From 35b2808180ea072d0f200cedd6abff43ae95c00e Mon Sep 17 00:00:00 2001
From: Nick Boultbee <nick.boultbee@generative.vision>
Date: Mon, 2 Dec 2024 12:35:27 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=86=95=20Target=2024.11=20too,=20now?=
 =?UTF-8?q?=20that=20it's=20out=20and=20non-beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/nix.yml | 2 ++
 .gitlab-ci.yml            | 1 +
 README.md                 | 1 +
 3 files changed, 4 insertions(+)

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

From f2d5bd94724ac5292813edb64314c182d0dec44e Mon Sep 17 00:00:00 2001
From: Nick Boultbee <nick.boultbee@generative.vision>
Date: Mon, 2 Dec 2024 14:59:59 +0000
Subject: [PATCH 2/3] Fix deprecated nix versions vars

---
 images/nix-flakes/default.nix   | 4 ++--
 images/nix-unstable/default.nix | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

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

From 8fab1455c944d80d7872fb33b9d19d576371a04f Mon Sep 17 00:00:00 2001
From: Nick Boultbee <nick.boultbee@generative.vision>
Date: Mon, 2 Dec 2024 15:00:03 +0000
Subject: [PATCH 3/3] Fix iproute -> iproute2

---
 images/devcontainer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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