nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 21:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238343 from NixOS/backport-238317-to-release-23.05

Browse Source 
[Backport release-23.05] writers.makePythonWriter: fix interpreter executable
This commit is contained in:
Artturi
2023-06-18 07:49:11 +03:00
committed by GitHub
parent e2e2059d19 753445f8f9
commit 194e4cf077
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/writers/default.nix
View File

@@ -264,8 +264,8 @@ let
makeScriptWriter {
interpreter =
if libraries == []
then "${python}/bin/python"
else "${python.withPackages (ps: libraries)}/bin/python"
then python.interpreter
else (python.withPackages (ps: libraries)).interpreter
;
check = optionalString python.isPy3k (writeDash "pythoncheck.sh" ''
exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"

2
pkgs/test/stdenv/hooks.nix
View File

@@ -115,7 +115,7 @@
name = "test-reproducible-builds";
buildCommand = ''
# can't be tested more precisely because the value of random-seed changes depending on the output
[[ $env.NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
[[ $NIX_CFLAGS_COMPILE =~ "-frandom-seed=" ]]
touch $out
'';
};