diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index a6b17dd..19cf08b 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -18,6 +18,7 @@ jobs: channel: - nixos-unstable - nixos-24.05 + - nixos-24.11 system: - aarch64-linux - x86_64-linux @@ -65,6 +66,7 @@ jobs: channel: - nixos-unstable - nixos-24.05 + - nixos-24.11 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3898d9..7367dc9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,3 +11,4 @@ build: IMAGE_TAG: latest - NIXPKGS_CHANNEL: - nixos-24.05 + - nixos-24.11 diff --git a/README.md b/README.md index 84eee9e..58522ff 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ nixpkgs channel describes. | Channel | Image Tag | Description | | --- | --- | --- | | nixos-24.05 | nixos-24.05 | only minor versions that include security updates | +| nixos-24.11 | nixos-24.11 | only minor versions that include security updates | | nixos-unstable | latest | latest and greatest, major versions might change | ## List of images diff --git a/images/devcontainer/default.nix b/images/devcontainer/default.nix index 3b993f6..342b2f1 100644 --- a/images/devcontainer/default.nix +++ b/images/devcontainer/default.nix @@ -14,7 +14,7 @@ , gnutar , gzip , iana-etc -, iproute +, iproute2 , less , lib , nix @@ -61,7 +61,7 @@ let (gcc-unwrapped // { outputs = builtins.filter (x: x != "libgcc") gcc-unwrapped.outputs; }) - iproute + iproute2 ]; }; diff --git a/images/nix-flakes/default.nix b/images/nix-flakes/default.nix index 00e9bfa..7bea3c9 100644 --- a/images/nix-flakes/default.nix +++ b/images/nix-flakes/default.nix @@ -1,10 +1,10 @@ { docker-nixpkgs -, nixFlakes +, nixVersions , writeTextFile , extraContents ? [ ] }: docker-nixpkgs.nix.override { - nix = nixFlakes; + nix = nixVersions.stable; extraContents = [ (writeTextFile { name = "nix.conf"; diff --git a/images/nix-unstable/default.nix b/images/nix-unstable/default.nix index 008e7ec..792acc5 100644 --- a/images/nix-unstable/default.nix +++ b/images/nix-unstable/default.nix @@ -1,7 +1,6 @@ { docker-nixpkgs , pkgs -, nixUnstable }: docker-nixpkgs.nix.override { - nix = pkgs.nixVersions.latest or pkgs.nixUnstable; + nix = pkgs.nixVersions.latest; }