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