Allow overriding which Python version is used when building the Opsqueue Python library

Author: Qqwy

default.nix

@@ -4,7 +4,7 @@
 let
   pkgs = import ./nix/nixpkgs-pinned.nix { };
 
-  pythonEnv = pkgs.pythonChannable.withPackages (
+  pythonEnv = pkgs.python.withPackages (
     p: with p; [
       click
       mypy

justfile

@@ -89,15 +89,15 @@ mypy:
 
 # Build Nix-derivations of binary and all libraries (release profile)
 [group('nix')]
-nix-build: (_nix-build "opsqueue" "pythonChannable.pkgs.opsqueue_python")
+nix-build: (_nix-build "opsqueue" "python.pkgs.opsqueue_python")
 
 # Build Nix-derivation of binary (release profile)
 [group('nix')]
 nix-build-bin: (_nix-build "opsqueue")
 
 # Build Nix-derivation of Python client library (release profile)
 [group('nix')]
-nix-build-python: (_nix-build "pythonChannable.pkgs.opsqueue_python")
+nix-build-python: (_nix-build "python.pkgs.opsqueue_python")
 
 _nix-build +TARGETS:
   nix build --file nix/nixpkgs-pinned.nix --print-out-paths --print-build-logs --no-link --option sandbox true {{TARGETS}}

nix/overlay.nix

@@ -8,28 +8,18 @@ let
   # as we use when _not_ using Nix.
   #
   # When using opsqueue as part of your own Nix derivations,
-  # be sure to use an overlay to set `rustPlatform`
+  # be sure to use an overlay to set `rustToolchain`
   # to the desired Rust version
   # if you want to use a different version from the default.
   rustToolchain = final.rust-bin.fromRustupToolchainFile ../rust-toolchain.toml;
-  rustPlatform = prev.makeRustPlatform {
-    rustc = rustToolchain;
-    cargo = rustToolchain;
-  };
 
   crane = import sources.crane { pkgs = final; };
   craneLib = crane.overrideToolchain (pkgs: rustToolchain);
 in
 {
-  # inherit naersk;
   inherit rustToolchain;
   opsqueue = final.callPackage ../opsqueue/opsqueue.nix { };
 
-  # The explicit choice is made not to override `python312`, as this will cause a rebuild of many
-  # packages when nixpkgs uses python 3.12 as default python environment.
-  # These packages should not be affected, e.g. cachix. This is because of a transitive
-  # dependency on the Python packages that we override.
-  # In our case cachix > ghc > shpinx > Python libraries.
-  pythonChannable = prev.python312.override { packageOverrides = pythonOverlay; };
+  python = prev.python312.override { packageOverrides = pythonOverlay; };
 
 }

nix/sources.json

@@ -11,18 +11,6 @@
         "url": "https://github.com/ipetkov/crane/archive/0bda7e7d005ccb5522a76d11ccfbf562b71953ca.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "naersk": {
-        "branch": "master",
-        "description": "Build Rust projects in Nix - no configuration, no code generation, no IFD, sandbox friendly.",
-        "homepage": "",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "8d97452673640eb7fabe428e8b6a425bc355008b",
-        "sha256": "0sgs8dh8yw62dzpd0mm6byf2q4vwqab3r0i62qy52las85f4p1qw",
-        "type": "tarball",
-        "url": "https://github.com/nix-community/naersk/archive/8d97452673640eb7fabe428e8b6a425bc355008b.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "nixpkgs": {
         "branch": "nixpkgs-unstable",
         "description": "Nix Packages collection",

opsqueue/opsqueue.nix

@@ -10,7 +10,7 @@
   useNextest ? false, # Disabled for now. Re-enable as part of https://github.com/channable/opsqueue/issues/81
   perl,
   git,
-  python312,
+  python,
 }:
 let
   sources = import ../nix/sources.nix;
@@ -32,7 +32,7 @@ let
   commonArgs = {
     inherit src version pname;
     strictDeps = true;
-    nativeBuildInputs = [ python312 ];
+    nativeBuildInputs = [ python ];
   };
   cargoArtifacts = craneLib.buildDepsOnly commonArgs;
 in