test

google · Nov 6, 2021 · 04547c0 · 04547c0
1 parent b0febbd
commit 04547c0
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/cabal.project b/cabal.project
@@ -3,7 +3,7 @@ packages:
   codeworld-account/
   codeworld-api/
   codeworld-auth/
-  codeworld-available-pkgs/
+  -- codeworld-available-pkgs/
   codeworld-base/
   codeworld-compiler/
   codeworld-error-sanitizer/
@@ -12,3 +12,21 @@ packages:
   codeworld-prediction/
   codeworld-server/
   funblocks-client/
+
+source-repository-package
+  type: git
+  location: https://github.com/peterbecich/hgeometry.git
+  tag: f898c5580c609320f0c7cc776e80f609711d19c5
+  subdir: hgeometry
+  --sha256: 0bmcb3dh1sfz6k7i30czcqqvarm1mzn55xdnimpnp19kj8v5g8nj
+
+source-repository-package
+  type: git
+  location: https://github.com/peterbecich/hgeometry.git
+  tag: f898c5580c609320f0c7cc776e80f609711d19c5
+  subdir: hgeometry-combinatorial
+  --sha256: 0bmcb3dh1sfz6k7i30czcqqvarm1mzn55xdnimpnp19kj8v5g8nj
+
+allow-newer:
+    reflex:witherable
+  , patch:witherable
diff --git a/codeworld-api/codeworld-api.cabal b/codeworld-api/codeworld-api.cabal
@@ -65,7 +65,7 @@ Library
                        template-haskell     >= 2.8   && < 2.18,
                        text                 >= 1.2.2 && < 1.3,
                        time                 >= 1.8   && < 2.0,
-                       witherable           >= 0.3   && < 0.4
+                       witherable           >= 0.3
 
   if impl(ghcjs)
     Js-sources:        jsbits/sim_fp.js
@@ -126,7 +126,7 @@ Test-suite unit-tests
                        template-haskell     >= 2.8   && < 2.18,
                        text                 >= 1.2.2 && < 1.3,
                        time                 >= 1.8   && < 2.0,
-                       witherable           >= 0.3   && < 0.4
+                       witherable           >= 0.3
 
   if impl(ghcjs)
     Js-sources:        jsbits/sim_fp.js

diff --git a/codeworld-available-pkgs/codeworld-available-pkgs.cabal b/codeworld-available-pkgs/codeworld-available-pkgs.cabal
@@ -10,6 +10,7 @@ Copyright:           (c) 2020, The CodeWorld Authors
 Bug-reports:         https://github.com/google/codeworld/issues
 
 Library
+  extra-libraries: m
   if impl(ghcjs -any)
     Build-depends:
       Boolean,

diff --git a/default.nix b/default.nix
@@ -1,6 +1,6 @@
 # https://input-output-hk.github.io/haskell.nix/tutorials/getting-started/
 { compiler ? "ghc865",
-  ghcjs ? "ghcjs",
+  # ghcjs ? "ghcjs",
   withCoverage ? false
 }:
   let
@@ -9,8 +9,19 @@
     pkgs = import
       haskellNix.sources.nixpkgs-unstable
       haskellNix.nixpkgsArgs;
+      overlays = [
+        (self: super:
+          {
+            m = self.stdenv.mkDerivation {
+              name = "m";
+              unpackPhase = "true";
+              installPhase = "mkdir -p $out";
+            };
+          }
+        )
+      ];
+
   in
-    # pkgs.pkgsCross.ghcjs.haskell-nix.project {
     pkgs.haskell-nix.project {
       projectFileName = "cabal.project";
       src = pkgs.haskell-nix.haskellLib.cleanGit {

diff --git a/nix/sources.json b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://input-output-hk.github.io/haskell.nix",
         "owner": "input-output-hk",
         "repo": "haskell.nix",
-        "rev": "166d280952e5f1791ce5aebc995a3525f7174e4b",
-        "sha256": "0q4xjdck74jp6dhyf0g0flj4fhs59rhcyslklfwmfhbq8afbqprn",
+        "rev": "564458fc4080c0fc51e316d74c3dbb68639ea839",
+        "sha256": "0d7kp3sqw8zhp4sv5awla6ch15mbndmr3640y3pwlvkcb59p8amm",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/haskell.nix/archive/166d280952e5f1791ce5aebc995a3525f7174e4b.tar.gz",
+        "url": "https://github.com/input-output-hk/haskell.nix/archive/564458fc4080c0fc51e316d74c3dbb68639ea839.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {