Merge pull request #61 from hacklschorsch/update-2024-11

Update 2024-11
LeastAuthority · Nov 5, 2024 · 78d0652 · 78d0652
2 parents b6fed3b + 137d5cd
commit 78d0652
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 35 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,9 +7,9 @@ executors:
   manylinux-2014-x86_64:
     docker:
       - image: "quay.io/pypa/manylinux2014_x86_64"
-  manylinux_2_24-x86_64:
+  manylinux_2_28-x86_64:
     docker:
-      - image: "quay.io/pypa/manylinux_2_24_x86_64"
+      - image: "quay.io/pypa/manylinux_2_28_x86_64"
 
 # Define some custom commands that we can use as elements of `steps` in job
 # definitions.
@@ -270,6 +270,7 @@ jobs:
 
       - run:
           name: "Cross-Build"
+          no_output_timeout: 30m
           command: |
             source .circleci/lib.sh
             cache_if_able nix build \
@@ -301,9 +302,10 @@ workflows:
           matrix:
             parameters:
               python-version:
-                - "python38"
                 - "python39"
                 - "python310"
+                - "python311"
+                - "python312"
 
       - "package-manylinux":
           name: "package-manylinux-2014_x86_64"
@@ -329,10 +331,9 @@ workflows:
               only: "/v.*/"
 
       - "package-manylinux":
-          name: "package-manylinux_2_24-x86_64"
-          executor: "manylinux_2_24-x86_64"
-          # Similar to the manylinux-2014_x86_64 case.
-          pre-command: "apt-get update -y && apt-get install -y openssh-client"
+          name: "package-manylinux_2_28-x86_64"
+          executor: "manylinux_2_28-x86_64"
+          pre-command: "yum install -y openssh-clients"
           python: "/opt/python/cp37-cp37m/bin/python"
           # The other one can upload the sdist.
           upload-sdist: false
@@ -344,11 +345,13 @@ workflows:
             parameters:
               # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
               xcode-version:
-                # Latest macOS 10.15.x
-                - "11.7.0"
-                # Latest macOS 11.x
-                - "13.2.1"
-                # A macOS 12.x
-                - "14.1.0"
+                # macOS 12.6.1 with xcode...
+                - "13.4.1"
+                # macOS 13.2.1 with xcode...
+                - "14.3.1"
+                # macOS 14.3.1 with xcode...
+                - "15.4.0"
+                # macOS 14.6.1 with xcode...
+                - "16.1.0"
           filters:
             <<: *FILTERS
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs?ref=nixos-22.11";
+      url = "github:nixos/nixpkgs?ref=nixos-24.05";
     };
 
     # The source repository for the crate we're building.
@@ -78,9 +78,10 @@
               src = libchallenge_bypass_ristretto_ffi-src;
             };
 
-          python38-challenge-bypass-ristretto = py-module pkgs.python38.pkgs;
           python39-challenge-bypass-ristretto = py-module pkgs.python39.pkgs;
           python310-challenge-bypass-ristretto = py-module pkgs.python310.pkgs;
+          python311-challenge-bypass-ristretto = py-module pkgs.python311.pkgs;
+          python312-challenge-bypass-ristretto = py-module pkgs.python312.pkgs;
         };
 
         # Define our cross-compiled packages.  This currently does not include
@@ -109,9 +110,10 @@
           in {
             # Run a little integration test that exercises the underlying
             # library via the Python interface.
-            integration38 = integration pkgs.python38;
             integration39 = integration pkgs.python39;
             integration310 = integration pkgs.python310;
+            integration311 = integration pkgs.python311;
+            integration312 = integration pkgs.python312;
 
             # The library should have the correct soname.
             soname = pkgs.runCommand "${lib.name}-soname" { } ''

diff --git a/nix/libchallenge-bypass-ristretto-ffi.nix b/nix/libchallenge-bypass-ristretto-ffi.nix
@@ -105,7 +105,7 @@ let
   #
   #  toEnvVar "aarch64-linux-android" = "AARCH64_LINUX_ANDROID"
   #
-  toEnvVar = s: lib.replaceChars ["-"] ["_"] (lib.toUpper s);
+  toEnvVar = s: lib.replaceStrings ["-"] ["_"] (lib.toUpper s);
 
   # Assemble a Rust build toolchain that can build for the "target" system.
   toolchain = with fenix; combine [
@@ -168,7 +168,7 @@ EOF
 
   # Then we can preserve the name we gave it in the past (kind of carelessly)
   # with underscores instead of dashes.
-  libname = "${lib.replaceChars ["-"] ["_"] pname}";
+  libname = "${lib.replaceStrings ["-"] ["_"] pname}";
 
   # The linker that is correct to use for the host system.  This is only used
   # for cross-compilation at the moment, since I don't know the correct value

diff --git a/nix/python-challenge-bypass-ristretto.nix b/nix/python-challenge-bypass-ristretto.nix
@@ -2,7 +2,7 @@
 # Ristretto implementation.
 { libchallenge_bypass_ristretto_ffi, python, pythonPackages, milksnake, cffi, attrs, testtools, hypothesis }:
 pythonPackages.buildPythonPackage rec {
-  version = "2023.1.23";
+  version = "2024.11.5";
   pname = "python-challenge-bypass-ristretto";
   name = "${pname}-${version}";
   src = ../.;