From dc5c6e16072cac32f8d8d04a2986df999dff3fbb Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Thu, 14 Mar 2013 00:46:30 +0400 Subject: [PATCH 001/142] bluez5: add experimental expression for bluez5 bluez5 has many changes relative to bluez4. Most notable are dependency on linux-3.4 and new dbus API. --- pkgs/os-specific/linux/bluez/bluez5.nix | 71 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/bluez/bluez5.nix diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix new file mode 100644 index 000000000000..561f2d8e1e70 --- /dev/null +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper +, pythonDBus, pygobject, readline, libsndfile, udev, libical, systemd }: + +assert stdenv.isLinux; + +let + pythonpath = "${pythonDBus}/lib/${python.libPrefix}/site-packages:" + + "${pygobject}/lib/${python.libPrefix}/site-packages"; +in + +stdenv.mkDerivation rec { + name = "bluez-5.3"; + + src = fetchurl { + url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; + sha256 = "41b0559e3a8436a739eb7cc79156ca91daf8c115f57971b6bcb422ee0213db42"; + }; + + buildInputs = + [ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper + 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" + ]; + + # 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 = '' + pushd test + for a in \ + simple-agent \ + test-adapter \ + test-device \ + test-thermometer \ + list-devices \ + monitor-bluetooth \ + ; do + cp $a $out/bin/bluez-$a + wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath} + done + popd + ''; + + meta = { + homepage = http://www.bluez.org/; + description = "Bluetooth support for Linux"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e574aed4f1de..1659bc739ccf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5635,7 +5635,10 @@ let bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; - bluez = callPackage ../os-specific/linux/bluez { }; + bluez4 = callPackage ../os-specific/linux/bluez { }; + bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { }; + + bluez = bluez4; beret = callPackage ../games/beret { }; From 53ea9a8abca66ac535dfc739ca7b3836a92c2945 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 19 Mar 2013 12:30:39 +0400 Subject: [PATCH 002/142] bluez5: mark bluez5 with loPrio --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1659bc739ccf..bb06b6b3cc69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5636,7 +5636,7 @@ let bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; bluez4 = callPackage ../os-specific/linux/bluez { }; - bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { }; + bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); bluez = bluez4; From d84bfa78e13a62928fa3ffd9d2f78a3d79a0708b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 13 Apr 2013 19:10:50 +0200 Subject: [PATCH 003/142] Add cleanupCmds option to pkgs.myEnvFun This option allows the user to specify commands to run when the shell exits. This can be used to cleanup operations done in `extraCmds'. Signed-off-by: Moritz Ulrich --- pkgs/misc/my-env/default.nix | 9 ++++++++- pkgs/misc/my-env/loadenv.sh | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index e68e4cab3492..e89a8ebb230d 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -59,7 +59,7 @@ { mkDerivation, substituteAll, pkgs }: { stdenv ? pkgs.stdenv, name, buildInputs ? [] , propagatedBuildInputs ? [], gcc ? stdenv.gcc, cTags ? [], extraCmds ? "" - , shell ? "${pkgs.bashInteractive}/bin/bash"}: + , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash"}: mkDerivation { # The setup.sh script from stdenv will expect the native build inputs in @@ -133,8 +133,15 @@ mkDerivation { fi rm -fr "\$tmp" ${extraCmds} + + nix_cleanup() { + ${cleanupCmds} + } + export PATH echo $name loaded + + trap nix_cleanup EXIT EOF mkdir -p $out/bin diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index c116c14d8fe6..5d126f0c29bb 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -10,4 +10,5 @@ export buildInputs export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" -exec @shell@ --norc +@shell@ --norc + From 089404358dd94d89da6fcbbcc8b15de9b2171327 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sat, 20 Apr 2013 17:02:00 +0200 Subject: [PATCH 004/142] notmuch: patch source to use full path of gpg2 gets rid of the dependency on the old gnupg1. and enables decryption even if the gpg binary is not in the users environment. warning: i don't know whether the switch from gnupg1 to gnupg introduces any incompatibilities. this is a works for me patch. --- .../networking/mailreaders/notmuch/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 1477cd82cf44..ebab3a42af67 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg1, +{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg, pkgconfig, talloc, xapian }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56"; }; - buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; + buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; patchPhase = '' (cd test && for prg in \ @@ -55,6 +55,14 @@ stdenv.mkDerivation rec { substituteInPlace "$prg" \ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" done) + + for src in \ + crypto.c \ + emacs/notmuch-crypto.el + do + substituteInPlace "$src" \ + --replace \"gpg\" \"${gnupg}/bin/gpg2\" + done ''; # XXX: emacs tests broken From d9aa18843b5d6e9e516b3362600339450605375d Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 23 Apr 2013 14:09:10 +0200 Subject: [PATCH 005/142] ProofGeneral: Workaround for bug #458 "ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90" http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 --- .../editors/emacs-modes/proofgeneral/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix index 6ac698ed75f5..3f974423fd70 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation (rec { -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ s|/sbin/install-info|install-info|g" + + # Workaround for bug #458 + # ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90 + # http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 + sed -i "Makefile" \ + -e "s|(setq byte-compile-error-on-warn t)||g" + sed -i "bin/proofgeneral" -e's/which/type -p/g' # @image{ProofGeneral} fails, so remove it. From aa555c56ac018d1c110d7fc3e77c57c0bd216d5b Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 1 May 2013 10:51:45 +0200 Subject: [PATCH 006/142] lftp: use a download location that keeps old versions around --- pkgs/tools/networking/lftp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index af299674fa99..2bc575bbd02b 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lftp-4.4.5"; src = fetchurl { - url = "ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/${name}.tar.xz"; + url = "ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/${name}.tar.xz"; sha256 = "1p3nxsd2an9pdwc3vgwxy8p5nnjrc7mhilikjaddy62cyvxdbpxq"; }; From b17ba0fbb2bc959726ee190ed040a7b3ee673fe1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 May 2013 12:56:51 +0200 Subject: [PATCH 007/142] subversion: Update to 1.7.9 CVE-2013-1845, CVE-2013-1846, CVE-2013-1847, CVE-2013-1849, CVE-2013-1884. --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 885e4310a593..9743b73345ce 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.8"; + version = "1.7.9"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2"; + sha1 = "453757bae78a800997559f2232483ab99238ec1e"; }; buildInputs = [ zlib apr aprutil sqlite ] From 900a28e06dad28f55231728a9eb7f41881f46f53 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 May 2013 13:11:46 +0200 Subject: [PATCH 008/142] krb5: Update to 1.10.5 CVE-2012-1012, CVE-2012-1013, CVE-2012-1015, CVE-2012-1016, CVE-2013-1415, CVE-2013-1416. --- pkgs/development/libraries/kerberos/krb5.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 38272165a281..a903a600da3d 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -2,7 +2,7 @@ let pname = "krb5"; - version = "1.10"; + version = "1.10.5"; name = "${pname}-${version}"; webpage = http://web.mit.edu/kerberos/; in @@ -12,7 +12,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "${webpage}/dist/krb5/1.10/${name}-signed.tar"; - sha256 = "1pa4m6538drb51gsqxbbxlsnc9fm9ccid9m2s3pv3di5l0a7l8bg"; + sha256 = "1nf195j9s8g55sh5dzbhy2l21kcdwgpn4acxrbwkvngdz9mv7g4k"; }; buildInputs = [ perl ncurses yacc ]; @@ -23,7 +23,9 @@ stdenv.mkDerivation (rec { cd ${name}/src ''; - meta = { + enableParallelBuilding = true; + + meta = { description = "MIT Kerberos 5"; homepage = webpage; license = "MPL"; From ff4d3d88d21a1992b0c1dd70852b50eab8526fa4 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 1 May 2013 14:33:00 +0200 Subject: [PATCH 009/142] Fix clisp 2.44.1 (needed by stumpwm). This fix applies the patch used for the newest clisp to the old, fixing errors with new glibc. Signed-off-by: Moritz Ulrich --- pkgs/development/interpreters/clisp/2.44.1.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix index 891fd809bf04..521933b0ed1f 100644 --- a/pkgs/development/interpreters/clisp/2.44.1.nix +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -14,16 +14,22 @@ stdenv.mkDerivation rec { buildInputs = [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre zlib libXpm xproto libXext xextproto libffi libffcall ]; - + + patches = [ ./bits_ipctypes_to_sys_ipc.patch ]; # from Gentoo + # First, replace port 9090 (rather low, can be used) # with 64237 (much higher, IANA private area, not # anything rememberable). - patchPhase = '' + # Also remove reference to a type that disappeared from recent glibc + # (seems the correct thing to do, found no reference to any solution) + postPatch = '' sed -e 's@9090@64237@g' -i tests/socket.tst sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i - ''; + substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" + ''; + configureFlags = '' --with-readline builddir --with-dynamic-ffi From e3a920feecb66b4de951b89e24b749b81c3a03a2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 May 2013 10:04:26 -0400 Subject: [PATCH 010/142] DBIxClass: Update Signed-off-by: Shea Levy --- pkgs/top-level/perl-packages.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bfbeeee57fcd..326c30c40018 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1545,15 +1545,13 @@ rec { }; DBIxClass = buildPerlPackage { - name = "DBIx-Class-0.08210"; + name = "DBIx-Class-0.08250"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08210.tar.gz; - sha256 = "0sajw5j3zpgf44zaif5sp98xpkdfmzfn76c8anljfx48qh7r22y4"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08250.tar.gz; + sha256 = "0nsqvj34klc9pf4l5kj3nqkq7agbsn11ys4115100awf7gxjbad6"; }; - buildInputs = [ DBDSQLite PackageStash TestException TestWarn ]; + buildInputs = [ DBDSQLite PackageStash TestException TestWarn TestDeep ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; - # !!! tests broken with latest sqlite, see http://lists.scsys.co.uk/pipermail/dbix-class/2013-April/011271.html - doCheck = false; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; From b8c2fc71b327aafc741b1bf4f5c68f4e5af26265 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 May 2013 11:22:37 -0400 Subject: [PATCH 011/142] jboss: Update to 7.1.1.Final Signed-off-by: Shea Levy --- pkgs/servers/http/jboss/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 2f0b9be96b04..d5768da4c824 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,21 +1,19 @@ { stdenv, fetchurl, unzip, jdk, lib }: stdenv.mkDerivation { - name = "jboss-5.1.0.GA"; + name = "jboss-as-7.1.1.Final"; src = fetchurl { - url = mirror://sourceforge/jboss/jboss-5.1.0.GA-jdk6.zip; - sha256 = "0wy5666h554x1qq4w0rzg3krp4rqrijq0ql7dkx6qgl3vpj9xr5y"; + url = http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz; + sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; buildInputs = [ unzip ]; - - buildPhase = '' - sed -i -e "/GREP/aJAVA_HOME=${jdk}" bin/run.sh - ''; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; installPhase = '' - mkdir -p $out - cp -av * $out + mv $PWD $out + find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' ''; meta = { From 8df1afa9c9c441388dc46b8783f08df15fd839f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 23 Feb 2013 12:05:22 +0100 Subject: [PATCH 012/142] stlink: new package stlink is an in-circuit debugging and programming tool for ST-Link v1 and v2 devices. It is similar to OpenOCD but just for ST-Link devices. https://github.com/texane/stlink IMPORTANT: You need permissions to access the stlink usb devices. Here are example udev rules for stlink v1 and v2 so you don't need to have root permissions (copied from /49-stlink*.rules): SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n" SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n" --- .../development/tools/misc/stlink/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/misc/stlink/default.nix diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix new file mode 100644 index 000000000000..fe7b0ba31503 --- /dev/null +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, libusb1 }: + +# IMPORTANT: You need permissions to access the stlink usb devices. Here are +# example udev rules for stlink v1 and v2 so you don't need to have root +# permissions (copied from /49-stlink*.rules): +# +# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n" +# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n" + +stdenv.mkDerivation { + name = "stlink-git20130306"; + + src = fetchgit { + url = git://github.com/texane/stlink.git; + rev = "5be889e3feb75fc7f594012c4855b4dc16940050"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig libusb1 ]; + preConfigure = "./autogen.sh"; + + meta = { + description = "In-circuit debug and programming for ST-Link devices"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d32d23ef054..f2e5071356c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5014,6 +5014,8 @@ let inherit readline ncurses; }); + stlink = callPackage ../development/tools/misc/stlink { }; + stlport = callPackage ../development/libraries/stlport { }; strigi = callPackage ../development/libraries/strigi {}; From 52edd648d36e355b7d3d85e04eb2859935f06c77 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 2 May 2013 01:32:12 +0200 Subject: [PATCH 013/142] fix jquery-ui link --- pkgs/development/libraries/javascript/jquery-ui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix index 409c9d7456b4..e2d48f25bb5d 100644 --- a/pkgs/development/libraries/javascript/jquery-ui/default.nix +++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jquery-ui-1.10.2"; src = fetchurl { - url = "http://jqueryui.com/download/${name}.custom.zip"; + url = "http://jqueryui.com/resources/download/${name}.custom.zip"; sha256 = "0r1fmqpym7bjqhjay9br4h3izky781bsda7v7552yjwkgiv391hl"; }; From faddfc97b0d859cbb03320283b3fb8e0b106f772 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 May 2013 20:49:56 -0400 Subject: [PATCH 014/142] x11vnc: Properly hard-code the path to xdpyinfo This never worked before, I don't think Signed-off-by: Shea Levy --- pkgs/tools/X11/x11vnc/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 4c7e89971487..23b0aaa55e8e 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \ --replace '"/bin/true"' '"${coreutils}/bin/true"' - substituteInPlace x11vnc/ssltools.h \ - --replace /bin/su /var/setuid-wrappers/su \ - --replace xdpyinfo ${xorg.xdpyinfo}/bin/xdpyinfo + sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:$PATH\\n"' -e 's|/bin/su|/var/setuid-wrappers/su|g' x11vnc/ssltools.h ''; meta = { From bd553581596358e4d751585ca6795023e30a352d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 2 May 2013 11:32:23 +0400 Subject: [PATCH 015/142] Adding filegive, my file sending program --- pkgs/tools/networking/filegive/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/filegive/default.nix diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix new file mode 100644 index 000000000000..be1b20e16894 --- /dev/null +++ b/pkgs/tools/networking/filegive/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, go }: + +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); + +stdenv.mkDerivation rec { + name = "filegive-0.3"; + + src = fetchurl { + url = "http://viric.name/cgi-bin/filegive/tarball/filegive-0.3.tar.gz?uuid=v0.3"; + name = "${name}.tar.gz"; + sha256 = "1xiz47q6f579nb36p973bb3wjszn515v0sjh76pif1cihijdsb5y"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "export GOARM=5"} + go build -o filegive + ''; + + installPhase = '' + ensureDir $out/bin + cp filegive $out/bin + ''; + + meta = { + homepage = http://viric.name/cgi-bin/filegive; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76de4b6090a6..f2179173f985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -767,6 +767,8 @@ let file = callPackage ../tools/misc/file { }; + filegive = callPackage ../tools/networking/filegive { }; + fileschanged = callPackage ../tools/misc/fileschanged { }; findutils = callPackage ../tools/misc/findutils { }; From 28f87c0eb5659e97de3ae3700d77909de7382895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 2 May 2013 11:34:42 +0400 Subject: [PATCH 016/142] Adding description to filegive --- pkgs/tools/networking/filegive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index be1b20e16894..7e3c228af126 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/filegive; + description = "Easy p2p file sending program"; license = "BSD"; }; } From 290bc17ff60c698cd6936d9d835991ad173b5166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 2 May 2013 13:17:01 +0400 Subject: [PATCH 017/142] Updating go 1.1beta2 to 1.1rc1 --- pkgs/development/compilers/go/1.1.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index f0e5ea23958e..c3cbf8422bf9 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation { - name = "go-1.1beta2"; + name = "go-1.1rc1"; src = fetchurl { - url = http://go.googlecode.com/files/go1.1beta2.src.tar.gz; - sha1 = "70d7642a6ea065a23458b9ea28e370b19912e52d"; + url = http://go.googlecode.com/files/go1.1rc1.src.tar.gz; + sha1 = "c999c36e7bb5c9ef05d309b0bb4275feb62c44e3"; }; buildInputs = [ bison glibc bash makeWrapper ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation { # Disable the hostname test sed -i '/TestHostname/areturn' src/pkg/os/os_test.go # Disable a failing icmp test - sed -i '/ip[46]:icmp.*nil/d' src/pkg/net/ipraw_test.go + sed -i '/ip[46]:.*icmp.*nil/d' src/pkg/net/ipraw_test.go ''; patches = [ ./cacert.patch ]; From 6414a306a4905b675b8d0ed0de5f524d1222cbc0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 2 May 2013 13:15:50 +0300 Subject: [PATCH 018/142] filegive: bump version to 0.3.1 --- pkgs/tools/networking/filegive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 7e3c228af126..d9cb3b6c03ed 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -3,12 +3,12 @@ assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); stdenv.mkDerivation rec { - name = "filegive-0.3"; + name = "filegive-0.3.1"; src = fetchurl { - url = "http://viric.name/cgi-bin/filegive/tarball/filegive-0.3.tar.gz?uuid=v0.3"; + url = "http://viric.name/cgi-bin/filegive/tarball/filegive-0.3.1.tar.gz?uuid=v0.3.1"; name = "${name}.tar.gz"; - sha256 = "1xiz47q6f579nb36p973bb3wjszn515v0sjh76pif1cihijdsb5y"; + sha256 = "14hsy7bkmhq03f2yf619kz8p11v8ndd59sdibck556z8dld7b6ya"; }; buildInputs = [ go ]; From 35e8764a2ebd15c1a43b50770ed442b674341393 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 May 2013 13:06:30 +0200 Subject: [PATCH 019/142] speed-dreams: Remove from the channel At 758 MiB compressed it's really too big for the channel. --- pkgs/games/speed-dreams/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index e14b9b26a4f0..e920b8c633e0 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://speed-dreams.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric raskin]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } From a1bc05bb5501f786bfec43d648550be791d2a565 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 May 2013 13:11:19 +0200 Subject: [PATCH 020/142] ufoai: Remove from the channel It's 898 MiB compressed. --- pkgs/games/ufoai/default.nix | 2 +- pkgs/top-level/release-python.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 80f3d72c579a..d9955aec3eb4 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "A squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index c51f45d6c5fb..b418a332f8bf 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1594,7 +1594,6 @@ in sourceHighlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spaceOrbit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; speechd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - speed_dreams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spidermonkey_185 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1692,7 +1691,6 @@ in udev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; udev145 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; udisks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ufoai = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ultimatestunts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ultrastardx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 40cd4a8a9d671b3286facdffad4ba483cd8ab518 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 May 2013 13:13:11 +0200 Subject: [PATCH 021/142] xonotic: Remove from the channel It's 878 MiB compressed. --- pkgs/games/xonotic/default.nix | 16 +++++++++++++--- pkgs/top-level/release-python.nix | 1 - 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 3553649dccb8..957d7b2c7f45 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,29 +1,37 @@ { stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }: + stdenv.mkDerivation rec { name = "xonotic-0.5.0"; + src = fetchurl { url = "http://dl.xonotic.org/${name}.zip"; sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq"; }; + # Commented out things needed to build cl-release because of errors. #buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ]; buildInputs = [ unzip SDL libjpeg ]; + sourceRoot = "Xonotic/source/darkplaces"; + #patchPhase = '' # substituteInPlace glquake.h \ # --replace 'typedef char GLchar;' '/*typedef char GLchar;*/' #''; - NIX_LDFLAGS=" + + NIX_LDFLAGS = '' -rpath ${zlib}/lib -rpath ${libvorbis}/lib -rpath ${curl}/lib - "; + ''; + buildPhase = '' DP_FS_BASEDIR="$out/share/xonotic" #make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release ''; + installPhase = '' mkdir -p "$out/bin" cp darkplaces-dedicated "$out/bin/xonotic-dedicated" @@ -32,7 +40,9 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/xonotic" mv data "$out/share/xonotic" ''; + dontPatchELF = true; + meta = { description = "A free fast-paced first-person shooter"; longDescription = '' @@ -46,6 +56,6 @@ stdenv.mkDerivation rec { homepage = http://www.xonotic.org; license = with stdenv.lib.licenses; gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index b418a332f8bf..d76eeec93dd4 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1960,7 +1960,6 @@ in xnee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xneur_0_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xonotic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xorg_sys_opengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xorgVideoUnichrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xoscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 7846ad9a90e4be119a2c5780e4f443cfb128210b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 May 2013 13:16:56 +0200 Subject: [PATCH 022/142] alienarena: Remove from the channel 387 MiB compressed, 898 uncompressed. --- pkgs/games/alienarena/default.nix | 7 ++++++- pkgs/top-level/release-python.nix | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index aa7d2f1e9144..856d9afe0f92 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,17 +1,22 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, mesa }: + stdenv.mkDerivation rec { name = "alienarena-7.52"; + src = fetchurl { url = "http://icculus.org/alienarena/Files/alienarena-7_52-linux20110929.tar.gz"; sha256 = "1s1l3apxsxnd8lyi568y38a1fcdr0gwmc3lkgq2nkc676k4gki3m"; }; + buildInputs = [ pkgconfig libjpeg libX11 curl libogg libvorbis freetype openal mesa libXxf86vm ]; + patchPhase = '' substituteInPlace ./configure \ --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 ''; + meta = { description = "A free, stand-alone first-person shooter computer game"; longDescription = '' @@ -27,6 +32,6 @@ stdenv.mkDerivation rec { # Engine is under GPLv2, everything else is under license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index d76eeec93dd4..fbf0b3ac9b28 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -41,7 +41,6 @@ in acl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; adobeReader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; agg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - alienarena = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; allegro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; allegro5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; alliance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 14169da6f55cb81ec0095b8e52d06c4ca1716653 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 May 2013 13:24:43 +0200 Subject: [PATCH 023/142] vdrift: Remove from the channel It's 564 MiB compressed. --- pkgs/games/vdrift/default.nix | 2 +- pkgs/top-level/release-python.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 63a8f5086845..97bd1ab432d9 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = http://vdrift.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index fbf0b3ac9b28..ba9b20c99de7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1711,7 +1711,6 @@ in valkyrie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vde2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vdpauinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vdrift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vectoroids = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; veracity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vfdecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 2742087bdd092d77083dc99cdafb6e93444fba3e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 2 May 2013 14:03:43 -0400 Subject: [PATCH 024/142] Add isPath to trivial.nix Signed-off-by: Shea Levy --- pkgs/lib/modules.nix | 11 ----------- pkgs/lib/trivial.nix | 10 ++++++++++ pkgs/lib/types.nix | 3 +-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 286178a0fa70..4c00728a9a58 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -11,17 +11,6 @@ with import ./options.nix; with import ./properties.nix; rec { - - # Unfortunately this can also be a string. - isPath = x: !( - builtins.isFunction x - || builtins.isAttrs x - || builtins.isInt x - || builtins.isBool x - || builtins.isList x - ); - - importIfPath = path: if isPath path then import path diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix index 8af3474f2a67..b2304ff7a17e 100644 --- a/pkgs/lib/trivial.nix +++ b/pkgs/lib/trivial.nix @@ -35,4 +35,14 @@ rec { else if builtins.isAttrs x then deepSeqAttrs x y else seq x y; + + isPath = val: with builtins; !( + isAttrs val + || isList val + || isInt val + || isString val + || isFunction val + || isBool val + || val == null + ); } diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 6ddac61d91bf..eac76917c2d2 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -96,8 +96,7 @@ rec { path = mkOptionType { name = "path"; - # Hacky: there is no ‘isPath’ primop. - check = lib.traceValIfNot (x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/"); + check = lib.traceValIfNot isPath; }; listOf = types.list; From 932dd06f3f9e39a461a687ba94d35fadcf11fb3f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 2 May 2013 15:04:21 -0400 Subject: [PATCH 025/142] Revert "Add isPath to trivial.nix" This breaks NixOS, and I don't actually need it, so someone who needs it can bring this back without breaking NixOS :) This reverts commit 2742087bdd092d77083dc99cdafb6e93444fba3e. Signed-off-by: Shea Levy --- pkgs/lib/modules.nix | 11 +++++++++++ pkgs/lib/trivial.nix | 10 ---------- pkgs/lib/types.nix | 3 ++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 4c00728a9a58..286178a0fa70 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -11,6 +11,17 @@ with import ./options.nix; with import ./properties.nix; rec { + + # Unfortunately this can also be a string. + isPath = x: !( + builtins.isFunction x + || builtins.isAttrs x + || builtins.isInt x + || builtins.isBool x + || builtins.isList x + ); + + importIfPath = path: if isPath path then import path diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix index b2304ff7a17e..8af3474f2a67 100644 --- a/pkgs/lib/trivial.nix +++ b/pkgs/lib/trivial.nix @@ -35,14 +35,4 @@ rec { else if builtins.isAttrs x then deepSeqAttrs x y else seq x y; - - isPath = val: with builtins; !( - isAttrs val - || isList val - || isInt val - || isString val - || isFunction val - || isBool val - || val == null - ); } diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index eac76917c2d2..6ddac61d91bf 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -96,7 +96,8 @@ rec { path = mkOptionType { name = "path"; - check = lib.traceValIfNot isPath; + # Hacky: there is no ‘isPath’ primop. + check = lib.traceValIfNot (x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/"); }; listOf = types.list; From fbae0027173fb333f903026da256744a76c69671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 28 Apr 2013 12:55:29 +0200 Subject: [PATCH 026/142] Add perl modules needed to build "slic3r" Slic3r is a tool to convert a digital 3D model into printing instructions for your 3D printer. I have some build/run issues with it so add it later. These perl modules are added: AlienWxWidgets BoostGeometryUtils constant-defer ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp GrowlGNTP MathLibm MathClipper MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath ModuleBuildWithXSpp NetDBus Spiffy TestBase Wx A couple of old modules were no longer available on CPAN so I bumped them: DataUUID ExtUtilsMakeMaker ExtUtilsManifest version VersionRequirements XMLTwig fails in the test phase (it is missing a dependencies), so the test is skipped. (How did it pass the test before?) --- pkgs/top-level/perl-packages.nix | 175 +++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a795769fadb0..dd98f70c7b14 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -80,6 +80,15 @@ rec { }; }; + AlienWxWidgets = buildPerlPackage rec { + name = "Alien-wxWidgets-0.64"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + sha256 = "1frmvdppzw1vrbk2jvwxh5a5qafl7bigflpgwpkzdg4v9nswgbmx"; + }; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ]; + }; + AnyMoose = buildPerlPackage rec { name = "Any-Moose-0.10"; src = fetchurl { @@ -245,6 +254,15 @@ rec { }; }; + BoostGeometryUtils = buildPerlModule rec { + name = "Boost-Geometry-Utils-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz"; + sha256 = "0wgd36rxd5lj0vlkp7l9zgx8bgbv0nj4kia83ipb7p64xpyysghg"; + }; + propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; + }; + CacheCache = buildPerlPackage rec { name = "Cache-Cache-1.06"; src = fetchurl { @@ -1065,6 +1083,14 @@ rec { }; }; + constant-defer = buildPerlPackage rec { + name = "constant-defer-5"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; + sha256 = "05fjw2n6liwlillrj3bkfm5fzxw1mcfbxrnk9m18vibx6yzf8pwq"; + }; + }; + ContextPreserve = buildPerlPackage rec { name = "Context-Preserve-0.01"; src = fetchurl { @@ -1372,10 +1398,10 @@ rec { }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.217"; + name = "Data-UUID-1.218"; src = fetchurl { url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; - sha256 = "0vgykclw1mn06a53d8y3g7s7vanks8078dh2j4jb84djk0cw9h0q"; + sha256 = "1cb4i0j48g5dk2dwzz32myl6wv4ngxqnrkdnixq80pzjcmz1qkpl"; }; }; @@ -1891,11 +1917,20 @@ rec { }; }; - ExtUtilsMakeMaker = buildPerlPackage rec{ - name = "ExtUtils-MakeMaker-6.59"; + ExtUtilsCppGuess = buildPerlModule rec { + name = "ExtUtils-CppGuess-0.07"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0fwhb2cf5x7y87xwml66p624iynf0mzvhy1q4aq5yv7l3lhwhaby"; + sha256 = "1a77hxf2pa8ia9na72rijv1yhpn2bjrdsybwk2dj2l938pl3xn0w"; + }; + propagatedBuildInputs = [ CaptureTiny ]; + }; + + ExtUtilsMakeMaker = buildPerlPackage rec{ + name = "ExtUtils-MakeMaker-6.66"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "1w9pbjajas60a9i29j8h10nz9jf86w7jb197llnfs9fqcf4yvfha"; }; propagatedBuildInputs = [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta @@ -1904,10 +1939,10 @@ rec { }; ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.59"; + name = "ExtUtils-Manifest-1.61"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0cb7mjmfsk2rlwdr5y91x2w5ffb0yjf9gblibk9wplivlpa48jhs"; + sha256 = "18jj4lrip2g580b2fw5khxvdx6h3pavgihvb87snggrlgabpj20n"; }; }; @@ -1919,6 +1954,23 @@ rec { }; }; + ExtUtilsTypemapsDefault = buildPerlModule rec { + name = "ExtUtils-Typemaps-Default-1.01"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "0k03rr7bmhnn6j0505w9id5apss85yvqnx76hxf3javn3klj1m5z"; + }; + }; + + ExtUtilsXSpp = buildPerlModule rec { + name = "ExtUtils-XSpp-0.1700"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "1msp79bdjzi59vignfz1cxwk5a2cjiahblvi0ka60pi8nnn0alrm"; + }; + buildInputs = [ Spiffy TestBase TestDifferences ]; + }; + FileChangeNotify = buildPerlModule rec { name = "File-ChangeNotify-0.20"; src = fetchurl { @@ -2203,6 +2255,15 @@ rec { }; }; + GrowlGNTP = buildPerlModule rec { + name = "Growl-GNTP-0.20"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Growl/${name}.tar.gz"; + sha256 = "150x65lwf7pfsygcpmvj3679lhlfwx87xylwnrmwll67f9dpkjdi"; + }; + buildInputs = [ DataUUID CryptCBC ]; + }; + HashFlatten = buildPerlPackage rec { name = "Hash-Flatten-1.19"; src = fetchurl { @@ -3014,6 +3075,49 @@ rec { propagatedBuildInputs = [TimeDate TestPod]; }; + MathLibm = buildPerlPackage rec { + name = "Math-Libm-1.00"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "0xn2a950mzzs5q1c4q98ckysn9dz20x7r35g02zvk35chgr0klxz"; + }; + }; + + MathClipper = buildPerlModule rec { + name = "Math-Clipper-1.19"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "1hrdand4i937bgsr3f3yma5ckkdwkprdwmkyyl37v1vqcjdrjr7j"; + }; + propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ]; + }; + + MathConvexHullMonotoneChain = buildPerlPackage rec { + name = "Math-ConvexHull-MonotoneChain-0.01"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "1xcl7cz62ydddji9qzs4xsfxss484jqjlj4iixa4aci611cw92r8"; + }; + }; + + MathGeometryVoronoi = buildPerlPackage rec { + name = "Math-Geometry-Voronoi-1.3"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "0b206k2q5cznld45cjhgm0as0clc9hk135ds8qafbkl3k175w1vj"; + }; + propagatedBuildInputs = [ ClassAccessor ParamsValidate ]; + }; + + MathPlanePath = buildPerlPackage rec { + name = "Math-PlanePath-101"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "0g24zhgyxs56zv966xb487vvmhqqxvvsbbz4mck8n4l31rabk8jj"; + }; + propagatedBuildInputs = [ MathLibm constant-defer ]; + }; + MathRound = buildPerlPackage rec { name = "Math-Round-0.06"; src = fetchurl { @@ -3064,6 +3168,15 @@ rec { }; }; + ModuleBuildWithXSpp = buildPerlModule rec { + name = "Module-Build-WithXSpp-0.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz"; + sha256 = "05c5dssgl7ykj64nkzy4nwfrs0hd1lvfidhflrs3f1c7hc0z9g46"; + }; + propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ]; + }; + ModuleFind = buildPerlPackage { name = "Module-Find-0.11"; src = fetchurl { @@ -3552,6 +3665,15 @@ rec { buildInputs = [ DBI DBDSQLite ]; }; + NetDBus = buildPerlPackage rec { + name = "Net-DBus-1.0.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz"; + sha256 = "03srw98nn7r4k6fmnr5bhwsxbhgrsmzdja98jl8b8a72iayg7l5z"; + }; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.dbus XMLTwig ]; + }; + NetDNS = buildPerlPackage { name = "Net-DNS-0.63"; src = fetchurl { @@ -4238,6 +4360,15 @@ rec { }; }; + Spiffy = buildPerlPackage rec { + name = "Spiffy-0.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "11pnsbyjzpp8y8ss7mrmz8nnbvv5vr7x71f13pwii9m8cam04blj"; + }; + buildInputs = [ ExtUtilsMakeMaker ]; + }; + SpreadsheetParseExcel = buildPerlPackage rec { name = "Spreadsheet-ParseExcel-0.58"; src = fetchurl { @@ -4693,6 +4824,15 @@ rec { buildInputs = [ LogTrace ]; }; + TestBase = buildPerlPackage rec { + name = "Test-Base-0.60"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + sha256 = "0yf030nay85xzas1qxn1nw6lhfsrcbgh3nq7bxbb11nxhvdaj2bx"; + }; + buildInputs = [ Spiffy ]; + }; + TestCheckDeps = buildPerlPackage { name = "Test-CheckDeps-0.002"; src = fetchurl { @@ -5302,18 +5442,18 @@ rec { }; version = buildPerlPackage rec { - name = "version-0.93"; + name = "version-0.9902"; src = fetchurl { url = "mirror://cpan/modules/by-module/version/${name}.tar.gz"; - sha256 = "1lfq27hshq1gvdqksicp22ag8n1aiijhjw68q3r254kp6zimrz69"; + sha256 = "17fdj3hxks33plapj3hinjgmyblnh302z52rq4b9spnz22q5vhww"; }; }; VersionRequirements = buildPerlPackage rec { - name = "Version-Requirements-0.101020"; + name = "Version-Requirements-0.101022"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "18bcfxwn21gcih0bc6p1sp42iis8lwnqh7fpprkniflj8q0ps0x4"; + sha256 = "0gn4cfx28sfsinxbf9lrxg4lzma8bsj99zb66lsg9irplrkx1pgl"; }; }; @@ -5375,6 +5515,18 @@ rec { }; }; + Wx = buildPerlPackage rec { + name = "Wx-0.9922"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + sha256 = "11x3cvffcyi4b2c6pz9awks3zrg83bg1cwapm4psdiqnd568safw"; + }; + propagatedBuildInputs = [ ExtUtilsXSpp AlienWxWidgets ]; + # Testing requires an X server: + # Error: Unable to initialize GTK+, is DISPLAY set properly?" + doCheck = false; + }; + X11GUITest = buildPerlPackage rec { name = "X11-GUITest-0.21"; src = fetchurl { @@ -5475,6 +5627,7 @@ rec { sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v"; }; propagatedBuildInputs = [XMLParser]; + doCheck = false; # requires lots of extra packages }; XMLWriter = buildPerlPackage rec { From ae5664cc5ef8408b4f754c48943a0d1ccbd298a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 3 May 2013 09:53:23 +0200 Subject: [PATCH 027/142] mirrors.nix: add http://backpan.perl.org/ for old CPAN modules It seems only the latest version of perl modules are in CPAN(?). The BackPan claims to have a complete history of CPAN. --- pkgs/build-support/fetchurl/mirrors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 9d9aa344f425..d6ad25afbadc 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -154,6 +154,7 @@ rec { ftp://ftp.nl.uu.net/pub/CPAN/ http://ftp.funet.fi/pub/CPAN/ http://cpan.perl.org/ + http://backpan.perl.org/ # for old releases ]; # Debian. From 24466df152abd066e1b8fafe7235ef229a4932a3 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 2 May 2013 18:15:54 +0200 Subject: [PATCH 028/142] Update isync to 1.0.6 --- pkgs/tools/networking/isync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index aca9b47195d3..9587dfee613b 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, openssl, pkgconfig, db4 }: stdenv.mkDerivation rec { - name = "isync-1.0.4"; + name = "isync-1.0.6"; src = fetchurl { - url = "mirror://sourceforge/isync/isync-1.0.4.tar.gz"; - sha256 = "1xmgzypl5a3i0fz1ca55vfbs5mv2l9icwf2gk8rvlbwrkn2wid68"; + url = "mirror://sourceforge/isync/${name}.tar.gz"; + sha256 = "0bv3hw6mc9xi55q6lpyz1w3dyrk6rlxa8ny2x1b44mrnbrx7chz5"; }; patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing From 1399445d59b175d26d92a7a0dd7b5d433b07c14d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:54 +0200 Subject: [PATCH 029/142] haskell-DAV: update to version 0.4 --- pkgs/development/libraries/haskell/DAV/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index 54106de1e091..93c0895fa660 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,17 +1,17 @@ -{ cabal, caseInsensitive, cmdargs, httpConduit, httpTypes, lens -, liftedBase, mtl, network, resourcet, transformers, xmlConduit -, xmlHamlet +{ cabal, caseInsensitive, httpConduit, httpTypes, lens, liftedBase +, mtl, network, optparseApplicative, resourcet, transformers +, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.3.1"; - sha256 = "0ql6sf61gq55iyn189papnid91n4ab5s2i24zvkqrgixjz7998rd"; + version = "0.4"; + sha256 = "10iwhxq9dbyx3j873khwkjxkhz9p1b1qms7q25jnpk15p1ph8b4a"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl - network resourcet transformers xmlConduit xmlHamlet + caseInsensitive httpConduit httpTypes lens liftedBase mtl network + optparseApplicative resourcet transformers xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; From a6deed86c1a78df9ec7d86e7902d33db55166319 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:54 +0200 Subject: [PATCH 030/142] haskell-basic-prelude: update to version 0.3.5.0 --- pkgs/development/libraries/haskell/basic-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index 0d18233ef214..95ce58e4b926 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "basic-prelude"; - version = "0.3.4.0"; - sha256 = "0layc06df7df4mf4zafj87c4klsvkxbhi69dkv4ag9fkzvs62sz6"; + version = "0.3.5.0"; + sha256 = "1nrfibvvh5vzzr2jz5hipsj29b7ml6d90ijlr917n9aq200w14ar"; buildDepends = [ hashable liftedBase ReadArgs systemFilepath text transformers unorderedContainers vector From 6c9c18833f42a7846bbe366c982378f115c48db9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:55 +0200 Subject: [PATCH 031/142] haskell-certificate: update to version 1.3.7 --- pkgs/development/libraries/haskell/certificate/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index ffdf30268547..168ccb113b63 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,14 +4,13 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.6"; - sha256 = "1w7xndslapy4ycgf2xshgx90i3v04nsck9l2mzc74nrnwm817b2m"; + version = "1.3.7"; + sha256 = "06sfka5p381gayx2q7vvyr7dl8q8d4jfqdrys3k0z8fjxdbqrqya"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time ]; - jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; From 319fc22b7c44b65cdb71f06372d82316cae69500 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:55 +0200 Subject: [PATCH 032/142] haskell-conduit: update to version 1.0.5 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 1a5ef7b4f702..cf4c17ceb459 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.4.2"; - sha256 = "11xrqn7jc4vccfwds6hy0d3jpm0d0ycwaszv18xk237zwl63w159"; + version = "1.0.5"; + sha256 = "0w8japlx0darpf67ki753l0kw64lgisr1dww3alfwjlya0k84z65"; buildDepends = [ liftedBase mmorph monadControl resourcet text transformers transformersBase void From 6dc8a1158fdae919d13a191bf0c2c1ef7cb37152 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:56 +0200 Subject: [PATCH 033/142] haskell-crypto-pubkey-types: update to version 0.3.2 --- .../libraries/haskell/crypto-pubkey-types/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 81cfdac0151d..5ccb1e7e0ce7 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, asn1Types }: cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.2.0"; - sha256 = "1arzkyxcm1ffnwk7imxkwvyi20dp8n960vzj7cbl7fhv3j04c9xq"; + version = "0.3.2"; + sha256 = "12gzx4mj8rc243vvjkzvrxnj2f7x3z86yfgahx3my5vsaw4bix2h"; + buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; description = "Generic cryptography Public keys algorithm types"; From ee291973cfaa6fb4b345633af4227827741e9902 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:56 +0200 Subject: [PATCH 034/142] haskell-crypto-pubkey: update to version 0.1.3 --- pkgs/development/libraries/haskell/crypto-pubkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index dc0885518776..3db4dc2b9c18 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.1.2"; - sha256 = "1law5l7j0r0v89dnibmaipjp0yshffq10xs4rvg2j247v29lhns5"; + version = "0.1.3"; + sha256 = "154bclz7mg2v7q72y6y0ylw0b28527nsmc8f6zf6ja5l9c9skw0g"; buildDepends = [ cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi ]; From 9e28ed89d110435dccdea584d34362148441dfff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:57 +0200 Subject: [PATCH 035/142] haskell-cryptocipher: update to version 0.5.0 --- .../libraries/haskell/cryptocipher/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 12392e439250..0aff493ac874 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,17 +1,16 @@ { cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi, cryptohash -, cryptoPubkeyTypes, entropy, primitive, QuickCheck, tagged -, testFramework, testFrameworkQuickcheck2, vector +, entropy, primitive, QuickCheck, testFramework +, testFrameworkQuickcheck2, vector }: cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.4.0"; - sha256 = "1qbnhzbzypin7h62sn2sibij7clsgmaiq24q3xhgbjrirb6bhqf0"; + version = "0.5.0"; + sha256 = "16gqsy23y3g9089ng94124g5pvc4d0vnh2r47ii789f8j96062nd"; isLibrary = true; isExecutable = true; buildDepends = [ - cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes - primitive tagged vector + cereal cipherAes cipherRc4 cpu cryptoApi primitive vector ]; testDepends = [ cryptoApi cryptohash entropy QuickCheck testFramework From 842459b22b8114f775dd9c0acb04df01c48215ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:57 +0200 Subject: [PATCH 036/142] haskell-ghc-vis: update to version 0.7.0.1 --- pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 5b87923f06bf..8b6dc19653fe 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.6.1.1"; - sha256 = "1fg8bxkhw2s3y8w0ljnnqbf8f5ld17p70v4aikc26ybmb0938yl6"; + version = "0.7.0.1"; + sha256 = "0k6pm1lqmcmgdqzcdbygdyg6bgx4k0gi77k1mxwprgr9vv3ly26w"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot From 8b99593f1895f44f9ccc293265fca5f684e24851 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:10:59 +0200 Subject: [PATCH 037/142] haskell-pool-conduit: update to version 0.1.2 --- .../libraries/haskell/pool-conduit/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index bec8f7882f11..b414c2a70f08 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -1,10 +1,12 @@ -{ cabal, resourcePool, resourcet, transformers }: +{ cabal, monadControl, resourcePool, resourcet, transformers }: cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.1.1"; - sha256 = "1gaj0gwwbr950jkxhpl326py758j2mvh557xz737js9qcs9g3cg1"; - buildDepends = [ resourcePool resourcet transformers ]; + version = "0.1.2"; + sha256 = "10lvq18pk9d4la5irr1qv1c9y4qbwlglmzgs7bz1d0g5232w3rv8"; + buildDepends = [ + monadControl resourcePool resourcet transformers + ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT"; From e658070162a075273b58d5a796f804b89baedc03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:11:00 +0200 Subject: [PATCH 038/142] haskell-reflection: update to version 1.3 --- pkgs/development/libraries/haskell/reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index d18f711cab32..d2d723230d16 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.2.0.1"; - sha256 = "17pzw45yr13nq9y9nb3siypj5amkixy82xm8bpy0nzs1cdfyawx6"; + version = "1.3"; + sha256 = "1wv868m24ds2hf2iwrv1hw1v0r82kjs2qhcp5b1p2jrdl26fhzd8"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; From dc52f9b8a176295f3a16f91af877e68b1c59c375 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:11:00 +0200 Subject: [PATCH 039/142] haskell-skein: update to version 1.0.3 --- pkgs/development/libraries/haskell/skein/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 7bf7f845762d..9bb3efc65034 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.2"; - sha256 = "1wzy586lcr0pxsdf4lvqhbzq8bsm26gm71jlmv64i22f99n5s9h2"; + version = "1.0.3"; + sha256 = "15vzydywhwjdgybabvv6lfk1vjs7blvs3k2apwxjdjh2q7jmgkam"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; - jailbreak = true; meta = { homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; From 73db2859d7aa344035724159c6334b9d6ea4265c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:11:01 +0200 Subject: [PATCH 040/142] haskell-uuid: update to version 1.2.12 --- pkgs/development/libraries/haskell/uuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index a1dbdf2f88d8..5b74c74b4904 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "uuid"; - version = "1.2.11"; - sha256 = "0fr91w8jahb7ryhgl8dm6w8jg9sykn3m1jnfvyrfdpkpwkc0kpxx"; + version = "1.2.12"; + sha256 = "023954gx1hqf1v4qlzwy3nlxwn9yll0642p16w3vayrahcm27ljb"; buildDepends = [ binary cryptohash maccatcher random time ]; testDepends = [ criterion deepseq HUnit mersenneRandomPure64 QuickCheck random From 9fd0479f3229315d6ead376ccfbaab41022dfa3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2013 14:11:01 +0200 Subject: [PATCH 041/142] haskell-yaml: update to version 0.8.2.4 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 8a3beafb8e47..f8f2ca510499 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.2.3"; - sha256 = "1ds6969gbkxgkm2fha0ifmssjl7by9glgix165v0h8i7fx9wx3wa"; + version = "0.8.2.4"; + sha256 = "0gk2h3wfx818jibj51jh5ksrrkghx4ykvdqfji4lrh1mv08ah3d0"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From ddbcefd927a5dc54c1268087b505fe7a24a4f33e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:17 +0200 Subject: [PATCH 042/142] haskell-hledger-interest: update to version 1.4.3 --- pkgs/applications/office/hledger-interest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix index e66166f47133..d53a8fe63e29 100644 --- a/pkgs/applications/office/hledger-interest/default.nix +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-interest"; - version = "1.4.2"; - sha256 = "1his6pxrvs5p28bmk77bd8vaq6rhjlilwq598mbkgfvlqg7q076v"; + version = "1.4.3"; + sha256 = "1nj50zi4p6rs0nl4656rr0vkbh7kdi49z1l53nypfqs3rmjgicsn"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal hledgerLib mtl time ]; From cd0b4ebcac0dfa7f2f96a670e719ff03ab8d10c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:18 +0200 Subject: [PATCH 043/142] haskell-DAV: update to version 0.4.1 --- pkgs/development/libraries/haskell/DAV/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index 93c0895fa660..a412ee9eeb5c 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "DAV"; - version = "0.4"; - sha256 = "10iwhxq9dbyx3j873khwkjxkhz9p1b1qms7q25jnpk15p1ph8b4a"; + version = "0.4.1"; + sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c"; isLibrary = true; isExecutable = true; buildDepends = [ From 3ec2ddf68585d3694d40ee07da99f248c284c820 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:18 +0200 Subject: [PATCH 044/142] haskell-asn1-types: update to version 0.1.3 --- pkgs/development/libraries/haskell/asn1-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index 1475de892742..3dacaa6353f7 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-types"; - version = "0.1.0"; - sha256 = "1520jq65fzlpi4jfrqwry3dg4lajdk6pssb7cqbrmplda0zi2d12"; + version = "0.1.3"; + sha256 = "1d55vhax71d29c2b6238pz1hqp4jnyvvfhs8f05qpcv754b4s4jg"; buildDepends = [ time ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-types"; From 5d6b71b2ff246a81895bca69c78a58dfcad7a220 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:19 +0200 Subject: [PATCH 045/142] haskell-binary: update to version 0.7.1.0 --- pkgs/development/libraries/haskell/binary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index d7a5edbf58d5..adfcc16a1806 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.7.0.1"; - sha256 = "16srrp0qx9hsr7820b2q3sp9wp8y8sxxi8rvsh63n48w4l3canxq"; + version = "0.7.1.0"; + sha256 = "16cb94z57ijw0q3h5p8jbvrv1vmnchsfjhrzvh3gdm3wf75fy8ln"; testDepends = [ Cabal filepath HUnit QuickCheck random testFramework testFrameworkQuickcheck2 From 73c248188994f0d1d43b9b804a0ee4411edc0708 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:20 +0200 Subject: [PATCH 046/142] haskell-hledger-lib: update to version 0.20 --- .../libraries/haskell/hledger-lib/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index f0edce802339..e00c07d83a80 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,14 +1,14 @@ -{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, regexpr, safe -, split, time, transformers, utf8String +{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow +, regexCompat, regexpr, safe, split, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.19.3"; - sha256 = "1wn72ycy1hvcn2ikaplq446hggpkbabyj1d8201vajwn862waxra"; + version = "0.20"; + sha256 = "040r797whajgy5xvb8ixlj5w8izx2q42mgd5554pzvjys18lsb5j"; buildDepends = [ - cmdargs csv filepath HUnit mtl parsec regexpr safe split time - transformers utf8String + cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat + regexpr safe split time transformers utf8String ]; meta = { homepage = "http://hledger.org"; From 67aa6b1641743542559d9ba826954194e3a11486 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:20 +0200 Subject: [PATCH 047/142] haskell-hledger-web: update to version 0.20 --- .../libraries/haskell/hledger-web/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index c33026f5fd60..494e729e7418 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,30 +1,26 @@ { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib -, httpConduit, HUnit, ioStorage, monadControl, networkConduit -, parsec, regexpr, safe, shakespeareCss, shakespeareJs -, shakespeareText, text, time, transformers, wai, waiExtra, warp -, yaml, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic -, yesodTest +, httpConduit, HUnit, monadControl, networkConduit, parsec, regexpr +, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time +, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml, yesod +, yesodCore, yesodDefault, yesodForm, yesodStatic, yesodTest }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.19.3"; - sha256 = "1kx5mn6drm90clz132vrd2lkssm73hlwvxb9cxg6z82i5qa9jqn9"; + version = "0.20"; + sha256 = "0imjr2cl68f6xp1vqv35z6pvbdmlbr9knsydwiazmw5s13r8sj21"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath - hamlet hjsmin hledger hledgerLib httpConduit HUnit ioStorage - monadControl networkConduit parsec regexpr safe shakespeareCss - shakespeareJs shakespeareText text time transformers wai waiExtra - warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic + hamlet hjsmin hledger hledgerLib httpConduit HUnit monadControl + networkConduit parsec regexpr safe shakespeareCss shakespeareJs + shakespeareText text time transformers wai waiExtra + waiHandlerLaunch warp yaml yesod yesodCore yesodDefault yesodForm + yesodStatic ]; testDepends = [ yesodCore yesodDefault yesodTest ]; - patchPhase = '' - sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal - ''; - jailbreak = true; doCheck = false; meta = { homepage = "http://hledger.org"; From 074955e2bdb316d55c128be20239b947b5325bfc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:21 +0200 Subject: [PATCH 048/142] haskell-hledger: update to version 0.20 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 8de78340b1ca..b840242dd88e 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.19.3"; - sha256 = "1kxkv2dwl5ir2vqvbi1ppbwns8mw1lkg5lkfdkdwwbjj7dq0ysr6"; + version = "0.20"; + sha256 = "1jdh01y8jys1ha3qrmx509ka4wb1bgv28xz3rwz8aklz2nfzn4zb"; isLibrary = true; isExecutable = true; buildDepends = [ From 8f10a42a321c190e769cdb5a6f5b06589b653640 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:22 +0200 Subject: [PATCH 049/142] haskell-reflection: update to version 1.3.1 --- pkgs/development/libraries/haskell/reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index d2d723230d16..8cdd36da0141 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.3"; - sha256 = "1wv868m24ds2hf2iwrv1hw1v0r82kjs2qhcp5b1p2jrdl26fhzd8"; + version = "1.3.1"; + sha256 = "0d81zvyg846jp0xkdkj4220w6hbrnzf46zcxs5qb5frm41rwcsj8"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; From cb842f97176afadb4ec0adcc6fef4903dc41350d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:35:22 +0200 Subject: [PATCH 050/142] haskell-snap: update to version 0.11.3 --- pkgs/development/libraries/haskell/snap/snap.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 3243fce6a368..b1a9a12ee1a4 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,25 +1,24 @@ { cabal, aeson, attoparsec, cereal, clientsession, comonad , configurator, directoryTree, dlist, errors, filepath, hashable , heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom -, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, tagged -, text, time, transformers, unorderedContainers, vector -, vectorAlgorithms, xmlhtml +, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text +, time, transformers, unorderedContainers, vector, vectorAlgorithms +, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.11.2.2"; - sha256 = "1fwm60rx2ginlphi00kn3ghs9rxdx4br8p4f3prpfmhvjikwgv8n"; + version = "0.11.3"; + sha256 = "1v4qx9kfxyx3kc2k4cpr8pjf20mfqmmzi7rzdlaf32frh38hp5ac"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec cereal clientsession comonad configurator directoryTree dlist errors filepath hashable heist lens logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix - snapCore snapServer stm syb tagged text time transformers + snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From 14660eb7e5b2adc6bba69d54c73e1c03364ed497 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:37:40 +0200 Subject: [PATCH 051/142] haskell-hashable: update to version 1.2.0.7 --- .../libraries/haskell/hashable/{1.2.0.6.nix => 1.2.0.7.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/hashable/{1.2.0.6.nix => 1.2.0.7.nix} (88%) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.6.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix similarity index 88% rename from pkgs/development/libraries/haskell/hashable/1.2.0.6.nix rename to pkgs/development/libraries/haskell/hashable/1.2.0.7.nix index efe37c9162df..b97d168d4121 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.6.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.0.6"; - sha256 = "0kd0vk87pgrir5zx7b30dvv2lsjjiykqi1gpalkgmgbvhals4p9z"; + version = "1.2.0.7"; + sha256 = "1v70b85g9kx0ikgxpiqpl8dp3w9hdxm75h73g69giyiy7swn9630"; buildDepends = [ text ]; testDepends = [ HUnit QuickCheck random testFramework testFrameworkHunit diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ec6fe741394b..7c5302236fc2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1007,8 +1007,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_0_6 = callPackage ../development/libraries/haskell/hashable/1.2.0.6.nix {}; - hashable = self.hashable_1_2_0_6; + hashable_1_2_0_7 = callPackage ../development/libraries/haskell/hashable/1.2.0.7.nix {}; + hashable = self.hashable_1_2_0_7; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; From 98dae954cf4ce19fb1e95d6b27b2a51b849ada8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 12:48:41 +0200 Subject: [PATCH 052/142] haskell-vector-binary-instances: add version 0.2.1.0 --- .../haskell/vector-binary-instances/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/vector-binary-instances/default.nix diff --git a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix new file mode 100644 index 000000000000..62d1c0506ed3 --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix @@ -0,0 +1,14 @@ +{ cabal, binary, cereal, vector }: + +cabal.mkDerivation (self: { + pname = "vector-binary-instances"; + version = "0.2.1.0"; + sha256 = "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l"; + buildDepends = [ binary cereal vector ]; + meta = { + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c5302236fc2..176a4acdede7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1895,6 +1895,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; + vectorBinaryInstances = callPackage ../development/libraries/haskell/vector-binary-instances {}; + vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {}; From e39f1607c9b23887a2c4b63c4949fbb73fe76927 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 May 2013 15:12:29 +0200 Subject: [PATCH 053/142] haskell-snap: jailbreak to support current version of hashable --- pkgs/development/libraries/haskell/snap/snap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index b1a9a12ee1a4..98ceb4489356 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From c0eca109ed86edb6a3b958bedfdb472ee5acecc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2013 09:58:30 +0200 Subject: [PATCH 054/142] haskell-text: update to version 0.11.3.1 --- .../libraries/haskell/text/0.11.3.1.nix | 25 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/text/0.11.3.1.nix diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix new file mode 100644 index 000000000000..8c3de985955e --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.3.1.nix @@ -0,0 +1,25 @@ +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.3.1"; + sha256 = "17smd4h8xiqlggwd3n4j2dszfqsjpjjbjgk9badhkmya8ykd9akn"; + buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 176a4acdede7..d04aa3796063 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -160,7 +160,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); split = self.split_0_2_2; # 7.6 ok stm = self.stm_2_4_2; # 7.6 ok syb = self.syb_0_4_0; # 7.6 ok - text = self.text_0_11_2_3; # 7.6 ok + text = self.text_0_11_3_1; # 7.6 ok transformers = self.transformers_0_3_0_0; # 7.6 ok vector = self.vector_0_10_0_1; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok @@ -1800,7 +1800,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; - text = self.text_0_11_2_3; + text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; + text = self.text_0_11_3_1; textIcu = callPackage ../development/libraries/haskell/text-icu {}; From 0b946a6374c76574ff744ba380a950cba076626a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2013 09:59:40 +0200 Subject: [PATCH 055/142] haddock: update to version 2.13.2 --- .../tools/documentation/haddock/{2.13.1.nix => 2.13.2.nix} | 6 +++--- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/tools/documentation/haddock/{2.13.1.nix => 2.13.2.nix} (82%) diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix similarity index 82% rename from pkgs/development/tools/documentation/haddock/2.13.1.nix rename to pkgs/development/tools/documentation/haddock/2.13.2.nix index a932e6ce1e21..a5a63f6c90aa 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "haddock"; - version = "2.13.1"; - sha256 = "0zsflbc3ayjsn542sa58zl62dd78ykr489f18sh467hrrnaj4pkf"; + version = "2.13.2"; + sha256 = "1qwj13ks3fzar14s587svv1pdiwk80m7x5pzn74v3jrqkn0xbrr5"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; - testDepends = [ Cabal filepath ]; + testDepends = [ Cabal deepseq filepath ]; buildTools = [ alex happy ]; doCheck = false; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d04aa3796063..4dc18f20e547 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -167,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_4_1; # 7.6 ok cabalInstall = self.cabalInstall_1_16_0_2; # 7.6 ok alex = self.alex_3_0_5; # 7.6 ok - haddock = self.haddock_2_13_1; # 7.6 ok + haddock = self.haddock_2_13_2; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok primitive = self.primitive_0_5_0_1; # semi-official, but specified }; @@ -2093,8 +2093,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; - haddock_2_13_1 = callPackage ../development/tools/documentation/haddock/2.13.1.nix {}; - haddock = self.haddock_2_13_1; + haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; + haddock = self.haddock_2_13_2; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; From 05f45683407b9be6bf9ed6f7ade0fd4dfed05bb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2013 10:00:30 +0200 Subject: [PATCH 056/142] haskell-snap: update to version 0.11.3.1 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 98ceb4489356..9c7c350c5174 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.11.3"; - sha256 = "1v4qx9kfxyx3kc2k4cpr8pjf20mfqmmzi7rzdlaf32frh38hp5ac"; + version = "0.11.3.1"; + sha256 = "0hlwpzrckq89wpa8603j7p3aghlqshrp3kzsdrryf44k24q3vgrj"; isLibrary = true; isExecutable = true; buildDepends = [ From a0ec8bd0206642c0e5603c0297203720d261f4d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2013 10:02:48 +0200 Subject: [PATCH 057/142] haskell-cgi: downgrade to version 3001.1.7.5 in GHC 7.6.x The next Haskell Platform will contain this fairly old version, because 3001.1.8.4 depends on monad-catchio, which is not part of HP. --- .../libraries/haskell/cgi/3001.1.7.5.nix | 14 ++++++++++++++ .../haskell/cgi/{3001.1.8.3.nix => 3001.1.8.4.nix} | 12 ++++-------- pkgs/top-level/haskell-packages.nix | 7 ++++--- 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix rename pkgs/development/libraries/haskell/cgi/{3001.1.8.3.nix => 3001.1.8.4.nix} (58%) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix new file mode 100644 index 000000000000..284c1ee2c055 --- /dev/null +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix @@ -0,0 +1,14 @@ +{ cabal, mtl, network, parsec, xhtml }: + +cabal.mkDerivation (self: { + pname = "cgi"; + version = "3001.1.7.5"; + sha256 = "1zdgdzkrzclf492pb9px5a490mxfxl5c1099axcxxm9wlpmf49ji"; + buildDepends = [ mtl network parsec xhtml ]; + meta = { + homepage = "http://andersk.mit.edu/haskell/cgi/"; + description = "A library for writing CGI programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix similarity index 58% rename from pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix rename to pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix index 08b0477039d9..4f5fed76b416 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix @@ -1,14 +1,10 @@ -{ cabal, extensibleExceptions, MonadCatchIOMtl, mtl, network -, parsec, xhtml -}: +{ cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { pname = "cgi"; - version = "3001.1.8.3"; - sha256 = "1pacv0qxfs7l71xvf9amd7qsw5g725qbrm8r6fgdb2awyl925sf4"; - buildDepends = [ - extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml - ]; + version = "3001.1.8.4"; + sha256 = "1h0ynrrda18g5pn1sw2n94rhhp3k39nb7wmx53b52dhxkp2izlgn"; + buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ]; meta = { homepage = "http://andersk.mit.edu/haskell/cgi/"; description = "A library for writing CGI programs"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4dc18f20e547..cff0c664d75e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -140,7 +140,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; async = self.async_2_0_1_4; # 7.6 ok - cgi = self.cgi_3001_1_8_3; # 7.6 ok + cgi = self.cgi_3001_1_7_5; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok GLUT = self.GLUT_2_4_0_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok @@ -613,8 +613,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {}; cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {}; cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; - cgi_3001_1_8_3 = callPackage ../development/libraries/haskell/cgi/3001.1.8.3.nix {}; - cgi = self.cgi_3001_1_8_3; + cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {}; + cgi_3001_1_8_4 = callPackage ../development/libraries/haskell/cgi/3001.1.8.4.nix {}; + cgi = self.cgi_3001_1_8_4; Chart = callPackage ../development/libraries/haskell/Chart {}; From 7b868bbff4d6793e5047a08b1304f6b0a241cbb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2013 11:29:38 +0200 Subject: [PATCH 058/142] git-annex: update to version 4.20130501 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index b3a9f02ed9e9..1a2e637bff06 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -10,14 +10,14 @@ }: let - version = "4.20130405"; + version = "4.20130501"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; - sha256 = "13lzkvk5095qj8026lc1p56w0q1c95v7nx8g9p9zrf8mhx6yxb9n"; + sha256 = "0g89lmkrs02qdb1k1bfq9gz3j4yv35320vb8ddmj99f4nnhqc6vv"; name = "git-annex-${version}.tar.gz"; }; From d21bfddc57cdbc6c9a878dc364ffefbfc4455488 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 May 2013 11:46:49 +0200 Subject: [PATCH 059/142] Revert "overrideDerivation: Simplify" This reverts commit 6640000cb7148ba39bbdcca8e0cd7f5c224bce57, which caused passthru attributes not to be passed correctly after calling overrideDerivation. E.g. in the evaluation of the Nix jobset: at `deb_ubuntu1004i386' [officialRelease = false, nix = ...]: attribute `fullName' missing --- pkgs/lib/customisation.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 50816f99ec60..a35b44e9f6ee 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -33,14 +33,17 @@ rec { overrideDerivation = drv: f: let - newDrv = derivation (drv.drvAttrs // (f drv)); + # Filter out special attributes. + drop = [ "meta" "passthru" "outPath" "drvPath" "crossDrv" "nativeDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ] + # also drop functions such as .merge .override etc + ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv); + attrs = removeAttrs drv drop; + newDrv = derivation (attrs // (f drv)); in newDrv // - { meta = drv.meta or {}; + { meta = if drv ? meta then drv.meta else {}; passthru = if drv ? passthru then drv.passthru else {}; } // - (drv.passthru or {}) - // (if (drv ? crossDrv && drv ? nativeDrv) then { crossDrv = overrideDerivation drv.crossDrv f; From 233aca358fee1f037acc20838caa9e71b4c26a19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 May 2013 13:43:47 +0200 Subject: [PATCH 060/142] checkinstall: Fix build on i686-linux http://hydra.nixos.org/build/4844549 --- pkgs/tools/package-management/checkinstall/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index a2b9c11eb09d..f3153100008f 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -29,11 +29,12 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'scandir'' error on Glibc 2.11. ./scandir.patch + ] + ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") # Force use of old memcpy so that installwatch works on Glibc < # 2.14. - ./use-old-memcpy.patch - ]; + ./use-old-memcpy.patch; buildInputs = [gettext]; From 1073187f787a72feb2a9d4aea02357b47b291e74 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 May 2013 14:01:32 +0200 Subject: [PATCH 061/142] Add Ubuntu 13.04 --- pkgs/build-support/vm/default.nix | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 1251866252c5..68ecb512901d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1322,6 +1322,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" ]; }; + ubuntu1304i386 = { + name = "ubuntu-13.04-raring-i386"; + fullName = "Ubuntu 13.04 Raring (i386)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/raring/main/binary-i386/Packages.bz2; + sha256 = "b7da6802c5302439d9abf05ebe1ab4c3b82d7be9356f51a12c5bf4994f009181"; + }) + (fetchurl { + url = mirror://ubuntu/dists/raring/universe/binary-i386/Packages.bz2; + sha256 = "1db19982fc3689b00a918e2cdbb936dfccebbac2ed82f81bb0164a3d51039012"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu1304x86_64 = { + name = "ubuntu-13.04-raring-amd64"; + fullName = "Ubuntu 13.04 Raring (amd64)"; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/raring/main/binary-amd64/Packages.bz2; + sha256 = "9ee6a67bedbda80b668a868bb81b5b3f30bbabac01f69d2a08961c37c8536356"; + }) + (fetchurl { + url = mirror://ubuntu/dists/raring/universe/binary-amd64/Packages.bz2; + sha256 = "0caf561bad359e8a82a987a076c0f1cb7a43412a5de053c105b160477c192978"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian40i386 = { name = "debian-4.0r9-etch-i386"; fullName = "Debian 4.0r9 Etch (i386)"; From 84fba68006259f1732a9580ba2bdcbc300300c89 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 3 May 2013 09:07:42 -0400 Subject: [PATCH 062/142] mkDerivation: Allow direct access to passthru Before this, the passthru attributes were only merged in with the derivation attribute set, and there was no way to distinguish after the fact which attributes were part of the derivation and which came from passthru. Now passthru can be looked at separately as well. Signed-off-by: Shea Levy --- pkgs/stdenv/generic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index dc8d92715def..9b8fd5615e70 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -85,6 +85,7 @@ let # include it in the result, it *is* available to nix-env for # queries. meta = attrs.meta or {}; + passthru = attrs.passthru or {}; } // # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the From c2b1ca029663d1ad41bbffd3d09becada06c74cc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 3 May 2013 09:09:58 -0400 Subject: [PATCH 063/142] Revert "Revert "overrideDerivation: Simplify"" Now that `drv.passthru' actually is meaningful, this works. This reverts commit d21bfddc57cdbc6c9a878dc364ffefbfc4455488. Signed-off-by: Shea Levy --- pkgs/lib/customisation.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index a35b44e9f6ee..50816f99ec60 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -33,17 +33,14 @@ rec { overrideDerivation = drv: f: let - # Filter out special attributes. - drop = [ "meta" "passthru" "outPath" "drvPath" "crossDrv" "nativeDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ] - # also drop functions such as .merge .override etc - ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv); - attrs = removeAttrs drv drop; - newDrv = derivation (attrs // (f drv)); + newDrv = derivation (drv.drvAttrs // (f drv)); in newDrv // - { meta = if drv ? meta then drv.meta else {}; + { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } // + (drv.passthru or {}) + // (if (drv ? crossDrv && drv ? nativeDrv) then { crossDrv = overrideDerivation drv.crossDrv f; From 6b0e94a516c5aa8d0e18e13028c7ccf541062c99 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 3 May 2013 09:12:55 -0400 Subject: [PATCH 064/142] overrideDerivation: Re-attatch passthru and meta to all outputs Signed-off-by: Shea Levy --- pkgs/lib/customisation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 50816f99ec60..bfa61169efb1 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -34,7 +34,7 @@ rec { overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); - in newDrv // + in addPassthru newDrv ( { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } @@ -46,7 +46,7 @@ rec { crossDrv = overrideDerivation drv.crossDrv f; nativeDrv = overrideDerivation drv.nativeDrv f; } - else { }); + else { })); # usage: (you can use override multiple times) From 7636315648adf70f42e878111e375b9154fab5fe Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 3 May 2013 16:58:24 +0300 Subject: [PATCH 065/142] Phonon GStreamer backend bugfix version bump --- .../libraries/phonon-backend-gstreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 24a261065ebd..f297bd792c77 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -2,7 +2,7 @@ , gst_plugins_base }: let - version = "4.6.0"; + version = "4.6.3"; pname = "phonon-backend-gstreamer"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v"; + sha256 = "0n5ggap1xzspq8x1j9bvnf7wqqh5495sysri7zyg42g32gqp7qjm"; }; buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; From 304feb380cf54548faa6ded85b0c46f0640ae152 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2013 16:36:23 +0200 Subject: [PATCH 066/142] haskell-authenticate-oauth: jailbreak to support crypto-pubkey-types 0.3.x --- .../development/libraries/haskell/authenticate-oauth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 445cf0a90388..60cd5ffb73a4 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl random resourcet RSA SHA time transformers ]; + jailbreak = true; meta = { homepage = "http://github.com/yesodweb/authenticate"; description = "Library to authenticate with OAuth for Haskell web applications"; From 5465a118e1308eabac2e59274278f12b34876a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 4 May 2013 01:04:17 +0400 Subject: [PATCH 067/142] filegive: update to 0.5.1 nat-pmp, fixed upnp bugs, ... --- pkgs/tools/networking/filegive/default.nix | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d9cb3b6c03ed..0cba306388e3 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,20 +1,39 @@ -{ stdenv, fetchurl, go }: +{ stdenv, fetchurl, fetchgit, go }: assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); +let + + # Code with BSD license + srcNatPMP = fetchgit { + url = "https://code.google.com/p/go-nat-pmp/"; + rev = "e04deda90d56"; + sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; + }; + + version = "0.5.1"; + +in stdenv.mkDerivation rec { - name = "filegive-0.3.1"; + name = "filegive-${version}"; src = fetchurl { - url = "http://viric.name/cgi-bin/filegive/tarball/filegive-0.3.1.tar.gz?uuid=v0.3.1"; + url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; name = "${name}.tar.gz"; - sha256 = "14hsy7bkmhq03f2yf619kz8p11v8ndd59sdibck556z8dld7b6ya"; + sha256 = "0b8x2g5c9j5v36s62yzdcnj4b76ahiz1brkilm3mv1qkck2y6wwb"; }; buildInputs = [ go ]; buildPhase = '' ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "export GOARM=5"} + + mkdir $TMPDIR/go + export GOPATH=$TMPDIR/go + + GONATPMP=$GOPATH/src/code.google.com/p/go-nat-pmp + mkdir -p $GONATPMP + cp -R ${srcNatPMP}/* $GONATPMP/ go build -o filegive ''; From a5adbf19a6d17d1cef3467661979a07306e43f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 4 May 2013 10:08:52 +0400 Subject: [PATCH 068/142] filegive: fixing licence, adding maintainer --- pkgs/tools/networking/filegive/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 0cba306388e3..b32c43d0a76c 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://viric.name/cgi-bin/filegive; description = "Easy p2p file sending program"; - license = "BSD"; + license = "AGPLv3+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } From d74eece6df44c83d69cc15b487ae1263e48b6e49 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 4 May 2013 20:29:16 +0200 Subject: [PATCH 069/142] libevent: set platforms --- pkgs/development/libraries/libevent/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 3be67d180406..b2987689be7c 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { ''; license = "mBSD"; + platforms = stdenv.lib.platforms.all; }; } From 301d2e5431281379a30dd79fa77b6f6aa744c165 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 4 May 2013 20:34:15 +0200 Subject: [PATCH 070/142] ncdu: set platforms --- pkgs/tools/misc/ncdu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 944b6ea77e1e..2d3a67db8c55 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "An ncurses disk usage analyzer."; homepage = http://dev.yorhel.nl/ncdu; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; }; } From c4edee4d3975770a681d43096463b7d517e22973 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 4 May 2013 15:18:37 -0400 Subject: [PATCH 071/142] clang: Pass the real gcc install prefix Signed-off-by: Shea Levy --- pkgs/development/compilers/llvm/clang.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 0c5788288881..bd6b0a6f2023 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all" + "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}" ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" ]; From b5241215b124b6508c585c807012d4b295034101 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 4 May 2013 22:19:53 +0200 Subject: [PATCH 072/142] cython: set platforms --- pkgs/development/interpreters/cython/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/default.nix index 42dafcb7f2e7..34bd63c29abf 100644 --- a/pkgs/development/interpreters/cython/default.nix +++ b/pkgs/development/interpreters/cython/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { description = "An interpreter to help writing C extensions for Python"; + platforms = stdenv.lib.platforms.all; }; } From 88864e331a9664b605707fb48f8ec2b3395a55bd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 4 May 2013 17:29:51 -0400 Subject: [PATCH 073/142] Try to fix the tarball. stdenv.gcc.gcc might be null, e.g. on ppc-linux Signed-off-by: Shea Levy --- pkgs/development/compilers/llvm/clang.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index bd6b0a6f2023..c2117798666b 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }: -let version = "3.2"; in +let + version = "3.2"; + gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; +in stdenv.mkDerivation { name = "clang-${version}"; @@ -13,7 +16,7 @@ stdenv.mkDerivation { "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}" + "-DGCC_INSTALL_PREFIX=${gccReal}" ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" ]; From f8f9f3b1ccafc5778bd0fbdd746ba04d55f62fa2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 4 May 2013 18:05:45 -0400 Subject: [PATCH 074/142] binutils_gold: Don't require unneded dependencies. Based on my scan of the logs they weren't even used when enabled Signed-off-by: Shea Levy --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index c3f9de4bc898..e1afceebaa23 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] - ++ stdenv.lib.optional gold [dejagnu flex2535 bison /* Some Gold tests require this: */ bc]; + ++ stdenv.lib.optional gold bison; inherit noSysDirs; From 0f633fdfc6fd8f09ae9ae764d905a702eb5343cb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 4 May 2013 21:21:31 -0400 Subject: [PATCH 075/142] Make some arguments passed to all-packages.nix available in the pkgs set These are needed to re-call to, say, deeply override glibc Signed-off-by: Shea Levy --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd80e8bb7861..8f8ceb043523 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -139,6 +139,9 @@ let # eventually. inherit __overrides pkgs; + # Make some arguments passed to all-packages.nix available + inherit system stdenvType platform; + # We use `callPackage' to be able to omit function arguments that # can be obtained from `pkgs' or `pkgs.xorg' (i.e. `defaultScope'). From 99864573312de6143f5e368c7e8a4e8b0d07291b Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 5 May 2013 10:49:57 +0200 Subject: [PATCH 076/142] add dontBuild docs --- doc/stdenv.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 1ecf72351f25..7bcbadd8ea9a 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -568,6 +568,11 @@ nothing. Variables controlling the build phase + + dontBuild + Set to true to skip the build phase. + + makefile The file name of the Makefile. From 8aabef687506a637f12626cc33ba7f7e56870a10 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 5 May 2013 11:06:05 +0200 Subject: [PATCH 077/142] autojump: bump and reogranize a bit, not functional yet --- pkgs/tools/misc/autojump/default.nix | 36 +++++++++++----------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 397e80a745ec..2eb453142002 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,41 +1,33 @@ -{ fetchurl, stdenv, python }: +{ fetchurl, stdenv, python, bash }: -let version = "4"; in +let + version = "21.5.8"; +in stdenv.mkDerivation rec { name = "autojump-${version}"; src = fetchurl { - url = "http://github.com/joelthelion/autojump/tarball/release-v4"; + url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz"; name = "autojump-${version}.tar.gz"; - sha256 = "06hjkdmfhawi6xksangymf9z85ql8d7q0vlcmgsw45vxq7iq1fnp"; + sha256 = "07jf5pa9xwmbswsc0h6law9f5qwczsj25w7h034s379imid5h62f"; }; - # FIXME: Appears to be broken with Bash 4.0: - # http://wiki.github.com/joelthelion/autojump/doesnt-seem-to-be-working-with-bash-40 . - - patchPhase = '' - sed -i "install.sh" \ - -e "s,/usr/,$out/,g ; s,/etc/,/nowhere/,g ; s,sudo,,g" - ''; - buildInputs = [ python ]; + dontBuild = true; installPhase = '' - mkdir -p "$out/bin" "$out/share/man/man1" - yes no | sh ./install.sh + bash ./install.sh -d $out mkdir -p "$out/etc/bash_completion.d" - cp -v autojump.bash "$out/etc/bash_completion.d" - - echo "Bash users: Make sure to source \`$out/etc/bash_completion.d/autojump.bash'" - echo "to get the \`j' and \`jumpstat' commands." + cp -v $out/etc/profile.d/autojump.bash "$out/etc/bash_completion.d" + mkdir -p $out/bin + ln -s $out/usr/local/bin/autojump $out/bin/j # FIXME: What's the right place for `autojump.zsh'? ''; meta = { description = "Autojump, a `cd' command that learns"; - longDescription = '' One of the most used shell commands is “cd”. A quick survey among my friends revealed that between 10 and 20% of all @@ -56,9 +48,9 @@ let version = "4"; in Autojump supports tab-completion. ''; - homepage = http://wiki.github.com/joelthelion/autojump; - - license = "GPLv3+"; + license = stdenv.lib.license.gpl3; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.iElectric ]; }; } From 6d406bd94542960be81fc5ff8826a5e516a38372 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 2 May 2013 18:23:10 +0200 Subject: [PATCH 078/142] Update spotify to 0.9.0.133. Signed-off-by: Moritz Ulrich --- pkgs/applications/audio/spotify/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 110d222c238c..36c6c2ca9cdf 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -2,16 +2,16 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let - version = "0.8.8.323"; - qt4webkit = +let + version = "0.9.0.133"; + qt4webkit = if stdenv.system == "i686-linux" then fetchurl { name = "libqtwebkit4_2.2_i386.deb"; url = http://mirrors.us.kernel.org/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_i386.deb; sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924"; } - else + else fetchurl { name = "libqtwebkit4_2.2_amd64.deb"; url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_amd64.deb; @@ -25,13 +25,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_i386.deb"; - sha256 = "13q803qlvq16yrr7f95izp9mqqdb8kpcsyrb5gc5i2pya68ra906"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd18ed58.259-1_i386.deb"; + sha256 = "15kbwll63pm99262f7xq1z0c5bwmk5cz46pkh8xd5xsqxlsvvv1n"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_amd64.deb"; - sha256 = "0ny3z499wks1dhrd3qq4d6cp0zd33198z9vak8ffgm5x24sdpghf"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd18ed58.259-1_amd64.deb"; + sha256 = "0l3nikhf4hyj6z7639s668kd806730va005rwqcxvymxddcbcp03"; } else throw "Spotify not supported on this platform."; From 9b5685271d317cec88f832caaef33b9842b55f61 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sun, 5 May 2013 12:46:23 +0200 Subject: [PATCH 079/142] fix autojump licence attribute --- pkgs/tools/misc/autojump/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 2eb453142002..2a815498d2d2 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -49,7 +49,7 @@ in Autojump supports tab-completion. ''; homepage = http://wiki.github.com/joelthelion/autojump; - license = stdenv.lib.license.gpl3; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; From 8095d76a73881bf83d81c21efe4ec0ed4c2efe42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 5 May 2013 13:13:45 +0200 Subject: [PATCH 080/142] spyder: new package Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive testing, debugging and introspection features. The name Spyder comes from Scientific PYthon Development EnviRonment. --- pkgs/applications/science/spyder/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/science/spyder/default.nix diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix new file mode 100644 index 000000000000..772a25ed4a1a --- /dev/null +++ b/pkgs/applications/science/spyder/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, buildPythonPackage, unzip, sphinx, pyside }: + +buildPythonPackage rec { + name = "spyder-2.1.13.1"; + namePrefix = ""; + + src = fetchurl { + url = "https://spyderlib.googlecode.com/files/${name}.zip"; + sha256 = "1sg88shvw6k2v5428k13mah4pyqng43856rzr6ypz5qgwn0677ya"; + }; + + buildInputs = [ unzip sphinx ]; + propagatedBuildInputs = [ pyside ]; + + # There is no test for spyder + doCheck = false; + + meta = { + description = "Scientific PYthon Development EnviRonment (SPYDER)"; + longDescription = '' + Spyder (previously known as Pydee) is a powerful interactive development + environment for the Python language with advanced editing, interactive + testing, debugging and introspection features. + ''; + homepage = https://code.google.com/p/spyderlib/; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f8ceb043523..77af5f6eca36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8716,6 +8716,10 @@ let gravit = callPackage ../applications/science/astronomy/gravit { }; + spyder = callPackage ../applications/science/spyder { + inherit (pythonPackages) sphinx; + }; + stellarium = callPackage ../applications/science/astronomy/stellarium { }; ### SCIENCE/GEOMETRY From 1a003e7dfc15457366e98f1b9facc8c2653af5ce Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 5 May 2013 16:24:16 +0200 Subject: [PATCH 081/142] autojump: add bash as buildInput --- pkgs/tools/misc/autojump/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 2a815498d2d2..459c9c86ce43 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -12,7 +12,7 @@ in sha256 = "07jf5pa9xwmbswsc0h6law9f5qwczsj25w7h034s379imid5h62f"; }; - buildInputs = [ python ]; + buildInputs = [ python bash ]; dontBuild = true; installPhase = '' From 9808445598b526fda586283255b0fcee06605adf Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sun, 5 May 2013 15:19:03 -0400 Subject: [PATCH 082/142] Add optional third party support for fullWebDAV. This follows the directions fom http://wiki.nginx.org/HttpDavModule. --- pkgs/servers/http/nginx/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 5c0b1c2d7233..147a23522464 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }: +{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false }: stdenv.mkDerivation rec { name = "nginx-1.2.4"; @@ -8,7 +8,13 @@ stdenv.mkDerivation rec { sha256 = "0hvcv4lgfcrsl40azkd3rxhf73l05jzzgflclpkdvjd95xgw51y5"; }; - buildInputs = [ openssl zlib pcre libxml2 libxslt ]; + dav-ext = fetchgit { + url = git://github.com/arut/nginx-dav-ext-module.git; + rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; + sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + }; + + buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; configureFlags = [ "--with-http_ssl_module" @@ -19,7 +25,7 @@ stdenv.mkDerivation rec { "--with-http_secure_link_module" # Install destination problems # "--with-http_perl_module" - ]; + ] ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}"; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2" From 185d102b665b4f57681038ef08f34c91311523a8 Mon Sep 17 00:00:00 2001 From: modulistic Date: Sun, 5 May 2013 21:45:06 +0200 Subject: [PATCH 083/142] pstree: version bump from 2.33 to 2.36 --- pkgs/applications/misc/pstree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 6f5c775cfb33..0d61d3d74cfb 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pstree-2.33"; + name = "pstree-2.36"; src = fetchurl { url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"; - sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg"; + sha256 = "1vx4fndmkkx3bmcv71rpzjjbn24hlfs10pl99dsfhbx16a2d41cx"; }; unpackPhase = "unpackFile \$src; sourceRoot=."; From e39ddf321c0966fa6a740c2fddef87eef97a13ca Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 5 May 2013 15:48:07 -0400 Subject: [PATCH 084/142] nginx: Don't fetch the full WebDAV extension unless needed Signed-off-by: Shea Levy --- pkgs/servers/http/nginx/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 147a23522464..9a5d8e7a149f 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,5 +1,13 @@ { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false }: +let + dav-ext = fetchgit { + url = git://github.com/arut/nginx-dav-ext-module.git; + rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; + sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + }; +in + stdenv.mkDerivation rec { name = "nginx-1.2.4"; @@ -8,12 +16,6 @@ stdenv.mkDerivation rec { sha256 = "0hvcv4lgfcrsl40azkd3rxhf73l05jzzgflclpkdvjd95xgw51y5"; }; - dav-ext = fetchgit { - url = git://github.com/arut/nginx-dav-ext-module.git; - rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; - sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; - }; - buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; configureFlags = [ From db04466380cee5ad4ae2b6753dbd3da953ad6dba Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 5 May 2013 22:02:48 +0200 Subject: [PATCH 085/142] xarchive: add gtk archiver --- pkgs/tools/archivers/xarchive/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/archivers/xarchive/default.nix diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix new file mode 100644 index 000000000000..2b60bef197ab --- /dev/null +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, gtk2, pkgconfig }: + +stdenv.mkDerivation rec { + version = "0.2.8-6"; + name = "xarchive-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/xarchive/${name}.tar.gz"; + sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4"; + }; + + buildInputs = [ gtk2 pkgconfig ]; + + meta = { + description = "A GTK+ front-end for command line archiving tools"; + mainatainers = [ stdenv.lib.maintainers.iElectric ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77af5f6eca36..ba175b40220b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1809,6 +1809,8 @@ let unrar = callPackage ../tools/archivers/unrar { }; + xarchive = callPackage ../tools/archivers/xarchive { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; From 7cc21354d501c824e7166e268728bc43ef05e1a8 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 5 May 2013 23:09:46 +0200 Subject: [PATCH 086/142] pa-applet: add pulseaudio applet --- pkgs/tools/audio/pa-applet/default.nix | 29 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/audio/pa-applet/default.nix diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/tools/audio/pa-applet/default.nix new file mode 100644 index 000000000000..2cfcf35f86cb --- /dev/null +++ b/pkgs/tools/audio/pa-applet/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, pulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: + +stdenv.mkDerivation rec { + name = "pa-applet"; + + src = fetchgit { + url = "https://github.com/fernandotcl/pa-applet.git"; + rev = "005f192df9ba6d2e6491f9aac650be42906b135a"; + }; + + buildInputs = [ + gtk3 pulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev + ]; + + preConfigure = '' + ./autogen.sh + ''; + + postInstall = '' + ''; + + meta = with stdenv.lib; { + homepage = http://projects.gnome.org/NetworkManager/; + description = ""; + license = licenses.gpl2; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba175b40220b..d3a7f03e14b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1262,6 +1262,8 @@ let networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; + pa_applet = callPackage ../tools/audio/pa-applet { }; + nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; nlopt = callPackage ../development/libraries/nlopt {}; From 15716e3659d5b0df69982740b2ecbf96a2348a53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:22 +0200 Subject: [PATCH 087/142] haskell-xmobar: update to version 0.17 --- pkgs/applications/misc/xmobar/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index c9d3183e7939..bdc5c7856aa1 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.16"; - sha256 = "1dx4kwygzp4c5j4jj4lsfgjfvhh863v68s106lmwc86a30h60p8i"; + version = "0.17"; + sha256 = "0ahb3xqxcfvpgxyb901bpl4i56mnslzwplcqxrr13glngcl7d25s"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -13,7 +13,6 @@ cabal.mkDerivation (self: { ]; extraLibraries = [ libXrandr wirelesstools ]; configureFlags = "-fwith_xft -fwith_iwlib"; - patches = [ ./add-freeration-variable.patch ]; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From 23c536c6ac195df0b86540a6cb45b5d84006e723 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:22 +0200 Subject: [PATCH 088/142] haskell-binary-shared: update to version 0.8.3 --- pkgs/development/libraries/haskell/binary-shared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix index 45d587697c08..34a6f0db9715 100644 --- a/pkgs/development/libraries/haskell/binary-shared/default.nix +++ b/pkgs/development/libraries/haskell/binary-shared/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "binary-shared"; - version = "0.8.2"; - sha256 = "05cqdpclb4xc6ydwdpxfi3bvaaw7syxlmb5r9kxjcp3f6fji5rm2"; + version = "0.8.3"; + sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3"; buildDepends = [ binary mtl ]; meta = { homepage = "http://www.leksah.org"; From a43495c64f905cde34174ff768e068ea3279114e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:22 +0200 Subject: [PATCH 089/142] haskell-case-insensitive: update to version 1.0.0.2 --- .../libraries/haskell/case-insensitive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 06a75132869d..44aaef29cea5 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "1.0.0.1"; - sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm"; + version = "1.0.0.2"; + sha256 = "11cczwg11y6pfsidj1i052rhri98sgg2qzf0ixgjq1gywakjx5f2"; buildDepends = [ deepseq hashable text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { From 4d2268178990d1ad42a0f9d322e9c45abc7c2753 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:22 +0200 Subject: [PATCH 090/142] haskell-diagrams-lib: update to version 0.6.0.3 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index fc99e80ddad1..a737160ea605 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "0.6.0.2"; - sha256 = "0jxpbggwgbjnl2yx7y0zcjs2fls7y1wm33wllq5j9snkiz1n81hb"; + version = "0.6.0.3"; + sha256 = "0rc3m2v1bxlm5rz1pi1w4k37sbgmr9qv54rllsqan1kicafjaqw1"; buildDepends = [ active colour dataDefault diagramsCore monoidExtras newtype NumInstances semigroups vectorSpace ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; From d9fa3a5ee2668f0a23d07bbec88694a54c9655b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:22 +0200 Subject: [PATCH 091/142] haskell-doctest: update to version 0.9.7 --- pkgs/development/libraries/haskell/doctest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index d83fa8729c1c..ecbac90aa418 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "doctest"; - version = "0.9.6"; - sha256 = "0gw13pm4hg69v60swsv6w4iwzgdj5f4pkcyfmgzfp1dx399p6hyl"; + version = "0.9.7"; + sha256 = "0d3aywm5v3kx16c1i6cb4inr7hdnmsl8qawxp27g0yng03wdra5l"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; From 391f30a2c929f65ab3f2ce782cf277ab684ff6ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:22 +0200 Subject: [PATCH 092/142] haskell-haxr: update to version 3000.9.1 --- pkgs/development/libraries/haskell/haxr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index deedba1673dc..c17680efc90a 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.9.0.1"; - sha256 = "106hw8ysjx12dvwij4ld6n54mxj2yl1p7iihp2fwz50v50mz6102"; + version = "3000.9.1"; + sha256 = "0m716ncb81y245vviz04089nlrvkca9cvjvj2qphkdhhmxsqw8fc"; buildDepends = [ base64Bytestring blazeBuilder HaXml HTTP mtl network time utf8String From c4556c74560c633662bfe10ac42cbcc50a2d7ecb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:22 +0200 Subject: [PATCH 093/142] haskell-hledger-lib: update to version 0.20.0.1 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index e00c07d83a80..f790b61f25ea 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.20"; - sha256 = "040r797whajgy5xvb8ixlj5w8izx2q42mgd5554pzvjys18lsb5j"; + version = "0.20.0.1"; + sha256 = "1skm2jii7d8b6a6i98xwxckxwhikgj44823wqzdk8f3bq9zlwhcg"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat regexpr safe split time transformers utf8String From da3b5558571fb4089536b273bf7ed6366d4652eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:23 +0200 Subject: [PATCH 094/142] haskell-hledger-web: update to version 0.20.0.1 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 494e729e7418..c6be8340ab5f 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.20"; - sha256 = "0imjr2cl68f6xp1vqv35z6pvbdmlbr9knsydwiazmw5s13r8sj21"; + version = "0.20.0.1"; + sha256 = "0fq3wfsy2ykyplr66ac91yd2vwzfw3ji8mq9q4jn58nnh6bgxfa1"; isLibrary = true; isExecutable = true; buildDepends = [ From dd35bae4acb8b3fcbdda0244d6e754e7a0842064 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:23 +0200 Subject: [PATCH 095/142] haskell-hledger: update to version 0.20.0.1 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index b840242dd88e..7484a72d1c59 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.20"; - sha256 = "1jdh01y8jys1ha3qrmx509ka4wb1bgv28xz3rwz8aklz2nfzn4zb"; + version = "0.20.0.1"; + sha256 = "0sdsxdydpmnarxz94py8rlbcffpan7l299ff7j9gn4f42z3sarw7"; isLibrary = true; isExecutable = true; buildDepends = [ From 9d390c25dd491ac082e95d259b82d0749656df47 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:23 +0200 Subject: [PATCH 096/142] haskell-lifted-base: update to version 0.2.0.5 --- pkgs/development/libraries/haskell/lifted-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 05f8f008f86d..ea3d4278bcdc 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.0.4"; - sha256 = "0ljqa56gd4760x7x32v75n6a4h8f03p2g4xajaj3917w4w2rf5rp"; + version = "0.2.0.5"; + sha256 = "1an7wlz31szccbypbrh59i3py210mh7jbfi0zaizd32q0im1573r"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; From f475955bc0e493cc123f931c09bd9f7650b0ba08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 19:15:23 +0200 Subject: [PATCH 097/142] haskell-texmath: update to version 0.6.1.4 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index a8b1c8090b10..c9534ef57ed0 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.1.3"; - sha256 = "1f2hka9jwlrm9dvw7z3896yfpdzxs2vaw0vbcmj5p401mvzc8w05"; + version = "0.6.1.4"; + sha256 = "0cw3lzadk8cx5h26b18i50hvs1vk8vbd0dxmmcszj4a8a0rbpmd9"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From 033a15841fca8615f10894b0befbf1ccce3ff735 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 20:35:56 +0200 Subject: [PATCH 098/142] haskell-dual-tree: jailbreak to fix build with monoid-extras 0.3.x --- pkgs/development/libraries/haskell/dual-tree/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 54f1da653161..a41924dbcfcb 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.2"; sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0"; buildDepends = [ monoidExtras newtype semigroups ]; + jailbreak = true; meta = { description = "Rose trees with cached and accumulating monoidal annotations"; license = self.stdenv.lib.licenses.bsd3; From 9a0861228649b71377f9b81dde577733aa611194 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 5 May 2013 21:01:20 +0200 Subject: [PATCH 099/142] haskell-diagrams-core: jailbreak to fix build with monoid-extras 0.3.x --- pkgs/development/libraries/haskell/diagrams/core.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 985a69dce135..76cf77f1315f 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { dualTree MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; From 9c73572ecf9480a39f433169bc5a5aeb6704c9b7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 6 May 2013 11:27:28 +0200 Subject: [PATCH 100/142] gnu parallel: Update to version 20130422 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 235cb70cd868..ead17461750c 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20120322"; + name = "parallel-20130422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1nm3ljgaxh2rg2dfwpw9r31zs7k09ab9i14yvbm4wrqasa2bcrxj"; + sha256 = "0aygc6d2sf2xrnyldv62a17masfs5am4zfm68k4fhvymwcfbp41h"; }; patchPhase = From 34347052a6a3a737c39ec4078d605742b73ed9e1 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 6 May 2013 11:21:01 +0200 Subject: [PATCH 101/142] mopidy: Update to 0.14.1 --- pkgs/applications/audio/mopidy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index d4777dcc53a8..d79ef44cabe4 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,12 +5,12 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.12.0"; + version = "0.14.1"; src = fetchgit { url = "https://github.com/mopidy/mopidy.git"; rev = "refs/tags/v${version}"; - sha256 = "18b1gsyq1ph1a8gl6m4jmhkvq1gyyhbkbb6rrr3qr4rb5prl1fyi"; + sha256 = "0lgd8dpiri9m6sigpf1g1qzvz25lkb38lskgwvb8j7x64y104z0v"; }; propagatedBuildInputs = with pythonPackages; [ From d0a58b35363c03e13f724eca6c1105995fa2090b Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 6 May 2013 12:14:34 +0200 Subject: [PATCH 102/142] python-cherrypy: Update to 3.2.2 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ff21b68dbc9..d8f76f1f2853 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -629,11 +629,12 @@ pythonPackages = python.modules // rec { cherrypy = buildPythonPackage (rec { - name = "cherrypy-3.1.2"; + name = "cherrypy-${version}"; + version = "3.2.2"; src = fetchurl { - url = "http://download.cherrypy.org/cherrypy/3.1.2/CherryPy-3.1.2.tar.gz"; - sha256 = "1xlvanhnxgvwd7vvypbafyl6yqfkpnwa9rs9k3058z84gd86bz8d"; + url = "http://download.cherrypy.org/cherrypy/${version}/CherryPy-${version}.tar.gz"; + sha256 = "14dn129h69wj0h8yr0bjwbrk8kygl6mkfnxc5m3fxhlm4xb8hnnw"; }; # error: invalid command 'test' From fd8e249b5da4845f5b68419991e5d18c8e5a275d Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Mon, 6 May 2013 11:06:59 +0000 Subject: [PATCH 103/142] byobu 5.37 integration --- pkgs/tools/misc/byobu/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/byobu/default.nix diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix new file mode 100644 index 000000000000..6766e0bb474f --- /dev/null +++ b/pkgs/tools/misc/byobu/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "byobu-5.37"; + + src = fetchurl { + url = "https://launchpad.net/byobu/trunk/5.37/+download/byobu_5.37.orig.tar.gz"; + sha256 = "e9fec9c03ebdfbeb42d08e8e7a7e45d873e1a5d5f7984a39793e37fe7cc30688"; + }; + + doCheck = true; + + meta = { + homepage = https://launchpad.net/byobu/; + description = "Byobu is a GPLv3 open source text-based window manager and terminal multiplexer."; + + longDescription = + ''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer. + It was originally designed to provide elegant enhancements to the otherwise functional, + plain, practical GNU Screen, for the Ubuntu server distribution. + Byobu now includes an enhanced profiles, convenient keybindings, + configuration utilities, and toggle-able system status notifications for both + the GNU Screen window manager and the more modern Tmux terminal multiplexer, + and works on most Linux, BSD, and Mac distributions. + ''; + + license = stdenv.lib.licenses.gpl3; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3a7f03e14b9..6948ecb87733 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -494,6 +494,8 @@ let btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; + byobu = callPackage ../tools/misc/byobu { }; + catdoc = callPackage ../tools/text/catdoc { }; dlx = callPackage ../misc/emulators/dlx { }; From 7480746a12e4a402fbd4dacfd9ea72d412fdd2f0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 May 2013 13:56:40 +0200 Subject: [PATCH 104/142] php-5.4: Don't build gd as a dynamically-loaded extension We didn't do this in PHP 5.3 either, so it causes regressions if php.ini isn't set up to load the gd extension. --- pkgs/development/interpreters/php/5.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 7d579c4adb10..823920ed1021 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -90,7 +90,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) gd = { # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. - configureFlags = ["--with-gd=shared --with-freetype-dir=${freetype} --with-png-dir=${libpng}"]; + configureFlags = ["--with-gd --with-freetype-dir=${freetype} --with-png-dir=${libpng}"]; buildInputs = [ libpng libjpeg freetype ]; }; From 15bdde9071a43ceb53c6d118f397749c1c43625c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 6 May 2013 09:29:33 -0400 Subject: [PATCH 105/142] Add express nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 168 ++++++++++++++++++++++++++++--- 1 file changed, 155 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 93085491b516..7dac13d246a3 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -193,6 +193,19 @@ let self = { ]; }; + "buffer-crc32" = self."buffer-crc32-0.2.1"; + + "buffer-crc32-0.2.1" = self.buildNodePackage rec { + name = "buffer-crc32-0.2.1"; + src = fetchurl { + url = "http://registry.npmjs.org/buffer-crc32/-/${name}.tgz"; + sha256 = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01"; + }; + deps = [ + + ]; + }; + "buffertools" = self."buffertools-~1"; "buffertools-~1" = self.buildNodePackage rec { @@ -232,7 +245,18 @@ let self = { ]; }; - "bytes" = self."bytes-0.1.0"; + "bytes" = self."bytes-0.2.0"; + + "bytes-0.2.0" = self.buildNodePackage rec { + name = "bytes-0.2.0"; + src = fetchurl { + url = "http://registry.npmjs.org/bytes/-/${name}.tgz"; + sha256 = "e70bd4dccc886a5cf1c925092b4acd7a262a9da3e1b51ccde10a3fcd0a328465"; + }; + deps = [ + + ]; + }; "bytes-0.1.0" = self.buildNodePackage rec { name = "bytes-0.1.0"; @@ -322,7 +346,27 @@ let self = { ]; }; - "connect" = self."connect-2.4.4"; + "connect" = self."connect-2.7.7"; + + "connect-2.7.7" = self.buildNodePackage rec { + name = "connect-2.7.7"; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/${name}.tgz"; + sha256 = "e4cf5b03c051d9b4b0e27a76ec76da0b8ca38d0e4ce1d8ba8c4c3b3caac7b032"; + }; + deps = [ + self."qs-0.6.1" + self."formidable-1.0.13" + self."cookie-signature-1.0.1" + self."buffer-crc32-0.2.1" + self."cookie-0.0.5" + self."send-0.1.0" + self."bytes-0.2.0" + self."fresh-0.1.0" + self."pause-0.0.1" + self."debug" + ]; + }; "connect-~1.7" = self.buildNodePackage rec { name = "connect-1.7.3"; @@ -355,7 +399,18 @@ let self = { ]; }; - "cookie" = self."cookie-0.0.4"; + "cookie" = self."cookie-0.0.5"; + + "cookie-0.0.5" = self.buildNodePackage rec { + name = "cookie-0.0.5"; + src = fetchurl { + url = "http://registry.npmjs.org/cookie/-/${name}.tgz"; + sha256 = "17938b21dcd85f09994b85484abb5aeddc4e92c61d1b599b764bbaaa7ad6adee"; + }; + deps = [ + + ]; + }; "cookie-0.0.4" = self.buildNodePackage rec { name = "cookie-0.0.4"; @@ -368,6 +423,19 @@ let self = { ]; }; + "cookie-signature" = self."cookie-signature-1.0.1"; + + "cookie-signature-1.0.1" = self.buildNodePackage rec { + name = "cookie-signature-1.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/${name}.tgz"; + sha256 = "e2ea4f290fdcfe82d8fb76991fee4106d4ae1f5d5a2f8b8d91442e047c538c8e"; + }; + deps = [ + + ]; + }; + "crc" = self."crc-0.2.0"; "crc-0.2.0" = self.buildNodePackage rec { @@ -434,16 +502,17 @@ let self = { "debug" = self."debug-*"; "debug-*" = self.buildNodePackage rec { - name = "debug-0.7.0"; + name = "debug-0.7.2"; src = fetchurl { url = "http://registry.npmjs.org/debug/-/${name}.tgz"; - sha256 = "113c041fb01fd8db2a1b83320529849ccbb23794a4c3799a0154312de2a5d618"; + sha256 = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; }; deps = [ ]; }; + "diff" = self."diff-~1.0.3"; "diff-~1.0.3" = self.buildNodePackage rec { @@ -483,6 +552,30 @@ let self = { ]; }; + "express" = self."express-*"; + + "express-*" = self.buildNodePackage rec { + name = "express-3.2.1"; + src = fetchurl { + url = "http://registry.npmjs.org/express/-/${name}.tgz"; + sha256 = "4ca52cccef971707a368f98c09baced9e06f4013b81c0cbcbf2c57c48982c428"; + }; + deps = [ + self."connect-2.7.7" + self."commander-~0.6.1" + self."range-parser-0.0.4" + self."mkdirp-0.3.4" + self."cookie-0.0.5" + self."buffer-crc32-0.2.1" + self."fresh-0.1.0" + self."methods-0.0.1" + self."send-0.1.0" + self."cookie-signature-1.0.1" + self."debug" + self."qs-0.6.1" + ]; + }; + "eyes" = self."eyes->=0.1.6"; "eyes->=0.1.6" = self.buildNodePackage rec { @@ -509,7 +602,18 @@ let self = { ]; }; - "formidable" = self."formidable-1.0.11"; + "formidable" = self."formidable-1.0.13"; + + "formidable-1.0.13" = self.buildNodePackage rec { + name = "formidable-1.0.13"; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/${name}.tgz"; + sha256 = "c3c7c6ecdd4b1ad9ec9b1c273d8dd1db2bc12f9a699c233d3885fcded58ceec6"; + }; + deps = [ + + ]; + }; "formidable-1.0.11" = self.buildNodePackage rec { name = "formidable-1.0.11"; @@ -547,7 +651,7 @@ let self = { }; deps = [ self."rimraf-2" - self."mkdirp-0.3" + self."mkdirp-0.3.4" self."graceful-fs-~1.1.2" self."inherits-~1.0.0" ]; @@ -744,6 +848,19 @@ let self = { ]; }; + "methods" = self."methods-0.0.1"; + + "methods-0.0.1" = self.buildNodePackage rec { + name = "methods-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/methods/-/${name}.tgz"; + sha256 = "2f7e32954dff5991dd8220e8f5dcdd32aeec5ec56ce9f7235872444af51b3adb"; + }; + deps = [ + + ]; + }; + "mime" = self."mime-*"; "mime->= 0.0.1" = self."mime-*"; @@ -794,9 +911,9 @@ let self = { ]; }; - "mkdirp" = self."mkdirp-0.3"; + "mkdirp" = self."mkdirp-0.3.4"; - "mkdirp-0.3" = self.buildNodePackage rec { + "mkdirp-0.3.4" = self.buildNodePackage rec { name = "mkdirp-0.3.4"; src = fetchurl { url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; @@ -873,7 +990,7 @@ let self = { self."graceful-fs-1" self."fstream-~0.1.13" self."minimatch-0.2" - self."mkdirp-0.3" + self."mkdirp-0.3.4" self."nopt-2" self."npmlog-0" self."osenv-0" @@ -1041,8 +1158,8 @@ let self = { ]; }; - "qs" = self."qs-0.5.0"; - "qs->= 0.3.1" = self."qs-0.5.0"; + "qs" = self."qs-0.6.1"; + "qs->= 0.3.1" = self."qs-0.6.1"; "qs-0.4.2" = self.buildNodePackage rec { name = "qs-0.4.2"; @@ -1066,6 +1183,17 @@ let self = { ]; }; + "qs-0.6.1" = self.buildNodePackage rec { + name = "qs-0.6.1"; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/${name}.tgz"; + sha256 = "afb476cec9b40a7801fe21f4056bfffb2270e126d7136f955c810fa7181f972a"; + }; + deps = [ + + ]; + }; + "range-parser" = self."range-parser-0.0.4"; "range-parser-0.0.4" = self.buildNodePackage rec { @@ -1251,7 +1379,21 @@ let self = { ]; }; - "send" = self."send-0.0.4"; + "send" = self."send-0.1.0"; + + "send-0.1.0" = self.buildNodePackage rec { + name = "send-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/${name}.tgz"; + sha256 = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de"; + }; + deps = [ + self."debug" + self."mime-1.2.6" + self."fresh-0.1.0" + self."range-parser-0.0.4" + ]; + }; "send-0.0.4" = self.buildNodePackage rec { name = "send-0.0.4"; From c2a2a03210580bb6a35c2bbcdde6bddb37367214 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 6 May 2013 12:47:46 -0400 Subject: [PATCH 106/142] Add extend nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 7dac13d246a3..ff40d717216c 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -576,6 +576,19 @@ let self = { ]; }; + "extend" = self."extend-*"; + + "extend-*" = self.buildNodePackage rec { + name = "extend-1.1.3"; + src = fetchurl { + url = "http://registry.npmjs.org/extend/-/${name}.tgz"; + sha256 = "0b27709829110f2e84926ebe3494b82df6e79ad49a618ad3444e4edf62b57a57"; + }; + deps = [ + + ]; + }; + "eyes" = self."eyes->=0.1.6"; "eyes->=0.1.6" = self.buildNodePackage rec { From a88306b15f2150db7a9f517d1288e3769510760b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 6 May 2013 12:56:15 -0400 Subject: [PATCH 107/142] nodePackages.underscore: Update Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index ff40d717216c..01cebccf1bcf 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1641,14 +1641,14 @@ let self = { ]; }; - "underscore" = self."underscore-1.4.2"; - "underscore->=1.3.1" = self."underscore-1.4.2"; + "underscore" = self."underscore-*"; + "underscore->=1.3.1" = self."underscore-*"; - "underscore-1.4.2" = self.buildNodePackage rec { - name = "underscore-1.4.2"; + "underscore-*" = self.buildNodePackage rec { + name = "underscore-1.4.4"; src = fetchurl { url = "http://registry.npmjs.org/underscore/-/${name}.tgz"; - sha256 = "329ab22ba9b37be4a0c694ca21b9ed85b99256a45c2e0cf3624c4719443366d6"; + sha256 = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; }; deps = [ From 78169ec02089d3d18afcfff24d66b9c93f8ba0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 5 May 2013 14:38:31 +0200 Subject: [PATCH 108/142] spyder: add recommended and optional dependencies Spyder says about itself that it has ...the support of IPython (enhanced interactive Python interpreter) and popular Python libraries such as NumPy (linear algebra), SciPy (signal and image processing) or matplotlib (interactive 2D/3D plotting). So I think having those available as default is a the right thing to to. (We can easily make a stripped down spyder expression if needed later.) I've added the list of recommended and optional dependencies as described here: http://pythonhosted.org/spyder/installation.html#dependencies --- pkgs/applications/science/spyder/default.nix | 14 +++++++++++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 772a25ed4a1a..30ef9f0efbc9 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchurl, buildPythonPackage, unzip, sphinx, pyside }: +{ stdenv, fetchurl, unzip, buildPythonPackage +# mandatory +, pyside +# recommended +, pyflakes ? null, rope ? null, sphinx ? null, numpy ? null, scipy ? null, matplotlib ? null +# optional +, ipython ? null, pylint ? null, pep8 ? null +}: buildPythonPackage rec { name = "spyder-2.1.13.1"; @@ -9,8 +16,9 @@ buildPythonPackage rec { sha256 = "1sg88shvw6k2v5428k13mah4pyqng43856rzr6ypz5qgwn0677ya"; }; - buildInputs = [ unzip sphinx ]; - propagatedBuildInputs = [ pyside ]; + buildInputs = [ unzip ]; + propagatedBuildInputs = + [ pyside pyflakes rope sphinx numpy scipy matplotlib ipython pylint pep8 ]; # There is no test for spyder doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3a7f03e14b9..623f1b2c7173 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8721,7 +8721,8 @@ let gravit = callPackage ../applications/science/astronomy/gravit { }; spyder = callPackage ../applications/science/spyder { - inherit (pythonPackages) sphinx; + inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended + inherit (pythonPackages) ipython pylint pep8; # optional }; stellarium = callPackage ../applications/science/astronomy/stellarium { }; From 36c6a05fd974194139656f80a3c47f6613418fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 5 May 2013 13:27:28 +0200 Subject: [PATCH 109/142] spyder: create desktop menu item --- pkgs/applications/science/spyder/default.nix | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 30ef9f0efbc9..6c0125e4b850 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, buildPythonPackage +{ stdenv, fetchurl, unzip, buildPythonPackage, makeDesktopItem # mandatory , pyside # recommended @@ -23,6 +23,25 @@ buildPythonPackage rec { # There is no test for spyder doCheck = false; + desktopItem = makeDesktopItem { + name = "Spyder"; + exec = "spyder"; + icon = "spyder"; + comment = "Scientific Python Development Environment"; + desktopName = "Spyder"; + genericName = "Python IDE"; + categories = "Application;Development;Editor;IDE;"; + }; + + # Create desktop item + postInstall = '' + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications/ + + mkdir -p $out/share/icons + cp spyderlib/images/spyder.svg $out/share/icons/ + ''; + meta = { description = "Scientific PYthon Development EnviRonment (SPYDER)"; longDescription = '' From e90c15355cc1022558fa25b37dced74ecd70da70 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 15:15:23 +0300 Subject: [PATCH 110/142] indilib: Advance to version 0.9.6. Note: this fixes the build of kstars from KDE4.10. Patch contributed by Karn Kallio. --- pkgs/development/libraries/indilib/default.nix | 8 +++++--- pkgs/development/libraries/indilib/link-zlib.patch | 12 ++++++++++++ pkgs/development/libraries/indilib/udev-dir.patch | 12 ++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/indilib/link-zlib.patch create mode 100644 pkgs/development/libraries/indilib/udev-dir.patch diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 31cbe772916d..dd8207ffa2b0 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost }: stdenv.mkDerivation { - name = "indilib-0.8"; + name = "indilib-0.9.6"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_0.8.tar.gz; - sha256 = "d5ed14a5de6fd6e5db15463ada96c2b15b53e84a1ffe199b76f70128493f2a65"; + url = mirror://sourceforge/indi/libindi_0.9.6.tar.gz; + sha256 = "1cyhsrsl68iczc4gcdnrrdh0r1dxjac6prxjfkw15wz97ya0mvs4"; }; + patches = [ ./link-zlib.patch ./udev-dir.patch ]; + propagatedBuildInputs = [ cmake cfitsio libusb zlib boost ]; meta = { diff --git a/pkgs/development/libraries/indilib/link-zlib.patch b/pkgs/development/libraries/indilib/link-zlib.patch new file mode 100644 index 000000000000..c051194a1b8a --- /dev/null +++ b/pkgs/development/libraries/indilib/link-zlib.patch @@ -0,0 +1,12 @@ +diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt +--- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430 ++++ libindi-0.9.6/CMakeLists.txt 2013-05-02 16:50:25.666624174 -0430 +@@ -169,7 +169,7 @@ + # To link with main() and indibase classes ###### + ################################################## + add_library(indidriver SHARED ${libindicom_SRCS} ${liblilxml_SRCS} ${indimain_SRCS} ${indidriver_SRCS}) +-target_link_libraries(indidriver ${LIBUSB_LIBRARIES}) ++target_link_libraries(indidriver z ${LIBUSB_LIBRARIES}) + if (NOVA_FOUND) + target_link_libraries(indidriver ${NOVA_LIBRARIES}) + endif(NOVA_FOUND) diff --git a/pkgs/development/libraries/indilib/udev-dir.patch b/pkgs/development/libraries/indilib/udev-dir.patch new file mode 100644 index 000000000000..2f6d03d6070c --- /dev/null +++ b/pkgs/development/libraries/indilib/udev-dir.patch @@ -0,0 +1,12 @@ +diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt +--- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430 ++++ libindi-0.9.6/CMakeLists.txt 2013-05-02 17:02:55.455944987 -0430 +@@ -13,7 +13,7 @@ + set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/indi/") + set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") +-set(UDEVRULES_INSTALL_DIR "/etc/udev/rules.d") ++set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc/udev/rules.d") + + IF(APPLE) + set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup") From ccbea23039f668b17cc5298cd558f3cbd955ae92 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 15:17:13 +0300 Subject: [PATCH 111/142] KStars: forgot to remove the notice that it doesn't build. --- pkgs/desktops/kde-4.10/kdeedu/kstars.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.10/kdeedu/kstars.nix b/pkgs/desktops/kde-4.10/kdeedu/kstars.nix index 0f63afe9e0d7..ce0a13b969df 100644 --- a/pkgs/desktops/kde-4.10/kdeedu/kstars.nix +++ b/pkgs/desktops/kde-4.10/kdeedu/kstars.nix @@ -1,7 +1,7 @@ { kde, kdelibs, eigen, xplanet, indilib }: kde { -#todo:wcslib, doesn't build +#todo:wcslib buildInputs = [ kdelibs eigen xplanet indilib ]; meta = { From 9097d35321831864a8c0d5d8f180b9678671b8b3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 15:24:28 +0300 Subject: [PATCH 112/142] libvncserver: Advance to version 0.9.9. Note: Fixes KDE4.10 build. Patch contributed by Karn Kallio. --- pkgs/development/libraries/libvncserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 755ae1dfca5a..65a8880fc9d5 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.attrByPath ["version"] "0.9.1" args; + version = lib.attrByPath ["version"] "0.9.9" args; buildInputs = with args; [ libtool libjpeg openssl libX11 libXdamage xproto damageproto xextproto libXext fixesproto libXfixes xineramaproto libXinerama @@ -13,7 +13,7 @@ in rec { src = fetchurl { url = "http://downloads.sourceforge.net/libvncserver/LibVNCServer-${version}.tar.gz"; - sha256 = "10pjhfv0vnfphy4bghygm1bfz983ca6y91mmpsyn1wy16zyagg8g"; + sha256 = "1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng"; }; inherit buildInputs; From a2359c02cd64e37324c95ce0cfd1e47d2d34f884 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 15:27:58 +0300 Subject: [PATCH 113/142] KRDC: it builds now, so remove the notice --- pkgs/desktops/kde-4.10/kdenetwork/krdc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix index 2932fecb1912..1f3ba36aaa1b 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix @@ -1,7 +1,7 @@ { kde, kdelibs, libvncserver, libjpeg }: kde { -#todo: doesn't build + buildInputs = [ kdelibs libvncserver libjpeg ]; patches = [ ./kdenetwork.patch ]; From 9f0d9a3b0107b2552a736d80bb46e87c328430c4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 15:31:28 +0300 Subject: [PATCH 114/142] KDE 4.10: kdesdk-thumbnailers: Patch the build system to fix build failure. Patch contributed by Karn Kallio. --- .../desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix | 4 +++- .../kdesdk/thumbnailers-add-subdirectory.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch diff --git a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix index 782ef72ce5aa..f96b0df2b955 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix @@ -1,9 +1,11 @@ { kde, kdelibs, gettext }: kde { -#todo: doesn't build + buildInputs = [ kdelibs gettext ]; + patches = [ ./thumbnailers-add-subdirectory.patch ]; + meta = { description = "PO file format thumbnailer"; }; diff --git a/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch b/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch new file mode 100644 index 000000000000..5b4f7643bf45 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch @@ -0,0 +1,12 @@ +diff -Naur kdesdk-4.10.2-upstream/kdesdk-thumbnailers/CMakeLists.txt kdesdk-4.10.2/kdesdk-thumbnailers/CMakeLists.txt +--- kdesdk-4.10.2-upstream/kdesdk-thumbnailers/CMakeLists.txt 2013-05-02 21:05:56.446226846 -0430 ++++ kdesdk-4.10.2/kdesdk-thumbnailers/CMakeLists.txt 2013-05-02 21:09:58.504053136 -0430 +@@ -9,7 +9,7 @@ + macro_log_feature(GETTEXTPO_FOUND "gettext-po" "A library for processing PO files" "www.gnu.org/software/gettext" FALSE "" "Required to build the PO thumbnailer") + + if(GETTEXTPO_FOUND) +-macro_optional_add_subdirectory(po_thumbnailer) ++add_subdirectory(po_thumbnailer) + endif(GETTEXTPO_FOUND) + + macro_display_feature_log() From 7280f5a44fd4b801fc9b7e6f33c98916667f50db Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 15:36:31 +0300 Subject: [PATCH 115/142] python sip: Advance to version 4.14.6. Note: Needed for KDE4.10 to build. Patch contributed by Karn Kallio. --- pkgs/development/python-modules/python-sip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index 7c1eca027459..fa958971cf38 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "sip-4.13.2"; + name = "sip-4.14.6"; src = fetchurl { urls = [ "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz" - "http://pkgs.fedoraproject.org/repo/pkgs/sip/${name}.tar.gz/5a12ea8e8a09b879ed2b3817e30fbc84/${name}.tar.gz" + "http://pkgs.fedoraproject.org/repo/pkgs/sip/${name}.tar.gz/d6493b9f0a7911566545f694327314c4/${name}.tar.gz" ]; - sha256 = "1gzff61bi22g6fkdg9iya4q2qfdkwxs19v4rhhf8x4bm7hszbhsb"; + sha256 = "1bwdd5xhrx8dx8rr86r043ddlbg7gd1vh0pm2nxw5l1yprwa7paa"; }; configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; From a08fba4fce9525a5796d4a24249195809e07a5ab Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 16:15:29 +0300 Subject: [PATCH 116/142] PyQt4: Advance version to 4.10.1. Note: needed for KDE4.10 to build. Patch contributed by Karn Kallio. --- pkgs/development/python-modules/pyqt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 9b1d74ff6168..7d9679349e8e 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: stdenv.mkDerivation rec { - name = "PyQt-x11-gpl-4.9.1"; + name = "PyQt-x11-gpl-4.10.1"; src = fetchurl { urls = [ "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz" - "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.9.1.tar.gz/7f495dc49f71e3bfb64bf942e0d8bb3c/PyQt-x11-gpl-4.9.1.tar.gz" + "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.10.1.tar.gz/e5973c4ec0b0469f329bc00209d2ad9c/PyQt-x11-gpl-4.10.1.tar.gz" ]; - sha256 = "1ccvc80z8a0k0drvba9ngivsnv2k2nn5317yf86w1zwh45zmb0zj"; + sha256 = "05psk23x6bc83hrkw7h88a14jxhvfbxms0c8yrdar8xqvkv8cdb2"; }; configurePhase = '' From a1924fca1230d7e59cf0cb9a817d0ca8d3591f90 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 17:26:51 +0300 Subject: [PATCH 117/142] KDE4.10: Fix PyKDE4 build I accidentally left in a broken state. Remove notice from kajongg because it compiles fine now. --- pkgs/desktops/kde-4.10/kdebindings/pykde4.nix | 16 +++++++++------- pkgs/desktops/kde-4.10/kdegames/kajongg.nix | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix index baa5e807236c..65a7c7ffe7e1 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix @@ -1,19 +1,21 @@ { kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - boost, lndir }: + nepomuk_core, polkit_qt_1, boost, lndir, pkgconfig }: let pydir = "lib/python${python.majorVersion}"; in kde { -#todo: doesn't build - buildInputs = [ python kdepimlibs -# shared_desktop_ontologies boost -]; + + # todo: polkit isn't found by the build system + + buildInputs = [ + python kdepimlibs shared_desktop_ontologies + boost nepomuk_core polkit_qt_1 pkgconfig + ]; propagatedBuildInputs = [ pyqt4 sip ]; # patches = [ ./pykde4-hardcode-lib-python.patch ]; - - cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON "; +# cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON "; preConfigure = '' diff --git a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix index 609850c3abfb..9a6f5e836955 100644 --- a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix +++ b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix @@ -1,6 +1,6 @@ { kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }: kde rec { -#todo: doesn't build + buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath; pythonPath = [ pythonPackages.twisted pykde4 ]; From ee4a7cbbf44c33c78638d455865edf475475f4f9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 17:29:27 +0300 Subject: [PATCH 118/142] KDE4.10 print-manager: Fix build. Patch contributed by Karn Kallio. --- pkgs/desktops/kde-4.10/kdeutils/print-manager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix index 1b0d748e6cc5..99feaf3e4f99 100644 --- a/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix +++ b/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix @@ -1,5 +1,5 @@ { kde, kdelibs -, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer +, pythonPackages, cups, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer , pythonDBus, makeWrapper }: let s_c_p = system_config_printer.override { withGUI = false; }; in @@ -8,7 +8,7 @@ kde rec { buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython ] ++ pythonPath; - pythonPath = [ pyqt4 pykde4 pycups s_c_p ]; + pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ]; passthru.propagatedUserEnvPackages = [ s_c_p ]; From 6e406edf0a376b7e4369c4a103ccaf512bce9b58 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 17:30:19 +0300 Subject: [PATCH 119/142] KDE4.10: Kate: Add experimental python support. --- pkgs/desktops/kde-4.10/applications/kate.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.10/applications/kate.nix b/pkgs/desktops/kde-4.10/applications/kate.nix index a0dbf2aaba92..e8efc87775ab 100644 --- a/pkgs/desktops/kde-4.10/applications/kate.nix +++ b/pkgs/desktops/kde-4.10/applications/kate.nix @@ -1,8 +1,8 @@ -{ kde, kdelibs, kactivities, qjson, pyqt4, sip }: +{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4 }: kde { -#todo: PythonLibrary, SIP, PyQt4, PyKDE4 - buildInputs = [ kdelibs kactivities qjson pyqt4 sip ]; + + buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4]; meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; From b2f67702082e144bd034098d3ebdf48c0dfaa50a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 17:37:40 +0300 Subject: [PATCH 120/142] KDE4.10 kioslave-{svn,perldoc}: Fix build. Patch contributed by Karn Kallio. --- pkgs/desktops/kde-4.10/default.nix | 4 +- pkgs/desktops/kde-4.10/kdesdk/find-svn.patch | 57 ------------------- .../kde-4.10/kdesdk/kioslave-perldoc.nix | 2 +- .../desktops/kde-4.10/kdesdk/kioslave-svn.nix | 4 +- 4 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/find-svn.patch diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix index 9a682d6b93aa..3b38c7ec3f92 100644 --- a/pkgs/desktops/kde-4.10/default.nix +++ b/pkgs/desktops/kde-4.10/default.nix @@ -25,8 +25,8 @@ let kdesdk = [ { name="cervisia"; } { name="lokalize"; } - { name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kioslave"; } - { name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kioslave"; } + { name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kdesdk-kioslaves"; } + { name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kdesdk-kioslaves"; } { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; } diff --git a/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch deleted file mode 100644 index f6f4df942dd9..000000000000 --- a/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake -index 59bcb96..2eac05d 100644 ---- a/cmake/modules/FindSVN.cmake -+++ b/cmake/modules/FindSVN.cmake -@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS - FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS - /usr/local/apr/bin - ) -+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS -+ /usr/local/apr/bin -+) - - if(SVNCONFIG_EXECUTABLE) - -@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE) - set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) - else(APRCONFIG_EXECUTABLE) - FIND_PATH(_INCLUDES apr_pools.h -- ${SVN_INCLUDES}/apr-0/ -- ${SVN_INCLUDES}/apr-1/ -- ${SVN_INCLUDES}/apr-1.0/ -- /usr/include/apr-0/ -- /usr/include/apr-1/ -- /usr/include/apr-1.0/ -- /usr/local/include/apr-0/ -- /usr/local/include/apr-1/ -- /usr/local/include/apr-1.0/ -+ HINTS ${SVN_INCLUDES} -+ SUFFIXES apr-0 apr-1 apr-1.0 - ) - if(_INCLUDES) - set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE) - set(SVN_FOUND FALSE) # no apr == can't compile! - endif(_INCLUDES) - endif(APRCONFIG_EXECUTABLE) -+ -+ # Use apu-config if it exists -+ if(APUCONFIG_EXECUTABLE) -+ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES) -+ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES}) -+ string(REPLACE " " ";" _INCLUDES ${_INCLUDES}) -+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -+ else(APUCONFIG_EXECUTABLE) -+ FIND_PATH(_INCLUDES apu.h -+ HINTS ${SVN_INCLUDES} -+ SUFFIXES apr-0 apr-1 apr-1.0 -+ ) -+ if(_INCLUDES) -+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -+ else(_INCLUDES) -+ set(SVN_FOUND FALSE) # no apr == can't compile! -+ endif(_INCLUDES) -+ endif(APUCONFIG_EXECUTABLE) - FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1) - if(SVN_LIBRARIES) - FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1) diff --git a/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix index 6f1029539f83..4c45be6b4fef 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix @@ -1,7 +1,7 @@ { kde, kdelibs, perl }: kde { -#todo: doesn't build + buildInputs = [ kdelibs perl ]; cmakeFlags = [ "-DBUILD_perldoc=ON" ]; diff --git a/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix index 13fc035e6063..0574241353db 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix @@ -1,10 +1,8 @@ { kde, kdelibs, subversionClient, apr, aprutil }: kde { -#todo: doesn't build - buildInputs = [ kdelibs subversionClient apr aprutil ]; - patches = [ ./find-svn.patch ]; + buildInputs = [ kdelibs subversionClient apr aprutil ]; meta = { description = "Subversion kioslave"; From f8ee077afcb5a93a128cf89c464e79fe98014234 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 18:16:08 +0300 Subject: [PATCH 121/142] KDE4.10 dolphin-plugins-*: fix the build. Patch contributed by Karn Kallio. --- pkgs/desktops/kde-4.10/default.nix | 8 ++++---- pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix | 8 ++++++-- pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix | 6 +++++- pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix | 8 ++++++-- pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix | 6 +++++- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix index 3b38c7ec3f92..4ea8b6acd444 100644 --- a/pkgs/desktops/kde-4.10/default.nix +++ b/pkgs/desktops/kde-4.10/default.nix @@ -27,10 +27,10 @@ let { name="lokalize"; } { name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kdesdk-kioslaves"; } { name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kdesdk-kioslaves"; } - { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } - { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } - { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; } - { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; } + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins"; } + { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins"; } + { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins"; } { name="kcachegrind"; } { name="kapptemplate"; } { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers";} diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix index 9b3a474d3fcc..500dffc809e9 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix @@ -1,11 +1,15 @@ { kde, kdelibs, kde_baseapps }: kde { -#todo: doesn't build + # Needs kdebase for libkonq buildInputs = [ kdelibs kde_baseapps ]; + patchPhase = '' + sed -i 's@macro_optional_add_subdirectory(bazaar)@add_subdirectory(bazaar)@' dolphin-plugins/CMakeLists.txt + ''; + meta = { - description = "Svn plugin for dolphin"; + description = "Bazaar plugin for dolphin"; }; } diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix index d28a8d726ccc..2da3603c3bec 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix @@ -1,10 +1,14 @@ { kde, kdelibs, kde_baseapps }: kde { -#todo: doesn't build + # Needs kdebase for libkonq buildInputs = [ kdelibs kde_baseapps ]; + patchPhase = '' + sed -i 's@macro_optional_add_subdirectory(git)@add_subdirectory(git)@' dolphin-plugins/CMakeLists.txt + ''; + meta = { description = "Git plugin for dolphin"; }; diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix index 9b3a474d3fcc..20925842a32d 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix @@ -1,11 +1,15 @@ { kde, kdelibs, kde_baseapps }: kde { -#todo: doesn't build + # Needs kdebase for libkonq buildInputs = [ kdelibs kde_baseapps ]; + patchPhase = '' + sed -i 's@macro_optional_add_subdirectory(hg)@add_subdirectory(hg)@' dolphin-plugins/CMakeLists.txt + ''; + meta = { - description = "Svn plugin for dolphin"; + description = "Mercurial plugin for dolphin"; }; } diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix index 9b3a474d3fcc..fafdcc55a1f0 100644 --- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix @@ -1,10 +1,14 @@ { kde, kdelibs, kde_baseapps }: kde { -#todo: doesn't build + # Needs kdebase for libkonq buildInputs = [ kdelibs kde_baseapps ]; + patchPhase = '' + sed -i 's@macro_optional_add_subdirectory(svn)@add_subdirectory(svn)@' dolphin-plugins/CMakeLists.txt + ''; + meta = { description = "Svn plugin for dolphin"; }; From 0256e55934c87c2fd5e61066fa096f94d88d6daa Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 6 May 2013 22:13:25 +0300 Subject: [PATCH 122/142] Fix KDE 4.8 and 4.7 build against new SIP --- .../kde-4.7/kdebindings/pykde4-new-sip.patch | 91 +++++++++++++++++++ pkgs/desktops/kde-4.7/kdebindings/pykde4.nix | 2 +- .../kde-4.8/kdebindings/pykde4-new-sip.patch | 91 +++++++++++++++++++ pkgs/desktops/kde-4.8/kdebindings/pykde4.nix | 2 +- 4 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch create mode 100644 pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch new file mode 100644 index 000000000000..96b3b887a8d1 --- /dev/null +++ b/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch @@ -0,0 +1,91 @@ +commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 +Author: Luca Beltrame +Date: Mon Oct 1 20:47:56 2012 +0200 + + Remove duplicated QVector definition, since it's in PyQt now. + Simon, if you have time, please review if everything is OK. + + CCMAIL: simon@simonzone.com + +diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip +index 5a0a080..73dad01 100644 +--- a/sip/kdecore/typedefs.sip ++++ b/sip/kdecore/typedefs.sip +@@ -951,77 +951,3 @@ template + %End + }; + +-%MappedType QVector +-{ +-%TypeHeaderCode +-#include +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- for (int i = 0; i < sipCpp->size(); ++i) +- { +- int t = (sipCpp->at(i)); +- +-#if PY_MAJOR_VERSION >= 3 +- PyObject *tobj = PyLong_FromLong(t); +-#else +- PyObject *tobj = PyInt_FromLong(t); +-#endif +- +- PyList_SET_ITEM(l, i, tobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- { +- if (!PyList_Check(sipPy)) +- return 0; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +-#if PY_MAJOR_VERSION >= 3 +- if (!PyNumber_Check(tobj)) +-#else +- if (!PyInt_Check(tobj)) +-#endif +- return 0; +- } +- return 1; +- } +- +- QVector *qv = new QVector; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) +- { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +- #if PY_MAJOR_VERSION >= 3 +- int t = PyLong_AsLong (tobj); +-#else +- int t = PyInt_AS_LONG (tobj); +-#endif +- +- if (*sipIsErr) +- { +- delete qv; +- return 0; +- } +- +- qv->append(t); +- } +- +- *sipCppPtr = qv; +- +- return sipGetState(sipTransferObj); +-%End +-}; diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix index 1ca6efe3b920..030f2fb430ac 100644 --- a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix @@ -10,7 +10,7 @@ kde { #NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon"; - patches = [ ./pykde-purity.patch ]; + patches = [ ./pykde-purity.patch ./pykde4-new-sip.patch ]; cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON"; diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch new file mode 100644 index 000000000000..96b3b887a8d1 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch @@ -0,0 +1,91 @@ +commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 +Author: Luca Beltrame +Date: Mon Oct 1 20:47:56 2012 +0200 + + Remove duplicated QVector definition, since it's in PyQt now. + Simon, if you have time, please review if everything is OK. + + CCMAIL: simon@simonzone.com + +diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip +index 5a0a080..73dad01 100644 +--- a/sip/kdecore/typedefs.sip ++++ b/sip/kdecore/typedefs.sip +@@ -951,77 +951,3 @@ template + %End + }; + +-%MappedType QVector +-{ +-%TypeHeaderCode +-#include +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- for (int i = 0; i < sipCpp->size(); ++i) +- { +- int t = (sipCpp->at(i)); +- +-#if PY_MAJOR_VERSION >= 3 +- PyObject *tobj = PyLong_FromLong(t); +-#else +- PyObject *tobj = PyInt_FromLong(t); +-#endif +- +- PyList_SET_ITEM(l, i, tobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- { +- if (!PyList_Check(sipPy)) +- return 0; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +-#if PY_MAJOR_VERSION >= 3 +- if (!PyNumber_Check(tobj)) +-#else +- if (!PyInt_Check(tobj)) +-#endif +- return 0; +- } +- return 1; +- } +- +- QVector *qv = new QVector; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) +- { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +- #if PY_MAJOR_VERSION >= 3 +- int t = PyLong_AsLong (tobj); +-#else +- int t = PyInt_AS_LONG (tobj); +-#endif +- +- if (*sipIsErr) +- { +- delete qv; +- return 0; +- } +- +- qv->append(t); +- } +- +- *sipCppPtr = qv; +- +- return sipGetState(sipTransferObj); +-%End +-}; diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix index e32b7447aea2..eb4d49616c4e 100644 --- a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix @@ -8,7 +8,7 @@ kde { propagatedBuildInputs = [ pyqt4 sip ]; - patches = [ ./pykde4-hardcode-lib-python.patch ]; + patches = [ ./pykde4-hardcode-lib-python.patch ./pykde4-new-sip.patch ]; cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON "; From eb4c9efb502439cc8d18f00babaf3d17459d498e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 7 May 2013 09:27:23 +0300 Subject: [PATCH 123/142] KOffice: superceded by Calligra long time ago. Removing. --- pkgs/applications/office/koffice/default.nix | 44 ---------- .../office/koffice/krita-exiv-0.21.diff | 81 ------------------- pkgs/applications/office/koffice/wpd.patch | 24 ------ pkgs/top-level/all-packages.nix | 4 - 4 files changed, 153 deletions(-) delete mode 100644 pkgs/applications/office/koffice/default.nix delete mode 100644 pkgs/applications/office/koffice/krita-exiv-0.21.diff delete mode 100644 pkgs/applications/office/koffice/wpd.patch diff --git a/pkgs/applications/office/koffice/default.nix b/pkgs/applications/office/koffice/default.nix deleted file mode 100644 index 773b755e9b27..000000000000 --- a/pkgs/applications/office/koffice/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew -, shared_mime_info, popplerQt4, gsl, gmm, wv2, libwpd, libwpg, giflib, libgsf -, fftw, pkgconfig, openjpeg , kdelibs, kdepimlibs, automoc4, phonon -, qimageblitz, qca2, eigen, soprano , kdegraphics}: - -stdenv.mkDerivation rec { - name = "koffice-2.2.2"; - src = fetchurl { - url = "mirror://kde/stable/${name}/${name}.tar.bz2"; - sha256 = "1jzdq7av4vbfkx987yz54431q3bwrsd7wzyinl9wsznx83v61c75"; - }; - - patchFlags = "-p0"; - patches = - let - urlBase = "http://kexi-project.org/download/patches/2.2.2/"; - in - [ - (fetchurl { - url = "${urlBase}support-large-memo-values-for-msaccess-2.2.2.patch"; - sha256 = "1jn6na8c0vdf87p0yv9bcff0kd1jmcxndxmm3s0878l5pak9m8rd"; - }) - (fetchurl { - url = "${urlBase}fix-crash-on-closing-sqlite-connection-2.2.2.patch"; - sha256 = "11h4rxdrv5vakym5786vr4bysi4627m53qqvk1vhxf3rkawvcafj"; - }) - ./wpd.patch - ./krita-exiv-0.21.diff - ]; - - buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew - shared_mime_info popplerQt4 gsl gmm wv2 libwpd libwpg giflib libgsf - stdenv.gcc.libc fftw pkgconfig kdelibs kdepimlibs automoc4 phonon - qimageblitz qca2 eigen openjpeg soprano kdegraphics ]; - - meta = { - description = "KDE integrated Office Suite"; - license = "GPL"; - homepage = http://www.koffice.org; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - # doesn't build, seems dead and superseded by calligra - #inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/applications/office/koffice/krita-exiv-0.21.diff b/pkgs/applications/office/koffice/krita-exiv-0.21.diff deleted file mode 100644 index b8da1bd586c7..000000000000 --- a/pkgs/applications/office/koffice/krita-exiv-0.21.diff +++ /dev/null @@ -1,81 +0,0 @@ -commit 7f6b2f2b9b2be1e4f257582a04b194c69f705bc7 -Author: Casper Boemann -Date: Sat Dec 4 10:44:02 2010 +0000 - - ------------------------------------------------------------------------ - r1203267 | rempt | 2010-12-03 14:20:03 +0100 (Fri, 03 Dec 2010) | 1 line - Changed paths: - M /trunk/koffice/krita/ui/kis_aboutdata.h - - correct url for animtim - - ------------------------------------------------------------------------ - r1203281 | uzak | 2010-12-03 14:43:32 +0100 (Fri, 03 Dec 2010) | 2 lines - Changed paths: - M /trunk/koffice/filters/kpresenter/powerpoint/pptstyle.cpp - - PPT: Fine tuned processing of the TextCFException structure for MS Office 2007. - - - ------------------------------------------------------------------------ - r1203296 | danders | 2010-12-03 15:44:01 +0100 (Fri, 03 Dec 2010) | 3 lines - Changed paths: - M /trunk/koffice/kplato/libs/kernel/kptaccount.cpp - - Fix data loss on xml load. - BUG: 258685 - - - ------------------------------------------------------------------------ - r1203344 | bero | 2010-12-03 18:08:24 +0100 (Fri, 03 Dec 2010) | 2 lines - Changed paths: - M /trunk/koffice/krita/ui/kisexiv2/kis_exif_io.cpp - - Fix build with exiv2 0.21 - - - - svn path=/branches/work/koffice-essen/; revision=1203491 - -diff krita/ui/kisexiv2/kis_exif_io.cpp krita/ui/kisexiv2/kis_exif_io.cpp -index 6eb7f30..c85da65 100644 ---- krita/ui/kisexiv2/kis_exif_io.cpp -+++ krita/ui/kisexiv2/kis_exif_io.cpp -@@ -406,7 +406,11 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp - v = kmdIntOrderedArrayToExifArray(entry.value()); - } else if (exivKey == "Exif.Image.Artist") { // load as dc:creator - KisMetaData::Value creator = entry.value().asArray()[0]; -+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20 - v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId())); -+#else -+ v = kmdValueToExivValue(creator, exifKey.defaultTypeId()); -+#endif - } else if (exivKey == "Exif.Photo.OECF") { - v = kmdOECFStructureToExifOECF(entry.value()); - } else if (exivKey == "Exif.Photo.DeviceSettingDescription") { -@@ -419,13 +423,25 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp - Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray); - QMap langArr = entry.value().asLangArray(); - if (langArr.contains("x-default")) { -+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20 - v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId())); -+#else -+ v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId()); -+#endif - } else if (langArr.size() > 0) { -+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20 - v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId())); -+#else -+ v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId()); -+#endif - } - } else { - dbgFile << exifKey.tag(); -+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20 - v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId())); -+#else -+ v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId()); -+#endif - } - if (v && v->typeId() != Exiv2::invalidTypeId) { - dbgFile << "Saving key" << exivKey; // << " of KMD value" << entry.value(); diff --git a/pkgs/applications/office/koffice/wpd.patch b/pkgs/applications/office/koffice/wpd.patch deleted file mode 100644 index 56a5b65e50b3..000000000000 --- a/pkgs/applications/office/koffice/wpd.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff cmake/modules/FindWPD.cmake cmake/modules/FindWPD.cmake -index 9bd788c..927785a 100644 ---- cmake/modules/FindWPD.cmake -+++ cmake/modules/FindWPD.cmake -@@ -19,14 +19,17 @@ if (WPD_INCLUDE_DIR AND WPD_LIBRARIES) - else (WPD_INCLUDE_DIR AND WPD_LIBRARIES) - if(NOT WIN32) - INCLUDE(FindPkgConfig) -- pkg_check_modules(WPD libwpd-0.8) -+ pkg_check_modules(PKG_WPD libwpd-0.8) - endif(NOT WIN32) - - FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h -- ${WPD_INCLUDE_DIR} -+ ${PKG_WPD_INCLUDE_DIRS} - /usr/include/libwpd-0.8 - ) - -+ FIND_LIBRARY(WPD_LIBRARIES wpd-0.8 -+ ${PKG_WPD_LIBRARY_DIRS} -+ ) - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPD DEFAULT_MSG WPD_INCLUDE_DIR WPD_LIBRARIES ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5215a941cdbc..8dee9373b3cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8637,10 +8637,6 @@ let kipi_plugins = callPackage ../applications/graphics/kipi-plugins { }; - koffice = callPackage ../applications/office/koffice { - boost = boost149; - }; - konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; konversation = callPackage ../applications/networking/irc/konversation { }; From 12be8c30a6b4866b2ae59e1c441af8fee9f2f9bf Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 7 May 2013 09:36:46 +0300 Subject: [PATCH 124/142] Improve bluedevil meta. --- pkgs/tools/bluetooth/bluedevil/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index 287036f3e0a8..24308cdb651c 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -11,4 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 ]; + meta = with stdenv.lib; { + description = "Bluetooth manager for KDE"; + license = "GPLv2"; + inherit (kdelibs.meta) platforms; + maintainers = [ maintainers.phreedom ]; + }; + } From 026b9971f56f349e3cd2b5dd1ef3e80c8c25d1f3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 7 May 2013 09:37:53 +0300 Subject: [PATCH 125/142] Remove KBluetooth. BlueDevil should be used instead. --- pkgs/tools/bluetooth/kbluetooth/default.nix | 30 --------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/tools/bluetooth/kbluetooth/default.nix diff --git a/pkgs/tools/bluetooth/kbluetooth/default.nix b/pkgs/tools/bluetooth/kbluetooth/default.nix deleted file mode 100644 index 81916cb3982f..000000000000 --- a/pkgs/tools/bluetooth/kbluetooth/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kdebase_workspace, soprano, gettext -, semanticDesktop ? true }: -with stdenv; -mkDerivation rec { - name = "kbluetooth-${version}"; - version = "0.4.2"; - - src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/112110-${name}.tar.bz2"; - sha256 = "0z5clp677g1vgh3dd09ilq1r481y342q2cx5pzjj51y1d9lb5zp5"; - }; - - enableParallelBuilding = true; - - buildInputs = [ cmake qt4 kdelibs automoc4 phonon kdebase_workspace soprano gettext] - ++ lib.optional semanticDesktop soprano; - - patchPhase = '' - substituteInPlace src/CMakeLists.txt --replace "DESTINATION \''${KDE4_BIN_INSTALL_DIR}" "DESTINATION bin" - substituteInPlace src/inputwizard/CMakeLists.txt --replace "DESTINATION \''${KDE4_BIN_INSTALL_DIR}" "DESTINATION bin" - substituteInPlace src/device-manager/CMakeLists.txt --replace "DESTINATION \''${KDE4_BIN_INSTALL_DIR}" "DESTINATION bin" - ''; - - meta = with stdenv.lib; { - description = "Bluetooth manager for KDE"; - license = "GPLv2"; - #inherit (kdelibs.meta) platforms; # doesn't build and seems to be dead - maintainers = [ maintainers.phreedom ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dee9373b3cc..d59f53852d0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8615,8 +8615,6 @@ let kbibtex = callPackage ../applications/office/kbibtex { }; - kbluetooth = callPackage ../tools/bluetooth/kbluetooth { }; - kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; kdenlive = callPackage ../applications/video/kdenlive { }; From 4ad55db0ad0996c3b51ac39194ebb23e4455c77e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 7 May 2013 09:57:10 +0300 Subject: [PATCH 126/142] Adding myself as a maintainer of Qt and KDE --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index ab9cd43d63bc..60d59030c1f3 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { homepage = http://qt-project.org/; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; - maintainers = with maintainers; [ urkud sander ]; + maintainers = with maintainers; [ urkud sander phreedom ]; platforms = platforms.linux; }; } From 083637896d8fe17b07f27be02f4515c6d3136aa8 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 7 May 2013 10:18:35 +0300 Subject: [PATCH 127/142] Removing konq-plugins, since they have been included in kdebase in all KDE versions we have currently packaged. --- .../browsers/konq-plugins/default.nix | 23 ------------------- .../browsers/konq-plugins/qt47.patch | 11 --------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 36 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/konq-plugins/default.nix delete mode 100644 pkgs/applications/networking/browsers/konq-plugins/qt47.patch diff --git a/pkgs/applications/networking/browsers/konq-plugins/default.nix b/pkgs/applications/networking/browsers/konq-plugins/default.nix deleted file mode 100644 index 656e24be0718..000000000000 --- a/pkgs/applications/networking/browsers/konq-plugins/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kde_baseapps, gettext }: - -stdenv.mkDerivation rec { - name = "konq-plugins-${version}"; - version = "4.4.0"; - - src = fetchurl { - url = http://ftp.riken.go.jp/pub/FreeBSD/distfiles/KDE/extragear/konq-plugins-4.4.0.tar.bz2; - sha256 = "1hn722rcdcwmhfnn89rnvp2b4d8gds4nm483ps3jkk83d7f2xmbi"; - }; - - buildInputs = [ cmake kdelibs qt4 automoc4 phonon kde_baseapps gettext ]; - - patches = [ ./qt47.patch ]; - - meta = with stdenv.lib; { - description = "Various plugins for Konqueror"; - license = "GPL"; - homepage = http://kde.org/; - maintainers = [ maintainers.phreedom ]; - platforms = kdelibs.meta.platforms; - }; -} diff --git a/pkgs/applications/networking/browsers/konq-plugins/qt47.patch b/pkgs/applications/networking/browsers/konq-plugins/qt47.patch deleted file mode 100644 index 2039d293eb32..000000000000 --- a/pkgs/applications/networking/browsers/konq-plugins/qt47.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- konq-plugins/adblock/adblock.cpp 2010-02-11 22:12:41.000000000 +0000 -+++ konq-plugins/adblock/adblock.cpp 2010-07-26 17:12:20.639786002 +0100 -@@ -300,7 +300,7 @@ - // ---------------------------------------------------------------------------- - - AdElement::AdElement() : -- m_url(0), m_category(0), m_type(0), m_blocked(false) {} -+ m_url(QString()), m_category(QString()), m_type(QString()), m_blocked(false) {} - - AdElement::AdElement(const QString &url, const QString &category, - const QString &type, bool blocked, const DOM::Node&node) : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d59f53852d0e..37cb74698ef0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8635,8 +8635,6 @@ let kipi_plugins = callPackage ../applications/graphics/kipi-plugins { }; - konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { }; - konversation = callPackage ../applications/networking/irc/konversation { }; krename = callPackage ../applications/misc/krename { }; From b0ad5299873edda79cc72543b2bd6f515430c292 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 7 May 2013 11:26:37 +0300 Subject: [PATCH 128/142] K3b: fix to make it build for KDE4.10. --- pkgs/applications/misc/k3b/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index cff71a6a00ed..06565065ce54 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext -, kdelibs, kdemultimedia, automoc4, phonon +, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null }: stdenv.mkDerivation rec { @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { flac libsamplerate libdvdread lame libsndfile libmad gettext stdenv.gcc.libc kdelibs kdemultimedia automoc4 phonon + libkcddb ]; enableParallelBuilding = true; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CD/DVD Burning Application for KDE"; license = licenses.gpl2Plus; - maintainers = [ maintainers.sander maintainers.urkud ]; + maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; platforms = with stdenv.lib.platforms; linux; }; } From 18df66f4666c0a2d5a3fa6d6660076e5af5f6af5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 May 2013 10:48:53 +0200 Subject: [PATCH 129/142] Revert "overrideDerivation: Re-attatch passthru and meta to all outputs" This reverts commit 6b0e94a516c5aa8d0e18e13028c7ccf541062c99. It still breaks VM builds: http://hydra.nixos.org/build/4858140 --- pkgs/lib/customisation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index bfa61169efb1..50816f99ec60 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -34,7 +34,7 @@ rec { overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); - in addPassthru newDrv ( + in newDrv // { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } @@ -46,7 +46,7 @@ rec { crossDrv = overrideDerivation drv.crossDrv f; nativeDrv = overrideDerivation drv.nativeDrv f; } - else { })); + else { }); # usage: (you can use override multiple times) From abf2d3677382bb93b989528cc6ed71ac6d5bd3b8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 May 2013 10:49:22 +0200 Subject: [PATCH 130/142] Revert "Revert "Revert "overrideDerivation: Simplify""" This reverts commit c2b1ca029663d1ad41bbffd3d09becada06c74cc. It still breaks VM builds: http://hydra.nixos.org/build/4858140 --- pkgs/lib/customisation.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 50816f99ec60..a35b44e9f6ee 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -33,14 +33,17 @@ rec { overrideDerivation = drv: f: let - newDrv = derivation (drv.drvAttrs // (f drv)); + # Filter out special attributes. + drop = [ "meta" "passthru" "outPath" "drvPath" "crossDrv" "nativeDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ] + # also drop functions such as .merge .override etc + ++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv); + attrs = removeAttrs drv drop; + newDrv = derivation (attrs // (f drv)); in newDrv // - { meta = drv.meta or {}; + { meta = if drv ? meta then drv.meta else {}; passthru = if drv ? passthru then drv.passthru else {}; } // - (drv.passthru or {}) - // (if (drv ? crossDrv && drv ? nativeDrv) then { crossDrv = overrideDerivation drv.crossDrv f; From e7480d9cb7a703ce3970d85b4d835724fe7ca899 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 May 2013 11:15:44 +0200 Subject: [PATCH 131/142] Add Debian 7.0 --- pkgs/build-support/vm/deb/deb-closure.pl | 26 ++++++++++++++++-------- pkgs/build-support/vm/default.nix | 23 +++++++++++++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index 887077037e28..bed397d6f07e 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -46,17 +46,27 @@ sub getDeps { } -# Process the "Provides" fields to be able to resolve virtual dependencies. +# Process the "Provides" and "Replaces" fields to be able to resolve +# virtual dependencies. my %provides; foreach my $cdata (values %packages) { - next unless defined $cdata->{Provides}; - my @provides = getDeps(Dpkg::Deps::deps_parse($cdata->{Provides})); - foreach my $name (@provides) { - #die "conflicting provide: $name\n" if defined $provides{$name}; - #warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n"; - next if defined $packages{$name}; - $provides{$name} = $cdata->{Package}; + if (defined $cdata->{Provides}) { + my @provides = getDeps(Dpkg::Deps::deps_parse($cdata->{Provides})); + foreach my $name (@provides) { + #die "conflicting provide: $name\n" if defined $provides{$name}; + #warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n"; + next if defined $packages{$name}; + $provides{$name} = $cdata->{Package}; + } + } + # Treat "Replaces" like "Provides". + if (defined $cdata->{Replaces}) { + my @replaces = getDeps(Dpkg::Deps::deps_parse($cdata->{Replaces})); + foreach my $name (@replaces) { + next if defined $packages{$name}; + $provides{$name} = $cdata->{Package}; + } } } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 68ecb512901d..86b15ff91553 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1422,6 +1422,28 @@ rec { packages = commonDebianPackages; }; + debian70i386 = { + name = "debian-7.0.0-wheezy-i386"; + fullName = "Debian 7.0.0 Wheezy (i386)"; + packagesList = fetchurl { + url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; + sha256 = "712939639e2cc82615c85bdf81edf31edef0fda003ac2b32998e438aee403ab8"; + }; + urlPrefix = mirror://debian; + packages = commonDebianPackages; + }; + + debian70x86_64 = { + name = "debian-7.0.0-wheezy-amd64"; + fullName = "Debian 7.0.0 Wheezy (amd64)"; + packagesList = fetchurl { + url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; + sha256 = "e79132f7db6655013be1f75feb9812b071386525246d8639679b322487d2732a"; + }; + urlPrefix = mirror://debian; + packages = commonDebianPackages; + }; + }; @@ -1485,6 +1507,7 @@ rec { "bzip2" "tar" "grep" + "sed" "findutils" "g++" "make" From e087ce095e7772ec369f1c85d070b12ec2c3352f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 6 May 2013 10:24:17 +0200 Subject: [PATCH 132/142] filegive: update to 0.5.2 (fixing miniupnpd support) --- pkgs/tools/networking/filegive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index b32c43d0a76c..6f5a0b3950bf 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -11,7 +11,7 @@ let sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; }; - version = "0.5.1"; + version = "0.5.2"; in stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; name = "${name}.tar.gz"; - sha256 = "0b8x2g5c9j5v36s62yzdcnj4b76ahiz1brkilm3mv1qkck2y6wwb"; + sha256 = "0n5ilhccdy2nsdvl871nn2isr1jdlm7yncxff7zm5qzsx8k9skkz"; }; buildInputs = [ go ]; From ce7c7dece56c89bc3aa6066095c33f56a7a03282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 7 May 2013 12:19:22 +0200 Subject: [PATCH 133/142] kdenlive: update to 0.9.6 --- pkgs/applications/video/kdenlive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index 8109477aa64d..d862c7012c49 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.9.4"; + version = "0.9.6"; src = fetchurl { url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2"; - sha256 = "1l3axf3y83gdfr6yc1lmy296h09gypkpqsc01w7pprg0y19rrfif"; + sha256 = "1rw2cbzy5mabwijvryyzbhpgldn2zy5jy4j87hl4m1i8ah9lgi7x"; }; buildInputs = From 17be4b85a32a874144a2e6fae1e5ffd1251731a3 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Tue, 7 May 2013 12:27:10 +0200 Subject: [PATCH 134/142] Add python-elpy-1.0.1: Backend for the elpy Emacs mode --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ff21b68dbc9..0aea926dbe58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1508,6 +1508,24 @@ pythonPackages = python.modules // rec { }; + elpy = buildPythonPackage rec { + name = "elpy-1.0.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/elpy/elpy-1.0.1.tar.gz"; + md5 = "5453f085f7871ed8fc11d51f0b68c785"; + }; + buildInputs = [ ]; + propagatedBuildInputs = [ flake8 ]; + + doCheck = false; # there are no tests + + meta = { + description = "Backend for the elpy Emacs mode"; + homepage = "https://github.com/jorgenschaefer/elpy"; + }; + }; + + enum = buildPythonPackage rec { name = "enum-0.4.4"; From 0dfb9ecc359ede45fc14ad3b871c0d1735e125f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 May 2013 14:05:28 +0200 Subject: [PATCH 135/142] systemd: Update to 203 --- ...aemon-reexec-do-the-right-thing-on-N.patch | 8 ++--- ...e-duplicate-paths-in-systemctl-start.patch | 30 ++++++++----------- ...ts-for-uninitialised-encrypted-devic.patch | 4 +-- ...o-configuration-hints-for-some-units.patch | 8 ++--- ...rop-the-dependency-on-local-fs.targe.patch | 4 +-- .../0006-Don-t-call-plymouth-quit.patch | 4 +-- ...007-Ignore-IPv6-link-local-addresses.patch | 4 +-- ...on-t-try-to-unmount-nix-or-nix-store.patch | 6 ++-- pkgs/os-specific/linux/systemd/default.nix | 4 +-- 9 files changed, 34 insertions(+), 38 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch index 7324325fad4f..e3a2f969273f 100644 --- a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch +++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch @@ -1,4 +1,4 @@ -From d9c2065158b63db16c9bf0fed37b3f759ef85cbd Mon Sep 17 00:00:00 2001 +From 8f861550827e750fb56954c3f91a2f565abb42bb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:44:33 +0100 Subject: [PATCH 1/8] Make "systemctl daemon-reexec" do the right thing on @@ -9,10 +9,10 @@ Subject: [PATCH 1/8] Make "systemctl daemon-reexec" do the right thing on 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/main.c b/src/core/main.c -index 7899761..f6f83f4 100644 +index 7fc06be..7575223 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1884,7 +1884,7 @@ finish: +@@ -1857,7 +1857,7 @@ finish: char_array_0(sfd); i = 0; @@ -22,5 +22,5 @@ index 7899761..f6f83f4 100644 args[i++] = "--switched-root"; args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user"; -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch index 31a6642978b2..a68973e78953 100644 --- a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch +++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch @@ -1,29 +1,25 @@ -From f3838af51d461ca3d339618d17962f2d57d1a7fa Mon Sep 17 00:00:00 2001 +From 2afcee0b4da066fb5f8fc00b749d88f5bd9df3d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:45:01 +0100 Subject: [PATCH 2/8] Ignore duplicate paths in "systemctl start" --- - src/systemctl/systemctl.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + src/systemctl/systemctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index fd9f580..b8252c9 100644 +index 3cca861..16791a2 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c -@@ -1507,8 +1507,10 @@ static int start_unit_one( - r = set_put(s, p); - if (r < 0) { - free(p); -- log_error("Failed to add path to set."); -- return r; -+ if (r != -EEXIST) { -+ log_error("Failed to add path %s to set.", p); -+ return r; -+ } - } - } +@@ -1867,7 +1867,7 @@ static int start_unit_one( + return log_oom(); + r = set_consume(s, p); +- if (r < 0) { ++ if (r < 0 && r != -EEXIST) { + log_error("Failed to add path to set."); + return r; + } -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch index 30382f557587..ee95a33839ff 100644 --- a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 6960f2025e95e69079540c4828f62e16d7e75fb1 Mon Sep 17 00:00:00 2001 +From b288ca7d376e3a78368a2b59529ebe5ba812babf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 3/8] Start device units for uninitialised encrypted devices @@ -28,5 +28,5 @@ index d17bdd9..040b10e 100644 SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch index 610f8a1de630..a060a1bbce53 100644 --- a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch +++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch @@ -1,4 +1,4 @@ -From 22d416e766e11dbc381620beff89284a0e23827b Mon Sep 17 00:00:00 2001 +From 7a498e661f3d111fa09700a6cfa62cfd6733b1cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:48:19 +0100 Subject: [PATCH 4/8] Set switch-to-configuration hints for some units @@ -34,12 +34,12 @@ index 18c3d74..a09054c 100644 + +X-StopOnReconfiguration=yes diff --git a/units/remote-fs.target b/units/remote-fs.target -index e867b8d..02462b4 100644 +index 09213e8..47b4cf5 100644 --- a/units/remote-fs.target +++ b/units/remote-fs.target @@ -10,5 +10,7 @@ Description=Remote File Systems Documentation=man:systemd.special(7) - After=remote-fs-pre.target remote-fs-setup.target + After=remote-fs-pre.target +X-StopOnReconfiguration=yes + @@ -70,5 +70,5 @@ index 0869e73..b6ed958 100644 +# Restart kills all active sessions. +X-RestartIfChanged=no -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch index 1f6da920091f..6905b507c746 100644 --- a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch +++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch @@ -1,4 +1,4 @@ -From 4b0a5f8b3f8fed53f34021dd6139699740b0c3ff Mon Sep 17 00:00:00 2001 +From e6bbe5fa858bd8196c8e1f264904679e6bda426d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:56:03 +0100 Subject: [PATCH 5/8] sysinit.target: Drop the dependency on local-fs.target @@ -29,5 +29,5 @@ index 8f4fb8f..e0f0147 100644 +After=emergency.service emergency.target RefuseManualStart=yes -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch index f56d6cc41be7..8dca3cb0e8cf 100644 --- a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch +++ b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch @@ -1,4 +1,4 @@ -From fbb62c4d5973f7556ce6c3bc9242180b7e087de8 Mon Sep 17 00:00:00 2001 +From 4731a9074538e9e24d2b81fc737917b064e194e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 18:36:28 +0100 Subject: [PATCH 6/8] Don't call "plymouth quit" @@ -34,5 +34,5 @@ index 269797a..2c640f4 100644 ExecStart=-/sbin/sulogin ExecStopPost=-@SYSTEMCTL@ --fail --no-block default -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch index f12061715471..9fdb454a2a93 100644 --- a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch +++ b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch @@ -1,4 +1,4 @@ -From 72a89fd9b4e35da375a1cdcf0d30a0f31a78d9a5 Mon Sep 17 00:00:00 2001 +From f0c362873860526579bf9bda216005fd5a0936dd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2013 12:41:14 +0100 Subject: [PATCH 7/8] Ignore IPv6 link-local addresses @@ -33,5 +33,5 @@ index b1ef912..4f2ab5c 100644 continue; -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch index c8959871c009..d8384e1332a6 100644 --- a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From ceb0fc701960de1568fe2732f390a7b92b76f2e1 Mon Sep 17 00:00:00 2001 +From 0112df74e576dd683c132ec33861b7099dc94454 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 8/8] Don't try to unmount /nix or /nix/store @@ -11,7 +11,7 @@ https://github.com/NixOS/nixos/issues/126 1 file changed, 2 insertions(+) diff --git a/src/core/umount.c b/src/core/umount.c -index 8c69e74..ff13a5d 100644 +index 1e95ad7..9f0e471 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -435,6 +435,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e @@ -24,5 +24,5 @@ index 8c69e74..ff13a5d 100644 || path_equal(m->path, "/usr") #endif -- -1.8.1 +1.8.2.1 diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 35b35d4e6fae..995049fcf6d4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,11 +6,11 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-201"; + name = "systemd-203"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "046cr1q7xv7bslzc16g8zz8nddf64lw8v01isw1204n21cd9yafn"; + sha256 = "07gvn3rpski8sh1nz16npjf2bvj0spsjdwc5px9685g2pi6kxcb1"; }; patches = From 2e77679b0bfddb64b54703bfeaac455979ff0b2c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 May 2013 14:26:29 +0200 Subject: [PATCH 136/142] systemd: Start ctrl-alt-del.target irreversibly This fixes hangs during EC2 reboots (which are implemented by sending a ctrl-alt-del to the instance). --- ...aemon-reexec-do-the-right-thing-on-N.patch | 2 +- ...e-duplicate-paths-in-systemctl-start.patch | 2 +- ...ts-for-uninitialised-encrypted-devic.patch | 2 +- ...o-configuration-hints-for-some-units.patch | 2 +- ...rop-the-dependency-on-local-fs.targe.patch | 2 +- .../0006-Don-t-call-plymouth-quit.patch | 2 +- ...007-Ignore-IPv6-link-local-addresses.patch | 2 +- ...on-t-try-to-unmount-nix-or-nix-store.patch | 2 +- ...art-ctrl-alt-del.target-irreversibly.patch | 27 +++++++++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 1 + 10 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 pkgs/os-specific/linux/systemd/0009-Start-ctrl-alt-del.target-irreversibly.patch diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch index e3a2f969273f..bcc8d8f32f77 100644 --- a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch +++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch @@ -1,7 +1,7 @@ From 8f861550827e750fb56954c3f91a2f565abb42bb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:44:33 +0100 -Subject: [PATCH 1/8] Make "systemctl daemon-reexec" do the right thing on +Subject: [PATCH 1/9] Make "systemctl daemon-reexec" do the right thing on NixOS --- diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch index a68973e78953..27ac6183efc8 100644 --- a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch +++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch @@ -1,7 +1,7 @@ From 2afcee0b4da066fb5f8fc00b749d88f5bd9df3d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:45:01 +0100 -Subject: [PATCH 2/8] Ignore duplicate paths in "systemctl start" +Subject: [PATCH 2/9] Ignore duplicate paths in "systemctl start" --- src/systemctl/systemctl.c | 2 +- diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch index ee95a33839ff..ad162fa789ae 100644 --- a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,7 +1,7 @@ From b288ca7d376e3a78368a2b59529ebe5ba812babf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 -Subject: [PATCH 3/8] Start device units for uninitialised encrypted devices +Subject: [PATCH 3/9] Start device units for uninitialised encrypted devices This is necessary because the NixOS service that initialises the filesystem depends on the appearance of the device unit. Also, this diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch index a060a1bbce53..7fe18f378f98 100644 --- a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch +++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch @@ -1,7 +1,7 @@ From 7a498e661f3d111fa09700a6cfa62cfd6733b1cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:48:19 +0100 -Subject: [PATCH 4/8] Set switch-to-configuration hints for some units +Subject: [PATCH 4/9] Set switch-to-configuration hints for some units MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch index 6905b507c746..78683f0cf08d 100644 --- a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch +++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch @@ -1,7 +1,7 @@ From e6bbe5fa858bd8196c8e1f264904679e6bda426d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:56:03 +0100 -Subject: [PATCH 5/8] sysinit.target: Drop the dependency on local-fs.target +Subject: [PATCH 5/9] sysinit.target: Drop the dependency on local-fs.target and swap.target Having all services with DefaultDependencies=yes depend on diff --git a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch index 8dca3cb0e8cf..e440f6113dc0 100644 --- a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch +++ b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch @@ -1,7 +1,7 @@ From 4731a9074538e9e24d2b81fc737917b064e194e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 18:36:28 +0100 -Subject: [PATCH 6/8] Don't call "plymouth quit" +Subject: [PATCH 6/9] Don't call "plymouth quit" NixOS doesn't use Plymouth (yet). --- diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch index 9fdb454a2a93..9c322c9fc597 100644 --- a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch +++ b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch @@ -1,7 +1,7 @@ From f0c362873860526579bf9bda216005fd5a0936dd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2013 12:41:14 +0100 -Subject: [PATCH 7/8] Ignore IPv6 link-local addresses +Subject: [PATCH 7/9] Ignore IPv6 link-local addresses Returning IPv6 link-local addresses is a bad idea, because they only work if an application connects specifically over the corresponding diff --git a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch index d8384e1332a6..803227031f79 100644 --- a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,7 +1,7 @@ From 0112df74e576dd683c132ec33861b7099dc94454 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 -Subject: [PATCH 8/8] Don't try to unmount /nix or /nix/store +Subject: [PATCH 8/9] Don't try to unmount /nix or /nix/store They'll still be remounted read-only. diff --git a/pkgs/os-specific/linux/systemd/0009-Start-ctrl-alt-del.target-irreversibly.patch b/pkgs/os-specific/linux/systemd/0009-Start-ctrl-alt-del.target-irreversibly.patch new file mode 100644 index 000000000000..d0bade9ba5bc --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0009-Start-ctrl-alt-del.target-irreversibly.patch @@ -0,0 +1,27 @@ +From ed7c22c76e1399861ec8e0216f08a7f9419eea50 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 7 May 2013 14:03:13 +0200 +Subject: [PATCH 9/9] Start ctrl-alt-del.target irreversibly + +This makes ctrl-alt-del reboots more robust, just like "systemctl +reboot". +--- + src/core/manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/manager.c b/src/core/manager.c +index c7f8f20..0508628 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -1372,7 +1372,7 @@ static int manager_process_signal_fd(Manager *m) { + + case SIGINT: + if (m->running_as == SYSTEMD_SYSTEM) { +- manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE); ++ manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY); + break; + } + +-- +1.8.2.1 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 995049fcf6d4..2482f808cac8 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ./0006-Don-t-call-plymouth-quit.patch ./0007-Ignore-IPv6-link-local-addresses.patch ./0008-Don-t-try-to-unmount-nix-or-nix-store.patch + ./0009-Start-ctrl-alt-del.target-irreversibly.patch ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; buildInputs = From d32fafc9e444b295f619a154db3540c352db6d9b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 7 May 2013 17:09:47 +0300 Subject: [PATCH 137/142] Calligra: fix build with KDE 4.10 --- pkgs/applications/office/calligra/default.nix | 4 ++- .../office/calligra/fix-kde4.10-build.patch | 36 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/office/calligra/fix-kde4.10-build.patch diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 0769f324c15d..da2d166fc86d 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkgconfig ]; + patches = [ ./fix-kde4.10-build.patch ]; + buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A Qt/KDE office suite, formely known as koffice"; homepage = http://calligra.org; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/office/calligra/fix-kde4.10-build.patch b/pkgs/applications/office/calligra/fix-kde4.10-build.patch new file mode 100644 index 000000000000..e41d6a28f9d7 --- /dev/null +++ b/pkgs/applications/office/calligra/fix-kde4.10-build.patch @@ -0,0 +1,36 @@ +From: Andre Woebbeking +Date: Sun, 13 Jan 2013 15:10:38 +0000 +Subject: compile with kdelibs 4.10 (tests are enabled by default) +X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=39fdda6757cbbb35480dec98eac419eb1879cb31 +--- +compile with kdelibs 4.10 (tests are enabled by default) +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,11 +96,6 @@ + set(SHOULD_BUILD_ACTIVE FALSE) + ENDIF() + +-if(KDE4_BUILD_TESTS) +- # only with this definition will the FOO_TEST_EXPORT macro do something +- add_definitions(-DCOMPILING_TESTS) +-endif(KDE4_BUILD_TESTS) +- + ######################## + ######################### + ## Look for KDE and Qt ## +@@ -146,6 +141,11 @@ + endif(NOT ${KDE_VERSION} VERSION_GREATER 4.6.4) + + macro_ensure_out_of_source_build("Compiling Calligra inside the source directory is not possible. Please refer to the build instruction http://community.kde.org/Calligra/Building/Building_Calligra") ++ ++if(KDE4_BUILD_TESTS) ++ # only with this definition will the FOO_TEST_EXPORT macro do something ++ add_definitions(-DCOMPILING_TESTS) ++endif(KDE4_BUILD_TESTS) + + ########################### + ############################ + From b7bc27cfff9a17ec4ff5e806203aea2e5191b373 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 7 May 2013 17:22:26 +0300 Subject: [PATCH 138/142] KDE 4.10: propagate nepomuk_core along with kdepimlibs. --- pkgs/desktops/kde-4.10/kde-runtime.nix | 4 ++-- pkgs/desktops/kde-4.10/kdeadmin/kuser.nix | 4 ++-- pkgs/desktops/kde-4.10/kdebindings/pykde4.nix | 4 ++-- pkgs/desktops/kde-4.10/kdebindings/smokekde.nix | 2 +- pkgs/desktops/kde-4.10/kdenetwork/kopete.nix | 4 ++-- pkgs/desktops/kde-4.10/kdepim-runtime.nix | 4 ++-- pkgs/desktops/kde-4.10/kdepim.nix | 4 ++-- pkgs/desktops/kde-4.10/kdepimlibs.nix | 4 ++-- pkgs/desktops/kde-4.10/kdeplasma-addons.nix | 4 ++-- pkgs/desktops/kde-4.10/kdeutils/kgpg.nix | 4 ++-- pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix index a0e58deb0b28..6b642eb0b226 100644 --- a/pkgs/desktops/kde-4.10/kde-runtime.nix +++ b/pkgs/desktops/kde-4.10/kde-runtime.nix @@ -1,11 +1,11 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio -, networkmanager, nepomuk_core, kactivities, kdepimlibs +, networkmanager, kactivities, kdepimlibs }: kde { buildInputs = [ - kdelibs attica xz bzip2 nepomuk_core libssh libjpeg exiv2 ntrack + kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack qca2 samba (libcanberra.override { gtk = null; }) pulseaudio networkmanager kactivities kdepimlibs #todo: add openslp, openexr diff --git a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix index fa140765e7ff..571674a461ad 100644 --- a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix +++ b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix @@ -1,5 +1,5 @@ -{ kde, kdelibs, kdepimlibs, nepomuk_core }: +{ kde, kdelibs, kdepimlibs }: kde { - buildInputs = [ kdelibs kdepimlibs nepomuk_core]; + buildInputs = [ kdelibs kdepimlibs ]; } diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix index 65a7c7ffe7e1..7f6973c054bb 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix @@ -1,5 +1,5 @@ { kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - nepomuk_core, polkit_qt_1, boost, lndir, pkgconfig }: + polkit_qt_1, boost, lndir, pkgconfig }: let pydir = "lib/python${python.majorVersion}"; in @@ -9,7 +9,7 @@ kde { buildInputs = [ python kdepimlibs shared_desktop_ontologies - boost nepomuk_core polkit_qt_1 pkgconfig + boost polkit_qt_1 pkgconfig ]; propagatedBuildInputs = [ pyqt4 sip ]; diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix index e7e5101c972f..d129686b2de1 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix +++ b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix @@ -1,5 +1,5 @@ { kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular -, shared_desktop_ontologies, attica, nepomuk_core }: +, shared_desktop_ontologies, attica }: kde { # attica, akonadi and kdepimlibs are disabled due to smokegen crash diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix index 1d401aca021a..3907b67c42a5 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix @@ -1,14 +1,14 @@ { kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, jasper, libidn, mediastreamer, msilbc, pkgconfig, libxslt, giflib, libgadu, boost, qca2, gpgme, sqlite, telepathy_qt, shared_desktop_ontologies, - libjpeg, nepomuk_core, libmms }: + libjpeg, libmms }: kde { #todo: libmeanwhile, xmms buildInputs = [ kdelibs telepathy_qt shared_desktop_ontologies qca2 gpgme libgadu mediastreamer kdepimlibs qimageblitz libktorrent libjpeg sqlite jasper giflib libmsn libotr - libxslt libidn speex nepomuk_core boost libmms msilbc + libxslt libidn speex boost libmms msilbc ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.10/kdepim-runtime.nix b/pkgs/desktops/kde-4.10/kdepim-runtime.nix index 191ce1080b8b..8fdd9fc8fa17 100644 --- a/pkgs/desktops/kde-4.10/kdepim-runtime.nix +++ b/pkgs/desktops/kde-4.10/kdepim-runtime.nix @@ -1,10 +1,10 @@ { kde, fetchurl, cmake, kdelibs, libxslt, boost, kdepimlibs, akonadi -, shared_desktop_ontologies, nepomuk_core }: +, shared_desktop_ontologies }: kde { buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies - libxslt nepomuk_core + libxslt ]; #todo: libkgapi, libkolab, libkolabxml meta = { diff --git a/pkgs/desktops/kde-4.10/kdepim.nix b/pkgs/desktops/kde-4.10/kdepim.nix index 56d18eab1857..fffab0010e3a 100644 --- a/pkgs/desktops/kde-4.10/kdepim.nix +++ b/pkgs/desktops/kde-4.10/kdepim.nix @@ -1,11 +1,11 @@ { kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime , akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison -, nepomuk_core, nepomuk_widgets, dblatex }: +, nepomuk_widgets, dblatex }: kde { #todo: update grantlee to 0.3 buildInputs = - [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_core nepomuk_widgets + [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex ]; diff --git a/pkgs/desktops/kde-4.10/kdepimlibs.nix b/pkgs/desktops/kde-4.10/kdepimlibs.nix index 27ec1de5a611..c9813b19f521 100644 --- a/pkgs/desktops/kde-4.10/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.10/kdepimlibs.nix @@ -4,11 +4,11 @@ kde { buildInputs = - [ boost gpgme libical libxslt nepomuk_core qjson + [ boost gpgme libical libxslt qjson openldap cyrus_sasl akonadi shared_desktop_ontologies ]; - propagatedBuildInputs = [ kdelibs ]; + propagatedBuildInputs = [ kdelibs nepomuk_core ]; meta = { description = "KDE PIM libraries"; diff --git a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix index 3b30a257ddfe..2bd6f5037db8 100644 --- a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix @@ -1,7 +1,7 @@ { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig , boost, eigen, kde_workspace, attica, python, qca2, qimageblitz , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt -, qjson, qoauth, nepomuk_core }: +, qjson, qoauth }: # TODO: qwt, scim, ibus kde { @@ -9,7 +9,7 @@ kde { KDEDIRS=marble; buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth - eigen qca2 libXtst qimageblitz nepomuk_core + eigen qca2 libXtst qimageblitz libqalculate shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt ]; diff --git a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix index 3027e2357a49..f3b00a5b968c 100644 --- a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix +++ b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, kdepimlibs, nepomuk_core }: +{ kde, kdelibs, kdepimlibs }: kde { - buildInputs = [ kdelibs kdepimlibs nepomuk_core ]; + buildInputs = [ kdelibs kdepimlibs ]; meta = { description = "Simple KDE GUI for GPG"; diff --git a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix index 09f409cc4746..21971beb80a0 100644 --- a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix @@ -1,9 +1,9 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, nepomuk_core, htmlTidy, boost }: +{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: kde { #todo: ruby is not found. needed for some example scripts buildInputs = - [ kdelibs kdepimlibs htmlTidy nepomuk_core boost ]; + [ kdelibs kdepimlibs htmlTidy boost ]; meta = { description = "A KDE link checker"; From cd6da089a68effaa1e84f3d1533e37c23d68017b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 May 2013 17:29:48 +0200 Subject: [PATCH 139/142] nginx: Update to 1.2.8 --- pkgs/servers/http/nginx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 9a5d8e7a149f..52a17ea399c3 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { - name = "nginx-1.2.4"; + name = "nginx-1.2.8"; src = fetchurl { url = "http://nginx.org/download/${name}.tar.gz"; - sha256 = "0hvcv4lgfcrsl40azkd3rxhf73l05jzzgflclpkdvjd95xgw51y5"; + sha256 = "0dvi8n3ljh3zz80r5zkb5q7f94mg62kkakn0wsqi3lxyqnc7r56j"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; From f58d12c31dad6b7dd365f800b83f10bffb0ff93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 7 May 2013 17:36:59 +0200 Subject: [PATCH 140/142] libgphoto2: fix build on i686 via a minor update --- pkgs/development/libraries/libgphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index e1feda6abd4a..4a45804789b8 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }: stdenv.mkDerivation rec { - name = "libgphoto2-2.5.1.1"; + name = "libgphoto2-2.5.2"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "057dnyrxr0vy2zs4fhscpig42kvlsy9fg4gj20fhvjcvp3pak8xl"; + sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3"; }; nativeBuildInputs = [ pkgconfig gettext ]; From 14d87f3a9ef827754c9f1e22e258d4118f797030 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 8 May 2013 10:25:59 +0400 Subject: [PATCH 141/142] Update Linux versions --- pkgs/os-specific/linux/kernel/linux-3.8.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.9.nix | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index a8dacfda4a33..1f39fac8ec94 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -252,7 +252,7 @@ in import ./generic.nix ( rec { - version = "3.8.10"; + version = "3.8.12"; testing = false; preConfigure = '' @@ -261,7 +261,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0nhjprr1yvkb9fvyjxxdds0j71vidpbqqnmrf0cym3a4l3fxqj5p"; + sha256 = "1vhimxcxl6scifbg6pgdljx093bldgsqi19980447pbp4zn2zzmv"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 764395d2642d..b4873b099eae 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -252,8 +252,7 @@ in import ./generic.nix ( rec { - version = "3.9"; - modDirVersion = "3.9.0"; + version = "3.9.1"; testing = false; preConfigure = '' @@ -262,7 +261,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0ha5ym9ssvz14kb8w6zksk4s867mmd07dkfp5kg7iisxxrj3xg30"; + sha256 = "0ax06wb00lk3rf5xxw907l0m9s4pypnnjvp0qgnc7il0jnvcsd0c"; }; config = configWithPlatform stdenv.platform; From 0c020c98f9d4f49d5c9907db5f4b35aac7df959b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 8 May 2013 10:52:20 +0400 Subject: [PATCH 142/142] Updates: Wine, SBCL, XBoard --- pkgs/development/compilers/sbcl/default.nix | 8 ++++---- pkgs/games/xboard/default.nix | 8 ++++---- pkgs/misc/emulators/wine/default.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index f4c45b390fe8..066554ddc153 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.6"; + version="1.1.7"; name="${baseName}-${version}"; - hash="1idrbjqi4m5p4dmxzwwx3rgsdq887njzi67gr1f4b26v56a3qnx2"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.6/sbcl-1.1.6-source.tar.bz2"; - sha256="1idrbjqi4m5p4dmxzwwx3rgsdq887njzi67gr1f4b26v56a3qnx2"; + hash="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.7/sbcl-1.1.7-source.tar.bz2"; + sha256="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8"; }; buildInputs = with a; [ clisp makeWrapper diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index a21911f4067d..21870fc3777c 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -5,11 +5,11 @@ let s = # Generated upstream information rec { baseName="xboard"; - version="4.7.0"; + version="4.7.1"; name="${baseName}-${version}"; - hash="15azbnyfapjppfni9k99sk68af1kg60nnh95rz8jgb3i2xv5y5m7"; - url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.0.tar.gz"; - sha256="15azbnyfapjppfni9k99sk68af1kg60nnh95rz8jgb3i2xv5y5m7"; + hash="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry"; + url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.1.tar.gz"; + sha256="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry"; }; buildInputs = [ libX11 xproto libXt libXaw libSM libICE libXmu diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 19bd931f32fd..11402ca740f0 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - version = "1.5.28"; + version = "1.5.29"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0ik02c11bp1glafcw82drkmjp8lxrkycvas3jlrvf1rv46blpy0b"; + sha256 = "1cc8g1mrs02nk16jz4a8brr82slp944k4c1nmaa2xpz183a0wz1q"; }; gecko = fetchurl {