update nixpkgs

modules.system.nix: add ca-derivation cache
Revert "fix nodejs"
2026-01-12 04:19:22 +08:00 · 2024-10-18 11:32:03 +08:00 · 2024-10-18 09:07:28 +08:00 · 2024-10-15 22:42:35 +08:00 · 2024-10-15 22:36:52 +08:00
3 changed files with 15 additions and 7 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -990,11 +990,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1728960512,
-        "narHash": "sha256-SmpNwQSMjkkIsxYGc4nK5lXji1V2ftGdvO63YQp+wLY=",
+        "lastModified": 1729222179,
+        "narHash": "sha256-a6OsOKlxF/+UVf7bUi9l09iGkt8vswpE0R8pUnNdOIs=",
        "owner": "CHN-beta",
        "repo": "nixpkgs",
-        "rev": "e3f3809400ebf3521fb15822bd779e332362bfb1",
+        "rev": "a60d02ef57437f359be6c57d5247c9eb96174345",
        "type": "github"
      },
      "original": {
--- a/modules/system/nix.nix
+++ b/modules/system/nix.nix
@@ -36,7 +36,11 @@ inputs:
        experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
        keep-failed = true;
        max-substitution-jobs = 4;
-        trusted-public-keys = [ "chn:Cc+nowW1LIpe1kyXOZmNaznFDiH1glXmpb4A+WD/DTE=" ];
+        trusted-public-keys =
+        [
+          "chn:Cc+nowW1LIpe1kyXOZmNaznFDiH1glXmpb4A+WD/DTE="
+          "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="
+        ];
        trusted-users = [ "@wheel" ];
        show-trace = true;
        max-jobs = 4;
@@ -88,7 +92,11 @@ inputs:
    })
    # substituters
    {
-      nix.settings.substituters = inputs.lib.mkIf (nix.substituters != null) nix.substituters;
+      nix.settings.substituters = inputs.lib.mkMerge
+      [
+        (inputs.lib.mkIf (nix.substituters != null) nix.substituters)
+        [ "https://cache.ngi0.nixos.org/" ]
+      ];
    }
    # autoOptimiseStore
    (inputs.lib.mkIf nix.autoOptimiseStore
--- a/modules/system/nixpkgs.nix
+++ b/modules/system/nixpkgs.nix
@@ -51,7 +51,7 @@ inputs:
            oneapiArch = let match = { znver3 = "CORE-AVX2"; znver4 = "core-avx2"; };
              in match.${nixpkgs.march} or nixpkgs.march;
            nvhpcArch = nixpkgs.march;
-            contentAddressedByDefault = true;
+            # contentAddressedByDefault = true;
            enableCcache = true;
          });
          overlays =
@@ -87,7 +87,7 @@ inputs:
                    config = cudaConfig //
                    {
                      allowUnfree = true;
-                      contentAddressedByDefault = true;
+                      # contentAddressedByDefault = true;
                      permittedInsecurePackages =
                        let pkgs = inputs.topInputs.${source.${name}}.legacyPackages.${system};
                        in map
Author	SHA1	Message	Date
chn	455bd56635	update nixpkgs	2024-10-18 11:32:03 +08:00
chn	9878931a9d	modules.system.nix: add ca-derivation cache	2024-10-18 09:07:28 +08:00
chn	3b3619c0f2	Revert "fix nodejs" This reverts commit `0a43a9a4fe`.	2024-10-15 22:42:35 +08:00
chn	458683d0e1	Revert "modules.system.nixpkgs: enable ca-derivation" This reverts commit `ec49dcf5b9`.	2024-10-15 22:36:52 +08:00