From c96bc1e5079fd5e178cc293533a2bf2f5b32e8e3 Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Thu, 26 Mar 2015 12:20:07 +0100 Subject: [PATCH 01/67] r-modules: fixing rggobi by adding initial expression for ggobi --- pkgs/development/r-modules/default.nix | 7 ++----- pkgs/tools/graphics/ggobi/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/graphics/ggobi/default.nix diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f662c26fe42..5769181fa00 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -267,6 +267,7 @@ let rgeos = [ pkgs.geos ]; rgl = [ pkgs.mesa pkgs.x11 ]; Rglpk = [ pkgs.glpk ]; + rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ]; RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; ridge = [ pkgs.gsl ]; @@ -339,6 +340,7 @@ let WideLM = [ pkgs.cudatoolkit ]; RCurl = [ pkgs.curl ]; R2SWF = [ pkgs.pkgconfig ]; + rggobi = [ pkgs.pkgconfig ]; RGtk2 = [ pkgs.pkgconfig ]; RProtoBuf = [ pkgs.pkgconfig ]; Rpoppler = [ pkgs.pkgconfig ]; @@ -664,7 +666,6 @@ let "BcDiag" # requires fabia "bdvis" # requres taxize "beadarrayFilter" # requires beadarray - "beadarrayMSV" # requires rggobi "bigGP" # requires MPI running. HELP WANTED! "bigpca" # requires NCmisc "Biograph" # requires mvna @@ -680,7 +681,6 @@ let "ChemoSpec" # depends on broken speaq "classGraph" # requires graph, and Rgraphviz "clpAPI" # requires clp - "clusterfly" # requires rggobi "compendiumdb" # requires Biobase "CORM" # requires limma "cplexAPI" # requires CPLEX @@ -821,7 +821,6 @@ let "permGPU" # requires Biobase "PhViD" # requires LBE "pi0" # requires qvalue - "PKgraph" # requires rggobi "plmDE" # requires limma "plsRcox" # requires survcomp "PMA" # requires impute @@ -855,7 +854,6 @@ let "REBayes" # requires Rmosek "RefFreeEWAS" # requires isva "retistruct" # depends on broken RImageJROI - "rggobi" # requires GGobi "RImageJROI" # requires spatstat "rjade" # requires V8 to build "rJPSGCS" # requires chopsticks @@ -886,7 +884,6 @@ let "selectspm" # depends on broken ecespa "semiArtificial" # requires RSNNS "SeqFeatR" # requires Biostrings, qvalue, and widgetTools - "SeqGrapheR" # requires rggobi "sequenza" # requires copynumber "SGCS" # requires spatstat "siar" # requires spatstat diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix new file mode 100644 index 00000000000..cf2c5598d2a --- /dev/null +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk2 }: + +stdenv.mkDerivation rec { + version = "2.1.11"; + name = "ggobi-${version}"; + + src = fetchurl { + url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2"; + sha256 = "2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7"; + }; + + buildInputs = [ pkgconfig libxml2 gtk2 ]; + + configureFlags = "--with-all-plugins"; + + meta = with stdenv.lib; { + description = "Visualization program for exploring high-dimensional data"; + homepage = http://www.ggobi.org/; + license = licenses.cpl10; + platforms = platforms.linux; + maintainers = [ maintainers.michelk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d2039624e0..1abb768f402 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1407,6 +1407,8 @@ let gftp = callPackage ../tools/networking/gftp { }; + ggobi = callPackage ../tools/graphics/ggobi { }; + gifsicle = callPackage ../tools/graphics/gifsicle { }; gitlab = callPackage ../applications/version-management/gitlab { From 6258728318fe55faef64285e614fe97edc7b9111 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 13:36:00 +0000 Subject: [PATCH 02/67] pythonPackages: notmuch: fix sourceRoot so that one can use overrides in top-level notmuch and still have this work --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c01b3b59ee0..bdc3be08bc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6885,7 +6885,7 @@ let src = pkgs.notmuch.src; - sourceRoot = "${pkgs.notmuch.name}/bindings/python"; + sourceRoot = "${pkgs.notmuch.src.name}/bindings/python"; buildInputs = with self; [ python pkgs.notmuch ]; From 3e15f6a3700968904c4a30c5a90c46d766856bbf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 21 Mar 2015 12:35:51 +0000 Subject: [PATCH 03/67] xscreensaver: change patchPhase into preConfigure so that one can use patches, fix a comment --- pkgs/misc/screensavers/xscreensaver/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index cb937a94000..1d039e0a440 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -18,14 +18,15 @@ stdenv.mkDerivation rec { libXxf86misc intltool ]; - patchPhase = + preConfigure = '' # Fix build error in version 5.18. Remove this patch when updating # to a later version. #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c - # Fix path to GTK. + + # Fix installation paths for GTK resources. sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ - -i driver/Makefile.in po/Makefile.in.in + -i driver/Makefile.in po/Makefile.in.in ''; configureFlags = From 94df35da1fdfd9ded4c902e7be595df674fb1b72 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 24 Mar 2015 22:54:31 +0000 Subject: [PATCH 04/67] emacs: ghc-mod: add the binary to user environment This is the correct way to do it, because users will expect to see the same ghc-mod both in emacs and in shell. --- pkgs/top-level/emacs-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index a5a087e16ad..4b23992d12a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -454,6 +454,7 @@ let self = _self // overrides; pname = "ghc"; version = external.ghc-mod.version; src = external.ghc-mod.src; + propagatedUserEnvPkgs = [ external.ghc-mod ]; fileSpecs = [ "elisp/*.el" ]; meta = { license = bsd3; }; }; From 1cef6dc89acdd7e00b2281f0d81e1c3bc136e7c2 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:55:59 -0500 Subject: [PATCH 05/67] SDL: Build on Darwin --- pkgs/development/libraries/SDL/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 3f1fbfcd6a9..6d6148e092a 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -7,7 +7,7 @@ # OSS is no longer supported, for it's much crappier than ALSA and # PulseAudio. -assert !(stdenv ? cross) -> alsaSupport || pulseaudioSupport; +assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { "--without-x" ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib"); + # Fix a build failure on OS X Mavericks + # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 + patches = stdenv.lib.optional stdenv.isDarwin [ (fetchurl { + url = "http://bugzilla-attachments.libsdl.org/attachment.cgi?id=1320"; + sha1 = "3137feb503a89a8d606405373905b92dcf7e293b"; + }) ]; + crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { patches = let f = rev: sha256: fetchurl { @@ -72,6 +79,6 @@ stdenv.mkDerivation rec { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db1d42c1614..f66870a8102 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7357,7 +7357,7 @@ let openglSupport = mesaSupported; alsaSupport = (!stdenv.isDarwin); x11Support = true; - pulseaudioSupport = true; + pulseaudioSupport = (!stdenv.isDarwin); # resolve the unrecognized -fpascal-strings option error stdenv = if stdenv.isDarwin From b5099669ace72ef8a9f3f3dd9808c34a7493dab9 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Thu, 5 Mar 2015 15:56:41 -0500 Subject: [PATCH 06/67] SDL_image: Enable building on Darwin --- pkgs/development/libraries/SDL_image/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 2aa122a8fb2..a1d83950477 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "SDL image library"; homepage = http://www.libsdl.org/projects/SDL_image/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From f56b17cb30bef87651462d00852928f8b40d404c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 26 Mar 2015 13:04:21 +0000 Subject: [PATCH 07/67] django: minimum supported python version for django 1.7 is 2.7 --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8281c25e4ea..4fab5c6ae47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3952,6 +3952,7 @@ let django_1_7 = buildPythonPackage rec { name = "Django-${version}"; version = "1.7.7"; + disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz"; From 46d1dd5b113db63949e9e50de405848f6c87c237 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 26 Mar 2015 21:42:36 +0000 Subject: [PATCH 08/67] Downgraded Emacs priority, for exuberant ctags Exuberant ctags works with Emacs among with other editors, and if installed is probably preferred to Emacs' ctags. --- pkgs/applications/editors/emacs-24/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index af5c11e69ae..83774206b5c 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -57,6 +57,9 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; platforms = platforms.all; + # So that Exuberant ctags is preferred + priority = 1; + longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp From 53d5b564d4108264907a674239e8258c24444c92 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:54:00 -0700 Subject: [PATCH 09/67] qemu: 2.2.0 -> 2.2.1 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7b329750ea5..69888e22a01 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - n = "qemu-2.2.0"; + n = "qemu-2.2.1"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; + sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; }; buildInputs = From c8a05f484f8c775f0d6723e491535738f4d6daf1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:57:59 -0700 Subject: [PATCH 10/67] usbredir: 0.6 -> 0.7 --- pkgs/development/libraries/usbredir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 7f05daab021..f970a63ff12 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usbredir-${version}"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "http://spice-space.org/download/usbredir/${name}.tar.bz2"; - sha256 = "028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf"; + sha256 = "1ah64271r83lvh8hrpkxzv0iwpga1wkrfkx4rkljpijx5dqs0qqa"; }; buildInputs = [ pkgconfig libusb ]; From e8a8f784713c9041f218ad55940b74396b6a70fa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 15:00:31 -0700 Subject: [PATCH 11/67] gptfdisk: 0.8.8 -> 1.0.0 --- pkgs/tools/system/gptfdisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 0fe4cbc986c..b8c92eeab56 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-0.8.8"; + name = "gptfdisk-1.0.0"; src = fetchurl { url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; - sha256 = "16myqa72mp0wyhca8il299h1gd6k6sr7m52qcr97j840wk0fjcac"; + sha256 = "0v0xl0mzwabdf9yisgsvkhpyi48kbik35c6df42gr6d78dkrarjv"; }; buildInputs = [ libuuid popt icu ncurses ]; From 65e303570e15465319301414024c788d03010e8c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 15:04:44 -0700 Subject: [PATCH 12/67] macchanger: 1.6.0 -> 1.7.0 --- pkgs/os-specific/linux/macchanger/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1ab7a600fcd..b6ae89afbaf 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook, texinfo }: let pname = "macchanger"; - version = "1.6.0"; + version = "1.7.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "31534f138f1d21fa247be74ba6bef3fbfa47bbcd5033e99bd10c432fe58e51f7"; + + src = fetchFromGitHub { + owner = "alobbs"; + repo = "macchanger"; + rev = version; + sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r"; }; + buildInputs = [ autoreconfHook texinfo ]; + meta = { description = "A utility for viewing/manipulating the MAC address of network interfaces"; maintainers = [ stdenv.lib.maintainers.joachifm ]; From c7a0045b80ddf199af66246477eae267576b3b20 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:07:02 -0700 Subject: [PATCH 13/67] openntpd: 5.7p3 -> 5.7p4 --- pkgs/tools/networking/openntpd/default.nix | 16 +++++++++--- .../networking/openntpd/no-install.patch | 26 ------------------- 2 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 pkgs/tools/networking/openntpd/no-install.patch diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 167fea80622..55147464416 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,15 +5,13 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "5.7p3"; + version = "5.7p4"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "4f417c8a4c21ed7ec3811107829f931404f9bf121855b8571a2ca3355695343a"; + sha256 = "08ybpi351284wj53qqrmg13j8l7md397yrqsmg0aqxg3frcxk4x9"; }; - patches = [ ./no-install.patch ]; - configureFlags = [ "--with-privsep-path=${privsepPath}" "--with-privsep-user=${privsepUser}" @@ -23,6 +21,16 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; + meta = with stdenv.lib; { homepage = "http://www.openntpd.org/"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/openntpd/no-install.patch b/pkgs/tools/networking/openntpd/no-install.patch deleted file mode 100644 index 0194e414062..00000000000 --- a/pkgs/tools/networking/openntpd/no-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 81549cf..1262bbf 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1740,21 +1740,6 @@ uninstall-man: uninstall-man5 uninstall-man8 - - install-exec-hook: - @ln -f "$(DESTDIR)$(sbindir)/ntpd" "$(DESTDIR)$(sbindir)/ntpctl" -- @if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(sysconfdir)"; \ -- fi -- @if [ ! -d "$(DESTDIR)$(localstatedir)/run" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/run"; \ -- fi -- @if [ ! -d "$(DESTDIR)$(localstatedir)/db" ]; then \ -- $(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/db"; \ -- fi -- @if [ ! -f "$(DESTDIR)$(sysconfdir)/ntpd.conf" ]; then \ -- $(INSTALL) -m 644 "$(srcdir)/ntpd.conf" "$(DESTDIR)$(sysconfdir)/ntpd.conf"; \ -- else \ -- echo; \ -- echo " $(DESTDIR)$(sysconfdir)/ntpd.conf already exists, install will not overwrite"; \ -- fi - @if [ ! -d "$(PRIVSEP_PATH)" ]; then \ - echo; \ - echo " Please created a privilege separation directory for ntpd." ; \ From b91bac282d31a72a32bd764967dc8f961d9f2022 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:18:17 -0700 Subject: [PATCH 14/67] cups: Fix gmp linking by propagating --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 68972c2e6c3..d2170cfc332 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, acl +, dbus, acl, gmp , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; - propagatedBuildInputs = [ openssl ]; + propagatedBuildInputs = [ openssl gmp ]; configureFlags = [ "--localstatedir=/var" From b6607a14af1bbc534cf7a7707f04d28db09d8784 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:18:35 -0700 Subject: [PATCH 15/67] ettercap: 0.8.1 -> 0.8.2 --- pkgs/applications/networking/sniffers/ettercap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 7e32a26abf1..3ff12c274d5 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ettercap-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Ettercap"; repo = "ettercap"; rev = "v${version}"; - sha256 = "017398fiqcl2x1bjfnz97y6j8v5n83gbsniy73vbx21kmhh5pacg"; + sha256 = "1kvrzv2f8kxy7pndfadkzv10cs5wsyfkaa1ski20r2mq4wrvd0cd"; }; buildInputs = [ From d6cd4c57dc6a3cae3a3675fea38a7d564babdd7e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 14:38:42 -0700 Subject: [PATCH 16/67] bluedevil: 1.3.1 -> 2.1.1 --- pkgs/tools/bluetooth/bluedevil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index e5a4f83ab0f..229b0512679 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bluedevil"; - version = "1.3.1"; + version = "2.1.1"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0di3hwgqzhx51x172wnbccf9f84cg69mab83qkcif0v3gv3pzy4f"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi"; }; buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ]; From 7b5f6ca9ba36fb1430f5ef5d54ee1d2ee6c2580c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:39:15 -0700 Subject: [PATCH 17/67] prosody: 0.9.7 -> 0.9.8 --- pkgs/servers/xmpp/prosody/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 67882b1a02a..684a06eff4a 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -14,11 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; name = "prosody-${version}"; + src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "001fgslg3h7zfrfpkmqixnz5ircq6l0kr4wci5aj0i3nk6rrjjyx"; + sha256 = "0wbq4ps69l09fjb5dfjzab6i30hzpi4bvyj5kc44gf70arf42w4l"; }; communityModules = fetchhg { From cd3b4602003283e1fc820316d86c23bbb218254f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:40:56 -0700 Subject: [PATCH 18/67] tig: 2.0.3 -> 2.1 --- .../version-management/git-and-tools/tig/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 4c82c96a7c1..c8973e4a660 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tig-2.0.3"; + name = "tig-2.1"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "1i4nizachq0ncq0d8c87ly50zk51vgzb5a8amqscywdp1kc0zb7s"; - + sha256 = "1c1w6w39a1dwx4whrg0ga1mhrlz095hz875z7ajn6xgmhkv8fqih"; }; buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]; From 0a8efb537b4567de62fae09c8eb179039345f1cf Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 16:52:41 -0700 Subject: [PATCH 19/67] librsync: 0.9.7 -> 1.0.0 --- .../libraries/librsync/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 76daf7d748b..c5a7a7202e2 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,22 +1,29 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, autoreconfHook, perl, zlib, bzip2, popt }: -stdenv.mkDerivation { - name = "librsync-0.9.7"; +stdenv.mkDerivation rec { + name = "librsync-${version}"; + version = "1.0.0"; - src = fetchurl { - url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz; - sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; + src = fetchFromGitHub { + owner = "librsync"; + repo = "librsync"; + rev = "v${version}"; + sha256 = "0rc2pksdd0mhdvk8y1yix71rf19wdx1lb2ryrkhi7vcy240rvgvc"; }; + buildInputs = [ autoreconfHook perl zlib bzip2 popt ]; + configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; crossAttrs = { dontStrip = true; }; - meta = { + meta = with stdenv.lib; { homepage = http://librsync.sourceforge.net/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } From 06ea22649512dda634bd3f65a13b05e194e22fdc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:15:29 -0700 Subject: [PATCH 20/67] cgit: 0.10.2 -> 0.11.2 --- .../version-management/git-and-tools/cgit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 383114f1c3c..6cde64b3090 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "0.10.2"; + version = "0.11.2"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "13ac4rqmxc87ymh78ff8kbw1s252nbid71l0ircmj9kmh9jqwncl"; + sha256 = "0fryh56kyah7v9a8zzhbhwlyy2j116w87sxmgrn2kmwk0rvnw4if"; }; # cgit is tightly coupled with git and needs a git source tree to build. @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to # 1.9.2 (see the repository history) gitSrc = fetchurl { - url = "https://www.kernel.org/pub/software/scm/git/git-1.9.2.tar.xz"; - sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13"; + url = "mirror://kernel/software/scm/git/git-2.3.2.tar.xz"; + sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; }; buildInputs = [ From 611a4bfc0dfefc8388a5026fc1490247bdc3ac55 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:22:11 -0700 Subject: [PATCH 21/67] licenses: Add mpl-1.0 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index d4810d412b1..6d2a6c6aada 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -287,6 +287,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "MIT License"; }; + mpl10 = spdx { + spdxId = "MPL-1.0"; + fullName = "Mozilla Public License 1.0"; + }; + mpl11 = spdx { spdxId = "MPL-1.1"; fullName = "Mozilla Public License 1.1"; From 5e790f0e177494a2b7dcc5b737f9cc67fbf14a42 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:29:57 -0700 Subject: [PATCH 22/67] libical: 1.0.0 -> 1.0.1 --- .../development/libraries/libical/default.nix | 24 ++++++++++++++----- .../libraries/libical/respect-env-tzdir.patch | 16 ++++++------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index dbb104546ad..6292318d5ca 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,13 +1,25 @@ -{stdenv, fetchurl, perl, cmake}: +{ stdenv, fetchFromGitHub, perl, cmake }: stdenv.mkDerivation rec { - pName = "libical"; - name = "${pName}-1.0"; - src = fetchurl { - url = "mirror://sourceforge/freeassociation/${pName}/${name}/${name}.tar.gz"; - sha256 = "1dy0drz9hy0sn2q3s2lp00jb9bis5gsm7n3m4zga49s9ir2b6fbw"; + name = "libical-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "libical"; + repo = "libical"; + rev = "v${version}"; + sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9"; }; + nativeBuildInputs = [ perl cmake ]; patches = [ ./respect-env-tzdir.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libical/libical; + description = "an Open Source implementation of the iCalendar protocols"; + license = licenses.mpl10; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; } diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 12da8d41c7b..980a0d5c71a 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,21 +1,19 @@ -* Remove /usr/*/zoneinfo from the default search path -* Respect $TZDIR diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c -index adf7598..d2fd5c8 100644 +index fe984c9..22ba0a1 100644 --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c -@@ -108,7 +108,7 @@ typedef struct - - static int r_pos [] = {1, 2, 3, -2, -1}; +@@ -107,7 +107,7 @@ typedef struct + char charcnt[4]; + } tzinfo; -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; +static char *search_paths [] = {"/etc/zoneinfo"}; static char *zdir = NULL; #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -195,6 +195,16 @@ set_zonedir (void) +@@ -194,6 +194,16 @@ set_zonedir (void) const char *fname = ZONES_TAB_SYSTEM_FILENAME; - int i; + unsigned int i; + const char *env_tzdir = strdup (getenv ("TZDIR")); + if (env_tzdir) { @@ -27,6 +25,6 @@ index adf7598..d2fd5c8 100644 + free (env_tzdir); + } + - for (i = 0;i < NUM_SEARCH_PATHS; i++) { + for (i = 0; i < NUM_SEARCH_PATHS; i++) { sprintf (file_path, "%s/%s", search_paths [i], fname); if (!access (file_path, F_OK|R_OK)) { From 82eb45bf99e2893b4dfb2b8d2ba48a0de6fa7f4e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:32:02 -0700 Subject: [PATCH 23/67] bluez5: 5.25 -> 5.29 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index e8be1b6b0e6..61d3667f165 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.25"; + name = "bluez-5.29"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "0c7xs4imwfgyx59qxbinfi403vhki1n8src1g87qlqz28lzjz9jw"; + sha256 = "1r7h8qr52n372r73fdyk804r92hqg9g6pvflwmak64y6brnnl8fz"; }; pythonPath = with pythonPackages; From 7719f7f23b8ad754d3a5916f5a218110c89eb69f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:40:11 -0700 Subject: [PATCH 24/67] mdadm: 3.3 -> 3.3.2 --- pkgs/os-specific/linux/mdadm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 48e1c178490..767f1e9ecae 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, groff }: stdenv.mkDerivation rec { - name = "mdadm-3.3"; + name = "mdadm-3.3.2"; src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; - sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww"; + url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; + sha256 = "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg"; }; nativeBuildInputs = [ groff ]; From 1eeee6c87c225b0c669997692a11c8983e30da05 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:54:08 -0700 Subject: [PATCH 25/67] libseccomp: 2.1.1 -> 2.2.0 --- .../libraries/libseccomp/default.nix | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index a66d31d2ec4..00655b51afc 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchurl, getopt, bash }: +{ stdenv, fetchFromGitHub, autoreconfHook, getopt }: stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.1.1"; + version = "2.2.0"; - src = fetchurl { - url = "mirror://sourceforge/libseccomp/libseccomp-${version}.tar.gz"; - sha256 = "0744mjx5m3jl1hzz13zypivl88m0wn44mf5gsrd3yf3w80gc24l8"; + src = fetchFromGitHub { + owner = "seccomp"; + repo = "libseccomp"; + rev = "v${version}"; + sha256 = "0vfd6hx92cp1jaqxxaj30r92bfm6fmamxi2yqxrl82mqism1lk84"; }; - # This fixes the check for 'getopt' to function appropriately. - # Additionally, this package can optionally include the kernel - # headers if they exist, or use its own inline copy of the source - # for talking to the seccomp filter - we opt to always use the - # inline copy + buildInputs = [ autoreconfHook getopt ]; + patchPhase = '' - substituteInPlace ./configure --replace "/bin/bash" "${bash}/bin/bash" - substituteInPlace ./configure --replace "verify_deps getopt" "" - substituteInPlace ./configure --replace getopt ${getopt}/bin/getopt - substituteInPlace ./configure --replace 'opt_sysinc_seccomp="yes"' 'opt_sysinc_seccomp="no"' + patchShebangs . ''; - meta = { + meta = with stdenv.lib; { description = "high level library for the Linux Kernel seccomp filter"; homepage = "http://sourceforge.net/projects/libseccomp"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } From 1697b2a2281b248fa9e053713e18b896b9b9bb5a Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 21:12:10 -0400 Subject: [PATCH 26/67] Added Eiffel Forum License v1 and v2 to lib/licenses.nix --- lib/licenses.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 9b3acf8653b..09c5fb21606 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -125,6 +125,16 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Common Public License 1.0"; }; + efl10 = spdx { + spdxId = "EFL-1.0"; + fullName = "Eiffel Forum License v1.0"; + }; + + efl20 = spdx { + spdxId = "EFL-2.0"; + fullName = "Eiffel Forum License v2.0"; + }; + epl10 = spdx { spdxId = "EPL-1.0"; fullName = "Eclipse Public License 1.0"; From 702590081b67a2f0dfc2744150741466eddd4344 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 18:11:39 -0700 Subject: [PATCH 27/67] cgmanager: Add derivation --- pkgs/os-specific/linux/cgmanager/default.nix | 36 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/os-specific/linux/cgmanager/default.nix diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix new file mode 100644 index 00000000000..79be500a13d --- /dev/null +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, libnih, dbus }: + +stdenv.mkDerivation rec { + name = "cgmanager-0.36"; + + src = fetchurl { + url = "https://linuxcontainers.org/downloads/cgmanager/${name}.tar.gz"; + sha256 = "039azd4ghpmiccd95ki8fna321kccapff00rib6hrdgg600pyw7l"; + }; + + buildInputs = [ pkgconfig libnih dbus ]; + + configureFlags = [ + "--with-init-script=systemd" + "--sysconfdir=/etc/" + "--localstatedir=/var" + ]; + + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; + + meta = with stdenv.lib; { + homepage = https://linuxcontainers.org/cgmanager/introduction/; + description = "a central privileged daemon that manages all your cgroups"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f25d37dd62..3e6d3fdd5f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8682,6 +8682,8 @@ let busybox = callPackage ../os-specific/linux/busybox { }; + cgmanager = callPackage ../os-specific/linux/cgmanager { }; + checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; checksec = callPackage ../os-specific/linux/checksec { }; From 26c7e2605ed7d8b9bcff55d7311ec7f3a4d427a7 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Mar 2015 17:54:25 -0700 Subject: [PATCH 28/67] lxc: 1.0.7 -> 1.1.1 --- pkgs/os-specific/linux/lxc/default.nix | 61 +++++++++++++------ .../lxc/install-localstatedir-in-store.patch | 15 ----- 2 files changed, 43 insertions(+), 33 deletions(-) delete mode 100644 pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 97f80b53032..9939a552574 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,38 +1,63 @@ -{ stdenv, autoreconfHook, fetchurl, libcap, libapparmor, perl, docbook2x -, docbook_xml_dtd_45, gnutls, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x +, docbook_xml_dtd_45, systemd +, libapparmor ? null, gnutls ? null, libseccomp ? null, cgmanager ? null +, libnih ? null, dbus ? null, libcap ? null }: +let + enableCgmanager = cgmanager != null && libnih != null && dbus != null; +in +with stdenv.lib; stdenv.mkDerivation rec { - name = "lxc-1.0.7"; + name = "lxc-1.1.1"; - src = fetchurl { - url = "http://github.com/lxc/lxc/archive/${name}.tar.gz"; - sha256 = "1wm8n1b8j3x37757h2yyz53k3b6r2r301fmkviqf4xp0jaav1cd0"; + src = fetchFromGitHub { + owner = "lxc"; + repo = "lxc"; + rev = name; + sha256 = "04zpznd364862y3dwn97klvwfw9i2b6n1lh4fkci0z74c6z9svql"; }; - buildInputs = [ libcap libapparmor perl docbook2x gnutls autoreconfHook pkgconfig ]; + buildInputs = [ + autoreconfHook pkgconfig perl docbook2x systemd + libapparmor gnutls libseccomp cgmanager libnih dbus libcap + ]; - patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ]; + patches = [ ./support-db2x.patch ]; - preConfigure = '' - export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml - substituteInPlace doc/rootfs/Makefile.am --replace '@LXCROOTFSMOUNT@' '$out/lib/lxc/rootfs' - substituteInPlace configure.ac --replace '$sysconfdir/' '/etc/' - substituteInPlace configure.ac --replace '$${sysconfdir}/' '/etc/' - ''; + XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; configureFlags = [ "--localstatedir=/var" + "--sysconfdir=/etc" "--with-rootfs-path=/var/lib/lxc/rootfs" + ] ++ optional (libapparmor != null) "--enable-apparmor" + ++ optional (gnutls != null) "--enable-gnutls" + ++ optional (libseccomp != null) "--enable-seccomp" + ++ optional (enableCgmanager) "--enable-cgmanager" + ++ optional (libcap != null) "--enable-capabilities" + ++ [ "--enable-doc" "--enable-tests" - "--enable-apparmor" ]; + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + + # Remove the unneeded var/lib directories + rm -rf $out/var + ''; + meta = { homepage = "http://lxc.sourceforge.net"; description = "userspace tools for Linux Containers, a lightweight virtualization system"; - license = stdenv.lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; longDescription = '' LXC is the userspace control package for Linux Containers, a @@ -42,7 +67,7 @@ stdenv.mkDerivation rec { mechanisms to Linux’s existing process management infrastructure. ''; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.linux; + maintainers = with maintainers; [ simons wkennington ]; }; } diff --git a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch deleted file mode 100644 index d45335a0232..00000000000 --- a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index eac2bfd..8f040d3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,8 +25,8 @@ pcdatadir = $(libdir)/pkgconfig - pcdata_DATA = lxc.pc - - install-data-local: -- $(MKDIR_P) $(DESTDIR)$(LXCPATH) -- $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc -+ $(MKDIR_P) $(out)$(LXCPATH) -+ $(MKDIR_P) $(out)$(localstatedir)/cache/lxc - - ChangeLog:: - @touch ChangeLog From b3e4968491844020d58014aaaf1189aab6f3158c Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Thu, 26 Mar 2015 22:28:09 -0400 Subject: [PATCH 29/67] Added willie package --- pkgs/top-level/python-packages.nix | 102 +++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f2d646c217..5966d4594b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7678,6 +7678,27 @@ let }; + + praw = pythonPackages.buildPythonPackage rec { + name = "praw-2.1.21"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/praw/praw-2.1.21.tar.gz"; + md5 = "3b0388c9105662f8be8f1a4d3a38216d"; + }; + + propagatedBuildInputs = with pythonPackages; [ update_checker six mock flake8 ]; + + # can't find the tests module? + doCheck = false; + + meta = with stdenv.lib; { + description = "Python Reddit API wrapper"; + homepage = http://praw.readthedocs.org/; + license = licenses.gpl3; + }; + }; + prettytable = buildPythonPackage rec { name = "prettytable-0.7.1"; @@ -8264,6 +8285,33 @@ let }; }; + + pyenchant = pythonPackages.buildPythonPackage rec { + name = "pyenchant-1.6.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyenchant/pyenchant-1.6.6.tar.gz"; + md5 = "9f5acfd87d04432bf8df5f9710a17358"; + }; + + propagatedBuildInputs = with pythonPackages; [ pkgs.enchant ]; + + patchPhase = let + path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; + in '' + sed -i "${path_hack_script}" enchant/_enchant.py + ''; + + # dictionaries needed for tests + doCheck = false; + + meta = with stdenv.lib; { + description = "pyenchant: Python bindings for the Enchant spellchecker"; + homepage = https://pythonhosted.org/pyenchant/; + license = licenses.lgpl21; + }; + }; + pyfeed = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; @@ -8320,6 +8368,24 @@ let }; }; + + pygeoip = pythonPackages.buildPythonPackage rec { + name = "pygeoip-0.3.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.3.2.tar.gz"; + md5 = "861664f8be3bed44820356539f2ea5b6"; + }; + + propagatedBuildInputs = with pythonPackages; [ ]; + + meta = with stdenv.lib; { + description = "Pure Python GeoIP API"; + homepage = https://github.com/appliedsec/pygeoip; + license = licenses.lgpl3Plus; + }; + }; + pyglet = buildPythonPackage rec { name = "pyglet-1.1.4"; @@ -11345,6 +11411,24 @@ let }; + + update_checker = pythonPackages.buildPythonPackage rec { + name = "update_checker-0.11"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/u/update_checker/update_checker-0.11.tar.gz"; + md5 = "1daa54bac316be6624d7ee77373144bb"; + }; + + propagatedBuildInputs = with pythonPackages; [ requests2 ]; + + meta = with stdenv.lib; { + description = "A python module that will check for package updates"; + homepage = https://github.com/bboe/update_checker; + license = licenses.bsd2; + }; + }; + urlgrabber = buildPythonPackage rec { name = "urlgrabber-3.9.1"; disabled = isPy3k; @@ -11700,6 +11784,24 @@ let }; + + willie = pythonPackages.buildPythonPackage rec { + name = "willie-5.2.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/willie/willie-5.2.0.tar.gz"; + md5 = "a19f8c34e10e3c2d0d915c894224e521"; + }; + + propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; + + meta = with stdenv.lib; { + description = "Willie is a simple, lightweight, open source, easy-to-use IRC utility bot, written in Python."; + homepage = http://willie.dftba.net/; + license = licenses.efl20; + }; + }; + wokkel = buildPythonPackage (rec { url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; name = nameFromURL url ".tar"; From a0154fed8c2e45da54caf330855c5c7eb3b7a758 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 26 Mar 2015 23:35:57 -0400 Subject: [PATCH 30/67] Update and simplify hologram expression --- pkgs/top-level/go-packages.nix | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 4f9f6947c98..3410bd0b8c5 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -626,33 +626,16 @@ let self = _self // overrides; _self = with self; { }; hologram = buildGoPackage rec { - rev = "6e81a11091f59a9392e424d8f1c42b4b813c4bff"; + rev = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c"; name = "hologram-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/AdRoll/hologram"; src = fetchFromGitHub { inherit rev; owner = "copumpkin"; repo = "hologram"; - sha256 = "1rpnc8sv9mwm9r9yfh8h2zxczznmvlhasrz55bcifmk4sym4ywq7"; + sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4"; }; - preBuild = '' - cd "go/src/$goPackagePath" - - govers -d -m code.google.com/p/goprotobuf github.com/golang/protobuf - - # Work around `go install` assuming containing directory is the executable name we want - for i in */bin; do - mv "$i" "$(dirname "$i")/$(dirname "$i")" - done - - # Generate protobuf definitions and static assets - sed -i '1s|^|SHELL = ${stdenv.shell}\n|' Makefile - make protocol/hologram.pb.go - make transport/remote/bindata.go - ''; - - buildInputs = [ pkgs.protobuf crypto protobuf goamz rgbterm go-bindata - go-homedir ldap g2s gox govers ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox govers ]; }; httprouter = buildGoPackage rec { @@ -1026,14 +1009,14 @@ let self = _self // overrides; _self = with self; { }; rgbterm = buildGoPackage rec { - rev = "9e3d038e1b8341ed7416c841a884cab4a3487941"; + rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/aybabtme/rgbterm"; src = fetchFromGitHub { inherit rev; owner = "aybabtme"; repo = "rgbterm"; - sha256 = "1pfg56pkm9clzd3c1s0czvydw1k35jggz9ydv8x2dbns3f7qn2ph"; + sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; }; }; From 6987f5bea9bb96d848dbccc81f335db469f09664 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 26 Mar 2015 23:40:40 -0400 Subject: [PATCH 31/67] Whoops, spurious dependency --- pkgs/top-level/go-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3410bd0b8c5..5a63be2e9c6 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -635,7 +635,7 @@ let self = _self // overrides; _self = with self; { repo = "hologram"; sha256 = "1ra6rdniqh3pi84fm29zam4irzv52a1dd2sppaqngk07f7rkkhi4"; }; - buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox govers ]; + buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ]; }; httprouter = buildGoPackage rec { From ba4f29aee6c431254f1c6d3fb6f37b2e643127d2 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Fri, 27 Mar 2015 00:56:44 -0400 Subject: [PATCH 32/67] update_checker doesn't pass tests --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5966d4594b1..7062834e72a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11422,6 +11422,8 @@ let propagatedBuildInputs = with pythonPackages; [ requests2 ]; + doCheck = false; + meta = with stdenv.lib; { description = "A python module that will check for package updates"; homepage = https://github.com/bboe/update_checker; From 9fc71d3bf63937952a92bc5249ac5e7b88c188d3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 27 Mar 2015 08:24:35 +0300 Subject: [PATCH 33/67] Add mkcl; patch by Tomas Hlavaty --- pkgs/development/compilers/mkcl/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/compilers/mkcl/default.nix diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix new file mode 100644 index 00000000000..2a34a5dc50b --- /dev/null +++ b/pkgs/development/compilers/mkcl/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, gmp }: + +stdenv.mkDerivation rec { + v = "1.1.9"; + name = "mkcl-${v}"; + + src = fetchgit { + url = "https://github.com/jcbeaudoin/mkcl.git"; + rev = "86768cc1dfc2cc9caa1fe9696584bb25ea6c1429"; + sha256 = "0ja7vyp5rjidb2a1gah35jqzqn6zjkikz5sd966p0f0wh26l6n03"; + }; + + propagatedBuildInputs = [ gmp ]; + + configureFlags = [ + "GMP_CFLAGS=-I${gmp}/include" + "GMP_LDFLAGS=-L${gmp}/lib" + ]; + + meta = { + description = "ANSI Common Lisp Implementation"; + homepage = https://common-lisp.net/project/mkcl/; + license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75167544379..eb6fb098a9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3858,6 +3858,8 @@ let mitscheme = callPackage ../development/compilers/mit-scheme { }; + mkcl = callPackage ../development/compilers/mkcl {}; + mlton = callPackage ../development/compilers/mlton { }; mono = callPackage ../development/compilers/mono { From fa8c5144070c8c2b8c096cb6d7084864e366b987 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Mar 2015 14:11:09 +0100 Subject: [PATCH 34/67] hackage-packages.nix: re-generate from Hackage 2015-03-26T14:11:09+0100 --- .../haskell-modules/hackage-packages.nix | 334 +++++++++++------- 1 file changed, 216 insertions(+), 118 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b84aa2f2a17..9fa2b6bc12c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -417,12 +417,12 @@ self: { }) {}; "ALUT" = callPackage - ({ mkDerivation, base, freealut, OpenAL, OpenGL }: + ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }: mkDerivation { pname = "ALUT"; - version = "2.3.0.2"; - sha256 = "02kfyb4g7sfjfzqlddxqbjffrj4a0gfrzkisdpbj2lw67j1gq5dp"; - buildDepends = [ base OpenAL OpenGL ]; + version = "2.4.0.0"; + sha256 = "0g8rzzk54y8d567dvj32bq0h409ag0am196kkirsjd6f58vgjp0g"; + buildDepends = [ base OpenAL StateVar transformers ]; extraLibraries = [ freealut ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; @@ -10529,8 +10529,8 @@ self: { }: mkDerivation { pname = "Nomyx"; - version = "0.7.5"; - sha256 = "1vnq19yh1sr39zch76fxangslx12zsv5w7p6nq48cbz8jix0ypxp"; + version = "0.7.6"; + sha256 = "1zbrirplcgff9z75lmamh0i5749m22kvnwcr3s51wajnvh982qi3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -10554,8 +10554,8 @@ self: { }: mkDerivation { pname = "Nomyx-Core"; - version = "0.7.5"; - sha256 = "0kd8rl0i7d4kbhnsakiqk0zmz956f12hccmql8fgnnww4fmf36zs"; + version = "0.7.6"; + sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq"; buildDepends = [ acid-state aeson base blaze-html blaze-markup bytestring data-lens data-lens-fd data-lens-template DebugTraceHelpers deepseq directory @@ -10577,8 +10577,8 @@ self: { }: mkDerivation { pname = "Nomyx-Language"; - version = "0.7.5"; - sha256 = "11480ggfphwdyakhch1i8fr3cqhdmx32jg5nj5pc43sk3bpq2dwk"; + version = "0.7.6"; + sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9"; buildDepends = [ base Boolean containers data-lens data-lens-fd data-lens-template DebugTraceHelpers ghc mtl old-locale random safe time @@ -10617,8 +10617,8 @@ self: { }: mkDerivation { pname = "Nomyx-Web"; - version = "0.7.5"; - sha256 = "161b87ysa9fh40r1z9cp1mzyrs5ws3d97bsrnqwgcaz4rhnjzyvb"; + version = "0.7.6"; + sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7"; buildDepends = [ base blaze-html blaze-markup bytestring data-lens data-lens-fd fb filepath happstack-authenticate happstack-server hscolour mtl @@ -10935,12 +10935,14 @@ self: { }) {}; "OpenAL" = callPackage - ({ mkDerivation, base, openal, OpenGL }: + ({ mkDerivation, base, ObjectName, openal, OpenGL, StateVar + , transformers + }: mkDerivation { pname = "OpenAL"; - version = "1.6.0.1"; - sha256 = "0m29p6mm87lbx1507n9w4ara4l1xva8j42xjp0771ngx4sbphn2y"; - buildDepends = [ base OpenGL ]; + version = "1.7.0.0"; + sha256 = "111r78zx39nyfnpq2pmy440bi4ymr6i2difwfaislvmjq43plhjw"; + buildDepends = [ base ObjectName OpenGL StateVar transformers ]; extraLibraries = [ openal ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; @@ -21054,10 +21056,8 @@ self: { }: mkDerivation { pname = "auto"; - version = "0.2.0.5"; - revision = "2"; - sha256 = "1c6n5yc24g3chm18c5jaspidgi064pbzbd9gnakxj6q0npwwmp1h"; - editedCabalFile = "21de0f6b3309a084876f2e6a3ef4a87a2953511d9d564528071c0a81bcf22dd0"; + version = "0.2.0.6"; + sha256 = "1k0nzhkn32jypf1yqjqadmqwq9ckyax23lmvwzz110fx657j1nhi"; buildDepends = [ base bytestring cereal containers deepseq MonadRandom profunctors random semigroups transformers @@ -21772,8 +21772,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.4.0"; - sha256 = "0cwx7irpzbl1g3wi4fcdjrkv2968517gljyvc9w8vm6f81wr2xcb"; + version = "0.4.1"; + sha256 = "1zylnxh6r6sbk6fyx3b5hh6msajrrr07nsb4hwqlh07n1zzavw7j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25273,19 +25273,22 @@ self: { }) {}; "blunt" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, containers - , haskell-src-exts, http-types, pointful, transformers, wai, warp + ({ mkDerivation, aeson, array, base, bytestring, clay, containers + , haskell-src-exts, http-types, jmacro, lucid, pointful, text + , transformers, wai, warp, wl-pprint-text }: mkDerivation { pname = "blunt"; - version = "0.0.12"; - sha256 = "19x4djczbzrjpqmcjz4pal0cks4xbrhgxw9gs45r6rbs3d7g06am"; + version = "0.0.13"; + sha256 = "1mawchdfywhs7gqfy1p91drfc4l31c2m2v8nkma5bg9i5zb81kyr"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson array base bytestring containers haskell-src-exts http-types - pointful transformers wai warp + aeson array base bytestring clay containers haskell-src-exts + http-types jmacro lucid pointful text transformers wai warp + wl-pprint-text ]; + homepage = "https://blunt.herokuapp.com"; description = "Point-free Haskell as a service"; license = stdenv.lib.licenses.mit; }) {}; @@ -25466,6 +25469,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "borel" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bimap, cassava + , ceilometer-common, chevalier-common, configurator, containers + , either, errors, hslogger, hspec, lens, lens-properties, marquise + , mtl, multiset, network, network-uri, pipes, pipes-concurrency + , pipes-safe, QuickCheck, text, time, transformers + , unordered-containers, vaultaire-common, vector, zeromq4-haskell + }: + mkDerivation { + pname = "borel"; + version = "0.18.0"; + sha256 = "0daayl70l8afpf6l4822nz2cqjy2k8zbrj89apipjbynsq543453"; + buildDepends = [ + aeson async attoparsec base bimap cassava ceilometer-common + chevalier-common configurator containers errors hslogger lens + marquise mtl multiset network network-uri pipes pipes-concurrency + pipes-safe text time transformers unordered-containers + vaultaire-common vector zeromq4-haskell + ]; + testDepends = [ + aeson async attoparsec base bimap cassava ceilometer-common + chevalier-common configurator containers either errors hslogger + hspec lens lens-properties marquise mtl multiset network + network-uri pipes pipes-concurrency pipes-safe QuickCheck text time + transformers unordered-containers vaultaire-common vector + zeromq4-haskell + ]; + homepage = "https://github.com/anchor/borel-core"; + description = "Metering System for OpenStack metrics provided by Vaultaire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bot" = callPackage ({ mkDerivation, arrows, base, Stream }: mkDerivation { @@ -26414,6 +26449,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bytestring-short" = callPackage + ({ mkDerivation, base, bytestring, deepseq, QuickCheck }: + mkDerivation { + pname = "bytestring-short"; + version = "0.0.1.0"; + sha256 = "034c63hw49sy4mg6xarf61d4f3shafj66v4sqky04sin460s28wv"; + buildDepends = [ base bytestring deepseq ]; + testDepends = [ base bytestring QuickCheck ]; + jailbreak = true; + description = "Backport copy of ShortByteString"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytestring-show" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , integer-gmp @@ -28577,8 +28625,8 @@ self: { }: mkDerivation { pname = "ceilometer-common"; - version = "0.2.2"; - sha256 = "01lvjyl884i6qcfxr7xj42g5spn1fx3jgcq1g8zv0b5y9jwpj7lr"; + version = "0.2.3"; + sha256 = "1zqqh7k627yw6vfcdihl2gw8hh3l9gxj283azmmcc9pm15grblps"; buildDepends = [ base bimap binary bytestring containers foldl lens pipes siphash template-haskell text vaultaire-common @@ -28589,7 +28637,7 @@ self: { text transformers vaultaire-common ]; homepage = "https://github.com/anchor/ceilometer-common"; - description = "Common Haskell types and encoding for ceilometer"; + description = "Common Haskell types and encoding for OpenStack Ceilometer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -29305,6 +29353,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chevalier-common" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, cereal, locators + , mtl, network, network-uri, protobuf, text, unordered-containers + , vaultaire-common, zeromq4-haskell + }: + mkDerivation { + pname = "chevalier-common"; + version = "0.6.0"; + sha256 = "0fg7cb5ds2ixk046isz6wala7azaxqlfsacb1p7l9j6din9mgzrs"; + buildDepends = [ + base bifunctors bytestring cereal locators mtl network network-uri + protobuf text unordered-containers vaultaire-common zeromq4-haskell + ]; + description = "Query interface for Chevalier"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chp" = callPackage ({ mkDerivation, base, containers, deepseq, extensible-exceptions , pretty, stm @@ -30770,8 +30835,8 @@ self: { }: mkDerivation { pname = "clustering"; - version = "0.1.1"; - sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws"; + version = "0.1.2"; + sha256 = "0idmh6k6j4dmnaf8zsvw30lkwsgk5hqvp4hlzfd4j6d9ah2pwmfp"; buildDepends = [ base binary containers matrices mwc-random primitive vector ]; @@ -34898,8 +34963,8 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "2.2.0"; - sha256 = "0f82hpw71yb7p3nfh4zpap8ag7dw3932qm9gvaw3b3xiild701gv"; + version = "2.2.1"; + sha256 = "06dl3jkv0ygyb42p89hifrsmcg8jipyag01ibwj3gr6kxm443cg7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -46041,6 +46106,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filtrable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "filtrable"; + version = "0.1.0.0"; + sha256 = "0hxnfjmwv1p1izxr5h7qrd5zdynj2c8k4zh198pinav5skf6v3kd"; + buildDepends = [ base ]; + jailbreak = true; + description = "Class of filtrable containers"; + license = "unknown"; + }) {}; + "final" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -49752,8 +49829,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.4.0"; - sha256 = "0d29bl64gsij7169wvqgdkr8vcn35jdbqyq2aky53wcbhw4kq7k7"; + version = "0.1.6.0"; + sha256 = "1j0axpzm1ysi6sv80rr2bka1wycinrnqvkpnxlb18yb3zbwijz76"; buildDepends = [ base ghc ]; buildTools = [ cpphs happy ]; patchPhase = '' @@ -50174,6 +50251,7 @@ self: { aeson base bytestring cassava containers directory filepath shake split text unordered-containers vector yaml ]; + jailbreak = true; homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; @@ -56967,8 +57045,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.13"; - sha256 = "1j2ka83s4fa8aqqnhvp83zqlp019ayznlkhd7pb6pqkd19npr78a"; + version = "0.3.0.15"; + sha256 = "1gxnwz7xzf4l0d4hwi8ij95910d38l89i9x3sw051zwn4fzns1cv"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base mtl resourcet scientific text @@ -61783,8 +61861,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "0.5.1.2"; - sha256 = "0vxlmlfyv3an8dhw5yrsnkaqhascdw3hdmpillrj266ag5w4b139"; + version = "0.5.2.1"; + sha256 = "0kff73g9gjvc035lw3420mxz9mp7pd1yl941wr3jagqnh6g1s85m"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -68136,13 +68214,13 @@ self: { "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, blaze-builder - , bytestring, containers, directory, doctest, filepath, hex, hspec - , PSQueue, text, unordered-containers, vector, word8 + , bytestring, containers, directory, doctest, filepath, Glob, hex + , hspec, PSQueue, text, unordered-containers, vector, word8 }: mkDerivation { pname = "http2"; - version = "0.8.0"; - sha256 = "1hvjb22jmmfrj0ym4sk4yn2y4x9manic42w7yfy8kckhihzh1j1s"; + version = "0.9.0"; + sha256 = "117s8kjbqhd034f483j2x3m2kkjl895b1bc1lxj35b6ar326fp2b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -68152,7 +68230,7 @@ self: { ]; testDepends = [ aeson aeson-pretty array base blaze-builder bytestring containers - directory doctest filepath hex hspec PSQueue text + directory doctest filepath Glob hex hspec PSQueue text unordered-containers vector word8 ]; description = "HTTP/2.0 library including frames and HPACK"; @@ -69203,12 +69281,12 @@ self: { }) {}; "hydrogen-multimap" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "hydrogen-multimap"; - version = "0.2"; - sha256 = "0v0yylh9zpfzyb19mhwwf6pw36pmpn3gj7cdiamqzz3db0zcadwb"; - buildDepends = [ base containers ]; + version = "0.3"; + sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93"; + buildDepends = [ base containers ghc-prim ]; homepage = "https://scravy.de/hydrogen-multimap/"; description = "Hydrogen Multimap"; license = stdenv.lib.licenses.mit; @@ -69228,19 +69306,19 @@ self: { }) {}; "hydrogen-prelude" = callPackage - ({ mkDerivation, array, base, cereal, containers, directory - , filepath, hashable, hydrogen-multimap, hydrogen-version, network - , process, random, regex-base, regex-tdfa, strict, time - , transformers, uuid + ({ mkDerivation, array, base, binary, bytestring, cereal + , containers, directory, filepath, hashable, hydrogen-multimap + , hydrogen-version, network, process, random, regex-base + , regex-tdfa, strict, text, time, transformers, uuid }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.19"; - sha256 = "0sl8gvihqhp7jrf6x6m6yg4kv4by63q6r4qi9bnlwbs3yykbriah"; + version = "0.20"; + sha256 = "18g3r95ssg385zqzny3137ms0ppv7d33xgvc4gvxkijv8cgj1697"; buildDepends = [ - array base cereal containers directory filepath hashable - hydrogen-multimap hydrogen-version network process random - regex-base regex-tdfa strict time transformers uuid + array base binary bytestring cereal containers directory filepath + hashable hydrogen-multimap hydrogen-version network process random + regex-base regex-tdfa strict text time transformers uuid ]; homepage = "http://scravy.de/hydrogen-prelude/"; description = "Hydrogen Prelude"; @@ -69297,8 +69375,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hydrogen-version"; - version = "1.3"; - sha256 = "1211ynxr4l1kwkxj37gyyfjcd8mmdajrnmwg9lwlf85dn49r4xzv"; + version = "1.4"; + sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38"; buildDepends = [ base ]; homepage = "https://scravy.de/hydrogen-version/"; description = "Hydrogen Version Type"; @@ -69926,40 +70004,40 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , classy-prelude, cmdargs, containers, directory, filepath, ghc - , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, http-client, http-client-tls, HUnit, ipython-kernel - , MissingH, mono-traversable, mtl, parsec, process, random, setenv - , shelly, split, stm, strict, system-argv0, system-filepath, tar - , template-haskell, text, transformers, unix, unordered-containers - , utf8-string, uuid, vector + ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db + , bytestring, cereal, classy-prelude, cmdargs, containers + , directory, filepath, ghc, ghc-parser, ghc-paths, haskeline + , haskell-src-exts, here, hlint, hspec, http-client + , http-client-tls, HUnit, ipython-kernel, MissingH + , mono-traversable, mtl, parsec, process, random, setenv, shelly + , split, stm, strict, system-argv0, system-filepath, tar, text + , transformers, unix, unordered-containers, utf8-string, uuid + , vector }: mkDerivation { pname = "ihaskell"; - version = "0.5.0.0"; - sha256 = "1vp31ihl2hbpw3fadwmdm6hg1692khmb1v7gzcqik162i65dyzrj"; + version = "0.6.0.0"; + sha256 = "15fsan1dxlmd7y31630rqrg9gaa205g3s89vlqnxjv0dfvs86qf0"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base base64-bytestring bytestring cereal classy-prelude - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client + aeson base base64-bytestring bin-package-db bytestring cereal + classy-prelude cmdargs containers directory filepath ghc ghc-parser + ghc-paths haskeline haskell-src-exts here hlint hspec http-client http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl parsec process random shelly split stm strict system-argv0 - system-filepath tar template-haskell text transformers unix - unordered-containers utf8-string uuid vector + system-filepath tar text transformers unix unordered-containers + utf8-string uuid vector ]; testDepends = [ - aeson base base64-bytestring bytestring cereal classy-prelude - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client + aeson base base64-bytestring bin-package-db bytestring cereal + classy-prelude cmdargs containers directory filepath ghc ghc-parser + ghc-paths haskeline haskell-src-exts here hlint hspec http-client http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl parsec process random setenv shelly split stm strict system-argv0 system-filepath tar text transformers unix unordered-containers utf8-string uuid vector ]; - jailbreak = true; homepage = "http://gibiansky.github.io/IHaskell/"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -70127,8 +70205,8 @@ self: { }: mkDerivation { pname = "ihaskell-rlangqq"; - version = "0.2.0.0"; - sha256 = "18681acd0wmmbalj87p4psis1qf84rzhvh8c1a96jgh5nv3rk5dn"; + version = "0.2.0.1"; + sha256 = "1si38n47p57kwqsmsqw9bnv4k6z3zd6n8f5kmsmmbcmjdqmi7i86"; buildDepends = [ base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat @@ -71669,18 +71747,18 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, parsec, tar, text, transformers, unix - , uuid, zeromq4-haskell + , directory, filepath, mtl, parsec, SHA, tar, text, transformers + , unix, uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.3.0.0"; - sha256 = "035cfq1dlkjmmfjkmfvkn4i4rx04wzsgz9s4dbdwhkx3x7bcj7sj"; + version = "0.6.0.0"; + sha256 = "0pk49hz2ba2ikd96nymrlk7nrd5sw1fmy7xbx24hrri5izqfjjli"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring cereal containers directory filepath mtl - parsec tar text transformers unix uuid zeromq4-haskell + parsec SHA tar text transformers unix uuid zeromq4-haskell ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; @@ -74617,15 +74695,14 @@ self: { }: mkDerivation { pname = "laika"; - version = "0.1.1"; - sha256 = "1ifs8brgbhzwl58ccnpyvfrkn1x27a38ylawik382n221sv28pj5"; + version = "0.1.3"; + sha256 = "1j9f76sch91igpgarw7pwzhymd6ji7wnwr9l8riallglphc55g7l"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -79927,6 +80004,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "machines-zlib" = callPackage + ({ mkDerivation, base, basic-prelude, machines, streaming-commons + }: + mkDerivation { + pname = "machines-zlib"; + version = "0.1.0"; + sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d"; + buildDepends = [ base basic-prelude machines streaming-commons ]; + homepage = "https://github.com/lshift/machines-zlib"; + description = "Decompression support for machines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "macho" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -86504,8 +86594,8 @@ self: { }: mkDerivation { pname = "network-anonymous-i2p"; - version = "0.9.2"; - sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8"; + version = "0.10.0"; + sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg"; buildDepends = [ attoparsec base bytestring exceptions mtl network network-attoparsec network-simple text transformers uuid @@ -92282,8 +92372,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.3"; - sha256 = "0z6vxh9pnq3ixmi7bcpn17wf4w1blj6l4k7lw39gzs7jjbcpijzr"; + version = "0.4"; + sha256 = "0vn5fy15yshr9ypz8qagnqsgkkn33qv19ayqp4fy5x5bv68y7a0b"; buildDepends = [ aeson base bytestring containers either HsOpenSSL http-streams http-types io-streams mtl network old-locale random text time @@ -93941,8 +94031,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.0.4"; - sha256 = "1cym8c5hjjs7i2gx4n9m7a9zg7dls4wqnnr5bravj7gv2gh9s67q"; + version = "0.2.0.5"; + sha256 = "046y5i4hw4a326r3145yrfd1p6sn3b9xsn6rdk73nv74ks4wrn5v"; buildDepends = [ base bytestring unix ]; testDepends = [ base bytestring doctest HUnit QuickCheck unix ]; description = "POSIX filepath/directory functionality"; @@ -95201,8 +95291,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.7.0.0"; - sha256 = "0ja4ba5w8rq3snmgaky8kxaq9s5h446kw7cbp7agrzc06w03xaci"; + version = "0.7.0.1"; + sha256 = "1dnarvm26xwrys8wjh43757r59pby41w5cizqwyg1zcr2qk7awd8"; buildDepends = [ base bifunctors bytestring conceit containers contravariant foldl free pipes pipes-bytestring pipes-concurrency pipes-parse @@ -104772,8 +104862,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.14.3"; - sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl"; + version = "0.15"; + sha256 = "02zqkm248fvv6nh10nj6rw7ks5w832q2zrzzk9z9gp1zrqnbhxhk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104848,6 +104938,7 @@ self: { version = "0.1.2"; sha256 = "1xsh6bjrr0l4vqn8iqlkv8s0y5qwaqqz3yjlxk0y3fsi1qz28yxs"; buildDepends = [ base bytestring css-text hjsmin shake text ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-minify"; description = "Shake Minify Rules"; license = stdenv.lib.licenses.bsd3; @@ -104860,6 +104951,7 @@ self: { version = "0.1.0"; sha256 = "158xjn4lzcj8gk4b9z4rhql7mqdp7v5x8rpc0sb3mlws2drr8yh0"; buildDepends = [ base bytestring bzlib shake tar ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Actions"; license = stdenv.lib.licenses.bsd3; @@ -112545,8 +112637,8 @@ self: { }: mkDerivation { pname = "system-fileio"; - version = "0.3.16.1"; - sha256 = "037p2i5gmcnw3qqh3yhn700w51kkyc7rpw9c77wlgdq5bgbyfkbk"; + version = "0.3.16.2"; + sha256 = "17mk1crlgrh9c9lfng6a2fdk49m2mbkkdlq5iysl1rzwkn12mmkd"; buildDepends = [ base bytestring system-filepath text time unix ]; testDepends = [ base bytestring chell system-filepath temporary text time @@ -121612,14 +121704,14 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.3"; - sha256 = "0zswcrd65dv8mnifh3h5hr1bmysc7mlqyyi4viln1is08daramzz"; + version = "0.2.4"; + sha256 = "1dfdfcvq6554dxda1h2mnl1ggm39k8w779836v3dwpi0wnq4x249"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers ]; homepage = "http://github.com/dmbarbour/haskell-vcache"; - description = "large, persistent, memcached values and structure sharing for Haskell"; + description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122118,8 +122210,10 @@ self: { ({ mkDerivation, alex, array, base, happy, monadLib }: mkDerivation { pname = "verilog"; - version = "0.0.9"; - sha256 = "0i7jc3lriy0ad4ixkf7lj7yis9lzs9j3wh5la7rlawvfq8hj0sag"; + version = "0.0.10"; + sha256 = "1kyhxxa1d1pqipq714nh60qh90pwb2b3a5wiy1h6yms77c2p4wq4"; + isLibrary = true; + isExecutable = true; buildDepends = [ array base monadLib ]; buildTools = [ alex happy ]; homepage = "http://github.com/tomahawkins/verilog"; @@ -122814,8 +122908,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.4.6"; - sha256 = "0vl6f2by245fg5sfbzj27zb5mmskqj2h4a68rhwdb8w7gsl2mxz5"; + version = "3.0.5"; + sha256 = "1z4ifsldm1j6kf7jnbq8j4pk39f5d51yrygaxfs1m3mnnvr8xl52"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers data-default-class deepseq directory @@ -124722,8 +124816,8 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.2.1"; - sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52"; + version = "0.1.2.2"; + sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; @@ -126257,14 +126351,18 @@ self: { }) {}; "xml-lens" = callPackage - ({ mkDerivation, base, containers, lens, text, xml-conduit }: + ({ mkDerivation, base, case-insensitive, containers, lens, text + , xml-conduit + }: mkDerivation { pname = "xml-lens"; - version = "0.1.6.2"; - sha256 = "14x3xz4rydl8x7ddznz90n3z5csy12c7l0r7bms8s7yqv4qzf6hz"; - buildDepends = [ base containers lens text xml-conduit ]; + version = "0.1.6.3"; + sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd"; + buildDepends = [ + base case-insensitive containers lens text xml-conduit + ]; homepage = "https://github.com/fumieval/xml-lens"; - description = "Lenses, traversals, prisms for xml-conduit"; + description = "Lenses, traversals, and prisms for xml-conduit"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127946,8 +128044,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.3"; - sha256 = "0k49s9cybr36knmx2lwapivszcq6xg67vpx5fw812dzv8x2cj714"; + version = "1.4.9"; + sha256 = "10rf7xrb0zrqpiv8149z52h1jx4nr96ajs2pxdr9avazprls9jmb"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit From 5f0d93351daa317a455518e94e503975c16a3bdd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Mar 2015 14:12:12 +0100 Subject: [PATCH 35/67] Bump cabal2nix to latest version. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 25839d0fed1..c01083df0fa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -655,8 +655,8 @@ self: super: { version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "a8eaadbe6529cabd5088b8ae24fb325fc85a50c1"; - sha256 = "08q6c6g6syf4qgmgmicq8gf3fmp2cvy9mm6wm0vi7wjll3i2dns1"; + rev = "d131b2b2db1bc37a10bbc40c3adea3f006633a5e"; + sha256 = "0s92mdkgjqkqby6b1lrxs5dh9ja49sj5jpdc56g5v8g03h3g9m0a"; deepClone = true; }; isLibrary = false; From 64a4fab42bccc18b1b0bd8521fa5c03a464c1e1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 15:33:53 +0100 Subject: [PATCH 36/67] ghc: bump version to 7.10.1 release --- pkgs/development/compilers/ghc/7.10.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 09d89b80f34..d39c4b921ba 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { - version = "7.10.0.20150316"; + version = "7.10.1"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; - sha256 = "0cqazqf90rsp2nl7pk46gki7lln9jks0h166i0bd1qsp5gc1xv13"; + url = "https://downloads.haskell.org/~ghc/7.10.1/${name}-src.tar.xz"; + sha256 = "181srnj3s5dcqb096yminjg50lq9cx57075n95y5hz33gbbf7wwj"; }; buildInputs = [ ghc perl ]; From 0e2257966f030799334a8df5cdf94977c3513c28 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Mar 2015 15:38:45 +0100 Subject: [PATCH 37/67] Disable packages that depend on Nothing in Nixpkgs should use , because it can cause Nixpkgs evaluation to depend in part on a different version of Nixpkgs, leading to unpredictable results (including evaluation errors). --- .../interpreters/ruby/bundler-env/default-gem-config.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index eba2a0b0a10..cf7bf881a8f 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -25,7 +25,7 @@ let v8 = v8_3_16_14; - mysql = (import {}).mysql; + mysql = assert false; (import {}).mysql; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb6fb098a9e..732b7612fcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1735,7 +1735,7 @@ let kexectools = callPackage ../os-specific/linux/kexectools { }; - keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; + #keybase-node-client = callPackage ../applications/misc/keybase-node-client { }; keychain = callPackage ../tools/misc/keychain { }; From 8b2f209838668ead093dec603bdfdb0347a69a07 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 16:42:06 +0100 Subject: [PATCH 38/67] mkDerivation: Use function arguments --- pkgs/stdenv/generic/default.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 751366e38d2..a53ccc3b60a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -83,7 +83,15 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. - mkDerivation = attrs: + mkDerivation = + { buildInputs ? [] + , nativeBuildInputs ? [] + , propagatedBuildInputs ? [] + , propagatedNativeBuildInputs ? [] + , crossConfig ? null + , meta ? {} + , passthru ? {} + , ... } @ attrs: let pos = if attrs.meta.description or null != null then @@ -122,13 +130,7 @@ let lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) - // (let - buildInputs = attrs.buildInputs or []; - nativeBuildInputs = attrs.nativeBuildInputs or []; - propagatedBuildInputs = attrs.propagatedBuildInputs or []; - propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or []; - crossConfig = attrs.crossConfig or null; - in + // { builder = attrs.realBuilder or shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; @@ -144,7 +146,7 @@ let nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs else []); propagatedNativeBuildInputs = propagatedNativeBuildInputs ++ (if crossConfig == null then propagatedBuildInputs 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 @@ -152,15 +154,15 @@ let # include it in the result, it *is* available to nix-env for # queries. We also a meta.position attribute here to # identify the source location of the package. - meta = attrs.meta or {} // (if pos != null then { - position = pos.file + ":" + (toString pos.line); + meta = meta // (if pos != null then { + position = pos.file + ":" + toString pos.line; } else {}); - passthru = attrs.passthru or {}; + inherit passthru; } // # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the # derivation (e.g., in assertions). - (attrs.passthru or {})); + passthru); # The stdenv that we are producing. result = From 5c0eb64d4312737f34b9f766f1836a6e75878251 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Mar 2015 16:11:18 +0100 Subject: [PATCH 39/67] Set more precise meta.position for Haskell packages --- .../haskell-modules/generic-builder.nix | 4 +++- pkgs/stdenv/generic/default.nix | 23 ++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4b0ddaf991c..3e9f82db359 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -43,7 +43,7 @@ , preFixup ? "", postFixup ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -}: +} @ args: assert pkgconfigDepends != [] -> pkgconfig != null; assert editedCabalFile != null -> revision != null; @@ -112,6 +112,8 @@ in stdenv.mkDerivation ({ name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; + pos = builtins.unsafeGetAttrPos "pname" args; + prePhases = ["setupCompilerEnvironmentPhase"]; preConfigurePhases = ["compileBuildDriverPhase"]; preInstallPhases = ["haddockPhase"]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index a53ccc3b60a..6960c84ba5e 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -69,8 +69,6 @@ let isUnfree (lib.lists.toList attrs.meta.license) && !allowUnfreePredicate attrs; - unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); - defaultNativeBuildInputs = extraBuildInputs ++ [ ../../build-support/setup-hooks/move-docs.sh ../../build-support/setup-hooks/compress-man-pages.sh @@ -91,19 +89,22 @@ let , crossConfig ? null , meta ? {} , passthru ? {} + , pos ? null # position used in error messages and for meta.position , ... } @ attrs: let - pos = - if attrs.meta.description or null != null then - unsafeGetAttrPos "description" attrs.meta + pos' = + if pos != null then + pos + else if attrs.meta.description or null != null then + builtins.unsafeGetAttrPos "description" attrs.meta else - unsafeGetAttrPos "name" attrs; - pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»"; + builtins.unsafeGetAttrPos "name" attrs; + pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»"; throwEvalHelp = unfreeOrBroken: whatIsWrong: assert builtins.elem unfreeOrBroken ["Unfree" "Broken" "blacklisted"]; - throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos'} ${whatIsWrong}, refusing to evaluate." + throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${whatIsWrong}, refusing to evaluate." + (lib.strings.optionalString (unfreeOrBroken != "blacklisted") '' For `nixos-rebuild` you can set @@ -129,7 +130,7 @@ let assert licenseAllowed attrs; lib.addPassthru (derivation ( - (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) + (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos"]) // { builder = attrs.realBuilder or shell; @@ -154,8 +155,8 @@ let # include it in the result, it *is* available to nix-env for # queries. We also a meta.position attribute here to # identify the source location of the package. - meta = meta // (if pos != null then { - position = pos.file + ":" + toString pos.line; + meta = meta // (if pos' != null then { + position = pos'.file + ":" + toString pos'.line; } else {}); inherit passthru; } // From c82dc7018de57f29c1812ac535c8b6a02a79eb99 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Mar 2015 16:13:18 +0100 Subject: [PATCH 40/67] Remove unused Darcs expression --- .../version-management/darcs/default.nix | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 pkgs/applications/version-management/darcs/default.nix diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix deleted file mode 100644 index d5f03a41f22..00000000000 --- a/pkgs/applications/version-management/darcs/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, curl, extensibleExceptions, filepath, hashedStorage -, haskeline, html, HTTP, mmap, mtl, network, networkUri, parsec -, random, regexCompat, tar, terminfo, text, utf8String, vector -, zlib -}: - -cabal.mkDerivation (self: { - pname = "darcs"; - version = "2.8.5"; - sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6"; - isLibrary = true; - isExecutable = true; - doCheck = false; - buildDepends = [ - extensibleExceptions filepath hashedStorage haskeline html HTTP - mmap mtl network networkUri parsec random regexCompat tar terminfo - text utf8String vector zlib - ]; - extraLibraries = [ curl ]; - postInstall = '' - mkdir -p $out/etc/bash_completion.d - mv contrib/darcs_completion $out/etc/bash_completion.d/darcs - ''; - patchPhase = '' - sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' darcs.cabal - ''; - meta = { - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; - license = "GPL"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) From c5aa2e7946690185e099725aba9669a9a6145b6d Mon Sep 17 00:00:00 2001 From: koral Date: Fri, 27 Mar 2015 15:57:03 +0000 Subject: [PATCH 41/67] grc: 1.5 -> 1.7 --- pkgs/tools/misc/grc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index de380222a66..9e6c31c055f 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.7"; name = "grc-${version}"; src = fetchurl { - url = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.tar.gz"; - sha256 = "1p6xffp5mmnaw9llvrd4rc7zd4l7b1m62dlmn3c8p1ina831yn52"; + url = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.orig.tar.gz"; + sha256 = "01hpvs5915ajcswm7kg4167qsa9kbg0snxxj5k3ymkz6c567dp70"; }; installPhase = '' From 52d77f2360140152c3d6a72bdb56ae5016ad95ea Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 Mar 2015 20:16:23 +0100 Subject: [PATCH 42/67] kona: reimplement using mkDerivation Also set supported platforms to `all`, per upstream, and specify license (ISC). --- .../development/interpreters/kona/default.nix | 60 +++++-------------- 1 file changed, 16 insertions(+), 44 deletions(-) diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 2a8f7ca2c30..ab89332046a 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,50 +1,22 @@ -x@{builderDefsPackage - , fetchgit - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["fetchgit"]; +{ stdenv, fetchgit }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); -in -rec { - srcDrv = a.fetchgit { - url = "https://github.com/kevinlawler/kona.git"; - inherit rev; - sha256 = "a8189c94fca3e62a740eb6823ab3fc571c0960ff5e7a3eb0353e5cf36ef9fdcb"; - }; - - src = "${srcDrv}/"; - - rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; - version = "git-${rev}"; +stdenv.mkDerivation rec { name = "kona-${version}"; - inherit buildInputs; + src = fetchgit { + url = "https://github.com/kevinlawler/kona.git"; + rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; + sha256 = "1jzxz5pg6p1y6nq3wyjyzxh0j72pzjrkm0mn1rs2mrm3zja9q658"; + }; + version = "git-${src.rev}"; - /* doConfigure should be removed if not needed */ - phaseNames = ["prepareOut" "doMakeInstall"]; - makeFlags = ["PREFIX=\$out"]; + makeFlags = "PREFIX=$(out)"; + preInstall = ''mkdir -p "$out/bin"''; - prepareOut = a.fullDepEntry '' - mkdir -p "$out/bin" - '' ["minInit" "defEnsureDir"]; - - meta = { + meta = with stdenv.lib; { description = "An interpreter of K, APL-like programming language"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.free; + homepage = https://github.com/kevinlawler/kona/; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + license = licenses.isc; }; - passthru = { - updateInfo = { - downloadPage = "https://github.com/kevinlawler/kona"; - }; - }; -}) x +} From 7a9e7905db4a5141c81c2338030afc5a38766f24 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 10:42:28 -0700 Subject: [PATCH 43/67] kernel: 3.10.72 -> 3.10.73 --- 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 31fe3081ab2..853b784a335 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, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.72"; + version = "3.10.73"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "17qfy5hmd2cn5wfk4mfvv9ygn958a4j75lsya9xdjrw10in1a22a"; + sha256 = "0xy8738sdbw7lbqwkmbhr2zghva5nyfqq163r6jmjr6cfw116kin"; }; features.iwlwifi = true; From ca12b0b30476ee6af4c01ad191169de9b63f2501 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 10:42:39 -0700 Subject: [PATCH 44/67] kernel: 3.19.2 -> 3.19.3 --- pkgs/os-specific/linux/kernel/linux-3.19.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix index 2a34202c895..10c6215f871 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.19.2"; + version = "3.19.3"; # Remember to update grsecurity! extraMeta.branch = "3.19"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0b8bfpfpyrpccb8v4nld0a0siricg8f3awmhz8wn4kwdvhhf83hc"; + sha256 = "0nis1r9fg562ysirzlyvfxvirpcfhxhhpfv3s13ccz20qiqiy46f"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a2473e3f4c8..9018ccb8a67 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.19.2"; - revision = "201503201903"; + { kversion = "3.19.3"; + revision = "201503270049"; branch = "test"; - sha256 = "0ha4hvf2c9im9cyq9sxdbdx165i6ngywf46899aq3giyw74gnpf3"; + sha256 = "0m76p947gr0bqk6xxb237bpf4ikxjzycjzq4i2szm4n86k9sfac0"; }; grsec_fix_path = From 304b3c077c5c5193710401346fa68c49775ca35c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 10:42:34 -0700 Subject: [PATCH 45/67] kernel: 3.14.36 -> 3.14.37 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index a1340335983..ea5a9f927d4 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, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.36"; + version = "3.14.37"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "03pl303z3vvldc3hamlrq77mcy66nsqdfk7yi43nzyrnmrby3l0r"; + sha256 = "1pq4i97vys38rl8ylx4s08qgh9yz3cl840j1f70yzakmc2017byc"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9018ccb8a67..6a4b707e777 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.36"; - revision = "201503182218"; + { kversion = "3.14.37"; + revision = "201503270048"; branch = "stable"; - sha256 = "14njc3xih3v38fnh7wrx7xdapqi67032qa6gp2qzhp41f5q7i4i8"; + sha256 = "1ryxh89m392mwqlwqiy3jszyhq9cxmvkv320di7hi50aqx8k2lqf"; }; grsecurity_unstable = grsecPatch From 933e6cc83244c974403e2bdbee63271a3c9db537 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 27 Mar 2015 17:58:55 +0100 Subject: [PATCH 46/67] kona: bump to 3.21 Use release tarball rather than GIT checkout. Note: disregard the platform and arch embedded in the release tarball name. --- pkgs/development/interpreters/kona/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index ab89332046a..03c836d9251 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "kona-${version}"; - src = fetchgit { - url = "https://github.com/kevinlawler/kona.git"; - rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; - sha256 = "1jzxz5pg6p1y6nq3wyjyzxh0j72pzjrkm0mn1rs2mrm3zja9q658"; + version = "3.21"; + src = fetchurl { + url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz"; + sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3"; }; - version = "git-${src.rev}"; makeFlags = "PREFIX=$(out)"; preInstall = ''mkdir -p "$out/bin"''; From 7215167342713d6ba65b0c3be6f6691d5495159e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 11:37:06 -0700 Subject: [PATCH 47/67] nss: 3.17.4 -> 3.18 --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a9c7d51923b..d86a55b78bd 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.17.4"; + version = "3.18"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/${name}.tar.gz"; - sha256 = "1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_RTM/src/${name}.tar.gz"; + sha256 = "0h0xy9kvd2s8r438q4dfn25cgvv5dc1hkm9lb4bgrxpr5bxv13b1"; }; buildInputs = [ nspr perl zlib sqlite ]; From f0742a4bfbbd9e66840fd422a5db3d0a21e331ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Mar 2015 19:44:19 +0100 Subject: [PATCH 48/67] cryptol is now available from Hackage, --- .../haskell-modules/configuration-common.nix | 5 ++++ .../configuration-ghc-7.6.x.nix | 26 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c01083df0fa..51cd53476ff 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -647,6 +647,11 @@ self: super: { # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); + # https://github.com/GaloisInc/cryptol/issues/197 + cryptol = overrideCabal super.cryptol (drv: { + postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs"; + }); + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index fceb444b3e2..d853e9265ba 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -70,30 +70,4 @@ self: super: { contravariant = addBuildDepend super.contravariant self.tagged; reflection = dontHaddock (addBuildDepend super.reflection self.tagged); -} // { - - # Not on Hackage. - cryptol = self.mkDerivation rec { - pname = "cryptol"; - version = "2.1.0"; - src = pkgs.fetchFromGitHub { - owner = "GaloisInc"; - repo = "cryptol"; - rev = "v${version}"; - sha256 = "00bmad3qc7h47j26xp7hbrlb0qv0f7k9spxgsc1f6lsmpgq9axr3"; - }; - isLibrary = true; - isExecutable = true; - buildDepends = with self; [ - ansi-terminal array async base containers deepseq directory - executable-path filepath GraphSCC haskeline monadLib mtl old-time - presburger pretty process QuickCheck random smtLib syb text - tf-random transformers utf8-string - ]; - buildTools = with self; [ alex happy Cabal_1_22_2_0 ]; - patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; - description = "Cryptol: The Language of Cryptography"; - license = pkgs.stdenv.lib.licenses.bsd3; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b461cc8d9..95734d55550 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3325,7 +3325,7 @@ let compcert = callPackage ../development/compilers/compcert {}; - cryptol = haskell-ng.packages.ghc763.cryptol; + cryptol = haskellngPackages.cryptol; cython = pythonPackages.cython; cython3 = python3Packages.cython; From 7f0e6b76ff9e1a548b5f251b5737b781df226e8b Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Fri, 27 Mar 2015 12:05:19 -0700 Subject: [PATCH 49/67] nano: patch for darwin --- pkgs/applications/editors/nano/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 3e777207fd0..e7b96bd4b7d 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { ${optionalString enableTiny "--enable-tiny"} ''; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/text.c --replace "__time_t" "time_t" + ''; + meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; From c9258a76bad8a47dfd3b473776aa499200d1e38d Mon Sep 17 00:00:00 2001 From: utdemir Date: Fri, 27 Mar 2015 22:53:11 +0200 Subject: [PATCH 50/67] Fix some build failures on GHC 7.10.1 --- .../configuration-ghc-7.10.x.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 f04ad96fc5f..6855a9b13a8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -89,13 +89,29 @@ self: super: { barecheck = doJailbreak super.barecheck; cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); + syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { + url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; + sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br"; + }); + + wl-pprint = overrideCabal super.wl-pprint (drv: { + patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; + }); + + wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { + patchPhase = '' + sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs + sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs + ''; + }); + # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; # Until the changes have been pushed to Hackage haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; - sha256 = "0ij5zi2sszqns46mhfb87fzrgn5lkdv8yf9iax7cbrxb4a2j4y1w"; + sha256 = "0idf12b2wd6chyvsgdcfl5kzx67crvgs1cqklx5say3426j57g4q"; }); foldl = appendPatch super.foldl (pkgs.fetchpatch { url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; @@ -108,7 +124,7 @@ self: super: { }); stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch { url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch"; - sha256 = "13n7wipaa1j2rghg2j68yjnda8a5galpv5sfz4j4d9509xakz25g"; + sha256 = "1j2a327m3bjl8k4dipc52nlh2ilg94gdcj9hdmdq62yh2drslvgx"; }); mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { url = "https://github.com/snoyberg/mono-traversable/pull/68.patch"; From 57d9198552487b80e97bf1930bfcabcb86b2fdf6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 28 Mar 2015 01:13:46 +0300 Subject: [PATCH 51/67] Adding Bluez 5.28; 5.29 breaks LibreOffice build --- pkgs/os-specific/linux/bluez/bluez5_28.nix | 79 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 83 insertions(+) create mode 100644 pkgs/os-specific/linux/bluez/bluez5_28.nix diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix new file mode 100644 index 00000000000..7f5a30144c8 --- /dev/null +++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, python, + pythonPackages, pythonDBus, readline, libsndfile, udev, libical, + systemd, enableWiimote ? false }: + +assert stdenv.isLinux; + +stdenv.mkDerivation rec { + name = "bluez-5.28"; + + src = fetchurl { + url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; + sha256 = "1a8qzh38wpq5c0rydpx9isf0jc6g14g2qs18j1rmi8a79f7v9fl5"; + }; + + pythonPath = with pythonPackages; + [ pythonDBus pygobject pygobject3 recursivePthLoader ]; + + buildInputs = + [ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython + readline libsndfile udev libical + # Disables GStreamer; not clear what it gains us other than a + # zillion extra dependencies. + # gstreamer gst_plugins_base + ]; + + preConfigure = '' + substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm + substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " + ''; + + configureFlags = [ + "--localstatedir=/var" + "--enable-library" + "--enable-cups" + "--with-dbusconfdir=$(out)/etc" + "--with-dbussystembusdir=$(out)/share/dbus-1/system-services" + "--with-dbussessionbusdir=$(out)/share/dbus-1/services" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-udevdir=$(out)/lib/udev" + ] ++ + stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]; + + # Work around `make install' trying to create /var/lib/bluetooth. + installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; + + makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; + + # FIXME: Move these into a separate package to prevent Bluez from + # depending on Python etc. + postInstall = '' + mkdir $out/test + cp -a test $out + pushd $out/test + for a in \ + simple-agent \ + test-adapter \ + test-device \ + test-thermometer \ + list-devices \ + monitor-bluetooth \ + ; do + ln -s ../test/$a $out/bin/bluez-$a + done + popd + wrapPythonProgramsIn $out/test "$out/test $pythonPath" + + # for bluez4 compatibility for NixOS + mkdir $out/sbin + ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd + ''; + + meta = with stdenv.lib; { + homepage = http://www.bluez.org/; + repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; + description = "Bluetooth support for Linux"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95734d55550..280cd0f3267 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8676,6 +8676,9 @@ let bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); + # Needed for LibreOffice + bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); + bluez = bluez4; inherit (pythonPackages) bedup; @@ -10970,6 +10973,7 @@ let harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; + bluez5 = bluez5_28; }; liferea = callPackage ../applications/networking/newsreaders/liferea { From 5d2fd00457c19fc92f5c9ebd9b61aa3702351b32 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 11:42:06 -0700 Subject: [PATCH 52/67] imagemagick: 6.9.0 -> 6.9.1 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 939b59b8d1c..d16aa03793f 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -20,7 +20,7 @@ let - version = "6.9.0-0"; + version = "6.9.1-0"; arch = if stdenv.system == "i686-linux" then "i686" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"; - sha256 = "1dmrl5x63msdnxsf4cmhz5v4ard2z3jrgp2zhqlb27399j81qcqj"; + sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j"; }; enableParallelBuilding = true; From 3a2df159e63e98a951171d837480c84584980218 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 12:41:22 -0700 Subject: [PATCH 53/67] libfpx: Add derivation --- pkgs/development/libraries/libfpx/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/libfpx/default.nix diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix new file mode 100644 index 00000000000..11ec1c0ecf3 --- /dev/null +++ b/pkgs/development/libraries/libfpx/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libfpx-1.3.1-4"; + + src = fetchurl { + url = "mirror://imagemagick/delegates/${name}.tar.xz"; + sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233"; + }; + + meta = with stdenv.lib; { + homepage = http://www.imagemagick.org; + description = "A library for manipulating FlashPIX images"; + license = "Flashpix"; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280cd0f3267..51ac5fb9741 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6314,6 +6314,8 @@ let libfprint = callPackage ../development/libraries/libfprint/master.nix { }; + libfpx = callPackage ../development/libraries/libfpx { }; + libgadu = callPackage ../development/libraries/libgadu { }; libgdata = gnome3.libgdata; From 8fbc082d1f829b11a9448921ef5b2e58fbf85e70 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 12:56:43 -0700 Subject: [PATCH 54/67] unrar: 5.1.7 -> 5.2.7 --- pkgs/tools/archivers/unrar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 1d11a8ab478..d973649c9ed 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: let - version = "5.1.7"; + version = "5.2.7"; in stdenv.mkDerivation { name = "unrar-${version}"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "13ida8vcamiagl40d9yfjma9k6givxczhx278f1p7bv9wgb8gfmc"; + sha256 = "1b1ggrqn020pvvh2ia98alqxpl1q3x65cb6zzqwv91rpjiz7a57g"; }; preBuild = '' @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utility for RAR archives"; homepage = http://www.rarlab.com/; - license = licenses.unfreeRedistributable; + license = licenses.gpl2; maintainers = [ maintainers.emery ]; platforms = platforms.all; }; From 4631afc21e920485f597c812c866c237dd60c698 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 13:22:51 -0700 Subject: [PATCH 55/67] Support unraring source files --- pkgs/build-support/builder-defs/builder-defs.nix | 4 ++++ pkgs/tools/archivers/unrar/default.nix | 2 ++ pkgs/tools/archivers/unrar/setup-hook.sh | 5 +++++ 3 files changed, 11 insertions(+) create mode 100644 pkgs/tools/archivers/unrar/setup-hook.sh diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index da5d2249852..42d8f35b076 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -23,6 +23,7 @@ let inherit (builtins) head tail trace; in else if hasSuffixHack ".tar.Z" s then "tZ" else if hasSuffixHack ".tar.lzma" s then "tar.lzma" else if hasSuffixHack ".tar.xz" s then "tar.xz" + else if hasSuffixHack ".rar" s then "rar" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" else if hasSuffixHack "-cvs-export" s then "cvs-dir" else if hasSuffixHack "-git-export" s then "git-dir" @@ -213,6 +214,9 @@ let inherit (builtins) head tail trace; in " else if (archiveType s) == "tar.xz" then " xz -d -c <'${s}' | tar xv cd \"\$(xz -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" + " else if (archiveType s) == "rar" then " + unrar x '${s}' + cd \"$(unrar lb '${s}' | tail -1 | sed -e 's@/.*@@' )\" " else if (archiveType s) == "zip" then " unzip '${s}' cd \"$( unzip -lqq '${s}' | tail -1 | diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index d973649c9ed..eb0d3a3bd83 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { $out/share/doc/unrar ''; + setupHook = ./setup-hook.sh; + meta = with stdenv.lib; { description = "Utility for RAR archives"; homepage = http://www.rarlab.com/; diff --git a/pkgs/tools/archivers/unrar/setup-hook.sh b/pkgs/tools/archivers/unrar/setup-hook.sh new file mode 100644 index 00000000000..41d6a5cd217 --- /dev/null +++ b/pkgs/tools/archivers/unrar/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_tryUnrar) +_tryUnrar() { + if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi + unrar x "$curSrc" >/dev/null +} From e632b7a0c9874ced23153ae3b577228f22b17438 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 14:09:22 -0700 Subject: [PATCH 56/67] djvulibre: Refactor --- pkgs/applications/misc/djvulibre/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 3a5cf4edc6f..b0f89cc5ea0 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -12,10 +12,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - meta = { + meta = with stdenv.lib; { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = with maintainers; [ urkud ]; + platforms = platforms.all; }; } From 8fd9a7cb59c1efaedc30396f38ebcf173e57dd28 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 14:29:38 -0700 Subject: [PATCH 57/67] lcms2: 2.6 -> 2.7 --- pkgs/development/libraries/lcms2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 8bb015a6c5f..db82c943d7c 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.6"; + name = "lcms2-2.7"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "1c8lgq8gfs3nyplvbx9k8wzfj6r2bqi3f611vb1m8z3476454wji"; + sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; From 29ea62382eac1d81e8301156143df1ee946066c5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 14:30:44 -0700 Subject: [PATCH 58/67] jbigkit: Add derivation --- .../development/libraries/jbigkit/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/jbigkit/default.nix diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix new file mode 100644 index 00000000000..8b95a8a4807 --- /dev/null +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jbigkit-2.1"; + + src = fetchurl { + url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; + }; + + installPhase = '' + install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a + install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a + install -D -m644 libjbig/jbig.h $out/include/jbig.h + install -D -m644 libjbig/jbig_ar.h $out/include/jbig_ar.h + install -D -m644 libjbig/jbig85.h $out/include/jbig85.h + + install -d -m755 $out/share/man/man1 + install -m644 pbmtools/*.1* $out/share/man/man1 + + install -D -m755 pbmtools/jbgtopbm $out/bin/jbgtopbm + install -D -m755 pbmtools/pbmtojbg $out/bin/pbmtojbg + install -D -m755 pbmtools/jbgtopbm85 $out/bin/jbgtopbm85 + install -D -m755 pbmtools/pbmtojbg85 $out/bin/pbmtojbg85 + ''; + + meta = with stdenv.lib; { + homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; + description = "a software implementation of the JBIG1 data compression standard"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51ac5fb9741..1c8a72956d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6077,6 +6077,8 @@ let jbig2dec = callPackage ../development/libraries/jbig2dec { }; + jbigkit = callPackage ../development/libraries/jbigkit { }; + jemalloc = callPackage ../development/libraries/jemalloc { }; jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; From bf562adad21ff78d193cd2dcc4f43f56e62e3838 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 14:37:45 -0700 Subject: [PATCH 59/67] liblqr: 0.4.1 -> 0.4.2 --- pkgs/development/libraries/liblqr-1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index c6323fcc84a..3af1227c69b 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "liblqr-1-0.4.1"; + name = "liblqr-1-0.4.2"; + src = fetchurl { url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2"; - sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; + sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; - configureFlags = "--enable-install-man"; meta = with stdenv.lib; { homepage = http://liblqr.wikidot.com; From 0cb847652e1101bf6fd4fb59c7b478f77634055f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:31:15 -0700 Subject: [PATCH 60/67] openjpeg: Fix pkgconfig file --- pkgs/development/libraries/openjpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index a635f68839b..4ffcd62f982 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { Name: openjp2 Description: JPEG2000 library (Part 1 and 2) URL: http://www.openjpeg.org/ - Version: @OPENJPEG_VERSION@ + Version: ${version} Libs: -L$out/lib -lopenjp2 Cflags: -I$out/include EOF From c8021333d4b6380dce4d46e00b75760fe5c860c3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:34:06 -0700 Subject: [PATCH 61/67] jbigkit: Needs fPIC for library support --- pkgs/development/libraries/jbigkit/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 8b95a8a4807..af2611a0bae 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; + postPatch = '' + sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile + ''; + installPhase = '' install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a From 1f82542fcba27b33c1d796dec5c8974c5494322d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:34:55 -0700 Subject: [PATCH 62/67] librsvg: 2.36.4 -> 2.40.9 --- pkgs/development/libraries/librsvg/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 808407877e9..3ed89ec8a8a 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf , bzip2, libcroco -, gtk2 ? null, gtk3 ? null +, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.36.4"; # 2.37 needs pango 1.32.6, 2.40 doesn't support gtk2 + name = "librsvg-2.40.9"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; - sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; + url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; + sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk"; }; buildInputs = [ libxml2 libgsf bzip2 libcroco pango ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk2 gtk3 ]; + propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c8a72956d5..9618bf13d9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6671,9 +6671,7 @@ let libqalculate = callPackage ../development/libraries/libqalculate { }; - librsvg = callPackage ../development/libraries/librsvg { - gtk2 = null; gtk3 = null; # neither gtk version by default - }; + librsvg = callPackage ../development/libraries/librsvg { }; librsync = callPackage ../development/libraries/librsync { }; From 1f632813e40a5955e479859201b6f844ace11b88 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:36:11 -0700 Subject: [PATCH 63/67] imagemagick: Refactor --- .../graphics/ImageMagick/default.nix | 98 ++++++++++++------- pkgs/top-level/all-packages.nix | 36 ++++++- 2 files changed, 95 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d16aa03793f..ec3ebc0bad6 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,21 +1,11 @@ -{ lib -, stdenv -, fetchurl -, pkgconfig -, bzip2 -, fontconfig -, freetype -, ghostscript ? null -, libjpeg -, libpng -, libtiff -, libxml2 -, zlib -, libtool -, jasper -, libX11 -, tetex ? null -, librsvg ? null +{ stdenv, fetchurl, pkgconfig, libtool +, libcl ? null, perl ? null, jemalloc ? null, bzip2 ? null, zlib ? null +, libX11 ? null, libXext ? null, libXt ? null, dejavu_fonts ? null, fftw ? null +, libfpx ? null, djvulibre ? null, fontconfig ? null, freetype ? null +, ghostscript ? null, graphviz ? null, jbigkit ? null, libjpeg ? null +, lcms2 ? null, openjpeg ? null, liblqr1 ? null, xz ? null, openexr ? null +, pango ? null, libpng ? null, librsvg ? null, libtiff ? null, libwebp ? null +, libxml2 ? null }: let @@ -27,8 +17,15 @@ let else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; + mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}"; + mkWith = mkFlag "with" "without"; + mkEnable = mkFlag "enable" "disable"; + + hasX11 = libX11 != null && libXext != null && libXt != null; + in +with stdenv.lib; stdenv.mkDerivation rec { name = "imagemagick-${version}"; @@ -39,26 +36,55 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = if tetex != null then - '' - export DVIDecodeDelegate=${tetex}/bin/dvips - '' else ""; + #preConfigure = if tetex != null then + # '' + # export DVIDecodeDelegate=${tetex}/bin/dvips + # '' else ""; - configureFlags = - [ "--with-frozenpaths" ] - ++ [ "--with-gcc-arch=${arch}" ] - ++ lib.optional (librsvg != null) "--with-rsvg" - ++ lib.optionals (stdenv.system != "x86_64-darwin") - [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" - "--with-gslib" - ]; + configureFlags = [ + (mkEnable (libcl != null) "opencl") + (mkWith true "modules") + (mkWith true "gcc-arch=${arch}") + (mkEnable true "hdri") + (mkWith (perl != null) "perl") + (mkWith (jemalloc != null) "jemalloc") + (mkWith true "frozenpaths") + (mkWith (bzip2 != null) "bzlib") + (mkWith hasX11 "x") + (mkWith (zlib != null) "zlib") + (mkWith false "dps") + (mkWith (fftw != null) "fftw") + (mkWith (libfpx != null) "fpx") + (mkWith (djvulibre != null) "djvu") + (mkWith (fontconfig != null) "fontconfig") + (mkWith (freetype != null) "freetype") + (mkWith (ghostscript != null) "gslib") + (mkWith (graphviz != null) "gvc") + (mkWith (jbigkit != null) "jbig") + (mkWith (libjpeg != null) "jpeg") + (mkWith (lcms2 != null) "lcms2") + (mkWith false "lcms") + (mkWith (openjpeg != null) "openjp2") + (mkWith (liblqr1 != null) "lqr") + (mkWith (xz != null) "lzma") + (mkWith (openexr != null) "openexr") + (mkWith (pango != null) "pango") + (mkWith (libpng != null) "png") + (mkWith (librsvg != null) "rsvg") + (mkWith (libtiff != null) "tiff") + (mkWith (libwebp != null) "webp") + (mkWith (libxml2 != null) "xml") + ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" + ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; - propagatedBuildInputs = - [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg - libtool jasper libX11 - ] ++ lib.optional (stdenv.system != "x86_64-darwin") ghostscript; + propagatedBuildInputs = [ ]; - buildInputs = [ tetex pkgconfig ]; + buildInputs = [ + pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw + libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg + lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp + libxml2 + ]; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; @@ -66,6 +92,6 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ the-kenny wkennington ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9618bf13d9c..41106d957c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10816,12 +10816,42 @@ let AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { - tetex = null; + imagemagick_light = imagemagick.override { + libcl = null; + perl = null; + jemalloc = null; + bzip2 = null; + zlib = null; + libX11 = null; + libXext = null; + libXt = null; + dejavu_fonts = null; + fftw = null; + libfpx = null; + djvulibre = null; + fontconfig = null; + freetype = null; + ghostscript = null; + graphviz = null; + jbigkit = null; + libjpeg = null; + lcms2 = null; + openjpeg = null; + liblqr1 = null; + xz = null; + openexr = null; + pango = null; + libpng = null; librsvg = null; + libtiff = null; + libwebp = null; + libxml2 = null; }; - imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { }); + imagemagick = callPackage ../applications/graphics/ImageMagick { + ghostscript = if stdenv.isDarwin then null else ghostscript; + perl = null; # Currently Broken + }; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { From 49e980fa3249bbedbaecfba59d9833f668326311 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:46:08 -0700 Subject: [PATCH 64/67] imagemagick: More cleanups --- pkgs/applications/graphics/ImageMagick/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index ec3ebc0bad6..35e12e8a8c7 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -36,11 +36,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - #preConfigure = if tetex != null then - # '' - # export DVIDecodeDelegate=${tetex}/bin/dvips - # '' else ""; - configureFlags = [ (mkEnable (libcl != null) "opencl") (mkWith true "modules") @@ -77,8 +72,6 @@ stdenv.mkDerivation rec { ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; - propagatedBuildInputs = [ ]; - buildInputs = [ pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg From c7bf9d2749544e2f861da14abbfa5f436fb0634f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:50:47 -0700 Subject: [PATCH 65/67] spl_git: 2015-03-20 -> 2015-03-25 --- pkgs/os-specific/linux/spl/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 5c3ccd86120..be09b424a6b 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-20"; + version = "2015-03-25"; src = fetchgit { url = git://github.com/zfsonlinux/spl.git; - rev = "79a0056e137c9cc540eb9ff7327c85ac8d094e6c"; - sha256 = "0xj132x0q76h9anjh7km2blqnr19yx7szwifj02x5h6xa07vq6fd"; + rev = "a4f54cf036d9a966ff87abe9a0063f2b457c2389"; + sha256 = "0n10icwmnx3y6201fncswhd1mfvs6xyk8praj27z0wnzxs1i4k96"; }; patches = [ ./const.patch ./install_prefix-git.patch ]; From 123bde971eb55fdac715562075c499062b72eaf9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 15:52:44 -0700 Subject: [PATCH 66/67] zfs_git: 2015-03-20 -> 2015-03-25 --- pkgs/os-specific/linux/zfs/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 62600886fa6..fb7b7f76ee4 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,12 @@ { callPackage, stdenv, fetchgit, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-03-20"; + version = "2015-03-25"; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "bc88866657979c5658441e201e19df365c67ddfe"; - sha256 = "1d97xw7cak64f0ywwskjssnryljidf4hpngmqv0mmz4lk4hwirm9"; + rev = "7d90f569b3f05def7cbd0a52ce8ac3040364d702"; + sha256 = "09qcfd3h6zjwvgr1prs41qi8wlzvdv8x4sfrcf95bjj6h25v7n51"; }; patches = [ From c612a25666013c1abcbe338f8f2af14dea278f75 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 16:01:42 -0700 Subject: [PATCH 67/67] dhcpcd: 6.8.0 -> 6.8.1 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 8154816ab86..95700cb3806 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.8.0"; + name = "dhcpcd-6.8.1"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "0h52rkzw87fyq5vj8zscbgf0ig9c881xz7i0rn3hvk28li7la0cb"; + sha256 = "10mg68yxvl4kn1ya8ziifg2dm71c10r12sg7y7k1k0vafazhrdi7"; }; buildInputs = [ pkgconfig udev ];