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: e62269f3c895
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: efe9acb17f19
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 3, 2018

  1. lib/trivial.nix: fix missing parens 

    Broken in 62dca7c; the tricky thing is that it depends on nix version.

(cherry picked from commit 608730a)
    @vcunat
    vcunat committed Sep 3, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    lforst Luca Forstner
    SSH Key Fingerprint: ljpBJ7bYHpwPGV7Y7sJZM+cMS44wfy1fkQqwY/900Nw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    102e016 View commit details

  2. tarball job: more --show-trace 

    Without that I couldn't well do the parent commit.

(cherry picked from commit 8d7439e)
    @vcunat
    vcunat committed Sep 3, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    lforst Luca Forstner
    SSH Key Fingerprint: ljpBJ7bYHpwPGV7Y7sJZM+cMS44wfy1fkQqwY/900Nw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    efe9acb View commit details
Showing with 9 additions and 9 deletions.
  1. +6 −6 lib/trivial.nix
  2. +3 −3 pkgs/top-level/make-tarball.nix
12 changes: 6 additions & 6 deletions lib/trivial.nix
View file
Original file line number Diff line number Diff line change
@@ -36,18 +36,18 @@ rec {

/* bitwise “and” */
bitAnd = builtins.bitAnd
or import ./zip-int-bits.nix
(a: b: if a==1 && b==1 then 1 else 0);
or (import ./zip-int-bits.nix
(a: b: if a==1 && b==1 then 1 else 0));

/* bitwise “or” */
bitOr = builtins.bitOr
or import ./zip-int-bits.nix
(a: b: if a==1 || b==1 then 1 else 0);
or (import ./zip-int-bits.nix
(a: b: if a==1 || b==1 then 1 else 0));

/* bitwise “xor” */
bitXor = builtins.bitXor
or import ./zip-int-bits.nix
(a: b: if a!=b then 1 else 0);
or (import ./zip-int-bits.nix
(a: b: if a!=b then 1 else 0));

/* bitwise “not” */
bitNot = builtins.sub (-1);
6 changes: 3 additions & 3 deletions pkgs/top-level/make-tarball.nix
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ releaseTools.sourceTarball rec {
mkdir $TMPDIR/foo
ln -s $(readlink -f .) $TMPDIR/foo/bar
p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace)
p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox)
p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace)
if [ "$p1" != "$p2" ]; then
echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
exit 1
@@ -63,9 +63,9 @@ releaseTools.sourceTarball rec {
# Run the regression tests in `lib'.
if
# `set -e` doesn't work inside here, so need to && instead :(
res="$(nix-instantiate --eval --strict lib/tests/misc.nix)" \
res="$(nix-instantiate --eval --strict lib/tests/misc.nix --show-trace)" \
&& [[ "$res" == "[ ]" ]] \
&& res="$(nix-instantiate --eval --strict lib/tests/systems.nix)" \
&& res="$(nix-instantiate --eval --strict lib/tests/systems.nix --show-trace)" \
&& [[ "$res" == "[ ]" ]]
then
true