MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master.upstream' into staging.upstream

Browse source
This commit is contained in:
William A. Kennington III 2015-11-07 18:53:26 -08:00
commit 5149c03adc
9 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/ldb/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "ldb-1.1.21";
name = "ldb-1.1.23";
src = fetchurl {
url = "mirror://samba/ldb/${name}.tar.gz";
sha256 = "1wfvqys8g3l2gki5xhf5jc50f6k95vdgzb97vvqfls404xzvnyr6";
sha256 = "0ncmwgga6q9v7maiywgw21w6rb3149m1w2ca11yq8k5j0izjz2wg";
};
buildInputs = [

4
pkgs/development/libraries/socket_wrapper/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig }:
stdenv.mkDerivation rec {
name = "socket_wrapper-1.1.4";
name = "socket_wrapper-1.1.5";
src = fetchurl {
url = "mirror://samba/cwrap/${name}.tar.gz";
sha256 = "0ypp7sx5rhn4jpmn5yxgr7mm5kkdcsa76xfnhgsvhagh1naqap2k";
sha256 = "01gn21kbicwfn3vlnnir8c11z2g54b532bj3qrpdrhgrcm3ifi45";
};
nativeBuildInputs = [ cmake pkgconfig ];

8
pkgs/development/libraries/talloc/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "talloc-2.1.3";
name = "talloc-2.1.5";
src = fetchurl {
url = "mirror://samba/talloc/${name}.tar.gz";
sha256 = "1c1c3zs13qyripjwcjpz2hqc3p9p50m5yl95gdrrrvyl49dzg9bs";
sha256 = "1pfx3kmj973hpacfw46fzfnjd7ms1j03ifkc30wk930brx8ffcrq";
};
buildInputs = [
@ -24,10 +24,6 @@ stdenv.mkDerivation rec {
"--builtin-libraries=replace"
];
postInstall = ''
ar qf $out/lib/libtalloc.a bin/default/talloc_5.o
'';
meta = with stdenv.lib; {
description = "Hierarchical pool based memory allocator with destructors";
homepage = http://tdb.samba.org/;

4
pkgs/development/libraries/tdb/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "tdb-1.3.7";
name = "tdb-1.3.8";
src = fetchurl {
url = "mirror://samba/tdb/${name}.tar.gz";
sha256 = "04k42cjvjc5wsqsqf44397hclq3nxlm9avjcsbz2hsn01k59akd6";
sha256 = "1cg6gmpgn36dd4bsp3j9k3hyrm87d8hdigqyyqxw5jga4w2aq186";
};
buildInputs = [

4
pkgs/development/libraries/tevent/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "tevent-0.9.25";
name = "tevent-0.9.26";
src = fetchurl {
url = "mirror://samba/tevent/${name}.tar.gz";
sha256 = "0sf694bdp2l6s48gmr8hxlcpdmjbwhr9ph1faqxmkcqibbav1ppy";
sha256 = "1gbh6d2m49j1v2hkaiyrh8bj02i5wxd4hqayzk2g44yyivbi8b16";
};
buildInputs = [

4
pkgs/development/libraries/uid_wrapper/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig }:
stdenv.mkDerivation rec {
name = "uid_wrapper-1.1.1";
name = "uid_wrapper-1.2.0";
src = fetchurl {
url = "mirror://samba/cwrap/${name}.tar.gz";
sha256 = "0y033cjs0kwmpx70xc4wh789vk9rw6bziizs28h50ad7lyyvx5b9";
sha256 = "0sfznk53kmz9m3rxwbv4pwwqs4bw3kr917y4n53h5jaxjym0m4c0";
};
nativeBuildInputs = [ cmake pkgconfig ];

4
pkgs/os-specific/linux/ipset/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
name = "ipset-6.26";
name = "ipset-6.27";
src = fetchurl {
url = "http://ipset.netfilter.org/${name}.tar.bz2";
sha256 = "0lbsg1fbiw9m959lgqziyivmx32z3vbnp3jhgnprkq31ia7a29kn";
sha256 = "0ddj66wr0xh9v6ks430l8r80lj2s9qc44d9c2ik48lwm0fl9fj3j";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/tools/filesystems/btrfsprogs/default.nix
View file

@ -2,14 +2,14 @@
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
let version = "4.2.3"; in
let version = "4.3"; in
stdenv.mkDerivation rec {
name = "btrfs-progs-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
sha256 = "0gpknqvnpl4y78fsfak3iv147czc0rak8fbcg0d9krr50wzd3hf3";
sha256 = "1755bjysbw7m2zgzp0jyr03x2vrnxvzdh8wvzmqqgmg97ngv4rxb";
};
buildInputs = [

4
pkgs/tools/misc/man-db/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }:
stdenv.mkDerivation rec {
name = "man-db-2.7.3";
name = "man-db-2.7.5";
src = fetchurl {
url = "mirror://savannah/man-db/${name}.tar.xz";
sha256 = "1shl07w3251ih6g6zx3xa3p1193difxwdz4ysnmff1v0jp4l8iwx";
sha256 = "056a3il7agfazac12yggcg4gf412yq34k065im0cpfxbcw6xskaw";
};
buildInputs = [ pkgconfig libpipeline db groff ];