Skip to content

Commit

Permalink
Update nixpkgs to 24.11, drop test for python39 but add python312
Browse files Browse the repository at this point in the history
Co-authored-by: Florian Sesser <[email protected]>
Signed-off-by: Benoit Donneaux <[email protected]>
  • Loading branch information
btlogy and hacklschorsch committed Dec 5, 2024
1 parent 19aa0cd commit 3187e00
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 69 deletions.
11 changes: 6 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,15 @@ workflows:
{}

- "nixos":
name: "<<matrix.pythonVersion>>"
nixpkgs: "nixpkgs-unstable"
name: "<<matrix.nixpkgs>>-<<matrix.pythonVersion>>"
matrix:
parameters:
nixpkgs:
- "nixpkgs-24_11"
pythonVersion:
- "python39"
- "python310"
- "python311"
- "python312"

# Eventually, test against PyPy 3.8
#- "pypy27-buster":
Expand Down Expand Up @@ -741,7 +742,7 @@ executors:
docker:
# Run in a highly Nix-capable environment.
- <<: *DOCKERHUB_AUTH
image: "nixos/nix:2.16.1"
image: "nixos/nix:2.25.3"
environment:
# Let us use features marked "experimental". For example, most/all of
# the `nix <subcommand>` forms.
Expand Down Expand Up @@ -772,7 +773,7 @@ commands:
# certain release branch. These aren't involved in the actual
# package build (only in CI environment setup) so the fact that
# they float shouldn't hurt reproducibility.
NIXPKGS="nixpkgs/nixos-23.05"
NIXPKGS="nixpkgs/nixos-24.11"
nix profile install $NIXPKGS#bash $NIXPKGS#jp
- "checkout"
Expand Down
60 changes: 13 additions & 47 deletions flake.lock

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

21 changes: 4 additions & 17 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,12 @@
# requirements. We could decide in the future that supporting multiple
# releases of NixOS at a time is worthwhile and then pins like these will
# help us test each of those releases.
"nixpkgs-22_11" = {
url = github:NixOS/nixpkgs?ref=nixos-22.11;
};
"nixpkgs-23_05" = {
url = github:NixOS/nixpkgs?ref=nixos-23.05;
};

# We depend on a very new python-cryptography which is not yet available
# from any release branch of nixpkgs. However, it is contained in a PR
# currently up for review. Point our nixpkgs at that for now.
"nixpkgs-unstable" = {
url = github:NixOS/nixpkgs?ref=pull/244135/head;
"nixpkgs-24_11" = {
url = github:NixOS/nixpkgs?ref=nixos-24.11;
};

# Point the default nixpkgs at one of those. This avoids having getting a
# _third_ package set involved and gives a way to provide what should be a
# working experience by default (that is, if nixpkgs doesn't get
# overridden).
nixpkgs.follows = "nixpkgs-unstable";
# Point the default nixpkgs at one of those.
nixpkgs.follows = "nixpkgs-24_11";

# Also get flake-utils for simplified multi-system definitions.
flake-utils = {
Expand Down

0 comments on commit 3187e00

Please sign in to comment.