From f21cab27a43ed58ffd865737bdcc5d907622216c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 10 Feb 2015 10:03:38 -0500 Subject: [PATCH 001/120] Fix initial-install issues with couchdb.nix. When starting from a clean slate, the couchdb service fails. First, the pre-start script fails because it tries to chown the uriFile, which doesn't exist. It also doesn't ensure that the directory in which the uriFIle is placed is writeable by couchdb, which could also cause failure (though I didn't observe this). Additionally, the log file's default location isn't a directory owned by couchdb, nor is the file guaranteed to exist, nor is it guaranteed to be chowned to the appropriate user. All of which can cause unexpected failure. As a bonus I made a small change in the description of the configFile attribute, in the hopes of making it a little more obvious why it existed. --- nixos/modules/services/databases/couchdb.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index e1fe6be6f6a..2b1d07c355e 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -131,8 +131,8 @@ in { type = types.string; default = "/var/lib/couchdb/couchdb.ini"; description = '' - Custom configuration file. File needs to be readable and writable - from couchdb user/group. + Configuration file for persisting runtime changes. File + needs to be readable and writable from couchdb user/group. ''; }; @@ -157,12 +157,15 @@ in { mkdir -p ${cfg.databaseDir}; mkdir -p ${cfg.viewIndexDir}; touch ${cfg.configFile} + touch -a ${cfg.logFile} if [ "$(id -u)" = 0 ]; then - chown ${cfg.user}:${cfg.group} ${cfg.uriFile} + chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`; + (-f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} chown ${cfg.user}:${cfg.group} ${cfg.configFile} + chown ${cfg.user}:${cfg.group} ${cfg.logFile} fi ''; From 1c45287bafa7be30df6e5a27c8e94af4e7e668cc Mon Sep 17 00:00:00 2001 From: j-keck Date: Thu, 12 Feb 2015 20:38:35 +0100 Subject: [PATCH 002/120] postgresql: Update to 9.0.19, 9.1.15, 9.2.10, 9.3.6, 9.4.1 --- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.3.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.4.x.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 85c14931eed..72d7f7a816f 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.18"; in +let version = "9.0.19"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003"; + sha256 = "1h45jdbzdcvprdsi9gija81s3ny46h3faf9f007gza4vm6y15bak"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index ef335a77ab6..fd1c9395d5a 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.14"; in +let version = "9.1.15"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "d0647ce563d18ae02bf68c5dd646a4c75e8b45b3a4fada64d481371fdc16f522"; + sha256 = "0pyyw0cy91z9wkqf8qzkwsy8cyjps0s94c9czz6mzhyd2npxxmk7"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index fdfb5a17b54..8528871d302 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.9"; in +let version = "9.2.10"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "94ec6d330f125b6fc725741293073b07d7d20cc3e7b8ed127bc3d14ad2370197"; + sha256 = "1bbkinqzb3c8i0vfzcy2g7djrq0kxz63jgvzda9p0vylxazmnm1m"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 40f07d8ffe1..d9644506eea 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.3.5"; in +let version = "9.3.6"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0"; + sha256 = "056ass7nnfyv7blv02anv795kgpz77gipdpxggd835cdwrhwns13"; }; buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; diff --git a/pkgs/servers/sql/postgresql/9.4.x.nix b/pkgs/servers/sql/postgresql/9.4.x.nix index 4e2d77ac6da..6cf59b21356 100644 --- a/pkgs/servers/sql/postgresql/9.4.x.nix +++ b/pkgs/servers/sql/postgresql/9.4.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.4.0"; in +let version = "9.4.1"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "7a35c3cb77532f7b15702e474d7ef02f0f419527ee80a4ca6036fffb551625a5"; + sha256 = "19n3i14bhmw8dacd2kl3n1wzj362qv3fjmal5vsvi580h9ybgp99"; }; buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; From ec437bff924eebcad69fad9743297c256de3fc81 Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Mon, 16 Feb 2015 08:08:16 +0000 Subject: [PATCH 003/120] replace use of `which` with `command -v` in i3 scripts --- pkgs/applications/window-managers/i3/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index f07c1d22310..fa6975c36ad 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" mkdir -p $out/man/man1 cp man/*.1 $out/man/man1 + for program in $out/bin/i3-sensible-*; do + sed -i 's/which/command -v/' $program + done ''; meta = with stdenv.lib; { From 3904d5445d742b4669f0fd8e786ae8b6f95faed6 Mon Sep 17 00:00:00 2001 From: Olav Date: Wed, 18 Feb 2015 00:12:43 +0000 Subject: [PATCH 004/120] Add lua package for cjson --- pkgs/top-level/lua-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index eeff4a47f9e..fd3b6713e2e 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -242,6 +242,27 @@ let }; }; + cjson = buildLuaPackage rec { + name = "cjson-${version}"; + version = "2.1.0"; + src = fetchurl { + url = "http://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.0.tar.gz"; + sha256 = "0y67yqlsivbhshg8ma535llz90r4zag9xqza5jx0q7lkap6nkg2i"; + }; + preBuild = '' + sed -i "s|/usr/local|$out|" Makefile + ''; + makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; + postInstall = '' + rm -rf $out/share/lua/${lua.luaversion}/cjson/tests + ''; + installTargets = "install install-extra"; + meta = { + description = "Lua C extension module for JSON support"; + license = stdenv.lib.licenses.mit; + }; + }; + luaMessagePack = buildLuaPackage rec { name = "lua-MessagePack-${version}"; version = "0.3.1"; From 4fea2833497ade8266c0b69788baf9a304e5ca8e Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 16 Jan 2015 15:04:12 +0300 Subject: [PATCH 005/120] sipcmd: add the command-line SIP client --- .../networking/sipcmd/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/sipcmd/default.nix diff --git a/pkgs/applications/networking/sipcmd/default.nix b/pkgs/applications/networking/sipcmd/default.nix new file mode 100644 index 00000000000..e45f8c4f84c --- /dev/null +++ b/pkgs/applications/networking/sipcmd/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, opal, ptlib }: + +stdenv.mkDerivation rec { + + rev = "3090e9f"; + + name = "sipcmd-${rev}"; + + src = fetchgit { + url = "https://github.com/tmakkonen/sipcmd"; + rev = "${rev}"; + sha256 = "072h9qapmz46r8pxbzkfmc4ikd7dv9g8cgrfrw21q942icbrvq2c"; + }; + + buildInputs = [ opal ptlib ]; + + buildPhase = '' + make IFLAGS="-I${opal}/include/opal -I${ptlib}/include -Isrc/ -L${opal}/lib -L${ptlib}/lib" + ''; + + installPhase = '' + mkdir -pv $out/bin + cp sipcmd $out/bin/sipcmd + ''; + + meta = { + homepage = https://github.com/tmakkonen/sipcmd; + description = "sipcmd - the command line SIP/H.323/RTP softphone"; + platforms = with stdenv.lib.platforms; linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e86264c5d..c50d4018827 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8178,6 +8178,8 @@ let shishi = callPackage ../servers/shishi { }; + sipcmd = callPackage ../applications/networking/sipcmd { }; + sipwitch = callPackage ../servers/sip/sipwitch { }; spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; From b7adfe0e7d4a3c2128d986c77977350862b10d86 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 19 Jan 2015 17:19:36 +0300 Subject: [PATCH 006/120] sipp: add the package --- pkgs/development/tools/misc/sipp/default.nix | 29 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/sipp/default.nix diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix new file mode 100644 index 00000000000..d3373e9f4a6 --- /dev/null +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, ncurses, libpcap }: + +stdenv.mkDerivation rec { + + version = "3.4-beta2"; + + name = "sipp-${version}"; + + src = fetchurl { + url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz"; + sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv"; + }; + + configurePhase = '' + export ac_cv_lib_curses_initscr=yes + export ac_cv_lib_pthread_pthread_mutex_init=yes + sed -i "s@-lcurses@-lncurses@g" ./configure + sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp + ./configure --prefix=$out --with-pcap + ''; + + postInstall = '' + mkdir -pv $out/share/pcap + cp pcap/* $out/share/pcap + ''; + + buildInputs = [ncurses libpcap]; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c50d4018827..d24d46d9732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11169,6 +11169,8 @@ let shntool = callPackage ../applications/audio/shntool { }; + sipp = callPackage ../development/tools/misc/sipp { }; + sonic-visualiser = callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; inherit (pkgs.xlibs) libX11; From 0a006c78bf1b55af38587d1b229a87ff6a4873d3 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Thu, 5 Feb 2015 16:52:14 +0300 Subject: [PATCH 007/120] dhcpdump: add the tool --- pkgs/tools/networking/dhcpdump/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/networking/dhcpdump/default.nix diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix new file mode 100644 index 00000000000..778cfc3b5ed --- /dev/null +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libpcap, perl }: + +stdenv.mkDerivation rec { + name = "dhcpdump-1.8"; + + src = fetchurl { + url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_1.8.orig.tar.gz"; + sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd"; + }; + + buildInputs = [libpcap perl]; + + installPhase = '' + mkdir -pv $out/bin + cp dhcpdump $out/bin + ''; + + meta = { + description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; + homepage = http://packages.ubuntu.com/ru/lucid/dhcpdump; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d24d46d9732..d6c61a375a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1037,6 +1037,8 @@ let dhcp = callPackage ../tools/networking/dhcp { }; + dhcpdump = callPackage ../tools/networking/dhcpdump { }; + dhcpcd = callPackage ../tools/networking/dhcpcd { }; di = callPackage ../tools/system/di { }; From 6920d4fbeb2ebfe6d50624fc500d48f0bcf8b13d Mon Sep 17 00:00:00 2001 From: bstrik Date: Wed, 18 Feb 2015 21:53:47 +0100 Subject: [PATCH 008/120] dockapps for windowmaker --- .../windowmaker/dockapps/wmcalclock.nix | 30 +++++++++++++++++++ .../windowmaker/dockapps/wmsystemtray.nix | 18 +++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 52 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix create mode 100644 pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix new file mode 100644 index 00000000000..1d2683c40fd --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }: + +stdenv.mkDerivation { + name = "wmCalClock-1.25"; + src = fetchurl { + url = http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz; + sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/Src"; + + buildPhase='' + make prefix=$out + ''; + + installPhase = '' + mkdir -pv $out/bin + mkdir -pv $out/man/man1 + make DESTDIR=$out install + ''; + + meta = { + description = "Clock for Windowmaker"; + homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix new file mode 100644 index 00000000000..358f3d22f39 --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }: + +stdenv.mkDerivation { + name = "wmsystemtray-1.4"; + src = fetchurl { + url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz; + sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; + }; + + buildInputs = [ pkgconfig libX11 libXpm libXext libXfixes libXmu ]; + + meta = { + description = "Systemtray for Windowmaker"; + homepage = "http://wmsystemtray.sourceforge.net"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.bstrik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7c6d211508..7fce0f1b249 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11730,6 +11730,10 @@ let windowmaker = callPackage ../applications/window-managers/windowmaker { }; + wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; + + wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { }; + winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { From 30061d39711d13b04264b717af0b896f3bb5e0eb Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Fri, 20 Feb 2015 14:14:26 -0700 Subject: [PATCH 009/120] Packaged nkf (network kanji filter) --- pkgs/tools/text/nkf/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/text/nkf/default.nix diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix new file mode 100644 index 00000000000..681cc5be37e --- /dev/null +++ b/pkgs/tools/text/nkf/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "nkf-${version}"; + version = "2.1.3"; + + src = fetchurl { + url = "mirror://sourceforgejp/nkf/59912/${name}.tar.gz"; + sha256 = "8cb430ae69a1ad58b522eb4927b337b5b420bbaeb69df255919019dc64b72fc2"; + }; + + makeFlags = "prefix=\${out}"; + + meta = { + description = "tool for converting encoding of Japanese text"; + homepage = "http://sourceforge.jp/projects/nkf/"; + license = stdenv.lib.licenses.zlib; + maintainers = [ stdenv.lib.maintainers.auntie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 605ab63ca21..c77fb8c38ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1980,6 +1980,8 @@ let nitrogen = callPackage ../tools/X11/nitrogen {}; + nkf = callPackage ../tools/text/nkf {}; + nlopt = callPackage ../development/libraries/nlopt {}; npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; From ce7449f68befeb6b5fd1315f9537d21b7fe939f1 Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Wed, 18 Feb 2015 09:12:06 +1100 Subject: [PATCH 010/120] virt-manager: update from 1.0.1 to 1.1.0 --- pkgs/applications/virtualization/virt-manager/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 182d89e5f22..67e3f9ade98 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python , makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib -, avahi, dconf, spiceSupport ? true, spice_gtk +, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo }: with stdenv.lib; @@ -9,12 +9,12 @@ with pythonPackages; buildPythonPackage rec { name = "virt-manager-${version}"; - version = "1.0.1"; + version = "1.1.0"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1n248kack1fni8y17ysgq5xhvffcgy4l62hnd0zvr4kjw0579qq8"; + sha256 = "0hbr1wf4byfvbqlbq3w6s71ckhn626i4rb497y4z2cm12p5hc2db"; }; propagatedBuildInputs = @@ -22,7 +22,7 @@ buildPythonPackage rec { paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 - libvirt libxml2Python ipaddr vte + libvirt libxml2Python ipaddr vte libosinfo ] ++ optional spiceSupport spice_gtk; buildInputs = From e0cefbca65813647cf573631ae1f2fed8d998b2c Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Wed, 18 Feb 2015 09:12:45 +1100 Subject: [PATCH 011/120] virt-viewer: update from 1.0 to 2.0 --- pkgs/applications/virtualization/virt-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 842687cfdaf..2fe7e0bcc23 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -11,10 +11,10 @@ with stdenv.lib; let sourceInfo = rec { baseName="virt-viewer"; - version="1.0"; + version="2.0"; name="${baseName}-${version}"; url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - hash="09sf1xzvw2yysv4c1jkqlzrazdg501r4j12hiwjdzk5swk6lppw0"; + hash="0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9"; }; in stdenv.mkDerivation { From 3bfbed7535ba05507e3b9ba4607416850bcbdabe Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Sat, 21 Feb 2015 14:35:01 -0700 Subject: [PATCH 012/120] Made suggested changes to nkf package --- pkgs/tools/text/nkf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/tools/text/nkf/default.nix index 681cc5be37e..31d58fbccc3 100644 --- a/pkgs/tools/text/nkf/default.nix +++ b/pkgs/tools/text/nkf/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { makeFlags = "prefix=\${out}"; meta = { - description = "tool for converting encoding of Japanese text"; + description = "Tool for converting encoding of Japanese text"; homepage = "http://sourceforge.jp/projects/nkf/"; license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.auntie ]; }; } From 3f02885d061da35db34d18fb6d8c7c3a90ee6162 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 21 Feb 2015 21:56:50 -0500 Subject: [PATCH 013/120] u9fs: initial package --- pkgs/servers/u9fs/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/servers/u9fs/default.nix diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix new file mode 100644 index 00000000000..dc855294fbd --- /dev/null +++ b/pkgs/servers/u9fs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchhg }: + +stdenv.mkDerivation { + name = "u9fs-20110513"; + src = fetchhg { + url = https://code.google.com/p/u9fs; + rev = "9474edb23b11"; + sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6"; + }; + + installPhase = + '' + mkdir -p $out/bin $out/share/man4 + cp u9fs $out/bin; cp u9fs.man $out/share/man4 + ''; + + meta = with stdenv.lib; + { description = "Serve 9P from Unix"; + homepage = https://code.google.com/p/u9fs; + license = licenses.free; + maintainers = [ maintainers.emery ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dd8284bbc9..b04e3ca85b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2779,6 +2779,8 @@ let txt2man = callPackage ../tools/misc/txt2man { }; + u9fs = callPackage ../servers/u9fs { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; From 446580f3cd5a642e811e31172639eadbebeda61b Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 22 Feb 2015 10:07:30 -0500 Subject: [PATCH 014/120] nixos: u9fs service module --- nixos/modules/module-list.nix | 1 + .../services/network-filesystems/u9fs.nix | 75 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/u9fs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c41ae69c1ac..103cded78b0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -228,6 +228,7 @@ ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix ./services/network-filesystems/diod.nix + ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix ./services/networking/amuled.nix ./services/networking/atftpd.nix diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix new file mode 100644 index 00000000000..64809727464 --- /dev/null +++ b/nixos/modules/services/network-filesystems/u9fs.nix @@ -0,0 +1,75 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.u9fs; +in +{ + + options = { + + services.u9fs = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to run the u9fs 9P server for Unix."; + }; + + listenStreams = mkOption { + type = types.listOf types.str; + default = [ "564" ]; + example = [ "192.168.16.1:564" ]; + description = '' + Sockets to listen for clients on. + See man 5 systemd.socket for socket syntax. + ''; + }; + + extraArgs = mkOption { + type = types.str; + default = ""; + example = "-a none -u nobody"; + description = + '' + Extra arguments to pass on invocation, + see man 4 u9fs + ''; + }; + + fsroot = mkOption { + type = types.path; + default = "/"; + example = "/srv"; + description = "File system root to serve to clients."; + }; + + }; + + }; + + config = mkIf cfg.enable { + + systemd = { + sockets.u9fs = { + description = "U9fs Listening Socket"; + wantedBy = [ "sockets.target" ]; + inherit (cfg) listenStreams; + socketConfig.Accept = "yes"; + }; + services."u9fs@" = { + description = "9P Protocol Server"; + reloadIfChanged = true; + requires = [ "u9fs.socket" ]; + serviceConfig = + { ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs} ${cfg.fsroot}"; + StandardInput = "socket"; + StandardError = "journal"; + }; + }; + }; + + }; + +} From d9db5dbd89c7844d72891007e8132f39e77eae03 Mon Sep 17 00:00:00 2001 From: Sam Griffin Date: Sun, 22 Feb 2015 14:29:34 -0500 Subject: [PATCH 015/120] updating bitcoin and changing source location --- pkgs/applications/altcoins/bitcoin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index a69c68f346e..2d96100fffc 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.9.3"; + version = "0.10.0"; src = fetchurl { - url = "https://github.com/bitcoin/bitcoin/archive/v${version}.tar.gz"; - sha256 = "0a6lkfzsmqqcbz2cc0cg8dccd990b5y7qi8mw358fhfb4f1jxn9y"; + url = "https://bitcoin.org/bin/bitcoin-core-0.10.0/bitcoin-${version}.tar.gz"; + sha256 = "a516cf6d9f58a117607148405334b35d3178df1ba1c59229609d2bcd08d30624"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib From fcc379070f67b9cba710298203b96f5a9537b926 Mon Sep 17 00:00:00 2001 From: Sibi Date: Sat, 21 Feb 2015 16:45:09 +0530 Subject: [PATCH 016/120] new package: wtforms --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 806af1fe11a..24637c53c01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4225,6 +4225,24 @@ let }; }; + wtforms = buildPythonPackage rec { + version = "2.0.2"; + name = "wtforms-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/W/WTForms/WTForms-${version}.zip"; + md5 = "613cf723ab40537705bec02733c78d95"; + }; + + propagatedBuildInputs = with self; [ ordereddict Babel ]; + + meta = { + homepage = https://github.com/wtforms/wtforms; + description = "A flexible forms validation and rendering library for Python"; + license = licenses.bsd3; + }; + }; + flexget = buildPythonPackage rec { version = "1.2.234"; name = "FlexGet-${version}"; From 0ae99380d03434317cf8e1f1585a8c437968233f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Tue, 24 Feb 2015 15:35:09 +0100 Subject: [PATCH 017/120] yed: upgraded to yed-3.14 --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 4299d49ae65..a9ced83cfae 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.13"; + name = "yEd-3.14"; src = fetchurl { url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "1d5qs6q31k49y9gh054aafck548pv9f97b3il4iksnna1r59w5jy"; + sha256 = "147bb081b063abee202a0019597ac960273454046afb29ebbe91e62102dd0471"; }; nativeBuildInputs = [ unzip makeWrapper ]; From c6ef0727c3aa377e4ad5f041c105a4795bb94cc9 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Wed, 25 Feb 2015 00:34:58 +0100 Subject: [PATCH 018/120] Fix/update Xpra --- pkgs/tools/X11/xpra/default.nix | 39 ++++++++++--- pkgs/tools/X11/xpra/gtk3.nix | 73 +++++++++++++++++++++++++ pkgs/tools/X11/xpra/libfakeXinerama.nix | 33 +++++++++++ pkgs/top-level/all-packages.nix | 5 +- 4 files changed, 140 insertions(+), 10 deletions(-) create mode 100644 pkgs/tools/X11/xpra/gtk3.nix create mode 100644 pkgs/tools/X11/xpra/libfakeXinerama.nix diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 688c0e12d93..a18ee18668b 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, buildPythonPackage , python, cython, pkgconfig , xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo -, ffmpeg, x264, libvpx, pil, libwebp }: +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, ffmpeg, x264, libvpx, pil, libwebp +, libfakeXinerama }: buildPythonPackage rec { - name = "xpra-0.11.6"; + name = "xpra-0.14.19"; namePrefix = ""; src = fetchurl { - url = "http://xpra.org/src/${name}.tar.bz2"; - sha256 = "0n3lr8nrfmrll83lgi1nzalng902wv0dcmcyx4awnman848dxij0"; + url = "https://www.xpra.org/src/${name}.tar.xz"; + sha256 = "0jifaysz4br1v0zibnzgd0k02rgybbsysvwrgbar1452sjb3db5m"; }; buildInputs = [ @@ -18,25 +20,27 @@ buildPythonPackage rec { xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage - xorg.libXrandr + xorg.libXrandr xorg.libxkbfile pango cairo gdk_pixbuf atk gtk glib ffmpeg libvpx x264 libwebp + + makeWrapper ]; propagatedBuildInputs = [ pil pygtk pygobject ]; - # Even after i tried monkey patching, their tests just fail, looks like - # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177 - doCheck = false; + postPatch = '' + sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py + ''; preBuild = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" ''; - setupPyBuildFlags = ["--enable-Xdummy"]; + setupPyBuildFlags = ["--with-Xdummy"]; preInstall = '' # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix @@ -44,9 +48,26 @@ buildPythonPackage rec { sed -i '/ = data_files/d' setup.py ''; + postInstall = '' + wrapProgram $out/bin/xpra \ + --set XKB_BINDIR "${xkbcomp}/bin" \ + --set FONTCONFIG_FILE "${fontsConf}" \ + --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ + --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + ''; + + #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though + #postFixup = '' + # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra + # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra + # sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + #''; + + meta = { homepage = http://xpra.org/; description = "Persistent remote applications for X"; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; }; } diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix new file mode 100644 index 00000000000..04bcd119514 --- /dev/null +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, buildPythonPackage +, python, cython, pkgconfig +, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection +, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config +, ffmpeg, x264, libvpx, libwebp +, libfakeXinerama }: + +buildPythonPackage rec { + name = "xpra-0.14.19"; + namePrefix = ""; + + src = fetchurl { + url = "https://www.xpra.org/src/${name}.tar.xz"; + sha256 = "0jifaysz4br1v0zibnzgd0k02rgybbsysvwrgbar1452sjb3db5m"; + }; + + buildInputs = [ + pkgconfig + + xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto + xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto + xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage + xorg.libXrandr xorg.libxkbfile + + pango cairo gdk_pixbuf atk gtk3 glib gobjectIntrospection + + ffmpeg libvpx x264 libwebp + + makeWrapper + ]; + + propagatedBuildInputs = [ + pygobject3 pycairo cython + ]; + + postPatch = '' + sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" + ''; + setupPyBuildFlags = [ "--with-gtk3" "--without-gtk2" "--with-Xdummy" ]; + + + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out + sed -i '/ = data_files/d' setup.py + ''; + + postInstall = '' + wrapProgram $out/bin/xpra \ + --set XKB_BINDIR "${xkbcomp}/bin" \ + --set FONTCONFIG_FILE "${fontsConf}" \ + --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ + --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin + ''; + + #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though + #postFixup = '' + # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra + # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra + # sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra + #''; + + + meta = { + homepage = http://xpra.org/; + description = "Persistent remote applications for X"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix new file mode 100644 index 00000000000..4ca509f8b93 --- /dev/null +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libX11, libXinerama }: + +stdenv.mkDerivation rec { + name = "libfakeXinerama-${version}"; + version = "0.1.0"; + + src = fetchurl { + url = "https://www.xpra.org/src/${name}.tar.bz2"; + sha256 = "0gxb8jska2anbb3c1m8asbglgnwylgdr44x9lr8yh91hjxsqadkx"; + }; + + buildInputs = [ libX11 libXinerama ]; + + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + buildPhase = '' + gcc -O2 -Wall fakeXinerama.c -fPIC -o libfakeXinerama.so.1.0 -shared + ''; + + installPhase = '' + mkdir -p $out/lib + cp libfakeXinerama.so.1.0 $out/lib + ln -s libXinerama.so.1.0 $out/lib/libXinerama.so.1 + ln -s libXinerama.so.1 $out/lib/libXinerama.so + ''; + + meta = { + homepage = http://xpra.org/; + description = "fakeXinerama for Xpra"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dea95572d6..c0e75a7cde2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12078,7 +12078,10 @@ let libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { }; + xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; }; + libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { inherit (xlibs) libXinerama; }; + #TODO: 'pil' is not available for python3, yet + xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonPackage python cython pygobject3 pycairo; }; xrestop = callPackage ../tools/X11/xrestop { }; From c6ead8477da707db3467069b50b642d4af6c512c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 24 Feb 2015 20:22:45 -0600 Subject: [PATCH 019/120] plasma52: update to 5.2.1 --- pkgs/desktops/plasma-5.2/default.nix | 2 +- pkgs/desktops/plasma-5.2/dependencies.nix | 8 + pkgs/desktops/plasma-5.2/manifest.nix | 324 ++++++++++++++++++++++ pkgs/desktops/plasma-5.2/manifest.sh | 1 + 4 files changed, 334 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 2384d926fc4..3b4aa652735 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -108,7 +108,7 @@ let kwin = with pkgs; super.kwin // { buildInputs = with xlibs; super.kwin.buildInputs ++ [ libICE libSM libXcursor ]; - patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ./kwin/libinput-0.8.patch ]; + patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; }; libkscreen = with pkgs; super.libkscreen // { diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.2/dependencies.nix index fe0b72c0daa..e96a5afbdbc 100644 --- a/pkgs/desktops/plasma-5.2/dependencies.nix +++ b/pkgs/desktops/plasma-5.2/dependencies.nix @@ -241,6 +241,14 @@ propagatedUserEnvPkgs = [ ]; }; + plasma-workspace-wallpaper = { + buildInputs = [ "ECM" ]; + nativeBuildInputs = [ "cmake" ]; + propagatedBuildInputs = [ ]; + propagatedNativeBuildInputs = [ ]; + propagatedUserEnvPkgs = [ ]; + }; + plasma-workspace-wallpapers = { buildInputs = [ "ECM" ]; nativeBuildInputs = [ "cmake" ]; diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix index 23bfa7867be..154c1aa98fd 100644 --- a/pkgs/desktops/plasma-5.2/manifest.nix +++ b/pkgs/desktops/plasma-5.2/manifest.nix @@ -325,4 +325,328 @@ name = "kwin-5.2.0.tar.xz"; }; } + { + name = stdenv.lib.nameFromURL "kio-extras-5.2.1.tar.xz" ".tar"; + store = "/nix/store/79invr6hmjir390chxkbqwijfl47sn44-kio-extras-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kio-extras-5.2.1.tar.xz"; + sha256 = "0b410hrwpanshvnr3qsgcpza142d178nr3hsgb0r0ssfh0wycmm8"; + name = "kio-extras-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.1.tar.xz" ".tar"; + store = "/nix/store/wp46hfmfna4343jryqnxgkx0i73w206m-kde-gtk-config-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kde-gtk-config-5.2.1.tar.xz"; + sha256 = "0d1ll4wx1wr14rczjmzxpfiwp67i0ljn172c9w8vhvrv7gy579vw"; + name = "kde-gtk-config-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-5.2.1.tar.xz" ".tar"; + store = "/nix/store/qsi6ridvxykn2qpdq6h8s85dcnn04l1a-oxygen-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/oxygen-5.2.1.tar.xz"; + sha256 = "1aj9y24ii51av8ydkk07nj666xk6igqkqqhlcpcc513qy87l041l"; + name = "oxygen-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khotkeys-5.2.1.tar.xz" ".tar"; + store = "/nix/store/98gn6w9nnzl0901dgs7kzm9j5kgf9i75-khotkeys-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/khotkeys-5.2.1.tar.xz"; + sha256 = "012hnykqwx4asmbsd84kqzrq90bwkpryh7nribpsc99kwlngdgsn"; + name = "khotkeys-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-desktop-5.2.1.tar.xz" ".tar"; + store = "/nix/store/ndkx7f2agaxdgn0l8yz9p3a0ahkhbyy8-plasma-desktop-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-desktop-5.2.1.tar.xz"; + sha256 = "08pjyvb8lzjd0pmc72k8c6jcgprzq0g8psd5vhmvw614j9pz1a5d"; + name = "plasma-desktop-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "baloo-5.6.1.tar.xz" ".tar"; + store = "/nix/store/qjcgng89qgribr5np0vrvj86jvvprsg4-baloo-5.6.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/baloo-5.6.1.tar.xz"; + sha256 = "1agf2vqkx9hb95di99c65752q9wjnyhkz1iwwvyk1n1a7jzvdqf2"; + name = "baloo-5.6.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sddm-kcm-5.2.1.tar.xz" ".tar"; + store = "/nix/store/g5lazmji9vlyiqkl6sj8h6i0yzdgnx1k-sddm-kcm-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/sddm-kcm-5.2.1.tar.xz"; + sha256 = "0jjis582j1rk8ss64ys94izsg29sik0khv3czzw5zjqns22kn2r3"; + name = "sddm-kcm-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "powerdevil-5.2.1.tar.xz" ".tar"; + store = "/nix/store/dv4cbwkmvpinz0v3s9y6p0ifci0q5fh0-powerdevil-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/powerdevil-5.2.1.tar.xz"; + sha256 = "147hpzwmw0vxysp7wv0fhmrgaw1aclap70ii7i5pz05k093xngfm"; + name = "powerdevil-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-workspace-wallpaper-5.2.1.tar.xz" ".tar"; + store = "/nix/store/mfchg5yspiyzvhhp5qh6j3zwfnwpca70-plasma-workspace-wallpaper-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-wallpaper-5.2.1.tar.xz"; + sha256 = "0cr6s3rs2gz8cq93q7l2w2g0ibzqqlyh0v1nkzhpyxqq0vggjliw"; + name = "plasma-workspace-wallpaper-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libbluedevil-5.2.1.tar.xz" ".tar"; + store = "/nix/store/iwiksm38d0ywn3x4rvcfjiynknxmy628-libbluedevil-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/libbluedevil-5.2.1.tar.xz"; + sha256 = "1wqk03pxl2bzy4f77fy1zwlrlv3k96x9xz8qnavkir9j0i3ijndp"; + name = "libbluedevil-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfilemetadata-5.6.1.tar.xz" ".tar"; + store = "/nix/store/m3f02ph2gqj8zw3p1kq86ih6m423i670-kfilemetadata-5.6.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kfilemetadata-5.6.1.tar.xz"; + sha256 = "0w6dzhng4wp4mrxnq6859np6j3h9iydj4dscp1qr3zc0y377blw3"; + name = "kfilemetadata-5.6.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "milou-5.2.1.tar.xz" ".tar"; + store = "/nix/store/f5979rdy20yxjbh9qif3wf7sylhdfr5i-milou-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/milou-5.2.1.tar.xz"; + sha256 = "1q5bfw7wbgq3gz5r3sdvx7rmsf4cbj501cy1asl6bf1grshjqiyn"; + name = "milou-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksysguard-5.2.1.tar.xz" ".tar"; + store = "/nix/store/6llw96fvpb79s3482w0v3ahb6qzn8czi-ksysguard-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/ksysguard-5.2.1.tar.xz"; + sha256 = "06sr86siw43ly1c8iqjd672szxxjqxl6n8gnxmf92h3qqh1i8a2k"; + name = "ksysguard-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmenuedit-5.2.1.tar.xz" ".tar"; + store = "/nix/store/fka4bg5h2hz93knjv2kqvz62dg5pk805-kmenuedit-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kmenuedit-5.2.1.tar.xz"; + sha256 = "0kpfxgm8jfm2lyf7wxmnnl9flligmds8f6fy1cy36fqxpzhcal98"; + name = "kmenuedit-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "systemsettings-5.2.1.tar.xz" ".tar"; + store = "/nix/store/942knn924cz51wwn3jimhcp799zlc7c8-systemsettings-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/systemsettings-5.2.1.tar.xz"; + sha256 = "0ib84irgdbjd3sga7csjx59c2wxg34yr3j9a8ajhqvdq34yb14n4"; + name = "systemsettings-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "muon-5.2.1.tar.xz" ".tar"; + store = "/nix/store/fvq7swhq8343kr70vjsl11bv1c3ayw3k-muon-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/muon-5.2.1.tar.xz"; + sha256 = "115a7q2ns0h6lszn1lq84y5bk02fm4ly3alxkig7976jh8rbykxf"; + name = "muon-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-nm-5.2.1.tar.xz" ".tar"; + store = "/nix/store/igw2v8zgczarw9ynxf473mfl76y6wd4j-plasma-nm-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-nm-5.2.1.tar.xz"; + sha256 = "1c4gkxv24kdl2b5gslljihwh5h0v970f70802swblgrp87819bfj"; + name = "plasma-nm-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksysguard-5.2.1.tar.xz" ".tar"; + store = "/nix/store/zkrwgpjsa2761wpmic225szjs4503kss-libksysguard-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/libksysguard-5.2.1.tar.xz"; + sha256 = "0f0s3hafdvgvscfbvkkdll95rzxa44j89qm7cmsclaqclmnwcfa2"; + name = "libksysguard-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.1.tar.xz" ".tar"; + store = "/nix/store/gsni5ny5qx2j1vic0q1pa0xb0126x2z0-polkit-kde-agent-1-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/polkit-kde-agent-1-5.2.1.tar.xz"; + sha256 = "0scmsiwwmmz1by8yzh5waa8ngp13hk7yihxh0bf0mfph8zkv3jf4"; + name = "polkit-kde-agent-1-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwin-5.2.1.tar.xz" ".tar"; + store = "/nix/store/n8bydi50mqc41sxh95v1zyncfh157am1-kwin-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kwin-5.2.1.tar.xz"; + sha256 = "1cp7rak0y7jjizj9ampx2wcvra0kffxjs7grd2j57s4qy3z9az6i"; + name = "kwin-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.1.tar.xz" ".tar"; + store = "/nix/store/cmrfclyx47g0byimi9fk2vgc92mi8vjd-plasma-workspace-wallpapers-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-wallpapers-5.2.1.tar.xz"; + sha256 = "0dhbwygbxzjxzklcrqa2429k1harl9gz33l9183bz3q62iwcxf0x"; + name = "plasma-workspace-wallpapers-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bluedevil-5.2.1.tar.xz" ".tar"; + store = "/nix/store/5mj21ln4sm2i32xbhzbadjhgxhig0fjs-bluedevil-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/bluedevil-5.2.1.tar.xz"; + sha256 = "1jahp2a8v4hmar8qfiw04miiih5br5s3jpkqlqmmpc56vn1czx6m"; + name = "bluedevil-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kinfocenter-5.2.1.tar.xz" ".tar"; + store = "/nix/store/cww4i8a48yhm0mddak67lqy9lld20wy3-kinfocenter-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kinfocenter-5.2.1.tar.xz"; + sha256 = "141mkk1gnhmnxxk0j1mn4p5zzwyjkbbwmwbpqq2adaar18p917i8"; + name = "kinfocenter-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscreen-5.2.1.tar.xz" ".tar"; + store = "/nix/store/h65gaypalzzqfgq3vcc495cdan9k4p5v-kscreen-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kscreen-5.2.1.tar.xz"; + sha256 = "164vwvqrvzjczg2nbi9wkpnk8yki240iz2h5j50n5gkqvgg0w7df"; + name = "kscreen-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.1.tar.xz" ".tar"; + store = "/nix/store/hlcr09wkzjs62vwawsi9d611n0gxrixp-oxygen-fonts-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/oxygen-fonts-5.2.1.tar.xz"; + sha256 = "0xnhh135yihmv40imd3mibwzcfdxgbn1mk4rjrsj5fqni113f0lm"; + name = "oxygen-fonts-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkscreen-5.2.1.tar.xz" ".tar"; + store = "/nix/store/6xs5v03w12rmqpz235sk9scxap51s2db-libkscreen-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/libkscreen-5.2.1.tar.xz"; + sha256 = "0i7vm73gs1f715fnmacrdnvk1hij03d72fr70wwa3x18cdcg4qas"; + name = "libkscreen-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "breeze-5.2.1.tar.xz" ".tar"; + store = "/nix/store/8sr3b4ah8ds74wgfna9zcnq6vm5s3kn3-breeze-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/breeze-5.2.1.tar.xz"; + sha256 = "0qdps15mr897s2pcjdci4nyg81n3j90ksz7jybqfkd0gr9l14iy5"; + name = "breeze-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libmm-qt-5.2.1.tar.xz" ".tar"; + store = "/nix/store/cgj3wzm22izb1hvbx3wdd18zw3wswgil-libmm-qt-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/libmm-qt-5.2.1.tar.xz"; + sha256 = "0n3q4bgj4ijrx7hdrnbbhxfnw4w97vgj5ba341qwf89hkhc4dhwn"; + name = "libmm-qt-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwrited-5.2.1.tar.xz" ".tar"; + store = "/nix/store/l3swq17a373a0z131mvqn4xa0nwsvjp5-kwrited-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kwrited-5.2.1.tar.xz"; + sha256 = "006y89c7pxzc55lrkjrvyrywj4j95641n3j0b5vjr2mgxcnv8q7a"; + name = "kwrited-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.1.tar.xz" ".tar"; + store = "/nix/store/06vk8iv3k4xb96rghh6jva6zj8q9a7ha-kdeplasma-addons-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kdeplasma-addons-5.2.1.tar.xz"; + sha256 = "1lfb6f5h1qjbl0zyqw5q98b27hw16lszyk1nacgncp3ig1y177r3"; + name = "kdeplasma-addons-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksshaskpass-5.2.1.tar.xz" ".tar"; + store = "/nix/store/fydms9jaal65yga60hngnz7hmz268wi2-ksshaskpass-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/ksshaskpass-5.2.1.tar.xz"; + sha256 = "18wa7naxv7g7zrrkrbh9iljd4h479cq6xmair5iqc0cbbfw7znm0"; + name = "ksshaskpass-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.1.tar.xz" ".tar"; + store = "/nix/store/1rm663f8mdif77m0wrkib534yskj0g6n-kde-cli-tools-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kde-cli-tools-5.2.1.tar.xz"; + sha256 = "0zxrn1j4lmlj0s6j5245sd0ykg9wa93i0d8qzca4rjxn5mh87v9q"; + name = "kde-cli-tools-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdecoration-5.2.1.tar.xz" ".tar"; + store = "/nix/store/06pjfn5j8lwbd7dj808mjs2bsfwbc3hr-kdecoration-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kdecoration-5.2.1.tar.xz"; + sha256 = "0910hgh64xbap213sjj1bbxwmibi74chdyyp2qc149f5anqs3fcy"; + name = "kdecoration-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwayland-5.2.1.tar.xz" ".tar"; + store = "/nix/store/03np6kr81s99j3ijzq236ywc8nkxpy0j-kwayland-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/kwayland-5.2.1.tar.xz"; + sha256 = "1c7h9csiam65jkrlg81iqi9y7q3mf63af87zkf6nfalbmz6j0p8l"; + name = "kwayland-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khelpcenter-5.2.1.tar.xz" ".tar"; + store = "/nix/store/2ws6508gv1m375l4xcyf6pa8q5c26748-khelpcenter-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/khelpcenter-5.2.1.tar.xz"; + sha256 = "17sl0va35p420s8lmyz1pzyhzmrssvakc3w06xjj7f6hvgh8iqxw"; + name = "khelpcenter-5.2.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "plasma-workspace-5.2.1.tar.xz" ".tar"; + store = "/nix/store/04b1cp5432y80dl8a55xy4nvw586f33c-plasma-workspace-5.2.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.2.1/plasma-workspace-5.2.1.tar.xz"; + sha256 = "0ldls1q5f88imc4cvxizssizswfgalh9ix95ab7p5f6ylizagp63"; + name = "plasma-workspace-5.2.1.tar.xz"; + }; + } ] diff --git a/pkgs/desktops/plasma-5.2/manifest.sh b/pkgs/desktops/plasma-5.2/manifest.sh index 6d0b6ef1452..9b76cca0840 100755 --- a/pkgs/desktops/plasma-5.2/manifest.sh +++ b/pkgs/desktops/plasma-5.2/manifest.sh @@ -6,6 +6,7 @@ if [ $# -eq 0 ]; then # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../.. -A autonix.manifest) \ http://download.kde.org/stable/plasma/5.2.0/ \ + http://download.kde.org/stable/plasma/5.2.1/ \ -A '*.tar.xz' else From ad06db5ddc8a11b4b853eb2e9b736ef2e6ff513c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 25 Feb 2015 12:07:37 -0600 Subject: [PATCH 020/120] media-player-info: patch extra shebangs to fix chroot build --- pkgs/data/misc/media-player-info/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 373e7504ead..b2bfb7bd13d 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -15,6 +15,10 @@ in buildInputs = [ udev ]; nativeBuildInputs = [ pkgconfig python3 ]; + postPatch = '' + patchShebangs ./tools + ''; + preConfigure = '' configureFlags="$configureFlags --with-udevdir=$out/lib/udev" ''; From 961ea0f492fd64bc251719c00026b7df3f0bcb7f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Feb 2015 11:28:42 -0800 Subject: [PATCH 021/120] mongodb: Support boost 1.57 --- pkgs/servers/nosql/mongodb/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index d307915d2f5..90e229d54ac 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -41,6 +41,9 @@ in stdenv.mkDerivation rec { # bug #482576 sed -i -e "/-Werror/d" src/third_party/v8/SConscript + # fix inclusion of std::swap + sed -i '1i #include ' src/mongo/shell/linenoise_utf8.h + # fix environment variable reading substituteInPlace SConstruct \ --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db97fb7126d..71d4ca4d523 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8153,7 +8153,6 @@ let mariadb = callPackage ../servers/sql/mariadb {}; mongodb = callPackage ../servers/nosql/mongodb { - boost = boost156; sasl = cyrus_sasl; }; From cbb706c32680ad47644052e54ec65bb9055fbc70 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Feb 2015 11:50:10 -0800 Subject: [PATCH 022/120] tinc_pre: Rename using date format --- pkgs/tools/networking/tinc/pre.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index e14cd819177..c0be126bdfd 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pre4b2ddde"; + name = "tinc-1.1pre-2015-02-24"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; From a6ea74ac6ae1441c7bcbef1e40b7c5f1a177f7b9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Feb 2015 11:52:16 -0800 Subject: [PATCH 023/120] spl_git: Use date format --- pkgs/os-specific/linux/spl/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index fc204bc0232..061d85dec6a 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,7 +1,7 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "086476f"; + version = "2015-02-04"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; From 7d5ab9a4d21ddc4667108a40654dc6394ee21236 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Feb 2015 11:52:56 -0800 Subject: [PATCH 024/120] linux-firmware-nonfree: Use date instead of git version --- .../linux/firmware/firmware-linux-nonfree/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 77f55d07faf..e175fa423a1 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,15 +1,11 @@ { stdenv, fetchgit }: -let - version = "4517261caab34742afdeaf0c36128b9579675717"; - shortVersion = stdenv.lib.substring 0 7 version; -in stdenv.mkDerivation { - name = "firmware-linux-nonfree-${shortVersion}"; + name = "firmware-linux-nonfree-2015-02-24"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = version; + rev = "4517261caab34742afdeaf0c36128b9579675717"; sha256 = "0w386nfwlqhk1wn7zzhfxkxx06nzqasc4dr0qq61wc29s9qlgi3c"; }; From 4ef3c64d2ed6bb9637350942a1d372091f13c64f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 25 Feb 2015 16:14:36 -0600 Subject: [PATCH 025/120] vsch: fetch release tarballs, not git revisions We only update at releases anyway, so it doesn't really make sense to use fetchgit. Plus, it makes monitor.nixos.org useless because we're inevitably behind master. --- .../version-management/vcsh/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index e9a8f48b7aa..af849668875 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,14 +1,12 @@ -{stdenv, fetchgit}: +{stdenv, fetchurl}: stdenv.mkDerivation rec { - rev = "ef15aeeb0553efb698e3d4261e79eff77a136ee7"; - version = "1.20141026"; - name = "vcsh-${version}_${builtins.substring 0 7 rev}"; + version = "1.20141026-1"; + name = "vcsh-${version}"; - src = fetchgit { - inherit rev; - url = "https://github.com/RichiH/vcsh"; - sha256 = "1dg6ina2wpy406s5x0x4r7khx6gc42hfak0gjwy0i53ivkckl1nd"; + src = fetchurl { + url = "https://github.com/RichiH/vcsh/archive/v${version}.tar.gz"; + sha256 = "1wgrmkygsbmk8zj88kjx9aim2fc44hh2d1a83h4mn2j714pffh33"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; From 3d4fbb874cbc3d5d179e9fab0f7099e95b34d960 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 29 Jan 2015 09:58:28 +0100 Subject: [PATCH 026/120] Update: add new Xen versions + update NixOS Xen modules Versions of XEN: - Xen 4.5 - Xen 4.5 + XenServer patches - Xen 4.4.1 --- nixos/modules/module-list.nix | 2 +- nixos/modules/virtualisation/xen-dom0.nix | 259 +++++++++++++----- nixos/modules/virtualisation/xen-domU.nix | 5 +- .../applications/virtualization/xen/4.4.1.nix | 46 ++++ .../applications/virtualization/xen/4.5.0.nix | 58 ++++ .../xen/{default.nix => generic.nix} | 87 +++--- pkgs/top-level/all-packages.nix | 7 +- 7 files changed, 341 insertions(+), 123 deletions(-) create mode 100644 pkgs/applications/virtualization/xen/4.4.1.nix create mode 100644 pkgs/applications/virtualization/xen/4.5.0.nix rename pkgs/applications/virtualization/xen/{default.nix => generic.nix} (73%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c41ae69c1ac..a19f49387ab 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -432,5 +432,5 @@ ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/virtualbox-guest.nix - #./virtualisation/xen-dom0.nix + ./virtualisation/xen-dom0.nix ] diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index f3a24c5cf25..157da76d752 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -5,18 +5,8 @@ with lib; let - cfg = config.virtualisation.xen; - xen = pkgs.xen; - - xendConfig = pkgs.writeText "xend-config.sxp" - '' - (loglevel DEBUG) - (network-script network-bridge) - (vif-script vif-bridge) - ''; - in { @@ -58,23 +48,60 @@ in ''; }; + virtualisation.xen.bridge = + mkOption { + default = "xenbr0"; + description = + '' + Create a bridge for the Xen domUs to connect to. + ''; + }; + + virtualisation.xen.stored = + mkOption { + default = "${pkgs.xen}/bin/oxenstored"; + description = + '' + Xen Store daemon to use. + ''; + }; + + virtualisation.xen.trace = + mkOption { + default = false; + description = + '' + Enable Xen tracing. + ''; + }; }; ###### implementation config = mkIf cfg.enable { + assertions = [ { + assertion = pkgs.stdenv.isx86_64; + message = "Xen currently not supported on ${pkgs.stdenv.system}"; + } { + assertion = config.boot.loader.grub.enable && (config.boot.loader.grub.efiSupport == false); + message = "Xen currently does not support EFI boot"; + } ]; environment.systemPackages = [ xen ]; - # Domain 0 requires a pvops-enabled kernel. - boot.kernelPackages = pkgs.linuxPackages_3_2_xen; + # Make sure Domain 0 gets the required configuration + #boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; }; boot.kernelModules = - [ "xen_evtchn" "xen_gntdev" "xen_blkback" "xen_netback" "xen_pciback" - "blktap" "tun" + [ "xen-evtchn" "xen-gntdev" "xen-gntalloc" "xen-blkback" "xen-netback" + "xen-pciback" "evtchn" "gntdev" "netbk" "blkbk" "xen-scsibk" + "usbbk" "pciback" "xen-acpi-processor" "blktap2" "tun" "netxen_nic" + "xen_wdt" "xen-acpi-processor" "xen-privcmd" "xen-scsiback" + "xenfs" ]; + # The radeonfb kernel module causes the screen to go black as soon # as it's loaded, so don't load it. boot.blacklistedKernelModules = [ "radeonfb" ]; @@ -87,8 +114,8 @@ in options loop max_loop=64 ''; - virtualisation.xen.bootParams = - [ "loglvl=all" "guest_loglvl=all" ] ++ + virtualisation.xen.bootParams = [] ++ + optionals cfg.trace [ "loglvl=all" "guest_loglvl=all" ] ++ optional (cfg.domain0MemorySize != 0) "dom0_mem=${toString cfg.domain0MemorySize}M"; system.extraSystemBuilderCmds = @@ -101,71 +128,36 @@ in system.activationScripts.xen = '' if [ -d /proc/xen ]; then - ${pkgs.sysvtools}/bin/mountpoint -q /proc/xen || \ + ${pkgs.kmod}/bin/modprobe xenfs 2> /dev/null + ${pkgs.utillinux}/bin/mountpoint -q /proc/xen || \ ${pkgs.utillinux}/bin/mount -t xenfs none /proc/xen fi ''; - jobs.xend = - { description = "Xen Control Daemon"; + # Domain 0 requires a pvops-enabled kernel. + system.requiredKernelConfig = with config.lib.kernelConfig; + [ (isYes "XEN") + (isYes "X86_IO_APIC") + (isYes "ACPI") + (isYes "XEN_DOM0") + (isYes "PCI_XEN") + (isYes "XEN_DEV_EVTCHN") + (isYes "XENFS") + (isYes "XEN_COMPAT_XENFS") + (isYes "XEN_SYS_HYPERVISOR") + (isYes "XEN_GNTDEV") + (isYes "XEN_BACKEND") + (isModule "XEN_NETDEV_BACKEND") + (isModule "XEN_BLKDEV_BACKEND") + (isModule "XEN_PCIDEV_BACKEND") + (isYes "XEN_BALLOON") + (isYes "XEN_SCRUB_PAGES") + ]; - startOn = "stopped udevtrigger"; - - path = - [ pkgs.bridge-utils pkgs.gawk pkgs.iproute pkgs.nettools - pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps - ]; - - environment.XENCONSOLED_TRACE = "hv"; - - preStart = - '' - mkdir -p /var/log/xen/console -m 0700 - - ${xen}/sbin/xend start - - # Wait until Xend is running. - for ((i = 0; i < 60; i++)); do echo "waiting for xend..."; ${xen}/sbin/xend status && break; done - - ${xen}/sbin/xend status || exit 1 - ''; - - postStop = "${xen}/sbin/xend stop"; - }; - - jobs.xendomains = - { description = "Automatically starts, saves and restores Xen domains on startup/shutdown"; - - startOn = "started xend"; - - stopOn = "starting shutdown and stopping xend"; - - restartIfChanged = false; - - path = [ pkgs.xen ]; - - environment.XENDOM_CONFIG = "${xen}/etc/sysconfig/xendomains"; - - preStart = - '' - mkdir -p /var/lock/subsys -m 755 - ${xen}/etc/init.d/xendomains start - ''; - - postStop = "${xen}/etc/init.d/xendomains stop"; - }; - - # To prevent a race between dhcpcd and xend's bridge setup script - # (which renames eth* to peth* and recreates eth* as a virtual - # device), start dhcpcd after xend. - jobs.dhcpcd.startOn = mkOverride 50 "started xend"; environment.etc = - [ { source = xendConfig; - target = "xen/xend-config.sxp"; - } - { source = "${xen}/etc/xen/scripts"; - target = "xen/scripts"; + [ { source = "${xen}/etc/xen/xl.conf"; + target = "xen/xl.conf"; } ]; @@ -174,6 +166,125 @@ in services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; + systemd.services.xen-store = { + description = "Xen Store Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "xen-store.socket" ]; + requires = [ "xen-store.socket" ]; + preStart = '' + export XENSTORED_ROOTDIR="/var/lib/xenstored" + rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null + + mkdir -p /var/run + ${optionalString cfg.trace "mkdir -p /var/log/xen"} + grep -q control_d /proc/xen/capabilities + ''; + serviceConfig.ExecStart = '' + ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork + ''; + postStart = '' + time=0 + timeout=30 + # Wait for xenstored to actually come up, timing out after 30 seconds + while [ $time -lt $timeout ] && ! `${pkgs.xen}/bin/xenstore-read -s / >/dev/null 2>&1` ; do + time=$(($time+1)) + sleep 1 + done + + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then + echo "Could not start Xenstore Daemon" + exit 1 + fi + + ${pkgs.xen}/bin/xenstore-write "/local/domain/0/name" "Domain-0" + ${pkgs.xen}/bin/xenstore-write "/local/domain/0/domid" 0 + ''; + }; + + systemd.sockets.xen-store = { + description = "XenStore Socket for userspace API"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = [ "/var/run/xenstored/socket" "/var/run/xenstored/socket_ro" ]; + SocketMode = "0660"; + SocketUser = "root"; + SocketGroup = "root"; + }; + }; + + + systemd.services.xen-console = { + description = "Xen Console Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "xen-store.service" ]; + preStart = '' + mkdir -p /var/run/xen + ${optionalString cfg.trace "mkdir -p /var/log/xen"} + grep -q control_d /proc/xen/capabilities + ''; + serviceConfig = { + ExecStart = '' + ${pkgs.xen}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} + ''; + }; + }; + + + systemd.services.xen-qemu = { + description = "Xen Qemu Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "xen-console.service" ]; + serviceConfig.ExecStart = '' + ${pkgs.xen}/lib/xen/bin/qemu-system-i386 -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv \ + -monitor /dev/null -serial /dev/null -parallel /dev/null + ''; + }; + + + systemd.services.xen-watchdog = { + description = "Xen Watchdog Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "xen-qemu.service" ]; + serviceConfig.ExecStart = "${pkgs.xen}/bin/xenwatchdogd 30 15"; + serviceConfig.Type = "forking"; + serviceConfig.RestartSec = "1"; + serviceConfig.Restart = "on-failure"; + }; + + + systemd.services.xen-bridge = { + description = "Xen bridge"; + wantedBy = [ "multi-user.target" ]; + before = [ "xen-domains.service" ]; + serviceConfig.RemainAfterExit = "yes"; + serviceConfig.ExecStart = '' + ${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge} + ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} up + ''; + serviceConfig.ExecStop = '' + ${pkgs.inetutils}/bin/ifconfig ${cfg.bridge} down + ${pkgs.bridge-utils}/bin/brctl delbr ${cfg.bridge} + ''; + }; + + systemd.services.xen-domains = { + description = "Xen domains - automatically starts, saves and restores Xen domains"; + wantedBy = [ "multi-user.target" ]; + after = [ "xen-bridge.service" "xen-qemu.service" ]; + ## To prevent a race between dhcpcd and xend's bridge setup script + ## (which renames eth* to peth* and recreates eth* as a virtual + ## device), start dhcpcd after xend. + before = [ "dhcpd.service" ]; + restartIfChanged = false; + serviceConfig.RemainAfterExit = "yes"; + path = [ pkgs.xen ]; + environment.XENDOM_CONFIG = "${pkgs.xen}/etc/sysconfig/xendomains"; + preStart = "mkdir -p /var/lock/subsys -m 755"; + serviceConfig.ExecStart = "${pkgs.xen}/etc/init.d/xendomains start"; + serviceConfig.ExecStop = "${pkgs.xen}/etc/init.d/xendomains stop"; + }; + }; } diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix index 48358966934..2db3190ad13 100644 --- a/nixos/modules/virtualisation/xen-domU.nix +++ b/nixos/modules/virtualisation/xen-domU.nix @@ -9,7 +9,10 @@ boot.loader.grub.device = "nodev"; boot.loader.grub.extraPerEntryConfig = "root (hd0)"; - boot.initrd.kernelModules = [ "xen-blkfront" ]; + boot.initrd.kernelModules = + [ "xen-blkfront" "xen-tpmfront" "xen-kbdfront" "xen-fbfront" + "xen-netfront" "xen-pcifront" "xen-scsifront" + ]; # Send syslog messages to the Xen console. services.syslogd.tty = "hvc0"; diff --git a/pkgs/applications/virtualization/xen/4.4.1.nix b/pkgs/applications/virtualization/xen/4.4.1.nix new file mode 100644 index 00000000000..a13a51a1d4e --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.4.1.nix @@ -0,0 +1,46 @@ +{ callPackage, fetchurl, ... } @ args: + +let + # Xen 4.4.1 + xenConfig = { + name = "xen-4.4.1"; + version = "4.4.1"; + + src = fetchurl { + url = "http://bits.xensource.com/oss-xen/release/4.4.1/xen-4.4.1.tar.gz"; + sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m"; + }; + + # Sources needed to build the xen tools and tools/firmware. + toolsGits = + [ # tag qemu-xen-4.4.1 + { name = "qemu-xen"; + url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git; + rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4"; + sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18"; + } + # tag xen-4.4.1 + { name = "qemu-xen-traditional"; + url = git://xenbits.xen.org/qemu-xen-4.4-testing.git; + rev = "6ae4e588081620b141071eb010ec40aca7e12876"; + sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded"; + } + ]; + + firmwareGits = + [ # tag 1.7.3.1 + { name = "seabios"; + url = git://xenbits.xen.org/seabios.git; + rev = "7d9cbe613694924921ed1a6f8947d711c5832eee"; + sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87"; + } + { name = "ovmf"; + url = git://xenbits.xen.org/ovmf.git; + rev = "447d264115c476142f884af0be287622cd244423"; + sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; + } + ]; + + }; + +in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix new file mode 100644 index 00000000000..176e15ea2c7 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.5.0.nix @@ -0,0 +1,58 @@ +{ callPackage, fetchurl, fetchgit, ... } @ args: + +let + # Xen 4.5.0 + xenConfig = { + name = "xen-4.5.0"; + version = "4.5.0"; + + src = fetchurl { + url = "http://bits.xensource.com/oss-xen/release/4.5.0/xen-4.5.0.tar.gz"; + sha256 = "0fvg00d596gh6cfm51xr8kj2mghcyivrf6np3dafnbldnbi41nsv"; + }; + + # Sources needed to build the xen tools and tools/firmware. + firmwareGits = + [ # tag 1.7.5 + { name = "seabios"; + url = git://xenbits.xen.org/seabios.git; + rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; + sha256 = "b96a0b9f31cab0f3993d007dcbe5f1bd69ad02b0a23eb2dc8a3ed1aafe7985cb"; + } + { name = "ovmf"; + url = git://xenbits.xen.org/ovmf.git; + rev = "447d264115c476142f884af0be287622cd244423"; + sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; + } + ]; + + toolsGits = + [ # tag qemu-xen-4.5.0 + { name = "qemu-xen"; + url = git://xenbits.xen.org/qemu-upstream-4.5-testing.git; + rev = "1ebb75b1fee779621b63e84fefa7b07354c43a99"; + sha256 = "1j312q2mqvkvby9adkkxf7f1pn3nz85g5mr9nbg4qpf2y9cg122z"; + } + # tag xen-4.5.0 + { name = "qemu-xen-traditional"; + url = git://xenbits.xen.org/qemu-xen-4.5-testing.git; + rev = "b0d42741f8e9a00854c3b3faca1da84bfc69bf22"; + sha256 = "ce52b5108936c30ab85ec0c9554f88d5e7b34896f3acb666d56765b49c86f2af"; + } + ]; + + xenserverPatches = let + patches = { + url = https://github.com/ts468/xen-4.5.pg.git; + rev = "3442b65b490f43c817cbc53369220d0b1ab9b785"; + sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845"; + }; + in '' + cp -r ${fetchgit patches}/master patches + quilt push -a + substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE" + ''; + }; + +in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) + diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/generic.nix similarity index 73% rename from pkgs/applications/virtualization/xen/default.nix rename to pkgs/applications/virtualization/xen/generic.nix index e6ad49f2035..da33af525f9 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -3,46 +3,20 @@ , lvm2, utillinux, procps, texinfo, perl, pythonPackages , glib, bridge-utils, xlibs, pixman, iproute, udev, bison , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl -, checkpolicy, transfig, glusterfs, fetchgit, xz }: +, checkpolicy, transfig, glusterfs, fetchgit, xz, spice +, spice_protocol, usbredir, alsaLib, quilt +, coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools +, inetutils, iptables, openvswitch, nbd, drbd, xenConfig +, xenserverPatched ? false, ... }: with stdenv.lib; let - version = "4.4.1"; libDir = if stdenv.is64bit then "lib64" else "lib"; - # Sources needed to build the xen tools and tools/firmware. - toolsGits = - [ # tag qemu-xen-4.4.1 - #{ name = "qemu-xen"; - # url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git; - # rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4"; - # sha256 = "e7abaf0e927f7a2bba4c59b6dad6ae19e77c92689c94fa0384e2c41742f8cdb6"; - #} - # tag xen-4.4.1 - { name = "qemu-xen-traditional"; - url = git://xenbits.xen.org/qemu-xen-4.4-testing.git; - rev = "6ae4e588081620b141071eb010ec40aca7e12876"; - sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded"; - } - ]; - firmwareGits = - [ # tag 1.7.3.1 - { name = "seabios"; - url = git://xenbits.xen.org/seabios.git; - rev = "7d9cbe613694924921ed1a6f8947d711c5832eee"; - sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87"; - } - { name = "ovmf"; - url = git://xenbits.xen.org/ovmf.git; - rev = "447d264115c476142f884af0be287622cd244423"; - sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; - } - ]; - - # Sources needed to build the stubdoms and tools + # These sources are already rather old and probably do not change frequently xenExtfiles = [ { url = http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz; sha256 = "13wlr85s1hnvia6a698qpryyy12lvmqw0a05xmjnd0h71ralsbkp"; @@ -76,15 +50,15 @@ let } ]; + scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin") + [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools + iproute inetutils iptables bridge_utils openvswitch nbd drbd ])); in -stdenv.mkDerivation { - name = "xen-${version}"; - src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m"; - }; + +stdenv.mkDerivation { + inherit (xenConfig) name version src; dontUseCmakeConfigure = true; @@ -95,11 +69,15 @@ stdenv.mkDerivation { glib bridge-utils pixman iproute udev bison xlibs.libX11 flex ocaml ocamlPackages.findlib figlet libaio checkpolicy pythonPackages.markdown transfig - glusterfs cmake + glusterfs cmake spice spice_protocol usbredir + alsaLib quilt ]; pythonPath = [ pythonPackages.curses ]; + patchPhase = if ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) + then xenConfig.xenserverPatches + else ""; preConfigure = '' # Fake wget: copy prefetched downloads instead @@ -111,6 +89,13 @@ stdenv.mkDerivation { export PATH=$PATH:$PWD/wget ''; + # TODO: If multiple arguments are given with with-extra-qemuu, + # then the configuration aborts; the reason is unclear. + # If you know how to fix it, please let me know! :) + #configureFlags = "--with-extra-qemuu-configure-args='--enable-spice --enable-usb-redir --enable-linux-aio'"; + + # TODO: Flask needs more testing before enabling it by default. + #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; buildFlags = "xen tools stubdom"; @@ -136,6 +121,12 @@ stdenv.mkDerivation { substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \ --replace /usr/include/pci ${pciutils}/include/pci + substituteInPlace tools/hotplug/Linux/xen-backend.rules \ + --replace /etc/xen/scripts $out/etc/xen/scripts + + # blktap is not provided by xen, but by xapi + sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules + # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't # print the GCC version number properly. substituteInPlace xen/Makefile \ @@ -157,15 +148,17 @@ stdenv.mkDerivation { # overriden at runtime. substituteInPlace tools/hotplug/Linux/init.d/xendomains \ --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ + --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \ + --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \ --replace /bin/ls ls # Xen's tools and firmares need various git repositories that it # usually checks out at time using git. We can't have that. - ${flip concatMapStrings toolsGits (x: let src = fetchgit x; in '' + ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x; in '' cp -r ${src} tools/${src.name}-dir-remote chmod +w tools/${src.name}-dir-remote '')} - ${flip concatMapStrings firmwareGits (x: let src = fetchgit x; in '' + ${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x; in '' cp -r ${src} tools/firmware/${src.name}-dir-remote chmod +w tools/firmware/${src.name}-dir-remote '')} @@ -189,13 +182,19 @@ stdenv.mkDerivation { installPhase = '' - mkdir -p $out + mkdir -p $out $out/share cp -prvd dist/install/nix/store/*/* $out/ cp -prvd dist/install/boot $out/boot - cp -prvd dist/install/etc $out/etc + cp -prvd dist/install/etc $out cp -dR docs/man1 docs/man5 $out/share/man/ wrapPythonPrograms - ''; # */ + substituteInPlace $out/etc/xen/scripts/hotplugpath.sh --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\" + + shopt -s extglob + for i in $out/etc/xen/scripts/!(*.sh); do + sed -i '2s@^@export PATH=$out/bin:${scriptEnvPath}@' $i + done + ''; meta = { homepage = http://www.xen.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dea95572d6..f33f8c230db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12008,9 +12008,10 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen = callPackage ../applications/virtualization/xen { - stdenv = overrideCC stdenv gcc45; - }; + xen_4_4_1 = callPackage ../applications/virtualization/xen/4.4.1.nix { }; + xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { }; + xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; }; + xen = xen_4_5_0; xfe = callPackage ../applications/misc/xfe { fox = fox_1_6; From b866da6826e6cc85cea9e6a59d9667890022b89c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Feb 2015 15:07:10 -0800 Subject: [PATCH 027/120] consul: Remove dependency on go-deps --- pkgs/servers/consul/default.nix | 5 +++++ pkgs/servers/consul/template.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index f7e19a37304..b299981bee2 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation { outputs = [ "out" "ui" ]; installPhase = '' + # Fix references to go-deps in the binary + hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') + xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) + sed -i "s,$hash,$xs,g" consul + # Install consul binary mkdir -p $out/bin cp consul $out/bin diff --git a/pkgs/servers/consul/template.nix b/pkgs/servers/consul/template.nix index 5585dc4d89e..59ca524b51e 100644 --- a/pkgs/servers/consul/template.nix +++ b/pkgs/servers/consul/template.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' + # Fix references to go-deps in the binary + hash=$(echo $src | sed 's,.*/\([^/-]*\).*,\1,g') + xs=$(printf 'x%.0s' $(seq 2 $(echo $hash | wc -c))) + sed -i "s,$hash,$xs,g" consul-template + mkdir -p $out/bin cp consul-template $out/bin ''; From 9ce0c1cb71138d0bb9f8ea314e65f084bb5095a1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Feb 2015 15:42:43 -0800 Subject: [PATCH 028/120] nixos/consul: Fix timeout bugs and json formatting --- nixos/modules/services/networking/consul.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 3ae010e8107..5308fd99508 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -178,7 +178,7 @@ in ExecReload = "${pkgs.consul}/bin/consul reload"; PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; - TimeoutStartSec = "${toString (20 + (3 * cfg.joinRetries))}s"; + TimeoutStartSec = "0"; } // (optionalAttrs (cfg.leaveOnStop) { ExecStop = "${pkgs.consul}/bin/consul leave"; }); @@ -209,13 +209,14 @@ in echo "$ADDR" } echo "{" > /etc/consul-addrs.json + delim=" " '' + concatStrings (flip mapAttrsToList cfg.interface (name: i: optionalString (i != null) '' - echo " \"${name}_addr\": \"$(getAddr "${i}")\"," >> /etc/consul-addrs.json + echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json + delim="," '')) + '' - echo " \"\": \"\"" >> /etc/consul-addrs.json echo "}" >> /etc/consul-addrs.json ''; postStart = '' From de3924a1a852192bef634023d76772a7d94e623f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 26 Feb 2015 08:33:43 +0100 Subject: [PATCH 029/120] Adds ocaml-asn1-combinators An OCaml library of combinators for expressing ASN.1 grammars. Homepage: https://github.com/mirleft/ocaml-asn1-combinators --- .../asn1-combinators/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/ocaml-modules/asn1-combinators/default.nix diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix new file mode 100644 index 00000000000..bb4b5f7b312 --- /dev/null +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip, ocaml, findlib, cstruct, zarith }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; + +let version = "0.1.1"; in + +stdenv.mkDerivation { + name = "ocaml-asn1-combinators-${version}"; + + src = fetchzip { + url = "https://github.com/mirleft/ocaml-asn1-combinators/archive/${version}.tar.gz"; + sha256 = "1wl5g2cqd4dk33w0ski6z425cs4sgj980fw0xkwgz1w1xzywh4i2"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ cstruct zarith ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirleft/ocaml-asn1-combinators; + description = "Combinators for expressing ASN.1 grammars in OCaml"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71d4ca4d523..6d416c19607 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3797,6 +3797,8 @@ let ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; + asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; + bolt = callPackage ../development/ocaml-modules/bolt { }; camlidl = callPackage ../development/tools/ocaml/camlidl { }; From aa188a27a2721f2d45d7aa83fee70a167850e7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 26 Feb 2015 10:35:34 +0100 Subject: [PATCH 030/120] Updating gtkwave to 3.3.64 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 2b00b640d73..1a5b1f92276 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-3.3.62"; + name = "gtkwave-3.3.64"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1ykc5j11rkfcinsl9cza9k93jwvcj04xxz0i446lwby4svcbaa9i"; + sha256 = "05bisdh82rsbs0pj0687dzbp0s30p3wzq4gypb9bbjaxwnrmdsfs"; }; buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; From cec683b79166ffa85ab6b0f137d0f074a0d7c274 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Feb 2015 21:27:32 +0100 Subject: [PATCH 031/120] hackage-packages: re-generate from Hackage 2015-02-25T21:27:32+0100 --- .../haskell-modules/hackage-packages.nix | 92 +++++++++++++------ 1 file changed, 63 insertions(+), 29 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 201826b1e89..87a9033cf95 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9908,8 +9908,8 @@ self: { }: mkDerivation { pname = "MonadCompose"; - version = "0.6.0.0"; - sha256 = "05fvnkpq37a4ab97lcv460znnq86csivyz3v6cmq08mnvsjf6cpl"; + version = "0.7.0.0"; + sha256 = "1jy81fkqr3325j58qxajzdmy22ssds3v80ks8320f3ws7rgkdhrh"; buildDepends = [ base ghc-prim MaybeT mmorph monad-products mtl transformers ]; @@ -21147,8 +21147,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.3.0.0"; - sha256 = "0rc2r8adw4j667iicncvf266mc65f1agj50q8x6hn1fm8pa8ssa7"; + version = "0.3.0.1"; + sha256 = "020vv9aaqfxpgrpviy0y6i0448rypr7rg5cvzbmn46n96jyww12w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -27633,8 +27633,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.6"; - sha256 = "1iasw1yvh5cm2b2lfhn7026rkil054fymal3n8p1kc0qm02zb4i5"; + version = "2.2.0.7"; + sha256 = "05xgsn9xgkckx7ip2qqy332miv6yl70avyzp7z5ww8lvn2v8q8ks"; buildDepends = [ base casadi-bindings-core casadi-bindings-internal cereal containers linear vector @@ -45658,6 +45658,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "flexible-time" = callPackage + ({ mkDerivation, base, bytestring, unix-time }: + mkDerivation { + pname = "flexible-time"; + version = "0.1.0.3"; + sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l"; + buildDepends = [ base bytestring unix-time ]; + homepage = "https://github.com/tattsun/flexible-time"; + description = "simple extension of Data.UnixTime."; + license = stdenv.lib.licenses.mit; + }) {}; + "flexible-unlit" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -49018,21 +49030,21 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, base, cmdargs, containers, directory, extra + ({ mkDerivation, ansi-terminal, base, cmdargs, directory, extra , filepath, process, tasty, tasty-hunit, terminal-size, time }: mkDerivation { pname = "ghcid"; - version = "0.3.4"; - sha256 = "1xapx3rlx9fsvs5idqyarassqbg8ifsar923pi9vsn29ipjp2kjq"; + version = "0.3.5"; + sha256 = "1ad5x1xvx5v00gj4gwlqz806mzigga4h8xx6ldqsndb8inz7hsrx"; isLibrary = true; isExecutable = true; buildDepends = [ - base cmdargs containers directory extra filepath process + ansi-terminal base cmdargs directory extra filepath process terminal-size time ]; testDepends = [ - base cmdargs containers directory extra filepath process tasty + ansi-terminal base cmdargs directory extra filepath process tasty tasty-hunit terminal-size time ]; homepage = "https://github.com/ndmitchell/ghcid#readme"; @@ -55727,8 +55739,8 @@ self: { }: mkDerivation { pname = "haskell-docs"; - version = "4.2.4"; - sha256 = "061gj5g1hga8k93rzknpyi51srlqnzcagykb9mzv91m8vp9wlnrf"; + version = "4.2.5"; + sha256 = "09xagxs0br6781flp430syfn6yv36ri0y1yki8cakrn7ak722fq2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -59947,7 +59959,7 @@ self: { "highlighting-kate" = callPackage ({ mkDerivation, base, blaze-html, containers, Diff, directory - , filepath, mtl, parsec, process, regex-pcre, utf8-string + , filepath, mtl, parsec, pcre-light, process, utf8-string }: mkDerivation { pname = "highlighting-kate"; @@ -59956,14 +59968,14 @@ self: { isLibrary = true; isExecutable = true; buildDepends = [ - base blaze-html containers filepath mtl parsec regex-pcre + base blaze-html containers filepath mtl parsec pcre-light utf8-string ]; testDepends = [ base blaze-html containers Diff directory filepath process ]; + configureFlags = [ "-fpcre-light" ]; jailbreak = true; - prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal"; homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; license = "GPL"; @@ -60939,18 +60951,19 @@ self: { "hlint" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs - , directory, extra, filepath, haskell-src-exts, hscolour, process + , directory, extra, filepath, haskell-src-exts, process , transformers, uniplate }: mkDerivation { pname = "hlint"; version = "1.9.16"; sha256 = "11ykjslyr8sgpa1jpnv3vdzz0nxyrxw3mzcsdbidgzw7aphpzcb3"; + editedCabalFile = "4e3f4397ef78f431aadf4644b37ec01d624dd14dd70fec81953a509546182b8a"; isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal base cmdargs containers cpphs directory extra - filepath haskell-src-exts hscolour process transformers uniplate + filepath haskell-src-exts process transformers uniplate ]; homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; @@ -103198,8 +103211,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.6.1"; - sha256 = "01j25pw9xywfmw3rgi756n1sdzlclwbhsj6dgwalsc8rbpwdbynv"; + version = "1.6.1.1"; + sha256 = "1yv29fjyxfqykg7l8r4la1j4kz3ixmklhw15ki2b9dgwsp7vzmfh"; buildDepends = [ async base bytestring containers directory enclosed-exceptions exceptions lifted-async lifted-base monad-control mtl process @@ -103955,8 +103968,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.5.3"; - sha256 = "0m3ghgh2ip22808cyx1babfkpj6v0ii6lmnwgrk8adaj5aif9dfg"; + version = "0.5.4"; + sha256 = "153f0h0432rh3ff5cvsjcnwaq6ydiprs16ximp1rcamwzm0nl8hp"; buildDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -104728,11 +104741,11 @@ self: { ({ mkDerivation, base, linear, vector }: mkDerivation { pname = "smoothie"; - version = "0.1.0.0"; - sha256 = "1njg9lw3wc11q15yh4mi1hmfmr4891w59pdwxy782jgqlxanmbx7"; + version = "0.1.0.1"; + sha256 = "1gr36qbc1d6j3mhgpyxc08qkgk11kdpschvclh06jlcq3h2j62sy"; buildDepends = [ base linear vector ]; homepage = "https://github.com/phaazon/smoothie"; - description = "Smooth curves via several spline and polynomials"; + description = "Smooth curves via several splines and polynomials"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -106483,8 +106496,10 @@ self: { }: mkDerivation { pname = "soxlib"; - version = "0.0.1.1"; - sha256 = "0bc4s74f2sw32j17pihpq0liyaysi4n5i2704ycn5agsgnc0n8xp"; + version = "0.0.2"; + sha256 = "1d82sqihmx3ymgyahbnjlzmam4pj4rwyp956p74fpl0gsmqphmr8"; + isLibrary = true; + isExecutable = true; buildDepends = [ base containers explicit-exception extensible-exceptions sample-frame storablevector transformers utility-ht @@ -119230,8 +119245,8 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.1"; - sha256 = "1nhcz52fszwyk363hi3xd0k2rx950xbrfq8ifl4i9l9zh3s0p232"; + version = "0.2.2"; + sha256 = "1df4y09f25y0sj3qn9x62a4bzdjjrml4510hdf0jsmiimqqyq0ac"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers @@ -120832,6 +120847,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-static-caching" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, containers + , cryptohash, directory, expiring-cache-map, filepath, http-types + , mtl, old-locale, text, time, unix, wai + }: + mkDerivation { + pname = "wai-middleware-static-caching"; + version = "0.6.0.1"; + sha256 = "0xj4r1fr1g0fybgsq65gxcvh5zn9hafvm0f73p6dnj6jhz6dryhk"; + buildDepends = [ + base base16-bytestring bytestring containers cryptohash directory + expiring-cache-map filepath http-types mtl old-locale text time + unix wai + ]; + homepage = "https://github.com/agrafix/wai-middleware-static"; + description = "WAI middleware that serves requests to static files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-middleware-throttle" = callPackage ({ mkDerivation, base, bytestring, haddock, hlint, hspec , http-types, HUnit, network, process, regex-compat, stm, text From 925f5798f55cd0792d6dd7a42ffc5b586f9d0461 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Tue, 24 Feb 2015 17:57:39 +0200 Subject: [PATCH 032/120] Add cassandra 2.0 According to the project website (http://cassandra.apache.org) version 2.0 is the most stable version. It's the one that's recommended if you are already in production or going into production soon. Cassandra 2.0 is also the version that's officially supported by Titan (http://thinkaurelius.github.io/titan), a distributed graph database that uses cassandra as one of it's backends. --- pkgs/servers/nosql/cassandra/2.0.nix | 50 +++++++++++++++++++ .../nosql/cassandra/{default.nix => 2.1.nix} | 14 ++++-- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/nosql/cassandra/2.0.nix rename pkgs/servers/nosql/cassandra/{default.nix => 2.1.nix} (81%) diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix new file mode 100644 index 00000000000..96724ec52f5 --- /dev/null +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, jre +, python +, makeWrapper +, gawk +, bash +, getopt +}: + +let + + version = "2.0.12"; + sha256 = "125yga0h155fwp5kvgv57y5yyv7x4inib4fp9xsckmc7n7kmjvxg"; + +in + +stdenv.mkDerivation rec { + name = "cassandra-${version}"; + + src = fetchurl { + inherit sha256; + url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir $out + mv * $out + + for cmd in cassandra nodetool sstablekeys sstableloader sstableupgrade + do wrapProgram $out/bin/$cmd \ + --set JAVA_HOME ${jre} \ + --prefix PATH : ${bash}/bin \ + --prefix PATH : ${getopt}/bin \ + --prefix PATH : ${gawk}/bin + done + + wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin + ''; + + meta = with stdenv.lib; { + homepage = http://cassandra.apache.org/; + description = "A massively scalable open source NoSQL database"; + platforms = with platforms; all; + license = with licenses; asl20; + maintainers = with maintainers; [ nckx rushmorem ]; + }; +} diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/2.1.nix similarity index 81% rename from pkgs/servers/nosql/cassandra/default.nix rename to pkgs/servers/nosql/cassandra/2.1.nix index 635861ab9ef..99292e2f442 100644 --- a/pkgs/servers/nosql/cassandra/default.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -8,13 +8,19 @@ , getopt }: -let version = "2.1.3"; -in stdenv.mkDerivation rec { +let + + version = "2.1.3"; + sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz"; + +in + +stdenv.mkDerivation rec { name = "cassandra-${version}"; src = fetchurl { + inherit sha256; url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; - sha256 = "1hzb7h73vr28v9axw85c1987l2i5g4i9ivmgq5mqlv3cv1ng0knz"; }; buildInputs = [ makeWrapper ]; @@ -39,6 +45,6 @@ in stdenv.mkDerivation rec { description = "A massively scalable open source NoSQL database"; platforms = with platforms; all; license = with licenses; asl20; - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx rushmorem ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db97fb7126d..5d8e57277c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7947,7 +7947,9 @@ let cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra = callPackage ../servers/nosql/cassandra { }; + cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { }; + cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; + cassandra = cassandra_2_1; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jdk; From 301d73c4cdb6953261a471a9e5e18a0868e6ddc0 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 26 Feb 2015 10:51:52 +0000 Subject: [PATCH 033/120] ansible: update from 1.7.2 to 1.8.4 --- pkgs/tools/system/ansible/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index fd17cef8f1c..c033814c631 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.7.2"; + version = "1.8.4"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "http://releases.ansible.com/ansible/ansible-${version}.tar.gz"; - sha256 = "1b4qhh6a8z18q7lfa7laxb3p0f7sacvv7nlbr2lix0vznhbffz51"; + sha256 = "1hcy4f6l9c23aa05yi4mr0zbqp0c6v5zq4c3dim076yfmfrh8z6k"; }; prePatch = '' - sed -i "s,\/usr\/share\/ansible\/,$out/share/ansible," lib/ansible/constants.py + sed -i "s,\/usr\/share\/ansible\/,$out/share/ansible," lib/ansible/constants.py ''; doCheck = false; From 3970bfdd294d9e80fdc1b3eedb097bcc25cf97b0 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 11:54:35 +0100 Subject: [PATCH 034/120] python-packages: add python3-pika-0.9.14 --- pkgs/top-level/python-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 614152b689c..44b73054036 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7368,6 +7368,20 @@ let propagatedBuildInputs = with self; [ unittest2 ]; }; + + python3pika = buildPythonPackage { + name = "python3-pika-0.9.14"; + disabled = !isPy3k; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/p/python3-pika/python3-pika-0.9.14.tar.gz; + md5 = "f3a3ee58afe0ae06f1fa553710e1aa28"; + }; + buildInputs = with self; [ nose mock pyyaml ]; + + propagatedBuildInputs = with self; [ unittest2 ]; + }; + + pil = buildPythonPackage rec { name = "PIL-${version}"; version = "1.1.7"; From 19f83205e5c6964e52a5a87b5a70496be71137c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Feb 2015 12:33:24 +0100 Subject: [PATCH 035/120] procmail: add meta.homepage link --- pkgs/applications/misc/procmail/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 38c982dc3e5..c786eec7e64 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -21,4 +21,6 @@ stdenv.mkDerivation { url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz; sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; }; + + meta.homepage = "http://www.procmail.org/"; } From 56a8ab137c7e29626ffab5ca7ba289a1c24bdab4 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 13:39:42 +0100 Subject: [PATCH 036/120] python-packages: add ddt-1.0.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44b73054036..e89ea9d476f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3741,6 +3741,23 @@ let }; }; + ddt = buildPythonPackage (rec { + name = "ddt-1.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/ddt/${name}.tar.gz"; + md5 = "29688456f9ee42d09d7d7c864ce6e17b"; + }; + + meta = { + description = "Data-Driven/Decorated Tests, a library to multiply test cases"; + + homepage = https://github.com/txels/ddt; + + license = stdenv.lib.licenses.mit; + }; + }); + distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; From 1fe1f730890218443fd2119b9a68a158da2d5f6a Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 13:41:43 +0100 Subject: [PATCH 037/120] python-packages: add falcon-0.2 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e89ea9d476f..66643da7f0d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4467,6 +4467,25 @@ let }; }); + falcon = buildPythonPackage (rec { + name = "falcon-0.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/falcon/${name}.tar.gz"; + md5 = "bf9e8bdd20700f1ff7ce6397cd441fbd"; + }; + + propagatedBuildInputs = with self; [ coverage ddt nose pyyaml requests2 six testtools python_mimeparse ]; + + meta = { + description = "An unladen web framework for building APIs and app backends"; + + homepage = http://falconframework.org; + + license = stdenv.lib.licenses.asl20; + }; + }); + flup = buildPythonPackage (rec { name = "flup-1.0.2"; disabled = isPy3k; From b6923404411fc79ea915485aa3de7ef165b67f94 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 26 Feb 2015 06:44:03 -0600 Subject: [PATCH 038/120] openblas: fix build on i686 --- .../science/math/openblas/default.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index a452037a235..8dc2b542be7 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,5 +1,15 @@ { stdenv, fetchurl, gfortran, perl, liblapack, config }: +# Minimum CPU requirements: +# x86: Pentium 4 (Prescott, circa 2004) +# x86_64: Opteron (circa 2003) +# These are the settings used for the generic builds. Performance will +# be poor on modern systems. The goal of the Hydra builds is simply to +# support as many systems as possible. OpenBLAS may support older +# CPU architectures, but you will need to set 'config.openblas.target' +# and 'config.openblas.preferLocalBuild', which will build it on your +# local machine. + let local = config.openblas.preferLocalBuild or false; localTarget = config.openblas.target or ""; in @@ -20,18 +30,24 @@ stdenv.mkDerivation rec { cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); target = if local then localTarget else - if cpu == "i686" then "P2" else - if cpu == "x86_64" then "CORE2" else + if cpu == "i686" then "PRESCOTT" else + if cpu == "x86_64" then "OPTERON" else # allow autodetect ""; - makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; + makeFlags = [ + "${if target != "" then "TARGET=" else ""}${target}" + "FC=gfortran" + "CC=gcc" + ''PREFIX="''$(out)"'' + "INTERFACE64=1" + ]; meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = [ "x86_64-linux" ]; + platforms = with platforms; linux; maintainers = with maintainers; [ ttuegel ]; }; } From 4607e0711c759069294b72ad5b29167575daa892 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 14:04:33 +0100 Subject: [PATCH 039/120] python-packages: add nosexcover-1.0.10 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66643da7f0d..989af085f0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6658,6 +6658,25 @@ let doCheck = false; }); + nosexcover = buildPythonPackage (rec { + name = "nosexcover-1.0.10"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/nosexcover/${name}.tar.gz"; + md5 = "12bf494a801b376debeb6a167c247391"; + }; + + propagatedBuildInputs = with self; [ coverage nose ]; + + meta = { + description = "Extends nose.plugins.cover to add Cobertura-style XML reports"; + + homepage = http://github.com/cmheisel/nose-xcover/; + + license = stdenv.lib.licenses.bsd3; + }; + }); + nosejs = buildPythonPackage { name = "nosejs-0.9.4"; src = pkgs.fetchurl { From d480e062629cc6710643e6ad9c94c80afc2f8dfd Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 14:33:50 +0100 Subject: [PATCH 040/120] python-packages: add pyaml-15.02.1 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 989af085f0f..76c14eb7c9e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9101,6 +9101,24 @@ let }); + pyaml = buildPythonPackage (rec { + name = "pyaml-15.02.1"; + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyaml/${name}.tar.gz"; + md5 = "e98cf27f50b9ca291ca4937c135db1c9"; + }; + + buildInputs = with self; [ pyyaml ]; + + meta = { + description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; + homepage = https://github.com/mk-fg/pretty-yaml; + }; + }); + + pyyaml = buildPythonPackage (rec { name = "PyYAML-3.10"; From 92664a84ad856f1ef98436b26b99b0e7271384e7 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 26 Feb 2015 14:39:55 +0100 Subject: [PATCH 041/120] nasm: update from from 2.11.05 to 2.11.08 2.11.06 had a bug that broke syslinux [1], this bug was fixed in 2.11.07, but there was never a tar-ball release of that version. [1] http://sourceforge.net/p/nasm/mailman/message/33074214/ --- pkgs/development/compilers/nasm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index fad8a584ed2..a30a97ce9ce 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.11.05"; # do not update until syslinux is fixed with that version + version = "2.11.08"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa"; + sha256 = "0ialkla6i63j8fpv840jy7k5mdf2wbqr98bvbcq0dp0b38ls18wx"; }; meta = with stdenv.lib; { From 94024b4c7d9f216dff2a8c069c07276f8e1ff17c Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 14:58:09 +0100 Subject: [PATCH 042/120] python-packages: add elasticsearch-1.4.0 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76c14eb7c9e..c57d7f3ba8c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2550,6 +2550,28 @@ let }; + elasticsearch = buildPythonPackage (rec { + name = "elasticsearch-1.4.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/e/elasticsearch/${name}.tar.gz"; + md5 = "14a758debd2296d923cb6c958db98eba"; + }; + + # Check is disabled because running them destroy the content of the local cluster! + # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch + doCheck = false; + + meta = { + description = "Official low-level client for Elasticsearch"; + + homepage = https://github.com/elasticsearch/elasticsearch-py; + + license = stdenv.lib.licenses.asl20; + }; + }); + + evdev = buildPythonPackage rec { version = "0.4.6"; name = "evdev-${version}"; From 486ee6e2523dd0a3bee54ea60e27ee0538740eb4 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 16:08:21 +0100 Subject: [PATCH 043/120] python-packages: update coverage-3.6 to 3.7 --- 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 c57d7f3ba8c..1d18798f4bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1766,11 +1766,11 @@ let }; coverage = buildPythonPackage rec { - name = "coverage-3.6"; + name = "coverage-3.7"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "67d4e393f4c6a5ffc18605409d2aa1ac"; + md5 = "c47b36ceb17eaff3ecfab3bcd347d0df"; }; meta = { From e071b6d71ba6bbf02a321021af14e53be89de31a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 26 Feb 2015 16:13:40 +0100 Subject: [PATCH 044/120] python-packages: pygments 2.0.1 -> 2.0.2 --- 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 614152b689c..4467807a456 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8208,12 +8208,12 @@ let }; pygments = buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; name = "Pygments-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - sha256 = "1js5vq0xvsiykzpj5snxhdz3li9fmk8vc549slg9hcnj80frw0sy"; + sha256 = "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k"; }; meta = with stdenv.lib; { From 37a90efc455ca7c7c81bd055a0301b83af81bcbb Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 17:05:53 +0100 Subject: [PATCH 045/120] python-packages: update cov-core-1.7 to 1.15.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d18798f4bd..4e474376f87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1781,10 +1781,10 @@ let }; covCore = buildPythonPackage rec { - name = "cov-core-1.7"; + name = "cov-core-1.15.0"; src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/c/cov-core/cov-core-1.7.tar.gz"; - md5 = "59c1e22e636633e10120beacbf45b28c"; + url = "http://pypi.python.org/packages/source/c/cov-core/${name}.tar.gz"; + md5 = "f519d4cb4c4e52856afb14af52919fe6"; }; meta = { description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; From eacaba303f0f256128479d6596c614b2a395c8d8 Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Thu, 26 Feb 2015 11:07:01 -0500 Subject: [PATCH 046/120] python pillow: fix expression for python3.3 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 614152b689c..e7c4ae25e54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7418,7 +7418,7 @@ let buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] - ++ optionals (isPy26 || isPyPy) [ pkgs.lcms2 ] + ++ optionals (isPy26 || isPy33 || isPyPy) [ pkgs.lcms2 ] ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. From 70eb7cf0120e9ae0b5088277f29581ba6a0500b9 Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 17:17:01 +0100 Subject: [PATCH 047/120] python-packages: add pytest-cov-1.8.1 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e474376f87..6fc91187b8c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2007,6 +2007,25 @@ let }; }; + pytestcov = buildPythonPackage (rec { + name = "pytest-cov-1.8.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-cov/${name}.tar.gz"; + md5 = "76c778afa2494088270348be42d759fc"; + }; + + buildInputs = with self; [ covCore pytest ]; + + meta = { + description = "py.test plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; + + homepage = https://github.com/schlamar/pytest-cov; + + license = stdenv.lib.licenses.mit; + }; + }); + pytest_xdist = buildPythonPackage rec { name = "pytest-xdist-1.8"; From a80e6b0eca31a4e52ffe684c39cc0b6fb3c5551b Mon Sep 17 00:00:00 2001 From: desiderius Date: Thu, 26 Feb 2015 17:25:28 +0100 Subject: [PATCH 048/120] python-packages: add elasticsearch-dsl-0.0.3 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6fc91187b8c..8f0ab4df11e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2591,6 +2591,26 @@ let }); + elasticsearchdsl = buildPythonPackage (rec { + name = "elasticsearch-dsl-0.0.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/e/elasticsearch-dsl/${name}.tar.gz"; + md5 = "6cbc9ed7aefb3ef804be4e3b318b2570"; + }; + + buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov urllib3 ]; + + meta = { + description = "Python client for Elasticsearch"; + + homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; + + license = stdenv.lib.licenses.asl20; + }; + }); + + evdev = buildPythonPackage rec { version = "0.4.6"; name = "evdev-${version}"; From 12414a34b2f5f8e8a74fd54eccb09598b1ce486e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 26 Feb 2015 18:20:40 +0100 Subject: [PATCH 049/120] DFU-Programmer: Update to 0.7.2. --- pkgs/development/tools/misc/dfu-programmer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 3528e8fbe08..f63a726f73b 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libusb }: let - version = "0.7.1"; + version = "0.7.2"; in stdenv.mkDerivation rec { name="dfu-programmer-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; - sha256 = "0cwy7z5h6f13yx9bkgh61bphzii6lcl21j2gckskphf37bfzazwz"; + sha256 = "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x"; }; configureFlags = [ "--disable-libusb_1_0" ]; From 7b27af61fbbfb109eda66db7d4f54d3e379e6498 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 26 Feb 2015 17:29:09 +0000 Subject: [PATCH 050/120] Add NixOS global binaries to the PATH --- nixos/modules/services/misc/disnix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 219c7ed9587..48bb9e4293e 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -132,7 +132,7 @@ in restartIfChanged = false; - path = [ pkgs.nix pkgs.disnix dysnomia ]; + path = [ pkgs.nix pkgs.disnix dysnomia "/run/current-system/sw" ]; environment = { HOME = "/root"; From 1e4287645c40e3d11b6dd5d6bbffbf5149f307dd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 26 Feb 2015 19:01:29 +0100 Subject: [PATCH 051/120] firefox: Fix hash --- pkgs/applications/networking/browsers/firefox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index e9334e5b73b..6f29784f129 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "0939dd0258b042c7b7d4d3a3bff8e476c380885b"; + sha1 = "bcbfe0e4aa3236582c3b5c49619641224cf942df"; }; buildInputs = From e4928b89558b0520e4e059f7c980eb283e9723bc Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 26 Feb 2015 19:20:43 +0000 Subject: [PATCH 052/120] GCE image: Pass header to metadata service calls. --- nixos/modules/virtualisation/google-compute-image.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 4d493b3896f..f4f517a9600 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -132,7 +132,7 @@ in after = [ "network-online.target" ]; wants = [ "network-online.target" ]; - script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 6 --waitretry=10"; in + script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 6 --waitretry=10 --header='Metadata-Flavor: Google'"; in '' # When dealing with cryptographic keys, we want to keep things private. umask 077 @@ -140,7 +140,7 @@ in if ! [ -e /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -m 0700 -p /root/.ssh - ${wget} -O /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys + ${wget} -O /root/authorized-keys-metadata http://metadata.google.internal/0.1/meta-data/authorized-keys if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then @@ -156,7 +156,7 @@ in ${flip concatMapStrings config.services.openssh.hostKeys (k : let kName = baseNameOf k.path; in '' echo "trying to obtain SSH private host key ${kName}" - ${wget} -O /root/${kName} http://metadata/0.1/meta-data/attributes/${kName} && : + ${wget} -O /root/${kName} http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : if [ $? -eq 0 -a -e /root/${kName} ]; then countKeys=$((countKeys+1)) mv -f /root/${kName} ${k.path} From 34f8d2597c57b5c787fdb8c335b09abf0ea6cf53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 26 Feb 2015 20:49:33 +0100 Subject: [PATCH 053/120] Fix eval (xen: bridge_utils => bridge-utils) --- pkgs/applications/virtualization/xen/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index da33af525f9..c90f6609973 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -52,7 +52,7 @@ let scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin") [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools - iproute inetutils iptables bridge_utils openvswitch nbd drbd ])); + iproute inetutils iptables bridge-utils openvswitch nbd drbd ])); in From 355424724eca90c6496bd94814e2712711478ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 20:10:49 +0100 Subject: [PATCH 054/120] liferea: maintenance update --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index b70be1ef980..904f6904979 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.13"; + version = "1.10.14"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0yz5sj960w0w6fdx32fdm4rzrav9l8ajid1d8g7n398hjh4mm0q1"; + sha256 = "0szazfknarw6ivnr4flr928ar309pz2mv6alc6pk6l1i9jchcnfs"; }; buildInputs = with gst_all_1; [ From f3bf4505a91bb16b9387baeb5d2f16444a354aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Feb 2015 21:24:45 +0100 Subject: [PATCH 055/120] cpio: fix CVE-2015-1197 by Suse patch --- pkgs/tools/archivers/cpio/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 0bfa81cb947..6a61ded4b19 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -18,6 +18,15 @@ stdenv.mkDerivation { }) ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; + postPatch = let pp = + fetchpatch { + name = "CVE-2015-1197.diff"; + url = "https://marc.info/?l=oss-security&m=142289947619786&w=2"; + sha256 = "0fr95bj416zfljv40fl1sh50059d18wdmfgaq8ad2fqi5cnbk859"; + }; + # one "<" and one "&" sign get mangled in the patch + in "cat ${pp} | sed 's/</ Date: Fri, 27 Feb 2015 04:30:08 +0000 Subject: [PATCH 056/120] Add noip2 package --- pkgs/tools/networking/noip/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/networking/noip/default.nix diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix new file mode 100644 index 00000000000..91f9982a0ba --- /dev/null +++ b/pkgs/tools/networking/noip/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "noip-2.1.9-1"; + + src = fetchurl { + url = http://www.noip.com/client/linux/noip-duc-linux.tar.gz; + sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593"; + }; + + makeFlags = [ "PREFIX=\${out}" ]; + installPhase = + '' + if [ ! -d "$out/bin" ]; then mkdir -p $out/bin;fi + cp noip2 $out/bin + ''; + + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71d4ca4d523..9748c4636e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2014,6 +2014,8 @@ let ngrok = callPackage ../tools/misc/ngrok { }; + noip = callPackage ../tools/networking/noip { }; + mpack = callPackage ../tools/networking/mpack { }; pa_applet = callPackage ../tools/audio/pa-applet { }; From 6ad73af7a2cc9af294012b7acf4b9b518067dd29 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Fri, 27 Feb 2015 08:13:05 +0100 Subject: [PATCH 057/120] Fix: Build Xen only for x86_64 Linux platforms. --- pkgs/applications/virtualization/xen/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index c90f6609973..711fd505efa 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -199,7 +199,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xen.org/; description = "Xen hypervisor and management tools for Dom0"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ eelco tstrobel ]; }; } From 4987478c96edb18200c360a94d9e58ce3b21dd1f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 27 Feb 2015 10:14:53 +0100 Subject: [PATCH 058/120] dar: Update from 2.4.15 to 2.4.17 --- pkgs/tools/archivers/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index f964aded2a4..6c9559f46e6 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }: stdenv.mkDerivation rec { - name = "dar-2.4.15"; + name = "dar-2.4.17"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "1x694g7yhach8swkjwbkdryp74r3rh0d2lrsa8mnf0azp0mrj1ln"; + sha256 = "0g43g6a633j6ipgwdvgwngnrnzhfwkhl2iwih1314xwbd4wir1jx"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt ] From adba4b5fada16e33c82be49da8c35555539eb7b9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 27 Feb 2015 10:59:13 +0100 Subject: [PATCH 059/120] fusesmb: use samba3 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a69b817d2a8..862491f3bca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2612,7 +2612,7 @@ let storebrowse = callPackage ../tools/system/storebrowse { }; - fusesmb = callPackage ../tools/filesystems/fusesmb { }; + fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; sl = callPackage ../tools/misc/sl { }; From 836b3d835e92b542f0e5079d7742646de7d42751 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 27 Feb 2015 11:08:31 +0100 Subject: [PATCH 060/120] botanUnstable: 1.11.13 doesn't exist, use 1.11.10 --- pkgs/development/libraries/botan/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index cc18b8c63ab..f979fb8a959 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "13"; - sha256 = "1jg36k376w6d6g7hgs2d67sr84pail5qf6yy1s5ys7pc16k2dy41"; + revision = "10"; + sha256 = "06d5p0bs953r2pqfc635x2w78m3xv28gr6fmvd8whbk9qp8r91yb"; openssl = null; }) From 24e05654072663d0a74349c450d6f5ff80445c39 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 27 Feb 2015 10:48:15 +0000 Subject: [PATCH 061/120] Only start fetch-keys for GCE image after ip-up. --- nixos/modules/virtualisation/google-compute-image.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index f4f517a9600..98985d2d2c5 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -129,10 +129,10 @@ in wantedBy = [ "sshd.service" ]; before = [ "sshd.service" ]; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; + after = [ "network-online.target" "ip-up.target" ]; + wants = [ "network-online.target" "ip-up.target" ]; - script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 6 --waitretry=10 --header='Metadata-Flavor: Google'"; in + script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'"; in '' # When dealing with cryptographic keys, we want to keep things private. umask 077 From fc966aead08750c8f8ce05db072e6b7c78f63528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 27 Feb 2015 11:04:04 +0100 Subject: [PATCH 062/120] gradle: don't hardcode gradle-launcher-VERSION.jar Instead, figure out VERSION at build-time. This simplifies using overrideDerivation (no need to copy and modify installPhase). Also add a check that the file exists (catch potential failure early). --- pkgs/development/tools/build-managers/gradle/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 3bbfff9221b..3bff9d59e7f 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { mkdir -pv $out cp -rv lib $out + gradle_launcher_jar=$(echo $out/lib/gradle-launcher-*.jar) + test -f $gradle_launcher_jar makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-2.2.1.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; From a7879236bd678da9e1afa6d8fd063bcaaec872ef Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 27 Feb 2015 12:10:04 +0100 Subject: [PATCH 063/120] mysql-workbench: fix build using libctemplate 2.2 --- .../libraries/libctemplate/2.2.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libctemplate/2.2.nix diff --git a/pkgs/development/libraries/libctemplate/2.2.nix b/pkgs/development/libraries/libctemplate/2.2.nix new file mode 100644 index 00000000000..36652f7abc7 --- /dev/null +++ b/pkgs/development/libraries/libctemplate/2.2.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + meta = { + description = "A simple but powerful template language for C++"; + longDescription = '' + CTemplate is a simple but powerful template language for C++. It + emphasizes separating logic from presentation: it is impossible to + embed application logic in this template language. ''; + homepage = http://code.google.com/p/google-ctemplate/; + license = "bsd"; + }; + + pname = "ctemplate"; + version = "2.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://ctemplate.googlecode.com/files/${name}.tar.gz"; + sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17b40b1b815..0b029cfdc4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6087,6 +6087,8 @@ let libctemplate = callPackage ../development/libraries/libctemplate { }; + libctemplate_2_2 = callPackage ../development/libraries/libctemplate/2.2.nix { }; + libcouchbase = callPackage ../development/libraries/libcouchbase { }; libcue = callPackage ../development/libraries/libcue { }; @@ -13402,6 +13404,7 @@ let mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { lua = lua5_1; + libctemplate = libctemplate_2_2; inherit (pythonPackages) pexpect paramiko; }; From 053122def0fe0816d78dc8d890bd8e5ebc4b207e Mon Sep 17 00:00:00 2001 From: desiderius Date: Fri, 27 Feb 2015 12:42:05 +0100 Subject: [PATCH 064/120] python-packages: disables the test phase for elasticsearch-dsl The test fails with: ImportError: No module named test_elasticsearch_dsl --- pkgs/top-level/python-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f0ab4df11e..91e95f41aea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2599,7 +2599,10 @@ let md5 = "6cbc9ed7aefb3ef804be4e3b318b2570"; }; - buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov urllib3 ]; + buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 ]; + + # ImportError: No module named test_elasticsearch_dsl + doCheck = false; meta = { description = "Python client for Elasticsearch"; From 7abccbe81c993f833e4ae0c1db1ac67c519e2e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 27 Feb 2015 12:55:49 +0100 Subject: [PATCH 065/120] octave: disable parallel building again http://hydra.nixos.org/build/19917018 --- pkgs/development/interpreters/octave/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index dc3d700dc8e..a0906a09a78 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { # there is a mysterious sh: command not found doCheck = false; - enableParallelBuilding = true; + # problems on Hydra + enableParallelBuilding = false; configureFlags = [ "--enable-readline" "--enable-dl" ]; From 83b9a19390f9309cffd7a8de3e93bddace33aae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 27 Feb 2015 12:59:41 +0100 Subject: [PATCH 066/120] dbus-glib: 0.102 -> 0.104 (fixes nm-applet empty menu) --- pkgs/development/libraries/dbus-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 16a20ec94a4..00b302bde8d 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.102"; + name = "dbus-glib-0.104"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "177j5p2vrvpmzk2xrrj6akn73kvpbvnmsjvlmca9l55qbdcfsr39"; + sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"; }; nativeBuildInputs = [ pkgconfig gettext ]; From 1fb78f8994f8a1f1efad12c5b31ea0cdf42b0b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 27 Feb 2015 12:59:53 +0100 Subject: [PATCH 067/120] openssl: 1.0.1k -> 1.0.1l --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c78cd25e128..9a1df52d3f7 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1k"; + name = "openssl-1.0.1l"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -43,7 +43,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "0754wzmzr90hiiqs5cy6g3cf8as75ljkhppgyirfg26hpapax7wg"; + sha256 = "1m6i80y9c9g7h4303bqbxnsk5wm6jd0n57hwqr0g4jaxzr44vkxj"; }; patches = patchesCross false; From 6944b2bde70609b9dbfbf8010acee3a42796ee84 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 27 Feb 2015 13:53:38 +0100 Subject: [PATCH 068/120] docker: update to 1.5.0 --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index eaf983f7bbc..c456c9aa9f2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "0d98c7dfzv1gj5ssbyln4pbkbml6rrmy22v5v4ricbsx9qhhwc1l"; + sha256 = "0j1wlh0jj84ly3iykp2iqvm01g5il5v56fvlrfvx6qsslyrs35yg"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; From 3a31043b43be834bbfa0722d1d9ed0692bfc4c7c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Feb 2015 13:59:29 +0100 Subject: [PATCH 069/120] fillDiskWithRPMs: Pass --extract-over-symlinks to cpio http://hydra.nixos.org/build/20003320 --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a0dca0d59fc..fc41e8ec52e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -423,7 +423,7 @@ rec { set +o pipefail for i in $rpms; do echo "$i..." - ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional + ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional --extract-over-symlinks done eval "$preInstall" From bf022367015fdaba996206a1213390694935b679 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 27 Feb 2015 14:10:43 +0100 Subject: [PATCH 070/120] kdenlive: Add icons to propagatedUserEnvPkgs. --- pkgs/applications/video/kdenlive/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index e3e52425ebd..f29ad00ea9e 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4 , phonon , makeWrapper, mlt, gettext , qimageblitz, qjson , shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies -, libv4l +, libv4l, oxygen_icons }: stdenv.mkDerivation rec { @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { shared_mime_info soprano ]; + propagatedUserEnvPkgs = [ oxygen_icons ]; + enableParallelBuilding = true; postInstall = '' From 22d2fc3657d269874df3229564ca7eee499aab92 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Feb 2015 14:32:22 +0100 Subject: [PATCH 071/120] Fix "systemctl reload container@" Fixes #5179. --- nixos/modules/virtualisation/containers.nix | 1 + nixos/modules/virtualisation/nixos-container.pl | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index c461cf8c00c..ea6bc641dad 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -10,6 +10,7 @@ let isExecutable = true; src = ./nixos-container.pl; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + su = "${pkgs.shadow.su}/bin/su"; inherit (pkgs) utillinux; }; diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index 94edfb37948..1455f7143f1 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -8,6 +8,7 @@ use Fcntl ':flock'; use Getopt::Long qw(:config gnu_getopt); my $nsenter = "@utillinux@/bin/nsenter"; +my $su = "@su@"; # Ensure a consistent umask. umask 0022; @@ -271,14 +272,14 @@ elsif ($action eq "login") { } elsif ($action eq "root-login") { - runInContainer("su", "root", "-l"); + runInContainer("@su@", "root", "-l"); } elsif ($action eq "run") { shift @ARGV; shift @ARGV; # Escape command. my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV); - runInContainer("su", "root", "-l", "-c", "exec " . $s); + runInContainer("@su@", "root", "-l", "-c", "exec " . $s); } elsif ($action eq "show-ip") { From aff40662936d4c17c9e2b139858e437a5f4ecf5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Feb 2015 18:03:35 +0000 Subject: [PATCH 072/120] terminology: update to 0.8.0 --- pkgs/desktops/e19/terminology.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix index 7b3bcbc5e40..1fe39c13321 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/e19/terminology.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19 }: stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5"; + sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628"; }; buildInputs = [ pkgconfig e19.efl e19.elementary ]; preConfigure = '' From 5f218eaf9220043d884924a1ecb7d87df8145a03 Mon Sep 17 00:00:00 2001 From: Ian Duncan Date: Fri, 27 Feb 2015 15:04:06 +0000 Subject: [PATCH 073/120] Add meta info for noip package --- lib/maintainers.nix | 1 + pkgs/tools/networking/noip/default.nix | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 54e74fb3311..75fdb60e84b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -85,6 +85,7 @@ henrytill = "Henry Till "; hinton = "Tom Hinton "; hrdinka = "Christoph Hrdinka "; + iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 91f9982a0ba..e2f1dc9cf1f 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -16,4 +16,11 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Dynamic DNS daemon for no-ip accounts"; + homepage = http://noip.com/download?page=linux; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.iand675 ]; + }; } From dd29e43add3e4898460291c250eb48d5429d4779 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Feb 2015 00:03:09 +0000 Subject: [PATCH 074/120] new package: rofi --- pkgs/applications/misc/rofi/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/rofi/default.nix diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix new file mode 100644 index 00000000000..74a2b8a896c --- /dev/null +++ b/pkgs/applications/misc/rofi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, libX11, libXinerama, libXft, pango +, i3Support ? false, i3 +}: + +stdenv.mkDerivation rec { + version = "0.15.1"; + name = "rofi-${version}"; + + src = fetchFromGitHub { + repo = "rofi"; + owner = "DaveDavenport"; + rev = "${version}"; + sha256 = "11fg85xg7mpw9vldmp163c9y398nvbilwqsl06ms0xbbmpyc2hgz"; + }; + + buildInputs = [ libX11 libXinerama libXft pango autoreconfHook pkgconfig + ] ++ stdenv.lib.optional i3Support i3; + + meta = { + description = "Window switcher, run dialog and dmenu replacement"; + homepage = https://davedavenport.github.io/rofi; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b029cfdc4c..04263eabfdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11298,6 +11298,8 @@ let qt = qt4; }); + rofi = callPackage ../applications/misc/rofi { }; + rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); From fe1243cc8ee3c8e9f5a3451b159138744525b572 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Feb 2015 15:34:11 +0000 Subject: [PATCH 075/120] Rofi: update to 0.15.2 requires >=automake-1.14 --- pkgs/applications/misc/rofi/default.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 74a2b8a896c..1bbe026cfeb 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig , libX11, libXinerama, libXft, pango , i3Support ? false, i3 }: stdenv.mkDerivation rec { - version = "0.15.1"; name = "rofi-${version}"; + version = "0.15.2"; src = fetchFromGitHub { repo = "rofi"; owner = "DaveDavenport"; rev = "${version}"; - sha256 = "11fg85xg7mpw9vldmp163c9y398nvbilwqsl06ms0xbbmpyc2hgz"; + sha256 = "0b8k5g2fpqrz1yac09kmfk4caxcc107qq4yhncnl159xdxw66vz8"; }; - buildInputs = [ libX11 libXinerama libXft pango autoreconfHook pkgconfig + buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango ] ++ stdenv.lib.optional i3Support i3; + preConfigure = '' + autoreconf -vif + ''; + meta = { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://davedavenport.github.io/rofi; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04263eabfdb..9b2789932ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11298,7 +11298,9 @@ let qt = qt4; }); - rofi = callPackage ../applications/misc/rofi { }; + rofi = callPackage ../applications/misc/rofi { + automake = automake114x; + }; rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); From 4106a3b74efa1631e28fc623f99468ff11f3ac36 Mon Sep 17 00:00:00 2001 From: Lane Seppala Date: Fri, 27 Feb 2015 10:27:18 -0700 Subject: [PATCH 076/120] Fix rebooting containers where resolv.conf is a symlink --- nixos/modules/virtualisation/containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index ea6bc641dad..018e79ae823 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -212,7 +212,7 @@ in "/nix/var/nix/profiles/per-container/$INSTANCE" \ "/nix/var/nix/gcroots/per-container/$INSTANCE" - cp -f /etc/resolv.conf "$root/etc/resolv.conf" + cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" if [ "$PRIVATE_NETWORK" = 1 ]; then extraFlags+=" --network-veth" From bf45ee500dd73128fc092b3b6e0185c4002a0953 Mon Sep 17 00:00:00 2001 From: Ian Duncan Date: Fri, 27 Feb 2015 17:29:58 +0000 Subject: [PATCH 077/120] Remove unnecessary conditional --- pkgs/tools/networking/noip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index e2f1dc9cf1f..bfd9b90b6b1 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=\${out}" ]; installPhase = '' - if [ ! -d "$out/bin" ]; then mkdir -p $out/bin;fi + mkdir -p $out/bin cp noip2 $out/bin ''; From f57163265bc16c1e91d5c385b228d72ff2ffb28b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Feb 2015 00:13:57 +0100 Subject: [PATCH 078/120] Adds ocaml-erm_xmpp OCaml based XMPP implementation Homepage: https://github.com/ermine/xmpp --- .../ocaml-modules/erm_xmpp/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/ocaml-modules/erm_xmpp/default.nix diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix new file mode 100644 index 00000000000..7508a14738d --- /dev/null +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }: + +let + version = "0.2"; + disable-tests = fetchurl { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/erm_xmpp/erm_xmpp.0.2/files/disable_tests.patch; + sha256 = "09d8630nmx2x8kb8ap1zmsb93zs14cqg7ga1gmdl92jvsjxbhgc1"; + }; +in + +stdenv.mkDerivation { + name = "ocaml-erm_xmpp-${version}"; + + src = fetchzip { + url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz"; + sha256 = "0saw2dmrzv2aadrznvyvchnhivvcwm78x9nwf6flq5v0pqddapk2"; + }; + + patches = [ disable-tests ]; + + buildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ erm_xml cryptokit ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/ermine/xmpp; + description = "OCaml based XMPP implementation"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b029cfdc4c..4f00392005f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3889,6 +3889,8 @@ let erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; + erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { lwt = ocaml_lwt; sexplib = ocaml_sexplib; From f87a7fd241cdb56040be037eb42cafca6e3c0e9b Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 26 Feb 2015 20:35:21 -0500 Subject: [PATCH 079/120] bundix: update --- pkgs/development/interpreters/ruby/bundix/Gemfile | 2 +- pkgs/development/interpreters/ruby/bundix/Gemfile.lock | 7 +++---- pkgs/development/interpreters/ruby/bundix/gemset.nix | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile b/pkgs/development/interpreters/ruby/bundix/Gemfile index b9ae407c4d4..7d2f78133c5 100644 --- a/pkgs/development/interpreters/ruby/bundix/Gemfile +++ b/pkgs/development/interpreters/ruby/bundix/Gemfile @@ -1,4 +1,4 @@ source "http://rubygems.org" gem "bundix", :git => "https://github.com/cstrahan/bundix.git", - :ref => "5df25b11b5b86e636754d54c2a8859c7c6ec78c7" + :ref => "v1.0.2" diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock index c8869fdb1e3..038fa1a7a50 100644 --- a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock +++ b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock @@ -1,10 +1,9 @@ GIT remote: https://github.com/cstrahan/bundix.git - revision: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7 - ref: 5df25b11b5b86e636754d54c2a8859c7c6ec78c7 + revision: e098b8c04087079c897aaf9542990e9fdd503bcf + ref: v1.0.2 specs: - bundix (0.1.0) - bundler (~> 1.7.9) + bundix (1.0.2) thor (~> 0.19.1) GEM diff --git a/pkgs/development/interpreters/ruby/bundix/gemset.nix b/pkgs/development/interpreters/ruby/bundix/gemset.nix index a3e732c68e1..adde97a49f2 100644 --- a/pkgs/development/interpreters/ruby/bundix/gemset.nix +++ b/pkgs/development/interpreters/ruby/bundix/gemset.nix @@ -1,12 +1,12 @@ { "bundix" = { - version = "0.1.0"; + version = "1.0.2"; source = { type = "git"; url = "https://github.com/cstrahan/bundix.git"; - rev = "5df25b11b5b86e636754d54c2a8859c7c6ec78c7"; + rev = "e098b8c04087079c897aaf9542990e9fdd503bcf"; + sha256 = "0www8srjqlxy1pzn2b6himy5y768dni54m7rv67gj8yvx48vd803"; fetchSubmodules = false; - sha256 = "1iqx12y777v8gszggj25x0xcf6lzllx58lmv53x6zy3jmvfh4siv"; }; dependencies = [ "thor" @@ -19,4 +19,4 @@ sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; }; }; -} +} \ No newline at end of file From 568df3f4a9b5da7f4be075c6a15219ac5c492c4c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Feb 2015 20:55:44 +0100 Subject: [PATCH 080/120] Disable the cjdns test The cjdns module uses "import from derivation", which is a bad thing (it causes building at evaluation time). --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 1bd3ec57731..e7771788edc 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -244,7 +244,7 @@ in rec { tests.blivet = callTest tests/blivet.nix {}; tests.cadvisor = scrubDrv (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.chromium = callTest tests/chromium.nix {}; - tests.cjdns = callTest tests/cjdns.nix {}; + #tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; tests.docker = scrubDrv (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = scrubDrv (import tests/docker-registry.nix { system = "x86_64-linux"; }); From 3b40ec50126026cb7194204dcb0d5f6c0427b55f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 28 Feb 2015 00:30:36 +0100 Subject: [PATCH 081/120] memtest86+: fixed reboot issues --- pkgs/tools/misc/memtest86+/compile-fix.patch | 20 ++++ pkgs/tools/misc/memtest86+/crash-fix.patch | 99 +++++++++++++++++++ pkgs/tools/misc/memtest86+/default.nix | 3 + .../misc/memtest86+/no-optimization.patch | 11 +++ 4 files changed, 133 insertions(+) create mode 100644 pkgs/tools/misc/memtest86+/compile-fix.patch create mode 100644 pkgs/tools/misc/memtest86+/crash-fix.patch create mode 100644 pkgs/tools/misc/memtest86+/no-optimization.patch diff --git a/pkgs/tools/misc/memtest86+/compile-fix.patch b/pkgs/tools/misc/memtest86+/compile-fix.patch new file mode 100644 index 00000000000..f178259f9e0 --- /dev/null +++ b/pkgs/tools/misc/memtest86+/compile-fix.patch @@ -0,0 +1,20 @@ +--- memtest86+-5.01/io.h~ 2013-08-10 02:01:58.000000000 +0000 ++++ memtest86+-5.01/io.h 2014-01-08 01:29:12.404465515 +0000 +@@ -31,7 +31,7 @@ + */ + + #define __OUT1(s,x) \ +-extern inline void __out##s(unsigned x value, unsigned short port) { ++static inline void __out##s(unsigned x value, unsigned short port) { + + #define __OUT2(s,s1,s2) \ + __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" +@@ -43,7 +43,7 @@ + __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } + + #define __IN1(s) \ +-extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; ++static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; + + #define __IN2(s,s1,s2) \ + __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" diff --git a/pkgs/tools/misc/memtest86+/crash-fix.patch b/pkgs/tools/misc/memtest86+/crash-fix.patch new file mode 100644 index 00000000000..de7c86bac35 --- /dev/null +++ b/pkgs/tools/misc/memtest86+/crash-fix.patch @@ -0,0 +1,99 @@ +diff --git a/controller.c b/controller.c +index f4f7371..183e9c3 100644 +--- a/controller.c ++++ b/controller.c +@@ -2,6 +2,8 @@ + * MemTest86+ V5 Specific code (GPL V2.0) + * By Samuel DEMEULEMEESTER, sdemeule@memtest.org + * http://www.canardpc.com - http://www.memtest.org ++ * ++ * Edited by David McInnis Oct 4, 2014 + */ + + //#include "defs.h" +@@ -292,7 +294,7 @@ static void setup_nhm(void) + + /* First, locate the PCI bus where the MCH is located */ + +- for(i = 0; i < sizeof(possible_nhm_bus); i++) { ++ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); + vid &= 0xFFFF; +@@ -327,7 +329,7 @@ static void setup_nhm32(void) + ctrl.mode = ECC_NONE; + + /* First, locate the PCI bus where the MCH is located */ +- for(i = 0; i < sizeof(possible_nhm_bus); i++) { ++ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); + vid &= 0xFFFF; +@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) { + unsigned long dramchr; + float clockratio; + double dramclock; +- unsigned int dummy[3]; ++ unsigned int dummy[4]; + int ram_type; + + float coef = 10; +@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) { + + static void poll_timings_i875(void) { + +- ulong dev6, dev62; ++ ulong dev6; + ulong temp; + float cas; + int rcd, rp, ras, chan; + long *ptr, *ptr2; + +- pci_conf_read( 0, 6, 0, 0x40, 4, &dev62); ++ pci_conf_read( 0, 6, 0, 0x40, 4, &dev6); + ptr2=(long*)(dev6+0x68); + + /* Read the MMR Base Address & Define the pointer */ +diff --git a/init.c b/init.c +index 754b8d7..5bd8b4f 100644 +--- a/init.c ++++ b/init.c +@@ -7,6 +7,8 @@ + * + * Released under version 2 of the Gnu Public License. + * By Chris Brady ++ * ++ * Edited by David McInnis October 4, 2014 + */ + + +@@ -914,7 +916,6 @@ void cpu_type(void) + default: + cprint(0, COL_MID, "Unknown Intel"); + break; +- break; + } + + } +diff --git a/main.c b/main.c +index 0bc7ca0..613f811 100644 +--- a/main.c ++++ b/main.c +@@ -422,7 +422,7 @@ void test_start(void) + //initialise_cpus(); + btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0); + /* Draw the screen and get system information */ +- init(); ++ init(); + + /* Set defaults and initialize variables */ + set_defaults(); +@@ -737,7 +737,7 @@ void test_start(void) + /* Do the same test for each CPU */ + if (++cpu_sel >= act_cpus) + { +- cpu_sel = 0; ++ cpu_sel = 0; + next_test(); + } else { + continue; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 500d7e815d2..dbd5a46e10a 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l"; }; + # Patch incompatiblity with GCC. Source: http://koji.fedoraproject.org/koji/buildinfo?buildID=586907 + patches = [ ./compile-fix.patch ./crash-fix.patch ./no-optimization.patch ]; + preBuild = '' # Really dirty hack to get Memtest to build without needing a Glibc # with 32-bit libraries and headers. diff --git a/pkgs/tools/misc/memtest86+/no-optimization.patch b/pkgs/tools/misc/memtest86+/no-optimization.patch new file mode 100644 index 00000000000..76815a93170 --- /dev/null +++ b/pkgs/tools/misc/memtest86+/no-optimization.patch @@ -0,0 +1,11 @@ +--- memtest86+-5.01/Makefile~ 2014-01-08 01:30:11.355900076 +0000 ++++ memtest86+-5.01/Makefile 2014-01-08 01:31:19.387555469 +0000 +@@ -12,7 +12,7 @@ + AS=as -32 + CC=gcc + +-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ ++CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector + + OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ From f54a63ed32c9f84a00102f718f5dae11ef2e5d74 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 28 Feb 2015 01:24:35 +0100 Subject: [PATCH 082/120] pythonPackages.py3status: requests2 is needed for many plugins --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 802a7d665f0..6f3f46b287b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3510,6 +3510,7 @@ let url = "https://pypi.python.org/packages/source/p/py3status/${name}.tar.gz"; md5 = "89ad395268c7791ff5d36412b1efeeb9"; }; + propagatedBuildInputs = with self; [ requests2 ]; meta = { maintainers = [ stdenv.lib.maintainers.garbas ]; }; From ea13e2aa87f2be34b3c66f3a65cc4400ed00f96a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 28 Feb 2015 04:02:15 +0100 Subject: [PATCH 083/120] lib/lists: add intersect and substract functions --- lib/lists.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/lists.nix b/lib/lists.nix index d57c4893daa..2dda700bef3 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -233,4 +233,9 @@ rec { xs = unique (drop 1 list); in [x] ++ remove x xs; + # Intersects list 'e' and another list + intersect = e: filter (x: elem x e); + + # Substracts list 'e' from another list + substract = e: filter (x: !(elem x e)); } From bd81885f706dae5cdeb8c03845fa43d8b74fa57c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 28 Feb 2015 04:03:24 +0100 Subject: [PATCH 084/120] nodePackages: correctly handle platforms and optional dependencies --- .../web/nodejs/build-node-package.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 17c437a7d0f..663864109e8 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -57,15 +57,20 @@ let mv $(find . -type d -mindepth 1 -maxdepth 1) $out ''; - platforms = fold (entry: platforms: - let - filterPlatforms = attrByPath [(removePrefix "!" entry)] [] stdenv.lib.platforms; - in - if hasPrefix "!" entry then - filter (p: any (f: p != f) filterPlatforms) platforms - else - filter (p: any (f: p == f) filterPlatforms) platforms - ) nodejs.meta.platforms os; + platforms = if os == [] then nodejs.meta.platforms else + fold (entry: platforms: + let + filterPlatforms = + stdenv.lib.platforms.${removePrefix "!" entry} or []; + in + # Ignore unknown platforms + if filterPlatforms == [] then platforms + else + if hasPrefix "!" entry then + substract (intersect filterPlatforms nodejs.meta.platforms) platforms + else + platforms ++ (intersect filterPlatforms nodejs.meta.platforms) + ) [] os; mapDependencies = deps: f: rec { # Convert deps to attribute set @@ -87,8 +92,8 @@ let _dependencies = mapDependencies deps (name: dep: dep.pkgName != pkgName); _optionalDependencies = mapDependencies optionalDependencies (name: dep: - any (platform: stdenv.system == platform) dep.meta.platforms && - all (d: d != dep.pkgName) skipOptionalDependencies + (builtins.tryEval dep).success && + !(elem dep.pkgName skipOptionalDependencies) ); _peerDependencies = mapDependencies peerDependencies (name: dep: dep.pkgName != pkgName); @@ -301,7 +306,7 @@ let dontStrip = true; meta = { - platforms = platforms; + inherit platforms; maintainers = [ stdenv.lib.maintainers.offline ]; }; From 68e85fcc05fd4e60ae123afe79a3ed04cc34d2fa Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 28 Feb 2015 08:47:36 +0100 Subject: [PATCH 085/120] urlwatch: update to version 1.18 --- pkgs/tools/networking/urlwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 4ad9c7cebad..bd580d28320 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { - name = "urlwatch-1.17"; + name = "urlwatch-1.18"; src = fetchurl { url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "1xl8gi01bfbrg2mchns9cgagpxjjsig1x4kis3isqgfg4k0h8vq0"; + sha256 = "090qfgx249ks7103sap6w47f8302ix2k46wxhfssxwsqcqdl25vb"; }; patchPhase = '' From d375550ead7d6833e24dc7e6f074f7463cec7033 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 23 Feb 2015 18:00:21 +0100 Subject: [PATCH 086/120] nixos: add a few missing type specifiers under boot.* --- .../system/boot/loader/generations-dir/generations-dir.nix | 2 ++ nixos/modules/system/boot/loader/grub/grub.nix | 1 + nixos/modules/system/boot/loader/init-script/init-script.nix | 1 + nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 1 + nixos/modules/tasks/kbd.nix | 1 + 5 files changed, 6 insertions(+) diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index 4b5e84f53c1..6153578612c 100644 --- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -24,6 +24,7 @@ in enable = mkOption { default = false; + type = types.bool; description = '' Whether to create symlinks to the system generations under /boot. When enabled, @@ -42,6 +43,7 @@ in copyKernels = mkOption { default = false; + type = types.bool; description = " Whether copy the necessary boot files into /boot, so /nix/store is not needed by the boot loader. diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index a166709d39a..585c8854fee 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -179,6 +179,7 @@ in }; splashImage = mkOption { + type = types.nullOr types.path; example = literalExample "./my-background.png"; description = '' Background image used for GRUB. It must be a 640x480, diff --git a/nixos/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix index 3b33d42b4ae..374d9524ff1 100644 --- a/nixos/modules/system/boot/loader/init-script/init-script.nix +++ b/nixos/modules/system/boot/loader/init-script/init-script.nix @@ -23,6 +23,7 @@ in enable = mkOption { default = false; + type = types.bool; description = '' Some systems require a /sbin/init script which is started. Or having it makes starting NixOS easier. diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index d3f32418a64..1ea3ddd8867 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -21,6 +21,7 @@ in boot.loader.raspberryPi.enable = mkOption { default = false; + type = types.bool; description = '' Whether to create files with the system generations in /boot. diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 03c42404e5d..8d26998021d 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -22,6 +22,7 @@ in # FIXME: still needed? boot.extraTTYs = mkOption { default = []; + type = types.listOf types.string; example = ["tty8" "tty9"]; description = '' Tty (virtual console) devices, in addition to the consoles on From 0473b4ae8d836fea8ccfb9f2aceb7f38e17023fb Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 25 Feb 2015 07:50:24 +0100 Subject: [PATCH 087/120] nixos: citerefentry markup in lxc option descriptions --- nixos/modules/virtualisation/lxc.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 10d3a6575fb..22da012e414 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -32,7 +32,9 @@ in default = ""; description = '' - This is the system-wide LXC config. See lxc.system.conf(5). + This is the system-wide LXC config. See + lxc.system.conf + 5. ''; }; @@ -43,7 +45,8 @@ in description = '' Default config (default.conf) for new containers, i.e. for - network config. See lxc.container.conf(5). + network config. See lxc.container.conf + 5. ''; }; @@ -54,7 +57,9 @@ in description = '' This is the config file for managing unprivileged user network - administration access in LXC. See lxc-user-net(5). + administration access in LXC. See + lxc-user-net5 + . ''; }; From 5472af91f2808943f74844879a5067a45c2d99d3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 25 Feb 2015 00:53:38 -0300 Subject: [PATCH 088/120] Fluxbox: update to 1.3.7 --- nixos/modules/services/x11/window-managers/default.nix | 1 + pkgs/applications/window-managers/fluxbox/default.nix | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 628d475c968..16455b34c22 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -10,6 +10,7 @@ in imports = [ ./bspwm.nix ./compiz.nix + ./fluxbox.nix ./herbstluftwm.nix ./i3.nix ./metacity.nix diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index b46864b9c2e..36e081ccfcf 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -4,19 +4,20 @@ , libXinerama , imlib2 }: +with stdenv.lib; stdenv.mkDerivation rec { name = "fluxbox-${version}"; - version = "1.3.5"; + version = "1.3.7"; buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ]; src = fetchurl { - url = "mirror://sourceforge/fluxbox/${name}.tar.bz2"; - sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983"; + url = "mirror://sourceforge/fluxbox/${name}.tar.xz"; + sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; }; - meta = with stdenv.lib; { + meta = { description = "Full-featured, light-resource X window manager"; longDescription = '' Fluxbox is a X window manager based on Blackbox 0.61.1 window From 929485b645f0ed6332250a11d4a31b9438bc56ab Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 28 Feb 2015 11:14:33 -0300 Subject: [PATCH 089/120] Adding Afterstep to nixos modules --- nixos/modules/services/x11/window-managers/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 628d475c968..15a54911a5d 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -8,6 +8,7 @@ in { imports = [ + ./afterstep.nix ./bspwm.nix ./compiz.nix ./herbstluftwm.nix From 66dc6872ce06e9a6f2b629a9fc63a71de175b28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 28 Feb 2015 17:12:12 +0100 Subject: [PATCH 090/120] darktable: update from 1.6.1 to 1.6.2 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 3d1d5f7d14f..6a598146561 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.6.2"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1iijbrq2chqwvvb8nv744fg1q1c9iflrw8jbc7rhj97jdmdyqwhk"; + sha256 = "1gf5pl4fhak1aqx3dgg0491zgsl6qr6kgyl034hnk4fzwn65zvk6"; }; buildInputs = From 45216b82a121276bc5568a555af6132519a96541 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 28 Feb 2015 17:49:58 +0100 Subject: [PATCH 091/120] lirc: upgraded to 0.9.2a --- pkgs/development/libraries/lirc/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 278eb8e9e52..b9b810ca92c 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,23 +1,16 @@ -{ stdenv, fetchurl, alsaLib, bash, help2man }: +{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, x11, python3 }: stdenv.mkDerivation rec { - name = "lirc-0.9.1a"; + name = "lirc-0.9.2a"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "191vhgsds221rzpzjibj005pfr182hq65hniqfd0qqsl5h1zwq8r"; + sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim"; }; - patches = [ - (fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lirc-0.9.1a-fix-segfaults.patch?h=packages/lirc"; - sha256 = "00ainq7y8yh2r447968jid06cqfb1xirv24xxrkl0gvakrrv9gnh"; - }) - ]; - preBuild = "patchShebangs ."; - buildInputs = [ alsaLib help2man ]; + buildInputs = [ alsaLib help2man pkgconfig x11 python3 ]; configureFlags = [ "--with-driver=devinput" From 307064ceb512d700a2979b7850082036969cb0ae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 28 Feb 2015 19:20:13 +0100 Subject: [PATCH 092/120] Don't use machinectl to shut down containers If the host is shutting down, machinectl may fail because it's bus-activated and D-Bus will be shutting down. So just send a signal to the leader process directly. Fixes #6212. --- nixos/modules/virtualisation/containers.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 018e79ae823..da39dda8535 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -203,7 +203,7 @@ in script = '' mkdir -p -m 0755 "$root/etc" "$root/var/lib" - mkdir -p -m 0700 "$root/var/lib/private" "$root/root" + mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers if ! [ -e "$root/etc/os-release" ]; then touch "$root/etc/os-release" fi @@ -261,11 +261,21 @@ in ip route add $LOCAL_ADDRESS dev $ifaceHost fi fi + + # Get the leader PID so that we can signal it in + # preStop. We can't use machinectl there because D-Bus + # might be shutting down. FIXME: in systemd 219 we can + # just signal systemd-nspawn to do a clean shutdown. + machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid" ''; preStop = '' - machinectl poweroff "$INSTANCE" || true + pid="$(cat /run/containers/$INSTANCE.pid)" + if [ -n "$pid" ]; then + kill -RTMIN+4 "$pid" + fi + rm -f "/run/containers/$INSTANCE.pid" ''; restartIfChanged = false; From 186348f83127c6db3abab2ab70dcd0a1de3002ef Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sat, 28 Feb 2015 20:30:04 +0100 Subject: [PATCH 093/120] lirc: fix python reference in build tools --- pkgs/development/libraries/lirc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index b9b810ca92c..d84e0219294 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "011nwpxm5d12rsapljg3pjf9pgb0j8ngmc3zg69q4kv61hkx2zim"; }; + patchPhase = '' + sed -e 's|^#!/usr/bin/env python3$|#!${python3}/bin/python3|g' -i tools/*.py + ''; + preBuild = "patchShebangs ."; buildInputs = [ alsaLib help2man pkgconfig x11 python3 ]; From 62080e3939486729d5ed41320ff2fd6f6b5e730c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 28 Feb 2015 21:54:15 +0000 Subject: [PATCH 094/120] smack: bump to version 3.4.1 --- pkgs/development/libraries/java/smack/builder.sh | 5 +++-- pkgs/development/libraries/java/smack/default.nix | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/java/smack/builder.sh b/pkgs/development/libraries/java/smack/builder.sh index bf86d59497e..83edfe04a65 100644 --- a/pkgs/development/libraries/java/smack/builder.sh +++ b/pkgs/development/libraries/java/smack/builder.sh @@ -1,6 +1,7 @@ source $stdenv/setup +mkdir smack +cd smack tar xfvz $src -cd smack* mkdir -p $out/share/java -cp *.jar $out/share/java +cp smack-*.jar $out/share/java diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index 14b8e1f5633..9d1d8f53533 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "smack-3_2_1"; + name = "smack-3.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_2_1.tar.gz; - sha256 = "0lljrxky66gc73caaflia2wgmlpry2cdj00bz1gd1vqrzd3pg3gd"; - }; + url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_4_1.tar.gz; + sha256 = "13jm93b0dsfxr62brq1hagi9fqk7ip3pi80svq10zh5kcpk77jf4"; + }; } From 362ba73ac68a1385f6e639ddfead4777767ed673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 28 Feb 2015 23:23:58 +0100 Subject: [PATCH 095/120] vlc: 2.1.5 -> 2.2.0 --- pkgs/applications/video/vlc/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 82930eb8bd8..e25f833eabc 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -13,15 +13,16 @@ with stdenv.lib; -assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); +assert (withQt5 -> qt5 != null); +assert (!withQt5 -> qt4 != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg"; + sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy"; }; buildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90dbe36e100..d67b65af917 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11784,7 +11784,7 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_2_2; + ffmpeg = ffmpeg_2; }; vlc_qt5 = vlc.override { From 154d3597a9931afae7e7036186e17e9f4fb50fa0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 26 Feb 2015 21:25:53 +0100 Subject: [PATCH 096/120] stress-ng 0.03.19 -> 0.03.20 --- pkgs/tools/system/stress-ng/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index d7220e062a6..46cbde74a03 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: -let version = "0.03.19"; in +let version = "0.03.20"; in stdenv.mkDerivation rec { name = "stress-ng-${version}"; src = fetchurl { - sha256 = "1icr9gk0zm2hhn19xg57x0509w4jz4mf72hsyy6nadzn9426ssaq"; + sha256 = "0j1nppja56cgsd7vg3465y9kbxy3hl8mbyzc254qqm4z9ij1m3dg"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; @@ -20,9 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stress test a computer system"; longDescription = '' - Stress test a computer system in various selectable ways, by exercising - various physical subsystems of a computer as well as the various - operating system kernel interfaces. Stress-ng features: + Stress test a system in various selectable ways, exercising both various + physical subsystems and various operating system kernel interfaces: - over 60 different stress tests - over 50 CPU specific stress tests that exercise floating point, integer, bit manipulation and control flow From 9f87f3ccb0963e317594018016113ecea4686fe0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Feb 2015 14:15:53 +0100 Subject: [PATCH 097/120] linux: disable UEVENT_HELPER* Deprecated since 2006: http://lwn.net/Articles/166954/ --- nixos/modules/services/hardware/udev.nix | 2 -- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 39180f4d37e..1dc344a10fc 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -236,8 +236,6 @@ in system.activationScripts.udevd = '' - echo "" > /proc/sys/kernel/hotplug - # Regenerate the hardware database /var/lib/udev/hwdb.bin # whenever systemd changes. if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${config.systemd.package} ]; then diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3e92e9c3fa6..fedfb707f32 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -263,6 +263,9 @@ with stdenv.lib; SLIP_COMPRESSED y # CSLIP compressed headers SLIP_SMART y THERMAL_HWMON y # Hardware monitoring support + ${optionalString (versionAtLeast version "3.15") '' + UEVENT_HELPER n + ''} USB_DEBUG? n USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling From 4995ecbb807b208657f6d5a8a9cea348bca1a430 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 1 Mar 2015 00:18:08 -0800 Subject: [PATCH 098/120] update foldl patch hash for GHC 7.10.1x, the pull request was updated --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 2a038a43877..219fe85b176 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -99,7 +99,7 @@ self: super: { }); foldl = appendPatch super.foldl (pkgs.fetchpatch { url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; - sha256 = "15lfh54vhdp36197dp4xpb2mr3g49gz2xzl31cjir1fmcvjsbgjl"; + sha256 = "0q4gs3xkazh644ff7qn2mp2q1nq3jq71x82g7iaacxclkiv0bphx"; }); persistent-template = appendPatch super.persistent-template (pkgs.fetchpatch { url = "https://github.com/yesodweb/persistent/commit/4d34960bc421ec0aa353d69fbb3eb0c73585db97.patch"; From b8d5e2fd6a710e1e4df3ab72984df506fdc871b8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 1 Mar 2015 09:53:11 +0100 Subject: [PATCH 099/120] checkstyle: update from 6.3 to 6.4 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 90dab874e18..1904ccc20bb 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.3"; + version = "6.4"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; - sha256 = "181wm6yxyf9dsp1dgy7bpjz5j72a5fc818293k5mxr8g1gf0s3f4"; + sha256 = "0qk653i8973ygz630siava3fm54vxmahbw6rikdi9lzjlpvvn74f"; }; installPhase = '' From ebf122c36ff1781cb1d6be8543c7eaabe434ff6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Mar 2015 12:31:26 +0100 Subject: [PATCH 100/120] coan: only build on Linux --- pkgs/development/tools/analysis/coan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 202109cdbf6..cd8cde1ae52 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = http://coan2.sourceforge.net/; license = with licenses; bsd3; - platforms = with platforms; all; + platforms = with platforms; linux; maintainers = with maintainers; [ nckx ]; }; } From c40cb390f818f869b4764c598dda66ecdc62c4ec Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 1 Mar 2015 12:51:36 +0100 Subject: [PATCH 101/120] meld: fix gsettings schemas and remove LD_LIBARY_PATH --- pkgs/applications/version-management/meld/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 36dcb256212..a892d7decc0 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -32,9 +32,13 @@ buildPythonPackage rec { --install-lib=$out/lib/${python27.libPrefix}/site-packages \ --prefix="$out" + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ + ''; + + preFixup = '' wrapProgram $out/bin/meld \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; From dbbff72154ab22de7f804bc66588bbc7c834ba5b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 1 Mar 2015 12:51:41 +0100 Subject: [PATCH 102/120] finalterm: fix gsettings schemas --- pkgs/applications/misc/finalterm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 0c084f9d018..9e217d88c69 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -34,6 +34,11 @@ in stdenv.mkDerivation { ) ''; + postInstall = '' + mkdir -p $out/share/gsettings-schemas/$name + mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ + ''; + postFixup = '' wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ From b7b54b053976852e9d1743d9d91df1882d4e3b62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Mar 2015 13:39:33 +0100 Subject: [PATCH 103/120] pgcli 0.15.4 -> 0.16.0 --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f3f46b287b..1f2d646c217 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7444,11 +7444,13 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.15.4"; + version = "0.16.0"; - src = pkgs.fetchurl { - sha256 = "1s57krfa5kpn15ma7dcivizgn987j24i6cxrnjf9hnnann0q26cd"; - url = "https://pypi.python.org/packages/source/p/pgcli/${name}.tar.gz"; + src = pkgs.fetchFromGitHub { + sha256 = "05xqv3z47xk8v4pbhkavbw49wxq4i3zg49v4g074spqgvcs4jy1n"; + rev = "v${version}"; + repo = "pgcli"; + owner = "amjith"; }; propagatedBuildInputs = with self; [ click jedi prompt_toolkit psycopg2 pygments sqlparse ]; From d8912db092aca760bbfcb31a9a51c0b12112ac7d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 28 Feb 2015 16:48:16 +0100 Subject: [PATCH 104/120] ocsigen-deriving: update from 0.6.2 to 0.7 --- .../ocsigen-deriving/default.nix | 25 ++++++++----------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 544d85c6f5f..89efb58ecbb 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -1,30 +1,25 @@ -{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp, camlp4}: +{ stdenv, fetchzip, ocaml, findlib, oasis, ocaml_optcomp, camlp4 }: + +let version = "0.7"; in stdenv.mkDerivation { - name = "ocsigen-deriving"; - src = fetchgit { - url = "git://github.com/ocsigen/deriving"; - rev = "refs/tags/0.6.2"; - sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662"; + name = "ocsigen-deriving-${version}"; + src = fetchzip { + url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz"; + sha256 = "05z606gly1iyan292x3mflg3zasgg68n8i2mivz0zbshx2hz2jbw"; }; - buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp camlp4]; - - configurePhase = '' - make setup-dev.exe - ./setup-dev.exe -configure --prefix $out - ''; + buildInputs = [ ocaml findlib oasis ocaml_optcomp camlp4 ]; createFindlibDestdir = true; - meta = { homepage = https://github.com/ocsigen/deriving; description = "Extension to OCaml for deriving functions from type declarations"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.gal_bolle + maintainers = with stdenv.lib.maintainers; [ + gal_bolle vbgl ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6018d647d53..aa0b0d32fb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4103,7 +4103,9 @@ let zed = callPackage ../development/ocaml-modules/zed { }; - ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { }; + ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { + oasis = ocaml_oasis; + }; }; From 587f127e93481de02dd345d8b001935b453fcaf9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 1 Mar 2015 17:22:34 +0100 Subject: [PATCH 105/120] coq-contribs: fix various packages --- pkgs/development/coq-modules/contribs/all.nix | 6 +- .../coq-modules/contribs/default.nix | 57 ++++++++++++++++++- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix index fe01fbf5891..d01c32bdb0a 100644 --- a/pkgs/development/coq-modules/contribs/all.nix +++ b/pkgs/development/coq-modules/contribs/all.nix @@ -47,7 +47,7 @@ EuclideanGeometry = "11n8877zksgksdfcj7arjx0zcfhsrvg83lcp6yb2bynvfp80gyzb"; EulerFormula = "1nhh49rf6wza2m5qmz5l5m24m299qn3v80wqzvf51lybadzll2h6"; ExactRealArithmetic = "1p32g13sx2z5rj3q6390ym8902gvl5x16wdhgz5i75y44s6kmkb1"; Exceptions = "0w2b16nr80f70dxllmhbqwfr1aw26rcfbak5bdyc0fna8hqp4q3p"; -#FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6"; +FOUnify = "1vwp5rwvs5ng4d13l9jjh4iljasfqmc5jpla8rga4v968bp84nw6"; FSSecModel = "0fi78vqfrw4vrmdw215ic08rw8y6aia901wqs4f1s9z2idd6m8qy"; FSets = "1n54s2vr6snh31jnvr79q951vyk0w0w6jrnwnlz9d3vyw47la9js"; Fairisle = "0gg9x69qr0zflaryniqnl8d34kjdij0i55fcb1f1i5hmrwn2sqn6"; @@ -135,10 +135,10 @@ RulerCompassGeometry = "02vm80xvvw22pdxrag3pv5zrhqf8726i9jqsiv4bnjqavj5z2hdr"; SMC = "0ca3ar1y9nyj5147r18babqsbg2q2ywws8fdi91xb5z9m3i97nv1"; Schroeder = "0mfbjmw4a48758k88yv01494wnywcp5yamkl394axvvbbna9h8b6"; SearchTrees = "1jyps6ddm8klmxjm50p2j9i014ij7imy3229pwz3dkzg54gxzzxb"; -#Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580"; +Semantics = "157db1y5zgxs9shl7rmqg89gxfa4cqxwlf6qys0jh3j0wsxs8580"; Shuffle = "14v1m4s9k49w30xrnyncjzgqjcckiga8wd2vnnzy8axrwr9zq7iq"; SquareMatrices = "07dlykg3w59crc54qqdqxq6hf8rmzvwwfr1g8z8v2l8h4yvfnhfl"; -Ssreflect = "1capfvkdnsv95ik0yj9kpwj4smm7i7n2n98d6rlv68bdd2abw9f3"; +Ssreflect = "07hv0ixv68d8vrpf9s6gxazxaz5fwpmhqrd6cqw7xp8m8gspxifz"; Stalmarck = "0vcbkzappq1si4hxbnb9bjkfk82j3jklb8g8ia83h1mdhzr7xdpz"; Streams = "1spcqnvwayahk12fd13vzh922ypzrjkcmws9gcy12qdqp04h8bnc"; String = "1wy7g66yq9y8m8y3gq29q7whfdm98g3cj9jxm5yibdzfahfdzzni"; diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index fb231bfdeac..289a4d75921 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -4,6 +4,15 @@ let mkContrib = import ./mk-contrib.nix; all = import ./all.nix; overrides = { + Additions = self: { + patchPhase = '' + for p in binary_strat dicho_strat generation log2_implementation shift + do + substituteInPlace $p.v \ + --replace 'Require Import Euclid.' 'Require Import Coq.Arith.Euclid.' + done + ''; + }; BDDs = self: { buildInputs = self.buildInputs ++ [ contribs.IntMap ]; patchPhase = '' @@ -13,6 +22,7 @@ let 32d30 < extraction EOF + coq_makefile -f Make -o Makefile ''; postInstall = '' mkdir -p $out/bin @@ -25,6 +35,7 @@ let 17d16 < rauzy/algorithme1/extraction EOF + coq_makefile -f Make -o Makefile ''; postInstall = '' mkdir -p $out/bin @@ -38,6 +49,7 @@ let 2d1 < -R ../QArithSternBrocot QArithSternBrocot EOF + coq_makefile -f Make -o Makefile ''; }; CoRN = self: { @@ -47,7 +59,9 @@ let 2d1 < -R ../MathClasses/ MathClasses EOF + coq_makefile -f Make -o Makefile.coq ''; + enableParallelBuilding = true; installFlags = self.installFlags + " -f Makefile.coq"; }; Counting = self: { @@ -70,6 +84,7 @@ let < -I ../Counting/src < -R ../Counting/theories Counting EOF + coq_makefile -f Make -o Makefile ''; }; FingerTree = self: { @@ -78,6 +93,22 @@ let 21d20 < extraction EOF + coq_makefile -f Make -o Makefile + ''; + }; + FOUnify = self: { + patchPhase = '' + patch Make < -custom "\$(CAMLOPTLINK) -pp 'camlp5o' -o unif unif.mli unif.ml main.ml" unif.ml unif + EOF + coq_makefile -f Make -o Makefile + ''; + postInstall = '' + mkdir -p $out/bin + cp unif $out/bin/ ''; }; Goedel = self: { @@ -85,8 +116,9 @@ let patchPhase = '' patch Make < interp.mli + EOF + ''; + configurePhase = '' + coq_makefile -f Make -o Makefile + make extract_interpret.vo + rm -f str_little.ml.d ''; }; SMC = self: { @@ -155,12 +205,13 @@ let 2d1 < -R ../../Cachan/IntMap IntMap EOF + coq_makefile -f Make -o Makefile ''; }; Ssreflect = self: { patchPhase = '' substituteInPlace Makefile \ - --replace "/bin/mkdir" "mkdir" + --replace "/bin/mkdir" "mkdir" ''; }; Stalmarck = self: { @@ -173,6 +224,7 @@ let 2d1 < -R ../ZornsLemma ZornsLemma EOF + coq_makefile -f Make -o Makefile ''; }; TreeAutomata = self: { @@ -182,6 +234,7 @@ let 2d1 < -R ../../Cachan/IntMap IntMap EOF + coq_makefile -f Make -o Makefile ''; }; }; From 936bee423509a2a0a9a48f577e1a746995e8b65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 1 Mar 2015 19:51:59 +0100 Subject: [PATCH 106/120] ams-lv2: update from 1.0.2 to 1.1.0 --- pkgs/applications/audio/ams-lv2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index dd23504d3fa..0001f0a9292 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, cairo, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchurl, cairo, fftw, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz"; - sha256 = "0fa1ghf6qahbhj9j1ciyw0hr6nngwksa37hbs651mlz0fn7lz4xm"; + sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5"; }; - buildInputs = [ cairo gtk gtkmm lv2 lvtk pkgconfig python ]; + buildInputs = [ cairo fftw gtk gtkmm lv2 lvtk pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; From f1e615f6df7979bc02495726faf3d9ba04bfe5b8 Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 1 Mar 2015 11:53:16 +0000 Subject: [PATCH 107/120] bind: 9.9.5-W1 -> 9.10.2 + added rndc key --- pkgs/servers/dns/bind/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 50e71a74546..fbfa2d8d9b7 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.9.5-W1"; in +let version = "9.10.2"; in stdenv.mkDerivation rec { - name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1b3ycb376b1j2fc0k6w16k8j9vgsfrzy3nlw1vxzzi41fgyqmcd3"; + sha256 = "163s8pvqj4lyryvfzkc6acbys7gw1by5dqwilggiwp54ia8bg6vg"; }; patchPhase = '' From 97079a044d0d2746e750770e1ecaab79686b9e0e Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 1 Mar 2015 22:54:21 +0100 Subject: [PATCH 108/120] i3: upgrade to 4.9 --- pkgs/applications/window-managers/i3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index f07c1d22310..6433099cef1 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl -, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy }: +, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy, libxkbcommon }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.8"; + version = "4.9"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "0sqvd8yqf9vwqrrvbpbf8k93b3qfa3q9289m82xq15r31wlk8b2h"; + sha256 = "0n6hfma058iykfxnl1m23mkh8y5sx1x80s3fxfdngbd9wc41kqxy"; }; buildInputs = [ - which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm + which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC From 38b53b8e7d45b915eea9a877e3f9287ff9af26a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 28 Feb 2015 13:52:58 +0100 Subject: [PATCH 109/120] nvidia-x11: Update to 346.47 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f62649e2daa..e207df67185 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,9 +12,11 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "346.35"; + versionNumber = "346.47"; + # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; + in stdenv.mkDerivation { @@ -26,12 +28,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "09fz8nydi8ip3yv7dmbwnpwvjql5wp582z57022ppb9hqwq3r9mv"; + sha256 = "0vkayz6nhw00kn2nvxvr9hsh4sa555nbbr9swlx5x1frziym48dv"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1z9a69a9xbcrz925mj02l2qaqcnhxzh2msbq4hf73p7x4h94ibkx"; + sha256 = "0xqnjs54i281pnkky7dnz4n7jcn2vqjba0kra8da1wnyklm6gdni"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 06dfa19b992ce0f7fc1a2e4839a62abebf415879 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 28 Feb 2015 13:49:25 +0100 Subject: [PATCH 110/120] nvidia-x11: Use GTK 2 Otherwise we end up with multiple versions of GTK in the system closure. Also, GTK 3 is not well integrated in NixOS yet (e.g. it doesn't respect KDE's colour scheme). --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 10 +++++----- pkgs/os-specific/linux/nvidia-x11/default.nix | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 2b651841c48..5edadeda81b 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -68,7 +68,6 @@ installPhase() { #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* - if test -z "$libsOnly"; then # Install headers and /share files etc. mkdir -p $out/include/nvidia @@ -99,15 +98,16 @@ installPhase() { --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done - patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.* + patchelf --set-rpath $glPath:$gtkPath $out/lib/libnvidia-gtk2.so.*.* # Test a bit. $out/bin/nvidia-settings --version else - rm $out/lib/libnvidia-gtk3.* + rm $out/lib/libnvidia-gtk2.* fi - # for simplicity and dependency reduction, don't support the gtk2 interface - rm $out/lib/libnvidia-gtk2.* + + # For simplicity and dependency reduction, don't support the gtk3 interface. + rm $out/lib/libnvidia-gtk3.* } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e207df67185..02731d7f775 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl -, gtk3, atk, pango, glib, gdk_pixbuf, cairo +, gtk, atk, pango, glib, gdk_pixbuf, cairo , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -48,9 +48,8 @@ stdenv.mkDerivation { openclPath = makeLibraryPath [zlib]; allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc]; - # we don't support the gtk2 version - gtk3Path = optionalString (!libsOnly) (makeLibraryPath - [ gtk3 atk pango glib gdk_pixbuf cairo ] ); + gtkPath = optionalString (!libsOnly) (makeLibraryPath + [ gtk atk pango glib gdk_pixbuf cairo ] ); programPath = makeLibraryPath [ xlibs.libXv ]; buildInputs = [ perl ]; From ea0d6a7fc0c77e3c34a66258ba066c8516e93b50 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Mar 2015 00:20:49 +0100 Subject: [PATCH 111/120] Add CUDA toolkit 6.5 --- .../development/compilers/cudatoolkit/6.5.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/compilers/cudatoolkit/6.5.nix diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix new file mode 100644 index 00000000000..9f9d3bc94bf --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/6.5.nix @@ -0,0 +1,65 @@ +{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib +}: + +let version = "6.5.19"; in + +stdenv.mkDerivation rec { + name = "cudatoolkit-${version}"; + + dontPatchELF = true; + dontStrip = true; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_${version}_linux_64.run"; + sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj"; + } + else throw "cudatoolkit does not support platform ${stdenv.system}"; + + outputs = [ "out" "sdk" ]; + + buildInputs = [ perl ]; + + runtimeDependencies = [ + ncurses expat python zlib + xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + gtk2 glib fontconfig freetype unixODBC alsaLib + ]; + + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; + + unpackPhase = '' + sh $src --keep --noexec + cd pkg/run_files + sh cuda-linux64-rel-${version}-*.run --keep --noexec + sh cuda-samples-linux-${version}-*.run --keep --noexec + cd pkg + ''; + + buildPhase = '' + find . -type f -executable -exec patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + '{}' \; || true + find . -type f -exec patchelf \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --force-rpath \ + '{}' \; || true + ''; + + installPhase = '' + mkdir $out $sdk + perl ./install-linux.pl --prefix="$out" + rm $out/tools/CUDA_Occupancy_Calculator.xls + perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + mv $out/include $out/usr_include + ''; + + setupHook = ./setup-hook.sh; + + meta = { + license = lib.licenses.unfree; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa0b0d32fb8..ccf5f6e93c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -993,6 +993,10 @@ let python = python26; }; + cudatoolkit65 = callPackage ../development/compilers/cudatoolkit/6.5.nix { + python = python26; + }; + cudatoolkit = cudatoolkit5; curl = callPackage ../tools/networking/curl rec { From 4a779f4d9a5b85e227a94b6b3bc5f866e8c38aaa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Mar 2015 00:22:22 +0100 Subject: [PATCH 112/120] blender: Support GeForce 9xx cards --- pkgs/applications/misc/blender/default.nix | 6 ++++-- pkgs/applications/misc/blender/sm52.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/misc/blender/sm52.patch diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 982c0d618d5..3a86c282193 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,7 +3,7 @@ , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw , jackaudioSupport ? false, jack2 -, cudaSupport ? false, cudatoolkit6 +, cudaSupport ? false, cudatoolkit65 , colladaSupport ? true, opencollada }: @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { sha256 = "114ipidrja6ryi6wv0w55wmh10ikazy24r8js596g7b9fpkzpymc"; }; + patches = [ ./sm52.patch ]; + buildInputs = [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport jack2 - ++ optional cudaSupport cudatoolkit6 + ++ optional cudaSupport cudatoolkit65 ++ optional colladaSupport opencollada; postUnpack = diff --git a/pkgs/applications/misc/blender/sm52.patch b/pkgs/applications/misc/blender/sm52.patch new file mode 100644 index 00000000000..7cb86c53bdd --- /dev/null +++ b/pkgs/applications/misc/blender/sm52.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' blender-2.73a-orig/CMakeLists.txt blender-2.73a/CMakeLists.txt +--- blender-2.73a-orig/CMakeLists.txt 2015-01-21 13:31:24.000000000 +0100 ++++ blender-2.73a/CMakeLists.txt 2015-03-01 23:14:22.962585422 +0100 +@@ -351,7 +351,7 @@ + option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF) + option(WITH_CYCLES_OSL "Build Cycles with OSL support" ${_init_CYCLES_OSL}) + option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) +-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 CACHE STRING "CUDA architectures to build binaries for") ++set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for") + mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) + unset(PLATFORM_DEFAULT) + option(WITH_CYCLES_LOGGING "Build cycles with logging support" ON) From ec019485d6b84d680d1a91a8f7ac8d94a57c95f4 Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Sun, 1 Mar 2015 20:19:36 -0800 Subject: [PATCH 113/120] Revert "Fix building on Xcode" This reverts commit dad86b4f544db4d497e4bbe769dec0bb3e9cfbd7. --- pkgs/stdenv/darwin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 89c8c6ee285..2502882123e 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -50,10 +50,10 @@ rec { stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" xargsFlags=" " export MACOSX_DEPLOYMENT_TARGET=10.7 - # Use the SDK from Xcode by default, falling back to /usr/{lib,include}. - export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --show-sdk-path 2> /dev/null || echo /) - export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" - export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" + export SDKROOT= + export SDKROOT_X=/ # FIXME: impure! + export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT_X/usr/include -F$SDKROOT_X/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" + export NIX_LDFLAGS_AFTER+=" -L$SDKROOT_X/usr/lib" export CMAKE_OSX_ARCHITECTURES=x86_64 ''; From b0dc17a5edf0a49eac8e377894141f8357ebb9b8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 2 Mar 2015 09:37:10 +0000 Subject: [PATCH 114/120] Bump development versions of Disnix --- .../disnix/DisnixWebService/default.nix | 4 ++-- pkgs/tools/package-management/disnix/default.nix | 8 ++++---- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 6ea1a68181a..845c760c41d 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation { name = "DisnixWebService-0.2"; src = fetchurl { - url = http://hydra.nixos.org/build/19859888/download/4/DisnixWebService-0.2.tar.bz2; - sha256 = "1gcrgjscd8mkixi5js6j44yiiyyz2vg7bdn5qp42vr4r8rh9zgq4"; + url = http://hydra.nixos.org/build/20103911/download/4/DisnixWebService-0.2.tar.bz2; + sha256 = "0sxyv93lc9zp8sk37dmpik1vchi5qa5djd5k90xg0n6920dl4snw"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 0e522f46674..b3e548583ff 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.3pre0d9af6829c047d9a6fb27bff38af02e9e75ce36f"; + name = "disnix-0.3pre9d3acde83aa4283cb6fc26874c524a98f39a5bc6"; src = fetchurl { - url = http://hydra.nixos.org/build/19868273/download/4/disnix-0.3pre0d9af6829c047d9a6fb27bff38af02e9e75ce36f.tar.gz; - sha256 = "1d4p913mk9dbs8vda5cv02rzcrsdj5klwnxp4ana6qss74lh9415"; + url = http://hydra.nixos.org/build/20103891/download/4/disnix-0.3pre9d3acde83aa4283cb6fc26874c524a98f39a5bc6.tar.gz; + sha256 = "04ryf4qlw5jv0xjn6pqy5lkxqlynycsgdjin3ivfhq3pm6i0v65l"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - description = "A distributed deployment extension for Nix"; + description = "A Nix-based distributed service deployment tool"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index ba21ab55754..cee6f7638fa 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.2pred5b649fa44bd3a1003d6466431ccbd07e79fe50f"; + name = "disnixos-0.2pre7bbac66b0ed3b637c6ebcfdd8f12055cc330093c"; src = fetchurl { - url = http://hydra.nixos.org/build/19868070/download/3/disnixos-0.2pred5b649fa44bd3a1003d6466431ccbd07e79fe50f.tar.gz; - sha256 = "0vkj5y8v734m3dmkg71d2jdk7bwgahn44yi62843a0mzjijngdzj"; + url = http://hydra.nixos.org/build/20062333/download/3/disnixos-0.2pre7bbac66b0ed3b637c6ebcfdd8f12055cc330093c.tar.gz; + sha256 = "0d5ql8n93l8xa949cwk7v55lpfcp8j0x8wigqwfh6gim5f21niyb"; }; buildInputs = [ socat pkgconfig disnix getopt ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index e5423ab8d64..a444a92edd0 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -19,10 +19,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> mongodb != null; stdenv.mkDerivation { - name = "dysnomia-0.3pre828145ee0bbfb72013a19c15db2947e26179f159"; + name = "dysnomia-0.3pre92a89d735776366633fdea301fdc6dc537009bba"; src = fetchurl { - url = http://hydra.nixos.org/build/19868062/download/1/dysnomia-0.3pre828145ee0bbfb72013a19c15db2947e26179f159.tar.gz; - sha256 = "0rxf6lhb952p7rwrbxhzj3fsqqbrxaksb60zmyqz3h19wjkpaiki"; + url = http://hydra.nixos.org/build/20062629/download/1/dysnomia-0.3pre92a89d735776366633fdea301fdc6dc537009bba.tar.gz; + sha256 = "0dv7ivph2v5j4g5fqdrllxyzmp1hwnsd22n1s61qpkzb6qxaywjj"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 2ee6e81896dccd1abfc9beaf021f59cd02a9316a Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 2 Mar 2015 01:48:05 -0800 Subject: [PATCH 115/120] Monthly bump of dolphinEmuMaster Large performance improvements, smaller binary, and higher accuracy! See for details : https://dolphin-emu.org/blog/2015/03/01/dolphin-progress-report-february-2015/ --- pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index e161fcd181c..1bc9f86766f 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -4,11 +4,11 @@ , pulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150201"; + name = "dolphin-emu-20150302"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "3c475b91ea5c4baa13b1339c3d2921938e8a3be9"; - sha256 = "1az8cv5y2hccvnp719rpynwglamf04zck1ic796c126xp286i5ki"; + rev = "cd8c37bc0792a492b59976eba10a3e54e0ea2842"; + sha256 = "06cb89c97w86ffn2nls0jb69macd5lqz930fjyjjahk9njx164fv"; fetchSubmodules = false; }; From 7365907de5a4e2667fb15629471494e736d07a84 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 2 Mar 2015 11:05:13 +0100 Subject: [PATCH 116/120] Adds ocaml-io-page This OCaml library implements support for efficient handling of I/O memory pages on Unix and Xen. Homepage: https://github.com/mirage/io-page --- .../ocaml-modules/io-page/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/io-page/default.nix diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix new file mode 100644 index 00000000000..25fa60139d6 --- /dev/null +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, cstruct }: + +let version = "1.4.0"; in + +stdenv.mkDerivation { + name = "ocaml-io-page-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz"; + sha256 = "05m1gbcy72i6gikdijbkpw8pfygc86a3l4k8ayyl58019l6qa2fq"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ cstruct ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/io-page; + platforms = ocaml.meta.platforms; + description = "IO memory page library for Mirage backends"; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccf5f6e93c8..5f64a37cb69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3910,6 +3910,8 @@ let functory = callPackage ../development/ocaml-modules/functory { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; + javalib = callPackage ../development/ocaml-modules/javalib { extlib = ocaml_extlib_maximal; }; From 95800b2991b9498298cce21098dd32f93efff827 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 2 Mar 2015 16:23:30 +0100 Subject: [PATCH 117/120] abduco: update from 0.2 to 0.3 --- pkgs/tools/misc/abduco/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index e5db7f26ef6..dc5d469dc87 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -3,25 +3,24 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "abduco-0.2"; + name = "abduco-0.3"; meta = { homepage = http://brain-dump.org/projects/abduco; license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; + maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; - sha256 = "04hrlxb02h2j8vxjnj263slyzxgkf7sncxfm0iwds5097f85mdy8"; + sha256 = "1m4hafwvpnzz53n15757zrsx3xqv51gpnf3mnxqkzyr5mswz0jwk"; }; configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = []; - installPhase = '' make PREFIX=$out install ''; From b9540c5b70df7db86062e3aee96fe6d24bfa7550 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 2 Mar 2015 16:48:09 +0100 Subject: [PATCH 118/120] rdesktop: update from 1.8.2 to 1.8.3 --- .../networking/remote/rdesktop/default.nix | 8 ++--- .../remote/rdesktop/enable_windows_key.patch | 29 ------------------- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index fbbc85108a1..2e844fdeab4 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -2,16 +2,14 @@ stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.2"; + version = "1.8.3"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv"; + sha256 = "1r7c1rjmw2xzq8fw0scyb453gy9z19774z1z8ldmzzsfndb03cl8"; }; - patches = [ ./enable_windows_key.patch ]; - buildInputs = [openssl libX11]; configureFlags = [ @@ -24,6 +22,6 @@ stdenv.mkDerivation (rec { description = "Open source client for Windows Terminal Services"; homepage = http://www.rdesktop.org/; platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; }; }) diff --git a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch deleted file mode 100644 index fff84c59963..00000000000 --- a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://sourceforge.net/p/rdesktop/code/1816/ -Fix constant naming and enabled windowskey by default. - -Index: trunk/rdesktop.c -=================================================================== ---- trunk/rdesktop.c (revision 1815) -+++ trunk/rdesktop.c (revision 1816) -@@ -554,7 +554,7 @@ - act.sa_flags = 0; - sigaction(SIGPIPE, &act, NULL); - -- flags = RDP_LOGON_NORMAL; -+ flags = RDP_LOGON_NORMAL | RDP_LOGON_ENABLEWINDOWSKEY; - prompt_password = False; - g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0; - g_embed_wnd = 0; -Index: trunk/constants.h -=================================================================== ---- trunk/constants.h (revision 1815) -+++ trunk/constants.h (revision 1816) -@@ -321,7 +321,7 @@ - #define RDP_LOGON_AUTO 0x0008 - #define RDP_LOGON_NORMAL 0x0033 - #define RDP_LOGON_COMPRESSION 0x0080 /* mppc compression with 8kB histroy buffer */ --#define RDP_LOGON_BLOB 0x0100 -+#define RDP_LOGON_ENABLEWINDOWSKEY 0x0100 - #define RDP_LOGON_COMPRESSION2 0x0200 /* rdp5 mppc compression with 64kB history buffer */ - #define RDP_LOGON_LEAVE_AUDIO 0x2000 - #define RDP_LOGON_PASSWORD_IS_SC_PIN 0x40000 From ccd6f5a3133d5b67f79242f129e1adc901578499 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 1 Mar 2015 22:46:56 +0100 Subject: [PATCH 119/120] nixos: make the grsec-lock unit depend on the path it writes to The grsec-lock unit fails unless /proc/sys/kernel/grsecurity/grsec_lock exists and so prevents switching into a new configuration after enabling grsecurity.sysctl. --- nixos/modules/security/grsecurity.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index d0c7fa6ec28..8775893f531 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -290,6 +290,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = "yes"; + unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel/grsecurity/grsec_lock"; script = '' locked=`cat /proc/sys/kernel/grsecurity/grsec_lock` if [ "$locked" == "0" ]; then From 18320d3b219a35a2f4c032aa4b16ec89db692901 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 2 Mar 2015 07:20:45 +0100 Subject: [PATCH 120/120] nixos: fix grsec-lock requires --- nixos/modules/security/grsecurity.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 8775893f531..66eeab7503d 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -286,7 +286,7 @@ in systemd.services.grsec-lock = mkIf cfg.config.sysctl { description = "grsecurity sysctl-lock Service"; - requires = [ "sysctl.service" ]; + requires = [ "systemd-sysctl.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = "yes";