Merge pull request #86 from generative-engineering/24.11

🆕 Target 24.11 too, now that it's out and non-beta

.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

.gitlab-ci.yml

@@ -11,3 +11,4 @@ build:
         IMAGE_TAG: latest
       - NIXPKGS_CHANNEL:
           - nixos-24.05
+          - nixos-24.11

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

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
     ];
   };
 

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";

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;
 }