diff --git a/flake.lock b/flake.lock index c761e5af88c..99b9f4f751c 100644 --- a/flake.lock +++ b/flake.lock @@ -77,22 +77,6 @@ "type": "github" } }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -114,9 +98,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "libgit2": "libgit2", "nixpkgs": "nixpkgs", - "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression" } } diff --git a/flake.nix b/flake.nix index 554b3a197ce..9bd33d3ae5b 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2"; - inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446"; inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; # dev tooling diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix index 17bfdea3822..3a0822856d9 100644 --- a/tests/nixos/default.nix +++ b/tests/nixos/default.nix @@ -56,18 +56,9 @@ let nix.package = lib.mkForce pkgs.nixVersions.nix_2_3; }; - otherNixes.nix_2_13.setNixPackage = { lib, pkgs, ... }: { + otherNixes.nix_2_24.setNixPackage = { lib, pkgs, ... }: { imports = [ checkOverrideNixVersion ]; - nix.package = lib.mkForce ( - self.inputs.nixpkgs-23-11.legacyPackages.${pkgs.stdenv.hostPlatform.system}.nixVersions.nix_2_13.overrideAttrs (o: { - meta = o.meta // { knownVulnerabilities = []; }; - }) - ); - }; - - otherNixes.nix_2_18.setNixPackage = { lib, pkgs, ... }: { - imports = [ checkOverrideNixVersion ]; - nix.package = lib.mkForce pkgs.nixVersions.nix_2_18; + nix.package = lib.mkForce pkgs.nixVersions.nix_2_24; }; in