From d749f111ab913e5acd70364a46a54067e2504bcd Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 14 Sep 2015 20:06:17 +0200 Subject: [PATCH 01/91] svtplay-dl: 0.10.2015.08.24 -> 0.20.2015.09.13 --- pkgs/tools/misc/svtplay-dl/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 32f6312a798..e29556faad4 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, makeWrapper, python, perl, zip -, rtmpdump, nose, mock, pycrypto, substituteAll }: +, rtmpdump, nose, mock, pycrypto, requests2, substituteAll }: stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.10.2015.08.24"; + version = "0.20.2015.09.13"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1w5jknqdlyw60pxx1wmx2xqkp968r9m3xdgm95ls1pjjp0pm047c"; + sha256 = "07wcjwc6kk0z8s7i3sc2n7zbbkbc2wwiclf3n0h5yk54marixql0"; }; - pythonPaths = [ pycrypto ]; + pythonPaths = [ pycrypto requests2 ]; buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths; nativeBuildInputs = [ zip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5912643c94a..c3bb7c7e28e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3140,7 +3140,7 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; svtplay-dl = callPackage ../tools/misc/svtplay-dl { - inherit (pythonPackages) nose mock; + inherit (pythonPackages) nose mock requests2; }; sysbench = callPackage ../development/tools/misc/sysbench {}; From 410749d79572bfa7cba3b1730d0fa14324058a6a Mon Sep 17 00:00:00 2001 From: Oliver Dunkl Date: Mon, 14 Sep 2015 16:26:05 +0200 Subject: [PATCH 02/91] [emacs-packages]: engine-mode init at 1.0.0 --- pkgs/top-level/emacs-packages.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index af07706e03d..2600fe1b82a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -440,6 +440,22 @@ let self = _self // overrides; }; }; + engine-mode = melpaBuild rec { + pname = "engine-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "hrs"; + repo = "engine-mode"; + rev = "v${version}"; + sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw"; + }; + + meta = { + description = "Minor mode for defining and querying search engines through Emacs"; + license = gpl3Plus; + }; + }; + epl = melpaBuild rec { pname = "epl"; version = "20140823"; @@ -1502,5 +1518,4 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; - }; in self From 6a8cf7854deeb950a57f54864e3b14038f97bb4c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 14 Sep 2015 23:32:52 -0300 Subject: [PATCH 03/91] Intercal: a quick fix to find gcc Intercal needs gcc to build any executable, and in Nix/NixOS it needs to be explicitly set in PATH environment variable. So, now ick is conveniently wrapped. --- pkgs/development/compilers/intercal/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index d3ecdab9ee3..f601dc254a4 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl , pkgconfig -, bison, flex }: +, bison, flex +, makeWrapper }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,7 +15,12 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bison flex ]; + [ pkgconfig bison flex makeWrapper ]; + + # Intercal invokes gcc, so we need an explicit PATH + postInstall = '' + wrapProgram $out/bin/ick --suffix PATH ':' ${stdenv.cc}/bin + ''; meta = { description = "The original esoteric programming language"; @@ -33,3 +39,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } +# TODO: investigate if LD_LIBRARY_PATH needs to be set From 91b07846a6e5a46d25e4b8e1a91dfb9ed974ad64 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Sep 2015 17:45:41 +0200 Subject: [PATCH 04/91] haskell-bytestring-builder: trigger re-build to recover from broken package on Hydra --- 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 aad72ad1c12..db3cb7bd3ce 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -82,7 +82,7 @@ self: super: { # haddock: No input file(s). nats = dontHaddock super.nats; - bytestring-builder = dontHaddock super.bytestring-builder; + bytestring-builder = dontHaddock (triggerRebuild super.bytestring-builder 1); # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; From 0f19e693aa68e39194db79761fd59b9bd6e8d02f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 15 Sep 2015 21:15:44 +0200 Subject: [PATCH 05/91] perlPackages.MathBigRat: 0.2606 -> 0.260801 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c80901789c..a6a3577041a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6440,11 +6440,11 @@ let self = _self // overrides; _self = with self; { NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp"; }; - MathBigRat = buildPerlPackage { - name = "Math-BigRat-0.2606"; + MathBigRat = buildPerlPackage rec { + name = "Math-BigRat-0.260801"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2606.tar.gz; - sha256 = "a69506468dd3067249e6ba9ce35eb9d5509471d939c1efae8283cbd038ca7e28"; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; + sha256 = "0ghzz7qzfvp70ywvb2vnvr06l62sx1bcjbrjyara0pmqdnvpysar"; }; meta = { description = "Arbitrary big rational numbers"; From 83df5ae07baf7510ed12c52f28dad1d988ade4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Sep 2015 21:42:56 +0200 Subject: [PATCH 06/91] ccl: fix fetchsvn hash (fixes #9746) No idea what's changed. --- pkgs/development/compilers/ccl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 378a8fc8cad..3522e234fa2 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = http://svn.clozure.com/publicsvn/openmcl/release/1.10/linuxx86/ccl; rev = revision; - sha256 = "11lmdvzj1mbm7mbr22vjbcrsvinyz8n32a91ms324xqdqpr82ifb"; + sha256 = "04p77n18cw0bc8i66mp2vfrhlliahrx66lm004a3nw3h0mdk0gd8"; }; buildInputs = [ gcc glibc m4 ]; From d243a5d0c9380c4be4a4a0b66b9ee9a99cd4e284 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 15 Sep 2015 20:55:11 +0200 Subject: [PATCH 07/91] eclipse-plugin-bytecode-outline: init at 2.4.3 --- pkgs/applications/editors/eclipse/plugins.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 6fe9a2212e8..9d85c05206a 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -127,6 +127,29 @@ rec { }; }; + bytecode-outline = buildEclipsePlugin rec { + name = "bytecode-outline-${version}"; + version = "2.4.3"; + + srcFeature = fetchurl { + url = "http://andrei.gmxhome.de/eclipse/features/de.loskutov.BytecodeOutline.feature_${version}.jar"; + sha256 = "0imhwp73gxy1y5d5gpjgd05ywn0xg3vqc5980wcx3fd51g4ifc67"; + }; + + srcPlugin = fetchurl { + url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.BytecodeOutline_${version}.jar"; + sha256 = "0230i88mvvxhn11m9c5mv3494zhh1xkxyfyva9qahck0wbqwpzkw"; + }; + + meta = with stdenv.lib; { + homepage = http://andrei.gmxhome.de/bytecode/; + description = "Shows disassembled bytecode of current java editor or class file"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; version = "8.7.0"; From 79c1bbf0501c956e3a932b968453b533ebed76c1 Mon Sep 17 00:00:00 2001 From: Susan Potter Date: Tue, 15 Sep 2015 15:49:04 -0500 Subject: [PATCH 08/91] Add package option to elasticsearch NixOS module --- nixos/modules/services/search/elasticsearch.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 64620bf1604..3436bd01d84 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -37,6 +37,12 @@ in { type = types.bool; }; + package = mkOption { + description = "Elasticsearch package to use."; + default = pkgs.elasticsearch; + type = types.package; + }; + host = mkOption { description = "Elasticsearch listen address."; default = "127.0.0.1"; @@ -123,7 +129,7 @@ in { after = [ "network-interfaces.target" ]; environment = { ES_HOME = cfg.dataDir; }; serviceConfig = { - ExecStart = "${pkgs.elasticsearch}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; + ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; User = "elasticsearch"; PermissionsStartOnly = true; }; @@ -142,7 +148,7 @@ in { ''; }; - environment.systemPackages = [ pkgs.elasticsearch ]; + environment.systemPackages = [ cfg.package ]; users.extraUsers = singleton { name = "elasticsearch"; From c748c0fb419fca9eed236ddb74e658d1d670abc8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 15 Sep 2015 23:46:49 +0200 Subject: [PATCH 09/91] global: 6.5 -> 6.5.1 --- pkgs/development/tools/misc/global/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 13903b4c7b9..63b29fccd52 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "global-6.5"; + name = "global-6.5.1"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "1af6lhwhrpdnigd3707fnk3dd6y53pbc4g0i75xjf0563bdi5zaa"; + sha256 = "1y34nbazsw2p6r2jhv27z15qvm9mhy5xjchpz8pwps00shkm578f"; }; nativeBuildInputs = [ libtool makeWrapper ]; From 89b6831ffdf368e62005a45cff7fda3d21ca7293 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 15 Sep 2015 06:32:57 +0200 Subject: [PATCH 10/91] virtualbox: Fix load of dbus library at runtime. VirtualBox had support for DBUS even in version 4.x, but it appears that nothing in our VM test triggered it to load, thus I didn't notice the runtime error: rtldrNativeLoad: dlopen('libdbus-1.so.3', RTLD_NOW | RTLD_LOCAL) failed: libdbus-1.so.3: cannot open shared object file: No such file or directory The upstream commits I think are responsible for this to come to surface are _probably_ (did I ever mention that I love SVN? *cough*) one of these: https://www.virtualbox.org/changeset/55664/vbox https://www.virtualbox.org/changeset/55602/vbox Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 2b291177642..9136bba0215 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, which, alsaLib, curl, libvpx, gawk, nettools +, which, alsaLib, curl, libvpx, gawk, nettools, dbus , xorriso, makeself, perl, pkgconfig, nukeReferences , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null @@ -85,11 +85,14 @@ in stdenv.mkDerivation { ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} + sed -i -e ' - s@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g + s@"libdbus-1\.so\.3"@"${dbus}/lib/libdbus-1.so.3"@g + s@"libasound\.so\.2"@"${alsaLib}/lib/libasound.so.2"@g ${optionalString pulseSupport '' - s@"libpulse.so.0"@"${libpulseaudio}/lib/libpulse.so.0"@g + s@"libpulse\.so\.0"@"${libpulseaudio}/lib/libpulse.so.0"@g ''} - ' src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/{alsa,pulse}_stubs.c + ' src/VBox/Main/xml/Settings.cpp \ + src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \ + include/VBox/dbus-calls.h export USER=nix set +x ''; From 7707c7df7ff1c84a619c35a51a19593debc2d0b3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 15 Sep 2015 14:14:44 +0200 Subject: [PATCH 11/91] tests/virtualbox: Start systemwide DBus in guests. We want to check whether DBus functionality is working, so let's make sure it is running in our mini-initrd. DBus unfortunately requires to have users properly set up and another configuration file other than in ${dbus.daemon}/etc/dbus-1/system.conf, so we do provide that as well. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 83a8b2835dc..6b74abf1320 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -8,6 +8,19 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let #!${pkgs.stdenv.shell} -xe export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" + mkdir -p /etc/dbus-1 /var/run/dbus + cat > /etc/passwd < /etc/group < Date: Tue, 15 Sep 2015 14:18:06 +0200 Subject: [PATCH 12/91] tests/virtualbox: Give test machines more memory. Sometimes there are random kernel panics do to the lack of memory in the qemu guests, but as we're setting the VirtualBox memory size relatively low, 1024 MB should be enough for the qemu guests. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 6b74abf1320..12cb4594b16 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -320,7 +320,7 @@ in { mkVMConf = name: val: val.machine // { key = "${name}-config"; }; vmConfigs = mapAttrsToList mkVMConf vboxVMs; in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; - virtualisation.memorySize = 768; + virtualisation.memorySize = 1024; virtualisation.virtualbox.host.enable = true; users.extraUsers.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; From f10fe3f596d9bb36aea7a845ff79d1349cc7f32c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Sep 2015 00:46:25 +0200 Subject: [PATCH 13/91] perl-MooseX-Getopt: 0.65 -> 0.68 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b9f6b7e8c1e..2bc4f47b8c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7284,11 +7284,11 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXGetopt = buildPerlPackage { - name = "MooseX-Getopt-0.65"; + MooseXGetopt = buildPerlPackage rec { + name = "MooseX-Getopt-0.68"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.65.tar.gz; - sha256 = "c07c2b7312c471bf2d331025c0ad6cc02068633eda1e208cbdb5511ef5da7fda"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "acb5118b4666352e58d4268040869d7dc2b68968fe26b5dd6715f51ebd784483"; }; buildInputs = [ CPANMeta ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings if_ ]; propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; @@ -7296,6 +7296,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From 4d8733d7b4aaae06e0c8c51f3759a7eeb37c6a4c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Sep 2015 01:05:35 +0200 Subject: [PATCH 14/91] perl-mousex-getopt: 0.35 -> 0.36 --- pkgs/top-level/perl-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2bc4f47b8c0..64f3cf06684 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7184,23 +7184,23 @@ let self = _self // overrides; _self = with self; { license = "perl"; }; }; - + MouseXGetOpt = buildPerlModule { - name = "mousex-getopt-0.35"; + name = "mousex-getopt-0.36"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/mousex-getopt-0.35.tar.gz; - sha256 = "5abe243a1ab05d64562358604de1d31d36994414c5c5eaeac688897129d2f9ae"; + url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.36.tar.gz; + sha256 = "172ab0609f1638c6d8800d2dff1bdaa044e305aaa2e9b1fbb8a9dc722a3bf430"; }; - buildInputs = [ Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; + buildInputs = [ MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { homepage = https://github.com/gfx/mousex-getopt; description = "A Mouse role for processing command line options"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; - MooseXAttributeChained = buildPerlModule rec { name = "MooseX-Attribute-Chained-1.0.1"; src = fetchurl { From 400d9e536b81a3f2731ecea99035912b176ba82c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 5 Aug 2015 23:27:51 +0200 Subject: [PATCH 15/91] perl-Getopt-Long-Descriptive: 0.093 -> 0.099 --- pkgs/top-level/perl-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64f3cf06684..9344099dbb6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4731,17 +4731,19 @@ let self = _self // overrides; _self = with self; { }; }; - GetoptLongDescriptive = buildPerlPackage { - name = "Getopt-Long-Descriptive-0.093"; + GetoptLongDescriptive = buildPerlPackage rec { + name = "Getopt-Long-Descriptive-0.099"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.093.tar.gz; - sha256 = "0iccps0jlcjm68i5yywgs477plfnkc6b2386bzb99blm3jwdfyac"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "1sf5r3vy7880ynsn2aqmb5p6rzmhq5v072x33g8c7aqjpz81wkgw"; }; + buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter SubExporterUtil ]; meta = { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ rycee ]; }; }; From 4dd7a7622a9fc41129c938860b1d9c410dc96266 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 5 Aug 2015 23:30:20 +0200 Subject: [PATCH 16/91] perl-CPAN-Changes: 0.27 -> 0.400002 --- pkgs/top-level/perl-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9344099dbb6..11a78c624ee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2025,15 +2025,16 @@ let self = _self // overrides; _self = with self; { }; }; - CPANChanges = buildPerlPackage { - name = "CPAN-Changes-0.27"; + CPANChanges = buildPerlPackage rec { + name = "CPAN-Changes-0.400002"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICAS/CPAN-Changes-0.27.tar.gz; - sha256 = "14dizyvgzp81hmg0djwnvvkdhqd3bsmms462cj0ai84z221scv1q"; + url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz"; + sha256 = "01eedea90d07468cb58e4a50bfa3bb1d4eeda9073596add1118fc359153abe8d"; }; meta = { description = "Read and write Changes files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ rycee ]; }; }; From 7324065115337f1c5885041bb718b1111666e4b0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 6 Aug 2015 00:03:26 +0200 Subject: [PATCH 17/91] perl-Readonly: 1.03 -> 2.00 --- pkgs/top-level/perl-packages.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 11a78c624ee..0c38bb0d7d0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9090,14 +9090,18 @@ let self = _self // overrides; _self = with self; { }; }; - Readonly = buildPerlPackage rec { - name = "Readonly-1.03"; + Readonly = buildPerlModule rec { + name = "Readonly-2.00"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; - sha256 = "1shkyxajh6l87nif47ygnfxjwvqf3d3kjpdvxaff4957vqanii2k"; + url = "mirror://cpan/authors/id/S/SA/SANKO/${name}.tar.gz"; + sha256 = "9bd0156e958842fdfd6c3bb27a23b47232d4737a407d81fabc4dc64b9363bf98"; }; meta = { - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/sanko/readonly; + description = "Facility for creating read-only scalars, arrays, hashes"; + platforms = stdenv.lib.platforms.unix; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ rycee ]; }; }; From a2b709705939c5d696dc5277fe09d060e04215b7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 15 Sep 2015 23:30:59 +0200 Subject: [PATCH 18/91] perl-Throwable: 0.200010 -> 0.200013 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0c38bb0d7d0..7d8d9542b38 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11596,14 +11596,20 @@ let self = _self // overrides; _self = with self; { }; }; - Throwable = buildPerlPackage rec { - name = "Throwable-0.200010"; + name = "Throwable-0.200013"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0qhq1f5bvgf5kjhmdg45vadq8dbc9gfms81hply5c6a71nmkv8yp"; + sha256 = "184gdcwxqwnkrx5md968v1ny70pq6blzpkihccm3bpdxnpgd11wr"; + }; + buildInputs = [ DevelStackTrace ]; + propagatedBuildInputs = [ DevelStackTrace ModuleRuntime Moo ]; + meta = { + homepage = https://github.com/rjbs/Throwable; + description = "A role for classes that can be thrown"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; - propagatedBuildInputs = [ DevelStackTrace Moose Moo MooXTypesMooseLike ]; }; TieCycle = buildPerlPackage rec { From f75df1563618efefc6dcb6946ecb40fcbb5b12e7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Sep 2015 00:25:08 +0200 Subject: [PATCH 19/91] perl-Mixin-Linewise: 0.004 -> 0.108 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7d8d9542b38..73761b393b7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6652,17 +6652,18 @@ let self = _self // overrides; _self = with self; { }; }; - MixinLinewise = buildPerlPackage { - name = "Mixin-Linewise-0.004"; + MixinLinewise = buildPerlPackage rec { + name = "Mixin-Linewise-0.108"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.004.tar.gz; - sha256 = "7a50d171850d3e0dde51e041eecd40abc68396ea822baa4381951a7710833dd9"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "7df20678474c0973930a472b0c55e3f8e85b7790b68ab18ef618f9c453c8aef2"; }; - propagatedBuildInputs = [ IOString SubExporter ]; + propagatedBuildInputs = [ PerlIOutf8_strict SubExporter ]; meta = { homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From c2705ef98d4ca155cc9445ef99127559793b2145 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Sep 2015 00:26:31 +0200 Subject: [PATCH 20/91] perl-Config-INI: 0.020 -> 0.025 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 73761b393b7..b4c359b5af0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1839,17 +1839,18 @@ let self = _self // overrides; _self = with self; { }; }; - ConfigINI = buildPerlPackage { - name = "Config-INI-0.020"; + ConfigINI = buildPerlPackage rec { + name = "Config-INI-0.025"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.020.tar.gz; - sha256 = "0ef298da75e3a7becd1f358422cea621c5cf0420278aa6a1bdd2dd14efe07bc9"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "628bf76d5b91f89dde22d4813ec033026ebf71b772bb61ccda909da00c869732"; }; - propagatedBuildInputs = [ IOString MixinLinewise ]; + propagatedBuildInputs = [ MixinLinewise ]; meta = { homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From 34ce5ce6525ef44c31cc010d7953bc38233d9bbe Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Sep 2015 01:22:41 +0200 Subject: [PATCH 21/91] perl-Pod-Weaver: 4.004 -> 4.012 --- pkgs/top-level/perl-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b4c359b5af0..6bee2bc69f6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9069,18 +9069,19 @@ let self = _self // overrides; _self = with self; { }; }; - PodWeaver = buildPerlPackage { - name = "Pod-Weaver-4.004"; + PodWeaver = buildPerlPackage rec { + name = "Pod-Weaver-4.012"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.004.tar.gz; - sha256 = "0hw500qkbmnwm385za5x7ypijx0lqk8cfc9jq232v95ka0hqcg29"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "d801cbfaff22d418943d0c5dcb8c145b8cc4d56741f9c33923ef891241116ad6"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; - propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli Moose MooseAutobox ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise ModuleRuntime Moose ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/pod-weaver; description = "Weave together a Pod document from an outline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From bab211893bf3e03abb8843d7478628411acd05af Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 15 Sep 2015 18:03:30 -0500 Subject: [PATCH 22/91] nixpkgs: rethinkdb 2.0.4 -> 2.1.3 Signed-off-by: Austin Seipp --- pkgs/servers/nosql/rethinkdb/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 789aa95b157..55f77ce0b5d 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "rethinkdb-${version}"; - version = "2.0.4"; + version = "2.1.3"; src = fetchurl { url = "http://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i"; + sha256 = "03w9fq3wcvwy04b3x6zb3hvwar7b9jfbpq77rmxdlgh5w64vvgwd"; }; preConfigure = '' @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { meta = { description = "An open-source distributed database built with love"; longDescription = '' - RethinkDB is built to store JSON documents, and scale to multiple machines with very little - effort. It has a pleasant query language that supports really useful queries like table joins - and group by, and is easy to setup and learn. + RethinkDB is built to store JSON documents, and scale to + multiple machines with very little effort. It has a pleasant + query language that supports really useful queries like table + joins and group by, and is easy to setup and learn. ''; - homepage = http://www.rethinkdb.com; - license = stdenv.lib.licenses.agpl3; - - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + homepage = http://www.rethinkdb.com; + license = stdenv.lib.licenses.agpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; }; } From b1d894e0816a3a8862dcb9245fc794141abf6467 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Wed, 16 Sep 2015 00:38:20 +0000 Subject: [PATCH 23/91] vimPlugins: add vim-jade --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 4210ba69485..b74ffd0cc96 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -398,6 +398,17 @@ rec { }; + vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jade-2015-07-06"; + src = fetchgit { + url = "git://github.com/digitaltoad/vim-jade"; + rev = "fb47bb8303e81fc17b4340ccd01a462332f7d90a"; + sha256 = "c3dde95c01d9e174a9143103e76796d2da40ddb68de9f321fce3f88df312e15a"; + }; + dependencies = []; + + }; + neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-ghc-2015-08-28"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8498053f58c..ae7e86bc749 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -69,6 +69,7 @@ "github:vim-scripts/wombat256.vim" "github:wakatime/vim-wakatime" "github:wincent/command-t" +"github:digitaltoad/vim-jade" "goyo" "matchit.zip" "pathogen" From 85ed1cc5edcb86e152ea9822fdc1de447c238f38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Aug 2015 12:23:30 +0200 Subject: [PATCH 24/91] miniupnpc: 1.9.{20150430 -> 20150730} The miniupnpc(3) man page is (now?) installed by default, no need to do so manually. Let's try enabling the test "suite"; it is dirt-cheap. --- pkgs/tools/networking/miniupnpc/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 22f833f9bdb..8e0890ea471 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,21 +1,17 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniupnpc-1.9.20150430"; + name = "miniupnpc-1.9.20150730"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn"; + sha256 = "0156hssql8iaziwba8ag7y39lchrgwcvlhck2d2qak1vznqzlr0x"; name = "${name}.tar.gz"; }; - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + doCheck = true; - postInstall = - '' - mkdir -p $out/share/man/man3 - cp man3/miniupnpc.3 $out/share/man/man3/ - ''; + installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; meta = { homepage = http://miniupnp.free.fr/; From 0635ec3b5ce8b3dd50509ee9d42998daa1e13531 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Sep 2015 04:57:44 +0200 Subject: [PATCH 25/91] libpsl: 0.8.0 -> 0.9.0 --- pkgs/development/libraries/libpsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 334c5558e2b..871f804e352 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -13,13 +13,13 @@ let owner = "publicsuffix"; }; - libVersion = "0.8.0"; + libVersion = "0.9.0"; in stdenv.mkDerivation { name = "libpsl-${version}"; src = fetchFromGitHub { - sha256 = "0mjnj36igk6w3c0d4k2fqqg1kl6bpnxfrcgcgz1zdw33gfa5gdi7"; + sha256 = "01vmlmm75jdpfmd546z1yib92nmdqdlqv19ax379p3ys6kgap1sw"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; From d884dd7a5535fee777c428e804c806249f82f10c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Sep 2015 04:59:34 +0200 Subject: [PATCH 26/91] libpsl: list 2015-09-07 -> 2015-09-15 --- pkgs/development/libraries/libpsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 871f804e352..ec2611e2ac9 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -5,10 +5,10 @@ let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-09-07"; + listVersion = "2015-09-15"; listSources = fetchFromGitHub { - sha256 = "0inpdixg967ibi5f41jq15l6r027lj2y5q0ymlfrp9b29gfay50n"; - rev = "ee621394b6d863dcc2ff89956d91cdd7d15d8c9d"; + sha256 = "1rrds3bsnxb2n2ifl0zg6mh1h8nd3h1ba4bz0dznrrlqzfbav0l2"; + rev = "4f89204a24e99d8a65353cc62d5bc4dea1b2ae31"; repo = "list"; owner = "publicsuffix"; }; From b708f3b1172cd3b117747bd94a779a3517e8f484 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Sep 2015 05:48:58 +0200 Subject: [PATCH 27/91] netsniff-ng: 0.5.9-{96-g4669e7a -> 98-gb3a9f17} --- pkgs/tools/networking/netsniff-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index f175157c92c..9ccc91b7bc1 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9-96-g4669e7a"; in +let version = "0.5.9-98-gb3a9f17"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "4669e7a1ac2112b0e9ba7c0b865fdedffbb86055"; - sha256 = "0lnqw2afp2x8nwvvvcfdszxd825bfmhclyp2cvwddmkbwnzbligi"; + rev = "b3a9f17eb9c7a47e6c4aee3649179b2a54d17eca"; + sha256 = "05nwi5ksijv42w7km08dhymiyyvcj43b5lrpdf9x5j725l79yqdb"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl From 0b9d83737c26c902b1be44cf24a88699f57ccd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 15 Sep 2015 23:43:38 +0200 Subject: [PATCH 28/91] lighttpd: 1.4.35 -> 1.4.37 --- pkgs/servers/http/lighttpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 056f9202df4..60848516155 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.35"; + name = "lighttpd-1.4.37"; src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "18rh7xyx69xbwl20znnjma1dq5fay0ygjjvpn3gaa7dxrir9nghi"; + sha256 = "1gbri5avg1jv2g585wk0jp53mf9jjdz2py9774mxm8bwarh6ykl0"; }; buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] From a8b75d8777fff863fd129ea1ba70881a777f7bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 16 Sep 2015 07:51:05 +0200 Subject: [PATCH 29/91] ascii: 3.14 -> 3.15 --- pkgs/tools/text/ascii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index 071b9368329..45579164513 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ascii-${version}"; - version = "3.14"; + version = "3.15"; src = fetchurl { url = "http://www.catb.org/~esr/ascii/${name}.tar.gz"; - sha256 = "1ldwi4cs2d36r1fv3j13cfa8h2pc4yayq5qii91758qqwfzky3kz"; + sha256 = "0pzzfljg2ijnnys3fzj3f2p288sl5cgk83a2mpcm679pcj5xpqdc"; }; prePatch = '' From b8e776bbe4163fb0e55ba8c4bc2038025eb6aa4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 16 Sep 2015 07:52:53 +0200 Subject: [PATCH 30/91] diffstat: 1.59 -> 1.60 2015/07/07 (diffstat 1.60) + add configure option --with-man2html + update configure macros + update config.guess, config.sub --- pkgs/tools/text/diffstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index 62b696715d9..61a65b59c9c 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "diffstat-1.59"; + name = "diffstat-1.60"; src = fetchurl { url = "ftp://invisible-island.net/diffstat/${name}.tgz"; - sha256 = "0w7jvfilbnfa9v3h8j8ipirvrj7n2x5gszfanzxvx748p10i8z96"; + sha256 = "08q1zckb3q5xpqa17pl14fbi5b64xc0sjbg393ap1bivnhcf8ci0"; }; meta = with stdenv.lib; { From 88a3951926f625c8005515d70ca73ebd5bcfb443 Mon Sep 17 00:00:00 2001 From: Florian Baumann Date: Wed, 16 Sep 2015 09:31:38 +0200 Subject: [PATCH 31/91] mlmmj: Fix invalid mailman entry and update transports and virtual dbs on activation --- nixos/modules/services/mail/mlmmj.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index f8a33f395a6..e2b37522cb1 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -109,9 +109,10 @@ in ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir} ${lib.concatMapStrings (createList cfg.listDomain) cfg.mailLists} echo ${lib.concatMapStrings (virtual cfg.listDomain) cfg.mailLists} > ${stateDir}/virtuals - echo ${cfg.listDomain} mailman: > ${stateDir}/transports - echo ${lib.concatMapStrings (transport cfg.listDomain) cfg.mailLists} >> ${stateDir}/transports - ''; + echo ${lib.concatMapStrings (transport cfg.listDomain) cfg.mailLists} > ${stateDir}/transports + ${pkgs.postfix}/bin/postmap ${stateDir}/virtuals + ${pkgs.postfix}/bin/postmap ${stateDir}/transports + ''; systemd.services."mlmmj-maintd" = { description = "mlmmj maintenance daemon"; From cb5e5a5b9d3d830980002378279e2cc1bf4c9753 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 16 Sep 2015 10:26:01 +0200 Subject: [PATCH 32/91] Revert "makeInitrd, makeModulesClosure: reduce repetition" This reverts commit b5ee55f81f9f65f15f9b807b4de1380a7f477baf. The reason is that the args attribute in this case doesn't contain the optional attributes which are specified, see here for example: $ nix-instantiate --eval -E '(args@{ bar ? 111, ... }: args) {}' { } $ This essentially breaks all VM tests, because stage-1 is passing all arguments but pkgs/build-support/vm/default.nix does not. Signed-off-by: aszlig --- pkgs/top-level/all-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e806bb1bd1..f586fbb360b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -424,13 +424,17 @@ let makeAutostartItem = callPackage ../build-support/make-startupitem { }; - makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }@args: - callPackage ../build-support/kernel/make-initrd.nix args; + makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: + callPackage ../build-support/kernel/make-initrd.nix { + inherit contents compressor prepend; + }; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; - makeModulesClosure = { kernel, rootModules, allowMissing ? false }@args: - callPackage ../build-support/kernel/modules-closure.nix args; + makeModulesClosure = { kernel, rootModules, allowMissing ? false }: + callPackage ../build-support/kernel/modules-closure.nix { + inherit kernel rootModules allowMissing; + }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; From 33d2f27d959332e38abb7fba9de22cbbc97613a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Sep 2015 10:52:02 +0200 Subject: [PATCH 33/91] stress-ng: 0.04.18 -> 0.04.19 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 17bb3ac1ca9..a0d99f2b7d7 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, attr, keyutils }: let - version = "0.04.18"; + version = "0.04.19"; name = "stress-ng-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { - sha256 = "04slzjpjv9kw0glzl3nr9p073shlcgs6aalc6ij9w3h4p7ibn0wh"; + sha256 = "12qgrr0wd3ppaawn5br0i7q26iy88pxfwg9wiqxf4cav89591syc"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; From 0f0b20ac0cad34a86acdc9c04cad4008d4828159 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Sep 2015 12:45:03 +0200 Subject: [PATCH 34/91] eid-mw: 4.1.5 -> 4.1.6 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- pkgs/tools/security/eid-mw/eid-nssdb.in | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index c814e7094a9..fbb8f0321ef 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite , pkgconfig }: -let version = "4.1.5"; in +let version = "4.1.6"; in stdenv.mkDerivation { name = "eid-mw-${version}"; src = fetchFromGitHub { - sha256 = "0m2awjfj2vs3aahy1ygrxi7mx12bhr1a621kiiszzai38crpgwbj"; + sha256 = "006s7093wqmk36mrlakjv89bqddyh599rvmgv0zgsp15vf9160zi"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/eid-mw/eid-nssdb.in b/pkgs/tools/security/eid-mw/eid-nssdb.in index 934c0256da7..fc05a20a675 100644 --- a/pkgs/tools/security/eid-mw/eid-nssdb.in +++ b/pkgs/tools/security/eid-mw/eid-nssdb.in @@ -59,6 +59,9 @@ fi dbdir="sql:$dbdir" +echo "NSS database: $dbdir" +echo "BEID library: $libfile" + case "$1" in add) echo "Adding $dbentry to database:" modutil -dbdir "$dbdir" -add "$dbentry" -libfile "$libfile" || @@ -75,9 +78,6 @@ esac ret=$? -echo "NSS database: $dbdir" -echo "BEID library: $libfile" - modutil -dbdir "$dbdir" -list "$dbentry" 2>/dev/null exit $ret From a904293857f2e75a860721b601ebf1522ddc1ffa Mon Sep 17 00:00:00 2001 From: taku0 Date: Mon, 14 Sep 2015 21:59:02 +0900 Subject: [PATCH 35/91] wavpack: disabled asm for Clang --- .../development/libraries/wavpack/default.nix | 12 ++++++++- .../libraries/wavpack/wavpack_clang.patch | 25 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/wavpack/wavpack_clang.patch diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index b205519eea1..074b26e3f3a 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "wavpack-${version}"; @@ -6,10 +6,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + # backported from + # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5 + ./wavpack_clang.patch + ]; + preConfigure = '' sed -i '2iexec_prefix=@exec_prefix@' wavpack.pc.in ''; + # --disable-asm is required for clang + # https://github.com/dbry/WavPack/issues/3 + configureFlags = lib.optionalString stdenv.cc.isClang "--disable-asm"; + src = fetchurl { url = "http://www.wavpack.com/${name}.tar.bz2"; sha256 = "0bmgwcvch3cjcivk7pyasqysj0s81wkg40j3zfrcd7bl0qhmqgn6"; diff --git a/pkgs/development/libraries/wavpack/wavpack_clang.patch b/pkgs/development/libraries/wavpack/wavpack_clang.patch new file mode 100644 index 00000000000..dfbe4718143 --- /dev/null +++ b/pkgs/development/libraries/wavpack/wavpack_clang.patch @@ -0,0 +1,25 @@ +diff -ru -x '*~' wavpack-4.75.0_orig/src/wavpack_local.h wavpack-4.75.0/src/wavpack_local.h +--- wavpack-4.75.0_orig/src/wavpack_local.h 2015-05-21 06:50:26.000000000 +0900 ++++ wavpack-4.75.0/src/wavpack_local.h 2015-09-14 21:48:09.000000000 +0900 +@@ -650,9 +650,9 @@ + void scan_word (WavpackStream *wps, int32_t *samples, uint32_t num_samples, int dir); + void update_error_limit (WavpackStream *wps); + +-const uint32_t bitset [32]; +-const uint32_t bitmask [32]; +-const char nbits_table [256]; ++extern const uint32_t bitset [32]; ++extern const uint32_t bitmask [32]; ++extern const char nbits_table [256]; + + int log2s (int32_t value); + int32_t exp2s (int log); +@@ -734,7 +734,7 @@ + /////////////////////////////////// common utilities //////////////////////////////////// + // module: common_utils.c + +-const uint32_t sample_rates [16]; ++extern const uint32_t sample_rates [16]; + uint32_t WavpackGetLibraryVersion (void); + const char *WavpackGetLibraryVersionString (void); + uint32_t WavpackGetSampleRate (WavpackContext *wpc); From 4140c7fe16d58c79f98d8a29abda1e4cda116924 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Thu, 10 Sep 2015 09:37:27 -0700 Subject: [PATCH 36/91] openjdk8: add the architecture passthru from openjdk7 --- pkgs/development/compilers/openjdk/8.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index bb1bba5d1c6..0e9184e1c62 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -5,6 +5,18 @@ }: let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else if stdenv.system == "x86_64-linux" then + "amd64" + else + throw "openjdk requires i686-linux or x86_64 linux"; + update = "60"; build = "24"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; @@ -204,6 +216,9 @@ let platforms = platforms.linux; }; - passthru.home = "${openjdk8}/lib/openjdk"; + passthru = { + inherit architecture; + home = "${openjdk8}/lib/openjdk"; + }; }; in openjdk8 From 8ef6197be5da964f35dec5a4a580fb9685ee9e2e Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Thu, 10 Sep 2015 09:48:15 -0700 Subject: [PATCH 37/91] jitsi: patch RPATHs of bundled .so files Possibly helps with bug #3482. --- .../instant-messengers/jitsi/default.nix | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 195c9588478..decd7b6f392 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, makeDesktopItem, unzip, ant, jdk }: +{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk +# Optional, Jitsi still runs without, but you may pass null: +, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xlibs +}: stdenv.mkDerivation rec { @@ -22,6 +25,21 @@ stdenv.mkDerivation rec { categories = "Application;Internet;"; }; + libPath = lib.makeLibraryPath ([ + stdenv.cc.cc # For libstdc++. + ] ++ lib.filter (x: x != null) [ + alsaLib + dbus_libs + gtk2 + libpulseaudio + openssl + ] ++ lib.optionals (xlibs != null) [ + xlibs.libX11 + xlibs.libXext + xlibs.libXScrnSaver + xlibs.libXv + ]); + buildInputs = [unzip ant jdk]; buildPhase = ''ant make''; @@ -35,6 +53,12 @@ stdenv.mkDerivation rec { chmod +x $out/bin/jitsi sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi patchShebangs $out + + libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" + find $out/ -type f -name '*.so' | while read file; do + patchelf --set-rpath "$libPath" "$file" && \ + patchelf --shrink-rpath "$file" + done ''; meta = { From e422c2398cd946b3e80ee415f76f4d5c930396b4 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Thu, 10 Sep 2015 09:48:25 -0700 Subject: [PATCH 38/91] jitsi: make a path patch for java slightly safer --- .../networking/instant-messengers/jitsi/default.nix | 2 +- .../networking/instant-messengers/jitsi/jitsi.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index decd7b6f392..f8a637ca4fe 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { mkdir $out/bin cp resources/install/generic/run.sh $out/bin/jitsi chmod +x $out/bin/jitsi - sed -i 's| java | ${jdk}/bin/java |' $out/bin/jitsi + substituteInPlace $out/bin/jitsi --replace '@JAVA@' '${jdk}/bin/java' patchShebangs $out libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch index 9163cecd175..942b3cd0cbe 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch +++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch @@ -24,4 +24,4 @@ export PATH=$PATH:native -java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator -+exec java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator ++exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator From 476f2e3e2dda1def282808870e8055021484b3f4 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Fri, 11 Sep 2015 20:54:30 -0700 Subject: [PATCH 39/91] jitsi: add myself as maintainer --- .../applications/networking/instant-messengers/jitsi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index f8a637ca4fe..c3548af9346 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = stdenv.lib.licenses.lgpl21Plus.shortName; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.khumba ]; }; } From 0af5fccf2a6bdc9224b03e32ca42800ddc68d433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 15 Sep 2015 16:31:19 +0200 Subject: [PATCH 40/91] pidgin-sipe: 1.18.1 -> 1.20.0 Build and run tested (on release-15.09 branch). --- .../instant-messengers/pidgin-plugins/sipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 8b19f338d3e..36be2517fbd 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: -let version = "1.18.1"; in +let version = "1.20.0"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; - sha256 = "18ch7jpi7ki7xlpahi88xrnmnhc6dcq4hafm0z6d5nfjfp8ldal5"; + sha256 = "14d8q9by531hfssm6ydn75xkgidka3ar4sy3czjdb03s1ps82srs"; }; meta = with stdenv.lib; { From 6625fde1c7404e78d9f7b578d4c448b7ea026e8b Mon Sep 17 00:00:00 2001 From: karsten gebbert Date: Tue, 15 Sep 2015 20:31:24 +0200 Subject: [PATCH 41/91] add renoise to nixpkgs --- pkgs/applications/audio/renoise/default.nix | 61 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 65 insertions(+) create mode 100644 pkgs/applications/audio/renoise/default.nix diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix new file mode 100644 index 00000000000..704f3f01c00 --- /dev/null +++ b/pkgs/applications/audio/renoise/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }: + +stdenv.mkDerivation rec { + name = "renoise"; + + buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; + + src = + if builtins.currentSystem == "x86_64-linux" then + if demo then + fetchurl { + url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2"; + sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg"; + } + else + requireFile { + url = "http://backstage.renoise.com/frontend/app/index.html#/login"; + name = "rns_3_0_1_reg_x86_64.tar.gz"; + sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7"; + } + else if builtins.currentSystem == "i686-linux" then + if demo then + fetchurl { + url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2"; + sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58"; + } + else + requireFile { + url = "http://backstage.renoise.com/frontend/app/index.html#/login"; + name = "rns_3_0_1_reg_x86.tar.gz"; + sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7"; + } + else throw "platform is not suppored by Renoise"; + + installPhase = '' + cp -r Resources $out + + mkdir -p $out/lib/ + + mv $out/AudioPluginServer* $out/lib/ + + cp renoise $out/renoise + + for path in ${toString buildInputs}; do + ln -s $path/lib/*.so* $out/lib/ + done + + ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ + + mkdir $out/bin + ln -s $out/renoise $out/bin/renoise + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise + ''; + + meta = { + description = "modern tracker-based DAW"; + homepage = http://www.renoise.com/; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9b1a5c0078..91c771425ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12434,6 +12434,10 @@ let fltk = fltk13; }; + renoise = callPackage ../applications/audio/renoise { + demo = false; + }; + rapcad = callPackage ../applications/graphics/rapcad {}; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; From aa4efac85079e0ad39aafa1b00e73e77dd6a1203 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Sep 2015 11:08:39 -0500 Subject: [PATCH 42/91] arpack: update homepage --- pkgs/development/libraries/science/math/arpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index c896ecca472..58326a6fa50 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation { FFLAGS = optional openblas.blas64 "-fdefault-integer-8"; meta = { - homepage = "http://forge.scilab.org/index.php/p/arpack-ng/"; + homepage = "http://github.com/opencollab/arpack-ng"; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue - problems + problems. ''; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.ttuegel ]; From 3dcff360858d2e9fbdfe3543f739a8eb058b70eb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Sep 2015 11:19:03 -0500 Subject: [PATCH 43/91] julia: build dependencies with same openblas --- pkgs/development/compilers/julia/0.3.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 7f0f263283d..82b35e2b9b3 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -5,11 +5,22 @@ , libunwind, llvm, readline, utf8proc, zlib # standard library dependencies , double_conversion, fftwSinglePrec, fftw, glpk, gmp, mpfr, pcre +# linear algebra , openblas, arpack, suitesparse }: with stdenv.lib; +# All dependencies should use the same OpenBLAS. +let + arpack_ = arpack; + suitesparse_ = suitesparse; +in +let + arpack = arpack_.override { inherit openblas; }; + suitesparse = suitesparse_.override { inherit openblas; }; +in + stdenv.mkDerivation rec { pname = "julia"; version = "0.3.11"; From b95bec7917c71e9d724b2ef846a7499c2ac53c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 16 Sep 2015 08:03:05 +0200 Subject: [PATCH 44/91] wireshark: 1.12.5 -> 1.12.7 Build and run tested. --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index ac2d11a33f1..40e3fdef980 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "1.12.5"; + version = "1.12.7"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2"; - sha256 = "10mxgj916bwv92pfhk4kldcaanr9vndjklzp9ypdxr29xyr7gwfh"; + sha256 = "0b7rc1l1gvzcz7gfa6g7pcn32zrcfiqjx0rxm6cg3q1cwwa1qjn7"; }; buildInputs = [ From f02eed27f9010977f1e161eb46de9d3a96256b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 16 Sep 2015 19:12:51 +0200 Subject: [PATCH 45/91] gitRepo: 1.21 -> 1.22 --- pkgs/applications/version-management/git-repo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index a697aaa08a1..dc5c2231a7a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation { - name = "git-repo-1.21"; + name = "git-repo-1.22"; src = fetchurl { # I could not find a versioned url for the 1.21 version. In case # the sha mismatches, check the homepage for new version and sha. url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo"; - sha1 = "b8bd1804f432ecf1bab730949c82b93b0fc5fede"; + sha1 = "da0514e484f74648a890c0467d61ca415379f791"; }; unpackPhase = "true"; @@ -20,4 +20,4 @@ stdenv.mkDerivation { homepage = "http://source.android.com/source/downloading.html"; description = "Android's repo management tool"; }; -} \ No newline at end of file +} From 937741c9f3e5bbfddb751a39a19344995af3629e Mon Sep 17 00:00:00 2001 From: Andreas Wagner Date: Wed, 16 Sep 2015 10:22:41 -0400 Subject: [PATCH 46/91] teensy-loader-cli: consistent naming, version bump --- .../tools/misc/teensy-loader-cli/default.nix | 26 +++++++++++++++++++ .../development/tools/misc/teensy/default.nix | 26 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/tools/misc/teensy-loader-cli/default.nix delete mode 100644 pkgs/development/tools/misc/teensy/default.nix diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix new file mode 100644 index 00000000000..db86f1a56d6 --- /dev/null +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip, libusb, fetchgit }: +let + version = "2.1"; +in +stdenv.mkDerivation { + name = "teensy-loader-cli-${version}"; + src = fetchgit { + url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; + rev = "001da416bc362ff24485ff97e3a729bd921afe98"; + sha256 = "36aed0a725055e36d71183ff57a023993099fdc380072177cffc7676da3c3966"; + }; + + buildInputs = [ unzip libusb ]; + + installPhase = '' + install -Dm755 teensy_loader_cli $out/bin/teensy-loader-cli + ''; + + meta = with stdenv.lib; { + license = licenses.gpl3; + description = "Firmware uploader for the Teensy microcontroller boards"; + homepage = http://www.pjrc.com/teensy/; + maintainers = with maintainers; [ the-kenny ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/teensy/default.nix b/pkgs/development/tools/misc/teensy/default.nix deleted file mode 100644 index 9902cd03453..00000000000 --- a/pkgs/development/tools/misc/teensy/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, unzip, libusb }: -let - version = "2.1"; -in -stdenv.mkDerivation { - name = "teensy-loader-${version}"; - src = fetchurl { - url = "http://www.pjrc.com/teensy/teensy_loader_cli.2.1.zip"; - sha256 = "0iidj3q0l2hds1gaadnwgni4qdgk6r0nv101986jxda8cw6h9zfs"; - }; - - buildInputs = [ unzip libusb ]; - - installPhase = '' - mkdir -p $out/bin - cp -v teensy_loader_cli $out/bin/ - ''; - - meta = with stdenv.lib; { - license = licenses.gpl3; - description = "Firmware uploader for the Teensy microcontroller board"; - homepage = http://www.pjrc.com/teensy/; - maintainers = with maintainers; [ the-kenny ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91c771425ac..16ac093df43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5750,7 +5750,7 @@ let tcptrack = callPackage ../development/tools/misc/tcptrack { }; - teensy-loader = callPackage ../development/tools/misc/teensy { }; + teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; From c9a6b811d634626ee4ffd6651a7f979e9b59e74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 16 Sep 2015 07:57:29 +0200 Subject: [PATCH 47/91] duply: 1.9.1 -> 1.9.2 --- pkgs/tools/backup/duply/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 52074db4ba2..a055b87c263 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation { - name = "duply-1.9.1"; + name = "duply-1.9.2"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.9.x/duply_1.9.1.tgz"; - sha256 = "1igg8nc0i1xn8k1xxmphsg019b1yx8ln86hhqm6f4pd565d1rwg5"; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.9.x/duply_1.9.2.tgz"; + sha256 = "1ay50rsr90dcnjncjclzfckqmxxnizmi4jhb5rsybfn0xdj0kz1b"; }; buildInputs = [ txt2man makeWrapper ]; From 72d22e3f4dde52dd1bcd979620c6d3639bc97d2f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 11:37:30 -0700 Subject: [PATCH 48/91] kernel: 3.10.87 -> 3.10.88 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 0bd76b37d63..b26bc1eb34a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.87"; + version = "3.10.88"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "01lax9c6j2gw33pr7dla1ly1d89970mkbwh2hnmysgzsyh136rvg"; + sha256 = "0ayz62v46zmbz43zd36a0zpczv4dyjjcyljcfv1p7mgj3fc9fs4z"; }; features.iwlwifi = true; From 5975687f9815cc32447adee433cc6a74acec3da0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 11:37:33 -0700 Subject: [PATCH 49/91] kernel: 3.14.51 -> 3.14.52 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index b0b5faaf682..fb38e32a4b9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.51"; + version = "3.14.52"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1gqsd69cqijff4c4br4ydmcjl226d0yy6vrmgfvy16xiraavq1mk"; + sha256 = "1sgjxp98wdq4a0044i46970jm2prrgp0xz9jg1q4mfysdz3n3fhv"; }; features.iwlwifi = true; From 871baf2278bfda2c3dfc3cdf70a9aa235b0e8dfe Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 11:37:37 -0700 Subject: [PATCH 50/91] kernel: 4.1.6 -> 4.1.7 --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index a04680241d6..917e5d6ffee 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.6"; + version = "4.1.7"; # Remember to update grsecurity! extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1zlr7d5d7rhcbpwsi0svmv0zwj50n6mj6xgfzwwi336f5p26wbci"; + sha256 = "0g1dnvak0pd03d4miy1025bw64wq71w29a058dzspdr6jcf9qwbn"; }; features.iwlwifi = true; From 62a04a8bf1d7722ed3c9f20328b3a56981623fae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 13:05:16 -0700 Subject: [PATCH 51/91] libtasn1: 4.5 -> 4.7 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 2ae5a79b958..1ae26c48fc2 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.5"; + name = "libtasn1-4.7"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "1nhvnznhg2aqfrfjxc8v008hjlzkh5831jsfahqk89qrw7fbbcw9"; + sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4"; }; buildInputs = [ perl texinfo ]; From 5a0759971f8667133b498e8e8d982052a52d10ad Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 13:14:23 -0700 Subject: [PATCH 52/91] heimdal: 2015-06-17 -> 2015-09-13 --- pkgs/development/libraries/kerberos/heimdal.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 98907da3e42..e5db8a103f6 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -11,13 +11,13 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "${type}heimdal-2015-06-17"; + name = "${type}heimdal-2015-09-13"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; - rev = "be63a2914adcbea7d42d56e674ee6edb4883ebaf"; - sha256 = "147gv49gmy94y6f0x1vx523qni0frgcp3r7fill0r06rkfgfzc0j"; + rev = "c81572ab5dcee3062e715b9e25ca7a20f6ec456b"; + sha256 = "1r60i4v6y5lpll0l2qpn0ycp6q6f1xjg7k1csi547zls8k96yk9s"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ] From a38d9d1ca8a11a10b73a1034730248355787025d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 16 Sep 2015 22:18:48 +0200 Subject: [PATCH 53/91] nixos-container: Add bash completion for "nixos-container" command --- nixos/modules/virtualisation/containers.nix | 6 ++++ .../nixos-container-completion.sh | 33 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 nixos/modules/virtualisation/nixos-container-completion.sh diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 8f881d76070..8d12c5a57fd 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -12,6 +12,12 @@ let perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; su = "${pkgs.shadow.su}/bin/su"; inherit (pkgs) utillinux; + + postInstall = '' + t=$out/etc/bash_completion.d + mkdir -p $t + cp ${./nixos-container-completion.sh} $t/nixos-container + ''; }; # The container's init script, a small wrapper around the regular diff --git a/nixos/modules/virtualisation/nixos-container-completion.sh b/nixos/modules/virtualisation/nixos-container-completion.sh new file mode 100644 index 00000000000..0fe8ab811a1 --- /dev/null +++ b/nixos/modules/virtualisation/nixos-container-completion.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +_nixos-container() { + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts="list create destroy start stop status update login root-login run show-ip show-host-key" + startstop_opts=$(nixos-container list) + update_opts="--config" + + if [[ "$prev" == "nixos-container" ]] + then + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + fi + + if [[ $(echo "$opts" | grep "$prev") ]] + then + if [[ "$prev" == "start" || "$prev" == "stop" ]] + then + COMPREPLY=( $(compgen -W "${startstop_opts}" -- ${cur}) ) + return 0 + elif [[ "$prev" == "update" ]] + then + COMPREPLY=( $(compgen -W "${update_opts}" -- ${cur}) ) + return 0 + fi + fi +} + +complete -F _nixos-container nixos-container + From 84505bd36a809e7c3e1d3129664cac5597477094 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 13:35:41 -0700 Subject: [PATCH 54/91] grsecurity: Update patches --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- pkgs/top-level/all-packages.nix | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index b3c51dc6306..18e73ae68d4 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -82,10 +82,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "4.1.6"; - revision = "201508181953"; + { kversion = "4.1.7"; + revision = "201509131604"; branch = "test"; - sha256 = "1m227k1wb1q588vkgmngcz86k0wpzan6vra67pcx2478mabm3s89"; + sha256 = "1frfyi1pkiqc3awri3sr7xv41qxc8m2kb1yhfvj6xkrwb9li2bki"; }; grsec_fix_path = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16ac093df43..69198adb1b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9667,9 +9667,14 @@ let grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage; # Stable kernels - linux_grsec_stable_desktop = grKernel grFlavors.linux_grsec_stable_desktop; - linux_grsec_stable_server = grKernel grFlavors.linux_grsec_stable_server; - linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen; + # This is no longer supported. Please see the official announcement on the + # grsecurity page. https://grsecurity.net/announce.php + linux_grsec_stable_desktop = throw "No longer supported due to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_desktop."; + linux_grsec_stable_server = throw "No longer supported due to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_server."; + linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. " + + "Please use linux_grsec_testing_server_xen."; # Testing kernels linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; From 35b3a53829962e1007323dfc857eacb4dbc25505 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 13:45:54 -0700 Subject: [PATCH 55/91] libabw: Boost 1.59 Compat --- pkgs/development/libraries/libabw/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 90c5a5fa429..42abb3d297c 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0zi1zj4fpxgpglbbb5n1kg3dmhqq5rpf46lli89r5daavp19iing"; }; + # Boost 1.59 compatability fix + # Attempt removing when updating + postPatch = '' + sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in + ''; + buildInputs = [ boost doxygen gperf pkgconfig librevenge libxml2 perl ]; meta = with stdenv.lib; { From 6c6653a4372316571d57b71b7ccb717b274bc2cc Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 17 Sep 2015 00:40:31 +0300 Subject: [PATCH 56/91] vimPlugins: 2015-09-17 update --- pkgs/misc/vim-plugins/default.nix | 131 +++++++++++++++--------------- 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b74ffd0cc96..e9c27629df7 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -85,6 +85,7 @@ rec { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -163,11 +164,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-08-27"; + name = "Syntastic-2015-09-15"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "3c2e7e4ce37bc68b54f23c62efd0be291e6dc450"; - sha256 = "a293ae35c1960f9f4149bae5c2c676b5db4b9b1ae0f6ef70a91bca8a55e01986"; + rev = "8164240f6f0aaed2055dae45fc0e5c6f6ec30b3d"; + sha256 = "51d5d2eb9f1f66784cd85742ebbeb3585835b5c87ddeb64cad21f81d32d262fd"; }; dependencies = []; @@ -207,22 +208,22 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2015-07-30"; + name = "The_NERD_tree-2015-09-12"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "bcf3de4fdffae45fc7c85b6b84a01b37177924aa"; - sha256 = "969c3d81f85674303fb295c55da6be3339ffa8658ed98cb20f92eb21551da847"; + rev = "8c7534bc9e1d0c2f18bf94c1440c4ae6b102b5d6"; + sha256 = "dc71561fed68facebeb4162c909afefbb1f415908e2402f98fa500893b193833"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-08-21"; + name = "UltiSnips-2015-09-15"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "e48d8a28e55e931a3340dae937aa7f66954815ad"; - sha256 = "8859aeebd30fc48e481ec11ba7f38c2d91ceae979fbc2045969b077e2b0cf124"; + rev = "ef2c0d6d80d7903bfed4fa0c3a7fe5af5fd0ce55"; + sha256 = "e6d782830c0465af6f23b96c42c59b0f5eb1bd41376dcae008d0ad54981ce182"; }; dependencies = []; @@ -240,11 +241,11 @@ rec { }; WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2015-05-14"; + name = "WebAPI-2015-09-14"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; - rev = "6d577e49aeb81b4ede280161ca1e550c9328d098"; - sha256 = "cb57200ada38ff5388e043075e900d3794020bb6f063a2845c71993e5543862a"; + rev = "575859ae34175a3bb88371dd65b266d7e8044140"; + sha256 = "bee247bd833db32386313b8966ba7ae36623606c3e3712d4660de671b626b958"; }; dependencies = []; @@ -267,22 +268,11 @@ rec { }; commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2015-07-27"; + name = "commentary-2015-09-12"; src = fetchgit { url = "git://github.com/tpope/vim-commentary"; - rev = "7fb632aab475b1d2560fe18a329742ba3b4725c6"; - sha256 = "29f8f8a354a749b30b98940c32c09355cd29aa456a9bf83c2d5dc7cc8bc7c8fe"; - }; - dependencies = []; - - }; - - vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2015-06-22"; - src = fetchgit { - url = "git://github.com/ap/vim-css-color"; - rev = "ceb028b27eae0550533501b1f02cb512a482ba85"; - sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd"; + rev = "e0f4850d78137a35b9461c530078bd77f39e4dce"; + sha256 = "64896579a5c682e7da2cce7292cba16c4186a42ff68d0e92143fa7345d28cf0d"; }; dependencies = []; @@ -333,11 +323,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2015-08-02"; + name = "fugitive-2015-09-10"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "b319b694539017dcd789dc2c42f784a30d7b28b8"; - sha256 = "88e0ac84a016969cf6231ae3705b931d3ee7d0902417c50d7c1397d80b1534b4"; + rev = "b7b23001def8d2ae816ff6dd772cd50976189e0e"; + sha256 = "737def8b596472908509bdfaf8d33111471fb1a2d692133ce16f03548e226672"; }; dependencies = []; @@ -365,6 +355,17 @@ rec { }; + vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-css-color-2015-06-22"; + src = fetchgit { + url = "git://github.com/ap/vim-css-color"; + rev = "ceb028b27eae0550533501b1f02cb512a482ba85"; + sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd"; + }; + dependencies = []; + + }; + lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "lushtags-2013-12-27"; src = fetchgit { @@ -432,11 +433,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2015-08-12"; + name = "vim-go-2015-09-14"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "5048bdbebcffb296aa60b4c21c44ae8276244539"; - sha256 = "b2a6dc12a7029a1e19f81fb1ddf009d62847e0958b6b083f6aa39445db3739cd"; + rev = "73710fe6964c2f366682dba3550e2dcec7831949"; + sha256 = "e4b83ec0233d1ae1cc4f7fe8dcc7e2dbd10de8fe314ff78045a850082f70b048"; }; dependencies = []; @@ -586,11 +587,11 @@ rec { }; vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-xkbswitch-2015-07-26"; + name = "vim-xkbswitch-2015-09-04"; src = fetchgit { url = "git://github.com/lyokha/vim-xkbswitch"; - rev = "eba2979fa3d11dc09d4ef9ef3854926f28b783a4"; - sha256 = "f51ff00ad6e40ba9f31be18fee5e6f80cf48c51872392a0dafe08477749b74bd"; + rev = "0d94b5dde9ddfeb6b064e30293b6fb7a4c54b907"; + sha256 = "d303a6099e684084dfd71bdb08ae2c6dc33ec9c6f68b1115e2be257d7c83ef11"; }; dependencies = []; patchPhase = '' @@ -634,11 +635,11 @@ rec { }; racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2015-08-30"; + name = "racer-2015-09-14"; src = fetchgit { url = "git://github.com/phildawes/racer"; - rev = "dcebb106b65a083d70d7d87bd7bdf42a72179d96"; - sha256 = "8efec086c394f574cddf09f7b2dfab5062de897f67110e1097a567e2fecf06b1"; + rev = "89db6bbca107f8e2cf19d3e5f3fac9cdf48fd7b9"; + sha256 = "db11ea7e9f71bec60f6dba8ca4c460a98c2b9cc6490ac467280bfea493965f4c"; }; dependencies = []; buildPhase = '' @@ -648,22 +649,22 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2015-08-22"; + name = "neocomplete-vim-2015-09-15"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "39661033cce39ebd013451b49809e94ade3ba08c"; - sha256 = "7a1482f44ff7a1fb27273d12023da25028c9fa393e6cbfcf9c417fecdb09f0b2"; + rev = "f6befdc80f3e61d0d26734e064a84e5a78ee00cc"; + sha256 = "c5307e5757deca8fe7ea17bf5ee60a89d855c42e2b0ebec5d40bc1dae09fffac"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2015-08-21"; + name = "neosnippet-snippets-2015-09-07"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "f72814aee4f8530b0f22ca9fa814e1e6473ba543"; - sha256 = "934177c1c51e3a386f21b678fceaa46a6ea63c7570ab71afa25f35fe30119777"; + rev = "7bc1674170670a4c43f7f4fc65e0e396759512ea"; + sha256 = "87a0c603517ab740b774245ca224235ff03abd1480855f4c2bedccd9acb95d53"; }; dependencies = []; @@ -681,22 +682,22 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2015-08-30"; + name = "unite-vim-2015-09-15"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "f1aa053aae95e0185c5c9667ecd938c4fc37c2c7"; - sha256 = "f1cc089cf82d77df73950f8beefe7caa84f77b9ae995be0aa83a3ebd38a5044e"; + rev = "771f33c201d85602a225045553720d2659bd04e5"; + sha256 = "ccdde79165ff9dd1c1df1a55b2434b8cb59d9b8242c57f0015802c136d5de89b"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2015-08-29"; + name = "vimproc-vim-2015-09-15"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "a6bd6893749e3cbfb07230f4284c36b2dc2d8179"; - sha256 = "11473597d678ac45628a8625025cba75945ebce9e5d7eecf20b17901ffb3bf46"; + rev = "7190c920c29a3612d9144df4cf9527e016362cef"; + sha256 = "180f6a38959a01014d66470936386c011b0b0cf8e0d84a9d3d2a8362c70454e4"; }; dependencies = []; buildInputs = [ which ]; @@ -776,11 +777,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2015-08-31"; + name = "youcompleteme-2015-09-16"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "f94b342989deb1a20b5f87ef2a7d30b16a9ff733"; - sha256 = "0a4d7e30a3ecdb22cb8ffa9bafae8b3bdb160c92ab5e2ce57413f2177e28eedc"; + rev = "61a5a9b84b8c0c993d63c20c8698b42db4365f60"; + sha256 = "1adad2e9e21999b4412e613df4861d757712af8650cbb4110d5d374fe249a60e"; }; dependencies = []; buildInputs = [ @@ -899,11 +900,11 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2015-08-28"; + name = "vim-wakatime-2015-09-07"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "02277aca9907c955e51156ad9685aae75a5da70d"; - sha256 = "7f6b5b99e47d0cd09d6a9649b7150db70008766ceafea59dc80ba74770ee4507"; + rev = "39598ddbdbb973cf5e13f1e6e4aabf7664ba0096"; + sha256 = "0efad3ccbfc3226a071ca3dadf46ae0813eccd4402efd8ad797e4194a5e91411"; }; dependencies = []; buildInputs = [ python ]; @@ -1344,11 +1345,11 @@ rec { }; vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2015-07-20"; + name = "vim-easy-align-2015-09-16"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "1206c65dcb87488900b5ac193965268f0ce2c574"; - sha256 = "60de7c9c5b916e6cd9bc9e5bef0a7d2a831a7ab6cf2231b7f7b29017559bc33a"; + rev = "98e0b493acae87202fba2294550957c9b5902b97"; + sha256 = "23273a8928d23336982e194ba13e9501e3ccf684dff9ed17988e3e1f16117cf5"; }; dependencies = []; @@ -1432,22 +1433,22 @@ rec { }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2015-08-31"; + name = "vim-snippets-2015-09-14"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "ec99c8c24f541727a648f072a84b9d1ea28f2341"; - sha256 = "5b1cdefc54959db41458898ebeefeb7d4396fbb9e7e2a5d256c4fd47931e5f07"; + rev = "93c4b32b4d7c7abd742518bcf92ab93ae4b43d54"; + sha256 = "8ca82f43c4235838fcadc7c36e8b4feb65507311f0168081990d87432f0de14c"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2015-08-28"; + name = "vim-webdevicons-2015-09-14"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "2bc50727340bd43fca65d1baa09c36dda71fff6c"; - sha256 = "3dea4be46ff7e2408d62c0f9a3f5c9fab0fe893e0f343bc4ebb25e1f30801f26"; + rev = "fec56878c734b608c1fa79952579aa976da2c98b"; + sha256 = "ecbe3c62c06aaf0c7d3104210f95e95db529368fd58533360ea5041acb3bcdf1"; }; dependencies = []; From c3ed1b17ba76e3c7fa25e22894bc786184c42e8b Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Wed, 16 Sep 2015 16:23:41 -0600 Subject: [PATCH 57/91] rabbitvcs: init at 0.16 --- .../version-management/rabbitvcs/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/version-management/rabbitvcs/default.nix diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix new file mode 100644 index 00000000000..100e854f29b --- /dev/null +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -0,0 +1,40 @@ +{ fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: +python2Packages.buildPythonPackage rec { + name = "rabbitvcs-${version}"; + version = "0.16"; + namePrefix = ""; + + src = fetchFromGitHub { + owner = "rabbitvcs"; + repo = "rabbitvcs"; + rev = "v${version}"; + sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; + }; + + pythonPath = with python2Packages; [ configobj dbus pygobject pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + + prePatch = '' + sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py + sed -ie "s|PREFIX = sys.prefix|PREFIX = \"$out\"|" ./setup.py + sed -ie 's|/usr/bin/meld|${meld}/bin/meld|' ./rabbitvcs/util/configspec/configspec.ini + sed -ie 's|/usr/bin/svnadmin|${subversion}/bin/svnadmin|' ./rabbitvcs/ui/create.py + sed -ie "s|/usr/share/doc|$out/share/doc|" ./rabbitvcs/ui/about.py + sed -ie "s|gnome-open|xdg-open|" ./rabbitvcs/util/helper.py + ''; + + outputs = [ "out" "cli" ]; + + postInstall = '' + mkdir -p $cli/bin + cp clients/cli/rabbitvcs $cli/bin + wrapPythonProgramsIn $cli "$out $pythonPath" + ''; + + meta = { + description = "Graphical tools for working with version control systems"; + homepage = http://rabbitvcs.org/; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.mathnerd314 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e806bb1bd1..6fbf5bf941d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12426,6 +12426,8 @@ let inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2; }; + rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; + rakarrack = callPackage ../applications/audio/rakarrack { fltk = fltk13; }; From 3faf5b53a571b37c6076a325a854781dc25d3a12 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Sep 2015 15:59:32 -0500 Subject: [PATCH 58/91] dropbox: 3.8.5 -> 3.8.9 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 0af5dfba3f2..3b157857ff9 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -19,11 +19,11 @@ let # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.8.5"; + version = "3.8.9"; sha256 = { - "x86_64-linux" = "1r0wz2fsx2piasl04qsgwbl88bi0ajr0dm2swbslxwkf789vk18y"; - "i686-linux" = "1dvfgp9dg3frhwmchwa6fyws4im9vgicchfsv0zzflvc7rm9fcig"; + "x86_64-linux" = "1mdhf57bqi4vihbzv5lz8zk4n576c1qjm7hzcq4f5qvkdsmp5in2"; + "i686-linux" = "0gighh782jjmlgqgbw2d00a3ri5h3inqdik7v70f1yygvkr7awy8"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = From 318ac091b25f3231c01680769563ae5460b54057 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 21:20:29 -0700 Subject: [PATCH 59/91] ldns: Compat with perl 5.22 --- pkgs/development/libraries/ldns/default.nix | 9 ++++++--- .../libraries/ldns/perl-5.22-compat.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/ldns/perl-5.22-compat.patch diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index b4dbbf792ef..b1f81549ef0 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -8,11 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; }; - patchPhase = '' - sed -i 's,\$(srcdir)/doc/doxyparse.pl,perl $(srcdir)/doc/doxyparse.pl,' Makefile.in + patches = [ ./perl-5.22-compat.patch ]; + + postPatch = '' + patchShebangs doc/doxyparse.pl ''; - buildInputs = [ openssl perl ]; + nativeBuildInputs = [ perl ]; + buildInputs = [ openssl ]; configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ]; diff --git a/pkgs/development/libraries/ldns/perl-5.22-compat.patch b/pkgs/development/libraries/ldns/perl-5.22-compat.patch new file mode 100644 index 00000000000..ddf711cef5d --- /dev/null +++ b/pkgs/development/libraries/ldns/perl-5.22-compat.patch @@ -0,0 +1,12 @@ +diff -Naur old/doc/doxyparse.pl new/doc/doxyparse.pl +--- old/doc/doxyparse.pl 2014-01-11 06:04:41.000000000 +0900 ++++ new/doc/doxyparse.pl 2015-08-08 22:29:34.216889652 +0900 +@@ -273,7 +273,7 @@ + + print MAN $MAN_MIDDLE; + +- if (defined(@$also)) { ++ if (@$also) { + print MAN "\n.SH SEE ALSO\n\\fI"; + print MAN join "\\fR, \\fI", @$also; + print MAN "\\fR.\nAnd "; From 024b0414abc66e44603d16b269ca258d013a17d0 Mon Sep 17 00:00:00 2001 From: Robbin C Date: Wed, 2 Sep 2015 07:45:44 +0800 Subject: [PATCH 60/91] zimlib: init at 20150710. This adds zimlib, a library for reading and writing ZIM files. ZIM is a file format for storing Web content offline. --- pkgs/development/libraries/zimlib/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/zimlib/default.nix diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix new file mode 100644 index 00000000000..c46a950804c --- /dev/null +++ b/pkgs/development/libraries/zimlib/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchgit, automake, autoconf, libtool, lzma }: + +stdenv.mkDerivation { + name = "zimlib"; + version = "20150710"; + src = fetchgit { + url = https://gerrit.wikimedia.org/r/p/openzim.git; + rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456"; + sha256 = "0x0d3rx6zcc8k66nqkacmwdvslrz70h9bliqawzv90ribq3alb0q"; + }; + buildInputs = [ automake autoconf libtool lzma ]; + setSourceRoot = "cd openzim-*/zimlib; export sourceRoot=`pwd`"; + preConfigurePhases = [ "./autogen.sh" ]; + + meta = { + description = "Library for reading and writing ZIM files (file format for storing Web content offline)"; + homepage = http://www.openzim.org/wiki/Zimlib; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0126504a330..7a60073330d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8415,6 +8415,8 @@ let czmq = callPackage ../development/libraries/czmq { }; + zimlib = callPackage ../development/libraries/zimlib { }; + zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { }; From fc2b0e9d1006dd3656b804154f3ba438540da832 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Sep 2015 21:58:53 -0700 Subject: [PATCH 61/91] argyllcms: gcc5 compat --- pkgs/tools/graphics/argyllcms/default.nix | 2 ++ pkgs/tools/graphics/argyllcms/gcc5.patch | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/graphics/argyllcms/gcc5.patch diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index a8ffc634d0e..fce383dcc9c 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { curlOpts = "--user-agent 'Mozilla/5.0'"; }; + patches = [ ./gcc5.patch ]; + # The contents of this file comes from the Jamtop file from the # root of the ArgyllCMS distribution, rewritten to pick up Nixpkgs # library paths. When ArgyllCMS is updated, make sure that changes diff --git a/pkgs/tools/graphics/argyllcms/gcc5.patch b/pkgs/tools/graphics/argyllcms/gcc5.patch new file mode 100644 index 00000000000..28067455c33 --- /dev/null +++ b/pkgs/tools/graphics/argyllcms/gcc5.patch @@ -0,0 +1,20 @@ +Description: Fix FTBFS with GCC 5 +Author: James Cowgill +Bug-Debian: https://bugs.debian.org/777779 +Forwarded: no +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/icc/icc.h ++++ b/icc/icc.h +@@ -100,7 +100,11 @@ + #define CF64PREC "LL" /* Constant precision specifier */ + + #ifndef ATTRIBUTE_NORETURN ++#ifdef _MSC_VER + # define ATTRIBUTE_NORETURN __declspec(noreturn) ++#else ++# define ATTRIBUTE_NORETURN __attribute__((noreturn)) ++#endif + #endif + + #else /* !__STDC_VERSION__ */ From 485ea9a621faafc11db1112d469d82c2a18c5395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Sep 2015 09:10:38 +0200 Subject: [PATCH 62/91] xf86_video_nouveau: deprecate this alias --- nixos/modules/services/x11/xserver.nix | 1 - pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 1ec098fded6..3348e8d0582 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -13,7 +13,6 @@ let # Map video driver names to driver packages. FIXME: move into card-specific modules. knownVideoDrivers = { - nouveau = { modules = [ pkgs.xf86_video_nouveau ]; }; unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; }; virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69198adb1b3..e4a8fb9d46c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10257,8 +10257,6 @@ let xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { }; - xf86_video_nouveau = xorg.xf86videonouveau; - xmoto = callPackage ../games/xmoto { }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; @@ -15044,6 +15042,7 @@ let rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtubeDL = youtube-dl; # added 2014-10-26 From d8b6defaae9d75c9eb57e11556ba46c6f0485015 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Thu, 17 Sep 2015 11:06:24 +0200 Subject: [PATCH 63/91] hipchat: 2.2.1373 -> 2.2.1388 --- .../networking/instant-messengers/hipchat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index f82ffa5ecd3..c6551307df9 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -5,7 +5,7 @@ let - version = "2.2.1373"; + version = "2.2.1388"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc @@ -47,12 +47,12 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; - sha256 = "0mxjzigncp8sh5w2rpr7kvkiahagm3adss1zv6rqk8hc1awrnd8n"; + sha256 = "18vl0c7xgyzd2miwkfzc638z0wzszgsdlbnslkkvxmg95ykdrdnz"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "1f4cjbazgifxpyr6589frs417h4wpxbykf46w5qiw0m2wiqpqff5"; + sha256 = "12q8hf3gmcgrqg6v9xqyknwsmwywpwm76jc54sfniiqv5ngq24hl"; } else throw "HipChat is not supported on ${stdenv.system}"; From 539b39c34b52622c44df4f91344471da5972dddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 17 Sep 2015 11:16:48 +0200 Subject: [PATCH 64/91] python35Packages.pyparted: 3.10 -> 3.10.7 --- pkgs/top-level/python-packages.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da228a36884..fbfd1b6005c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11546,27 +11546,16 @@ let pyparted = buildPythonPackage rec { name = "pyparted-${version}"; - version = "3.10"; + version = "3.10.7"; disabled = isPyPy; src = pkgs.fetchurl { - url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; - sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; + url = "https://github.com/rhinstaller/pyparted/archive/v${version}.tar.gz"; + sha256 = "0c9ljrdggwawd8wdzqqqzrna9prrlpj6xs59b0vkxzip0jkf652r"; }; - patches = singleton (pkgs.fetchurl { - url = "https://www.redhat.com/archives/pyparted-devel/" - + "2014-April/msg00000.html"; - postFetch = '' - sed -i -ne '//,// { - s/^<[^>]*>//; /^$/!p - }' "$downloadedFile" - ''; - sha256 = "1lakhz3nvx0qacn90bj1nq13zqxphiw4d9dsc44gwa8nj24j2zws"; - }); - postPatch = '' - sed -i -e 's|/sbin/mke2fs|${pkgs.e2fsprogs}&|' tests/baseclass.py + sed -i -e 's|mke2fs|${pkgs.e2fsprogs}/bin/mke2fs|' tests/baseclass.py sed -i -e ' s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py From ca6fae24b99f8d635180f5923744f1a2ba5b3d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 17 Sep 2015 11:19:18 +0200 Subject: [PATCH 65/91] sqlalchemy, IMAPClient: disable on py35 --- 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 fbfd1b6005c..3c8e7fa4e3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14094,7 +14094,7 @@ let sqlalchemy = self.sqlalchemy9.override rec { name = "SQLAlchemy-0.7.10"; - disabled = isPy34; + disabled = isPy34 || isPy35; doCheck = !isPyPy; src = pkgs.fetchurl { @@ -14113,7 +14113,7 @@ let sqlalchemy8 = self.sqlalchemy9.override rec { name = "SQLAlchemy-0.8.7"; - disabled = isPy34; + disabled = isPy34 || isPy35; doCheck = !isPyPy; src = pkgs.fetchurl { @@ -17139,7 +17139,7 @@ let IMAPClient = buildPythonPackage rec { name = "IMAPClient-${version}"; version = "0.11"; - disabled = isPy34; + disabled = isPy34 || isPy35; src = pkgs.fetchurl { url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; From b0336c9854a8c8e634005af99bc75dabd4abb4e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 17 Sep 2015 12:17:19 +0200 Subject: [PATCH 66/91] lftp: 4.6.3a -> 4.6.4 Upstream says: 2015-08-20: lftp-4.6.4 released. Some bugs fixed, minor features added. --- pkgs/tools/networking/lftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index c77e20c2413..ea7ec605e2b 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }: stdenv.mkDerivation rec { - name = "lftp-4.6.3a"; + name = "lftp-4.6.4"; src = fetchurl { urls = [ "http://lftp.yar.ru/ftp/${name}.tar.bz2" "http://lftp.yar.ru/ftp/old/${name}.tar.bz2" ]; - sha256 = "0846p1z5v997lxaqanj8n1qkv470s8nlhs420kiby67k4j2zl576"; + sha256 = "0zj0dd6s3nzwdawxjp0xw31ipsa4vzimmg5bzq952q2f29vd0akn"; }; buildInputs = [ gnutls pkgconfig readline zlib ]; From 8f98226f50e4d8a37b39a4fb5a2a5986b4269080 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 10:54:51 +0200 Subject: [PATCH 67/91] tests/virtualbox: Allow to call it with debug attr. Instead of manually setting debug to true or false, this should make it possible to now run the test like this: nix-build nixos/tests/virtualbox.nix --arg debug true Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 12cb4594b16..b21df456639 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -1,6 +1,6 @@ -import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let +{ debug ? false, ... } @ args: - debug = false; +import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let testVMConfig = vmName: attrs: { config, pkgs, ... }: { boot.kernelParams = let @@ -416,4 +416,4 @@ in { destroyVM_test2; }; ''; -}) +}) args From 17f58275a05aba98eb644581d557de5c11e3b962 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 11:02:43 +0200 Subject: [PATCH 68/91] tests/virtualbox: Fix long line in guestAdditions. This is essentially not only "wrapping" the line but refactoring into a shorter name which is used in two places. And yes, I know I'm very pedantic if it comes to whitespaces and line lengths, but I made sure this doesn't change any functionality: $ nix-instantiate nixos/tests/virtualbox.nix ... /nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv $ git stash pop ... $ nix-instantiate nixos/tests/virtualbox.nix ... /nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv $ Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 60 ++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index b21df456639..cad1574314e 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -2,38 +2,40 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let - testVMConfig = vmName: attrs: { config, pkgs, ... }: { - boot.kernelParams = let - miniInit = '' - #!${pkgs.stdenv.shell} -xe - export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" + testVMConfig = vmName: attrs: { config, pkgs, ... }: let + guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions; - mkdir -p /etc/dbus-1 /var/run/dbus - cat > /etc/passwd < /etc/group < /etc/passwd < /etc/group < Date: Thu, 17 Sep 2015 11:25:37 +0200 Subject: [PATCH 69/91] tests/virtualbox: Use antiquotes for log sockets. We're simply using antiquotation, since it's been a while since these got introduced (in Nix 1.7). So we can use them because it makes the code much more readable. As usual, I made sure that I didn't accidentally change something in functionality: $ nix-instantiate nixos/tests/virtualbox.nix ... /nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv $ git stash pop ... $ nix-instantiate nixos/tests/virtualbox.nix ... /nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv $ Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index cad1574314e..87c2e25e70b 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -171,27 +171,21 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let ]; in { machine = { - systemd.sockets = listToAttrs (singleton { - name = "vboxtestlog-${name}"; - value = { - description = "VirtualBox Test Machine Log Socket"; - wantedBy = [ "sockets.target" ]; - before = [ "multi-user.target" ]; - socketConfig.ListenStream = "/run/virtualbox-log-${name}.sock"; - socketConfig.Accept = true; - }; - }); + systemd.sockets."vboxtestlog-${name}" = { + description = "VirtualBox Test Machine Log Socket"; + wantedBy = [ "sockets.target" ]; + before = [ "multi-user.target" ]; + socketConfig.ListenStream = "/run/virtualbox-log-${name}.sock"; + socketConfig.Accept = true; + }; - systemd.services = listToAttrs (singleton { - name = "vboxtestlog-${name}@"; - value = { - description = "VirtualBox Test Machine Log"; - serviceConfig.StandardInput = "socket"; - serviceConfig.StandardOutput = "syslog"; - serviceConfig.SyslogIdentifier = "GUEST-${name}"; - serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat"; - }; - }); + systemd.services."vboxtestlog-${name}@" = { + description = "VirtualBox Test Machine Log"; + serviceConfig.StandardInput = "socket"; + serviceConfig.StandardOutput = "syslog"; + serviceConfig.SyslogIdentifier = "GUEST-${name}"; + serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat"; + }; }; testSubs = '' From effe0309ee503bc9b45c3d071004f606018e62c4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 11:32:05 +0200 Subject: [PATCH 70/91] tests/virtualbox: Put name in log descriptions. Makes it easier to debug and find out for which machine a certain log socket has been started or stopped. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 87c2e25e70b..a944c9caf35 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -172,7 +172,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let in { machine = { systemd.sockets."vboxtestlog-${name}" = { - description = "VirtualBox Test Machine Log Socket"; + description = "VirtualBox Test Machine Log Socket For ${name}"; wantedBy = [ "sockets.target" ]; before = [ "multi-user.target" ]; socketConfig.ListenStream = "/run/virtualbox-log-${name}.sock"; @@ -180,7 +180,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let }; systemd.services."vboxtestlog-${name}@" = { - description = "VirtualBox Test Machine Log"; + description = "VirtualBox Test Machine Log For ${name}"; serviceConfig.StandardInput = "socket"; serviceConfig.StandardOutput = "syslog"; serviceConfig.SyslogIdentifier = "GUEST-${name}"; From 4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 12:23:09 +0200 Subject: [PATCH 71/91] nixos/virtualbox-image: Enable PAE on 32bit. pkgs/os-specific/linux/kernel/common-config.nix defines HIGHMEM64G on line 441 for 32bit systems, which implies PAE. We now creating the OVA with PAE support enabled, which fixes bootup of the image if people are just importing it without setting PAE explicitly. Signed-off-by: aszlig --- nixos/modules/virtualisation/virtualbox-image.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index c1538feb9df..ca2c4035cc9 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -110,6 +110,7 @@ in { --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"} VBoxManage modifyvm "$vmName" \ --memory 1536 --acpi on --vram 10 \ + ${optionalString (pkgs.stdenv.system == "i686-linux") "--pae on"} \ --nictype1 virtio --nic1 nat \ --audiocontroller ac97 --audio alsa \ --rtcuseutc on \ From 03730319bd0f51b8fb5a19eccf0b92628923a2fc Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 12:27:16 +0200 Subject: [PATCH 72/91] nixos/virtualbox-image: Use 32MB of video memory. Booting the demo/installer image won't work if the video memory is too low. It boots into KDE, shows the background image and doesn't do anything, according to @domenkozar. Thanks to @domenkozar for reporting and testing this with 32MB. Signed-off-by: aszlig --- nixos/modules/virtualisation/virtualbox-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index ca2c4035cc9..767a8c339a3 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -109,7 +109,7 @@ in { VBoxManage createvm --name "$vmName" --register \ --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"} VBoxManage modifyvm "$vmName" \ - --memory 1536 --acpi on --vram 10 \ + --memory 1536 --acpi on --vram 32 \ ${optionalString (pkgs.stdenv.system == "i686-linux") "--pae on"} \ --nictype1 virtio --nic1 nat \ --audiocontroller ac97 --audio alsa \ From ab295420c5041eeb9be928283ca3678c3f55fd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 17 Sep 2015 12:44:17 +0200 Subject: [PATCH 73/91] qemu: qemu-2.4.0-x86-only -> qemu-x86-only-2.4.0 --- pkgs/applications/virtualization/qemu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 46581994910..1bedb404a2a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,17 +11,17 @@ with stdenv.lib; let - n = "qemu-2.4.0"; + version = "2.4.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; in stdenv.mkDerivation rec { - name = n + (if x86Only then "-x86-only" else ""); + name = "qemu-" + stdenv.lib.optionalString x86Only "x86-only-" + version; src = fetchurl { - url = "http://wiki.qemu.org/download/${n}.tar.bz2"; + url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j"; }; From c0c1374b8afd00d09854d8213199691de5b932c9 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 17 Sep 2015 13:27:12 +0200 Subject: [PATCH 74/91] xhyve: xhyve-0.1.0 -> xhyve-0.2.0 --- pkgs/applications/virtualization/xhyve/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index 9941d34bc89..e34fa855955 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -2,14 +2,17 @@ stdenv.mkDerivation rec { name = "xhyve-${version}"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; - sha256 = "0nbb9zy4iqmdz2dpyvcl1ynimrrpyd6f6cq8y2p78n1lmgqhrgkm"; + sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; }; - buildFlags = "CFLAGS=-Wno-pedantic -Wno-shift-sign-overflow"; + # Don't use git to determine version + buildFlags = '' + CFLAGS=-DVERSION=\"${version}\" + ''; installPhase = '' mkdir -p $out/bin From 7994c99d6f62bfd9129e3ff4d1471efb3b5e58c2 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 17 Sep 2015 12:32:45 +0000 Subject: [PATCH 75/91] Update libcloud to 0.18.0. Needed for newer nixops. --- 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 3c8e7fa4e3f..aa7932109c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7704,11 +7704,11 @@ let libcloud = buildPythonPackage (rec { - name = "libcloud-0.14.1"; + name = "libcloud-0.18.0"; src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/a/apache-libcloud/apache-libcloud-0.14.1.tar.bz2; - sha256 = "1l6190pjv54c7y8pzr089ij727qv7bqhhaznr2mkvimgr1wzsql5"; + url = https://pypi.python.org/packages/source/a/apache-libcloud/apache-libcloud-0.18.0.tar.bz2; + sha256 = "0ahdp14ddly074qg5cksxdhqaws0kj445xmhz1y7lzspsp6fk1xg"; }; buildInputs = with self; [ mock ]; From 08bd889058554be874751c70a4641878412810eb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 17 Sep 2015 15:20:33 +0200 Subject: [PATCH 76/91] maint script gnome-latest.sh: don't write sha to a file --- maintainers/scripts/gnome-latest.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh index 63b309c5a77..9186db5fda3 100755 --- a/maintainers/scripts/gnome-latest.sh +++ b/maintainers/scripts/gnome-latest.sh @@ -9,7 +9,7 @@ if [ "$project" == "--help" ]; then exit 0 fi -baseVersion=$2 +majorVersion=$2 if [ -z "$project" ]; then echo "No project specified, exiting" @@ -28,15 +28,15 @@ else } fi -if [ -z "$baseVersion" ]; then +if [ -z "$majorVersion" ]; then echo "Looking for available versions..." >&2 available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` ) echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2 echo -en "Choose one of them: " >&2 - read baseVersion + read majorVersion fi -FTPDIR="${GNOME_FTP}/${project}/${baseVersion}" +FTPDIR="${GNOME_FTP}/${project}/${majorVersion}" #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` # gnome's LATEST-IS is broken. Do not trust it. @@ -69,14 +69,14 @@ echo "Latest version is: ${version}" >&2 name=${project}-${version} echo "Fetching .sha256 file" >&2 -curl -O http://${FTPDIR}/${name}.sha256sum +sha256out=$(curl -s http://${FTPDIR}/${name}.sha256sum) extensions=( "xz" "bz2" "gz" ) echo "Choosing archive extension (known are ${extensions[@]})..." >&2 for ext in ${extensions[@]}; do - if grep "\\.tar\\.${ext}$" ${name}.sha256sum >& /dev/null; then + if echo -e "$sha256out" | grep -q "\\.tar\\.${ext}$"; then ext_pref=$ext - sha256=$(grep "\\.tar\\.${ext}$" ${name}.sha256sum | cut -f1 -d\ ) + sha256=$(echo -e "$sha256out" | grep "\\.tar\\.${ext}$" | cut -f1 -d\ ) break fi done @@ -84,12 +84,12 @@ sha256=`nix-hash --to-base32 --type sha256 $sha256` echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 cat <&2 From 482ae6d35071bf27fa6be208a64836d6d55a95f1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Sep 2015 13:21:22 +0200 Subject: [PATCH 77/91] perl-Autobox: 2.82 -> 2.83 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7fb00a099e8..eabad68c1fd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -404,11 +404,11 @@ let self = _self // overrides; _self = with self; { autobox = pkgs.perlPackages.Autobox; - Autobox = buildPerlPackage { - name = "autobox-2.82"; + Autobox = buildPerlPackage rec { + name = "autobox-2.83"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-2.82.tar.gz; - sha256 = "0w008z8ych54czr6drmhqrrvikcfhra6ig3v1fhk36apq64p9k1p"; + url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz"; + sha256 = "1i493ss5nr0hp3wncn0s31gyka4r09wx65b8g2f8av2nm4zs70rz"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { From 19e1197efaf7005afdf83be534e1e2e425dc6c98 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Sep 2015 13:45:26 +0200 Subject: [PATCH 78/91] perl-B-Hooks-EndOfScope: 0.13 -> 0.15 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eabad68c1fd..b1f936e077f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -512,11 +512,11 @@ let self = _self // overrides; _self = with self; { inherit (pkgs) db; }; - BHooksEndOfScope = buildPerlPackage { - name = "B-Hooks-EndOfScope-0.13"; + BHooksEndOfScope = buildPerlPackage rec { + name = "B-Hooks-EndOfScope-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.13.tar.gz; - sha256 = "1f5d0lbkwf23dfjn60g6fynmjhy5rxdyxcpdfb07srm73qpg2zpi"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "0bllq4077hxbdsh31r3cwpm6mzmc0247rrg1lr7rk7flscif8bhj"; }; propagatedBuildInputs = [ ModuleImplementation ModuleRuntime SubExporterProgressive ]; meta = { From bfc52b2654b45d50a0d62362f953021451b679a2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Sep 2015 14:24:34 +0200 Subject: [PATCH 79/91] perl-CPAN-Meta: 2.142690 -> 2.150005 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1f936e077f..d85c73039af 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2039,11 +2039,11 @@ let self = _self // overrides; _self = with self; { }; }; - CPANMeta = buildPerlPackage { - name = "CPAN-Meta-2.142690"; + CPANMeta = buildPerlPackage rec { + name = "CPAN-Meta-2.150005"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.142690.tar.gz; - sha256 = "495770e22e91e3d2bd04dc364f05061cabacfdce35baa3868bc0c05733d145db"; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + sha256 = "04g7cfbx7vi8kqc9pwv7n3z95vimkbv0h7v6p1ky37gzz3nsw66j"; }; propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements JSONPP ]; meta = { From 1983d9403d6493557a42c03122280e6a69730890 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Sep 2015 14:28:53 +0200 Subject: [PATCH 80/91] perl-Module-Metadata: 1.00019 -> 1.00027 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d85c73039af..02117364ad2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6856,10 +6856,10 @@ let self = _self // overrides; _self = with self; { }; ModuleMetadata = buildPerlPackage rec { - name = "Module-Metadata-1.000019"; + name = "Module-Metadata-1.000027"; src = fetchurl { url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; - sha256 = "0m755qn44nasbaj578628jgdqg0k4ldyn6fm3880hdi1q16skz2s"; + sha256 = "1rrjj48vvv3i1jrmw97i4mvsmknll7hxga4cq2s9qvc2issdrxz2"; }; propagatedBuildInputs = [ version ]; }; From b8ecf516e3b5d30d5150fa1831a6a5f5fd2cdffa Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Sep 2015 15:22:48 +0200 Subject: [PATCH 81/91] perlPackages: fix some builds by adding ModuleMetadata to buildInputs --- pkgs/top-level/perl-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 02117364ad2..6a31d15ac80 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3523,7 +3523,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.021.tar.gz; sha256 = "665c48de1c7c33e9b00e8ddc0204d02b45009e60b9b65033fa4a832dfe9fc808"; }; - buildInputs = [ DistCheckConflicts DistZilla JSON ModuleBuildTiny PathClass TestCheckDeps TestWarnings ]; + buildInputs = [ DistCheckConflicts DistZilla JSON ModuleBuildTiny PathClass TestCheckDeps TestWarnings ModuleMetadata ]; propagatedBuildInputs = [ DataSection DistCheckConflicts DistZilla Moose PathTiny SubExporterForMethods namespaceautoclean ModuleCoreList ]; meta = { homepage = http://search.cpan.org/dist/Dist-Zilla-Plugin-Test-Compile/; @@ -7029,7 +7029,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1213.tar.gz; sha256 = "0f3b196ae67dc1daaa43c44ae7703f27c4f92c391ad3e252a90e90c50c851e03"; }; - buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ]; + buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ModuleMetadata ]; propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DevelStackTrace DistCheckConflicts EvalClosure ListMoreUtils MROCompat ModuleRuntime ModuleRuntimeConflicts PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; meta = { homepage = http://moose.perl.org/; @@ -7343,7 +7343,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.10.tar.gz; sha256 = "a555f80c0e91bc428f040015f00dd98f3c022704ec089516b9b3507f3d437090"; }; - buildInputs = [ TestCheckDeps TestFatal ]; + buildInputs = [ TestCheckDeps TestFatal ModuleMetadata ]; propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; meta = { homepage = https://github.com/karenetheridge/moosex-lazyrequire; @@ -7373,7 +7373,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.28.tar.gz; sha256 = "0srk85z6py9brw1jfvacd76y6219wycq3dj0wackbkmmbq04ln0g"; }; - buildInputs = [ namespaceautoclean TestCheckDeps TestException ]; + buildInputs = [ namespaceautoclean TestCheckDeps TestException ModuleMetadata ]; propagatedBuildInputs = [ Moose MooseXTypes namespaceautoclean ]; meta = { homepage = https://github.com/karenetheridge/moosex-methodattributes; @@ -7456,7 +7456,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.13.tar.gz; sha256 = "01mqpvbz7yw993918hgp72vl22i6mgicpq5b3zrrsp6vl8sqj2sw"; }; - buildInputs = [ TestCheckDeps TestNoWarnings ]; + buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata]; propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ]; meta = { homepage = http://metacpan.org/release/MooseX-Role-WithOverloading; @@ -7638,7 +7638,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.006.tar.gz; sha256 = "0260c6fbbf84d411b145238ffd92a73f754bd92434448d9f78798fba0a2dfdd6"; }; - buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ]; + buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ModuleMetadata ]; propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesStringlike PathTiny ]; meta = { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; @@ -10432,7 +10432,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.006.tar.gz; sha256 = "774c1455566d11746118fd95305d1dbd111af86eac78058918e72468c43d9bcb"; }; - buildInputs = [ ModuleBuildTiny ]; + buildInputs = [ ModuleBuildTiny ModuleMetadata ]; propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; From cd73f0ad694e5d2c2aee164a1438fe3f1107eec1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Sep 2015 15:24:04 +0200 Subject: [PATCH 82/91] perl-CPAN-Meta-Check: 0.009 -> 0.012 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a31d15ac80..83e6988a8c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2053,13 +2053,13 @@ let self = _self // overrides; _self = with self; { }; }; - CPANMetaCheck = buildPerlPackage { - name = "CPAN-Meta-Check-0.009"; + CPANMetaCheck = buildPerlPackage rec { + name = "CPAN-Meta-Check-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.009.tar.gz; - sha256 = "eb2d43afd1da276e4acdebd24937f5171d0aaca8d19a5ef0c3e834b8792b7361"; + url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; + sha256 = "1rymh4l6sdh8l1q2q25lncmi4afbh2il0bpk8gxmd13qmjidjk2b"; }; - buildInputs = [ TestDeep ]; + buildInputs = [ TestDeep ModuleMetadata ]; propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ]; meta = { description = "Verify requirements in a CPAN::Meta object"; From edee7f172098921f13466bc1d82faee423035700 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 17 Sep 2015 15:32:50 +0200 Subject: [PATCH 83/91] Transformed meta.maintainers attributes to lists --- pkgs/applications/audio/foo-yc20/default.nix | 2 +- pkgs/applications/misc/super_user_spark/default.nix | 2 +- pkgs/applications/virtualization/xhyve/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 025ca594dff..4ccbb425612 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = https://github.com/sampov2/foo-yc20; license = "BSD"; - maintainers = stdenv.lib.maintainers.magnetophon; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix index 988db35500b..73a9e343df9 100644 --- a/pkgs/applications/misc/super_user_spark/default.nix +++ b/pkgs/applications/misc/super_user_spark/default.nix @@ -29,5 +29,5 @@ mkDerivation rec { homepage = "https://github.com/NorfairKing/super-user-spark"; description = "A safe way to never worry about your beautifully configured system again"; platforms = ghc.meta.platforms; - maintainers = stdenv.lib.maintainers.badi; + maintainers = [ stdenv.lib.maintainers.badi ]; } diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index e34fa855955..b7205ac000e 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight Virtualization on OS X Based on bhyve"; homepage = "https://github.com/mist64/xhyve"; - maintainers = lib.maintainers.lnl7; + maintainers = [ lib.maintainers.lnl7 ]; platforms = lib.platforms.darwin; }; } From ec5b66eb4add9d494d8fb16f6899028750d317a2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Sep 2015 15:24:32 +0200 Subject: [PATCH 84/91] Enable separate debug info You can now pass separateDebugInfo = true; to mkDerivation. This causes debug info to be separated from ELF binaries and stored in the "debug" output. The advantage is that it enables installing lean binaries, while still having the ability to make sense of core dumps, etc. --- doc/stdenv.xml | 28 ++++++++++++++ pkgs/applications/misc/hello/ex-2/default.nix | 4 +- .../setup-hooks/separate-debug-info.sh | 37 +++++++++++++++++++ pkgs/stdenv/generic/default.nix | 34 ++++++++++------- pkgs/tools/package-management/nix/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2 + 6 files changed, 93 insertions(+), 16 deletions(-) create mode 100644 pkgs/build-support/setup-hooks/separate-debug-info.sh diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 1556ffd057f..7ba24db2e05 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -899,6 +899,34 @@ following: phase. + + separateDebugInfo + If set to true, the standard + environment will enable debug information in C/C++ builds. After + installation, the debug information will be separated from the + executables and stored in the output named + debug. (This output is enabled automatically; + you don’t need to set the outputs attribute + explicitly.) To be precise, the debug information is stored in + debug/lib/debug/.build-id/XX/YYYY…, + where XXYYYY… is the build + ID of the binary — a SHA-1 hash of the contents of + the binary. Debuggers like GDB use the build ID to look up the + separated debug information. + + For example, with GDB, you can add + + +set debug-file-directory ~/.nix-profile/lib/debug + + + to ~/.gdbinit. GDB will then be able to find + debug information installed via nix-env + -i. + + + + diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index 8a31c591b29..bb91c90e2fc 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; }; - doCheck = true; + doCheck = false; + + separateDebugInfo = true; meta = { description = "A program that produces a familiar, friendly greeting"; diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh new file mode 100644 index 00000000000..63691899209 --- /dev/null +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -0,0 +1,37 @@ +export NIX_LDFLAGS+=" --build-id" +export NIX_CFLAGS_COMPILE+=" -ggdb" +dontStrip=1 + +fixupOutputHooks+=(_separateDebugInfo) + +_separateDebugInfo() { + local dst="${debug:-$out}" + if [ "$prefix" = "$dst" ]; then return; fi + + dst="$dst/lib/debug/.build-id" + + # Find executables and dynamic libraries. + local -a files=($(find "$prefix" -type f -a \( -perm /0100 -o -name "*.so" -o -name "*.so.*" \))) + + local i magic + for i in "${files[@]}"; do + # Skip non-ELF files. + exec 10< "$i" + read -n 4 -u 10 magic + if [[ "$magic" =~ ELF ]]; then echo FOO; fi + exec 10<&- + + # Extract the Build ID. FIXME: there's probably a cleaner way. + local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" + if [ "${#id}" != 40 ]; then + echo "could not find build ID of $i, skipping" >&2 + continue + fi + + # Extract the debug info. + header "separating debug info from $i (build ID $id)" + mkdir -p "$dst/${id:0:2}" + objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" + strip --strip-debug "$i" + done +} diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 249e4845bc2..778b3365b47 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -96,6 +96,10 @@ let , meta ? {} , passthru ? {} , pos ? null # position used in error messages and for meta.position + , separateDebugInfo ? false + , outputs ? [ "out" ] + , __impureHostDeps ? [] + , __propagatedImpureHostDeps ? [] , ... } @ attrs: let pos' = @@ -132,6 +136,13 @@ let throwEvalHelp "Broken" "is not supported on ‘${result.system}’" else true; + outputs' = + outputs ++ + (if separateDebugInfo then [ "debug" ] else []); + + buildInputs' = buildInputs ++ + (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []); + in assert licenseAllowed attrs; @@ -140,18 +151,11 @@ let ["meta" "passthru" "crossAttrs" "pos" "__impureHostDeps" "__propagatedImpureHostDeps"]) // (let - buildInputs = attrs.buildInputs or []; - nativeBuildInputs = attrs.nativeBuildInputs or []; - propagatedBuildInputs = attrs.propagatedBuildInputs or []; - propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or []; - crossConfig = attrs.crossConfig or null; - - __impureHostDeps = attrs.__impureHostDeps or []; - __propagatedImpureHostDeps = attrs.__propagatedImpureHostDeps or []; - # TODO: remove lib.unique once nix has a list canonicalization primitive - computedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs)); - computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs)); + computedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs ++ nativeBuildInputs)); + computedPropagatedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs)); in { builder = attrs.realBuilder or shell; @@ -162,10 +166,10 @@ let __ignoreNulls = true; # Inputs built by the cross compiler. - buildInputs = if crossConfig != null then buildInputs else []; + buildInputs = if crossConfig != null then buildInputs' else []; propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs else []; # Inputs built by the usual native compiler. - nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []); + nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs' else []); propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (if crossConfig == null then propagatedBuildInputs else []); } // ifDarwin { @@ -176,7 +180,9 @@ let "/bin/sh" ]; __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; - }))) ( + } // (if outputs' != [ "out" ] then { + outputs = outputs'; + } else { })))) ( { # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7db46596eec..8a301f912b8 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -41,7 +41,9 @@ let installFlags = "sysconfdir=$(out)/etc"; - doInstallCheck = true; + doInstallCheck = false; + + separateDebugInfo = true; crossAttrs = { postUnpack = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4a8fb9d46c..486fcb8c633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -477,6 +477,8 @@ let deps = [ makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; + separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; + ### TOOLS From e636e0a5329f546ebcc603d56bb99a0d016370f8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Sep 2015 15:45:10 +0200 Subject: [PATCH 85/91] gdb: Look for debug info in /run/current-system/sw/lib/debug The previous default was $out/lib/debug, which wasn't very useful. This ensures that you can do environment.systemPackages = [ pkgs.hello.debug ]; to install debug info. --- nixos/modules/config/system-path.nix | 3 ++- pkgs/development/tools/misc/gdb/default.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 3241780a3a7..748ada99be6 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -103,7 +103,8 @@ in [ "/bin" "/etc/xdg" "/info" - "/lib" + "/lib" # FIXME: remove + #"/lib/debug/.build-id" # enables GDB to find separated debug info "/man" "/sbin" "/share/applications" diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index d50822d4949..ee7f0595a1f 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; '' --with-gmp=${gmp} --with-mpfr=${mpfr} --with-system-readline --with-expat --with-libexpat-prefix=${expat} + --with-separate-debug-dir=/run/current-system/sw/lib/debug '' + optionalString (target != null) " --target=${target.config}" + optionalString (elem stdenv.system platforms.cygwin) " --without-python"; From f81982e779e51402dc4e4717718b1ba50a739004 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Sep 2015 15:52:06 +0200 Subject: [PATCH 86/91] gdb: Update to 7.10 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index ee7f0595a1f..f90fcb817b1 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.9.1"; + basename = "gdb-7.10"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0h5sfg4ndhb8q4fxbq0hdxfjp35n6ih96f6x8yvb418s84x5976d"; + sha256 = "1a08c9svaihqmz2mm44il1gwa810gmwkckns8b0y0v3qz52amgby"; }; # I think python is not a native input, but I leave it From da0e642c2b12f974d77fce4ed2c180d2fa518970 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 14:12:24 +0200 Subject: [PATCH 87/91] tests/virtualbox: Add systemd-detect-virt subtest. Addresses #9876 in the way that we want to make sure that VirtualBox 5.x is going to be properly detected. Right now the result is "kvm", so the subtest fails as expected with: error: systemd-detect-virt returned "kvm" instead of "oracle" at (eval 14) line 414, <__ANONIO__> line 92. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index a944c9caf35..1a5a6f7b5bb 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -189,6 +189,8 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let }; testSubs = '' + my ${"$" + name}_sharepath = '${sharePath}'; + sub checkRunning_${name} { my $cmd = 'VBoxManage list runningvms | grep -q "^\"${name}\""'; my ($status, $out) = $machine->execute(ru $cmd); @@ -295,9 +297,15 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let echo "$otherIP reachable" | ${pkgs.netcat}/bin/netcat -clp 5678 || : ''; + sysdDetectVirt = pkgs: '' + ${pkgs.systemd}/bin/systemd-detect-virt > /mnt-root/result + ''; + vboxVMs = mapAttrs createVM { simple = {}; + detectvirt.vmScript = sysdDetectVirt; + test1.vmFlags = hostonlyVMFlags; test1.vmScript = dhcpScript; @@ -381,6 +389,18 @@ in { destroyVM_simple; + subtest "systemd-detect-virt", sub { + createVM_detectvirt; + vbm("startvm detectvirt"); + waitForStartup_detectvirt; + waitForVMBoot_detectvirt; + shutdownVM_detectvirt; + my $result = $machine->succeed("cat '$detectvirt_sharepath/result'"); + chomp $result; + die "systemd-detect-virt returned \"$result\" instead of \"oracle\"" + if $result ne "oracle"; + }; + subtest "net-hostonlyif", sub { createVM_test1; createVM_test2; From 389e654e0398a1ea64a58cca667808fe453a7611 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 12:51:58 +0200 Subject: [PATCH 88/91] systemd: Backport fix for detecting VirtualBox. This is a backport of systemd/systemd@e32886e. As noted by @ts468 in #9876, systemd-detect-virt will report KVM if we're running inside VirtualBox 5.x. Instead of just disabling the check, this essentially fixes systemd to be able to detect VirtualBox again. Tested this against nixos/tests/simple.nix (just to make sure systemd is still working) and nixos/tests/virtualbox.nix (all tests succeed). Thanks a lot to @ts468 for catching this and also to @domenkozar for testing various things concerning that bug. Fixes #9876. Signed-off-by: aszlig --- pkgs/os-specific/linux/systemd/fixes.patch | 41 ++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index 89a40f93b89..2997c02d26d 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -2145,10 +2145,47 @@ index 8d171a5..bd0d324 100644 bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update); diff --git a/src/shared/virt.c b/src/shared/virt.c -index f9c4e67..f10baab 100644 +index f9c4e67..f3104d5 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c -@@ -293,8 +293,26 @@ int detect_container(const char **id) { +@@ -151,7 +151,7 @@ int detect_vm(const char **id) { + _cleanup_free_ char *domcap = NULL, *cpuinfo_contents = NULL; + static thread_local int cached_found = -1; + static thread_local const char *cached_id = NULL; +- const char *_id = NULL; ++ const char *_id = NULL, *_id_cpuid = NULL; + int r; + + if (_likely_(cached_found >= 0)) { +@@ -197,10 +197,26 @@ int detect_vm(const char **id) { + + /* this will set _id to "other" and return 0 for unknown hypervisors */ + r = detect_vm_cpuid(&_id); +- if (r != 0) ++ ++ /* finish when found a known hypervisor other than kvm */ ++ if (r < 0 || (r > 0 && !streq(_id, "kvm"))) + goto finish; + ++ _id_cpuid = _id; ++ + r = detect_vm_dmi(&_id); ++ ++ /* kvm with and without Virtualbox */ ++ if (streq_ptr(_id_cpuid, "kvm")) { ++ if (r > 0 && streq(_id, "oracle")) ++ goto finish; ++ ++ _id = _id_cpuid; ++ r = 1; ++ goto finish; ++ } ++ ++ /* information from dmi */ + if (r != 0) + goto finish; + +@@ -293,8 +309,26 @@ int detect_container(const char **id) { r = read_one_line_file("/run/systemd/container", &m); if (r == -ENOENT) { From 39965bba04f42f64baf8321819fd899a4a2942bd Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 17 Sep 2015 15:48:06 +0200 Subject: [PATCH 89/91] maint script gnome-latest.sh: support point versions, handle 404 errors --- maintainers/scripts/gnome-latest.sh | 59 ++++++++++++++++++----------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh index 9186db5fda3..ccded6e6277 100755 --- a/maintainers/scripts/gnome-latest.sh +++ b/maintainers/scripts/gnome-latest.sh @@ -24,7 +24,7 @@ if [ "$FTP_CLIENT" = "lftp" ]; then } else ls_ftp() { - curl -l "$1"/ + curl -s -l "$1"/ } fi @@ -36,40 +36,53 @@ if [ -z "$majorVersion" ]; then read majorVersion fi +if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then + # not a major version + version="$majorVersion" + majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2) +fi + FTPDIR="${GNOME_FTP}/${project}/${majorVersion}" #version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//` # gnome's LATEST-IS is broken. Do not trust it. -files=$(ls_ftp "${FTPDIR}") -declare -A versions - -for f in $files; do - case $f in +if [ -z "$version" ]; then + files=$(ls_ftp "${FTPDIR}") + declare -A versions + + for f in $files; do + case $f in (LATEST-IS-*|*.news|*.changes|*.sha256sum|*.diff*): - ;; + ;; ($project-*.*.9*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - echo "Ignored unstable version ${tmp}" >&2 - ;; + tmp=${f#$project-} + tmp=${tmp%.tar*} + echo "Ignored unstable version ${tmp}" >&2 + ;; ($project-*.tar.*): - tmp=${f#$project-} - tmp=${tmp%.tar*} - versions[${tmp}]=1 - ;; + tmp=${f#$project-} + tmp=${tmp%.tar*} + versions[${tmp}]=1 + ;; (*): - echo "UNKNOWN FILE $f" - ;; - esac -done -echo "Found versions ${!versions[@]}" >&2 -version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1` -echo "Latest version is: ${version}" >&2 + echo "UNKNOWN FILE $f" + ;; + esac + done + echo "Found versions ${!versions[@]}" >&2 + version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1` + echo "Latest version is: ${version}" >&2 +fi name=${project}-${version} echo "Fetching .sha256 file" >&2 -sha256out=$(curl -s http://${FTPDIR}/${name}.sha256sum) +sha256out=$(curl -s -f http://${FTPDIR}/${name}.sha256sum) + +if [ "$?" -ne "0" ]; then + echo "Version not found" >&2 + exit 1 +fi extensions=( "xz" "bz2" "gz" ) echo "Choosing archive extension (known are ${extensions[@]})..." >&2 From dbdb732849501e75253c1fd671a3a6bf99b633ac Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 17 Sep 2015 16:55:31 +0200 Subject: [PATCH 90/91] maint script gnome-latest.sh: rename to gnome.sh, update src.nix --- .../scripts/{gnome-latest.sh => gnome.sh} | 54 ++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) rename maintainers/scripts/{gnome-latest.sh => gnome.sh} (72%) diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome.sh similarity index 72% rename from maintainers/scripts/gnome-latest.sh rename to maintainers/scripts/gnome.sh index ccded6e6277..9f2f976354f 100755 --- a/maintainers/scripts/gnome-latest.sh +++ b/maintainers/scripts/gnome.sh @@ -1,15 +1,26 @@ #!/usr/bin/env bash +set -o pipefail + GNOME_FTP="ftp.gnome.org/pub/GNOME/sources" -project=$1 - -if [ "$project" == "--help" ]; then - echo "Usage: $0 project [major.minor]" +usage() { + echo "Usage: $0 show|update project [major.minor]" >&2 exit 0 +} + +if [ "$#" -lt 1 ]; then + usage fi -majorVersion=$2 +action="$1" +project="$2" +majorVersion="$3" + +if [ "$action" != "show" ] && [ "$action" != "update" ]; then + echo "Unknown action $action" >&2 + usage +fi if [ -z "$project" ]; then echo "No project specified, exiting" @@ -31,6 +42,11 @@ fi if [ -z "$majorVersion" ]; then echo "Looking for available versions..." >&2 available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` ) + if [ "$?" -ne "0" ]; then + echo "Project $project not found" >&2 + exit 1 + fi + echo -e "The following versions are available:\n ${available_baseversions[@]}" >&2 echo -en "Choose one of them: " >&2 read majorVersion @@ -93,16 +109,30 @@ for ext in ${extensions[@]}; do break fi done -sha256=`nix-hash --to-base32 --type sha256 $sha256` echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 -cat < "$projectPath/src.nix" +else + echo -e "\n$src" +fi \ No newline at end of file From 67d2344120dadeb69b5070552058ab489c5f931e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 17 Sep 2015 17:01:59 +0200 Subject: [PATCH 91/91] gnome-shell: use src.nix --- maintainers/scripts/gnome.sh | 2 +- .../desktops/gnome-3/3.16/core/gnome-shell/default.nix | 7 +------ pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix | 10 ++++++++++ 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh index 9f2f976354f..cd2c5777403 100755 --- a/maintainers/scripts/gnome.sh +++ b/maintainers/scripts/gnome.sh @@ -111,7 +111,7 @@ for ext in ${extensions[@]}; do done echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 -src="# Autogenerated by maintainers/scripts/gnome-latest.sh +src="# Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { name = \"${project}-${version}\"; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix index ca50cf8218d..899efc5443b 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix @@ -8,12 +8,7 @@ # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup stdenv.mkDerivation rec { - name = "gnome-shell-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${gnome3.version}/${name}.tar.xz"; - sha256 = "00gjdfaznpnspb4jmjc19axiz6snd9drvqmzpq4sw0xh1ysgpncv"; - }; + inherit (import ./src.nix fetchurl) name src; # Needed to find /etc/NetworkManager/VPN configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix new file mode 100644 index 00000000000..782e18e4a9d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-shell-3.16.1"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-shell/3.16/gnome-shell-3.16.1.tar.xz; + sha256 = "9bd9fbb40fb003ae09bebfe29d5b6a569b1fbb4a81c92ac9bada5efb956bf201"; + }; +}