Update web-common nix

input-output-hk · Nov 23, 2021 · 3d2ed6c · 3d2ed6c
1 parent 29de5fa
commit 3d2ed6c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/default.nix b/default.nix
@@ -32,16 +32,13 @@ in
 rec {
   inherit pkgs marlowe;
 
-  inherit (marlowe) web-ghc;
+  inherit (marlowe) webCommon web-ghc;
 
   inherit (haskell.packages.marlowe.components.exes) marlowe-pab;
 
   # TODO This stuff should probably be exposed as an overlay in the plutus-apps if
   # we switch to flakes.
-  webCommon = pkgs.callPackage sources.web-common { inherit (marlowe.lib) gitignore-nix; };
-  webCommonPlutus = pkgs.callPackage (sources.plutus-apps + "/web-common-plutus") { inherit (marlowe.lib) gitignore-nix; };
   webCommonPlayground = pkgs.callPackage (sources.plutus-apps + "/web-common-playground") { inherit (marlowe.lib) gitignore-nix; };
-
   webCommonMarlowe = pkgs.callPackage ./web-common-marlowe { inherit (marlowe.lib) gitignore-nix; };
 
   marlowe-playground = pkgs.recurseIntoAttrs rec {

diff --git a/flake.lock b/flake.lock
diff --git a/marlowe-dashboard-client/default.nix b/marlowe-dashboard-client/default.nix
@@ -47,7 +47,7 @@ let
       spagoPackages = pkgs.callPackage ./spago-packages.nix { };
     })
     (_: {
-      WEB_COMMON_SRC = webCommon;
+      WEB_COMMON_SRC = webCommon.cleanSrc;
     });
 in
 {

diff --git a/marlowe-playground-client/default.nix b/marlowe-playground-client/default.nix
@@ -59,7 +59,7 @@ let
       spagoPackages = pkgs.callPackage ./spago-packages.nix { };
     })
     (_: {
-      WEB_COMMON_SRC = webCommon;
+      WEB_COMMON_SRC = webCommon.cleanSrc;
       WEB_COMMON_PLAYGROUND_SRC = webCommonPlayground;
     });
 in

diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
@@ -103,6 +103,8 @@ let
   # ghc web service
   web-ghc = pkgs.callPackage (sources.plutus-apps + "/nix/pkgs/web-ghc") { inherit haskell; extraPackagesFun = ps: [ ps.marlowe ]; };
 
+  webCommon = pkgs.callPackage sources.web-common { inherit gitignore-nix; };
+
   # combined haddock documentation for all public plutus libraries
   plutus-haddock-combined =
     let
@@ -142,4 +144,5 @@ in
   inherit web-ghc;
   inherit easyPS plutus-haddock-combined;
   inherit lib;
+  inherit webCommon;
 }
diff --git a/shell.nix b/shell.nix
@@ -120,7 +120,7 @@ haskell.project.shellFor {
   # Point to some source dependencies
   + ''
     export ACTUS_TEST_DATA_DIR=${packages.actus-tests}/tests/
-    export WEB_COMMON_SRC="${webCommon}"
+    export WEB_COMMON_SRC="${webCommon.cleanSrc}"
     export WEB_COMMON_PLAYGROUND_SRC="${webCommonPlayground}"
   '';
 }