public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging into closure-size

Browse Source 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
Vladimír Čunát
2015-11-20 14:32:58 +01:00
parent bdbbfa0d42 b809f886c0
commit 333d69a5f0
1278 changed files with 105731 additions and 30012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/ansible/default.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }:
pythonPackages.buildPythonPackage rec {
version = "1.9.3";
version = "1.9.4";
name = "ansible-${version}";
namePrefix = "";
src = fetchurl {
url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz";
sha256 = "1vgfsjqb5gbs30ymqgq3q2kxzn3fvh8680n14yj5c040zm1gd515";
url = "https://releases.ansible.com/ansible/${name}.tar.gz";
sha256 = "1qvgzb66nlyc2ncmgmqhzdk0x0p2px09967p1yypf5czwjn2yb4p";
};
prePatch = ''
pkgs/tools/system/bootchart/default.nix
+10 -20
View File
@@ -1,31 +1,21 @@
{stdenv, fetchurl, gnutar, gzip, coreutils, utillinux, gnugrep, gnused, psmisc, nettools}:
{stdenv, fetchurl, lib, pkgconfig, glib, gtk, python27, pythonPackages }:
stdenv.mkDerivation rec {
name = "bootchart-0.9";
version = "0.14.7";
name = "bootchart-${version}";
src = fetchurl {
url = "mirror://sourceforge/bootchart/${name}.tar.bz2";
sha256 = "0z9jvi7cyp3hpx6hf1fyaa8fhnaz7aqid8wrkwp29cngryg3jf3p";
url = "https://github.com/mmeeks/bootchart/archive/${version}.tar.gz";
sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
};
buildInputs = [ gnutar gzip coreutils utillinux gnugrep gnused psmisc nettools ];
patchPhase = ''
export MYPATH=
for i in $buildInputs; do
export MYPATH=''${MYPATH}''${MYPATH:+:}$i/bin:$i/sbin
done
sed -i -e 's,PATH.*,PATH='$MYPATH, \
-e 's,^CONF.*,CONF='$out/etc/bootchartd.conf, \
script/bootchartd
'';
buildInputs = [ pkgconfig glib gtk python27 pythonPackages.wrapPython pythonPackages.pygtk ];
pythonPath = with pythonPackages; [ pygtk pycairo ];
installPhase = ''
mkdir -p $out/sbin $out/etc
cp script/bootchartd $out/sbin
cp script/bootchartd.conf $out/etc
chmod +x $out/sbin/bootchartd
make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/python2.7
wrapProgram $out/bin/pybootchartgui \
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
'';
meta = with stdenv.lib; {
pkgs/tools/system/collectd/default.nix
+14 -6
View File
@@ -3,6 +3,8 @@
, pkgconfig ? null # most of the extra deps need pkgconfig to be found
, curl ? null
, iptables ? null
, jdk ? null
, libatasmart ? null
, libcredis ? null
, libdbi ? null
, libgcrypt ? null
@@ -14,34 +16,40 @@
, libsigrok ? null
, libvirt ? null
, libxml2 ? null
, libtool ? null
, lm_sensors ? null
, lvm2 ? null
, mysql ? null
, postgresql ? null
, protobufc ? null
, python ? null
, rabbitmq-c ? null
, riemann ? null
, rrdtool ? null
, udev ? null
, varnish ? null
, yajl ? null
}:
stdenv.mkDerivation rec {
name = "collectd-5.4.2";
name = "collectd-5.5.0";
src = fetchurl {
url = "http://collectd.org/files/${name}.tar.bz2";
sha256 = "14z3qkqbmfjvqvcb2v17480f7c8j7wa49myk0zlxpd9qq40fk2cp";
sha256 = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88";
};
buildInputs = [
pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl
libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool
varnish yajl
varnish yajl jdk libtool python udev
];
# for some reason libsigrok isn't auto-detected
configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok";
configureFlags =
stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
pkgs/tools/system/dd_rescue/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoconf }:
stdenv.mkDerivation rec {
version = "1.98";
version = "1.99";
name = "dd_rescue-${version}";
src = fetchurl {
sha256 = "14lf2pv52sr16977qjq1rsr42rfd3ywsss2xw9svgaa14g49ss6b";
sha256 = "0gkbwssn134fjyyvjvylyvassw4fwv5mbis9gcb969xdc64dfhg1";
url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
};
pkgs/tools/system/di/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "di-4.35";
name = "di-4.36";
src = fetchurl {
url = "http://gentoo.com/di/${name}.tar.gz";
sha256 = "1lkiggvdm6wi14xy8845w6mqqr50j2q7g0i2rdcs7qw5gb7gmprc";
sha256 = "11kd9jawpkir6qwjciis9l5fdvgbp9yndcv4rg6k3x9x1and40zb";
};
makeFlags = "INSTALL_DIR=$(out)";
pkgs/tools/system/fakeroot/default.nix
+6 -5
View File
@@ -1,14 +1,15 @@
{stdenv, fetchurl, utillinux}:
{ stdenv, fetchurl, utillinux, libcap }:
stdenv.mkDerivation rec {
name = "fakeroot-1.18.4";
version = "1.20.2";
name = "fakeroot-${version}";
src = fetchurl {
url = https://launchpad.net/ubuntu/+archive/primary/+files/fakeroot_1.18.4.orig.tar.bz2;
sha256 = "18mydrz49n7ic7147pikkpdb96x00s9wisdk6hrc75ll7vx9wd8a";
url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.bz2";
sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw";
};
buildInputs = [ utillinux /* provides getopt */ ];
buildInputs = [ utillinux /* provides getopt */ libcap ];
postUnpack = ''
for prog in getopt; do
pkgs/tools/system/fio/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libaio, python, zlib }:
let version = "2.2.10"; in
let version = "2.2.11"; in
stdenv.mkDerivation rec {
name = "fio-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
sha256 = "0hg72k8cifw6lc46kyiic7ai4gqn2819d6g998vmx01jnlcixp8q";
sha256 = "0g26xvbb60f96ks8q7jpap0xc2grb5j5w4m4glz910ndgf0s45wm";
};
buildInputs = [ libaio python zlib ];
pkgs/tools/system/gptfdisk/default.nix
+23 -9
View File
@@ -1,13 +1,28 @@
{ fetchurl, stdenv, libuuid, popt, icu, ncurses }:
let version = "1.0.1"; in
stdenv.mkDerivation rec {
name = "gptfdisk-1.0.0";
name = "gptfdisk-${version}";
src = fetchurl {
# http://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
# page clearly implies a preference for using SourceForge's bandwidth:
url = "mirror://sourceforge/gptfdisk/${name}.tar.gz";
sha256 = "0v0xl0mzwabdf9yisgsvkhpyi48kbik35c6df42gr6d78dkrarjv";
sha256 = "1izazbyv5n2d81qdym77i8mg9m870hiydmq4d0s51npx5vp8lk46";
};
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.mac --replace \
"-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6"
substituteInPlace Makefile.mac --replace \
" -arch i386" ""
substituteInPlace Makefile.mac --replace \
" -I/opt/local/include -I /usr/local/include -I/opt/local/include" ""
substituteInPlace Makefile.mac --replace \
"/opt/local/lib/libncurses.a" "${ncurses}/lib/libncurses.dylib"
'';
buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac";
buildInputs = [ libuuid popt icu ncurses ];
installPhase = ''
@@ -20,13 +35,12 @@ stdenv.mkDerivation rec {
done
'';
meta = {
description = "A set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
license = stdenv.lib.licenses.gpl2;
meta = with stdenv.lib; {
inherit version;
description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
license = licenses.gpl2;
homepage = http://www.rodsbooks.com/gdisk/;
platforms = stdenv.lib.platforms.linux;
maintainers = with maintainers; [ nckx ];
platforms = platforms.all;
};
}
pkgs/tools/system/iops/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://www.vanheusden.com/iops/;
license = licenses.gpl2;
maintainers = with maintainers; davidak;
platforms = with platforms; unix;
platforms = with platforms; linux; # build problems on Darwin
};
}
pkgs/tools/system/rsyslog/default.nix
+3 -3
View File
@@ -11,14 +11,14 @@ let
mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in
stdenv.mkDerivation rec {
name = "rsyslog-8.12.0";
name = "rsyslog-8.14.0";
src = fetchurl {
url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
sha256 = "083yrgv7s5j7pfbk254lav15yyxsk04qhachxghrvs4nhangwss6";
sha256 = "1hp7ga543m6vhijcnjb4z8v26ddjgypk1lh6km1cvxc45cfmnfs4";
};
patches = [ ./fix-gnutls-detection.patch ];
#patches = [ ./fix-gnutls-detection.patch ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
pkgs/tools/system/s6-rc/default.nix
+42
View File
@@ -0,0 +1,42 @@
{ stdenv, execline, fetchgit, skalibs, s6 }:
let
version = "0.0.1.0";
in stdenv.mkDerivation rec {
name = "s6-rc-${version}";
src = fetchgit {
url = "git://git.skarnet.org/s6-rc";
rev = "refs/tags/v${version}";
sha256 = "02ppsda8pg7mph3r7lrh7dhi6ip99bgghsl3lf902cg9i4n50q6q";
};
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-include=${execline}/include"
"--with-include=${s6}/include"
"--with-lib=${skalibs}/lib"
"--with-lib=${execline}/lib"
"--with-lib=${s6}/lib/s6"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
"--with-dynlib=${s6}/lib"
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
meta = {
homepage = http://skarnet.org/software/s6-rc/;
description = "a service manager for s6-based systems";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ pmahoney ];
};
}
pkgs/tools/system/s6/default.nix
+44
View File
@@ -0,0 +1,44 @@
{ stdenv, execline, fetchgit, skalibs }:
let
version = "2.2.1.0";
in stdenv.mkDerivation rec {
name = "s6-${version}";
src = fetchgit {
url = "git://git.skarnet.org/s6";
rev = "refs/tags/v${version}";
sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9";
};
dontDisableStatic = true;
enableParallelBuilding = true;
configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
"--with-include=${skalibs}/include"
"--with-include=${execline}/include"
"--with-lib=${skalibs}/lib"
"--with-lib=${execline}/lib"
"--with-dynlib=${skalibs}/lib"
"--with-dynlib=${execline}/lib"
] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
preBuild = ''
substituteInPlace "src/daemontools-extras/s6-log.c" \
--replace '"execlineb"' '"${execline}/bin/execlineb"'
'';
meta = {
homepage = http://www.skarnet.org/software/s6/;
description = "skarnet.org's small & secure supervision software suite";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ pmahoney ];
};
}
pkgs/tools/system/stress-ng/default.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, attr, keyutils }:
let
version = "0.04.20";
version = "0.04.21";
name = "stress-ng-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
sha256 = "0zzlnqmld804h08iabhcrj3ggm5wiry9g2jrdr33cqp44lrw402v";
sha256 = "01308c31dx7ln7w3r74f18c473hz9236f118b27z1js94dsya0hw";
url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
};