From 310203565c860f5c9f8074aee85871089a1f234e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 21 Dec 2017 17:53:25 +0100 Subject: wrapPythonPrograms: do not propagate disabling user site-packages to child-processes The `PYTHONNOUSERSITE` was exported to prevent impurities during runtime. The downside of exporting environment variables is that they always propagate all the way down the process tree, unless they are explicitly unset at some point. Using the `-s` argument applies it only to the process executed in the wrapper. That way, subprocesses are free to do impure things. --- pkgs/development/interpreters/python/wrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 01b573e6ad5d..394ea5337d05 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -67,7 +67,7 @@ wrapPythonProgramsIn() { # (see pkgs/build-support/setup-hooks/make-wrapper.sh) local -a wrap_args=("$f" --prefix PATH ':' "$program_PATH" - --set PYTHONNOUSERSITE "true" + --add-flags '-s' ) # Add any additional arguments provided by makeWrapperArgs -- cgit 1.4.1 From e527eb03734ba4aa9188fbce44dbd3c609729225 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jan 2018 11:21:28 +0100 Subject: Revert "wrapPythonPrograms: do not propagate disabling user site-packages to child-processes" This reverts commit 310203565c860f5c9f8074aee85871089a1f234e. See https://github.com/NixOS/nixpkgs/commit/310203565c860f5c9f8074aee85871089a1f234e#commitcomment-26697890 --- pkgs/development/interpreters/python/wrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 394ea5337d05..01b573e6ad5d 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -67,7 +67,7 @@ wrapPythonProgramsIn() { # (see pkgs/build-support/setup-hooks/make-wrapper.sh) local -a wrap_args=("$f" --prefix PATH ':' "$program_PATH" - --add-flags '-s' + --set PYTHONNOUSERSITE "true" ) # Add any additional arguments provided by makeWrapperArgs -- cgit 1.4.1 From c2316114bcc6568bb186f8c4f49eb4e817fedec1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 9 Jan 2018 11:14:48 +0800 Subject: stdenv: Kill off ensureDir --- pkgs/development/interpreters/erlang/R16B02-basho.nix | 2 +- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/stdenv/generic/setup.sh | 10 ---------- pkgs/tools/networking/bud/default.nix | 4 ++-- 4 files changed, 4 insertions(+), 14 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index 33c34f7fecc0..714924514edb 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -36,7 +36,7 @@ mkDerivation rec { tar xf "${manpages}" -C "$out/lib/erlang" for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" + mkdir -p "$out/share/man/''${prefix##*/}" ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" done ''; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ca1a773c4a28..f56d22d7b7ee 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -546,7 +546,7 @@ in "--with-sha1=CommonCrypto" ]; preConfigure = '' - ensureDir $out/Applications + mkdir -p $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices} ''; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index d2c67cce81a2..dbbe45e45f3f 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -188,16 +188,6 @@ addToSearchPath() { addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" } - -ensureDir() { - echo "warning: ‘ensureDir’ is deprecated; use ‘mkdir’ instead" >&2 - local dir - for dir in "$@"; do - if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi - done -} - - # Add $1/lib* into rpaths. # The function is used in multiple-outputs.sh hook, # so it is defined here but tried after the hook. diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index 48ae772e1271..c0383b7c822f 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ python gyp ] ++ lib.optional stdenv.isLinux utillinux; - + buildPhase = '' python ./gyp_bud -f make make -C out ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp out/Release/bud $out/bin ''; -- cgit 1.4.1