diff --git a/nix/mk-hackage.nix b/nix/mk-hackage.nix index 987e71b..9f245cc 100644 --- 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 index b6cbbce..08280f8 100644 --- 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 index ca3acd9..00c650c 100644 --- 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 index 58f884d..5c16b9a 100644 --- 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";