From ef5d158e83e1dc4e1be8735f9de1d24f1fd55136 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 8 Jul 2015 14:21:51 +0200
Subject: [PATCH 001/137] language-support python: propagatedBuildInputs
Explain difference between buildInputs and propagatedBuildInputs.
Shamefully steal wording from Perl.
---
doc/language-support.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/doc/language-support.xml b/doc/language-support.xml
index def0de1d91f..798988274ec 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -341,7 +341,16 @@ twisted = buildPythonPackage {
<para>By default <varname>doCheck = true</varname> is set and tests are run with
<literal>${python.interpreter} setup.py test</literal> command in <varname>checkPhase</varname>.</para>
- <para><varname>propagatedBuildInputs</varname> packages are propagated to user environment.</para>
+ <para><varname>propagatedBuildInputs</varname> packages are propagated to the user environment.</para>
+
+ <para>
+ As in Perl, dependencies on other Python packages can be specified in the
+ <varname>buildInputs</varname> and
+ <varname>propagatedBuildInputs</varname> attributes. If something is
+ exclusively a build-time dependency, use
+ <varname>buildInputs</varname>; if it’s (also) a runtime dependency,
+ use <varname>propagatedBuildInputs</varname>.
+ </para>
<para>
By default <varname>meta.platforms</varname> is set to the same value
From b30cab15ea64ae7f701626524bcf522a21fcc284 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 12 Jul 2015 13:07:39 +0200
Subject: [PATCH 002/137] language support python docs wrong statement
Remove wrong line about propagatedBuildInputs.
---
doc/language-support.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/doc/language-support.xml b/doc/language-support.xml
index 798988274ec..9117af864ad 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -1,3 +1,4 @@
+
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-language-support">
@@ -341,8 +342,6 @@ twisted = buildPythonPackage {
<para>By default <varname>doCheck = true</varname> is set and tests are run with
<literal>${python.interpreter} setup.py test</literal> command in <varname>checkPhase</varname>.</para>
- <para><varname>propagatedBuildInputs</varname> packages are propagated to the user environment.</para>
-
<para>
As in Perl, dependencies on other Python packages can be specified in the
<varname>buildInputs</varname> and
From b825befbdb8cf3ec2fdd3c9ddf471b8946868245 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 14 Jul 2015 00:57:06 +0200
Subject: [PATCH 003/137] quake3: add botlib patch for amd64
botlib abuses strcpy (source and dest overlap), and the strcpy function for 64
bit intel CPU's in the latest glibc, does not like this causing the bots to not
load.
---
pkgs/games/quake3/game/botlib.patch | 51 +++++++++++++++++++++++++++++
pkgs/games/quake3/game/default.nix | 3 ++
2 files changed, 54 insertions(+)
create mode 100644 pkgs/games/quake3/game/botlib.patch
diff --git a/pkgs/games/quake3/game/botlib.patch b/pkgs/games/quake3/game/botlib.patch
new file mode 100644
index 00000000000..82e2c781101
--- /dev/null
+++ b/pkgs/games/quake3/game/botlib.patch
@@ -0,0 +1,51 @@
+Retrieved from https://bugzilla.icculus.org/show_bug.cgi?id=4331,
+removed path prefix.
+
+ -- nckx <tobias.geerinckx.rice@gmail.com>
+
+PATCH: Bots don't work on 64 bit Intel CPU's
+
+botlib abuses strcpy (source and dest overlap), and the strcpy function for 64
+bit intel CPU's in the latest glibc, does not like this causing the bots to not
+load.
+
+The attached patch fixes this.
+
+Note this patch should be credited to: Andreas Bierfert (andreas.bierfert at
+lowlatency.de)
+
+See: http://bugzilla.redhat.com/show_bug.cgi?id=526338
+
+diff -up quake3-1.36/code/botlib/l_precomp.c~ quake3-1.36/code/botlib/l_precomp.c
+--- code/botlib/l_precomp.c~ 2009-04-27 08:42:37.000000000 +0200
++++ code/botlib/l_precomp.c 2009-11-03 21:03:08.000000000 +0100
+@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path)
+ if ((*ptr == '\\' || *ptr == '/') &&
+ (*(ptr+1) == '\\' || *(ptr+1) == '/'))
+ {
+- strcpy(ptr, ptr+1);
++ memmove(ptr, ptr+1, strlen(ptr));
+ } //end if
+ else
+ {
+diff -up quake3-1.36/code/botlib/l_script.c~ quake3-1.36/code/botlib/l_script.c
+--- code/botlib/l_script.c~ 2009-04-27 08:42:37.000000000 +0200
++++ code/botlib/l_script.c 2009-11-03 21:06:11.000000000 +0100
+@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string)
+ {
+ if (*string == '\"')
+ {
+- strcpy(string, string+1);
++ memmove(string, string+1, strlen(string));
+ } //end if
+ if (string[strlen(string)-1] == '\"')
+ {
+@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string)
+ {
+ if (*string == '\'')
+ {
+- strcpy(string, string+1);
++ memmove(string, string+1, strlen(string));
+ } //end if
+ if (string[strlen(string)-1] == '\'')
+ {
diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix
index cbcc8c290f8..ed447004345 100644
--- a/pkgs/games/quake3/game/default.nix
+++ b/pkgs/games/quake3/game/default.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation {
# Do an exit() instead of _exit(). This is nice for gcov.
# Upstream also seems to do this.
./exit.patch
+
+ # No bots on amd64 without this patch.
+ ./botlib.patch
];
buildInputs = [ x11 SDL mesa openal gcc46 ];
From bcb314853a6f6124ac5f86b8cc56c04a0849c4ff Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Jul 2015 01:47:15 +0200
Subject: [PATCH 004/137] unrtf: init at 0.21.9
---
pkgs/tools/text/unrtf/default.nix | 27 +++++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 29 insertions(+)
create mode 100644 pkgs/tools/text/unrtf/default.nix
diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix
new file mode 100644
index 00000000000..6b177b8b37b
--- /dev/null
+++ b/pkgs/tools/text/unrtf/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+ name = "unrtf-${version}";
+ version = "0.21.9";
+
+ src = fetchurl {
+ url = "https://www.gnu.org/software/unrtf/${name}.tar.gz";
+ sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2";
+ };
+
+ buildInputs = [ autoconf automake ];
+
+ preConfigure = "./bootstrap";
+
+ meta = with stdenv.lib; {
+ description = "A converter from Rich Text Format to other formats";
+ longDescription = ''
+ UnRTF converts documents in Rich Text Format to other
+ formats, including HTML, LaTeX, and RTF itself.
+ '';
+ homepage = https://www.gnu.org/software/unrtf/;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ joachifm ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e7849dd1a..9eb8e045398 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3170,6 +3170,8 @@ let
unoconv = callPackage ../tools/text/unoconv { };
+ unrtf = callPackage ../tools/text/unrtf { };
+
upx = callPackage ../tools/compression/upx { };
urlview = callPackage ../applications/misc/urlview {};
From 4bd52ddb88dd5bb9aed7bd674d3754391d3ddc94 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Jul 2015 02:02:36 +0200
Subject: [PATCH 005/137] untex: init at 1.2
---
pkgs/tools/text/untex/default.nix | 27 +++++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 29 insertions(+)
create mode 100644 pkgs/tools/text/untex/default.nix
diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix
new file mode 100644
index 00000000000..e2f6142a2a0
--- /dev/null
+++ b/pkgs/tools/text/untex/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "untex-${version}";
+ version = "1.2";
+
+ src = fetchurl {
+ url = "https://www.ctan.org/tex-archive/support/untex/${name}.tar.gz";
+ sha256 = "07p836jydd5yjy905m5ylnnac1h4cc4jsr41panqb808mlsiwmmy";
+ };
+
+ unpackPhase = "tar xf $src";
+ installTargets = "install install.man";
+ installFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man/man1";
+ preBuild = ''
+ sed -i '1i#include <stdlib.h>\n#include <string.h>' untex.c
+ mkdir -p $out/bin $out/share/man/man1
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A utility which removes LaTeX commands from input";
+ homepage = https://www.ctan.org/pkg/untex;
+ license = licenses.gpl1;
+ maintainers = with maintainers; [ joachifm ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eb8e045398..129af9c5deb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3172,6 +3172,8 @@ let
unrtf = callPackage ../tools/text/unrtf { };
+ untex = callPackage ../tools/text/untex { };
+
upx = callPackage ../tools/compression/upx { };
urlview = callPackage ../applications/misc/urlview {};
From ba03068c210ada1b5c3dee56cb90708af3057e48 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Jul 2015 02:17:50 +0200
Subject: [PATCH 006/137] libwpd: add meta.{description,license,homepage}
---
pkgs/development/libraries/libwpd/default.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index df5917fb05c..01ae59efdf4 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -11,4 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ glib libgsf libxml2 zlib librevenge ];
nativeBuildInputs = [ pkgconfig ];
+
+ meta = with stdenv.lib; {
+ description = "A library for importing and exporting WordPerfect documents";
+ homepage = http://libwpd.sourceforge.net/;
+ license = licenses.lgpl21;
+ };
}
From ef772328ebd98b2d570de54e2f61a46b0aecf9b9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Jul 2015 02:19:03 +0200
Subject: [PATCH 007/137] recoll: make use of unrtf, untex, and Word Perfect
filters
---
pkgs/applications/search/recoll/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 0eb4632a4c0..3182f4a5c66 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl
, qt4, xapian, file, python
, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
+, libwpd, unrtf, untex
, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }:
assert stdenv.system != "powerpc-linux";
@@ -40,12 +41,11 @@ stdenv.mkDerivation rec {
substituteInPlace $f --replace unzip ${unzip}/bin/unzip
substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv
substituteInPlace $f --replace xsltproc ${libxslt}/bin/xsltproc
+ substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf
+ substituteInPlace $f --replace untex ${untex}/bin/untex
+ substituteInPlace $f --replace wpd2html ${libwpd}/bin/wpd2html
done
'';
- # TODO:
- #substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf
- #substituteInPlace $f --replace untex ${untex}/bin/untex
- #substituteInPlace $f --replace wpd2html ${wpd2html}/bin/wpd2html
meta = with stdenv.lib; {
description = "A full-text search tool";
From c1a9be394f193b41a07d7447d249c73bb25aa5d6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 16 Jul 2015 08:57:17 +0000
Subject: [PATCH 008/137] pythonPackages.sqlalchemy: 0.9.8 -> 0.9.9
---
pkgs/top-level/python-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45de46ef679..0b8987d1758 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12772,13 +12772,13 @@ let
};
sqlalchemy9 = buildPythonPackage rec {
- name = "SQLAlchemy-0.9.8";
+ name = "SQLAlchemy-0.9.9";
disabled = isPyPy;
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
- md5 = "470ca4da4a0081efc830f0d90dd91682";
+ sha256 = "14az6hhrz4bgnicz4q373z119zmaf7j5zxl1jfbfl5lix5m1z9bj";
};
buildInputs = with self; [ nose mock ]
From f27b17e54c6a86784f295d57d7ded5136c39b645 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 16 Jul 2015 09:00:33 +0000
Subject: [PATCH 009/137] pythonPackages.sqlalchemy_1_0: init at 1.0.6
sqlalchemy-0.9.9 is maintained as the reference version (it is still in maintenance
state upstream).
---
pkgs/top-level/python-packages.nix | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b8987d1758..f5904190852 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12799,6 +12799,14 @@ let
};
};
+ sqlalchemy_1_0 = self.sqlalchemy9.override rec {
+ name = "SQLAlchemy-1.0.6";
+
+ src = pkgs.fetchurl {
+ url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
+ sha256 = "1wv5kjf142m8g1dnbvgpbqxb8v8rm9lzgsafql2gg229xi5sba4r";
+ };
+ };
sqlalchemy_imageattach = buildPythonPackage rec {
name = "SQLAlchemy-ImageAttach-${version}";
From bb6459dd0bb99c0db291d744cde6f466d7379d7e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 19 Jul 2015 13:38:36 -0500
Subject: [PATCH 010/137] qt5.base: use pkgconfig unconditionally
---
pkgs/development/libraries/qt-5/5.4/qtbase.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 7ef39a40860..ac38339c1f8 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation {
-strip
-reduce-relocations
-system-proxies
+ -pkg-config
-gui
-widgets
From 3f3da5ccbde10176a4e634888384bb48c024b337 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 19 Jul 2015 13:38:51 -0500
Subject: [PATCH 011/137] qt5.base: install setupHook correctly
---
pkgs/development/libraries/qt-5/5.4/qtbase.nix | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index ac38339c1f8..cf960c39b40 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -172,12 +172,11 @@ stdenv.mkDerivation {
# Don't retain build-time dependencies like gdb and ruby.
sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-
- mkdir -p "$out/nix-support"
- substitute ${./setup-hook.sh} "$out/nix-support/setup-hook" \
- --subst-var out --subst-var-by lndir "${lndir}"
'';
+ inherit lndir;
+ setupHook = ./setup-hook.sh;
+
enableParallelBuilding = true; # often fails on Hydra, as well as qt4
meta = {
From f6bc130bc83c62e626d11414e876143f98d49437 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 16:59:48 -0700
Subject: [PATCH 012/137] libssh: 0.7.0 -> 0.7.1
---
...troduce-ssh_forward_listen-Fixes-194.patch | 28 -------------------
pkgs/development/libraries/libssh/default.nix | 8 ++----
2 files changed, 3 insertions(+), 33 deletions(-)
delete mode 100644 pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
diff --git a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
deleted file mode 100644
index 030983d5c55..00000000000
--- a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001
-From: Mike DePaulo <mikedep333@gmail.com>
-Date: Fri, 15 May 2015 22:22:13 -0400
-Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194)
-
----
- src/channels.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/channels.c b/src/channels.c
-index 7a4e71f..db5f83a 100644
---- a/src/channels.c
-+++ b/src/channels.c
-@@ -2206,6 +2206,11 @@ error:
- }
-
- /* DEPRECATED */
-+int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) {
-+ return ssh_channel_listen_forward(session, address, port, bound_port);
-+}
-+
-+/* DEPRECATED */
- ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) {
- return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL);
- }
---
-2.1.4
-
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index ef4540db2b2..1766a685aaa 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,15 +1,13 @@
{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
stdenv.mkDerivation rec {
- name = "libssh-0.7.0";
+ name = "libssh-0.7.1";
src = fetchurl {
- url = "https://git.libssh.org/projects/libssh.git/snapshot/${name}.tar.gz";
- sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0";
+ url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz";
+ sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg";
};
- patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ];
-
postPatch = ''
# Fix headers to use libsodium instead of NaCl
sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c
From 6eab1065f124701a85f2f747589db24ee004c68b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 19 Jul 2015 19:44:37 -0700
Subject: [PATCH 013/137] ceph: Fix wrapper path
---
pkgs/tools/filesystems/ceph/generic.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index b899192aa3c..bece841d5f5 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -101,7 +101,7 @@ let
wrapArgs = "--set PYTHONPATH \"$(toPythonPath $lib)\""
+ " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
+ " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
- + " --set PATH : \"$out/bin\"";
+ + " --set PATH \"$out/bin\"";
in
stdenv.mkDerivation {
name="ceph-${version}";
From d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 20 Jul 2015 09:01:20 +0300
Subject: [PATCH 014/137] edk2, OVMF: Fix build on GCC 4.9
The toolchain must be correctly specified in the OVMF build or it fails
with 'Unsupported section alignment':
http://hydra.nixos.org/build/23859056
---
pkgs/development/compilers/edk2/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index ebbac8ec355..f68681e6023 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -46,7 +46,7 @@ edk2 = stdenv.mkDerivation {
configurePhase = ''
mkdir -v Conf
sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
- 's|MYTOOLS|GCC48|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
+ 's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
< ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
sed -e 's|DEFINE GCC48_IA32_PREFIX = /usr/bin/|DEFINE GCC48_IA32_PREFIX = ""|' \
-e 's|DEFINE GCC48_X64_PREFIX = /usr/bin/|DEFINE GCC48_X64_PREFIX = ""|' \
From 17d9f9139599862884eb6c86a8fa8c66a26ec3d9 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Mon, 20 Jul 2015 09:16:17 +0200
Subject: [PATCH 015/137] pycharm: update 4.5.2 to 4.5.3
---
pkgs/applications/editors/idea/default.nix | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 5d13cf6a4ce..e394ae4d6a3 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -273,25 +273,25 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "4.5.2";
- build = "141.1580";
+ version = "4.5.3";
+ build = "141.1899";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "09v1ni06h381y7d5cglifwsz81kln2y4ld7hgpz1sn56fwbi8ld9";
+ sha256 = "13f3mp7gcl27fikxjlwk7n1gyxa46q0wfgniang4knb596wlfli0";
};
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "4.5.2";
- build = "141.1580";
+ version = "4.5.3";
+ build = "141.1899";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1dgpzn7wgaxicgw48z83fp462g5mxsr7iwkgp11ffypz93ba2dm7";
+ sha256 = "00b66fy841vjm54n2fby5wf7y8ihihqgydr6329iv9p5s0mgzh2s";
};
};
From 1fee4ce381f2bb7eda196bb6a1725fe03824e788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jul 2015 09:56:02 +0200
Subject: [PATCH 016/137] nzbget: fix URLs, fixes #8860
/cc maintainer @pSub.
---
pkgs/tools/networking/nzbget/default.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index 8d47ab1e167..3497fd8efaf 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -1,11 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2
, gnutls, libgcrypt, zlib }:
+let
+ version = "15.0";
+in
stdenv.mkDerivation rec {
- name = "nzbget-15.0";
+ name = "nzbget-${version}";
src = fetchurl {
- url = "mirror://sourceforge/nzbget/${name}.tar.gz";
+ url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${name}-src.tar.gz";
sha256 = "02nclq97gqr4zwww4j1l9sds2rwrwwvwvh2gkjhwvr0pb4z3zw9y";
};
@@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://nzbget.sourceforge.net/;
+ homepage = http://nzbget.net;
license = licenses.gpl2Plus;
description = "A command line tool for downloading files from news servers";
maintainers = with maintainers; [ pSub ];
From 617c5fcaf012b3f8278c1bf8642c40396cf916fa Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 12 Jul 2015 17:46:44 -0400
Subject: [PATCH 017/137] rainbowstream: purify (close #8791)
This obviates the need for `cc` to be available at run time.
---
.../python-modules/rainbowstream/image.patch | 18 ++++++++++++++++++
pkgs/top-level/python-packages.nix | 12 ++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 pkgs/development/python-modules/rainbowstream/image.patch
diff --git a/pkgs/development/python-modules/rainbowstream/image.patch b/pkgs/development/python-modules/rainbowstream/image.patch
new file mode 100644
index 00000000000..215152ae4fb
--- /dev/null
+++ b/pkgs/development/python-modules/rainbowstream/image.patch
@@ -0,0 +1,18 @@
+diff --git a/rainbowstream/c_image.py b/rainbowstream/c_image.py
+index f050150..a0fb77d 100644
+--- a/rainbowstream/c_image.py
++++ b/rainbowstream/c_image.py
+@@ -12,11 +12,7 @@ def call_c():
+ """
+ Call the C program for converting RGB to Ansi colors
+ """
+- library = expanduser('~/.image.so')
+- sauce = join(dirname(__file__), 'image.c')
+- if not exists(library) or getmtime(sauce) > getmtime(library):
+- build = "cc -fPIC -shared -o %s %s" % (library, sauce)
+- os.system(build + " >/dev/null 2>&1")
++ library = '@CLIB@'
+ image_c = ctypes.cdll.LoadLibrary(library)
+ image_c.init()
+ return image_c.rgb_to_ansi
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08c0cfee510..222b9150511 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7505,11 +7505,23 @@ let
doCheck = false;
+ patches = [
+ ../development/python-modules/rainbowstream/image.patch
+ ];
+
+ postPatch = ''
+ clib=$out/${python.sitePackages}/rainbowstream/image.so
+ substituteInPlace rainbowstream/c_image.py \
+ --replace @CLIB@ $clib
+ '';
+
preBuild = ''
export LC_ALL="en_US.UTF-8"
'';
postInstall = ''
+ mkdir -p $out/lib
+ cc -fPIC -shared -o $clib rainbowstream/image.c
for prog in "$out/bin/"*; do
wrapProgram "$prog" \
--prefix PYTHONPATH : "$PYTHONPATH"
From 004a23f47758ac2593e7a177ee9a45ec1d9a28a4 Mon Sep 17 00:00:00 2001
From: Michael Kuryshev <me@mk9.name>
Date: Sun, 19 Jul 2015 18:52:01 +0300
Subject: [PATCH 018/137] mpc: enable on darwin
---
pkgs/applications/audio/mpc/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 2f798fff7b9..f37585d3dec 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -13,15 +13,15 @@ stdenv.mkDerivation rec {
preConfigure =
''
- export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.so.${mpd_clientlib.majorVersion}.0.${mpd_clientlib.minorVersion}
+ export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion}
export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A minimalist command line interface to MPD";
homepage = http://www.musicpd.org/clients/mpc/;
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.algorith ];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.algorith ];
+ platforms = with platforms; linux ++ darwin;
};
}
From 941f0ff978c1c6235988fbff817812b5b7eaf193 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 13 Jul 2015 15:01:43 +0200
Subject: [PATCH 019/137] litecoin: 0.9.3-preview5 -> 0.10.2.2
---
pkgs/applications/altcoins/litecoin.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index f2235abaaae..4e0198b972d 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.9.3-preview5";
+ version = "0.10.2.2";
src = fetchurl {
url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz";
- sha256 = "0nnfz4s2g28jb5fqy6cabsryp3h2amzlyslr6g6k8r1vmzvx5ym6";
+ sha256 = "1p1h2654b7f2lyrmihcjmpmx6sjpkgsifcm2ixxb2g9jh6qq8b4m";
};
buildInputs = [ pkgconfig autoreconfHook openssl
From 37dcb18a5e1a3adfa5a8276f8835a0ad28aa8f97 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Sun, 12 Jul 2015 23:05:18 +0200
Subject: [PATCH 020/137] steam: add `which` to the environment
Close #8788, fixes #8766.
Some games use it in their starting scripts (notably FTL does that).
---
pkgs/games/steam/chrootenv.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 96f409faef8..ff4b104059d 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -14,6 +14,7 @@ buildFHSUserEnv {
pkgs.gnome2.zenity
pkgs.xdg_utils
pkgs.xlibs.xrandr
+ pkgs.which
]
++ lib.optional (config.steam.java or false) pkgs.jdk
++ lib.optional (config.steam.primus or false) pkgs.primus
From 4f928f3550df3025106d1c7231b703aad28d1510 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 20 Jul 2015 12:19:56 +0300
Subject: [PATCH 021/137] nfs-utils: 1.2.5 -> 1.3.2, potentially fixes
CVE-2013-1923
---
pkgs/os-specific/linux/nfs-utils/default.nix | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 6b30104b083..75f25e26804 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,18 +1,18 @@
{ fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap
-, lvm2, e2fsprogs, python
+, lvm2, e2fsprogs, python, sqlite
}:
stdenv.mkDerivation rec {
- name = "nfs-utils-1.2.5";
+ name = "nfs-utils-1.3.2"; # NOTE: when updating, remove the HACK BUG FIX below
src = fetchurl {
url = "mirror://sourceforge/nfs/${name}.tar.bz2";
- sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m";
+ sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v";
};
buildInputs =
[ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap
- lvm2 e2fsprogs python
+ lvm2 e2fsprogs python sqlite
];
# FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
@@ -32,14 +32,15 @@ stdenv.mkDerivation rec {
done
sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c
- # https://bugzilla.redhat.com/show_bug.cgi?id=749195
- sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c
+ # HACK BUG FIX: needed for 1.3.2
+ # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=17a3e5bffb7110d46de1bf42b64b90713ff5ea50
+ sed -e 's,daemon_init(!,daemon_init(,' -i utils/statd/statd.c
'';
preBuild =
''
makeFlags="sbindir=$out/sbin"
- installFlags="statedir=$TMPDIR" # hack to make `make install' work
+ installFlags="statedir=$TMPDIR statdpath=$TMPDIR" # hack to make `make install' work
'';
# One test fails on mips.
From 5c31245047a4bd0966059d0d5cd4e701745ee6c4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 20 Jul 2015 12:20:02 +0300
Subject: [PATCH 022/137] rpcbind: 0.2.3 -> 1.0.7
---
pkgs/servers/rpcbind/default.nix | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 6eb8a57cab4..6eb58d45838 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,16 +1,19 @@
{ fetchurl, stdenv, pkgconfig, libtirpc
, useSystemd ? true, systemd }:
-let version = "0.2.3";
+let version = "1.0.7";
in stdenv.mkDerivation rec {
name = "rpcbind-${version}";
src = fetchurl {
url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
- sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
+ sha256 = "14vl0kmavc1fay630f4w8l1hjfzhmcqm8d0akzahhgymh5fw1f7r";
};
patches = [ ./sunrpc.patch ];
+ postPatch = ''
+ sed -e 's|/usr/include/tirpc|${libtirpc}/include/tirpc|' -i src/Makefile.am -i src/Makefile.in
+ '';
buildInputs = [ libtirpc ]
++ stdenv.lib.optional useSystemd systemd;
From 8d507823ca1d2f57d2840bb43c52637bf00315f1 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 20 Jul 2015 11:23:34 +0200
Subject: [PATCH 023/137] dwarf-therapist: 30.2.0pre -> 31.0.0.
---
pkgs/games/dwarf-therapist/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix
index 6d7eaf30736..4e676bf5f9d 100644
--- a/pkgs/games/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-therapist/default.nix
@@ -1,7 +1,7 @@
{ stdenv, coreutils, fetchgit, qt4, dwarf_fortress, bash, makeWrapper }:
let
- version = "30.2.0pre";
+ version = "31.0.0";
df = dwarf_fortress;
in
stdenv.mkDerivation rec {
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "https://github.com/splintermind/Dwarf-Therapist.git";
- rev = "65bb15a29d616d788c20a3344058b7277e4fadba";
- sha256 = "1q1n9sm0lgmn52m4aigb22cdfbh2s569y1mn5cmimgj600i6c2f2";
+ rev = "refs/tags/v${version}";
+ sha256 = "02d6k8c3vm401v04ln9q405njarx869jpfyf42lwskijrzjygk9x";
};
# Needed for hashing
From e4fcddf1774785f00ff07e759086a4b8ce9e06d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jul 2015 12:04:43 +0200
Subject: [PATCH 024/137] statifier: fix meta.platforms syntax
---
pkgs/os-specific/linux/statifier/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index 0e1ecdd6d7d..dd62d6d9d07 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation {
sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier
sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh
'';
-
+
meta = with stdenv.lib; {
description = "Tool for creating static Linux binaries";
- platforms = with platforms; [ linux ];
+ platforms = with platforms; linux;
};
}
From 855b3c48ab8d8129cddbcf250d6dfa586dbd16b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jul 2015 12:05:06 +0200
Subject: [PATCH 025/137] gcc: fix multilib build
Fixes #8706, thanks to @cpages a lot.
Also ported to gcc5, without testing that one yet.
---
pkgs/development/compilers/gcc/4.9/default.nix | 2 +-
pkgs/development/compilers/gcc/5/default.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 14641faa5fe..9069387762f 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -320,7 +320,7 @@ stdenv.mkDerivation ({
" --with-gnu-as --without-gnu-ld "
else ""}
--enable-lto
- ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
+ ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
${optionalString (isl != null) "--with-isl=${isl}"}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 5e6acea35df..46864c0bb02 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -318,7 +318,7 @@ stdenv.mkDerivation ({
" --with-gnu-as --without-gnu-ld "
else ""}
--enable-lto
- ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
+ ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
${optionalString (isl != null) "--with-isl=${isl}"}
From 615f64dcbe6de193a9c3b0e03591fe623fecaeb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Jul 2015 13:42:30 +0200
Subject: [PATCH 026/137] gcc_multi: disable the hook moving lib64 to lib
This was preventing wine from build, and we typically don't want it
anyway in multilib builds. /cc #8706.
---
pkgs/build-support/cc-wrapper/default.nix | 5 +++--
pkgs/top-level/all-packages.nix | 14 +++++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index ec024c72481..57607ba25b9 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -7,7 +7,7 @@
{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
-, zlib ? null, extraPackages ? []
+, zlib ? null, extraPackages ? [], extraBuildCommands ? ""
, dyld ? null # TODO: should this be a setup-hook on dyld?
, isGNU ? false, isClang ? false
}:
@@ -232,7 +232,8 @@ stdenv.mkDerivation {
substituteAll ${./add-flags} $out/nix-support/add-flags.sh
cp -p ${./utils.sh} $out/nix-support/utils.sh
- '';
+ ''
+ + extraBuildCommands;
# The dynamic linker has different names on different Linux platforms.
dynamicLinker =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32dda557f1d..ea85bd3547b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3687,8 +3687,12 @@ let
gcc_multi =
if system == "x86_64-linux" then lowPrio (
- wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc.cc.override {
- stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc);
+ let
+ extraBuildCommands = ''
+ echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
+ '';
+ in wrapCCWith (import ../build-support/cc-wrapper) glibc_multi extraBuildCommands (gcc.cc.override {
+ stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi "" gcc.cc);
profiledCompiler = false;
enableMultilib = true;
}))
@@ -4741,7 +4745,7 @@ let
win32hello = callPackage ../development/compilers/visual-c++/test { };
- wrapCCWith = ccWrapper: libc: baseCC: ccWrapper {
+ wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper {
nativeTools = stdenv.cc.nativeTools or false;
nativeLibc = stdenv.cc.nativeLibc or false;
nativePrefix = stdenv.cc.nativePrefix or "";
@@ -4750,10 +4754,10 @@ let
dyld = if stdenv.isDarwin then darwin.dyld else null;
isGNU = baseCC.isGNU or false;
isClang = baseCC.isClang or false;
- inherit stdenv binutils coreutils zlib;
+ inherit stdenv binutils coreutils zlib extraBuildCommands;
};
- wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) stdenv.cc.libc;
+ wrapCC = wrapCCWith (makeOverridable (import ../build-support/cc-wrapper)) stdenv.cc.libc "";
# legacy version, used for gnat bootstrapping
wrapGCC-old = baseGCC: (makeOverridable (import ../build-support/gcc-wrapper-old)) {
nativeTools = stdenv.cc.nativeTools or false;
From 745690717e24179d48e556ae487af77260eee49a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Jul 2015 09:19:12 -0400
Subject: [PATCH 027/137] build-maven: Add handling for snapshot version
resolution
---
pkgs/build-support/build-maven.nix | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index a1faf8060be..ff91828eeca 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -15,15 +15,27 @@ infoFile: let
script = writeText "build-maven-repository.sh" ''
${lib.concatStrings (map (dep: let
- inherit (dep) url sha1 groupId artifactId version authenticated;
+ inherit (dep)
+ url sha1 groupId artifactId version
+ authenticated metadata extension repository-id;
+
+ versionDir = dep.unresolved-version or version;
fetch = (if authenticated then requireFile else fetchurl) {
inherit url sha1;
};
+
+ fetchMetadata = (if authenticated then requireFile else fetchurl) {
+ inherit (metadata) url sha1;
+ };
in ''
- dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${version}
+ dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${versionDir}
mkdir -p $dir
ln -sv ${fetch} $dir/${fetch.name}
+ ${lib.optionalString (dep ? metadata) ''
+ ln -svf ${fetchMetadata} $dir/maven-metadata-${repository-id}.xml
+ ln -sv ${fetch} $dir/$(echo ${fetch.name} | sed 's|${version}|${dep.unresolved-version}|')
+ ''}
'') info.dependencies)}
'';
From 23187c343109f5420f56f52107dce29b65bcf48f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 20 Jul 2015 14:28:49 +0100
Subject: [PATCH 028/137] docker: allow the user to override postStart
My use-case: passing -H SOM.EIP.ADD.RES:PORT doesn't result in a .sock
file so the service would never go up.
---
nixos/modules/virtualisation/docker.nix | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index ef9cc2280db..2339cf7c649 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -54,6 +54,21 @@ in
'';
};
+ postStart =
+ mkOption {
+ type = types.string;
+ default = ''
+ while ! [ -e /var/run/docker.sock ]; do
+ sleep 0.1
+ done
+ '';
+ description = ''
+ The postStart phase of the systemd service. You may need to
+ override this if you are passing in flags to docker which
+ don't cause the socket file to be created.
+ '';
+ };
+
};
@@ -106,11 +121,7 @@ in
path = [ pkgs.kmod ];
environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
- postStart = ''
- while ! [ -e /var/run/docker.sock ]; do
- sleep 0.1
- done
- '';
+ postStart = cfg.postStart;
# Presumably some containers are running we don't want to interrupt
restartIfChanged = false;
From 17a65c4bf043aaa35b6224a27a3d0a9df546ca85 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 20 Jul 2015 08:41:57 -0500
Subject: [PATCH 029/137] qt5.base: override postgresql autodetection
---
pkgs/development/libraries/qt-5/5.4/qtbase.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index cf960c39b40..441dbdd5c66 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -143,6 +143,11 @@ stdenv.mkDerivation {
-${optionalString (buildTests == false) "no"}make tests
'';
+ # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+ # if dependency paths contain the string "pq", which can occur in the hash.
+ # To prevent these failures, we need to override PostgreSQL detection.
+ PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+
propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
From 965f330c654553400611aa51d6898a9dd14e40dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 20 Jul 2015 08:46:20 -0500
Subject: [PATCH 030/137] qt5.base: disable unsupported SIMD instruction sets
If not explicitly disabled, Qt tries to detect support for the various
instruction sets. As a result, binaries built on Hydra may use
instruction sets unsupported by clients.
---
pkgs/development/libraries/qt-5/5.4/qtbase.nix | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 441dbdd5c66..ecefa891332 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -25,6 +25,8 @@
with stdenv.lib;
+let system-x86_64 = elem stdenv.system platforms.x86_64; in
+
stdenv.mkDerivation {
name = "qtbase-${version}";
@@ -125,6 +127,16 @@ stdenv.mkDerivation {
-no-linuxfb
-no-kms
+ ${optionalString (!system-x86_64) "-no-sse2"}
+ -no-sse3
+ -no-ssse3
+ -no-sse4.1
+ -no-sse4.2
+ -no-avx
+ -no-avx2
+ -no-mips_dsp
+ -no-mips_dspr2
+
-system-zlib
-system-libpng
-system-libjpeg
From 07fd9384f57530c8e7b2a0669a11da2b7fa1a024 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Jul 2015 16:39:39 +0200
Subject: [PATCH 031/137] texlive: flip the default for the assertion so that
normal users can build it
---
pkgs/tools/typesetting/tex/texlive/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index fe8809e8263..3acfffafde2 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,7 +1,7 @@
args : with args;
rec {
- src = assert config.allowTexliveBuilds or false; fetchurl {
+ src = assert config.allowTexliveBuilds or true; fetchurl {
url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;
sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
};
From 46516fc19e1bac21b31b9b3a44f71bcf0a52ed9b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 20 Jul 2015 16:52:45 +0200
Subject: [PATCH 032/137] connmanui: update to latest (e4a8ddcca08 ->
fce0af94e12)
---
pkgs/tools/networking/connmanui/default.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/networking/connmanui/default.nix b/pkgs/tools/networking/connmanui/default.nix
index 280d3d9f9fc..32ae736494f 100644
--- a/pkgs/tools/networking/connmanui/default.nix
+++ b/pkgs/tools/networking/connmanui/default.nix
@@ -2,17 +2,20 @@
stdenv.mkDerivation rec {
name = "connmanui-${version}";
- version = "e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2";
+ rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516";
+ version = "22062015-${rev}";
src = fetchgit {
+ inherit rev;
url = "git://github.com/tbursztyka/connman-ui.git";
- rev = version;
- sha256 = "0rml52v81s7hr0g6qbj5bamli08kn66hay84qicx8sy8679wg443";
+ sha256 = "2072b337379b849cc55a19a3bb40834941e3f82b3924ef5d9b29e887fd19055e";
};
buildInputs = [ autoconf automake libtool glib gtk3 dbus pkgconfig file intltool connman ];
preConfigure = ''
+ rm m4/intltool.m4
+ ln -s ${intltool}/share/aclocal/intltool.m4 m4/
set -e
./autogen.sh
sed -i "s/\/usr\/bin\/file/file/g" ./configure
From eb9475d110f6cb1d37fa31f5272a44ba039036e7 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@compiletoi.net>
Date: Mon, 20 Jul 2015 17:09:33 +0200
Subject: [PATCH 033/137] nox: updated to 0.0.2
---
pkgs/tools/package-management/nox/default.nix | 6 +--
.../package-management/nox/show-trace.patch | 41 -------------------
2 files changed, 2 insertions(+), 45 deletions(-)
delete mode 100644 pkgs/tools/package-management/nox/show-trace.patch
diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index bbb576400f0..2930e6fdce2 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -2,16 +2,14 @@
pythonPackages.buildPythonPackage rec {
name = "nox-${version}";
- version = "0.0.1";
+ version = "0.0.2";
namePrefix = "";
src = fetchurl {
url = "https://pypi.python.org/packages/source/n/nix-nox/nix-nox-${version}.tar.gz";
- sha256 = "1s1jhickdhym70qrb5h4qxq1mvkpwgdppqpfb2jnpfaf1az6c207";
+ sha256 = "1wpxh5fhj8nx4yx4cvmc087cnf4iqwxf7zd7rdh2ln3pgxrjfral";
};
- patches = [ ./show-trace.patch ];
-
buildInputs = [ pythonPackages.pbr ];
pythonPath = with pythonPackages; [
diff --git a/pkgs/tools/package-management/nox/show-trace.patch b/pkgs/tools/package-management/nox/show-trace.patch
deleted file mode 100644
index 6b464d3a4b2..00000000000
--- a/pkgs/tools/package-management/nox/show-trace.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
-Date: Tue, 2 Jun 2015 13:04:19 +0200
-Subject: [PATCH] Run `nix-env` & `nix-shell` with `--show-trace`
-
-Evaluation is broken often enough that this seems wise.
-Debugging such errors without a backtrace is most unpleasant.
-
-diff -Naur nix-nox-0.0.1/nox/nixpkgs_repo.py nix-nox-0.0.1b/nox/nixpkgs_repo.py
---- nox/nox/nixpkgs_repo.py 2014-10-26 21:50:33.000000000 +0100
-+++ nox/nox/nixpkgs_repo.py 2015-07-03 04:46:08.114975479 +0200
-@@ -75,7 +75,7 @@
-
- def packages(path):
- """List all nix packages in the repo, as a set"""
-- output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path'],
-+ output = subprocess.check_output(['nix-env', '-f', path, '-qaP', '--drv-path', '--show-trace'],
- universal_newlines=True)
- return set(output.split('\n'))
-
-diff -Naur nix-nox-0.0.1/nox/search.py nix-nox-0.0.1b/nox/search.py
---- nox/nox/search.py 2014-09-20 14:55:33.000000000 +0200
-+++ nox/nox/search.py 2015-07-03 04:46:54.264813143 +0200
-@@ -10,7 +10,7 @@
-
- def nix_packages_json():
- click.echo('Refreshing cache')
-- output = subprocess.check_output(['nix-env', '-qa', '--json'],
-+ output = subprocess.check_output(['nix-env', '-qa', '--json', '--show-trace'],
- universal_newlines=True)
- return json.loads(output)
-
-@@ -70,7 +70,7 @@
- value_proc=parse_input)
- attributes = [p.attribute for p in packages]
- if action == 'install':
-- subprocess.check_call(['nix-env', '-iA'] + attributes)
-+ subprocess.check_call(['nix-env', '-iA', '--show-trace'] + attributes)
- elif action == 'shell':
- attributes = [a[len('nixpkgs.'):] for a in attributes]
-- subprocess.check_call(['nix-shell', '-p'] + attributes)
-+ subprocess.check_call(['nix-shell', '-p', '--show-trace'] + attributes)
From cbf14b9d8f86fc19c6a04767893a07ae9bb20c9f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:26:53 -0500
Subject: [PATCH 034/137] nixpkgs: dd-agent 5.2.3 -> 5.4.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/tools/networking/dd-agent/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 8c340460b75..5838d5407be 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -2,14 +2,14 @@
, makeWrapper }:
stdenv.mkDerivation rec {
- version = "5.2.3";
+ version = "5.4.3";
name = "dd-agent-${version}";
src = fetchFromGitHub {
- owner = "DataDog";
- repo = "dd-agent";
- rev = version;
- sha256 = "05flcbzpnmhf6qskkccbfk957sl9hhydlp4p5vqhs62hkpwmqwan";
+ owner = "datadog";
+ repo = "dd-agent";
+ rev = version;
+ sha256 = "07cign0ydxf1h6xsyi3iviywlm9x6d6rcaz46f3wipby6mv1s5dc";
};
buildInputs = [
From 6dac59b09622a10234605cea1841ffb04cc318d8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:28:49 -0500
Subject: [PATCH 035/137] nixpkgs: libseccomp 2.2.1 -> 2.2.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/development/libraries/libseccomp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 61f22701111..af9f017ac73 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libseccomp-${version}";
- version = "2.2.1";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "seccomp";
repo = "libseccomp";
rev = "v${version}";
- sha256 = "153k3jflcgij19nxghmwlvqlngl84vkld514d31490c6sfkr5fy2";
+ sha256 = "0pl827qjls5b6kjj8qxxdwcn6rviqbm5xjqf0hgx6b04c836mswx";
};
buildInputs = [ autoreconfHook getopt ];
From 71d4b4baae379e0a6e1bea5db1ae5eba31daad0f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:31:02 -0500
Subject: [PATCH 036/137] nixpkgs: lockdep 3.19.1 -> 4.1.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/os-specific/linux/lockdep/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 612291e62e4..7765f5f8b9c 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "lockdep-${version}";
- version = "3.19.1";
- fullver = "3.19.1";
+ version = "4.1.2";
+ fullver = "4.1.2";
src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "0qx7vxmlcwr4nvzf4wq0da7xwzqw4b67h9a5rfpxgg9mayk3czvi";
+ url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+ sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy";
};
preConfigure = "cd tools/lib/lockdep";
From 131e41191bf564323977e71a5f2361af0c64be81 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:44:35 -0500
Subject: [PATCH 037/137] nixpkgs: nginxUnstable 1.9.2 -> 1.9.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/servers/http/nginx/unstable.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 907fe98d681..990d3d52d30 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -10,10 +10,10 @@
with stdenv.lib;
let
- version = "1.9.2";
+ version = "1.9.3";
mainSrc = fetchurl {
url = "http://nginx.org/download/nginx-${version}.tar.gz";
- sha256 = "0y7d87v9rvc4xvxaz8cag6zhdg7lfp3z65ain665q02aw5dl5dl0";
+ sha256 = "1svkyrh31g9hzfmj0xwc167sz0b1fn4i62mwipdjy9ia3cscb622";
};
rtmp-ext = fetchFromGitHub {
From 8d7dd4cf53ed04d6ffb21448b789bf090f60048e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:48:50 -0500
Subject: [PATCH 038/137] nixpkgs: re2c 0.14.2 -> 0.14.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/development/tools/parsing/re2c/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
index ce9941b2362..d4b3e56ebe3 100644
--- a/pkgs/development/tools/parsing/re2c/default.nix
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "re2c-${version}";
- version = "0.14.2";
+ version = "0.14.3";
src = fetchurl {
url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz";
- sha256 = "0c0w5w1dp9v9d0a6smjbnk6zvfs77fx1xd7damap3x3sjxiyn0m7";
+ sha256 = "113yj5h38isfsjigqvb2j3ammfmxckgwyxmm0h4fyflzb7ghcs0w";
};
meta = {
From f07d5a244fac2b34a4ee683af102d01cd5ac2c65 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:49:03 -0500
Subject: [PATCH 039/137] nixpkgs: ninja 1.5.3 -> 1.6.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/development/tools/build-managers/ninja/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 5ba5d86ac77..c1ef980e82d 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "ninja-${version}";
- version = "1.5.3";
+ version = "1.6.0";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/martine/ninja/archive/v${version}.tar.gz";
- sha256 = "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw";
+ sha256 = "1ryd1686bd31gfdjxnqm6k1ybnjmjz8v97px7lmdkr4g0vxqhgml";
};
buildInputs = [ python asciidoc re2c ];
From b81c21428c4abb9a2c7789ca0fdd1494e640111e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:50:37 -0500
Subject: [PATCH 040/137] nixpkgs: pax-utils 1.0.3 -> 1.0.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/os-specific/linux/pax-utils/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 266fee9e493..d698fcf1b7e 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pax-utils-${version}";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
- sha256 = "0w2nddgany3s0znyj6zizlvn8y5vba9x49jm5nliv13p3x7ajdc5";
+ sha256 = "1wymfsir2s22zqjdwnwv7bn075vzzlhssgwxnkz33i2d5pr6rqgp";
};
makeFlags = [
From c2f1ac98855c6ed7eddc6f616aaa590758d89f53 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 13:52:06 -0500
Subject: [PATCH 041/137] nixpkgs: ssdeep 2.12 -> 2.13
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/tools/security/ssdeep/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 7ec4934805b..a17fc36b013 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ssdeep-${version}";
- version = "2.12";
+ version = "2.13";
src = fetchurl {
url = "mirror://sourceforge/ssdeep/${name}.tar.gz";
- sha256 = "1pjb3qpcn6slfqjv23jf7i8zf7950b7h27b0v0dva5pxmn3rw149";
+ sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f";
};
# For some reason (probably a build system bug), the binary isn't
From f6f5b34977f28278af9971a527b12663791a324c Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Mon, 20 Jul 2015 19:58:56 +0000
Subject: [PATCH 042/137] vimPlugins: add vim-multiple-cursors
---
pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++
pkgs/misc/vim-plugins/vim-plugin-names | 1 +
2 files changed, 13 insertions(+)
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index bc568f73945..ba7fda90a70 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -59,6 +59,7 @@ rec {
hoogle = Hoogle;
ipython = vim-ipython;
latex-live-preview = vim-latex-live-preview;
+ multiple-cursors = vim-multiple-cursors;
necoGhc = neco-ghc; # backwards compat, added 2014-10-18
neocomplete = neocomplete-vim;
neosnippet = neosnippet-vim;
@@ -451,6 +452,17 @@ rec {
};
+ vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-multiple-cursors-2015-05-29";
+ src = fetchgit {
+ url = "git://github.com/terryma/vim-multiple-cursors";
+ rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
+ sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
+ };
+ dependencies = [];
+
+ };
+
vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-nerdtree-tabs-2014-09-25";
src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f7b01d8af7f..be9914ef8cf 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -96,6 +96,7 @@
"vim-gitgutter"
"vim-iced-coffee-script"
"vim-latex-live-preview"
+"vim-multiple-cursors"
"vim-signature"
"vim-snippets"
"vim2hs"
From 4d36b10f90a7fcf794bf3172ed6ffa7e0df147db Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 20 Jul 2015 15:03:52 -0500
Subject: [PATCH 043/137] qt53: override postgresql autodetection
---
pkgs/development/libraries/qt-5/5.3/default.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 693f62a63eb..0e606d03db2 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -144,6 +144,11 @@ stdenv.mkDerivation rec {
-${optionalString (buildTests == false) "no"}make tests
'';
+ # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+ # if dependency paths contain the string "pq", which can occur in the hash.
+ # To prevent these failures, we need to override PostgreSQL detection.
+ PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+
propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
From 6a10139bbaf7ba744f543217a33880c728e2dba0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 20 Jul 2015 15:04:44 -0500
Subject: [PATCH 044/137] qt53: disable unsupported SIMD instruction sets
---
pkgs/development/libraries/qt-5/5.3/default.nix | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 0e606d03db2..14675af48fb 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -22,6 +22,8 @@ let
ver = "${v_maj}.${v_min}";
in
+let system-x86_64 = elem stdenv.system platforms.x86_64; in
+
stdenv.mkDerivation rec {
name = "qt-${ver}";
@@ -126,6 +128,16 @@ stdenv.mkDerivation rec {
-no-linuxfb
-no-kms
+ ${optionalString (!system-x86_64) "-no-sse2"}
+ -no-sse3
+ -no-ssse3
+ -no-sse4.1
+ -no-sse4.2
+ -no-avx
+ -no-avx2
+ -no-mips_dsp
+ -no-mips_dspr2
+
-system-zlib
-system-libpng
-system-libjpeg
From 60c6a9921e192fda713ce156155364cd27a8cc3f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 20 Jul 2015 14:22:43 -0700
Subject: [PATCH 045/137] emacs: Update Mac Port Emacs to 24.5-mac-5.9
---
pkgs/applications/editors/emacs-24/macport-24.5.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index a9f3e53fb59..6ea9fbfdbb6 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
emacsName = "emacs-24.5";
- name = "${emacsName}-mac-5.8";
+ name = "${emacsName}-mac-5.9";
#builder = ./builder.sh;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
- sha256 = "0ljhrag5lag8i72xfsmgk9lndqv0b3sahyyd48svj6jlg4jachir";
+ sha256 = "1xjskagjlnni1nqshszbvk8h8vhwq9sk09l25vb6fijn4g9akwqr";
};
buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
From 17d045c74b9211f485b6dd72fe637c52774ac918 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 20 Jul 2015 18:07:06 -0700
Subject: [PATCH 046/137] ceph-git: 2015-07-15 -> 2015-07-20
---
pkgs/tools/filesystems/ceph/git.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 341c24c04a3..f65b7ea7846 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,12 @@
{ callPackage, fetchgit, git, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "2015-07-15";
+ version = "2015-07-20";
src = fetchgit {
url = "git://github.com/ceph/ceph.git";
- rev = "66dcbaed3c3c8e4b5367ba1cd2859271e692e7e0";
- sha256 = "05jba4zjrkksrra6rz4kby8vv4ja8fa73wvwcw3yn3mn1x9kyz2g";
+ rev = "ce534e1e0addfe93194a553cec98799ea97affe4";
+ sha256 = "19i9fp06fdyhx5x6ryw5q81id0354601yxnywvir3i9hy51p9xaz";
};
patches = [ ./fix-pythonpath.patch ];
From 35f8386e782e31315419454fdfebdf26ef445397 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 20 Jul 2015 18:08:29 -0700
Subject: [PATCH 047/137] chromium-dev: Update
---
.../networking/browsers/chromium/source/sources.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 5410293a792..3e2f256eec8 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,10 +1,10 @@
# This file is autogenerated from update.sh in the parent directory.
{
dev = {
- version = "45.0.2454.6";
- sha256 = "09bhbq3hvsfiac7w6ajd6n1lcdzf2isg1s9sqabrnx9blyds7msh";
- sha256bin32 = "1f38rfd9v91inhd9m2sfcj4bpvq5f03zn8ypvacr9mpwc47rylx3";
- sha256bin64 = "1bfjpjisa0hqiy8kmmgh2mr6zyifpmhr7k5ai44h5szf36768bn6";
+ version = "45.0.2454.7";
+ sha256 = "19xjdp0zxr96r2fx9wf30wldalrh393p2dhqwp2n1m751vizbj5s";
+ sha256bin32 = "1id1z3m0pc2lxh4lp9r6babh098gfyz4dda931yjkxhzb9rw1v0d";
+ sha256bin64 = "1sksf651z1sqgh9pwdm5dksqnb0lzhwabxj3myg4w5kxi8s4pi8l";
};
beta = {
version = "44.0.2403.89";
From 337bd6a190ec7add783886092c239876bfd56c90 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 21:44:08 -0500
Subject: [PATCH 048/137] nixpkgs: verilator 3.872 -> 3.874
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 635e89dadc8..825f342b443 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "verilator-${version}";
- version = "3.872";
+ version = "3.874";
src = fetchurl {
url = "http://www.veripool.org/ftp/${name}.tgz";
- sha256 = "113ha7vy6lsi9zygiy3rnsd3dhi5y8lkfsfrh0nwzady7147l2yh";
+ sha256 = "070binwp0jnashi6w45km26vrn6200b8hdg4179lcqyzdxi8c06j";
};
enableParallelBuilding = true;
From 4a6b7fc5638372729f64f90514d4cfa1983fd680 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 21:46:30 -0500
Subject: [PATCH 049/137] nixpkgs: stunnel 5.16 -> 5.20
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/tools/networking/stunnel/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index ef9c56deacb..31acb8dd9ec 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "stunnel-${version}";
- version = "5.16";
+ version = "5.20";
src = fetchurl {
url = "http://www.stunnel.org/downloads/${name}.tar.gz";
- sha256 = "13b0ad7smz4949hchdgsx3yjr5i3z8flwiy8w6xalvk2n8zykdxn";
+ sha256 = "0ar940mw5sjxkh98d6wnrd366jfkqirbyf2b5kcdk1vjk9ra6dja";
};
buildInputs = [ openssl ];
From 3793ff52903dd5d9fb493c0022c06ea5ef018cb3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 20 Jul 2015 21:50:05 -0500
Subject: [PATCH 050/137] nixpkgs: torsocks 2.0.0 -> 2.1.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/tools/security/tor/torsocks.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix
index d4a725fa04a..d7b0139df70 100644
--- a/pkgs/tools/security/tor/torsocks.nix
+++ b/pkgs/tools/security/tor/torsocks.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "torsocks-${version}";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchgit {
url = meta.repositories.git;
rev = "refs/tags/v${version}";
- sha256 = "e3868ae8baadce1854cc9e604a5fcfa0433a15e4eb1223cc9da5b3c586db0048";
+ sha256 = "1q7rbf0j54jh17qs76b6k9hzv4sh4044qfzidjrp6gx576ysrvsf";
};
buildInputs = [ autoreconfHook ];
From f7d962cd423418cecedf48335cdf692fa7b04c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 21 Jul 2015 10:47:28 +0200
Subject: [PATCH 051/137] aiccu: patch gnutls api change
---
pkgs/tools/networking/aiccu/default.nix | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix
index dd53234906d..81d19646a95 100644
--- a/pkgs/tools/networking/aiccu/default.nix
+++ b/pkgs/tools/networking/aiccu/default.nix
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
buildInputs = [ gnutls iproute makeWrapper ];
+ patches = [
+ (fetchurl {
+ url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/gnutls-3.4.0.patch?h=packages/aiccu&id=cc6decc4e734420e4c5d0cd28652077f6bd88d84";
+ sha256 = "1ni3lhwy3r54js124p7fhm1my82a703chvh07vrhslb4v4b71g5s";
+ name = "gnutls-3.4.0.patch";
+ })
+ ];
+
configureFlags = "--prefix=$out";
installPhase = ''
install -D -m 755 unix-console/aiccu $out/bin/aiccu
From 768daf76912385bf6bb106d802bdb3345211de69 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 10:51:02 +0200
Subject: [PATCH 052/137] anki: fix build (ZHF)
---
pkgs/games/anki/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index af90c826705..8c5ad4ab0d8 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ];
preConfigure = ''
- substituteInPlace anki \
+ substituteInPlace anki/anki \
--replace /usr/share/ $out/share/
substituteInPlace Makefile \
From 69afeeba322743e512370863d5531bd0a4e72f43 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 11:03:11 +0200
Subject: [PATCH 053/137] mechanize: 0.1.11 -> 0.2.5 (ZHF). Old mechanize
failed to build due to setuptools bump.
---
pkgs/top-level/python-packages.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aabd4eebd90..2537011f98f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7351,16 +7351,18 @@ let
mechanize = buildPythonPackage (rec {
- name = "mechanize-0.1.11";
+ name = "mechanize-0.2.5";
disabled = isPy3k;
src = pkgs.fetchurl {
- url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz";
- sha256 = "1h62mwy4iz09jqz17nrb9j8y0djd500zdfqwrz9xmdwqzqwixkj2";
+ url = "https://pypi.python.org/packages/source/m/mechanize/${name}.tar.gz";
+ sha256 = "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf";
};
propagatedBuildInputs = with self; [ clientform ];
+ doCheck = false;
+
meta = {
description = "Stateful programmatic web browsing in Python";
From 0907d28da4a49e5474ebca279d8e0beecaa50163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 11:11:48 +0200
Subject: [PATCH 054/137] opencascade: fix the build, really now
---
pkgs/top-level/all-packages.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea85bd3547b..32452c5e78a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7650,6 +7650,7 @@ let
opencascade = callPackage ../development/libraries/opencascade {
tcl = tcl-8_5;
+ tk = tk-8_5;
};
opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix {
From 8050aa1c806aa9845c7bf4556fa4e097e697c060 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 19 Jul 2015 22:05:32 +0200
Subject: [PATCH 055/137] scsh: 0.6.7 -> 0.7 pre-release
The scsh HEAD is buildable, whereas 0.6.7 segfaults during image creation.
---
.../development/interpreters/scsh/default.nix | 30 ++++++++-----------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix
index 98b4f55f79b..ad2bf945f96 100644
--- a/pkgs/development/interpreters/scsh/default.nix
+++ b/pkgs/development/interpreters/scsh/default.nix
@@ -1,26 +1,22 @@
-{stdenv, fetchurl}:
-
-let
- pname = "scsh";
- version = "0.6.7";
- name = "${pname}-${version}";
-in
+{ stdenv, fetchgit, autoconf, automake, autoreconfHook, scheme48 }:
stdenv.mkDerivation {
- inherit name;
+ name = "scsh-0.7pre";
- src = fetchurl {
- url = "mirror://sourceforge/${pname}/${name}.tar.gz";
- sha256 = "c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f";
+ src = fetchgit {
+ url = "git://github.com/scheme/scsh.git";
+ rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
+ fetchSubmodules = true;
+ sha256 = "0fz1r0bmiii9ld91r84dqkqwhnqk0h6drdycq93zcy5ndyn12fqp";
};
- meta = {
+ buildInputs = [ autoconf automake autoreconfHook scheme48 ];
+ configureFlags = ''--with-scheme48=${scheme48}'';
+
+ meta = with stdenv.lib; {
description = "A Scheme shell";
- longDescription = ''
- SCSH is an implementation of the Scheme shell. It is implemented as
- a heap image which is interpreted by the Scheme 48 virtual machine.
- '';
homepage = http://www.scsh.net/;
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ joachifm ];
};
}
From b9f4c3b981828827806e31716e689268d4d40fc0 Mon Sep 17 00:00:00 2001
From: Sean Leather <sean.leather@gmail.com>
Date: Tue, 21 Jul 2015 11:37:31 +0200
Subject: [PATCH 056/137] closure-compiler: 20150315 -> 20150609
---
pkgs/development/compilers/closure/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 2135e75a07a..9d9eb42b064 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
- version = "20150315";
+ version = "20150609";
src = fetchurl {
url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
- sha256 = "1vzwyhpqbrndg7mri81f1b2yi8cshw5pghvdda9vdxgq465sa52f";
+ sha256 = "0347j50kg41agrvpb29vp69ra912ljhp206z9kbrk84lxpmx19rp";
};
phases = [ "installPhase" ];
From 5317cf9ff413d18700f441a0967f82d3d3a16d7d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 11:40:04 +0200
Subject: [PATCH 057/137] go: 1.0 and 1.2 not supported on i686 (ZHF)
---
pkgs/development/compilers/go/1.2.nix | 2 +-
pkgs/development/compilers/go/default.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index bbedea812b8..7aaedcb365d 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -87,6 +87,6 @@ stdenv.mkDerivation {
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ pierron viric ];
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix
index b35159c10e7..b16ce93a3c5 100644
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@@ -90,6 +90,6 @@ stdenv.mkDerivation {
description = "The Go Programming language";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [ pierron viric ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
From 02b1c2727bc7b0cab3085b4c20c9e1615d0af2b7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 11:41:01 +0200
Subject: [PATCH 058/137] go: rename default.nix to 1.0.nix
---
pkgs/development/compilers/go/{default.nix => 1.0.nix} | 0
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename pkgs/development/compilers/go/{default.nix => 1.0.nix} (100%)
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/1.0.nix
similarity index 100%
rename from pkgs/development/compilers/go/default.nix
rename to pkgs/development/compilers/go/1.0.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32452c5e78a..1e55145c312 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3970,7 +3970,7 @@ let
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; });
- go_1_0 = callPackage ../development/compilers/go { };
+ go_1_0 = callPackage ../development/compilers/go/1.0.nix { };
go_1_1 =
if stdenv.isDarwin then
From a3552280f82127f998c150be2d5582890a3bf016 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 11 May 2015 18:47:56 -0400
Subject: [PATCH 059/137] riak-2.1.1: new package
---
pkgs/servers/nosql/riak/2.1.1.nix | 94 +++++++++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 1 +
2 files changed, 95 insertions(+)
create mode 100644 pkgs/servers/nosql/riak/2.1.1.nix
diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix
new file mode 100644
index 00000000000..ce160312dbb
--- /dev/null
+++ b/pkgs/servers/nosql/riak/2.1.1.nix
@@ -0,0 +1,94 @@
+{ stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }:
+
+let
+ solrName = "solr-4.7.0-yz-1.tgz";
+ yokozunaJarName = "yokozuna-2.jar";
+ yzMonitorJarName = "yz_monitor-1.jar";
+
+ srcs = {
+ riak = fetchurl {
+ url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.1/2.1.1/riak-2.1.1.tar.gz";
+ sha256 = "1bm5j3zknz82mkyh5zgaap73awflh4mkibdvdz164235mdxlwhdm";
+ };
+ solr = fetchurl {
+ url = "http://s3.amazonaws.com/files.basho.com/solr/${solrName}";
+ sha256 = "0brml3lb3xk26rmi05rrzpxrw92alfi9gi7p7537ny9lqg3808qp";
+ };
+ yokozunaJar = fetchurl {
+ url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yokozunaJarName}";
+ sha256 = "0xzfy181qxv27pc4f5xd0szn8vls5743273awr5rwv3608gkspj2";
+ };
+ yzMonitorJar = fetchurl {
+ url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yzMonitorJarName}";
+ sha256 = "0kb97d1a43vw759j1h5qwbhx455pidn2pi7sfxijqic37h81ri1m";
+ };
+ };
+in
+
+stdenv.mkDerivation rec {
+ name = "riak-2.1.1";
+
+ buildInputs = [
+ which unzip erlangR16 pam
+ ];
+
+ src = srcs.riak;
+
+ postPatch = ''
+ sed -i deps/node_package/priv/base/env.sh \
+ -e 's@{{platform_data_dir}}@$RIAK_DATA_DIR@' \
+ -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
+ -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
+ -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=$RIAK_ETC_DIR@' \
+ -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=$RIAK_LOG_DIR@'
+ '';
+
+ preBuild = ''
+ mkdir solr-pkg
+ cp ${srcs.solr} solr-pkg/${solrName}
+ export SOLR_PKG_DIR=$(readlink -f solr-pkg)
+
+ mkdir -p deps/yokozuna/priv/java_lib
+ cp ${srcs.yokozunaJar} deps/yokozuna/priv/java_lib/${yokozunaJarName}
+
+ mkdir -p deps/yokozuna/priv/solr/lib/ext
+ cp ${srcs.yzMonitorJar} deps/yokozuna/priv/solr/lib/ext/${yzMonitorJarName}
+
+ patchShebangs .
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ make locked-deps
+ make rel
+
+ runHook postBuild
+ '';
+
+ doCheck = false;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out
+ mv rel/riak/etc rel/riak/riak-etc
+ mkdir -p rel/riak/etc
+ mv rel/riak/riak-etc rel/riak/etc/riak
+ mv rel/riak/* $out
+
+ for prog in $out/bin/*; do
+ substituteInPlace $prog \
+ --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \
+ ". $out/lib/env.sh"
+ done
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ maintainers = with maintainers; [ cstrahan ];
+ description = "Dynamo inspired NoSQL DB by Basho";
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e55145c312..fbb6b48df35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9011,6 +9011,7 @@ let
};
riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
+ riak2 = callPackage ../servers/nosql/riak/2.1.1.nix { };
influxdb = callPackage ../servers/nosql/influxdb { };
From cbf935f90ee368652d8bc28fc5bb0abb6d1509a6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 13:20:22 +0200
Subject: [PATCH 060/137] ekiga: fid build failure, use adwaita-icon-theme
instead of gnome-icon-theme (ZHF)
---
.../applications/networking/instant-messengers/ekiga/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 7ce47d53d14..b7b92315911 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
preAutoreconf = ''
substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 ""
+ substituteInPlace configure.ac --replace gnome-icon-theme adwaita-icon-theme
'';
configureFlags = [
From fdbd928fcea1da6466723826c1de73aaf675570e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 11:47:38 +0200
Subject: [PATCH 061/137] qtcreator: fix build by using qt5Full
/cc #8596.
---
pkgs/top-level/all-packages.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e55145c312..aeb39893d2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7898,7 +7898,8 @@ let
};
qtcreator = callPackage ../development/qtcreator {
- qtLib = qt48.override { developerBuild = true; };
+ qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4
+ withDocumentation = false; # FIXME: fails to setup some paths
};
qtkeychain = callPackage ../development/libraries/qtkeychain { };
From b454ff7cbbc5925e4018ee1fc3f2f03939192f4e Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Tue, 21 Jul 2015 14:03:29 +0200
Subject: [PATCH 062/137] Add sitePackages to pypy's passthru
---
pkgs/development/interpreters/pypy/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index 143bab57534..a4eb7439b0d 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -114,6 +114,7 @@ let
isPypy = true;
buildEnv = callPackage ../python/wrapper.nix { python = self; };
interpreter = "${self}/bin/${executable}";
+ sitePackages = "lib/${libPrefix}/site-packages";
};
enableParallelBuilding = true; # almost no parallelization without STM
From 0bb1b47cc2b5c5f834592fb9ea5e1bf65887e7f4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 21 Jul 2015 13:35:54 +0200
Subject: [PATCH 063/137] mozplugger: 1.12.0 -> 2.1.6
The source url for 1.12.0 returns 404, so this update fixes the build
as well.
---
.../mozilla-plugins/mozplugger/default.nix | 42 ++++++++-----------
pkgs/top-level/all-packages.nix | 3 +-
2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
index 37d5cbe039f..17012850a31 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
@@ -1,36 +1,30 @@
-a :
-let
- fetchurl = a.fetchurl;
+{ stdenv, fetchurl, firefox, libX11, xproto }:
+
+stdenv.mkDerivation rec {
+ name = "mozplugger-${version}";
+ version = "2.1.6";
- version = a.lib.attrByPath ["version"] "1.12.0" a;
- buildInputs = with a; [
- firefox libX11 xproto
- ];
-in
-rec {
src = fetchurl {
url = "http://mozplugger.mozdev.org/files/mozplugger-${version}.tar.gz";
- sha256 = "1vpggfmbv4h3srk80rgidd020i03hrkpb7cfxkwagkcd0zcal4hk";
+ sha256 = "1vszkq4kdbaxsrqr2xn9rq6ipza9fngdri79gvjqk3bvsdmg0k19";
};
- inherit buildInputs;
- configureFlags = [];
- makeFlags = ["linux" "prefix=" "root=$out"];
+ buildInputs = [ firefox libX11 xproto ];
- preBuild = a.fullDepEntry(''
- sed -e s@/usr/@"$out/"@g -i mozplugger.c
- '') ["doUnpack" "minInit"];
+ installPhase = ''
+ mkdir -p "$out/etc" "$out/bin" "$out/lib/mozilla/plugins" "$out/share/man/man7"
+ cp mozpluggerrc "$out/etc"
+ cp mozplugger-{helper,controller,linker,update} "$out/bin"
+ cp mozplugger.so "$out/lib/mozilla/plugins"
+ cp mozplugger.7 "$out/share/man/man7"
- postInstall = a.fullDepEntry(''
- mkdir -p $out/share/${name}/plugin
- ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin
- '') ["doMakeInstall" "minInit" "defEnsureDir"];
+ mkdir -p "$out/share/${name}/plugin"
+ ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${name}/plugin"
+ '';
- /* doConfigure should be removed if not needed */
- phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
-
- name = "mozplugger-" + version;
meta = {
description = "Mozilla plugin for launching external program for handling in-page objects";
+ homepage = http://mozplugger.mozdev.org/;
+ license = stdenv.lib.licenses.gpl2Plus;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e7849dd1a..87b7f03fc36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12019,8 +12019,7 @@ let
mopidy-mopify = callPackage ../applications/audio/mopidy-mopify { };
- mozplugger = builderDefsPackage (import ../applications/networking/browsers/mozilla-plugins/mozplugger) {
- inherit firefox;
+ mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {
inherit (xlibs) libX11 xproto;
};
From 51a76a71d7702671243a19f9af53dfe2271fa63f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:12:51 +0200
Subject: [PATCH 064/137] cogl: disable gles on darwin (ZHF). Untested on
darwin.
---
pkgs/development/libraries/cogl/1.20.nix | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix
index 1489f48c9b4..5eb12fe2998 100644
--- a/pkgs/development/libraries/cogl/1.20.nix
+++ b/pkgs/development/libraries/cogl/1.20.nix
@@ -18,10 +18,9 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-introspection"
- "--enable-gles1"
- "--enable-gles2"
"--enable-kms-egl-platform"
- ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+ ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
propagatedBuildInputs = with xorg; [
glib gdk_pixbuf gobjectIntrospection
From 4579e57604ac96bc1e0d182aa9ca988ca740ae4a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:20:59 +0200
Subject: [PATCH 065/137] go tools: add package alias to fix other packages
(ZHF)
---
pkgs/top-level/go-packages.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index bab63e87b30..7b2ed01c196 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -136,6 +136,7 @@ let
rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9";
name = "tools-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "golang.org/x/tools";
+ goPackageAliases = [ "code.google.com/p/go.tools" ];
preConfigure = ''
# Make the builtin tools available here
From 840fcacdb93da204154b33132248d62c70274a89 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:24:38 +0200
Subject: [PATCH 066/137] go go-etcd: disable on go 1.3 (ZHF)
---
pkgs/top-level/go-packages.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 7b2ed01c196..a365388597d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1149,6 +1149,8 @@ let
rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8";
name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/coreos/go-etcd";
+ disabled = isGo13;
+
src = fetchFromGitHub {
inherit rev;
owner = "coreos";
From bbc7e18ed7ccea7ba85713f461e5017a1f27fcef Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:24:45 +0200
Subject: [PATCH 067/137] go go-systemd: disable on go 1.3 (ZHF)
---
pkgs/top-level/go-packages.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a365388597d..b20443674c0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1423,6 +1423,7 @@ let
rev = "2688e91251d9d8e404e86dd8f096e23b2f086958";
name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/coreos/go-systemd";
+ disabled = isGo13;
excludedPackages = "examples";
From babb744b71819c4c3a412168e633958657805a2a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 21 Jul 2015 06:16:18 -0400
Subject: [PATCH 068/137] riak: new nixos service
---
nixos/modules/misc/ids.nix | 2 +
nixos/modules/module-list.nix | 1 +
nixos/modules/services/databases/riak.nix | 148 ++++++++++++++++++++++
nixos/tests/riak.nix | 21 +++
4 files changed, 172 insertions(+)
create mode 100644 nixos/modules/services/databases/riak.nix
create mode 100644 nixos/tests/riak.nix
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index fd75db1abe7..b53b9c47b01 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -226,6 +226,7 @@
gitit = 202;
riemanntools = 203;
subsonic = 204;
+ riak = 205;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -430,6 +431,7 @@
gitit = 202;
riemanntools = 203;
subsonic = 204;
+ riak = 205;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f771bced5ef..7e2c42f2b8c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -131,6 +131,7 @@
./services/databases/opentsdb.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
+ ./services/databases/riak.nix
./services/databases/virtuoso.nix
./services/desktops/accountsservice.nix
./services/desktops/geoclue2.nix
diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix
new file mode 100644
index 00000000000..bee768fa42a
--- /dev/null
+++ b/nixos/modules/services/databases/riak.nix
@@ -0,0 +1,148 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.riak;
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.riak = {
+
+ enable = mkEnableOption "riak";
+
+ package = mkOption {
+ type = types.package;
+ example = literalExample "pkgs.riak2";
+ description = ''
+ Riak package to use.
+ '';
+ };
+
+ nodeName = mkOption {
+ type = types.string;
+ default = "riak@127.0.0.1";
+ description = ''
+ Name of the Erlang node.
+ '';
+ };
+
+ distributedCookie = mkOption {
+ type = types.string;
+ default = "riak";
+ description = ''
+ Cookie for distributed node communication. All nodes in the
+ same cluster should use the same cookie or they will not be able to
+ communicate.
+ '';
+ };
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/db/riak";
+ description = ''
+ Data directory for Riak.
+ '';
+ };
+
+ logDir = mkOption {
+ type = types.path;
+ default = "/var/log/riak";
+ description = ''
+ Log directory for Riak.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Additional text to be appended to <filename>riak.conf</filename>.
+ '';
+ };
+
+ };
+
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ cfg.package ];
+ environment.etc."riak/riak.conf".text = ''
+ nodename = ${cfg.nodeName}
+ distributed_cookie = ${cfg.distributedCookie}
+
+ platform_log_dir = ${cfg.logDir}
+ platform_etc_dir = /etc/riak
+ platform_data_dir = ${cfg.dataDir}
+
+ ${cfg.extraConfig}
+ '';
+
+ users.extraUsers.riak = {
+ name = "riak";
+ uid = config.ids.uids.riak;
+ group = "riak";
+ description = "Riak server user";
+ };
+
+ users.extraGroups.riak.gid = config.ids.gids.riak;
+
+ systemd.services.riak = {
+ description = "Riak Server";
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ path = [
+ pkgs.utillinux # for `logger`
+ pkgs.bash
+ ];
+
+ environment.RIAK_DATA_DIR = "${cfg.dataDir}";
+ environment.RIAK_LOG_DIR = "${cfg.logDir}";
+ environment.RIAK_ETC_DIR = "/etc/riak";
+
+ preStart = ''
+ if ! test -e ${cfg.logDir}; then
+ mkdir -m 0755 -p ${cfg.logDir}
+ chown -R riak ${cfg.logDir}
+ fi
+
+ if ! test -e ${cfg.dataDir}; then
+ mkdir -m 0700 -p ${cfg.dataDir}
+ chown -R riak ${cfg.dataDir}
+ fi
+ '';
+
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/riak console";
+ ExecStop = "${cfg.package}/bin/riak stop";
+ StandardInput = "tty";
+ User = "riak";
+ Group = "riak";
+ PermissionsStartOnly = true;
+ # Give Riak a decent amount of time to clean up.
+ TimeoutStopSec = 120;
+ LimitNOFILE = 65536;
+ };
+
+ unitConfig.RequiresMountsFor = [
+ "${cfg.dataDir}"
+ "${cfg.logDir}"
+ "/etc/riak"
+ ];
+ };
+
+ };
+
+}
diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix
new file mode 100644
index 00000000000..a56f51c4e50
--- /dev/null
+++ b/nixos/tests/riak.nix
@@ -0,0 +1,21 @@
+import ./make-test.nix {
+ name = "riak";
+
+ nodes = {
+ master =
+ { pkgs, config, ... }:
+
+ {
+ services.riak.enable = true;
+ services.riak.package = pkgs.riak2;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $master->waitForUnit("riak");
+ $master->sleep(20); # Hopefully this is long enough!!
+ $master->succeed("RIAK_DATA_DIR='/var/db/riak' RIAK_LOG_DIR='/var/log/riak' RIAK_ETC_DIR='/etc/riak' riak ping 2>&1");
+ '';
+}
From ee0db7648c02606f6c81892abdfc0051c96ff949 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 15:50:31 +0200
Subject: [PATCH 069/137] signon: update to fix build (ZHF). cc @ttuegel
---
pkgs/development/libraries/signon/default.nix | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix
index 0bafb42e2c5..7b3defb8a58 100644
--- a/pkgs/development/libraries/signon/default.nix
+++ b/pkgs/development/libraries/signon/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, doxygen, qt5 }:
+{ stdenv, fetchzip, doxygen, qt5 }:
stdenv.mkDerivation rec {
- name = "signon-8.56";
- src = fetchurl {
- url = "https://accounts-sso.googlecode.com/files/${name}.tar.bz2";
- sha256 = "00kwysm7bga0bycclkcyslsa6aahcn98drm125l6brzhigc7qxa8";
+ name = "signon-${version}";
+ version = "8.57";
+ src = fetchzip {
+ url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip";
+ sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a";
};
buildInputs = [ qt5.base ];
@@ -14,11 +15,4 @@ stdenv.mkDerivation rec {
qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5
'';
- postInstall = ''
- mv $out/lib/cmake/SignOnQt5/SignOnQtConfig.cmake \
- $out/lib/cmake/SignOnQt5/SignOnQt5Config.cmake
- mv $out/lib/cmake/SignOnQt5/SignOnQtConfigVersion.cmake \
- $out/lib/cmake/SignOnQt5/SignOnQt5ConfigVersion.cmake
- '';
-
}
From bfa5df6a5e96ff06cecea38b4f685996e4e68558 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:01:20 +0200
Subject: [PATCH 070/137] pahole: fix build (ZHF)
---
pkgs/development/tools/misc/pahole/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
index 739cc7e5143..38de21872b9 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
postInstall = ''
for p in $out/bin/*; do
- rpath=`patchelf --print-rpath $p`:$out
- patchelf --set-rpath $rpath $p
+ rpath=`patchelf --print-rpath $p || true`:$out
+ patchelf --set-rpath "$rpath" $p || true
done
'';
From 5c485cfff5e6b4b0066bd0daae538d408abf733b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:05:11 +0200
Subject: [PATCH 071/137] perlPackages.MHonArc: fix installation (ZHF)
---
pkgs/top-level/perl-packages.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 97b98605cc2..8aaf05d8bc0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5660,6 +5660,9 @@ let self = _self // overrides; _self = with self; {
sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2";
};
propagatedBuildInputs = [ ];
+
+ installTargets = "install";
+
meta = with stdenv.lib; {
homepage = http://dcssrv1.oit.uci.edu/indiv/ehood/mhonarch.html;
description = "A mail-to-HTML converter";
From 5a4d349ce70ac8f220ee8f56e98a881e4f2cc5d0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:18:21 +0200
Subject: [PATCH 072/137] processing: fix build (ZHF)
---
pkgs/applications/graphics/processing/default.nix | 10 +++++-----
pkgs/top-level/all-packages.nix | 5 ++++-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index ecce0e260bb..69e5ccb85ec 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }:
+{ fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }:
stdenv.mkDerivation rec {
name = "processing-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# Stop it trying to download its own version of java
patches = [ ./use-nixpkgs-jre.patch ];
- buildInputs = [ ant jre makeWrapper libXxf86vm which ];
+ buildInputs = [ ant jdk makeWrapper libXxf86vm which ];
buildPhase = "cd build && ant build";
@@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -r linux/work/* $out/${name}/
makeWrapper $out/${name}/processing $out/bin/processing \
- --prefix PATH : "${jre}/bin:${which}/bin" \
+ --prefix PATH : "${jdk}/bin:${which}/bin" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
makeWrapper $out/${name}/processing-java $out/bin/processing-java \
- --prefix PATH : "${jre}/bin:${which}/bin" \
+ --prefix PATH : "${jdk}/bin:${which}/bin" \
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
- ln -s ${jre} $out/${name}/java
+ ln -s ${jdk} $out/${name}/java
'';
meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d4bd57fa67..d66ebf21e1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12365,7 +12365,10 @@ let
qiv = callPackage ../applications/graphics/qiv { };
- processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; };
+ processing = callPackage ../applications/graphics/processing {
+ inherit (xorg) libXxf86vm;
+ jdk = jdk7;
+ };
# perhaps there are better apps for this task? It's how I had configured my preivous system.
# And I don't want to rewrite all rules
From 9f4936942cb3a9c9e3448ebcdbbf4986be5c0539 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 15 Jul 2015 02:41:11 +0200
Subject: [PATCH 073/137] dropbox: 3.6.7 -> 3.6.9
---
pkgs/applications/networking/dropbox/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 33df71c62c3..5a37a8eb76a 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -19,11 +19,11 @@
let
# NOTE: When updating, please also update in current stable, as older versions stop working
- version = "3.6.7";
+ version = "3.6.9";
sha256 =
{
- "x86_64-linux" = "1jwzrpw382amx0jap9m411a3yvkc9iwnw6n35kwq3infmbwjs6q8";
- "i686-linux" = "0rjd908bhfk00qh6gvizf2fyfb3cccd78spyvh435z377x2pmxzy";
+ "x86_64-linux" = "1i260mi40siwcx9b2sj4zwszxmj1l88mpmyqncsfa72k02jz22j3";
+ "i686-linux" = "0qqc8qbfaighbhjq9y22ka6n6apl8b6cr80a9rkpk2qsk99k8h1z";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
From 63eccd2b2d630e68405598d09be88ba50c1684e5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:26:47 +0200
Subject: [PATCH 074/137] pyutil: 1.7.9 -> 2.0.0. Fixes build failure (ZHF)
---
pkgs/top-level/python-packages.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2537011f98f..aa0ea9282f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11134,11 +11134,11 @@ let
pyutil = buildPythonPackage (rec {
- name = "pyutil-1.7.9";
+ name = "pyutil-2.0.0";
src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz";
- sha256 = "c303bb779f96073820e2eb7c9692fe15a57df491eb356839f3cb3377ed03b844";
+ sha256 = "1fsg9yz5mi2sb0h6c1vvcqchx56i89nbvdb5gfgv1ia3b2w5ra8c";
};
buildInputs = with self; [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []);
From e4239cc8ad6fe313166497ffd30a6bf00811427f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 16:51:53 +0200
Subject: [PATCH 075/137] qpid-cpp: 0.26 -> 0.34. Fixes build (ZHF)
---
pkgs/servers/amqp/qpid-cpp/default.nix | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index 69c0a3dff41..410bd23eb30 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -1,14 +1,13 @@
{ stdenv, fetchurl, cmake, python, boost, libuuid, ruby }:
stdenv.mkDerivation rec {
- name = "${project}-cpp-${version}";
+ name = "qpid-cpp-${version}";
- project = "qpid";
- version = "0.26";
+ version = "0.34";
src = fetchurl {
- url = "mirror://apache/${project}/${version}/${name}.tar.gz";
- sha256 = "1c03yi19d5h5h78h37add9csmy0mzvvmvn7zkcalwszabdhsb5yk";
+ url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz";
+ sha256 = "07ibwvw5lm7xabv32zai5x03r7l9mxm0zk7h9lbfkzmav0f41w0w";
};
buildInputs = [ cmake python boost libuuid ruby ];
From eee8823c37c8d505a5448c7a414a17794039ded5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 17:22:01 +0200
Subject: [PATCH 076/137] Revert "samba: 4.2.1 -> 4.2.3"
This reverts commit be0f468926ff805b9fae4bba87a0fc8b628cbc1a.
---
pkgs/servers/samba/4.x.nix | 4 ++--
pkgs/top-level/all-packages.nix | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 1cdf7ad2ed0..a31846c54aa 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@
with lib;
stdenv.mkDerivation rec {
- name = "samba-4.2.3";
+ name = "samba-4.2.1";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
- sha256 = "0z2c17d2id0m59mfdxdljhizp97l29clmw6g5zp93n0q92pabpxn";
+ sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip";
};
patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d66ebf21e1a..16f19bdc7d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9153,6 +9153,7 @@ let
samba4 = callPackage ../servers/samba/4.x.nix {
python = python2;
kerberos = null; # Bundle kerberos because samba uses internal, non-stable functions
+ gnutls = gnutls33;
# enableLDAP
};
From c6b1625a53677729280e2caa2058e5d2e936c0e2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 17:32:44 +0200
Subject: [PATCH 077/137] sipwitch: 1.6.1 -> 1.9.8. Fixes build (ZHF)
---
pkgs/servers/sip/sipwitch/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 14cd91ee141..8eecfa1e276 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
stdenv.mkDerivation rec {
- name = "sipwitch-1.6.1";
+ name = "sipwitch-1.9.8";
src = fetchurl {
url = "mirror://gnu/sipwitch/${name}.tar.gz";
- sha256 = "1sa4fbv8filzcxqx2viyixsq4pwgvkidn6l6g3k62gl8bvdfk7p9";
+ sha256 = "0117c5iid1vrwl7sl3pys2jlinpmx2vfp8wcdwk93m7cc6k9793b";
};
buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];
From dc5b74ab788e6156a29ec5ef83521826a7104a33 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 17:34:52 +0200
Subject: [PATCH 078/137] spamassassin: fix rules installation (ZHF)
---
pkgs/servers/mail/spamassassin/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index ea69d036f95..e46a76a9b0c 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -32,6 +32,7 @@ buildPerlPackage rec {
doCheck = false;
postInstall = ''
+ mkdir -p $out/share/spamassassin
mv "rules/"* $out/share/spamassassin/
for n in "$out/bin/"*; do
From 14502c6446b5f516c6fa79a473d1880ff41e56f9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 17:37:08 +0200
Subject: [PATCH 079/137] Revert "Revert "samba: 4.2.1 -> 4.2.3""
This reverts commit eee8823c37c8d505a5448c7a414a17794039ded5.
Wrong revert. Sorry.
---
pkgs/servers/samba/4.x.nix | 4 ++--
pkgs/top-level/all-packages.nix | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index a31846c54aa..1cdf7ad2ed0 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@
with lib;
stdenv.mkDerivation rec {
- name = "samba-4.2.1";
+ name = "samba-4.2.3";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
- sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip";
+ sha256 = "0z2c17d2id0m59mfdxdljhizp97l29clmw6g5zp93n0q92pabpxn";
};
patches =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16f19bdc7d9..d66ebf21e1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9153,7 +9153,6 @@ let
samba4 = callPackage ../servers/samba/4.x.nix {
python = python2;
kerberos = null; # Bundle kerberos because samba uses internal, non-stable functions
- gnutls = gnutls33;
# enableLDAP
};
From 148dcf4d1ce54079ed1c8746812975892ff6b611 Mon Sep 17 00:00:00 2001
From: Tadas Barzdzius <tadas@barzdzius.lt>
Date: Tue, 21 Jul 2015 19:08:15 +0300
Subject: [PATCH 080/137] Vagrant: 1.7.3 -> 1.7.4 (ZHF)
---
pkgs/development/tools/vagrant/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 97136aa255e..085807e1bfa 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,7 +4,7 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
let
- version = "1.7.3";
+ version = "1.7.4";
rake = buildRubyGem {
inherit ruby;
name = "rake-10.3.2";
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
- sha256 = "0zg2sdxgrmwqvzqw4z8d6ji8d0cby33nggv0n9ncjxp0wjiv8nkm";
+ sha256 = "0dl3cskpz7d8mmv0ah86426vlx0lj1wkjdlb5gc868dfsysw5lnw";
}
else
fetchurl {
url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
- sha256 = "0r23w49jwl3c3g4nns5xnrsrqyfkqsgln91cj30hxkw50d0ldpvs";
+ sha256 = "0sns9q48c6b2sabp6bwkppx8ffp774jhv69jrv225qrnifx12105";
};
meta = with stdenv.lib; {
@@ -93,12 +93,12 @@ stdenv.mkDerivation rec {
preFixup = ''
# 'hide' the template file from shebang-patching
- chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+ chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable
chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
'';
postFixup = ''
- chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+ chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.5/lib/bundler/templates/Executable
chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
'';
}
From f8f0c7196e4494d31d8be29af67a014d7ecb86fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 18:50:13 +0200
Subject: [PATCH 081/137] gnome-control-center: disable parallel building
It fails on Hydra sometimes. Reported upstream.
---
.../gnome-3/3.16/core/gnome-control-center/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 0c676c38efa..0a688115f14 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
- enableParallelBuilding = true;
+ # https://bugzilla.gnome.org/show_bug.cgi?id=752596
+ enableParallelBuilding = false;
buildInputs = with gnome3;
[ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
From 04356dc250dbd642dbebdc800da39566caff8644 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 21 Jul 2015 18:53:55 +0200
Subject: [PATCH 082/137] samba: drop heimdal compat patch to fix the build
(ZHF)
---
pkgs/servers/samba/4.x-heimdal-compat.patch | 16 ----------------
pkgs/servers/samba/4.x.nix | 2 +-
2 files changed, 1 insertion(+), 17 deletions(-)
delete mode 100644 pkgs/servers/samba/4.x-heimdal-compat.patch
diff --git a/pkgs/servers/samba/4.x-heimdal-compat.patch b/pkgs/servers/samba/4.x-heimdal-compat.patch
deleted file mode 100644
index 35f01e4001e..00000000000
--- a/pkgs/servers/samba/4.x-heimdal-compat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
-index bb476e1..0a407a4 100644
---- a/source4/kdc/kdc.c
-+++ b/source4/kdc/kdc.c
-@@ -967,9 +967,9 @@ static void kdc_task_init(struct task_server *task)
- * The old behavior in the _kdc_get_preferred_key()
- * function is use_strongest_server_key=TRUE.
- */
-- kdc->config->as_use_strongest_session_key = false;
-+ kdc->config->tgt_use_strongest_session_key = false;
-+ kdc->config->svc_use_strongest_session_key = false;
- kdc->config->preauth_use_strongest_session_key = false;
-- kdc->config->tgs_use_strongest_session_key = false;
- kdc->config->use_strongest_server_key = true;
-
- /* Register hdb-samba4 hooks for use as a keytab */
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 1cdf7ad2ed0..6b8347177a0 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
patches =
[ ./4.x-no-persistent-install.patch
./4.x-fix-ctdb-deps.patch
- ] ++ stdenv.lib.optional enableKerberos ./4.x-heimdal-compat.patch;
+ ];
buildInputs =
[ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
From ecb38b5fb6f12b19862fedbb6774fb886dbd84c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 18:54:10 +0200
Subject: [PATCH 083/137] gnome-control-center: meta fixes
Description was wrong, and add meta. Taken from Debian.
/cc maintainer @lethalman, also for the grandparent commit.
---
.../gnome-3/3.16/core/gnome-control-center/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 0a688115f14..5d6e504951f 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Single sign-on framework for GNOME";
+ description = "Utilities to configure the GNOME desktop";
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ lethalman ];
platforms = platforms.linux;
};
From 0015a47229b681a0beeddf1e340d32aaf4831cbe Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 21 Jul 2015 18:59:40 +0200
Subject: [PATCH 084/137] khal: Change source to pypi.python.org
---
pkgs/applications/misc/khal/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 2652af9bed9..db7af2df052 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -5,8 +5,8 @@ pythonPackages.buildPythonPackage rec {
name = "khal-${version}";
src = fetchurl {
- url = "https://github.com/geier/khal/archive/v${version}.tar.gz";
- sha256 = "1rjs5s8ky4n628rs6l5ggaj2abb4kq2avvxmimjjgxz3zh9xlz6s";
+ url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz";
+ sha256 = "1042vnc0vsaf0yr44hb0bh227d4rn81smvxksrzwdwja3wwxk4m9";
};
propagatedBuildInputs = with pythonPackages; [
From 8de63957a5bfca69708eaced1a925eeba7a578a3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 21 Jul 2015 19:59:41 +0300
Subject: [PATCH 085/137] memtester: init at 4.3.0
---
pkgs/tools/system/memtester/default.nix | 21 +++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 23 insertions(+)
create mode 100644 pkgs/tools/system/memtester/default.nix
diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix
new file mode 100644
index 00000000000..2663f3b852a
--- /dev/null
+++ b/pkgs/tools/system/memtester/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "memtester-${version}";
+ version = "4.3.0";
+
+ src = fetchurl {
+ url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz";
+ sha256 = "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr";
+ };
+
+ installFlags = [ "INSTALLPATH=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "A userspace utility for testing the memory subsystem for faults";
+ homepage = http://pyropus.ca/software/memtester/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.dezgeg ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e55145c312..ed6d668ad8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1996,6 +1996,8 @@ let
makebootfat = callPackage ../tools/misc/makebootfat { };
+ memtester = callPackage ../tools/system/memtester { };
+
minidlna = callPackage ../tools/networking/minidlna { };
mmv = callPackage ../tools/misc/mmv { };
From d15d02c824a5998b6815ae9c2ca0a70de2d35d2a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 21 Jul 2015 19:00:03 +0200
Subject: [PATCH 086/137] khal: 0.5.0 -> 0.6.0
---
pkgs/applications/misc/khal/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index db7af2df052..cbc728bc1f5 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgs, pythonPackages }:
pythonPackages.buildPythonPackage rec {
- version = "0.5.0";
+ version = "0.6.0";
name = "khal-${version}";
src = fetchurl {
url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz";
- sha256 = "1042vnc0vsaf0yr44hb0bh227d4rn81smvxksrzwdwja3wwxk4m9";
+ sha256 = "16nsib70rczln0hrh93bas58lr8crvq8yipj7qnfs4hbs9b8sbhs";
};
propagatedBuildInputs = with pythonPackages; [
@@ -23,6 +23,7 @@ pythonPackages.buildPythonPackage rec {
tzlocal
urwid
python.modules.sqlite3
+ pkginfo
];
meta = with stdenv.lib; {
From 1bcf33a7fa32672de20020da587465b4d5830f33 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 21 Jul 2015 19:18:07 +0100
Subject: [PATCH 087/137] tibia: update to 10.80
---
pkgs/games/tibia/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 4d759c5f889..03729cfae3b 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
assert stdenv.isi686;
stdenv.mkDerivation {
- name = "tibia-10.79";
+ name = "tibia-10.80";
src = fetchurl {
- url = http://static.tibia.com/download/tibia1079.tgz;
- sha256 = "04wpg5hdfhcp12kk2va3jdijr2p9jfmfivgqrn3cnbblxi83k2sn";
+ url = http://static.tibia.com/download/tibia1080.tgz;
+ sha256 = "0ng7gi64lsda8k3674nc2gwnr8si648nmwgghrjrcwyybgsyzfvl";
};
shell = stdenv.shell;
From 9147dee57fe1e1deb52398fc6ddd8dac9dab87e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Jul 2015 20:53:55 +0200
Subject: [PATCH 088/137] cups-filters: update, including security fixes
- NEWS claims to fix CVE-2015-{3258,3279}
- shell path is now directly configurable
/cc maintainer @ttuegel.
---
.../development/libraries/poppler/default.nix | 2 +-
pkgs/misc/cups/filters.nix | 31 +++++++++----------
pkgs/misc/cups/longer-shell-path.patch | 13 --------
3 files changed, 15 insertions(+), 31 deletions(-)
delete mode 100644 pkgs/misc/cups/longer-shell-path.patch
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index c79cdfd4466..373fe630d11 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,7 +4,7 @@
, utils ? false, suffix ? "glib"
}:
-let
+let # beware: updates often break cups_filters build
version = "0.32.0"; # even major numbers are stable
sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9";
in
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 8043cbb1506..a860273e9eb 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,35 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
+{ stdenv, fetchurl, fetchpatch, pkgconfig, cups, poppler, poppler_utils, fontconfig
, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }:
stdenv.mkDerivation rec {
name = "cups-filters-${version}";
- version = "1.0.61";
+ version = "1.0.71";
src = fetchurl {
url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
- sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m";
+ sha256 = "07wwlqcykfjfqcwj1bxk60ggahyaw7wcx32n5s104d1qkhham01i";
};
- patches = [
- (substituteAll {
- src = ./longer-shell-path.patch;
- bash = "${bash}/bin/bash";
- })
-
- # Fix build with poppler-0.31.0
- (fetchurl {
- url = "https://bugs.linuxfoundation.org/attachment.cgi?id=476";
- name = "cups-filters-poppler-0.31.0.patch";
- sha256 = "016pzksz4nl1sv3p5ahlnbmb7c899yrvlzq8jxic0gvdrzwd5bl4";
- })
- ];
+ patches = [(fetchpatch { # drop on update
+ name = "poppler-0.34.patch";
+ url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
+ sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
+ })];
buildInputs = [
pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl
ijs qpdf dbus avahi
];
- configureFlags = "--with-pdftops=pdftops --enable-imagefilters --with-rcdir=no";
+ configureFlags = [
+ "--with-pdftops=pdftops"
+ "--enable-imagefilters"
+ "--with-rcdir=no"
+ "--with-shell=${stdenv.shell}"
+ ];
makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups";
diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch
deleted file mode 100644
index a15fd483225..00000000000
--- a/pkgs/misc/cups/longer-shell-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c
-index 1c019aa..431d2f9 100644
---- a/filter/foomatic-rip/foomaticrip.c
-+++ b/filter/foomatic-rip/foomaticrip.c
-@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
- "/opt/cups/filter:"
- "/usr/lib/cups/filter";
-
--char modern_shell[64] = "/bin/bash";
-+char modern_shell[128] = "@bash@";
-
- void config_set_option(const char *key, const char *value)
- {
From 205a6b894d91310ac144474334da2ec90e710489 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Jul 2015 21:07:04 +0200
Subject: [PATCH 089/137] cargo: workaround frequent hash mismatches due to
#8567
For now, let's remove `leaveDotGit`. The only visible effect I could see
was that `cargo --version` won't report the git commit anymore, but
that's only a minor issue compared to the build breaking often.
Fixes #8566 and closes #8862.
---
pkgs/development/tools/build-managers/cargo/default.nix | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index d849ad5de94..9ffc9b0cbb9 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -11,8 +11,7 @@ buildRustPackage rec {
src = fetchgit {
url = "https://github.com/rust-lang/cargo.git";
rev = "refs/tags/0.3.0";
- sha256 = "1ckb2xd7nm8357imw6b1ci2ar8grnihzan94kvmjrijq6sz8yv9i";
- leaveDotGit = true;
+ sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793";
};
depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w";
From f7915e45f36612708e1ebcd88b546b2a5790d744 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 21 Jul 2015 21:40:19 +0200
Subject: [PATCH 090/137] perl-Font-TTF: add description and license
---
pkgs/top-level/perl-packages.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8aaf05d8bc0..de2ad38a33e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4033,6 +4033,10 @@ let self = _self // overrides; _self = with self; {
sha256 = "0l7vxag0v3hf7w1kjyjv02zqrjzhg6xczcv60z00l3z0fr78xi16";
};
propagatedBuildInputs = [ IOString ];
+ meta = {
+ description = "TTF font support for Perl";
+ license = stdenv.lib.licenses.artistic2;
+ };
};
ForksSuper = buildPerlPackage {
From a855efe7dbce4962729f767177a08f9f4e7ab837 Mon Sep 17 00:00:00 2001
From: Oliver Hunt <oliver.huntuk@gmail.com>
Date: Tue, 21 Jul 2015 21:37:29 +0000
Subject: [PATCH 091/137] ksuperkey: init
---
pkgs/tools/X11/ksuperkey/default.nix | 26 ++++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 28 insertions(+)
create mode 100644 pkgs/tools/X11/ksuperkey/default.nix
diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix
new file mode 100644
index 00000000000..233296e58ac
--- /dev/null
+++ b/pkgs/tools/X11/ksuperkey/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, libX11, libXtst, pkgconfig, inputproto, libXi, xproto, xextproto }:
+
+stdenv.mkDerivation rec {
+ name = "ksuperkey-git-2015-07-21";
+
+ buildInputs = [
+ libX11 libXtst pkgconfig inputproto libXi xproto xextproto
+ ];
+
+ src = fetchgit {
+ url = "https://github.com/hanschen/ksuperkey";
+ rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639";
+ sha256 = "00be6b93daf78bae0223f002e782e30a650dded3c5a83b1adfe9439e20e398fb";
+ };
+
+ preConfigure = ''
+ makeFlags="$makeFlags PREFIX=$out"
+ '';
+
+ meta = {
+ description = "A tool to be able to bind the super key as a key rather than a modifier";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.vozz ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea85bd3547b..84cbdc23b83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11811,6 +11811,8 @@ let
koji = callPackage ../tools/package-management/koji { };
+ ksuperkey = callPackage ../tools/X11/ksuperkey { };
+
kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
lame = callPackage ../development/libraries/lame { };
From a5e1b8db8f29561cd4a5b4744af2a918d4eb0904 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 16:42:01 -0500
Subject: [PATCH 092/137] nixpkgs: pax-utils 1.0.4 -> 1.0.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/os-specific/linux/pax-utils/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index d698fcf1b7e..13d144c54b0 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pax-utils-${version}";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
- sha256 = "1wymfsir2s22zqjdwnwv7bn075vzzlhssgwxnkz33i2d5pr6rqgp";
+ sha256 = "0vwhmnwai24h654d1zchm5qkbr030ay98l2qdp914ydgwhw9k6pn";
};
makeFlags = [
From 2a3a761639f8e5a0c393e8c2cb093ae89de76659 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 17:00:10 -0500
Subject: [PATCH 093/137] nixpkgs: capstone 2.1.2 -> 3.0.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/development/libraries/capstone/default.nix | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index d61c82bb7d3..31971b5d52a 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,21 +1,16 @@
-{ stdenv, fetchurl, bash }:
+{ stdenv, fetchurl, bash, cmake }:
stdenv.mkDerivation rec {
name = "capstone-${version}";
- version = "2.1.2";
+ version = "3.0.4";
src = fetchurl {
- url = "http://www.capstone-engine.org/download/${version}/${name}.tgz";
- sha256 = "1k6px3vdcsfby3lakss5sazs875kbzkzqk7cj79xrm2y5ik1vr29";
+ url = "hhttps://github.com/aquynh/capstone/archive/${version}.tar.gz";
+ sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
};
- buildPhase = false;
-
- patchPhase = ''
- substituteInPlace make.sh --replace "/usr/bin/env bash" "${bash}/bin/bash"
- '';
-
- installPhase = "PREFIX=$out ./make.sh install";
+ buildInputs = [ cmake ];
+ enableParallelBuild = true;
meta = {
description = "advanced disassembly library";
From d2986a93987972d7a1f46864cf2b209d168c8f9a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 18:27:19 -0500
Subject: [PATCH 094/137] nixpkgs: remove linuxPackages.ktap
It's been broken on the latest 3 major kernels, and it seems development
has stalled unfortunately, so this should be pulled.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/os-specific/linux/ktap/default.nix | 34 -------------------------
pkgs/top-level/all-packages.nix | 2 --
2 files changed, 36 deletions(-)
delete mode 100644 pkgs/os-specific/linux/ktap/default.nix
diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix
deleted file mode 100644
index 2cb4f60f75b..00000000000
--- a/pkgs/os-specific/linux/ktap/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, kernel, useFFI ? false }:
-
-assert builtins.substring 0 4 kernel.version != "3.18";
-
-let
- ffiArgs = stdenv.lib.optionalString useFFI "FFI=1";
-in
-stdenv.mkDerivation rec {
- name = "ktap-${version}";
- version = "0.5-e7a38ef0";
- src = fetchgit {
- url = "https://github.com/ktap/ktap.git";
- rev = "e7a38ef06bec9a651c9e8bdb3ad66a104210d475";
- sha256 = "07acf20e1926d3afd89b13855154b8cc792c57261e7d3cae2da70cb08844f9c8";
- };
-
- buildPhase = ''
- make ${ffiArgs} KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
- '';
-
- installPhase = ''
- mkdir -p $out/sbin
- cp ktap $out/sbin
- make modules_install KERNEL_SRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out
- '';
-
- meta = {
- description = "A lightweight script-based dynamic tracing tool for Linux";
- homepage = "http://www.ktap.org";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 864f22f86a0..c9eab53a346 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9772,8 +9772,6 @@ let
fusionio-vsl = callPackage ../os-specific/linux/fusionio/vsl.nix { };
- ktap = callPackage ../os-specific/linux/ktap { };
-
lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
From a594118f3dcd72f108f8612fd9e735ef8870059f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 18:50:23 -0500
Subject: [PATCH 095/137] nixpkgs: mono 4.0.1 -> 4.0.2.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/development/compilers/mono/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 66939ff1a02..3082a53137b 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -6,13 +6,15 @@ let
in
stdenv.mkDerivation rec {
name = "mono-${version}";
- version = "4.0.1";
+ version = "4.0.2.5";
src = fetchurl {
url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
- sha256 = "1kjv1zhcmd2qfr89vkaas6541n5jfzisn3y030l6lg6lp3ria7zz";
+ sha256 = "0lfndz7l3j593wilyczb5w6kvrdbf2fsd1i46qlszfjvx975hx5h";
};
- buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
+ buildInputs =
+ [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib
+ ];
propagatedBuildInputs = [glib];
NIX_LDFLAGS = "-lgcc_s" ;
From 0ca8ddc16eff7349d2d0cafe3ddf67bd802fee03 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 21 Jul 2015 18:51:56 -0500
Subject: [PATCH 096/137] nixpkgs: fsharp 3.1.1.32 -> 3.1.2.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
pkgs/development/compilers/fsharp/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index 92d80deb532..11bae06fc74 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "fsharp-${version}";
- version = "3.1.1.32";
+ version = "3.1.2.5";
src = fetchurl {
url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz";
- sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd";
+ sha256 = "1j6lnzvhj8fj1csb9am9xcrmmph6v3jyangkq8n1yp3dr6yxqzh1";
};
buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ];
From a8c7abdb8df092855a8a7b16bfd3c312baede4b2 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 22 Jul 2015 01:26:40 +0000
Subject: [PATCH 097/137] knockknock: init
A simple but secure port knocking daemon and associated tool (NixOS modules upcoming)
---
pkgs/tools/security/knockknock/default.nix | 29 ++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 31 insertions(+)
create mode 100644 pkgs/tools/security/knockknock/default.nix
diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
new file mode 100644
index 00000000000..2813149c4df
--- /dev/null
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, python, pycrypto, hping }:
+
+buildPythonPackage rec {
+ rev = "bf14bbff";
+ name = "knockknock-r${rev}";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "moxie0";
+ repo = "knockknock";
+ sha256 = "1chpfs3w2vkjrgay69pbdr116z1jldv53fi768a1i05fdqhy1px4";
+ };
+
+ propagatedBuildInputs = [ pycrypto ];
+
+ patchPhase = ''
+ substituteInPlace setup.py --replace "/etc" "$out/etc"
+ substituteInPlace knockknock.py --replace 'existsInPath("hping3")' '"${hping}/bin/hping3"'
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Simple, secure port knocking daemon and client written in Python";
+ homepage = "http://www.thoughtcrime.org/software/knockknock/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ copumpkin ];
+ platforms = with platforms; linux;
+ };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9eab53a346..5f338c0fb41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1966,6 +1966,8 @@ let
kismet = callPackage ../applications/networking/sniffers/kismet { };
+ knockknock = callPackage ../tools/security/knockknock { inherit (pythonPackages) pycrypto; };
+
kpcli = callPackage ../tools/security/kpcli { };
kst = callPackage ../tools/graphics/kst { };
From 75a7f96b4426970697736e912ab12494dcf1d96d Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 22 Jul 2015 01:32:09 +0000
Subject: [PATCH 098/137] knockknock: minor cleanup
---
pkgs/tools/security/knockknock/default.nix | 2 +-
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
index 2813149c4df..2341d2110bf 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, python, pycrypto, hping }:
-buildPythonPackage rec {
+buildPythonPackage rec {
rev = "bf14bbff";
name = "knockknock-r${rev}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f338c0fb41..3cf462adeb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1966,7 +1966,7 @@ let
kismet = callPackage ../applications/networking/sniffers/kismet { };
- knockknock = callPackage ../tools/security/knockknock { inherit (pythonPackages) pycrypto; };
+ knockknock = callPackage ../tools/security/knockknock { };
kpcli = callPackage ../tools/security/kpcli { };
From 551a26dad196ae1370b5ea84783784c9f0fce62f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 21 Jul 2015 21:59:18 -0700
Subject: [PATCH 099/137] chromium: Update stable 43 -> 44
---
.../networking/browsers/chromium/source/sources.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 3e2f256eec8..6b2f542f34f 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -13,9 +13,9 @@
sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0";
};
stable = {
- version = "43.0.2357.134";
- sha256 = "0nbn25pl3rgyqmy4p5dqr0v08xzkm08lpzsaxzszqpa4w7ivp8fk";
- sha256bin32 = "1xmybw4vs8x2rrg43f7x7yn763wfzr5f8d1jpq49r42qr365q6vs";
- sha256bin64 = "1y79135pmkhvv4cdhdy93jhm0jdx132a6spqqyyhbcr2sn26cq62";
+ version = "44.0.2403.89";
+ sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds";
+ sha256bin32 = "09a1k0xxmp6v1nfnngfkhv9vilnwvqlbgfsisbhwdnkk86pnv7r4";
+ sha256bin64 = "1i7ylif5vd0yj0gddl2kv87gh3vgzvzmz91rrrs9za2bkf2gkf0p";
};
}
From 85002177154829c69124de6aed022ca437ec0a04 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 21 Jul 2015 11:15:26 +0200
Subject: [PATCH 100/137] vimus: disable on 32 bit linux
A port of https://github.com/NixOS/nixpkgs/commit/57c5b8f5e179a758d9e9eb7f856e5f5bdb2fc5a3
---
pkgs/development/haskell-modules/configuration-common.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 837fa79859d..0ec01cebf49 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -891,4 +891,6 @@ self: super: {
# Hydra no longer allows building texlive packages.
lhs2tex = dontDistribute super.lhs2tex;
+ # https://ghc.haskell.org/trac/ghc/ticket/9825
+ vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
}
From 419b15a21538f7e53e394cf44181bbd4d0881116 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 09:56:46 +0200
Subject: [PATCH 101/137] capstone: fix hhttps typo (ZHF)
---
pkgs/development/libraries/capstone/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 31971b5d52a..a72532ee35b 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3.0.4";
src = fetchurl {
- url = "hhttps://github.com/aquynh/capstone/archive/${version}.tar.gz";
+ url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
};
From fe7114035fc4c818ed363041394439e5473ca7e5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 22 Jul 2015 06:26:08 +0200
Subject: [PATCH 102/137] coreclr: disable i686 build
The hydra build [1] fails with
error: Detected non x86_64 target processor. Not supported!
[1]: https://hydra.nixos.org/build/23871656
---
pkgs/development/compilers/coreclr/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 094df5b5b63..629d981893d 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://dotnet.github.io/core/;
description = ".NET is a general purpose development platform.";
- platforms = with stdenv.lib.platforms; linux;
+ platforms = [ "x86_64-linux" ];
maintainers = with stdenv.lib.maintainers; [ obadz ];
license = stdenv.lib.licenses.mit;
};
From f50e3275108bfddc6f56f3362552d74bd843c5b0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:04:00 +0200
Subject: [PATCH 103/137] gradm: fix download (ZHF)
---
pkgs/os-specific/linux/gradm/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/os-specific/linux/gradm/default.nix
index d34a028220c..97f4c1e93fa 100644
--- a/pkgs/os-specific/linux/gradm/default.nix
+++ b/pkgs/os-specific/linux/gradm/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "gradm-${version}";
- version = "3.1-201503211320";
+ version = "3.1-201507191652";
src = fetchurl {
url = "http://grsecurity.net/stable/${name}.tar.gz";
- sha256 = "17yd307jqva8jqib2xr3i9kmp58f2cb4jd7an5rbk5zr1k48ap9j";
+ sha256 = "0l3s56wvk5kpd2qppl328x4alh327xnbf271lh1fan84pxbw651g";
};
buildInputs = [ gcc coreutils findutils binutils pam flex bison bash ];
From 04e782f380964f447448d91bce0e99e9ddb23570 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:10:03 +0200
Subject: [PATCH 104/137] hbase: 0.98.8 -> 0.98.13. Fixes download (ZHF)
---
pkgs/servers/hbase/default.nix | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index de5be18713e..408022f650f 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,10 +1,13 @@
{ stdenv, fetchurl, jre, makeWrapper }:
-stdenv.mkDerivation {
- name = "hbase-0.98.8";
+stdenv.mkDerivation rec {
+ name = "hbase-${version}";
+ version = "0.98.13";
+
src = fetchurl {
- url = http://mirror.gopotato.co.uk/apache/hbase/stable/hbase-0.98.8-hadoop2-bin.tar.gz;
- sha256 = "0nvxaqpw8v2hg6mn2p2zxj3y6r4dj4xzxmp8rfmv6m6algn5apv6";
+ url = "mirror://apache/hbase/${version}/hbase-${version}-hadoop2-bin.tar.gz";
+ sha256 = "1av81nnnwivxf5ha6x9qrr2afl5sbyskl07prv0rdac954xmgg8n";
};
+
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out
From 62092ef4e7c161e6043d0dc7ab2c98d7cc2ea291 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:23:34 +0200
Subject: [PATCH 105/137] kicad: fix download urls (ZHF)
---
pkgs/applications/science/electronics/kicad/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 1fc97abef92..0762002b8a8 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
name = "kicad-20131025";
src = fetchbzr {
- url = "https://code.launchpad.net/~kicad-stable-committers/kicad/stable";
+ url = "https://code.launchpad.net/kicad/stable";
rev = 4024;
sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5";
};
srcLibrary = fetchbzr {
- url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library";
+ url = "http://bazaar.launchpad.net/~kicad-product-committers/kicad/library";
rev = 293;
sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i";
};
From 6f5aa25e89209f29457bc6fd09643bee1370152b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:29:34 +0200
Subject: [PATCH 106/137] Revert "zfs_git: 2015-06-22 -> 2015-07-01"
This reverts commit 54022375eb3ae3375385717690ef133c819c9bf1.
Revert "zfs_git: 2015-05-13 -> 2015-06-22"
This reverts commit 59faa759dade5c629409d683e72523548c40f554.
Closes #8941
---
pkgs/os-specific/linux/zfs/git.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 0df47e612e2..130a02c86e8 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,12 +1,12 @@
{ callPackage, stdenv, fetchgit, spl_git, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "2015-07-01";
+ version = "2015-05-13";
src = fetchgit {
url = git://github.com/zfsonlinux/zfs.git;
- rev = "a7b10a931911d3a98a90965795daad031c6d33a2";
- sha256 = "0llqbc37f4szx7mwi6j3xmxxz03g3ib7cwypmpcyi0nwkssav5xi";
+ rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c";
+ sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437";
};
patches = [ ./nix-build.patch ];
From 6151349d07325cbf24c5877fa929f816fbfc37e6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 10:58:21 +0200
Subject: [PATCH 107/137] partclone: fix download (ZHF)
---
pkgs/tools/backup/partclone/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix
index fe2b9e00aaa..928c0494a1c 100644
--- a/pkgs/tools/backup/partclone/default.nix
+++ b/pkgs/tools/backup/partclone/default.nix
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
src = fetchurl {
url = https://codeload.github.com/Thomas-Tsai/partclone/legacy.tar.gz/stable;
- sha256 = "0vvk6c26gf2wv5y0mxnz90bivgp84pi82qk5q5xkcz6nz3swals7";
- name = "Thomas-Tsai-partclone-stable-0-gab3bd53.tar.gz";
+ sha256 = "12bnhljc4n4951p5c05gc7z5qwdsjpx867ad1npmgsm8d9w941sn";
+ name = "Thomas-Tsai-partclone-stable-20150722.tar.gz";
};
buildInputs = [e2fsprogs pkgconfig libuuid];
From 14d36053b1051685fc98412d056a6be1469e280e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 11:23:17 +0200
Subject: [PATCH 108/137] weston: use version 1.8.0 instead of wayland version
(ZHF)
---
pkgs/applications/window-managers/weston/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 9b88400ef53..d270d3a2b1d 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -6,11 +6,12 @@
}:
stdenv.mkDerivation rec {
- name = "weston-${wayland.version}";
+ name = "weston-${version}";
+ version = "1.8.0";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "1kb6a494j56sh7iy43xwkjlr3bh0nnkq4bkimwj6qirzbya12i8w";
+ sha256 = "04nkbbdglh0pqznxkdqvak3pc53jmz24d0658bn5r0cf6agycqw9";
};
buildInputs = [
From 0abe34e4543125f62ef3335fb3bc065e2df996db Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 11:34:18 +0200
Subject: [PATCH 109/137] OVMF: build with gcc 4.8, I'm no idea what I'm doing
(ZHF)
---
pkgs/applications/virtualization/OVMF/default.nix | 5 +++--
pkgs/top-level/all-packages.nix | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 479d625c7de..715073351f1 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
+{ stdenv, edk2, nasm, iasl, seabios, openssl, gcc, secureBoot ? false }:
let
@@ -15,7 +15,8 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
name = "OVMF-2014-12-10";
# TODO: properly include openssl for secureBoot
- buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
+ # Doesn't build with gcc 4.9
+ buildInputs = [nasm iasl gcc] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
unpackPhase = ''
for file in \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cf462adeb3..d412cbbce8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9059,8 +9059,8 @@ let
qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
- OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
- OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
+ OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; gcc = gcc48; };
+ OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; gcc = gcc48; };
#WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };
seabios = callPackage ../applications/virtualization/seabios { };
From befef13d3734595c201d4e81a6ab2266c400a48b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 11:37:38 +0200
Subject: [PATCH 110/137] chaps: not supported on i686 (ZHF)
---
pkgs/tools/security/chaps/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix
index 9a2ae0b5114..1d3f530dd9f 100644
--- a/pkgs/tools/security/chaps/default.nix
+++ b/pkgs/tools/security/chaps/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
description = "PKCS #11 implementation based on trusted platform module (TPM)";
homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design";
maintainers = [ maintainers.tstrobel ];
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
license = licenses.bsd3;
};
}
From 58430f3259d59c902d916a3fbf85fb17ed28725e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 11:58:02 +0200
Subject: [PATCH 111/137] Revert "OVMF: build with gcc 4.8, I'm no idea what
I'm doing (ZHF)"
This reverts commit 0abe34e4543125f62ef3335fb3bc065e2df996db.
---
pkgs/applications/virtualization/OVMF/default.nix | 5 ++---
pkgs/top-level/all-packages.nix | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 715073351f1..479d625c7de 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, edk2, nasm, iasl, seabios, openssl, gcc, secureBoot ? false }:
+{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
let
@@ -15,8 +15,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
name = "OVMF-2014-12-10";
# TODO: properly include openssl for secureBoot
- # Doesn't build with gcc 4.9
- buildInputs = [nasm iasl gcc] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
+ buildInputs = [nasm iasl] ++ stdenv.lib.optionals (secureBoot == true) [ openssl ];
unpackPhase = ''
for file in \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d412cbbce8f..3cf462adeb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9059,8 +9059,8 @@ let
qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
- OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; gcc = gcc48; };
- OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; gcc = gcc48; };
+ OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
+ OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
#WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };
seabios = callPackage ../applications/virtualization/seabios { };
From 65700b435c8a495e5ff7071e41db34bf49b9ef89 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 15:48:45 +0200
Subject: [PATCH 112/137] Use ConditionVirtualization to disable some services
in containers
(cherry picked from commit c52a98380673093037a3116025d0aa92cd46a214)
---
nixos/modules/system/boot/systemd.nix | 4 ++++
nixos/modules/virtualisation/container-config.nix | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 2ad12c51b21..d001feb063b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -749,6 +749,10 @@ in
systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
+ # Don't bother with certain units in containers.
+ systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";
+ systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container";
+
};
}
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 67047541102..c210c8d5f25 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -19,10 +19,6 @@ with lib;
# Shut up warnings about not having a boot loader.
system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
- systemd.services.systemd-remount-fs.enable = false;
-
- systemd.services.systemd-random-seed.enable = false;
-
};
}
From 6bd4e0b8cd8a5f043492846d7ee4531349962102 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 15:54:16 +0200
Subject: [PATCH 113/137] Create systemd-{network,resolve} user/group
unconditionally
This shuts up this error from dbus:
May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-network" in message bus configuration file
May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-resolve" in message bus configuration file
which happens because the D-Bus config for networkd/resolved is
enabled unconditionally, and we don't have an easy way to turn it off.
(cherry picked from commit f19b58fb6a5cc55af6d8d8ca7979f8e64255d2d0)
---
nixos/modules/system/boot/networkd.nix | 3 ---
nixos/modules/system/boot/resolved.nix | 3 ---
nixos/modules/system/boot/systemd.nix | 5 +++++
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index b183c0f3236..34eea9af83b 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -641,9 +641,6 @@ in
environment.etc."systemd/network".source =
generateUnits "network" cfg.units [] [];
- users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
- users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
-
systemd.services.systemd-networkd = {
wantedBy = [ "multi-user.target" ];
before = [ "network-interfaces.target" ];
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index ecd547322d3..5a98b9b6d48 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -30,9 +30,6 @@ with lib;
DNS=${concatStringsSep " " config.networking.nameservers}
'';
- users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
- users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
-
};
}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d001feb063b..557dc204fca 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -648,6 +648,11 @@ in
${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
'';
+ users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
+ users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
+ users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
+ users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
+
# Target for ‘charon send-keys’ to hook into.
users.extraGroups.keys.gid = config.ids.gids.keys;
From 9647609e3eb687079d2120b57bdf095d8643671f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 15:59:11 +0200
Subject: [PATCH 114/137] stage-1: Don't mount /dev/shm if it's already mounted
(cherry picked from commit c8ef5989452e191a1d345cd006f54305cb989af6)
---
nixos/modules/system/boot/stage-2-init.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 173453a17f7..330e2f97c5b 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -85,8 +85,10 @@ done
# More special file systems, initialise required directories.
-mkdir -m 0755 /dev/shm
-mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
+if ! mountpoint -q /dev/shm; then
+ mkdir -m 0755 /dev/shm
+ mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
+fi
mkdir -m 0755 -p /dev/pts
[ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default
mkdir -m 01777 -p /tmp
From ec82157ac5b36560c7edae4acfe47edb57133991 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 16:22:49 +0200
Subject: [PATCH 115/137] stage-2: Don't run hwclock in containers
(cherry picked from commit b978df019a2b1281f7a70445eaa71b45049f4cfd)
---
nixos/modules/system/boot/stage-2-init.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 330e2f97c5b..a73070ab332 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -164,7 +164,9 @@ $systemConfig/activate
# Restore the system time from the hardware clock. We do this after
# running the activation script to be sure that /etc/localtime points
# at the current time zone.
-hwclock --hctosys
+if [ -e /dev/rtc ]; then
+ hwclock --hctosys
+fi
# Record the boot configuration.
From 0ab320a884f93fb98939a3f0ccc5ce8bd9d25da9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 17:32:53 +0200
Subject: [PATCH 116/137] stage-1: Shut up warnings about swap devices that
don't exist yet
(cherry picked from commit 388dac478d21b743946362294043b83da4852721)
---
nixos/modules/system/boot/stage-1-init.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index e8d276920a8..26cf7f06c9e 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -182,9 +182,9 @@ if test -e /sys/power/resume -a -e /sys/power/disk; then
for sd in @resumeDevices@; do
# Try to detect resume device. According to Ubuntu bug:
# https://bugs.launchpad.net/ubuntu/+source/pm-utils/+bug/923326/comments/1
- # When there are multiple swap devices, we can't know where will hibernate
- # image reside. We can check all of them for swsuspend blkid.
- resumeInfo="$(udevadm info -q property "$sd" )"
+ # when there are multiple swap devices, we can't know where the hibernate
+ # image will reside. We can check all of them for swsuspend blkid.
+ resumeInfo="$(test -e "$d" && udevadm info -q property "$sd")"
if [ "$(echo "$resumeInfo" | sed -n 's/^ID_FS_TYPE=//p')" = "swsuspend" ]; then
resumeDev="$sd"
break
From 2c48ab43903adc1e0437f651dad35c7dd91a10e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 16:37:03 +0200
Subject: [PATCH 117/137] Remove ancient version of udev
(cherry picked from commit ab91aaaeb85b78623bfdb91d87f5d94d378c1e74)
---
pkgs/os-specific/linux/udev/145.nix | 53 -----------------------------
pkgs/top-level/all-packages.nix | 1 -
2 files changed, 54 deletions(-)
delete mode 100644 pkgs/os-specific/linux/udev/145.nix
diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix
deleted file mode 100644
index fd1cb8a2d8d..00000000000
--- a/pkgs/os-specific/linux/udev/145.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
- name = "udev-145";
-
- src = fetchurl {
- url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
- sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
- };
-
- buildInputs = [gperf pkgconfig glib acl libusb usbutils];
-
- configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
-
- preConfigure =
- ''
- substituteInPlace extras/keymap/Makefile.in \
- --replace /usr/include ${stdenv.glibc}/include
- '';
-
- postInstall =
- ''
- # Install some rules that really should be installed by default.
- for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
- cp rules/packages/$i $out/libexec/rules.d/
- done
-
- # The path to rule_generator.functions in write_cd_rules and
- # write_net_rules is broken. Also, don't store the mutable
- # persistant rules in /etc/udev/rules.d but in
- # /var/lib/udev/rules.d.
- for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do
- substituteInPlace $i \
- --replace /lib/udev $out/libexec \
- --replace /etc/udev/rules.d /var/lib/udev/rules.d
- done
-
- # Don't set PATH to /bin:/sbin; won't work in NixOS.
- substituteInPlace $out/libexec/rule_generator.functions \
- --replace 'PATH=' '#PATH='
-
- # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
- # environment of the caller.
- sed '3,4d' -i $out/libexec/firmware.sh
- '';
-
- meta = {
- homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
- description = "Udev manages the /dev filesystem";
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cf462adeb3..eb8f55a248a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10207,7 +10207,6 @@ let
cross = assert crossSystem != null; crossSystem;
});
- udev145 = callPackage ../os-specific/linux/udev/145.nix { };
udev = pkgs.systemd;
eudev = callPackage ../os-specific/linux/eudev {};
From 925e1f91c5a13649df193a47f37a6906b13e6a83 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2015 18:19:34 +0200
Subject: [PATCH 118/137] Set up /etc/machine-id before starting systemd
Otherwise, systemd will try to populate /etc, which we don't want.
(cherry picked from commit c8501a421806c6526a12b2f6537ab38754e9d4ff)
---
nixos/modules/system/boot/systemd.nix | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 557dc204fca..f6113188b03 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -646,6 +646,10 @@ in
# groups, in addition to those in the systemd-journal group.
# Users can always read their own journals.
${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
+
+ if ! [ -e /etc/machine-id ]; then
+ ${systemd}/bin/systemd-machine-id-setup
+ fi
'';
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
From bb5647ea0f48b666a65b9018f1bf775623293a77 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 00:56:38 +0200
Subject: [PATCH 119/137] Remove unused file
(cherry picked from commit 58ef0eea0c2d79fbe41f0cb09d93aaec8251fe61)
---
.../linux/kernel-headers/2.6.32.nix | 62 -------------------
1 file changed, 62 deletions(-)
delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.6.32.nix
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
deleted file mode 100644
index 100dd0c611b..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{stdenv, fetchurl, perl, cross ? null}:
-
-assert cross == null -> stdenv.isLinux;
-
-let
- version = "2.6.32.16";
- kernelHeadersBaseConfig = if cross == null then
- stdenv.platform.kernelHeadersBaseConfig
- else
- cross.platform.kernelHeadersBaseConfig;
-in
-
-stdenv.mkDerivation {
- name = "linux-headers-${version}";
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
- sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
- };
-
- targetConfig = if cross != null then cross.config else null;
-
- platform =
- if cross != null then cross.platform.kernelArch else
- if stdenv.system == "i686-linux" then "i386" else
- if stdenv.system == "x86_64-linux" then "x86_64" else
- if stdenv.system == "powerpc-linux" then "powerpc" else
- if stdenv.isArm then "arm" else
- if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
- abort "don't know what the kernel include directory is called for this platform";
-
- buildInputs = [perl];
-
- extraIncludeDirs =
- if cross != null then
- (if cross.arch == "powerpc" then ["ppc"] else [])
- else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-
- buildPhase = ''
- if test -n "$targetConfig"; then
- export ARCH=$platform
- fi
- make ${kernelHeadersBaseConfig}
- make mrproper headers_check
- '';
-
- installPhase = ''
- make INSTALL_HDR_PATH=$out headers_install
-
- # Some builds (e.g. KVM) want a kernel.release.
- mkdir -p $out/include/config
- echo "${version}-default" > $out/include/config/kernel.release
- '';
-
- # !!! hacky
- fixupPhase = ''
- ln -s asm $out/include/asm-$platform
- if test "$platform" = "i386" -o "$platform" = "x86_64"; then
- ln -s asm $out/include/asm-x86
- fi
- '';
-}
From 069b4a8a57f50488c5c03b137d886626821d80f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 01:01:16 +0200
Subject: [PATCH 120/137] Remove Linux 3.2 and 3.4
These are not supported by systemd so no reason to keep them around.
(cherry picked from commit ee10e165dcc23f7b1855072f5a1f208dcdeead93)
Conflicts:
pkgs/os-specific/linux/kernel/linux-3.4.nix
---
pkgs/os-specific/linux/kernel/linux-3.2.nix | 27 ---------------------
pkgs/os-specific/linux/kernel/linux-3.4.nix | 27 ---------------------
pkgs/top-level/all-packages.nix | 16 ------------
3 files changed, 70 deletions(-)
delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.2.nix
delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.4.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
deleted file mode 100644
index 2fc240f6196..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
- version = "3.2.69";
- extraMeta.branch = "3.2";
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "0fs7aj3vn51dlx7yfgkx05qpki2msh6j2irwajd9bw0l26cbycd3";
- };
-
- # We don't provide these patches if grsecurity is enabled, because
- # the grsec 3.2 -stable patchset already includes them.
- kernelPatches = args.kernelPatches ++ (
- stdenv.lib.optionals (!(args.features.grsecurity or false))
- [ { name = "0001-AppArmor-compatibility-patch-for-v5-network-controll";
- patch = ./apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch;
- }
- { name = "0002-AppArmor-compatibility-patch-for-v5-interface";
- patch = ./apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch;
- }
- { name = "0003-AppArmor-Allow-dfa-backward-compatibility-with-broke";
- patch = ./apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch;
- }]);
-
- features.iwlwifi = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
deleted file mode 100644
index a0ba7f46c68..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, ... } @ args:
-
-import ./generic.nix (args // rec {
- version = "3.4.108";
- extraMeta.branch = "3.4";
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "0xdycfbn2j398n1763zkhiv08xsya52acic1zign4s315b45pijm";
- };
-
- kernelPatches = args.kernelPatches ++
- [ { name = "0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file";
- patch = ./apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch;
- }
- { name = "0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules";
- patch = ./apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch;
- }
- { name = "0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou";
- patch = ./apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch;
- }];
-
- features.iwlwifi = true;
- features.efiBootStub = true;
- features.needsCifsUtils = true;
- features.netfilterRPFilter = true;
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb8f55a248a..a73bb0b2ae0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9608,20 +9608,6 @@ let
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
- linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
- inherit fetchurl stdenv perl buildLinux;
- kernelPatches = [ kernelPatches.bridge_stp_helper ];
- };
-
- linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
- inherit fetchurl stdenv perl buildLinux;
- kernelPatches = [ kernelPatches.bridge_stp_helper ]
- ++ lib.optionals ((platform.kernelArch or null) == "mips")
- [ kernelPatches.mips_fpureg_emu
- kernelPatches.mips_fpu_sigill
- ];
- };
-
linux_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.bridge_stp_helper ];
@@ -9866,8 +9852,6 @@ let
linux_latest = linuxPackages_latest.kernel;
# Build the kernel modules for the some of the kernels.
- linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
- linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi;
linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;
From eedda353f30b1e4317096b4367e15fedd79c29f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Jun 2015 01:03:34 +0200
Subject: [PATCH 121/137] Remove Linux 3.19
It's already EOL so we shouldn't keep it around in our new stable
branch.
(cherry picked from commit cdbb5483b7ef1dcdb628e802aab25362c01ea41c)
---
pkgs/top-level/all-packages.nix | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a73bb0b2ae0..9c14725cce1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9653,16 +9653,6 @@ let
];
};
- linux_3_19 = makeOverridable (import ../os-specific/linux/kernel/linux-3.19.nix) {
- inherit fetchurl stdenv perl buildLinux;
- kernelPatches = [ kernelPatches.bridge_stp_helper ]
- ++ lib.optionals ((platform.kernelArch or null) == "mips")
- [ kernelPatches.mips_fpureg_emu
- kernelPatches.mips_fpu_sigill
- kernelPatches.mips_ext3_n32
- ];
- };
-
linux_4_0 = makeOverridable (import ../os-specific/linux/kernel/linux-4.0.nix) {
inherit fetchurl stdenv perl buildLinux;
kernelPatches = [ kernelPatches.bridge_stp_helper ]
@@ -9858,7 +9848,6 @@ let
linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
- linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19);
linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0);
linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
From 5d02c02a9bfd6912e4e0f700b1b35e76d1d6bd3f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 31 May 2015 19:55:33 +0300
Subject: [PATCH 122/137] systemd: Use upstream tmpfiles.d rules
This fixes a failing assert in systemd-timesyncd (issue #5913) as it
expects the directory /run/systemd/netif/links/ to exist, and nothing in
NixOS currently creates it.
Also we get a net reduction in our code as rules for /run/utmp and
/var/log/journal are also provided by the same upstream file.
(cherry picked from commit a278a9224a3c1c5db399d53c86b36a25133b5cda)
---
.../modules/system/activation/activation-script.nix | 4 ----
nixos/modules/system/boot/systemd.nix | 12 +-----------
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 2e5a70b3aa5..02b3e25a313 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -114,10 +114,6 @@ in
''
# Various log/runtime directories.
- touch /run/utmp # must exist
- chgrp ${toString config.ids.gids.utmp} /run/utmp
- chmod 664 /run/utmp
-
mkdir -m 0755 -p /run/nix/current-load # for distributed builds
mkdir -m 0700 -p /run/nix/remote-stores
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index f6113188b03..1314b727772 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -639,13 +639,6 @@ in
system.activationScripts.systemd = stringAfter [ "groups" ]
''
mkdir -m 0755 -p /var/lib/udev
- mkdir -p /var/log/journal
- chmod 0755 /var/log/journal
-
- # Make all journals readable to users in the wheel and adm
- # groups, in addition to those in the systemd-journal group.
- # Users can always read their own journals.
- ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
if ! [ -e /etc/machine-id ]; then
${systemd}/bin/systemd-machine-id-setup
@@ -731,6 +724,7 @@ in
startSession = true;
};
+ environment.etc."tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
environment.etc."tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
environment.etc."tmpfiles.d/nixos.conf".text =
@@ -738,10 +732,6 @@ in
# This file is created automatically and should not be modified.
# Please change the option ‘systemd.tmpfiles.rules’ instead.
- z /var/log/journal 2755 root systemd-journal - -
- z /var/log/journal/%m 2755 root systemd-journal - -
- z /var/log/journal/%m/* 0640 root systemd-journal - -
-
${concatStringsSep "\n" cfg.tmpfiles.rules}
'';
From 4232f5d219527fddee96f69ff94af0a8bde703ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Jun 2015 14:18:27 +0200
Subject: [PATCH 123/137] Disable system_tarball_pc and fix eval
It refers to a kernel version that no longer exists.
(cherry picked from commit e4b9624ca89617005cb082e2a8301695759e1b19)
---
nixos/release.nix | 2 ++
pkgs/top-level/release-cross.nix | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/nixos/release.nix b/nixos/release.nix
index cf0a00dd254..05023868fa1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -176,10 +176,12 @@ in rec {
# boot that system from uboot (like for the sheevaplug).
# The pc variant helps preparing the expression for the system tarball
# in a machine faster than the sheevpalug
+ /*
system_tarball_pc = forAllSystems (system: makeSystemTarball {
module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
inherit system;
});
+ */
# Provide container tarball for lxc, libvirt-lxc, docker-lxc, ...
containerTarball = forAllSystems (system: makeSystemTarball {
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index cef3d2dffbd..ced90c0489c 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -16,7 +16,6 @@ let
#xorgserver.crossDrv = nativePlatforms;
};
nixUnstable.crossDrv = nativePlatforms;
- linuxPackages_3_4.kernel.crossDrv = linux;
};
/* Basic list of packages to be natively built,
From 9a75bafcdaeda8dc5a1e33613a6dd80dda4661d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 1 Jul 2015 11:19:03 +0200
Subject: [PATCH 124/137] systemd-timesyncd: Use NTP servers from our own
ntp.org pool
(cherry picked from commit 01dc343c2c613c263a2180d1850847f33653f94f)
Conflicts:
pkgs/os-specific/linux/systemd/default.nix
---
pkgs/os-specific/linux/systemd/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index bde6686ff0a..b98f6e69282 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -82,6 +82,8 @@ stdenv.mkDerivation rec {
substituteInPlace src/journal/catalog.c \
--replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
+
+ configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
'';
# This is needed because systemd uses the gold linker, which doesn't
From fab309069328e238a4050cd52c176e6349b06d44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 12:51:21 +0200
Subject: [PATCH 125/137] Don't include wireless tools in containers
---
nixos/modules/tasks/network-interfaces.nix | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 6361ed2cc43..a967fc77e68 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -708,11 +708,14 @@ in
pkgs.iproute
pkgs.iputils
pkgs.nettools
- pkgs.wirelesstools
+ pkgs.openresolv
+ ]
+ ++ optionals (!config.boot.isContainer) [
+ pkgs.wirelesstools # FIXME: obsolete?
pkgs.iw
pkgs.rfkill
- pkgs.openresolv
- ] ++ bridgeStp;
+ ]
+ ++ bridgeStp;
systemd.targets."network-interfaces" =
{ description = "All Network Interfaces";
From eae4712f52b5dc87fbcfeb61be0a5cb343d2f11e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 22 Jul 2015 13:52:29 +0200
Subject: [PATCH 126/137] glib-tested: disable appinfo test, cannot reproduce
hydra failure
---
pkgs/development/libraries/glib/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 5c76bc3186b..fb9c361c530 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -93,6 +93,8 @@ stdenv.mkDerivation rec {
sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c
# All gschemas fail to pass the test, upstream bug?
sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c
+ # Cannot reproduce the failing test_associations on hydra
+ sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c
# Needed because of libtool wrappers
sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
'';
From 0d9d941d65f91393e845063e8929764bf4dd6b16 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 22 Jul 2015 11:56:33 +0200
Subject: [PATCH 127/137] python-packages: update elasticsearch-dsl 0.0.3 to
0.0.4
---
pkgs/top-level/python-packages.nix | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08c0cfee510..f86b63c254f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3142,23 +3142,22 @@ let
elasticsearchdsl = buildPythonPackage (rec {
- name = "elasticsearch-dsl-0.0.3";
+ name = "elasticsearch-dsl-0.0.4";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/e/elasticsearch-dsl/${name}.tar.gz";
- md5 = "6cbc9ed7aefb3ef804be4e3b318b2570";
+ sha256 = "0bz8p10qk7rz10glq9dm2nq9m1x6czzlqk518107x39gx18lm1a2";
};
- buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 ];
+ buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 pytz ];
# ImportError: No module named test_elasticsearch_dsl
+ # Tests require a local instance of elasticsearch
doCheck = false;
meta = {
description = "Python client for Elasticsearch";
-
homepage = https://github.com/elasticsearch/elasticsearch-dsl-py;
-
license = licenses.asl20;
};
});
From e908c0c9da67854b91c9c93f1e0d100e50a29aa0 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 22 Jul 2015 11:26:28 +0200
Subject: [PATCH 128/137] python-packages: update elasticsearch-1.4.0 to
elasticsearch-1.6.0
---
pkgs/top-level/python-packages.nix | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08c0cfee510..ed5ae77066f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3120,11 +3120,11 @@ let
elasticsearch = buildPythonPackage (rec {
- name = "elasticsearch-1.4.0";
+ name = "elasticsearch-1.6.0";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/e/elasticsearch/${name}.tar.gz";
- md5 = "14a758debd2296d923cb6c958db98eba";
+ sha256 = "1b0b5d1qp77r83r130kb2ikhd6am0d1389rdcllr1xsajrp5kj4h";
};
# Check is disabled because running them destroy the content of the local cluster!
@@ -3133,9 +3133,7 @@ let
meta = {
description = "Official low-level client for Elasticsearch";
-
homepage = https://github.com/elasticsearch/elasticsearch-py;
-
license = licenses.asl20;
};
});
From 201f9beddbf5786262bcff11482f0aa30914bb34 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 15:02:07 +0200
Subject: [PATCH 129/137] Don't enable cron by default
The rationale for disabling this is: 1) systemd timers are better; 2)
it gets rid of one usually unnecessary process, which makes containers
more light-weight.
Note that cron is still enabled if services.cron.systemCronJobs is
non-empty, so this only matters if you have no declarative cron jobs
but do have user cron jobs.
---
.../doc/manual/release-notes/rl-unstable.xml | 8 ++-
nixos/modules/services/scheduling/cron.nix | 60 ++++++++++---------
2 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 0b7750b0591..5fb07a8ed69 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -36,7 +36,7 @@
</para>
-<para>Following new services were added since the last release:
+<para>The following new services were added since the last release:
<itemizedlist>
<listitem><para><literal>brltty</literal></para></listitem>
@@ -50,6 +50,12 @@ following incompatible changes:
<itemizedlist>
+<listitem><para><command>cron</command> is no longer enabled by
+default, unless you have a non-empty
+<option>services.cron.systemCronJobs</option>. To force
+<command>cron</command> to be enabled, set
+<option>services.cron.enable = true</option>.</para></listitem>
+
<listitem><para>Steam now doesn't need root rights to work. Instead of using
<literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>.
<literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>,
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 1f42086dc1e..c81d2bdefa7 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -4,8 +4,6 @@ with lib;
let
- inherit (config.services) jobsTags;
-
# Put all the system cronjobs together.
systemCronJobsFile = pkgs.writeText "system-crontab"
''
@@ -25,9 +23,9 @@ let
sendmailPath = "/var/setuid-wrappers/sendmail";
};
- allFiles = map (f: "\"${f}\"") (
- [ "${systemCronJobsFile}" ] ++ config.services.cron.cronFiles
- );
+ allFiles =
+ optional (config.services.cron.systemCronJobs != []) systemCronJobsFile
+ ++ config.services.cron.cronFiles;
in
@@ -91,36 +89,44 @@ in
###### implementation
- config = mkIf (config.services.cron.enable && allFiles != []) {
+ config = mkMerge [
- security.setuidPrograms = [ "crontab" ];
+ { services.cron.enable = mkDefault (allFiles != []);
- environment.systemPackages = [ cronNixosPkg ];
+ }
- systemd.services.cron =
- { description = "Cron Daemon";
+ (mkIf (config.services.cron.enable && allFiles != []) {
- wantedBy = [ "multi-user.target" ];
+ security.setuidPrograms = [ "crontab" ];
- preStart =
- ''
- rm -f /etc/crontab
- cat ${toString allFiles} > /etc/crontab
- chmod 0600 /etc/crontab
+ environment.systemPackages = [ cronNixosPkg ];
- mkdir -m 710 -p /var/cron
+ systemd.services.cron =
+ { description = "Cron Daemon";
- # By default, allow all users to create a crontab. This
- # is denoted by the existence of an empty cron.deny file.
- if ! test -e /var/cron/cron.allow -o -e /var/cron/cron.deny; then
- touch /var/cron/cron.deny
- fi
- '';
+ wantedBy = [ "multi-user.target" ];
- restartTriggers = [ config.environment.etc.localtime.source ];
- serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
- };
+ preStart =
+ ''
+ rm -f /etc/crontab
+ cat ${concatMapStrings (f: "\"${f}\" ") allFiles} > /etc/crontab
+ chmod 0600 /etc/crontab
- };
+ mkdir -m 710 -p /var/cron
+
+ # By default, allow all users to create a crontab. This
+ # is denoted by the existence of an empty cron.deny file.
+ if ! test -e /var/cron/cron.allow -o -e /var/cron/cron.deny; then
+ touch /var/cron/cron.deny
+ fi
+ '';
+
+ restartTriggers = [ config.environment.etc.localtime.source ];
+ serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
+ };
+
+ })
+
+ ];
}
From e2b25f94347da698994a00120e79ed67f40b8f38 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 15:12:47 +0200
Subject: [PATCH 130/137] Use environment.etc to manage /etc/crontab
Otherwise, /etc/crontab won't be deleted when cron is disabled.
---
nixos/modules/services/scheduling/cron.nix | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index c81d2bdefa7..a92e8b65d2a 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -91,9 +91,7 @@ in
config = mkMerge [
- { services.cron.enable = mkDefault (allFiles != []);
-
- }
+ { services.cron.enable = mkDefault (allFiles != []); }
(mkIf (config.services.cron.enable && allFiles != []) {
@@ -101,6 +99,17 @@ in
environment.systemPackages = [ cronNixosPkg ];
+ environment.etc.crontab =
+ { source = pkgs.runCommand "crontabs" { inherit allFiles; }
+ ''
+ touch $out
+ for i in $allFiles; do
+ cat "$i" >> $out
+ done
+ '';
+ mode = "0600"; # Cron requires this.
+ };
+
systemd.services.cron =
{ description = "Cron Daemon";
@@ -108,10 +117,6 @@ in
preStart =
''
- rm -f /etc/crontab
- cat ${concatMapStrings (f: "\"${f}\" ") allFiles} > /etc/crontab
- chmod 0600 /etc/crontab
-
mkdir -m 710 -p /var/cron
# By default, allow all users to create a crontab. This
From 57e48df19e87bca6a995e48ffaa571ca5720cb42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 15:17:01 +0200
Subject: [PATCH 131/137] Remove non-incompatible changes from the list of
incompatible changes
---
.../doc/manual/release-notes/rl-unstable.xml | 27 ++-----------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 5fb07a8ed69..fc4fcd4219e 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -41,7 +41,7 @@
<itemizedlist>
<listitem><para><literal>brltty</literal></para></listitem>
<listitem><para><literal>marathon</literal></para></listitem>
-<listitem><para><literal>Tvheadend</literal></para></listitem>
+<listitem><para><literal>tvheadend</literal></para></listitem>
</itemizedlist>
</para>
@@ -70,20 +70,6 @@ was accordingly renamed to <literal>bomi</literal>
was accordingly renamed to <literal>electron</literal>
</para></listitem>
-<listitem>
- <para>
- The default <literal>NIX_PATH</literal> for NixOS now includes
- <literal>/nix/var/nix/profiles/per-user/root/channels</literal>, so it's
- easy to add custom channels.
- </para>
- <para>
- Moreover, whenever a <command>nixos-rebuild <action>
- --upgrade</command> is issued, every channel that includes a file
- called <filename>.update-on-nixos-rebuild</filename> will be upgraded
- alongside of the <literal>nixos</literal> channel.
- </para>
-</listitem>
-
<listitem>
<para>
The CUPS printing service has been updated to version <literal>2.0.2</literal>.
@@ -96,15 +82,6 @@ was accordingly renamed to <literal>electron</literal>
</para>
</listitem>
-<listitem>
- <para>
- HPLIP (printer, scanner, and fax drivers for HP devices) has
- been updated to version <literal>3.15.4</literal>. This release
- adds support for the <literal>arm6l-linux</literal> and
- <literal>arm7l-linux</literal> platforms.
- </para>
-</listitem>
-
<listitem>
<para>
Haskell packages can no longer be found by name, i.e. the commands
@@ -130,7 +107,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install
<listitem>
<para>
- Previous versions of NixOS come with a feature called
+ Previous versions of NixOS came with a feature called
<literal>ghc-wrapper</literal>, a small wrapper script that allows
GHC to transparently pick up on libraries installed in the user's
profile. This feature has been deprecated;
From 606d34e45aeedc843f0ddb375e1fb1aa9be429fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 15:20:40 +0200
Subject: [PATCH 132/137] Revert "Revert "Drop tests.installer.grub1 as release
critical""
This reverts commit cd28c5517c224c0c969f6bccb1f85dcc280ed7f2. Still broken:
http://hydra.nixos.org/build/23928152
---
nixos/release-combined.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 52a1dcf9932..be8df4f4a2c 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,7 +52,6 @@ in rec {
(all nixos.tests.firefox)
(all nixos.tests.firewall)
(all nixos.tests.gnome3)
- (all nixos.tests.installer.grub1)
(all nixos.tests.installer.lvm)
(all nixos.tests.installer.luksroot)
(all nixos.tests.installer.separateBoot)
From 323fed4284407b72087fde94134e2892e3c5e31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 22 Jul 2015 15:27:14 +0200
Subject: [PATCH 133/137] kodi: 14.2 -> 15.0
---
pkgs/applications/video/kodi/default.nix | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index cd24f2bfc2a..30eac05c234 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -37,18 +37,18 @@ assert cecSupport -> libcec != null;
assert rtmpSupport -> rtmpdump != null;
let
- rel = "Helix";
- ffmpeg_2_4_6 = fetchurl {
- url = "https://github.com/xbmc/FFmpeg/archive/2.4.6-${rel}.tar.gz";
- sha256 = "1kxp2z2zgcbplm5398zrfgwcfacfzvbg9y9wwrmm8vgwfmj32wh8";
+ rel = "Isengard";
+ ffmpeg_2_6_3 = fetchurl {
+ url = "https://github.com/xbmc/FFmpeg/archive/2.6.3-${rel}.tar.gz";
+ sha256 = "129nwrj9i758vz9xakpp68sm1l7z4in0krq6ayyqnpsnm54r9xlc";
};
in stdenv.mkDerivation rec {
name = "kodi-" + version;
- version = "14.2";
+ version = "15.0";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
- sha256 = "1x37l8db6xrvdw933p804lnwvkcm4vdb9gm5i6vmz4ha8f88bjyr";
+ sha256 = "1zqdmqffjfr5219cvpbvq9v1z5p5pzi2m9xs9lzk4jz7rxrs3nr7";
};
buildInputs = [
@@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
--replace "/bin/bash" "${bash}/bin/bash -ex"
- cp ${ffmpeg_2_4_6} tools/depends/target/ffmpeg/ffmpeg-2.4.6-${rel}.tar.gz
+ cp ${ffmpeg_2_6_3} tools/depends/target/ffmpeg/ffmpeg-2.6.3-${rel}.tar.gz
'';
preConfigure = ''
From 48a25dc899d3ff413f19bb1a6afa021d400001f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 16:09:00 +0200
Subject: [PATCH 134/137] Manual: Reduce chunking
Fixes #7607.
---
nixos/doc/manual/default.nix | 15 +++++++++++++--
nixos/doc/manual/manual.xml | 2 +-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index fdfeb5ca07c..797675e5df1 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -61,6 +61,16 @@ let
echo "${version}" > version
'';
+ toc = builtins.toFile "toc.xml"
+ ''
+ <toc role="chunk-toc">
+ <d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-nixos-manual"><?dbhtml filename="index.html"?>
+ <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?>
+ </d:tocentry>
+ </d:tocentry>
+ </toc>
+ '';
+
in rec {
# The NixOS options in JSON format.
@@ -113,9 +123,10 @@ in rec {
--param chunk.section.depth 0 \
--param chunk.first.sections 1 \
--param use.id.as.filename 1 \
- --stringparam generate.toc "book toc chapter toc appendix toc" \
+ --stringparam generate.toc "book toc appendix toc" \
+ --stringparam chunk.toc ${toc} \
--nonet --xinclude --output $dst/ \
- ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunkfast.xsl ./manual.xml
+ ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl ./manual.xml
mkdir -p $dst/images/callouts
cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index f6aedfd6b66..eac96f92599 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -2,7 +2,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
- xml:id="NixOSManual">
+ xml:id="book-nixos-manual">
<info>
<title>NixOS Manual</title>
From 1a03de173bac85b8feded80734de25388831d3eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Jul 2015 16:17:06 +0200
Subject: [PATCH 135/137] Move release notes to an appendix and a separate
chunk
---
nixos/doc/manual/default.nix | 4 ++--
nixos/doc/manual/manual.xml | 3 ++-
nixos/doc/manual/release-notes/release-notes.xml | 14 ++++++--------
nixos/doc/manual/release-notes/rl-1310.xml | 12 ++++++------
nixos/doc/manual/release-notes/rl-1404.xml | 12 ++++++------
nixos/doc/manual/release-notes/rl-1412.xml | 12 ++++++------
nixos/doc/manual/release-notes/rl-unstable.xml | 14 +++++++-------
7 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 797675e5df1..419df915e6a 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -65,8 +65,8 @@ let
''
<toc role="chunk-toc">
<d:tocentry xmlns:d="http://docbook.org/ns/docbook" linkend="book-nixos-manual"><?dbhtml filename="index.html"?>
- <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?>
- </d:tocentry>
+ <d:tocentry linkend="ch-options"><?dbhtml filename="options.html"?></d:tocentry>
+ <d:tocentry linkend="ch-release-notes"><?dbhtml filename="release-notes.html"?></d:tocentry>
</d:tocentry>
</toc>
'';
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index eac96f92599..736d1d4eff7 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -33,11 +33,12 @@
<xi:include href="administration/running.xml" />
<!-- <xi:include href="userconfiguration.xml" /> -->
<xi:include href="development/development.xml" />
- <xi:include href="release-notes/release-notes.xml" />
<appendix xml:id="ch-options">
<title>Configuration Options</title>
<xi:include href="options-db.xml" />
</appendix>
+ <xi:include href="release-notes/release-notes.xml" />
+
</book>
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index a988a5b0199..70cd2d6070b 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -1,19 +1,17 @@
-<part xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="ch-release-notes">
+<appendix xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="ch-release-notes">
<title>Release Notes</title>
-<partintro>
<para>This section lists the release notes for each stable version of NixOS
and current unstable revision.</para>
-</partintro>
<xi:include href="rl-unstable.xml" />
<xi:include href="rl-1412.xml" />
<xi:include href="rl-1404.xml" />
<xi:include href="rl-1310.xml" />
-</part>
+</appendix>
diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixos/doc/manual/release-notes/rl-1310.xml
index 234fb5a643f..583912d7073 100644
--- a/nixos/doc/manual/release-notes/rl-1310.xml
+++ b/nixos/doc/manual/release-notes/rl-1310.xml
@@ -1,11 +1,11 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="sec-release-13.10">
+<section xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="sec-release-13.10">
<title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
<para>This is the first stable release branch of NixOS.</para>
-</chapter>
\ No newline at end of file
+</section>
diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml
index 74af1ed1274..36f67ed88b0 100644
--- a/nixos/doc/manual/release-notes/rl-1404.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -1,8 +1,8 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="sec-release-14.04">
+<section xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="sec-release-14.04">
<title>Release 14.04 (“Baboon”, 2014/04/30)</title>
@@ -157,4 +157,4 @@ networking.firewall.enable = false;
</para>
-</chapter>
\ No newline at end of file
+</section>
diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml
index 36ae48af759..42b51cd4a8e 100644
--- a/nixos/doc/manual/release-notes/rl-1412.xml
+++ b/nixos/doc/manual/release-notes/rl-1412.xml
@@ -1,8 +1,8 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="sec-release-14.12">
+<section xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="sec-release-14.12">
<title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
@@ -174,4 +174,4 @@ now.</para></listitem>
</para>
-</chapter>
+</section>
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index fc4fcd4219e..ecde80f2a01 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -1,10 +1,10 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- version="5.0"
- xml:id="sec-release-unstable">
+<section xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="5.0"
+ xml:id="sec-release-unstable">
-<title>Unstable revision</title>
+<title>Release 15.07 (“Dingo”, 2015/07/??)</title>
<para>In addition to numerous new and upgraded packages, this release has the following highlights:
@@ -164,4 +164,4 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install
</itemizedlist>
</para>
-</chapter>
+</section>
From b1e58a7720b0baec3ba7c9c053d54a8ee06bb7cf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 16:38:33 +0200
Subject: [PATCH 136/137] simple-scan: 3.17.3 -> 3.17.4
---
pkgs/applications/graphics/simple-scan/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 744f789e55c..954b2e02136 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cairo, colord, glib, gtk3, intltool, itstool, libxml2
, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
-let version = "3.17.3"; in
+let version = "3.17.4"; in
stdenv.mkDerivation rec {
name = "simple-scan-${version}";
src = fetchurl {
- sha256 = "1kb2xk4vr2nab3hfjfnfyapv2z65h99c3g7mfkmanzrng5xwrj8q";
+ sha256 = "1pslbv45g01g039zj2b01k08f763kkhzqw8wwz7yh27m7bjllnx6";
url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz";
};
From 3064b6a0cc4dc047fae97bdffa0725bc7fd38f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Jul 2015 16:25:00 +0200
Subject: [PATCH 137/137] remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.
/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.
---
pkgs/development/libraries/bobcat/default.nix | 4 ++--
pkgs/development/tools/parsing/flexc++/default.nix | 4 ++--
pkgs/os-specific/linux/jfbview/default.nix | 5 ++---
pkgs/top-level/all-packages.nix | 9 ++-------
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 38dfce7583a..2a9ee1c9c5b 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline
+{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline
, utillinux, yodl }:
let version = "3.25.02"; in
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ];
};
- buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ];
+ buildInputs = [ libmilter libX11 openssl readline utillinux ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 515fb9d251f..d723cc0382b 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }:
+{ stdenv, fetchurl, bobcat, icmake, yodl }:
let version = "2.02.00"; in
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ nckx ];
};
- buildInputs = [ bobcat gcc49 ];
+ buildInputs = [ bobcat ];
nativeBuildInputs = [ icmake yodl ];
postPatch = ''
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 4b371097ee6..34bf136ece7 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -1,5 +1,4 @@
-# FIXME: remove gcc49 when the default gcc supports C++1y
-{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
+{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11
, mujs, mupdf, ncurses, openjpeg, openssl }:
let
@@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "jichu4n";
};
- buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf
+ buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf
ncurses openjpeg openssl ];
buildFlags = binaries;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c14725cce1..3d7dd44d6a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3132,9 +3132,7 @@ let
torbutton = callPackage ../tools/security/torbutton { };
- torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
- stdenv = overrideCC stdenv gcc49;
- };
+ torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
touchegg = callPackage ../tools/inputmethods/touchegg { };
@@ -10829,7 +10827,6 @@ let
clipit = callPackage ../applications/misc/clipit { };
bomi = callPackage ../applications/video/bomi {
- stdenv = overrideCC stdenv gcc49;
pulseSupport = config.pulseaudio or true;
};
@@ -13390,8 +13387,7 @@ let
zathuraCollection = recurseIntoAttrs
(let callPackage = newScope pkgs.zathuraCollection; in
import ../applications/misc/zathura {
- inherit callPackage pkgs fetchurl lib;
- stdenv = overrideCC stdenv gcc49;
+ inherit stdenv callPackage pkgs fetchurl lib;
useMupdf = config.zathura.useMupdf or false;
});
@@ -13405,7 +13401,6 @@ let
girara = callPackage ../applications/misc/girara {
gtk = gtk3;
- stdenv = overrideCC stdenv gcc49;
};
girara-light = callPackage ../applications/misc/girara {