--- a/flake.lock +++ b/flake.lock @@ -2,10 +2,10 @@ "nodes": { "crane": { "locked": { - "lastModified": 1780532242, + "lastModified": 1781825982, "owner": "ipetkov", "repo": "crane", - "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37", + "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", "type": "github" }, "original": { @@ -126,15 +126,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1781402740, + "lastModified": 1781820577, "owner": "nixos", "repo": "nixpkgs", - "rev": "49145c5aba740948d6da1265f584826bd27619ad", + "rev": "adf9aaad17ce9361ef72b69a9bf53026b334b5fc", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "nixpkgs", "type": "github" } @@ -190,10 +190,10 @@ ] }, "locked": { - "lastModified": 1781320681, + "lastModified": 1781752752, "owner": "oxalica", "repo": "rust-overlay", - "rev": "5b929d8c854149d926d05ea0cd6469bf4e54db27", + "rev": "c06d86dabe5b92982b9d67acccb9990d58da3a0e", "type": "github" }, "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.