Skip to content

Commit 2b82c6f

Browse files
tannebergerMarcelCoding
authored andcommitted
misc: update to 25.11
1 parent b2d53b1 commit 2b82c6f

2 files changed

Lines changed: 36 additions & 38 deletions

File tree

flake.lock

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
inputs = {
3-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
3+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
44

55
# naersk and flake utils are not used by this flake directly, but needed
66
# for the follows in all the other ones.
@@ -146,8 +146,7 @@
146146
}:
147147
let
148148
pkgs = nixpkgs.legacyPackages."x86_64-linux";
149-
lib = pkgs.lib;
150-
overlayFlake = private-flake-overlays.lib.overlayFlake;
149+
inherit (pkgs) lib;
151150

152151
registry = import ./registry;
153152

@@ -189,7 +188,7 @@
189188
];
190189

191190
# function that generates a system with the given number
192-
generate_system = (id:
191+
generate_system = id:
193192
let
194193
myRegistry = registry.traffic-stop-box."${toString id}";
195194
in
@@ -211,8 +210,7 @@
211210
}
212211
] ++ stop-box-modules;
213212
};
214-
}
215-
);
213+
};
216214

217215
# list of traffic-stop-box-$id that will be built
218216
stop_box_ids = [ 0 1 4 ];
@@ -296,13 +294,13 @@
296294

297295
# these are in the app declaration as nix before 2.19 tries to find attrPaths in packages first.
298296
# here we evaluate over all nixos configurations making this extremely slow
299-
apps."x86_64-linux" = (import ./pkgs/deployment.nix { inherit self pkgs lib; });
297+
apps."x86_64-linux" = import ./pkgs/deployment.nix { inherit self pkgs lib; };
300298

301-
nixosConfigurations = lib.attrsets.mapAttrs (name: value: (nixpkgs.lib.nixosSystem value)) unevaluatedNixosConfigurations;
299+
nixosConfigurations = lib.attrsets.mapAttrs (_name: value: (nixpkgs.lib.nixosSystem value)) unevaluatedNixosConfigurations;
302300

303301
hydraJobs =
304302
let
305-
get-toplevel = (host: nixSystem: nixSystem.config.microvm.declaredRunner or nixSystem.config.system.build.toplevel);
303+
get-toplevel = _host: nixSystem: nixSystem.config.microvm.declaredRunner or nixSystem.config.system.build.toplevel;
306304
in
307305
nixpkgs.lib.mapAttrs get-toplevel self.nixosConfigurations;
308306
};

0 commit comments

Comments
 (0)