git.delta.rocks / fleet / refs/commits / 28094c98518f

2  "nodes": {2  "nodes": {
3    "crane": {3    "crane": {
4      "locked": {4      "locked": {
5        "lastModified": 1780532242,5        "lastModified": 1781825982,
6        "owner": "ipetkov",6        "owner": "ipetkov",
7        "repo": "crane",7        "repo": "crane",
8        "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37",8        "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7",
9        "type": "github"9        "type": "github"
10      },10      },
11      "original": {11      "original": {
126    },126    },
127    "nixpkgs": {127    "nixpkgs": {
128      "locked": {128      "locked": {
129        "lastModified": 1781402740,129        "lastModified": 1781820577,
130        "owner": "nixos",130        "owner": "nixos",
131        "repo": "nixpkgs",131        "repo": "nixpkgs",
132        "rev": "49145c5aba740948d6da1265f584826bd27619ad",132        "rev": "adf9aaad17ce9361ef72b69a9bf53026b334b5fc",
133        "type": "github"133        "type": "github"
134      },134      },
135      "original": {135      "original": {
136        "owner": "nixos",136        "owner": "nixos",
137        "ref": "release-25.11",137        "ref": "release-26.05",
138        "repo": "nixpkgs",138        "repo": "nixpkgs",
139        "type": "github"139        "type": "github"
140      }140      }
190        ]190        ]
191      },191      },
192      "locked": {192      "locked": {
193        "lastModified": 1781320681,193        "lastModified": 1781752752,
194        "owner": "oxalica",194        "owner": "oxalica",
195        "repo": "rust-overlay",195        "repo": "rust-overlay",
196        "rev": "5b929d8c854149d926d05ea0cd6469bf4e54db27",196        "rev": "c06d86dabe5b92982b9d67acccb9990d58da3a0e",
197        "type": "github"197        "type": "github"
198      },198      },
199      "original": {199      "original": {

--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "NixOS cluster configuration management";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/release-26.05";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -118,7 +118,9 @@
             ];
             deployerSystem = elem system deployerSystems;
             lib = pkgs.lib;
-            rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+            rust = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
+              enableLibsecret = false;
+            };
             craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rust;
             treefmt = (inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build;
           in
@@ -126,21 +128,7 @@
             _module.args.pkgs = import inputs.nixpkgs {
               inherit system;
               overlays = [
-                (inputs.rust-overlay.overlays.default)
-                (final: prev: {
-                  # Libsecret is stupidly huge
-                  # https://github.com/oxalica/rust-overlay/issues/211
-                  libsecret = final.stdenv.mkDerivation {
-                    name = "fake-libsecret";
-                    version = "1.0.0";
-                    unpackPhase = "true";
-                    buildPhase = "true";
-                    installPhase = ''
-                      mkdir -p $out/lib/
-                      echo "" | gcc -shared -o $out/lib/libsecret-1.so.0 -x c -
-                    '';
-                  };
-                })
+                inputs.rust-overlay.overlays.default
               ];
             };
             # Reference fleet package should be built with nightly rust, specified in rust-toolchain.toml.