Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 035b5892457d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb3653482008
Choose a head ref
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on Nov 17, 2017

  1. makeWrapper: add --set-default and --set-eval 

    After #31497 starter quoting all values, there arouse the need to left some
values evaluated.

`--set-default var value` expands to `export var=${var-value}`, where value is
not evaluated and literally assigned to var unless it is already set.

`--set-eval var value` expands to `export var=$(eval echo value)`, where value
is evaluated by `eval`.
    @orivej
    orivej committed Nov 17, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4199892 View commit details

  2. mesos: do not use makeWrapper with bash from bootstrap tools 

    It is too old and does not support required features. The error is:

/nix/store/...-hook/nix-support/setup-hook: line 78: export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName: bad substitution
    @orivej
    orivej committed Nov 17, 2017
    Copy the full SHA
    80d1eaa View commit details

  3. treewide: use --set-default and --set-eval where appropriate

    @orivej
    orivej committed Nov 17, 2017
    Copy the full SHA
    74648f7 View commit details

  4. makeWrapper: delete --set-eval 

    because --run is good enough.
    @orivej
    orivej committed Nov 17, 2017
    Copy the full SHA
    fbdc74c View commit details

  5. Merge pull request #31767 from orivej/make-wrapper 

    makeWrapper: add --set-default
    @orivej
    orivej authored Nov 17, 2017
    Copy the full SHA
    eb36534 View commit details
2 changes: 2 additions & 0 deletions pkgs/applications/networking/cluster/mesos/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@ let
# src/common/command_utils.cpp
# https://github.com/NixOS/nixpkgs/issues/13783
tarWithGzip = lib.overrideDerivation gnutar (oldAttrs: {
# Original builder is bash 4.3.42 from bootstrap tools, too old for makeWrapper.
builder = "${bash}/bin/bash";
buildInputs = (oldAttrs.buildInputs or []) ++ [ makeWrapper ];
postInstall = (oldAttrs.postInstall or "") + ''
wrapProgram $out/bin/tar --prefix PATH ":" "${gzip}/bin"
5 changes: 5 additions & 0 deletions pkgs/build-support/setup-hooks/make-wrapper.sh
View file
Original file line number Diff line number Diff line change
@@ -48,6 +48,11 @@ makeWrapper() {
value="${params[$((n + 2))]}"
n=$((n + 2))
echo "export $varName=${value@Q}" >> "$wrapper"
elif [[ "$p" == "--set-default" ]]; then
varName="${params[$((n + 1))]}"
value="${params[$((n + 2))]}"
n=$((n + 2))
echo "export $varName=\${$varName-${value@Q}}" >> "$wrapper"
elif [[ "$p" == "--unset" ]]; then
varName="${params[$((n + 1))]}"
n=$((n + 1))
2 changes: 1 addition & 1 deletion pkgs/development/compilers/dmd/2.067.1.nix
View file
Original file line number Diff line number Diff line change
@@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/dmd \
--prefix PATH ":" "${stdenv.cc}/bin" \
--set CC "$""{CC:-$CC""}"
--set-default CC "$CC"
cd $out/bin
tee dmd.conf << EOF
2 changes: 1 addition & 1 deletion pkgs/development/compilers/dmd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/dmd \
--prefix PATH ":" "${stdenv.cc}/bin" \
--set CC "$""{CC:-$CC""}"
--set-default CC "$CC"
cd $out/bin
tee dmd.conf << EOF
2 changes: 1 addition & 1 deletion pkgs/misc/emulators/retrofe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/bin/retrofe" \
--prefix GST_PLUGIN_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--set RETROFE_PATH "\''${RETROFE_PATH:-\$PWD}"
--run 'export RETROFE_PATH=''${RETROFE_PATH:-$PWD}'
'';

meta = with stdenv.lib; {
2 changes: 1 addition & 1 deletion pkgs/servers/nosql/apache-jena/fuseki-binary.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
for i in "$out"/bin/*; do
wrapProgram "$i" \
--prefix "PATH" : "${java}/bin/" \
--set "FUSEKI_HOME" '"''${FUSEKI_HOME:-'"$out"'}"' \
--set-default "FUSEKI_HOME" "$out" \
;
done
'';
4 changes: 2 additions & 2 deletions pkgs/tools/text/popfile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,8 +44,8 @@ stdenv.mkDerivation rec {
wrapProgram "$path" \
--prefix PERL5LIB : $PERL5LIB:$out/bin \
--set POPFILE_ROOT $out/bin \
--set POPFILE_USER \$\{POPFILE_USER:-\$HOME/.popfile\} \
--run "test -d \$POPFILE_USER || mkdir -m 0700 -p \$POPFILE_USER"
--run 'export POPFILE_USER=''${POPFILE_USER:-$HOME/.popfile}' \
--run 'test -d "$POPFILE_USER" || mkdir -m 0700 -p "$POPFILE_USER"'
done
'';