From c52bd0c8d8ae3676d2803f695e73668dffbfcd63 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 12 Mar 2013 23:43:37 +0400 Subject: [PATCH 01/92] viewnior: Add viewnior, GTK image viewer program --- .../graphics/viewnior/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/graphics/viewnior/default.nix diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix new file mode 100644 index 000000000000..99e1ec1c169b --- /dev/null +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, gtk2, libpng, exiv2, lcms +, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}: + +stdenv.mkDerivation rec { + name = "viewnior-1.3"; + + src = fetchurl { + url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz"; + sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10"; + }; + + buildInputs = + [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext + shared_mime_info glib gdk_pixbuf perl + ]; + + meta = { + description = "Viewnior is a fast and simple image viewer for GNU/Linux"; + longDescription = + '' Viewnior is insipred by big projects like Eye of Gnome, because of it's + usability and richness,and by GPicView, because of it's lightweight design and + minimal interface. So here comes Viewnior - small and light, with no compromise + with the quality of it's functions. The program is made with better integration + in mind (follows Gnome HIG2). + ''; + + license = "GPLv3"; + + homepage = http://xsisqox.github.com/Viewnior; + + maintainers = [ stdenv.lib.maintainers.smironov ]; + + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e574aed4f1de..8ec20e317b77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9047,6 +9047,8 @@ let vice = callPackage ../misc/emulators/vice { }; + viewnior = callPackage ../applications/graphics/viewnior { }; + vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { inherit (gnome) libsoup; webkit = webkit_gtk2; From 33379ae58af46771de25acfb22fb3bd9c146802c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 14 Mar 2013 13:50:29 +0000 Subject: [PATCH 02/92] cmus: update to 2.5.0 This version builds with current ffmpeg. CUE support is nice too. --- pkgs/applications/audio/cmus/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 1bfb2df2745c..2ea37e2bd237 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "cmus-${version}"; - version = "2.3.3"; + version = "2.5.0"; + + src = fetchurl { + url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2"; + sha256 = "1pwd3jifv12yr0yr77hsv5c9y8ay6kn2b5a3s5i8v2c882vgl890"; + }; configurePhase = "./configure prefix=$out"; buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ]; - src = fetchurl { - url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2"; - sha256 = "13hc5d7h2ayjwnip345hc59rpjj9fgrp1i5spjw3s14prdqr733v"; - }; - meta = { description = "cmus is a small, fast and powerful console music player for Linux and *BSD"; homepage = http://cmus.sourceforge.net; From 27e2fb68956bb2c0b5e55dc6311abc600ecf26b1 Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Fri, 15 Mar 2013 12:41:01 +0100 Subject: [PATCH 03/92] Upgrade to 1.0.0 --- pkgs/development/tools/ocaml/opam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 0a0dd4e6fe22..c36d0004992a 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -27,13 +27,13 @@ let sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; }; opam = fetchurl { - url = "https://github.com/OCamlPro/opam/archive/0.9.5.zip"; - sha256 = "2ec706330a3283b4d057abc562c6078351988d0ae98ad507fe51cae598b43afd"; + url = "https://github.com/OCamlPro/opam/archive/1.0.0.zip"; + sha256 = "f8d94a91c2b8d110fa5e3b0a87c512a860acbae110654498a164c5c888c40bda"; }; }; in stdenv.mkDerivation rec { - name = "opam-0.9.5"; + name = "opam-1.0.0"; buildInputs = [unzip curl ncurses ocaml]; From 4dbdbda37f3570c33feeff36ce2078c73ed00fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Mar 2013 00:58:35 +0100 Subject: [PATCH 04/92] Adding storebrowse, a tool to browse the nix store with a web browser. The build script is a bit long due to the upstream go style of things. --- pkgs/tools/system/storebrowse/default.nix | 42 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/system/storebrowse/default.nix diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix new file mode 100644 index 000000000000..622afaee9884 --- /dev/null +++ b/pkgs/tools/system/storebrowse/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, fetchhg, go, sqlite}: + +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); + +stdenv.mkDerivation rec { + name = "storebrowser-20130315233902"; + + src = fetchurl { + url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-f87547f083bfb75b.tar.gz?uuid=f87546f083bfb75b"; + name = "${name}.tar.gz"; + sha256 = "1c9al500wril7bq25smi9m7byfdf33arzyb8px5w8a2dv2cyl20w"; + }; + + srcGoSqlite = fetchhg { + url = "https://code.google.com/p/gosqlite/"; + tag = "5baefb109e18"; + sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk"; + }; + + buildPhase = '' + PATH=${go}/bin:$PATH + mkdir $TMPDIR/go + export GOPATH=$TMPDIR/go + + GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite + mkdir -p $GOSQLITE + cp -R $srcGoSqlite/* $GOSQLITE/ + export CGO_CFLAGS=-I${sqlite}/include + export CGO_LDFLAGS=-L${sqlite}/lib + go build -ldflags "-r ${sqlite}/lib" -o storebrowse + ''; + + installPhase = '' + ensureDir $out/bin + cp storebrowse $out/bin + ''; + + meta = { + homepage = http://viric.name/cgi-bin/storebrowse; + license = "AGPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b7623a97e94..896d9ee99c90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1565,6 +1565,8 @@ let inherit (gnome) libgnomeui scrollkeeper; }; + storebrowse = callPackage ../tools/system/storebrowse { }; + fusesmb = callPackage ../tools/filesystems/fusesmb { }; socat = callPackage ../tools/networking/socat { }; From 6ee91a03048e97e3ae73b5f2856f06ded138e857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Mar 2013 01:40:47 +0100 Subject: [PATCH 05/92] storebrowse: update Easier to launch, dramatic improvement printing of the URL where to browse. --- pkgs/tools/system/storebrowse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 622afaee9884..2bbbd1e20348 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -3,12 +3,12 @@ assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); stdenv.mkDerivation rec { - name = "storebrowser-20130315233902"; + name = "storebrowser-20130316003957"; src = fetchurl { - url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-f87547f083bfb75b.tar.gz?uuid=f87546f083bfb75b"; + url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-16700f4ad9e88.tar.gz?uuid=16700f4ad9e88"; name = "${name}.tar.gz"; - sha256 = "1c9al500wril7bq25smi9m7byfdf33arzyb8px5w8a2dv2cyl20w"; + sha256 = "1wwzdraszja8sapa666akm8fkg53aj8ka5yn2hkq6dmbim5wjnaq"; }; srcGoSqlite = fetchhg { From 5bffa00f18c98ed6c4352e767d2a0b636f31a16e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Mar 2013 01:42:49 +0100 Subject: [PATCH 06/92] storbrowse: fix name --- pkgs/tools/system/storebrowse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 2bbbd1e20348..3863aa3429e9 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -3,7 +3,7 @@ assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); stdenv.mkDerivation rec { - name = "storebrowser-20130316003957"; + name = "storebrowse-20130316003957"; src = fetchurl { url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-16700f4ad9e88.tar.gz?uuid=16700f4ad9e88"; From b5b4a4a5cfdb40198c483ed52ca1f648983200c7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 16 Mar 2013 10:51:03 +0400 Subject: [PATCH 07/92] Linux 3.8: update to 3.8.3 --- pkgs/os-specific/linux/kernel/linux-3.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 9aaa2e80aab6..87421b1900d2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -251,7 +251,7 @@ in import ./generic.nix ( rec { - version = "3.8.2"; + version = "3.8.3"; testing = false; preConfigure = '' @@ -260,7 +260,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1i7r89ba79x6irr95gq1b0cnkbmdz3llh72vdamn83s3zh6cy1fv"; + sha256 = "15jdsnsswpah8936xmq6r1jpfsp1kbq643i4l0bgc6n749f512ig"; }; config = configWithPlatform stdenv.platform; From 924be9b524f009ecb987368f93d7a9cdad07683d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 16 Mar 2013 08:34:14 +0100 Subject: [PATCH 08/92] Wicd: #379 Also add the gtk-2.0 directory in pygobject to the PYTHONPATH --- pkgs/tools/networking/wicd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index d63711e12ac8..6cacfc14ffc8 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in ''; From 6922ec9258740b56569b470278caaa9d205bde4c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 16 Mar 2013 16:26:20 +0400 Subject: [PATCH 09/92] Linux-3.9-rc2 --- pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index cd21d6943965..4b3f5d444e3a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -251,7 +251,7 @@ in import ./generic.nix ( rec { - version = "3.9-rc1"; + version = "3.9-rc2"; modDirVersion = "3.9.0-rc1"; testing = true; @@ -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 = "1bm4fdk1v3dlhcqrzwzrf6fscvq7p7493f5ld5lbspaw8vb08690"; + sha256 = "1aan14n6sw43qk9kpmdrpcakb1398kj2djqca8cvijc8g76973in"; }; config = configWithPlatform stdenv.platform; From 8d76cf51bb635e238d6371fc304d701e2dece3d7 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 15 Mar 2013 11:50:09 +0100 Subject: [PATCH 10/92] elinks: allow building without guile Guile doesn't build on armv5tel now (failing an important test), so better if I can disable it for elinks. --- .../networking/browsers/elinks/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 9334ff4bd41b..1618042364e8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl -, spidermonkey, guile, gpm }: +, spidermonkey, gpm +, enableGuile ? true, guile ? null }: + +assert enableGuile -> guile != null; stdenv.mkDerivation rec { name = "elinks-0.12pre5"; @@ -11,14 +14,15 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ]; + buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + ++ stdenv.lib.optional enableGuile guile; configureFlags = '' - --enable-finger --enable-html-highlight --with-guile + --enable-finger --enable-html-highlight --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent --enable-nntp --with-openssl=${openssl} - ''; + '' + stdenv.lib.optionalString enableGuile " --with-guile"; crossAttrs = { propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; From 4e5b7cd5d1dc6c4af752f894566dff7a43ac7d1c Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 16 Mar 2013 14:59:35 +0100 Subject: [PATCH 11/92] Add cloc-1.58 --- pkgs/tools/misc/cloc/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/cloc/default.nix diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix new file mode 100644 index 000000000000..dfe5476f8130 --- /dev/null +++ b/pkgs/tools/misc/cloc/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, perl, AlgorithmDiff, RegexpCommon }: + +stdenv.mkDerivation rec { + + name = "cloc-${version}"; + + version = "1.58"; + + src = fetchurl { + url = "mirror://sourceforge/cloc/cloc-${version}.tar.gz"; + sha256 = "1k92jldy4m717lh1xd6yachx3l2hhpx76qhj1ipnx12hsxw1zc8w"; + }; + + buildInputs = [ perl AlgorithmDiff RegexpCommon ]; + + unpackPhase = '' + mkdir ${name} + tar xf $src -C ${name} + cd ${name} + ''; + + makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ]; + + meta = { + description = "A program that counts lines of source code"; + homepage = http://cloc.sourceforge.net; + license = stdenv.lib.licenses.gpl2; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 896d9ee99c90..4afdd3f49903 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -587,6 +587,10 @@ let clamav = callPackage ../tools/security/clamav { }; + cloc = callPackage ../tools/misc/cloc { + inherit (perlPackages) perl AlgorithmDiff RegexpCommon; + }; + cloog = callPackage ../development/libraries/cloog { }; cloogppl = callPackage ../development/libraries/cloog-ppl { }; From 47ca534deb502a8ddf50ca25014525787480492e Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 16 Mar 2013 15:14:29 +0100 Subject: [PATCH 12/92] Add haskell-netwire --- .../libraries/haskell/netwire/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/netwire/default.nix diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix new file mode 100644 index 000000000000..d7ab9539e0c8 --- /dev/null +++ b/pkgs/development/libraries/haskell/netwire/default.nix @@ -0,0 +1,18 @@ +{ cabal, bifunctors, deepseq, liftedBase, monadControl, mtl +, profunctors, random, semigroups, tagged, time, vectorSpace +}: + +cabal.mkDerivation (self: { + pname = "netwire"; + version = "4.0.7"; + sha256 = "035jz7j19c7n4za9xi8vj6yl9m2b2v6d53mp711gf8609wv0cx0c"; + buildDepends = [ + bifunctors deepseq liftedBase monadControl mtl profunctors random + semigroups tagged time vectorSpace + ]; + meta = { + description = "Flexible wire arrows for FRP"; + 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 4ffd314f3c99..1ca8d0b14c45 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1318,6 +1318,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {}; + netwire = callPackage ../development/libraries/haskell/netwire {}; + network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; From c9ffddb9d7aaaef27d02a9562774cde09e5842f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Mar 2013 15:15:20 +0100 Subject: [PATCH 13/92] storebrowse: newer version --- pkgs/tools/system/storebrowse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 3863aa3429e9..905818a59df2 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -3,12 +3,12 @@ assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); stdenv.mkDerivation rec { - name = "storebrowse-20130316003957"; + name = "storebrowse-20130316140138"; src = fetchurl { - url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-16700f4ad9e88.tar.gz?uuid=16700f4ad9e88"; + url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-881990147c.tar.gz?uuid=881990147c"; name = "${name}.tar.gz"; - sha256 = "1wwzdraszja8sapa666akm8fkg53aj8ka5yn2hkq6dmbim5wjnaq"; + sha256 = "183b6gz7xv88c94i9mgmjslsdn75v5vsbchl19kjv7mbrxfx5mvl"; }; srcGoSqlite = fetchhg { From 4873645bef130a11524eadcddd28ea8e2da39c20 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 16 Mar 2013 15:24:09 +0100 Subject: [PATCH 14/92] Add haskell-cereal-conduit --- .../libraries/haskell/cereal-conduit/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cereal-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix new file mode 100644 index 000000000000..8637724e11a4 --- /dev/null +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, cereal, conduit, transformers, HUnit }: + +cabal.mkDerivation (self: { + pname = "cereal-conduit"; + version = "0.7"; + sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix"; + buildDepends = [ cereal conduit transformers HUnit ]; + meta = { + homepage = "https://github.com/litherum/cereal-conduit"; + description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; + 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 4ffd314f3c99..765ad5b6cca4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -583,6 +583,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cereal = callPackage ../development/libraries/haskell/cereal {}; + cerealConduit = callPackage ../development/libraries/haskell/cereal-conduit {}; + certificate = callPackage ../development/libraries/haskell/certificate {}; cgi_3001_1_7_1 = callPackage ../development/libraries/haskell/cgi/3001.1.7.1.nix {}; From 8082dd3753e98b260a2aaa2553560fe7fae6e08c Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 16 Mar 2013 15:33:16 +0100 Subject: [PATCH 15/92] Add haskell-stm-conduit This adds the dependency haskell-stm-chans as well. --- .../libraries/haskell/stm-chans/default.nix | 14 ++++++++++++++ .../libraries/haskell/stm-conduit/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stm-chans/default.nix create mode 100644 pkgs/development/libraries/haskell/stm-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix new file mode 100644 index 000000000000..74e121e5af99 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm-chans/default.nix @@ -0,0 +1,14 @@ +{ cabal, stm }: + +cabal.mkDerivation (self: { + pname = "stm-chans"; + version = "1.3.1"; + sha256 = "15agd0d3r3zmya72hpi9pkmzqw7mj6l84946dhds0hsb6d12r6qj"; + buildDepends = [ stm ]; + meta = { + homepage = "http://code.haskell.org/~wren/"; + description = "Additional types of channels for STM"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix new file mode 100644 index 000000000000..e6c1d64857df --- /dev/null +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, conduit, resourcet, stm, stmChans, transformers, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: + +cabal.mkDerivation (self: { + pname = "stm-conduit"; + version = "1.0.0"; + sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v"; + buildDepends = [ + conduit resourcet stm stmChans transformers HUnit QuickCheck + testFramework testFrameworkHunit testFrameworkQuickcheck2 + ]; + meta = { + homepage = "https://github.com/wowus/stm-conduit"; + description = "Introduces conduits to channels, and promotes using conduits concurrently"; + 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 4ffd314f3c99..52d331af75a8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1687,6 +1687,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {}; stm = self.stm_2_4_2; + stmChans = callPackage ../development/libraries/haskell/stm-chans {}; + + stmConduit = callPackage ../development/libraries/haskell/stm-conduit {}; + storableComplex = callPackage ../development/libraries/haskell/storable-complex {}; storableRecord = callPackage ../development/libraries/haskell/storable-record {}; From 2b07e1bf4ca680cc9142156e5ac72571284bb147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 16 Mar 2013 16:33:16 +0100 Subject: [PATCH 16/92] Ardour3: update to the release of Ardour 3.0 A tarball is only available to subscribers or people who pay to download it on the site. This project is GPL licensed but users are strongly encouraged to support it financially --- pkgs/applications/audio/ardour/ardour3.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 8a5a65f8ed09..13990ec49e1b 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, alsaLib, aubio, boost, cairomm, curl, fftw +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw , fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile @@ -6,17 +6,17 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - # Ardour 3 RC2 - rev = "14092"; + # Ardour 3.0 tag + rev = "79db9422"; in stdenv.mkDerivation { - name = "ardour3-svn-${rev}"; + name = "ardour3"; - src = fetchsvn { - url = http://subversion.ardour.org/svn/ardour2/branches/3.0; + src = fetchgit { + url = git://git.ardour.org/ardour/ardour.git; inherit rev; - sha256 = "1zyy74z3xcsdhrzw4g6y1qm1ai2fl3bgabscl0wn7m1kkscr9nzg"; + sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096"; }; buildInputs = From 82f947c78a0de94c72abee4f9bb2706a14169bac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 16 Mar 2013 16:56:19 +0100 Subject: [PATCH 17/92] runLaTeX: Fix dependency detection Since Nix 1.4, expressions like "${path}/blabla" always evaluate to a string rather than a path. However, findLaTeXIncludes depended on the old (weird) behaviour, leading to errors like: error: string `/nix/store/4c32q75in74m1148anlzdhb8jpppab0s-bla/IEEEtran.cls' cannot refer to other paths So use path concatenation instead. --- pkgs/tools/typesetting/tex/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 9ae567e635b7..223f72c67855 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -66,7 +66,7 @@ rec { else if dep.type == "tex" then [".tex" ""] else [""]; fn = pkgs.lib.findFirst (fn: builtins.pathExists fn) null - (map (ext: "${dirOf key}/${dep.name}${ext}") exts); + (map (ext: dirOf key + ("/" + dep.name + ext)) exts); in if fn != null then [{key = fn;}] ++ xs else xs; @@ -90,8 +90,8 @@ rec { { src = key; } "${pkgs.stdenv.bash}/bin/bash ${./find-lhs2tex-includes.sh}"); - in pkgs.lib.concatMap (x : if builtins.pathExists x then [{key = x;}] else []) - (map (x : "${dirOf key}/${x}") deps); + in pkgs.lib.concatMap (x: if builtins.pathExists x then [{key = x;}] else []) + (map (x: dirOf key + ("/" + x)) deps); }; dot2pdf = From dd25120e8ebcd19b002391a16c031131b49d9f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Mar 2013 20:40:04 +0100 Subject: [PATCH 18/92] gcc34: fix build on i686 --- pkgs/development/compilers/gcc/3.4/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix index 6cadf58d2ce6..1595b7f336fe 100644 --- a/pkgs/development/compilers/gcc/3.4/default.nix +++ b/pkgs/development/compilers/gcc/3.4/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation { md5 = "4a21ac777d4b5617283ce488b808da7b"; }; - patches = if noSysDirs then [./no-sys-dirs.patch] else []; + patches = stdenv.lib.optional noSysDirs ./no-sys-dirs.patch; + + # inspiration: https://aur.archlinux.org/packages/g77/ + postPatch = '' + substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t + ''; inherit noSysDirs profiledCompiler; From 198d4fbe41930ec4e0075bf1c5cb3a200e2d94c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Mar 2013 20:59:46 +0100 Subject: [PATCH 19/92] gcc33: fix build by --disable-multilib --- pkgs/development/compilers/gcc/3.3/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/3.3/builder.sh b/pkgs/development/compilers/gcc/3.3/builder.sh index 5b80215cffb5..12e35f88b945 100644 --- a/pkgs/development/compilers/gcc/3.3/builder.sh +++ b/pkgs/development/compilers/gcc/3.3/builder.sh @@ -35,7 +35,7 @@ EOF cd ../build configureScript=../$sourceRoot/configure - configureFlags="--enable-languages=$langs" + configureFlags="--enable-languages=$langs --disable-multilib" } From 8acaea6d5717866133ad00e3f6f05ef7b84be176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Mar 2013 21:08:57 +0100 Subject: [PATCH 20/92] gcc33: fix build on i686 --- pkgs/development/compilers/gcc/3.3/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/3.3/default.nix b/pkgs/development/compilers/gcc/3.3/default.nix index 9aa9e27ac6f7..23501489925a 100644 --- a/pkgs/development/compilers/gcc/3.3/default.nix +++ b/pkgs/development/compilers/gcc/3.3/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation { url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2; md5 = "6936616a967da5a0b46f1e7424a06414"; }; - + + # inspiration: https://aur.archlinux.org/packages/g77/ + postPatch = '' + substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t + ''; + inherit noSysDirs langC langCC langFortran; meta = { From 16972d2415af915ed1aaa9e20dfc352f5486a0fc Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 17 Mar 2013 12:24:49 +0000 Subject: [PATCH 21/92] screen: fix some annoying bugs by importing patches from ArchLinux --- pkgs/tools/misc/screen/default.nix | 3 ++ .../screen/screen-4.0.3-caption-colors.patch | 25 ++++++++++++++++ .../misc/screen/screen-4.0.3-long-term.patch | 29 +++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch create mode 100644 pkgs/tools/misc/screen/screen-4.0.3-long-term.patch diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 2a5256761926..2a3f53d67417 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q"; }; + patches = [ ./screen-4.0.3-caption-colors.patch + ./screen-4.0.3-long-term.patch ]; + preConfigure = '' configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc" sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in diff --git a/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch b/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch new file mode 100644 index 000000000000..14365dc81c1b --- /dev/null +++ b/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch @@ -0,0 +1,25 @@ +# Source: +# https://projects.archlinux.org/svntogit/packages.git/plain/screen/trunk/screen-4.0.3-caption-colors.patch +# modified by hand for nixpkgs + +From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001 +From: Sadrul Habib Chowdhury +Date: Tue, 26 Jan 2010 20:17:26 +0000 +Subject: Accommodate more color changes in the caption. + +--- +diff --git a/src/screen.c b/src/screen.c +index b1c3dfb..2cceae0 100644 +--- a/screen.c ++++ b/screen.c +@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; + #endif + + static char winmsg_buf[MAXSTR]; +-#define MAX_WINMSG_REND 16 /* rendition changes */ ++#define MAX_WINMSG_REND 256 /* rendition changes */ + static int winmsg_rend[MAX_WINMSG_REND]; + static int winmsg_rendpos[MAX_WINMSG_REND]; + static int winmsg_numrend; +-- +cgit v0.8.3.4 diff --git a/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch b/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch new file mode 100644 index 000000000000..f94f9da8ac4a --- /dev/null +++ b/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch @@ -0,0 +1,29 @@ +# Source: +# https://projects.archlinux.org/svntogit/packages.git/plain/screen/trunk/screen-4.0.3-long-term.patch + +# This fixes long terminal names handling, e.g. TERM=rxvt-unicode-256colors works +# as expected. +diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h +--- screen-4.0.3-orig//display.h 2003-07-02 00:01:42.000000000 +1000 ++++ screen-4.0.3/display.h 2010-12-03 20:19:23.826671689 +1000 +@@ -85,7 +85,7 @@ + struct win *d_other; /* pointer to other window */ + int d_nonblock; /* -1 don't block if obufmax reached */ + /* >0: block after nonblock secs */ +- char d_termname[20 + 1]; /* $TERM */ ++ char d_termname[40 + 1]; /* $TERM */ + char *d_tentry; /* buffer for tgetstr */ + char d_tcinited; /* termcap inited flag */ + int d_width, d_height; /* width/height of the screen */ +diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h +--- screen-4.0.3-orig//screen.h 2003-08-22 22:28:43.000000000 +1000 ++++ screen-4.0.3/screen.h 2010-12-03 20:19:43.163338333 +1000 +@@ -202,7 +202,7 @@ + char preselect[20]; + int esc; /* his new escape character unless -1 */ + int meta_esc; /* his new meta esc character unless -1 */ +- char envterm[20 + 1]; /* terminal type */ ++ char envterm[40 + 1]; /* terminal type */ + int encoding; /* encoding of display */ + } + attach; From 16f6c3b752f8e951237cb62eef750566197b15e5 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 17 Mar 2013 14:45:37 +0100 Subject: [PATCH 22/92] i3: update to 4.5 also updating i3status to 2.7 --- pkgs/applications/window-managers/i3/default.nix | 12 ++++++------ pkgs/applications/window-managers/i3/status.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 94ac84f838c2..f8e4e16655aa 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison, - xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex, +{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, + xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, libXcursor, coreutils, perl }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr"; + sha256 = "1kiffcbvvjljqchw9ffgy9s8f9z06i8805jvjas58q5i2yxl5kcy"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm - libstartup_notification libX11 pcre libev yajl flex libXcursor perl ]; + buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm + libstartup_notification libX11 pcre libev yajl libXcursor perl ]; patchPhase = '' sed -i -e '/^# Pango/,/^$/d' common.mk diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 60db6188f70c..76fc487ba4ab 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "i3status-2.6"; + name = "i3status-2.7"; src = fetchurl { url = "http://i3wm.org/i3status/${name}.tar.bz2"; - sha256 = "e7e710cc271887bcd22757269e1b00a5618fb53abdb3455140116b3d38797bce"; + sha256 = "0cm6fhsc7hzsqni8pwhjl2l0rfd458paabn54cgzqnmwwdflwgq7"; }; buildInputs = [ confuse yajl alsaLib wirelesstools ]; From 464fd741cd3744d308339941569fd738da072157 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 17 Mar 2013 15:13:53 +0100 Subject: [PATCH 23/92] notmuch: update to 0.15.2 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 147d5f491517..1477cd82cf44 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.15"; + name = "notmuch-0.15.2"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q"; + sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; From 44ec42ed93ee533cc2984d3db8f2f6366fe2b562 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 17 Mar 2013 15:15:56 +0100 Subject: [PATCH 24/92] pythonPackages.alot: update to 0.3.4 (and stable revision) --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 877d2d3ed7c2..7d5d885ca9d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -124,13 +124,13 @@ pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - rev = "c765ebd6041a845a800cc9fd30705102ae2d040f"; - name = "alot-0.3.3_${rev}"; + rev = "d3c1880a60ddd8ded397d92cddf310a948b97fdc"; + name = "alot-0.3.4_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "0yyp3nz5n1zfwf0l4rkkphq5l6prd988b57ighnmi2samzqa9yv4"; + sha256 = "049fzxs83zry5xr3al5wjvh7bcjq63wilf9wxh2c6sjmg96kpvvl"; }; # error: invalid command 'test' From cdcfc953bfe07256313b313464bfbb2b66e82263 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 17 Mar 2013 15:17:20 +0100 Subject: [PATCH 25/92] pythonPackages.httplib2: update to 0.8 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d5d885ca9d1..bdda69591b7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1321,11 +1321,11 @@ pythonPackages = python.modules // rec { }); httplib2 = buildPythonPackage rec { - name = "httplib2-0.7.7"; + name = "httplib2-0.8"; src = fetchurl { url = "http://httplib2.googlecode.com/files/${name}.tar.gz"; - sha256 = "2e2ce18092c32d1ec54f8a447e14e33585e30f240b883bfeeca65f12b3bcfaf6"; + sha256 = "0gww8axb4j1vysbk9kfsk5vrws9a403gh30dxchmga8hrg1rns5g"; }; meta = { From cad8f4b0f6111609ed8ba1fc75fc918db7225600 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 17 Mar 2013 15:23:56 +0100 Subject: [PATCH 26/92] pythonPackage.flake8: update to 2.0 flake8 is not depending on pyflakes, mccabe, pep8 which were also updated or added. --- pkgs/top-level/python-packages.nix | 65 +++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdda69591b7a..52fd1c92bb02 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1049,17 +1049,18 @@ pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.7.0"; + name = "flake8-2.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "a7830d1a6c23e889bc1fcaa4a87f53bd"; + md5 = "176c6b3613777122721db181560aa1e3"; }; buildInputs = [ nose ]; + propagatedBuildInputs = [ pyflakes pep8 mccabe ]; # 3 failing tests - doCheck = false; + #doCheck = false; meta = { description = "code checking using pep8 and pyflakes."; @@ -1651,6 +1652,25 @@ pythonPackages = python.modules // rec { }); + mccabe = buildPythonPackage (rec { + name = "mccabe-0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz"; + md5 = "c1012c7c24081471f45aab864d4e3805"; + }; + + buildInputs = [ ]; + + meta = { + description = "McCabe checker, plugin for flake8"; + homepage = "https://github.com/flintwork/mccabe"; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; + }); + + mechanize = buildPythonPackage (rec { name = "mechanize-0.1.11"; @@ -2183,17 +2203,32 @@ pythonPackages = python.modules // rec { pep8 = buildPythonPackage rec { name = "pep8-${version}"; - version = "1.3.3"; + version = "1.4.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz"; - md5 = "093a99ced0cc3b58c01549d7350f5a73"; + md5 = "055dbd22ac5669232fdba752612e9686"; }; + #====================================================================== + #FAIL: test_check_simple (testsuite.test_shell.ShellTestCase) + #---------------------------------------------------------------------- + #Traceback (most recent call last): + # File "/tmp/nix-build-python-pep8-1.4.5.drv-0/pep8-1.4.5/testsuite/test_shell.py", line 84, in test_check_simple + # self.assertTrue(config_filename.endswith('tox.ini')) + #AssertionError: False is not true + # + #---------------------------------------------------------------------- + #Ran 21 tests in 0.711s + # + #FAILED (failures=1) + doCheck = false; + meta = { - homepage = http://pypi.python.org/pypi/pep8/; + homepage = "http://pep8.readthedocs.org/"; description = "Python style guide checker"; license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -2530,6 +2565,24 @@ pythonPackages = python.modules // rec { }; }; + pyflakes = buildPythonPackage rec { + name = "pyflakes-0.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz"; + md5 = "00debd2280b962e915dfee552a675915"; + }; + + buildInputs = [ unittest2 ]; + + meta = { + homepage = "https://launchpad.net/pyflakes"; + description = "A simple program which checks Python source files for errors."; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; + }; + pyglet = buildPythonPackage rec { name = "pyglet-1.1.4"; From 4ec3035a04fbbb6e5922cf81ea6374b3f92f46d4 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sun, 17 Mar 2013 15:24:45 +0100 Subject: [PATCH 27/92] pythonPackage.turses: update to 0.2.13 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52fd1c92bb02..86ea190ee28c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3694,11 +3694,11 @@ pythonPackages = python.modules // rec { turses = buildPythonPackage (rec { - name = "turses-0.2.12"; + name = "turses-0.2.13"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "016fw2ch1gy3rrlfjsdpd6y11mkrbjw4h84h7954k2vhc84l1gm0"; + sha256 = "0sygm40z04zifcfqwby8wwwnj3i1bpl41r7xgnjcipxwirjmnp2k"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; From e8ab3a7549fd01d0e16ee12de2c1cb45b53fb406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Mar 2013 21:17:12 +0100 Subject: [PATCH 28/92] octave: removing texlive dependency I saw I added it, but I can't remember why, and now I don't see what is it for. It gets into octave closure, so it's a bit annoying for its size. --- pkgs/development/interpreters/octave/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index b545fe8b55f2..c19a7a48616e 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl + graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl fftw fftwSinglePrec qrupdate ]; doCheck = true; From 8c5eaf18407a7da82bd4323067b846e2c2e8499f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Mar 2013 22:05:14 +0100 Subject: [PATCH 29/92] octave: update to 3.6.4 --- pkgs/development/interpreters/octave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index c19a7a48616e..73f13c11a7db 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -3,10 +3,10 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, fftw, fftwSinglePrec, zlib, curl, qrupdate }: stdenv.mkDerivation rec { - name = "octave-3.6.3"; + name = "octave-3.6.4"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "11i82vyf514rvdqcgdanw0ppvag8lcm6198rars0dd0w1xahjzg3"; + sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 From 51528e61d9d8ebdc3f5f577409f92c053a9032a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Mar 2013 22:27:55 +0100 Subject: [PATCH 30/92] transmission: update to 2.77, but leave the old 2.60 for its gtk client The gtk client in 2.61 and above require a gtk3 we don't have in nixpkgs yet. --- .../networking/p2p/transmission/2.60.nix | 41 +++++++++++++++++++ .../networking/p2p/transmission/default.nix | 13 ++++-- pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/p2p/transmission/2.60.nix diff --git a/pkgs/applications/networking/p2p/transmission/2.60.nix b/pkgs/applications/networking/p2p/transmission/2.60.nix new file mode 100644 index 000000000000..c59fddf6364b --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission/2.60.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, + file, inotifyTools, gtk ? null }: + +stdenv.mkDerivation rec { + name = "transmission-2.60"; # transmission >= 2.61 requires gtk3 + + src = fetchurl { + url = "http://download.transmissionbt.com/files/${name}.tar.xz"; + sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4"; + }; + + buildInputs = [ pkgconfig openssl curl intltool libevent + file inotifyTools gtk ]; + + preConfigure = '' + sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure + ''; + + postInstall = '' + rm -f $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = { + description = "A fast, easy and free BitTorrent client"; + longDescription = '' + Transmission is a BitTorrent client which features a simple interface + on top of a cross-platform back-end. + Feature spotlight: + * Uses fewer resources than other clients + * Native Mac, GTK+ and Qt GUI clients + * Daemon ideal for servers, embedded systems, and headless use + * All these can be remote controlled by Web and Terminal clients + * Bluetack (PeerGuardian) blocklists with automatic updates + * Full encryption, DHT, and PEX support + ''; + homepage = http://www.transmissionbt.com/; + license = [ "GPLv2" ]; + maintainers = [ stdenv.lib.maintainers.astsmtl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index c59fddf6364b..14ec49c4e8da 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, - file, inotifyTools, gtk ? null }: +{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent +, file, inotifyTools +, enableGtk ? false, gtk ? null }: + +assert enableGtk -> gtk != null; stdenv.mkDerivation rec { - name = "transmission-2.60"; # transmission >= 2.61 requires gtk3 + name = "transmission-2.77"; # transmission >= 2.61 requires gtk3 src = fetchurl { url = "http://download.transmissionbt.com/files/${name}.tar.xz"; - sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4"; + sha256 = "1phzhj4wds6r2ziclva1b5l6l9xjsx5ji7s3m4xia44aq4znbcam"; }; buildInputs = [ pkgconfig openssl curl intltool libevent @@ -16,6 +19,8 @@ stdenv.mkDerivation rec { sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure ''; + configureFlags = stdenv.lib.optional enableGtk "--with-gtk"; + postInstall = '' rm -f $out/share/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59923c85b43..ba6f934f01e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7860,6 +7860,9 @@ let wrapPython = pythonPackages.wrapPython; }; + # This builds the gtk client + transmission_260 = callPackage ../applications/networking/p2p/transmission/2.60.nix { }; + transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; From 470a015950e62ce62d27992ca9908473714285b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Mar 2013 22:30:42 +0100 Subject: [PATCH 31/92] transmission: nicer about disabling gtk --- pkgs/applications/networking/p2p/transmission/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 14ec49c4e8da..2c6106d13040 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -13,13 +13,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig openssl curl intltool libevent - file inotifyTools gtk ]; + file inotifyTools ] + ++ stdenv.lib.optional enableGtk gtk; preConfigure = '' sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure ''; - configureFlags = stdenv.lib.optional enableGtk "--with-gtk"; + configureFlags = stdenv.lib.optionalString enableGtk "--with-gtk"; postInstall = '' rm -f $out/share/icons/hicolor/icon-theme.cache From 4fcb4a1ca1c8d7589db35978dcb385dbbbd2351b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 11:36:16 +0100 Subject: [PATCH 32/92] gv: update to version 3.7.4 --- pkgs/applications/misc/gv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 7a02100b2cb9..70e810bb8d7b 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, Xaw3d, ghostscriptX, perl }: let - name = "gv-3.7.3"; + name = "gv-3.7.4"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://gnu/gv/${name}.tar.gz"; - sha256 = "ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b"; + sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; buildInputs = [ Xaw3d ghostscriptX perl ]; From 8e9ff8e1ab25fcfc347f3e38a3ac39bf9835ad20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 11:37:46 +0100 Subject: [PATCH 33/92] cppi: update to version 1.18 --- pkgs/development/tools/misc/cppi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 0ae8b8c76c5f..f9246df9e567 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "cppi-1.16"; + name = "cppi-1.18"; src = fetchurl { url = "mirror://gnu/cppi/${name}.tar.xz"; - sha256 = "16i4j80wam7p189xc9i2ijrcgjn684296rym6ja3nlqv8rv90lm8"; + sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j"; }; doCheck = true; From 26a39d2dbc360aed0ca8064025fece350035b942 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 11:45:44 +0100 Subject: [PATCH 34/92] haskell-monad-par: update to version 0.3.4.1 --- .../libraries/haskell/monad-par/{0.3.4.nix => 0.3.4.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/monad-par/{0.3.4.nix => 0.3.4.1.nix} (90%) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix similarity index 90% rename from pkgs/development/libraries/haskell/monad-par/0.3.4.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix index 342bea47f6b1..3fc819542eb4 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4"; - sha256 = "1j1xskd8smpfi2dpiwnpwakw0hs0i2yn1lrs9l06wz4b148hwc4k"; + version = "0.3.4.1"; + sha256 = "0v0gnxzv49zvmgm2cb20dlb8m7mn4chpwrc61g4zp69nabjpwwm8"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4ffd314f3c99..45e0b723d5ca 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1258,8 +1258,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.nix {}; - monadPar = self.monadPar_0_3_4; + monadPar_0_3_4_1 = callPackage ../development/libraries/haskell/monad-par/0.3.4.1.nix {}; + monadPar = self.monadPar_0_3_4_1; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; From 852350301f7435d1324d314e0bba14d8c25a1dbe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 11:46:01 +0100 Subject: [PATCH 35/92] haskell-mmorph: add version 1.0.0 --- .../libraries/haskell/mmorph/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/mmorph/default.nix diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix new file mode 100644 index 000000000000..c4379499fad9 --- /dev/null +++ b/pkgs/development/libraries/haskell/mmorph/default.nix @@ -0,0 +1,13 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "mmorph"; + version = "1.0.0"; + sha256 = "10r8frcn6ar56n1vxy8rkys8j52f8xkqan8qxqanka1150k6khqk"; + buildDepends = [ transformers ]; + meta = { + description = "Monad morphisms"; + 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 45e0b723d5ca..336fd15a0d95 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1275,6 +1275,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mongoDB = callPackage ../development/libraries/haskell/mongoDB {}; + mmorph = callPackage ../development/libraries/haskell/mmorph {}; + mpppc = callPackage ../development/libraries/haskell/mpppc {}; mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {}; From f642dcd638f7ac0da74286c3d14a19444e483ed3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 11:50:03 +0100 Subject: [PATCH 36/92] haskell-OpenGL: add version 2.8.0.0 --- .../libraries/haskell/OpenGL/2.8.0.0.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix new file mode 100644 index 000000000000..72183c86192c --- /dev/null +++ b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix @@ -0,0 +1,16 @@ +{ cabal, GLURaw, libX11, mesa, OpenGLRaw }: + +cabal.mkDerivation (self: { + pname = "OpenGL"; + version = "2.8.0.0"; + sha256 = "1wb5772dhh4a81ks9zxz8adpfxa97hcna9s263h9cl2vny6ksxff"; + buildDepends = [ GLURaw OpenGLRaw ]; + extraLibraries = [ libX11 mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A binding for the OpenGL graphics system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 336fd15a0d95..ecd7fc44ec62 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_1_2; # 7.6 ok - OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok + OpenGL = self.OpenGL_2_8_0_0; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok QuickCheck = self.QuickCheck_2_6; # 7.6 ok @@ -1370,7 +1370,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {}; OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; - OpenGL = self.OpenGL_2_6_0_1; + OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; + OpenGL = self.OpenGL_2_8_0_0; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; From 07bbcaf29eb9875f3655a4ee1e3365f970524730 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 11:50:22 +0100 Subject: [PATCH 37/92] haskell-GLUT: add version 2.4.0.0 --- .../libraries/haskell/GLUT/2.4.0.0.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 7 +++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix new file mode 100644 index 000000000000..a7a7e7f371ad --- /dev/null +++ b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix @@ -0,0 +1,18 @@ +{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL +, OpenGLRaw +}: + +cabal.mkDerivation (self: { + pname = "GLUT"; + version = "2.4.0.0"; + sha256 = "1g6bnj2p9hj6c04pmkjwlw9brp7rrva1fyylr2q2dbfz4kbz438h"; + buildDepends = [ OpenGL OpenGLRaw ]; + extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A binding for the OpenGL Utility Toolkit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ecd7fc44ec62..17e74fe6eff5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -135,7 +135,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); async = self.async_2_0_1_4; # 7.6 ok cgi = self.cgi_3001_1_8_3; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok - GLUT = self.GLUT_2_3_1_0; # 7.6 ok + GLUT = self.GLUT_2_4_0_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok HTTP = self.HTTP_4000_2_8; # 7.6 ok @@ -924,7 +924,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { OpenGL = self.OpenGL_2_6_0_1; }; - GLUT = self.GLUT_2_3_1_0; + GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { + OpenGL = self.OpenGL_2_8_0_0; + }; + GLUT = self.GLUT_2_4_0_0; gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; From da3b05204b03ebdeb9a3915fd26d0a0ea3ae752c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:03 +0100 Subject: [PATCH 38/92] haskell-Boolean: update to version 0.2 --- pkgs/development/libraries/haskell/Boolean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index 4503c0fec548..bc8e9dca159c 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "Boolean"; - version = "0.1.2"; - sha256 = "07mhg9zf98hlm7qq9gdbrq68a8rpvdby1jwmgrvf3nv2k47dimx6"; + version = "0.2"; + sha256 = "1r8qvsfbfjfp453pdy9ci9w584ad9bm4xv0ynx4b1yny34ag3zr3"; meta = { - description = "Generalized booleans"; + description = "Generalized booleans and numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From c435b3447160e0eb9bf73cd61b63a30aa3696ead Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:03 +0100 Subject: [PATCH 39/92] haskell-HStringTemplate: update to version 0.7.1 --- .../development/libraries/haskell/HStringTemplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 3011f3a44466..6f96bbbcb7f4 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.7.0"; - sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai"; + version = "0.7.1"; + sha256 = "0hqc1496xazihlww8j90m1cwzj7cihqbfjdly9s8kjf8d5my64ld"; buildDepends = [ blazeBuilder deepseq filepath mtl parsec syb text time utf8String void From 2eaec021cce6c15857a39bcbe24ff4ae48e34ce7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:03 +0100 Subject: [PATCH 40/92] haskell-classy-prelude: update to version 0.5.4 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 4d0f5441e414..e105726540b8 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.5.3"; - sha256 = "0xlhdxkxvrzj9y8wdl2f1pz94zz2gfa9vfbia9prhr7skirxvsad"; + version = "0.5.4"; + sha256 = "1p30f1inp0kj2dsvqnxaplxl83kd8bv41jmszvbdbf3vijjpk6kr"; buildDepends = [ basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector From ba21dc51bc963ec669a4a88faad07460a96a1015 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:03 +0100 Subject: [PATCH 41/92] haskell-conduit: update to version 1.0.4 --- pkgs/development/libraries/haskell/conduit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 8614b24bacca..8bfb77a8706d 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,13 +1,13 @@ -{ cabal, doctest, hspec, liftedBase, monadControl, QuickCheck -, resourcet, text, transformers, transformersBase, void +{ cabal, doctest, hspec, liftedBase, mmorph, monadControl +, QuickCheck, resourcet, text, transformers, transformersBase, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.3"; - sha256 = "1jvbm5v25h1m5a9gd0f417mhpabp3kcfzsjm8887gcyimp2d0z07"; + version = "1.0.4"; + sha256 = "1y97wc273i3qvq4nqp9kr3bgl8mca257hv92f3lbq2wzqkr5vahk"; buildDepends = [ - liftedBase monadControl resourcet text transformers + liftedBase mmorph monadControl resourcet text transformers transformersBase void ]; testDepends = [ From 872f114a4f8d4c69c29c2c782b3a7ff6bf8b97fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 42/92] haskell-doctest: update to version 0.9.5.1 --- pkgs/development/libraries/haskell/doctest/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index ce418a8d053f..63298ebaf7ef 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.5"; - sha256 = "073q56gyhkb7r4f94b9nx341dkmgapy8gig7f668jkghv2zci5ws"; + version = "0.9.5.1"; + sha256 = "0phakf605pdwp89y522wm17n1bflxlgqkgahklnf10wnywxwm7cs"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; @@ -13,7 +13,6 @@ cabal.mkDerivation (self: { baseCompat deepseq filepath ghcPaths hspec HUnit QuickCheck setenv silently stringbuilder syb transformers ]; - jailbreak = true; doCheck = false; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; From 68ac128d2d8a1ddac3973fd9297a31e6134c2d5f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 43/92] haskell-ghc-mod: update to version 1.12.3 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 3e86d440d5d3..f12f789ea991 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.12.2"; - sha256 = "0kwf1szw26iz4sw2slv10birpngf1cfy9jzmllzr0nvybh1pv7a9"; + version = "1.12.3"; + sha256 = "1dc919xbq7aqvpayqh9czvpzz4w4j082d1fjv0n9b7i4a780xghv"; isLibrary = false; isExecutable = true; buildDepends = [ From faba47220461377035cf1b112b4c72773fe3fab6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 44/92] haskell-hS3: update to version 0.5.7 --- pkgs/development/libraries/haskell/hS3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix index 9c4c9681b5f0..83ee2c810ebd 100644 --- a/pkgs/development/libraries/haskell/hS3/default.nix +++ b/pkgs/development/libraries/haskell/hS3/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hS3"; - version = "0.5.6"; - sha256 = "1cd6dzvhfkfp0lzw8lwfcr0wn8wqi2hm8pgb5idp4vg4z00yf2zc"; + version = "0.5.7"; + sha256 = "1p5p6vwazqi5kpi3i0msbgcdf6flp25b2v1an6lvj7y8dx1pk6f2"; isLibrary = true; isExecutable = true; buildDepends = [ From bcba4c0829d55b3d581d7bc86e0b6cc0f773cccb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 45/92] haskell-hamlet: update to version 1.1.6.4 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 7b61aee26dfa..489c38e86f8d 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 = "1.1.6.3"; - sha256 = "1kpj8j47licmdf364n0fn5908hsl6ib1wkiqhcx3m0nimb7pjnss"; + version = "1.1.6.4"; + sha256 = "1cjv32sajwq9lhgh3a8xb0z6j89121k8ndp6g21lmbdzc9fhpws0"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From c1cc7cfd00682814cbefab656ce3d2e093b54660 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 46/92] haskell-hspec-meta: update to version 1.4.5 --- pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index c86db3bf0d72..5f3ca918b0a9 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.4.4"; - sha256 = "1p1miiaa38rd92bz695znlwd6wyvs8zpp2idyw5pkzvhqi8w10a1"; + version = "1.4.5"; + sha256 = "0k50vwzg3ka4727bj63y4gsvw4g80gnalj31rsbvj3afl9gikkk7"; isLibrary = true; isExecutable = true; buildDepends = [ From 76ffb599df8baad9a5b4dfb496bd9b0971a74a66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 47/92] haskell-hspec: update to version 1.4.5 --- pkgs/development/libraries/haskell/hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 949874bfa910..4161cf8bc03b 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.4.4"; - sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r"; + version = "1.4.5"; + sha256 = "1dfwc1gjsawafi6k19hsw4kd5ahp8a9hdkyrm7nhjp4kjzgd2ymf"; isLibrary = true; isExecutable = true; buildDepends = [ From fff5c6f0a0bf1abf5421d96f3d04f7c4c62af059 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 48/92] haskell-http-conduit: update to version 1.9.2.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 715d5ce7dba2..e4ffe2482f55 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.2.1"; - sha256 = "1zzw9gdljn7pmp0d6k051gp1wiw9412c3gdbpwbpng6m5jhk079i"; + version = "1.9.2.2"; + sha256 = "16njcgdnzs2la5xvs1pqs3zcjyzqlk3yfis89h9x7qg2w8hq8pxf"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault From 9d7344d8aa42a458617199e9937baafed40d4481 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 49/92] haskell-pandoc: update to version 1.11.1 --- pkgs/development/libraries/haskell/pandoc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 184e3fd9536d..f81fb4e56d9e 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.11"; - sha256 = "1v32z6fmfkllwf5y64sjbk3ckss2kfcs71b64a7fjdhp82m4i4yh"; + version = "1.11.1"; + sha256 = "0b23vrgkm1csykx1zrldkg5ka816j6m7a5fhs4cxffalifq91c7b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -24,7 +24,6 @@ cabal.mkDerivation (self: { testFrameworkQuickcheck2 text ]; configureFlags = "-fblaze_html_0_5"; - patchPhase = "sed -i -e 's|QuickCheck >= 2.4 && < 2.6,|QuickCheck,|' pandoc.cabal"; doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc"; From a36ecf090c24fb71b3b820b6fbbb88ee142a584e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 50/92] haskell-persistent-template: update to version 1.1.3 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 8cdc7caafc9b..ae2245f73c99 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.1.2.5"; - sha256 = "142b02ini1b5c566rzhykv45n4byzvhp9r6yyavy4zyvgdj7ligj"; + version = "1.1.3"; + sha256 = "1jvr71qfjv2f4vx4xbz78x5a325zkdpg2qvcbglizz10xwrm5j9d"; buildDepends = [ aeson monadControl persistent text transformers ]; testDepends = [ aeson hspec persistent QuickCheck text ]; meta = { From b76ede07c9dc11d0188ddfc7060575df0a9a8ab2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 51/92] haskell-resourcet: update to version 0.4.7 --- pkgs/development/libraries/haskell/resourcet/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index f0dde62ef979..dc4ff618e164 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -1,13 +1,13 @@ -{ cabal, hspec, liftedBase, monadControl, mtl, transformers +{ cabal, hspec, liftedBase, mmorph, monadControl, mtl, transformers , transformersBase }: cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.5"; - sha256 = "1i2n0y4ridlzi2fn319f8jg1whb10gajgyvbz0rx2mwxj15bbgni"; + version = "0.4.7"; + sha256 = "0cmh9hhiy0qksigm2rvycyaw58r8357fl6xhv8x465ykw1va0by8"; buildDepends = [ - liftedBase monadControl mtl transformers transformersBase + liftedBase mmorph monadControl mtl transformers transformersBase ]; testDepends = [ hspec liftedBase transformers ]; meta = { From 944f2263118645524fc4e8875e3c7287c9726533 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 52/92] haskell-shake: update to version 0.10.1 --- pkgs/development/libraries/haskell/shake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index dd4f985e6183..a3c6d69af869 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.9.1"; - sha256 = "19jpnf7794ii1v0rfafmcrs71flwz6hmz72ng529ll12iy64xwkv"; + version = "0.10.1"; + sha256 = "0k8hk5aw5xk4aq7g8yjlkn1rjhcdy3jd5mna9phjs23kmfsmayk6"; isLibrary = true; isExecutable = true; buildDepends = [ From a5c4b2e236bbc029326d02c0e30565a4161eee4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:04 +0100 Subject: [PATCH 53/92] haskell-tagged: update to version 0.4.5 --- pkgs/development/libraries/haskell/tagged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index e435671fe227..2489f5650924 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.4.4"; - sha256 = "0bc88q33pyz4sx429awhxmnjzvmsg7vwwsqi2w7yf8lrmz5ph08x"; + version = "0.4.5"; + sha256 = "1ipj7ff2ya3r3w39clcrxs766hm568lj2kb2kd3npg87jj05wgv0"; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; From 4f347dc96d2dbb6b5a5659923b8620191c3d34e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:05 +0100 Subject: [PATCH 54/92] haskell-uu-parsinglib: update to version 2.7.4.3 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index d9477f4233da..f011aa725d35 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.4.2"; - sha256 = "10ddm6x9km3lzs9ahqpsl9krvslsn9glimwzq4hspgsp6izd1dmq"; + version = "2.7.4.3"; + sha256 = "0q907gfxia7i63wc1p0zfmp102f5xpanhrq5pa259mp1nwqq6lyg"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; From db5a48aebc8e1f8ebe24d49da8a0a02e4487ae55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:05 +0100 Subject: [PATCH 55/92] haskell-wai-test: update to version 1.3.0.5 --- pkgs/development/libraries/haskell/wai-test/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 9995cd6b9770..423f738fbfbf 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,14 +1,15 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, cookie, httpTypes, HUnit, text, transformers, wai +, conduit, cookie, httpTypes, HUnit, network, text, transformers +, wai }: cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0.4"; - sha256 = "1si54frsn8s8r0ykqc9h571rqbapf82jcvbz8bd49bbylv4j6yy0"; + version = "1.3.0.5"; + sha256 = "0v0x1sk7q36xy8syinc96y1jsyjvw6756cich4hxq86l2jfbgccw"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie - httpTypes HUnit text transformers wai + httpTypes HUnit network text transformers wai ]; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; From ac022ec7af3f7240652d7737f0b0827ccec9a745 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:02:43 +0100 Subject: [PATCH 56/92] smartmontools: update to version 6.1 (using latest drivedb.h revision 3797 from trunk) --- pkgs/tools/system/smartmontools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 1e310ce6c43e..909b0d832f78 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -2,17 +2,17 @@ let driverdb = fetchurl { - url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3781"; - sha256 = "0m39ji2kf80dsws5ksg2pmkpn8x00lrlvl5nlc6ldjfss7sjvc9x"; + url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3797"; + sha256 = "01ycm3vffxpfvfga9vp1d38jy3lqpkpxnxf78pidc8q1nn8bpdyz"; name = "smartmontools-drivedb.h"; }; in stdenv.mkDerivation rec { - name = "smartmontools-6.0"; + name = "smartmontools-6.1"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6"; + sha256 = "01yfv6hqsqandg6x8mnwa4g42hhqvc7dfxnfb3v849n8rj5kn059"; }; patchPhase = '' From 21a7031e3e03806db00404cf740927201bafdc85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Mar 2013 12:15:30 +0100 Subject: [PATCH 57/92] haskell-vty-ui: jailbreak to fix build with recent versions of QuickCheck --- pkgs/development/libraries/haskell/vty-ui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index 5d0c9ffd91a8..3b38db8c1de4 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ filepath mtl QuickCheck random regexBase stm text time vector vty ]; + jailbreak = true; meta = { homepage = "http://jtdaugherty.github.com/vty-ui/"; description = "An interactive terminal user interface library for Vty"; From 36054d4e3c71334bd80d7e5bf8500d74761cb675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Mar 2013 12:20:43 +0100 Subject: [PATCH 58/92] podofo: update 0.9.1 to 0.9.2 --- pkgs/development/libraries/podofo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 6b79482c330e..243a792f6b9c 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -2,10 +2,10 @@ openssl, libpng, lua5}: stdenv.mkDerivation rec { - name = "podofo-0.9.1"; + name = "podofo-0.9.2"; src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; - sha256 = "0icpxh1l1dpviq2zwy764dhg8y03zwyf4pgw4s7kb165nvh9v5kv"; + sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6"; }; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; nativeBuildInputs = [ cmake ]; From 1e1b6ee733eb19b41bfc205bd88093418075e2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Mar 2013 12:21:00 +0100 Subject: [PATCH 59/92] iputils: update 20101006 to 20121221 Still without manpages! I don't know where to get SGML tools. --- pkgs/os-specific/linux/iputils/default.nix | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index a50aefaec97d..a2717bbe3785 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchurl, libsysfs, openssl }: +{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap }: assert stdenv ? glibc; -stdenv.mkDerivation { - name = "iputils-20101006"; +let + time = "20121221"; +in +stdenv.mkDerivation rec { + name = "iputils-${time}"; src = fetchurl { - url = http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2; - sha256 = "1rvfvdnmzlmgy9a6xv5v4n785zmn10v2l7yaq83rdfgbh1ng8fpx"; + url = "http://www.skbuff.net/iputils/iputils-s${time}.tar.bz2"; + sha256 = "17riqp8dh8dvx32zv3hyrghpxz6xnxa6vai9b4yc485nqngm83s5"; }; - buildInputs = [ libsysfs openssl ]; + buildInputs = [ libsysfs gnutls openssl libcap ]; - # Urgh, it uses Make's `-l' dependency "feature". - makeFlags = "VPATH=${libsysfs}/lib:${stdenv.glibc}/lib:${openssl}/lib"; + buildFlags = "all ninfod"; installPhase = '' - mkdir -p $out/sbin - cp -p arping ping ping6 rdisc tracepath tracepath6 traceroute6 $out/sbin/ + mkdir -p $out/sbin $out/bin + cp -p ping ping6 tracepath tracepath6 traceroute6 $out/bin/ + cp -p clockdiff arping rdisc ninfod/ninfod $out/sbin/ ''; meta = { From 7c071ade78b5d84bf8c8b24c845688e4d0e71cb6 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Mon, 18 Mar 2013 13:29:00 +0100 Subject: [PATCH 60/92] Add haskell-authenticate-oauth --- .../haskell/authenticate-oauth/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/authenticate-oauth/default.nix diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix new file mode 100644 index 000000000000..67acd7b08695 --- /dev/null +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -0,0 +1,21 @@ +{ cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit +, conduit, cryptoPubkeyTypes, dataDefault, httpConduit, httpTypes +, monadControl, random, resourcet, RSA, SHA, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "authenticate-oauth"; + version = "1.4.0.5"; + sha256 = "0yic95glkc0j35sdq04z5n2607ch0k64vyi3y0kfji31qzd3d44x"; + buildDepends = [ + base64Bytestring blazeBuilder blazeBuilderConduit conduit + cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl + random resourcet RSA SHA time transformers + ]; + meta = { + homepage = "http://github.com/yesodweb/authenticate"; + description = "Library to authenticate with OAuth for Haskell web applications"; + 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 4a7d22891459..5e87b46cab4b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -489,6 +489,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); authenticate = callPackage ../development/libraries/haskell/authenticate {}; + authenticateOauth = callPackage ../development/libraries/haskell/authenticate-oauth {}; + base16Bytestring = callPackage ../development/libraries/haskell/base16-bytestring {}; base64String = callPackage ../development/libraries/haskell/base64-string {}; From ec99c8625b81a1cafaf9ded2c71395cbcc0fa081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Mar 2013 13:56:51 +0100 Subject: [PATCH 61/92] openjade: making it build It wants an older perl. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61a81193a99e..604fad0228e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1283,7 +1283,9 @@ let opendkim = callPackage ../development/libraries/opendkim { }; - openjade = callPackage ../tools/text/sgml/openjade { }; + openjade = callPackage ../tools/text/sgml/openjade { + perl = perl510; + }; openobex = callPackage ../tools/bluetooth/openobex { }; From 4ef33e7a670a69d19a01af670cab6c01a51e4044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Mar 2013 15:04:28 +0100 Subject: [PATCH 62/92] perlPackages: add SGMLSpm Required by iputils to create the manpages. --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1110bd14e426..d31a572eea1c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4179,6 +4179,14 @@ rec { }; }; + SGMLSpm = buildPerlPackage { + name = "SGMLSpm-1.1"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz; + sha256 = "1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m"; + }; + }; + Socket6 = buildPerlPackage rec { name = "Socket6-0.23"; src = fetchurl { From 4ae71ad19d3931488464985d1073817770fbdfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Mar 2013 15:05:08 +0100 Subject: [PATCH 63/92] Adding the sgml dtd for docbook 3.1 Required by iputils manpages. --- .../sgml+xml/schemas/sgml-dtd/docbook/3.1.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix diff --git a/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix new file mode 100644 index 000000000000..6f29c78eca69 --- /dev/null +++ b/pkgs/data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, unzip }: + +let + + src = fetchurl { + url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip; + sha256 = "0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0"; + }; + + isoents = fetchurl { + url = http://www.oasis-open.org/cover/ISOEnts.zip; + sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"; + }; + +in + +stdenv.mkDerivation { + name = "docbook-sgml-3.1"; + + unpackPhase = "true"; + + buildInputs = [ unzip ]; + + installPhase = + '' + o=$out/sgml/dtd/docbook-3.1 + mkdir -p $o + cd $o + unzip ${src} + unzip ${isoents} + sed -e "s/iso-/ISO/" -e "s/.gml//" -i docbook.cat + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 604fad0228e2..618b423b1608 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5749,7 +5749,10 @@ let iproute = callPackage ../os-specific/linux/iproute { }; - iputils = callPackage ../os-specific/linux/iputils { }; + iputils = callPackage ../os-specific/linux/iputils { + sp = spCompat; + inherit (perlPackages) SGMLSpm; + }; iptables = callPackage ../os-specific/linux/iptables { }; @@ -6433,6 +6436,8 @@ let docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; + docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { }; + docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { }; docbook_xml_dtd_412 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix { }; From d711dcc070ac80074db96ab8cf744955489ec68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Mar 2013 15:05:53 +0100 Subject: [PATCH 64/92] Adding setup-hook for opensp, to set the sgml catalog files This sets the SGML_CATALOG_FILES, similar to how libxml2 does the same with XML_CATALOG_FILES. I based the hook on the libxml2 one, and I followed the instructions about this variable here: http://docbook.sourceforge.net/release/dsssl/1.79/doc/install.html --- pkgs/tools/text/sgml/opensp/compat.nix | 6 +++++- pkgs/tools/text/sgml/opensp/default.nix | 2 ++ pkgs/tools/text/sgml/opensp/setup-hook.sh | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/text/sgml/opensp/setup-hook.sh diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix index 8e521da20848..3e9d9152d36a 100644 --- a/pkgs/tools/text/sgml/opensp/compat.nix +++ b/pkgs/tools/text/sgml/opensp/compat.nix @@ -3,13 +3,17 @@ stdenv.mkDerivation { name = "sp-compat-${builtins.substring 7 100 opensp.name}"; - buildCommand = '' + phases = [ "fixupPhase" "installPhase" ]; + + installPhase = '' mkdir -pv $out/bin for i in ${opensp}/bin/o*; do ln -sv $i $out/bin/''${i#${opensp}/bin/o} done ''; + setupHook = opensp.setupHook; + meta.description = "Compatibility wrapper for old programs looking for original sp programs"; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 76efbd0b1af6..e30567000dd1 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation { docsrc/*.xml ''; + setupHook = ./setup-hook.sh; + buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ]; meta = { diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/tools/text/sgml/opensp/setup-hook.sh new file mode 100644 index 000000000000..2c9142da1016 --- /dev/null +++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh @@ -0,0 +1,22 @@ +addSGMLCatalogs () { + if test -d $1/sgml/dtd; then + for i in $(find $1/sgml/dtd -name docbook.cat); do + export SGML_CATALOG_FILES="${SGML_CATALOG_FILES:+:}$i" + done + fi +} + +if test -z "$sgmlHookDone"; then + sgmlHookDone=1 + + # Set http_proxy and ftp_proxy to a invalid host to prevent + # xmllint and xsltproc from trying to download DTDs from the + # network even when --nonet is not given. That would be impure. + # (Note that .invalid is a reserved domain guaranteed not to + # work.) + export http_proxy=http://nodtd.invalid/ + export ftp_proxy=http://nodtd.invalid/ + + export SGML_CATALOG_FILES + envHooks=(${envHooks[@]} addSGMLCatalogs) +fi From 0236cc5d8826e3429fe8eb5e8b2851f68dfdad16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Mar 2013 15:07:03 +0100 Subject: [PATCH 65/92] iputils: build and install the manpages --- pkgs/os-specific/linux/iputils/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index a2717bbe3785..76b328d9c0d8 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap }: +{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap, sp, docbook_sgml_dtd_31 +, SGMLSpm }: assert stdenv ? glibc; @@ -13,15 +14,28 @@ stdenv.mkDerivation rec { sha256 = "17riqp8dh8dvx32zv3hyrghpxz6xnxa6vai9b4yc485nqngm83s5"; }; - buildInputs = [ libsysfs gnutls openssl libcap ]; + prePatch = '' + sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile + ''; - buildFlags = "all ninfod"; + buildInputs = [ libsysfs gnutls openssl libcap sp docbook_sgml_dtd_31 SGMLSpm ]; + + buildFlags = "man all ninfod"; + + # Stdenv doesn't handle symlinks well for that + dontGzipMan = true; installPhase = '' mkdir -p $out/sbin $out/bin cp -p ping ping6 tracepath tracepath6 traceroute6 $out/bin/ cp -p clockdiff arping rdisc ninfod/ninfod $out/sbin/ + + mkdir -p $out/share/man/man8 + cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \ + doc/tracepath.8 doc/ninfod.8 $out/share/man/man8 + ln -s $out/share/man/man8/{ping,ping6}.8 + ln -s $out/share/man/man8/{tracepath,tracepath6}.8 ''; meta = { From 93a963f347627cefb0830d028193d9416f18c94d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Mar 2013 22:35:33 +0100 Subject: [PATCH 66/92] nixUnstable: Update to the latest This is mostly to get rid of those annoying Perl warnings in NixOS... --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index ff36e0cc3cc5..41ad7b4f4f21 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.4pre3056_79a3ba7"; + name = "nix-1.5.2pre3079_c3fc60d"; src = fetchurl { - url = "http://hydra.nixos.org/build/4070551/download/5/${name}.tar.xz"; - sha256 = "7478fd6fea91ec094645e8487b9ef001abd300703d79e04743f4d212469cf13d"; + url = "http://hydra.nixos.org/build/4445767/download/5/${name}.tar.xz"; + sha256 = "0422ceb1439cf1140e86f86514bdcb04b0706881ea31a9f6ee5206b9faad009b"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 618b423b1608..0d3e4cca9a24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8910,14 +8910,10 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - nixUnstable = nixStable; - - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; - */ nut = callPackage ../applications/misc/nut { }; From ac807625a76295def5da00f7e3a899260fbe0c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 18 Mar 2013 22:45:16 +0100 Subject: [PATCH 67/92] storebrowse: update fixing bugs I try to add build rules for arm too. --- pkgs/tools/system/storebrowse/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 905818a59df2..c46372bcd4b6 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, fetchhg, go, sqlite}: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); stdenv.mkDerivation rec { - name = "storebrowse-20130316140138"; + name = "storebrowse-20130318212204"; src = fetchurl { - url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-881990147c.tar.gz?uuid=881990147c"; + url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-775928f68e53.tar.gz?uuid=775928f68e53"; name = "${name}.tar.gz"; - sha256 = "183b6gz7xv88c94i9mgmjslsdn75v5vsbchl19kjv7mbrxfx5mvl"; + sha256 = "1yb8qbw95d9561s10k12a6lwv3my8h52arsbfcpizx74dwfsv7in"; }; + # This source has license BSD srcGoSqlite = fetchhg { url = "https://code.google.com/p/gosqlite/"; tag = "5baefb109e18"; @@ -22,6 +23,8 @@ stdenv.mkDerivation rec { mkdir $TMPDIR/go export GOPATH=$TMPDIR/go + ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "export GOARM=5"} + GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite mkdir -p $GOSQLITE cp -R $srcGoSqlite/* $GOSQLITE/ From c306d2f899e6cf42911821cbcf62594deab1894d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 19 Mar 2013 13:21:04 +0400 Subject: [PATCH 68/92] Fix references to ifconfig and route --- pkgs/os-specific/linux/gogoclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 4328eb36b6dc..09a449bbede9 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { rm $out/bin/gogoc.conf.sample substituteInPlace "$out/template/linux.sh" \ - --replace "/sbin/ifconfig" "${nettools}/sbin/ifconfig" \ - --replace "/sbin/route" "${nettools}/sbin/route" \ + --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ + --replace "/sbin/route" "${nettools}/bin/route" \ --replace "/sbin/ip" "${iproute}/sbin/ip" \ --replace "/sbin/sysctl" "${procps}/sbin/sysctl" sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh From 2d2123b8d7085e0db9e27eae81480323ac4acdd7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 19 Mar 2013 13:34:57 +0400 Subject: [PATCH 69/92] Update Linux 3.9-rc to rc3 --- pkgs/os-specific/linux/kernel/linux-3.9.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 4b3f5d444e3a..1f0e60ee0d72 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -251,8 +251,8 @@ in import ./generic.nix ( rec { - version = "3.9-rc2"; - modDirVersion = "3.9.0-rc1"; + version = "3.9-rc3"; + modDirVersion = "3.9.0-rc3"; testing = true; 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 = "1aan14n6sw43qk9kpmdrpcakb1398kj2djqca8cvijc8g76973in"; + sha256 = "1fbg952zzn6nkch2fpd1fzkwc6xsf66fnmkxrmc77yz8d29qddi5"; }; config = configWithPlatform stdenv.platform; From 61f9b4f61b3e98303792dcaf403d011b7c1a31f6 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Tue, 19 Mar 2013 11:46:47 +0100 Subject: [PATCH 70/92] Fixing the go timezones. glibc doesn't include the zoneinfo anymore. --- pkgs/development/compilers/go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 955daa0ad9fc..9e74643e161f 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper}: +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}: let loader386 = "${glibc}/lib/ld-linux.so.2"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c - sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ # -e 's,/bin/echo,${coreutils}/bin/echo,' \ From a7359deca809381d11a53bb866e42397aee93949 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 19 Mar 2013 13:59:40 -0400 Subject: [PATCH 71/92] edk2: Update Signed-off-by: Shea Levy --- pkgs/development/compilers/edk2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 9633967da6a9..949324ba8b1c 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -10,12 +10,12 @@ else throw "Unsupported architecture"; edk2 = stdenv.mkDerivation { - name = "edk2-2012-03-13"; + name = "edk2-2013-03-19"; src = fetchsvn { url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2; - rev = "13783"; - sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil"; + rev = "14211"; + sha256 = "1rhrv7cyazb1d4gw3s8fv0c245iankvb9pqx6nngbkkxkcswvnw7"; }; buildInputs = [ libuuid pythonFull ]; From 36ca429641f86cb91ef2390d6a210e941506aead Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 19 Mar 2013 18:56:55 +0100 Subject: [PATCH 72/92] ipdbplugin: nose ipdb plugin, nosetests --ipdb --- pkgs/top-level/python-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86ea190ee28c..93bcb49db05d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1389,6 +1389,16 @@ pythonPackages = python.modules // rec { propagatedBuildInputs = [ ipython ]; }; + ipdbplugin = buildPythonPackage { + name = "ipdbplugin-1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.2.tar.gz"; + md5 = "39169b00a2186b99469249c5b0613753"; + }; + propagatedBuildInputs = [ nose ipython ]; + }; + + jedi = buildPythonPackage (rec { name = "jedi-0.5b5"; From 4ab9c00850fdd2007c724131b3e59934760eeccd Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 19 Mar 2013 19:01:35 +0100 Subject: [PATCH 73/92] openldap-2.4.34 --- pkgs/development/libraries/openldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 5c9fedb7fc55..a074721d5922 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: stdenv.mkDerivation rec { - name = "openldap-2.4.31"; + name = "openldap-2.4.34"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz"; - sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6"; + sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza"; }; buildInputs = [openssl cyrus_sasl db4 groff]; From 1c86db4bc3f363ea170c7159e03b4ce7717e2e4c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 19 Mar 2013 19:14:40 +0100 Subject: [PATCH 74/92] openldap: support building without cyrus-sasl and tls --- pkgs/development/libraries/openldap/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index a074721d5922..1d5a09613408 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -8,7 +8,12 @@ stdenv.mkDerivation rec { sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza"; }; - buildInputs = [openssl cyrus_sasl db4 groff]; + buildInputs = [ openssl cyrus_sasl db4 groff ]; + + configureFlags = + [ "--enable-overlays" + ] ++ stdenv.lib.optional (openssl == null) "--without-tls" + ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"; dontPatchELF = 1; # !!! From 1eb437784021521d57ae96980bf447e9162d4415 Mon Sep 17 00:00:00 2001 From: modulistic Date: Wed, 20 Mar 2013 00:11:58 +0100 Subject: [PATCH 75/92] i3 window manager: cairo.override with xcbSupport enabled, on par with i3lock --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d3e4cca9a24..a1c0d4bc72e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7224,7 +7224,9 @@ let hydrogen = callPackage ../applications/audio/hydrogen { }; - i3 = callPackage ../applications/window-managers/i3 { }; + i3 = callPackage ../applications/window-managers/i3 { + cairo = cairo.override { xcbSupport = true; }; + }; i3lock = callPackage ../applications/window-managers/i3/lock.nix { cairo = cairo.override { xcbSupport = true; }; From f976962d7b7087920a6635ca90f07b06e8a44202 Mon Sep 17 00:00:00 2001 From: modulistic Date: Wed, 20 Mar 2013 00:13:44 +0100 Subject: [PATCH 76/92] i3 window manager: enable Pango support for antialiased fonts --- pkgs/applications/window-managers/i3/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index f8e4e16655aa..b977a6af50df 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, - libXcursor, coreutils, perl }: + libXcursor, coreutils, perl, pango }: stdenv.mkDerivation rec { name = "i3-${version}"; @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm - libstartup_notification libX11 pcre libev yajl libXcursor perl ]; + libstartup_notification libX11 pcre libev yajl libXcursor perl pango ]; patchPhase = '' - sed -i -e '/^# Pango/,/^$/d' common.mk patchShebangs . ''; From ae9b33ac51dee8b24479cbdb54fe8d752a912ce4 Mon Sep 17 00:00:00 2001 From: modulistic Date: Wed, 20 Mar 2013 00:14:22 +0100 Subject: [PATCH 77/92] i3 window manager: version bump from 4.5 to 4.5.1 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index b977a6af50df..4173660f542d 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.5"; + version = "4.5.1"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1kiffcbvvjljqchw9ffgy9s8f9z06i8805jvjas58q5i2yxl5kcy"; + sha256 = "bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm From a1a7448e5b8838db060ada9f641d15a426b94425 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 09:50:06 +0100 Subject: [PATCH 78/92] topgit: update to version 0.9 --- .../git-and-tools/default.nix | 2 +- .../git-and-tools/topgit/default.nix | 30 +++++++------------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 066da4bff4a9..57aea0dcab15 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -72,7 +72,7 @@ rec { }; topGit = lib.makeOverridable (import ./topgit) { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl; }; tig = import ./tig { diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 4b1926051822..dfe113634b4a 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -1,33 +1,25 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: -let - version = "0.8-45-gd279e29"; - lib = stdenv.lib; -in -stdenv.mkDerivation { - name = "topgit-${version}"; +stdenv.mkDerivation rec { + name = "topgit-0.9"; src = fetchurl { - url = "http://repo.or.cz/w/topgit.git/snapshot/topgit-${version}.zip"; - sha256 = "0vzrng1w2k7m4z0x9h6zbrcf33dx08ly8fnbxzz3ms2k2dbsmpl6"; + url = "https://github.com/greenrd/topgit/archive/${name}.tar.gz"; + sha256 = "1z9x42a0cmn8n2n961qcfl522nd6j9a3dpx1jbqfp24ddrk5zd94"; }; - buildInputs = [unzip]; - configurePhase = "export prefix=$out"; + configurePhase = "makeFlags=prefix=$out"; postInstall = '' - mkdir -p "$out/share/doc/topgit-${version}" - cp README "$out/share/doc/topgit-${version}/" - mkdir -p "$out/etc/bash_completion.d" - make prefix="$out" install - mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/" + install -D README "$out/share/doc/${name}/README" + install -D contrib/tg-completion.bash "$out/etc/bash_completion.d/tg-completion.bash" ''; meta = { - description = "TopGit aims to make handling of large amount of interdependent topic branches easier"; - maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo lib.maintainers.simons ]; - homepage = http://repo.or.cz/w/topgit.git; + homepage = "https://github.com/greenrd/topgit"; + description = "TopGit manages large amount of interdependent topic branches"; license = "GPLv2"; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ]; }; } From 51e64392ea8f4537743513adebe36c8febe355d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 10:15:06 +0100 Subject: [PATCH 79/92] git-annex: update to version 4.20130314 --- .../git-and-tools/default.nix | 5 ++-- .../git-and-tools/git-annex/default.nix | 26 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 57aea0dcab15..b0d8cf7d9c5d 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -49,10 +49,9 @@ rec { editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH monadControl mtl network networkInfo networkMulticast networkProtocolXmpp - QuickCheck random regexCompat SafeSemaphore SHA stm text time + QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa transformers transformersBase utf8String uuid wai waiLogger warp - xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack - cabalInstall; + xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack; }; qgit = import ./qgit { 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 4ea0a5df8c17..697e7d3b42e0 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 @@ -6,19 +6,18 @@ , networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck , random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers , transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes -, yesod, yesodDefault, yesodForm, yesodStatic, testpack -, cabalInstall # TODO: remove this build input at the next update +, yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa }: let - version = "4.20130227"; + version = "4.20130314"; 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 = "1zw5kzb08zz43ahbhrazjpq9zn73l3kwnqilp464frf7fg7rwan6"; + sha256 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9"; name = "git-annex-${version}.tar.gz"; }; @@ -30,20 +29,21 @@ stdenv.mkDerivation { networkProtocolXmpp openssh QuickCheck random regexCompat rsync SafeSemaphore SHA stm text time transformers transformersBase utf8String uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm - yesodStatic which perl testpack cabalInstall ]; + yesodStatic which perl testpack regexTdfa ]; configurePhase = '' - makeFlagsArray=( PREFIX=$out ) + makeFlagsArray=( PREFIX=$out CABAL=./Setup ) patchShebangs . - - # cabal-install wants to store stuff in $HOME - mkdir ../tmp - export HOME=$PWD/../tmp - - cabal configure -f-fast -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3 + ghc -O2 --make Setup + ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3 ''; - checkPhase = "./git-annex test"; + doCheck = true; + checkPhase = '' + export HOME="$NIX_BUILD_TOP/tmp" + mkdir "$HOME" + ./git-annex test + ''; meta = { homepage = "http://git-annex.branchable.com/"; From 7ee864141020854b3dbdb7b0d350ae33ef33ad83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 10:44:54 +0100 Subject: [PATCH 80/92] haskell-xmonad-contrib: update to version 0.11.1 --- pkgs/applications/window-managers/xmonad/xmonad-contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 6716591eabae..6282af4e2eb4 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmonad-contrib"; - version = "0.11"; - sha256 = "188brys16b3wmxd22j4284wnpasm8bixdjfxl1jr2q2xi45nzks0"; + version = "0.11.1"; + sha256 = "1356dn8ipw7fgn2xijppn69f64zg36gcxbw9qndxbbmml5gq0zrl"; buildDepends = [ extensibleExceptions mtl random utf8String X11 X11Xft xmonad ]; From 60295ebd98c46a9f20922a760e6fa5110e93ab6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 10:44:54 +0100 Subject: [PATCH 81/92] haskell-X11: update to version 1.6.1.1 --- pkgs/development/libraries/haskell/X11/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index dff5bca4400b..c304a58b9a51 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -1,9 +1,12 @@ -{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender }: +{ cabal, dataDefault, libX11, libXext, libXinerama, libXrandr +, libXrender +}: cabal.mkDerivation (self: { pname = "X11"; - version = "1.6.0.2"; - sha256 = "0z1g93k2zbkb9is2zy6pfwp13bv11cvs30b9cz253wjv2liphshw"; + version = "1.6.1.1"; + sha256 = "1bkfnxcmf8qia0l3x5n3j4f1zakjwnlq0mhdnbpp6v3q2g37brbw"; + buildDepends = [ dataDefault ]; extraLibraries = [ libX11 libXext libXinerama libXrandr libXrender ]; From 2d00a0f8d5538c80a3d98832381a571b95fa3aa0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 10:44:55 +0100 Subject: [PATCH 82/92] haskell-bson: update to version 0.2.2 --- pkgs/development/libraries/haskell/bson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 6b76aee47a1e..2aa8f54b884c 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "bson"; - version = "0.2.1"; - sha256 = "1g5xvkpn5j2yn9figxiv5dindwv6gg90np56k235hy9cwmdicmwq"; + version = "0.2.2"; + sha256 = "043lbaj4rrvh4a1yc033np51vi8xlbczflbhyx2bsiryzbi27waf"; buildDepends = [ binary cryptohash dataBinaryIeee754 mtl network text time ]; From 4d54ec04443a132a09b02c9c43125fb6c451ac89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 10:44:55 +0100 Subject: [PATCH 83/92] haskell-cereal-conduit: update to version 0.7 --- .../development/libraries/haskell/cereal-conduit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix index 8637724e11a4..464e8dbb5e76 100644 --- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -1,10 +1,11 @@ -{ cabal, cereal, conduit, transformers, HUnit }: +{ cabal, cereal, conduit, HUnit, mtl, resourcet, transformers }: cabal.mkDerivation (self: { pname = "cereal-conduit"; version = "0.7"; sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix"; - buildDepends = [ cereal conduit transformers HUnit ]; + buildDepends = [ cereal conduit transformers ]; + testDepends = [ cereal conduit HUnit mtl resourcet transformers ]; meta = { homepage = "https://github.com/litherum/cereal-conduit"; description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits"; From e61805cc771813a77691460970a843aaa8b4f5c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 10:44:55 +0100 Subject: [PATCH 84/92] haskell-comonad: update to version 3.0.2 --- pkgs/development/libraries/haskell/comonad/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index b37ffdf596e1..7e11886fc582 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,10 +1,11 @@ -{ cabal, semigroups, transformers }: +{ cabal, doctest, filepath, semigroups, transformers }: cabal.mkDerivation (self: { pname = "comonad"; - version = "3.0.1.1"; - sha256 = "01zqxrqxy6x6nf6rynzmncbhlgbbpshhw10pkimnw5isg3b8qhc2"; + version = "3.0.2"; + sha256 = "0ryyifcxc5rmjrf9323zzj357709mah1hdsrnrbakd5ck7grjfay"; buildDepends = [ semigroups transformers ]; + testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/comonad/"; description = "Haskell 98 compatible comonads"; From 5bc4ec3f075c200a317de57c488e914b0ca14b71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 10:44:55 +0100 Subject: [PATCH 85/92] haskell-stm-conduit: update to version 1.0.0 --- .../libraries/haskell/stm-conduit/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index e6c1d64857df..94117bd16635 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -1,13 +1,16 @@ -{ cabal, conduit, resourcet, stm, stmChans, transformers, HUnit, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: +{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, transformers +}: cabal.mkDerivation (self: { pname = "stm-conduit"; version = "1.0.0"; sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v"; - buildDepends = [ - conduit resourcet stm stmChans transformers HUnit QuickCheck - testFramework testFrameworkHunit testFrameworkQuickcheck2 + buildDepends = [ conduit resourcet stm stmChans transformers ]; + testDepends = [ + conduit HUnit QuickCheck stm stmChans testFramework + testFrameworkHunit testFrameworkQuickcheck2 transformers ]; meta = { homepage = "https://github.com/wowus/stm-conduit"; From 35520356fdb1e40694f842f951b5a51a1dd3f112 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 10:44:55 +0100 Subject: [PATCH 86/92] haskell-warp: update to version 1.3.7.5 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index d924d4f38b07..7b48ae92b1f3 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7.4"; - sha256 = "0z043v1fjblbvkn44hzp7j8iawqzbwf67qxq7gsv7jfq1q58xbrx"; + version = "1.3.7.5"; + sha256 = "1y6xnlrqfd763s5r79f53vlbk4iirnci6wpaicrm14f791w2mppc"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From d28d3f37a8fbcc1dead6eb941a4d1cc134099903 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 20 Mar 2013 11:43:43 +0100 Subject: [PATCH 87/92] topgit: fix build on FreeBSD The BSD unices have a version of install(1) that doesn't support the -D flag. Grr. --- .../version-management/git-and-tools/topgit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index dfe113634b4a..5290a12a54ac 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { configurePhase = "makeFlags=prefix=$out"; postInstall = '' - install -D README "$out/share/doc/${name}/README" - install -D contrib/tg-completion.bash "$out/etc/bash_completion.d/tg-completion.bash" + mkdir -p "$out/share/doc/${name}" "$out/etc/bash_completion.d/" + mv README "$out/share/doc/${name}/" + mv contrib/tg-completion.bash "$out/etc/bash_completion.d/" ''; meta = { From cd370052b8d44fbd1e038436de885bff98e13d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 20 Mar 2013 20:18:11 +0100 Subject: [PATCH 88/92] libopus: update --- pkgs/development/libraries/libopus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index d4c90ee33fbe..d08ae8ef72a9 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fixedPoint ? false }: stdenv.mkDerivation rec { - name = "libopus-1.0.1"; + name = "libopus-1.0.2"; src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/opus-1.0.1.tar.gz"; - sha256 = "1vs133z6c03xi1a7b8bkqxlb6ipwchawwb52z1lgvh1amwy5ryl0"; + url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz"; + sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs"; }; configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point"; From 0d23e5458820bf906b06a6eb7f571c4ca959b5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 20 Mar 2013 20:28:26 +0100 Subject: [PATCH 89/92] opus-tools: update --- pkgs/applications/audio/opus-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index 6b7e1e2aeff6..a543aa32eea5 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, libogg, libao, pkgconfig, libopus}: stdenv.mkDerivation rec { - name = "opus-tools-0.1.5"; + name = "opus-tools-0.1.6"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "0184zfamg3qcjknk4liz4smws3mbv77gjhq2pn9xgcx9nw78srvn"; + sha256 = "1hd2ych34y3qy4rj4hd5cp29ixy891afizlsxphsfvfplk1dp1nc"; }; buildInputs = [ libogg libao pkgconfig libopus ]; From a799b8ef5d869d04cd55654f55305e63874bae6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 20 Mar 2013 21:48:26 +0100 Subject: [PATCH 90/92] ffmpeg: add opus support, enabled by default --- pkgs/development/libraries/ffmpeg/1.1.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 100e3456ca43..622cec98f184 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -6,6 +6,7 @@ , vpxSupport ? false, libvpx ? null , x264Support ? true, x264 ? null , xvidSupport ? true, xvidcore ? null +, opusSupport ? true, libopus ? null , vdpauSupport ? true, libvdpau ? null , vaapiSupport ? true, libva ? null , faacSupport ? false, faac ? null @@ -19,6 +20,7 @@ assert vorbisSupport -> libvorbis != null; assert vpxSupport -> libvpx != null; assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; +assert opusSupport -> libopus != null; assert vdpauSupport -> libvdpau != null; assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional vpxSupport "--enable-libvpx" ++ stdenv.lib.optional x264Support "--enable-libx264" ++ stdenv.lib.optional xvidSupport "--enable-libxvid" + ++ stdenv.lib.optional opusSupport "--enable-libopus" ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" @@ -64,6 +67,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional vpxSupport libvpx ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional opusSupport libopus ++ stdenv.lib.optional vdpauSupport libvdpau ++ stdenv.lib.optional vaapiSupport libva ++ stdenv.lib.optional faacSupport faac From 39be94cb6803cb6506b19a9ab61a11d4fddb4584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 20 Mar 2013 22:20:15 +0100 Subject: [PATCH 91/92] ffmpeg: enabling ffplay Playing sound, it displays great ffts. --- pkgs/development/libraries/ffmpeg/1.1.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 622cec98f184..9266250527e6 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -12,6 +12,7 @@ , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null +, playSupport ? true, SDL ? null }: assert speexSupport -> speex != null; @@ -25,6 +26,7 @@ assert vdpauSupport -> libvdpau != null; assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; +assert playSupport -> SDL != null; stdenv.mkDerivation rec { name = "ffmpeg-1.1.3"; @@ -41,7 +43,6 @@ stdenv.mkDerivation rec { "--enable-gpl" "--enable-postproc" "--enable-swscale" - "--disable-ffplay" "--enable-shared" "--enable-avresample" "--enable-runtime-cpudetect" @@ -57,7 +58,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; + ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" + ++ stdenv.lib.optional playSupport "--enable-ffplay"; buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] ++ stdenv.lib.optional mp3Support lame @@ -72,7 +74,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional vaapiSupport libva ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; + ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] + ++ stdenv.lib.optional playSupport SDL; enableParallelBuilding = true; From 90b2dcdd2ae30f34e8354d78eda4090bc6a6b188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 20 Mar 2013 22:38:27 +0100 Subject: [PATCH 92/92] Revert "i3 window manager: cairo.override with xcbSupport enabled, on par with i3lock" i3 doesn't want cairo at all. This reverts commit 1eb437784021521d57ae96980bf447e9162d4415. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1c0d4bc72e4..0d3e4cca9a24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7224,9 +7224,7 @@ let hydrogen = callPackage ../applications/audio/hydrogen { }; - i3 = callPackage ../applications/window-managers/i3 { - cairo = cairo.override { xcbSupport = true; }; - }; + i3 = callPackage ../applications/window-managers/i3 { }; i3lock = callPackage ../applications/window-managers/i3/lock.nix { cairo = cairo.override { xcbSupport = true; };