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
base: 035b5892457d
Choose a base ref
...
head repository: NixOS/nixpkgs
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
    Configuration menu
    Copy the full SHA
    4199892 View commit details
    Browse the repository at this point in the history

  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
    Configuration menu
    Copy the full SHA
    80d1eaa View commit details
    Browse the repository at this point in the history

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

    @orivej
    orivej committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    74648f7 View commit details
    Browse the repository at this point in the history

  4. makeWrapper: delete --set-eval 

    because --run is good enough.
    @orivej
    orivej committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    fbdc74c View commit details
    Browse the repository at this point in the history

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

    makeWrapper: add --set-default
    @orivej
    orivej committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    eb36534 View commit details
    Browse the repository at this point in the history