Merge pull request #37 from Liqwid-Labs/t4/no-ca

Liqwid-Labs · Jan 3, 2023 · 7371121 · 7371121
2 parents c21e708 + ee6f4a5
commit 7371121
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/nix/mk-hackage.nix b/nix/mk-hackage.nix
@@ -86,12 +86,10 @@ rec {
       ${pkgs.haskell-nix.nix-tools.${compiler-nix-name}}/bin/hackage-to-nix $out 01-index.tar "https://mkHackageNix/"
     '';
 
-  copySrc = src: pkgs.runCommand "copied-src-${builtins.baseNameOf src}"
-    {
-      __contentAddressed = true;
-    } ''
-    cp -T -r ${src} $out
-  '';
+  copySrc = src: builtins.path {
+    path = src;
+    name = "copied-src-${builtins.baseNameOf (builtins.unsafeDiscardStringContext src)}";
+  };
 
   mkModule = extraHackagePackages: {
     # Prevent nix-build from trying to download the packages

diff --git a/nix/onchain.nix b/nix/onchain.nix
@@ -566,6 +566,7 @@ in
               {
                 dependencies = [ hasktags ];
                 script = ''
+                  # shellcheck disable=SC2046
                   hasktags -x ${haskellSources}
                 '';
                 help = ''

diff --git a/templates/offchain/flake.nix b/templates/offchain/flake.nix
@@ -2,7 +2,7 @@
   description = "Example Liqwid CTL project";
 
   nixConfig = {
-    extra-experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
+    extra-experimental-features = [ "nix-command" "flakes" ];
     extra-substituters = [ "https://cache.iog.io" "https://public-plutonomicon.cachix.org" "https://mlabs.cachix.org" ];
     extra-trusted-public-keys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "public-plutonomicon.cachix.org-1:3AKJMhCLn32gri1drGuaZmFrmnue+KkKrhhubQk/CWc=" ];
     allow-import-from-derivation = "true";

diff --git a/templates/onchain/flake.nix b/templates/onchain/flake.nix
@@ -2,7 +2,7 @@
   description = "A liqwid-nix Plutarch project";
 
   nixConfig = {
-    extra-experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
+    extra-experimental-features = [ "nix-command" "flakes" ];
     extra-substituters = [ "https://cache.iog.io" "https://public-plutonomicon.cachix.org" "https://mlabs.cachix.org" ];
     extra-trusted-public-keys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "public-plutonomicon.cachix.org-1:3AKJMhCLn32gri1drGuaZmFrmnue+KkKrhhubQk/CWc=" ];
     allow-import-from-derivation = "true";