Skip to content

Commit

Permalink
nixpkgs: drop support for 24.05 (ipetkov#751)
Browse files Browse the repository at this point in the history
  • Loading branch information
ipetkov authored and ulucs committed Dec 3, 2024
1 parent 29522bf commit a131fed
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 20 deletions.
16 changes: 3 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,9 @@ jobs:
matrix:
include:
# Latest and greatest release of Nix
#- install_url: https://nixos.org/nix/install
# The latest nix releases keep being broken, stick to what's in NixOS
- install_url: https://releases.nixos.org/nix/nix-2.18.2/install
# The 24.05 branch ships with Nix 2.18.2
- install_url: https://releases.nixos.org/nix/nix-2.18.2/install
- install_url: https://nixos.org/nix/install
# The 24.11 branch ships with Nix 2.24.10
- install_url: https://releases.nixos.org/nix/nix-2.24.10/install
nixpkgs-override: "--override-input nixpkgs $(./ci/ref-from-lock.sh ./test#nixpkgs-latest-release)"
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -75,10 +73,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
#install_url: https://nixos.org/nix/install
# The latest nix releases keep being broken, stick to what's in NixOS
install_url: https://releases.nixos.org/nix/nix-2.18.2/install
- uses: cachix/cachix-action@v15
with:
name: crane
Expand All @@ -99,10 +93,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
#install_url: https://nixos.org/nix/install
# The latest nix releases keep being broken, stick to what's in NixOS
install_url: https://releases.nixos.org/nix/nix-2.18.2/install
- uses: cachix/cachix-action@v15
with:
name: crane
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## Unreleased

### Changed
* **Breaking**: dropped compatibility for Nix versions below 2.24.10
* **Breaking**: dropped compatibility for nixpkgs-23.11

## [0.19.4] - 2024-11-30

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion lib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}:

let
minSupported = "24.05";
minSupported = "24.11";
current = lib.concatStringsSep "." (lib.lists.sublist 0 2 (lib.splitVersion lib.version));
isUnsupported = lib.versionOlder current minSupported;
msg = "crane requires at least nixpkgs-${minSupported}, supplied nixpkgs-${current}";
Expand Down
8 changes: 4 additions & 4 deletions test/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions test/flake.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
inputs = {
# NB: nixpkgs-unstable testing will come from the root flake
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-latest-release.url = "github:NixOS/nixpkgs/release-24.05";
nixpkgs-latest-release.url = "github:NixOS/nixpkgs/release-24.11";

advisory-db = {
url = "github:rustsec/advisory-db";
Expand Down

0 comments on commit a131fed

Please sign in to comment.