From 3187e00735cb7146d956a6644bb304d8f57bb895 Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Thu, 5 Dec 2024 11:22:00 +0100 Subject: [PATCH] Update nixpkgs to 24.11, drop test for python39 but add python312 Co-authored-by: Florian Sesser Signed-off-by: Benoit Donneaux --- .circleci/config.yml | 11 ++++---- flake.lock | 60 ++++++++++---------------------------------- flake.nix | 21 +++------------- 3 files changed, 23 insertions(+), 69 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dfa95456d..bf18f1f89 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -93,14 +93,15 @@ workflows: {} - "nixos": - name: "<>" - nixpkgs: "nixpkgs-unstable" + name: "<>-<>" matrix: parameters: + nixpkgs: + - "nixpkgs-24_11" pythonVersion: - - "python39" - "python310" - "python311" + - "python312" # Eventually, test against PyPy 3.8 #- "pypy27-buster": @@ -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 ` forms. @@ -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" diff --git a/flake.lock b/flake.lock index b7b74a0e4..cd383b229 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -21,11 +21,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -34,50 +34,18 @@ "type": "github" } }, - "nixpkgs-22_11": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1689885880, - "narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1689791806, - "narHash": "sha256-QpXjfiyBFwa7MV/J6nM5FoBreks9O7j9cAZxV22MR8A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "439ba0789ff84dddea64eb2d47a4a0d4887dbb1f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "pull/244135/head", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -87,11 +55,9 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs-24_11" ], - "nixpkgs-22_11": "nixpkgs-22_11", - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-24_11": "nixpkgs-24_11" } }, "systems": { diff --git a/flake.nix b/flake.nix index 44000c9ab..8a2d3c326 100644 --- a/flake.nix +++ b/flake.nix @@ -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; + "nixpkgs-24_11" = { + url = github:NixOS/nixpkgs?ref=nixos-24.11; }; - # 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; - }; - - # 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 = {