Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4d0a22db7f60
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2ba2f91a7fdc
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 3, 2018

  1. nix-prefetch-git: needs findutils as it depends on find/xargs 

    (cherry picked from commit 66d6e84)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Sep 3, 2018
    Copy the full SHA
    e62269f View commit details

  2. 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.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    102e016 View commit details

  3. 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
    Copy the full SHA
    efe9acb View commit details

  4. knot-dns: 2.7.1 -> 2.7.2 

    https://lists.nic.cz/pipermail/knot-dns-users/2018-August/001423.html
(cherry picked from commit 0a5b8ef)
    @vcunat
    vcunat committed Sep 3, 2018
    Copy the full SHA
    2ba2f91 View commit details
Showing with 13 additions and 13 deletions.
  1. +6 −6 lib/trivial.nix
  2. +2 −2 pkgs/servers/dns/knot-dns/default.nix
  3. +2 −2 pkgs/tools/package-management/nix-prefetch-scripts/default.nix
  4. +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);
4 changes: 2 additions & 2 deletions pkgs/servers/dns/knot-dns/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
# Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec {
name = "knot-dns-${version}";
version = "2.7.1";
version = "2.7.2";

src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "7d6ae20ada0f0ee7700d5df17f47f86b49eb21ee34977d0d70de6a0947371381";
sha256 = "cb70b2ee1c7ecbaad8774a1e0c449a68c6a6f7c9d60595524f003201d6e38431";
};

outputs = [ "bin" "out" "dev" ];
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix-prefetch-scripts/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, makeWrapper, buildEnv,
git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix
git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix, findutils
}:

let mkPrefetchScript = tool: src: deps:
@@ -28,7 +28,7 @@ let mkPrefetchScript = tool: src: deps:
in rec {
nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ];
nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ];
nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils ];
nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils findutils ];
nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [ mercurial ];
nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ];

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