From f2d5bd94724ac5292813edb64314c182d0dec44e Mon Sep 17 00:00:00 2001 From: Nick Boultbee Date: Mon, 2 Dec 2024 14:59:59 +0000 Subject: [PATCH 1/8] 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 Date: Mon, 2 Dec 2024 15:00:03 +0000 Subject: [PATCH 2/8] 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 ]; }; From fe1eb377ed26b53618f47af63e870d668bafce07 Mon Sep 17 00:00:00 2001 From: "me@so.lar.is" Date: Mon, 26 May 2025 14:44:36 +0200 Subject: [PATCH 3/8] Add support for 25.05 --- .github/workflows/nix.yml | 2 ++ .gitlab-ci.yml | 1 + README.md | 1 + images/devcontainer/default.nix | 6 +++++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 19cf08b..80427d0 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -19,6 +19,7 @@ jobs: - nixos-unstable - nixos-24.05 - nixos-24.11 + - nixos-25.05 system: - aarch64-linux - x86_64-linux @@ -67,6 +68,7 @@ jobs: - nixos-unstable - nixos-24.05 - nixos-24.11 + - nixos-25.05 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7367dc9..39638db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,3 +12,4 @@ build: - NIXPKGS_CHANNEL: - nixos-24.05 - nixos-24.11 + - nixos-25.05 diff --git a/README.md b/README.md index 58522ff..3b9cbe2 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ nixpkgs channel describes. | --- | --- | --- | | 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-25.05 | nixos-25.05 | 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 342b2f1..c3127a0 100644 --- a/images/devcontainer/default.nix +++ b/images/devcontainer/default.nix @@ -42,7 +42,11 @@ let nix # runtime dependencies of nix - cacert + # HACK: don't include the "hashed" output. It has overlapping files with + # the "unbundled" output, and that breaks the build. + (cacert // { + outputs = builtins.filter (x: x != "hashed") cacert.outputs; + }) gitReallyMinimal gnutar gzip From 98e0048215bc77a083a2a2000254e378377f61e2 Mon Sep 17 00:00:00 2001 From: erikarvstedt <36110478+erikarvstedt@users.noreply.github.com> Date: Wed, 4 Jun 2025 16:19:54 +0200 Subject: [PATCH 4/8] nix.conf: enable parallel building (#90) This is a sensible default given Docker images are often used for CI and build jobs. --- images/nix-flakes/default.nix | 1 + images/nix-unstable-static/default.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/nix-flakes/default.nix b/images/nix-flakes/default.nix index 7bea3c9..9fb8673 100644 --- a/images/nix-flakes/default.nix +++ b/images/nix-flakes/default.nix @@ -12,6 +12,7 @@ docker-nixpkgs.nix.override { text = '' accept-flake-config = true experimental-features = nix-command flakes + max-jobs = auto ''; }) ] ++ extraContents; diff --git a/images/nix-unstable-static/default.nix b/images/nix-unstable-static/default.nix index f494ce0..a018073 100644 --- a/images/nix-unstable-static/default.nix +++ b/images/nix-unstable-static/default.nix @@ -84,11 +84,12 @@ let mkdir -p libexec/nix ln -s /bin/nix libexec/nix/build-remote - # Enable flakes + # Enable flakes and parallel building mkdir -p etc/nix cat < etc/nix/nix.conf accept-flake-config = true experimental-features = nix-command flakes + max-jobs = auto NIX_CONFIG # Add run-as-user script From 02f2b05be81ab26a05d43263e04bae535f79f445 Mon Sep 17 00:00:00 2001 From: tomf Date: Tue, 1 Jul 2025 21:31:00 +1000 Subject: [PATCH 5/8] maddy: init (#94) --- images/maddy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 images/maddy/default.nix diff --git a/images/maddy/default.nix b/images/maddy/default.nix new file mode 100644 index 0000000..6596ace --- /dev/null +++ b/images/maddy/default.nix @@ -0,0 +1,6 @@ +{ buildCLIImage +, maddy +}: +buildCLIImage { + drv = maddy; +} From 96c221d72c3af7ead0d0aa7fb90ce08dcb633a9b Mon Sep 17 00:00:00 2001 From: tomf Date: Tue, 1 Jul 2025 21:31:24 +1000 Subject: [PATCH 6/8] images/pocket-id: init (#93) --- images/pocket-id/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 images/pocket-id/default.nix diff --git a/images/pocket-id/default.nix b/images/pocket-id/default.nix new file mode 100644 index 0000000..d73832f --- /dev/null +++ b/images/pocket-id/default.nix @@ -0,0 +1,6 @@ +{ buildCLIImage +, pocket-id +}: +buildCLIImage { + drv = pocket-id; +} From 9a5876396f7c4c2e405c8bc4ff20cf4d28c0cdcf Mon Sep 17 00:00:00 2001 From: Cobalt Date: Sun, 10 Aug 2025 08:47:03 +0200 Subject: [PATCH 7/8] images/attic: init (#95) Crate image with attic-client. --- images/attic/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 images/attic/default.nix diff --git a/images/attic/default.nix b/images/attic/default.nix new file mode 100644 index 0000000..05e953f --- /dev/null +++ b/images/attic/default.nix @@ -0,0 +1,10 @@ +{ docker-nixpkgs +, attic-client +}: +(docker-nixpkgs.nix.override { + extraContents = [ attic-client ]; +}).overrideAttrs (prev: { + meta = (prev.meta or { }) // { + description = "Nix and Attic client image"; + }; +}) From 64a3352bbfcca09a04774880951b0030e8f01409 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 10 Aug 2025 08:50:04 +0200 Subject: [PATCH 8/8] drop old 24.xx channels CI is breaking --- .github/workflows/nix.yml | 4 ---- .gitlab-ci.yml | 2 -- README.md | 2 -- images/devenv/default.nix | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 80427d0..fd4ec71 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -17,8 +17,6 @@ jobs: matrix: channel: - nixos-unstable - - nixos-24.05 - - nixos-24.11 - nixos-25.05 system: - aarch64-linux @@ -66,8 +64,6 @@ jobs: matrix: channel: - nixos-unstable - - nixos-24.05 - - nixos-24.11 - nixos-25.05 runs-on: ubuntu-latest steps: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39638db..baed4d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,4 @@ build: - NIXPKGS_CHANNEL: nixos-unstable IMAGE_TAG: latest - NIXPKGS_CHANNEL: - - nixos-24.05 - - nixos-24.11 - nixos-25.05 diff --git a/README.md b/README.md index 3b9cbe2..5da449c 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,6 @@ 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-25.05 | nixos-25.05 | only minor versions that include security updates | | nixos-unstable | latest | latest and greatest, major versions might change | diff --git a/images/devenv/default.nix b/images/devenv/default.nix index e562ce2..c0e6aef 100644 --- a/images/devenv/default.nix +++ b/images/devenv/default.nix @@ -3,7 +3,7 @@ }: (docker-nixpkgs.nix.override { # only available since 24.05 - extraContents = if devenv == null then [] else [ devenv ]; + extraContents = [ devenv ]; }).overrideAttrs (prev: { meta = (prev.meta or { }) // { description = "Nix and devenv image";