aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/interpreters/python
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters/python')
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/hooks/default.nix4
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/hooks/flit-build-hook.sh4
-rw-r--r--nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh2
4 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix
index bab7a047b15..86616cc8890 100644
--- a/nixpkgs/pkgs/development/interpreters/python/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/default.nix
@@ -104,9 +104,9 @@ in {
major = "3";
minor = "8";
patch = "0";
- suffix = "b3";
+ suffix = "rc1";
};
- sha256 = "03wq85pkpr9j56k3zg6whahc5park1pzshbakl7y50lzrkpq2ynd";
+ sha256 = "08d8j3dsv6yz5zxkqvsa71scxjjzdwarfk6hsjfhaw2xrxndyi5f";
inherit (darwin) CF configd;
inherit passthruFun;
};
diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix b/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix
index 3a4b4a0ccad..861cb38c060 100644
--- a/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/default.nix
@@ -20,10 +20,10 @@ in rec {
};
} ./flit-build-hook.sh) {};
- pipBuildHook = callPackage ({ pip }:
+ pipBuildHook = callPackage ({ pip, wheel }:
makeSetupHook {
name = "pip-build-hook.sh";
- deps = [ pip ];
+ deps = [ pip wheel ];
substitutions = {
inherit pythonInterpreter pythonSitePackages;
};
diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
index faa3f6e3075..48295dc3643 100644
--- a/nixpkgs/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
@@ -3,9 +3,9 @@ echo "Sourcing flit-build-hook"
flitBuildPhase () {
echo "Executing flitBuildPhase"
- preBuild
+ runHook preBuild
@pythonInterpreter@ -m flit build --format wheel
- postBuild
+ runHook postBuild
echo "Finished executing flitBuildPhase"
}
diff --git a/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
index 6796d3efd0a..c297bfffb1e 100644
--- a/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
+++ b/nixpkgs/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
@@ -7,7 +7,7 @@ pipBuildPhase() {
mkdir -p dist
echo "Creating a wheel..."
- @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist "$options" .
+ @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
echo "Finished creating a wheel..."
runHook postBuild