diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 5d3b2068..9a83b6d6 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -97,11 +97,6 @@ path = "ghc/ghc.git"; contents = blameIgnore; } - { - url = "github.com"; - path = "haskell/cabal.git"; - contents = blameIgnore; - } ]; }; @@ -117,17 +112,15 @@ nix = { settings = { - extra-substituters = [ - "https://ghc-nix.cachix.org" - "https://haskell-language-server.cachix.org" - "https://helix.cachix.org" - "https://cache.iog.io" - ]; + # extra-substituters = [ + # "https://ghc-nix.cachix.org" + # "https://haskell-language-server.cachix.org" + # "https://helix.cachix.org" + # ]; 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 574a939e..c5096654 100644 --- a/nix/homeModules/common/user-nixconf.nix +++ b/nix/homeModules/common/user-nixconf.nix @@ -8,6 +8,7 @@ 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" @@ -24,11 +25,14 @@ "nix-command" "flakes" ]; - allow-import-from-derivation = true; - keep-outputs = false; # Build time derivations and sources + keep-outputs = true; # Build time derivations and sources + }; - http-connections = 50; # default: 25 - max-substitution-jobs = 32; # default: 16 + registry.flakies = { + from.id = "flakies"; + from.type = "indirect"; + to.type = "git"; + to.url = "https://git.confusedcompiler.org/leana8959/flakies"; }; }; } diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix index e9e58d14..eae02c50 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 = "bb254a5a42f2f0a9e9c35230cc6a4ea4ad07ba8b"; - hash = "sha256-LjVC54HepbZUfGzQXMEowSrD63LqyN4q7aszr9sUZvc="; + rev = "03f7b0bb545a59ddc031c08879eaf7e08dea1bef"; + hash = "sha256-ZNE2IR9f9zDS1t10bHqabXQiAq9aibfeQOo1pJtKUn0="; }) {};