diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-10 10:24:30 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-10 10:24:30 +0000 |
| commit | 5144a19987ee5148e0a21b0d44be4a00dde24f96 (patch) | |
| tree | f81fdffda18c1b10ad1125e16fe9f77bdf80bf34 | |
| parent | 232da3a29db13a09e98bddab17c88958027ed0e5 (diff) | |
| parent | e9974606a50e49c4eb5df609c589234d89385992 (diff) | |
svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
63 files changed, 589 insertions, 575 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 91307deb2203a..236c7574d5ec9 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -4,23 +4,18 @@ , alsaLib }: -# XXX: ? -# - checking for alsa >= 1.0.0... no -# - checking for Wand >= 6.2.8... no -# - imagemagickBig instead of imagemagick? - assert (gtk != null) -> (pkgconfig != null); assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-24.0.92"; + name = "emacs-24.0.93"; builder = ./builder.sh; src = fetchurl { url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz"; - sha256 = "0pwps72zj7mm6asly1vdq46dcj3in4qrkb6ss9xq6nbf039nj4w6"; + sha256 = "4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe"; }; buildInputs = diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix new file mode 100644 index 0000000000000..8934238ffa3aa --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -0,0 +1,34 @@ +{ fetchgit, stdenv, emacs }: + +# TODO: byte-compile in build phase - a buildEmacsPackage that does +# that would be nice + +stdenv.mkDerivation rec { + name = "calfw-1.3-5-ga9b6615"; + + src = fetchgit { + url = "git://github.com/kiwanami/emacs-calfw.git"; + rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d"; + sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393"; + }; + + buildInputs = [ emacs ]; + + installPhase = + '' + ensureDir "$out/share/doc/${name}" + cp -v readme.md "$out/share/doc/${name}" + + ensureDir "$out/share/emacs/site-lisp/" + cp *.el "$out/share/emacs/site-lisp/" + ''; + + meta = { + description = "A calendar framework for Emacs"; + + license = "GPLv3+"; + + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index a7ff4e624a110..751330550f1a7 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { inherit date; cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; module = "emacs-w3m"; - sha256 = "ad46592d4fe3cdaadc02ce6d3fb1ac237e200beecd2ad11a04c1395a38a70a0a"; + sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc"; }; buildInputs = [ emacs w3m texinfo autoconf ]; diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix new file mode 100644 index 0000000000000..e5958021aa27b --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation { + name = "js2-mode-0-20120130"; + + src = fetchgit { + url = "git://github.com/mooz/js2-mode.git"; + rev = "4c008b1987aa53769899e24808b6d74b41b4ff40"; + sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile js2-mode.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/ + ''; +} diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 85388ffa6012d..0ac499f2681a2 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, djvulibre, qt4 }: +{stdenv, fetchurl, djvulibre, qt4, pkgconfig }: -stdenv.mkDerivation { - name = "djview4-4.1-2"; +stdenv.mkDerivation rec { + name = "djview-4.8"; src = fetchurl { - url = mirror://sf/djvu/djview4-4.1-2.tar.gz; - sha256 = "10k0h892kab3n8xypw6vsnvhwil410hvvqj375pwiss4vlm5isv1"; + url = "mirror://sourceforge/djvu/${name}.tar.gz"; + sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c"; }; buildInputs = [djvulibre qt4]; + buildNativeInputs = [ pkgconfig ]; + + patches = [ ./djview4-qt-4.8.patch ]; + passthru = { mozillaPlugin = "/lib/netscape/plugins"; }; diff --git a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch new file mode 100644 index 0000000000000..ce3694197f60f --- /dev/null +++ b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch @@ -0,0 +1,38 @@ +Origin: OpenSUSE +Index: djview-4.8/src/qdjvuwidget.cpp +=================================================================== +--- djview-4.8.orig/src/qdjvuwidget.cpp ++++ djview-4.8/src/qdjvuwidget.cpp +@@ -153,7 +153,7 @@ all_numbers(const char *s) + } + + template<class T> static inline void +-swap(T& x, T& y) ++myswap(T& x, T& y) + { + T tmp; + tmp = x; +@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k) + /* Sort v[lo], v[m], v[hi] by insertion */ + m = (lo+hi)/2; + if (v[lo]>v[m]) +- swap(v[lo],v[m]); ++ myswap(v[lo],v[m]); + if (v[m]>v[hi]) { +- swap(v[m],v[hi]); ++ myswap(v[m],v[hi]); + if (v[lo]>v[m]) +- swap(v[lo],v[m]); ++ myswap(v[lo],v[m]); + } + /* Extract pivot, place sentinel */ + pivot = v[m]; +@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k) + do ++l; while (v[l]<pivot); + do --h; while (v[h]>pivot); + if (l < h) { +- swap(v[l],v[h]); ++ myswap(v[l],v[h]); + goto loop; + } + /* Finish up */ diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 2557f0f82e58c..27b3c0c9b0324 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,25 +1,29 @@ -{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, - pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa, freeglut, - glew, libXmu, libXi }: +{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost +, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa +, freeglut, glew, libXmu, libXi, tclap }: stdenv.mkDerivation rec { - name = "hugin-2010.4.0"; + name = "hugin-2011.4.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "13n3p4f39mbdydsjqy48csjgvv30lfcwvln5y5dyy95lyrfwcp6l"; + sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - NIX_LDFLAGS = "-lrt"; +#NIX_LDFLAGS = "-lrt"; - buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig + buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; + buildNativeInputs = [ cmake pkgconfig ]; + + propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ]; + postInstall = '' mkdir -p "$out/nix-support" - echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages + echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages ''; meta = { diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index feb507c873205..e4899bfc463f5 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, gitSupport ? false -, git ? null -, monotoneSupport ? false -, monotone ? null +, YAMLLibYAML +, gitSupport ? false, git ? null +, monotoneSupport ? false, monotone ? null , extraUtils ? [] }: @@ -13,19 +12,19 @@ assert monotoneSupport -> (monotone != null); let name = "ikiwiki"; - version = "3.20120115"; + version = "3.20120202"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "3145372b3d86068f90348a96f9daf3a3b438d747be0e977358d82ee752499c1f"; + sha256 = "0bada9a98e0990c6d99e8ca978e42926578aec36d033d6a273e415349a6cbb48"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML] + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML ] ++ stdenv.lib.optionals gitSupport [git] ++ stdenv.lib.optionals monotoneSupport [monotone]; diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/linphone/default.nix index 07ca19b63cc50..c98a8ae4fd90e 100644 --- a/pkgs/applications/networking/linphone/default.nix +++ b/pkgs/applications/networking/linphone/default.nix @@ -2,16 +2,18 @@ readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }: stdenv.mkDerivation rec { - name = "linphone-3.4.3"; + name = "linphone-3.5.0"; src = fetchurl { - url = "mirror://savannah/linphone/3.4.x/sources/${name}.tar.gz"; - sha256 = "14k655z0kfmnm42nxhsl25rjim9swrr4kpnplkx3pd9b3yha1rwj"; + url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz"; + sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix"; }; - buildInputs = [ intltool pkgconfig gtk libglade libosip libexosip speex readline + buildInputs = [ intltool gtk libglade libosip libexosip speex readline ffmpeg alsaLib SDL libv4l libtheora libXv ]; + buildNativeInputs = [ pkgconfig ]; + meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dc4c0531031c5..2815266f2a15a 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -58,9 +58,8 @@ stdenv.mkDerivation rec { ''; # XXX: emacs tests broken - #postBuild = '' - # make test - #''; + doCheck = false; + checkTarget = "test"; meta = { description = "Notmuch -- The mail indexer"; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index afd16dbb2a8ac..abb4eff6b57fd 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }: -let rev = "22523"; in +let rev = "24763"; in stdenv.mkDerivation { - name = "tribler-5.4.3-pre${rev}"; + name = "tribler-5.5.10"; src = fetchsvn { - url = http://svn.tribler.org/abc/branches/release-5.4.x; + url = http://svn.tribler.org/abc/branches/release-5.5.x; inherit rev; - sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g"; + sha256 = "1lvg2vvwzwf8zzg0fl1mp8wc0kcspxkl84q4qdxalkv4x2d8w5c6"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ]; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 8d1b5afe4d0bb..4bbe8400fd55e 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, - shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: +{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig +, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: stdenv.mkDerivation rec { name = "kmymoney-4.6.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ]; - buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ]; + buildNativeInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ]; KDEDIRS = libalkimia; diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 5fde0cfa28503..d90beecd967a6 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -6,10 +6,13 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2 , autoconf, openldap, postgresql, bash , langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] +, force ? false }: -throw "The expression for libreoffice is still not ready" - +if !force then + throw ''The expression for libreoffice is still not ready. + Set config.libreoffice.force = true; if you want to try it anyway.'' +else stdenv.mkDerivation rec { name = "libreoffice-3.4.5.2"; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 77fe32d1792dd..9592f8f987182 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "11.08.0"; + version = "12.01.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df"; + sha256 = "358cdafe81b7e7290f6bb8c93580b0e2f0ae5a4d148a476e5af375aa9bf77054"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 6f5d36f6aa74a..534a00a357bed 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, ruby, makeWrapper, git }: stdenv.mkDerivation rec { - name = "svn2git-2.1.0-20111206"; + name = "svn2git-2.2.0"; src = fetchgit { url = https://github.com/nirvdrum/svn2git; - rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848"; - sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca"; + rev = "db0769835e9d1d3ff324091a3bb7756200a09932"; + sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2"; }; buildInputs = [ ruby makeWrapper ]; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 63fc994af37ab..eaea4d190f19a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -166,6 +166,7 @@ rec { halt -d -p -f ''; + initrd = makeInitrd { contents = [ { object = stage1Init; @@ -961,6 +962,30 @@ rec { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; }; + fedora16i386 = { + name = "fedora-16-i386"; + fullName = "Fedora 16 (i386)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/16/Everything/i386/os/repodata/8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118-primary.xml.gz; + sha256 = "8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118"; + }; + urlPrefix = mirror://fedora/linux/releases/16/Everything/i386/os; + archs = ["noarch" "i386" "i586" "i686"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + }; + + fedora16x86_64 = { + name = "fedora-16-x86_64"; + fullName = "Fedora 16 (x86_64)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/16/Everything/x86_64/os/repodata/3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107-primary.xml.gz; + sha256 = "3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107"; + }; + urlPrefix = mirror://fedora/linux/releases/16/Everything/x86_64/os; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + }; + opensuse103i386 = { name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; @@ -1175,6 +1200,28 @@ rec { packages = commonDebPackages ++ [ "diffutils" ]; }; + ubuntu1110i386 = { + name = "ubuntu-11.10-oneiric-i386"; + fullName = "Ubuntu 11.10 Oneiric (i386)"; + packagesList = fetchurl { + url = mirror://ubuntu/dists/oneiric/main/binary-i386/Packages.bz2; + sha256 = "11r1s76ppi7rwz08i20d7n4ndaj9lb9wsl9k8ww4s1c6agzpwv8a"; + }; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" ]; + }; + + ubuntu1110x86_64 = { + name = "ubuntu-11.10-oneiric-amd64"; + fullName = "Ubuntu 11.10 Oneiric (amd64)"; + packagesList = fetchurl { + url = mirror://ubuntu/dists/oneiric/main/binary-amd64/Packages.bz2; + sha256 = "07k784gxwaqmyggmzczy9hjkgfp6p6dcs8rhkxw5hfzn0jaf8l2s"; + }; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" ]; + }; + debian40i386 = { name = "debian-4.0r9-etch-i386"; fullName = "Debian 4.0r9 Etch (i386)"; @@ -1220,22 +1267,22 @@ rec { }; debian60i386 = { - name = "debian-6.0.3-squeeze-i386"; - fullName = "Debian 6.0.3 Squeeze (i386)"; + name = "debian-6.0.4-squeeze-i386"; + fullName = "Debian 6.0.4 Squeeze (i386)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha1 = "90a55b6bb049d0777d06d5b28a1848b38678426b"; + sha256 = "5686732aa690d80ba4c390af3f7b9ba3c3c8c17861c89bca3a3694c403d7b7e6"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian60x86_64 = { - name = "debian-6.0.3-squeeze-amd64"; - fullName = "Debian 6.0.3 Squeeze (amd64)"; + name = "debian-6.0.4-squeeze-amd64"; + fullName = "Debian 6.0.4 Squeeze (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha1 = "071626063ab0a70f10200e2e27a5c7fae29fa4ad"; + sha256 = "525f919bb48a4d2d0cb3a4fb5b0d4338e7936f68753ca945358ea1c3792ea7b7"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index e228154522bdd..19b9d26c7deb2 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -6,7 +6,7 @@ then coverageAnalysis else stdenv.mkDerivation) -rec { +(rec { name = "guile-2.0.5"; src = fetchurl { @@ -69,3 +69,13 @@ rec { platforms = stdenv.lib.platforms.all; }; } + +// + +(if stdenv.isFreeBSD + then { + # XXX: Thread support is currently broken on FreeBSD (namely the + # `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) + configureFlags = [ "--without-threads" ]; + } + else {})) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 92641f1ca4482..4d46a06d7e1ec 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -16,9 +16,12 @@ g: # Get dependencies from patched gems builder = g.builder_3_0_0; buildr = g.buildr_1_4_6; bundler = g.bundler_1_0_21; - childprocess = g.childprocess_0_3_0; + childprocess = g.childprocess_0_3_1; + coffee_script = g.coffee_script_2_2_0; + coffee_script_source = g.coffee_script_source_1_2_0; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; + execjs = g.execjs_1_3_0; ffi = g.ffi_1_0_11; highline = g.highline_1_5_1; hike = g.hike_1_2_1; @@ -51,7 +54,7 @@ g: # Get dependencies from patched gems rspec_mocks = g.rspec_mocks_2_1_0; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_5; - sass = g.sass_3_1_13; + sass = g.sass_3_1_14; selenium_webdriver = g.selenium_webdriver_2_18_0; sprockets = g.sprockets_2_1_2; thor = g.thor_0_14_6; @@ -60,7 +63,7 @@ g: # Get dependencies from patched gems tzinfo = g.tzinfo_0_3_31; xml_simple = g.xml_simple_1_0_12; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { ZenTest_4_5_0 = { basename = ''ZenTest''; @@ -153,7 +156,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-3.2.1''; - requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ]; + requiredGems = [ g.i18n_0_6_0 ]; sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v''; }; arel_3_0_0 = { @@ -262,16 +265,44 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6''; }; - childprocess_0_3_0 = { + childprocess_0_3_1 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.0''; + name = ''childprocess-0.3.1''; requiredGems = [ g.ffi_1_0_11 ]; - sha256 = ''1bvx6nkc1m24wjjybk943x1vjr51c98l0pwj73hj1r237307jyb4''; + sha256 = ''0phkpxvwz88kgbi4d2akiqbppf374kn2rwf64hfs99p1j1ksbw5l''; + }; + coffee_script_2_2_0 = { + basename = ''coffee_script''; + meta = { + description = ''Ruby CoffeeScript Compiler''; + homepage = ''http://github.com/josh/ruby-coffee-script''; + longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. +''; + }; + name = ''coffee-script-2.2.0''; + requiredGems = [ g.coffee_script_source_1_2_0 g.execjs_1_3_0 ]; + sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; + }; + coffee_script_source_1_2_0 = { + basename = ''coffee_script_source''; + meta = { + description = ''The CoffeeScript Compiler''; + homepage = ''http://jashkenas.github.com/coffee-script/''; + longDescription = '' CoffeeScript is a little language that compiles into JavaScript. + Underneath all of those embarrassing braces and semicolons, + JavaScript has always had a gorgeous object model at its heart. + CoffeeScript is an attempt to expose the good parts of JavaScript + in a simple way. +''; + }; + name = ''coffee-script-source-1.2.0''; + requiredGems = [ ]; + sha256 = ''13cpmlj2m5lyxipdxmnajy12bzwmgc6g2n090gpa0wd5am7xvhkp''; }; diff_lcs_1_1_2 = { basename = ''diff_lcs''; @@ -332,6 +363,18 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; + execjs_1_3_0 = { + basename = ''execjs''; + meta = { + description = ''Run JavaScript code from Ruby''; + homepage = ''https://github.com/sstephenson/execjs''; + longDescription = '' ExecJS lets you run JavaScript code from Ruby. +''; + }; + name = ''execjs-1.3.0''; + requiredGems = [ g.multi_json_1_0_4 ]; + sha256 = ''1sski14wdzfljx2f9j7r09li3rxqwvink8n5v489ykw1sicg6l2s''; + }; ffi_1_0_11 = { basename = ''ffi''; meta = { @@ -819,7 +862,7 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54''; }; - sass_3_1_13 = { + sass_3_1_14 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -830,9 +873,9 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.13''; + name = ''sass-3.1.14''; requiredGems = [ ]; - sha256 = ''0x07yckw9c4d59713midk2n85d3h88fcp147p8nai88gbvrm8b63''; + sha256 = ''0nrgsrqkfn3w8bpqsq9h4jv5wj0wikn3mp0gb3b7qdzkhw0h9947''; }; selenium_webdriver_2_18_0 = { basename = ''selenium_webdriver''; @@ -842,7 +885,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; name = ''selenium-webdriver-2.18.0''; - requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_0 ]; + requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_1 ]; sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9''; }; sprockets_2_1_2 = { diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index d22eb738671e8..138ee6eb27f50 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, unzip, libtool }: stdenv.mkDerivation rec { - name = "crypto++-5.6.0"; + name = "crypto++-5.6.1"; src = fetchurl { - url = "mirror://sourceforge/cryptopp/cryptopp560.zip"; - sha256 = "1icbk50mr1sqycqbxbqg703m8aamz23ajgl22ychxdahz2sz08mm"; + url = "mirror://sourceforge/cryptopp/cryptopp561.zip"; + sha256 = "0s7jhvnfihikqp1iwpdz03fad62xkjxci6jiahrh6f3sn664vrwq"; }; patches = [ ./pic.patch ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; cxxflags = if stdenv.isi686 then "-march=i686" else - if stdenv.isx86_64 then "-march=nocona" else + if stdenv.isx86_64 then "-march=nocona -fPIC" else ""; configurePhase = '' @@ -35,12 +35,10 @@ stdenv.mkDerivation rec { -e '/^CXXFLAGS =/s|-g -O2|-O3|' ''; - # Deal with one of the crappiest build system around there. + # I add what 'enableParallelBuilding' would add to the make call, + # if we were using the generic build phase. buildPhase = '' - # These guys forgot a file or something. - : > modexppc.cpp - - make PREFIX="$out" all cryptopp.dll + make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run @@ -48,11 +46,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir "$out" make install PREFIX="$out" - cp -v cryptopp.dll "$out/lib/libcryptopp.so" ''; doCheck = true; - checkPhase = "make test"; + checkPhase = "LD_LIBRARY_PATH=`pwd` make test"; meta = { description = "Crypto++, a free C++ class library of cryptographic schemes"; diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 905b2648dbd36..d850618ecdf9d 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, libosip, openssl, pkgconfig }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = http://download.savannah.gnu.org/releases/exosip/libeXosip2-3.5.0.tar.gz; - sha256 = "1z0s8qxxvyaksnnb9srfi3aipkkb7c1rsxdywl9xyxgnlri0w0a6"; + url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz"; + sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; }; name = "libexosip2-${version}"; diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 38f12f779b659..3283302f12977 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -2,10 +2,10 @@ , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, vorbisSupport ? false, libvorbis ? null +, vorbisSupport ? true, libvorbis ? null , vpxSupport ? false, libvpx ? null , x264Support ? true, x264 ? null -, xvidSupport ? false, xvidcore ? null +, xvidSupport ? true, xvidcore ? null , faacSupport ? false, faac ? null }: diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index ae6b692e44f2d..1fbd7f739362c 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs +{ stdenv, fetchurl, pkgconfig, glib, atk, pango129, cairo, perl, xlibs , gdk_pixbuf, xz , xineramaSupport ? true , cupsSupport ? true, cups ? null @@ -8,12 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = src.pkgname; + name = "gtk+-3.2.3"; - src = fetchurl_gnome { - project = "gtk+"; - major = "3"; minor = "2"; patchlevel = "0"; extension = "xz"; - sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw"; + src = fetchurl { + url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz; + sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2"; }; enableParallelBuilding = true; @@ -21,14 +20,12 @@ stdenv.mkDerivation rec { buildNativeInputs = [ perl pkgconfig ]; propagatedBuildInputs = - [ xlibs.xlibs glib atk pango gdk_pixbuf cairo + [ xlibs.xlibs glib atk pango129 gdk_pixbuf cairo xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; - configureFlags = "--with-xinput=yes"; - postInstall = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 73601f462e954..c90d7a0425af9 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1.2"; - sha256 = "1655fp71l8qjif4p6c1y2xk8r0gj58djg7np5zwwm6jlj780773r"; + version = "0.6.1.3"; + sha256 = "0vly55dpqrm9vb8ayp72na1nf2rr5ini3d81qqvxflmjgpksrgwq"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 47425ae2536c9..8d9c42c124330 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.6.0.1"; - sha256 = "0yy8yl2s3n0kyr14bcxp1hjzh3wlrhc0xp2ngl3wbz1hbzyrsdlf"; + version = "1.6.1.1"; + sha256 = "0y0npw27ic23zx7fq7dmvwbz2r62wblw9nbyai9kxgff4m2p3j4m"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index d0dc0afb35fa3..c3cdf36121784 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.7.1"; - sha256 = "0ll9pp0qnvw903ncpfgrc67jg385jzla3j9l0yfm9qqnn38sqhqv"; + version = "0.10.8"; + sha256 = "1vlp8vwaipz757vnd95gcdi9dkrpbgfdlsb3kgjivsj7rqbmxf7z"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix index d1603e0441a56..6f39e82739d3c 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-data"; - version = "6.0.0"; - sha256 = "1wdvylqgy3iw41ksw2ys4f0vyak8sbk6gginljvz07rrh04klyhl"; + version = "6.0.1"; + sha256 = "0v2ln4mdnild72p02mzjn8mn5srvjixsjqjgkdqzshvxjnnm95l8"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 94070a34c1854..5caea80d6c8be 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.8.4"; - sha256 = "0cyf1q1ngz0jqxdrvblcy9iw7l478v0rfr7bgkpq0l4brw0ca1pg"; + version = "3000.8.5"; + sha256 = "1gfifqc7ldklapnymwd9ss0lll6q87sbg1hc6pa4c9sh275x1rz6"; buildDepends = [ blazeBuilder dataenc HaXml HTTP mtl network time utf8String ]; diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index ff7101aba233d..021477863a64a 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hint"; - version = "0.3.3.3"; - sha256 = "0i7d7c2786c13npbb5np3gaidsq4kkajvm3fn2gx8djrhhlrqw5l"; + version = "0.3.3.4"; + sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy"; buildDepends = [ extensibleExceptions ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl random utf8String diff --git a/pkgs/development/libraries/haskell/json/0.5.nix b/pkgs/development/libraries/haskell/json/default.nix index a748c2b4f5872..5bfbb59d83f47 100644 --- a/pkgs/development/libraries/haskell/json/0.5.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.5"; sha256 = "12jbvq0lp7z5q6g94pv8s5455yydfyh9h2xlr76wqzfh3myvy6fl"; buildDepends = [ mtl parsec syb ]; + patchPhase = "sed -i json.cabal -e '1iExtensions: FlexibleInstances'"; meta = { description = "Support for serialising Haskell to and from JSON"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 758a068453da4..b843186b52af1 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.7.0"; - sha256 = "03bp3bpf1zr8srbzxjhppj7pba0h1if9lga7x5nvhlgc6p7799nw"; + version = "0.7.1"; + sha256 = "1vahcr1vjpr1wfkifp8ih3fajz1886zhc3cj643f7s3im7wjzw5j"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time utf8String ]; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index de998c51b93c5..77f1d07bab266 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,23 +1,19 @@ -{ cabal, ansiTerminal, base64Bytestring, blazeHtml, citeprocHs -, Diff, extensibleExceptions, highlightingKate, HTTP, HUnit, json -, mtl, network, pandocTypes, parsec, QuickCheck, random, syb -, tagsoup, temporary, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, texmath, time, utf8String, xml -, zipArchive, zlib +{ cabal, base64Bytestring, blazeHtml, citeprocHs +, extensibleExceptions, highlightingKate, HTTP, json, mtl, network +, pandocTypes, parsec, random, syb, tagsoup, temporary, texmath +, time, utf8String, xml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.0.3"; - sha256 = "1p5054sdvvgl38rr0ajfavr79rwr2l8jdrpzai329ksskkh1acdp"; + version = "1.9.0.5"; + sha256 = "0haszw0khz47k2cfhzz38ia1zznwwmixhaf0jyr6l2gdpfq59b0p"; isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal base64Bytestring blazeHtml citeprocHs Diff - extensibleExceptions highlightingKate HTTP HUnit json mtl network - pandocTypes parsec QuickCheck random syb tagsoup temporary - testFramework testFrameworkHunit testFrameworkQuickcheck2 texmath - time utf8String xml zipArchive zlib + base64Bytestring blazeHtml citeprocHs extensibleExceptions + highlightingKate HTTP json mtl network pandocTypes parsec random + syb tagsoup temporary texmath time utf8String xml zipArchive zlib ]; configureFlags = "-fhighlighting -fthreaded"; meta = { diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index e0ad17c6acbba..6dc4d44ee96c8 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.5"; - sha256 = "18jpn3pyy6dh20xpdlwmhcjvbywjz4vr9fvwcwhylbicrw627ybs"; + version = "0.4.6"; + sha256 = "0p8lf10b5zn2gw5klpjc397q892cydvnl677srj9rk3lhmsm5jjl"; buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; diff --git a/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix b/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix deleted file mode 100644 index 4b920133ffd93..0000000000000 --- a/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname -, random, regexPosix, time, xml -}: - -cabal.mkDerivation (self: { - pname = "test-framework"; - version = "0.4.2.2"; - sha256 = "1lwdx4z9j5wxbmmlakf6knirdhi0ic6xpmhrj9ipa5ybw2zszakr"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - ansiTerminal ansiWlPprint extensibleExceptions hostname random - regexPosix time xml - ]; - meta = { - homepage = "http://batterseapower.github.com/test-framework/"; - description = "Framework for running and organising tests, with HUnit and QuickCheck support"; - 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/development/libraries/haskell/test-framework/0.5.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 6ac60c1df2dd8..6ac60c1df2dd8 100644 --- a/pkgs/development/libraries/haskell/test-framework/0.5.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index b72c5ceee04ec..a1487ddb90384 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.0.1"; - sha256 = "0q39a83g7kcj9qpnjg0v7pd0b4w9i090nl2s9v8lpv4n46z6cyaq"; + version = "0.6.0.2"; + sha256 = "04b642xbbgivbnpc8srqirdf71n5b6h5ir6rw0z2xpiv0znk6vh2"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 9b7f94d1cbd2c..450597c22e10b 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.13.2"; - sha256 = "19k0sa16dr63bgl9j37zrxnknlnq3c2927xccwc2vq19vl7n52nd"; + version = "0.13.2.1"; + sha256 = "0s5jmsrip26ahvz7mzf12m9rcibrk9is3kwbswz87h0sr0k11nbv"; buildDepends = [ stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 647f715d3ce11..ce24888ce1440 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.13.2"; - sha256 = "1kzgqmh0vjm1qcskkfdyjbbq276nhd76w7bgxgdq67zl48bfc09g"; + version = "0.13.2.1"; + sha256 = "0p0d9vxw2pyvnhswsgasdd62hj86w3ixbbsx41wkswzkjjjib9i6"; buildDepends = [ parsec stm time wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 8430c1fa59d1c..b2df725223d75 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.13.1.1"; - sha256 = "00zij92hm7rbl8sx6f625cqzwgi72c8qn1dj6d1q4zg14dszarad"; + version = "0.13.1.2"; + sha256 = "1gn5si6939yizlkf7hzm2a2gff5sa98m7q5q1hz23av98zfa8pv7"; isLibrary = true; isExecutable = true; buildDepends = [ parsec strict time ]; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 1d4f6659475a9..a2240ca327c70 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.0.3.1"; - sha256 = "1j1z797zi5svxyv5ssfx8lyhmzlc2j7iad4b01aw0jvyp3ad4qan"; + version = "0.0.3.2"; + sha256 = "0x78fkjinfhhihhfihr0g5rc4d8jkhza3vw5qsyds74skd6rsy1q"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; diff --git a/pkgs/development/libraries/haskell/json/0.4.4.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index a318cf3c5ee1a..909754db3e7f5 100644 --- a/pkgs/development/libraries/haskell/json/0.4.4.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -1,12 +1,12 @@ -{ cabal, mtl, parsec, syb }: +{ cabal, zlib }: cabal.mkDerivation (self: { - pname = "json"; - version = "0.4.4"; - sha256 = "102qmz55b2mgcca3q1c2pkcr6hz7kmpldad3f6blhmp1cz15f081"; - buildDepends = [ mtl parsec syb ]; + pname = "zlib"; + version = "0.5.3.3"; + sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; + extraLibraries = [ zlib ]; meta = { - description = "Support for serialising Haskell to and from JSON"; + description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 0e44a4773c7a6..e407b75c8bbe3 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "libogg-1.2.2"; + name = "libogg-1.3.0"; src = fetchurl { - url = "http://downloads.xiph.org/releases/ogg/${name}.tar.gz"; - sha256 = "1fngv23r8anbf2f2x7s2bh1isxnw287gbc7mhh9g1m96pis0a05b"; + url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; + sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3"; }; + buildNativeInputs = [ xz ]; + meta = { homepage = http://xiph.org/ogg/; }; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index d5f91c182605c..efb210d657629 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, libogg }: +{ stdenv, fetchurl, libogg, xz }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.2"; + name = "libvorbis-1.3.3"; src = fetchurl { - url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.bz2"; - sha256 = "159khaa9j0pd4fm554m1igzmrhsa3qbh4n8avihfinwym05vc14z"; + url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; + sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43"; }; + buildNativeInputs = [ xz ]; propagatedBuildInputs = [ libogg ]; meta = { diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix new file mode 100644 index 0000000000000..854af5942f908 --- /dev/null +++ b/pkgs/development/libraries/libwebp/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, libpng, libjpeg}: + +stdenv.mkDerivation rec { + name = "libwebp-0.1.3"; + + src = fetchurl { + url = "http://webp.googlecode.com/files/${name}.tar.gz"; + sha256 = "1fkssvg99s9ypswh4ywkirgcy1wmy3b6388f3cqj4a4vwdb89ca0"; + }; + + buildInputs = [ libpng libjpeg ]; + + meta = { + homepage = http://code.google.com/p/webp/; + description = "Tools and library for the WebP image format"; + + /* It has its own licence, google-related, but that looks like BSD */ + license = "free"; + }; +} diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 0c2e13c5615ab..0c490c63411a2 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, zlib}: +{ stdenv, fetchurl, zlib }: -stdenv.mkDerivation { - name = "libzip-0.8"; +stdenv.mkDerivation rec { + name = "libzip-0.10"; src = fetchurl { - url = http://www.nih.at/libzip/libzip-0.8.tar.gz; - sha256 = "0iy04c3b2yfwl9lpgwzm12qkdskbxj8l91r6mgn8f6ib00fj66ss"; + url = "http://www.nih.at/libzip/${name}.tar.gz"; + sha256 = "1lnpxcl4z084bvx3jd0pqgr350ljnizpnlwh5vbzjp0iw9jakbxp"; }; - buildInputs = [zlib]; + propagatedBuildInputs = [ zlib ]; meta = { homepage = http://www.nih.at/libzip; diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix index 5a0ff2b537452..4d6e5411e24c2 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng }: +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "pango-1.29.4"; - src = fetchurl_gnome { - project = "pango"; - major = "1"; minor = "29"; patchlevel = "4"; extension = "xz"; + src = fetchurl { + url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz; sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s"; }; diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix new file mode 100644 index 0000000000000..276b279fc09e4 --- /dev/null +++ b/pkgs/development/libraries/tclap/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "tclap-1.2.1"; + + src = fetchurl { + url = "mirror://sourceforge/tclap/${name}.tar.gz"; + sha256 = "1fzf7l1wvlhxnpwi15jvvfizn836s7r0r8vckgbqk2lyf7ihz7wz"; + }; + + meta = { + homepage = http://tclap.sourceforge.net/; + description = "Templatized C++ Command Line Parser Library"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 56d47812b08af..68215c555b7af 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -4,10 +4,10 @@ assert readline != null; let system = stdenv.system; - arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; + arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; version = "3.6.6.20"; in -assert system == "i686-linux" || system == "x86_64-linux"; +assert arch != ""; stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { cp -v libv8.* $out/lib cp -v d8 $out/bin/d8 cp -vR include $out/ - wrapProgram $out/bin/d8 --set LD_LIBRARY_PATH $out/lib + wrapProgram $out/bin/d8 --set ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} $out/lib ''; } diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 620cb8149a264..7dd3cf61a82c6 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.13.2"; - sha256 = "1q3pzfcgrl9nka1gdl84c4fqc1ql83idlbb8fghqsjp0ijzcxk3s"; + version = "1.13.3"; + sha256 = "1dnz4992hr662ys1lkf6iyqmi2a3bksim8dlryqwd9wx9h24lhq2"; isLibrary = true; isExecutable = true; meta = { diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix new file mode 100644 index 0000000000000..81815500c618f --- /dev/null +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -0,0 +1,20 @@ +{ cabal, happy }: + +cabal.mkDerivation (self: { + pname = "Ebnf2ps"; + version = "1.0.10"; + sha256 = "0xim32bnfapfs53lvmdz2af08rqd15lp5b0rh6yjqm7n1g2061zs"; + isLibrary = false; + isExecutable = true; + buildTools = [ happy ]; + meta = { + homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/"; + description = "Peter's Syntax Diagram Drawing Tool"; + 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/development/tools/parsing/ebnf2ps/default.nix b/pkgs/development/tools/parsing/ebnf2ps/default.nix deleted file mode 100644 index 5abb52566feb1..0000000000000 --- a/pkgs/development/tools/parsing/ebnf2ps/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ cabal, fetchurl, happy }: - -let - pname = "ebnf2ps"; - version = "1.0.8"; -in -cabal.mkDerivation (self: { - inherit pname version; - - src = fetchurl { - url = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/${pname}-${version}.tar.gz"; - sha256 = "1yfgq4nf79g1nyfb0yxqi887kxc04dvwpm1fwrk50bs4xj1vg3wf"; - }; - - buildTools = [ happy ]; - - patches = [ ./modernize.patch ]; - - meta = { - homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/"; - description = "Syntax Diagram Drawing Tool"; - license = "BSD"; - - longDescription = '' - Ebnf2ps generates nice looking syntax diagrams in EPS and FIG - format from EBNF specifications and from yacc, bison, and Happy - input grammars. The diagrams can be immediatedly included in - TeX/LaTeX documents and in texts created with other popular - document preparation systems. - ''; - - platforms = self.stdenv.lib.platforms.linux; - maintainers = [ self.stdenv.lib.maintainers.simons ]; - }; -}) diff --git a/pkgs/development/tools/parsing/ebnf2ps/modernize.patch b/pkgs/development/tools/parsing/ebnf2ps/modernize.patch deleted file mode 100644 index edb5e366d48af..0000000000000 --- a/pkgs/development/tools/parsing/ebnf2ps/modernize.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff --git a/Ebnf2ps.cabal b/Ebnf2ps.cabal -index 483d34a..0a7b96e 100644 ---- a/Ebnf2ps.cabal -+++ b/Ebnf2ps.cabal -@@ -1,66 +1,30 @@ ---- Ebnf2ps.cabal auto-generated by cabal init. For additional options, ---- see ---- http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html#pkg-descr. ---- The name of the package. - Name: Ebnf2ps -- ---- The package version. See the Haskell package versioning policy ---- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for ---- standards guiding when and how versions should be incremented. - Version: 1.0.8 -- ---- A short (one-line) description of the package. --Synopsis: Ebnf2ps: Peter's Syntax Diagram Drawing Tool -- ---- A longer description of the package. ---- Description: -- ---- URL for the project homepage or repository. -+Synopsis: Peter's Syntax Diagram Drawing Tool - Homepage: http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/ -- ---- The license under which the package is released. - License: BSD4 -- ---- The file containing the license text. - -- License-file: LICENSE -- ---- The package author(s). --Author: Peter Thiemann -- ---- An email address to which users can send suggestions, bug reports, ---- and patches. --Maintainer: thiemann@acm.org -- ---- A copyright notice. ---- Copyright: -- -+Author: Peter Thiemann <thiemann@acm.org> -+Maintainer: Peter Thiemann <thiemann@acm.org> - Category: Language -- - Build-type: Simple -- ---- Extra files to be distributed with the package, such as examples or ---- a README. ---- Extra-source-files: -- ---- Constraint on the version of Cabal needed to build this package. - Cabal-version: >=1.2 -- -+Tested-With: GHC == 6.10.4, GHC == 6.12.3, GHC == 7.0.4, GHC == 7.2.2 -+Description: Ebnf2ps generates nice looking syntax diagrams in EPS -+ and FIG format from EBNF specifications and from yacc, -+ bison, and Happy input grammars. The diagrams can be -+ immediatedly included in TeX/LaTeX documents and in -+ texts created with other popular document preparation -+ systems. - - Executable Ebnf2ps -- -- .hs or .lhs file containing the Main module. - Main-is: Ebnf2ps.hs - Hs-source-dirs: src -- -- -- Packages needed in order to build this package. -- Build-depends: base < 4.3 -- , containers < 0.4 -- , haskell98 -- , unix < 2.5 -- -- -- Modules not exported by this package. -- -- Other-modules: -- -- -- Extra tools (e.g. alex, hsc2hs, ...) needed to build the source. -+ Build-depends: base >= 2 && < 5, -+ containers, -+ old-time, -+ directory, -+ unix - Build-tools: happy - Cc-options: -DAFMPATH=/usr/share/texmf-texlive/fonts/afm - -diff --git a/src/Color.hs b/src/Color.hs -index 184e5e6..8786dac 100644 ---- a/src/Color.hs -+++ b/src/Color.hs -@@ -23,7 +23,7 @@ - module Color where - -- (Color (..), lookupColor, showsColor, showsAColor, prepareColors) - --import Char -+import Data.Char - import Numeric - - type Color = (Int, Int, Int) -diff --git a/src/CommandLine.hs b/src/CommandLine.hs -index 50d6546..518b107 100644 ---- a/src/CommandLine.hs -+++ b/src/CommandLine.hs -@@ -1,6 +1,6 @@ - module CommandLine (parse_cmds) where --import System -- -+import System.IO -+import System.Environment - - defaultArgs :: Args - defaultArgs = MkArgs "Times-Roman" 10 "black" "Times-Roman" 10 "black" "white" "black" "Times-Roman" 10 "black" "white" "black" "black" 500 500 30 100 200 "rgb.txt" False False False False True False False False False -diff --git a/src/Ebnf2ps.hs b/src/Ebnf2ps.hs -index 9dc2e4d..6f340cf 100644 ---- a/src/Ebnf2ps.hs -+++ b/src/Ebnf2ps.hs -@@ -25,11 +25,10 @@ import Defaults (afmPathDefault, ebnfInputDefault, rgbPathDefault) - import PathExpansion (expandPath) - import Color - import Info --import IO --import Monad -+import System.Time -+import System.Environment -+import Control.Monad - import Numeric --import System --import Time - - -------------------------------------------------------------------------------- - main :: IO () -diff --git a/src/Ebnf2psParser.hs b/src/Ebnf2psParser.hs -index 4cc7052..0fb4557 100644 ---- a/src/Ebnf2psParser.hs -+++ b/src/Ebnf2psParser.hs -@@ -4,7 +4,7 @@ - module Ebnf2psParser (theEbnfParser, theHappyParser, theYaccParser) where - import AbstractSyntax - import Lexer --import List -+import Data.List - - data HappyAbsSyn - = HappyTerminal Token' -diff --git a/src/EbnfLayout.hs b/src/EbnfLayout.hs -index cd0b4d9..aecc0b4 100644 ---- a/src/EbnfLayout.hs -+++ b/src/EbnfLayout.hs -@@ -25,7 +25,7 @@ import AbstractSyntax - import Color - import Fonts (FONT, stringWidth, stringHeight, fontDescender) - import Info --import List -+import Data.List - - -- all arithmetic is done in 1/100 pt - -diff --git a/src/Fonts.hs b/src/Fonts.hs -index c1639de..ed36a79 100644 ---- a/src/Fonts.hs -+++ b/src/Fonts.hs -@@ -17,7 +17,7 @@ - module Fonts (FONT, makeFont, fontDescender, stringWidth, stringHeight, fontName, fontScale, noFont) - where - --import Char -+import Data.Char - import Numeric - - data FONT = FONT String Int Int (String -> Int) -diff --git a/src/GrammarTransform.hs b/src/GrammarTransform.hs -index 99c3840..65624ab 100644 ---- a/src/GrammarTransform.hs -+++ b/src/GrammarTransform.hs -@@ -13,7 +13,7 @@ module GrammarTransform - where - - import AbstractSyntax --import List -+import Data.List - - - data RInfo -diff --git a/src/GrammarUnfold.hs b/src/GrammarUnfold.hs -index 056119a..d35a630 100644 ---- a/src/GrammarUnfold.hs -+++ b/src/GrammarUnfold.hs -@@ -17,7 +17,7 @@ module GrammarUnfold ( - import AbstractSyntax - import GrammarTransform - import StringMatch (stringMatch) --import List -+import Data.List - - import qualified Data.Map (Map, keys, elems, findWithDefault, fromList) - -diff --git a/src/IOSupplement.hs b/src/IOSupplement.hs -index 3251365..ba666b1 100644 ---- a/src/IOSupplement.hs -+++ b/src/IOSupplement.hs -@@ -29,8 +29,9 @@ - module IOSupplement (getPath, readPathFile, readRGBPathFile) - where - --import System --import IO -+import System.IO -+import System.IO.Error -+import System.Environment - - #ifdef __HBC__ - ioError = fail -diff --git a/src/Lexer.hs b/src/Lexer.hs -index 52f2549..8bf9f82 100644 ---- a/src/Lexer.hs -+++ b/src/Lexer.hs -@@ -3,7 +3,7 @@ module Lexer where - -- Last Modified By: M. Walter - -- - --import Char -+import Data.Char - - ------------------------------------------------------------------------------ - --NOW the lexer -diff --git a/src/PathExpansion.hs b/src/PathExpansion.hs -index 48e27d6..01807e5 100644 ---- a/src/PathExpansion.hs -+++ b/src/PathExpansion.hs -@@ -3,10 +3,11 @@ module PathExpansion (expandPath) - where - - #ifdef __GLASGOW_HASKELL__ --import System --import Directory --import Monad --import IO -+import System.Directory -+import System.Environment -+import Control.Monad -+import System.IO -+import System.IO.Error - import System.Posix.User (getUserEntryForName, homeDirectory) - #endif - -@@ -99,8 +100,8 @@ replaceEnv (x:xs) = do t <- replaceEnv xs - return (x:t) - - getEnv2 t -- |t == "HOME" = catch (getEnv t) (\e -> if IO.isDoesNotExistError e then return ['.'] else ioError e) -- |otherwise = catch (getEnv t) (\e -> if IO.isDoesNotExistError e then return [] else ioError e) -+ |t == "HOME" = catch (getEnv t) (\e -> if isDoesNotExistError e then return ['.'] else ioError e) -+ |otherwise = catch (getEnv t) (\e -> if isDoesNotExistError e then return [] else ioError e) - ------------------------------------------------------- - - ---------------- Teilen nach Doppelpunkt -------------- diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 914b2cc26c3b5..9f48627e39243 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, python, zlib, v8 }: stdenv.mkDerivation rec { - version = "0.6.9"; + version = "0.6.10"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "484ab6b3da6195339544c16aff17f747aa85d1dd15d765d6724aa8a4ecda03ca"; + sha256 = "1mbbb3dy0hh5qahx7aqaj8cny0wm42d00c1m804r81y6afmn1l6i"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index f468b183be956..e2ba47abb9a06 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -1,32 +1,66 @@ -# TODO: some files are not at the right place. -# For now, we take the strategy of adding symlinks to fix this, -# however it is probably better to extract the files from -# the appropriate debian binary packages. +# The firmware bundle as packaged by Debian. This should be "all" firmware that is not shipped +# as part of the kernel itself. +# You can either install the complete bundle, or write a separate package for individual +# devices that copies the firmware from this package. -{stdenv, fetchurl}: +{ stdenv, fetchurl, buildEnv, dpkg }: -stdenv.mkDerivation { - name = "firmware-linux-nonfree-0.34"; +let + version = "0.35"; - src = fetchurl { - url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-nonfree_0.34.tar.gz"; - sha256 = "94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a"; + packages = [ + { name = "linux-nonfree"; sha256 = "8c0701500e5252e3e05ad0e5403cc5295899ccb2d6d731380b5f4c2d90003ed1"; } + { name = "atheros"; sha256 = "df411d76e3d55cb256b0974df16cf18f316c1325f33670fbc9e36abba5aa46c0"; } + { name = "bnx2"; sha256 = "124e74aa6ce477f7b6a0b5eff3870b0104fd885b4bdfb9977175e75bdb9a7525"; } + { name = "bnx2x"; sha256 = "4cbcf3422a9aaa6e31704770c724179765dceabd2e6867e24cf47039925e6545"; } + { name = "brcm80211"; sha256 = "eefba7ba31c018d514ea15878cfd7bca36a65b0df3e9024fc3875a990678a684"; } + { name = "intelwimax"; sha256 = "436a3bd128224f43988630318aa3e74abfbe838916e1e10a602ddc468b75d843"; } + { name = "ipw2x00"; sha256 = "9c214e3a9f7f7d710b5cb30282d5ca2b2ccafc3bb208dfe7e18de16d3aadc7a3"; } + { name = "ivtv"; sha256 = "ced47d8b87ff8ff70a8c32492cc4fb5818860ef018b5c04a4415ab26c9b16300"; } + { name = "iwlwifi"; sha256 = "5d9615ec128b59cc5834e0261ea74127c0bc64bafabdaef1028a8f1acf611568"; } + { name = "libertas"; sha256 = "b109fb5c392928ac5495f8ce1d0f41d123b193031f8b548e8b68e9563db37016"; } + { name = "linux"; sha256 = "8e87f75c120904f2ca5fd9017e4503c23d8705b9ccaeb570374d1747163620ab"; } + { name = "myricom"; sha256 = "4c9e19d8b2cea97eb05f9d577537dba81aa36ac06c6da9bbed0bfa20434b7acc"; } + { name = "netxen"; sha256 = "3bd129229cf548a533c79cb55deefa7e4919e09fcc1f655773f4fa5078d81b9b"; } + { name = "qlogic"; sha256 = "213d098435c657115d2754ef5ead52e64f5fa05be4dcbcb0d5d3ca745376959c"; } + { name = "ralink"; sha256 = "51f3001ed15ca72bb088297b9e6e4a821ba6250f0ccc8886d77d2f5386a21836"; } + { name = "realtek"; sha256 = "a6338f5cd8bbe9627fa994016ebb0a91b40914021bec280ddc8f8a56eab22287"; } + ]; + + fetchPackage = + { name, sha256 }: fetchurl { + url = "mirror://debian/pool/non-free/f/firmware-nonfree/firmware-${name}_${version}_all.deb"; + inherit sha256; }; - - phases = [ "unpackPhase" "patchPhase" "installPhase" "postInstall" ]; - patchPhase = "rm -rf debian defines TODO"; + srcs = map fetchPackage packages; + +in stdenv.mkDerivation { + name = "firmware-linux-nonfree-${version}"; + inherit srcs; + + unpackPhase = '' + ensureDir "./firmware" + ''; - installPhase = "mkdir -p $out && cp -ra * $out/"; + buildPhase = '' + for src in $srcs; do + dpkg-deb -W $src + dpkg-deb -x $src . + done + ''; - # repeat the same trick for radeon, 3com, etc. - postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; + buildInputs = [ dpkg ]; + + installPhase = '' + mkdir -p "$out/" + cp -r lib/firmware/* "$out/" + ''; meta = { - description = "Non-free kernel firmware (packaged by Debian)"; + description = "Binary firmware collection packaged by Debian"; homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; license = "unfree-redistributable-firmware"; - priority = "10"; + priority = 10; # low priority so that other packages can override this big package }; } - diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix index 7016e23581b7a..f06fcb149e866 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { src = firmwareLinuxNonfree; phases = [ "installPhase" ]; - installPhase = "mkdir -p $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin"; + installPhase = '' + mkdir -p $out/rtlwifi + cp "$src/rtlwifi/rtl8192cfw.bin" "$out/rtlwifi/rtl8192cfw.bin" + ''; meta = { description = "Firmware for the Realtek RTL8192c wireless cards"; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index f0dbc1509bdeb..b77f6eb47885c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -214,7 +214,7 @@ in import ./generic.nix ( rec { - version = "3.2.2"; + version = "3.2.4"; testing = false; modDirVersion = version; @@ -225,7 +225,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2"; - sha256 = "9f20bd2332db32e2d5b0fc346762d486faab19e0dd059c82964116421bb7cceb"; + sha256 = "1c648a7041e65a167d3fd8beda484a3d55c35cad9d6d189b9949d3c621887da7"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index d49555e8ba860..6813bd927c8a9 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.5"; in +let version = "9.0.6"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "016mnwpcyla49qr3gglgpyjwnq1ljjbs3q0s8vlfmazfkj0fxn2n"; + sha256 = "317d99d2ff9e1de8da0cae107bc06c9fd455b1df0c0fb77b8fbb61fb08276056"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/tools/filesystems/fuse-zip/default.nix b/pkgs/tools/filesystems/fuse-zip/default.nix new file mode 100644 index 0000000000000..346b11015f46f --- /dev/null +++ b/pkgs/tools/filesystems/fuse-zip/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, fuse, libzip, zlib }: + +stdenv.mkDerivation rec { + name = "fuse-zip-0.2.13"; + + src = fetchurl { + url = "http://fuse-zip.googlecode.com/files/${name}.tar.gz"; + sha1 = "9cfa00e38a59d4e06fd47bfaca75ad5e299ecc6b"; + }; + + buildInputs = [ pkgconfig fuse libzip zlib ]; + + makeFlags = "INSTALLPREFIX=$(out)"; + + meta = { + homepage = http://code.google.com/p/fuse-zip/; + description = "A FUSE-based filesystem that allows read and write access to ZIP files"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch b/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch new file mode 100644 index 0000000000000..e4bb0db3abf81 --- /dev/null +++ b/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch @@ -0,0 +1,25 @@ +From 42d3c4e7e95ea0e0dda9b502b2de2c4ed9ed9467 Mon Sep 17 00:00:00 2001 +From: "T.M. Abraham" <tabraham@novell.com> +Date: Fri, 6 Jan 2012 21:58:55 -0500 +Subject: [PATCH] properly check for HAVE_FALLOC_PH in both occurrences + +--- + nbd-server.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/nbd-server.c b/nbd-server.c +index 0ecf0e8..2cd066d 100644 +--- a/nbd-server.c ++++ b/nbd-server.c +@@ -1461,7 +1461,7 @@ int expflush(CLIENT *client) { + * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM) + */ + int exptrim(struct nbd_request* req, CLIENT* client) { +-#ifdef HAVE_FALLOC_PH ++#if HAVE_FALLOC_PH + FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0); + FILE_INFO cur = prev; + int i = 1; +-- +1.7.8 + diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index ef032eee390ef..af182c9d7e552 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,27 +1,25 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-2.9.24"; + name = "nbd-2.9.25"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "025cqsx6cwbr62javdvm5vx675ai0b1absbx4if1v5pp9hzrpxmq"; + sha256 = "179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4"; }; - buildInputs = [pkgconfig glib]; + patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ]; + + buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional stdenv.isLinux stdenv.glibc.kernelHeaders; + postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; - # The test suite doesn't succeed on Hydra (NixOS), because it assumes - # that certain global configuration files available. + # The test suite doesn't succeed on Hydra. doCheck = false; - # Glib calls `clock_gettime', which is in librt. Since we're using - # a static Glib, we need to pass it explicitly. - NIX_LDFLAGS = "-lrt"; - meta = { homepage = "http://nbd.sourceforge.net"; description = "map arbitrary files as block devices over the network"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee633f94bfd87..122fe50c6fe3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -706,6 +706,8 @@ let fsfs = callPackage ../tools/filesystems/fsfs { }; + fuse_zip = callPackage ../tools/filesystems/fuse-zip { }; + dos2unix = callPackage ../tools/text/dos2unix { }; uni2ascii = callPackage ../tools/text/uni2ascii { }; @@ -3720,32 +3722,15 @@ let gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; - gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - - gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; - - gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { - glib = callPackage ../development/libraries/glib/2.30.x.nix { }; - - glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; + gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; + gtk = pkgs.gtk2; - atk = callPackage ../development/libraries/atk/2.2.x.nix { }; - - atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; - - cairo = callPackage ../development/libraries/cairo { }; - - pango = callPackage ../development/libraries/pango/1.29.x.nix { }; + gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; - gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { }; + pango129 = lowPrio (callPackage ../development/libraries/pango/1.29.x.nix { }); - gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - - # Let hydra build gtk-3.x but do not show this to users yet - recurseForRelease = true; - }; + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { inherit (gnome) gtk; @@ -4237,6 +4222,8 @@ let libvorbis = callPackage ../development/libraries/libvorbis { }; + libwebp = callPackage ../development/libraries/libwebp { }; + libwmf = callPackage ../development/libraries/libwmf { }; libwpd = callPackage ../development/libraries/libwpd { @@ -4683,6 +4670,8 @@ let ## inherit stdenv fetchurl cmake qt4 telepathy_qt; ## }; + tclap = callPackage ../development/libraries/tclap {}; + tcp_wrappers = callPackage ../development/libraries/tcp-wrappers {}; tdb = callPackage ../development/libraries/tdb { }; @@ -6616,7 +6605,8 @@ let djvulibre = callPackage ../applications/misc/djvulibre { }; - djview4 = callPackage ../applications/graphics/djview { }; + djview = callPackage ../applications/graphics/djview { }; + djview4 = pkgs.djview; dmenu = callPackage ../applications/misc/dmenu { }; @@ -6696,6 +6686,8 @@ let cedet = callPackage ../applications/editors/emacs-modes/cedet { }; + calfw = callPackage ../applications/editors/emacs-modes/calfw { }; + cua = callPackage ../applications/editors/emacs-modes/cua { }; ecb = callPackage ../applications/editors/emacs-modes/ecb { }; @@ -6712,6 +6704,8 @@ let # Requires Emacs 23, for `avl-tree'. }; + js2 = callPackage ../applications/editors/emacs-modes/js2 { }; + stratego = callPackage ../applications/editors/emacs-modes/stratego { }; haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; @@ -6855,7 +6849,7 @@ let inherit (gnome) libIDL; }; - firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; }; + firefox11Wrapper = lowPrio (wrapFirefox { browser = firefox11Pkgs.firefox; }); flac = callPackage ../applications/audio/flac { }; @@ -7030,8 +7024,7 @@ let fltk = fltk13; }; - hugin = callPackage ../applications/graphics/hugin { - }; + hugin = callPackage ../applications/graphics/hugin { }; hydrogen = callPackage ../applications/audio/hydrogen { }; @@ -7064,7 +7057,7 @@ let ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML; + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML; gitSupport = false; monotoneSupport = false; extraUtils = []; @@ -7145,6 +7138,7 @@ let libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; + force = getConfig [ "libreoffice" "force" ] false; }; lingot = callPackage ../applications/audio/lingot { @@ -7159,7 +7153,7 @@ let links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/linphone { - inherit (gnome) libglade gtk; + inherit (gnome) libglade; }; lmms = callPackage ../applications/audio/lmms { }; @@ -8127,7 +8121,7 @@ let gnome3 = (import ../desktops/gnome-3 { callPackage = pkgs.newScope pkgs.gnome3; - } // pkgs.gtkLibs3x); + }); gnome = recurseIntoAttrs gnome2; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f29eaeca9e2e8..fd6d412be6af5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm = self.stm_2_2_0_1; # 7.4.1 ok syb = self.syb_0_3_6; # 7.4.1 ok xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok - zlib = self.zlib_0_5_3_1; # 7.4.1 ok + zlib = self.zlib_0_5_3_3; # 7.4.1 ok HTTP = self.HTTP_4000_2_2; # 7.4.1 ok text = self.text_0_11_1_13; # 7.4.1 ok transformers = self.transformers_0_2_2_0; # 7.4.1 ok @@ -632,9 +632,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; }; - DSH = callPackage ../development/libraries/haskell/DSH { - json = self.json_0_5; - }; + DSH = callPackage ../development/libraries/haskell/DSH {}; dstring = callPackage ../development/libraries/haskell/dstring {}; @@ -927,9 +925,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); WebBitsHtml = self.WebBitsHtml_1_0_1; }; - json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {}; - json_0_5 = callPackage ../development/libraries/haskell/json/0.5.nix {}; - json = self.json_0_4_4; + json = callPackage ../development/libraries/haskell/json {}; jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {}; @@ -1061,9 +1057,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {}; pathPieces = self.pathPieces_0_1_0; - pandoc = callPackage ../development/libraries/haskell/pandoc { - testFramework = self.testFramework_0_4_2_2; - }; + pandoc = callPackage ../development/libraries/haskell/pandoc {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; @@ -1327,9 +1321,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); terminfo = callPackage ../development/libraries/haskell/terminfo {}; - testFramework_0_4_2_2 = callPackage ../development/libraries/haskell/test-framework/0.4.2.2.nix {}; - testFramework_0_5 = callPackage ../development/libraries/haskell/test-framework/0.5.nix {}; - testFramework = self.testFramework_0_5; + testFramework = callPackage ../development/libraries/haskell/test-framework {}; testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; @@ -1524,7 +1516,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib = self.zlib_0_5_3_1; + zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { + inherit (pkgs) zlib; + }; + zlib = self.zlib_0_5_3_3; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; @@ -1567,11 +1562,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cpphs = callPackage ../development/tools/misc/cpphs {}; - ebnf2ps = callPackage ../development/tools/parsing/ebnf2ps { - inherit (pkgs) fetchurl; - }; + Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {}; - frown = callPackage ../development/tools/parsing/frown {}; + # 2012-02-09: Disabled because upstream site has disappeared. This tool is clearly + # unmaintained, and we should delete it unless anyone complains. + # frown = callPackage ../development/tools/parsing/frown {}; haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; @@ -1588,7 +1583,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happyMeta = callPackage ../development/tools/haskell/happy-meta {}; - HaRe = callPackage ../development/tools/haskell/HaRe {}; + # 2012-02-09: Disabled because this package is clearly, and it won't compile with + # any recent version of GHC. We should delete it unless anyone + # complains. + # HaRe = callPackage ../development/tools/haskell/HaRe {}; hlint = callPackage ../development/tools/haskell/hlint {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee4f3fa477150..85d50caf86351 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -380,7 +380,7 @@ rec { sha256 = "19iasq94nph33vz4jrk5x6cqd9ivq0db867s524faba8avrrlxz9"; }; buildInputs = [ TestMore TestException TestRequires DBDSQLite ]; - propagatedBuildInputs = + propagatedBuildInputs = [ DBIxClass CatalystRuntime CatalystXComponentTraits Moose MooseXTypes NamespaceAutoclean CarpClan ListMoreUtils TieIxHash TryTiny CatalystDevel DBIxClassSchemaLoader MooseXNonMoose @@ -562,7 +562,7 @@ rec { url = "mirror://cpan/modules/by-module/CatalystX/${name}.tar.gz"; sha256 = "0a2mhfgv0kqmaxf2crs8mqk44lyhd9qcwlpzhrc0b0dh4z503mr4"; }; - propagatedBuildInputs = + propagatedBuildInputs = [ CatalystRuntime MooseXTraitsPluggable NamespaceAutoclean ListMoreUtils ]; }; @@ -1134,7 +1134,7 @@ rec { sha256 = "15k1kgbrsnkwr0ib6cyr114zk904lisy4k09gfiynag9wjhv47lm"; }; buildInputs = [ DBDSQLite TestException TestWarn ]; - propagatedBuildInputs = + propagatedBuildInputs = [ PackageStash ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataCompare DataDumperConcise DataPage HashMerge MROCompat ModuleFind @@ -1169,7 +1169,7 @@ rec { sha256 = "0qrsh6i8p4mpx5bapn40cpsbvnvzivli71gymbiqjd0mjflbsjf6"; }; buildInputs = [ TestException TestMore TestWarn DBDSQLite ]; - propagatedBuildInputs = + propagatedBuildInputs = [ DataDump LinguaENInflectNumber LinguaENInflectPhrase ClassAccessor ClassAccessorGrouped ClassC3Componentised MROCompat CarpClan DBIxClass ClassLoad ClassUnload @@ -1299,8 +1299,8 @@ rec { sha256 = "0z4nl7aizbailraqwkkqhx6k3hdz67wxszjfhd5yg2vn06ybsjwj"; }; buildInputs = [ TestMore ]; - propagatedBuildInputs = - [ CaptureTiny EmailAbstract EmailAddress ListMoreUtils Moose + propagatedBuildInputs = + [ CaptureTiny EmailAbstract EmailAddress ListMoreUtils Moose Throwable TryTiny ]; }; @@ -1389,10 +1389,10 @@ rec { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; sha256 = "0fwhb2cf5x7y87xwml66p624iynf0mzvhy1q4aq5yv7l3lhwhaby"; }; - propagatedBuildInputs = + propagatedBuildInputs = [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta - FileCopyRecursive VersionRequirements ExtUtilsManifest - ]; + FileCopyRecursive VersionRequirements ExtUtilsManifest + ]; }; ExtUtilsManifest = buildPerlPackage rec { @@ -2088,7 +2088,7 @@ rec { sha256 = "1l7sjnibnvgb7a73cjhysmrg4j2bfcn0x5yrqmh0v23laj9fsbbm"; }; buildInputs = [ TestMore ]; - propagatedBuildInputs = + propagatedBuildInputs = [ LinguaENInflect LinguaENInflectNumber LinguaENTagger ]; }; @@ -2415,7 +2415,7 @@ rec { sha256 = "0gv79bsnacrzwpac3dll64zj40qcsbp4kdk8yr9z5bwim7nkvnv3"; }; buildInputs =[ TestException ]; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassMOP Moose NamespaceAutoclean ListMoreUtils ]; }; @@ -3012,7 +3012,7 @@ rec { sha256 = "12abz50zz51s1f5hvs5xl6smb369sjid1zyjkfygkiglqp4an0kr"; }; buildInputs = [ TestDeep TestException TestWarn ]; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; }; @@ -3117,7 +3117,7 @@ rec { url = "mirror://cpan/modules/by-module/String/${name}.tar.gz"; sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm"; }; - propagatedBuildInputs = + propagatedBuildInputs = [ LinguaENInflectPhrase TextUnidecode NamespaceClean ]; }; @@ -3940,4 +3940,12 @@ rec { }; }; + YAMLLibYAML = buildPerlPackage rec { + name = "YAML-LibYAML-0.38"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/YAML/${name}.tar.gz"; + sha256 = "eb98f304d14f6557b07adfa24da16e00cfa54a9d9484b6e898e35f919c5eb7ba"; + }; + }; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e8cf9553d92b..dd5c4d6e6726c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -759,10 +759,10 @@ let pythonPackages = python.modules // rec { matplotlib = buildPythonPackage ( rec { - name = "matplotlib-1.0.1"; + name = "matplotlib-1.1.0"; src = fetchurl { url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; - sha256 = "1xksjix227n9hm6jnhlwkdf1yf1zgz18665cisqk8grv6xvn7g43"; + sha256 = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7"; }; doCheck = false; |