Update to recent ImplicitCAD and GPipe-GLFW

Author: sorki

cabal.project

@@ -1 +1,23 @@
 packages: ./.
+
+-- until 0.4
+source-repository-package
+ type: git
+ location: https://github.com/Haskell-Things/ImplicitCAD
+ tag: ae794b901e9677593815fad741d87ff56846562d
+
+-- fork due to resizeBuffer PR https://github.com/tobbebex/GPipe-Core/pull/76
+source-repository-package
+ type: git
+ location: https://github.com/sorki/GPipe-Core
+ tag: 86a7b29014e7ebfb24ac17d5afcd877a38a1fbd5
+ subdir:
+ GPipe-Core
+
+-- until next release
+source-repository-package
+ type: git
+ location: https://github.com/plredmond/GPipe-GLFW
+ tag: 3d7e91a20a80fe31e910884b151ebe4d26e8274e
+ subdir:
+ GPipe-GLFW

example-haskell/SomeModule.hs

@@ -9,10 +9,10 @@ import SomeOtherModule
 res = 2
 
 obj = union $ [
- cubeR 0 False (V3 20 20 14)
+ cube False (V3 20 20 14)
  , translate (V3 20 20 20) (sphere 15)
  , translate (V3 30 20 20) (sphere 5)
- , translate (V3 0 0 25) (cubeR 2 False (pure 10))
+ , translate (V3 0 0 25) (withRounding 2 $ cube False (pure 10))
  , translate (V3 25 0 0) (cylinder2 10 4 10)
  , translate (V3 (-25) 0 0) obj'
  ]

overlay.nix

@@ -13,8 +13,8 @@ let
  gpipeGlfwSrc = super.fetchFromGitHub {
  owner = "plredmond";
  repo = "GPipe-GLFW";
- rev = "83d26eb7b41d67f5ac6fbd1bd8758d72c660e039";
- sha256 = "0fg60amvp2v37cwmvfa0n7if1ppisjjh3bknmrr17m7fbfbbxlhq";
+ rev = "3d7e91a20a80fe31e910884b151ebe4d26e8274e";
+ sha256 = "0rx00mxlz6jlipx19h271mbnp8l9kzgm3dhwprwww4gf8g43r7vd";
  };
 in
  ({
@@ -25,12 +25,12 @@ in
  GPipe = hsuper.callCabal2nix "GPipe" "${gpipeSrc}/GPipe-Core" {};
  GPipe-GLFW = hsuper.callCabal2nix "GPipe-GLFW" ("${gpipeGlfwSrc}/GPipe-GLFW") {};
 
- # until > 3.0.2 is out
+ # until > 4.0.0 is out
  implicit = hsuper.callCabal2nix "implicit" (super.fetchFromGitHub {
- owner = "colah";
+ owner = "Haskell-Things";
  repo = "ImplicitCAD";
- rev = "8dff5531cdc4d9ed32bf958e3945b4a3a0ef3774";
- sha256 = "0bp797a9wlpyw2d6b4csz5ikqq3wy1qry0iabl7r7axjrhvnfp56";
+ rev = "ae794b901e9677593815fad741d87ff56846562d";
+ sha256 = "0q8bj3jysgl7kfivrag8g6yx58n5rxf69qsc3lw43941lamaxpda";
  }) {};
  });
  });

src/Graphics/Implicit/Viewer/Loaders.hs

@@ -16,7 +16,6 @@ import Data.List (isSuffixOf)
 import Data.Time (getCurrentTime, diffUTCTime)
 import Data.Typeable (Typeable)
 
-import Linear (V3(V3))
 import Graphics.Implicit
 import Graphics.Implicit.Primitives (getBox)
 import Graphics.Implicit.ExtOpenScad.Definitions

stack.yaml

@@ -2,27 +2,24 @@
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
 
-resolver: lts-16.25
+resolver: lts-19.5
 
 # Local packages, usually specified by relative directory name
 packages:
 - .
 
 # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
 extra-deps:
-- storable-endian-0.2.6
-- quickspec-2.1.5@sha256:1d1cc020fa9075cb5fafd4056fe1d930d5763b954fa8200e57ce6aba057544b2,3557
-- twee-lib-2.2@sha256:9fe9327505d8f450a94f2fc9eea74b292901b7992d520aa1dd4f0410fbe0e594,2112
 - git: git@github.com:sorki/GPipe-Core
  commit: 86a7b29014e7ebfb24ac17d5afcd877a38a1fbd5
  subdirs:
  - GPipe-Core
 - git: git@github.com:plredmond/GPipe-GLFW
- commit: 83d26eb7b41d67f5ac6fbd1bd8758d72c660e039
+ commit: 3d7e91a20a80fe31e910884b151ebe4d26e8274e
  subdirs:
  - GPipe-GLFW
-- git: git@github.com:colah/ImplicitCAD
- commit: 8dff5531cdc4d9ed32bf958e3945b4a3a0ef3774
+- git: git@github.com:Haskell-Things/ImplicitCAD
+ commit: ae794b901e9677593815fad741d87ff56846562d
 
 # Override default flag values for local packages and extra-deps
 flags: {}