From af4d6b73dea1bf63dee2a06b9bde4f58594b3e20 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 22 May 2013 19:03:49 +0200 Subject: [PATCH 001/162] adding alchemy painting application --- .../applications/graphics/alchemy/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/graphics/alchemy/default.nix diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix new file mode 100644 index 00000000000..c8d53f35177 --- /dev/null +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, jre}: + +stdenv.mkDerivation { + name = "alchemy-007-alpha"; + enableParallelBuilding = true; + + src = fetchurl { + url = http://al.chemy.org/files/Alchemy-007.tar.gz; + sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b"; + }; + + installPhase = '' + ensureDir $out/bin $out/share + cp -a . $out/share/alchemy + cat >> $out/bin/alchemy << EOF + #!/bin/sh + cd $out/share/alchemy + ${jre}/bin/java -jar Alchemy.jar "$@" + EOF + chmod +x $out/bin/alchemy + ''; + + meta = { + description = "Drawing application"; + homepage = http://al.chemy.org/; + license = stdenv.lib.licenses.gpl; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1a47b29e8..e17da967033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6692,6 +6692,8 @@ let aewan = callPackage ../applications/editors/aewan { }; + alchemy = callPackage ../applications/graphics/alchemy { }; + amsn = callPackage ../applications/networking/instant-messengers/amsn { }; antiword = callPackage ../applications/office/antiword {}; From 8a1409432e0991f931ceb13e890817ee810b783e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 29 May 2013 21:42:12 +0200 Subject: [PATCH 002/162] sourcery-codebench: fix installation of manpages Sourcery CodeBench manpages are installed under share/doc//man/. Add symlinks so that the manpages become available to "man". NOTE: I use symlinks instead of moving the manpages, because I think it is best to do as little as possible to prebuilt packages. --- pkgs/development/compilers/mentor/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index e053599e5dd..b12a197451a 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -37,6 +37,11 @@ let *gdb) patchelf --set-rpath "${ncurses}/lib" "$file";; esac done + + # Manpages + mkdir -p "$out/share/man" + ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1" + ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7" ''; meta = with stdenv.lib; { From a17b45686b3f1ad656771848ab5bf3bc3c758e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 23:20:57 +0200 Subject: [PATCH 003/162] Fixing firefox reference --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2edc268319c..a69969fff0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7181,7 +7181,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox20Pkgs; + firefoxPkgs = pkgs.firefox21Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; From 67d41e44246a447baf0319db08975f5f7a5dcceb Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 30 May 2013 01:30:48 +0200 Subject: [PATCH 004/162] gpl fix --- pkgs/applications/graphics/alchemy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index c8d53f35177..2f31b568e34 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Drawing application"; homepage = http://al.chemy.org/; - license = stdenv.lib.licenses.gpl; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; From 14cd1be49840ad69ff1ad2e8fe1f46a493d3bc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 09:51:07 +0200 Subject: [PATCH 005/162] freecad: update to stable from February, 0.13.1830 --- pkgs/applications/graphics/freecad/default.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index c681bc415e3..340c9d0a69e 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,15 +1,14 @@ -{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, +{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, boost, zlib, python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }: stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "git-20121213"; + version = "0.13.1830"; - src = fetchgit { - url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad; - rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f"; - sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w"; + src = fetchurl { + url = "mirror://sourceforge/free-cad/${name}.tar.gz"; + sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a69969fff0b..70a8f9c0e8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7216,8 +7216,7 @@ let # !!! Fix the dependency on two different builds of nss. }; - freecad = callPackage ../applications/graphics/freecad { - }; + freecad = callPackage ../applications/graphics/freecad { }; freemind = callPackage ../applications/misc/freemind { jdk = jdk; From 2599ec692b4c9806244691773df0f3baf5074e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 09:55:08 +0200 Subject: [PATCH 006/162] gnunet-svn: slight update For not any special reason --- pkgs/applications/networking/p2p/gnunet/svn.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index 9335778d3d2..4bff8239adf 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -4,14 +4,15 @@ , makeWrapper, autoconf, automake }: let - rev = "27314"; + rev = "27317"; in stdenv.mkDerivation rec { name = "gnunet-svn-${rev}"; src = fetchsvn { url = https://gnunet.org/svn/gnunet; - sha256 = "14b893y5dy84hp1klrmng06znbh2m2wk4f1kpbhzbwnvjyhk6kdq"; + rev = "27317"; + sha256 = "1l7jypm57wjhzlwdj8xzhfppjdpy6wbph4nqgwxxb9q056wwf9zy"; }; buildInputs = [ From 1ddfbae86a1e9cd3a50e58a10f88455508c0bb07 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 30 May 2013 12:11:13 +0200 Subject: [PATCH 007/162] stunnel: Add explicit openssl reference (latest stunnel version did not build for me otherwise) --- pkgs/tools/networking/stunnel/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index cfc4b2497b7..cb93e8a504b 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation { }; buildInputs = [openssl]; + + configureFlags = [ + "--with-ssl=${openssl}" + ]; meta = { description = "Stunnel - Universal SSL wrapper"; From a7dbbd2e25f1980ea006912c755f858be31f82c2 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 30 May 2013 12:11:57 +0200 Subject: [PATCH 008/162] New package: sbt 0.12.3, a Scala build tool --- .../tools/build-managers/sbt/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/build-managers/sbt/default.nix diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix new file mode 100644 index 00000000000..90045b97352 --- /dev/null +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, writeScript, bash, jre }: + +let + + sbt = writeScript "sbt.sh" '' + #!${bash}/bin/bash + ${jre}/bin/java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled \ + -XX:MaxPermSize=384M -jar @out@/lib/sbt-launch.jar "$@" + ''; + +in stdenv.mkDerivation rec { + name = "sbt-${version}"; + + version = "0.12.3"; + + src = fetchurl { + url = "http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/${version}/sbt.tgz"; + sha256 = "154ydaxd6ink5sy4flzpyh47nnhgkxwpzmml8q16am7655fpib08"; + }; + + installPhase = '' + mkdir -p $out/lib $out/bin + mv bin/sbt-launch.jar $out/lib/ + cp ${sbt} $out/bin/sbt + substituteInPlace $out/bin/sbt --replace @out@ $out + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70a8f9c0e8c..829d8a983bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3416,6 +3416,8 @@ let jre = jdk; }; + sbt = callPackage ../development/tools/build-managers/sbt { }; + scons = callPackage ../development/tools/build-managers/scons { }; simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; From 03b50b3335dfe44e83979d15d4ebf592ea9fead9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 10:51:13 +0200 Subject: [PATCH 009/162] haskell-monad-par: add version 0.3.4.2 --- .../libraries/haskell/monad-par/0.3.4.2.nix | 28 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix new file mode 100644 index 00000000000..ab875b34c36 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix @@ -0,0 +1,28 @@ +{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras +, mtl, mwcRandom, parallel, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh +, time +}: + +cabal.mkDerivation (self: { + pname = "monad-par"; + version = "0.3.4.2"; + sha256 = "1k10m4w2g92psahsvcyi98sc31wg5anijp46lbsipi2r2gxxc7bs"; + buildDepends = [ + abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom + parallel + ]; + testDepends = [ + abstractDeque abstractPar deepseq HUnit monadParExtras mtl + mwcRandom QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh time + ]; + doCheck = false; + meta = { + homepage = "https://github.com/simonmar/monad-par"; + description = "A library for parallel programming based on a monad"; + 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 9f99a49dd6d..90918c53638 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1378,7 +1378,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; monadPar_0_3_4_1 = callPackage ../development/libraries/haskell/monad-par/0.3.4.1.nix {}; - monadPar = self.monadPar_0_3_4_1; + monadPar_0_3_4_2 = callPackage ../development/libraries/haskell/monad-par/0.3.4.2.nix {}; + monadPar = self.monadPar_0_3_4_2; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; From e7975c0d33167027eed934a469406a3cf7cec70e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 10:51:38 +0200 Subject: [PATCH 010/162] git-annex: update to version 4.20130521 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index f8809d27cc4..737ee00aa00 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -10,14 +10,14 @@ }: let - version = "4.20130501"; + version = "4.20130521"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "https://github.com/joeyh/git-annex/tarball/${version}"; - sha256 = "1280sdj3d3s3k5a1znzl7xzzyncv9kz522bprhwb9if03v6xh2kl"; + sha256 = "0wa3sgw0xbqykl5r6ba0gannwj61y0h024glm0xjj97fy06b77i0"; name = "git-annex-${version}.tar.gz"; }; From 6fadcc2d6952229b780b098b86c651bc48b4c921 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 10:52:40 +0200 Subject: [PATCH 011/162] git-annex: disable building of the web application to fix the build in the presence of yesod 1.2 --- .../version-management/git-and-tools/git-annex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 737ee00aa00..7e8b57293b7 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 @@ -35,7 +35,7 @@ stdenv.mkDerivation { makeFlagsArray=( PREFIX=$out CABAL=./Setup ) patchShebangs . ghc -O2 --make Setup - ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3 + ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -f-webapp -fassistant -fdbus -finotify -fwebdav -fs3 ''; doCheck = true; From de182afeae3ee8024290d6f76b3e80246c1d8883 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:46 +0200 Subject: [PATCH 012/162] haskell-asn1-types: update to version 0.2.0 --- pkgs/development/libraries/haskell/asn1-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index 3dacaa6353f..a50ee82a38d 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-types"; - version = "0.1.3"; - sha256 = "1d55vhax71d29c2b6238pz1hqp4jnyvvfhs8f05qpcv754b4s4jg"; + version = "0.2.0"; + sha256 = "0350g5p3zbvm29nnjd554i6fyc47vmzpb42w6q46v3i9fiy23kvd"; buildDepends = [ time ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-types"; From 0b433e463b9dd70dd3c5449585c96f0fb5bc5977 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:46 +0200 Subject: [PATCH 013/162] haskell-certificate: update to version 1.3.8 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 1de453b27ef..db314a12296 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.7"; - sha256 = "06sfka5p381gayx2q7vvyr7dl8q8d4jfqdrys3k0z8fjxdbqrqya"; + version = "1.3.8"; + sha256 = "1id3jfaisl04n1mjj9lbq3gyz8hyn3r9p9chzmfbra0pcj3vf1m0"; isLibrary = true; isExecutable = true; buildDepends = [ From ac1f88bef2c8b636b060a1a447fd36139ffec2d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:46 +0200 Subject: [PATCH 014/162] haskell-conduit: update to version 1.0.6 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 983c41f57c9..6a12708ea33 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.5"; - sha256 = "0w8japlx0darpf67ki753l0kw64lgisr1dww3alfwjlya0k84z65"; + version = "1.0.6"; + sha256 = "0da5wxhsfjgcn850iimcp15vhg5lw0fa8i7c3hdw4yvrpza14dcn"; buildDepends = [ liftedBase mmorph monadControl resourcet text transformers transformersBase void From 836b002fd8a912ab4ed99a662e34496c8a5f3a30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 015/162] haskell-criterion: update to version 0.8.0.0 --- .../libraries/haskell/criterion/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 004f74cd7e7..84eacff71a1 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,14 +1,15 @@ -{ cabal, aeson, deepseq, filepath, hastache, mtl, mwcRandom, parsec -, statistics, time, transformers, vector, vectorAlgorithms +{ cabal, aeson, binary, deepseq, filepath, Glob, hastache, mtl +, mwcRandom, parsec, statistics, time, transformers, vector +, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.2.1"; - sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5"; + version = "0.8.0.0"; + sha256 = "05v4glwvidsd4gm2jcvmlcpfaxg2x0fb69w051rbwg9scanrm7bf"; buildDepends = [ - aeson deepseq filepath hastache mtl mwcRandom parsec statistics - time transformers vector vectorAlgorithms + aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec + statistics time transformers vector vectorAlgorithms ]; meta = { homepage = "https://github.com/bos/criterion"; From 172b463f5a46e1620d62f87f82fa54b9d3a66811 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 016/162] haskell-crypto-pubkey-types: update to version 0.4.0 --- .../libraries/haskell/crypto-pubkey-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 38024a24c54..e4234d1d4cd 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.3.2"; - sha256 = "12gzx4mj8rc243vvjkzvrxnj2f7x3z86yfgahx3my5vsaw4bix2h"; + version = "0.4.0"; + sha256 = "0bapzvd0xgv38mbj1xhzcswchnx81sq0wwyax3qqzcpgvcyz28sl"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; From 1309b1d8b41989e5cc8b1e6b2c18c687de502357 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 017/162] haskell-crypto-pubkey: update to version 0.1.4 --- pkgs/development/libraries/haskell/crypto-pubkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index 48af6182c64..47e8dc179ae 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.1.3"; - sha256 = "154bclz7mg2v7q72y6y0ylw0b28527nsmc8f6zf6ja5l9c9skw0g"; + version = "0.1.4"; + sha256 = "13ah3ip6gdv7b1zz5qwi7515a3k8pp3l0jr1kq4q2a0vqy24gkn1"; buildDepends = [ cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi ]; From f51d2220cae4072e7202600565e3d5185d176171 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 018/162] haskell-digestive-functors-heist: update to version 0.7.0.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 0bff7f191b1..e2dc195b196 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,12 +3,11 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.6.2.1"; - sha256 = "1hs1qiaakxgv1lyd74cahqphrpqch1wayx0c9zpgjja3bnwjcj8n"; + version = "0.7.0.0"; + sha256 = "0ljsr4yy3pb4cjg9dcgfcs9rn1ihg3xi9ak5p3h3kw3w19d1hsaq"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; - jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; From 8c3232f9258dafbf36a5a7c594723940922f3f2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 019/162] haskell-digestive-functors: update to version 0.6.1.0 --- .../haskell/digestive-functors/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 0b956680a84..98a2a7d3476 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,11 +1,16 @@ -{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }: +{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.0.1"; - sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi"; + version = "0.6.1.0"; + sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d"; buildDepends = [ mtl text ]; - testDepends = [ HUnit mtl testFramework testFrameworkHunit text ]; + testDepends = [ + HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; From 13a7b3f9696e5923dbd636e1f569dafbf6f650c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 020/162] haskell-ghc-mod: update to version 2.0.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 4eaf0dcb782..fe0602bf888 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 = "2.0.2"; - sha256 = "1j2av7lcsnpizy6lyykk47rmm07rkfjyg9glfi7ma5cg082v15ni"; + version = "2.0.3"; + sha256 = "0f0n4cqpspad3ygw89rp8wj1gxb7mv5zrd8938zm1rn2mimihggr"; isLibrary = true; isExecutable = true; buildDepends = [ From bd9c8128ada2f2619b12c38d7e2b27654ca5571c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 021/162] haskell-gloss: update to version 1.7.8.3 --- pkgs/development/libraries/haskell/gloss/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index ededea21fcc..31128c382b6 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.8.2"; - sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4"; + version = "1.7.8.3"; + sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr"; buildDepends = [ bmp GLUT OpenGL ]; - jailbreak = true; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; From d7be6a93b8fe1a2856e3faf827fe13be22f646ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 022/162] haskell-hs-bibutils: update to version 5.0 --- pkgs/development/libraries/haskell/hs-bibutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index 592862d49ef..adf136cd898 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.17.1"; - sha256 = "0qn3kibwwiaandmk672n9lki431934qahj81r4yj2acmyv6fcycf"; + version = "5.0"; + sha256 = "18gchn62g2cqzyj1nr8wd5i6smhq739g00cblkllj1jkni33ch2l"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; From 0ed2c83e5af29dd8f228b53c5f5e15063616e8ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 023/162] haskell-http-conduit: update to version 1.9.4 --- 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 3062c71dcf1..cea5708c269 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.3"; - sha256 = "03c08jj6941kxl5iw60n8s8qnxp2rsfgfmf7m761iy7i7hsj1rkk"; + version = "1.9.4"; + sha256 = "0zm8m3nvxyc9z3b8d47ggx56raqpz1aa8r268k6gidpc5zpad2yl"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault From b6b5bc27991a321532e622c0a9dbf9d0b5d2d060 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 024/162] haskell-liblastfm: update to version 0.2.0.0 --- .../libraries/haskell/liblastfm/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index a07480551df..4e98aa82bc2 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -1,14 +1,15 @@ -{ cabal, aeson, attoparsec, cereal, cryptoApi, httpConduit -, httpTypes, HUnit, network, pureMD5, testFramework -, testFrameworkHunit, text +{ cabal, aeson, attoparsec, cereal, contravariant, cryptoApi +, httpConduit, httpTypes, HUnit, network, pureMD5, testFramework +, testFrameworkHunit, text, void }: cabal.mkDerivation (self: { pname = "liblastfm"; - version = "0.1.1.2"; - sha256 = "1zckgjc0r2s1s6s9s309dr2ri8bzj1fi8gcbhm3hifczq1v149w9"; + version = "0.2.0.0"; + sha256 = "1x147mry8pq8qzrhrsbxm4b7sb80c9900kq2igwvcskwszd5h56n"; buildDepends = [ - aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text + aeson cereal contravariant cryptoApi httpConduit httpTypes network + pureMD5 text void ]; testDepends = [ aeson attoparsec HUnit testFramework testFrameworkHunit text From bc8e70f8791b0b9b5521b810b75897bd5d2fd250 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 025/162] haskell-multiarg: update to version 0.16.0.0 --- pkgs/development/libraries/haskell/multiarg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index f3b00a7efb2..d636ea7b542 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.14.0.0"; - sha256 = "05zibar3yqwz2k2ihpby8jdfr4qniz2cz2989sxjf72hqih0g9pb"; + version = "0.16.0.0"; + sha256 = "086mnhbp1d3n0xdn4cdlyrkkgrykg4bwhi7sbfdmn688qhpl3g9m"; buildDepends = [ explicitException utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; From a5d42ef934a69d81b47942f0834f7c0a9f16bc93 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 026/162] haskell-network-protocol-xmpp: update to version 0.4.5 --- .../libraries/haskell/network-protocol-xmpp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix index 304017d3d24..910d2cc6774 100644 --- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix +++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "network-protocol-xmpp"; - version = "0.4.4"; - sha256 = "0l2s412aazli80jszdl1am01z14a0q2z8fsxxjawk4cy70d6f4ry"; + version = "0.4.5"; + sha256 = "1phnd9nygpc8gmyriwaqjnvygxi5zg4nx2i1m3vwwxql221420gg"; buildDepends = [ gnuidn gnutls gsasl libxmlSax monadsTf network text transformers xmlTypes ]; - jailbreak = true; meta = { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; From fc02ddca524fa47df650ee12ab23c5903c37d89d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 027/162] haskell-parseargs: update to version 0.1.3.5 --- pkgs/development/libraries/haskell/parseargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index 4287015115c..2a481246e88 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "parseargs"; - version = "0.1.3.4"; - sha256 = "1n55ay42qiwm72fa63xbz5m5fi0ld5dr3vypmyz5mc0zzhqwxz2j"; + version = "0.1.3.5"; + sha256 = "1ig1n2nnicmy71qwcl5hkdk4mvwq0mz6zr5h9kw329lgvr9cyzyc"; isLibrary = true; isExecutable = true; meta = { From e539c38a21902c6245763eabe1af137abc4e9590 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 028/162] haskell-persistent-postgresql: update to version 1.2.0 --- .../haskell/persistent-postgresql/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 251db960506..c7d6b532db6 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -1,16 +1,15 @@ -{ cabal, aeson, conduit, monadControl, persistent, postgresqlLibpq -, postgresqlSimple, text, time, transformers +{ cabal, aeson, blazeBuilder, conduit, monadControl, persistent +, postgresqlLibpq, postgresqlSimple, text, time, transformers }: cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.1.3.1"; - sha256 = "1lbr4x45hzk73439x6is9zw6y3mqy1ivmblncvg70kzw0kmjhpnk"; + version = "1.2.0"; + sha256 = "0i5ha1vs91makwrw4qqwdzp92i24ynmmsmjyqpik6q80fxxiwps6"; buildDepends = [ - aeson conduit monadControl persistent postgresqlLibpq + aeson blazeBuilder conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; From 2bd5a628dcc74f131d6c5cca35a4aafab15865ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 029/162] haskell-persistent-sqlite: update to version 1.2.0 --- .../libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 947f75342d4..bb7a6731a26 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.1.5"; - sha256 = "1kqxp0qsvxfz352yg9k1wgb2nfm7kcz8xdj9q537ilh99wxkp6cl"; + version = "1.2.0"; + sha256 = "09xd9z16rcq9ymx5ysshzdr30lih55b9kasvbq5xw6wq7lvg6q4h"; buildDepends = [ aeson conduit monadControl monadLogger persistent text transformers ]; From dc7f1b2df19a2fc33da77b212af26e0d7f215783 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 030/162] haskell-persistent-template: update to version 1.2.0.1 --- .../haskell/persistent-template/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 396f51f69cb..f3ab1800dae 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,12 +1,14 @@ -{ cabal, aeson, hspec, monadControl, persistent, QuickCheck, text -, transformers +{ cabal, aeson, hspec, monadControl, monadLogger, persistent +, QuickCheck, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.1.3.1"; - sha256 = "0171x8mv3ff9ppllkp3mgpwa8p1zg3y6fykq70z9h0hx1ny0407p"; - buildDepends = [ aeson monadControl persistent text transformers ]; + version = "1.2.0.1"; + sha256 = "1l8ws4mijl0cwcl14ms8hibfgcn3y6b1679xc0cdyz1ifiymkdns"; + buildDepends = [ + aeson monadControl monadLogger persistent text transformers + ]; testDepends = [ aeson hspec persistent QuickCheck text ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From c3aa81cd0eb6499a6a7db23f5a88cb61b8ad2c13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 031/162] haskell-persistent: update to version 1.2.0.1 --- .../libraries/haskell/persistent/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 036deebae20..79fd1f6f781 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,15 +7,19 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.5.1"; - sha256 = "1ds0q3mzgg60makx7impyxsvpzd3issa89igcy176yb54ypjwfnz"; + version = "1.2.0.1"; + sha256 = "1bs74g1fkwq4wvz18lp0ial6z58vpslgv0rqdn91ka6gw8k4fvlb"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit resourcet silently text time transformers transformersBase unorderedContainers vector ]; - testDepends = [ hspec text ]; + testDepends = [ + aeson attoparsec base64Bytestring blazeHtml conduit hspec + monadControl monadLogger pathPieces resourcet text time + transformers unorderedContainers vector + ]; extraLibraries = [ sqlite ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From 0853a818252ed792a35c47b56d57e739cf4649e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 032/162] haskell-postgresql-simple: update to version 0.3.3.0 --- .../libraries/haskell/postgresql-simple/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 81a5f67c45b..0a40cdf7a96 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -5,13 +5,15 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.2.4.1"; - sha256 = "09yszkiahfyidaq9yfk4mda5sf1m8bcqqag51vasybln9k9hhws3"; + version = "0.3.3.0"; + sha256 = "0srkalfg41gdnzwwa2bmwwrcdqnw13f7b94wv4d5a6sg6yf1ry1l"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector ]; - testDepends = [ base16Bytestring cryptohash HUnit text time ]; + testDepends = [ + base16Bytestring cryptohash HUnit text time vector + ]; doCheck = false; meta = { description = "Mid-Level PostgreSQL client library"; From 4ca19f846bca7712fa9bdc1e6df4989f288d6acd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 033/162] haskell-statistics: update to version 0.10.4.1 --- .../libraries/haskell/statistics/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 4576a447fde..54876a879fc 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,16 +1,16 @@ -{ cabal, deepseq, erf, HUnit, ieee754, mathFunctions, monadPar -, mwcRandom, primitive, QuickCheck, testFramework +{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions +, monadPar, mwcRandom, primitive, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector -, vectorAlgorithms +, vectorAlgorithms, vectorBinaryInstances }: cabal.mkDerivation (self: { pname = "statistics"; - version = "0.10.3.1"; - sha256 = "12abfqxsriqlncr60wwcsm0q41hmqc6vp9p1hmnv2l3qqcisk60s"; + version = "0.10.4.1"; + sha256 = "0kd3zn8ckz3h9dnighmfviacw5cy6czsj90ryn8c0h6yb2s3gqi1"; buildDepends = [ - deepseq erf mathFunctions monadPar mwcRandom primitive vector - vectorAlgorithms + binary deepseq erf mathFunctions monadPar mwcRandom primitive + vector vectorAlgorithms vectorBinaryInstances ]; testDepends = [ erf HUnit ieee754 mathFunctions mwcRandom primitive QuickCheck From 80093a4d8d673ffcbc6903b5bf4b2645f3faa41e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 034/162] haskell-stm-conduit: update to version 2.0.0 --- pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 778d333c956..5a5470251b1 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "1.1.0"; - sha256 = "1b5v3vf9izzpw3vaslskhdxqnc1zmag1f3x50dh8r1nl318ndkf7"; + version = "2.0.0"; + sha256 = "015gz4fqijgcs6dls5l8ry47q4a33a6ik0hsj5mw48iw44af39jr"; buildDepends = [ conduit resourcet stm stmChans transformers ]; testDepends = [ conduit HUnit QuickCheck stm stmChans testFramework From 43c6a39ca3b23b5fa65affe36998bdda2c9e750c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 035/162] haskell-tls-extra: update to version 0.6.3 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index c9ab989ed76..b3c1c884dc9 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.6.1"; - sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan"; + version = "0.6.3"; + sha256 = "1ng8h3v5px63fpb4y3sd47djzpksyzzavilsdnp1kd453abpmx9l"; isLibrary = true; isExecutable = true; buildDepends = [ From bdd7ce87c2d0e82f5baaf581c4999fe4ccc92724 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 036/162] haskell-wai-extra: update to version 1.3.4.2 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 4be1beecafd..3192def654e 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.4"; - sha256 = "1ay82q58pizc48rh4d8z7ybf2jjvzxqylj6mx34nvrxxlmxf5gfx"; + version = "1.3.4.2"; + sha256 = "14mrvh3av6dn4jx5q06b4lyjw8sr1ynygbncf5fbp3nzn8nmh17s"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes From f12cadb586acdc70e3d581df4cb28fbe73daf683 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 037/162] haskell-wai-logger: update to version 0.3.1 --- pkgs/development/libraries/haskell/wai-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index 16f02f87746..f6035269112 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.3.0"; - sha256 = "132jcjyqr7bxcfi7v9mapvx8dci0lz8rv91mgnrzgvpac542c2yq"; + version = "0.3.1"; + sha256 = "0x1d67fcfpjrgyjr7hipifqrzk13x8z8xmlj7h999r8mswijhgii"; buildDepends = [ blazeBuilder byteorder caseInsensitive dateCache fastLogger httpTypes network wai From 5aa1b5294f273dea33d60ec12e19957307df8071 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 038/162] haskell-wai: update to version 1.4.0.1 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index deb1090dd4a..9b3b1083bc0 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.4.0"; - sha256 = "1213sib2qp1xafrrnmkxabgkba0g00awy6dx9jnlfkj5r6m32wdq"; + version = "1.4.0.1"; + sha256 = "1d08mp7dpf8iw50yjysr5p7fc9jgdcwql943p9c11x35n2ks6z2n"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From 7c46aed8d96fcf9906bc9cefacc199f8b641f6f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 039/162] haskell-warp: update to version 1.3.8.2 --- 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 0f3956dfe6e..3cf1f8e6ba6 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.8.1"; - sha256 = "07kzfv8j9x6qhl9kjhyl6gricq88y6ys48vml4chqnd8sg9vki3x"; + version = "1.3.8.2"; + sha256 = "0s8na04n21glgkc0bcc0171ikh9cagx35s2h6i1pb5pwa8l0akv6"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From 496c7cfa6243b0d0f75efcae4f0354ed9e594315 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 040/162] haskell-xdot: update to version 0.2.3.1 --- pkgs/development/libraries/haskell/xdot/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 27aaad02b35..130402ec75b 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.3"; - sha256 = "0xb8igsqydiw1w00frn4mxkflhxkayif2vivxmq5fk53am2f43wy"; + version = "0.2.3.1"; + sha256 = "1gricrnssxgzaq1z7nnyppmz284nix0m89477x22mal125pkcf7n"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; - jailbreak = true; meta = { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = self.stdenv.lib.licenses.bsd3; From 9739c773913b0b11b7bb498631f92759342f1468 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 041/162] haskell-yesod-auth: update to version 1.2.0.1 --- .../libraries/haskell/yesod-auth/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index c93a507e28b..22f1c583011 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,21 +1,21 @@ -{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, fileEmbed -, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network -, persistent, persistentTemplate, pureMD5, pwstoreFast, random, SHA -, shakespeareCss, shakespeareJs, text, transformers -, unorderedContainers, wai, yesodCore, yesodForm, yesodJson -, yesodPersistent +{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, dataDefault +, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes +, liftedBase, mimeMail, network, persistent, persistentTemplate +, pureMD5, pwstoreFast, random, resourcet, SHA, shakespeareCss +, shakespeareJs, text, transformers, unorderedContainers, wai +, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.7"; - sha256 = "0vsgpvmsmdzbwj5l862bzm21ld3adkmbwgkffbpjr4yylbvvyvrn"; + version = "1.2.0.1"; + sha256 = "02nljkc12mgjhvkiv876w6w13q9s9iigya8v4jzj6myv48lainvd"; buildDepends = [ - aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet - httpConduit httpTypes liftedBase mimeMail network persistent - persistentTemplate pureMD5 pwstoreFast random SHA shakespeareCss - shakespeareJs text transformers unorderedContainers wai yesodCore - yesodForm yesodJson yesodPersistent + aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate + fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network + persistent persistentTemplate pureMD5 pwstoreFast random resourcet + SHA shakespeareCss shakespeareJs text transformers + unorderedContainers wai yesodCore yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From c4260c58bda40f0d9900005586969420ad7a8ced Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 042/162] haskell-yesod-core: update to version 1.2.1 --- .../libraries/haskell/yesod-core/default.nix | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index fff50366233..7518e6ff82a 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,29 +1,30 @@ -{ cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup -, caseInsensitive, cereal, clientsession, conduit, cookie, failure -, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase -, monadControl, monadLogger, parsec, pathPieces, QuickCheck, random -, resourcet, shakespeare, shakespeareCss, shakespeareI18n -, shakespeareJs, text, time, transformers, transformersBase, vector -, wai, waiExtra, waiTest, yesodRoutes +{ cabal, aeson, attoparsecConduit, blazeBuilder, blazeHtml +, blazeMarkup, caseInsensitive, cereal, clientsession, conduit +, cookie, dataDefault, failure, fastLogger, hamlet, hspec +, httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec +, pathPieces, QuickCheck, random, resourcet, safe, shakespeare +, shakespeareCss, shakespeareI18n, shakespeareJs, text, time +, transformers, transformersBase, vector, wai, waiExtra, waiTest +, warp, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.8.3"; - sha256 = "116vglpqh2561g0gzhm4ijwx829c50ai1hh715vwi5j5i01y2rkr"; + version = "1.2.1"; + sha256 = "1p9xaw0d9dx68q7i99kjcqy1lhmd164drbcw3489560wa71mwamk"; buildDepends = [ - aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal - clientsession conduit cookie failure fastLogger hamlet httpTypes - liftedBase monadControl monadLogger parsec pathPieces random - resourcet shakespeare shakespeareCss shakespeareI18n shakespeareJs - text time transformers transformersBase vector wai waiExtra - yesodRoutes + aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup + caseInsensitive cereal clientsession conduit cookie dataDefault + failure fastLogger hamlet httpTypes liftedBase monadControl + monadLogger parsec pathPieces random resourcet safe shakespeare + shakespeareCss shakespeareI18n shakespeareJs text time transformers + transformersBase vector wai waiExtra warp yesodRoutes ]; testDepends = [ - blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random - shakespeareCss shakespeareJs text transformers wai waiTest + blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase + QuickCheck random resourcet shakespeareCss shakespeareJs text + transformers wai waiTest ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; From 6dbbd1822b86158f7b0fdbd1a79082e9bb0405d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 043/162] haskell-yesod-default: update to version 1.2.0 --- .../libraries/haskell/yesod-default/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index b0e720ff487..58ea0b10a22 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,20 +1,13 @@ -{ cabal, dataDefault, hamlet, networkConduit, safe, shakespeareCss -, shakespeareJs, text, transformers, unorderedContainers, wai -, waiExtra, warp, yaml, yesodCore -}: +{ cabal, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.1.3.2"; - sha256 = "07gm9sj4c231wdmfmb7df1s8wvqa6fw7nhcq554h16h2ibv5pcqg"; - buildDepends = [ - dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs - text transformers unorderedContainers wai waiExtra warp yaml - yesodCore - ]; + version = "1.2.0"; + sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk"; + buildDepends = [ yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; - description = "Default config and main functions for your yesod application"; + description = "Default config and main functions for your yesod application (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 2ba8e44f48f815294b4135a77751c49f73e03cd9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 044/162] haskell-yesod-form: update to version 1.3.0 --- .../libraries/haskell/yesod-form/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index adf11916b90..d693cd1d0a4 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,18 +1,18 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , cryptoApi, dataDefault, emailValidate, hamlet, hspec, network -, persistent, shakespeareCss, shakespeareJs, text, time +, persistent, resourcet, shakespeareCss, shakespeareJs, text, time , transformers, wai, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.1.3"; - sha256 = "1mrqr6pfrhkk0vv9lhd4wxiic8d1hsraiqmjcqsfbpdyrc6fqypq"; + version = "1.3.0"; + sha256 = "1y729h61w30yi4mcva727317gdc70nhn6jzxb7fmc9hqgnh136nc"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi - dataDefault emailValidate hamlet network persistent shakespeareCss - shakespeareJs text time transformers wai xssSanitize yesodCore - yesodPersistent + dataDefault emailValidate hamlet network persistent resourcet + shakespeareCss shakespeareJs text time transformers wai xssSanitize + yesodCore yesodPersistent ]; testDepends = [ hspec text time ]; meta = { From 830630d011f42ad889fc54fcdf7b59b47a271f65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 045/162] haskell-yesod-json: update to version 1.2.0 --- .../libraries/haskell/yesod-json/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index b395645557b..780444bd861 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,20 +1,13 @@ -{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, hspec -, safe, shakespeareJs, text, transformers, vector, wai, waiExtra -, waiTest, yesodCore, yesodRoutes -}: +{ cabal, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "1.1.2.2"; - sha256 = "1bl4rs3biv2man0n8ijldil32lyswjqk5ykz0nv06qsaaafjpc3g"; - buildDepends = [ - aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs - text transformers vector wai waiExtra yesodCore yesodRoutes - ]; - testDepends = [ hspec text waiTest yesodCore ]; + version = "1.2.0"; + sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw"; + buildDepends = [ yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; - description = "Generate content for Yesod using the aeson package"; + description = "Generate content for Yesod using the aeson package. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 4aa35f4d29ecd3f1a39eb237b4a3c5225178e37e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 046/162] haskell-yesod-persistent: update to version 1.2.0 --- .../haskell/yesod-persistent/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index e69bc2a5127..1f0b330ff2c 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,11 +1,19 @@ -{ cabal, persistent, persistentTemplate, transformers, yesodCore }: +{ cabal, blazeBuilder, conduit, hspec, liftedBase, persistent +, persistentSqlite, persistentTemplate, poolConduit, resourcet +, text, transformers, waiTest, yesodCore +}: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.1.0.1"; - sha256 = "0kgd1b7kaif644hjbvkc53yxr7qk310zdndypd9h0j31paw52k1p"; + version = "1.2.0"; + sha256 = "1gzzs62mnx2q15sm3hvlk18qjgk3bi828klgl2ckc0462f7z8d0k"; buildDepends = [ - persistent persistentTemplate transformers yesodCore + blazeBuilder conduit liftedBase persistent persistentTemplate + poolConduit resourcet transformers yesodCore + ]; + testDepends = [ + blazeBuilder conduit hspec persistent persistentSqlite text waiTest + yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 0f2e38e54a74ca0cb2776fbbf6a2487753e4d859 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 047/162] haskell-yesod-routes: update to version 1.2.0 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 0ebfeb92bf1..44d728ffcfd 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.1.2"; - sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv"; + version = "1.2.0"; + sha256 = "1d7z0v6jrl08w7qz3apwdjss3vq151y28l7231cpqiia46damib2"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { From b39fb32d6e09be462bdb406aaa8b419cfc764b50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 048/162] haskell-yesod-static: update to version 1.2.0 --- .../haskell/yesod-static/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index ff514a9a599..d341434345b 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,21 +1,24 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohash, fileEmbed, hspec, httpTypes, systemFilepath, text -, transformers, unixCompat, wai, waiAppStatic, yesodCore +, cryptohash, dataDefault, fileEmbed, hspec, httpTypes +, shakespeareCss, systemFileio, systemFilepath, text, transformers +, unixCompat, wai, waiAppStatic, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.2.3"; - sha256 = "15wk7kpr5xdxia07wyx7msfdlyafqn2pkkrzzdfqvij972n17xmh"; + version = "1.2.0"; + sha256 = "18fkphk8qzshm5r0ivdvllmbmvl5q6m84zsf1g0fmridqz2xywjz"; buildDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed - httpTypes systemFilepath text transformers unixCompat wai - waiAppStatic yesodCore + base64Bytestring cereal conduit cryptoConduit cryptohash + dataDefault fileEmbed httpTypes shakespeareCss systemFileio + systemFilepath text transformers unixCompat wai waiAppStatic + yesodCore ]; testDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed - hspec httpTypes systemFilepath text transformers unixCompat wai - waiAppStatic yesodCore + base64Bytestring cereal conduit cryptoConduit cryptohash + dataDefault fileEmbed hspec httpTypes shakespeareCss systemFileio + systemFilepath text transformers unixCompat wai waiAppStatic + yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From f60f7b0ac821e3cec36b78b4b7cfe41cb10b15fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 049/162] haskell-yesod-test: update to version 1.2.0 --- .../libraries/haskell/yesod-test/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 8b32b48af87..f32e90dab17 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,20 +1,23 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit , monadControl, network, persistent, poolConduit, text, time -, transformers, wai, waiTest, xmlConduit, xmlTypes +, transformers, wai, waiTest, xmlConduit, xmlTypes, yesodCore +, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.5"; - sha256 = "095hwl1dm4mk467la68x3lilj0c056603kl0nn8ra4glcr86273j"; + version = "1.2.0"; + sha256 = "184hfhp62jq2icyn1l6s8kvdcsa6099vmykg2nxrafg9f83lb53q"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network persistent poolConduit text time transformers wai waiTest - xmlConduit xmlTypes + xmlConduit xmlTypes yesodCore + ]; + testDepends = [ + hspec htmlConduit HUnit text xmlConduit yesodCore yesodForm ]; - testDepends = [ hspec htmlConduit HUnit xmlConduit ]; meta = { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; From 982c74a555653b4ee46ac28894ec48463de318c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 050/162] haskell-yesod: update to version 1.2.0.1 --- .../libraries/haskell/yesod/default.nix | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index b118ce951b0..53dc5cab87c 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,31 +1,18 @@ -{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder -, blazeHtml, blazeMarkup, Cabal, conduit, fileEmbed, filepath -, fsnotify, ghcPaths, hamlet, httpConduit, httpReverseProxy -, httpTypes, liftedBase, monadControl, network, networkConduit -, optparseApplicative, parsec, projectTemplate, resourcet -, shakespeare, shakespeareCss, shakespeareJs, shakespeareText -, split, systemFileio, systemFilepath, tar, text, time -, transformers, unixCompat, unorderedContainers, wai, waiExtra -, warp, yaml, yesodAuth, yesodCore, yesodDefault, yesodForm -, yesodJson, yesodPersistent, zlib +{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, hamlet +, monadControl, networkConduit, safe, shakespeareCss, shakespeareJs +, text, transformers, unorderedContainers, wai, waiExtra, warp +, yaml, yesodAuth, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.9.3"; - sha256 = "16w96lyd0z9slhzggbvmb23yfr3jkwywpmp15kbilwn7ghjlkm41"; - isLibrary = true; - isExecutable = true; + version = "1.2.0.1"; + sha256 = "1whkw0lmkyja2j6vbfcf5rjmmhmc85r4arjwjrvdmz6jkjyqham3"; buildDepends = [ - aeson attoparsec base64Bytestring blazeBuilder blazeHtml - blazeMarkup Cabal conduit fileEmbed filepath fsnotify ghcPaths - hamlet httpConduit httpReverseProxy httpTypes liftedBase - monadControl network networkConduit optparseApplicative parsec - projectTemplate resourcet shakespeare shakespeareCss shakespeareJs - shakespeareText split systemFileio systemFilepath tar text time - transformers unixCompat unorderedContainers wai waiExtra warp yaml - yesodAuth yesodCore yesodDefault yesodForm yesodJson - yesodPersistent zlib + aeson blazeHtml blazeMarkup dataDefault hamlet monadControl + networkConduit safe shakespeareCss shakespeareJs text transformers + unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore + yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From f902fe1f68140a4d2dd61800b183164185aabcf0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:02:18 +0200 Subject: [PATCH 051/162] haskell-monad-par: drop obsolete version 0.3.4.1 --- .../libraries/haskell/monad-par/0.3.4.1.nix | 28 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix deleted file mode 100644 index 3fc819542eb..00000000000 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras -, mtl, mwcRandom, parallel, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh -, time -}: - -cabal.mkDerivation (self: { - pname = "monad-par"; - version = "0.3.4.1"; - sha256 = "0v0gnxzv49zvmgm2cb20dlb8m7mn4chpwrc61g4zp69nabjpwwm8"; - buildDepends = [ - abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom - parallel - ]; - testDepends = [ - abstractDeque abstractPar deepseq HUnit monadParExtras mtl - mwcRandom QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 testFrameworkTh time - ]; - doCheck = false; - meta = { - homepage = "https://github.com/simonmar/monad-par"; - description = "A library for parallel programming based on a monad"; - 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 90918c53638..82154f85ef9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1377,7 +1377,6 @@ 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_1 = callPackage ../development/libraries/haskell/monad-par/0.3.4.1.nix {}; monadPar_0_3_4_2 = callPackage ../development/libraries/haskell/monad-par/0.3.4.2.nix {}; monadPar = self.monadPar_0_3_4_2; From 6039e98991ba3cdbfa89b27b6e337fdbff0e1c6b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:09:13 +0200 Subject: [PATCH 052/162] pkgs/top-level/release.nix: build GHC 7.6.3 instead of 7.6.2 --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f7c2ac399a4..11102f89155 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -383,7 +383,7 @@ let ghc = ghcSupported; }; - haskellPackages_ghc762 = { + haskellPackages_ghc763 = { ghc = ghcSupported; }; From 8dbe2decf9b9773a5d8cad8a806cc05d54c60fb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:11:39 +0200 Subject: [PATCH 053/162] Switch default Haskell implementation to Haskell Platform 2013.2.0.0. This makes GHC 7.6.3 is our default compiler. --- pkgs/top-level/all-packages.nix | 20 ++++++++++---------- pkgs/top-level/haskell-packages.nix | 2 +- pkgs/top-level/release-haskell.nix | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 829d8a983bf..ad38930d467 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2501,9 +2501,9 @@ let # particularly in connection with Hydra builds for all these packages. # So we enable it for selected versions only. - # Current default version: 7.4.2. - haskellPackages = haskellPackages_ghc742; - # Current Haskell Platform: 2012.4.0.0 + # Current default version: 7.6.3. + haskellPackages = haskellPackages_ghc763; + # Current Haskell Platform: 2013.2.0.0 haskellPlatform = haskellPackages.haskellPlatform; haskellPackages_ghc6104 = haskell.packages_ghc6104; @@ -2516,17 +2516,17 @@ let haskellPackages_ghc704 = haskell.packages_ghc704; haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; + haskellPackages_ghc741 = haskell.packages_ghc741; + haskellPackages_ghc742 = haskell.packages_ghc742; + haskellPackages_ghc761 = haskell.packages_ghc761; + haskellPackages_ghc762 = haskell.packages_ghc762; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741 = haskell.packages_ghc741; - haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc742.noProfiling); - haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc742.profiling); - haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); - haskellPackages_ghc761 = haskell.packages_ghc761; - haskellPackages_ghc762 = haskell.packages_ghc762; - haskellPackages_ghc763 = recurseIntoAttrs haskell.packages_ghc763; + haskellPackages_ghc763_no_profiling = recurseIntoAttrs (haskell.packages_ghc763.noProfiling); + haskellPackages_ghc763_profiling = recurseIntoAttrs (haskell.packages_ghc763.profiling); + haskellPackages_ghc763 = recurseIntoAttrs (haskell.packages_ghc763.highPrio); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 82154f85ef9..988ec9a53a6 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); # GHC version, change the "preferences function" for that GHC version # in haskell-defaults.nix. - # NOTE: 2012.4.0.0 is the current default. + # NOTE: 2013.2.0.0 is the current default. haskellPlatformArgs_future = self : { inherit (self) cabal ghc; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 67647e11cca..9a3bae89f9c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -11,8 +11,8 @@ let ghc704 = "ghc704"; ghc742 = "ghc742"; ghc763 = "ghc763"; - default = [ ghc742 ]; - latest = [ ghc763 ]; + default = [ ghc763 ]; + latest = [ ]; all = [ ghc6104 ghc6123 ghc704 ghc742 ghc763 ]; allBut = platform: pkgs.lib.filter (x: platform != x) all; From fb45ff999406d40c35cca6e492f0d24a319f67e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:12:59 +0200 Subject: [PATCH 054/162] haskell-binary: prefer the version from Hackage over that shipped with GHC The binary package shipped with GHC is ancient, and some software (like statistics and criterion) doesn't compile with it. --- pkgs/top-level/haskell-defaults.nix | 5 ----- pkgs/top-level/haskell-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 10b0347127e..371ee72bd1f 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -18,35 +18,30 @@ ghcHEADPrefs = self : self.haskellPlatformArgs_future self // { haskellPlatform = null; - binary = null; # now a core package extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; ghc763Prefs = self : self.haskellPlatformArgs_2013_2_0_0 self // { haskellPlatform = self.haskellPlatform_2013_2_0_0; - binary = null; # now a core package extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; ghc742Prefs = self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; - binary = null; # now a core package cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; - binary = null; # now a core package cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; ghc722Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; - binary = null; # a core package deepseq = self.deepseq_1_3_0_1; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 988ec9a53a6..252bef7d6d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -589,8 +589,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bimap = callPackage ../development/libraries/haskell/bimap {}; - binary_hackage = callPackage ../development/libraries/haskell/binary {}; - binary = self.binary_hackage; # core package since ghc-7.2.1 + binary = callPackage ../development/libraries/haskell/binary {}; binaryShared = callPackage ../development/libraries/haskell/binary-shared {}; From 143c64732ceb5b19225721a6db925607df95c9a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:13:11 +0200 Subject: [PATCH 055/162] all-packages.nix: tabs --> blanks --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad38930d467..ac9fed3d382 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6905,9 +6905,9 @@ let # A variant of the Darcs derivation that containts only the executable and # thus has no dependencies on other Haskell packages. cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // { - isLibrary = false; - configureFlags = "-f-library"; }); }.final; - }; + isLibrary = false; + configureFlags = "-f-library"; }); }.final; + }; }; darktable = callPackage ../applications/graphics/darktable { From 0d6f43f2c84668ce9f8ea40d9ad093e242938e10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:17:40 +0200 Subject: [PATCH 056/162] haskell-digestive-functors: jailbreak to fix the build --- .../development/libraries/haskell/digestive-functors/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 98a2a7d3476..1d3f31e5568 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { HUnit mtl QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; From 79fe788106ee0ddac175e87210c4221f4ccb96d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:19:40 +0200 Subject: [PATCH 057/162] haskell-symbol: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/symbol/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index d82a1968878..e92c2ec03ad 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.4"; sha256 = "00318syprv1ixfbr4v7xq86z10f0psxk0b8kaxvawvacm8hp61bn"; buildDepends = [ deepseq syb ]; + jailbreak = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "A 'Symbol' type for fast symbol comparison"; From 709718a30773c9b5aac8916d103bd2372e7420ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:20:11 +0200 Subject: [PATCH 058/162] haskell-happstack-util: drop obsolete package --- .../haskell/happstack/happstack-util.nix | 23 ------------------- pkgs/top-level/haskell-packages.nix | 2 -- pkgs/top-level/release-haskell.nix | 1 - 3 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/happstack/happstack-util.nix diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix deleted file mode 100644 index 8dfac311a9a..00000000000 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, extensibleExceptions, filepath, hslogger, mtl, network -, parsec, random, time, unixCompat -}: - -cabal.mkDerivation (self: { - pname = "happstack-util"; - version = "6.0.3"; - sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - extensibleExceptions filepath hslogger mtl network parsec random - time unixCompat - ]; - jailbreak = true; - meta = { - homepage = "http://happstack.com"; - description = "Web framework"; - 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 252bef7d6d8..01c185cff12 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1071,8 +1071,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hamlet = callPackage ../development/libraries/haskell/hamlet {}; - happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {}; - happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {}; happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9a3bae89f9c..1bf2127a86d 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -183,7 +183,6 @@ mapHaskellTestOn { hamlet = default; happstackHamlet = default; happstackServer = default; - happstackUtil = default; happy = all; hashable = default; hashedStorage = default; From d7c578285aa3b3418649008d971e68015c9d6e41 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:09:00 +0200 Subject: [PATCH 059/162] haskell-wx-direct: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index a1caaef1bc9..08512c20625 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -7,6 +7,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ parsec strict time ]; + patchPhase = '' + sed -i -e 's|containers >=.*|containers|' wxdirect.cabal + ''; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; From d9c5a29897b3c24f89a9ff8a1709cb699065f8d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:09:44 +0200 Subject: [PATCH 060/162] haskell-gloss: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/gloss/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 31128c382b6..003207e77ae 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.7.8.3"; sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr"; buildDepends = [ bmp GLUT OpenGL ]; + jailbreak = true; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; From ff1dbd50b80941edb267358df8890fc03ebc663b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:15:02 +0200 Subject: [PATCH 061/162] haskell-HFuse: fix capitalization of directory name --- pkgs/development/libraries/haskell/{hfuse => HFuse}/default.nix | 0 pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/haskell/{hfuse => HFuse}/default.nix (100%) diff --git a/pkgs/development/libraries/haskell/hfuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/hfuse/default.nix rename to pkgs/development/libraries/haskell/HFuse/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 01c185cff12..b3f866895b6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1143,7 +1143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); heist = callPackage ../development/libraries/haskell/heist {}; - HFuse = callPackage ../development/libraries/haskell/hfuse {}; + HFuse = callPackage ../development/libraries/haskell/HFuse {}; highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; From 36aaa263d3b83911f378bf9250e3fe041eb0dac2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:16:26 +0200 Subject: [PATCH 062/162] cabal2ghci: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/tools/haskell/cabal2ghci/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix index 881328d875b..cd7bf9dc9d1 100644 --- a/pkgs/development/tools/haskell/cabal2ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { Cabal cmdargs stylishHaskell systemFileio systemFilepath text unorderedContainers yaml ]; + jailbreak = true; meta = { description = "A tool to generate .ghci file from .cabal"; license = self.stdenv.lib.licenses.bsd3; From c009bddb19210493138811fed75a256007bfe1fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:16:59 +0200 Subject: [PATCH 063/162] haskell-language-c-quote: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/language-c-quote/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 4c281642277..35d15c0291a 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { HUnit srcloc symbol testFramework testFrameworkHunit ]; buildTools = [ alex happy ]; + jailbreak = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; From 93eb171838ca7eca25f3d6b99227da0d4b10b766 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:17:10 +0200 Subject: [PATCH 064/162] Hipmunk: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index fee71449142..c07060cf197 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "5.2.0.10"; sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95"; buildDepends = [ StateVar transformers ]; + patchPhase = '' + sed -i -e 's|containers.*,|containers,|' Hipmunk.cabal + ''; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; description = "A Haskell binding for Chipmunk"; From 41f9d7d83cce13c181aca03dd3e08b3116f3a801 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:17:20 +0200 Subject: [PATCH 065/162] benchpress: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/benchpress/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index c80f04f966d..9218e50b767 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2.6"; sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg"; buildDepends = [ mtl time ]; + jailbreak = true; meta = { homepage = "http://github.com/tibbe/benchpress"; description = "Micro-benchmarking with detailed statistics"; From 3eab69da503e7679f6f699039673352a16c718d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:17:29 +0200 Subject: [PATCH 066/162] haskell-distributed-process: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- .../libraries/haskell/distributed-process/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index d23a5ef0228..95f7993da22 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { testFrameworkHunit ]; noHaddock = true; + jailbreak = true; doCheck = false; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; From 4f6d1ad646cdfe1710e29de38a6fa378d9144382 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:29:29 +0200 Subject: [PATCH 067/162] haskell-packages.nix: fix spelling of type-level-numbers attribute --- pkgs/top-level/haskell-packages.nix | 2 +- pkgs/top-level/release-haskell.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b3f866895b6..b78e423d869 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1927,7 +1927,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); typeEquality = callPackage ../development/libraries/haskell/type-equality {}; - typeLlevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; + typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; unbound = callPackage ../development/libraries/haskell/unbound {}; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 1bf2127a86d..790e1c5ff2c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -386,7 +386,7 @@ mapHaskellTestOn { transformersBase = default; transformersCompat = default; tuple = default; - typeLlevelNaturalNumber = default; + typeLevelNaturalNumber = default; uniplate = default; uniqueid = default; unixCompat = default; From 7b48b3acf6bc294d7c8878cf79fed515820afc98 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:35:18 +0200 Subject: [PATCH 068/162] haskell-wx-core: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 98032d91c8e..5dde5e8fc3f 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -8,6 +8,9 @@ cabal.mkDerivation (self: { sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; + patchPhase = '' + sed -i -e 's|containers >=.*|containers|' wxcore.cabal + ''; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; From 02c1dd624ff88e8708d23fc88316ff99ad09e0fb Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Thu, 30 May 2013 12:41:29 +0200 Subject: [PATCH 069/162] Add vanitygen --- pkgs/applications/misc/vanitygen/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/vanitygen/default.nix diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix new file mode 100644 index 00000000000..1aa3f57ecca --- /dev/null +++ b/pkgs/applications/misc/vanitygen/default.nix @@ -0,0 +1,38 @@ +{ fetchurl, stdenv, openssl, pcre }: + +stdenv.mkDerivation rec { + version = "0.21"; + name = "vanitygen-${version}"; + + src = fetchurl { + name = "vanitygen-${version}.tar.gz"; + url = "https://github.com/samr7/vanitygen/tarball/0.21"; + sha256 = "1lj0gi08lg0pcby5pbpi08ysynzy24qa1n1065112shkpasi0kxv"; + }; + + buildInputs = [ openssl pcre ]; + + installPhase = '' + ensureDir $out/bin + cp vanitygen $out/bin + cp keyconv $out/bin/vanitygen-keyconv + ''; + + meta = { + description = "Bitcoin vanity address generator"; + longDescription= '' + Vanitygen can search for exact prefixes or regular expression + matches, so you can generate Bitcoin addresses that starts + with the needed mnemonic. + + Vanitygen can generate regular bitcoin addresses, namecoin + addresses, and testnet addresses. + + When searching for exact prefixes, vanitygen will ensure that + the prefix is possible, will provide a difficulty estimate, + and will run about 30% faster. + ''; + homepage = "https://github.com/samr7/vanitygen"; + license = "AGPLv3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 829d8a983bf..94d923d7155 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8125,6 +8125,8 @@ let gtk = gtk3; }; + vanitygen = callPackage ../applications/misc/vanitygen { }; + vbindiff = callPackage ../applications/editors/vbindiff { }; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; From 03d4faa703feb8ed887d654be0a72ae4cf25104d Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 30 May 2013 13:30:30 +0200 Subject: [PATCH 070/162] bittorrentSync: fix hash --- pkgs/applications/networking/bittorrentsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index 842dd8a8826..ae339abb799 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -16,7 +16,7 @@ let version = "1.0.134"; sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7" - else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jakbt" + else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jak" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { From 1f4c75f9e8af11b5568df0304f008dd6054733c4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 30 May 2013 15:02:36 +0200 Subject: [PATCH 071/162] Update euca2ools to 2.1.3 --- pkgs/tools/virtualization/euca2ools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index ce84706c356..ae488b0f359 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchgit, which, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "euca2ools-2.0.0-pre-20111230"; + name = "euca2ools-2.1.3"; namePrefix = ""; src = fetchgit { url = https://github.com/eucalyptus/euca2ools.git; - rev = "0032f7c85603f34b728a6f8bc6f25d7e4892432e"; - sha256 = "ae3c3918d60411ebf15faefb6dc94e3a98ab73cf751d8180c52f51b19ed64c09"; + rev = "8ae2ecc"; + sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b"; }; pythonPath = [ pythonPackages.boto pythonPackages.m2crypto pythonPackages.ssl ]; + doCheck = false; + meta = { homepage = http://open.eucalyptus.com/downloads; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; From 7c3c250a2cfe7527ad5d0bbe6f5a22ed898ef191 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 30 May 2013 15:05:39 +0200 Subject: [PATCH 072/162] Add snort-2.9.4.6 --- .../networking/ids/daq/default.nix | 19 +++++++++++++++++++ .../networking/ids/snort/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/applications/networking/ids/daq/default.nix create mode 100644 pkgs/applications/networking/ids/snort/default.nix diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix new file mode 100644 index 00000000000..92175bb23e9 --- /dev/null +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, flex, bison, libpcap}: + +stdenv.mkDerivation rec { + name = "daq-2.0.0"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = http://www.snort.org/downloads/2311; + sha256 = "0f0w5jfmx0n2sms4f2mfg984a27r7qh927vkd7fclvx9cbiwibzv"; + }; + + buildInputs = [ flex bison libpcap ]; + + meta = { + description = "Data AcQuisition library (DAQ), for packet I/O"; + homepage = http://www.snort.org; + license = "GPLv2"; + }; +} diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix new file mode 100644 index 00000000000..b674f3a83fb --- /dev/null +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: + +stdenv.mkDerivation rec { + name = "snort-2.9.4.6"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = http://www.snort.org/downloads/2320; + sha256 = "1g5kn36l67a5m95h2shqwqbbjb6rgl3sf1bciakal2l4n6857ang"; + }; + + buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; + + meta = { + description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; + homepage = http://www.snort.org; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac9fed3d382..5a7b082863e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -652,6 +652,8 @@ let dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { }; + daq = callPackage ../applications/networking/ids/daq { }; + dar = callPackage ../tools/archivers/dar { }; davfs2 = callPackage ../tools/filesystems/davfs2 { }; @@ -1634,6 +1636,8 @@ let smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; + snort = callPackage ../applications/networking/ids/snort { }; + snx = callPackage_i686 ../tools/networking/snx { inherit (pkgsi686Linux) pam gcc33; inherit (pkgsi686Linux.xlibs) libX11; From 316e78098ce0a940c3af775e2fe10da57e483539 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 30 May 2013 09:05:55 -0400 Subject: [PATCH 073/162] Add mkdirp as a top-level nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 14 ++++++++++++-- pkgs/top-level/node-packages.json | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index a185eaee1d0..62773f16f56 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1064,6 +1064,16 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-*"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } { baseName = "mkdirp"; version = "0.3.5"; @@ -1322,9 +1332,9 @@ } { baseName = "optimist"; - version = "0.5.0"; + version = "0.5.1"; fullName = "optimist-*"; - hash = "b0c4b65a456618f179946e0b0641643b9d70ea5d884afa5bbf94419f740b1ccf"; + hash = "89307bc0c5f010a0ad3f53aaf5ed3a63bd0763c2239e5e26fafb60a2eb0df195"; patchLatest = false; topLevel = true; dependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 516754fdef5..aee35a797b2 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -33,4 +33,5 @@ , "semver" , "npm2nix" , "ansi-remover" +, "mkdirp" ] From 6c4c1c4fb6b5465670f175c5c0b1989b33396223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 12:09:44 +0200 Subject: [PATCH 074/162] Updating opencascade to 6.6.0 --- .../libraries/opencascade/default.nix | 26 ++++++------------- pkgs/top-level/all-packages.nix | 5 +--- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 7cc47a30eb7..1ce38ab7b3c 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,33 +1,23 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, -ftgl, freetype}: +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.5.4"; + name = "opencascade-6.6.0"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; - sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; + url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz; + sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3"; }; - buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; + buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ]; preUnpack = '' - sourceRoot=`pwd`/ros + sourceRoot=`pwd`/ros/adm/cmake + cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" ''; - preConfigure = '' - sh ./build_configure - ''; - - # -fpermissive helps building opencascade, although gcc detects a flaw in the code - # and reports an error otherwise. Further versions may fix that. - NIX_CFLAGS_COMPILE = "-fpermissive"; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; - postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} - cp -R ../doc $out/share/doc/${name} + cp -R ../../../doc $out/share/doc/${name} ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a7b082863e..523cf4381b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4816,10 +4816,7 @@ let openbabel = callPackage ../development/libraries/openbabel { }; - opencascade = callPackage ../development/libraries/opencascade { - automake = automake111x; - ftgl = ftgl212; - }; + opencascade = callPackage ../development/libraries/opencascade { }; opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; From 71229f8eb904361ddf819e35d96e1cfb128e22fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 15:11:20 +0200 Subject: [PATCH 075/162] digikam: updating (2.9 for kde 4.7/8, 3.2 for kde 4.10) --- pkgs/applications/graphics/digikam/2.nix | 32 +++++++++++++++++++ .../applications/graphics/digikam/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 5 ++- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/graphics/digikam/2.nix diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix new file mode 100644 index 00000000000..be991772d39 --- /dev/null +++ b/pkgs/applications/graphics/digikam/2.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, +lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, +liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, +shared_desktop_ontologies, marble, mysql }: + +stdenv.mkDerivation rec { + name = "digikam-2.9.0"; + + src = fetchurl { + url = "mirror://sourceforge/digikam/${name}.tar.bz2"; + sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk"; + }; + + nativeBuildInputs = [ cmake automoc4 pkgconfig ]; + + buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff + jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw + opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ]; + + # Make digikam find some FindXXXX.cmake + KDEDIRS="${marble}:${qjson}"; + + enableParallelBuilding = true; + + meta = { + description = "Photo Management Program"; + license = "GPL"; + homepage = http://www.digikam.org; + maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + inherit (kdelibs.meta) platforms; + }; +} diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 7b92d5e1690..27d8ae546da 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { - name = "digikam-2.6.0"; + name = "digikam-3.2.0"; src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721"; + sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 523cf4381b8..77dc18a4c7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8725,7 +8725,10 @@ let calligra = callPackage ../applications/office/calligra { }; - digikam = callPackage ../applications/graphics/digikam { }; + digikam = if builtins.compareVersions "4.9" kde4.release == 1 then + callPackage ../applications/graphics/digikam/2.nix { } + else + callPackage ../applications/graphics/digikam { }; k3b = callPackage ../applications/misc/k3b { }; From df81da4ac20cba07e791c5c4de7ed116781447ff Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 30 May 2013 16:01:18 +0200 Subject: [PATCH 076/162] add nodePackages.jshint --- pkgs/top-level/node-packages-generated.nix | 81 ++++++++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 82 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 62773f16f56..b70c5194b8b 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -232,6 +232,17 @@ dependencies = [ ]; } + { + baseName = "cli"; + version = "0.4.4-2"; + fullName = "cli-0.4.x"; + hash = "27a0db02501285da601c47495d0cd837ddeb4577bfd507c5503d2ee8cd0caffb"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "glob"; range = ">= 3.1.4"; } + ]; + } { baseName = "clone"; version = "0.1.5"; @@ -333,6 +344,16 @@ { name = "debug"; range = "*"; } ]; } + { + baseName = "console-browserify"; + version = "0.1.6"; + fullName = "console-browserify-0.1.x"; + hash = "e774c881920562b0893e50844332f79fc5a08752d28791d942c35fcc3ef2d75d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "cookie"; version = "0.0.5"; @@ -676,6 +697,19 @@ { name = "inherits"; range = "1"; } ]; } + { + baseName = "glob"; + version = "3.2.1"; + fullName = "glob->= 3.1.4"; + hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.11"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "1"; } + ]; + } { baseName = "graceful-fs"; version = "1.2.1"; @@ -873,6 +907,21 @@ dependencies = [ ]; } + { + baseName = "jshint"; + version = "2.1.2"; + fullName = "jshint-*"; + hash = "dcf2c9df4de942240c99c5ed2e1c44b55966a1c0d85fb6fcbdde583ea6ace5a4"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "shelljs"; range = "0.1.x"; } + { name = "underscore"; range = "1.4.x"; } + { name = "cli"; range = "0.4.x"; } + { name = "minimatch"; range = "0.x.x"; } + { name = "console-browserify"; range = "0.1.x"; } + ]; + } { baseName = "json-schema"; version = "0.2.2"; @@ -1052,6 +1101,18 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch-0.x.x"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } { baseName = "minimatch"; version = "0.2.12"; @@ -1600,6 +1661,16 @@ { name = "range-parser"; range = "0.0.4"; } ]; } + { + baseName = "shelljs"; + version = "0.1.4"; + fullName = "shelljs-0.1.x"; + hash = "21a6f3dc5eaeb1c10efbe62e31aeb6762241f707fb1fdcda4766c8bccde3eaf0"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "sigmund"; version = "1.0.0"; @@ -1763,6 +1834,16 @@ dependencies = [ ]; } + { + baseName = "underscore"; + version = "1.4.4"; + fullName = "underscore-1.4.x"; + hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "underscore"; version = "1.4.4"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index aee35a797b2..8116f769654 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -34,4 +34,5 @@ , "npm2nix" , "ansi-remover" , "mkdirp" +, "jshint" ] From 298f8fc459129368b860e652cce24a12fc4f0dd6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 30 May 2013 18:13:50 +0200 Subject: [PATCH 077/162] Added bro 2.1 --- .../networking/ids/bro/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/ids/bro/default.nix diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix new file mode 100644 index 00000000000..6e70e106d26 --- /dev/null +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl, geoip, gperftools }: + +stdenv.mkDerivation rec { + name = "bro-2.1"; + + src = fetchurl { + url = "http://www.bro.org/downloads/release/${name}.tar.gz"; + sha256 = "1q2mm7rbgjcn01na2wm5fdfdm9pggzgljxj0n127s93fip3vg0qd"; + }; + + buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ]; + + USER="something"; + + enableParallelBuilding = true; + + meta = { + description = "Bro is a powerful network analysis framework that is much different from the typical IDS you may know."; + homepage = http://www.bro.org/; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dc18a4c7a..76f3fe907d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -495,6 +495,8 @@ let bootchart = callPackage ../tools/system/bootchart { }; + bro = callPackage ../applications/networking/ids/bro { }; + bsod = callPackage ../misc/emulators/bsod { }; btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; From 94d83c895352d1a94a61e7ceb0edf5efac567145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 18:46:30 +0200 Subject: [PATCH 078/162] digikam 3.2: fixing url --- pkgs/applications/graphics/digikam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 27d8ae546da..713adaffd06 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "digikam-3.2.0"; src = fetchurl { - url = "mirror://sourceforge/digikam/${name}.tar.bz2"; + url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx"; }; From 270f861dde3ca89c89228a7fbd78f185e1eb0fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 19:25:01 +0200 Subject: [PATCH 079/162] Setting opencascade 6.5 to freecad for it to build. --- .../development/libraries/opencascade/6.5.nix | 41 +++++++++++++++++++ .../libraries/opencascade/default.nix | 26 ++++++++---- pkgs/top-level/all-packages.nix | 6 ++- 3 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/opencascade/6.5.nix diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix new file mode 100644 index 00000000000..7cc47a30eb7 --- /dev/null +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, +ftgl, freetype}: + +stdenv.mkDerivation rec { + name = "opencascade-6.5.4"; + src = fetchurl { + url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; + sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; + }; + + buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; + + preUnpack = '' + sourceRoot=`pwd`/ros + ''; + + preConfigure = '' + sh ./build_configure + ''; + + # -fpermissive helps building opencascade, although gcc detects a flaw in the code + # and reports an error otherwise. Further versions may fix that. + NIX_CFLAGS_COMPILE = "-fpermissive"; + + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; + + postInstall = '' + mv $out/inc $out/include + mkdir -p $out/share/doc/${name} + cp -R ../doc $out/share/doc/${name} + ''; + + enableParallelBuilding = true; + + meta = { + description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; + homepage = http://www.opencascade.org/; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 1ce38ab7b3c..7cc47a30eb7 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,23 +1,33 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}: +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, +ftgl, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.6.0"; + name = "opencascade-6.5.4"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz; - sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3"; + url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; + sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; }; - buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ]; + buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; preUnpack = '' - sourceRoot=`pwd`/ros/adm/cmake - cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" + sourceRoot=`pwd`/ros ''; + preConfigure = '' + sh ./build_configure + ''; + + # -fpermissive helps building opencascade, although gcc detects a flaw in the code + # and reports an error otherwise. Further versions may fix that. + NIX_CFLAGS_COMPILE = "-fpermissive"; + + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; + postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} - cp -R ../../../doc $out/share/doc/${name} + cp -R ../doc $out/share/doc/${name} ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76f3fe907d0..5f0edb6eb46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4820,6 +4820,8 @@ let opencascade = callPackage ../development/libraries/opencascade { }; + opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { }; + opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; opencsg = callPackage ../development/libraries/opencsg { }; @@ -7221,7 +7223,9 @@ let # !!! Fix the dependency on two different builds of nss. }; - freecad = callPackage ../applications/graphics/freecad { }; + freecad = callPackage ../applications/graphics/freecad { + opencascade = opencascade_6_5; + }; freemind = callPackage ../applications/misc/freemind { jdk = jdk; From b810381cceb45fd6cca14dd5895c6aad0c747a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 19:26:15 +0200 Subject: [PATCH 080/162] Ouch. I rolled back the default opencascade by error. --- .../libraries/opencascade/default.nix | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 7cc47a30eb7..1ce38ab7b3c 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,33 +1,23 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, -ftgl, freetype}: +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.5.4"; + name = "opencascade-6.6.0"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; - sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; + url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz; + sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3"; }; - buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; + buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ]; preUnpack = '' - sourceRoot=`pwd`/ros + sourceRoot=`pwd`/ros/adm/cmake + cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" ''; - preConfigure = '' - sh ./build_configure - ''; - - # -fpermissive helps building opencascade, although gcc detects a flaw in the code - # and reports an error otherwise. Further versions may fix that. - NIX_CFLAGS_COMPILE = "-fpermissive"; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; - postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} - cp -R ../doc $out/share/doc/${name} + cp -R ../../../doc $out/share/doc/${name} ''; enableParallelBuilding = true; From 19dd9dc877150f74be172409132855c190b6d778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 20:13:41 +0200 Subject: [PATCH 081/162] Firefox 20 reference in release.nix. Fixing. --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 11102f89155..32494f64ad2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -359,7 +359,7 @@ let }; firefox36Pkgs.firefox = linux; - firefox20Pkgs.firefox = linux; + firefox21Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 17119e38e3e78678801c5ac4881d4c35e7cd0b8d Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 31 May 2013 01:07:36 +0000 Subject: [PATCH 082/162] licenses: Add AGPLv3 and fix links to BSD licenses --- pkgs/lib/licenses.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index fee430a4067..385993a320e 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -4,6 +4,18 @@ * add it to this list. The URL mentioned above is a good source for inspiration. */ + agpl3 = { + shortName = "AGPLv3"; + fullName = "GNU Affero General Public License version 3 only"; + url = https://www.gnu.org/licenses/agpl.html; + }; + + agpl3Plus = { + shortName = "AGPLv3+"; + fullName = "GNU Affero General Public License version 3 or later"; + url = https://www.gnu.org/licenses/agpl.html; + }; + asl20 = { shortName = "ASL2.0"; fullName = "Apache Software License 2.0"; @@ -19,13 +31,13 @@ bsd2 = { shortName = "BSD-2"; fullName = "BSD license (2 clause)"; - url = http://www.freebsd.org/copyright/freebsd-license.html; + url = http://opensource.org/licenses/BSD-2-Clause; }; bsd3 = { shortName = "BSD-3"; fullName = "BSD license (3 clause)"; - url = http://www.opensource.org/licenses/bsd-license.php; + url = http://opensource.org/licenses/BSD-3-Clause; }; bsdOriginal = { From 96b01e999f1641d79ba0cc034dca985e5fad43dd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 31 May 2013 01:09:44 +0000 Subject: [PATCH 083/162] setuptools: Fix download link (the old one was returning 404) --- pkgs/development/python-modules/setuptools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 468ea50c924..92c39afc249 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { - name = "python-setuptools-" + version; + shortName = "setuptools-${version}"; + name = "python-${shortName}"; version = "0.6c11"; src = fetchurl { - url = "http://pypi.python.org/packages/source/s/setuptools/${name}.tar.gz"; + url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3"; }; From 9b9bd3d0553c04e81a8f68c36e82a79cbe43f01d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 09:25:02 +0200 Subject: [PATCH 084/162] libf2c: fixing hash. The changes: diff -r lold/arithchk.c l/arithchk.c 218a219,221 > if (sizeof(long long) > sizeof(long) > && sizeof(long long) == sizeof(void*)) > fprintf(f, "#define LONG_LONG_POINTERS\n"); diff -r lold/README l/README 41c41 < message to netlib@netlib.bell-labs.com --- > message to netlib@netlib.org --- pkgs/development/libraries/libf2c/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index edcf177add7..9e6832fc2a3 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = http://www.netlib.org/f2c/libf2c.zip; - sha256 = "14py0zdwzj5gqjzi0z2hlcy3czpzx1fav55akdj143qgav8h6dav"; + sha256 = "1mcp1lh7gay7hm186dr0wvwd2bc05xydhnc1qy3dqs4n3r102g7i"; }; unpackPhase = '' From ce88984ecc6613d22b5ebe95238f7b62e4022c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 09:58:49 +0200 Subject: [PATCH 085/162] New URLs for coin3d --- pkgs/development/libraries/coin3d/default.nix | 2 +- pkgs/development/libraries/soqt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index f676c9abaa0..b477a88ed53 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.1.3"; src = fetchurl { - url = "http://ftp.coin3d.org/coin/src/all/Coin-${version}.tar.gz"; + url = "https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz"; sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q"; }; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 80fbb53953a..7d655ae122a 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.0"; src = fetchurl { - url = "http://ftp.coin3d.org/coin/src/all/SoQt-${version}.tar.gz"; + url = "https://bitbucket.org/Coin3D/coin/downloads/SoQt-${version}.tar.gz"; sha256 = "14dbh8ynzjcgwgxjc6530c5plji7vn62kbdf447w0dp53564p8zn"; }; From 85d2bf78e1e74e392b066f98f0199d7b887a0c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 10:08:38 +0200 Subject: [PATCH 086/162] I forgot to bring back opencascade 6.5 overrides. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f0edb6eb46..46441fc2ea9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4820,7 +4820,10 @@ let opencascade = callPackage ../development/libraries/opencascade { }; - opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { }; + opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { + automake = automake111x; + ftgl = ftgl212; + }; opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; From 758f20f0b8b7ed25268e308bb5be6cb29668a05f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 31 May 2013 12:38:26 -0400 Subject: [PATCH 087/162] node-packages.nix: Move non top-level attrs to a sub-attr `full' Since `full' isn't recursed into for derivations, nix-env -qaP * won't show attributes with problematic characters. Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 35 ++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index e38cd3e6936..8eb14a5c521 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -3,22 +3,27 @@ let inherit (self) buildNodePackage patchLatest; - importGeneratedPackages = generated: nativeDeps: self: builtins.listToAttrs (pkgs.lib.fold (pkg: pairs: - (pkgs.lib.optional pkg.topLevel { name = pkg.baseName; value = builtins.getAttr pkg.fullName self; }) ++ [ - { - name = pkg.fullName; - value = buildNodePackage rec { - name = "${pkg.baseName}-${pkg.version}"; - src = (if pkg.patchLatest then patchLatest else fetchurl) { - url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; - sha256 = pkg.hash; - }; - deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self) pkg.dependencies; - buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else []; + importGeneratedPackages = generated: nativeDeps: self: + let + all = pkgs.lib.fold (pkg: { top-level, full }: { + top-level = top-level ++ pkgs.lib.optional pkg.topLevel { + name = pkg.baseName; + value = builtins.getAttr pkg.fullName self.full; }; - } - ] ++ pairs - ) [] generated); + full = [ { + name = pkg.fullName; + value = buildNodePackage rec { + name = "${pkg.baseName}-${pkg.version}"; + src = (if pkg.patchLatest then patchLatest else fetchurl) { + url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; + sha256 = pkg.hash; + }; + deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self.full) pkg.dependencies; + buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else []; + }; + } ] ++ full; + } ) { top-level = []; full = []; } generated; + in builtins.listToAttrs all.top-level // { full = builtins.listToAttrs all.full; }; self = { inherit importGeneratedPackages; From 210246266d15ccf5858798416fc2673d2cdff5f9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 31 May 2013 12:50:28 -0400 Subject: [PATCH 088/162] Make overrides of nodePackages work Signed-off-by: Shea Levy --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/node-packages.nix | 46 +++++++++++++++----------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46441fc2ea9..8493daf2de0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1101,6 +1101,7 @@ let nodePackages = recurseIntoAttrs (import ./node-packages.nix { inherit pkgs stdenv nodejs fetchurl; neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux; + self = pkgs.nodePackages; }); ldns = callPackage ../development/libraries/ldns { }; diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 8eb14a5c521..03f85af3c0d 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, nodejs, fetchurl, neededNatives }: +{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self }: let inherit (self) buildNodePackage patchLatest; @@ -24,30 +24,28 @@ let } ] ++ full; } ) { top-level = []; full = []; } generated; in builtins.listToAttrs all.top-level // { full = builtins.listToAttrs all.full; }; +in { + inherit importGeneratedPackages; - self = { - inherit importGeneratedPackages; + nativeDeps = { + "node-expat-*" = [ pkgs.expat ]; + "rbytes-0.0.2" = [ pkgs.openssl ]; + }; - nativeDeps = { - "node-expat-*" = [ pkgs.expat ]; - "rbytes-0.0.2" = [ pkgs.openssl ]; - }; + buildNodePackage = import ../development/web/nodejs/build-node-package.nix { + inherit stdenv nodejs neededNatives; + inherit (pkgs) runCommand; + }; - buildNodePackage = import ../development/web/nodejs/build-node-package.nix { - inherit stdenv nodejs neededNatives; - inherit (pkgs) runCommand; - }; + patchLatest = srcAttrs: + let src = fetchurl srcAttrs; in pkgs.runCommand src.name {} '' + mkdir unpack + cd unpack + tar xf ${src} + mv */ package 2>/dev/null || true + sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json + tar cf $out * + ''; - patchLatest = srcAttrs: - let src = fetchurl srcAttrs; in pkgs.runCommand src.name {} '' - mkdir unpack - cd unpack - tar xf ${src} - mv */ package 2>/dev/null || true - sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json - tar cf $out * - ''; - - /* Put manual packages below here (ideally eventually managed by npm2nix */ - } // importGeneratedPackages (import ./node-packages-generated.nix) self.nativeDeps self; -in self + /* Put manual packages below here (ideally eventually managed by npm2nix */ +} // importGeneratedPackages (import ./node-packages-generated.nix) self.nativeDeps self From 9efcf4f6fe1094e7894117a0cbdf5055d8b824db Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 31 May 2013 13:27:55 -0400 Subject: [PATCH 089/162] Make nodePackages individually overridable Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 03f85af3c0d..a23b776d112 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -12,7 +12,7 @@ let }; full = [ { name = pkg.fullName; - value = buildNodePackage rec { + value = pkgs.lib.makeOverridable buildNodePackage rec { name = "${pkg.baseName}-${pkg.version}"; src = (if pkg.patchLatest then patchLatest else fetchurl) { url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; From 059af7e759a2e6af724e8f04763a294f3d446322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:44:49 +0200 Subject: [PATCH 090/162] Revert "Firefox 20 reference in release.nix. Fixing." This reverts commit 19dd9dc877150f74be172409132855c190b6d778. --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 32494f64ad2..11102f89155 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -359,7 +359,7 @@ let }; firefox36Pkgs.firefox = linux; - firefox21Pkgs.firefox = linux; + firefox20Pkgs.firefox = linux; gnome = { gnome_panel = linux; From b7e5f363c756d396a2be02bd5b6f4031b1badd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:45:00 +0200 Subject: [PATCH 091/162] Revert "Fixing firefox reference" This reverts commit a17b45686b3f1ad656771848ab5bf3bc3c758e2a. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8493daf2de0..0e3eca2ca95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7192,7 +7192,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox21Pkgs; + firefoxPkgs = pkgs.firefox20Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; From 2e6c1ebf4258dbb012474efb3b73f83ae5922058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:45:10 +0200 Subject: [PATCH 092/162] Revert "firefox update to 21.0" This reverts commit 971337a119d708d78a152f4d918694e7b5a2b7e8. --- .../networking/browsers/firefox/{21.0.nix => 20.0.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/applications/networking/browsers/firefox/{21.0.nix => 20.0.nix} (97%) diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix similarity index 97% rename from pkgs/applications/networking/browsers/firefox/21.0.nix rename to pkgs/applications/networking/browsers/firefox/20.0.nix index 1a23c9d9cf9..1480a300820 100644 --- a/pkgs/applications/networking/browsers/firefox/21.0.nix +++ b/pkgs/applications/networking/browsers/firefox/20.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "21.0"; + firefoxVersion = "20.0"; - xulVersion = "21.0"; # this attribute is used by other packages + xulVersion = "20.0"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha256 = "076rfh82m1b1hw10dzbgg13h63wmnispgyvag4nb20ylnlf0629r"; + sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218"; }; commonConfigureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e3eca2ca95..f87abe9082c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7213,12 +7213,12 @@ let firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; }); - firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix { + firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; - firefox21Wrapper = lowPrio (wrapFirefox { browser = firefox21Pkgs.firefox; }); + firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; }); flac = callPackage ../applications/audio/flac { }; From f7934d7b9d9c56584507079b6edc2986f4e8b401 Mon Sep 17 00:00:00 2001 From: bbenoist Date: Sat, 1 Jun 2013 00:49:30 +0200 Subject: [PATCH 093/162] Add numdiff-5.6.1 A little program that can be used to compare putatively similar files line by line and field by field, ignoring small numeric differences or/and different numeric formats. --- pkgs/tools/text/numdiff/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/text/numdiff/default.nix diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix new file mode 100644 index 00000000000..eb5ebf612b2 --- /dev/null +++ b/pkgs/tools/text/numdiff/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +let + version = "5.6.1"; +in +stdenv.mkDerivation { + name = "numdiff-${version}"; + src = fetchurl { + url = "http://ftp.igh.cnrs.fr/pub/nongnu/numdiff/numdiff-${version}.tar.gz"; + sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx"; + }; + meta = { + description = '' + A little program that can be used to compare putatively similar files + line by line and field by field, ignoring small numeric differences + or/and different numeric formats. + ''; + homepage = "http://www.nongnu.org/numdiff/"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = stdenv.lib.maintainers.bbenoist; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f87abe9082c..acfe1e20077 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1314,6 +1314,8 @@ let ntp = callPackage ../tools/networking/ntp { }; + numdiff = callPackage ../tools/text/numdiff { }; + nssmdns = callPackage ../tools/networking/nss-mdns { }; nylon = callPackage ../tools/networking/nylon { }; From 23fb448242e5d1e07f0a8b7107653337df32e4a2 Mon Sep 17 00:00:00 2001 From: bbenoist Date: Sat, 1 Jun 2013 01:16:36 +0200 Subject: [PATCH 094/162] php-5.4: Reintroduce the ftpSupport build option The ftpSupport build option I added on the 5.3 version of PHP was not present in the version 5.4 because it was not yet merged when I wrote my commit. --- pkgs/development/interpreters/php/5.4.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 13707709a7c..5a2af030c1e 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -144,6 +144,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-zip"]; }; + ftp = { + configureFlags = ["--enable-ftp"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -181,6 +185,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) mcryptSupport = config.php.mcrypt or false; bz2Support = config.php.bz2 or false; zipSupport = config.php.zip or true; + ftpSupport = config.php.ftp or true; }; configurePhase = '' From 0c6e22adbab989b6e9f25edb9baf3267664112ff Mon Sep 17 00:00:00 2001 From: bbenoist Date: Fri, 31 May 2013 23:42:44 +0200 Subject: [PATCH 095/162] qt: make docs, demos and examples optionnaly available As the only option before was to don't include them at all. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 60d59030c1f..ade9a67cbcc 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -10,6 +10,9 @@ , flashplayerFix ? false, gdk_pixbuf , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , developerBuild ? false +, docs ? false +, examples ? false +, demos ? false }: with stdenv.lib; @@ -72,7 +75,9 @@ stdenv.mkDerivation rec { -exceptions -xmlpatterns -make libs -make tools -make translations - -nomake demos -nomake examples -nomake docs + -${if demos then "" else "no"}make demos + -${if examples then "" else "no"}make examples + -${if docs then "" else "no"}make docs -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if buildMultimedia then "" else "-no"}-multimedia -audio-backend ${if developerBuild then "-developer-build" else ""} From 22194538d72274f714b346a328d71542e695b3b9 Mon Sep 17 00:00:00 2001 From: bbenoist Date: Sat, 1 Jun 2013 00:05:29 +0200 Subject: [PATCH 096/162] qtcreator: Update to 2.7.1 and improvements (merge #579) - Qt is now directly overriden in QtCreator's definition. - qt48Full can be used in a development environment to enable access to docs demos and examples. NOTE: It may be required to remove older configuration files located in ~/.config/QtProject and at ~/.config/Trolltech.conf to reconfigure qtcreator with the correct paths. I have found /nix/store/... paths in the following files: $HOME/.config/QtProject/qtcreator/toolchains.xml $HOME/.config/QtProject/qtcreator/qtversion.xml $HOME/.config/QtProject/qtcreator/helpcollection.qhc At the first launch, be sure to check your qtcreator's configuration by selecting Tools->Options. The most important parts are the Kits and QtVersion tabs located in the Build & Run section. --- pkgs/development/qtcreator/default.nix | 13 +++++++++---- pkgs/top-level/all-packages.nix | 8 ++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 60ff5ede75a..add0c08e95a 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchurl, qt4_for_qtcreator }: +{ stdenv, fetchurl, qt48 }: let - version = "2.6.0"; + baseVersion = "2.7"; + revision = "1"; + version = "${baseVersion}.${revision}"; + qt4_for_qtcreator = qt48.override { + developerBuild = true; + }; in stdenv.mkDerivation rec { name = "qtcreator-${version}"; src = fetchurl { - url = "http://origin.releases.qt-project.org/qtcreator/${version}/qt-creator-${version}-src.tar.gz"; - md5 = "9bf01098f84a0fe930b2718d11124204"; + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz"; + sha256 = "04vn7y3dkk9vi1rsmsxby57mvc2h9n5q842hayq2mdlsax4qnhjv"; }; buildInputs = [ qt4_for_qtcreator ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e948c3a294..4958059171e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4964,8 +4964,12 @@ let inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; }; - qt4_for_qtcreator = qt48.override { - developerBuild = true; + qt48Full = callPackage ../development/libraries/qt-4.x/4.8 { + # GNOME dependencies are not used unless gtkStyle == true + inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + docs = true; + demos = true; + examples = true; }; qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; From 295d6248ee6172a7a76ac51c37f4f35fe66139a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Jun 2013 14:13:01 +0200 Subject: [PATCH 097/162] release-haskell: drop packages that are broken in HP 2013.2.0.0 The following packages don't compile with recent versions of GHC and seem unmaintained, too: distributedProcess, Ebnf2ps, epic, HFuse, Hipmunk, hspread, ltk, multiset, strictConcurrency, vacuumCairo, wxcore, wx, wxdirect. --- pkgs/top-level/release-haskell.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 790e1c5ff2c..f08e5c8c58e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -133,19 +133,16 @@ mapHaskellTestOn { dimensional = default ++ latest; dimensionalTf = default ++ latest; directoryTree = default; - distributedProcess = default; dlist = default; dns = default; doctest = default ++ latest; dotgen = default; doubleConversion = default; - Ebnf2ps = default; editDistance = default; editline = default; emailValidate = default; entropy = default; enumerator = default; - epic = default; erf = default; failure = default; fclabels = default; @@ -197,11 +194,9 @@ mapHaskellTestOn { HDBC = default; HDBCPostgresql = default; HDBCSqlite3 = default; - HFuse = default; highlightingKate = default; hinotify = default; hint = default; - Hipmunk = default; hledger = default ++ latest; hledgerInterest = default ++ latest; hledgerLib = default ++ latest; @@ -221,7 +216,6 @@ mapHaskellTestOn { hslogger = default; hsloggerTemplate = default; hspec = default ++ latest; - hspread = default; HsSyck = default; HStringTemplate = default ++ latest; hsyslog = all; @@ -249,7 +243,6 @@ mapHaskellTestOn { liftedBase = default; ListLike = default; logfloat = default; - ltk = default; mainlandPretty = default; maude = default; MaybeT = default; @@ -271,7 +264,6 @@ mapHaskellTestOn { mtlparse = default; multiplate = default; multirec = default; - multiset = default; murmurHash = default; mwcRandom = default; nat = default; @@ -361,7 +353,6 @@ mapHaskellTestOn { storableComplex = default; storableRecord = default; streamproc = all; - strictConcurrency = default; strict = default; strptime = default; svgcairo = default; @@ -400,7 +391,6 @@ mapHaskellTestOn { uulib = default ++ latest; uuOptions = default; uuParsinglib = default; - vacuumCairo = default; vacuum = default; vcsRevision = default; Vec = default; @@ -416,9 +406,6 @@ mapHaskellTestOn { wlPprint = default ++ latest; wlPprintExtras = default; wlPprintTerminfo = default; - wxcore = default; - wx = default; - wxdirect = default; X11 = default; xhtml = all; xmlConduit = default; From fe231c5562148038320d1cdc96b24b8434f0c555 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Jun 2013 14:18:45 +0200 Subject: [PATCH 098/162] haskell-repa-examples: update to version 3.2.3.2 --- pkgs/development/libraries/haskell/repa-examples/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index bea9d9f7f04..0d65439f2c5 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "repa-examples"; - version = "3.2.3.1"; - sha256 = "1lflgpnig2ks2mwp7bywyjqr2v426gbk1675mkkvjncgr5ahf11g"; + version = "3.2.3.2"; + sha256 = "1l8bvaaap5gl62j9zinjgj8vlqq4b52p46hnj8kq9n09lxq6xq96"; isLibrary = false; isExecutable = true; buildDepends = [ From 4a09850b0f6e841604c8c2b12003541e0c049d15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Jun 2013 14:18:45 +0200 Subject: [PATCH 099/162] haskell-repa: update to version 3.2.3.3 --- pkgs/development/libraries/haskell/repa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index 66a8838c8d8..ae56ba5157a 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "3.2.3.2"; - sha256 = "0xwaqkir4gjlhnvd1r69ycswg4p65ig38d2np69hv195zr47pmvh"; + version = "3.2.3.3"; + sha256 = "0rdny7yjcmz9iy07sqnjmwyr58f0kyzzdycwi55j963rb4vqkacn"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; From bc17e069f90a6941c112e4811fc7f9d7c3617f0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Jun 2013 14:18:45 +0200 Subject: [PATCH 100/162] haskell-shakespeare-i18n: update to version 1.0.0.3 --- .../libraries/haskell/shakespeare-i18n/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 1150ead0394..667edcdce1c 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -1,10 +1,11 @@ -{ cabal, parsec, shakespeare, text }: +{ cabal, hspec, parsec, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "1.0.0.2"; - sha256 = "11ydkl6v31v79q8a8fqf4p99p7dv9dlimr3rhi9cs5lrxz9gmf5z"; + version = "1.0.0.3"; + sha256 = "0k5daz6ayc4d6zxsq7p27bp5fq4qr31qxw9z9mwb5xcz2404d00r"; buildDepends = [ parsec shakespeare text ]; + testDepends = [ hspec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A type-based approach to internationalization"; From def6e9d78ee7aae259fbc007356b7326321a8875 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Jun 2013 14:18:45 +0200 Subject: [PATCH 101/162] haskell-stm-chans: update to version 3.0.0 --- pkgs/development/libraries/haskell/stm-chans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix index 16dc7622031..e8bd79a9a80 100644 --- a/pkgs/development/libraries/haskell/stm-chans/default.nix +++ b/pkgs/development/libraries/haskell/stm-chans/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "stm-chans"; - version = "2.0.0"; - sha256 = "041dmjmr70was4vxf1ihizzarms7a8x53m80i65ggxxmq5xqmsa3"; + version = "3.0.0"; + sha256 = "1nnl5h88dshcmk0ydhkf84kkf6989igxry9r0z7lwlxfgf7q9nim"; buildDepends = [ stm ]; meta = { homepage = "http://code.haskell.org/~wren/"; From 2bc98d2b398e4b9a47537121b20513a4e8f4a85a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Jun 2013 14:18:45 +0200 Subject: [PATCH 102/162] haskell-stm-conduit: update to version 2.1.0 --- pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 5a5470251b1..79171aefb9f 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.0.0"; - sha256 = "015gz4fqijgcs6dls5l8ry47q4a33a6ik0hsj5mw48iw44af39jr"; + version = "2.1.0"; + sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l"; buildDepends = [ conduit resourcet stm stmChans transformers ]; testDepends = [ conduit HUnit QuickCheck stm stmChans testFramework From e8b8efa471ea3265a55553a19b423b626fe5f681 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Jun 2013 14:18:45 +0200 Subject: [PATCH 103/162] haskell-cabal2nix: update to version 1.50 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index d213c5392a8..4e941be7998 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.49"; - sha256 = "1zrxgaw1lqnnyk4xd0skdc72yq3xfx3vfg1sfgrs3235njraa20i"; + version = "1.50"; + sha256 = "1ascgayijfa8d85245bggf9h1rgrji3h4gwiapi1v3z389aj0zjw"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 081ca56cc9da9a6b4b3d880947940561afd9dd34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Jun 2013 14:22:12 +0200 Subject: [PATCH 104/162] haskell-yesod-platform: add version 1.2.0.1 --- .../haskell/yesod-platform/default.nix | 65 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/libraries/haskell/yesod-platform/default.nix diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix new file mode 100644 index 00000000000..09514ea9316 --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -0,0 +1,65 @@ +{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec +, attoparsecConduit, authenticate, base64Bytestring +, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml +, blazeMarkup, byteorder, caseInsensitive, cereal, certificate +, cipherAes, cipherRc4, clientsession, conduit, cookie, cprngAes +, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers, cryptoPubkey +, cryptoPubkeyTypes, cryptoRandomApi, cssText, dataDefault +, dataDefaultClass, dataDefaultInstancesBase +, dataDefaultInstancesContainers, dataDefaultInstancesDlist +, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate +, entropy, failure, fastLogger, fileEmbed, filesystemConduit +, hamlet, hashable, hjsmin, hspec, hspecExpectations, htmlConduit +, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase +, mimeMail, mimeTypes, mmorph, monadControl, monadLogger +, networkConduit, pathPieces, pem, persistent, persistentTemplate +, poolConduit, primitive, publicsuffixlist, pureMD5, pwstoreFast +, quickcheckIo, resourcePool, resourcet, safe, semigroups, setenv +, SHA, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs +, shakespeareText, silently, simpleSendfile, skein, socks +, stringsearch, systemFileio, systemFilepath, tagged, tagsoup +, tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat +, unorderedContainers, utf8Light, utf8String, vault, vector, void +, wai, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8 +, xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth +, yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic +, yesodTest, zlibBindings, zlibConduit +}: + +cabal.mkDerivation (self: { + pname = "yesod-platform"; + version = "1.2.0.1"; + sha256 = "0hff8kx5d1z8xmy7fnzzhvy9774r26i4bczkb4cz30v3v5pf2g15"; + buildDepends = [ + aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit + authenticate base64Bytestring baseUnicodeSymbols blazeBuilder + blazeBuilderConduit blazeHtml blazeMarkup byteorder caseInsensitive + cereal certificate cipherAes cipherRc4 clientsession conduit cookie + cprngAes cryptoApi cryptoConduit cryptohash cryptoNumbers + cryptoPubkey cryptoPubkeyTypes cryptoRandomApi cssText dataDefault + dataDefaultClass dataDefaultInstancesBase + dataDefaultInstancesContainers dataDefaultInstancesDlist + dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy + failure fastLogger fileEmbed filesystemConduit hamlet hashable + hjsmin hspec hspecExpectations htmlConduit httpConduit httpDate + httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph + monadControl monadLogger networkConduit pathPieces pem persistent + persistentTemplate poolConduit primitive publicsuffixlist pureMD5 + pwstoreFast quickcheckIo resourcePool resourcet safe semigroups + setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs + shakespeareText silently simpleSendfile skein socks stringsearch + systemFileio systemFilepath tagged tagsoup tagstreamConduit tls + tlsExtra transformersBase unixCompat unorderedContainers utf8Light + utf8String vault vector void wai waiAppStatic waiExtra waiLogger + waiTest warp word8 xmlConduit xmlTypes xssSanitize yaml yesod + yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes + yesodStatic yesodTest zlibBindings zlibConduit + ]; + jailbreak = true; + meta = { + homepage = "http://www.yesodweb.com/"; + description = "Meta package for Yesod"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b78e423d869..b17eaeff626 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2101,6 +2101,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {}; + yesodPlatform = callPackage ../development/libraries/haskell/yesod-platform {}; + yesodRoutes = callPackage ../development/libraries/haskell/yesod-routes {}; yesodStatic = callPackage ../development/libraries/haskell/yesod-static {}; From 9ebb5ad7a64733ba1c0961adf23b51ceeecc9a39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 2 Jun 2013 09:41:32 +0200 Subject: [PATCH 105/162] release.nix, release-small.nix: build atlas library on Hydra This puppy takes several hours to compile, being able to download that package in binary form is really valuable. --- pkgs/top-level/release-small.nix | 1 + pkgs/top-level/release.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 9c85cb381b6..f22faf123cc 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -19,6 +19,7 @@ with (import ./release-lib.nix); aspell = all; at = linux; + atlas = linux; aterm25 = all; aterm28 = all; autoconf = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 11102f89155..de1aaec01ae 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -45,6 +45,7 @@ let apacheHttpd = linux; aspell = all; at = linux; + atlas = linux; audacious = linux; autoconf = all; automake110x = all; From ed4f1c947f4087afd9047dc305e82097f802913e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 2 Jun 2013 14:31:56 +0200 Subject: [PATCH 106/162] iw: update to 3.10. The newer, the better. --- pkgs/os-specific/linux/iw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 7110754357c..ac8d4824c62 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libnl, pkgconfig}: -stdenv.mkDerivation { - name = "iw-3.6"; +stdenv.mkDerivation rec { + name = "iw-3.10"; src = fetchurl { - url = http://wireless.kernel.org/download/iw/iw-3.6.tar.bz2; - sha256 = "0my8nv6liya0b15nqn8wq2kxwjy7x6k65a9x1121zwqxq5m064fz"; + url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; + sha256 = "1sagsrl2s0d3ar3q2yc5qxk2d47zgn551akwcs9f4a5prw9f4vj5"; }; buildInputs = [ libnl pkgconfig ]; From 0e57e74e6f7a302a270084b18fe738b8c10d511c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 2 Jun 2013 14:56:16 +0200 Subject: [PATCH 107/162] youtube-dl: without pandoc on non-pc --- pkgs/tools/misc/youtube-dl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 09752ec71ce..54b3e6a4856 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { }; buildInputs = [ python ]; - nativeBuildInputs = [ pandoc zip ]; + nativeBuildInputs = [ zip ] ++ + stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) pandoc; patchPhase = '' rm youtube-dl From 4ecd9cdb14df537cd04c7be94246165b691df4d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 1 Apr 2013 17:42:51 +0200 Subject: [PATCH 108/162] cgit: new package cgit is a web frontend for git repositories - it is a CGI program to use with your favourite webserver. Add the latest version, 0.9.2. --- .../git-and-tools/cgit/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/cgit/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix new file mode 100644 index 00000000000..63dd56d7e33 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt, docbook_xml_xslt }: + +stdenv.mkDerivation rec { + name = "cgit-0.9.2"; + + src = fetchurl { + url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; + sha256 = "0q177q1r7ssna32c760l4dx6p4aaz6kdv27zn2jb34bx98045h08"; + }; + + # cgit is is tightly coupled with git and needs a git source tree to build. + # The cgit-0.9.2 Makefile has GIT_VER = 1.8.3, so use that version. + # IMPORTANT: Remember to check which git version cgit needs on every version + # bump. + gitSrc = fetchurl { + url = https://git-core.googlecode.com/files/git-1.8.3.tar.gz; + sha256 = "0fn5xdx30dl8dl1cdpqif5hgc3qnxlqfpwyhm0sm1wgqhgbcdlzi"; + }; + + buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt ]; + + # Give cgit a git source tree and pass configuration parameters (as make + # variables). + preBuild = '' + mkdir -p git + tar --strip-components=1 -xf "$gitSrc" -C git + + makeFlagsArray+=(prefix="$out" CGIT_SCRIPT_PATH="$out/cgit/") + ''; + + # Install manpage. + postInstall = '' + # xmllint fails: + #make install-man + + # bypassing xmllint works: + a2x --no-xmllint -f manpage cgitrc.5.txt + mkdir -p "$out/share/man/man5" + cp cgitrc.5 "$out/share/man/man5" + ''; + + meta = { + homepage = http://git.zx2c4.com/cgit/about/; + description = "Web frontend for git repositories"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66139e41681..bafa21a6257 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6816,6 +6816,8 @@ let centerim = callPackage ../applications/networking/instant-messengers/centerim { }; + cgit = callPackage ../applications/version-management/git-and-tools/cgit { }; + chatzilla = callPackage ../applications/networking/irc/chatzilla { xulrunner = firefox36Pkgs.xulrunner; }; From 778e09625fdcefcbe1cd88d1c1366308232111ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 2 Jun 2013 19:54:20 +0200 Subject: [PATCH 109/162] aircarck-ng: updating and fixing build Requested in issue #585 --- pkgs/tools/networking/aircrack-ng/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index be4bfb20dfa..6ee6b536cbe 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,15 +1,11 @@ -{stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}: +{stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools}: -let - rev = "2268"; -in stdenv.mkDerivation rec { - name = "aircrack-ng-1.1-${rev}"; + name = "aircrack-ng-1.2-beta1"; - src = fetchsvn { - url = "http://trac.aircrack-ng.org/svn/trunk"; - inherit rev; - sha256 = "0zjkk3s65v9w92fhzhyknhjcsx6whcm0an0qcawn2ggs0n0ss9ij"; + src = fetchurl { + url = "http://download.aircrack-ng.org/${name}.tar.gz"; + sha256 = "19cfib7sqp2rdm3lc84jrzsa6r8443gkm1ifbmhygsqn6fnkj8zi"; }; buildInputs = [libpcap openssl zlib]; From d9fe34aeb4c5f43cdfc8828461a2fe0150bd94ca Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 2 Jun 2013 20:37:14 +0200 Subject: [PATCH 110/162] aircrackng: add platform & maintainers --- pkgs/tools/networking/aircrack-ng/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 6ee6b536cbe..4fb101d3609 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c ''; - meta = { + meta = with stdenv.lib; { description = "Wireless encryption crackign tools"; homepage = http://www.aircrack-ng.org/; license = "GPL2+"; + maintainers = [ maintainers.iElectric maintainers.viric maintainers.garbas maintainers.chaoflow ]; + platform = platforms.linux; }; } From 71f3c07548d7d08e44906d4090dc3cf05aad8487 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 2 Jun 2013 18:07:02 +0200 Subject: [PATCH 111/162] haskell-hledger-lib: update to version 0.21 --- .../libraries/haskell/hledger-lib/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index f790b61f25e..02266726cc7 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,15 +1,21 @@ { cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow -, regexCompat, regexpr, safe, split, time, transformers, utf8String +, regexCompat, regexpr, safe, split, testFramework +, testFrameworkHunit, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.20.0.1"; - sha256 = "1skm2jii7d8b6a6i98xwxckxwhikgj44823wqzdk8f3bq9zlwhcg"; + version = "0.21"; + sha256 = "1j57f05ja8v2igykij3vnvl4z89cppnnbf9bz1i3m7c61xapawg7"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat regexpr safe split time transformers utf8String ]; + testDepends = [ + cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat + regexpr safe split testFramework testFrameworkHunit time + transformers + ]; meta = { homepage = "http://hledger.org"; description = "Core data types, parsers and utilities for the hledger accounting tool"; From 7cdd298eb22d96ebc75c35547f8591b3385e1f50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 2 Jun 2013 18:07:03 +0200 Subject: [PATCH 112/162] haskell-hledger-web: update to version 0.21 --- .../libraries/haskell/hledger-web/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index c6be8340ab5..0493a4aab68 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,26 +1,25 @@ { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs -, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib -, httpConduit, HUnit, monadControl, networkConduit, parsec, regexpr -, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time -, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml, yesod -, yesodCore, yesodDefault, yesodForm, yesodStatic, yesodTest +, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec +, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe +, shakespeareText, text, time, transformers, wai, waiExtra +, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodPlatform +, yesodStatic, yesodTest }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.20.0.1"; - sha256 = "0fq3wfsy2ykyplr66ac91yd2vwzfw3ji8mq9q4jn58nnh6bgxfa1"; + version = "0.21"; + sha256 = "19simd7vk9656zk1212ca9i52470np4j2lwjg4yi89rjq2ay2l05"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath - hamlet hjsmin hledger hledgerLib httpConduit HUnit monadControl - networkConduit parsec regexpr safe shakespeareCss shakespeareJs - shakespeareText text time transformers wai waiExtra - waiHandlerLaunch warp yaml yesod yesodCore yesodDefault yesodForm - yesodStatic + hamlet hjsmin hledger hledgerLib httpConduit HUnit json + networkConduit parsec regexpr safe shakespeareText text time + transformers wai waiExtra waiHandlerLaunch warp yaml yesod + yesodCore yesodPlatform yesodStatic ]; - testDepends = [ yesodCore yesodDefault yesodTest ]; + testDepends = [ hspec yesod yesodTest ]; doCheck = false; meta = { homepage = "http://hledger.org"; From 7250514410dc0a43df4858917dc87de8aec8c957 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 2 Jun 2013 18:07:03 +0200 Subject: [PATCH 113/162] haskell-hledger: update to version 0.21 --- .../libraries/haskell/hledger/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 7484a72d1c5..bca994634e9 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,18 +1,24 @@ -{ cabal, cmdargs, filepath, haskeline, hledgerLib, HUnit, mtl -, parsec, regexpr, safe, shakespeareText, split, text, time -, utf8String +{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl +, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText +, split, testFramework, testFrameworkHunit, text, time +, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.20.0.1"; - sha256 = "0sdsxdydpmnarxz94py8rlbcffpan7l299ff7j9gn4f42z3sarw7"; + version = "0.21"; + sha256 = "1s44kmkkndqpnhsl23ba0b9g3dhswp4brd0nfi7gzlbdg8z8024w"; isLibrary = true; isExecutable = true; buildDepends = [ cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe shakespeareText split text time utf8String ]; + testDepends = [ + cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec + prettyShow regexCompat regexpr safe shakespeareText split + testFramework testFrameworkHunit text time transformers + ]; meta = { homepage = "http://hledger.org"; description = "The main command-line interface for the hledger accounting tool"; From f1c42a833140451e4ec909920154236274ce3f60 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 2 Jun 2013 23:32:59 +0200 Subject: [PATCH 114/162] Module::Pluggable: Update to 4.8 --- .../perl-modules/module-pluggable.patch | 92 ++++++------------- pkgs/top-level/perl-packages.nix | 12 ++- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 36 insertions(+), 70 deletions(-) diff --git a/pkgs/development/perl-modules/module-pluggable.patch b/pkgs/development/perl-modules/module-pluggable.patch index defe8e01ff6..51a029c106b 100644 --- a/pkgs/development/perl-modules/module-pluggable.patch +++ b/pkgs/development/perl-modules/module-pluggable.patch @@ -1,65 +1,27 @@ -diff -rc Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm -*** Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm 2007-01-30 00:13:00.000000000 +0100 ---- Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm 2007-03-13 14:29:34.000000000 +0100 -*************** -*** 136,147 **** - my $sp = catdir($dir, (split /::/, $searchpath)); - - # if it doesn't exist or it's not a dir then skip it -! next unless ( -e $sp && -d _ ); # Use the cached stat the second time - - my @files = $self->find_files($sp); - - # foreach one we've found - foreach my $file (@files) { - # untaint the file; accept .pm only - next unless ($file) = ($file =~ /(.*$file_regex)$/); - # parse the file to get the name ---- 136,148 ---- - my $sp = catdir($dir, (split /::/, $searchpath)); - - # if it doesn't exist or it's not a dir then skip it -! next unless ( -d $sp ); - - my @files = $self->find_files($sp); - - # foreach one we've found - foreach my $file (@files) { -+ - # untaint the file; accept .pm only - next unless ($file) = ($file =~ /(.*$file_regex)$/); - # parse the file to get the name -*************** -*** 161,167 **** - - my $err = $self->handle_finding_plugin($plugin); - carp "Couldn't require $plugin : $err" if $err; -! - push @plugins, $plugin; - } - ---- 162,168 ---- - - my $err = $self->handle_finding_plugin($plugin); - carp "Couldn't require $plugin : $err" if $err; -! - push @plugins, $plugin; - } - -*************** -*** 201,207 **** - (my $path = $File::Find::name) =~ s#^\\./##; - push @files, $path; - } -! }, $search_path ); - } - #chdir $cwd; - return @files; ---- 202,208 ---- - (my $path = $File::Find::name) =~ s#^\\./##; - push @files, $path; - } -! }, "$search_path/." ); - } - #chdir $cwd; - return @files; +diff -ru Module-Pluggable-4.8/lib/Module/Pluggable/Object.pm Module-Pluggable-4.8-new/lib/Module/Pluggable/Object.pm +--- Module-Pluggable-4.8/lib/Module/Pluggable/Object.pm 2013-05-28 01:30:06.000000000 +0200 ++++ Module-Pluggable-4.8-new/lib/Module/Pluggable/Object.pm 2013-06-02 23:24:52.704125205 +0200 +@@ -180,12 +180,13 @@ + my $sp = catdir($dir, (split /::/, $searchpath)); + + # if it doesn't exist or it's not a dir then skip it +- next unless ( -e $sp && -d _ ); # Use the cached stat the second time ++ next unless ( -d $sp ); + + my @files = $self->find_files($sp); + + # foreach one we've found + foreach my $file (@files) { ++ + # untaint the file; accept .pm only + next unless ($file) = ($file =~ /(.*$file_regex)$/); + # parse the file to get the name +@@ -314,7 +315,7 @@ + (my $path = $File::Find::name) =~ s#^\\./##; + push @files, $path; + } +- }, $search_path ); ++ }, "$search_path/." ); + } + #chdir $cwd; + return @files; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e927d55025b..8fe62df8220 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3292,16 +3292,20 @@ rec { propagatedBuildInputs = [ version ]; }; - ModulePluggable = buildPerlPackage rec { - name = "Module-Pluggable-3.9"; + ModulePluggable = buildPerlPackage { + name = "Module-Pluggable-4.8"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz"; - sha256 = "0psryh1dz828zly92db9zcv905n82in2awixzqngqhzg4y7fg4wc"; + url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-4.8.tar.gz; + sha256 = "0gc2sanga3207l3dnmb05isc7m87l1j94v9ll3z4sbb3vs49gdd2"; }; patches = [ # !!! merge this patch into Perl itself (which contains Module::Pluggable as well) ../development/perl-modules/module-pluggable.patch ]; + meta = { + description = "Automatically give your module the ability to have plugins"; + license = "perl5"; + }; }; ModulePluggableFast = buildPerlPackage { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20bbc37e4d6..e5dc28a2fb0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1951,7 +1951,7 @@ pythonPackages = python.modules // rec { }; meta = { - homepage = "http://code.google.com/p/httplib2"; + homepage = http://code.google.com/p/httplib2; description = "A comprehensive HTTP client library"; license = pkgs.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; From 4efc39eaddffee6fa1c0def4c3cf9beab44f5ae4 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 2 Jun 2013 23:40:18 +0200 Subject: [PATCH 115/162] mysql-connector-java: Updated to 5.1.25 --- pkgs/servers/sql/mysql/jdbc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 07c4d6a0aba..424f6d02181 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation { - name = "mysql-connector-java-5.1.22"; + name = "mysql-connector-java-5.1.25"; builder = ./builder.sh; src = fetchurl { - url = http://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-5.1.22.zip; - sha256 = "0hfx1znq0iqclkc8visca7x67lvlk3cswni69ghi2c5cpa2d4ijm"; + url = http://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-5.1.25.zip; + sha256 = "1qwnha8w8xafcig8wdvbry93pbli2vmzks8ds6kbb9im2k0rrmrw"; }; buildInputs = [ unzip ant ]; From 96b193a7b1ca98b46a9cf1989c811e548ad03512 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 3 Jun 2013 00:31:33 +0200 Subject: [PATCH 116/162] typos --- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- pkgs/tools/package-management/checkinstall/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 4fb101d3609..1cc91f25660 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://www.aircrack-ng.org/; license = "GPL2+"; maintainers = [ maintainers.iElectric maintainers.viric maintainers.garbas maintainers.chaoflow ]; - platform = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index f3153100008..2fbf5282ee1 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation { homepage = http://checkinstall.izto.org/; description = "A tool for automatically generating Slackware, RPM or Debian packages when doing `make install'"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platform = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } From 34a4d5f3f0b4e8270b858c2a5146a19d70a69081 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Jun 2013 10:15:34 +0200 Subject: [PATCH 117/162] os-specific/linux/microcode/converter.nix: update download location for intel-microcode2ucode.c --- pkgs/os-specific/linux/microcode/converter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/converter.nix b/pkgs/os-specific/linux/microcode/converter.nix index 7b1ff08be0c..49babc6ca57 100644 --- a/pkgs/os-specific/linux/microcode/converter.nix +++ b/pkgs/os-specific/linux/microcode/converter.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "microcode2ucode-20120205"; src = fetchurl { - url = "sources.gentoo.org/sys-apps/microcode-data/files/intel-microcode2ucode.c"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/microcode_ctl/intel-microcode2ucode.c/0efc5f6c74a4d7e61ca22683c93c98cf/intel-microcode2ucode.c"; sha256 = "c51b1b1d8b4b28e7d5d007917c1e444af1a2ff04a9408aa9067c0e57d70164de"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildPhase = '' gcc -Wall -O2 $src -o intel-microcode2ucode ''; - + installPhase = '' ensureDir "$out/bin" cp intel-microcode2ucode "$out/bin/" From 823765e3055051889cc321ebcca4c6c39bfebb39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Jun 2013 10:51:27 +0200 Subject: [PATCH 118/162] haskell-mode: update to current version from git --- .../editors/emacs-modes/haskell/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index c8de8726284..7e490f253d1 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit, emacs }: +{ stdenv, fetchurl, emacs }: -stdenv.mkDerivation { - name = "haskell-mode-2.8.0.29-gae3e4499d2"; +stdenv.mkDerivation rec { + name = "haskell-mode-2.9.1-102-g8d4b965"; - src = fetchgit { - url = "http://github.com/haskell/haskell-mode.git"; - rev = "ae3e4499d27a1468bdf88ffe0ce15cd7e4bb9f2a"; - sha256 = "29a1725da620c13ff2b3b56906e76dd9f19317eee92bd5750b3aa9a4264effae"; + src = fetchurl { + url = "https://github.com/haskell/haskell-mode/tarball/8d4b9651a69b62fcbedbac63de29a1e87ff0e97f"; + sha256 = "02sil43885xjbfqakrxkm7bjnjd930lx6845fc2rxmkq5plkq85a"; + name = "${name}.tar.gz"; }; buildInputs = [emacs]; From 5324db88ec4659433676073668b97d77ed1ca859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Jun 2013 10:34:03 +0200 Subject: [PATCH 119/162] gnutls: update to 3.2.1 Required also: nettle: update to 2.7.1 I tested that wget works. --- pkgs/development/libraries/gnutls/default.nix | 10 +++++----- pkgs/development/libraries/nettle/default.nix | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index ba441b1082b..69b97e9732b 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,15 +1,15 @@ -{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig , guileBindings, guile, perl, gmp }: assert guileBindings -> guile != null; stdenv.mkDerivation (rec { - name = "gnutls-3.1.10"; + name = "gnutls-3.2.1"; src = fetchurl { - url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz"; - sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk"; + url = "mirror://gnupg/gnutls/v3.2/${name}.tar.xz"; + sha256 = "1zi2kq3vcbqdy9khl7r6pgk4hgwibniasm9k6siasdvqjijq3ymb"; }; # Note: GMP is a dependency of Nettle, whose public headers include @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ nettle libtasn1 ]; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 2e444c32177..4208402ab99 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gmp, gnum4 }: stdenv.mkDerivation (rec { - name = "nettle-2.5"; + name = "nettle-2.7.1"; src = fetchurl { url = "mirror://gnu/nettle/${name}.tar.gz"; - sha256 = "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa"; + sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw"; }; buildInputs = [ gnum4 ]; @@ -15,6 +15,9 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; + # It doesn't build otherwise + dontDisableStatic = true; + patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") ./cygwin.patch; From 7b40df9c95db59ed607305e85c513ee455d42b45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Jun 2013 10:17:41 +0200 Subject: [PATCH 120/162] haskell-tls-extra: update to version 0.6.4 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index b3c1c884dc9..b53b948c41d 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.6.3"; - sha256 = "1ng8h3v5px63fpb4y3sd47djzpksyzzavilsdnp1kd453abpmx9l"; + version = "0.6.4"; + sha256 = "058ia1cabs7ribz287iqkkjvqpp2n7c219f3xc92fhm0qq00mh5n"; isLibrary = true; isExecutable = true; buildDepends = [ From 8e023d17514866f312faca841de21755fae661de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Jun 2013 14:52:26 +0200 Subject: [PATCH 121/162] gnutls: downgrading to the latest in 3.1 series A test was failing on i686 (not on x86_64): http://hydra.nixos.org/build/5222124/nixlog/1/tail-reload --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 69b97e9732b..2e2f11194aa 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation (rec { - name = "gnutls-3.2.1"; + name = "gnutls-3.1.12"; src = fetchurl { url = "mirror://gnupg/gnutls/v3.2/${name}.tar.xz"; - sha256 = "1zi2kq3vcbqdy9khl7r6pgk4hgwibniasm9k6siasdvqjijq3ymb"; + sha256 = "025k37wsl21ncwrg489ysbjqsz8iralvgv98adj960sl03787lyc"; }; # Note: GMP is a dependency of Nettle, whose public headers include From f004ddc7cfd3737fae2da8bdd0eae7d1302961d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Jun 2013 14:53:27 +0200 Subject: [PATCH 122/162] crypto++: adding shared object target We only built the static library, before. --- pkgs/development/libraries/crypto++/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index e9efcfaf7f0..f80d5813c3e 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # I add what 'enableParallelBuilding' would add to the make call, # if we were using the generic build phase. buildPhase = '' - make PREFIX="$out" all -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES + make PREFIX="$out" all libcryptopp.so -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run From 3e070f105ddc2dfc8111218e3d8c80f5a34357cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Jun 2013 16:19:26 +0200 Subject: [PATCH 123/162] gnutls: updating the url. It was outdated (from times when gnutls was at gnupg repository) --- pkgs/development/libraries/gnutls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 2e2f11194aa..5f1a543f961 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (rec { name = "gnutls-3.1.12"; src = fetchurl { - url = "mirror://gnupg/gnutls/v3.2/${name}.tar.xz"; + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.xz"; sha256 = "025k37wsl21ncwrg489ysbjqsz8iralvgv98adj960sl03787lyc"; }; From 7b21e19a82b89ac5fa704fac005abee7d63cadfc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Jun 2013 22:08:57 +0200 Subject: [PATCH 124/162] git-annex: generate build instructions with cabal2nix --- .../git-and-tools/default.nix | 12 +- .../git-and-tools/git-annex/default.nix | 110 ++++++++---------- pkgs/top-level/haskell-packages.nix | 2 + 3 files changed, 50 insertions(+), 74 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a5aeb1bf6a4..fe5aebeb96e 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -42,17 +42,7 @@ rec { sendEmailSupport = !stdenv.isDarwin; }); - gitAnnex = lib.makeOverridable (import ./git-annex) { - inherit stdenv fetchurl perl which ikiwiki curl bup git gnupg1 lsof openssh rsync; - inherit (haskellPackages) ghc aeson async blazeBuilder bloomfilter - caseInsensitive clientsession cryptoApi dataDefault dataenc DAV dbus dns - 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 regexTdfa - transformers transformersBase utf8String uuid wai waiLogger warp - xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic; - }; + gitAnnex = pkgs.haskellPackages.gitAnnex; qgit = import ./qgit { inherit fetchurl stdenv; 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 7e8b57293b7..5086f4f31b3 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 @@ -1,73 +1,57 @@ -{ stdenv, fetchurl, perl, which, ikiwiki, ghc, aeson, async, blazeBuilder -, bloomfilter, bup, caseInsensitive, clientsession, cryptoApi, curl, dataDefault -, dataenc, DAV, dbus, dns, editDistance, extensibleExceptions, filepath, git -, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, httpConduit, httpTypes, HUnit -, IfElse, json, liftedBase, lsof, MissingH, monadControl, mtl, network -, 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, regexTdfa +{ cabal, aeson, async, blazeBuilder, bloomfilter, bup +, caseInsensitive, clientsession, cryptoApi, curl, dataDefault +, dataenc, DAV, dbus, dlist, dns, editDistance +, extensibleExceptions, filepath, git, gnupg1, gnutls, hamlet +, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit +, IfElse, json, lsof, MissingH, MonadCatchIOTransformers +, monadControl, mtl, network, networkInfo, networkMulticast +, networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa +, rsync, SafeSemaphore, SHA, stm, text, time, transformers +, unixCompat, utf8String, uuid, wai, waiLogger, warp, xmlConduit +, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic }: -let - version = "4.20130521"; -in -stdenv.mkDerivation { - name = "git-annex-${version}"; - - src = fetchurl { - url = "https://github.com/joeyh/git-annex/tarball/${version}"; - sha256 = "0wa3sgw0xbqykl5r6ba0gannwj61y0h024glm0xjj97fy06b77i0"; - name = "git-annex-${version}.tar.gz"; - }; - - buildInputs = [ ghc aeson async blazeBuilder bloomfilter bup ikiwiki - caseInsensitive clientsession cryptoApi curl dataDefault dataenc DAV dbus - dns editDistance extensibleExceptions filepath git gnupg1 gnutls hamlet - hinotify hS3 hslogger httpConduit httpTypes HUnit IfElse json liftedBase - lsof MissingH monadControl mtl network 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 which perl regexTdfa ]; - - configurePhase = '' - makeFlagsArray=( PREFIX=$out CABAL=./Setup ) - patchShebangs . - ghc -O2 --make Setup - ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -f-webapp -fassistant -fdbus -finotify -fwebdav -fs3 - ''; - - doCheck = true; +cabal.mkDerivation (self: { + pname = "git-annex"; + version = "4.20130601"; + sha256 = "0l6jbi9r26w5h9hfg9v9qybqvijp4n7c9l1zd4ikxg2nqcc8j8ln"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson async blazeBuilder bloomfilter caseInsensitive clientsession + cryptoApi dataDefault dataenc DAV dbus dlist dns editDistance + extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger + HTTP httpConduit httpTypes HUnit IfElse json MissingH + MonadCatchIOTransformers monadControl mtl network networkInfo + networkMulticast networkProtocolXmpp QuickCheck random regexTdfa + SafeSemaphore SHA stm text time transformers unixCompat utf8String + uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault + yesodForm yesodStatic + ]; + buildTools = [ bup curl git gnupg1 lsof openssh rsync ]; + configureFlags = "-fS3 + -fWebDAV + -fInotify + -fDbus + -f-Assistant + -f-Webapp + -fPairing + -fXMPP + -fDNS + -fProduction + -fTDFA"; + preConfigure = "patchShebangs ."; checkPhase = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" + cp dist/build/git-annex/git-annex git-annex ./git-annex test ''; - meta = { homepage = "http://git-annex.branchable.com/"; - description = "Manage files with git without checking them into git"; - license = stdenv.lib.licenses.gpl3Plus; - - longDescription = '' - Git-annex allows managing files with git, without checking the - file contents into git. While that may seem paradoxical, it is - useful when dealing with files larger than git can currently - easily handle, whether due to limitations in memory, checksumming - time, or disk space. - - Even without file content tracking, being able to manage files - with git, move files around and delete files with versioned - directory trees, and use branches and distributed clones, are all - very handy reasons to use git. And annexed files can co-exist in - the same git repository with regularly versioned files, which is - convenient for maintaining documents, Makefiles, etc that are - associated with annexed files but that benefit from full revision - control. - ''; - - platforms = ghc.meta.platforms; - maintainers = [ stdenv.lib.maintainers.simons ]; + description = "manage files with git, without checking their contents into git"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.simons ]; }; -} +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b17eaeff626..acd91ee6f60 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2258,6 +2258,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; cabalInstall = self.cabalInstall_1_16_0_2; + gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; + githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; From 1ed5202c2c75f5768a0387d3212831d74c366a1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Jun 2013 22:09:09 +0200 Subject: [PATCH 125/162] Agda: cosmetic change --- pkgs/development/libraries/haskell/Agda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index ea32e635898..f6589dc53be 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -1,6 +1,6 @@ { cabal, alex, binary, deepseq, filepath, geniplate, happy , hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel -, QuickCheck, text, unorderedContainers, xhtml, zlib +, QuickCheck, text, time, unorderedContainers, xhtml, zlib }: cabal.mkDerivation (self: { @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ binary deepseq filepath geniplate hashable hashtables haskeline - haskellSrcExts mtl parallel QuickCheck text unorderedContainers - xhtml zlib + haskellSrcExts mtl parallel QuickCheck text time + unorderedContainers xhtml zlib ]; buildTools = [ alex happy ]; jailbreak = true; From 079ea60624455471d282c3fb1121ff829bfbcc97 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 27 May 2013 07:43:34 +0200 Subject: [PATCH 126/162] neoload: upgrade to 4.1.3 --- pkgs/development/tools/neoload/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 85d2c7a4793..384e724dfad 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -31,15 +31,15 @@ let dotInstall4j = writeTextFile { name = "dot-install4j"; text = '' ''; }; in stdenv.mkDerivation rec { - name = "neoload-4.1.2"; + name = "neoload-4.1.3"; src = fetchurl ( if stdenv.system == "x86_64-linux" then - { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_2_linux_x64.sh; - sha256 = "10r1dg2a37lhimy9r9sax01ljp09cas9irfygc7qa0g15hll1s84"; } + { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_3_linux_x64.sh; + sha256 = "0qqp7iy6xpaqg535hk21yqmxi0inin5v160sa7nwxh41dq0li5xx"; } else - { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_2_linux_x86.sh; - sha256 = "00b2qf5jx9na4n6c7fv7v7r59w1iwm8sfmz1gb5ljqa1s7sa777a"; } ); + { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_3_linux_x86.sh; + sha256 = "0rvy6l9znha3wf8cn406lwvv2qshqnls9kasi68r4wgysr1hh662"; } ); buildInputs = [ makeWrapper ]; phases = [ "installPhase" ]; From 39e0eb94204f3c05edca88878028855980930333 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 27 May 2013 07:43:50 +0200 Subject: [PATCH 127/162] linux-3.0: upgrade to 3.0.80 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 1f9bffae6d2..9f1a36db7dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -231,7 +231,7 @@ in import ./generic.nix ( rec { - version = "3.0.78"; + version = "3.0.80"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -239,7 +239,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0jgarhjllxygxsj2kph61pf9jvlab4pnp7n4kb9l0lfj3y0crx04"; + sha256 = "0f3md117bh8n5izkhjd2jp096jqmwz6wpxn7rf8x2x9cz4jz0cqx"; }; config = configWithPlatform stdenv.platform; From d7911372a84e324a9b492abb99f1270fa8ae31c8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 27 May 2013 07:44:08 +0200 Subject: [PATCH 128/162] linux-3.4: upgrade to 3.4.47 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index aba9ded0366..cd7e9f2b375 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -246,7 +246,7 @@ in import ./generic.nix ( rec { - version = "3.4.45"; + version = "3.4.47"; testing = false; preConfigure = '' @@ -255,7 +255,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "13qli7s5i3zq76xsww05s89gm6mkvpf1fjxbka0fddzvmwzw9jav"; + sha256 = "0hdrwzhfnm3c26i2iaw2rfhi7rl89n7dpvbznn29k27p3ifi3rp6"; }; config = configWithPlatform stdenv.platform; From 91cf1716f497d971dd3eb98584142870443eb27e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 27 May 2013 07:44:19 +0200 Subject: [PATCH 129/162] linux-3.9: upgrade to 3.9.4 --- 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 cd5156c3e50..66ef05878bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -253,7 +253,7 @@ in import ./generic.nix ( rec { - version = "3.9.3"; + version = "3.9.4"; testing = false; preConfigure = '' @@ -262,7 +262,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0hc82w3rg1ykpkq7na44vqa4b9zymvpl05kc7a3lpgmd1j3n3sw9"; + sha256 = "121n82731il7c329psa21xzg8yci7j4w3f2px6v2gh3z82ijkc4i"; }; config = configWithPlatform stdenv.platform; From 40a250fc6ffcab8128059c45de1d77bd02db8cbc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Jun 2013 11:09:23 +0400 Subject: [PATCH 130/162] SBCL update --- pkgs/development/compilers/sbcl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 066554ddc15..1e4feff1107 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.7"; + version="1.1.8"; name="${baseName}-${version}"; - hash="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.7/sbcl-1.1.7-source.tar.bz2"; - sha256="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8"; + hash="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-source.tar.bz2"; + sha256="1fmcpsi2bddfpz3impm9i62y9p15r3mc4xgm1dg0k77l33859jip"; }; buildInputs = with a; [ clisp makeWrapper From d82d86eb64b159cc821261ec31c528cf97a68382 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Jun 2013 11:29:34 +0400 Subject: [PATCH 131/162] ECL update --- pkgs/development/compilers/ecl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 40690841965..d2c26487c0f 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="12.12.1"; + version="13.5.1"; name="${baseName}-${version}"; - hash="15y2dgj95li6mxiz9pnllj9x88km0z8gfh46kysfllkp2pl7rrsl"; - url="mirror://sourceforge/project/ecls/ecls/12.12/ecl-12.12.1.tgz"; - sha256="15y2dgj95li6mxiz9pnllj9x88km0z8gfh46kysfllkp2pl7rrsl"; + hash="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r"; + url="mirror://sourceforge/project/ecls/ecls/13.5/ecl-13.5.1.tgz"; + sha256="18ic8w9sdl0dh3kmyc9lsrafikrd9cg1jkhhr25p9saz0v75f77r"; }; buildInputs = [ libffi From cb5b198b514e9ed214627ab91ed93082a1789541 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Jun 2013 11:00:19 +0200 Subject: [PATCH 132/162] linux: Update to 3.2.46 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index b3c478c5086..9f16fc78b09 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.2.45"; + version = "3.2.46"; modDirVersion = version; @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz"; - sha256 = "0mhq64rvzf5bll7xxffajjl7p38szbc13jsr6zh34x3qfzf3abhr"; + sha256 = "1yxkkiay2a84113zjxyf680fz5l0ihvjq3fcik8hfibrb5x2rhgr"; }; config = configWithPlatform stdenv.platform; From 49d0f50f0ce28d08d6cab2cf86b51c704ee1a7fa Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Tue, 4 Jun 2013 10:20:30 +0100 Subject: [PATCH 133/162] fish: Add fish 2.0.0 --- pkgs/shells/fish/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/shells/fish/default.nix diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix new file mode 100644 index 00000000000..091da2c68f0 --- /dev/null +++ b/pkgs/shells/fish/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, autoconf, ncurses, which }: + +stdenv.mkDerivation rec { + name = "fish-2.0.0"; + + src = fetchurl { + url = http://fishshell.com/files/2.0.0/fish-2.0.0.tar.gz; + sha1 = "2d28553e2ff975f8e5fed6b266f7a940493b6636"; + }; + + nativeBuildInputs = [ autoconf ]; + + buildInputs = [ ncurses which ]; + + preConfigure = '' + autoconf + ''; + + meta = { + homepage = http://fishshell.com; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2fb66b5fdc..309af93605c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2004,6 +2004,8 @@ let dash = callPackage ../shells/dash { }; + fish = callPackage ../shells/fish { }; + tcsh = callPackage ../shells/tcsh { }; rush = callPackage ../shells/rush { }; From 7cfdfda910b339b057ee34b9338d38080668ad9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 4 Jun 2013 11:35:33 +0200 Subject: [PATCH 134/162] audacity: minor update, prefer system-wide libs - Using system-wide libs where we have them (except for portaudio, which I couldn't make work). - Add the soxr library (now the preferred way of audio resampling). --- pkgs/applications/audio/audacity/default.nix | 26 ++++++++++++++----- pkgs/applications/misc/audio/soxr/default.nix | 20 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/misc/audio/soxr/default.nix diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 306620ca1c9..fa392c4e43c 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,20 +1,32 @@ { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, - libogg, libvorbis, libmad, alsaLib, libsndfile, libsamplerate, flac, lame, - expat, id3lib, ffmpeg, portaudio + libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, + expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */ }: stdenv.mkDerivation rec { - version = "2.0.2"; + version = "2.0.3"; name = "audacity-${version}"; src = fetchurl { - url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.bz2"; - sha256 = "17c7p5jww5zcg2k2fs1751mv5kbadcmgicszi1zxwj2p5b35x2mc"; + url = "http://audacity.googlecode.com/files/audacity-minsrc-${version}.tar.xz"; + sha256 = "1k4bbxhpfl80vm3gm3jxqly0syqjij5kwziy4xyq2c8aj2miwj1f"; }; - buildInputs = [ pkgconfig wxGTK libsndfile expat alsaLib libsamplerate - libvorbis libmad flac id3lib ffmpeg gettext ]; + + preConfigure = /* we prefer system-wide libs */ '' + mv lib-src lib-src-rm + mkdir lib-src + mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms} lib-src/ + rm -r lib-src-rm/ + ''; + + buildInputs = [ + pkgconfig gettext wxGTK gtk expat alsaLib + libsndfile soxr libid3tag + ffmpeg libmad lame libvorbis flac + ]; #ToDo: soundtouch, detach sbsms dontDisableStatic = true; + doCheck = true; meta = { description = "Sound editor with graphical UI"; diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix new file mode 100644 index 00000000000..a8dd26ab609 --- /dev/null +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "soxr-0.1.1"; + + src = fetchurl { + url = "mirror://sourceforge/soxr/${name}-Source.tar.xz"; + sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw"; + }; + + preConfigure = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src''; + + buildInputs = [ cmake ]; + + meta = { + description = "An audio resampling library"; + homepage = http://soxr.sourceforge.net; + license = "LGPLv2.1+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2fb66b5fdc..371e8c3066a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7999,6 +7999,8 @@ let sox = callPackage ../applications/misc/audio/sox { }; + soxr = callPackage ../applications/misc/audio/soxr { }; + spotify = callPackage ../applications/audio/spotify { inherit (gnome) GConf; }; From 13b3fa8d36d84d8bfba7674ffe395c5e7ece97ed Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 4 Jun 2013 12:35:07 +0300 Subject: [PATCH 135/162] libotr3: bump to 3.2.1 --- pkgs/development/libraries/libotr/3.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libotr/3.2.nix b/pkgs/development/libraries/libotr/3.2.nix index 472cc79fd4a..7dd6226a698 100644 --- a/pkgs/development/libraries/libotr/3.2.nix +++ b/pkgs/development/libraries/libotr/3.2.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, libgcrypt}: stdenv.mkDerivation { - name = "libotr-3.2.0"; + name = "libotr-3.2.1"; src = fetchurl { url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz; sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq"; From 11db400be869c2f32609b578ec32992807ba0eee Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 4 Jun 2013 12:35:59 +0300 Subject: [PATCH 136/162] Package obfsproxy and pyptlib needed for TOR obfuscated bridges. --- pkgs/top-level/python-packages.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5dc28a2fb0..aef4670001b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2768,6 +2768,21 @@ pythonPackages = python.modules // rec { }; }); + obfsproxy = buildPythonPackage ( rec { + name = "obfsproxy-0.2.2"; + src = fetchgit { + url = https://git.torproject.org/pluggable-transports/obfsproxy.git; + rev = "3c4e843a30c430aec1de03e0e09ef654072efc03"; + }; + + propagatedBuildInputs = [ pyptlib argparse twisted pycrypto ]; + + meta = { + description = "a pluggable transport proxy"; + homepage = https://www.torproject.org/projects/obfsproxy; + }; + }); + # optfunc = buildPythonPackage ( rec { # name = "optfunc-git"; # @@ -3487,6 +3502,19 @@ pythonPackages = python.modules // rec { }; }; + pyptlib = buildPythonPackage (rec { + name = "pyptlib-${version}"; + version = "0.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyptlib/pyptlib-${version}.tar.gz"; + sha256 = "0mklak456jqifx57j9jmpb69h3ybxc880qk86pg4g8jk0i14pxh3"; + }; + meta = { + description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; + license = stdenv.lib.licenses.bsd2; + }; + }); + pyrss2gen = buildPythonPackage (rec { name = "PyRSS2Gen-1.0.0"; From cdba8df4d5e452782762b24a279148f86a3b184b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Tue, 4 Jun 2013 10:52:25 +0100 Subject: [PATCH 137/162] haskell-pipes: Add pipes 3.3.0 --- .../development/libraries/haskell/pipes/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pipes/default.nix diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix new file mode 100644 index 00000000000..87c173850f9 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -0,0 +1,13 @@ +{ cabal, mmorph, transformers }: + +cabal.mkDerivation (self: { + pname = "pipes"; + version = "3.3.0"; + sha256 = "1bgznfv7hxqwj5f7vkm8d41phw63bl2swzr0wrz0pcqxlr42likb"; + buildDepends = [ mmorph transformers ]; + meta = { + description = "Compositional pipelines"; + 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 acd91ee6f60..bcb8c94855f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1551,6 +1551,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pgm = callPackage ../development/libraries/haskell/pgm {}; + pipes = callPackage ../development/libraries/haskell/pipes {}; + polyparse = callPackage ../development/libraries/haskell/polyparse {}; poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; From a4d69deca4d338394fe57263d839a6aef2b198e5 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Tue, 4 Jun 2013 10:57:21 +0100 Subject: [PATCH 138/162] haskell-pipes: Add pipes-concurrency, pipes-parse and pipes-safe --- .../libraries/haskell/pipes-concurrency/default.nix | 13 +++++++++++++ .../libraries/haskell/pipes-parse/default.nix | 13 +++++++++++++ .../libraries/haskell/pipes-safe/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++++ 4 files changed, 45 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pipes-concurrency/default.nix create mode 100644 pkgs/development/libraries/haskell/pipes-parse/default.nix create mode 100644 pkgs/development/libraries/haskell/pipes-safe/default.nix diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix new file mode 100644 index 00000000000..702853766a7 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -0,0 +1,13 @@ +{ cabal, pipes, stm, transformers }: + +cabal.mkDerivation (self: { + pname = "pipes-concurrency"; + version = "1.1.0"; + sha256 = "05xpwxhf08yf88ya89f8gcy4vphi6qxyccf2yiyi5zrf6c2pkr00"; + buildDepends = [ pipes stm transformers ]; + meta = { + description = "Concurrency for the pipes ecosystem"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix new file mode 100644 index 00000000000..2a5e62926b9 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -0,0 +1,13 @@ +{ cabal, pipes }: + +cabal.mkDerivation (self: { + pname = "pipes-parse"; + version = "1.0.0"; + sha256 = "0fk39a6d0ik5ghwyj6yyi9d0cj2sp22812fin7amcxcafrplf88w"; + buildDepends = [ pipes ]; + meta = { + description = "Parsing infrastructure for the pipes ecosystem"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix new file mode 100644 index 00000000000..09c58f0a017 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix @@ -0,0 +1,13 @@ +{ cabal, pipes, transformers }: + +cabal.mkDerivation (self: { + pname = "pipes-safe"; + version = "1.2.0"; + sha256 = "0ki9i9378j8kgw5dd91b38r686pcr9fl2vf9dfgfshia072ppggj"; + buildDepends = [ pipes transformers ]; + meta = { + description = "Safety for the pipes ecosystem"; + 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 bcb8c94855f..5d4c626ade6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1553,6 +1553,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pipes = callPackage ../development/libraries/haskell/pipes {}; + pipes-concurrency = callPackage ../development/libraries/haskell/pipes-concurrency {}; + + pipes-parse = callPackage ../development/libraries/haskell/pipes-parse {}; + + pipes-safe = callPackage ../development/libraries/haskell/pipes-safe {}; + polyparse = callPackage ../development/libraries/haskell/polyparse {}; poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; From fca2f04bb1cd8bb14c054d3ded643ceeb99f63ce Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Jun 2013 12:41:59 +0200 Subject: [PATCH 139/162] Make the location of the tarballs cache configurable --- maintainers/scripts/copy-tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/copy-tarball.sh b/maintainers/scripts/copy-tarball.sh index de325120efc..792071c129b 100755 --- a/maintainers/scripts/copy-tarball.sh +++ b/maintainers/scripts/copy-tarball.sh @@ -1,6 +1,6 @@ #! /bin/sh -e -distDir=/data/webserver/tarballs +distDir=${NIX_TARBALLS_CACHE:-/tarballs} url="$1" file="$2" From 930c958771aa2b1868473856f0380553e5a36038 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Jun 2013 14:18:55 +0200 Subject: [PATCH 140/162] iputils: Don't depend on both GNU TLS and OpenSSL --- pkgs/os-specific/linux/iputils/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 76b328d9c0d..5ca3a6a0a5c 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { name = "iputils-${time}"; - + src = fetchurl { url = "http://www.skbuff.net/iputils/iputils-s${time}.tar.bz2"; sha256 = "17riqp8dh8dvx32zv3hyrghpxz6xnxa6vai9b4yc485nqngm83s5"; @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile ''; - buildInputs = [ libsysfs gnutls openssl libcap sp docbook_sgml_dtd_31 SGMLSpm ]; + makeFlags = "USE_GNUTLS=no"; + + buildInputs = [ libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm ]; buildFlags = "man all ninfod"; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { ln -s $out/share/man/man8/{ping,ping6}.8 ln -s $out/share/man/man8/{tracepath,tracepath6}.8 ''; - + meta = { homepage = http://www.skbuff.net/iputils/; description = "A set of small useful utilities for Linux networking"; From 94dfd4bdf9a8685e143ea848b501e0c094d71512 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 Jun 2013 14:48:44 +0200 Subject: [PATCH 141/162] php: Get rid of unnecessary runtime dependencies like gettext --- pkgs/development/interpreters/php/5.4.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 5a2af030c1e..3c200f9c5c1 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -189,10 +189,18 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; configurePhase = '' + # Don't record the configure flags since this causes unnecessary + # runtime dependencies. + for i in main/build-defs.h.in scripts/php-config.in; do + substituteInPlace $i \ + --replace '@CONFIGURE_COMMAND@' '(omitted)' \ + --replace '@CONFIGURE_OPTIONS@' "" \ + --replace '@PHP_LDFLAGS@' "" + done + iniFile=$out/etc/php-recommended.ini [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags - echo configurePhase end ''; installPhase = '' From 6509d2cb2c717803d8a442e40c92aaf214cf48e4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Jun 2013 19:12:07 +0400 Subject: [PATCH 142/162] Adding mitmproxy --- pkgs/top-level/python-packages.nix | 58 ++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aef4670001b..e2e54b13b9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2376,6 +2376,35 @@ pythonPackages = python.modules // rec { }; }; + mitmproxy = buildPythonPackage rec { + baseName = "mitmproxy"; + name = "${baseName}-${meta.version}"; + + src = fetchurl { + url = "${meta.homepage}/download/${name}.tar.gz"; + sha256 = "1ddqni6d4kc8ypl6yig4nc00izvbk359sz6hykb9g0lfcpfqlngj"; + }; + + buildInputs = [ + pkgs.pyopenssl pyasn1 urwid pil lxml flask protobuf netlib + ]; + + doCheck = false; + + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" \ + --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + meta = { + version = "0.9"; + description = ''Man-in-the-middle proxy''; + homepage = "http://mitmproxy.org/"; + license = pkgs.lib.licenses.mit; + }; + }; mock = buildPythonPackage (rec { name = "mock-1.0.1"; @@ -2581,6 +2610,29 @@ pythonPackages = python.modules // rec { }; }; + netlib = buildPythonPackage rec { + baseName = "netlib"; + name = "${baseName}-${meta.version}"; + + src = fetchurl { + url = "https://github.com/cortesi/netlib/archive/v${meta.version}.tar.gz"; + name = "${name}.tar.gz"; + sha256 = "1y8lx2j1jrr93mqfb06zg1x5jm9lllw744sb61ib8dagw43nnq3v"; + }; + + buildInputs = [ + pkgs.pyopenssl pyasn1 + ]; + + doCheck = false; + + meta = { + version = "0.9"; + description = ''Man-in-the-middle proxy''; + homepage = "https://github.com/cortesi/netlib"; + license = pkgs.lib.licenses.mit; + }; + }; nevow = buildPythonPackage (rec { name = "nevow-${version}"; @@ -3219,11 +3271,11 @@ pythonPackages = python.modules // rec { pyasn1 = buildPythonPackage ({ - name = "pyasn1-0.0.11a"; + name = "pyasn1-0.1.7"; src = fetchurl { - url = "mirror://sourceforge/pyasn1/pyasn1-devel/0.0.11a/pyasn1-0.0.11a.tar.gz"; - sha256 = "0b7q67ygdk48zn07pyhyg7r0b74gds50652ndpzfw4vs8l3vjg0b"; + url = "mirror://sourceforge/pyasn1/0.1.7/pyasn1-0.1.7.tar.gz"; + sha256 = "1aqy21fb564gmnkw2fbkn55c40diyx3z0ixh4savvxikqm9ivy74"; }; meta = { From 888c7f27578a1d025c3f28e23d7c767bb3b509a3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 4 Jun 2013 17:47:42 -0400 Subject: [PATCH 143/162] modules: Enable setting extraArgs for all submodules or by name Signed-off-by: Shea Levy --- pkgs/lib/options.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 59bda41a623..4e939047070 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -90,10 +90,17 @@ rec { # Evaluate sub-modules. subModuleMerge = path: vals: lib.fix (args: - let result = recurseInto path (optionConfig vals args); in { - inherit (result) config options; + let + result = recurseInto path (optionConfig vals args); name = lib.removePrefix (opt.name + ".") path; - } + extraArgs = opt.extraArgs or {}; + individualExtraArgs = opt.individualExtraArgs or {}; + in { + inherit (result) config options; + inherit name; + } // + (opt.extraArgs or {}) // + (if hasAttr name individualExtraArgs then getAttr name individualExtraArgs else {}) ); # Add _options in sub-modules to make it viewable from other From 341aadaba15a8b6c5c8153009d3c8f69c086c5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Jun 2013 00:30:44 +0200 Subject: [PATCH 144/162] kdenlive+mlt: enabling some subcomponents, parallel builds --- pkgs/applications/video/kdenlive/default.nix | 8 +++++--- pkgs/development/libraries/mlt/default.nix | 12 +++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index d862c7012c4..d7fab74e6ca 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon , mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano -, pkgconfig, shared_desktop_ontologies }: +, pkgconfig, shared_desktop_ontologies, libv4l }: stdenv.mkDerivation rec { name = "kdenlive-${version}"; @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1rw2cbzy5mabwijvryyzbhpgldn2zy5jy4j87hl4m1i8ah9lgi7x"; }; - buildInputs = + buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz - qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies + qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies libv4l ]; + enableParallelBuilding = true; + meta = { description = "Free and open source video editor"; license = "GPLv2+"; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 4e4790bd2a0..4d17184a608 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL, ffmpeg, libdv, libsamplerate, libvorbis -, libxml2 , pkgconfig, qt4, sox }: +, libxml2 , pkgconfig, qt4, sox, gtk2 }: stdenv.mkDerivation rec { name = "mlt-${version}"; @@ -10,18 +10,20 @@ stdenv.mkDerivation rec { sha256 = "0m4nzxli1pl8w59m4iwwhpmr1xdz7xfknmbl3a0mkkd1jzdiq3nc"; }; - buildInputs = + buildInputs = [ SDL ffmpeg libdv libsamplerate libvorbis libxml2 pkgconfig qt4 - sox + sox # gtk2 /*optional*/ ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ "--enable-gpl" "--avformat-swscale" ]; + configureFlags = [ "--enable-gpl" "--enable-gpl3" "--avformat-swscale" ]; + + enableParallelBuilding = true; meta = { homepage = http://www.mltframework.org/; description = "Open source multimedia framework, designed for television broadcasting"; - license = "GPLv2+"; + license = "GPLv3"; }; } From fa6f6ccefaac43f6158ef174837eaaec79cb1878 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 31 May 2013 12:07:44 +0000 Subject: [PATCH 145/162] Add python packages: gdata, IMAPClient and Logbook --- pkgs/top-level/python-packages.nix | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2e54b13b9d..7711f4e97a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5901,4 +5901,57 @@ pythonPackages = python.modules // rec { }; }; + gdata = buildPythonPackage rec { + name = "gdata-${version}"; + version = "2.0.17"; + + src = fetchurl { + url = "https://gdata-python-client.googlecode.com/files/${name}.tar.gz"; + # sha1 = "d2d9f60699611f95dd8c328691a2555e76191c0c"; + sha256 = "0bdaqmicpbj9v3p0swvyrqs7m35bzwdw1gy56d3k09np692jfwmd"; + }; + + # Fails with "error: invalid command 'test'" + doCheck = false; + + meta = { + homepage = https://code.google.com/p/gdata-python-client/; + description = "Python client library for Google data APIs"; + license = pkgs.lib.licenses.asl20; + }; + }; + + IMAPClient = buildPythonPackage rec { + name = "IMAPClient-${version}"; + version = "0.9.2"; + + src = fetchurl { + url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; + sha256 = "10alpj7074djs048xjc4j7ggd1nrqdqpy0fzl7fj9hddp0rbchs9"; + }; + + meta = { + homepage = http://imapclient.freshfoo.com/; + description = "Easy-to-use, Pythonic and complete IMAP client library"; + license = pkgs.lib.licenses.bsd3; + }; + }; + + Logbook = buildPythonPackage rec { + name = "Logbook-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/L/Logbook/${name}.tar.gz"; + # md5 = "143cb15af4c4a784ca785a1546ad1b93"; + sha256 = "0iim9pcyl57c6z9i1kfw5nz92qrnpz2l0bz4lir2xrqi8m03q3d7"; + }; + + meta = { + homepage = http://pythonhosted.org/Logbook/; + description = "A logging replacement for Python"; + license = pkgs.lib.licenses.bsd3; + }; + }; + }; in pythonPackages From 6eb8048c8f28239282115e0a3720aadb1f02a9fe Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 31 May 2013 12:08:34 +0000 Subject: [PATCH 146/162] gmvault: New package Gmvault Gmail Backup - Backup and restore your gmail account at will. --- pkgs/tools/networking/gmvault/default.nix | 27 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/gmvault/default.nix diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix new file mode 100644 index 00000000000..5ed0a57bfae --- /dev/null +++ b/pkgs/tools/networking/gmvault/default.nix @@ -0,0 +1,27 @@ +{ pkgs, fetchurl, buildPythonPackage, pythonPackages }: + +buildPythonPackage rec { + version = "1.8.1-beta"; + name = "gmvault-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz"; + name = "${name}.tar.bz"; + sha256 = "0b575cnrd6jzcpa05mbn2swzcy0r9ck09pkhs4ydj6d3ir52j80c"; + }; + + doCheck = false; + + propagatedBuildInputs = [ + pythonPackages.gdata + pythonPackages.IMAPClient + pythonPackages.Logbook + pythonPackages.argparse + ]; + + meta = { + description = "Gmvault Gmail Backup - Backup and restore your gmail account at will."; + homepage = "http://gmvault.org"; + license = pkgs.lib.licenses.agpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bad3cbdfb3..d300e8db91c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -865,6 +865,8 @@ let glxinfo = callPackage ../tools/graphics/glxinfo { }; + gmvault = callPackage ../tools/networking/gmvault { }; + gnokii = builderDefsPackage (import ../tools/misc/gnokii) { inherit intltool perl gettext libusb pkgconfig bluez readline pcsclite libical gtk glib; From 76b18e4204130000bb919cafd9f7dae4844e122f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 5 Jun 2013 02:25:20 +0000 Subject: [PATCH 147/162] gmvault: Fix start script --- pkgs/tools/networking/gmvault/default.nix | 7 +++++++ pkgs/tools/networking/gmvault/gmvault.py | 4 ++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/tools/networking/gmvault/gmvault.py diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index 5ed0a57bfae..1ea2b761fc8 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -19,6 +19,13 @@ buildPythonPackage rec { pythonPackages.argparse ]; + startScript = ./gmvault.py; + + patchPhase = '' + cat ${startScript} > etc/scripts/gmvault + chmod +x etc/scripts/gmvault + ''; + meta = { description = "Gmvault Gmail Backup - Backup and restore your gmail account at will."; homepage = "http://gmvault.org"; diff --git a/pkgs/tools/networking/gmvault/gmvault.py b/pkgs/tools/networking/gmvault/gmvault.py new file mode 100644 index 00000000000..127036577f3 --- /dev/null +++ b/pkgs/tools/networking/gmvault/gmvault.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python + +import gmv.gmv_cmd as runner +runner.bootstrap_run() From bf310f322e4ca37eb506f54178107e804873ad88 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Jun 2013 17:44:28 +0200 Subject: [PATCH 148/162] add haskell/libffi --- .../libraries/haskell/libffi/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/libffi/default.nix diff --git a/pkgs/development/libraries/haskell/libffi/default.nix b/pkgs/development/libraries/haskell/libffi/default.nix new file mode 100644 index 00000000000..da87fc01bc6 --- /dev/null +++ b/pkgs/development/libraries/haskell/libffi/default.nix @@ -0,0 +1,13 @@ +{ cabal, libffi }: + +cabal.mkDerivation (self: { + pname = "libffi"; + version = "0.1"; + sha256 = "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28"; + pkgconfigDepends = [ libffi ]; + meta = { + description = "A binding to libffi"; + 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 5d4c626ade6..820d68ea550 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1307,6 +1307,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); lenses = callPackage ../development/libraries/haskell/lenses {}; + libffi = callPackage ../development/libraries/haskell/libffi { + libffi = pkgs.libffi; + }; + libmpd = callPackage ../development/libraries/haskell/libmpd {}; liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; From 3e0a25508c730d43ff3d03d134efd7151dbf1aa9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Jun 2013 17:44:47 +0200 Subject: [PATCH 149/162] add haskell/language-java --- .../haskell/language-java/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/language-java/default.nix diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix new file mode 100644 index 00000000000..5464826788b --- /dev/null +++ b/pkgs/development/libraries/haskell/language-java/default.nix @@ -0,0 +1,22 @@ +{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "language-java"; + version = "0.2.4"; + sha256 = "1fb36xq75mzmbsh25s0pscazvz6nvfy2mn1270653m7s3gdgcs5f"; + buildDepends = [ cpphs parsec syb ]; + testDepends = [ + filepath HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + buildTools = [ alex ]; + doCheck = false; + meta = { + homepage = "http://github.com/vincenthz/language-java"; + description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; + 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 820d68ea550..679186b9a60 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1287,6 +1287,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {}; + languageJava = callPackage ../development/libraries/haskell/language-java {}; + languageJavascript = callPackage ../development/libraries/haskell/language-javascript {}; languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; From 187670c7dad7afcba31eb585bb4e434fb6d96009 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Jun 2013 18:11:31 +0200 Subject: [PATCH 150/162] add haskell/idris --- pkgs/development/compilers/idris/default.nix | 23 ++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/compilers/idris/default.nix diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix new file mode 100644 index 00000000000..225f8afcd82 --- /dev/null +++ b/pkgs/development/compilers/idris/default.nix @@ -0,0 +1,23 @@ +{ cabal, binary, Cabal, filepath, gmp, happy, haskeline +, languageJava, libffi, mtl, parsec, split, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "idris"; + version = "0.9.8"; + sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + binary Cabal filepath haskeline languageJava libffi mtl parsec + split text transformers + ]; + buildTools = [ happy ]; + extraLibraries = [ gmp ]; + meta = { + homepage = "http://www.idris-lang.org/"; + description = "Functional Programming Language with Dependent Types"; + 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 679186b9a60..92e09207829 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2242,6 +2242,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); darcs = callPackage ../applications/version-management/darcs {}; + idris = callPackage ../development/compilers/idris {}; + leksah = callPackage ../applications/editors/leksah { QuickCheck = self.QuickCheck2; }; From 0ac416d336eb12c2343b14b60c60179920f1a0e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:02:25 +0200 Subject: [PATCH 151/162] release-haskell.nix: make sure idris compiles --- pkgs/top-level/release-haskell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index f08e5c8c58e..218ce951f06 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -227,6 +227,7 @@ mapHaskellTestOn { httpTypes = default; HUnit = all; hxt = default; + idris = default; IfElse = default; irc = default; iteratee = default; From f165b58b7b3cea2e76310123e4b912c8426a36ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:15:27 +0200 Subject: [PATCH 152/162] cabal2nix: add myself as a maintainer --- pkgs/development/tools/haskell/cabal2nix/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 4e941be7998..c1e58c5fedb 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -14,6 +14,9 @@ cabal.mkDerivation (self: { description = "Convert Cabal files into Nix build instructions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 0dfe09b6c9e115f831493634dcf8d8304808ad2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:37 +0200 Subject: [PATCH 153/162] haskell-bmp: update to version 1.2.5.1 GHC versions prior to 7.6.x cannot compile this version, so override the 'bmp' attribute for those compilers to version 1.2.2.1 in haskell-defaults.nix. --- .../development/libraries/haskell/bmp/1.2.5.1.nix | 15 +++++++++++++++ pkgs/top-level/haskell-defaults.nix | 9 +++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/bmp/1.2.5.1.nix diff --git a/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix new file mode 100644 index 00000000000..21ddb3c18e5 --- /dev/null +++ b/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix @@ -0,0 +1,15 @@ +{ cabal, binary }: + +cabal.mkDerivation (self: { + pname = "bmp"; + version = "1.2.5.1"; + sha256 = "1q1g5p7kan9hqb4s50fz989c4p8vmfrs7qvwiqx9bcic8k7jqld4"; + buildDepends = [ binary ]; + meta = { + homepage = "http://code.ouroborus.net/bmp"; + description = "Read and write uncompressed BMP image files"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 371ee72bd1f..23573478e39 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -31,12 +31,14 @@ self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; + bmp = self.bmp_1_2_2_1; }; ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; + bmp = self.bmp_1_2_2_1; }; ghc722Prefs = @@ -44,6 +46,7 @@ haskellPlatform = self.haskellPlatform_2012_2_0_0; deepseq = self.deepseq_1_3_0_1; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; + bmp = self.bmp_1_2_2_1; }; ghc721Prefs = ghc722Prefs; @@ -56,6 +59,7 @@ monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; + bmp = self.bmp_1_2_2_1; }; ghc703Prefs = @@ -66,6 +70,7 @@ monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; + bmp = self.bmp_1_2_2_1; }; ghc702Prefs = ghc701Prefs; @@ -78,6 +83,7 @@ monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; + bmp = self.bmp_1_2_2_1; }; ghc6123Prefs = ghc6122Prefs; @@ -91,6 +97,7 @@ # deviating from Haskell platform here, to make some packages (notably statistics) compile jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; + bmp = self.bmp_1_2_2_1; }; ghc6121Prefs = @@ -103,6 +110,7 @@ # deviating from Haskell platform here, to make some packages (notably statistics) compile jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; + bmp = self.bmp_1_2_2_1; }; ghc6104Prefs = @@ -116,6 +124,7 @@ monadPar = self.monadPar_0_1_0_3; # deviating from Haskell platform here, to make some packages (notably statistics) compile jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; + bmp = self.bmp_1_2_2_1; }; # Abstraction for Haskell packages collections diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 92e09207829..fff7983d7c4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -619,7 +619,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {}; bmp_1_2_4_1 = callPackage ../development/libraries/haskell/bmp/1.2.4.1.nix {}; - bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond + bmp_1_2_5_1 = callPackage ../development/libraries/haskell/bmp/1.2.5.1.nix {}; + bmp = self.bmp_1_2_5_1; Boolean = callPackage ../development/libraries/haskell/Boolean {}; From 14ecb17f61729ac63dc30b93e4fb6da2d3ea89fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:49 +0200 Subject: [PATCH 154/162] haskell-xmobar: update to version 0.18 --- pkgs/applications/misc/xmobar/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index bdc5c7856aa..db2b9eb94e3 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,15 +1,15 @@ -{ cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String -, wirelesstools, X11, X11Xft +{ cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time +, utf8String, wirelesstools, X11, X11Xft }: cabal.mkDerivation (self: { pname = "xmobar"; - version = "0.17"; - sha256 = "0ahb3xqxcfvpgxyb901bpl4i56mnslzwplcqxrr13glngcl7d25s"; + version = "0.18"; + sha256 = "08kk0yjx51vjrvvvd34hv8v80dsh8kjv150qf413ikaff0i28v7w"; isLibrary = false; isExecutable = true; buildDepends = [ - filepath mtl parsec stm time utf8String X11 X11Xft + filepath mtl parsec regexCompat stm time utf8String X11 X11Xft ]; extraLibraries = [ libXrandr wirelesstools ]; configureFlags = "-fwith_xft -fwith_iwlib"; From 773fc7e9bef96703ea8dd19de883f540d5c3fa2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:49 +0200 Subject: [PATCH 155/162] haskell-file-embed: update to version 0.0.4.8 --- pkgs/development/libraries/haskell/file-embed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 145d3c1c203..ccb0f8bac82 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.4.7"; - sha256 = "1hn08499kay0y6ik5z1s58s8r9h1nzf116avgi6ia4b565wpzkvi"; + version = "0.0.4.8"; + sha256 = "1jq4jdrxw822gzz7mc07nx4yj233mwmykp6xk371pf3hnq8rly0h"; buildDepends = [ filepath ]; testDepends = [ filepath HUnit ]; meta = { From 98d0b364be80341fd4e5a194855cfddb52e82750 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:49 +0200 Subject: [PATCH 156/162] haskell-hledger-lib: update to version 0.21.2 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 02266726cc7..57cb8dc8710 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.21"; - sha256 = "1j57f05ja8v2igykij3vnvl4z89cppnnbf9bz1i3m7c61xapawg7"; + version = "0.21.2"; + sha256 = "07li348kmwz9j4bfgmkq7zs9nyqxi5hhydij2fg4jwj0hbfxvmy9"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat regexpr safe split time transformers utf8String From fb11741df649fc19aef7d2b986ed8fb4b588a73c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:49 +0200 Subject: [PATCH 157/162] haskell-hledger-web: update to version 0.21.2 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 0493a4aab68..acffb0e55ff 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.21"; - sha256 = "19simd7vk9656zk1212ca9i52470np4j2lwjg4yi89rjq2ay2l05"; + version = "0.21.2"; + sha256 = "1z8nyvqzyjh36g50w4gmh8mzvydanfn1s3gx4nliwk4mjfj4bbkl"; isLibrary = true; isExecutable = true; buildDepends = [ From 9b79169e46934d59bfc6a16c9d0dd6b92a7fb21d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:49 +0200 Subject: [PATCH 158/162] haskell-hledger: update to version 0.21.2 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index bca994634e9..5d81a49f10b 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.21"; - sha256 = "1s44kmkkndqpnhsl23ba0b9g3dhswp4brd0nfi7gzlbdg8z8024w"; + version = "0.21.2"; + sha256 = "04n9bm97zqh8am83fr2aflw3gv5nwm9jm7bp9vzd4986f1c43ig3"; isLibrary = true; isExecutable = true; buildDepends = [ From 690cefa2b7a24cb981e8187db79f72f6717a4ceb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:49 +0200 Subject: [PATCH 159/162] haskell-lifted-base: update to version 0.2.1.0 --- pkgs/development/libraries/haskell/lifted-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 9b9dd8b679e..dc970925f98 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.0.5"; - sha256 = "1an7wlz31szccbypbrh59i3py210mh7jbfi0zaizd32q0im1573r"; + version = "0.2.1.0"; + sha256 = "0c4vzyfyjvqv5q8mprgxf9ckibpp5k1zh9k5slmdsd9m1l3pwwqy"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; From 9d8dbacd99aefb9c6e80e83337cd0ae2076c61eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:50 +0200 Subject: [PATCH 160/162] haskell-mongoDB: update to version 1.4.0 --- pkgs/development/libraries/haskell/mongoDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 83b04869e68..e730125544e 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.3.2"; - sha256 = "0gv0i2z6f797ibjfp16ax2aiqa66sclxjy8sabrwydwcyr96xb4y"; + version = "1.4.0"; + sha256 = "1cj73k6lfpxmfaigqwwglnncfl1ikz6yjgs0d9f6k42kwysbddwz"; buildDepends = [ binary bson cryptohash liftedBase monadControl mtl network parsec random randomShuffle text transformersBase From 97935a981e7ccd18a2a78fd61a7ab774ecb1ca4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:50 +0200 Subject: [PATCH 161/162] haskell-cabal2nix: update to version 1.51 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index c1e58c5fedb..96803e139ba 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.50"; - sha256 = "1ascgayijfa8d85245bggf9h1rgrji3h4gwiapi1v3z389aj0zjw"; + version = "1.51"; + sha256 = "0la1bhdxrzn1phjyca7h54vimwf4jy5ryclwrnivbcxkncrk9lig"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 6cacb34fec15df3b1a98061b12528e48df0b940b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:32:11 +0200 Subject: [PATCH 162/162] haskell-bmp: jailbreak version 1.2.5.1 to support binary 0.7.x --- pkgs/development/libraries/haskell/bmp/1.2.5.1.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix index 21ddb3c18e5..650251a6c37 100644 --- a/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix +++ b/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.2.5.1"; sha256 = "1q1g5p7kan9hqb4s50fz989c4p8vmfrs7qvwiqx9bcic8k7jqld4"; buildDepends = [ binary ]; + jailbreak = true; meta = { homepage = "http://code.ouroborus.net/bmp"; description = "Read and write uncompressed BMP image files";