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

difftreelog

ci switch to nixos-26.05

zuuqnlrvYaroslav Bolyukin2026-06-18parent: #48d120a.patch.diff

2 files changed

modifiedflake.lockdiffbeforeafterboth
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": {
modifiedflake.nixdiffbeforeafterboth
2 description = "NixOS cluster configuration management";2 description = "NixOS cluster configuration management";
33
4 inputs = {4 inputs = {
5 nixpkgs.url = "github:nixos/nixpkgs/release-25.11";5 nixpkgs.url = "github:nixos/nixpkgs/release-26.05";
6 rust-overlay = {6 rust-overlay = {
7 url = "github:oxalica/rust-overlay";7 url = "github:oxalica/rust-overlay";
8 inputs.nixpkgs.follows = "nixpkgs";8 inputs.nixpkgs.follows = "nixpkgs";
118 ];118 ];
119 deployerSystem = elem system deployerSystems;119 deployerSystem = elem system deployerSystems;
120 lib = pkgs.lib;120 lib = pkgs.lib;
121 rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;121 rust = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
122 enableLibsecret = false;
123 };
122 craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rust;124 craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rust;
123 treefmt = (inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build;125 treefmt = (inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build;
124 in126 in
125 {127 {
126 _module.args.pkgs = import inputs.nixpkgs {128 _module.args.pkgs = import inputs.nixpkgs {
127 inherit system;129 inherit system;
128 overlays = [130 overlays = [
129 (inputs.rust-overlay.overlays.default)131 inputs.rust-overlay.overlays.default
130 (final: prev: {
131 # Libsecret is stupidly huge
132 # https://github.com/oxalica/rust-overlay/issues/211
133 libsecret = final.stdenv.mkDerivation {
134 name = "fake-libsecret";
135 version = "1.0.0";
136 unpackPhase = "true";
137 buildPhase = "true";
138 installPhase = ''
139 mkdir -p $out/lib/
140 echo "" | gcc -shared -o $out/lib/libsecret-1.so.0 -x c -
141 '';
142 };
143 })
144 ];132 ];
145 };133 };
146 # Reference fleet package should be built with nightly rust, specified in rust-toolchain.toml.134 # Reference fleet package should be built with nightly rust, specified in rust-toolchain.toml.