diff options
author | William A. Kennington III <william@wkennington.com> | 2015-09-04 12:05:11 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-09-04 12:05:11 -0700 |
commit | c6f689f951eb45d9d7ca4a47ca0eeb1949bfe2af (patch) | |
tree | 2cbaf9252e99e1e1a446c7842d37ed688915abb5 /pkgs/tools | |
parent | b68e45dfa7fc642a9eb93009f9611647160eb02a (diff) | |
parent | c985530a25125a587af2a6b4f02f2d1efb83c765 (diff) | |
download | nixlib-c6f689f951eb45d9d7ca4a47ca0eeb1949bfe2af.tar nixlib-c6f689f951eb45d9d7ca4a47ca0eeb1949bfe2af.tar.gz nixlib-c6f689f951eb45d9d7ca4a47ca0eeb1949bfe2af.tar.bz2 nixlib-c6f689f951eb45d9d7ca4a47ca0eeb1949bfe2af.tar.lz nixlib-c6f689f951eb45d9d7ca4a47ca0eeb1949bfe2af.tar.xz nixlib-c6f689f951eb45d9d7ca4a47ca0eeb1949bfe2af.tar.zst nixlib-c6f689f951eb45d9d7ca4a47ca0eeb1949bfe2af.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/ceph/git.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/dhcpcd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/tinc/pre.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 7 |
4 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index c56145069011..a36e29c6f087 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-08-29"; + version = "2015-09-04"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "54626351679fe312d5b96cc0304755ae5f1ece40"; - sha256 = "12rdp1q7arxhg259y08pzix22yjlrjs5qmwv342qcl5xbfkg502r"; + rev = "8c17e0197481205f8726b06d57313ffe08fba2bf"; + sha256 = "189l412m6x0f0mqzhgzwfa3sgm5xfxzb9synlvbfm3n1fgdhj5iy"; }; patches = [ ./fix-pythonpath.patch ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index d9310e2372eb..dfe2de9b96d3 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.9.2"; + name = "dhcpcd-6.9.3"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "0w4aqpn6wczvrffc51lq87acvqwqdskk7948z3sz9laslci29y79"; + sha256 = "0lxfis066ijjlqha2mf49v8mydmnnjb6nijihfn65ylmsqg4g2b0"; }; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 3a89922ca9e5..f7d74b6a39aa 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,15 +1,16 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pre-2015-07-17"; + name = "tinc-1.1pre-2015-07-22"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "f92c3446f2052a59d1e6a28f1bc7cec278cb1e48"; - sha256 = "1y15fk4i6jm9w3qkami2vgp5zfrm5frjxwfmwr4xiw23bmy9cgim"; + rev = "56a8b90d863171d62e0a337b5635fbfc53a67fb0"; + sha256 = "081z4xs5l988g1s0yr7fvnysajd05bx6s54sh84jvq7ij8af71dm"; }; - buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; + buildInputs = [ ncurses readline zlib lzo openssl ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e773b1ff2e10..d193cfa438ed 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -86,13 +86,15 @@ in rec { nix = nixStable; nixStable = common rec { - name = "nix-1.9"; + name = "nix-1.10"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1"; + sha256 = "5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6"; }; }; + nixUnstable = nix; + /* nixUnstable = lib.lowPrio (common rec { name = "nix-1.10pre4212_e12cf82"; src = fetchurl { @@ -100,5 +102,6 @@ in rec { sha256 = "4165db0ea9bb6b5cd96d294348299f20ac045fc18db680104ff98fe9ac893f72"; }; }); + */ } |