From 3d2ed6c9705023d33464dd1d12c0cbdc706606ce Mon Sep 17 00:00:00 2001
From: Jamie Bertram <jamie.bertram@tweag.io>
Date: Wed, 10 Nov 2021 15:56:22 -0500
Subject: [PATCH] Update web-common nix

---
 default.nix                           | 5 +----
 flake.lock                            | 6 +++---
 marlowe-dashboard-client/default.nix  | 2 +-
 marlowe-playground-client/default.nix | 2 +-
 nix/pkgs/default.nix                  | 3 +++
 shell.nix                             | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/default.nix b/default.nix
index b4b5260a40..513a2cb740 100644
--- 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
index 437523ef35..7e52e2b618 100644
--- a/flake.lock
+++ b/flake.lock
@@ -281,11 +281,11 @@
     "web-common": {
       "flake": false,
       "locked": {
-        "lastModified": 1635526611,
-        "narHash": "sha256-qLUmwG7hKGbc3pFWkKSKFFE0uWxgPSrIUZspUwwEFCo=",
+        "lastModified": 1636582556,
+        "narHash": "sha256-sUMGwh6PJNGFNLeNJ5aPm4ZpT1x6TSdp6z9VSUB4dXM=",
         "owner": "input-output-hk",
         "repo": "purescript-web-common",
-        "rev": "f1241ea27fc6acc78d093574e3707165b4ef9b3e",
+        "rev": "a0a81da88232a38ffde93bd402941eb224d50834",
         "type": "github"
       },
       "original": {
diff --git a/marlowe-dashboard-client/default.nix b/marlowe-dashboard-client/default.nix
index 843dafc526..bcbc125ff9 100644
--- 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
index 315f43f526..41cbbc4678 100644
--- 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
index 2665a0d9ea..dca8309452 100644
--- 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
index 58e77c7dc0..80d1ac1eb2 100644
--- 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}"
   '';
 }