diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 9a83b6d6..5d3b2068 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -97,6 +97,11 @@ path = "ghc/ghc.git"; contents = blameIgnore; } + { + url = "github.com"; + path = "haskell/cabal.git"; + contents = blameIgnore; + } ]; }; @@ -112,15 +117,17 @@ nix = { settings = { - # extra-substituters = [ - # "https://ghc-nix.cachix.org" - # "https://haskell-language-server.cachix.org" - # "https://helix.cachix.org" - # ]; + extra-substituters = [ + "https://ghc-nix.cachix.org" + "https://haskell-language-server.cachix.org" + "https://helix.cachix.org" + "https://cache.iog.io" + ]; extra-trusted-public-keys = [ "ghc-nix.cachix.org-1:ziC/I4BPqeA4VbtOFpFpu6D1t6ymFvRWke/lc2+qjcg=" "haskell-language-server.cachix.org-1:juFfHrwkOxqIOZShtC4YC1uT1bBcq2RSvC7OMKx0Nz8=" "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" + "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ]; }; }; diff --git a/nix/homeModules/common/user-nixconf.nix b/nix/homeModules/common/user-nixconf.nix index c5096654..574a939e 100644 --- a/nix/homeModules/common/user-nixconf.nix +++ b/nix/homeModules/common/user-nixconf.nix @@ -8,7 +8,6 @@ package = lib.mkDefault (nixosConfig.nix.package or pkgs.nix); settings = { - allow-import-from-derivation = "true"; extra-substituters = [ "https://nix-community.cachix.org" "https://leana8959.cachix.org" @@ -25,14 +24,11 @@ "nix-command" "flakes" ]; - keep-outputs = true; # Build time derivations and sources - }; + allow-import-from-derivation = true; + keep-outputs = false; # Build time derivations and sources - registry.flakies = { - from.id = "flakies"; - from.type = "indirect"; - to.type = "git"; - to.url = "https://git.confusedcompiler.org/leana8959/flakies"; + http-connections = 50; # default: 25 + max-substitution-jobs = 32; # default: 16 }; }; } diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix index eae02c50..e9e58d14 100644 --- a/nix/packages/by-name/ruler/package.nix +++ b/nix/packages/by-name/ruler/package.nix @@ -12,8 +12,8 @@ domain = "git.confusedcompiler.org"; owner = "leana8959"; repo = "ruler"; - rev = "03f7b0bb545a59ddc031c08879eaf7e08dea1bef"; - hash = "sha256-ZNE2IR9f9zDS1t10bHqabXQiAq9aibfeQOo1pJtKUn0="; + rev = "bb254a5a42f2f0a9e9c35230cc6a4ea4ad07ba8b"; + hash = "sha256-LjVC54HepbZUfGzQXMEowSrD63LqyN4q7aszr9sUZvc="; }) {};