Merge pull request #281 from IntersectMBO/hkm/use-foliage-hackage-ove…

…rlay-ghcjs Use foliage hackage overlay ghcjs
IntersectMBO · Nov 19, 2024 · f7d6a67 · f7d6a67
2 parents b170724 + b9dda76
commit f7d6a67
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/cabal.project b/cabal.project
@@ -14,11 +14,13 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 
 repository ghcjs-overlay
-  url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/7ed50a3159d95499981b1c384ddc05639032789e
+  url: https://input-output-hk.github.io/hackage-overlay-ghcjs/
   secure: True
   root-keys:
-  key-threshold: 0
-  --sha256: sha256-LvLpoKZy44DfMDLIqj1kodQ+WBo/BtGGJ23Iok2LVO8=
+    3838d0dfa046bb3d16de9ae0823dab1dd937ee336f9bcaa87c85b36443aee7f6
+    92e8a83a0df4f99ff0372b6dcdb008c52971d1d53b1df621630f5a650fbf1f0a
+    d5f108840fa2addca04caa82bc4c60ce41df7c0d3133baf6716b05a4dce11b6c
+  key-threshold: 3
 
 -- Avoid conflict in `hjsonschema`
 -- src/Import.hs:2:16: error: [GHC-69158]

diff --git a/core/cardano-addresses.cabal b/core/cardano-addresses.cabal
@@ -122,3 +122,4 @@ test-suite unit
   if flag(release)
     ghc-options: -Werror
   default-language: Haskell2010
+
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,14 +11,18 @@
       url = "github:intersectmbo/cardano-haskell-packages?ref=repo";
       flake = false;
     };
+    hackageGHCJS = {
+      url = "github:input-output-hk/hackage-overlay-ghcjs?ref=repo";
+      flake = false;
+    };
     flake-utils.url = "github:numtide/flake-utils";
     iohkNix = {
       url = "github:input-output-hk/iohk-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils, haskellNix, iohkNix, CHaP, ... }:
+  outputs = { self, nixpkgs, flake-utils, haskellNix, iohkNix, CHaP, hackageGHCJS, ... }:
     let
       inherit (nixpkgs) lib;
       inherit (flake-utils.lib) eachSystem mkApp;
@@ -54,7 +58,7 @@
           };
 
           haskellProject = (import ./nix/haskell.nix {
-            inherit system CHaP;
+            inherit system CHaP hackageGHCJS;
             inherit (pkgs) haskell-nix;
           });
 

diff --git a/nix/haskell.nix b/nix/haskell.nix
@@ -1,7 +1,7 @@
 ############################################################################
 # Builds Haskell packages with Haskell.nix
 ############################################################################
-{ system, CHaP, haskell-nix }:
+{ system, CHaP, hackageGHCJS, haskell-nix }:
 haskell-nix.cabalProject' (
   { pkgs
   , lib
@@ -28,6 +28,7 @@ haskell-nix.cabalProject' (
 
     inputMap = {
       "https://chap.intersectmbo.org/" = CHaP;
+      "https://input-output-hk.github.io/hackage-overlay-ghcjs/" = hackageGHCJS;
     };
 
     # Setting this to builtins.currentSystem allows --impure to be used
Original file line number	Diff line number	Diff line change
Expand Up		@@ -122,3 +122,4 @@ test-suite unit
		if flag(release)
		ghc-options: -Werror
		default-language: Haskell2010