python3Packages -> python3.pkgs, to fix cross-compilation errors (especially around geoclue-ols)

2024-06-27 15:46:04 +00:00
parent 9b8c461ce9
commit b3a685aa31
21 changed files with 91 additions and 89 deletions
--- a/hosts/by-name/servo/services/export/sftpgo/default.nix
+++ b/hosts/by-name/servo/services/export/sftpgo/default.nix
@@ -12,7 +12,7 @@ let
  external_auth_hook = pkgs.static-nix-shell.mkPython3 {
    pname = "external_auth_hook";
    srcRoot = ./.;
-    pkgs = [ "python3Packages.passlib" ];
+    pkgs = [ "python3.pkgs.passlib" ];
  };
  # Client initiates a FTP "control connection" on port 21.
  # - this handles the client -> server commands, and the server -> client status, but not the actual data
--- a/hosts/by-name/servo/services/export/sftpgo/external_auth_hook
+++ b/hosts/by-name/servo/services/export/sftpgo/external_auth_hook
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 -p python3Packages.passlib
+#!nix-shell -i python3 -p python3 -p python3.pkgs.passlib
 # vim: set filetype=python :
 #
 # available environment variables:
--- a/hosts/common/programs/assorted.nix
+++ b/hosts/common/programs/assorted.nix
@@ -151,7 +151,7 @@ in
      # "ponymix"
      "pulsemixer"
      "python3-repl"
-      # "python3Packages.eyeD3"  # music tagging
+      # "python3.pkgs.eyeD3"  # music tagging
      "ripgrep"  # needed as a user package so that its user-level config file can be installed
      "rsync"
      "sane-scripts.bittorrent"
--- a/pkgs/additional/depthcharge-tools/default.nix
+++ b/pkgs/additional/depthcharge-tools/default.nix
@@ -1,7 +1,7 @@
 {
  lib,
  fetchFromGitHub,
-  python3Packages,
+  python3,
  stdenv,
 }: stdenv.mkDerivation (finalAttrs: {
  pname = "depthcharge-tools";
@@ -15,17 +15,17 @@
  };

  nativeBuildInputs = [
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
-    python3Packages.wrapPython
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
+    python3.pkgs.wrapPython
  ];

-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
    setuptools  #< needs `pkg_resources` at runtime
  ];

  nativeCheckInputs = [
-    python3Packages.pythonImportsCheckHook
+    python3.pkgs.pythonImportsCheckHook
  ];

  postFixup = ''
--- a/pkgs/additional/fastcluster/default.nix
+++ b/pkgs/additional/fastcluster/default.nix
@@ -1,7 +1,7 @@
 {
  lib,
  fetchFromGitHub,
-  python3Packages,
+  python3,
  stdenv,
 }: stdenv.mkDerivation (finalAttrs: {
  pname = "fastcluster";
@@ -15,17 +15,18 @@
  };

  nativeBuildInputs = [
-    python3Packages.oldest-supported-numpy
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
-    python3Packages.setuptoolsBuildHook
+    python3.pythonOnBuildForHost.pkgs.oldest-supported-numpy
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
+    python3.pkgs.setuptoolsBuildHook
  ];
-  propagatedBuildInputs = with python3Packages; [
+
+  propagatedBuildInputs = with python3.pkgs; [
    numpy
  ];

  nativeCheckInputs = [
-    python3Packages.pythonImportsCheckHook
+    python3.pkgs.pythonImportsCheckHook
  ];

  pythonImportsCheck = [
--- a/pkgs/additional/feedsearch-crawler/default.nix
+++ b/pkgs/additional/feedsearch-crawler/default.nix
@@ -1,7 +1,7 @@
 {
  lib,
  fetchFromGitHub,
-  python3Packages,
+  python3,
  stdenv,
 }:
 stdenv.mkDerivation {
@@ -30,12 +30,12 @@ stdenv.mkDerivation {
  '';

  nativeBuildInputs = [
-    python3Packages.poetry-core
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
+    python3.pkgs.poetry-core
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
  ];

-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
    aiodns
    aiohttp
    beautifulsoup4
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
  ];

  nativeCheckInputs = [
-    python3Packages.pythonImportsCheckHook
+    python3.pkgs.pythonImportsCheckHook
  ];

  pythonImportsCheck = [
--- a/pkgs/additional/geoclue-ols/default.nix
+++ b/pkgs/additional/geoclue-ols/default.nix
@@ -2,7 +2,7 @@
  lib,
  fetchFromGitea,
  fastcluster,
-  python3Packages,
+  python3,
  stdenv,
 }: stdenv.mkDerivation {
  pname = "ols";
@@ -28,7 +28,7 @@
  # };
  # src = /home/colin/ref/repos/tpikonen/ols;

-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
    aiohttp
    fastcluster
    fastjsonschema
@@ -38,13 +38,13 @@
  ];

  nativeBuildInputs = [
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
-    python3Packages.setuptoolsBuildHook
-    python3Packages.wrapPython
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
+    python3.pkgs.setuptoolsBuildHook
+    python3.pkgs.wrapPython
  ];
  nativeCheckInputs = [
-    python3Packages.pythonImportsCheckHook
+    python3.pkgs.pythonImportsCheckHook
  ];

  postFixup = ''
--- a/pkgs/additional/listparser/default.nix
+++ b/pkgs/additional/listparser/default.nix
@@ -2,7 +2,7 @@
  fetchFromGitHub,
  lib,
  nix-update-script,
-  python3Packages,
+  python3,
  stdenv,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -17,19 +17,19 @@ stdenv.mkDerivation (finalAttrs: {
  };

  nativeBuildInputs = [
-    python3Packages.poetry-core
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
+    python3.pkgs.poetry-core
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
  ];

-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
    requests
    lxml
  ];

  nativeCheckInputs = [
-    python3Packages.pytestCheckHook
-    python3Packages.pythonImportsCheckHook
+    python3.pkgs.pytestCheckHook
+    python3.pkgs.pythonImportsCheckHook
  ];

  pythonImportsCheck = [
--- a/pkgs/additional/pa-dlna/default.nix
+++ b/pkgs/additional/pa-dlna/default.nix
@@ -3,7 +3,7 @@
  fetchFromGitLab,
  libpulseaudio,
  pulseaudio,
-  python3Packages,
+  python3,
  stdenv,
 }:

@@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  nativeBuildInputs = [
-    python3Packages.flit-core
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
-    python3Packages.wrapPython
+    python3.pkgs.flit-core
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
+    python3.pkgs.wrapPython
  ];

-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
    psutil
    # `pa-dlna` shells out to `pa-rec` at runtime.
    pulseaudio
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  nativeCheckInputs = [
-    python3Packages.pythonImportsCheckHook
+    python3.pkgs.pythonImportsCheckHook
  ];

  postFixup = ''
--- a/pkgs/additional/pyln-bolt7/default.nix
+++ b/pkgs/additional/pyln-bolt7/default.nix
@@ -2,7 +2,7 @@
 {
  clightning,
  pyln-proto,
-  python3Packages,
+  python3,
  stdenv,
  unzip,
 }:
@@ -20,15 +20,15 @@ stdenv.mkDerivation {
  sourceRoot = "clightning-v${clightning.version}/contrib/pyln-spec/bolt7";

  nativeBuildInputs = [
-    python3Packages.poetry-core
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
+    python3.pkgs.poetry-core
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
    unzip  # used by `unpackPhase`
  ];
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
    pyln-proto
  ];
-  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
+  nativeCheckInputs = [ python3.pkgs.pytestCheckHook ];

  doCheck = true;
  strictDeps = true;
--- a/pkgs/additional/pyln-client/default.nix
+++ b/pkgs/additional/pyln-client/default.nix
@@ -3,7 +3,7 @@
  clightning,
  pyln-bolt7,
  pyln-proto,
-  python3Packages,
+  python3,
  stdenv,
  unzip,
 }:
@@ -15,19 +15,19 @@ stdenv.mkDerivation {
  sourceRoot = "clightning-v${clightning.version}/contrib/pyln-client";

  nativeBuildInputs = [
-    python3Packages.poetry-core
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
+    python3.pkgs.poetry-core
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
    unzip  # used by `unpackPhase`
  ];

-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
    pyln-bolt7
    pyln-proto
  ];

  nativeCheckInputs = [
-    python3Packages.pytestCheckHook
+    python3.pkgs.pytestCheckHook
  ];

  doCheck = true;
--- a/pkgs/additional/pyln-proto/default.nix
+++ b/pkgs/additional/pyln-proto/default.nix
@@ -1,7 +1,7 @@
 # based on: <https://github.com/fort-nix/nix-bitcoin/blob/master/pkgs/python-packages/pyln-proto/default.nix>
 {
  clightning,
-  python3Packages,
+  python3,
  stdenv,
  unzip,
 }:
@@ -22,13 +22,13 @@ stdenv.mkDerivation {
  '';

  nativeBuildInputs = [
-    python3Packages.poetry-core
-    python3Packages.pypaBuildHook
-    python3Packages.pypaInstallHook
+    python3.pkgs.poetry-core
+    python3.pkgs.pypaBuildHook
+    python3.pkgs.pypaInstallHook
    unzip  # used by `unpackPhase`
  ];

-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
    bitstring
    cryptography
    coincurve
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
  ];

  nativeCheckInputs = [
-    python3Packages.pytestCheckHook
+    python3.pkgs.pytestCheckHook
  ];

  doCheck = true;
--- a/pkgs/additional/sane-die-with-parent/default.nix
+++ b/pkgs/additional/sane-die-with-parent/default.nix
@@ -2,5 +2,5 @@
 static-nix-shell.mkPython3 {
  pname = "sane-die-with-parent";
  srcRoot = ./.;
-  pkgs = [ "python3Packages.psutil" ];
+  pkgs = [ "python3.pkgs.psutil" ];
 }
--- a/pkgs/additional/sane-die-with-parent/sane-die-with-parent
+++ b/pkgs/additional/sane-die-with-parent/sane-die-with-parent
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 -p python3Packages.psutil
+#!nix-shell -i python3 -p python3 -p python3.pkgs.psutil
 # vim: set filetype=python :
 """
 USAGE: sane-die-with-parent [options...] <cmd> [args ...]
--- a/pkgs/additional/sane-scripts/default.nix
+++ b/pkgs/additional/sane-scripts/default.nix
@@ -1,9 +1,10 @@
-{ lib
-, python3Packages
-, static-nix-shell
-, stdenv
-, symlinkJoin
-, transmission
+{
+  lib,
+  python3,
+  static-nix-shell,
+  stdenv,
+  symlinkJoin,
+  transmission,
 }:

 let
@@ -16,13 +17,13 @@ let
      src = ./src/lib/bt;

      nativeBuildInputs = [
-        python3Packages.pypaBuildHook
-        python3Packages.pypaInstallHook
-        python3Packages.setuptoolsBuildHook
+        python3.pkgs.pypaBuildHook
+        python3.pkgs.pypaInstallHook
+        python3.pkgs.setuptoolsBuildHook
      ];
      propagatedBuildInputs = [ transmission ];
      nativeCheckInputs = [
-        python3Packages.pythonImportsCheckHook
+        python3.pkgs.pythonImportsCheckHook
      ];

      pythonImportChecks = [
@@ -31,19 +32,19 @@ let
      doCheck = true;
      strictDeps = true;
    };
-    ssdp = python3Packages.buildPythonPackage {
+    ssdp = python3.pkgs.buildPythonPackage {
      pname = "sane-lib-ssdp";
      version = "0.1.0";
      format = "setuptools";
      src = ./src/lib/ssdp;

      nativeBuildInputs = [
-        python3Packages.pypaBuildHook
-        python3Packages.pypaInstallHook
-        python3Packages.setuptoolsBuildHook
+        python3.pkgs.pypaBuildHook
+        python3.pkgs.pypaInstallHook
+        python3.pkgs.setuptoolsBuildHook
      ];
      nativeCheckInputs = [
-        python3Packages.pythonImportsCheckHook
+        python3.pkgs.pythonImportsCheckHook
      ];

      pythonImportChecks = [
@@ -70,7 +71,7 @@ let
    bt-add = static-nix-shell.mkPython3 {
      pname = "sane-bt-add";
      srcRoot = ./src;
-      pkgs = [ "python3Packages.requests" "sane-scripts.lib.bt" ];
+      pkgs = [ "python3.pkgs.requests" "sane-scripts.lib.bt" ];
    };
    bt-rm = static-nix-shell.mkPython3 {
      pname = "sane-bt-rm";
@@ -80,7 +81,7 @@ let
    bt-search = static-nix-shell.mkPython3 {
      pname = "sane-bt-search";
      srcRoot = ./src;
-      pkgs = [ "python3Packages.natsort" "python3Packages.requests" ];
+      pkgs = [ "python3.pkgs.natsort" "python3.pkgs.requests" ];
    };
    bt-show = static-nix-shell.mkPython3 {
      pname = "sane-bt-show";
@@ -110,7 +111,7 @@ let
    ip-check = static-nix-shell.mkPython3 {
      pname = "sane-ip-check";
      srcRoot = ./src;
-      pkgs = [ "miniupnpc" "python3Packages.requests" "sane-scripts.lib.ssdp" ];
+      pkgs = [ "miniupnpc" "python3.pkgs.requests" "sane-scripts.lib.ssdp" ];
    };
    ip-port-forward = static-nix-shell.mkPython3 {
      pname = "sane-ip-port-forward";
@@ -199,12 +200,12 @@ let
    sync-music = static-nix-shell.mkPython3 {
      pname = "sane-sync-music";
      srcRoot = ./src;
-      pkgs = [ "ffmpeg" "python3Packages.unidecode" "sox" ];
+      pkgs = [ "ffmpeg" "python3.pkgs.unidecode" "sox" ];
    };
    tag-music = static-nix-shell.mkPython3 {
      pname = "sane-tag-music";
      srcRoot = ./src;
-      pkgs = [ "python3Packages.mutagen" ];
+      pkgs = [ "python3.pkgs.mutagen" ];
    };
    vpn = static-nix-shell.mkBash {
      pname = "sane-vpn";
--- a/pkgs/additional/sane-scripts/src/sane-bt-add
+++ b/pkgs/additional/sane-scripts/src/sane-bt-add
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 -p python3Packages.requests -p sane-scripts.lib.bt
+#!nix-shell -i python3 -p python3 -p python3.pkgs.requests -p sane-scripts.lib.bt
 # vim: set filetype=python :
 """
 sane-bt-add: instruct servo to download or rename some torrent.
--- a/pkgs/additional/sane-scripts/src/sane-bt-search
+++ b/pkgs/additional/sane-scripts/src/sane-bt-search
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 -p python3Packages.natsort -p python3Packages.requests
+#!nix-shell -i python3 -p python3 -p python3.pkgs.natsort -p python3.pkgs.requests
 # vim: set filetype=python :
 """
 usage: sane-bt-search [options] <query_string>
--- a/pkgs/additional/sane-scripts/src/sane-ip-check
+++ b/pkgs/additional/sane-scripts/src/sane-ip-check
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p miniupnpc -p python3 -p python3Packages.requests -p sane-scripts.lib.ssdp
+#!nix-shell -i python3 -p miniupnpc -p python3 -p python3.pkgs.requests -p sane-scripts.lib.ssdp
 # vim: set filetype=python :
 """
 sane-ip-check: query the IP address of this machine as seen by an external Internet host.
--- a/pkgs/additional/sane-scripts/src/sane-sync-music
+++ b/pkgs/additional/sane-scripts/src/sane-sync-music
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p ffmpeg -p python3 -p python3Packages.unidecode -p sox
+#!nix-shell -i python3 -p ffmpeg -p python3 -p python3.pkgs.unidecode -p sox
 # vim: set filetype=python :
 import argparse
 import concurrent.futures
--- a/pkgs/additional/sane-scripts/src/sane-tag-music
+++ b/pkgs/additional/sane-scripts/src/sane-tag-music
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 -p python3Packages.mutagen
+#!nix-shell -i python3 -p python3 -p python3.pkgs.mutagen
 # vim: set filetype=python :
 #
 # mutagen docs:
--- a/pkgs/additional/static-nix-shell/default.nix
+++ b/pkgs/additional/static-nix-shell/default.nix
@@ -74,7 +74,7 @@ in rec {
      pkgExprs
    );
    # allow any package to be a list of packages, to support things like
-    # -p python3Packages.foo.propagatedBuildInputs
+    # -p python3.pkgs.foo.propagatedBuildInputs
    pkgsEnv' = lib.flatten pkgsEnv;
    doWrap = pkgsEnv' != [];
  in