From 6704a7379b209e5d49e509507279b14d89041222 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:25 +0000 Subject: [PATCH 001/183] haskell-test-framework: dropped version 0.4.2.2 Pandoc updated to 0.5. svn path=/nixpkgs/trunk/; revision=32100 --- .../haskell/test-framework/0.4.2.2.nix | 25 ------------------- .../test-framework/{0.5.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++---- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix rename pkgs/development/libraries/haskell/test-framework/{0.5.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix b/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix deleted file mode 100644 index 4b920133ffd..00000000000 --- a/pkgs/development/libraries/haskell/test-framework/0.4.2.2.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname -, random, regexPosix, time, xml -}: - -cabal.mkDerivation (self: { - pname = "test-framework"; - version = "0.4.2.2"; - sha256 = "1lwdx4z9j5wxbmmlakf6knirdhi0ic6xpmhrj9ipa5ybw2zszakr"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - ansiTerminal ansiWlPprint extensibleExceptions hostname random - regexPosix time xml - ]; - meta = { - homepage = "http://batterseapower.github.com/test-framework/"; - description = "Framework for running and organising tests, with HUnit and QuickCheck support"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/test-framework/0.5.nix b/pkgs/development/libraries/haskell/test-framework/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/test-framework/0.5.nix rename to pkgs/development/libraries/haskell/test-framework/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f29eaeca9e2..294fa00d17d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1061,9 +1061,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pathPieces_0_1_0 = callPackage ../development/libraries/haskell/path-pieces/0.1.0.nix {}; pathPieces = self.pathPieces_0_1_0; - pandoc = callPackage ../development/libraries/haskell/pandoc { - testFramework = self.testFramework_0_4_2_2; - }; + pandoc = callPackage ../development/libraries/haskell/pandoc {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; @@ -1327,9 +1325,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); terminfo = callPackage ../development/libraries/haskell/terminfo {}; - testFramework_0_4_2_2 = callPackage ../development/libraries/haskell/test-framework/0.4.2.2.nix {}; - testFramework_0_5 = callPackage ../development/libraries/haskell/test-framework/0.5.nix {}; - testFramework = self.testFramework_0_5; + testFramework = callPackage ../development/libraries/haskell/test-framework {}; testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; From a2df0e09ff226eae4fe0afc7b404dd57281d2dc5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:28 +0000 Subject: [PATCH 002/183] haskell-zlib: added version 0.5.3.3 svn path=/nixpkgs/trunk/; revision=32101 --- .../libraries/haskell/zlib/0.5.3.3.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 7 +++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/zlib/0.5.3.3.nix diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix new file mode 100644 index 00000000000..909754db3e7 --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -0,0 +1,17 @@ +{ cabal, zlib }: + +cabal.mkDerivation (self: { + pname = "zlib"; + version = "0.5.3.3"; + sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; + extraLibraries = [ zlib ]; + meta = { + description = "Compression and decompression in the gzip and zlib formats"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 294fa00d17d..b1e44ecb0be 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm = self.stm_2_2_0_1; # 7.4.1 ok syb = self.syb_0_3_6; # 7.4.1 ok xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok - zlib = self.zlib_0_5_3_1; # 7.4.1 ok + zlib = self.zlib_0_5_3_3; # 7.4.1 ok HTTP = self.HTTP_4000_2_2; # 7.4.1 ok text = self.text_0_11_1_13; # 7.4.1 ok transformers = self.transformers_0_2_2_0; # 7.4.1 ok @@ -1520,7 +1520,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; - zlib = self.zlib_0_5_3_1; + zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { + inherit (pkgs) zlib; + }; + zlib = self.zlib_0_5_3_3; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; From d5d4995b03c3aec94bc691b9e09fccc360a9fa02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:30 +0000 Subject: [PATCH 003/183] haskell-pandoc: updated to version 1.9.0.5 svn path=/nixpkgs/trunk/; revision=32102 --- .../libraries/haskell/pandoc/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index de998c51b93..77f1d07bab2 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,23 +1,19 @@ -{ cabal, ansiTerminal, base64Bytestring, blazeHtml, citeprocHs -, Diff, extensibleExceptions, highlightingKate, HTTP, HUnit, json -, mtl, network, pandocTypes, parsec, QuickCheck, random, syb -, tagsoup, temporary, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, texmath, time, utf8String, xml -, zipArchive, zlib +{ cabal, base64Bytestring, blazeHtml, citeprocHs +, extensibleExceptions, highlightingKate, HTTP, json, mtl, network +, pandocTypes, parsec, random, syb, tagsoup, temporary, texmath +, time, utf8String, xml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.0.3"; - sha256 = "1p5054sdvvgl38rr0ajfavr79rwr2l8jdrpzai329ksskkh1acdp"; + version = "1.9.0.5"; + sha256 = "0haszw0khz47k2cfhzz38ia1zznwwmixhaf0jyr6l2gdpfq59b0p"; isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal base64Bytestring blazeHtml citeprocHs Diff - extensibleExceptions highlightingKate HTTP HUnit json mtl network - pandocTypes parsec QuickCheck random syb tagsoup temporary - testFramework testFrameworkHunit testFrameworkQuickcheck2 texmath - time utf8String xml zipArchive zlib + base64Bytestring blazeHtml citeprocHs extensibleExceptions + highlightingKate HTTP json mtl network pandocTypes parsec random + syb tagsoup temporary texmath time utf8String xml zipArchive zlib ]; configureFlags = "-fhighlighting -fthreaded"; meta = { From 572260e2378e97e5384682e71417875a174193d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:33 +0000 Subject: [PATCH 004/183] haskell-system-filepath: updated to version 0.4.6 svn path=/nixpkgs/trunk/; revision=32103 --- .../development/libraries/haskell/system-filepath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index e0ad17c6acb..6dc4d44ee96 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.5"; - sha256 = "18jpn3pyy6dh20xpdlwmhcjvbywjz4vr9fvwcwhylbicrw627ybs"; + version = "0.4.6"; + sha256 = "0p8lf10b5zn2gw5klpjc397q892cydvnl677srj9rk3lhmsm5jjl"; buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; From 99e9375631ae9d3e67288a49c3fab1ed47709137 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:35 +0000 Subject: [PATCH 005/183] haskell-wx: updated to version 0.13.2.1 svn path=/nixpkgs/trunk/; revision=32104 --- pkgs/development/libraries/haskell/wxHaskell/wx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 9b7f94d1cbd..450597c22e1 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wx"; - version = "0.13.2"; - sha256 = "19k0sa16dr63bgl9j37zrxnknlnq3c2927xccwc2vq19vl7n52nd"; + version = "0.13.2.1"; + sha256 = "0s5jmsrip26ahvz7mzf12m9rcibrk9is3kwbswz87h0sr0k11nbv"; buildDepends = [ stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; From a3cab4b496c3838c07f666c2526608319732f05f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:38 +0000 Subject: [PATCH 006/183] haskell-wxcore: updated to version 0.13.2.1 svn path=/nixpkgs/trunk/; revision=32105 --- pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 647f715d3ce..ce24888ce14 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.13.2"; - sha256 = "1kzgqmh0vjm1qcskkfdyjbbq276nhd76w7bgxgdq67zl48bfc09g"; + version = "0.13.2.1"; + sha256 = "0p0d9vxw2pyvnhswsgasdd62hj86w3ixbbsx41wkswzkjjjib9i6"; buildDepends = [ parsec stm time wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { From 77f141510227e1b8db886514f518094f72f07b58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:40 +0000 Subject: [PATCH 007/183] haskell-wxdirect: updated to version 0.13.1.2 svn path=/nixpkgs/trunk/; revision=32106 --- pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 8430c1fa59d..b2df725223d 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxdirect"; - version = "0.13.1.1"; - sha256 = "00zij92hm7rbl8sx6f625cqzwgi72c8qn1dj6d1q4zg14dszarad"; + version = "0.13.1.2"; + sha256 = "1gn5si6939yizlkf7hzm2a2gff5sa98m7q5q1hz23av98zfa8pv7"; isLibrary = true; isExecutable = true; buildDepends = [ parsec strict time ]; From 6789ec0c842e5af48fc844fd607692a3ff790c30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 10:34:43 +0000 Subject: [PATCH 008/183] haskell-cpphs: updated to version 1.13.3 svn path=/nixpkgs/trunk/; revision=32107 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 620cb8149a2..7dd3cf61a82 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.13.2"; - sha256 = "1q3pzfcgrl9nka1gdl84c4fqc1ql83idlbb8fghqsjp0ijzcxk3s"; + version = "1.13.3"; + sha256 = "1dnz4992hr662ys1lkf6iyqmi2a3bksim8dlryqwd9wx9h24lhq2"; isLibrary = true; isExecutable = true; meta = { From e4ee3e2c9be0afb556c7da9736b9d2ec68dfb47e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Feb 2012 12:22:48 +0000 Subject: [PATCH 009/183] * svn2git updated to 2.2.0. svn path=/nixpkgs/trunk/; revision=32108 --- .../version-management/git-and-tools/svn2git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 6f5d36f6aa7..534a00a357b 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, ruby, makeWrapper, git }: stdenv.mkDerivation rec { - name = "svn2git-2.1.0-20111206"; + name = "svn2git-2.2.0"; src = fetchgit { url = https://github.com/nirvdrum/svn2git; - rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848"; - sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca"; + rev = "db0769835e9d1d3ff324091a3bb7756200a09932"; + sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2"; }; buildInputs = [ ruby makeWrapper ]; From b22276deea284a2ad4ac5587fc1ac801b18f449e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Feb 2012 12:38:32 +0000 Subject: [PATCH 010/183] * Add disk images for Ubuntu 11.10. svn path=/nixpkgs/trunk/; revision=32109 --- pkgs/build-support/vm/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 979ceae5418..3e926d05d6a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -166,6 +166,7 @@ rec { halt -d -p -f ''; + initrd = makeInitrd { contents = [ { object = stage1Init; @@ -1153,23 +1154,23 @@ rec { packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; }; - ubuntu1010i386 = { - name = "ubuntu-10.04-maverick-i386"; - fullName = "Ubuntu 10.04 Maverick (i386)"; + ubuntu1110i386 = { + name = "ubuntu-11.10-oneiric-i386"; + fullName = "Ubuntu 11.10 Oneiric (i386)"; packagesList = fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2; - sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0"; + url = mirror://ubuntu/dists/oneiric/main/binary-i386/Packages.bz2; + sha256 = "11r1s76ppi7rwz08i20d7n4ndaj9lb9wsl9k8ww4s1c6agzpwv8a"; }; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - ubuntu1010x86_64 = { - name = "ubuntu-10.04-maverick-amd64"; - fullName = "Ubuntu 10.04 Maverick (amd64)"; + ubuntu1110x86_64 = { + name = "ubuntu-11.10-oneiric-amd64"; + fullName = "Ubuntu 11.10 Oneiric (amd64)"; packagesList = fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2; - sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc"; + url = mirror://ubuntu/dists/oneiric/main/binary-amd64/Packages.bz2; + sha256 = "07k784gxwaqmyggmzczy9hjkgfp6p6dcs8rhkxw5hfzn0jaf8l2s"; }; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; From 78ab1dd99506f9453e691507ba12c6c88d6bb718 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Feb 2012 13:14:25 +0000 Subject: [PATCH 011/183] * Added Fedora 16 images. svn path=/nixpkgs/trunk/; revision=32110 --- pkgs/build-support/vm/default.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 3e926d05d6a..f86ebbb556e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -962,6 +962,30 @@ rec { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ]; }; + fedora16i386 = { + name = "fedora-16-i386"; + fullName = "Fedora 16 (i386)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/16/Everything/i386/os/repodata/8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118-primary.xml.gz; + sha256 = "8d5e9b291748d8254e1e66ad2d35bdb7e020d8c2c6a84f928595597b7e546118"; + }; + urlPrefix = mirror://fedora/linux/releases/16/Everything/i386/os; + archs = ["noarch" "i386" "i586" "i686"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + }; + + fedora16x86_64 = { + name = "fedora-16-x86_64"; + fullName = "Fedora 16 (x86_64)"; + packagesList = fetchurl { + url = mirror://fedora/linux/releases/16/Everything/x86_64/os/repodata/3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107-primary.xml.gz; + sha256 = "3fffacc6006d9b4782e57f3f11fcb44ab2a1abf6625e4afb4bf6a1e6475dd107"; + }; + urlPrefix = mirror://fedora/linux/releases/16/Everything/x86_64/os; + archs = ["noarch" "x86_64"]; + packages = commonFedoraPackages ++ [ "cronie" "util-linux" ]; + }; + opensuse103i386 = { name = "opensuse-10.3-i586"; fullName = "openSUSE 10.3 (i586)"; From c303784a89a061c38b61ff9b984224b38e0335c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Feb 2012 13:19:03 +0000 Subject: [PATCH 012/183] * Debian 6.0.4. svn path=/nixpkgs/trunk/; revision=32112 --- pkgs/build-support/vm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index f86ebbb556e..8c9fbec533f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1245,22 +1245,22 @@ rec { }; debian60i386 = { - name = "debian-6.0.3-squeeze-i386"; - fullName = "Debian 6.0.3 Squeeze (i386)"; + name = "debian-6.0.4-squeeze-i386"; + fullName = "Debian 6.0.4 Squeeze (i386)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha1 = "90a55b6bb049d0777d06d5b28a1848b38678426b"; + sha256 = "5686732aa690d80ba4c390af3f7b9ba3c3c8c17861c89bca3a3694c403d7b7e6"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian60x86_64 = { - name = "debian-6.0.3-squeeze-amd64"; - fullName = "Debian 6.0.3 Squeeze (amd64)"; + name = "debian-6.0.4-squeeze-amd64"; + fullName = "Debian 6.0.4 Squeeze (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha1 = "071626063ab0a70f10200e2e27a5c7fae29fa4ad"; + sha256 = "525f919bb48a4d2d0cb3a4fb5b0d4338e7936f68753ca945358ea1c3792ea7b7"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From c9201bdf53497b872351d0e2d9d42bd955994c7e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 14:01:00 +0000 Subject: [PATCH 013/183] YAML-LibYAML: added version 0.38 svn path=/nixpkgs/trunk/; revision=32114 --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ee4f3fa4771..e8abf0210dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3940,4 +3940,12 @@ rec { }; }; + YAMLLibYAML = buildPerlPackage rec { + name = "YAML-LibYAML-0.38"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/YAML/${name}.tar.gz"; + sha256 = "eb98f304d14f6557b07adfa24da16e00cfa54a9d9484b6e898e35f919c5eb7ba"; + }; + }; + } From f57a6512b856d90ae278d6617f7ad7ba7d466d3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 14:01:03 +0000 Subject: [PATCH 014/183] perl-packages.nix: strip trailing whitespace svn path=/nixpkgs/trunk/; revision=32115 --- pkgs/top-level/perl-packages.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e8abf0210dc..85d50caf863 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -380,7 +380,7 @@ rec { sha256 = "19iasq94nph33vz4jrk5x6cqd9ivq0db867s524faba8avrrlxz9"; }; buildInputs = [ TestMore TestException TestRequires DBDSQLite ]; - propagatedBuildInputs = + propagatedBuildInputs = [ DBIxClass CatalystRuntime CatalystXComponentTraits Moose MooseXTypes NamespaceAutoclean CarpClan ListMoreUtils TieIxHash TryTiny CatalystDevel DBIxClassSchemaLoader MooseXNonMoose @@ -562,7 +562,7 @@ rec { url = "mirror://cpan/modules/by-module/CatalystX/${name}.tar.gz"; sha256 = "0a2mhfgv0kqmaxf2crs8mqk44lyhd9qcwlpzhrc0b0dh4z503mr4"; }; - propagatedBuildInputs = + propagatedBuildInputs = [ CatalystRuntime MooseXTraitsPluggable NamespaceAutoclean ListMoreUtils ]; }; @@ -1134,7 +1134,7 @@ rec { sha256 = "15k1kgbrsnkwr0ib6cyr114zk904lisy4k09gfiynag9wjhv47lm"; }; buildInputs = [ DBDSQLite TestException TestWarn ]; - propagatedBuildInputs = + propagatedBuildInputs = [ PackageStash ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataCompare DataDumperConcise DataPage HashMerge MROCompat ModuleFind @@ -1169,7 +1169,7 @@ rec { sha256 = "0qrsh6i8p4mpx5bapn40cpsbvnvzivli71gymbiqjd0mjflbsjf6"; }; buildInputs = [ TestException TestMore TestWarn DBDSQLite ]; - propagatedBuildInputs = + propagatedBuildInputs = [ DataDump LinguaENInflectNumber LinguaENInflectPhrase ClassAccessor ClassAccessorGrouped ClassC3Componentised MROCompat CarpClan DBIxClass ClassLoad ClassUnload @@ -1299,8 +1299,8 @@ rec { sha256 = "0z4nl7aizbailraqwkkqhx6k3hdz67wxszjfhd5yg2vn06ybsjwj"; }; buildInputs = [ TestMore ]; - propagatedBuildInputs = - [ CaptureTiny EmailAbstract EmailAddress ListMoreUtils Moose + propagatedBuildInputs = + [ CaptureTiny EmailAbstract EmailAddress ListMoreUtils Moose Throwable TryTiny ]; }; @@ -1389,10 +1389,10 @@ rec { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; sha256 = "0fwhb2cf5x7y87xwml66p624iynf0mzvhy1q4aq5yv7l3lhwhaby"; }; - propagatedBuildInputs = + propagatedBuildInputs = [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta - FileCopyRecursive VersionRequirements ExtUtilsManifest - ]; + FileCopyRecursive VersionRequirements ExtUtilsManifest + ]; }; ExtUtilsManifest = buildPerlPackage rec { @@ -2088,7 +2088,7 @@ rec { sha256 = "1l7sjnibnvgb7a73cjhysmrg4j2bfcn0x5yrqmh0v23laj9fsbbm"; }; buildInputs = [ TestMore ]; - propagatedBuildInputs = + propagatedBuildInputs = [ LinguaENInflect LinguaENInflectNumber LinguaENTagger ]; }; @@ -2415,7 +2415,7 @@ rec { sha256 = "0gv79bsnacrzwpac3dll64zj40qcsbp4kdk8yr9z5bwim7nkvnv3"; }; buildInputs =[ TestException ]; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassMOP Moose NamespaceAutoclean ListMoreUtils ]; }; @@ -3012,7 +3012,7 @@ rec { sha256 = "12abz50zz51s1f5hvs5xl6smb369sjid1zyjkfygkiglqp4an0kr"; }; buildInputs = [ TestDeep TestException TestWarn ]; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; }; @@ -3117,7 +3117,7 @@ rec { url = "mirror://cpan/modules/by-module/String/${name}.tar.gz"; sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm"; }; - propagatedBuildInputs = + propagatedBuildInputs = [ LinguaENInflectPhrase TextUnidecode NamespaceClean ]; }; From 29869899a833b4deced5b481bd1a10e32080eab9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 14:01:05 +0000 Subject: [PATCH 015/183] ikiwiki: updated to version 3.20120202 svn path=/nixpkgs/trunk/; revision=32116 --- pkgs/applications/misc/ikiwiki/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index feb507c8732..e4899bfc463 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, gitSupport ? false -, git ? null -, monotoneSupport ? false -, monotone ? null +, YAMLLibYAML +, gitSupport ? false, git ? null +, monotoneSupport ? false, monotone ? null , extraUtils ? [] }: @@ -13,19 +12,19 @@ assert monotoneSupport -> (monotone != null); let name = "ikiwiki"; - version = "3.20120115"; + version = "3.20120202"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "3145372b3d86068f90348a96f9daf3a3b438d747be0e977358d82ee752499c1f"; + sha256 = "0bada9a98e0990c6d99e8ca978e42926578aec36d033d6a273e415349a6cbb48"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML] + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML ] ++ stdenv.lib.optionals gitSupport [git] ++ stdenv.lib.optionals monotoneSupport [monotone]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01ef719b085..bb056cbd799 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7089,7 +7089,7 @@ let ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML; + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML; gitSupport = false; monotoneSupport = false; extraUtils = []; From 4e3afe1b8d0f813e693eaab6a6b539ae9f4c6feb Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 7 Feb 2012 17:39:51 +0000 Subject: [PATCH 016/183] emacs mode calfw-1.3 svn path=/nixpkgs/trunk/; revision=32118 --- .../editors/emacs-modes/calfw/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/calfw/default.nix diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix new file mode 100644 index 00000000000..37bc3770c8c --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -0,0 +1,34 @@ +{ fetchgit, stdenv, emacs }: + +# TODO: byte-compile in build phase - a buildEmacsPackage that does +# that would be nice + +stdenv.mkDerivation rec { + name = "calfw-1.3"; + + src = fetchgit { + url = "git://github.com/kiwanami/emacs-calfw.git"; + rev = "e3408d8d1f4dd6d1e76883d728efc62bba41ee7a"; + sha256 = "1b9c74200aa0b06fcd199f6c2cc91fdfaceb04e7744fe842e1fe4839c0c933f3"; + }; + + buildInputs = [ emacs ]; + + installPhase = + '' + ensureDir "$out/share/doc/${name}" + cp -v readme.md "$out/share/doc/${name}" + + ensureDir "$out/share/emacs/site-lisp/" + cp *.el "$out/share/emacs/site-lisp/" + ''; + + meta = { + description = "A calendar framework for Emacs"; + + license = "GPLv3+"; + + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb056cbd799..f239d0a7dc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6715,6 +6715,8 @@ let cedet = callPackage ../applications/editors/emacs-modes/cedet { }; + calfw = callPackage ../applications/editors/emacs-modes/calfw { }; + cua = callPackage ../applications/editors/emacs-modes/cua { }; ecb = callPackage ../applications/editors/emacs-modes/ecb { }; From f3b60febd3a32afda11cc10f8dba484ee8818c5b Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 7 Feb 2012 17:39:54 +0000 Subject: [PATCH 017/183] calfw-1.3-5-ga9b6615 for fix in combination with org-mode svn path=/nixpkgs/trunk/; revision=32119 --- pkgs/applications/editors/emacs-modes/calfw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index 37bc3770c8c..8934238ffa3 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -4,12 +4,12 @@ # that would be nice stdenv.mkDerivation rec { - name = "calfw-1.3"; + name = "calfw-1.3-5-ga9b6615"; src = fetchgit { url = "git://github.com/kiwanami/emacs-calfw.git"; - rev = "e3408d8d1f4dd6d1e76883d728efc62bba41ee7a"; - sha256 = "1b9c74200aa0b06fcd199f6c2cc91fdfaceb04e7744fe842e1fe4839c0c933f3"; + rev = "a9b6615b6666bbebe78257c557fd9a2e3a325d8d"; + sha256 = "524acc8fec7e64ebe0d370ddb1d96eee6a409d650b79011fa910c35225a7f393"; }; buildInputs = [ emacs ]; From 58bd562e287362ef55309b59d76c78b835de715c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 7 Feb 2012 17:39:56 +0000 Subject: [PATCH 018/183] python-matplotlib-1.1.0 svn path=/nixpkgs/trunk/; revision=32120 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9cc483ef3a..77b10c10a07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -759,10 +759,10 @@ let pythonPackages = python.modules // rec { matplotlib = buildPythonPackage ( rec { - name = "matplotlib-1.0.1"; + name = "matplotlib-1.1.0"; src = fetchurl { url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; - sha256 = "1xksjix227n9hm6jnhlwkdf1yf1zgz18665cisqk8grv6xvn7g43"; + sha256 = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7"; }; doCheck = false; From af8aceb847339fca08618df2f1652f1a1169c6c4 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 7 Feb 2012 17:39:59 +0000 Subject: [PATCH 019/183] notmuch cosmetical change svn path=/nixpkgs/trunk/; revision=32121 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index dc4c0531031..2815266f2a1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -58,9 +58,8 @@ stdenv.mkDerivation rec { ''; # XXX: emacs tests broken - #postBuild = '' - # make test - #''; + doCheck = false; + checkTarget = "test"; meta = { description = "Notmuch -- The mail indexer"; From df12f0bd015155663df966408ec9c48cf4c79b57 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 7 Feb 2012 17:40:02 +0000 Subject: [PATCH 020/183] emacs js2-mode svn path=/nixpkgs/trunk/; revision=32122 --- .../editors/emacs-modes/js2/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/js2/default.nix diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix new file mode 100644 index 00000000000..e5958021aa2 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation { + name = "js2-mode-0-20120130"; + + src = fetchgit { + url = "git://github.com/mooz/js2-mode.git"; + rev = "4c008b1987aa53769899e24808b6d74b41b4ff40"; + sha256 = "6af5f52e46ffe85b7610e2db19a96afbef60a6f5374f1c5db3653448e30160be"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile js2-mode.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + cp js2-mode.el js2-mode.elc $out/share/emacs/site-lisp/ + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f239d0a7dc5..09a55fa4981 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6733,6 +6733,8 @@ let # Requires Emacs 23, for `avl-tree'. }; + js2 = callPackage ../applications/editors/emacs-modes/js2 { }; + stratego = callPackage ../applications/editors/emacs-modes/stratego { }; haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; From 2f7102afc0f9f51220556f12a401b16087adba41 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 7 Feb 2012 17:40:05 +0000 Subject: [PATCH 021/183] emacs 24.0.93 svn path=/nixpkgs/trunk/; revision=32123 --- pkgs/applications/editors/emacs-24/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 91307deb220..236c7574d5e 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -4,23 +4,18 @@ , alsaLib }: -# XXX: ? -# - checking for alsa >= 1.0.0... no -# - checking for Wand >= 6.2.8... no -# - imagemagickBig instead of imagemagick? - assert (gtk != null) -> (pkgconfig != null); assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-24.0.92"; + name = "emacs-24.0.93"; builder = ./builder.sh; src = fetchurl { url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz"; - sha256 = "0pwps72zj7mm6asly1vdq46dcj3in4qrkb6ss9xq6nbf039nj4w6"; + sha256 = "4a100accb2f76231aed4dddb32d3725dec131280ad3bdf1b39b52ce337a210fe"; }; buildInputs = From 4afaf0be233ba4ef750e847887230585dea0fddb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 17:45:47 +0000 Subject: [PATCH 022/183] emacs-w3m: updated the SHA256 hash Thanks Ludo! svn path=/nixpkgs/trunk/; revision=32124 --- pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index a7ff4e624a1..751330550f1 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { inherit date; cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; module = "emacs-w3m"; - sha256 = "ad46592d4fe3cdaadc02ce6d3fb1ac237e200beecd2ad11a04c1395a38a70a0a"; + sha256 = "7a6d90b9d25f137d5a204cfa29f6c6afa8edb1ee302f969110ffda11f11909cc"; }; buildInputs = [ emacs w3m texinfo autoconf ]; From a62fa4480adcc41d421fd1dc5a0471ce2469c1f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 19:54:25 +0000 Subject: [PATCH 023/183] nbd: updated to version 2.9.25 svn path=/nixpkgs/trunk/; revision=32125 --- ...or-HAVE_FALLOC_PH-in-both-occurrence.patch | 25 +++++++++++++++++++ pkgs/tools/networking/nbd/default.nix | 8 +++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch diff --git a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch b/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch new file mode 100644 index 00000000000..e4bb0db3abf --- /dev/null +++ b/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch @@ -0,0 +1,25 @@ +From 42d3c4e7e95ea0e0dda9b502b2de2c4ed9ed9467 Mon Sep 17 00:00:00 2001 +From: "T.M. Abraham" +Date: Fri, 6 Jan 2012 21:58:55 -0500 +Subject: [PATCH] properly check for HAVE_FALLOC_PH in both occurrences + +--- + nbd-server.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/nbd-server.c b/nbd-server.c +index 0ecf0e8..2cd066d 100644 +--- a/nbd-server.c ++++ b/nbd-server.c +@@ -1461,7 +1461,7 @@ int expflush(CLIENT *client) { + * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM) + */ + int exptrim(struct nbd_request* req, CLIENT* client) { +-#ifdef HAVE_FALLOC_PH ++#if HAVE_FALLOC_PH + FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0); + FILE_INFO cur = prev; + int i = 1; +-- +1.7.8 + diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index ef032eee390..60eea0e2d9e 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-2.9.24"; + name = "nbd-2.9.25"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "025cqsx6cwbr62javdvm5vx675ai0b1absbx4if1v5pp9hzrpxmq"; + sha256 = "179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4"; }; - buildInputs = [pkgconfig glib]; + buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional stdenv.isLinux stdenv.glibc.kernelHeaders; postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; + patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ]; + # The test suite doesn't succeed on Hydra (NixOS), because it assumes # that certain global configuration files available. doCheck = false; From 1451109c95ec2ca6712129d76e7c5df2ad15bd96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 19:54:28 +0000 Subject: [PATCH 024/183] nbd: linking with -lrt is no longer necessary because we don't link glib statically anymore svn path=/nixpkgs/trunk/; revision=32126 --- pkgs/tools/networking/nbd/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 60eea0e2d9e..26272424749 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation { # that certain global configuration files available. doCheck = false; - # Glib calls `clock_gettime', which is in librt. Since we're using - # a static Glib, we need to pass it explicitly. - NIX_LDFLAGS = "-lrt"; - meta = { homepage = "http://nbd.sourceforge.net"; description = "map arbitrary files as block devices over the network"; From 07a925d08a5765f39d9b10b27cd285dd8c8b7f1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 19:54:31 +0000 Subject: [PATCH 025/183] nbd: re-enable the test suite to see what happens svn path=/nixpkgs/trunk/; revision=32127 --- pkgs/tools/networking/nbd/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 26272424749..2d12d28ac2c 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -11,14 +11,13 @@ stdenv.mkDerivation { sha256 = "179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4"; }; - buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional stdenv.isLinux stdenv.glibc.kernelHeaders; - postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; - patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ]; - # The test suite doesn't succeed on Hydra (NixOS), because it assumes - # that certain global configuration files available. - doCheck = false; + buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional stdenv.isLinux stdenv.glibc.kernelHeaders; + + postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; + + doCheck = true; meta = { homepage = "http://nbd.sourceforge.net"; From acd9d6b42e81213101710c59eabe125706e6ca57 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 7 Feb 2012 21:03:12 +0000 Subject: [PATCH 026/183] pango-1.29: use fetchurl cherry-pick /nixpkgs/branches/glib-2.30@32043 svn path=/nixpkgs/trunk/; revision=32128 --- pkgs/development/libraries/pango/1.29.x.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix index b255f05dd23..0b1c44f30b8 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng, xz }: +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, xz }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "pango-1.29.4"; - src = fetchurl_gnome { - project = "pango"; - major = "1"; minor = "29"; patchlevel = "4"; extension = "xz"; + src = fetchurl { + url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz; sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s"; }; From a8dba7888b8e0e956cee6accdec4cb9b803fbcc8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 7 Feb 2012 21:03:16 +0000 Subject: [PATCH 027/183] Move gtkLibs3x to top-level namespace, gtk+-3.2.3 Cherry-pick /nixpkgs/branches/glib-2.30@32044 svn path=/nixpkgs/trunk/; revision=32129 --- pkgs/development/libraries/gtk+/3.2.x.nix | 15 +++++-------- pkgs/top-level/all-packages.nix | 27 +++++------------------ 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index a72411d1636..826fb81cf87 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs +{ stdenv, fetchurl, pkgconfig, glib, atk, pango129, cairo, perl, xlibs , gdk_pixbuf, xz , xineramaSupport ? true , cupsSupport ? true, cups ? null @@ -8,12 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = src.pkgname; + name = "gtk+-3.2.3"; - src = fetchurl_gnome { - project = "gtk+"; - major = "3"; minor = "2"; patchlevel = "0"; extension = "xz"; - sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw"; + src = fetchurl { + url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz; + sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2"; }; enableParallelBuilding = true; @@ -21,14 +20,12 @@ stdenv.mkDerivation rec { buildNativeInputs = [ perl pkgconfig xz ]; propagatedBuildInputs = - [ xlibs.xlibs glib atk pango gdk_pixbuf cairo + [ xlibs.xlibs glib atk pango129 gdk_pixbuf cairo xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; - configureFlags = "--with-xinput=yes"; - postInstall = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a55fa4981..26911382b34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3731,32 +3731,15 @@ let gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; - gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + + gtk = pkgs.gtk2; gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; - gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { - glib = callPackage ../development/libraries/glib/2.30.x.nix { }; + pango129 = lowPrio (callPackage ../development/libraries/pango/1.29.x.nix { }); - glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; - - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; - - atk = callPackage ../development/libraries/atk/2.2.x.nix { }; - - atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; - - cairo = callPackage ../development/libraries/cairo { }; - - pango = callPackage ../development/libraries/pango/1.29.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { }; - - gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - - # Let hydra build gtk-3.x but do not show this to users yet - recurseForRelease = true; - }; + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { inherit (gnome) gtk; From 043000cf35018a62dcd106c48b43efecd5a21d3c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 7 Feb 2012 21:03:20 +0000 Subject: [PATCH 028/183] Fix eval svn path=/nixpkgs/trunk/; revision=32130 --- 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 26911382b34..b2a8a72d77d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8139,7 +8139,7 @@ let gnome3 = (import ../desktops/gnome-3 { callPackage = pkgs.newScope pkgs.gnome3; - } // pkgs.gtkLibs3x); + }); gnome = recurseIntoAttrs gnome2; From 912637f33a48f8b5bee1656b11650300770a1ae6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 7 Feb 2012 21:03:25 +0000 Subject: [PATCH 029/183] Enable/disable libreoffice build in nixpkgs.config, not in tree. I've tried to use override instead of getConfig but failed because exception is thrown before the function is called with force = true. svn path=/nixpkgs/trunk/; revision=32131 --- pkgs/applications/office/openoffice/libreoffice.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 5fde0cfa285..d90beecd967 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -6,10 +6,13 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2 , autoconf, openldap, postgresql, bash , langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ] +, force ? false }: -throw "The expression for libreoffice is still not ready" - +if !force then + throw ''The expression for libreoffice is still not ready. + Set config.libreoffice.force = true; if you want to try it anyway.'' +else stdenv.mkDerivation rec { name = "libreoffice-3.4.5.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2a8a72d77d..06c4a8ee08c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7157,6 +7157,7 @@ let libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; + force = getConfig [ "libreoffice" "force" ] false; }; lingot = callPackage ../applications/audio/lingot { From 85f4a69a14b46573e637f08df3761fbd4681fe3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 7 Feb 2012 21:45:05 +0000 Subject: [PATCH 030/183] nbd: the test suite still doesn't work on Hydra svn path=/nixpkgs/trunk/; revision=32132 --- pkgs/tools/networking/nbd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 2d12d28ac2c..af182c9d7e5 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation { postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; - doCheck = true; + # The test suite doesn't succeed on Hydra. + doCheck = false; meta = { homepage = "http://nbd.sourceforge.net"; From 34c8b2fa312d00a3ad5344c55f4f87956958debc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Feb 2012 23:31:40 +0000 Subject: [PATCH 031/183] * Updated Postgres to 9.0.6 (contributed by Bryce L Nordgren). svn path=/nixpkgs/trunk/; revision=32134 --- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index d49555e8ba8..6813bd927c8 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.5"; in +let version = "9.0.6"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "016mnwpcyla49qr3gglgpyjwnq1ljjbs3q0s8vlfmazfkj0fxn2n"; + sha256 = "317d99d2ff9e1de8da0cae107bc06c9fd455b1df0c0fb77b8fbb61fb08276056"; }; buildInputs = [ zlib readline ]; From 07bf4c6f764dfc72bdca127f5361bd9e6cce093a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Feb 2012 09:22:28 +0000 Subject: [PATCH 032/183] haskell-asn1-data: updated to version 0.6.1.3 svn path=/nixpkgs/trunk/; revision=32136 --- pkgs/development/libraries/haskell/asn1-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 73601f462e9..c90d7a0425a 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1.2"; - sha256 = "1655fp71l8qjif4p6c1y2xk8r0gj58djg7np5zwwm6jlj780773r"; + version = "0.6.1.3"; + sha256 = "0vly55dpqrm9vb8ayp72na1nf2rr5ini3d81qqvxflmjgpksrgwq"; isLibrary = true; isExecutable = true; buildDepends = [ From efd8bf8677b6166483a2592efc55943fa22418d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Feb 2012 09:22:32 +0000 Subject: [PATCH 033/183] haskell-gloss: updated to version 1.6.1.1 svn path=/nixpkgs/trunk/; revision=32137 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 47425ae2536..8d9c42c1243 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.6.0.1"; - sha256 = "0yy8yl2s3n0kyr14bcxp1hjzh3wlrhc0xp2ngl3wbz1hbzyrsdlf"; + version = "1.6.1.1"; + sha256 = "0y0npw27ic23zx7fq7dmvwbz2r62wblw9nbyai9kxgff4m2p3j4m"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; From 8be0696c793a4ff1024be4e20c041fcf7820f1fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Feb 2012 09:22:35 +0000 Subject: [PATCH 034/183] haskell-hamlet: updated to version 0.10.8 svn path=/nixpkgs/trunk/; revision=32138 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index d0dc0afb35f..c3cdf361217 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "0.10.7.1"; - sha256 = "0ll9pp0qnvw903ncpfgrc67jg385jzla3j9l0yfm9qqnn38sqhqv"; + version = "0.10.8"; + sha256 = "1vlp8vwaipz757vnd95gcdi9dkrpbgfdlsb3kgjivsj7rqbmxf7z"; buildDepends = [ blazeBuilder blazeHtml failure parsec shakespeare text ]; From 115ec41ba164438af8f01fb5cd488371c4f6d84f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Feb 2012 09:22:38 +0000 Subject: [PATCH 035/183] haskell-libmpd: updated to version 0.7.1 svn path=/nixpkgs/trunk/; revision=32139 --- pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 758a068453d..b843186b52a 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.7.0"; - sha256 = "03bp3bpf1zr8srbzxjhppj7pba0h1if9lga7x5nvhlgc6p7799nw"; + version = "0.7.1"; + sha256 = "1vahcr1vjpr1wfkifp8ih3fajz1886zhc3cj643f7s3im7wjzw5j"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time utf8String ]; From 6a46fac659c12c25f5c1beb9724ac955de8bda93 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Feb 2012 09:22:40 +0000 Subject: [PATCH 036/183] haskell-zlib-bindings: updated to version 0.0.3.2 svn path=/nixpkgs/trunk/; revision=32140 --- pkgs/development/libraries/haskell/zlib-bindings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 1d4f6659475..a2240ca327c 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.0.3.1"; - sha256 = "1j1z797zi5svxyv5ssfx8lyhmzlc2j7iad4b01aw0jvyp3ad4qan"; + version = "0.0.3.2"; + sha256 = "0x78fkjinfhhihhfihr0g5rc4d8jkhza3vw5qsyds74skd6rsy1q"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; From f680a3c1755f48d9e0acfbdb7762573aa7f224a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 Feb 2012 11:38:46 +0000 Subject: [PATCH 037/183] * Put back the Ubuntu 10.10 images that I accidentally removed. svn path=/nixpkgs/trunk/; revision=32141 --- pkgs/build-support/vm/default.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8c9fbec533f..737e57217ba 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1178,6 +1178,28 @@ rec { packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; }; + ubuntu1010i386 = { + name = "ubuntu-10.04-maverick-i386"; + fullName = "Ubuntu 10.04 Maverick (i386)"; + packagesList = fetchurl { + url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2; + sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0"; + }; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" ]; + }; + + ubuntu1010x86_64 = { + name = "ubuntu-10.04-maverick-amd64"; + fullName = "Ubuntu 10.04 Maverick (amd64)"; + packagesList = fetchurl { + url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2; + sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc"; + }; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" ]; + }; + ubuntu1110i386 = { name = "ubuntu-11.10-oneiric-i386"; fullName = "Ubuntu 11.10 Oneiric (i386)"; From ff1bfcaefb16044497cf6658c296fc14839ecd19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 Feb 2012 15:45:26 +0000 Subject: [PATCH 038/183] * Added fuse-zip, a FUSE filesystem for accessing zip files. svn path=/nixpkgs/trunk/; revision=32143 --- pkgs/tools/filesystems/fuse-zip/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/filesystems/fuse-zip/default.nix diff --git a/pkgs/tools/filesystems/fuse-zip/default.nix b/pkgs/tools/filesystems/fuse-zip/default.nix new file mode 100644 index 00000000000..346b11015f4 --- /dev/null +++ b/pkgs/tools/filesystems/fuse-zip/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, fuse, libzip, zlib }: + +stdenv.mkDerivation rec { + name = "fuse-zip-0.2.13"; + + src = fetchurl { + url = "http://fuse-zip.googlecode.com/files/${name}.tar.gz"; + sha1 = "9cfa00e38a59d4e06fd47bfaca75ad5e299ecc6b"; + }; + + buildInputs = [ pkgconfig fuse libzip zlib ]; + + makeFlags = "INSTALLPREFIX=$(out)"; + + meta = { + homepage = http://code.google.com/p/fuse-zip/; + description = "A FUSE-based filesystem that allows read and write access to ZIP files"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06c4a8ee08c..3476b7e1f93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -706,6 +706,8 @@ let fsfs = callPackage ../tools/filesystems/fsfs { }; + fuse_zip = callPackage ../tools/filesystems/fuse-zip { }; + dos2unix = callPackage ../tools/text/dos2unix { }; uni2ascii = callPackage ../tools/text/uni2ascii { }; From 1e0012c1abcd1e1b18f7428c387012c989e047f5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 Feb 2012 16:46:09 +0000 Subject: [PATCH 039/183] * Tribler updated to 5.5.10. svn path=/nixpkgs/trunk/; revision=32144 --- pkgs/applications/networking/p2p/tribler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index afd16dbb2a8..abb4eff6b57 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }: -let rev = "22523"; in +let rev = "24763"; in stdenv.mkDerivation { - name = "tribler-5.4.3-pre${rev}"; + name = "tribler-5.5.10"; src = fetchsvn { - url = http://svn.tribler.org/abc/branches/release-5.4.x; + url = http://svn.tribler.org/abc/branches/release-5.5.x; inherit rev; - sha256 = "09hscrnl50s9qncklnqqzwxwvidl3hj7hr7qsysmv6sw7b9rbx0g"; + sha256 = "1lvg2vvwzwf8zzg0fl1mp8wc0kcspxkl84q4qdxalkv4x2d8w5c6"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ]; From d83e1b4b5d5984b553173a6c08c728a729ce5793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 8 Feb 2012 19:54:16 +0000 Subject: [PATCH 040/183] Updating libvorbis and libogg, and enabling by default libvorbis and libxvid on ffmpeg. I think there are little drawbacks on that, whlie there are benefits. svn path=/nixpkgs/trunk/; revision=32145 --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- pkgs/development/libraries/libogg/default.nix | 10 ++++++---- pkgs/development/libraries/libvorbis/default.nix | 9 +++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 38f12f779b6..3283302f129 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -2,10 +2,10 @@ , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, vorbisSupport ? false, libvorbis ? null +, vorbisSupport ? true, libvorbis ? null , vpxSupport ? false, libvpx ? null , x264Support ? true, x264 ? null -, xvidSupport ? false, xvidcore ? null +, xvidSupport ? true, xvidcore ? null , faacSupport ? false, faac ? null }: diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 0e44a4773c7..e407b75c8bb 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { - name = "libogg-1.2.2"; + name = "libogg-1.3.0"; src = fetchurl { - url = "http://downloads.xiph.org/releases/ogg/${name}.tar.gz"; - sha256 = "1fngv23r8anbf2f2x7s2bh1isxnw287gbc7mhh9g1m96pis0a05b"; + url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; + sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3"; }; + buildNativeInputs = [ xz ]; + meta = { homepage = http://xiph.org/ogg/; }; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index d5f91c18260..efb210d6576 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, libogg }: +{ stdenv, fetchurl, libogg, xz }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.2"; + name = "libvorbis-1.3.3"; src = fetchurl { - url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.bz2"; - sha256 = "159khaa9j0pd4fm554m1igzmrhsa3qbh4n8avihfinwym05vc14z"; + url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; + sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43"; }; + buildNativeInputs = [ xz ]; propagatedBuildInputs = [ libogg ]; meta = { From 3782f740a0c1d1590e5c3f5e92a5c6c57d7d0624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 8 Feb 2012 21:37:20 +0000 Subject: [PATCH 041/183] Adding libwebp svn path=/nixpkgs/trunk/; revision=32146 --- .../development/libraries/libwebp/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/libwebp/default.nix diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix new file mode 100644 index 00000000000..854af5942f9 --- /dev/null +++ b/pkgs/development/libraries/libwebp/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, libpng, libjpeg}: + +stdenv.mkDerivation rec { + name = "libwebp-0.1.3"; + + src = fetchurl { + url = "http://webp.googlecode.com/files/${name}.tar.gz"; + sha256 = "1fkssvg99s9ypswh4ywkirgcy1wmy3b6388f3cqj4a4vwdb89ca0"; + }; + + buildInputs = [ libpng libjpeg ]; + + meta = { + homepage = http://code.google.com/p/webp/; + description = "Tools and library for the WebP image format"; + + /* It has its own licence, google-related, but that looks like BSD */ + license = "free"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3476b7e1f93..f08fcb5cac7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4233,6 +4233,8 @@ let libvorbis = callPackage ../development/libraries/libvorbis { }; + libwebp = callPackage ../development/libraries/libwebp { }; + libwmf = callPackage ../development/libraries/libwmf { }; libwpd = callPackage ../development/libraries/libwpd { From 0df0d9ad9c11723da76829eb7df6dbda44aff380 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Feb 2012 22:07:42 +0000 Subject: [PATCH 042/183] Ebnf2ps: the package is now available from Hackage svn path=/nixpkgs/trunk/; revision=32147 --- .../tools/parsing/Ebnf2ps/default.nix | 20 ++ .../tools/parsing/ebnf2ps/default.nix | 35 --- .../tools/parsing/ebnf2ps/modernize.patch | 256 ------------------ pkgs/top-level/haskell-packages.nix | 4 +- 4 files changed, 21 insertions(+), 294 deletions(-) create mode 100644 pkgs/development/tools/parsing/Ebnf2ps/default.nix delete mode 100644 pkgs/development/tools/parsing/ebnf2ps/default.nix delete mode 100644 pkgs/development/tools/parsing/ebnf2ps/modernize.patch diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix new file mode 100644 index 00000000000..2677d84a376 --- /dev/null +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -0,0 +1,20 @@ +{ cabal, happy }: + +cabal.mkDerivation (self: { + pname = "Ebnf2ps"; + version = "1.0.9"; + sha256 = "0c8nbjyar5dqv33vnm3r1f2rbrmwnv1fm41cbgb6fbsf0cp3979w"; + isLibrary = false; + isExecutable = true; + buildTools = [ happy ]; + meta = { + homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/"; + description = "Peter's Syntax Diagram Drawing Tool"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/tools/parsing/ebnf2ps/default.nix b/pkgs/development/tools/parsing/ebnf2ps/default.nix deleted file mode 100644 index 5abb52566fe..00000000000 --- a/pkgs/development/tools/parsing/ebnf2ps/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ cabal, fetchurl, happy }: - -let - pname = "ebnf2ps"; - version = "1.0.8"; -in -cabal.mkDerivation (self: { - inherit pname version; - - src = fetchurl { - url = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/${pname}-${version}.tar.gz"; - sha256 = "1yfgq4nf79g1nyfb0yxqi887kxc04dvwpm1fwrk50bs4xj1vg3wf"; - }; - - buildTools = [ happy ]; - - patches = [ ./modernize.patch ]; - - meta = { - homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/"; - description = "Syntax Diagram Drawing Tool"; - license = "BSD"; - - longDescription = '' - Ebnf2ps generates nice looking syntax diagrams in EPS and FIG - format from EBNF specifications and from yacc, bison, and Happy - input grammars. The diagrams can be immediatedly included in - TeX/LaTeX documents and in texts created with other popular - document preparation systems. - ''; - - platforms = self.stdenv.lib.platforms.linux; - maintainers = [ self.stdenv.lib.maintainers.simons ]; - }; -}) diff --git a/pkgs/development/tools/parsing/ebnf2ps/modernize.patch b/pkgs/development/tools/parsing/ebnf2ps/modernize.patch deleted file mode 100644 index edb5e366d48..00000000000 --- a/pkgs/development/tools/parsing/ebnf2ps/modernize.patch +++ /dev/null @@ -1,256 +0,0 @@ -diff --git a/Ebnf2ps.cabal b/Ebnf2ps.cabal -index 483d34a..0a7b96e 100644 ---- a/Ebnf2ps.cabal -+++ b/Ebnf2ps.cabal -@@ -1,66 +1,30 @@ ---- Ebnf2ps.cabal auto-generated by cabal init. For additional options, ---- see ---- http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html#pkg-descr. ---- The name of the package. - Name: Ebnf2ps -- ---- The package version. See the Haskell package versioning policy ---- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for ---- standards guiding when and how versions should be incremented. - Version: 1.0.8 -- ---- A short (one-line) description of the package. --Synopsis: Ebnf2ps: Peter's Syntax Diagram Drawing Tool -- ---- A longer description of the package. ---- Description: -- ---- URL for the project homepage or repository. -+Synopsis: Peter's Syntax Diagram Drawing Tool - Homepage: http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/ -- ---- The license under which the package is released. - License: BSD4 -- ---- The file containing the license text. - -- License-file: LICENSE -- ---- The package author(s). --Author: Peter Thiemann -- ---- An email address to which users can send suggestions, bug reports, ---- and patches. --Maintainer: thiemann@acm.org -- ---- A copyright notice. ---- Copyright: -- -+Author: Peter Thiemann -+Maintainer: Peter Thiemann - Category: Language -- - Build-type: Simple -- ---- Extra files to be distributed with the package, such as examples or ---- a README. ---- Extra-source-files: -- ---- Constraint on the version of Cabal needed to build this package. - Cabal-version: >=1.2 -- -+Tested-With: GHC == 6.10.4, GHC == 6.12.3, GHC == 7.0.4, GHC == 7.2.2 -+Description: Ebnf2ps generates nice looking syntax diagrams in EPS -+ and FIG format from EBNF specifications and from yacc, -+ bison, and Happy input grammars. The diagrams can be -+ immediatedly included in TeX/LaTeX documents and in -+ texts created with other popular document preparation -+ systems. - - Executable Ebnf2ps -- -- .hs or .lhs file containing the Main module. - Main-is: Ebnf2ps.hs - Hs-source-dirs: src -- -- -- Packages needed in order to build this package. -- Build-depends: base < 4.3 -- , containers < 0.4 -- , haskell98 -- , unix < 2.5 -- -- -- Modules not exported by this package. -- -- Other-modules: -- -- -- Extra tools (e.g. alex, hsc2hs, ...) needed to build the source. -+ Build-depends: base >= 2 && < 5, -+ containers, -+ old-time, -+ directory, -+ unix - Build-tools: happy - Cc-options: -DAFMPATH=/usr/share/texmf-texlive/fonts/afm - -diff --git a/src/Color.hs b/src/Color.hs -index 184e5e6..8786dac 100644 ---- a/src/Color.hs -+++ b/src/Color.hs -@@ -23,7 +23,7 @@ - module Color where - -- (Color (..), lookupColor, showsColor, showsAColor, prepareColors) - --import Char -+import Data.Char - import Numeric - - type Color = (Int, Int, Int) -diff --git a/src/CommandLine.hs b/src/CommandLine.hs -index 50d6546..518b107 100644 ---- a/src/CommandLine.hs -+++ b/src/CommandLine.hs -@@ -1,6 +1,6 @@ - module CommandLine (parse_cmds) where --import System -- -+import System.IO -+import System.Environment - - defaultArgs :: Args - defaultArgs = MkArgs "Times-Roman" 10 "black" "Times-Roman" 10 "black" "white" "black" "Times-Roman" 10 "black" "white" "black" "black" 500 500 30 100 200 "rgb.txt" False False False False True False False False False -diff --git a/src/Ebnf2ps.hs b/src/Ebnf2ps.hs -index 9dc2e4d..6f340cf 100644 ---- a/src/Ebnf2ps.hs -+++ b/src/Ebnf2ps.hs -@@ -25,11 +25,10 @@ import Defaults (afmPathDefault, ebnfInputDefault, rgbPathDefault) - import PathExpansion (expandPath) - import Color - import Info --import IO --import Monad -+import System.Time -+import System.Environment -+import Control.Monad - import Numeric --import System --import Time - - -------------------------------------------------------------------------------- - main :: IO () -diff --git a/src/Ebnf2psParser.hs b/src/Ebnf2psParser.hs -index 4cc7052..0fb4557 100644 ---- a/src/Ebnf2psParser.hs -+++ b/src/Ebnf2psParser.hs -@@ -4,7 +4,7 @@ - module Ebnf2psParser (theEbnfParser, theHappyParser, theYaccParser) where - import AbstractSyntax - import Lexer --import List -+import Data.List - - data HappyAbsSyn - = HappyTerminal Token' -diff --git a/src/EbnfLayout.hs b/src/EbnfLayout.hs -index cd0b4d9..aecc0b4 100644 ---- a/src/EbnfLayout.hs -+++ b/src/EbnfLayout.hs -@@ -25,7 +25,7 @@ import AbstractSyntax - import Color - import Fonts (FONT, stringWidth, stringHeight, fontDescender) - import Info --import List -+import Data.List - - -- all arithmetic is done in 1/100 pt - -diff --git a/src/Fonts.hs b/src/Fonts.hs -index c1639de..ed36a79 100644 ---- a/src/Fonts.hs -+++ b/src/Fonts.hs -@@ -17,7 +17,7 @@ - module Fonts (FONT, makeFont, fontDescender, stringWidth, stringHeight, fontName, fontScale, noFont) - where - --import Char -+import Data.Char - import Numeric - - data FONT = FONT String Int Int (String -> Int) -diff --git a/src/GrammarTransform.hs b/src/GrammarTransform.hs -index 99c3840..65624ab 100644 ---- a/src/GrammarTransform.hs -+++ b/src/GrammarTransform.hs -@@ -13,7 +13,7 @@ module GrammarTransform - where - - import AbstractSyntax --import List -+import Data.List - - - data RInfo -diff --git a/src/GrammarUnfold.hs b/src/GrammarUnfold.hs -index 056119a..d35a630 100644 ---- a/src/GrammarUnfold.hs -+++ b/src/GrammarUnfold.hs -@@ -17,7 +17,7 @@ module GrammarUnfold ( - import AbstractSyntax - import GrammarTransform - import StringMatch (stringMatch) --import List -+import Data.List - - import qualified Data.Map (Map, keys, elems, findWithDefault, fromList) - -diff --git a/src/IOSupplement.hs b/src/IOSupplement.hs -index 3251365..ba666b1 100644 ---- a/src/IOSupplement.hs -+++ b/src/IOSupplement.hs -@@ -29,8 +29,9 @@ - module IOSupplement (getPath, readPathFile, readRGBPathFile) - where - --import System --import IO -+import System.IO -+import System.IO.Error -+import System.Environment - - #ifdef __HBC__ - ioError = fail -diff --git a/src/Lexer.hs b/src/Lexer.hs -index 52f2549..8bf9f82 100644 ---- a/src/Lexer.hs -+++ b/src/Lexer.hs -@@ -3,7 +3,7 @@ module Lexer where - -- Last Modified By: M. Walter - -- - --import Char -+import Data.Char - - ------------------------------------------------------------------------------ - --NOW the lexer -diff --git a/src/PathExpansion.hs b/src/PathExpansion.hs -index 48e27d6..01807e5 100644 ---- a/src/PathExpansion.hs -+++ b/src/PathExpansion.hs -@@ -3,10 +3,11 @@ module PathExpansion (expandPath) - where - - #ifdef __GLASGOW_HASKELL__ --import System --import Directory --import Monad --import IO -+import System.Directory -+import System.Environment -+import Control.Monad -+import System.IO -+import System.IO.Error - import System.Posix.User (getUserEntryForName, homeDirectory) - #endif - -@@ -99,8 +100,8 @@ replaceEnv (x:xs) = do t <- replaceEnv xs - return (x:t) - - getEnv2 t -- |t == "HOME" = catch (getEnv t) (\e -> if IO.isDoesNotExistError e then return ['.'] else ioError e) -- |otherwise = catch (getEnv t) (\e -> if IO.isDoesNotExistError e then return [] else ioError e) -+ |t == "HOME" = catch (getEnv t) (\e -> if isDoesNotExistError e then return ['.'] else ioError e) -+ |otherwise = catch (getEnv t) (\e -> if isDoesNotExistError e then return [] else ioError e) - ------------------------------------------------------- - - ---------------- Teilen nach Doppelpunkt -------------- diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b1e44ecb0be..6bcd3516449 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1566,9 +1566,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cpphs = callPackage ../development/tools/misc/cpphs {}; - ebnf2ps = callPackage ../development/tools/parsing/ebnf2ps { - inherit (pkgs) fetchurl; - }; + Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {}; frown = callPackage ../development/tools/parsing/frown {}; From d2bbefa08e8d546206381311140a0ee55205e15c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Feb 2012 23:06:01 +0000 Subject: [PATCH 043/183] haskell-hint: updated to version 0.3.3.4 svn path=/nixpkgs/trunk/; revision=32148 --- pkgs/development/libraries/haskell/hint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index ff7101aba23..021477863a6 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hint"; - version = "0.3.3.3"; - sha256 = "0i7d7c2786c13npbb5np3gaidsq4kkajvm3fn2gx8djrhhlrqw5l"; + version = "0.3.3.4"; + sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy"; buildDepends = [ extensibleExceptions ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl random utf8String From d450c760f8e1c98f7dba25721ceb8d0c09023437 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Feb 2012 23:06:04 +0000 Subject: [PATCH 044/183] haskell-Ebnf2ps: updated to version 1.0.10 svn path=/nixpkgs/trunk/; revision=32149 --- pkgs/development/tools/parsing/Ebnf2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index 2677d84a376..81815500c61 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Ebnf2ps"; - version = "1.0.9"; - sha256 = "0c8nbjyar5dqv33vnm3r1f2rbrmwnv1fm41cbgb6fbsf0cp3979w"; + version = "1.0.10"; + sha256 = "0xim32bnfapfs53lvmdz2af08rqd15lp5b0rh6yjqm7n1g2061zs"; isLibrary = false; isExecutable = true; buildTools = [ happy ]; From 1d44b332ed7f7ce69f881d8ca96d5eedd79c28f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Feb 2012 09:16:17 +0000 Subject: [PATCH 045/183] GNU Guile: Disable pthread support on FreeBSD. svn path=/nixpkgs/trunk/; revision=32152 --- pkgs/development/interpreters/guile/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 1b9284dd046..07ea14e6654 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -6,7 +6,7 @@ then coverageAnalysis else stdenv.mkDerivation) -rec { +(rec { name = "guile-2.0.5"; src = fetchurl { @@ -69,3 +69,13 @@ rec { platforms = stdenv.lib.platforms.all; }; } + +// + +(if stdenv.isFreeBSD + then { + # XXX: Thread support is currently broken on FreeBSD (namely the + # `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) + configureFlags = [ "--disable-threads" ]; + } + else {})) From 452cdc59f1daf7a97c1f3b21ca0f6b5d735163b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Feb 2012 10:07:42 +0000 Subject: [PATCH 046/183] GNU Guile: Use the right configure option name. svn path=/nixpkgs/trunk/; revision=32154 --- pkgs/development/interpreters/guile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 07ea14e6654..a4cf2605d49 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -76,6 +76,6 @@ then { # XXX: Thread support is currently broken on FreeBSD (namely the # `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) - configureFlags = [ "--disable-threads" ]; + configureFlags = [ "--without-threads" ]; } else {})) From 0333114f588ddf55474d0aa9e811a8b5b925a017 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 12:54:00 +0000 Subject: [PATCH 047/183] haskell-happstack-data: updated to version 6.0.1 svn path=/nixpkgs/trunk/; revision=32155 --- .../libraries/haskell/happstack/happstack-data.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix index d1603e0441a..6f39e82739d 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-data"; - version = "6.0.0"; - sha256 = "1wdvylqgy3iw41ksw2ys4f0vyak8sbk6gginljvz07rrh04klyhl"; + version = "6.0.1"; + sha256 = "0v2ln4mdnild72p02mzjn8mn5srvjixsjqjgkdqzshvxjnnm95l8"; isLibrary = true; isExecutable = true; buildDepends = [ From 4ef705c1ef3a0ed116ce1c4a5f285ed7490086c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 12:54:03 +0000 Subject: [PATCH 048/183] haskell-haxr: updated to version 3000.8.5 svn path=/nixpkgs/trunk/; revision=32156 --- pkgs/development/libraries/haskell/haxr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 94070a34c18..5caea80d6c8 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.8.4"; - sha256 = "0cyf1q1ngz0jqxdrvblcy9iw7l478v0rfr7bgkpq0l4brw0ca1pg"; + version = "3000.8.5"; + sha256 = "1gfifqc7ldklapnymwd9ss0lll6q87sbg1hc6pa4c9sh275x1rz6"; buildDepends = [ blazeBuilder dataenc HaXml HTTP mtl network time utf8String ]; From db29c078b30a9ac6366c3b3831bde11e940ddf20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 12:54:05 +0000 Subject: [PATCH 049/183] haskell-texmath: updated to version 0.6.0.2 svn path=/nixpkgs/trunk/; revision=32157 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index b72c5ceee04..a1487ddb903 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.0.1"; - sha256 = "0q39a83g7kcj9qpnjg0v7pd0b4w9i090nl2s9v8lpv4n46z6cyaq"; + version = "0.6.0.2"; + sha256 = "04b642xbbgivbnpc8srqirdf71n5b6h5ir6rw0z2xpiv0znk6vh2"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From 1a7d345aab689ac38431210f49acac18c5d48f7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 13:22:57 +0000 Subject: [PATCH 050/183] wxmaxima: updated to version 12.01.0 svn path=/nixpkgs/trunk/; revision=32158 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 77fe32d1792..9592f8f9871 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "11.08.0"; + version = "12.01.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df"; + sha256 = "358cdafe81b7e7290f6bb8c93580b0e2f0ae5a4d148a476e5af375aa9bf77054"; }; buildInputs = [wxGTK maxima makeWrapper]; From 20510021800cea566e3f8cea8cb6e75559e77a27 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Feb 2012 14:09:08 +0000 Subject: [PATCH 051/183] * libzip updated to 0.10. svn path=/nixpkgs/trunk/; revision=32159 --- pkgs/development/libraries/libzip/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 0c2e13c5615..7e8cd4bac8a 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, zlib}: +{ stdenv, fetchurl, zlib }: -stdenv.mkDerivation { - name = "libzip-0.8"; +stdenv.mkDerivation rec { + name = "libzip-0.10"; src = fetchurl { - url = http://www.nih.at/libzip/libzip-0.8.tar.gz; - sha256 = "0iy04c3b2yfwl9lpgwzm12qkdskbxj8l91r6mgn8f6ib00fj66ss"; + url = "http://www.nih.at/libzip/${name}.tar.gz"; + sha256 = "1lnpxcl4z084bvx3jd0pqgr350ljnizpnlwh5vbzjp0iw9jakbxp"; }; - buildInputs = [zlib]; + buildInputs = [ zlib ]; meta = { homepage = http://www.nih.at/libzip; From 3a4595d6798c7f9e3eeb81bdb7f4d8828c4d456d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Feb 2012 14:22:13 +0000 Subject: [PATCH 052/183] * zlib should be a propagated build input of libzip. svn path=/nixpkgs/trunk/; revision=32160 --- pkgs/development/libraries/libzip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 7e8cd4bac8a..0c490c63411 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1lnpxcl4z084bvx3jd0pqgr350ljnizpnlwh5vbzjp0iw9jakbxp"; }; - buildInputs = [ zlib ]; + propagatedBuildInputs = [ zlib ]; meta = { homepage = http://www.nih.at/libzip; From 24ff52e62e637d62cc6c28f526ac7626d60b69e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 14:38:01 +0000 Subject: [PATCH 053/183] haskell-json: dropped obsolete version 0.4.4 svn path=/nixpkgs/trunk/; revision=32161 --- .../libraries/haskell/json/0.4.4.nix | 17 ----------------- .../haskell/json/{0.5.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/json/0.4.4.nix rename pkgs/development/libraries/haskell/json/{0.5.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/json/0.4.4.nix b/pkgs/development/libraries/haskell/json/0.4.4.nix deleted file mode 100644 index a318cf3c5ee..00000000000 --- a/pkgs/development/libraries/haskell/json/0.4.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, mtl, parsec, syb }: - -cabal.mkDerivation (self: { - pname = "json"; - version = "0.4.4"; - sha256 = "102qmz55b2mgcca3q1c2pkcr6hz7kmpldad3f6blhmp1cz15f081"; - buildDepends = [ mtl parsec syb ]; - meta = { - description = "Support for serialising Haskell to and from JSON"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/json/0.5.nix b/pkgs/development/libraries/haskell/json/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/json/0.5.nix rename to pkgs/development/libraries/haskell/json/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6bcd3516449..8f429052eb5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -927,9 +927,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); WebBitsHtml = self.WebBitsHtml_1_0_1; }; - json_0_4_4 = callPackage ../development/libraries/haskell/json/0.4.4.nix {}; - json_0_5 = callPackage ../development/libraries/haskell/json/0.5.nix {}; - json = self.json_0_4_4; + json = callPackage ../development/libraries/haskell/json {}; jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {}; From 1e8e60da4142393bb0eda94a0d2eb7e474838a0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 14:38:03 +0000 Subject: [PATCH 054/183] haskell-json: fix build with GHC 7.4.x svn path=/nixpkgs/trunk/; revision=32162 --- pkgs/development/libraries/haskell/json/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index a748c2b4f58..5bfbb59d83f 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.5"; sha256 = "12jbvq0lp7z5q6g94pv8s5455yydfyh9h2xlr76wqzfh3myvy6fl"; buildDepends = [ mtl parsec syb ]; + patchPhase = "sed -i json.cabal -e '1iExtensions: FlexibleInstances'"; meta = { description = "Support for serialising Haskell to and from JSON"; license = self.stdenv.lib.licenses.bsd3; From bfd1783a06e96ad1e033b8722ace31f0c70786b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 14:41:36 +0000 Subject: [PATCH 055/183] haskell-packages.nix: fixed obsolete reference to json_0_5 attribute svn path=/nixpkgs/trunk/; revision=32163 --- pkgs/top-level/haskell-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8f429052eb5..a884ffa2eb0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -632,9 +632,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); downloadCurl = callPackage ../development/libraries/haskell/download-curl { tagsoup = self.tagsoup_0_10_1; }; - DSH = callPackage ../development/libraries/haskell/DSH { - json = self.json_0_5; - }; + DSH = callPackage ../development/libraries/haskell/DSH {}; dstring = callPackage ../development/libraries/haskell/dstring {}; From 792bbd3522a67024eb2c551344a1a475cf2e639f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 14:53:05 +0000 Subject: [PATCH 056/183] haskell-packages.nix: disable the obsolete 'frown' tool svn path=/nixpkgs/trunk/; revision=32164 --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a884ffa2eb0..4c3958d92d1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1564,7 +1564,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {}; - frown = callPackage ../development/tools/parsing/frown {}; + # 2012-02-09: Disabled because upstream site has disappeared. This tool is clearly + # unmaintained, and we should delete it unless anyone complains. + # frown = callPackage ../development/tools/parsing/frown {}; haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; From 2d48075c4a5088c187a8d945b49c3f63174628cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Feb 2012 14:53:07 +0000 Subject: [PATCH 057/183] haskell-packages.nix: disable the obsolete 'HaRe' tool svn path=/nixpkgs/trunk/; revision=32165 --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4c3958d92d1..fd6d412be6a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1583,7 +1583,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happyMeta = callPackage ../development/tools/haskell/happy-meta {}; - HaRe = callPackage ../development/tools/haskell/HaRe {}; + # 2012-02-09: Disabled because this package is clearly, and it won't compile with + # any recent version of GHC. We should delete it unless anyone + # complains. + # HaRe = callPackage ../development/tools/haskell/HaRe {}; hlint = callPackage ../development/tools/haskell/hlint {}; From f77fa09f568366630b582381d51756ed9f3fc6f3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 10 Feb 2012 05:22:58 +0000 Subject: [PATCH 058/183] v8: Get building on darwin svn path=/nixpkgs/trunk/; revision=32168 --- .../interpreters/ruby/generated.nix | 65 +++++++++++++++---- pkgs/development/libraries/v8/default.nix | 6 +- pkgs/development/web/nodejs/default.nix | 4 +- 3 files changed, 59 insertions(+), 16 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 92641f1ca44..4d46a06d7e1 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -16,9 +16,12 @@ g: # Get dependencies from patched gems builder = g.builder_3_0_0; buildr = g.buildr_1_4_6; bundler = g.bundler_1_0_21; - childprocess = g.childprocess_0_3_0; + childprocess = g.childprocess_0_3_1; + coffee_script = g.coffee_script_2_2_0; + coffee_script_source = g.coffee_script_source_1_2_0; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; + execjs = g.execjs_1_3_0; ffi = g.ffi_1_0_11; highline = g.highline_1_5_1; hike = g.hike_1_2_1; @@ -51,7 +54,7 @@ g: # Get dependencies from patched gems rspec_mocks = g.rspec_mocks_2_1_0; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_5; - sass = g.sass_3_1_13; + sass = g.sass_3_1_14; selenium_webdriver = g.selenium_webdriver_2_18_0; sprockets = g.sprockets_2_1_2; thor = g.thor_0_14_6; @@ -60,7 +63,7 @@ g: # Get dependencies from patched gems tzinfo = g.tzinfo_0_3_31; xml_simple = g.xml_simple_1_0_12; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { ZenTest_4_5_0 = { basename = ''ZenTest''; @@ -153,7 +156,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-3.2.1''; - requiredGems = [ g.i18n_0_6_0 g.multi_json_1_0_4 ]; + requiredGems = [ g.i18n_0_6_0 ]; sha256 = ''0ajkzsa7467jp7lxgjcsl94nqkvw9d0h492rypljs0f8f1fn744v''; }; arel_3_0_0 = { @@ -262,16 +265,44 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6''; }; - childprocess_0_3_0 = { + childprocess_0_3_1 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.0''; + name = ''childprocess-0.3.1''; requiredGems = [ g.ffi_1_0_11 ]; - sha256 = ''1bvx6nkc1m24wjjybk943x1vjr51c98l0pwj73hj1r237307jyb4''; + sha256 = ''0phkpxvwz88kgbi4d2akiqbppf374kn2rwf64hfs99p1j1ksbw5l''; + }; + coffee_script_2_2_0 = { + basename = ''coffee_script''; + meta = { + description = ''Ruby CoffeeScript Compiler''; + homepage = ''http://github.com/josh/ruby-coffee-script''; + longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. +''; + }; + name = ''coffee-script-2.2.0''; + requiredGems = [ g.coffee_script_source_1_2_0 g.execjs_1_3_0 ]; + sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; + }; + coffee_script_source_1_2_0 = { + basename = ''coffee_script_source''; + meta = { + description = ''The CoffeeScript Compiler''; + homepage = ''http://jashkenas.github.com/coffee-script/''; + longDescription = '' CoffeeScript is a little language that compiles into JavaScript. + Underneath all of those embarrassing braces and semicolons, + JavaScript has always had a gorgeous object model at its heart. + CoffeeScript is an attempt to expose the good parts of JavaScript + in a simple way. +''; + }; + name = ''coffee-script-source-1.2.0''; + requiredGems = [ ]; + sha256 = ''13cpmlj2m5lyxipdxmnajy12bzwmgc6g2n090gpa0wd5am7xvhkp''; }; diff_lcs_1_1_2 = { basename = ''diff_lcs''; @@ -332,6 +363,18 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; + execjs_1_3_0 = { + basename = ''execjs''; + meta = { + description = ''Run JavaScript code from Ruby''; + homepage = ''https://github.com/sstephenson/execjs''; + longDescription = '' ExecJS lets you run JavaScript code from Ruby. +''; + }; + name = ''execjs-1.3.0''; + requiredGems = [ g.multi_json_1_0_4 ]; + sha256 = ''1sski14wdzfljx2f9j7r09li3rxqwvink8n5v489ykw1sicg6l2s''; + }; ffi_1_0_11 = { basename = ''ffi''; meta = { @@ -819,7 +862,7 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54''; }; - sass_3_1_13 = { + sass_3_1_14 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -830,9 +873,9 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.13''; + name = ''sass-3.1.14''; requiredGems = [ ]; - sha256 = ''0x07yckw9c4d59713midk2n85d3h88fcp147p8nai88gbvrm8b63''; + sha256 = ''0nrgsrqkfn3w8bpqsq9h4jv5wj0wikn3mp0gb3b7qdzkhw0h9947''; }; selenium_webdriver_2_18_0 = { basename = ''selenium_webdriver''; @@ -842,7 +885,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; name = ''selenium-webdriver-2.18.0''; - requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_0 ]; + requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_1 ]; sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9''; }; sprockets_2_1_2 = { diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 7024478afae..8aa342186c0 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -4,10 +4,10 @@ assert readline != null; let system = stdenv.system; - arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else ""; + arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; version = "3.6.6.20"; in -assert system == "i686-linux" || system == "x86_64-linux"; +assert arch != ""; stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { cp -v libv8.* $out/lib cp -v d8 $out/bin/d8 cp -vR include $out/ - wrapProgram $out/bin/d8 --set LD_LIBRARY_PATH $out/lib + wrapProgram $out/bin/d8 --set ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} $out/lib ''; } diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 914b2cc26c3..9f48627e392 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, python, zlib, v8 }: stdenv.mkDerivation rec { - version = "0.6.9"; + version = "0.6.10"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "484ab6b3da6195339544c16aff17f747aa85d1dd15d765d6724aa8a4ecda03ca"; + sha256 = "1mbbb3dy0hh5qahx7aqaj8cny0wm42d00c1m804r81y6afmn1l6i"; }; configureFlags = [ From f8d0599756b4eef0c773d16f753afe5801b80a08 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 10 Feb 2012 10:13:34 +0000 Subject: [PATCH 059/183] Add tclap (required for new hugin) svn path=/nixpkgs/trunk/; revision=32169 --- pkgs/development/libraries/tclap/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/tclap/default.nix diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix new file mode 100644 index 00000000000..276b279fc09 --- /dev/null +++ b/pkgs/development/libraries/tclap/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "tclap-1.2.1"; + + src = fetchurl { + url = "mirror://sourceforge/tclap/${name}.tar.gz"; + sha256 = "1fzf7l1wvlhxnpwi15jvvfizn836s7r0r8vckgbqk2lyf7ihz7wz"; + }; + + meta = { + homepage = http://tclap.sourceforge.net/; + description = "Templatized C++ Command Line Parser Library"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f08fcb5cac7..4478c5c468c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4681,6 +4681,8 @@ let ## inherit stdenv fetchurl cmake qt4 telepathy_qt; ## }; + tclap = callPackage ../development/libraries/tclap {}; + tcp_wrappers = callPackage ../development/libraries/tcp-wrappers {}; tdb = callPackage ../development/libraries/tdb { }; From f9c551a41f111ab7608464da90649021e669f7cb Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 10 Feb 2012 10:13:39 +0000 Subject: [PATCH 060/183] hugin-2011.4.0 svn path=/nixpkgs/trunk/; revision=32170 --- pkgs/applications/graphics/hugin/default.nix | 22 ++++++++++++-------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 795417dbf5b..27b3c0c9b03 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,25 +1,29 @@ -{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, - pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa, freeglut, - glew, libXmu, libXi }: +{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost +, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa +, freeglut, glew, libXmu, libXi, tclap }: stdenv.mkDerivation rec { - name = "hugin-2010.4.0"; + name = "hugin-2011.4.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "13n3p4f39mbdydsjqy48csjgvv30lfcwvln5y5dyy95lyrfwcp6l"; + sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - NIX_LDFLAGS = "-lrt"; +#NIX_LDFLAGS = "-lrt"; - buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig + buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; + buildNativeInputs = [ cmake pkgconfig ]; + + propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ]; + postInstall = '' - ensureDir "$out/nix-support" - echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages + mkdir -p "$out/nix-support" + echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4478c5c468c..c13b50c7641 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7042,8 +7042,7 @@ let fltk = fltk13; }; - hugin = callPackage ../applications/graphics/hugin { - }; + hugin = callPackage ../applications/graphics/hugin { }; hydrogen = callPackage ../applications/audio/hydrogen { }; From 3217e1c5c3ac5de108998007b40abdbe5bc51a7f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 10 Feb 2012 10:13:44 +0000 Subject: [PATCH 061/183] djview-4.8, fix build with qt-4.8 svn path=/nixpkgs/trunk/; revision=32171 --- pkgs/applications/graphics/djview/default.nix | 14 ++++--- .../graphics/djview/djview4-qt-4.8.patch | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/graphics/djview/djview4-qt-4.8.patch diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 85388ffa601..0ac499f2681 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, djvulibre, qt4 }: +{stdenv, fetchurl, djvulibre, qt4, pkgconfig }: -stdenv.mkDerivation { - name = "djview4-4.1-2"; +stdenv.mkDerivation rec { + name = "djview-4.8"; src = fetchurl { - url = mirror://sf/djvu/djview4-4.1-2.tar.gz; - sha256 = "10k0h892kab3n8xypw6vsnvhwil410hvvqj375pwiss4vlm5isv1"; + url = "mirror://sourceforge/djvu/${name}.tar.gz"; + sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c"; }; buildInputs = [djvulibre qt4]; + buildNativeInputs = [ pkgconfig ]; + + patches = [ ./djview4-qt-4.8.patch ]; + passthru = { mozillaPlugin = "/lib/netscape/plugins"; }; diff --git a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch new file mode 100644 index 00000000000..ce3694197f6 --- /dev/null +++ b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch @@ -0,0 +1,38 @@ +Origin: OpenSUSE +Index: djview-4.8/src/qdjvuwidget.cpp +=================================================================== +--- djview-4.8.orig/src/qdjvuwidget.cpp ++++ djview-4.8/src/qdjvuwidget.cpp +@@ -153,7 +153,7 @@ all_numbers(const char *s) + } + + template static inline void +-swap(T& x, T& y) ++myswap(T& x, T& y) + { + T tmp; + tmp = x; +@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k) + /* Sort v[lo], v[m], v[hi] by insertion */ + m = (lo+hi)/2; + if (v[lo]>v[m]) +- swap(v[lo],v[m]); ++ myswap(v[lo],v[m]); + if (v[m]>v[hi]) { +- swap(v[m],v[hi]); ++ myswap(v[m],v[hi]); + if (v[lo]>v[m]) +- swap(v[lo],v[m]); ++ myswap(v[lo],v[m]); + } + /* Extract pivot, place sentinel */ + pivot = v[m]; +@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k) + do ++l; while (v[l]pivot); + if (l < h) { +- swap(v[l],v[h]); ++ myswap(v[l],v[h]); + goto loop; + } + /* Finish up */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c13b50c7641..5ef62ad1749 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6624,7 +6624,8 @@ let djvulibre = callPackage ../applications/misc/djvulibre { }; - djview4 = callPackage ../applications/graphics/djview { }; + djview = callPackage ../applications/graphics/djview { }; + djview4 = pkgs.djview; dmenu = callPackage ../applications/misc/dmenu { }; From c84eb70b511edbeefba07a7539e8e2ce2c07285c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 10 Feb 2012 10:13:48 +0000 Subject: [PATCH 062/183] Latest exosip and linphone svn path=/nixpkgs/trunk/; revision=32172 --- pkgs/applications/networking/linphone/default.nix | 10 ++++++---- pkgs/development/libraries/exosip/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/linphone/default.nix index 07ca19b63cc..c98a8ae4fd9 100644 --- a/pkgs/applications/networking/linphone/default.nix +++ b/pkgs/applications/networking/linphone/default.nix @@ -2,16 +2,18 @@ readline, ffmpeg, alsaLib, SDL, libv4l, libtheora, libXv }: stdenv.mkDerivation rec { - name = "linphone-3.4.3"; + name = "linphone-3.5.0"; src = fetchurl { - url = "mirror://savannah/linphone/3.4.x/sources/${name}.tar.gz"; - sha256 = "14k655z0kfmnm42nxhsl25rjim9swrr4kpnplkx3pd9b3yha1rwj"; + url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz"; + sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix"; }; - buildInputs = [ intltool pkgconfig gtk libglade libosip libexosip speex readline + buildInputs = [ intltool gtk libglade libosip libexosip speex readline ffmpeg alsaLib SDL libv4l libtheora libXv ]; + buildNativeInputs = [ pkgconfig ]; + meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 905b2648dbd..d850618ecdf 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, libosip, openssl, pkgconfig }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = http://download.savannah.gnu.org/releases/exosip/libeXosip2-3.5.0.tar.gz; - sha256 = "1z0s8qxxvyaksnnb9srfi3aipkkb7c1rsxdywl9xyxgnlri0w0a6"; + url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz"; + sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; }; name = "libexosip2-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ef62ad1749..88a27cad732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7178,7 +7178,7 @@ let links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/linphone { - inherit (gnome) libglade gtk; + inherit (gnome) libglade; }; lmms = callPackage ../applications/audio/lmms { }; From e9974606a50e49c4eb5df609c589234d89385992 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 10 Feb 2012 10:13:52 +0000 Subject: [PATCH 063/183] kmymoney: explicitly pass pkgconfig svn path=/nixpkgs/trunk/; revision=32173 --- pkgs/applications/office/kmymoney/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 8d1b5afe4d0..4bbe8400fd5 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, - shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: +{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig +, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: stdenv.mkDerivation rec { name = "kmymoney-4.6.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ]; - buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ]; + buildNativeInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ]; KDEDIRS = libalkimia; From cf686eaa503b79301373171005c5e3700bb39112 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:35 +0000 Subject: [PATCH 064/183] haskell-failure: added version 0.2.0 svn path=/nixpkgs/trunk/; revision=32175 --- .../haskell/failure/{default.nix => 0.1.2.nix} | 0 .../libraries/haskell/failure/0.2.0.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 12 +++++++++--- 3 files changed, 27 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/failure/{default.nix => 0.1.2.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/failure/0.2.0.nix diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/0.1.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/failure/default.nix rename to pkgs/development/libraries/haskell/failure/0.1.2.nix diff --git a/pkgs/development/libraries/haskell/failure/0.2.0.nix b/pkgs/development/libraries/haskell/failure/0.2.0.nix new file mode 100644 index 00000000000..05b1b0c173c --- /dev/null +++ b/pkgs/development/libraries/haskell/failure/0.2.0.nix @@ -0,0 +1,18 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "failure"; + version = "0.2.0"; + sha256 = "1z7q2ldgfm0khar3vx7paz0jigzd720xjq2s0x02qf2m3iv0ilcv"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Failure"; + description = "A simple type class for success/failure computations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fd6d412be6a..af5967c2285 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -592,7 +592,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataenc = callPackage ../development/libraries/haskell/dataenc {}; - dataObject = callPackage ../development/libraries/haskell/data-object {}; + dataObject = callPackage ../development/libraries/haskell/data-object { + failure = self.failure_0_1_2; + }; dataObjectYaml = callPackage ../development/libraries/haskell/data-object-yaml {}; @@ -656,7 +658,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {}; extensibleExceptions = null; # a core package in recent GHCs - failure = callPackage ../development/libraries/haskell/failure {}; + failure_0_1_2 = callPackage ../development/libraries/haskell/failure/0.1.2.nix {}; + failure_0_2_0 = callPackage ../development/libraries/haskell/failure/0.2.0.nix {}; + failure = self.failure_0_2_0; fastLogger = callPackage ../development/libraries/haskell/fast-logger {}; @@ -1471,7 +1475,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; - xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator {}; + xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator { + failure = self.failure_0_1_2; + }; xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; From eb9badcd216d5f0b2cee13795121f397523ab69a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:40 +0000 Subject: [PATCH 065/183] haskell-attempt: added version 0.4.0 svn path=/nixpkgs/trunk/; revision=32176 --- .../attempt/{default.nix => 0.3.1.1.nix} | 0 .../libraries/haskell/attempt/0.4.0.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 ++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) rename pkgs/development/libraries/haskell/attempt/{default.nix => 0.3.1.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/attempt/0.4.0.nix diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/attempt/default.nix rename to pkgs/development/libraries/haskell/attempt/0.3.1.1.nix diff --git a/pkgs/development/libraries/haskell/attempt/0.4.0.nix b/pkgs/development/libraries/haskell/attempt/0.4.0.nix new file mode 100644 index 00000000000..2c5fc47ea31 --- /dev/null +++ b/pkgs/development/libraries/haskell/attempt/0.4.0.nix @@ -0,0 +1,18 @@ +{ cabal, failure }: + +cabal.mkDerivation (self: { + pname = "attempt"; + version = "0.4.0"; + sha256 = "0n7srd1gy1fa0q1qzizvdgmrc078jyx47115aw85vvl74vh9qyjy"; + buildDepends = [ failure ]; + meta = { + homepage = "http://github.com/snoyberg/attempt/tree/master"; + description = "Concrete data type for handling extensible exceptions as failures"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index af5967c2285..75737781652 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -439,7 +439,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); async = callPackage ../development/libraries/haskell/async {}; - attempt = callPackage ../development/libraries/haskell/attempt {}; + attempt_0_3_1_1 = callPackage ../development/libraries/haskell/attempt/0.3.1.1.nix { + failure = self.failure_0_1_2; + }; + attempt_0_4_0 = callPackage ../development/libraries/haskell/attempt/0.4.0.nix {}; + attempt = self.attempt_0_4_0; attoparsec = callPackage ../development/libraries/haskell/attoparsec {}; @@ -551,7 +555,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); time = self.time_1_1_3; }; - convertibleText = callPackage ../development/libraries/haskell/convertible-text {}; + convertibleText = callPackage ../development/libraries/haskell/convertible-text { + attempt = self.attempt_0_3_1_1; + }; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; From cd306852ad0bdc76c0fce9c2f9970f54c962fabe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:45 +0000 Subject: [PATCH 066/183] haskell-crypto-conduit: added version 0.1.3.1 svn path=/nixpkgs/trunk/; revision=32177 --- .../libraries/haskell/crypto-conduit/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/crypto-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix new file mode 100644 index 00000000000..5882fe3c5bf --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, cereal, conduit, cryptoApi, transformers }: + +cabal.mkDerivation (self: { + pname = "crypto-conduit"; + version = "0.1.3.1"; + sha256 = "0b8n2njz2ccdb9gql79l96jgv1nlq4ls09d25a2yy9f69w7h1ww5"; + buildDepends = [ cereal conduit cryptoApi transformers ]; + meta = { + homepage = "https://github.com/meteficha/crypto-conduit"; + description = "Conduit interface for cryptographic operations (from crypto-api)"; + 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 75737781652..1ce97f035b1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -578,6 +578,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; + cryptoConduit = callPackage ../development/libraries/haskell/crypto-conduit {}; + cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {}; From 78d758d93f6d43d061836525cf9c7f7acb3ae05a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:48 +0000 Subject: [PATCH 067/183] haskell-yesod-routes: added version 0.0.1 svn path=/nixpkgs/trunk/; revision=32178 --- .../libraries/haskell/yesod-routes/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/yesod-routes/default.nix diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix new file mode 100644 index 00000000000..9a130902c47 --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -0,0 +1,14 @@ +{ cabal, pathPieces, text, vector }: + +cabal.mkDerivation (self: { + pname = "yesod-routes"; + version = "0.0.1"; + sha256 = "19bnww5idxr0j2l8g838idxkhhn73bhdz0bnvglinv7163fy8xhl"; + buildDepends = [ pathPieces text vector ]; + meta = { + homepage = "http://www.yesodweb.com/"; + description = "Efficient routing for Yesod"; + 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 1ce97f035b1..0a01ceee171 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1511,6 +1511,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {}; + yesodRoutes = callPackage ../development/libraries/haskell/yesod-routes {}; + yesodStatic = callPackage ../development/libraries/haskell/yesod-static {}; yst = callPackage ../development/libraries/haskell/yst {}; From a2d2fa31a6bff04e3897dd4349158fc5b670fff1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:50 +0000 Subject: [PATCH 068/183] haskell-persistent: updated to version 0.8.0 svn path=/nixpkgs/trunk/; revision=32179 --- .../libraries/haskell/persistent/default.nix | 18 ++++++++++-------- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 59fe42ff65e..51fdacfcf2b 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,20 +1,22 @@ -{ cabal, blazeHtml, dataObject, enumerator, monadControl, mtl -, pathPieces, pool, sqlite, text, time, transformers -, transformersBase +{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit +, liftedBase, monadControl, mtl, pathPieces, poolConduit, sqlite +, text, time, transformers, transformersBase, unorderedContainers +, vector }: cabal.mkDerivation (self: { pname = "persistent"; - version = "0.6.4.4"; - sha256 = "0n4zl0r8nmp3pwsgc0kiy7fgk2dfvdvagv1gvjxrs8545c5ycggv"; + version = "0.8.0"; + sha256 = "0z70ibicfbfripp1x9csfvfhn7k26j78jvvig9ylsjwldhysr7qr"; buildDepends = [ - blazeHtml dataObject enumerator monadControl mtl pathPieces pool - text time transformers transformersBase + aeson attoparsec base64Bytestring blazeHtml conduit liftedBase + monadControl mtl pathPieces poolConduit text time transformers + transformersBase unorderedContainers vector ]; extraLibraries = [ sqlite ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, non-relational, multi-backend persistence"; + description = "Type-safe, multi-backend data serialization"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0a01ceee171..5ca8288a5c9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1101,9 +1101,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); pcreLight = callPackage ../development/libraries/haskell/pcre-light {}; - persistent = callPackage ../development/libraries/haskell/persistent { - pathPieces = self.pathPieces_0_0_0; - }; + persistent = callPackage ../development/libraries/haskell/persistent {}; persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {}; From 27b99106347efa75c49dee7dac38fb6a6f884a08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:54 +0000 Subject: [PATCH 069/183] haskell-persistent-sqlite: updated to version 0.8.0 svn path=/nixpkgs/trunk/; revision=32180 --- .../libraries/haskell/persistent-sqlite/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 0037573cea7..e9cfbaeff50 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -1,13 +1,13 @@ -{ cabal, dataObject, monadControl, neither, persistent, text +{ cabal, aeson, conduit, monadControl, persistent, text , transformers }: cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "0.6.2.1"; - sha256 = "10sqmkd7vnrrpr8phcswbxcvn8vjipgy96nk2jj3g96j3cfwfpk0"; + version = "0.8.0"; + sha256 = "19dly53g4jzcqi9px49w9qaf2vnlpsxc6jf5xn63827ylmxlmk5q"; buildDepends = [ - dataObject monadControl neither persistent text transformers + aeson conduit monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From c78b13be70449c786fdf146d68043dc176fe47c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:57 +0000 Subject: [PATCH 070/183] haskell-persistent-template: updated to version 0.8.1 svn path=/nixpkgs/trunk/; revision=32181 --- .../libraries/haskell/persistent-template/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 7a32591b97c..00dc40fc2f2 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,10 +1,10 @@ -{ cabal, monadControl, persistent, text, transformers }: +{ cabal, aeson, monadControl, persistent, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.6.3.1"; - sha256 = "0hppxd80q7bnxz9vm08i278d9k95w6z139y73dy53ncqkp72ahrg"; - buildDepends = [ monadControl persistent text transformers ]; + version = "0.8.1"; + sha256 = "0av1rzqz80lzirk9l45jiwj4zar6ncy0q9x7dqhsrklyxk4jzv6v"; + buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; From a72543aa72d9ce75a6640fce9f79e639920dd239 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:59 +0000 Subject: [PATCH 071/183] haskell-attoparsec-conduit: updated to version 0.2.0 svn path=/nixpkgs/trunk/; revision=32182 --- .../libraries/haskell/attoparsec-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 0ce16db4466..9a17ef13563 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.0.1"; - sha256 = "04r3ywzjm39rmd0pka8537c8n6d4l6scgzkqzplmi6nb0kikgb6i"; + version = "0.2.0"; + sha256 = "11jcsqyqc33xn980rac7fmdgj99dg4bp75b5whqzpnr67ginjjv9"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From 3dd1ac8766e23e6e323c78a6d07d983f71376d36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:02 +0000 Subject: [PATCH 072/183] haskell-authenticate: updated to version 1.0.0 svn path=/nixpkgs/trunk/; revision=32183 --- .../libraries/haskell/authenticate/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 0c41a350103..8818aa2d972 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,18 +1,16 @@ -{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder -, caseInsensitive, enumerator, failure, httpEnumerator, httpTypes -, network, random, RSA, SHA, tagsoup, text, time, tls, transformers -, unorderedContainers, xmlEnumerator +{ cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit +, caseInsensitive, conduit, httpConduit, httpTypes, network +, tagsoup, text, transformers, unorderedContainers, xmlConduit }: cabal.mkDerivation (self: { pname = "authenticate"; - version = "0.10.4"; - sha256 = "0bjxlnc2qf1900ch9cnab26qz6a0vdz5nz1dwrjby1n5xqqzjd7x"; + version = "1.0.0"; + sha256 = "0a163dhi69gh6zmi43jidxlaknbk1y0frjlwijdf7fp073rh0p87"; buildDepends = [ - aeson attoparsec base64Bytestring blazeBuilder caseInsensitive - enumerator failure httpEnumerator httpTypes network random RSA SHA - tagsoup text time tls transformers unorderedContainers - xmlEnumerator + aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive + conduit httpConduit httpTypes network tagsoup text transformers + unorderedContainers xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; From 081a06c578a4dfcf449625af34123733f9acbb4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:05 +0000 Subject: [PATCH 073/183] haskell-blaze-builder-conduit: updated to version 0.2.0 svn path=/nixpkgs/trunk/; revision=32184 --- .../libraries/haskell/blaze-builder-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index f48243a027a..da3bd570e05 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.0.1"; - sha256 = "1k9is6dknfqjnkqrvxs9z8cx0ffnnz4q02is9plndyg8pccgjfa9"; + version = "0.2.0"; + sha256 = "13fcxmzw4xz7y271vdf6w6fj6isninjcxnm7h7gbk4yf31wx831r"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From df2916a86ada407067d41ffa9deb30114301a75e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:07 +0000 Subject: [PATCH 074/183] haskell-certificate: updated to version 1.1.0 svn path=/nixpkgs/trunk/; revision=32185 --- 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 33b36578bc8..abb4bcad643 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.0.1"; - sha256 = "0rv9gs316ng86zv5njcfj96zplbrn317vypnyv7sz28v4k4vha10"; + version = "1.1.0"; + sha256 = "10xpszfr51nd72kqmr4l1fna3bc3a272h3vf5b5hlls6k9kxzddg"; isLibrary = true; isExecutable = true; buildDepends = [ From 4d74352a738fdc88f827b7712cc505b921657e00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:10 +0000 Subject: [PATCH 075/183] haskell-conduit: updated to version 0.2.0 svn path=/nixpkgs/trunk/; revision=32186 --- 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 bd8d1632af2..59130a5b864 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 = "0.1.1.1"; - sha256 = "0gqkk5q329xbw565xd9xc0pz2ha66jkdbbjgwadvrjw1n52vaqg5"; + version = "0.2.0"; + sha256 = "0ljbxm6rxcxfw51kcjkmb041kz7k6frgc9l6gvfh2s9zrip8zq5v"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; From 2a0c2cccdb8281a891c861ac489b518d0dc524ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:13 +0000 Subject: [PATCH 076/183] haskell-cookie: updated to version 0.4.0 svn path=/nixpkgs/trunk/; revision=32187 --- pkgs/development/libraries/haskell/cookie/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 698c643d339..4896ba1d39e 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, text, time }: +{ cabal, blazeBuilder, dataDefault, text, time }: cabal.mkDerivation (self: { pname = "cookie"; - version = "0.3.0.2"; - sha256 = "123ylraxcavj82qcvrbfpb172k8zl5qgzh2byv84did1f1dz0ris"; - buildDepends = [ blazeBuilder text time ]; + version = "0.4.0"; + sha256 = "1vkz6nys26i0yprb8jkv8iyq9xqnxb0wv07f7s7c448vx4gfln98"; + buildDepends = [ blazeBuilder dataDefault text time ]; meta = { homepage = "http://github.com/snoyberg/cookie"; description = "HTTP cookie parsing and rendering"; From da120789ceb82634fc8a768447ab8bd4213473e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:15 +0000 Subject: [PATCH 077/183] haskell-highlighting-kate: updated to version 0.5.0.2 svn path=/nixpkgs/trunk/; revision=32188 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index a4f7e906a9e..795488adfd0 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.0.1"; - sha256 = "05r8w4366gi64l65k6vyda1cs96ld8i2dgch8r5fmxwiaa8dcs1l"; + version = "0.5.0.2"; + sha256 = "012hr5ci9j4fwnrc1ypx6ca562vzqlfk5phjs4xl3llxv8afdhgl"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ]; From 7d6092cbbc773f81e59e76420da39ff94847bcef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:18 +0000 Subject: [PATCH 078/183] haskell-http-conduit: updated to version 1.2.5 svn path=/nixpkgs/trunk/; revision=32189 --- .../haskell/http-conduit/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 0a4dd110fee..5b58909231d 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,20 +1,21 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate -, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase -, monadControl, network, text, time, tls, tlsExtra, transformers -, transformersBase, utf8String, zlibConduit +, conduit, cookie, cprngAes, dataDefault, failure, httpTypes +, liftedBase, monadControl, network, regexCompat, socks, text, time +, tls, tlsExtra, transformers, transformersBase, utf8String +, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.2.0"; - sha256 = "1s3qrvglhymwvr0cp32mi95dijic40lphhsfr4hm63qjphfc8dpi"; + version = "1.2.5"; + sha256 = "0mb85akb7mgdhjkmp041lhqir2gys9bjixn2v1i848mijw1zx8zr"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder - blazeBuilderConduit caseInsensitive certificate conduit cprngAes - dataDefault failure httpTypes liftedBase monadControl network text - time tls tlsExtra transformers transformersBase utf8String - zlibConduit + blazeBuilderConduit caseInsensitive certificate conduit cookie + cprngAes dataDefault failure httpTypes liftedBase monadControl + network regexCompat socks text time tls tlsExtra transformers + transformersBase utf8String zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; From baeebd76777158e623e2a793b49621213a7e243a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:20 +0000 Subject: [PATCH 079/183] haskell-http-enumerator: updated to version 0.7.3 svn path=/nixpkgs/trunk/; revision=32190 --- .../development/libraries/haskell/http-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 39e23b3253d..25346362b88 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.2.5"; - sha256 = "1sck3z1x73qbak6p11745bywxwz91nk635jvv4wmgq4ifyfkbabb"; + version = "0.7.3"; + sha256 = "0l7azfvibqnninbxvbvgvia53jjf2fa1mhbip8gafy53asig6d06"; isLibrary = true; isExecutable = true; buildDepends = [ From a53f8656fe40be02381fc78a49caf8ef1da80f95 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:23 +0000 Subject: [PATCH 080/183] haskell-pandoc: updated to version 1.9.1 svn path=/nixpkgs/trunk/; revision=32191 --- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 77f1d07bab2..8de94769cb8 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.0.5"; - sha256 = "0haszw0khz47k2cfhzz38ia1zznwwmixhaf0jyr6l2gdpfq59b0p"; + version = "1.9.1"; + sha256 = "00xwy1afy4cn7z2drsc4dnqd4g45i45v9f3jm9j6i32pz27y8s2a"; isLibrary = true; isExecutable = true; buildDepends = [ From 7d474b4dd9e26cd02f5840d59055ca5d7a8ef148 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:26 +0000 Subject: [PATCH 081/183] haskell-shakespeare-css: updated to version 0.10.7 svn path=/nixpkgs/trunk/; revision=32192 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index fb23dbce0ef..613399fa75b 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.6"; - sha256 = "18hcrsmw7xg2cdzyb413rc1bg507y4kr6q1l3mbxgnzqnffik6d7"; + version = "0.10.7"; + sha256 = "0cla600s5715glimlf58gndpp7njhm26j78bfm16cxia5psp5zav"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 58a133f7fb34cb572fd9367e5530e2e5c035dc05 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:28 +0000 Subject: [PATCH 082/183] haskell-shakespeare-i18n: updated to version 0.0.1 svn path=/nixpkgs/trunk/; revision=32193 --- .../libraries/haskell/shakespeare-i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 1a1e4f1d20b..85139482ad9 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "0.0.0"; - sha256 = "1zyr63ncd92c30afh0sf4lq7p253jd3gjvcv65f7i0njqpc1lg9y"; + version = "0.0.1"; + sha256 = "0hnjrds4vhqyd7pda8rciz50kspf01880j93qn6xx610hbqsal3m"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/i18n"; From b1dabf47954fad40e164a6efe513ba7ba58241e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:31 +0000 Subject: [PATCH 083/183] haskell-shakespeare-js: updated to version 0.11.0.1 svn path=/nixpkgs/trunk/; revision=32194 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index d127725a73e..b1dfc72ecec 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "0.10.4"; - sha256 = "15mh93d38qpqnrgxvaq659zwl2mks9xhkynhlpjrf8zb234knxjw"; + version = "0.11.0.1"; + sha256 = "01gmsk1q5iq23m93n8mcmm02jqv3i7ksf1jw4qnla1gssdkx8ggk"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 067ed3e52b0971ea55654683e40ce2d92b5ffa58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:34 +0000 Subject: [PATCH 084/183] haskell-shakespeare-text: updated to version 0.10.5 svn path=/nixpkgs/trunk/; revision=32195 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 26ce04559ec..01fff9ff998 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "0.10.3"; - sha256 = "0w3qf0zykdi5ixjcp0l9zdgwhbnnljn6ib88xkai05xkm6wzh06s"; + version = "0.10.5"; + sha256 = "13nhasfbza73kv3iin16iidwyz71b8d75vq0ym37zygpxb5izkvw"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From d4cde497838003522c755278ea5ce0b31eb176b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:36 +0000 Subject: [PATCH 085/183] haskell-shakespeare: updated to version 0.10.3.1 svn path=/nixpkgs/trunk/; revision=32196 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index bc5f3097855..44fcbb277b7 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "0.10.2"; - sha256 = "173pcdm69w1xg3vm31xh6hs9w1552cmb1pz99ri09h1ajdhf2qwc"; + version = "0.10.3.1"; + sha256 = "1wfw5qbgl4jl1r4gaw55mnsmn70vpzn7ykz3gbqzrf91wc6s3zj4"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 5f3751c9314b49f641c310e91848aaeec4c1560e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:39 +0000 Subject: [PATCH 086/183] haskell-th-lift: updated to version 0.5.5 svn path=/nixpkgs/trunk/; revision=32197 --- pkgs/development/libraries/haskell/th-lift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index 2a5fe84c20a..aa7b5224de6 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.5.4"; - sha256 = "1ax5rniainbw4lynfng0wv8a6x2cfv7k69n5nv1pwpb4s76am1hi"; + version = "0.5.5"; + sha256 = "1zp9alv3nbvra1rscddak3i33c2jnv6g6806h94qbfkq3zbimfi0"; meta = { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; From 7750208983b9e5e5d1b6ab0679d6862c9dee92c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:42 +0000 Subject: [PATCH 087/183] haskell-tls-extra: updated to version 0.4.3 svn path=/nixpkgs/trunk/; revision=32198 --- 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 6ea11c7d6ad..278ca4bc1b8 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.2.1"; - sha256 = "0gddss5pnvrkjgjlvyl92rb78i4q8x9m6r8z01ba1snqjgldmj56"; + version = "0.4.3"; + sha256 = "1qr7l70c5fgqpf9hnhsngghcss2cannhca1snlvbcrq074hc2f2n"; isLibrary = true; isExecutable = true; buildDepends = [ From acfc1c505eda929db42801c3d1cf42dfa25f9bab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:44 +0000 Subject: [PATCH 088/183] haskell-tls: updated to version 0.9.0 svn path=/nixpkgs/trunk/; revision=32199 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 326e40198f7..f88b752e68c 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.8.5"; - sha256 = "07xz81ny9a1rcflqiqxkmx5kj62rssxw1gr6vnlg76xr21j8mam9"; + version = "0.9.0"; + sha256 = "1lv4ihds9b253i79cc7fcp27s3jlh10vrbnrhbicrrmcgaqklg82"; isLibrary = true; isExecutable = true; buildDepends = [ From f7200279f4884963f7996af7feb0ae540ccb98ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:47 +0000 Subject: [PATCH 089/183] haskell-wai-app-static: updated to version 1.1.1 svn path=/nixpkgs/trunk/; revision=32200 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 2cb4ae16ce7..e7197e293f2 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "0.3.5.1"; - sha256 = "0pk7biyfg8za2i85vawgf3mxglbhk7bfl9xmiswqk6ppwwq2q4xb"; + version = "1.1.1"; + sha256 = "0i73rxgmng7grs8cgxw8769jg0cvpsb5gi4s0iwrdyh3xd1vj7iy"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed httpDate httpTypes text time transformers unixCompat wai From 57cb4ab024555ad5eac657ca3ff3f185a32a6c4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:50 +0000 Subject: [PATCH 090/183] haskell-wai-extra: updated to version 1.1.0 svn path=/nixpkgs/trunk/; revision=32201 --- .../libraries/haskell/wai-extra/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index a2840ad66ce..e0a36878582 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,16 +1,16 @@ -{ cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive -, dataDefault, enumerator, fastLogger, httpTypes, network, text -, time, transformers, wai, zlibBindings, zlibEnum +{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive +, conduit, dataDefault, fastLogger, httpTypes, network, text, time +, transformers, wai, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "0.4.6"; - sha256 = "1wpdfzw5qzbd33iypgppp4822vn7vhja6y26dnkb17n08r83vvhv"; + version = "1.1.0"; + sha256 = "1mj2swb2bgsay9prpw6h0wmwsqyan53ndyczmhppdax4y5088f55"; buildDepends = [ - blazeBuilder blazeBuilderEnumerator caseInsensitive dataDefault - enumerator fastLogger httpTypes network text time transformers wai - zlibBindings zlibEnum + blazeBuilder blazeBuilderConduit caseInsensitive conduit + dataDefault fastLogger httpTypes network text time transformers wai + zlibConduit ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 85c395797e0b631b71c39fdaddfa832a3b95bf26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:52 +0000 Subject: [PATCH 091/183] haskell-wai: updated to version 1.1.0 svn path=/nixpkgs/trunk/; revision=32202 --- pkgs/development/libraries/haskell/wai/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index b118d794563..f1d4210b667 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -1,13 +1,13 @@ -{ cabal, blazeBuilder, enumerator, httpTypes, network, text -, transformers +{ cabal, blazeBuilder, conduit, httpTypes, network, text +, transformers, vault }: cabal.mkDerivation (self: { pname = "wai"; - version = "0.4.3"; - sha256 = "08dmsl90ibs6a4sadsd2dhf5mssf5jswk6n2jv19q5sg3dra4m84"; + version = "1.1.0"; + sha256 = "1kmmivcak9v13rgivs2vhr543dfdx19wncwlpda453570ywam7vh"; buildDepends = [ - blazeBuilder enumerator httpTypes network text transformers + blazeBuilder conduit httpTypes network text transformers vault ]; meta = { homepage = "https://github.com/yesodweb/wai"; From 897d63e5f731df86005e0d74154a0dee5091bb48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:56 +0000 Subject: [PATCH 092/183] haskell-warp: updated to version 1.1.0 svn path=/nixpkgs/trunk/; revision=32203 --- .../development/libraries/haskell/warp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 95caf840ad0..b6380981d00 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,15 +1,15 @@ -{ cabal, blazeBuilder, blazeBuilderEnumerator, caseInsensitive -, enumerator, httpTypes, network, simpleSendfile, transformers -, unixCompat, wai +{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive +, conduit, httpTypes, liftedBase, network, simpleSendfile +, transformers, unixCompat, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "0.4.6.3"; - sha256 = "1gfjhp1s42ynpi3kh8fr6fp5nwirxz0gasr7zs7q2qwwvlq9pzm6"; + version = "1.1.0"; + sha256 = "1an2j89422rcvrvrmhg1hwj8vpikjj5xdzb3h37rjsfj6qlqy5cf"; buildDepends = [ - blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator - httpTypes network simpleSendfile transformers unixCompat wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes + liftedBase network simpleSendfile transformers unixCompat wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 6d1c0f4b60e24cc064cc777c95a51a7a1e5142de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:33:58 +0000 Subject: [PATCH 093/183] haskell-yaml: updated to version 0.5.2 svn path=/nixpkgs/trunk/; revision=32204 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index e65737a94b9..4256705fe24 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.5.1.2"; - sha256 = "0xmx58h47prpmgbf63bsy7ar74h0d968wyd2yg3bgvwmnd83iz7d"; + version = "0.5.2"; + sha256 = "1jhzycasfmjlfdpca1cflrggc16jp16852af7d6cwfsy342wh6gp"; buildDepends = [ aeson attoparsec conduit text transformers unorderedContainers vector From 6caa6272e923256f4e1c334c8bbadac855ed3f8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:01 +0000 Subject: [PATCH 094/183] haskell-yesod-auth: updated to version 0.8.1 svn path=/nixpkgs/trunk/; revision=32205 --- .../libraries/haskell/yesod-auth/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 2ed7486eff4..be251edffc6 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,20 +1,19 @@ -{ cabal, aeson, authenticate, blazeHtml, controlMonadAttempt -, hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate -, pureMD5, pwstoreFast, random, SHA, shakespeareCss, text -, transformers, unorderedContainers, wai, yesodCore, yesodForm -, yesodJson, yesodPersistent +{ cabal, aeson, authenticate, blazeHtml, hamlet, httpConduit +, liftedBase, mimeMail, persistent, persistentTemplate, pureMD5 +, pwstoreFast, random, SHA, shakespeareCss, text, transformers +, unorderedContainers, wai, yesodCore, yesodForm, yesodJson +, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.7.9"; - sha256 = "08vlj61y3czv0v8dnfdkyfww5sccia6j0fxnn1hxk44zghwhy214"; + version = "0.8.1"; + sha256 = "10jhvkyxf8j55yzc05p0fmmjsd8fb1sns86vlsl0108947b2pp8v"; buildDepends = [ - aeson authenticate blazeHtml controlMonadAttempt hamlet - httpEnumerator mimeMail persistent persistentTemplate pureMD5 - pwstoreFast random SHA shakespeareCss text transformers - unorderedContainers wai yesodCore yesodForm yesodJson - yesodPersistent + aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail + persistent persistentTemplate pureMD5 pwstoreFast random SHA + shakespeareCss text transformers unorderedContainers wai yesodCore + yesodForm yesodJson yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From bb1679d37190839105b49abf5e25df1f31c9c219 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:04 +0000 Subject: [PATCH 095/183] haskell-yesod-core: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=32206 --- .../libraries/haskell/yesod-core/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index b747179b0f3..7699e4d291b 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,21 +1,21 @@ { cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal -, clientsession, cookie, dataObject, dataObjectYaml, enumerator -, failure, fastLogger, hamlet, httpTypes, monadControl, parsec -, pathPieces, random, shakespeare, shakespeareCss, shakespeareI18n -, shakespeareJs, text, time, transformers, transformersBase, vector -, wai, waiExtra, waiLogger +, clientsession, conduit, cookie, failure, fastLogger, hamlet +, httpTypes, liftedBase, monadControl, parsec, pathPieces, random +, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs, text +, time, transformers, transformersBase, vector, wai, waiExtra +, waiLogger, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.4.1"; - sha256 = "048xc8dshwpaxirz8wvk3ra0qs99wx1i145nfj7n3i6kw8qkfnz6"; + version = "0.10.1"; + sha256 = "011bxz0wjd349jhwxh0cs1lhqpjgwq57ia8wzxf21bcwy8c08nj0"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession - cookie dataObject dataObjectYaml enumerator failure fastLogger - hamlet httpTypes monadControl parsec pathPieces random shakespeare - shakespeareCss shakespeareI18n shakespeareJs text time transformers - transformersBase vector wai waiExtra waiLogger + conduit cookie failure fastLogger hamlet httpTypes liftedBase + monadControl parsec pathPieces random shakespeare shakespeareCss + shakespeareI18n shakespeareJs text time transformers + transformersBase vector wai waiExtra waiLogger yesodRoutes ]; meta = { homepage = "http://www.yesodweb.com/"; From ca95e7796c8eb2ca30b39effcf6c1a152a8cf705 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:06 +0000 Subject: [PATCH 096/183] haskell-yesod-default: updated to version 0.6.1 svn path=/nixpkgs/trunk/; revision=32207 --- .../libraries/haskell/yesod-default/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index bfed775756f..fb89b511504 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,14 +1,14 @@ -{ cabal, cmdargs, dataObject, dataObjectYaml, shakespeareCss -, shakespeareJs, text, transformers, wai, waiExtra, warp, yesodCore +{ cabal, shakespeareCss, shakespeareJs, text, transformers +, unorderedContainers, wai, waiExtra, warp, yaml, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-default"; - version = "0.5.0"; - sha256 = "02j9567nmyxr68q8p8ihbig9b6f9p9ciif8nlp03mfkbq10hwrm3"; + version = "0.6.1"; + sha256 = "0am5f8r2w7695zfc6vi0gy8yin9kfgj37qzr14r5v6wzhk1gq5da"; buildDepends = [ - cmdargs dataObject dataObjectYaml shakespeareCss shakespeareJs text - transformers wai waiExtra warp yesodCore + shakespeareCss shakespeareJs text transformers unorderedContainers + wai waiExtra warp yaml yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 76dbef631e06b6ad97c76ebc7d71e632d7fea83d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:09 +0000 Subject: [PATCH 097/183] haskell-yesod-form: updated to version 0.4.1 svn path=/nixpkgs/trunk/; revision=32208 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 2f384e2e878..3b1d6e9170d 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.3.4.2"; - sha256 = "1ahkbycxvjh1yvxfbf8wg6mlklmwm8hmy15x0b07g2xq7h1jmc5i"; + version = "0.4.1"; + sha256 = "0l55n7zml3sf8f2qmmii5cq53awajc4vfr5msrm8kvi3ivzjld0s"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai From 8478697f71e349b1f4cfcade806a3df8576ba121 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:12 +0000 Subject: [PATCH 098/183] haskell-yesod-json: updated to version 0.3.1 svn path=/nixpkgs/trunk/; revision=32209 --- .../libraries/haskell/yesod-json/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 379d7319b12..66c31e868d6 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,14 +1,15 @@ -{ cabal, aeson, attoparsecEnumerator, blazeBuilder, shakespeareJs -, text, transformers, unorderedContainers, vector, yesodCore +{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, safe +, shakespeareJs, text, transformers, vector, wai, waiExtra +, yesodCore, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "0.2.3"; - sha256 = "0bd75zzxqrarqk8b2v515jv0zbi5x27fmb9cbj3g57l9ig57lqy5"; + version = "0.3.1"; + sha256 = "17w82mfl364dc0k1zk1gqas3fyskz2jc50diq71fiw87apslva4v"; buildDepends = [ - aeson attoparsecEnumerator blazeBuilder shakespeareJs text - transformers unorderedContainers vector yesodCore + aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs + text transformers vector wai waiExtra yesodCore yesodRoutes ]; meta = { homepage = "http://www.yesodweb.com/"; From a5461d2cc8c8181993ee0e3bfd89cd16d3bac073 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:15 +0000 Subject: [PATCH 099/183] haskell-yesod-persistent: updated to version 0.3.1 svn path=/nixpkgs/trunk/; revision=32210 --- .../libraries/haskell/yesod-persistent/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 00b5fb317fd..11a85b9cf8e 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,13 +1,11 @@ -{ cabal, failure, persistent, persistentTemplate, transformers -, yesodCore -}: +{ cabal, persistent, persistentTemplate, transformers, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "0.2.2"; - sha256 = "0pgvckyn3l9ggw77hmdpxfx5iwdk36fcfx464rqfzdy28agax47c"; + version = "0.3.1"; + sha256 = "0pxzwqrq4wr9hdnppi5ri0iip2a8gg2y7lplmhn2791jc001ll7m"; buildDepends = [ - failure persistent persistentTemplate transformers yesodCore + persistent persistentTemplate transformers yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 4b7ebbed6f9b01431c0f3d8f92f1d1feb55510ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:18 +0000 Subject: [PATCH 100/183] haskell-yesod-static: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=32211 --- .../libraries/haskell/yesod-static/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 46f989c53a5..815932e6248 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,15 +1,15 @@ -{ cabal, base64Bytestring, cereal, enumerator, fileEmbed, httpTypes -, pureMD5, text, transformers, unixCompat, wai, waiAppStatic -, yesodCore +{ cabal, base64Bytestring, cereal, conduit, cryptoConduit +, cryptohash, fileEmbed, httpTypes, text, transformers, unixCompat +, wai, waiAppStatic, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "0.3.2.1"; - sha256 = "0gggavj5bxb12axlfl8kmqizgg55nmcrr6z5za60n3bp70sq4vn4"; + version = "0.10.1"; + sha256 = "07dapygk2n6d7sk39gwi06w96b13dqhxgx3l7ac198nil5x2m68m"; buildDepends = [ - base64Bytestring cereal enumerator fileEmbed httpTypes pureMD5 text - transformers unixCompat wai waiAppStatic yesodCore + base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed + httpTypes text transformers unixCompat wai waiAppStatic yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From eef5c55e6eff91df165a329deb5044133c1d9984 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:20 +0000 Subject: [PATCH 101/183] haskell-yesod: updated to version 0.10.1 svn path=/nixpkgs/trunk/; revision=32212 --- .../libraries/haskell/yesod/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index ab0bc9f89dd..e74f73ac53f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,21 +1,21 @@ -{ cabal, attoparsec, blazeBuilder, blazeHtml, hamlet, httpTypes -, monadControl, parsec, shakespeareCss, shakespeareJs +{ cabal, attoparsec, blazeBuilder, blazeHtml, fastLogger, hamlet +, httpTypes, monadControl, parsec, shakespeareCss, shakespeareJs , shakespeareText, text, time, transformers, unixCompat, wai -, waiExtra, warp, yesodAuth, yesodCore, yesodForm, yesodJson -, yesodPersistent +, waiExtra, waiLogger, warp, yesodAuth, yesodCore, yesodForm +, yesodJson, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "0.9.4.1"; - sha256 = "0dcd4m91liash046i0qaq51s447sl4fn55gsg7mi807lffik436q"; + version = "0.10.1"; + sha256 = "1m4prrpxdcj7qn755as37kn66f7didparhar520anr9cryn0wfr9"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec blazeBuilder blazeHtml hamlet httpTypes monadControl - parsec shakespeareCss shakespeareJs shakespeareText text time - transformers unixCompat wai waiExtra warp yesodAuth yesodCore - yesodForm yesodJson yesodPersistent + attoparsec blazeBuilder blazeHtml fastLogger hamlet httpTypes + monadControl parsec shakespeareCss shakespeareJs shakespeareText + text time transformers unixCompat wai waiExtra waiLogger warp + yesodAuth yesodCore yesodForm yesodJson yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From 657628e1c7ec8f9d94b8f867c777964e36ce72d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:23 +0000 Subject: [PATCH 102/183] haskell-zlib-conduit: updated to version 0.2.0 svn path=/nixpkgs/trunk/; revision=32213 --- pkgs/development/libraries/haskell/zlib-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index d19157382a8..decdd32676a 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.0.1"; - sha256 = "19bxw5maiff213jsbw889pwhmkwh1qnxrv377icwsqa619dx4k1y"; + version = "0.2.0"; + sha256 = "1vwan9vglj7xdna3pfw71bcfcp10s4vn6fd6wwdz7wvxrbn52gsk"; buildDepends = [ conduit transformers zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From c5617dc628d1854ca792d9a9ea86bc830595a685 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:34:26 +0000 Subject: [PATCH 103/183] haskell-LambdaHack: updated to version 0.2.0 svn path=/nixpkgs/trunk/; revision=32214 --- pkgs/games/LambdaHack/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index c34160976e3..7609f3abda5 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,15 +1,15 @@ -{ cabal, binary, ConfigFile, gtk, MissingH, mtl, random, zlib }: +{ cabal, binary, ConfigFile, gtk, mtl, random, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.1.20110918"; - sha256 = "14zn650x7r65lb76hygz6yiwzbg2rbcyisi7kx2lszrbg0fp8pa9"; - isLibrary = false; + version = "0.2.0"; + sha256 = "09lgbpwrlw29n797q3k5aafvkg04nd8cw6pi41g914phf7lxzq4c"; + isLibrary = true; isExecutable = true; - buildDepends = [ binary ConfigFile gtk MissingH mtl random zlib ]; + buildDepends = [ binary ConfigFile gtk mtl random zlib ]; meta = { homepage = "http://github.com/kosmikus/LambdaHack"; - description = "A roguelike game engine in early development"; + description = "A roguelike game engine in early and very active development"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From 761785c4ab0728b677db03cc9988538dd81ae51e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Feb 2012 18:33:14 +0000 Subject: [PATCH 104/183] * Fix ebook-tools. It broke because of the libzip update. svn path=/nixpkgs/trunk/; revision=32215 --- pkgs/tools/text/ebook-tools/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 87a75b2559b..abb766928d7 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,22 +1,23 @@ -{ stdenv, fetchurl, cmake, libxml2, libzip }: - -let - pn = "ebook-tools"; -in +{ stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }: stdenv.mkDerivation rec { - name = "${pn}-0.2.1"; + name = "ebook-tools-0.2.1"; src = fetchurl { - url = "mirror://sf/${pn}/${name}.tar.gz"; + url = "mirror://sourceforge/ebook-tools/${name}.tar.gz"; sha256 = "0wgwdsd3jwwfg36jyr5j0wayqjli3ia80lxzk10byd4cmkywnhy2"; }; - buildInputs = [ cmake libxml2 libzip ]; + buildInputs = [ cmake pkgconfig libxml2 libzip ]; + + preConfigure = + '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libzip)" + ''; meta = { - homepage = "http://${pn}.sourceforge.net"; - description = "Tools and libs for dealing with various ebook file formats"; + homepage = "http://ebook-tools.sourceforge.net"; + description = "Tools and library for dealing with various ebook file formats"; maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.all; }; From 1ad1d987e33cfa5e798fd0b2948d4c401033c209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 10 Feb 2012 20:24:13 +0000 Subject: [PATCH 105/183] Adding stunt rally. svn path=/nixpkgs/trunk/; revision=32217 --- pkgs/games/stuntrally/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/games/stuntrally/default.nix diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix new file mode 100644 index 00000000000..3b835f6e9e5 --- /dev/null +++ b/pkgs/games/stuntrally/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig }: + +stdenv.mkDerivation rec { + name = "stunt-rally-1.4"; + + src = fetchurl { + url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2; + sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq"; + }; + + buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig ]; + + enableParallelBuilding = true; + + meta = { + description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; + homepage = http://code.google.com/p/vdrift-ogre/; + license = "GPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88a27cad732..1b1457dac1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8040,6 +8040,8 @@ let stardust = callPackage ../games/stardust {}; + stuntrally = callPackage ../games/stuntrally { }; + superTux = callPackage ../games/super-tux { }; superTuxKart = callPackage ../games/super-tux-kart { From ed00bb14bbab8a45fe8c00459fe487ea6059517c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 10 Feb 2012 21:53:59 +0000 Subject: [PATCH 106/183] Adding a throw for stunt-rally; it does not work after build. svn path=/nixpkgs/trunk/; revision=32221 --- pkgs/games/stuntrally/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 3b835f6e9e5..14db3dd52b8 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,5 +1,7 @@ { fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig }: +throw "Stunt Rally needs ogre with cg support at runtime - we have to package nvidia cg" + stdenv.mkDerivation rec { name = "stunt-rally-1.4"; From 9ae92c3d694527c8bf4ac54d1838a8996bdb8ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 10 Feb 2012 21:56:45 +0000 Subject: [PATCH 107/183] Updating zziplib svn path=/nixpkgs/trunk/; revision=32222 --- pkgs/development/libraries/zziplib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 4f8dc30653f..a7d246d34fb 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, python, zip, xmlto, zlib }: stdenv.mkDerivation rec { - name = "zziplib-0.13.56"; + name = "zziplib-0.13.58"; src = fetchurl { url = "mirror://sourceforge/zziplib/${name}.tar.bz2"; - sha256 = "0q7yvqzsmp717bh38zhavw3sh27ms6rc84nrqnnnfwmcq6a32sq5"; + sha256 = "13j9f6i8rx0qd5m96iwrcha78h34qpfk5qzi7cv098pms6gq022m"; }; buildInputs = [ perl python zip xmlto zlib ]; From ff240c015077d51b2379c43044b788fa06f547dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 10 Feb 2012 22:23:33 +0000 Subject: [PATCH 108/183] Updating trigger rally svn path=/nixpkgs/trunk/; revision=32223 --- pkgs/games/trigger/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index ecc3c1a36fc..f958897cd40 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,22 +1,22 @@ { fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, jam }: stdenv.mkDerivation rec { - name = "trigger-0.5.2.1"; + name = "trigger-rally-0.6.0"; src = fetchurl { url = "mirror://sourceforge/trigger-rally/${name}-src.tar.bz2"; - sha256 = "17sbw6j2z62w047fb8vlkabhq7s512r3a4pjd6402lpq09mpywhg"; + sha256 = "0qm6anlcqx19iaiz0zh0bf74g9nc6gr8cy0lbsxahwgzkwsqz0fw"; }; srcData = fetchurl { - url = "mirror://sourceforge/trigger-rally/trigger-0.5.2-data.tar.bz2"; - sha256 = "0sxfpn2vqzgv1dm66j75bmfc1kmnwrv1bb1yazmm803nnngk6zy9"; + url = "mirror://sourceforge/trigger-rally/trigger-rally-0.6.0-data.tar.bz2"; + sha256 = "161mfgv68my2231d8ps4zs1axisrj0lkcc4yqsr0x28w0mr19j4y"; }; buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa jam ]; preConfigure = '' - configureFlags="$configureFlags --datadir=$out/share/trigger-0.5.2-data" + configureFlags="$configureFlags --datadir=$out/share/trigger-rally-0.6.0-data" ''; # It has some problems installing the README file, so... out. From af2f845060ebca1865829bfdd1c1a1e422d499ba Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Sat, 11 Feb 2012 09:06:09 +0000 Subject: [PATCH 109/183] Kwooty binary newsreader version bump 0.8.0 -> 0.8.1. Newer version builds against the updated dependencies of the package. svn path=/nixpkgs/trunk/; revision=32226 --- pkgs/applications/networking/newsreaders/kwooty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix index 67254084d8e..003157dd129 100644 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix @@ -5,14 +5,14 @@ , unrar, p7zip, par2cmdline, coreutils }: -let version = "0.8.0"; +let version = "0.8.1"; name = "kwooty-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/kwooty/${name}.tar.gz"; - sha256 = "bb50fb9b3d6c973f2abee62cfc11a7086900a4b676c12bf4e0a2adc170a977fc"; + sha256 = "746ed50ec3c067711932c89dc3ee5527c126f37c6922b3eda49535eb83c245e4"; }; patches = [ ./searchPath.patch ]; @@ -33,6 +33,6 @@ in stdenv.mkDerivation { ]; meta = with stdenv.lib; { - description = "Binary news reader for KDE"; + description = "Binary news reader of KDE"; }; } From c2e5c08d7208513414719e52121176f379354131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 11 Feb 2012 14:33:27 +0000 Subject: [PATCH 110/183] Adding the game Bits&Bots svn path=/nixpkgs/trunk/; revision=32227 --- pkgs/games/bitsnbots/default.nix | 36 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/games/bitsnbots/default.nix diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix new file mode 100644 index 00000000000..252f881c375 --- /dev/null +++ b/pkgs/games/bitsnbots/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, SDL, lua, mesa }: + +stdenv.mkDerivation rec { + name = "bitsnbots-20111230"; + + src = fetchurl { + url = http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz; + sha256 = "1iiclm6bfpp2p6d692hpnw25xyr48ki1xkcxa7fvh5b7m1519gsp"; + }; + + patchPhase = '' + sed -i '/^INCLUDE/d' Makefile.linux + ''; + + makefile = "Makefile.linux"; + + NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL"; + + NIX_LDFLAGS = "-lGL"; + + installPhase = '' + mkdir -p $out/share/${name} + cp -R bitsnbots resource scripts README $out/share/${name} + mkdir -p $out/bin + ln -s $out/share/${name}/bitsnbots $out/bin + ''; + + buildInputs = [ SDL lua mesa ]; + + meta = { + description = "Simple puzzle game with moving robots"; + homepage = "http://moikmellah.org/blog/?page_id=19"; + license = "GPLv3+"; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b1457dac1e..629b4217dd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7881,6 +7881,10 @@ let guile = guile_1_8; }; + bitsnbots = callPackage ../games/bitsnbots { + lua = lua5; + }; + blackshades = callPackage ../games/blackshades { }; blackshadeselite = callPackage ../games/blackshadeselite { }; From af62434159aea3b910a59e1a734f8f20415d0570 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 11 Feb 2012 21:15:16 +0000 Subject: [PATCH 111/183] kmymoney-4.6.2, fix build with qt-4.8 svn path=/nixpkgs/trunk/; revision=32230 --- pkgs/applications/office/kmymoney/default.nix | 6 ++-- .../applications/office/kmymoney/qt-4.8.patch | 32 +++++++++++++++++++ .../libraries/libalkimia/default.nix | 4 +-- 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/office/kmymoney/qt-4.8.patch diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 4bbe8400fd5..da815c5fb6b 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -2,11 +2,11 @@ , shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: stdenv.mkDerivation rec { - name = "kmymoney-4.6.1"; + name = "kmymoney-4.6.2"; src = fetchurl { url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2"; - sha256 = "0ympq70z0a9zrs623jznj6hnjph2rdhpra0np2mqm1mmy72bkjjz"; + sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d"; }; buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { KDEDIRS = libalkimia; - patches = [ ./qgpgme.patch ]; + patches = [ ./qgpgme.patch ./qt-4.8.patch ]; meta = { homepage = http://kmymoney2.sourceforge.net/; diff --git a/pkgs/applications/office/kmymoney/qt-4.8.patch b/pkgs/applications/office/kmymoney/qt-4.8.patch new file mode 100644 index 00000000000..7e9a44337cd --- /dev/null +++ b/pkgs/applications/office/kmymoney/qt-4.8.patch @@ -0,0 +1,32 @@ +From: Christoph Feck +Date: Thu, 10 Nov 2011 11:34:20 +0000 +Subject: Fix compile with Qt 4.8 +X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=8324cfb9657d8c03f83691402386e8c5bfb29981 +--- +Fix compile with Qt 4.8 + +Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and +fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer +--- + + +--- a/libkdchart/src/KDChartBackgroundAttributes.cpp ++++ b/libkdchart/src/KDChartBackgroundAttributes.cpp +@@ -22,6 +22,7 @@ + + #include "KDChartBackgroundAttributes.h" + #include ++#include + + #include + +@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh + << "visible="< Date: Sun, 12 Feb 2012 13:34:06 +0000 Subject: [PATCH 112/183] Bumped revision of Disnix activation scripts svn path=/nixpkgs/trunk/; revision=32234 --- .../disnix/activation-scripts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix index 8725f5d1250..23906fb3aff 100644 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { - name = "disnix-activation-scripts-0.3pre29887"; + name = "disnix-activation-scripts-0.3pre30423"; src = fetchurl { - url = http://hydra.nixos.org/build/1461490/download/1/disnix-activation-scripts-0.3pre29887.tar.gz; - sha256 = "034mx096iz9dqjsrxh6jkvcwch399gfsahrm6vfnswz9jfvfdcw0"; + url = http://hydra.nixos.org/build/1842091/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; + sha256 = "11b569bflknjbjddam4mv07bpmihbfx5acxzxzhnshj6x8sv6064"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From d53d97ad5ee3a1d23736109c628103fab89739d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:01:46 +0000 Subject: [PATCH 113/183] haskell-HaRe: updated to version 0.6.0.2 svn path=/nixpkgs/trunk/; revision=32238 --- pkgs/development/tools/haskell/HaRe/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index a7c2e74fa7e..23739451816 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.6.0.1"; - sha256 = "cd3fa312c7fa6a5f761bbc3ebdbc6300e83ba9e285047acded6269d2164d67f8"; + version = "0.6.0.2"; + sha256 = "13mi6z37fszrl97mll4injhq8dyhqzm344x7y2vw8krr5xjj3kw2"; isLibrary = false; isExecutable = true; buildDepends = [ hint mtl network syb ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5ca8288a5c9..49c2d39e9fd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1597,10 +1597,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happyMeta = callPackage ../development/tools/haskell/happy-meta {}; - # 2012-02-09: Disabled because this package is clearly, and it won't compile with - # any recent version of GHC. We should delete it unless anyone - # complains. - # HaRe = callPackage ../development/tools/haskell/HaRe {}; + HaRe = callPackage ../development/tools/haskell/HaRe {}; hlint = callPackage ../development/tools/haskell/hlint {}; From 7d51d5249938880daa115ba6fa48fb2a91a159c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:01:51 +0000 Subject: [PATCH 114/183] haskell-HDBC: updated to version 2.3.1.1 svn path=/nixpkgs/trunk/; revision=32239 --- pkgs/development/libraries/haskell/HDBC/HDBC.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index 30791deea1c..4044c179810 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "HDBC"; - version = "2.3.1.0"; - sha256 = "1y3qcc0ids9k3af4qkhabwg82q03a21wl4vdqhj1h0zmf08b3m6k"; + version = "2.3.1.1"; + sha256 = "1gqihvsf5w7j8xbn1xy93mdrsh77qwxbhfmyjivbm6i95w1i0kb7"; isLibrary = true; isExecutable = true; buildDepends = [ convertible mtl text time utf8String ]; meta = { - homepage = "https://github.com/jgoerzen/hdbc/wiki"; + homepage = "https://github.com/hdbc/hdbc"; description = "Haskell Database Connectivity"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From e74e8f880a4049a62d8e9fc9208f004515df52ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:01:54 +0000 Subject: [PATCH 115/183] haskell-attoparsec: updated to version 0.10.1.1 svn path=/nixpkgs/trunk/; revision=32240 --- pkgs/development/libraries/haskell/attoparsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index c0b9a0eab82..fb755000477 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.10.1.0"; - sha256 = "1wlil4zxnyrygvkgmap8kcqf4f6rc08ais20alyy4ggzmx73sl9q"; + version = "0.10.1.1"; + sha256 = "07zl85nkimpswlb4rxycisaphhyrlq4la2limxxi7sk21gyh88b0"; buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; From af4959a2ae0031c17aea259ad11fb90aa7ef14e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:01:56 +0000 Subject: [PATCH 116/183] haskell-cmdargs: updated to version 0.9.3 svn path=/nixpkgs/trunk/; revision=32241 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 7024b08a672..7984bbbc99d 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.9.2"; - sha256 = "1c0xy4g9b5jqy51qhgq7djafqz27z6q7ya31pgy186pfgl7604kr"; + version = "0.9.3"; + sha256 = "1mm16249nprclmgplw5bmmzsnmfm8dlkc5janrwvmlssbxw5hgnk"; isLibrary = true; isExecutable = true; buildDepends = [ transformers ]; From a05bc7570cdb6773d6ada4594c18fb5c8efbd148 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:01:59 +0000 Subject: [PATCH 117/183] haskell-conduit: updated to version 0.2.1 svn path=/nixpkgs/trunk/; revision=32242 --- 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 59130a5b864..d1a26389c7a 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 = "0.2.0"; - sha256 = "0ljbxm6rxcxfw51kcjkmb041kz7k6frgc9l6gvfh2s9zrip8zq5v"; + version = "0.2.1"; + sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; From b6922cc2ae1ff18b7ae51f1399c11b3732872ecb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:01 +0000 Subject: [PATCH 118/183] haskell-crypto-conduit: updated to version 0.1.3.1 svn path=/nixpkgs/trunk/; revision=32243 --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 5882fe3c5bf..736d5f666d0 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Conduit interface for cryptographic operations (from crypto-api)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 1f346f478121e3da0ed7def86f933420b8c6a302 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:04 +0000 Subject: [PATCH 119/183] haskell-highlighting-kate: updated to version 0.5.0.4 svn path=/nixpkgs/trunk/; revision=32244 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 795488adfd0..a6eae113100 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.0.2"; - sha256 = "012hr5ci9j4fwnrc1ypx6ca562vzqlfk5phjs4xl3llxv8afdhgl"; + version = "0.5.0.4"; + sha256 = "1kn73gcjhndb5wbdy9hbjgar1bdcmy8cy831ib4ik1fn62zmvxrf"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ]; From 7c6a291d496aa890910caddee9802185474e4c7c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:06 +0000 Subject: [PATCH 120/183] haskell-http-conduit: updated to version 1.2.6 svn path=/nixpkgs/trunk/; revision=32245 --- .../libraries/haskell/http-conduit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 5b58909231d..6621f13df8e 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,19 +1,19 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, failure, httpTypes -, liftedBase, monadControl, network, regexCompat, socks, text, time -, tls, tlsExtra, transformers, transformersBase, utf8String +, liftedBase, monadControl, mtl, network, regexCompat, socks, text +, time, tls, tlsExtra, transformers, transformersBase, utf8String , zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.2.5"; - sha256 = "0mb85akb7mgdhjkmp041lhqir2gys9bjixn2v1i848mijw1zx8zr"; + version = "1.2.6"; + sha256 = "0gspqkydw5v4wb9s0ipy5s708nmqp3phkh3j95mzn6nlbk2r9kvn"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault failure httpTypes liftedBase monadControl + cprngAes dataDefault failure httpTypes liftedBase monadControl mtl network regexCompat socks text time tls tlsExtra transformers transformersBase utf8String zlibConduit ]; From 3cc92a77ce4a1fbd73f115a5d1b5a73a33c767f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:08 +0000 Subject: [PATCH 121/183] haskell-numeric-prelude: updated to version 0.3.0.1 svn path=/nixpkgs/trunk/; revision=32246 --- .../development/libraries/haskell/numeric-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index ef3ffbddf1a..94ec52e0ac7 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.3"; - sha256 = "0zxqfsgyg7gf051qjzv57bb1cvrbzlvvyyl2d3gmikyy6h3pis1f"; + version = "0.3.0.1"; + sha256 = "14hi0l4pga4srrfypx4alsyq34y5wsanis6216cds3zjw6db3frg"; isLibrary = true; isExecutable = true; buildDepends = [ From e01f4fb894840aed161ed77de1ddb48d9dde9a9c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:11 +0000 Subject: [PATCH 122/183] haskell-pandoc: updated to version 1.9.1.1 svn path=/nixpkgs/trunk/; revision=32247 --- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 8de94769cb8..7561253d4c0 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.1"; - sha256 = "00xwy1afy4cn7z2drsc4dnqd4g45i45v9f3jm9j6i32pz27y8s2a"; + version = "1.9.1.1"; + sha256 = "1npyc99f90fhbfddr6x5dlnwdc3i1pnhg4xiv12fmf1cl8xlcpyl"; isLibrary = true; isExecutable = true; buildDepends = [ From 76c27de2862c31d1ec2d2a8f7f655369cbe5ee44 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:14 +0000 Subject: [PATCH 123/183] haskell-persistent-template: updated to version 0.8.1.1 svn path=/nixpkgs/trunk/; revision=32248 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 00dc40fc2f2..7ea678266f4 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.8.1"; - sha256 = "0av1rzqz80lzirk9l45jiwj4zar6ncy0q9x7dqhsrklyxk4jzv6v"; + version = "0.8.1.1"; + sha256 = "1wl669h8az9wviaq04pwg7w3g5cc90hafn2f1p3jybbif0hpqhks"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From f8bdfa5b7f693e9a292c8c266df0f6be017da6db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:16 +0000 Subject: [PATCH 124/183] haskell-system-fileio: updated to version 0.3.5 svn path=/nixpkgs/trunk/; revision=32249 --- pkgs/development/libraries/haskell/system-fileio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index cd514f7ce23..56031ed3157 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.4"; - sha256 = "184f5bb3qhag6cwmk0zc2ldkwnkzbv82pv7hy541j8jqqi5wprih"; + version = "0.3.5"; + sha256 = "0d1baliykfpg15bzknx98slr0qa5yjr3va3w8hs02wgx6sp3wsy2"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; From 26dc512856bc1eb003834d2472d9fb553780d503 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:19 +0000 Subject: [PATCH 125/183] haskell-texmath: updated to version 0.6.0.3 svn path=/nixpkgs/trunk/; revision=32250 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index a1487ddb903..7bd8217b434 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.0.2"; - sha256 = "04b642xbbgivbnpc8srqirdf71n5b6h5ir6rw0z2xpiv0znk6vh2"; + version = "0.6.0.3"; + sha256 = "0vj1kh62qs7badv00lcda9m3j53kc069kmrv5lmz62a96y4kx5yi"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From 3a381fbe8ba8008530da0ed6cec2c4ec7957e566 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:21 +0000 Subject: [PATCH 126/183] haskell-wai-logger: updated to version 0.1.3 svn path=/nixpkgs/trunk/; revision=32251 --- 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 d99bd1a0442..02de60a4944 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.1.2"; - sha256 = "0pzbdjy0xkjqkzc5w1v0hh18jgbxlkllsjwxabswkh8gl73mp7d9"; + version = "0.1.3"; + sha256 = "0h9m2vnm81q1zdj0gv3d9vzd2mlm1343div591695fq52ks26cfc"; buildDepends = [ blazeBuilder byteorder caseInsensitive fastLogger httpTypes network time wai From bf4edd50ded724589238f0c79cca87ce14d9b42f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:23 +0000 Subject: [PATCH 127/183] haskell-yesod-auth: updated to version 0.8.1.1 svn path=/nixpkgs/trunk/; revision=32252 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index be251edffc6..4cb1bb336ee 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "0.8.1"; - sha256 = "10jhvkyxf8j55yzc05p0fmmjsd8fb1sns86vlsl0108947b2pp8v"; + version = "0.8.1.1"; + sha256 = "0wmvywyil6cnpxq777a0w4qknw4lr4i53nni4bcigrvmpg7gzgac"; buildDepends = [ aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 pwstoreFast random SHA From 32c44363356921351e5ff4555c21a158d1f5ce10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Feb 2012 09:02:26 +0000 Subject: [PATCH 128/183] haskell-yesod-routes: added meta.maintainers svn path=/nixpkgs/trunk/; revision=32253 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 9a130902c47..c93b5e1db8c 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -10,5 +10,9 @@ cabal.mkDerivation (self: { description = "Efficient routing for Yesod"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 1a5c12c34cae877b053ddddff291995839ea832f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 13 Feb 2012 13:41:57 +0000 Subject: [PATCH 129/183] I made stuntrally work, thanks to adding the nvidia_cg_toolkit to ogre. svn path=/nixpkgs/trunk/; revision=32257 --- pkgs/development/libraries/ogre/default.nix | 1 + pkgs/games/stuntrally/default.nix | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 90604ed1058..e7744f43e12 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -5,6 +5,7 @@ x@{builderDefsPackage , xproto, libX11, libXmu, libSM, pkgconfig , libXxf86vm, xf86vidmodeproto, libICE , renderproto, libXrender + , nvidia_cg_toolkit , ...}: builderDefsPackage (a : diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 14db3dd52b8..69609b1bbfb 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,6 +1,5 @@ -{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig }: - -throw "Stunt Rally needs ogre with cg support at runtime - we have to package nvidia cg" +{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig +, makeWrapper }: stdenv.mkDerivation rec { name = "stunt-rally-1.4"; @@ -10,7 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq"; }; - buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig ]; + buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ]; + + # I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but + # the cmake code I saw is not ready for that. Therefore, we use the env var. + postInstall = '' + wrapProgram $out/bin/stuntrally --set OGRE_PLUGIN_DIR ${ogre}/lib/OGRE + wrapProgram $out/bin/sr-editor --set OGRE_PLUGIN_DIR ${ogre}/lib/OGRE + ''; enableParallelBuilding = true; From 0a85d5cf98362a6d8e9b34f5dfde29e14272d72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 13 Feb 2012 13:59:12 +0000 Subject: [PATCH 130/183] Blind commit about making nvidia-cg-toolkit build for i686-linux svn path=/nixpkgs/trunk/; revision=32258 --- pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 8bb201f975e..06f1d74382e 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { ensureDir "$out/lib/" [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" - for mandir in man1 man3 manCg manCgFX + for mandir in man1 man3 \ + ${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX do ensureDir "$out/share/man/$mandir/" cp -v share/man/$mandir/* "$out/share/man/$mandir/" From 456d380cef854f7f6f1c172127c355f02689d377 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Mon, 13 Feb 2012 17:15:34 +0000 Subject: [PATCH 131/183] Fixed poweroff/reboot in "consolekit" for NixOS. svn path=/nixpkgs/trunk/; revision=32261 --- .../libraries/consolekit/commands.patch | 33 +++++++++++++++++++ .../libraries/consolekit/default.nix | 4 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/consolekit/commands.patch diff --git a/pkgs/development/libraries/consolekit/commands.patch b/pkgs/development/libraries/consolekit/commands.patch new file mode 100644 index 00000000000..48b0d5d8cf6 --- /dev/null +++ b/pkgs/development/libraries/consolekit/commands.patch @@ -0,0 +1,33 @@ +This patch adds shutdown commands specific to NixOS, as NixOS does not have +a /sbin or /usr/sbin directory. In order not to have a dependency on the +package that provides "shutdown" when in an environment other than NixOS, +we'll make it depend on /var/run/current-system. + +Note: this patch does not compromise system security. Other systems than +NixOS should have already shutdown in the earlier directories being searched, +and otherwise /var/run is writable only be root. + +--- ConsoleKit-0.4.1/tools/linux/ck-system-restart.org 2012-02-13 11:29:57.352902568 +0100 ++++ ConsoleKit-0.4.1/tools/linux/ck-system-restart 2012-02-13 11:43:27.593317712 +0100 +@@ -7,6 +7,9 @@ + elif [ -x "/usr/sbin/shutdown" ] ; then + /usr/sbin/shutdown -r now + exit $? ++elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then ++ /var/run/current-system/sw/sbin/shutdown -r now ++ exit $? + else + exit 1 + fi +--- ConsoleKit-0.4.1/tools/linux/ck-system-stop.org 2012-02-13 11:30:06.228950934 +0100 ++++ ConsoleKit-0.4.1/tools/linux/ck-system-stop 2012-02-13 11:44:12.664563304 +0100 +@@ -7,6 +7,9 @@ + elif [ -x "/usr/sbin/shutdown" ] ; then + /usr/sbin/shutdown -h now + exit $? ++elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then ++ /var/run/current-system/sw/sbin/shutdown -h now ++ exit $? + else + exit 1 + fi diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix index 5cebc5874bd..e9cedf18857 100644 --- a/pkgs/development/libraries/consolekit/default.nix +++ b/pkgs/development/libraries/consolekit/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ]; patches = [ ./0001-Don-t-daemonize-when-activated.patch - ./0002-Don-t-take-bus-name-until-ready.patch ]; + ./0002-Don-t-take-bus-name-until-ready.patch + ./commands.patch # adds shutdown commands for NixOS to the list of shutdown commands + ]; # For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_LDFLAGS = "-lgcc_s"; From b13fd75b355f72771ed28174fb5f00c144a96870 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 13 Feb 2012 19:34:35 +0000 Subject: [PATCH 132/183] freeciv-2.3.1 svn path=/nixpkgs/trunk/; revision=32262 --- pkgs/games/freeciv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index f5b101b8882..933d009dd2c 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -2,11 +2,11 @@ , pkgconfig, fontconfig, libzip, zip, zlib }: stdenv.mkDerivation rec { - name = "freeciv-2.2.7"; + name = "freeciv-2.3.1"; src = fetchurl { - url = "mirror://sf/freeciv/${name}.tar.bz2"; - sha256 = "993dd1685dad8012225fdf434673515a194fa072b3d5bfb04952a98fb862d319"; + url = "mirror://sourceforge/freeciv/${name}.tar.bz2"; + sha256 = "1n3ak0y9hj9kha0r3cdbi8zb47vrgal1jsbblamqgwwwgzy8cri3"; }; buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype pkgconfig fontconfig libzip zip zlib] ; From 1c4a8d7e6d0fc72f79dc9a57dc48c475f5f37ed3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 13 Feb 2012 19:34:39 +0000 Subject: [PATCH 133/183] freeciv: add flags for clients and server svn path=/nixpkgs/trunk/; revision=32263 --- pkgs/games/freeciv/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 933d009dd2c..7aaf3238308 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,6 +1,12 @@ -{ stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype -, pkgconfig, fontconfig, libzip, zip, zlib }: +{ stdenv, fetchurl, zlib, bzip2, pkgconfig +, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype +, gtkClient ? false, gtk +, server ? true, readline }: +let + inherit (stdenv.lib) optional optionals; + client = sdlClient || gtkClient; +in stdenv.mkDerivation rec { name = "freeciv-2.3.1"; @@ -9,7 +15,12 @@ stdenv.mkDerivation rec { sha256 = "1n3ak0y9hj9kha0r3cdbi8zb47vrgal1jsbblamqgwwwgzy8cri3"; }; - buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype pkgconfig fontconfig libzip zip zlib] ; + buildNativeInputs = [ pkgconfig ]; + + buildInputs = [ zlib bzip2 ] + ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype ] + ++ optional gtkClient gtk + ++ optional server readline; meta = with stdenv.lib; { description = "multiplayer (or single player), turn-based strategy game."; From 19dde94ddcd74eb683057ca8898e5550d7054f3b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 13 Feb 2012 19:34:42 +0000 Subject: [PATCH 134/183] Add calligra suite KOffice, rebranded. Let hydra build it. svn path=/nixpkgs/trunk/; revision=32264 --- pkgs/applications/office/calligra/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/office/calligra/default.nix diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix new file mode 100644 index 00000000000..89eed7310c2 --- /dev/null +++ b/pkgs/applications/office/calligra/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa +, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 +, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 +, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }: + +stdenv.mkDerivation rec { + name = "calligra-2.3.87"; + + src = fetchurl { + url = "mirror://kde/unstable/${name}/${name}.tar.bz2"; + sha256 = "1arrk2ww3bykv4y8fsn1dn25gq9bf7a4ygggkrczfrxlbv1s9p9v"; + }; + + buildNativeInputs = [ cmake perl pkgconfig ]; + + buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs + createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype + sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl + shared_desktop_ontologies ]; + + meta = { + description = "A Qt/KDE office suite, formely known as koffice"; + homepage = http://calligra.org; + maintainers = [ stdenv.lib.maintainers.urkud ]; + inherit (kdelibs.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 629b4217dd2..bffaaa00281 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8204,6 +8204,8 @@ let bluedevil = callPackage ../tools/bluetooth/bluedevil { }; + calligra = callPackage ../applications/office/calligra { }; + digikam = callPackage ../applications/graphics/digikam { boost = boost147; }; From af1b08ac32e89fa4b4ca9e3d38acb38407a0f41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 13 Feb 2012 21:04:39 +0000 Subject: [PATCH 135/183] Updating firefox to 10.0.1. I'll let hydra build it. svn path=/nixpkgs/trunk/; revision=32266 --- pkgs/applications/networking/browsers/firefox/10.0.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix index 79869b324b9..3a688cb6669 100644 --- a/pkgs/applications/networking/browsers/firefox/10.0.nix +++ b/pkgs/applications/networking/browsers/firefox/10.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "10.0"; + firefoxVersion = "10.0.1"; - xulVersion = "10.0"; # this attribute is used by other packages + xulVersion = "10.0.1"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c"; + sha1 = "8613957db84e6722ccf1ebf74fab927139614bfc"; }; commonConfigureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bffaaa00281..88101ecf295 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6840,7 +6840,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox90Pkgs; + firefoxPkgs = pkgs.firefox100Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; From 1c885d3dee41b3d899d1079e583bcd718ec91166 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Tue, 14 Feb 2012 09:56:46 +0000 Subject: [PATCH 136/183] Updating to 2.10.1, security fixes and also fixes #14351 'multiple display of room members' svn path=/nixpkgs/trunk/; revision=32267 --- .../networking/instant-messengers/pidgin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 89c3a10a45e..637744fc182 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { name = "pidgin-2.9.0"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.9.0.tar.bz2; - sha256 = "1mygaap7cbak9n9zm4wshxnvb27a68w633d712vy2knr8z78xvi8"; + url = mirror://sourceforge/pidgin/pidgin-2.10.1.tar.bz2; + sha256 = "2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8"; }; inherit nss ncurses; From ba4e2e775a6429e21ebda27db1e1a16954620ee7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 14 Feb 2012 10:53:09 +0000 Subject: [PATCH 137/183] Bumped GeoIP java library to version 1.2.5 svn path=/nixpkgs/trunk/; revision=32268 --- pkgs/development/libraries/java/geoipjava/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index f713ef2f645..1420d4f2a42 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, jdk, unzip}: stdenv.mkDerivation { - name = "GeoIPJava-1.2.3"; + name = "GeoIPJava-1.2.5"; src = fetchurl { - url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.3.zip; - sha256 = "0l8vxan2xh0mp1vjxh39q05jyfw8gk5y77b7i8s1aw7ssyzd05vs"; + url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; + sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; buildPhase = From 5d70cfcb257cabee4840f360fcae9024d2363958 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 14 Feb 2012 14:29:22 +0000 Subject: [PATCH 138/183] kdepim-runtime: fix mailindexer eating 100% CPU svn path=/nixpkgs/trunk/; revision=32271 --- pkgs/desktops/kde-4.8/kdepim-runtime.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/kde-4.8/kdepim-runtime.nix b/pkgs/desktops/kde-4.8/kdepim-runtime.nix index ef637f3f075..f9280aad23a 100644 --- a/pkgs/desktops/kde-4.8/kdepim-runtime.nix +++ b/pkgs/desktops/kde-4.8/kdepim-runtime.nix @@ -5,6 +5,13 @@ kde { buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2 libxslt ]; + patches = map fetchurl [ { + # See https://bugs.kde.org/show_bug.cgi?id=289932 + url = "http://bugsfiles.kde.org/attachment.cgi?id=68763"; + name = "delays-in-nepomuk-indexing.patch"; + sha256 = "0j3ndqwvi4bg789jb0wqsh2zpwi1gwdyng9gdmng189dx409jf85"; + } ]; + meta = { description = "KDE PIM runtime"; license = "GPL"; From 96c20f97b7b8abb74a29551facc523682ca74acc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 14 Feb 2012 14:29:25 +0000 Subject: [PATCH 139/183] unzip: fix typo in meta svn path=/nixpkgs/trunk/; revision=32272 --- pkgs/tools/archivers/unzip/6.0.nix | 2 +- pkgs/top-level/release.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/unzip/6.0.nix b/pkgs/tools/archivers/unzip/6.0.nix index 8abd813fb8f..face504fa32 100644 --- a/pkgs/tools/archivers/unzip/6.0.nix +++ b/pkgs/tools/archivers/unzip/6.0.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation ({ homepage = http://www.info-zip.org; description = "An extraction utility for archives compressed in .zip format"; license = "free"; # http://www.info-zip.org/license.html - meta.platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; }; } // (if enableNLS then { patches = diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 44419a040fd..c6b47005097 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -304,7 +304,6 @@ with (import ./release-lib.nix); udev = linux; uml = ["i686-linux"]; unrar = linux; - unzip = all; upstart = linux; usbutils = linux; utillinux = linux; From f1abe7d1957d16c96b648def367bc8aec70616ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:24 +0000 Subject: [PATCH 140/183] haskell-network: updated 2.3.x version to 2.3.0.11 svn path=/nixpkgs/trunk/; revision=32276 --- .../network/{2.3.0.10.nix => 2.3.0.11.nix} | 4 ++-- .../libraries/haskell/network/2.3.0.8.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 7 +++---- 3 files changed, 5 insertions(+), 24 deletions(-) rename pkgs/development/libraries/haskell/network/{2.3.0.10.nix => 2.3.0.11.nix} (82%) delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.8.nix diff --git a/pkgs/development/libraries/haskell/network/2.3.0.10.nix b/pkgs/development/libraries/haskell/network/2.3.0.11.nix similarity index 82% rename from pkgs/development/libraries/haskell/network/2.3.0.10.nix rename to pkgs/development/libraries/haskell/network/2.3.0.11.nix index d3e72fa72ed..7007211a721 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.10.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.11.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.0.10"; - sha256 = "1f1z7wggxl2rzix1r4bhvcdl0fmx2mzkn70iy3w5yl54vmym21bm"; + version = "2.3.0.11"; + sha256 = "1ghm8rw0m3x71pnndbmzm9j99yh8bmmrlhz4ykslsk2my7ihmxdk"; buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.8.nix b/pkgs/development/libraries/haskell/network/2.3.0.8.nix deleted file mode 100644 index 93e57b0ec01..00000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.8.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.8"; - sha256 = "10y7spi1qwjmq7mz7h09ijrzq0jl4r02jrgxiqavsiw6j35r4yfv"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 49c2d39e9fd..f4f7906a4d3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -141,7 +141,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok HUnit = self.HUnit_1_2_2_3; # 7.4.1 ok - network = self.network_2_3_0_10; # 7.4.1 ok + network = self.network_2_3_0_11; # 7.4.1 ok OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok parallel = self.parallel_3_2_0_2; # 7.4.1 ok parsec = self.parsec_3_1_2; # 7.4.1 ok @@ -1036,9 +1036,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; - network_2_3_0_8 = callPackage ../development/libraries/haskell/network/2.3.0.8.nix {}; - network_2_3_0_10 = callPackage ../development/libraries/haskell/network/2.3.0.10.nix {}; - network = self.network_2_3_0_10; + network_2_3_0_11 = callPackage ../development/libraries/haskell/network/2.3.0.11.nix {}; + network = self.network_2_3_0_11; nixosTypes = callPackage ../development/libraries/haskell/nixos-types {}; From 3c63b41aa4e415d115b69f486f1fce90739ac332 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:27 +0000 Subject: [PATCH 141/183] haskell-tar: added version 0.4.0.0 svn path=/nixpkgs/trunk/; revision=32277 --- .../haskell/tar/{default.nix => 0.3.2.0.nix} | 0 pkgs/development/tools/haskell/tar/0.4.0.0.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 ++++- 3 files changed, 20 insertions(+), 1 deletion(-) rename pkgs/development/tools/haskell/tar/{default.nix => 0.3.2.0.nix} (100%) create mode 100644 pkgs/development/tools/haskell/tar/0.4.0.0.nix diff --git a/pkgs/development/tools/haskell/tar/default.nix b/pkgs/development/tools/haskell/tar/0.3.2.0.nix similarity index 100% rename from pkgs/development/tools/haskell/tar/default.nix rename to pkgs/development/tools/haskell/tar/0.3.2.0.nix diff --git a/pkgs/development/tools/haskell/tar/0.4.0.0.nix b/pkgs/development/tools/haskell/tar/0.4.0.0.nix new file mode 100644 index 00000000000..70afaa4aa6a --- /dev/null +++ b/pkgs/development/tools/haskell/tar/0.4.0.0.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "tar"; + version = "0.4.0.0"; + sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3"; + meta = { + description = "Reading, writing and manipulating \".tar\" archive files."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f4f7906a4d3..3f860fe9444 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1604,7 +1604,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SourceGraph = callPackage ../development/tools/haskell/SourceGraph {}; - tar = callPackage ../development/tools/haskell/tar {}; + tar_0_3_2_0 = callPackage ../development/tools/haskell/tar/0.3.2.0.nix {}; + tar_0_4_0_0 = callPackage ../development/tools/haskell/tar/0.4.0.0.nix {}; + tar = self.tar_0_4_0_0; threadscope = callPackage ../development/tools/haskell/threadscope {}; @@ -1616,6 +1618,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); darcs = callPackage ../applications/version-management/darcs { regexCompat = self.regexCompat93; + tar = self.tar_0_3_2_0; }; leksah = callPackage ../applications/editors/leksah {}; From 70d973551a544576b75536564373879e1c7ae404 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:30 +0000 Subject: [PATCH 142/183] haskell-bitmap: updated to version 0.0.2 svn path=/nixpkgs/trunk/; revision=32278 --- pkgs/development/libraries/haskell/bitmap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix index d89e225a5e3..53f85710281 100644 --- a/pkgs/development/libraries/haskell/bitmap/default.nix +++ b/pkgs/development/libraries/haskell/bitmap/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "bitmap"; - version = "0.0.1"; - sha256 = "281ad4d9234349cfd14f91977b48e2d1861c037f4b6562aa138cddd25c801a7e"; + version = "0.0.2"; + sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m"; meta = { homepage = "http://code.haskell.org/~bkomuves/"; - description = "A library for handling and manipulating bitmaps"; + description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ From 9c1bdb6d900d8c797c7af80d4342843a3c01f5e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:33 +0000 Subject: [PATCH 143/183] haskell-ghc-mod: updated to version 1.10.5 svn path=/nixpkgs/trunk/; revision=32279 --- 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 2566e098656..d8d8fe5a02e 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.0.8"; - sha256 = "1c1236a8829418cae3039c3479875104664827c661b8c7567dd7bdbda12e8bcc"; + version = "1.10.5"; + sha256 = "0hbimrrlasa2rkmdz9d4fcyk70fynmwx0zqyl470hrwz8d8v73rc"; buildDepends = [ attoparsec attoparsecEnumerator ghcPaths hlint regexPosix ]; From 1bc51d7448ae55eb36ba49ef079be84c7d5bfb07 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:35 +0000 Subject: [PATCH 144/183] haskell-hackage-db: updated to version 1.3 svn path=/nixpkgs/trunk/; revision=32280 --- pkgs/development/libraries/haskell/hackage-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index 2afb2108f06..2b6989dcf4b 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hackage-db"; - version = "1.2"; - sha256 = "1dsm8mp8f6z7jqqgx39xfvl5kql6bbwxk25k435rsb685q9hzpxq"; + version = "1.3"; + sha256 = "17l2aw2kzjpjzyrg0c5vlaglx0vl475g3wxwavvzrd60z9lb3cp9"; buildDepends = [ tar ]; meta = { homepage = "http://github.com/peti/hackage-db"; From 385e00233844f7c35477234cb1a53e4aff316253 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:38 +0000 Subject: [PATCH 145/183] haskell-hakyll: updated to version 3.2.6.1 svn path=/nixpkgs/trunk/; revision=32281 --- pkgs/development/libraries/haskell/hakyll/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index acb75b05ae9..9ccb5045c08 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,15 +1,15 @@ { cabal, binary, blazeHtml, citeprocHs, cryptohash, hamlet, mtl -, pandoc, parsec, regexBase, regexPcre, snapCore, snapServer +, pandoc, parsec, regexBase, regexTdfa, snapCore, snapServer , tagsoup, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.6.0"; - sha256 = "1yg97kihfxb250vk9dm2v9sh197lc6qjil0j40zgcwpss96xynax"; + version = "3.2.6.1"; + sha256 = "0chpg04rsp8lxzdj43wqs3wyc7i70hfi3raxdar6bhwxhfxgj4wn"; buildDepends = [ binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec - regexBase regexPcre snapCore snapServer tagsoup time + regexBase regexTdfa snapCore snapServer tagsoup time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; From 19be3645ad89f315328a9fca71e54cae6de3420c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:41 +0000 Subject: [PATCH 146/183] haskell-http-types: updated to version 0.6.9 svn path=/nixpkgs/trunk/; revision=32282 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 890d5100147..0c7f78c65c2 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.6.8"; - sha256 = "0amjpn93wc7jhfy1n69mhiryi2yy40k5388ap3iwqi79mblkjf31"; + version = "0.6.9"; + sha256 = "1dkp2iqqalrm381vagw65bhjnm80hv02h28447lmjl2j60b4mby0"; isLibrary = true; isExecutable = true; buildDepends = [ blazeBuilder caseInsensitive text ]; From 75da6dea3333a99c5e8df07568d4312275af127d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:43 +0000 Subject: [PATCH 147/183] haskell-libmpd: updated to version 0.7.2 svn path=/nixpkgs/trunk/; revision=32283 --- pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index b843186b52a..3a2b6e4f86d 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.7.1"; - sha256 = "1vahcr1vjpr1wfkifp8ih3fajz1886zhc3cj643f7s3im7wjzw5j"; + version = "0.7.2"; + sha256 = "109bm5fgwmydh3bi93wxr6ac3gkp7pcvp4a8z226c1wlgc995zap"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time utf8String ]; From e6f6c4b42e15cc895e16b38b1b1a2feab8d465d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:46 +0000 Subject: [PATCH 148/183] haskell-shakespeare-i18n: updated to version 0.0.2 svn path=/nixpkgs/trunk/; revision=32284 --- .../libraries/haskell/shakespeare-i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 85139482ad9..fc7025e64da 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "0.0.1"; - sha256 = "0hnjrds4vhqyd7pda8rciz50kspf01880j93qn6xx610hbqsal3m"; + version = "0.0.2"; + sha256 = "1hb144n3fa5qiy3skrmab0qv63fa5vf4vg4ar9hrybmwdksqa410"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/i18n"; From f2ee9177d0bb9e6194c6457cf25eae3817596fad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:48 +0000 Subject: [PATCH 149/183] haskell-stb-image: updated to version 0.2.1 svn path=/nixpkgs/trunk/; revision=32285 --- pkgs/development/libraries/haskell/stb-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix index 43e56473b65..1521763f2bf 100644 --- a/pkgs/development/libraries/haskell/stb-image/default.nix +++ b/pkgs/development/libraries/haskell/stb-image/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "stb-image"; - version = "0.2"; - sha256 = "7d027b6de52d07bbe439a84897aaa6e26a8f05c6fa6f4aeaa3060be23ae11937"; + version = "0.2.1"; + sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52"; buildDepends = [ bitmap ]; meta = { homepage = "http://code.haskell.org/~bkomuves/"; From 5cbc5242a81db886df390b78852676bd4c706ada Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:51 +0000 Subject: [PATCH 150/183] haskell-wai-logger: updated to version 0.1.4 svn path=/nixpkgs/trunk/; revision=32286 --- 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 02de60a4944..83b43004bc0 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.1.3"; - sha256 = "0h9m2vnm81q1zdj0gv3d9vzd2mlm1343div591695fq52ks26cfc"; + version = "0.1.4"; + sha256 = "1rvcqq4jlkcjavy8a3vf61jclwpnjmj6cp3whrzwvay9b1qfsck3"; buildDepends = [ blazeBuilder byteorder caseInsensitive fastLogger httpTypes network time wai From 6e3f66185d28ba02b271d66baefccedd47589bc4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:53 +0000 Subject: [PATCH 151/183] haskell-packages.nix: allow packages to be built with a version of 'filepath' other than the one shipped with the compiler svn path=/nixpkgs/trunk/; revision=32287 --- pkgs/top-level/haskell-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3f860fe9444..9e9734d7355 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -658,7 +658,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); explicitException = callPackage ../development/libraries/haskell/explicit-exception {}; - filepath = callPackage ../development/libraries/haskell/filepath {}; + filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {}; + filepath = null; # a core package in recent GHCs extensibleExceptions_0_1_1_0 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.0.nix {}; extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {}; From 89a958e4d078f74c9664378310f0ca06e7d9f559 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:56 +0000 Subject: [PATCH 152/183] haskell-packages.nix: allow packages to be built with a version of 'Cabal' other than the one shipped with the compiler svn path=/nixpkgs/trunk/; revision=32288 --- .../libraries/haskell/Cabal/1.14.0.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/Cabal/1.14.0.nix diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix new file mode 100644 index 00000000000..f87b363e88e --- /dev/null +++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix @@ -0,0 +1,18 @@ +{ cabal, Cabal, filepath }: + +cabal.mkDerivation (self: { + pname = "Cabal"; + version = "1.14.0"; + sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j"; + buildDepends = [ Cabal filepath ]; + meta = { + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9e9734d7355..9154f658d96 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -119,8 +119,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; # This is the Cabal builder, the function we use to build most Haskell - # packages. It isn't the Cabal library, which is a core package of GHC - # and therefore not separately listed here. + # packages. It isn't the Cabal library, which is spelled "Cabal". cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix { enableLibraryProfiling = enableLibraryProfiling; @@ -505,6 +504,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bytestringTrie = callPackage ../development/libraries/haskell/bytestring-trie {}; + Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; + Cabal = null; # core package in GHC + cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; cairo = callPackage ../development/libraries/haskell/cairo { From adc9bf05104d1463484aa88a4a7b2b69e8a1850b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:58 +0000 Subject: [PATCH 153/183] haskell-packages.nix: removed obsolete 'aeson-native' and 'blaze-textual-native' svn path=/nixpkgs/trunk/; revision=32289 --- .../haskell/aeson-native/default.nix | 23 ------------------- .../haskell/blaze-textual-native/default.nix | 18 --------------- pkgs/top-level/haskell-packages.nix | 4 ---- 3 files changed, 45 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/aeson-native/default.nix delete mode 100644 pkgs/development/libraries/haskell/blaze-textual-native/default.nix diff --git a/pkgs/development/libraries/haskell/aeson-native/default.nix b/pkgs/development/libraries/haskell/aeson-native/default.nix deleted file mode 100644 index 9f662984509..00000000000 --- a/pkgs/development/libraries/haskell/aeson-native/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, attoparsec, blazeBuilder, blazeTextualNative, deepseq -, hashable, mtl, syb, text, time, unorderedContainers, vector -}: - -cabal.mkDerivation (self: { - pname = "aeson-native"; - version = "0.3.3.2"; - sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh"; - buildDepends = [ - attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb - text time unorderedContainers vector - ]; - meta = { - homepage = "http://github.com/mailrank/aeson"; - description = "Fast JSON parsing and encoding (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/blaze-textual-native/default.nix b/pkgs/development/libraries/haskell/blaze-textual-native/default.nix deleted file mode 100644 index 602c5be9357..00000000000 --- a/pkgs/development/libraries/haskell/blaze-textual-native/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, blazeBuilder, text, time, vector }: - -cabal.mkDerivation (self: { - pname = "blaze-textual-native"; - version = "0.2.1.1"; - sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd"; - buildDepends = [ blazeBuilder text time vector ]; - meta = { - homepage = "http://github.com/mailrank/blaze-textual"; - description = "Fast rendering of common datatypes (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9154f658d96..7ee23a162b3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -426,8 +426,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); aeson = callPackage ../development/libraries/haskell/aeson {}; - aesonNative = callPackage ../development/libraries/haskell/aeson-native {}; - ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; @@ -486,8 +484,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {}; - blazeTextualNative = callPackage ../development/libraries/haskell/blaze-textual-native {}; - bmp = callPackage ../development/libraries/haskell/bmp {}; Boolean = callPackage ../development/libraries/haskell/Boolean {}; From 3256e7f5c2809ffd59d46e8263ef5a89c8527025 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:59:01 +0000 Subject: [PATCH 154/183] haskell-nixos-types: removed obsolete package svn path=/nixpkgs/trunk/; revision=32290 --- .../libraries/haskell/nixos-types/default.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/nixos-types/default.nix diff --git a/pkgs/development/libraries/haskell/nixos-types/default.nix b/pkgs/development/libraries/haskell/nixos-types/default.nix deleted file mode 100644 index 88506a5377d..00000000000 --- a/pkgs/development/libraries/haskell/nixos-types/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, regexPosix }: - -cabal.mkDerivation (self: { - pname = "nixos-types"; - version = "1.3"; - sha256 = "0kdi3q316c9irrzwl1vx764f958i5d61v2vc03356sfyy13d19sk"; - buildDepends = [ regexPosix ]; - meta = { - homepage = "http://github.com/haskell4nix/nixos-types"; - description = "Data types representing the Nix language"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7ee23a162b3..0a7f30e9941 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1038,8 +1038,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_3_0_11 = callPackage ../development/libraries/haskell/network/2.3.0.11.nix {}; network = self.network_2_3_0_11; - nixosTypes = callPackage ../development/libraries/haskell/nixos-types {}; - nonNegative = callPackage ../development/libraries/haskell/non-negative {}; numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {}; From 844d950d1328364c6e84044f3bc7ba46e64389ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:59:04 +0000 Subject: [PATCH 155/183] haskell-cabal2nix: updated to version 1.26 svn path=/nixpkgs/trunk/; revision=32291 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index bf7a52f3c03..52f39939530 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -1,12 +1,12 @@ -{ cabal, hackageDb, HTTP, mtl, nixosTypes, regexPosix }: +{ cabal, Cabal, filepath, hackageDb, HTTP, mtl, regexPosix }: cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.25"; - sha256 = "12csiw7j51vlf8l0prhjj06l7sqii12qy5ryl5n8vrgp8vch2kvl"; + version = "1.26"; + sha256 = "18gl75y1grhzyhlaz32800gxxfrcl01r7cpx1c63lzpwmdxvk01d"; isLibrary = false; isExecutable = true; - buildDepends = [ hackageDb HTTP mtl nixosTypes regexPosix ]; + buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; meta = { homepage = "http://github.com/haskell4nix/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; From ac69747aa855a9222d129c968fcdfd38712624b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 17:00:37 +0000 Subject: [PATCH 156/183] Regenerated all Haskell packages with the latest version of cabal2nix. svn path=/nixpkgs/trunk/; revision=32292 --- pkgs/applications/editors/leksah/default.nix | 12 +++++------ pkgs/applications/misc/xmobar/default.nix | 7 +++++-- .../office/hledger-interest/default.nix | 4 ++-- .../version-management/darcs/default.nix | 11 +++++----- .../window-managers/xmonad/xmonad-contrib.nix | 6 +++--- .../window-managers/xmonad/xmonad-extras.nix | 6 +++--- .../compilers/Agda-executable/default.nix | 4 ++-- pkgs/development/compilers/epic/default.nix | 4 ++-- pkgs/development/compilers/idris/default.nix | 7 +++++-- .../libraries/haskell/AC-Vector/default.nix | 3 ++- .../libraries/haskell/Agda/default.nix | 8 ++++---- .../libraries/haskell/AspectAG/default.nix | 4 ++-- .../libraries/haskell/Boolean/default.nix | 3 ++- .../libraries/haskell/Cabal/1.14.0.nix | 4 ++-- .../libraries/haskell/Chart/default.nix | 6 +++--- .../libraries/haskell/ConfigFile/default.nix | 4 ++-- .../libraries/haskell/CouchDB/default.nix | 4 ++-- .../libraries/haskell/Crypto/default.nix | 4 ++-- .../libraries/haskell/DSH/default.nix | 6 +++--- .../libraries/haskell/Diff/default.nix | 3 ++- .../libraries/haskell/FerryCore/default.nix | 4 ++-- .../libraries/haskell/GLFW/default.nix | 4 ++-- .../libraries/haskell/GLURaw/default.nix | 4 ++-- .../libraries/haskell/GLUT/2.1.1.2.nix | 6 ++++-- .../libraries/haskell/GLUT/2.1.2.1.nix | 6 ++++-- .../libraries/haskell/GLUT/2.2.2.1.nix | 6 +++--- .../libraries/haskell/GLUT/2.3.0.0.nix | 6 +++--- .../libraries/haskell/GlomeVec/default.nix | 3 ++- .../libraries/haskell/HDBC/HDBC-odbc.nix | 4 ++-- .../haskell/HDBC/HDBC-postgresql.nix | 4 ++-- .../libraries/haskell/HDBC/HDBC-sqlite3.nix | 4 ++-- .../libraries/haskell/HDBC/HDBC.nix | 4 ++-- .../libraries/haskell/HGL/default.nix | 4 ++-- .../libraries/haskell/HList/default.nix | 3 ++- .../haskell/HStringTemplate/default.nix | 7 ++++--- .../libraries/haskell/HTTP/4000.0.6.nix | 4 ++-- .../libraries/haskell/HTTP/4000.0.9.nix | 4 ++-- .../libraries/haskell/HTTP/4000.1.1.nix | 4 ++-- .../libraries/haskell/HTTP/4000.1.2.nix | 4 ++-- .../libraries/haskell/HTTP/4000.2.1.nix | 4 ++-- .../libraries/haskell/HTTP/4000.2.2.nix | 4 ++-- .../libraries/haskell/HUnit/1.2.0.3.nix | 3 ++- .../libraries/haskell/HUnit/1.2.2.1.nix | 3 ++- .../libraries/haskell/HUnit/1.2.2.3.nix | 3 ++- .../libraries/haskell/HUnit/1.2.4.2.nix | 3 ++- .../libraries/haskell/HaXml/default.nix | 4 ++-- .../haskell/HaskellForMaths/default.nix | 4 ++-- .../libraries/haskell/Hipmunk/default.nix | 4 ++-- .../libraries/haskell/HsOpenSSL/default.nix | 4 ++-- .../libraries/haskell/HsSyck/default.nix | 4 ++-- .../libraries/haskell/JsContracts/default.nix | 6 ++++-- .../libraries/haskell/ListLike/default.nix | 3 ++- .../libraries/haskell/MaybeT/default.nix | 4 ++-- .../libraries/haskell/MemoTrie/default.nix | 3 ++- .../libraries/haskell/MissingH/default.nix | 5 +++-- .../haskell/MonadCatchIO-mtl/default.nix | 4 ++-- .../MonadCatchIO-transformers/default.nix | 4 ++-- .../libraries/haskell/MonadPrompt/default.nix | 4 ++-- .../libraries/haskell/MonadRandom/default.nix | 4 ++-- .../libraries/haskell/NanoProlog/default.nix | 4 ++-- .../haskell/NumInstances/default.nix | 3 ++- .../libraries/haskell/ObjectName/default.nix | 3 ++- .../libraries/haskell/OneTuple/default.nix | 3 ++- .../libraries/haskell/OpenAL/default.nix | 4 ++-- .../libraries/haskell/OpenGL/2.2.1.1.nix | 3 ++- .../libraries/haskell/OpenGL/2.2.3.0.nix | 3 ++- .../libraries/haskell/OpenGL/2.4.0.2.nix | 8 +++++--- .../libraries/haskell/OpenGL/2.5.0.0.nix | 8 +++++--- .../libraries/haskell/OpenGLRaw/default.nix | 3 ++- .../libraries/haskell/PSQueue/default.nix | 3 ++- .../libraries/haskell/Pathfinder/default.nix | 4 ++-- .../libraries/haskell/QuickCheck/1.2.0.0.nix | 4 ++-- .../libraries/haskell/QuickCheck/1.2.0.1.nix | 4 ++-- .../libraries/haskell/QuickCheck/2.1.1.1.nix | 4 ++-- .../libraries/haskell/QuickCheck/2.4.0.1.nix | 4 ++-- .../libraries/haskell/QuickCheck/2.4.1.1.nix | 4 ++-- .../libraries/haskell/QuickCheck/2.4.2.nix | 4 ++-- .../libraries/haskell/RSA/default.nix | 4 ++-- .../libraries/haskell/Ranged-sets/default.nix | 4 ++-- .../libraries/haskell/RepLib/default.nix | 4 ++-- .../libraries/haskell/SDL-image/default.nix | 4 ++-- .../libraries/haskell/SDL-mixer/default.nix | 4 ++-- .../libraries/haskell/SDL-ttf/default.nix | 4 ++-- .../libraries/haskell/SDL/default.nix | 3 ++- .../libraries/haskell/SHA/default.nix | 4 ++-- .../libraries/haskell/SMTPClient/default.nix | 4 ++-- .../haskell/Shellac/Shellac-haskeline.nix | 4 ++-- .../haskell/Shellac/Shellac-readline.nix | 4 ++-- .../libraries/haskell/Shellac/Shellac.nix | 4 ++-- .../libraries/haskell/StateVar/default.nix | 3 ++- .../haskell/TableAlgebra/default.nix | 4 ++-- .../libraries/haskell/Tensor/default.nix | 3 ++- .../libraries/haskell/Vec/default.nix | 4 ++-- .../libraries/haskell/WebBits-Html/1.0.1.nix | 4 ++-- .../libraries/haskell/WebBits-Html/1.0.2.nix | 4 ++-- .../libraries/haskell/WebBits/1.0.nix | 4 ++-- .../libraries/haskell/WebBits/2.0.nix | 4 ++-- .../libraries/haskell/WebBits/2.1.nix | 4 ++-- .../libraries/haskell/X11-xft/default.nix | 5 +++-- .../libraries/haskell/X11/default.nix | 4 ++-- .../libraries/haskell/Zwaluw/default.nix | 3 ++- .../libraries/haskell/aeson/default.nix | 8 ++++---- .../haskell/ansi-terminal/default.nix | 3 ++- .../haskell/ansi-wl-pprint/default.nix | 4 ++-- .../libraries/haskell/asn1-data/default.nix | 6 ++++-- .../libraries/haskell/async/default.nix | 3 ++- .../libraries/haskell/attempt/0.3.1.1.nix | 4 ++-- .../libraries/haskell/attempt/0.4.0.nix | 4 ++-- .../haskell/attoparsec-conduit/default.nix | 4 ++-- .../libraries/haskell/attoparsec/default.nix | 4 ++-- .../haskell/attoparsec/enumerator.nix | 4 ++-- .../haskell/authenticate/default.nix | 8 ++++---- .../haskell/base-unicode-symbols/default.nix | 3 ++- .../haskell/base16-bytestring/default.nix | 3 ++- .../haskell/base64-bytestring/default.nix | 3 ++- .../haskell/base64-string/default.nix | 3 ++- .../libraries/haskell/benchpress/default.nix | 4 ++-- .../libraries/haskell/bimap/default.nix | 3 ++- .../haskell/binary-shared/default.nix | 4 ++-- .../libraries/haskell/binary/default.nix | 3 ++- .../libraries/haskell/bitarray/default.nix | 3 ++- .../libraries/haskell/bitmap/default.nix | 3 ++- .../libraries/haskell/bktrees/default.nix | 3 ++- .../haskell/blaze-builder-conduit/default.nix | 4 ++-- .../blaze-builder-enumerator/default.nix | 4 ++-- .../haskell/blaze-builder/default.nix | 4 ++-- .../libraries/haskell/blaze-html/default.nix | 4 ++-- .../haskell/blaze-textual/default.nix | 4 ++-- .../libraries/haskell/bmp/default.nix | 4 ++-- .../libraries/haskell/bson/default.nix | 8 ++++---- .../libraries/haskell/byteorder/default.nix | 3 ++- .../haskell/bytestring-lexing/default.nix | 3 ++- .../haskell/bytestring-mmap/default.nix | 3 ++- .../haskell/bytestring-nums/default.nix | 3 ++- .../haskell/bytestring-trie/default.nix | 4 ++-- .../libraries/haskell/cairo/default.nix | 5 +++-- .../haskell/case-insensitive/default.nix | 4 ++-- .../haskell/cautious-file/default.nix | 3 ++- .../libraries/haskell/cereal/default.nix | 3 ++- .../libraries/haskell/certificate/default.nix | 5 +++-- .../libraries/haskell/cgi/3001.1.7.1.nix | 4 ++-- .../libraries/haskell/cgi/3001.1.7.2.nix | 4 ++-- .../libraries/haskell/cgi/3001.1.7.3.nix | 7 +++++-- .../libraries/haskell/cgi/3001.1.7.4.nix | 7 +++++-- .../libraries/haskell/cgi/3001.1.8.2.nix | 4 ++-- .../libraries/haskell/citeproc-hs/default.nix | 8 ++++---- .../haskell/clientsession/default.nix | 6 +++--- .../libraries/haskell/cmdargs/default.nix | 4 ++-- .../libraries/haskell/cmdlib/default.nix | 4 ++-- .../haskell/colorize-haskell/default.nix | 4 ++-- .../libraries/haskell/colour/default.nix | 3 ++- .../haskell/compact-string-fix/default.nix | 3 ++- .../libraries/haskell/conduit/default.nix | 4 ++-- .../haskell/containers-deepseq/default.nix | 4 ++-- .../haskell/continued-fractions/default.nix | 3 ++- .../haskell/control-monad-attempt/default.nix | 4 ++-- .../libraries/haskell/converge/default.nix | 3 ++- .../haskell/convertible-text/default.nix | 4 ++-- .../libraries/haskell/convertible/default.nix | 4 ++-- .../libraries/haskell/cookie/default.nix | 4 ++-- .../libraries/haskell/cprng-aes/default.nix | 6 ++++-- .../libraries/haskell/criterion/default.nix | 8 ++++---- .../libraries/haskell/crypto-api/default.nix | 4 ++-- .../haskell/crypto-conduit/default.nix | 4 ++-- .../haskell/crypto-pubkey-types/default.nix | 4 ++-- .../haskell/cryptocipher/default.nix | 6 +++--- .../libraries/haskell/cryptohash/default.nix | 4 ++-- .../libraries/haskell/css-text/default.nix | 4 ++-- .../libraries/haskell/csv/default.nix | 4 ++-- .../libraries/haskell/curl/default.nix | 3 ++- .../data-accessor/data-accessor-template.nix | 4 ++-- .../haskell/data-accessor/data-accessor.nix | 4 ++-- .../haskell/data-binary-ieee754/default.nix | 4 ++-- .../haskell/data-default/default.nix | 4 ++-- .../haskell/data-object-yaml/default.nix | 5 +++-- .../libraries/haskell/data-object/default.nix | 4 ++-- .../libraries/haskell/data-reify/default.nix | 3 ++- .../libraries/haskell/dataenc/default.nix | 3 ++- .../libraries/haskell/datetime/default.nix | 4 ++-- .../libraries/haskell/deepseq-th/default.nix | 4 ++-- .../libraries/haskell/deepseq/1.1.0.0.nix | 3 ++- .../libraries/haskell/deepseq/1.1.0.2.nix | 3 ++- .../libraries/haskell/deepseq/1.2.0.1.nix | 3 ++- .../libraries/haskell/deepseq/1.3.0.0.nix | 3 ++- .../libraries/haskell/derive/default.nix | 8 ++++++-- .../libraries/haskell/derp/default.nix | 3 ++- .../libraries/haskell/digest/default.nix | 3 ++- .../libraries/haskell/dimensional/default.nix | 4 ++-- .../haskell/directory-tree/default.nix | 3 ++- .../libraries/haskell/dlist/default.nix | 3 ++- .../libraries/haskell/dotgen/default.nix | 3 ++- .../haskell/double-conversion/default.nix | 4 ++-- .../haskell/download-curl/default.nix | 4 ++-- .../libraries/haskell/download/default.nix | 4 ++-- .../libraries/haskell/dstring/default.nix | 4 ++-- .../libraries/haskell/editline/default.nix | 3 ++- .../haskell/email-validate/default.nix | 4 ++-- .../libraries/haskell/entropy/default.nix | 3 ++- .../libraries/haskell/enumerator/default.nix | 4 ++-- .../libraries/haskell/erf/default.nix | 3 ++- .../haskell/explicit-exception/default.nix | 4 ++-- .../haskell/extensible-exceptions/0.1.1.0.nix | 3 ++- .../haskell/extensible-exceptions/0.1.1.2.nix | 3 ++- .../haskell/extensible-exceptions/0.1.1.3.nix | 3 ++- .../haskell/extensible-exceptions/0.1.1.4.nix | 3 ++- .../libraries/haskell/failure/0.1.2.nix | 3 ++- .../libraries/haskell/failure/0.2.0.nix | 4 ++-- .../libraries/haskell/fast-logger/default.nix | 4 ++-- .../libraries/haskell/fclabels/default.nix | 4 ++-- .../libraries/haskell/feed/default.nix | 4 ++-- .../libraries/haskell/fgl/5.4.2.2.nix | 4 ++-- .../libraries/haskell/fgl/5.4.2.3.nix | 4 ++-- .../libraries/haskell/fgl/5.4.2.4.nix | 4 ++-- .../libraries/haskell/file-embed/default.nix | 3 ++- .../libraries/haskell/filepath/default.nix | 3 ++- .../libraries/haskell/filestore/default.nix | 8 ++++++-- .../libraries/haskell/fingertree/default.nix | 3 ++- .../haskell/flexible-defaults/default.nix | 4 ++-- .../libraries/haskell/funcmp/default.nix | 3 ++- .../libraries/haskell/gamma/default.nix | 4 ++-- .../libraries/haskell/gd/default.nix | 5 ++++- .../libraries/haskell/gdiff/default.nix | 3 ++- .../haskell/generic-deriving/default.nix | 3 ++- .../libraries/haskell/ghc-core/default.nix | 4 ++-- .../libraries/haskell/ghc-events/default.nix | 4 ++-- .../libraries/haskell/ghc-mtl/default.nix | 4 ++-- .../libraries/haskell/ghc-paths/default.nix | 3 ++- .../haskell/ghc-syb-utils/default.nix | 4 ++-- .../libraries/haskell/ghc-syb/default.nix | 3 ++- .../libraries/haskell/gitit/default.nix | 19 +++++++++--------- .../libraries/haskell/glade/default.nix | 4 ++-- .../libraries/haskell/glib/default.nix | 3 ++- .../libraries/haskell/gloss/default.nix | 4 ++-- .../libraries/haskell/graphviz/default.nix | 8 ++++---- .../libraries/haskell/gtk/default.nix | 6 +++--- .../haskell/gtk2hs-buildtools/default.nix | 4 ++-- .../haskell/gtksourceview2/default.nix | 6 +++--- .../libraries/haskell/hS3/default.nix | 6 +++--- .../libraries/haskell/hackage-db/default.nix | 4 ++-- .../libraries/haskell/hakyll/default.nix | 10 +++++----- .../libraries/haskell/hamlet/default.nix | 6 +++--- .../haskell/happstack/happstack-data.nix | 7 ++++--- .../haskell/happstack/happstack-hamlet.nix | 4 ++-- .../haskell/happstack/happstack-server.nix | 13 ++++++------ .../haskell/happstack/happstack-util.nix | 8 ++++---- .../libraries/haskell/hashable/default.nix | 4 ++-- .../haskell/hashed-storage/default.nix | 6 ++++-- .../libraries/haskell/hashtables/default.nix | 4 ++-- .../haskell/haskeline-class/default.nix | 4 ++-- .../libraries/haskell/haskeline/default.nix | 8 ++++++-- .../haskell/haskell-lexer/default.nix | 3 ++- .../haskell/haskell-src-exts/default.nix | 4 ++-- .../haskell/haskell-src-meta/default.nix | 4 ++-- .../libraries/haskell/haskell-src/1.0.1.3.nix | 3 ++- .../libraries/haskell/haskell-src/1.0.1.4.nix | 4 ++-- .../libraries/haskell/haskell-src/1.0.1.5.nix | 4 ++-- .../libraries/haskell/hastache/default.nix | 8 ++++++-- .../libraries/haskell/haxr-th/default.nix | 4 ++-- .../libraries/haskell/haxr/default.nix | 6 +++--- .../haskell/highlighting-kate/default.nix | 7 +++++-- .../libraries/haskell/hint/default.nix | 8 ++++---- .../libraries/haskell/hjsmin/default.nix | 4 ++-- .../libraries/haskell/hledger-lib/default.nix | 7 ++++--- .../libraries/haskell/hledger-vty/default.nix | 8 ++++++-- .../libraries/haskell/hledger-web/default.nix | 14 ++++++------- .../libraries/haskell/hledger/default.nix | 9 +++++---- .../libraries/haskell/hmatrix/default.nix | 6 ++++-- .../libraries/haskell/hopenssl/default.nix | 4 ++-- .../libraries/haskell/hostname/default.nix | 3 ++- .../libraries/haskell/hp2any-core/default.nix | 4 ++-- .../haskell/hp2any-graph/default.nix | 8 +++++--- .../libraries/haskell/hs-bibutils/default.nix | 4 ++-- .../libraries/haskell/hscolour/default.nix | 3 ++- .../libraries/haskell/hsdns/default.nix | 4 ++-- .../libraries/haskell/hsemail/default.nix | 4 ++-- .../haskell/hslogger-template/default.nix | 4 ++-- .../libraries/haskell/hspread/default.nix | 4 ++-- .../libraries/haskell/hsyslog/default.nix | 3 ++- .../libraries/haskell/html/1.0.1.2.nix | 3 ++- .../haskell/http-conduit/default.nix | 18 ++++++++--------- .../libraries/haskell/http-date/default.nix | 4 ++-- .../haskell/http-enumerator/default.nix | 8 ++++---- .../libraries/haskell/http-types/default.nix | 4 ++-- .../libraries/haskell/httpd-shed/default.nix | 4 ++-- .../haskell/hxt-charproperties/default.nix | 3 ++- .../haskell/hxt-regex-xmlschema/default.nix | 4 ++-- .../libraries/haskell/hxt-unicode/default.nix | 4 ++-- .../libraries/haskell/hxt/default.nix | 6 +++--- .../libraries/haskell/ieee754/default.nix | 3 ++- .../haskell/instant-generics/default.nix | 4 ++-- .../libraries/haskell/io-storage/default.nix | 3 ++- .../libraries/haskell/irc/default.nix | 4 ++-- .../libraries/haskell/iteratee/default.nix | 5 +++-- .../libraries/haskell/ivor/default.nix | 4 ++-- .../libraries/haskell/jpeg/default.nix | 4 ++-- .../haskell/jsonEnumerator/default.nix | 4 ++-- .../libraries/haskell/jsonTypes/default.nix | 4 ++-- .../language-haskell-extract/default.nix | 4 ++-- .../haskell/language-javascript/default.nix | 4 ++-- .../libraries/haskell/largeword/default.nix | 3 ++- .../haskell/leksah/leksah-server.nix | 8 ++++---- .../haskell/leksah/process-leksah.nix | 3 ++- .../libraries/haskell/libmpd/default.nix | 4 ++-- .../libraries/haskell/lifted-base/default.nix | 5 +++-- .../libraries/haskell/logfloat/default.nix | 3 ++- .../libraries/haskell/ltk/default.nix | 4 ++-- .../haskell/math-functions/default.nix | 4 ++-- .../libraries/haskell/maude/default.nix | 4 ++-- .../mersenne-random-pure64/default.nix | 4 ++-- .../libraries/haskell/mime-mail/default.nix | 8 ++++++-- .../libraries/haskell/mmap/default.nix | 3 ++- .../haskell/monad-control/0.2.0.3.nix | 4 ++-- .../libraries/haskell/monad-control/0.3.1.nix | 5 +++-- .../libraries/haskell/monad-loops/default.nix | 4 ++-- .../libraries/haskell/monad-par/default.nix | 4 ++-- .../libraries/haskell/monad-peel/default.nix | 4 ++-- .../libraries/haskell/mongoDB/default.nix | 8 ++++---- .../libraries/haskell/mpppc/default.nix | 4 ++-- .../libraries/haskell/mtl/1.1.0.2.nix | 3 ++- .../libraries/haskell/mtl/1.1.1.1.nix | 3 ++- .../libraries/haskell/mtl/2.0.1.0.nix | 4 ++-- .../libraries/haskell/mtlparse/default.nix | 4 ++-- .../libraries/haskell/multiarg/default.nix | 4 ++-- .../libraries/haskell/multiplate/default.nix | 4 ++-- .../libraries/haskell/multirec/default.nix | 3 ++- .../libraries/haskell/multiset/default.nix | 3 ++- .../libraries/haskell/murmur-hash/default.nix | 3 ++- .../libraries/haskell/mwc-random/0.10.0.1.nix | 4 ++-- .../libraries/haskell/mwc-random/0.11.0.0.nix | 4 ++-- .../libraries/haskell/neither/default.nix | 4 ++-- .../libraries/haskell/network/2.2.1.4.nix | 4 ++-- .../libraries/haskell/network/2.2.1.7.nix | 4 ++-- .../libraries/haskell/network/2.3.0.11.nix | 4 ++-- .../libraries/haskell/network/2.3.0.2.nix | 4 ++-- .../libraries/haskell/network/2.3.0.5.nix | 4 ++-- .../haskell/non-negative/default.nix | 4 ++-- .../haskell/numeric-prelude/default.nix | 4 ++-- .../libraries/haskell/numtype/default.nix | 3 ++- .../haskell/pandoc-types/default.nix | 4 ++-- .../libraries/haskell/pandoc/default.nix | 15 +++++++------- .../libraries/haskell/pango/default.nix | 5 +++-- .../libraries/haskell/parallel/1.1.0.1.nix | 3 ++- .../libraries/haskell/parallel/2.2.0.1.nix | 4 ++-- .../libraries/haskell/parallel/3.1.0.1.nix | 4 ++-- .../libraries/haskell/parallel/3.2.0.2.nix | 4 ++-- .../libraries/haskell/parseargs/default.nix | 3 ++- .../libraries/haskell/parsec/2.1.0.1.nix | 3 ++- .../libraries/haskell/parsec/3.1.1.nix | 4 ++-- .../libraries/haskell/parsec/3.1.2.nix | 4 ++-- .../libraries/haskell/parsimony/default.nix | 4 ++-- .../libraries/haskell/path-pieces/0.0.0.nix | 4 ++-- .../libraries/haskell/path-pieces/0.1.0.nix | 4 ++-- .../libraries/haskell/pathtype/default.nix | 4 ++-- .../libraries/haskell/pcre-light/default.nix | 3 ++- .../haskell/persistent-sqlite/default.nix | 4 ++-- .../haskell/persistent-template/default.nix | 7 +++++-- .../libraries/haskell/persistent/default.nix | 14 ++++++------- .../libraries/haskell/polyparse/default.nix | 4 ++-- .../haskell/pool-conduit/default.nix | 4 ++-- .../libraries/haskell/pool/default.nix | 4 ++-- .../libraries/haskell/ppm/default.nix | 4 ++-- .../libraries/haskell/pretty-show/default.nix | 4 ++-- .../libraries/haskell/primitive/default.nix | 3 ++- .../haskell/prolog-graph-lib/default.nix | 4 ++-- .../haskell/prolog-graph/default.nix | 5 +++-- .../libraries/haskell/prolog/default.nix | 4 ++-- .../libraries/haskell/pureMD5/default.nix | 4 ++-- .../haskell/pwstore-fast/default.nix | 4 ++-- .../libraries/haskell/random-fu/default.nix | 6 +++--- .../haskell/random-shuffle/default.nix | 4 ++-- .../haskell/random-source/default.nix | 8 ++++---- .../libraries/haskell/random/1.0.1.1.nix | 4 ++-- .../libraries/haskell/ranges/default.nix | 3 ++- .../libraries/haskell/recaptcha/default.nix | 4 ++-- .../libraries/haskell/regex-base/0.72.0.2.nix | 3 ++- .../libraries/haskell/regex-base/0.93.1.nix | 4 ++-- .../libraries/haskell/regex-base/0.93.2.nix | 4 ++-- .../haskell/regex-compat/0.71.0.1.nix | 4 ++-- .../libraries/haskell/regex-compat/0.92.nix | 4 ++-- .../libraries/haskell/regex-compat/0.93.1.nix | 4 ++-- .../libraries/haskell/regex-compat/0.95.1.nix | 4 ++-- .../haskell/regex-pcre-builtin/default.nix | 4 ++-- .../libraries/haskell/regex-pcre/default.nix | 4 ++-- .../haskell/regex-posix/0.72.0.3.nix | 4 ++-- .../libraries/haskell/regex-posix/0.94.1.nix | 4 ++-- .../libraries/haskell/regex-posix/0.94.2.nix | 4 ++-- .../libraries/haskell/regex-posix/0.94.4.nix | 4 ++-- .../libraries/haskell/regex-posix/0.95.1.nix | 4 ++-- .../libraries/haskell/regex-tdfa/default.nix | 4 ++-- .../libraries/haskell/regexpr/default.nix | 4 ++-- .../libraries/haskell/regular/default.nix | 3 ++- .../haskell/repa-algorithms/default.nix | 4 ++-- .../haskell/repa-bytestring/default.nix | 4 ++-- .../haskell/repa-examples/default.nix | 5 +++-- .../libraries/haskell/repa-io/default.nix | 4 ++-- .../libraries/haskell/repa/default.nix | 4 ++-- .../libraries/haskell/repr/default.nix | 6 ++++-- .../haskell/resource-pool/default.nix | 5 +++-- .../libraries/haskell/rvar/default.nix | 4 ++-- .../libraries/haskell/safe/default.nix | 3 ++- .../libraries/haskell/semigroups/default.nix | 3 ++- .../libraries/haskell/sendfile/default.nix | 4 ++-- .../haskell/shakespeare-css/default.nix | 4 ++-- .../haskell/shakespeare-i18n/default.nix | 4 ++-- .../haskell/shakespeare-js/default.nix | 4 ++-- .../haskell/shakespeare-text/default.nix | 4 ++-- .../libraries/haskell/shakespeare/default.nix | 4 ++-- .../haskell/simple-sendfile/default.nix | 4 ++-- .../libraries/haskell/skein/default.nix | 4 ++-- .../libraries/haskell/smallcheck/default.nix | 4 ++-- .../libraries/haskell/snap/core.nix | 12 +++++------ .../libraries/haskell/snap/server.nix | 15 +++++++------- .../libraries/haskell/socks/default.nix | 4 ++-- .../libraries/haskell/split/default.nix | 3 ++- .../libraries/haskell/stateref/default.nix | 4 ++-- .../libraries/haskell/statistics/default.nix | 4 ++-- .../libraries/haskell/stb-image/default.nix | 4 ++-- .../libraries/haskell/stm/2.1.1.2.nix | 3 ++- .../libraries/haskell/stm/2.1.2.1.nix | 3 ++- .../libraries/haskell/stm/2.2.0.1.nix | 3 ++- .../haskell/storable-complex/default.nix | 3 ++- .../haskell/storable-record/default.nix | 4 ++-- .../libraries/haskell/streamproc/default.nix | 3 ++- .../libraries/haskell/strict/default.nix | 3 ++- .../haskell/strictConcurrency/default.nix | 4 ++-- .../haskell/string-combinators/default.nix | 4 ++-- .../libraries/haskell/svgcairo/default.nix | 5 +++-- .../libraries/haskell/syb/0.2.2.nix | 3 ++- .../libraries/haskell/syb/0.3.3.nix | 3 ++- .../libraries/haskell/syb/0.3.6.nix | 3 ++- .../development/libraries/haskell/syb/0.3.nix | 3 ++- .../libraries/haskell/syb/default.nix | 3 ++- .../syb/syb-with-class-instances-text.nix | 4 ++-- .../libraries/haskell/syb/syb-with-class.nix | 3 ++- .../haskell/system-fileio/default.nix | 4 ++-- .../haskell/system-filepath/default.nix | 4 ++-- .../libraries/haskell/tabular/default.nix | 4 ++-- .../libraries/haskell/tagged/default.nix | 4 ++-- .../libraries/haskell/tagsoup/default.nix | 4 ++-- .../libraries/haskell/temporary/default.nix | 3 ++- .../libraries/haskell/terminfo/default.nix | 4 ++-- .../haskell/test-framework-hunit/default.nix | 4 ++-- .../test-framework-quickcheck/default.nix | 4 ++-- .../test-framework-quickcheck2/default.nix | 6 ++++-- .../haskell/test-framework-th/default.nix | 5 +++-- .../haskell/test-framework/default.nix | 8 ++++---- .../libraries/haskell/testpack/default.nix | 4 ++-- .../libraries/haskell/texmath/0.4.nix | 4 ++-- .../libraries/haskell/texmath/default.nix | 4 ++-- .../libraries/haskell/text/0.11.0.5.nix | 4 ++-- .../libraries/haskell/text/0.11.0.6.nix | 4 ++-- .../libraries/haskell/text/0.11.1.12.nix | 4 ++-- .../libraries/haskell/text/0.11.1.13.nix | 4 ++-- .../libraries/haskell/text/0.11.1.5.nix | 4 ++-- .../libraries/haskell/th-extras/default.nix | 4 ++-- .../libraries/haskell/th-lift/default.nix | 3 ++- .../libraries/haskell/thespian/default.nix | 4 ++-- .../haskell/threadmanager/default.nix | 3 ++- .../libraries/haskell/time/1.1.2.4.nix | 3 ++- .../libraries/haskell/time/1.1.3.nix | 3 ++- .../libraries/haskell/time/1.2.0.3.nix | 3 ++- .../libraries/haskell/time/1.2.0.5.nix | 3 ++- .../libraries/haskell/time/1.4.0.1.nix | 4 ++-- .../libraries/haskell/tls-extra/default.nix | 8 ++++---- .../libraries/haskell/tls/default.nix | 6 +++--- .../haskell/transformers-base/default.nix | 4 ++-- .../haskell/transformers/0.2.2.0.nix | 3 ++- .../libraries/haskell/tuple/default.nix | 4 ++-- .../haskell/type-equality/default.nix | 3 ++- .../libraries/haskell/unbound/default.nix | 4 ++-- .../libraries/haskell/uniplate/default.nix | 4 ++-- .../libraries/haskell/uniqueid/default.nix | 3 ++- .../libraries/haskell/unix-compat/default.nix | 3 ++- .../haskell/unordered-containers/default.nix | 4 ++-- .../libraries/haskell/url/default.nix | 4 ++-- .../libraries/haskell/utf8-light/default.nix | 3 ++- .../libraries/haskell/utf8-string/default.nix | 3 ++- .../libraries/haskell/utility-ht/default.nix | 3 ++- .../haskell/uu-parsinglib/default.nix | 4 ++-- .../libraries/haskell/uulib/default.nix | 3 ++- .../haskell/vacuum-cairo/default.nix | 5 +++-- .../libraries/haskell/vacuum/default.nix | 3 ++- .../libraries/haskell/vault/default.nix | 3 ++- .../haskell/vector-algorithms/default.nix | 4 ++-- .../haskell/vector-space/default.nix | 4 ++-- .../libraries/haskell/vector/default.nix | 4 ++-- .../libraries/haskell/vty/default.nix | 6 +++--- .../haskell/wai-app-static/default.nix | 8 ++++---- .../libraries/haskell/wai-extra/default.nix | 4 ++-- .../libraries/haskell/wai-logger/default.nix | 8 ++++---- .../libraries/haskell/wai/default.nix | 5 +++-- .../libraries/haskell/warp/default.nix | 7 ++++--- .../haskell/web-routes-quasi/default.nix | 4 ++-- .../libraries/haskell/web-routes/default.nix | 4 ++-- .../haskell/wl-pprint-text/default.nix | 4 ++-- .../libraries/haskell/wxHaskell/wx.nix | 4 ++-- .../libraries/haskell/wxHaskell/wxcore.nix | 6 ++++-- .../libraries/haskell/wxHaskell/wxdirect.nix | 4 ++-- .../libraries/haskell/xhtml/3000.2.0.1.nix | 3 ++- .../libraries/haskell/xhtml/3000.2.0.4.nix | 3 ++- .../libraries/haskell/xhtml/3000.2.0.5.nix | 3 ++- .../libraries/haskell/xml-conduit/default.nix | 4 ++-- .../haskell/xml-enumerator/default.nix | 6 +++--- .../libraries/haskell/xml-types/default.nix | 4 ++-- .../libraries/haskell/xml/default.nix | 4 ++-- .../haskell/xss-sanitize/default.nix | 6 ++++-- .../libraries/haskell/yaml/default.nix | 6 +++--- .../libraries/haskell/yap/default.nix | 3 ++- .../libraries/haskell/yesod-auth/default.nix | 10 +++++----- .../libraries/haskell/yesod-core/default.nix | 20 +++++++++---------- .../haskell/yesod-default/default.nix | 6 +++--- .../libraries/haskell/yesod-form/default.nix | 8 ++++---- .../libraries/haskell/yesod-json/default.nix | 9 +++++---- .../haskell/yesod-persistent/default.nix | 6 ++++-- .../haskell/yesod-routes/default.nix | 4 ++-- .../haskell/yesod-static/default.nix | 7 ++++--- .../libraries/haskell/yesod/default.nix | 19 +++++++++--------- .../libraries/haskell/yst/default.nix | 8 ++++---- .../haskell/zeromq-haskell/default.nix | 3 ++- .../libraries/haskell/zip-archive/default.nix | 6 ++++-- .../libraries/haskell/zipper/default.nix | 4 ++-- .../haskell/zlib-bindings/default.nix | 4 ++-- .../haskell/zlib-conduit/default.nix | 4 ++-- .../libraries/haskell/zlib-enum/default.nix | 4 ++-- .../libraries/haskell/zlib/0.5.0.0.nix | 3 ++- .../libraries/haskell/zlib/0.5.2.0.nix | 3 ++- .../libraries/haskell/zlib/0.5.3.1.nix | 3 ++- .../libraries/haskell/zlib/0.5.3.3.nix | 3 ++- .../tools/documentation/haddock/2.4.2.nix | 4 ++-- .../tools/documentation/haddock/2.9.4.nix | 4 ++-- .../tools/haskell/BNFC-meta/default.nix | 4 ++-- .../tools/haskell/BNFC/default.nix | 4 ++-- .../tools/haskell/HaRe/default.nix | 4 ++-- .../tools/haskell/SourceGraph/default.nix | 8 ++++---- .../tools/haskell/alex-meta/default.nix | 4 ++-- .../tools/haskell/cabal-ghci/default.nix | 3 ++- .../tools/haskell/happy-meta/default.nix | 4 ++-- .../tools/haskell/hlint/default.nix | 6 ++++-- .../tools/haskell/hslogger/default.nix | 4 ++-- .../development/tools/haskell/tar/0.3.2.0.nix | 3 ++- .../development/tools/haskell/tar/0.4.0.0.nix | 3 ++- .../tools/haskell/threadscope/default.nix | 7 ++++--- .../tools/haskell/uuagc/bootstrap.nix | 4 ++-- .../development/tools/haskell/uuagc/cabal.nix | 4 ++-- .../tools/haskell/uuagc/default.nix | 6 ++++-- pkgs/development/tools/misc/cpphs/default.nix | 3 ++- .../tools/parsing/Ebnf2ps/default.nix | 3 ++- pkgs/development/tools/parsing/alex/2.3.1.nix | 3 ++- pkgs/development/tools/parsing/alex/2.3.2.nix | 3 ++- pkgs/development/tools/parsing/alex/2.3.3.nix | 3 ++- pkgs/development/tools/parsing/alex/2.3.5.nix | 3 ++- pkgs/development/tools/parsing/alex/3.0.1.nix | 4 ++-- .../tools/parsing/happy/1.18.4.nix | 4 ++-- .../tools/parsing/happy/1.18.5.nix | 4 ++-- .../tools/parsing/happy/1.18.6.nix | 4 ++-- .../tools/parsing/happy/1.18.8.nix | 4 ++-- .../tools/parsing/happy/1.18.9.nix | 4 ++-- pkgs/games/LambdaHack/default.nix | 8 ++++++-- pkgs/games/MazesOfMonad/default.nix | 4 ++-- .../cabal-install/0.10.2.nix | 4 ++-- .../cabal-install/0.6.2.nix | 4 ++-- .../cabal-install/0.8.0.nix | 4 ++-- .../cabal-install/0.8.2.nix | 4 ++-- 563 files changed, 1383 insertions(+), 1119 deletions(-) diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix index f8a5d6a712f..6ce382884ac 100644 --- a/pkgs/applications/editors/leksah/default.nix +++ b/pkgs/applications/editors/leksah/default.nix @@ -1,6 +1,6 @@ -{ cabal, binary, binaryShared, deepseq, glib, gtk, gtksourceview2 -, hslogger, leksahServer, ltk, mtl, network, parsec, processLeksah -, regexBase, regexTdfa, strict, time, utf8String +{ cabal, binary, binaryShared, Cabal, deepseq, filepath, glib, gtk +, gtksourceview2, hslogger, leksahServer, ltk, mtl, network, parsec +, processLeksah, regexBase, regexTdfa, strict, time, utf8String }: cabal.mkDerivation (self: { @@ -10,9 +10,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - binary binaryShared deepseq glib gtk gtksourceview2 hslogger - leksahServer ltk mtl network parsec processLeksah regexBase - regexTdfa strict time utf8String + binary binaryShared Cabal deepseq filepath glib gtk gtksourceview2 + hslogger leksahServer ltk mtl network parsec processLeksah + regexBase regexTdfa strict time utf8String ]; noHaddock = true; meta = { diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 355deec4092..cec2da54cf0 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,4 +1,5 @@ -{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft +{ cabal, Cabal, filepath, libXrandr, mtl, parsec, stm, time +, utf8String, X11, X11Xft }: cabal.mkDerivation (self: { @@ -7,7 +8,9 @@ cabal.mkDerivation (self: { sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ]; + buildDepends = [ + Cabal filepath mtl parsec stm time utf8String X11 X11Xft + ]; extraLibraries = [ libXrandr ]; configureFlags = "-fwith_xft"; meta = { diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix index a400730878e..6715df077bf 100644 --- a/pkgs/applications/office/hledger-interest/default.nix +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -1,4 +1,4 @@ -{ cabal, hledgerLib, mtl, time }: +{ cabal, Cabal, hledgerLib, mtl, time }: cabal.mkDerivation (self: { pname = "hledger-interest"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg"; isLibrary = false; isExecutable = true; - buildDepends = [ hledgerLib mtl time ]; + buildDepends = [ Cabal hledgerLib mtl time ]; meta = { homepage = "http://github.com/peti/hledger-interest"; description = "computes interest for a given account"; diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index e3f1742ee59..272b0aefc5f 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -1,6 +1,6 @@ -{ cabal, curl, extensibleExceptions, hashedStorage, haskeline, html -, HTTP, mmap, mtl, network, parsec, random, regexCompat, tar -, terminfo, text, zlib +{ cabal, Cabal, curl, extensibleExceptions, filepath, hashedStorage +, haskeline, html, HTTP, mmap, mtl, network, parsec, random +, regexCompat, tar, terminfo, text, zlib }: cabal.mkDerivation (self: { @@ -10,8 +10,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - extensibleExceptions hashedStorage haskeline html HTTP mmap mtl - network parsec random regexCompat tar terminfo text zlib + Cabal extensibleExceptions filepath hashedStorage haskeline html + HTTP mmap mtl network parsec random regexCompat tar terminfo text + zlib ]; extraLibraries = [ curl ]; meta = { diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 6bb06f7d4a5..5c443b6d3a2 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -1,5 +1,5 @@ -{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft -, xmonad +{ cabal, Cabal, extensibleExceptions, mtl, random, utf8String, X11 +, X11Xft, xmonad }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.10"; sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq"; buildDepends = [ - extensibleExceptions mtl random utf8String X11 X11Xft xmonad + Cabal extensibleExceptions mtl random utf8String X11 X11Xft xmonad ]; meta = { homepage = "http://xmonad.org/"; diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 249310b6411..b88841426a3 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -1,4 +1,4 @@ -{ cabal, hint, HList, libmpd, mtl, network, parsec, random +{ cabal, Cabal, hint, HList, libmpd, mtl, network, parsec, random , regexPosix, split, X11, xmonad, xmonadContrib }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.10.1"; sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27"; buildDepends = [ - hint HList libmpd mtl network parsec random regexPosix split X11 - xmonad xmonadContrib + Cabal hint HList libmpd mtl network parsec random regexPosix split + X11 xmonad xmonadContrib ]; noHaddock = true; meta = { diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix index 1b772b8dc71..427736615e0 100644 --- a/pkgs/development/compilers/Agda-executable/default.nix +++ b/pkgs/development/compilers/Agda-executable/default.nix @@ -1,4 +1,4 @@ -{ cabal, Agda }: +{ cabal, Agda, Cabal }: cabal.mkDerivation (self: { pname = "Agda-executable"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p"; isLibrary = false; isExecutable = true; - buildDepends = [ Agda ]; + buildDepends = [ Agda Cabal ]; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "Command-line program for type-checking and compiling Agda programs"; diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 8c6b4ee50cf..33087f23c9a 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -1,4 +1,4 @@ -{ cabal, boehmgc, gmp, happy, mtl }: +{ cabal, boehmgc, Cabal, gmp, happy, mtl }: cabal.mkDerivation (self: { pname = "epic"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; meta = { diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 4e491ffde0d..e030fee7658 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,4 +1,5 @@ -{ cabal, binary, epic, happy, haskeline, mtl, parsec, transformers +{ cabal, binary, Cabal, epic, filepath, happy, haskeline, mtl +, parsec, transformers }: cabal.mkDerivation (self: { @@ -7,7 +8,9 @@ cabal.mkDerivation (self: { sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr"; isLibrary = false; isExecutable = true; - buildDepends = [ binary epic haskeline mtl parsec transformers ]; + buildDepends = [ + binary Cabal epic filepath haskeline mtl parsec transformers + ]; buildTools = [ happy ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix index e4b78876c57..076bd84640b 100644 --- a/pkgs/development/libraries/haskell/AC-Vector/default.nix +++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "AC-Vector"; version = "2.3.2"; sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay"; + buildDepends = [ Cabal ]; meta = { description = "Efficient geometric vectors and transformations"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index 724dabbab1b..104a0513987 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -1,5 +1,5 @@ -{ cabal, alex, binary, happy, hashable, hashtables, haskeline -, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib +{ cabal, alex, binary, Cabal, filepath, happy, hashable, hashtables +, haskeline, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - binary hashable hashtables haskeline haskellSrcExts mtl QuickCheck - syb xhtml zlib + binary Cabal filepath hashable hashtables haskeline haskellSrcExts + mtl QuickCheck syb xhtml zlib ]; buildTools = [ alex happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix index 347fc5ff9c9..724b00c6476 100644 --- a/pkgs/development/libraries/haskell/AspectAG/default.nix +++ b/pkgs/development/libraries/haskell/AspectAG/default.nix @@ -1,10 +1,10 @@ -{ cabal, HList, mtl }: +{ cabal, Cabal, HList, mtl }: cabal.mkDerivation (self: { pname = "AspectAG"; version = "0.3.4.1"; sha256 = "12iaf27crynwnnd7qm1zvvaj6zw6i6c05mb4dsq55dnhph2l356g"; - buildDepends = [ HList mtl ]; + buildDepends = [ Cabal HList mtl ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG"; description = "Attribute Grammars in the form of an EDSL"; diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index 720d6046169..1ddbef327ac 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "Boolean"; version = "0.0.1"; sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765"; + buildDepends = [ Cabal ]; meta = { description = "Generalized booleans"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix index f87b363e88e..608ac1abe3c 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, filepath }: +{ cabal, filepath }: cabal.mkDerivation (self: { pname = "Cabal"; version = "1.14.0"; sha256 = "1r5b4x1ham5gdg9m9l8idpvr9czlk1q21vqmg0di4adkp2fhlm3j"; - buildDepends = [ Cabal filepath ]; + buildDepends = [ filepath ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 1976472da23..d7df45f6cf3 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -1,5 +1,5 @@ -{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl -, time +{ cabal, Cabal, cairo, colour, dataAccessor, dataAccessorTemplate +, mtl, time }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.15"; sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4"; buildDepends = [ - cairo colour dataAccessor dataAccessorTemplate mtl time + Cabal cairo colour dataAccessor dataAccessorTemplate mtl time ]; meta = { homepage = "http://www.dockerz.net/software/chart.html"; diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index d8cfb2ee407..f07d5160015 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -1,4 +1,4 @@ -{ cabal, MissingH, mtl, parsec }: +{ cabal, Cabal, MissingH, mtl, parsec }: cabal.mkDerivation (self: { pname = "ConfigFile"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0w2yhbnqldhmj3d98j720l4lj4d08abqcff751p2slszdm5pw1jm"; isLibrary = true; isExecutable = true; - buildDepends = [ MissingH mtl parsec ]; + buildDepends = [ Cabal MissingH mtl parsec ]; noHaddock = true; meta = { homepage = "http://software.complete.org/configfile"; diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 98002a4c469..73cf270728c 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -1,10 +1,10 @@ -{ cabal, HTTP, json, mtl, network }: +{ cabal, Cabal, HTTP, json, mtl, network }: cabal.mkDerivation (self: { pname = "CouchDB"; version = "0.10.1"; sha256 = "1ny62ab0sjrkh7mpxj0ahqrv7c8dh0n5s1g8xl0mq3yiwlrjdsim"; - buildDepends = [ HTTP json mtl network ]; + buildDepends = [ Cabal HTTP json mtl network ]; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index 0adb00ccc86..525e6af08ac 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -1,4 +1,4 @@ -{ cabal, HUnit, QuickCheck, random }: +{ cabal, Cabal, HUnit, QuickCheck, random }: cabal.mkDerivation (self: { pname = "Crypto"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p"; isLibrary = true; isExecutable = true; - buildDepends = [ HUnit QuickCheck random ]; + buildDepends = [ Cabal HUnit QuickCheck random ]; meta = { description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index 0ccc9d810df..8ade61252a7 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -1,4 +1,4 @@ -{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl +{ cabal, Cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl , Pathfinder, syb, text, xhtml }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.7.8"; sha256 = "1mlym2hs7sr78lih8c0yi5y5h14vxy3zpl3gfnidh9wiw5cai9lg"; buildDepends = [ - convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text - xhtml + Cabal convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb + text xhtml ]; meta = { description = "Database Supported Haskell"; diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index f54344882bb..8ba20bf09cb 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "Diff"; version = "0.1.3"; sha256 = "02dhy4rp3mkzm5x3h1rkdin2h8qcb7h7nhn14gl2gvl6wdykfh5w"; + buildDepends = [ Cabal ]; meta = { description = "O(ND) diff algorithm in haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix index e7167baab7d..9cb44f2bd95 100644 --- a/pkgs/development/libraries/haskell/FerryCore/default.nix +++ b/pkgs/development/libraries/haskell/FerryCore/default.nix @@ -1,10 +1,10 @@ -{ cabal, HaXml, mtl, parsec, TableAlgebra }: +{ cabal, Cabal, HaXml, mtl, parsec, TableAlgebra }: cabal.mkDerivation (self: { pname = "FerryCore"; version = "0.4.6.4"; sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp"; - buildDepends = [ HaXml mtl parsec TableAlgebra ]; + buildDepends = [ Cabal HaXml mtl parsec TableAlgebra ]; meta = { description = "Ferry Core Components"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index 1a9179b9877..dc25efc5053 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -1,10 +1,10 @@ -{ cabal, libX11, mesa, OpenGL }: +{ cabal, Cabal, libX11, mesa, OpenGL }: cabal.mkDerivation (self: { pname = "GLFW"; version = "0.5.0.1"; sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6"; - buildDepends = [ OpenGL ]; + buildDepends = [ Cabal OpenGL ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://haskell.org/haskellwiki/GLFW"; diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index 1397bea4f2b..84c9de49d24 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix @@ -1,10 +1,10 @@ -{ cabal, freeglut, mesa, OpenGLRaw }: +{ cabal, Cabal, freeglut, mesa, OpenGLRaw }: cabal.mkDerivation (self: { pname = "GLURaw"; version = "1.2.0.0"; sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1"; - buildDepends = [ OpenGLRaw ]; + buildDepends = [ Cabal OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix index 302b1fb8fb9..779e5811854 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix @@ -1,10 +1,12 @@ -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: +{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa +, OpenGL +}: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.1.1.2"; sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb"; - buildDepends = [ OpenGL ]; + buildDepends = [ Cabal OpenGL ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix index d6551c6c6d9..d8ed1d01b42 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -1,10 +1,12 @@ -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: +{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa +, OpenGL +}: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.1.2.1"; sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02"; - buildDepends = [ OpenGL ]; + buildDepends = [ Cabal OpenGL ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix index 3248631be3e..f98aef780a7 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix @@ -1,12 +1,12 @@ -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, StateVar, Tensor +{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa +, OpenGL, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.2.2.1"; sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw"; - buildDepends = [ OpenGL StateVar Tensor ]; + buildDepends = [ Cabal OpenGL StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix index 109ea000b43..e05cd1b8e35 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix @@ -1,12 +1,12 @@ -{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw, StateVar, Tensor +{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa +, OpenGL, OpenGLRaw, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "GLUT"; version = "2.3.0.0"; sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99"; - buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; + buildDepends = [ Cabal OpenGL OpenGLRaw StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix index 421e64ee7a2..ea8229ace41 100644 --- a/pkgs/development/libraries/haskell/GlomeVec/default.nix +++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "GlomeVec"; version = "0.1.2"; sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Simple 3D vector library"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index 0b918dc4c85..e5a298b38fd 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -1,4 +1,4 @@ -{ cabal, HDBC, mtl, odbc, time, utf8String }: +{ cabal, Cabal, HDBC, mtl, odbc, time, utf8String }: cabal.mkDerivation (self: { pname = "HDBC-odbc"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0vza38ggs863wjh25xnwslwlin68166ywws72bs766rl0rq7fkf4"; isLibrary = true; isExecutable = true; - buildDepends = [ HDBC mtl time utf8String ]; + buildDepends = [ Cabal HDBC mtl time utf8String ]; extraLibraries = [ odbc ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix index 8ac9548d610..f51d287ef3c 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix @@ -1,4 +1,4 @@ -{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }: +{ cabal, Cabal, HDBC, mtl, parsec, postgresql, time, utf8String }: cabal.mkDerivation (self: { pname = "HDBC-postgresql"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs"; isLibrary = true; isExecutable = true; - buildDepends = [ HDBC mtl parsec time utf8String ]; + buildDepends = [ Cabal HDBC mtl parsec time utf8String ]; extraLibraries = [ postgresql ]; meta = { homepage = "http://software.complete.org/hdbc-postgresql"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix index aa983026c91..9eb87bc8186 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix @@ -1,4 +1,4 @@ -{ cabal, HDBC, mtl, sqlite, utf8String }: +{ cabal, Cabal, HDBC, mtl, sqlite, utf8String }: cabal.mkDerivation (self: { pname = "HDBC-sqlite3"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "11765nsncgyv9j6r5wpziqyhy0lxrmqbhgricbdx0c788ky75y92"; isLibrary = true; isExecutable = true; - buildDepends = [ HDBC mtl utf8String ]; + buildDepends = [ Cabal HDBC mtl utf8String ]; extraLibraries = [ sqlite ]; meta = { homepage = "http://software.complete.org/hdbc-sqlite3"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index 4044c179810..44ffd4861f2 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -1,4 +1,4 @@ -{ cabal, convertible, mtl, text, time, utf8String }: +{ cabal, Cabal, convertible, mtl, text, time, utf8String }: cabal.mkDerivation (self: { pname = "HDBC"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1gqihvsf5w7j8xbn1xy93mdrsh77qwxbhfmyjivbm6i95w1i0kb7"; isLibrary = true; isExecutable = true; - buildDepends = [ convertible mtl text time utf8String ]; + buildDepends = [ Cabal convertible mtl text time utf8String ]; meta = { homepage = "https://github.com/hdbc/hdbc"; description = "Haskell Database Connectivity"; diff --git a/pkgs/development/libraries/haskell/HGL/default.nix b/pkgs/development/libraries/haskell/HGL/default.nix index 4b8d6e24c4b..661f34f5c1e 100644 --- a/pkgs/development/libraries/haskell/HGL/default.nix +++ b/pkgs/development/libraries/haskell/HGL/default.nix @@ -1,10 +1,10 @@ -{ cabal, X11 }: +{ cabal, Cabal, X11 }: cabal.mkDerivation (self: { pname = "HGL"; version = "3.2.0.2"; sha256 = "13wcvf6bfii9pihr8m08b81fyslf5n587ds4zzgizbd8m38k81vz"; - buildDepends = [ X11 ]; + buildDepends = [ Cabal X11 ]; meta = { description = "A simple graphics library based on X11 or Win32"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 657e4899b7b..73716da6e89 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "HList"; version = "0.2.3"; sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908"; + buildDepends = [ Cabal ]; meta = { description = "Heterogeneous lists"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 31aef957a4f..83aad7a8712 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,5 +1,5 @@ -{ cabal, deepseq, mtl, parsec, syb, sybWithClass, text, time -, utf8String +{ cabal, Cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass +, text, time, utf8String }: cabal.mkDerivation (self: { @@ -7,7 +7,8 @@ cabal.mkDerivation (self: { version = "0.6.8"; sha256 = "1fybvb3v2b786n1hfzcvyanj3yfm5j8z4fm48vaskcggawh6rlkr"; buildDepends = [ - deepseq mtl parsec syb sybWithClass text time utf8String + Cabal deepseq filepath mtl parsec syb sybWithClass text time + utf8String ]; meta = { description = "StringTemplate implementation in Haskell"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix index 13d271dfc36..76643783414 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, network, parsec }: +{ cabal, Cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.0.6"; sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b"; - buildDepends = [ mtl network parsec ]; + buildDepends = [ Cabal mtl network parsec ]; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index fee3431829f..441f3faa0e4 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, network, parsec }: +{ cabal, Cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.0.9"; sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba"; - buildDepends = [ mtl network parsec ]; + buildDepends = [ Cabal mtl network parsec ]; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix index d007467e0e3..5806d8c34b2 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, network, parsec }: +{ cabal, Cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.1.1"; sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3"; - buildDepends = [ mtl network parsec ]; + buildDepends = [ Cabal mtl network parsec ]; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix index 5dcb4cbe618..c625223ca24 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, network, parsec }: +{ cabal, Cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.1.2"; sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8"; - buildDepends = [ mtl network parsec ]; + buildDepends = [ Cabal mtl network parsec ]; meta = { homepage = "http://projects.haskell.org/http/"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index a707189ed5e..887b6a72260 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, network, parsec }: +{ cabal, Cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.1"; sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a"; - buildDepends = [ mtl network parsec ]; + buildDepends = [ Cabal mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index 082c3ddc3ac..89b3ccd674d 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, network, parsec }: +{ cabal, Cabal, mtl, network, parsec }: cabal.mkDerivation (self: { pname = "HTTP"; version = "4000.2.2"; sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh"; - buildDepends = [ mtl network parsec ]; + buildDepends = [ Cabal mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; description = "A library for client-side HTTP"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix index ebf561825ce..dd0779adaf4 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "HUnit"; version = "1.2.0.3"; sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12"; + buildDepends = [ Cabal ]; meta = { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix index ec65d160e86..7aa09f1c4eb 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "HUnit"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix index 9c58da37b50..b34ba884f47 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "HUnit"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix index e0dd6bd2bc1..89ceddf4e1d 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "HUnit"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0yijvrjmmz6vvgi5h1195z4psmymvhq6rr7kkd26nqbd34lbrg7x"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://hunit.sourceforge.net/"; description = "A unit testing framework for Haskell"; diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index 76167c0a265..53149cc26f7 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -1,4 +1,4 @@ -{ cabal, polyparse, random }: +{ cabal, Cabal, filepath, polyparse, random }: cabal.mkDerivation (self: { pname = "HaXml"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ckmi8iwyaid4mcnh8117s9kq45f8r7sidh6dbhzbj0dl29rrkbz"; isLibrary = true; isExecutable = true; - buildDepends = [ polyparse random ]; + buildDepends = [ Cabal filepath polyparse random ]; meta = { homepage = "http://www.cs.york.ac.uk/fp/HaXml/"; description = "Utilities for manipulating XML documents"; diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index 25143e647bb..c1fbb0653e1 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -1,10 +1,10 @@ -{ cabal, random }: +{ cabal, Cabal, random }: cabal.mkDerivation (self: { pname = "HaskellForMaths"; version = "0.4.3"; sha256 = "00s502h3pw9i464qn6cn74ihghcnn5gsar891q276ld682m5vdns"; - buildDepends = [ random ]; + buildDepends = [ Cabal random ]; meta = { homepage = "http://haskellformaths.blogspot.com/"; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index 6877e07524d..5a7e1eb5c86 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -1,10 +1,10 @@ -{ cabal, StateVar, transformers }: +{ cabal, Cabal, StateVar, transformers }: cabal.mkDerivation (self: { pname = "Hipmunk"; version = "5.2.0.6"; sha256 = "16yh7v6v05nksspcfz8h054piyhmrfbpaada36562rjxcywyfnfj"; - buildDepends = [ StateVar transformers ]; + buildDepends = [ Cabal StateVar transformers ]; noHaddock = true; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 1ab60436f68..90d84c85e6b 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -1,10 +1,10 @@ -{ cabal, network, openssl, time }: +{ cabal, Cabal, network, openssl, time }: cabal.mkDerivation (self: { pname = "HsOpenSSL"; version = "0.10.1.2"; sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh"; - buildDepends = [ network time ]; + buildDepends = [ Cabal network time ]; extraLibraries = [ openssl ]; meta = { homepage = "https://github.com/phonohawk/HsOpenSSL"; diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix index f27d1f97f37..b382232839c 100644 --- a/pkgs/development/libraries/haskell/HsSyck/default.nix +++ b/pkgs/development/libraries/haskell/HsSyck/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb, utf8String }: +{ cabal, Cabal, syb, utf8String }: cabal.mkDerivation (self: { pname = "HsSyck"; version = "0.50"; sha256 = "0ap675i2fngvd1nw1dk8p2fz4nbd2aq5ci8dsvpcjbp28y9j2blm"; - buildDepends = [ syb utf8String ]; + buildDepends = [ Cabal syb utf8String ]; meta = { description = "Fast, lightweight YAML loader and dumper"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/JsContracts/default.nix b/pkgs/development/libraries/haskell/JsContracts/default.nix index 51a0e127ecf..b0abdae3290 100644 --- a/pkgs/development/libraries/haskell/JsContracts/default.nix +++ b/pkgs/development/libraries/haskell/JsContracts/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, parsec, syb, WebBits, WebBitsHtml }: +{ cabal, Cabal, filepath, mtl, parsec, syb, WebBits, WebBitsHtml }: cabal.mkDerivation (self: { pname = "JsContracts"; @@ -6,7 +6,9 @@ cabal.mkDerivation (self: { sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl parsec syb WebBits WebBitsHtml ]; + buildDepends = [ + Cabal filepath mtl parsec syb WebBits WebBitsHtml + ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "Design-by-contract for JavaScript"; diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 523f59de5e9..276e9b05602 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "ListLike"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://software.complete.org/listlike"; description = "Generic support for list-like structures"; diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix index 34856050862..1d797c908b1 100644 --- a/pkgs/development/libraries/haskell/MaybeT/default.nix +++ b/pkgs/development/libraries/haskell/MaybeT/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "MaybeT"; version = "0.1.2"; sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { description = "MaybeT monad transformer"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index 61ba44a4924..adf94c3a9d4 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "MemoTrie"; version = "0.4.10"; sha256 = "1hkraq33sai046gwqlabc9nkz6jbl6vgj0c6lc6j4j5h5d8v08kk"; + buildDepends = [ Cabal ]; meta = { homepage = "http://haskell.org/haskellwiki/MemoTrie"; description = "Trie-based memo functions"; diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index 47da3ba266a..f6afb7221f6 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -1,4 +1,5 @@ -{ cabal, hslogger, HUnit, mtl, network, parsec, random, regexCompat +{ cabal, Cabal, filepath, hslogger, HUnit, mtl, network, parsec +, random, regexCompat }: cabal.mkDerivation (self: { @@ -8,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - hslogger HUnit mtl network parsec random regexCompat + Cabal filepath hslogger HUnit mtl network parsec random regexCompat ]; meta = { homepage = "http://software.complete.org/missingh"; diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index bcbf6b79868..ea911a29148 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, mtl }: +{ cabal, Cabal, extensibleExceptions, mtl }: cabal.mkDerivation (self: { pname = "MonadCatchIO-mtl"; version = "0.3.0.4"; sha256 = "0wzdrfplwa4v9miv88rg3jvf7l6gphc29lpdp5qjm5873y57jxm7"; - buildDepends = [ extensibleExceptions mtl ]; + buildDepends = [ Cabal extensibleExceptions mtl ]; meta = { homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"; description = "Monad-transformer version of the Control.Exception module"; diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index 52080c26a3b..946abea0add 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, transformers }: +{ cabal, Cabal, extensibleExceptions, transformers }: cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; version = "0.2.2.3"; sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6"; - buildDepends = [ extensibleExceptions transformers ]; + buildDepends = [ Cabal extensibleExceptions transformers ]; meta = { description = "Monad-transformer compatible version of the Control.Exception module"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix index daf961f1550..f3a21608766 100644 --- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix +++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "MonadPrompt"; version = "1.0.0.3"; sha256 = "0v6svyiajri7c463bz1a1x1nin5s9s7c3s7y0gjc4cn7lhgdsvf2"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { description = "MonadPrompt, implementation & examples"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index f9c68ce7b43..365f542d367 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, random }: +{ cabal, Cabal, mtl, random }: cabal.mkDerivation (self: { pname = "MonadRandom"; version = "0.1.6"; sha256 = "1429w2h66sf0cw992xj4w9clapcqgpdzmh80as7zxf8l87rarqqp"; - buildDepends = [ mtl random ]; + buildDepends = [ Cabal mtl random ]; meta = { description = "Random-number generation monad"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix index 4bf301bd66d..0d8f7d3206e 100644 --- a/pkgs/development/libraries/haskell/NanoProlog/default.nix +++ b/pkgs/development/libraries/haskell/NanoProlog/default.nix @@ -1,4 +1,4 @@ -{ cabal, ListLike, uuParsinglib }: +{ cabal, Cabal, ListLike, uuParsinglib }: cabal.mkDerivation (self: { pname = "NanoProlog"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn"; isLibrary = true; isExecutable = true; - buildDepends = [ ListLike uuParsinglib ]; + buildDepends = [ Cabal ListLike uuParsinglib ]; meta = { description = "Very small interpreter for a Prolog-like language"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index 8aa6dec08cb..33014e8b5d6 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "NumInstances"; version = "1.0"; sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy"; + buildDepends = [ Cabal ]; meta = { description = "Instances of numeric classes for functions and tuples"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix index 0be7c3dd22c..a94dafa3d9b 100755 --- a/pkgs/development/libraries/haskell/ObjectName/default.nix +++ b/pkgs/development/libraries/haskell/ObjectName/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "ObjectName"; version = "1.0.0.0"; sha256 = "0yr1aa0ail2h9qsq2bslcwwq6cxl2lzajmc1laj19r7ks62p32rm"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "Explicitly handled object names"; diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix index 2ecc841a8a4..67bf042de8a 100644 --- a/pkgs/development/libraries/haskell/OneTuple/default.nix +++ b/pkgs/development/libraries/haskell/OneTuple/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "OneTuple"; version = "0.2.1"; sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb"; + buildDepends = [ Cabal ]; meta = { description = "Singleton Tuple"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index a4a77aa8244..0b7add71e04 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,10 +1,10 @@ -{ cabal, ObjectName, openal, StateVar, Tensor }: +{ cabal, Cabal, ObjectName, openal, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "OpenAL"; version = "1.4.0.0"; sha256 = "1vn9r8fd4zwqm8a9d8bgvi9vs1lmygn8sw1rlv819b5wmjwz3ms2"; - buildDepends = [ ObjectName StateVar Tensor ]; + buildDepends = [ Cabal ObjectName StateVar Tensor ]; extraLibraries = [ openal ]; meta = { homepage = "http://connect.creativelabs.com/openal/"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix index e74fcdca024..3967f093311 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix @@ -1,9 +1,10 @@ -{ cabal, libX11, mesa }: +{ cabal, Cabal, libX11, mesa }: cabal.mkDerivation (self: { pname = "OpenGL"; version = "2.2.1.1"; sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792"; + buildDepends = [ Cabal ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix index 65e3da59367..44c7f4b5f82 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -1,9 +1,10 @@ -{ cabal, libX11, mesa }: +{ cabal, Cabal, libX11, mesa }: cabal.mkDerivation (self: { pname = "OpenGL"; version = "2.2.3.0"; sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57"; + buildDepends = [ Cabal ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix index 73b5c741bbb..1d8d4ee9617 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix @@ -1,12 +1,14 @@ -{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar -, Tensor +{ cabal, Cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw +, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "OpenGL"; version = "2.4.0.2"; sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6"; - buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; + buildDepends = [ + Cabal GLURaw ObjectName OpenGLRaw StateVar Tensor + ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix index 8e616e4e069..4dae187013c 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix @@ -1,12 +1,14 @@ -{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar -, Tensor +{ cabal, Cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw +, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "OpenGL"; version = "2.5.0.0"; sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j"; - buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; + buildDepends = [ + Cabal GLURaw ObjectName OpenGLRaw StateVar Tensor + ]; extraLibraries = [ libX11 mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix index 70c25ea9ac6..92368c61a54 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix @@ -1,9 +1,10 @@ -{ cabal, mesa }: +{ cabal, Cabal, mesa }: cabal.mkDerivation (self: { pname = "OpenGLRaw"; version = "1.2.0.0"; sha256 = "1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r"; + buildDepends = [ Cabal ]; extraLibraries = [ mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix index ff3bd0b8fb5..d7b0380ed31 100644 --- a/pkgs/development/libraries/haskell/PSQueue/default.nix +++ b/pkgs/development/libraries/haskell/PSQueue/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "PSQueue"; version = "1.1"; sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58"; + buildDepends = [ Cabal ]; meta = { description = "Priority Search Queue"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Pathfinder/default.nix b/pkgs/development/libraries/haskell/Pathfinder/default.nix index 90df60cc8e6..04a283e19f8 100644 --- a/pkgs/development/libraries/haskell/Pathfinder/default.nix +++ b/pkgs/development/libraries/haskell/Pathfinder/default.nix @@ -1,10 +1,10 @@ -{ cabal, libxml2, text }: +{ cabal, Cabal, libxml2, text }: cabal.mkDerivation (self: { pname = "Pathfinder"; version = "0.5.10"; sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; extraLibraries = [ libxml2 ]; meta = { description = "Relational optimiser and code generator"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix index a459fd95317..9c227eddc64 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix @@ -1,10 +1,10 @@ -{ cabal, random }: +{ cabal, Cabal, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "1.2.0.0"; sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed"; - buildDepends = [ random ]; + buildDepends = [ Cabal random ]; meta = { homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix index c104a4be27a..98bbf31b624 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, random }: +{ cabal, Cabal, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "1.2.0.1"; sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; - buildDepends = [ random ]; + buildDepends = [ Cabal random ]; meta = { homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix index 828255a9860..886d5061a45 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, mtl, random }: +{ cabal, Cabal, extensibleExceptions, mtl, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "2.1.1.1"; sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9"; - buildDepends = [ extensibleExceptions mtl random ]; + buildDepends = [ Cabal extensibleExceptions mtl random ]; meta = { homepage = "http://www.cse.chalmers.se/~koen"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix index ac9ac3d2a7d..0fbfe74eee7 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, mtl, random }: +{ cabal, Cabal, extensibleExceptions, mtl, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "2.4.0.1"; sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r"; - buildDepends = [ extensibleExceptions mtl random ]; + buildDepends = [ Cabal extensibleExceptions mtl random ]; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix index 8eb413d2b31..74804a77b6f 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, random }: +{ cabal, Cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "2.4.1.1"; sha256 = "06vrn0j26ai2jfl32yd3kx8by4pimcinjf23b0dyc35z2gb139wj"; - buildDepends = [ extensibleExceptions random ]; + buildDepends = [ Cabal extensibleExceptions random ]; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix index 69a1c1dc417..e4d41ed20a3 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, random }: +{ cabal, Cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; version = "2.4.2"; sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg"; - buildDepends = [ extensibleExceptions random ]; + buildDepends = [ Cabal extensibleExceptions random ]; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index c5b8efc67f6..93c913c44d6 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, pureMD5, random, SHA }: +{ cabal, binary, Cabal, pureMD5, random, SHA }: cabal.mkDerivation (self: { pname = "RSA"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk"; isLibrary = true; isExecutable = true; - buildDepends = [ binary pureMD5 random SHA ]; + buildDepends = [ binary Cabal pureMD5 random SHA ]; meta = { description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix index 6a6211b6263..5ccb58611d4 100644 --- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix +++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix @@ -1,10 +1,10 @@ -{ cabal, HUnit, QuickCheck }: +{ cabal, Cabal, HUnit, QuickCheck }: cabal.mkDerivation (self: { pname = "Ranged-sets"; version = "0.3.0"; sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l"; - buildDepends = [ HUnit QuickCheck ]; + buildDepends = [ Cabal HUnit QuickCheck ]; meta = { homepage = "http://code.haskell.org/ranged-sets"; description = "Ranged sets for Haskell"; diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 908ff5b62a9..9614d0d608b 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, typeEquality }: +{ cabal, Cabal, mtl, typeEquality }: cabal.mkDerivation (self: { pname = "RepLib"; version = "0.5.1"; sha256 = "1c6zqi87lmmmiz8amsvhw6wkhg90rhh6yl5vh0a9ism3apwh1i7r"; - buildDepends = [ mtl typeEquality ]; + buildDepends = [ Cabal mtl typeEquality ]; noHaddock = true; meta = { homepage = "http://code.google.com/p/replib/"; diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix index e6695f01358..eae536c7583 100644 --- a/pkgs/development/libraries/haskell/SDL-image/default.nix +++ b/pkgs/development/libraries/haskell/SDL-image/default.nix @@ -1,10 +1,10 @@ -{ cabal, SDL, SDL_image }: +{ cabal, Cabal, SDL, SDL_image }: cabal.mkDerivation (self: { pname = "SDL-image"; version = "0.6.1"; sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni"; - buildDepends = [ SDL ]; + buildDepends = [ Cabal SDL ]; extraLibraries = [ SDL_image ]; meta = { description = "Binding to libSDL_image"; diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix index 674282e30a8..2c6919de948 100644 --- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix +++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix @@ -1,10 +1,10 @@ -{ cabal, SDL, SDL_mixer }: +{ cabal, Cabal, SDL, SDL_mixer }: cabal.mkDerivation (self: { pname = "SDL-mixer"; version = "0.6.1"; sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1"; - buildDepends = [ SDL ]; + buildDepends = [ Cabal SDL ]; extraLibraries = [ SDL_mixer ]; meta = { description = "Binding to libSDL_mixer"; diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index f48e0dbab51..bc36786a366 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -1,10 +1,10 @@ -{ cabal, SDL, SDL_ttf }: +{ cabal, Cabal, SDL, SDL_ttf }: cabal.mkDerivation (self: { pname = "SDL-ttf"; version = "0.6.1"; sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal"; - buildDepends = [ SDL ]; + buildDepends = [ Cabal SDL ]; extraLibraries = [ SDL_ttf ]; meta = { description = "Binding to libSDL_ttf"; diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index 8adf60f938c..dbdda0e96c8 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -1,9 +1,10 @@ -{ cabal, SDL }: +{ cabal, Cabal, SDL }: cabal.mkDerivation (self: { pname = "SDL"; version = "0.6.2"; sha256 = "1fqj3sw709q28rmjzcffa3k1mcp7r9cvdrrqmcppaz5yv63ychly"; + buildDepends = [ Cabal ]; extraLibraries = [ SDL ]; meta = { description = "Binding to libSDL"; diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index 659b06f72b7..21a5293583f 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary }: +{ cabal, binary, Cabal }: cabal.mkDerivation (self: { pname = "SHA"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "12sz1dblmpiy8bg45fwndp1g9gf7494vqqbvbd1hwr5qzyfwyqck"; isLibrary = true; isExecutable = true; - buildDepends = [ binary ]; + buildDepends = [ binary Cabal ]; meta = { description = "Implementations of the SHA suite of message digest functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 755c17eee8e..da5f2a924ee 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, hsemail, network }: +{ cabal, Cabal, extensibleExceptions, hsemail, network }: cabal.mkDerivation (self: { pname = "SMTPClient"; version = "1.0.4"; sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2"; - buildDepends = [ extensibleExceptions hsemail network ]; + buildDepends = [ Cabal extensibleExceptions hsemail network ]; meta = { description = "A simple SMTP client library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix index c31f0e5d289..054a095c467 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix @@ -1,10 +1,10 @@ -{ cabal, haskeline, mtl, Shellac }: +{ cabal, Cabal, haskeline, mtl, Shellac }: cabal.mkDerivation (self: { pname = "Shellac-haskeline"; version = "0.2.0.1"; sha256 = "1xvs2ni83yyf7rx3ikmn2bkx20fyj03d03crqyyfw28mikhgv5br"; - buildDepends = [ haskeline mtl Shellac ]; + buildDepends = [ Cabal haskeline mtl Shellac ]; meta = { description = "Haskeline backend module for Shellac"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix index 20fee419fe9..dc28a52e7f4 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix @@ -1,10 +1,10 @@ -{ cabal, readline, Shellac }: +{ cabal, Cabal, readline, Shellac }: cabal.mkDerivation (self: { pname = "Shellac-readline"; version = "0.9"; sha256 = "3edffecf2225c199f0a4df55e3685f7deee47755ae7f8d03f5da7fac3c2ab878"; - buildDepends = [ readline Shellac ]; + buildDepends = [ Cabal readline Shellac ]; meta = { description = "Readline backend module for Shellac"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix index 8f36e8ebc08..4a2228bd4b6 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "Shellac"; version = "0.9.5.1"; sha256 = "19fpbh5ijy9xc3rhl9qwyan8jfnz9nsqvnsjxb7kkb7l2bpz4qfp"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://www.cs.princeton.edu/~rdockins/shellac/home/"; description = "A framework for creating shell envinronments"; diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix index 95148607b6f..abfff4fdff4 100755 --- a/pkgs/development/libraries/haskell/StateVar/default.nix +++ b/pkgs/development/libraries/haskell/StateVar/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "StateVar"; version = "1.0.0.0"; sha256 = "1c1b6a6nn1cdnba08zzp0645wl482h7yaa69zw2l3wwyyyccjic4"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "State variables"; diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix index f1c212d7a49..8c1f40c382b 100644 --- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix +++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix @@ -1,10 +1,10 @@ -{ cabal, HaXml, mtl }: +{ cabal, Cabal, HaXml, mtl }: cabal.mkDerivation (self: { pname = "TableAlgebra"; version = "0.7.1"; sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz"; - buildDepends = [ HaXml mtl ]; + buildDepends = [ Cabal HaXml mtl ]; meta = { description = "Ferry Table Algebra"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix index 3856409819d..7afd1aabd87 100755 --- a/pkgs/development/libraries/haskell/Tensor/default.nix +++ b/pkgs/development/libraries/haskell/Tensor/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "Tensor"; version = "1.0.0.1"; sha256 = "10arhk5gkn5jxpb53r80bblpk0afdax1fc2mik40hj5g5g960cp9"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/HOpenGL/"; description = "Tensor data types"; diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 94c157765d3..03ee7e869a5 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck }: +{ cabal, Cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "Vec"; version = "0.9.8"; sha256 = "0yaqy0p2jh2ajf8897vsxl5w6bmavixn6n5cc7w8kdnybpbdms6v"; - buildDepends = [ QuickCheck ]; + buildDepends = [ Cabal QuickCheck ]; meta = { homepage = "http://graphics.cs.ucdavis.edu/~sdillard/Vec"; description = "Fixed-length lists and low-dimensional linear algebra"; diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix index 18371c57f08..fc02bd89bd9 100644 --- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix +++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec, syb, WebBits }: +{ cabal, Cabal, mtl, parsec, syb, WebBits }: cabal.mkDerivation (self: { pname = "WebBits-Html"; version = "1.0.1"; sha256 = "134rmm5ccfsjdr0pdwn2mf81l81rgxapa3wjjfjkxrkxq6hav35n"; - buildDepends = [ mtl parsec syb WebBits ]; + buildDepends = [ Cabal mtl parsec syb WebBits ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix index cd34f3161f3..be596da42fb 100644 --- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix +++ b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec, syb, WebBits }: +{ cabal, Cabal, mtl, parsec, syb, WebBits }: cabal.mkDerivation (self: { pname = "WebBits-Html"; version = "1.0.2"; sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal"; - buildDepends = [ mtl parsec syb WebBits ]; + buildDepends = [ Cabal mtl parsec syb WebBits ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/WebBits/1.0.nix b/pkgs/development/libraries/haskell/WebBits/1.0.nix index 89161608843..91899cab2cf 100644 --- a/pkgs/development/libraries/haskell/WebBits/1.0.nix +++ b/pkgs/development/libraries/haskell/WebBits/1.0.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec, syb }: +{ cabal, Cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { pname = "WebBits"; version = "1.0"; sha256 = "1xqk4ajywlaq9nb9a02i7c25na5p2qbpc2k9zw93gbapppjiapsc"; - buildDepends = [ mtl parsec syb ]; + buildDepends = [ Cabal mtl parsec syb ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/WebBits/2.0.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix index 88502db4dff..89ef4903f0f 100644 --- a/pkgs/development/libraries/haskell/WebBits/2.0.nix +++ b/pkgs/development/libraries/haskell/WebBits/2.0.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec, syb }: +{ cabal, Cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { pname = "WebBits"; version = "2.0"; sha256 = "14a1rqlq925f6rdbi8yx44xszj5pvskcmw1gi1bj8hbilgmlwi7f"; - buildDepends = [ mtl parsec syb ]; + buildDepends = [ Cabal mtl parsec syb ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/WebBits/2.1.nix b/pkgs/development/libraries/haskell/WebBits/2.1.nix index 915ff0b1d60..89889e015eb 100644 --- a/pkgs/development/libraries/haskell/WebBits/2.1.nix +++ b/pkgs/development/libraries/haskell/WebBits/2.1.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec, syb }: +{ cabal, Cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { pname = "WebBits"; version = "2.1"; sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn"; - buildDepends = [ mtl parsec syb ]; + buildDepends = [ Cabal mtl parsec syb ]; meta = { homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix index d9eee5f5e1c..3f7ffe73c33 100644 --- a/pkgs/development/libraries/haskell/X11-xft/default.nix +++ b/pkgs/development/libraries/haskell/X11-xft/default.nix @@ -1,11 +1,12 @@ -{ cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11 +{ cabal, Cabal, fontconfig, freetype, libXft, pkgconfig, utf8String +, X11 }: cabal.mkDerivation (self: { pname = "X11-xft"; version = "0.3.1"; sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf"; - buildDepends = [ utf8String X11 ]; + buildDepends = [ Cabal utf8String X11 ]; extraLibraries = [ fontconfig freetype pkgconfig ]; pkgconfigDepends = [ libXft ]; configureFlags = "--extra-include-dirs=${freetype}/include/freetype2"; diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index 6b0047085bc..5141ed9fa11 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -1,10 +1,10 @@ -{ cabal, libX11, libXext, libXinerama, syb }: +{ cabal, Cabal, libX11, libXext, libXinerama, syb }: cabal.mkDerivation (self: { pname = "X11"; version = "1.5.0.1"; sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19"; - buildDepends = [ syb ]; + buildDepends = [ Cabal syb ]; extraLibraries = [ libX11 libXext libXinerama ]; meta = { homepage = "https://github.com/haskell-pkg-janitors/X11"; diff --git a/pkgs/development/libraries/haskell/Zwaluw/default.nix b/pkgs/development/libraries/haskell/Zwaluw/default.nix index 125da2a795e..8f4c3245cee 100644 --- a/pkgs/development/libraries/haskell/Zwaluw/default.nix +++ b/pkgs/development/libraries/haskell/Zwaluw/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "Zwaluw"; version = "0.1"; sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1"; + buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/MedeaMelana/Zwaluw"; description = "Combinators for bidirectional URL routing"; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 2c55bdfc357..58ef9fff5ff 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -1,5 +1,5 @@ -{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl -, syb, text, time, unorderedContainers, vector +{ cabal, attoparsec, blazeBuilder, Cabal, deepseq, dlist, hashable +, mtl, syb, text, time, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.6.0.0"; sha256 = "1j8g1q7xr1pgyfyrkbh2zz7fhqshj0q5qg7fczrnsbbzf5k459zw"; buildDepends = [ - attoparsec blazeBuilder deepseq dlist hashable mtl syb text time - unorderedContainers vector + attoparsec blazeBuilder Cabal deepseq dlist hashable mtl syb text + time unorderedContainers vector ]; meta = { homepage = "https://github.com/bos/aeson"; diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 484736c7098..b3e5b6de5d4 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "ansi-terminal"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "09r4nlpmkis6cp30jkymfas13hz6ph4zqxhvigrxn6s76v7nb5a8"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://batterseapower.github.com/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index 5730588ab9e..27785292742 100755 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -1,4 +1,4 @@ -{ cabal, ansiTerminal }: +{ cabal, ansiTerminal, Cabal }: cabal.mkDerivation (self: { pname = "ansi-wl-pprint"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0zrhzkmc5ki6q9ac5l16lhnyf9z2raj78gj9n0a7530rcv4ak3k0"; isLibrary = true; isExecutable = true; - buildDepends = [ ansiTerminal ]; + buildDepends = [ ansiTerminal Cabal ]; meta = { homepage = "http://github.com/batterseapower/ansi-wl-pprint"; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index c90d7a0425a..83d75e4064d 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -1,4 +1,6 @@ -{ cabal, attoparsec, attoparsecEnumerator, enumerator, mtl, text }: +{ cabal, attoparsec, attoparsecEnumerator, Cabal, enumerator, mtl +, text +}: cabal.mkDerivation (self: { pname = "asn1-data"; @@ -7,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec attoparsecEnumerator enumerator mtl text + attoparsec attoparsecEnumerator Cabal enumerator mtl text ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-data"; diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index 20cca829736..7e810630cb8 100755 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "async"; version = "1.4"; sha256 = "1d24bcvmw687jcf75wgavlhfs55f0va02xhl4xdnj2lrlr19s5dl"; + buildDepends = [ Cabal ]; meta = { homepage = "http://gitorious.org/async/"; description = "Asynchronous Computations"; diff --git a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix index 52a16a8ac1c..afdc3f473d2 100644 --- a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix +++ b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, failure }: +{ cabal, Cabal, failure }: cabal.mkDerivation (self: { pname = "attempt"; version = "0.3.1.1"; sha256 = "0yfn8mh7gy6nh689ic6sygf9d7lk44kpj2wahnljl53k6vw7smv5"; - buildDepends = [ failure ]; + buildDepends = [ Cabal failure ]; meta = { homepage = "http://github.com/snoyberg/attempt/tree/master"; description = "Concrete data type for handling extensible exceptions as failures"; diff --git a/pkgs/development/libraries/haskell/attempt/0.4.0.nix b/pkgs/development/libraries/haskell/attempt/0.4.0.nix index 2c5fc47ea31..ef1f58cd7ba 100644 --- a/pkgs/development/libraries/haskell/attempt/0.4.0.nix +++ b/pkgs/development/libraries/haskell/attempt/0.4.0.nix @@ -1,10 +1,10 @@ -{ cabal, failure }: +{ cabal, Cabal, failure }: cabal.mkDerivation (self: { pname = "attempt"; version = "0.4.0"; sha256 = "0n7srd1gy1fa0q1qzizvdgmrc078jyx47115aw85vvl74vh9qyjy"; - buildDepends = [ failure ]; + buildDepends = [ Cabal failure ]; meta = { homepage = "http://github.com/snoyberg/attempt/tree/master"; description = "Concrete data type for handling extensible exceptions as failures"; diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 9a17ef13563..91aeb71a8c9 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, conduit, text, transformers }: +{ cabal, attoparsec, Cabal, conduit, text, transformers }: cabal.mkDerivation (self: { pname = "attoparsec-conduit"; version = "0.2.0"; sha256 = "11jcsqyqc33xn980rac7fmdgj99dg4bp75b5whqzpnr67ginjjv9"; - buildDepends = [ attoparsec conduit text transformers ]; + buildDepends = [ attoparsec Cabal conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Turn attoparsec parsers into sinks"; diff --git a/pkgs/development/libraries/haskell/attoparsec/default.nix b/pkgs/development/libraries/haskell/attoparsec/default.nix index fb755000477..8c2f49624a7 100644 --- a/pkgs/development/libraries/haskell/attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec/default.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq, text }: +{ cabal, Cabal, deepseq, text }: cabal.mkDerivation (self: { pname = "attoparsec"; version = "0.10.1.1"; sha256 = "07zl85nkimpswlb4rxycisaphhyrlq4la2limxxi7sk21gyh88b0"; - buildDepends = [ deepseq text ]; + buildDepends = [ Cabal deepseq text ]; meta = { homepage = "https://github.com/bos/attoparsec"; description = "Fast combinator parsing for bytestrings"; diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix index ad73d41f587..009b302d82a 100644 --- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix +++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, enumerator, text }: +{ cabal, attoparsec, Cabal, enumerator, text }: cabal.mkDerivation (self: { pname = "attoparsec-enumerator"; version = "0.3"; sha256 = "1sfqcr1mvny9gf0zzggwvs2b20knxrbb208rzaa86ay0b5b5jw5v"; - buildDepends = [ attoparsec enumerator text ]; + buildDepends = [ attoparsec Cabal enumerator text ]; meta = { homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; description = "Pass input from an enumerator to an Attoparsec parser"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 8818aa2d972..36782ab685f 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,5 +1,5 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit -, caseInsensitive, conduit, httpConduit, httpTypes, network +, Cabal, caseInsensitive, conduit, httpConduit, httpTypes, network , tagsoup, text, transformers, unorderedContainers, xmlConduit }: @@ -8,9 +8,9 @@ cabal.mkDerivation (self: { version = "1.0.0"; sha256 = "0a163dhi69gh6zmi43jidxlaknbk1y0frjlwijdf7fp073rh0p87"; buildDepends = [ - aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive - conduit httpConduit httpTypes network tagsoup text transformers - unorderedContainers xmlConduit + aeson attoparsec blazeBuilder blazeBuilderConduit Cabal + caseInsensitive conduit httpConduit httpTypes network tagsoup text + transformers unorderedContainers xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index ae9d23f57d4..88e22b5479f 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "base-unicode-symbols"; version = "0.2.2.3"; sha256 = "0803ncdydkxivn4kcjfn9v0lm43xg47y5iws7lajhhyg6v4zq08j"; + buildDepends = [ Cabal ]; meta = { homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index b09024851de..3c2cd963253 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "base16-bytestring"; version = "0.1.1.4"; sha256 = "061rxlw5kjwj0s08kml46qpw602xwwp05285gpad8c7baw5mzxlr"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/bos/base16-bytestring"; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 304889991f0..20ec2b5b66c 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "base64-bytestring"; version = "0.1.1.0"; sha256 = "0vdmwajxg6w924pcsls45bz4bn29xgl3sgvdp2g1jb8f7qb58r7i"; + buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and deconding for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix index e77d5b96ea7..96575043a61 100644 --- a/pkgs/development/libraries/haskell/base64-string/default.nix +++ b/pkgs/development/libraries/haskell/base64-string/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "base64-string"; version = "0.2"; sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y"; + buildDepends = [ Cabal ]; meta = { homepage = "http://urchin.earth.li/~ian/cabal/base64-string/"; description = "Base64 implementation for String's"; diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 5b69e6d901e..f2f37b9e8bd 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, time }: +{ cabal, Cabal, mtl, time }: cabal.mkDerivation (self: { pname = "benchpress"; version = "0.2.2.4"; sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf"; - buildDepends = [ mtl time ]; + buildDepends = [ Cabal mtl time ]; meta = { homepage = "http://github.com/tibbe/benchpress"; description = "Micro-benchmarking with detailed statistics"; diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix index 2b132f9cad0..3554c79ea8e 100644 --- a/pkgs/development/libraries/haskell/bimap/default.nix +++ b/pkgs/development/libraries/haskell/bimap/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "bimap"; version = "0.2.4"; sha256 = "d991ae393ade2191f42d8a0d659d2b9a749675735eb5b57872f577ede82565c5"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/bimap"; description = "Bidirectional mapping between two key types"; diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix index 340230b506d..88b727d5d36 100644 --- a/pkgs/development/libraries/haskell/binary-shared/default.nix +++ b/pkgs/development/libraries/haskell/binary-shared/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, mtl }: +{ cabal, binary, Cabal, mtl }: cabal.mkDerivation (self: { pname = "binary-shared"; version = "0.8.1"; sha256 = "0niq6hgsawsdg3kkjgkwyrgy8w7pfkqfph5d1x5bzcjrcl982jrg"; - buildDepends = [ binary mtl ]; + buildDepends = [ binary Cabal mtl ]; meta = { homepage = "http://www.leksah.org"; description = "Sharing for the binary package"; diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index 9195e24d529..7daa91a703a 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "binary"; version = "0.5.1.0"; sha256 = "18si0f021447b1kqshar224zyh02gc65z7v82waxcn4igss7gm1a"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/binary/"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix index faf51870ae9..f94ac01db71 100644 --- a/pkgs/development/libraries/haskell/bitarray/default.nix +++ b/pkgs/development/libraries/haskell/bitarray/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "bitarray"; version = "0.0.1"; sha256 = "01ijysisw70zaw70hx851axw48agfamdqj21rzzhdqd2ww6bwchb"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~bkomuves/"; description = "Mutable and immutable bit arrays"; diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix index 53f85710281..fd0c243d85c 100644 --- a/pkgs/development/libraries/haskell/bitmap/default.nix +++ b/pkgs/development/libraries/haskell/bitmap/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "bitmap"; version = "0.0.2"; sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~bkomuves/"; description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)"; diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix index 23493e50c19..b8917e1b7d0 100644 --- a/pkgs/development/libraries/haskell/bktrees/default.nix +++ b/pkgs/development/libraries/haskell/bktrees/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "bktrees"; version = "0.3.1"; sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9"; + buildDepends = [ Cabal ]; meta = { description = "A set data structure with approximate searching"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index da3bd570e05..2f4968096b7 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, conduit, text, transformers }: +{ cabal, blazeBuilder, Cabal, conduit, text, transformers }: cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; version = "0.2.0"; sha256 = "13fcxmzw4xz7y271vdf6w6fj6isninjcxnm7h7gbk4yf31wx831r"; - buildDepends = [ blazeBuilder conduit text transformers ]; + buildDepends = [ blazeBuilder Cabal conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Convert streams of builders to streams of bytestrings"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index ccc8d36d6fd..b16b80bc5f5 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, enumerator, transformers }: +{ cabal, blazeBuilder, Cabal, enumerator, transformers }: cabal.mkDerivation (self: { pname = "blaze-builder-enumerator"; version = "0.2.0.3"; sha256 = "00a9rly27sh49gi5askg7z3ji8ig9llxk4qcznsag01d1z0kb97n"; - buildDepends = [ blazeBuilder enumerator transformers ]; + buildDepends = [ blazeBuilder Cabal enumerator transformers ]; meta = { homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index f5835393895..7ded6eecf4d 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "blaze-builder"; version = "0.3.1.0"; sha256 = "192pqmr6mcjnflqpvp93nycfbdi0ifab8ifvrxvmwbrdkiidvai6"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; description = "Efficient buffered output"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 0231b9e8e00..37093316a7e 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, text }: +{ cabal, blazeBuilder, Cabal, text }: cabal.mkDerivation (self: { pname = "blaze-html"; version = "0.4.3.1"; sha256 = "0yhwlwmjy3jagxscz2i0yjfy6akqpamn9c35ffxcgpr0kj6qlpfp"; - buildDepends = [ blazeBuilder text ]; + buildDepends = [ blazeBuilder Cabal text ]; meta = { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index 67d87905143..8e01e599d47 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, text, time, vector }: +{ cabal, blazeBuilder, Cabal, text, time, vector }: cabal.mkDerivation (self: { pname = "blaze-textual"; version = "0.2.0.6"; sha256 = "1699fj9zig6ids9bdjn5v0gqhnyx5dkzi542gkx1gs8943c94737"; - buildDepends = [ blazeBuilder text time vector ]; + buildDepends = [ blazeBuilder Cabal text time vector ]; meta = { homepage = "http://github.com/bos/blaze-textual"; description = "Fast rendering of common datatypes"; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 19f69ede610..4ba299f6c75 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary }: +{ cabal, binary, Cabal }: cabal.mkDerivation (self: { pname = "bmp"; version = "1.2.0.2"; sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk"; - buildDepends = [ binary ]; + buildDepends = [ binary Cabal ]; meta = { homepage = "http://code.ouroborus.net/bmp"; description = "Read and write uncompressed BMP image files"; diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index 53a8ee3ba46..f4f66ff3dfa 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754 -, mtl, network, time +{ cabal, binary, Cabal, compactStringFix, cryptohash +, dataBinaryIeee754, mtl, network, time }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.1.7"; sha256 = "1dmndq0rx22h9kxv31rxwqhwkgsvqg9qy4l0xmvpcvvl101zj4jx"; buildDepends = [ - binary compactStringFix cryptohash dataBinaryIeee754 mtl network - time + binary Cabal compactStringFix cryptohash dataBinaryIeee754 mtl + network time ]; meta = { homepage = "http://github.com/TonyGen/bson-haskell"; diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index d3af223418b..96ac64628ec 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "byteorder"; version = "1.0.3"; sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way"; + buildDepends = [ Cabal ]; meta = { homepage = "http://community.haskell.org/~aslatter/code/byteorder"; description = "Exposes the native endianness or byte ordering of the system"; diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index 05b316f2412..e2be2b384d8 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -1,9 +1,10 @@ -{ cabal, alex }: +{ cabal, alex, Cabal }: cabal.mkDerivation (self: { pname = "bytestring-lexing"; version = "0.4.0"; sha256 = "1lww38rab9k8drndqkg306kiq6663i89sq6l1bvjv6cs13acc8wr"; + buildDepends = [ Cabal ]; buildTools = [ alex ]; meta = { homepage = "http://code.haskell.org/~wren/"; diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix index cf68d1e7fa5..f891df3b688 100755 --- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "bytestring-mmap"; version = "0.2.2"; sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/"; description = "mmap support for strict ByteStrings"; diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix index 20228b9eed1..a95f028033a 100644 --- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "bytestring-nums"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "12knbyrvr1wa7za8bwypvq3cp81k18qi032dl98s2ylhcz1r6rdk"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/solidsnack/bytestring-nums"; description = "Parse numeric literals from ByteStrings"; diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix index 1dc56c420b6..b1032cbe3e4 100644 --- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary }: +{ cabal, binary, Cabal }: cabal.mkDerivation (self: { pname = "bytestring-trie"; version = "0.2.3"; sha256 = "1zb4s7fd951swc648szrpx0ldailmdinapgbcg1zajb5c5jq57ga"; - buildDepends = [ binary ]; + buildDepends = [ binary Cabal ]; meta = { homepage = "http://code.haskell.org/~wren/"; description = "An efficient finite map from (byte)strings to values"; diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 32d62dad8d0..c23e392ea33 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,10 +1,11 @@ -{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, zlib }: +{ cabal, Cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, zlib +}: cabal.mkDerivation (self: { pname = "cairo"; version = "0.12.2"; sha256 = "1sa0xfx14y4imq3bd9l0rqrmxls3l9yga249a31zfhcinnr1j9db"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; pkgconfigDepends = [ cairo ]; diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 9d72d8cedf7..ec11ff94f97 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -1,10 +1,10 @@ -{ cabal, hashable, text }: +{ cabal, Cabal, hashable, text }: cabal.mkDerivation (self: { pname = "case-insensitive"; version = "0.4.0.1"; sha256 = "15wcpzmj1ppl27p8hph9y8nxkjkd4yrvamxi3gk0ahfnb47chaq7"; - buildDepends = [ hashable text ]; + buildDepends = [ Cabal hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix index f291c3e632f..d0cde7a1c36 100644 --- a/pkgs/development/libraries/haskell/cautious-file/default.nix +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "cautious-file"; version = "1.0"; sha256 = "1s2la91vk9c99bj0ipzc4r6w81rcs4jfmn0xr1cgjab00bzj880q"; + buildDepends = [ Cabal filepath ]; meta = { description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index 53c974dd56a..becfcc93b45 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "cereal"; version = "0.3.5.1"; sha256 = "1a9ri0fs0vh75c9llpjyvqp6qkjciqri6adpyn7hbqrn2z1h0l5n"; + buildDepends = [ Cabal ]; meta = { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index abb4bcad643..6121589cfb8 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -1,4 +1,5 @@ -{ cabal, asn1Data, base64Bytestring, cryptoPubkeyTypes, mtl, time +{ cabal, asn1Data, base64Bytestring, Cabal, cryptoPubkeyTypes, mtl +, time }: cabal.mkDerivation (self: { @@ -8,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - asn1Data base64Bytestring cryptoPubkeyTypes mtl time + asn1Data base64Bytestring Cabal cryptoPubkeyTypes mtl time ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix index 9cb92640ee4..a8cc328199d 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, network, parsec, xhtml }: +{ cabal, Cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { pname = "cgi"; version = "3001.1.7.1"; sha256 = "7d1d710871fffbbec2a33d7288b2959ddbcfd794d47f0122127576c02550b339"; - buildDepends = [ mtl network parsec xhtml ]; + buildDepends = [ Cabal mtl network parsec xhtml ]; meta = { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix index 7e91e25209e..0e19bd850ff 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, network, parsec, xhtml }: +{ cabal, Cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { pname = "cgi"; version = "3001.1.7.2"; sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39"; - buildDepends = [ mtl network parsec xhtml ]; + buildDepends = [ Cabal mtl network parsec xhtml ]; meta = { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix index 0c1f8d709c3..44b8e366579 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix @@ -1,10 +1,13 @@ -{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: +{ cabal, Cabal, extensibleExceptions, mtl, network, parsec, xhtml +}: cabal.mkDerivation (self: { pname = "cgi"; version = "3001.1.7.3"; sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0"; - buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; + buildDepends = [ + Cabal extensibleExceptions mtl network parsec xhtml + ]; meta = { homepage = "http://andersk.mit.edu/haskell/cgi/"; description = "A library for writing CGI programs"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix index 3621b1fac1b..21751613844 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix @@ -1,10 +1,13 @@ -{ cabal, extensibleExceptions, mtl, network, parsec, xhtml }: +{ cabal, Cabal, extensibleExceptions, mtl, network, parsec, xhtml +}: cabal.mkDerivation (self: { pname = "cgi"; version = "3001.1.7.4"; sha256 = "1fiild4djzhyz683kwwb0k4wvhd89ihbn6vncjl270xvwj5xmrbd"; - buildDepends = [ extensibleExceptions mtl network parsec xhtml ]; + buildDepends = [ + Cabal extensibleExceptions mtl network parsec xhtml + ]; meta = { homepage = "http://andersk.mit.edu/haskell/cgi/"; description = "A library for writing CGI programs"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix index 686555330f3..654a0c26ae7 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix @@ -1,4 +1,4 @@ -{ cabal, extensibleExceptions, MonadCatchIOMtl, mtl, network +{ cabal, Cabal, extensibleExceptions, MonadCatchIOMtl, mtl, network , parsec, xhtml }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "3001.1.8.2"; sha256 = "09ly7bn5ck563jq1wip5w628g74xj4p1ha9rllfdck33pqrl2mgz"; buildDepends = [ - extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml + Cabal extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml ]; meta = { homepage = "http://andersk.mit.edu/haskell/cgi/"; diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index d4f1d943088..d1fbcc16d0b 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -1,5 +1,5 @@ -{ cabal, hsBibutils, HTTP, json, mtl, network, pandocTypes, parsec -, syb, time, utf8String, xml +{ cabal, Cabal, filepath, hsBibutils, HTTP, json, mtl, network +, pandocTypes, parsec, syb, time, utf8String, xml }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.3.4"; sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv"; buildDepends = [ - hsBibutils HTTP json mtl network pandocTypes parsec syb time - utf8String xml + Cabal filepath hsBibutils HTTP json mtl network pandocTypes parsec + syb time utf8String xml ]; meta = { homepage = "http://gorgias.mine.nu/repos/citeproc-hs/"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index a59b3b9ef0e..9d8ba2176f6 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,4 +1,4 @@ -{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi +{ cabal, base64Bytestring, Cabal, cereal, cprngAes, cryptoApi , cryptocipher, entropy, skein, tagged }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.7.4"; sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss"; buildDepends = [ - base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy - skein tagged + base64Bytestring Cabal cereal cprngAes cryptoApi cryptocipher + entropy skein tagged ]; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 7984bbbc99d..ea87d60e7fe 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -1,4 +1,4 @@ -{ cabal, transformers }: +{ cabal, Cabal, filepath, transformers }: cabal.mkDerivation (self: { pname = "cmdargs"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1mm16249nprclmgplw5bmmzsnmfm8dlkc5janrwvmlssbxw5hgnk"; isLibrary = true; isExecutable = true; - buildDepends = [ transformers ]; + buildDepends = [ Cabal filepath transformers ]; meta = { homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Command line argument processing"; diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix index 7b29ba58004..e2d59f0fd25 100644 --- a/pkgs/development/libraries/haskell/cmdlib/default.nix +++ b/pkgs/development/libraries/haskell/cmdlib/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, split, syb, transformers }: +{ cabal, Cabal, mtl, split, syb, transformers }: cabal.mkDerivation (self: { pname = "cmdlib"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0218f4rl64wvvka95m969hg5y9vc29dqaawfcnk7d1qsv3hx9ydl"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl split syb transformers ]; + buildDepends = [ Cabal mtl split syb transformers ]; meta = { description = "a library for command line parsing & online help"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix index 702ddd0b9ec..340b92856b0 100644 --- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix +++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix @@ -1,4 +1,4 @@ -{ cabal, ansiTerminal, haskellLexer }: +{ cabal, ansiTerminal, Cabal, haskellLexer }: cabal.mkDerivation (self: { pname = "colorize-haskell"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3"; isLibrary = true; isExecutable = true; - buildDepends = [ ansiTerminal haskellLexer ]; + buildDepends = [ ansiTerminal Cabal haskellLexer ]; meta = { homepage = "http://github.com/yav/colorize-haskell"; description = "Highligt Haskell source"; diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index 7f4fde5ef97..ecfdbbab040 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "colour"; version = "2.3.3"; sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Colour"; description = "A model for human colour/color perception"; diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix index 416826298bb..fd79a1413ea 100644 --- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix +++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "compact-string-fix"; version = "0.3.2"; sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n"; + buildDepends = [ Cabal ]; meta = { homepage = "http://twan.home.fmf.nl/compact-string/"; description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index d1a26389c7a..67812b37b7f 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,4 +1,4 @@ -{ cabal, liftedBase, monadControl, text, transformers +{ cabal, Cabal, liftedBase, monadControl, text, transformers , transformersBase }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.1"; sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9"; buildDepends = [ - liftedBase monadControl text transformers transformersBase + Cabal liftedBase monadControl text transformers transformersBase ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/containers-deepseq/default.nix b/pkgs/development/libraries/haskell/containers-deepseq/default.nix index 1e7630a93e8..fb32e2f3fca 100644 --- a/pkgs/development/libraries/haskell/containers-deepseq/default.nix +++ b/pkgs/development/libraries/haskell/containers-deepseq/default.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "containers-deepseq"; version = "0.1.0.1"; sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { description = "Provide orphan NFData instances for containers as needed. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix index 26b683c1969..3ffdc6dd759 100755 --- a/pkgs/development/libraries/haskell/continued-fractions/default.nix +++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "continued-fractions"; version = "0.9.1.1"; sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh"; + buildDepends = [ Cabal ]; meta = { homepage = "/dev/null"; description = "Continued fractions"; diff --git a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix index 0450373e8c6..a9b3131db5c 100644 --- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix +++ b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix @@ -1,10 +1,10 @@ -{ cabal, attempt, transformers }: +{ cabal, attempt, Cabal, transformers }: cabal.mkDerivation (self: { pname = "control-monad-attempt"; version = "0.3.0.1"; sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s"; - buildDepends = [ attempt transformers ]; + buildDepends = [ attempt Cabal transformers ]; meta = { homepage = "http://github.com/snoyberg/control-monad-attempt"; description = "Monad transformer for attempt. (deprecated)"; diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix index 6c128285285..ae58c850a2a 100755 --- a/pkgs/development/libraries/haskell/converge/default.nix +++ b/pkgs/development/libraries/haskell/converge/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "converge"; version = "0.1.0.1"; sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj"; + buildDepends = [ Cabal ]; meta = { homepage = "/dev/null"; description = "Limit operations for converging sequences"; diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix index 7444583bd9f..c06ae32ffab 100644 --- a/pkgs/development/libraries/haskell/convertible-text/default.nix +++ b/pkgs/development/libraries/haskell/convertible-text/default.nix @@ -1,4 +1,4 @@ -{ cabal, attempt, text, time }: +{ cabal, attempt, Cabal, text, time }: cabal.mkDerivation (self: { pname = "convertible-text"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz"; isLibrary = true; isExecutable = true; - buildDepends = [ attempt text time ]; + buildDepends = [ attempt Cabal text time ]; meta = { homepage = "http://github.com/snoyberg/convertible/tree/text"; description = "Typeclasses and instances for converting between types (deprecated)"; diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix index 5497500c0a8..2f9db499de8 100644 --- a/pkgs/development/libraries/haskell/convertible/default.nix +++ b/pkgs/development/libraries/haskell/convertible/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, text, time }: +{ cabal, Cabal, mtl, text, time }: cabal.mkDerivation (self: { pname = "convertible"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0qkz760ddshmglmrf47a01978c9zhxfss44b6vmfkwwfcjb7da2b"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl text time ]; + buildDepends = [ Cabal mtl text time ]; meta = { homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible"; description = "Typeclasses and instances for converting between types"; diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 4896ba1d39e..8d90d754db2 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, dataDefault, text, time }: +{ cabal, blazeBuilder, Cabal, dataDefault, text, time }: cabal.mkDerivation (self: { pname = "cookie"; version = "0.4.0"; sha256 = "1vkz6nys26i0yprb8jkv8iyq9xqnxb0wv07f7s7c448vx4gfln98"; - buildDepends = [ blazeBuilder dataDefault text time ]; + buildDepends = [ blazeBuilder Cabal dataDefault text time ]; meta = { homepage = "http://github.com/snoyberg/cookie"; description = "HTTP cookie parsing and rendering"; diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 0a40bd29575..d718ff6f7f0 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,10 +1,12 @@ -{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }: +{ cabal, Cabal, cereal, cryptoApi, cryptocipher, entropy, random }: cabal.mkDerivation (self: { pname = "cprng-aes"; version = "0.2.3"; sha256 = "1xyphzb3afvw7kpgq3b0c86b45rp5a8s870gag1lp7h686lhfnn3"; - buildDepends = [ cereal cryptoApi cryptocipher entropy random ]; + buildDepends = [ + Cabal cereal cryptoApi cryptocipher entropy random + ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index e99f4b7df53..33cf33d2621 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, deepseq, hastache, mtl, mwcRandom, parsec -, statistics, time, transformers, vector, vectorAlgorithms +{ cabal, aeson, Cabal, deepseq, filepath, hastache, mtl, mwcRandom +, parsec, statistics, time, transformers, vector, vectorAlgorithms }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.6.0.1"; sha256 = "0k6ip41w5h1z8gl67a8vsb6c3md5nc4yh1vd6dysp9fqgn0vky0a"; buildDepends = [ - aeson deepseq hastache mtl mwcRandom parsec statistics time - transformers vector vectorAlgorithms + aeson Cabal deepseq filepath hastache mtl mwcRandom parsec + statistics time transformers vector vectorAlgorithms ]; meta = { homepage = "https://github.com/bos/criterion"; diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 546392d7087..f08bf30f712 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -1,10 +1,10 @@ -{ cabal, cereal, entropy, largeword, tagged }: +{ cabal, Cabal, cereal, entropy, largeword, tagged }: cabal.mkDerivation (self: { pname = "crypto-api"; version = "0.9"; sha256 = "11372brnpiqdm6fdfp95wyyl8nvhbagnq0q2bdhn4xsskpnp4hnp"; - buildDepends = [ cereal entropy largeword tagged ]; + buildDepends = [ Cabal cereal entropy largeword tagged ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; description = "A generic interface for cryptographic operations"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 736d5f666d0..eabaf07aa11 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, cereal, conduit, cryptoApi, transformers }: +{ cabal, Cabal, cereal, conduit, cryptoApi, transformers }: cabal.mkDerivation (self: { pname = "crypto-conduit"; version = "0.1.3.1"; sha256 = "0b8n2njz2ccdb9gql79l96jgv1nlq4ls09d25a2yy9f69w7h1ww5"; - buildDepends = [ cereal conduit cryptoApi transformers ]; + buildDepends = [ Cabal cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 5f146d047be..5ac6c2e52db 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, cryptoApi }: +{ cabal, Cabal, cryptoApi }: cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; version = "0.1.0"; sha256 = "1ib5bqxydvv37l53wl6b4j6m6y904rsiamhh144lm6rmqiym26f5"; - buildDepends = [ cryptoApi ]; + buildDepends = [ Cabal cryptoApi ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; description = "Generic cryptography Public keys algorithm types"; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index a95e3ec1f64..18d1986663d 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,5 +1,5 @@ -{ cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive, tagged -, vector +{ cabal, Cabal, cereal, cryptoApi, cryptoPubkeyTypes, primitive +, tagged, vector }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - cereal cryptoApi cryptoPubkeyTypes primitive tagged vector + Cabal cereal cryptoApi cryptoPubkeyTypes primitive tagged vector ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 4336be8318d..7e556e44d92 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,4 +1,4 @@ -{ cabal, cereal, cryptoApi, tagged }: +{ cabal, Cabal, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { pname = "cryptohash"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1nplmwihq40jmng4r3wiyfb0i33a8wx2gmlbqajc62wny98l7sab"; isLibrary = true; isExecutable = true; - buildDepends = [ cereal cryptoApi tagged ]; + buildDepends = [ Cabal cereal cryptoApi tagged ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptohash"; description = "collection of crypto hashes, fast, pure and practical"; diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 609eb593ebb..5f6194f9840 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, text }: +{ cabal, attoparsec, Cabal, text }: cabal.mkDerivation (self: { pname = "css-text"; version = "0.1.1"; sha256 = "10vb08rnfq987w7wrirw8ib1kzafxaaancswm4xpw46ha3rq1m0y"; - buildDepends = [ attoparsec text ]; + buildDepends = [ attoparsec Cabal text ]; meta = { homepage = "http://www.yesodweb.com/"; description = "CSS parser and renderer"; diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix index 1539583a617..b37c4d09c56 100644 --- a/pkgs/development/libraries/haskell/csv/default.nix +++ b/pkgs/development/libraries/haskell/csv/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec }: +{ cabal, Cabal, filepath, parsec }: cabal.mkDerivation (self: { pname = "csv"; version = "0.1.2"; sha256 = "00767ai09wm7f0yzmpqck3cpgxncpr9djnmmz5l17ajz69139x4c"; - buildDepends = [ parsec ]; + buildDepends = [ Cabal filepath parsec ]; meta = { description = "CSV loader and dumper"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix index c512820114f..1f62732ab86 100644 --- a/pkgs/development/libraries/haskell/curl/default.nix +++ b/pkgs/development/libraries/haskell/curl/default.nix @@ -1,9 +1,10 @@ -{ cabal, curl }: +{ cabal, Cabal, curl }: cabal.mkDerivation (self: { pname = "curl"; version = "1.3.7"; sha256 = "0i6d7732p5gn1bcvavbxcg4wd18j425mi1yjg0b29zzz3yl0qhgi"; + buildDepends = [ Cabal ]; extraLibraries = [ curl ]; meta = { description = "Haskell binding to libcurl"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix index a160aa3f708..a938db9dd30 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -1,10 +1,10 @@ -{ cabal, dataAccessor, utilityHt }: +{ cabal, Cabal, dataAccessor, utilityHt }: cabal.mkDerivation (self: { pname = "data-accessor-template"; version = "0.2.1.9"; sha256 = "14zp2zjxlkdi33cjif9lc1kl8m0x4brh0pk3d34wk1g1bfzynijc"; - buildDepends = [ dataAccessor utilityHt ]; + buildDepends = [ Cabal dataAccessor utilityHt ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Utilities for accessing and manipulating fields of records"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 76bee6c05a8..55f32097037 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, Cabal, transformers }: cabal.mkDerivation (self: { pname = "data-accessor"; version = "0.2.2.1"; sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb"; - buildDepends = [ transformers ]; + buildDepends = [ Cabal transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Utilities for accessing and manipulating fields of records"; diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix index 48786b509fa..01e8850f519 100644 --- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix +++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary }: +{ cabal, binary, Cabal }: cabal.mkDerivation (self: { pname = "data-binary-ieee754"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0i0nclq8858flpp2sl3czwz6rfaykjrlzpvlfr6vlxzf8zvah9kz"; isLibrary = true; isExecutable = true; - buildDepends = [ binary ]; + buildDepends = [ binary Cabal ]; meta = { homepage = "http://john-millikin.com/software/data-binary-ieee754/"; description = "Parser/Serialiser for IEEE-754 floating-point values"; diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 593c7b3bd3c..27c26f080e7 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -1,10 +1,10 @@ -{ cabal, dlist }: +{ cabal, Cabal, dlist }: cabal.mkDerivation (self: { pname = "data-default"; version = "0.3.0"; sha256 = "0nbvknfa9kkc46fl1ffji0ghqb41wwsccmc55mya5zavfq9g05g9"; - buildDepends = [ dlist ]; + buildDepends = [ Cabal dlist ]; meta = { description = "A class for types with a default value"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix index 54c2a05f8f1..4eb2d03156f 100644 --- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix +++ b/pkgs/development/libraries/haskell/data-object-yaml/default.nix @@ -1,4 +1,4 @@ -{ cabal, conduit, convertibleText, dataObject, failure, text +{ cabal, Cabal, conduit, convertibleText, dataObject, failure, text , transformers, yaml }: @@ -9,7 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - conduit convertibleText dataObject failure text transformers yaml + Cabal conduit convertibleText dataObject failure text transformers + yaml ]; meta = { homepage = "http://github.com/snoyberg/data-object-yaml"; diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix index c1b12ab038f..2fc4fd82b7a 100644 --- a/pkgs/development/libraries/haskell/data-object/default.nix +++ b/pkgs/development/libraries/haskell/data-object/default.nix @@ -1,10 +1,10 @@ -{ cabal, failure, text, time }: +{ cabal, Cabal, failure, text, time }: cabal.mkDerivation (self: { pname = "data-object"; version = "0.3.1.9"; sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l"; - buildDepends = [ failure text time ]; + buildDepends = [ Cabal failure text time ]; meta = { homepage = "http://github.com/snoyberg/data-object/tree/master"; description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix index 2618ef6a690..616b3faaf1e 100644 --- a/pkgs/development/libraries/haskell/data-reify/default.nix +++ b/pkgs/development/libraries/haskell/data-reify/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "data-reify"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification"; description = "Reify a recursive data structure into an explicit graph"; diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index 7f7b65702b0..d224baf4b8d 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "dataenc"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding"; description = "Data encoding library"; diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix index 72f3d1c937f..88ca61486b1 100644 --- a/pkgs/development/libraries/haskell/datetime/default.nix +++ b/pkgs/development/libraries/haskell/datetime/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck, time }: +{ cabal, Cabal, QuickCheck, time }: cabal.mkDerivation (self: { pname = "datetime"; version = "0.2.1"; sha256 = "1yfg3wvi13r725dhfsmcdw4ns3cgl2ayrb5jck0q8b4crk2dlrzg"; - buildDepends = [ QuickCheck time ]; + buildDepends = [ Cabal QuickCheck time ]; meta = { homepage = "http://github.com/esessoms/datetime"; description = "Utilities to make Data.Time.* easier to use."; diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index ccffbe54f02..1356396feb7 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "deepseq-th"; version = "0.1.0.2"; sha256 = "0f2hrp2rjb3iailnxh47wl1imgq6jqr9qj31vi7k8lgp5pwa90mc"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { description = "Template Haskell based deriver for optimised NFData instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix index 2c61618cd08..b097d52b57e 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "deepseq"; version = "1.1.0.0"; sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a"; + buildDepends = [ Cabal ]; meta = { description = "Fully evaluate data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix index 4af1d5bff9c..6ec62de1414 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "deepseq"; version = "1.1.0.2"; sha256 = "1iqk8lc2an2rd1j9lcr76yabiz18h10lazlmdg5c528yssyd6135"; + buildDepends = [ Cabal ]; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix index 35fca66fa86..3034488a6a1 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "deepseq"; version = "1.2.0.1"; sha256 = "0r7lkqhllj7phmn4sq836fmis4wy9fpka4hjzhqzhbbykzys0z7d"; + buildDepends = [ Cabal ]; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix index e2c9c926aa7..492027ec3e6 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "deepseq"; version = "1.3.0.0"; sha256 = "0z2k1rda67nmhv62irjfd642iarj1i9m55l6p47j4cysrszhvqgy"; + buildDepends = [ Cabal ]; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index c98ddb04cd5..e3af2b62daf 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -1,4 +1,6 @@ -{ cabal, haskellSrcExts, syb, transformers, uniplate }: +{ cabal, Cabal, filepath, haskellSrcExts, syb, transformers +, uniplate +}: cabal.mkDerivation (self: { pname = "derive"; @@ -6,7 +8,9 @@ cabal.mkDerivation (self: { sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y"; isLibrary = true; isExecutable = true; - buildDepends = [ haskellSrcExts syb transformers uniplate ]; + buildDepends = [ + Cabal filepath haskellSrcExts syb transformers uniplate + ]; meta = { homepage = "http://community.haskell.org/~ndm/derive/"; description = "A program and library to derive instances for data types"; diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix index 99b072b63a4..504c63622d8 100644 --- a/pkgs/development/libraries/haskell/derp/default.nix +++ b/pkgs/development/libraries/haskell/derp/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "derp"; version = "0.1.5"; sha256 = "0mpc4hav5iqrcjns5sz8q0v2c0d7nb2hbzn58cmbl7cma2kp36li"; + buildDepends = [ Cabal ]; meta = { description = "Derivative Parsing"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index b313da931f9..16a8e7c8089 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -1,9 +1,10 @@ -{ cabal, zlib }: +{ cabal, Cabal, zlib }: cabal.mkDerivation (self: { pname = "digest"; version = "0.0.1.0"; sha256 = "1p2fk950ivdj7pvc624y0fx48rdh0ax3rw9606926n60mxi9fca0"; + buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 35b5a8d2440..18558a2ea1d 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -1,10 +1,10 @@ -{ cabal, numtype, time }: +{ cabal, Cabal, numtype, time }: cabal.mkDerivation (self: { pname = "dimensional"; version = "0.10.1.2"; sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn"; - buildDepends = [ numtype time ]; + buildDepends = [ Cabal numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; description = "Statically checked physical dimensions"; diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 1e0b78c4af3..679ffe9b7b4 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "directory-tree"; version = "0.10.0"; sha256 = "08b0w9j55x6c06pri7yvv84n24inhpb4miybdnkyjkjy7r3yy7m4"; + buildDepends = [ Cabal filepath ]; meta = { homepage = "http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index a88b38650c7..29beefb6fef 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "dlist"; version = "0.5"; sha256 = "1shr5wlpha68h82gwpndr5441847l01gh3j7szyvnmgzkr0fb027"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~dons/code/dlist/"; description = "Differences lists"; diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix index 06a3e6a09fe..c17c3f4e8ee 100644 --- a/pkgs/development/libraries/haskell/dotgen/default.nix +++ b/pkgs/development/libraries/haskell/dotgen/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "dotgen"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1g5ds0mqkz0lzhcp42hin08azschs3p083ikdk4d5jil8rzl7d8k"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { description = "A simple interface for building .dot graph files."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index 7c810a29565..fc3574d19d9 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "double-conversion"; version = "0.2.0.4"; sha256 = "00rb8n2ky20ah9ry398jagi9gb0gz40yjfalh35cpckmg30z199x"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "https://github.com/bos/double-conversion"; description = "Fast conversion between double precision floating point and text"; diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix index 81e88b8f58d..42615e89e38 100644 --- a/pkgs/development/libraries/haskell/download-curl/default.nix +++ b/pkgs/development/libraries/haskell/download-curl/default.nix @@ -1,10 +1,10 @@ -{ cabal, curl, feed, tagsoup, xml }: +{ cabal, Cabal, curl, feed, tagsoup, xml }: cabal.mkDerivation (self: { pname = "download-curl"; version = "0.1.3"; sha256 = "17g5dnw4yxi4kf5x71bkk4wx1zl8yjs5dd34k6dgnw9wgkz97qw1"; - buildDepends = [ curl feed tagsoup xml ]; + buildDepends = [ Cabal curl feed tagsoup xml ]; meta = { homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix index c0895ac2938..63a441e45a9 100644 --- a/pkgs/development/libraries/haskell/download/default.nix +++ b/pkgs/development/libraries/haskell/download/default.nix @@ -1,10 +1,10 @@ -{ cabal, feed, tagsoup, xml }: +{ cabal, Cabal, feed, tagsoup, xml }: cabal.mkDerivation (self: { pname = "download"; version = "0.3.2"; sha256 = "0nhbfq8q9ckc5fnlg54l361p2jhkag9cz11v07kj9f1kwkm4d7w3"; - buildDepends = [ feed tagsoup xml ]; + buildDepends = [ Cabal feed tagsoup xml ]; meta = { homepage = "http://code.haskell.org/~dons/code/download"; description = "High-level file download based on URLs"; diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix index 0b979e179f4..a6aeb49c1e0 100644 --- a/pkgs/development/libraries/haskell/dstring/default.nix +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -1,10 +1,10 @@ -{ cabal, baseUnicodeSymbols, dlist }: +{ cabal, baseUnicodeSymbols, Cabal, dlist }: cabal.mkDerivation (self: { pname = "dstring"; version = "0.4.0.3"; sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c"; - buildDepends = [ baseUnicodeSymbols dlist ]; + buildDepends = [ baseUnicodeSymbols Cabal dlist ]; meta = { homepage = "https://github.com/basvandijk/dstring"; description = "Difference strings"; diff --git a/pkgs/development/libraries/haskell/editline/default.nix b/pkgs/development/libraries/haskell/editline/default.nix index b8fe0d25ed4..53c416bef9b 100644 --- a/pkgs/development/libraries/haskell/editline/default.nix +++ b/pkgs/development/libraries/haskell/editline/default.nix @@ -1,9 +1,10 @@ -{ cabal, libedit }: +{ cabal, Cabal, libedit }: cabal.mkDerivation (self: { pname = "editline"; version = "0.2.1.0"; sha256 = "83618e5f86074fdc11d7f5033aa2886284462941be38fa02966acc92712c46e1"; + buildDepends = [ Cabal ]; extraLibraries = [ libedit ]; meta = { homepage = "http://code.haskell.org/editline"; diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 2906b0a9e64..bcd4476dea8 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, ranges }: +{ cabal, Cabal, parsec, ranges }: cabal.mkDerivation (self: { pname = "email-validate"; version = "0.2.8"; sha256 = "04cz1nm1zkb46kdxs43pmkxli2xm5nqlh951nn0mdgy6hqhkpkqd"; - buildDepends = [ parsec ranges ]; + buildDepends = [ Cabal parsec ranges ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index e877124b963..9c0cb75e415 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "entropy"; version = "0.2.1"; sha256 = "1qp8hvdzfgg2wk7d431qycwbn2zpzlplc1c7dbhimj1had5jscrs"; + buildDepends = [ Cabal ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; description = "A platform independent entropy source"; diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index b0e9f03a31b..33d7f295b77 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -1,10 +1,10 @@ -{ cabal, text, transformers }: +{ cabal, Cabal, text, transformers }: cabal.mkDerivation (self: { pname = "enumerator"; version = "0.4.18"; sha256 = "0xqgcn3xs0i7kdy73lizfhs4dzj8crf2x9pmb9d37kqrhdgznl9d"; - buildDepends = [ text transformers ]; + buildDepends = [ Cabal text transformers ]; meta = { homepage = "https://john-millikin.com/software/enumerator/"; description = "Reliable, high-performance processing with left-fold enumerators"; diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix index 25d64b3faaf..72aac851437 100644 --- a/pkgs/development/libraries/haskell/erf/default.nix +++ b/pkgs/development/libraries/haskell/erf/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "erf"; version = "2.0.0.0"; sha256 = "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14"; + buildDepends = [ Cabal ]; meta = { description = "The error function, erf, and related functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index 2a95faafaf6..708dcc0e1ef 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -1,4 +1,4 @@ -{ cabal, transformers }: +{ cabal, Cabal, transformers }: cabal.mkDerivation (self: { pname = "explicit-exception"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39"; isLibrary = true; isExecutable = true; - buildDepends = [ transformers ]; + buildDepends = [ Cabal transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Exception"; description = "Exceptions which are explicit in the type signature"; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix index 8a928931e3e..66f3a505091 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "extensible-exceptions"; version = "0.1.1.0"; sha256 = "c252dc5a505332700f041d4e1fd3d309cde6158892f9c35339bf5e67bad7f781"; + buildDepends = [ Cabal ]; meta = { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix index 329bb2a42c4..402dab01165 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "extensible-exceptions"; version = "0.1.1.2"; sha256 = "0rsdvb7k8mp88s1jjmna17qa6363vbjgvlkpncmn8516dnxhypg3"; + buildDepends = [ Cabal ]; meta = { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix index d349a1f17e3..82ce2f96d39 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "extensible-exceptions"; version = "0.1.1.3"; sha256 = "1i8rjfczsx1wjfaq423a7cp7qrnxh053865z7bg6hwhk2pxsrxkm"; + buildDepends = [ Cabal ]; meta = { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix index f217db39bc6..8636659645b 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "extensible-exceptions"; version = "0.1.1.4"; sha256 = "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc"; + buildDepends = [ Cabal ]; meta = { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/failure/0.1.2.nix b/pkgs/development/libraries/haskell/failure/0.1.2.nix index fc5c9488e59..c218d95c564 100644 --- a/pkgs/development/libraries/haskell/failure/0.1.2.nix +++ b/pkgs/development/libraries/haskell/failure/0.1.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "failure"; version = "0.1.2"; sha256 = "14pwj0zb5kk2wadpddanxv3kr0hzklxhzbprmkh40yn1dbwgdas4"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Failure"; description = "A simple type class for success/failure computations"; diff --git a/pkgs/development/libraries/haskell/failure/0.2.0.nix b/pkgs/development/libraries/haskell/failure/0.2.0.nix index 05b1b0c173c..4021482ae07 100644 --- a/pkgs/development/libraries/haskell/failure/0.2.0.nix +++ b/pkgs/development/libraries/haskell/failure/0.2.0.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, Cabal, transformers }: cabal.mkDerivation (self: { pname = "failure"; version = "0.2.0"; sha256 = "1z7q2ldgfm0khar3vx7paz0jigzd720xjq2s0x02qf2m3iv0ilcv"; - buildDepends = [ transformers ]; + buildDepends = [ Cabal transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Failure"; description = "A simple type class for success/failure computations"; diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 462bf7b5230..82e5bda7f3c 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder }: +{ cabal, blazeBuilder, Cabal, filepath }: cabal.mkDerivation (self: { pname = "fast-logger"; version = "0.0.2"; sha256 = "1pwxhgcy4lmc63dnr9fihkmiclf60hrnsv8wzbsdg0jcj4qi0zr7"; - buildDepends = [ blazeBuilder ]; + buildDepends = [ blazeBuilder Cabal filepath ]; meta = { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index f93da3ee549..c54bd936388 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, transformers }: +{ cabal, Cabal, mtl, transformers }: cabal.mkDerivation (self: { pname = "fclabels"; version = "1.1.0.2"; sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r"; - buildDepends = [ mtl transformers ]; + buildDepends = [ Cabal mtl transformers ]; meta = { description = "First class accessor labels"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index 8ad5c4318f7..6da13fec632 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -1,10 +1,10 @@ -{ cabal, utf8String, xml }: +{ cabal, Cabal, utf8String, xml }: cabal.mkDerivation (self: { pname = "feed"; version = "0.3.8"; sha256 = "1yvigcvb8cvxfa8vb2i11xkrylqw57jwzkaji6m1wp03k80zf576"; - buildDepends = [ utf8String xml ]; + buildDepends = [ Cabal utf8String xml ]; meta = { description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix index 7299daddb14..7041dd87f93 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "fgl"; version = "5.4.2.2"; sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; description = "Martin Erwig's Functional Graph Library"; diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix index 7417a32745c..488e8d2001a 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "fgl"; version = "5.4.2.3"; sha256 = "1f46siqqv8bc9v8nxr72nxabpzfax117ncgdvif6rax5ansl48g7"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; description = "Martin Erwig's Functional Graph Library"; diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix index 7b6aa799944..ad0ce4f334b 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "fgl"; version = "5.4.2.4"; sha256 = "0rh22786f37mpsvhkv075wjh5sd0c83nlhk669xil9rd7swcr66f"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell"; description = "Martin Erwig's Functional Graph Library"; diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index d24d30adfcb..d42cc848bd7 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "file-embed"; version = "0.0.4.1"; sha256 = "156ydqljhxp16192s4pj6h8jcvrfmj2lnsvzy0zg394wi97bxpi2"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/snoyberg/file-embed/tree/master"; description = "Use Template Haskell to embed file contents directly"; diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix index 3511cddeee2..ab047ef30c7 100644 --- a/pkgs/development/libraries/haskell/filepath/default.nix +++ b/pkgs/development/libraries/haskell/filepath/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "filepath"; version = "1.3.0.0"; sha256 = "1v5affq82b4fypm49d5sradcx4ymgmkac563vfx483pmyl73i5jl"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; description = "Library for manipulating FilePaths in a cross platform way"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 4c4214f0317..d30338aae63 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -1,10 +1,14 @@ -{ cabal, Diff, parsec, split, time, utf8String, xml }: +{ cabal, Cabal, Diff, filepath, parsec, split, time, utf8String +, xml +}: cabal.mkDerivation (self: { pname = "filestore"; version = "0.4.0.4"; sha256 = "14rp2689gjnk9pqk2xv4m3q3icgfvbik32c2d6gx4l2y7n78dsbx"; - buildDepends = [ Diff parsec split time utf8String xml ]; + buildDepends = [ + Cabal Diff filepath parsec split time utf8String xml + ]; meta = { homepage = "http://johnmacfarlane.net/repos/filestore"; description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index 37f66a12ba6..1fd1bf724a2 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "fingertree"; version = "0.0.1.0"; sha256 = "e80bf256506290c8f4fb44222920ae7d8405fd22e453c7a08dba49297d49328b"; + buildDepends = [ Cabal ]; meta = { description = "Generic finger-tree structure, with example instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index 3c7e45ce0d5..94f78f01119 100755 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -1,10 +1,10 @@ -{ cabal, thExtras, transformers }: +{ cabal, Cabal, thExtras, transformers }: cabal.mkDerivation (self: { pname = "flexible-defaults"; version = "0.0.0.3"; sha256 = "1s0dz61bqzzbxqvn9i8zwaccsha15als45zzjs2yc11r3m151dla"; - buildDepends = [ thExtras transformers ]; + buildDepends = [ Cabal thExtras transformers ]; meta = { homepage = "https://github.com/mokus0/flexible-defaults"; description = "Generate default function implementations for complex type classes"; diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index d96bb075ab3..9867983345e 100755 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "funcmp"; version = "1.5"; sha256 = "f68807833f39178c99877321f0f335cfde12a5c4b38e6c51f33f8cab94b9e12e"; + buildDepends = [ Cabal filepath ]; meta = { homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index 2853fbca768..8c6ccc6b70e 100755 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -1,10 +1,10 @@ -{ cabal, continuedFractions, converge, vector }: +{ cabal, Cabal, continuedFractions, converge, vector }: cabal.mkDerivation (self: { pname = "gamma"; version = "0.9.0.2"; sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq"; - buildDepends = [ continuedFractions converge vector ]; + buildDepends = [ Cabal continuedFractions converge vector ]; meta = { homepage = "https://github.com/mokus0/gamma"; description = "Gamma function and related functions"; diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix index 42de2748380..8e26e8b00cc 100644 --- a/pkgs/development/libraries/haskell/gd/default.nix +++ b/pkgs/development/libraries/haskell/gd/default.nix @@ -1,9 +1,12 @@ -{ cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }: +{ cabal, Cabal, expat, fontconfig, freetype, gd, libjpeg, libpng +, zlib +}: cabal.mkDerivation (self: { pname = "gd"; version = "3000.7.1"; sha256 = "07rb02jfmz6bw853b6snw1inby9qgaygdmlsid35snc2xn2ylb50"; + buildDepends = [ Cabal ]; extraLibraries = [ expat fontconfig freetype gd libjpeg libpng zlib ]; diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix index 929b717f552..29d52225e15 100644 --- a/pkgs/development/libraries/haskell/gdiff/default.nix +++ b/pkgs/development/libraries/haskell/gdiff/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "gdiff"; version = "1.0"; sha256 = "35257b1090cf78f95d24c7a89920863c1d824652311fa5793693d7d06d96517b"; + buildDepends = [ Cabal ]; meta = { description = "Generic diff and patch"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index b34c394cac7..30e2ac7c0b2 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "generic-deriving"; version = "1.0.3"; sha256 = "0g5sw4m9qdr1l47zq15l6jk9ksz1nazssdxz7lrdqx6ib3xbrz6y"; + buildDepends = [ Cabal ]; meta = { description = "Generic programming library for generalized deriving"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix index 9995c56fd58..9f95976939a 100644 --- a/pkgs/development/libraries/haskell/ghc-core/default.nix +++ b/pkgs/development/libraries/haskell/ghc-core/default.nix @@ -1,4 +1,4 @@ -{ cabal, colorizeHaskell, pcreLight }: +{ cabal, Cabal, colorizeHaskell, filepath, pcreLight }: cabal.mkDerivation (self: { pname = "ghc-core"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1s68m2zkpz0n927rgzg0l0r5v8pk3z03rlkd82h83agw0hzb9ng7"; isLibrary = false; isExecutable = true; - buildDepends = [ colorizeHaskell pcreLight ]; + buildDepends = [ Cabal colorizeHaskell filepath pcreLight ]; meta = { homepage = "http://code.haskell.org/~dons/code/ghc-core"; description = "Display GHC's core and assembly output in a pager"; diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 31b6c32d304..9364944b3e0 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, mtl }: +{ cabal, binary, Cabal, mtl }: cabal.mkDerivation (self: { pname = "ghc-events"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0q1r5jxk8ma8rg65n4iixl5zyk4nxpzi4ywf0jz8y1nbbhbas7g2"; isLibrary = true; isExecutable = true; - buildDepends = [ binary mtl ]; + buildDepends = [ binary Cabal mtl ]; noHaddock = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix index d67f455471f..f9b97f83c97 100644 --- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix @@ -1,10 +1,10 @@ -{ cabal, MonadCatchIOMtl, mtl }: +{ cabal, Cabal, MonadCatchIOMtl, mtl }: cabal.mkDerivation (self: { pname = "ghc-mtl"; version = "1.0.1.1"; sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn"; - buildDepends = [ MonadCatchIOMtl mtl ]; + buildDepends = [ Cabal MonadCatchIOMtl mtl ]; meta = { homepage = "http://darcsden.com/jcpetruzza/ghc-mtl"; description = "An mtl compatible version of the Ghc-Api monads and monad-transformers"; diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix index 1fa7e662f02..60c7f9ced46 100644 --- a/pkgs/development/libraries/haskell/ghc-paths/default.nix +++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "ghc-paths"; version = "0.1.0.8"; sha256 = "0mhc5zhbybp1vmkjsqbca51993vkpx5g8hql160m8m95apkc2wl6"; + buildDepends = [ Cabal ]; meta = { description = "Knowledge of GHC's installation directories"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix index ce2cb87c096..a6a5a47305d 100644 --- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, Cabal, syb }: cabal.mkDerivation (self: { pname = "ghc-syb-utils"; version = "0.2.1.0"; sha256 = "02wmd4zkng38z3bhsk4w4dqj1lzznhg2p0ijwr1a0dgx8cqr490z"; - buildDepends = [ syb ]; + buildDepends = [ Cabal syb ]; meta = { homepage = "http://github.com/nominolo/ghc-syb"; description = "Scrap Your Boilerplate utilities for the GHC API"; diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix index d0a766940fe..68b5c842234 100644 --- a/pkgs/development/libraries/haskell/ghc-syb/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "ghc-syb"; version = "0.2.0.0"; sha256 = "0052bd2ee4d92fbb010bebc7bcfd533a0b78437f1fb0834288ce979c103d9d67"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/nominolo/ghc-syb"; description = "Data and Typeable instances for the GHC API"; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 87a60a75ca9..2259a19a23d 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,8 +1,8 @@ -{ cabal, cgi, ConfigFile, feed, filestore, ghcPaths -, happstackServer, happstackUtil, highlightingKate, hslogger -, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes -, parsec, random, recaptcha, safe, SHA, syb, text, time, url -, utf8String, xhtml, xml, xssSanitize, zlib +{ cabal, Cabal, cgi, ConfigFile, feed, filepath, filestore +, ghcPaths, happstackServer, happstackUtil, highlightingKate +, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc +, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, text +, time, url, utf8String, xhtml, xml, xssSanitize, zlib }: cabal.mkDerivation (self: { @@ -12,10 +12,11 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - cgi ConfigFile feed filestore ghcPaths happstackServer - happstackUtil highlightingKate hslogger HStringTemplate HTTP json - mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb - text time url utf8String xhtml xml xssSanitize zlib + Cabal cgi ConfigFile feed filepath filestore ghcPaths + happstackServer happstackUtil highlightingKate hslogger + HStringTemplate HTTP json mtl network pandoc pandocTypes parsec + random recaptcha safe SHA syb text time url utf8String xhtml xml + xssSanitize zlib ]; meta = { homepage = "http://gitit.net"; diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index f1bae4ad9fe..0aea2274383 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -1,4 +1,4 @@ -{ cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade +{ cabal, Cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade , pkgconfig }: @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { pname = "glade"; version = "0.12.1"; sha256 = "114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990"; - buildDepends = [ glib gtk ]; + buildDepends = [ Cabal glib gtk ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ gtkC libglade ]; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index c60c776e60f..21516fb9f65 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -1,9 +1,10 @@ -{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig }: +{ cabal, Cabal, glib, gtk2hsBuildtools, libc, pkgconfig }: cabal.mkDerivation (self: { pname = "glib"; version = "0.12.2"; sha256 = "0p1d6j23yf30824q5gn7pw7s47hs4rnaqs69d2hn2pnzpc1ml3c6"; + buildDepends = [ Cabal ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 8d9c42c1243..dc25a6af204 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -1,10 +1,10 @@ -{ cabal, bmp, GLUT, OpenGL }: +{ cabal, bmp, Cabal, GLUT, OpenGL }: cabal.mkDerivation (self: { pname = "gloss"; version = "1.6.1.1"; sha256 = "0y0npw27ic23zx7fq7dmvwbz2r62wblw9nbyai9kxgff4m2p3j4m"; - buildDepends = [ bmp GLUT OpenGL ]; + buildDepends = [ bmp Cabal GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 006e0c3266f..8c7d7d20eaf 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,5 +1,5 @@ -{ cabal, colour, dlist, extensibleExceptions, fgl, polyparse, text -, transformers, wlPprintText +{ cabal, Cabal, colour, dlist, extensibleExceptions, fgl, filepath +, polyparse, text, transformers, wlPprintText }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - colour dlist extensibleExceptions fgl polyparse text transformers - wlPprintText + Cabal colour dlist extensibleExceptions fgl filepath polyparse text + transformers wlPprintText ]; meta = { homepage = "http://projects.haskell.org/graphviz/"; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 346caa1b72e..ddd808e9a44 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -1,12 +1,12 @@ -{ cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl, pango -, pkgconfig +{ cabal, Cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl +, pango, pkgconfig }: cabal.mkDerivation (self: { pname = "gtk"; version = "0.12.2"; sha256 = "0qjhy2adbqv03qbmh6ydga4axvj263n5srwpfrw4v5gk34fvyj9w"; - buildDepends = [ cairo glib mtl pango ]; + buildDepends = [ Cabal cairo glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib gtk ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 036067ec1aa..8a0bb262a3b 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -1,4 +1,4 @@ -{ cabal, alex, happy, random }: +{ cabal, alex, Cabal, filepath, happy, random }: cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl"; isLibrary = false; isExecutable = true; - buildDepends = [ random ]; + buildDepends = [ Cabal filepath random ]; buildTools = [ alex happy ]; meta = { homepage = "http://projects.haskell.org/gtk2hs/"; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 7ab1b1eda71..960867b873a 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -1,12 +1,12 @@ -{ cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl -, pkgconfig +{ cabal, Cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc +, mtl, pkgconfig }: cabal.mkDerivation (self: { pname = "gtksourceview2"; version = "0.12.3"; sha256 = "0bhwvhwsg3mf4w94fl6z6qkn67i68hh3zwwhzqa59lia0nc233gd"; - buildDepends = [ glib gtk mtl ]; + buildDepends = [ Cabal glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ gtksourceview ]; diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix index 1f0f75ffeb8..58bb2a61266 100644 --- a/pkgs/development/libraries/haskell/hS3/default.nix +++ b/pkgs/development/libraries/haskell/hS3/default.nix @@ -1,5 +1,5 @@ -{ cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random -, regexCompat, utf8String +{ cabal, Cabal, Crypto, dataenc, HTTP, hxt, MissingH, network +, random, regexCompat, utf8String }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - Crypto dataenc HTTP hxt MissingH network random regexCompat + Cabal Crypto dataenc HTTP hxt MissingH network random regexCompat utf8String ]; meta = { diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index 2b6989dcf4b..37698cebb38 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -1,10 +1,10 @@ -{ cabal, tar }: +{ cabal, Cabal, filepath, tar }: cabal.mkDerivation (self: { pname = "hackage-db"; version = "1.3"; sha256 = "17l2aw2kzjpjzyrg0c5vlaglx0vl475g3wxwavvzrd60z9lb3cp9"; - buildDepends = [ tar ]; + buildDepends = [ Cabal filepath tar ]; meta = { homepage = "http://github.com/peti/hackage-db"; description = "provide access to the Hackage database via Data.Map"; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 9ccb5045c08..e19111eb077 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,6 +1,6 @@ -{ cabal, binary, blazeHtml, citeprocHs, cryptohash, hamlet, mtl -, pandoc, parsec, regexBase, regexTdfa, snapCore, snapServer -, tagsoup, time +{ cabal, binary, blazeHtml, Cabal, citeprocHs, cryptohash, filepath +, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa, snapCore +, snapServer, tagsoup, time }: cabal.mkDerivation (self: { @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { version = "3.2.6.1"; sha256 = "0chpg04rsp8lxzdj43wqs3wyc7i70hfi3raxdar6bhwxhfxgj4wn"; buildDepends = [ - binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec - regexBase regexTdfa snapCore snapServer tagsoup time + binary blazeHtml Cabal citeprocHs cryptohash filepath hamlet mtl + pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index c3cdf361217..e9ce8f939e9 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare -, text +{ cabal, blazeBuilder, blazeHtml, Cabal, failure, parsec +, shakespeare, text }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.10.8"; sha256 = "1vlp8vwaipz757vnd95gcdi9dkrpbgfdlsb3kgjivsj7rqbmxf7z"; buildDepends = [ - blazeBuilder blazeHtml failure parsec shakespeare text + blazeBuilder blazeHtml Cabal failure parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix index 6f39e82739d..06fde8d35d8 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-data.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix @@ -1,5 +1,5 @@ -{ cabal, binary, mtl, syb, sybWithClass, sybWithClassInstancesText -, text, time +{ cabal, binary, Cabal, mtl, syb, sybWithClass +, sybWithClassInstancesText, text, time }: cabal.mkDerivation (self: { @@ -9,7 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - binary mtl syb sybWithClass sybWithClassInstancesText text time + binary Cabal mtl syb sybWithClass sybWithClassInstancesText text + time ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index a0ec12802a0..97ec17f54fe 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -1,10 +1,10 @@ -{ cabal, hamlet, happstackServer, text }: +{ cabal, Cabal, hamlet, happstackServer, text }: cabal.mkDerivation (self: { pname = "happstack-hamlet"; version = "6.2.3"; sha256 = "0k8g0rx9ikfklsrry2hxmm4hxwn31ra004qllpn6aldg6dr2w5n1"; - buildDepends = [ hamlet happstackServer text ]; + buildDepends = [ Cabal hamlet happstackServer text ]; meta = { homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index c8e5e12cf4b..ca7514fe129 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -1,6 +1,7 @@ -{ cabal, blazeHtml, extensibleExceptions, happstackData -, happstackUtil, hslogger, html, MaybeT, mtl, network, parsec -, sendfile, syb, text, time, utf8String, xhtml, zlib +{ cabal, blazeHtml, Cabal, extensibleExceptions, filepath +, happstackData, happstackUtil, hslogger, html, MaybeT, mtl +, network, parsec, sendfile, syb, text, time, utf8String, xhtml +, zlib }: cabal.mkDerivation (self: { @@ -10,9 +11,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - blazeHtml extensibleExceptions happstackData happstackUtil hslogger - html MaybeT mtl network parsec sendfile syb text time utf8String - xhtml zlib + blazeHtml Cabal extensibleExceptions filepath happstackData + happstackUtil hslogger html MaybeT mtl network parsec sendfile syb + text time utf8String xhtml zlib ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index c2af99bafd5..e0f5ba67342 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -1,5 +1,5 @@ -{ cabal, extensibleExceptions, hslogger, mtl, network, parsec -, random, time, unixCompat +{ cabal, Cabal, extensibleExceptions, filepath, hslogger, mtl +, network, parsec, random, time, unixCompat }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - extensibleExceptions hslogger mtl network parsec random time - unixCompat + Cabal extensibleExceptions filepath hslogger mtl network parsec + random time unixCompat ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index ba4c0312f9b..4a9c110a199 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "hashable"; version = "1.1.2.2"; sha256 = "0gfg1cyd468czfv5xfhn7rz0r5s0v378c4xjlm6kkw7n10n2zg8y"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index 441dac7a4df..eefc5b87282 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -1,4 +1,6 @@ -{ cabal, binary, dataenc, extensibleExceptions, mmap, mtl, zlib }: +{ cabal, binary, Cabal, dataenc, extensibleExceptions, filepath +, mmap, mtl, zlib +}: cabal.mkDerivation (self: { pname = "hashed-storage"; @@ -7,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - binary dataenc extensibleExceptions mmap mtl zlib + binary Cabal dataenc extensibleExceptions filepath mmap mtl zlib ]; meta = { description = "Hashed file storage support code"; diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index 56b2316a5f9..c314752970d 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -1,10 +1,10 @@ -{ cabal, hashable, primitive, vector }: +{ cabal, Cabal, hashable, primitive, vector }: cabal.mkDerivation (self: { pname = "hashtables"; version = "1.0.1.2"; sha256 = "09lviwxwlhvhrgm7v66w0vd7j02s0191w1izsvwh1a3dj2vc7vw7"; - buildDepends = [ hashable primitive vector ]; + buildDepends = [ Cabal hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; description = "Mutable hash tables in the ST monad"; diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix index acf6a6c0d4f..2134d22e88e 100644 --- a/pkgs/development/libraries/haskell/haskeline-class/default.nix +++ b/pkgs/development/libraries/haskell/haskeline-class/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskeline, mtl }: +{ cabal, Cabal, haskeline, mtl }: cabal.mkDerivation (self: { pname = "haskeline-class"; version = "0.6.2"; sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl"; - buildDepends = [ haskeline mtl ]; + buildDepends = [ Cabal haskeline mtl ]; meta = { homepage = "http://community.haskell.org/~aslatter/code/haskeline-class"; description = "Class interface for working with Haskeline"; diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index f3cd0fd4aed..51b853a14da 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -1,10 +1,14 @@ -{ cabal, extensibleExceptions, mtl, terminfo, utf8String }: +{ cabal, Cabal, extensibleExceptions, filepath, mtl, terminfo +, utf8String +}: cabal.mkDerivation (self: { pname = "haskeline"; version = "0.6.4.6"; sha256 = "136h71rb50sypkdbnk849mbcgfzx3y4hfxmx2c7kf90zpmsx5wmj"; - buildDepends = [ extensibleExceptions mtl terminfo utf8String ]; + buildDepends = [ + Cabal extensibleExceptions filepath mtl terminfo utf8String + ]; meta = { homepage = "http://trac.haskell.org/haskeline"; description = "A command-line interface for user input, written in Haskell"; diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix index 90c4a599bc4..74b20c01aaa 100644 --- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix +++ b/pkgs/development/libraries/haskell/haskell-lexer/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "haskell-lexer"; version = "1.0"; sha256 = "86d0c4071295c8613eb965768cb61a0c8422fc0c429a49c7a93e93a72b185b86"; + buildDepends = [ Cabal ]; meta = { description = "A fully compliant Haskell 98 lexer"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix index 649bf29f58f..f0648c65567 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix @@ -1,10 +1,10 @@ -{ cabal, cpphs, happy }: +{ cabal, Cabal, cpphs, happy }: cabal.mkDerivation (self: { pname = "haskell-src-exts"; version = "1.11.1"; sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6"; - buildDepends = [ cpphs ]; + buildDepends = [ Cabal cpphs ]; buildTools = [ happy ]; meta = { homepage = "http://code.haskell.org/haskell-src-exts"; diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index fc377e554a6..51256ed31e4 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcExts, syb, thLift }: +{ cabal, Cabal, haskellSrcExts, syb, thLift }: cabal.mkDerivation (self: { pname = "haskell-src-meta"; version = "0.5.0.3"; sha256 = "0c270088b5p3drr3f75ln210py2h4dfkkfgvly3ry42yl6xkvm2j"; - buildDepends = [ haskellSrcExts syb thLift ]; + buildDepends = [ Cabal haskellSrcExts syb thLift ]; meta = { description = "Parse source to template-haskell abstract syntax"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix index 0bec7376544..c9ec5a30fe2 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix @@ -1,9 +1,10 @@ -{ cabal, happy }: +{ cabal, Cabal, happy }: cabal.mkDerivation (self: { pname = "haskell-src"; version = "1.0.1.3"; sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89"; + buildDepends = [ Cabal ]; buildTools = [ happy ]; meta = { description = "Manipulating Haskell source code"; diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix index 949efadea96..fd0f5e16fe0 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix @@ -1,10 +1,10 @@ -{ cabal, happy, syb }: +{ cabal, Cabal, happy, syb }: cabal.mkDerivation (self: { pname = "haskell-src"; version = "1.0.1.4"; sha256 = "02h33d7970641p9vi62sgcxb5v4yaz8xx9vf2yxyvxs3hglm7f0j"; - buildDepends = [ syb ]; + buildDepends = [ Cabal syb ]; buildTools = [ happy ]; meta = { description = "Support for manipulating Haskell source code"; diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix index dd62d57a02a..77e6e566ba2 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix @@ -1,10 +1,10 @@ -{ cabal, happy, syb }: +{ cabal, Cabal, happy, syb }: cabal.mkDerivation (self: { pname = "haskell-src"; version = "1.0.1.5"; sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz"; - buildDepends = [ syb ]; + buildDepends = [ Cabal syb ]; buildTools = [ happy ]; meta = { description = "Support for manipulating Haskell source code"; diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index 906df662fa7..67419bb08d0 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -1,10 +1,14 @@ -{ cabal, blazeBuilder, ieee754, mtl, syb, text, utf8String }: +{ cabal, blazeBuilder, Cabal, filepath, ieee754, mtl, syb, text +, utf8String +}: cabal.mkDerivation (self: { pname = "hastache"; version = "0.3.3"; sha256 = "18ayrfwi3jn3q650m5dm9wx9c7djwc2miz3mxlscd9gzlnrfi772"; - buildDepends = [ blazeBuilder ieee754 mtl syb text utf8String ]; + buildDepends = [ + blazeBuilder Cabal filepath ieee754 mtl syb text utf8String + ]; meta = { homepage = "http://github.com/lymar/hastache"; description = "Haskell implementation of Mustache templates"; diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix index 83917cf8891..af95878aca0 100644 --- a/pkgs/development/libraries/haskell/haxr-th/default.nix +++ b/pkgs/development/libraries/haskell/haxr-th/default.nix @@ -1,10 +1,10 @@ -{ cabal, haxr }: +{ cabal, Cabal, haxr }: cabal.mkDerivation (self: { pname = "haxr-th"; version = "3000.5"; sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif"; - buildDepends = [ haxr ]; + buildDepends = [ Cabal haxr ]; meta = { homepage = "http://www.haskell.org/haxr/"; description = "Automatic deriving of XML-RPC structs for Haskell records"; diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 5caea80d6c8..1191d6b7411 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeBuilder, dataenc, HaXml, HTTP, mtl, network, time -, utf8String +{ cabal, blazeBuilder, Cabal, dataenc, HaXml, HTTP, mtl, network +, time, utf8String }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "3000.8.5"; sha256 = "1gfifqc7ldklapnymwd9ss0lll6q87sbg1hc6pa4c9sh275x1rz6"; buildDepends = [ - blazeBuilder dataenc HaXml HTTP mtl network time utf8String + blazeBuilder Cabal dataenc HaXml HTTP mtl network time utf8String ]; meta = { homepage = "http://www.haskell.org/haskellwiki/HaXR"; diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index a6eae113100..ad4b6cde79f 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -1,4 +1,5 @@ -{ cabal, blazeHtml, mtl, parsec, regexPcreBuiltin }: +{ cabal, blazeHtml, Cabal, filepath, mtl, parsec, regexPcreBuiltin +}: cabal.mkDerivation (self: { pname = "highlighting-kate"; @@ -6,7 +7,9 @@ cabal.mkDerivation (self: { sha256 = "1kn73gcjhndb5wbdy9hbjgar1bdcmy8cy831ib4ik1fn62zmvxrf"; isLibrary = true; isExecutable = true; - buildDepends = [ blazeHtml mtl parsec regexPcreBuiltin ]; + buildDepends = [ + blazeHtml Cabal filepath mtl parsec regexPcreBuiltin + ]; meta = { homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index 021477863a6..d4a8036e88b 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -1,5 +1,5 @@ -{ cabal, extensibleExceptions, ghcMtl, ghcPaths, haskellSrc -, MonadCatchIOMtl, mtl, random, utf8String +{ cabal, Cabal, extensibleExceptions, filepath, ghcMtl, ghcPaths +, haskellSrc, MonadCatchIOMtl, mtl, random, utf8String }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.3.3.4"; sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy"; buildDepends = [ - extensibleExceptions ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl - random utf8String + Cabal extensibleExceptions filepath ghcMtl ghcPaths haskellSrc + MonadCatchIOMtl mtl random utf8String ]; meta = { homepage = "http://darcsden.com/jcpetruzza/hint"; diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 588a6006f7e..ff2225a8078 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, languageJavascript, text }: +{ cabal, blazeBuilder, Cabal, languageJavascript, text }: cabal.mkDerivation (self: { pname = "hjsmin"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k"; isLibrary = true; isExecutable = true; - buildDepends = [ blazeBuilder languageJavascript text ]; + buildDepends = [ blazeBuilder Cabal languageJavascript text ]; meta = { homepage = "http://github.com/alanz/hjsmin"; description = "Haskell implementation of a javascript minifier"; diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index aa17a1a7d92..525fd822dcd 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,5 +1,5 @@ -{ cabal, cmdargs, HUnit, mtl, parsec, regexpr, safe, split, time -, utf8String +{ cabal, Cabal, cmdargs, filepath, HUnit, mtl, parsec, regexpr +, safe, split, time, utf8String }: cabal.mkDerivation (self: { @@ -7,7 +7,8 @@ cabal.mkDerivation (self: { version = "0.17"; sha256 = "0dlm3hjbcf48nzz597ag1q9y0phsc09062wvzpmfkhk4hsijpds4"; buildDepends = [ - cmdargs HUnit mtl parsec regexpr safe split time utf8String + Cabal cmdargs filepath HUnit mtl parsec regexpr safe split time + utf8String ]; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hledger-vty/default.nix b/pkgs/development/libraries/haskell/hledger-vty/default.nix index 0a6dd1cf202..386560d96aa 100644 --- a/pkgs/development/libraries/haskell/hledger-vty/default.nix +++ b/pkgs/development/libraries/haskell/hledger-vty/default.nix @@ -1,4 +1,6 @@ -{ cabal, cmdargs, hledger, hledgerLib, HUnit, safe, time, vty }: +{ cabal, Cabal, cmdargs, hledger, hledgerLib, HUnit, safe, time +, vty +}: cabal.mkDerivation (self: { pname = "hledger-vty"; @@ -6,7 +8,9 @@ cabal.mkDerivation (self: { sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188"; isLibrary = false; isExecutable = true; - buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ]; + buildDepends = [ + Cabal cmdargs hledger hledgerLib HUnit safe time vty + ]; meta = { homepage = "http://hledger.org"; description = "A curses-style console interface for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 692e57cad94..7fd0c6c72d1 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,7 +1,7 @@ -{ cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs -, dataObject, dataObjectYaml, failure, fileEmbed, hamlet, hledger -, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe -, shakespeareCss, shakespeareJs, shakespeareText, text, time +{ cabal, aeson, blazeHtml, Cabal, cabalFileTh, clientsession +, cmdargs, dataObject, dataObjectYaml, failure, fileEmbed, filepath +, hamlet, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr +, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time , transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm , yesodJson, yesodStatic }: @@ -13,9 +13,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - aeson blazeHtml cabalFileTh clientsession cmdargs dataObject - dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit - ioStorage parsec regexpr safe shakespeareCss shakespeareJs + aeson blazeHtml Cabal cabalFileTh clientsession cmdargs dataObject + dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib + HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs shakespeareText text time transformers wai waiExtra warp yesod yesodCore yesodForm yesodJson yesodStatic ]; diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 6184f551e0c..e8d2c9ac5c5 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,5 +1,6 @@ -{ cabal, cabalFileTh, cmdargs, csv, haskeline, hledgerLib, HUnit -, mtl, parsec, regexpr, safe, split, time, utf8String +{ cabal, Cabal, cabalFileTh, cmdargs, csv, filepath, haskeline +, hledgerLib, HUnit, mtl, parsec, regexpr, safe, split, time +, utf8String }: cabal.mkDerivation (self: { @@ -9,8 +10,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - cabalFileTh cmdargs csv haskeline hledgerLib HUnit mtl parsec - regexpr safe split time utf8String + Cabal cabalFileTh cmdargs csv filepath haskeline hledgerLib HUnit + mtl parsec regexpr safe split time utf8String ]; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index c87e507c485..7ef87a8dcfb 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -1,10 +1,12 @@ -{ cabal, binary, blas, gsl, liblapack, storableComplex, vector }: +{ cabal, binary, blas, Cabal, gsl, liblapack, storableComplex +, vector +}: cabal.mkDerivation (self: { pname = "hmatrix"; version = "0.13.1.0"; sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp"; - buildDepends = [ binary storableComplex vector ]; + buildDepends = [ binary Cabal storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; configureFlags = "-fvector"; meta = { diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix index fec3f5dccf4..2f2e72059a1 100644 --- a/pkgs/development/libraries/haskell/hopenssl/default.nix +++ b/pkgs/development/libraries/haskell/hopenssl/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, openssl }: +{ cabal, Cabal, mtl, openssl }: cabal.mkDerivation (self: { pname = "hopenssl"; version = "1.6.1"; sha256 = "75ba42c5e9b02c09057c5aa25f577bdfe5214533fbd2921ac555897ade85958a"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; extraLibraries = [ openssl ]; meta = { homepage = "http://gitorious.org/hopenssl"; diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix index 69653ca2699..52caa9cdcee 100644 --- a/pkgs/development/libraries/haskell/hostname/default.nix +++ b/pkgs/development/libraries/haskell/hostname/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "hostname"; version = "1.0"; sha256 = "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv"; + buildDepends = [ Cabal ]; meta = { description = "A very simple package providing a cross-platform means of determining the hostname"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix index f1634f632a3..045c8678f65 100644 --- a/pkgs/development/libraries/haskell/hp2any-core/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec, network, time }: +{ cabal, attoparsec, Cabal, filepath, network, time }: cabal.mkDerivation (self: { pname = "hp2any-core"; version = "0.11.1"; sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546"; - buildDepends = [ attoparsec network time ]; + buildDepends = [ attoparsec Cabal filepath network time ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Hp2any"; description = "Heap profiling helper library"; diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index 5c035be0b02..5dbb580bd17 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -1,5 +1,5 @@ -{ cabal, freeglut, GLUT, hp2anyCore, mesa, network, OpenGL -, parseargs +{ cabal, Cabal, filepath, freeglut, GLUT, hp2anyCore, mesa, network +, OpenGL, parseargs }: cabal.mkDerivation (self: { @@ -8,7 +8,9 @@ cabal.mkDerivation (self: { sha256 = "1al20pxfgkgwynrx7vr0i57342s91lcm3cnd9qjx8b6vkqmzykkq"; isLibrary = true; isExecutable = true; - buildDepends = [ GLUT hp2anyCore network OpenGL parseargs ]; + buildDepends = [ + Cabal filepath GLUT hp2anyCore network OpenGL parseargs + ]; extraLibraries = [ freeglut mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Hp2any"; diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index ebba81acf4f..d89b48ae8e5 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, Cabal, syb }: cabal.mkDerivation (self: { pname = "hs-bibutils"; version = "4.12"; sha256 = "0akxi69as7k5c0955yla9wcl1xvcvgzpzy3p1jj781w1lf89p537"; - buildDepends = [ syb ]; + buildDepends = [ Cabal syb ]; meta = { homepage = "http://code.haskell.org/hs-bibutils"; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix index 9992faf048c..e8db094f9a4 100644 --- a/pkgs/development/libraries/haskell/hscolour/default.nix +++ b/pkgs/development/libraries/haskell/hscolour/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "hscolour"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "17wzd1b7kd4di7djj8d203rn6r1zvd6rykpxhqv7j06kzgx2r7bz"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~malcolm/hscolour/"; description = "Colourise Haskell code"; diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index 2a83df47f09..ba9b033ff36 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -1,10 +1,10 @@ -{ cabal, adns, network }: +{ cabal, adns, Cabal, network }: cabal.mkDerivation (self: { pname = "hsdns"; version = "1.5"; sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399"; - buildDepends = [ network ]; + buildDepends = [ Cabal network ]; extraLibraries = [ adns ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index 3ba0249c4df..fbf35824d16 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec }: +{ cabal, Cabal, mtl, parsec }: cabal.mkDerivation (self: { pname = "hsemail"; version = "1.7.1"; sha256 = "0059015ab93d5facf6060404984a295090ebfc667ae5b84b283163e126805a9e"; - buildDepends = [ mtl parsec ]; + buildDepends = [ Cabal mtl parsec ]; meta = { homepage = "http://gitorious.org/hsemail"; description = "Internet Message Parsers"; diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix index 4ee2f0e75df..31de0b7575f 100644 --- a/pkgs/development/libraries/haskell/hslogger-template/default.nix +++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix @@ -1,10 +1,10 @@ -{ cabal, hslogger, mtl }: +{ cabal, Cabal, hslogger, mtl }: cabal.mkDerivation (self: { pname = "hslogger-template"; version = "2.0.0"; sha256 = "1x8c132ckxjhnhlrnm92h0hkalkrgcc91cn73kv9kvcwy9b2fqcr"; - buildDepends = [ hslogger mtl ]; + buildDepends = [ Cabal hslogger mtl ]; meta = { description = "Automatic generation of hslogger functions"; license = self.stdenv.lib.licenses.publicDomain; diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix index c1ee264ea84..9ac0ec4a5f7 100644 --- a/pkgs/development/libraries/haskell/hspread/default.nix +++ b/pkgs/development/libraries/haskell/hspread/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, extensibleExceptions, network }: +{ cabal, binary, Cabal, extensibleExceptions, network }: cabal.mkDerivation (self: { pname = "hspread"; version = "0.3.3"; sha256 = "6e8a9ecc1a6b1cc767aa188e2f4c04b77b321fd14000cac8f71dd6a7b82afbfc"; - buildDepends = [ binary extensibleExceptions network ]; + buildDepends = [ binary Cabal extensibleExceptions network ]; meta = { description = "A client library for the spread toolkit"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index baa19065041..c5359080ef7 100755 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "hsyslog"; version = "1.4"; sha256 = "f3bf4bf47565cb0245afb0e8ffa3f79635b02f0032081845a5999964d828f4db"; + buildDepends = [ Cabal ]; meta = { homepage = "http://gitorious.org/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001."; diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/1.0.1.2.nix index f420bad2959..65bfe35c370 100644 --- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix +++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "html"; version = "1.0.1.2"; sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061"; + buildDepends = [ Cabal ]; meta = { description = "HTML combinator library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 6621f13df8e..3fc5ce16248 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,9 +1,9 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring -, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate -, conduit, cookie, cprngAes, dataDefault, failure, httpTypes -, liftedBase, monadControl, mtl, network, regexCompat, socks, text -, time, tls, tlsExtra, transformers, transformersBase, utf8String -, zlibConduit +, blazeBuilder, blazeBuilderConduit, Cabal, caseInsensitive +, certificate, conduit, cookie, cprngAes, dataDefault, failure +, httpTypes, liftedBase, monadControl, mtl, network, regexCompat +, socks, text, time, tls, tlsExtra, transformers, transformersBase +, utf8String, zlibConduit }: cabal.mkDerivation (self: { @@ -12,10 +12,10 @@ cabal.mkDerivation (self: { sha256 = "0gspqkydw5v4wb9s0ipy5s708nmqp3phkh3j95mzn6nlbk2r9kvn"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder - blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault failure httpTypes liftedBase monadControl mtl - network regexCompat socks text time tls tlsExtra transformers - transformersBase utf8String zlibConduit + blazeBuilderConduit Cabal caseInsensitive certificate conduit + cookie cprngAes dataDefault failure httpTypes liftedBase + monadControl mtl network regexCompat socks text time tls tlsExtra + transformers transformersBase utf8String zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index 1fbcc40a814..551fd912211 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -1,10 +1,10 @@ -{ cabal, attoparsec }: +{ cabal, attoparsec, Cabal }: cabal.mkDerivation (self: { pname = "http-date"; version = "0.0.1"; sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd"; - buildDepends = [ attoparsec ]; + buildDepends = [ attoparsec Cabal ]; meta = { description = "HTTP Date parser/formatter"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 25346362b88..4890f5e3292 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -1,5 +1,5 @@ { cabal, asn1Data, attoparsec, attoparsecEnumerator -, base64Bytestring, blazeBuilder, blazeBuilderEnumerator +, base64Bytestring, blazeBuilder, blazeBuilderEnumerator, Cabal , caseInsensitive, certificate, cprngAes, dataDefault, enumerator , failure, httpTypes, monadControl, network, tls, tlsExtra , transformers, utf8String, zlibEnum @@ -13,9 +13,9 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ asn1Data attoparsec attoparsecEnumerator base64Bytestring - blazeBuilder blazeBuilderEnumerator caseInsensitive certificate - cprngAes dataDefault enumerator failure httpTypes monadControl - network tls tlsExtra transformers utf8String zlibEnum + blazeBuilder blazeBuilderEnumerator Cabal caseInsensitive + certificate cprngAes dataDefault enumerator failure httpTypes + monadControl network tls tlsExtra transformers utf8String zlibEnum ]; meta = { homepage = "http://github.com/snoyberg/http-enumerator"; diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 0c7f78c65c2..5c49527b116 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, caseInsensitive, text }: +{ cabal, blazeBuilder, Cabal, caseInsensitive, text }: cabal.mkDerivation (self: { pname = "http-types"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1dkp2iqqalrm381vagw65bhjnm80hv02h28447lmjl2j60b4mby0"; isLibrary = true; isExecutable = true; - buildDepends = [ blazeBuilder caseInsensitive text ]; + buildDepends = [ blazeBuilder Cabal caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; description = "Generic HTTP types for Haskell (for both client and server code)"; diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index e56a95437db..19bf6736ff5 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -1,4 +1,4 @@ -{ cabal, network }: +{ cabal, Cabal, network }: cabal.mkDerivation (self: { pname = "httpd-shed"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "c03f784742bdc3053c7e867e587ee859a9a3adaa082d36bdb2ea69da1b02069f"; isLibrary = true; isExecutable = true; - buildDepends = [ network ]; + buildDepends = [ Cabal network ]; meta = { description = "A simple web-server with an interact style API"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix index 9e2b9a21bb3..8b104f1fb6c 100644 --- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix +++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "hxt-charproperties"; version = "9.1.1"; sha256 = "14xv0q1hh0k8lgispc4fa49cvyg9s7936kp42vr9b0pyd1q4zid8"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Character properties and classes for XML and Unicode"; diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index c18bdea3875..ccd68b6b08d 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -1,10 +1,10 @@ -{ cabal, hxtCharproperties, parsec }: +{ cabal, Cabal, hxtCharproperties, parsec }: cabal.mkDerivation (self: { pname = "hxt-regex-xmlschema"; version = "9.0.4"; sha256 = "0jl89p9sb76zb6j2b9ssxaai6jq3jbnnpv4v05wfvlmk8apckwgf"; - buildDepends = [ hxtCharproperties parsec ]; + buildDepends = [ Cabal hxtCharproperties parsec ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; description = "A regular expression library for W3C XML Schema regular expressions"; diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix index 6584a69b4ba..4dd6f195ee7 100644 --- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix +++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix @@ -1,10 +1,10 @@ -{ cabal, hxtCharproperties }: +{ cabal, Cabal, hxtCharproperties }: cabal.mkDerivation (self: { pname = "hxt-unicode"; version = "9.0.2"; sha256 = "1ri3198j0bavgam861yiiisl43rh4pbkmji7g6v3jnnch7834hdd"; - buildDepends = [ hxtCharproperties ]; + buildDepends = [ Cabal hxtCharproperties ]; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"; diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 7a3a5fdcb94..15e488d4577 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, deepseq, HUnit, hxtCharproperties +{ cabal, binary, Cabal, deepseq, filepath, HUnit, hxtCharproperties , hxtRegexXmlschema, hxtUnicode, mtl, network, parsec }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "9.2.0"; sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc"; buildDepends = [ - binary deepseq HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode - mtl network parsec + binary Cabal deepseq filepath HUnit hxtCharproperties + hxtRegexXmlschema hxtUnicode mtl network parsec ]; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix index 3a731c62623..a2c88adefe4 100644 --- a/pkgs/development/libraries/haskell/ieee754/default.nix +++ b/pkgs/development/libraries/haskell/ieee754/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "ieee754"; version = "0.7.3"; sha256 = "0gq747h15inxbxbgmzmchb9a8p57rhv3bmj69idx5arh0d3whgv0"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 2a51e8d344b..7023bc12daf 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, Cabal, syb }: cabal.mkDerivation (self: { pname = "instant-generics"; version = "0.3.4"; sha256 = "0j3sfbw3j0izwmhvwcl8nxxvlrpfla5rngxx2yvl6w5i87wyhswi"; - buildDepends = [ syb ]; + buildDepends = [ Cabal syb ]; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix index 55b88ac1d36..26eedf5b94f 100644 --- a/pkgs/development/libraries/haskell/io-storage/default.nix +++ b/pkgs/development/libraries/haskell/io-storage/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "io-storage"; version = "0.3"; sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/willdonnelly/io-storage"; description = "A key-value store in the IO monad"; diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index c7e222e1d14..1e6379b1543 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec }: +{ cabal, Cabal, parsec }: cabal.mkDerivation (self: { pname = "irc"; version = "0.5.0.0"; sha256 = "0bid9iqgrppkl7hl1cd2m1pvvk5qva53fqfl0v5ld52j904c50sr"; - buildDepends = [ parsec ]; + buildDepends = [ Cabal parsec ]; meta = { description = "A small library for parsing IRC messages"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 670055a7dec..ee53c99c6e4 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -1,4 +1,5 @@ -{ cabal, ListLike, MonadCatchIOTransformers, parallel, transformers +{ cabal, Cabal, ListLike, MonadCatchIOTransformers, parallel +, transformers }: cabal.mkDerivation (self: { @@ -8,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - ListLike MonadCatchIOTransformers parallel transformers + Cabal ListLike MonadCatchIOTransformers parallel transformers ]; meta = { homepage = "http://www.tiresiaspress.us/haskell/iteratee"; diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix index a7fc6b7e6e1..8d580993eee 100644 --- a/pkgs/development/libraries/haskell/ivor/default.nix +++ b/pkgs/development/libraries/haskell/ivor/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, mtl, parsec }: +{ cabal, binary, Cabal, mtl, parsec }: cabal.mkDerivation (self: { pname = "ivor"; version = "0.1.14.1"; sha256 = "0r9ykfkxpwsrhsvv691r361pf79a7y511hxy2mvd6ysz1441mych"; - buildDepends = [ binary mtl parsec ]; + buildDepends = [ binary Cabal mtl parsec ]; meta = { homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/"; description = "Theorem proving library based on dependent type theory"; diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix index 872f2fb394f..7dec5d03665 100644 --- a/pkgs/development/libraries/haskell/jpeg/default.nix +++ b/pkgs/development/libraries/haskell/jpeg/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "jpeg"; version = "0.0.1"; sha256 = "848e047cfec5781a28f472e9cd27d016362211d88dd6adb4f826c37d29d8bba6"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { description = "A library for decoding JPEG files written in pure Haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix index 1e4629166fa..6190e6e3f6f 100644 --- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix +++ b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, blazeBuilderEnumerator, enumerator +{ cabal, blazeBuilder, blazeBuilderEnumerator, Cabal, enumerator , jsonTypes, text, transformers }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.0.1.2"; sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d"; buildDepends = [ - blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text + blazeBuilder blazeBuilderEnumerator Cabal enumerator jsonTypes text transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix index 44be8624a41..04af2f7a1a2 100644 --- a/pkgs/development/libraries/haskell/jsonTypes/default.nix +++ b/pkgs/development/libraries/haskell/jsonTypes/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "json-types"; version = "0.1"; sha256 = "088if9qv0didjyb6y1583viihjgc4nwr61qfjqdg9rzc2ya6vqdn"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { description = "Basic types for representing JSON"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index d0ecb017dba..33516b5c23d 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcExts, regexPosix }: +{ cabal, Cabal, haskellSrcExts, regexPosix }: cabal.mkDerivation (self: { pname = "language-haskell-extract"; version = "0.2.1"; sha256 = "0lmg16g3z8cx0vb037bk4j2nr3qvybfcqfsr8l6jk57b2nz3yhbf"; - buildDepends = [ haskellSrcExts regexPosix ]; + buildDepends = [ Cabal haskellSrcExts regexPosix ]; meta = { homepage = "http://github.com/finnsson/template-helper"; description = "Module to automatically extract functions from the local code"; diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 66dec535676..87e16be4a04 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,4 +1,4 @@ -{ cabal, alex, happy, mtl, utf8Light }: +{ cabal, alex, Cabal, happy, mtl, utf8Light }: cabal.mkDerivation (self: { pname = "language-javascript"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "029ncc7hdw3pi9fbnxd0knz7wy3jpj5wcfqsxzyk5dkwji6d95x1"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl utf8Light ]; + buildDepends = [ Cabal mtl utf8Light ]; buildTools = [ alex happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index d6716abe55f..c568ba26b78 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "largeword"; version = "1.0.1"; sha256 = "0kkkck220wap3ad2k6461ylhshiqbizv0qh35i2325fhqx892gyr"; + buildDepends = [ Cabal ]; meta = { homepage = "http://trac.haskell.org/largeword/wiki"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix index 5f2584cfef5..c9e07c05341 100644 --- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix +++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix @@ -1,5 +1,5 @@ -{ cabal, binary, binaryShared, deepseq, haddock, hslogger, ltk, mtl -, network, parsec, processLeksah, time +{ cabal, binary, binaryShared, Cabal, deepseq, filepath, haddock +, hslogger, ltk, mtl, network, parsec, processLeksah, time }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - binary binaryShared deepseq haddock hslogger ltk mtl network parsec - processLeksah time + binary binaryShared Cabal deepseq filepath haddock hslogger ltk mtl + network parsec processLeksah time ]; meta = { homepage = "http://leksah.org"; diff --git a/pkgs/development/libraries/haskell/leksah/process-leksah.nix b/pkgs/development/libraries/haskell/leksah/process-leksah.nix index 39e62a93d45..6c6637b9c2c 100644 --- a/pkgs/development/libraries/haskell/leksah/process-leksah.nix +++ b/pkgs/development/libraries/haskell/leksah/process-leksah.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "process-leksah"; version = "1.0.1.4"; sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv"; + buildDepends = [ Cabal filepath ]; meta = { description = "Process libraries"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index 3a2b6e4f86d..5369e1a70c6 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, network, time, utf8String }: +{ cabal, Cabal, filepath, mtl, network, time, utf8String }: cabal.mkDerivation (self: { pname = "libmpd"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "109bm5fgwmydh3bi93wxr6ac3gkp7pcvp4a8z226c1wlgc995zap"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl network time utf8String ]; + buildDepends = [ Cabal filepath mtl network time utf8String ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; description = "An MPD client library"; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 255570f6c6e..c148629b540 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -1,11 +1,12 @@ -{ cabal, baseUnicodeSymbols, monadControl, transformersBase }: +{ cabal, baseUnicodeSymbols, Cabal, monadControl, transformersBase +}: cabal.mkDerivation (self: { pname = "lifted-base"; version = "0.1.0.3"; sha256 = "1fk2jv8xwjb4xmzcx7h74nh14i3wf5mpifiki9rvq4hnrb7gdx36"; buildDepends = [ - baseUnicodeSymbols monadControl transformersBase + baseUnicodeSymbols Cabal monadControl transformersBase ]; meta = { homepage = "https://github.com/basvandijk/lifted-base"; diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix index 5f438fb4060..aa101ff1c87 100644 --- a/pkgs/development/libraries/haskell/logfloat/default.nix +++ b/pkgs/development/libraries/haskell/logfloat/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "logfloat"; version = "0.12.1"; sha256 = "1k13jjqv4df341hcj9hzrlisfx9wrsmyqvzi6ricx341d9z4ch05"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix index 103c11361e9..3f86a7922e9 100644 --- a/pkgs/development/libraries/haskell/ltk/default.nix +++ b/pkgs/development/libraries/haskell/ltk/default.nix @@ -1,10 +1,10 @@ -{ cabal, glib, gtk, haddock, mtl, parsec }: +{ cabal, Cabal, filepath, glib, gtk, haddock, mtl, parsec }: cabal.mkDerivation (self: { pname = "ltk"; version = "0.10.0.4"; sha256 = "1dp6dl8a0pfj6lx8n8a2y1j3c2z57k9pf81yr45qsp7wg53d6qhf"; - buildDepends = [ glib gtk haddock mtl parsec ]; + buildDepends = [ Cabal filepath glib gtk haddock mtl parsec ]; meta = { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index 266ffcd30f7..d649886495d 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -1,10 +1,10 @@ -{ cabal, erf, vector }: +{ cabal, Cabal, erf, vector }: cabal.mkDerivation (self: { pname = "math-functions"; version = "0.1.1.0"; sha256 = "0qb0hbfzd1g8cz3dkm8cs2wknz08b63vn7nljmynk794y64b1klp"; - buildDepends = [ erf vector ]; + buildDepends = [ Cabal erf vector ]; meta = { homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix index 1344f7759af..7dd0904a589 100644 --- a/pkgs/development/libraries/haskell/maude/default.nix +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, text }: +{ cabal, Cabal, parsec, text }: cabal.mkDerivation (self: { pname = "maude"; version = "0.3.0"; sha256 = "1z9bk4fzkbfiqqx4mv4cdlckchvcli2gcp40d04ravvj7x6yaghg"; - buildDepends = [ parsec text ]; + buildDepends = [ Cabal parsec text ]; meta = { homepage = "https://github.com/davidlazar/maude-hs"; description = "An interface to the Maude rewriting system"; diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix index 3153bb6f608..0d77b382048 100644 --- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix +++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix @@ -1,10 +1,10 @@ -{ cabal, random }: +{ cabal, Cabal, random }: cabal.mkDerivation (self: { pname = "mersenne-random-pure64"; version = "0.2.0.3"; sha256 = "0cyjfdl17n5al04vliykx0m7zncqh3201vn9b9fqfqqpmm61grqz"; - buildDepends = [ random ]; + buildDepends = [ Cabal random ]; meta = { homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index a8b7e733025..265e48945f5 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -1,10 +1,14 @@ -{ cabal, base64Bytestring, blazeBuilder, random, text }: +{ cabal, base64Bytestring, blazeBuilder, Cabal, filepath, random +, text +}: cabal.mkDerivation (self: { pname = "mime-mail"; version = "0.4.1.1"; sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4"; - buildDepends = [ base64Bytestring blazeBuilder random text ]; + buildDepends = [ + base64Bytestring blazeBuilder Cabal filepath random text + ]; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix index 817cae52295..bdb6a5b50c7 100644 --- a/pkgs/development/libraries/haskell/mmap/default.nix +++ b/pkgs/development/libraries/haskell/mmap/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "mmap"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0f08x9kmv3a03kz5a6dpxr30nks55cs9sp55qpn2jnw31qx6hg6p"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { description = "Memory mapped files for POSIX and Windows"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix index b3d9208bd25..94dc55e852b 100644 --- a/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix +++ b/pkgs/development/libraries/haskell/monad-control/0.2.0.3.nix @@ -1,10 +1,10 @@ -{ cabal, baseUnicodeSymbols, transformers }: +{ cabal, baseUnicodeSymbols, Cabal, transformers }: cabal.mkDerivation (self: { pname = "monad-control"; version = "0.2.0.3"; sha256 = "0z7wjilrx6phqs2gxwv65dy1n3mc0j8hj3adshkwy6z8ggj283nh"; - buildDepends = [ baseUnicodeSymbols transformers ]; + buildDepends = [ baseUnicodeSymbols Cabal transformers ]; meta = { homepage = "https://github.com/basvandijk/monad-control/"; description = "Lift control operations, like exception catching, through monad transformers"; diff --git a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix index bf4ca6d0042..00950682e22 100644 --- a/pkgs/development/libraries/haskell/monad-control/0.3.1.nix +++ b/pkgs/development/libraries/haskell/monad-control/0.3.1.nix @@ -1,11 +1,12 @@ -{ cabal, baseUnicodeSymbols, transformers, transformersBase }: +{ cabal, baseUnicodeSymbols, Cabal, transformers, transformersBase +}: cabal.mkDerivation (self: { pname = "monad-control"; version = "0.3.1"; sha256 = "0laqvbnj1dfcdxrybxdnzw5g95drv34ys0cbwkcw47nl9w801p45"; buildDepends = [ - baseUnicodeSymbols transformers transformersBase + baseUnicodeSymbols Cabal transformers transformersBase ]; meta = { homepage = "https://github.com/basvandijk/monad-control"; diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix index 669df22a951..b233bcea007 100644 --- a/pkgs/development/libraries/haskell/monad-loops/default.nix +++ b/pkgs/development/libraries/haskell/monad-loops/default.nix @@ -1,10 +1,10 @@ -{ cabal, stm }: +{ cabal, Cabal, stm }: cabal.mkDerivation (self: { pname = "monad-loops"; version = "0.3.1.1"; sha256 = "086aqd1x1xc6irp24z1lwhzrknw9r2wbs8fnxz6vyi75m3rqvdcv"; - buildDepends = [ stm ]; + buildDepends = [ Cabal stm ]; meta = { homepage = "http://code.haskell.org/~mokus/monad-loops"; description = "Monadic loops"; diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/default.nix index e8a2e298c98..806c11a3e11 100644 --- a/pkgs/development/libraries/haskell/monad-par/default.nix +++ b/pkgs/development/libraries/haskell/monad-par/default.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq, HUnit }: +{ cabal, Cabal, deepseq, HUnit }: cabal.mkDerivation (self: { pname = "monad-par"; version = "0.1.0.3"; sha256 = "1c0yclil152hv06c2sbgam9amd63nnzh7a4xsnxb05wgy93qs2mg"; - buildDepends = [ deepseq HUnit ]; + buildDepends = [ Cabal deepseq HUnit ]; meta = { homepage = "https://github.com/simonmar/monad-par"; description = "A library for parallel programming based on a monad"; diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix index 670b6aaf79b..02838ab4d88 100644 --- a/pkgs/development/libraries/haskell/monad-peel/default.nix +++ b/pkgs/development/libraries/haskell/monad-peel/default.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, transformers }: +{ cabal, Cabal, extensibleExceptions, transformers }: cabal.mkDerivation (self: { pname = "monad-peel"; version = "0.1"; sha256 = "0q56hdjgbj7ykpjx5z8qlqqkngmgm5wzm9vwcd7v675k2ywcl3ys"; - buildDepends = [ extensibleExceptions transformers ]; + buildDepends = [ Cabal extensibleExceptions transformers ]; meta = { homepage = "http://andersk.mit.edu/haskell/monad-peel/"; description = "Lift control operations like exception catching through monad transformers"; diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 374521d36c5..97e28fdfb2f 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl -, network, parsec, random, randomShuffle, transformersBase +{ cabal, binary, bson, Cabal, cryptohash, liftedBase, monadControl +, mtl, network, parsec, random, randomShuffle, transformersBase }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "1.2.0"; sha256 = "0rffa13p889mxbbkj2bmqy3yada3mrhngvp8pp7qvrll1acm7s13"; buildDepends = [ - binary bson cryptohash liftedBase monadControl mtl network parsec - random randomShuffle transformersBase + binary bson Cabal cryptohash liftedBase monadControl mtl network + parsec random randomShuffle transformersBase ]; meta = { homepage = "http://github.com/TonyGen/mongoDB-haskell"; diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix index 31dd91a2d2f..063c8736328 100644 --- a/pkgs/development/libraries/haskell/mpppc/default.nix +++ b/pkgs/development/libraries/haskell/mpppc/default.nix @@ -1,10 +1,10 @@ -{ cabal, ansiTerminal, split, text }: +{ cabal, ansiTerminal, Cabal, split, text }: cabal.mkDerivation (self: { pname = "mpppc"; version = "0.1.2"; sha256 = "1zms71wx5a6rd60xy1pv6g1kxlx0hzh36pbr5a5lkfflc583z1k5"; - buildDepends = [ ansiTerminal split text ]; + buildDepends = [ ansiTerminal Cabal split text ]; meta = { description = "Multi-dimensional parametric pretty-printer with color"; license = "GPL"; diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix index d609fc75cd7..174b3b2902a 100644 --- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "mtl"; version = "1.1.0.2"; sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36"; + buildDepends = [ Cabal ]; meta = { description = "Monad transformer library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix index 05e84b90dd0..7f47ea5b444 100644 --- a/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix +++ b/pkgs/development/libraries/haskell/mtl/1.1.1.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "mtl"; version = "1.1.1.1"; sha256 = "157gbrgrg0l9r72nq45dkach53yncysif4qglsaql28g37djc4x6"; + buildDepends = [ Cabal ]; meta = { description = "Monad transformer library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix index dc2ddedc121..8024c76c4c5 100644 --- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix +++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, Cabal, transformers }: cabal.mkDerivation (self: { pname = "mtl"; version = "2.0.1.0"; sha256 = "1w6jpzyl08mringnd6gxwcl3y9q506r240vm1sv0aacml1hy8szk"; - buildDepends = [ transformers ]; + buildDepends = [ Cabal transformers ]; meta = { description = "Monad classes, using functional dependencies"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix index 349fea712eb..3f9b240fb37 100644 --- a/pkgs/development/libraries/haskell/mtlparse/default.nix +++ b/pkgs/development/libraries/haskell/mtlparse/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "mtlparse"; version = "0.1.2"; sha256 = "cd85d985e4eff842b1c053a2ff507094a20995c5757acc06ea34ff07d9edd142"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/"; description = "parse library using mtl package"; diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 5f12e4cee92..9acb58bc959 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,4 +1,4 @@ -{ cabal, explicitException, QuickCheck, text, transformers +{ cabal, Cabal, explicitException, QuickCheck, text, transformers , utf8String }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.1.0.0"; sha256 = "010mph49fq0rdr5dmm4pdlbmfmaaas8wffa9p1cgprs2ic1hnx3g"; buildDepends = [ - explicitException QuickCheck text transformers utf8String + Cabal explicitException QuickCheck text transformers utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index 13059f0183e..6680be9d579 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, Cabal, transformers }: cabal.mkDerivation (self: { pname = "multiplate"; version = "0.0.1.1"; sha256 = "00rxgkvgx1rfvk15gjyyg00vqyg4j24d8d19q6rj07j2mgfvdxw6"; - buildDepends = [ transformers ]; + buildDepends = [ Cabal transformers ]; meta = { homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index c001783a13b..b98ae57572c 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "multirec"; version = "0.7.1"; sha256 = "1a3snlv6lr9mi4nrl4cyc5ilk6flbdn0ck2sqla6dyb2zdlgf5ph"; + buildDepends = [ Cabal ]; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix index eb5df93d5bc..995e573f3e5 100644 --- a/pkgs/development/libraries/haskell/multiset/default.nix +++ b/pkgs/development/libraries/haskell/multiset/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "multiset"; version = "0.2.1"; sha256 = "0snlm6s9ikf5gngdwb7rm7v6017f5bffajv6777y56pjmd7bk9sy"; + buildDepends = [ Cabal ]; meta = { description = "The Data.MultiSet container type"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix index d20822244ef..1f5a48e333a 100644 --- a/pkgs/development/libraries/haskell/murmur-hash/default.nix +++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "murmur-hash"; version = "0.1.0.5"; sha256 = "1m7rm57bxkrl4i9fbvmx5m29axyxddrs4ss7plbd19pw3wsvgmr0"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/nominolo/murmur-hash"; description = "MurmurHash2 implementation for Haskell"; diff --git a/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix b/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix index ab762c2db63..f6219dbfecb 100644 --- a/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix +++ b/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, primitive, time, vector }: +{ cabal, Cabal, primitive, time, vector }: cabal.mkDerivation (self: { pname = "mwc-random"; version = "0.10.0.1"; sha256 = "0mmkl90rf57f2rxg3y2nibd37l9mwr2j4c71bwyvxqzfk7cylw9b"; - buildDepends = [ primitive time vector ]; + buildDepends = [ Cabal primitive time vector ]; meta = { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix b/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix index 5cf459fb0a9..faede83bb6f 100644 --- a/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix +++ b/pkgs/development/libraries/haskell/mwc-random/0.11.0.0.nix @@ -1,10 +1,10 @@ -{ cabal, primitive, time, vector }: +{ cabal, Cabal, primitive, time, vector }: cabal.mkDerivation (self: { pname = "mwc-random"; version = "0.11.0.0"; sha256 = "1yqi472m3snx71fvd4mig6my74rkpf3sbsdcmx2y2l00cyk79ghh"; - buildDepends = [ primitive time vector ]; + buildDepends = [ Cabal primitive time vector ]; meta = { homepage = "https://github.com/bos/mwc-random"; description = "Fast, high quality pseudo random number generation"; diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix index e5b3e6a8c48..f16315c967f 100644 --- a/pkgs/development/libraries/haskell/neither/default.nix +++ b/pkgs/development/libraries/haskell/neither/default.nix @@ -1,10 +1,10 @@ -{ cabal, failure, transformers }: +{ cabal, Cabal, failure, transformers }: cabal.mkDerivation (self: { pname = "neither"; version = "0.3.1"; sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk"; - buildDepends = [ failure transformers ]; + buildDepends = [ Cabal failure transformers ]; meta = { homepage = "http://github.com/snoyberg/neither"; description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix index 7d99df9ee1c..313bddd84cb 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix @@ -1,10 +1,10 @@ -{ cabal, parsec }: +{ cabal, Cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.2.1.4"; sha256 = "16a842bee5db116f754b459ef261426b6705a6d79383c6d545c9df5f6329cd25"; - buildDepends = [ parsec ]; + buildDepends = [ Cabal parsec ]; meta = { description = "Networking-related facilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix index ba33bc36643..248281ff0d3 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix @@ -1,10 +1,10 @@ -{ cabal, parsec }: +{ cabal, Cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.2.1.7"; sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58"; - buildDepends = [ parsec ]; + buildDepends = [ Cabal parsec ]; meta = { description = "Networking-related facilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.11.nix b/pkgs/development/libraries/haskell/network/2.3.0.11.nix index 7007211a721..602fa228dff 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.11.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.11.nix @@ -1,10 +1,10 @@ -{ cabal, parsec }: +{ cabal, Cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.0.11"; sha256 = "1ghm8rw0m3x71pnndbmzm9j99yh8bmmrlhz4ykslsk2my7ihmxdk"; - buildDepends = [ parsec ]; + buildDepends = [ Cabal parsec ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix index 9d2642a487d..c4631e4a0ab 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix @@ -1,10 +1,10 @@ -{ cabal, parsec }: +{ cabal, Cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.0.2"; sha256 = "1s4hm0ilsd67ircrl0h5b72kwrw1imb3cj5z52h99bv7qjdbag03"; - buildDepends = [ parsec ]; + buildDepends = [ Cabal parsec ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix index bf9330eb256..ae689ce996b 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix @@ -1,10 +1,10 @@ -{ cabal, parsec }: +{ cabal, Cabal, parsec }: cabal.mkDerivation (self: { pname = "network"; version = "2.3.0.5"; sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; - buildDepends = [ parsec ]; + buildDepends = [ Cabal parsec ]; meta = { homepage = "http://github.com/haskell/network"; description = "Low-level networking interface"; diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix index 934bb76dcd4..5004d55017b 100644 --- a/pkgs/development/libraries/haskell/non-negative/default.nix +++ b/pkgs/development/libraries/haskell/non-negative/default.nix @@ -1,4 +1,4 @@ -{ cabal, QuickCheck, utilityHt }: +{ cabal, Cabal, QuickCheck, utilityHt }: cabal.mkDerivation (self: { pname = "non-negative"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0aebb6f5518191a02b11230798444997a03b84d63d2aaa6c38cac6718f6c351c"; isLibrary = true; isExecutable = true; - buildDepends = [ QuickCheck utilityHt ]; + buildDepends = [ Cabal QuickCheck utilityHt ]; meta = { homepage = "http://code.haskell.org/~thielema/non-negative/"; description = "Non-negative numbers"; diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index 94ec52e0ac7..631c183215e 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -1,4 +1,4 @@ -{ cabal, deepseq, nonNegative, parsec, QuickCheck, random +{ cabal, Cabal, deepseq, nonNegative, parsec, QuickCheck, random , storableRecord, utilityHt }: @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - deepseq nonNegative parsec QuickCheck random storableRecord + Cabal deepseq nonNegative parsec QuickCheck random storableRecord utilityHt ]; meta = { diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix index b55e0c50b4b..a236434f0be 100644 --- a/pkgs/development/libraries/haskell/numtype/default.nix +++ b/pkgs/development/libraries/haskell/numtype/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "numtype"; version = "1.0"; sha256 = "2606e81d7bcef0ba76b1e6ffc8d513c36fef5fefaab3bdd02da18761ec504e1f"; + buildDepends = [ Cabal ]; meta = { homepage = "http://dimensional.googlecode.com/"; description = "Type-level (low cardinality) integers"; diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 063fe6f45c5..def80594aac 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, Cabal, syb }: cabal.mkDerivation (self: { pname = "pandoc-types"; version = "1.9.0.2"; sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl"; - buildDepends = [ syb ]; + buildDepends = [ Cabal syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 7561253d4c0..472207f4b32 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,7 +1,7 @@ -{ cabal, base64Bytestring, blazeHtml, citeprocHs -, extensibleExceptions, highlightingKate, HTTP, json, mtl, network -, pandocTypes, parsec, random, syb, tagsoup, temporary, texmath -, time, utf8String, xml, zipArchive, zlib +{ cabal, base64Bytestring, blazeHtml, Cabal, citeprocHs +, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl +, network, pandocTypes, parsec, random, syb, tagsoup, temporary +, texmath, time, utf8String, xml, zipArchive, zlib }: cabal.mkDerivation (self: { @@ -11,9 +11,10 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml citeprocHs extensibleExceptions - highlightingKate HTTP json mtl network pandocTypes parsec random - syb tagsoup temporary texmath time utf8String xml zipArchive zlib + base64Bytestring blazeHtml Cabal citeprocHs extensibleExceptions + filepath highlightingKate HTTP json mtl network pandocTypes parsec + random syb tagsoup temporary texmath time utf8String xml zipArchive + zlib ]; configureFlags = "-fhighlighting -fthreaded"; meta = { diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 99e4d04f774..ded28f56571 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -1,11 +1,12 @@ -{ cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig +{ cabal, Cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango +, pkgconfig }: cabal.mkDerivation (self: { pname = "pango"; version = "0.12.2"; sha256 = "0kf9sw2ajqlvv9n685fbif7c8x1qnz4w3y3xqql3a1rv6s3kmqba"; - buildDepends = [ cairo glib mtl ]; + buildDepends = [ Cabal cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ cairo pango ]; diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix index 2977a60964c..435785d7fac 100644 --- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "parallel"; version = "1.1.0.1"; sha256 = "0885086660268f3626effacb29a02b5c81f3e5a8dfa99dabe0981ddbc407999f"; + buildDepends = [ Cabal ]; meta = { description = "parallel programming library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix index 185e86b02e8..651fc460e3f 100644 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "parallel"; version = "2.2.0.1"; sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix index 37d537185cb..166e6b0c1db 100644 --- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "parallel"; version = "3.1.0.1"; sha256 = "0j03i5467iyz98fl4fnzlwrr93j2as733kbrxnlcgyh455kb89ns"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix index 81d37e3a2b0..502e24f0928 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "parallel"; version = "3.2.0.2"; sha256 = "0sy67cdbwh17wng6b77h9hnkg59mgnyilwvirihmq9535jm9yml2"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { description = "Parallel programming library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index 4f50be5f700..8e718e32d24 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "parseargs"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ncdbjzfkhb1f3aznsci26kss9nrv3iilc65q5xdl9nly8p837mv"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://wiki.cs.pdx.edu/bartforge/parseargs"; description = "Command-line argument parsing library for Haskell programs"; diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix index 155e4f09007..f6a445821d3 100644 --- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "parsec"; version = "2.1.0.1"; sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/~daan/parsec.html"; description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix index e740ca91dba..1f9f952365a 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "parsec"; version = "3.1.1"; sha256 = "0x34gwn9k68h69c3hw7yaah6zpdwq8hvqss27f3n4n4cp7dh81fk"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://www.cs.uu.nl/~daan/parsec.html"; description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix index 95ef6219dbb..96cffcae137 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, text }: +{ cabal, Cabal, mtl, text }: cabal.mkDerivation (self: { pname = "parsec"; version = "3.1.2"; sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch"; - buildDepends = [ mtl text ]; + buildDepends = [ Cabal mtl text ]; meta = { homepage = "http://www.cs.uu.nl/~daan/parsec.html"; description = "Monadic parser combinators"; diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix index 55bc7f74d29..ac7ef78fdd1 100644 --- a/pkgs/development/libraries/haskell/parsimony/default.nix +++ b/pkgs/development/libraries/haskell/parsimony/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "parsimony"; version = "1.3"; sha256 = "0vbayvk989m85qfxxls74rn0v8ylb5l7lywp30sw2wybvi4r08lg"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { description = "Monadic parser combinators derived from Parsec"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix index 6230ac2e8a3..f1e39891aee 100755 --- a/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix +++ b/pkgs/development/libraries/haskell/path-pieces/0.0.0.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "path-pieces"; version = "0.0.0"; sha256 = "09sk4wlzy37gaii7spisjy4a3pizis9si4kv389bki20gfwpaivf"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "http://github.com/snoyberg/path-pieces"; description = "Components of paths"; diff --git a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix index 9c3c8dbc79a..118c025a94e 100755 --- a/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix +++ b/pkgs/development/libraries/haskell/path-pieces/0.1.0.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "path-pieces"; version = "0.1.0"; sha256 = "12dgiq2pz94pwa5v5wv96ps0nl5w23r44nnp4lm4cdhl063c9w8d"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "http://github.com/snoyberg/path-pieces"; description = "Components of paths"; diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix index 8c776e68b1a..6a3894739f7 100644 --- a/pkgs/development/libraries/haskell/pathtype/default.nix +++ b/pkgs/development/libraries/haskell/pathtype/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck }: +{ cabal, Cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "pathtype"; version = "0.5.2"; sha256 = "0rbmq6kzz2l07q9a5k888scpn62hnw2hmzz4ysprhfgdnn5b2cvi"; - buildDepends = [ QuickCheck ]; + buildDepends = [ Cabal QuickCheck ]; meta = { homepage = "http://code.haskell.org/pathtype"; description = "Type-safe replacement for System.FilePath etc"; diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix index 3336b8f1c8a..b15f200fa7d 100644 --- a/pkgs/development/libraries/haskell/pcre-light/default.nix +++ b/pkgs/development/libraries/haskell/pcre-light/default.nix @@ -1,9 +1,10 @@ -{ cabal, pcre }: +{ cabal, Cabal, pcre }: cabal.mkDerivation (self: { pname = "pcre-light"; version = "0.4"; sha256 = "1xiikiap1bvx9czw64664vifdq64scx0yhfclh5m8mkvn3x6yzxk"; + buildDepends = [ Cabal ]; extraLibraries = [ pcre ]; meta = { homepage = "http://code.haskell.org/~dons/code/pcre-light"; diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index e9cfbaeff50..c9647768af4 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -1,4 +1,4 @@ -{ cabal, aeson, conduit, monadControl, persistent, text +{ cabal, aeson, Cabal, conduit, monadControl, persistent, text , transformers }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.8.0"; sha256 = "19dly53g4jzcqi9px49w9qaf2vnlpsxc6jf5xn63827ylmxlmk5q"; buildDepends = [ - aeson conduit monadControl persistent text transformers + aeson Cabal conduit monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 7ea678266f4..444b2b12b60 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,10 +1,13 @@ -{ cabal, aeson, monadControl, persistent, text, transformers }: +{ cabal, aeson, Cabal, monadControl, persistent, text, transformers +}: cabal.mkDerivation (self: { pname = "persistent-template"; version = "0.8.1.1"; sha256 = "1wl669h8az9wviaq04pwg7w3g5cc90hafn2f1p3jybbif0hpqhks"; - buildDepends = [ aeson monadControl persistent text transformers ]; + buildDepends = [ + aeson Cabal monadControl persistent text transformers + ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 51fdacfcf2b..394ea83e1fe 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,7 +1,7 @@ -{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, conduit -, liftedBase, monadControl, mtl, pathPieces, poolConduit, sqlite -, text, time, transformers, transformersBase, unorderedContainers -, vector +{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml, Cabal +, conduit, liftedBase, monadControl, mtl, pathPieces, poolConduit +, sqlite, text, time, transformers, transformersBase +, unorderedContainers, vector }: cabal.mkDerivation (self: { @@ -9,9 +9,9 @@ cabal.mkDerivation (self: { version = "0.8.0"; sha256 = "0z70ibicfbfripp1x9csfvfhn7k26j78jvvig9ylsjwldhysr7qr"; buildDepends = [ - aeson attoparsec base64Bytestring blazeHtml conduit liftedBase - monadControl mtl pathPieces poolConduit text time transformers - transformersBase unorderedContainers vector + aeson attoparsec base64Bytestring blazeHtml Cabal conduit + liftedBase monadControl mtl pathPieces poolConduit text time + transformers transformersBase unorderedContainers vector ]; extraLibraries = [ sqlite ]; meta = { diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix index b27dc9cc695..8f52486017c 100644 --- a/pkgs/development/libraries/haskell/polyparse/default.nix +++ b/pkgs/development/libraries/haskell/polyparse/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "polyparse"; version = "1.7"; sha256 = "de8ed0ce54f1f81bb0783dd97b7b22eca28df4a238684a26b37c5af2d17a364b"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "http://code.haskell.org/~malcolm/polyparse/"; description = "A variety of alternative parser combinator libraries"; diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index 339ec70593c..ef53cbdf70c 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, conduit, resourcePool, transformers }: +{ cabal, Cabal, conduit, resourcePool, transformers }: cabal.mkDerivation (self: { pname = "pool-conduit"; version = "0.0.0.1"; sha256 = "1im5fpwadg9hmajay6dkwmlzbp5rzn8hh9wh01iy23jgivkqk2q0"; - buildDepends = [ conduit resourcePool transformers ]; + buildDepends = [ Cabal conduit resourcePool transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT"; diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix index fb417a3faf2..8e223cc6cef 100644 --- a/pkgs/development/libraries/haskell/pool/default.nix +++ b/pkgs/development/libraries/haskell/pool/default.nix @@ -1,10 +1,10 @@ -{ cabal, monadControl, transformers }: +{ cabal, Cabal, monadControl, transformers }: cabal.mkDerivation (self: { pname = "pool"; version = "0.1.2.1"; sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; - buildDepends = [ monadControl transformers ]; + buildDepends = [ Cabal monadControl transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Thread-safe resource pools. (deprecated)"; diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix index df204fa2482..d39aa47969e 100644 --- a/pkgs/development/libraries/haskell/ppm/default.nix +++ b/pkgs/development/libraries/haskell/ppm/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "ppm"; version = "2009.5.13"; sha256 = "9e390ca9a9e6e740fa71d2b72fa2c9c3d521118b0ebb35f10fabbbe543ecfb5b"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://github.com/nfjinjing/ppm/tree/master"; description = "a tiny PPM image generator"; diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index 19398be7ac7..55f323e2cca 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -1,4 +1,4 @@ -{ cabal, haskellLexer }: +{ cabal, Cabal, haskellLexer }: cabal.mkDerivation (self: { pname = "pretty-show"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; isLibrary = true; isExecutable = true; - buildDepends = [ haskellLexer ]; + buildDepends = [ Cabal haskellLexer ]; meta = { homepage = "http://wiki.github.com/yav/pretty-show"; description = "Tools for working with derived Show instances"; diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix index ab8dc18ad0a..67044e0d793 100644 --- a/pkgs/development/libraries/haskell/primitive/default.nix +++ b/pkgs/development/libraries/haskell/primitive/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "primitive"; version = "0.4.1"; sha256 = "06999i59xhvjwfdbnr1n09zkvg7lnim64nqxqlvk0x6slkidb7f6"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/primitive"; description = "Wrappers for primitive operations"; diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix index 5459b8fa6dc..dbaca7110fe 100644 --- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix @@ -1,10 +1,10 @@ -{ cabal, fgl, graphviz, mtl, prolog, text }: +{ cabal, Cabal, fgl, graphviz, mtl, prolog, text }: cabal.mkDerivation (self: { pname = "prolog-graph-lib"; version = "0.1"; sha256 = "1gryhk0jd8bvmjbjkz6n7sfnsa6iwzkckpgi51xsj5f2nwdxbl6g"; - buildDepends = [ fgl graphviz mtl prolog text ]; + buildDepends = [ Cabal fgl graphviz mtl prolog text ]; meta = { homepage = "https://github.com/Erdwolf/prolog"; description = "Generating images of resolution trees for Prolog queries"; diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix index 446a430ed7c..b2de564d954 100644 --- a/pkgs/development/libraries/haskell/prolog-graph/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix @@ -1,4 +1,5 @@ -{ cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text +{ cabal, Cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib +, text }: cabal.mkDerivation (self: { @@ -8,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - cmdargs fgl graphviz mtl prolog prologGraphLib text + Cabal cmdargs fgl graphviz mtl prolog prologGraphLib text ]; meta = { homepage = "https://github.com/Erdwolf/prolog"; diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix index 6702e2e3887..9e23f08d34c 100644 --- a/pkgs/development/libraries/haskell/prolog/default.nix +++ b/pkgs/development/libraries/haskell/prolog/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec, syb, thLift, transformers }: +{ cabal, Cabal, mtl, parsec, syb, thLift, transformers }: cabal.mkDerivation (self: { pname = "prolog"; version = "0.1"; sha256 = "00791fb1f84wq42wvacnjl290fbn28x9hknxsic3ksi3f7psladm"; - buildDepends = [ mtl parsec syb thLift transformers ]; + buildDepends = [ Cabal mtl parsec syb thLift transformers ]; meta = { homepage = "https://github.com/Erdwolf/prolog"; description = "A Prolog interpreter written in Haskell"; diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix index 2dfc0091799..098f7e60cd1 100644 --- a/pkgs/development/libraries/haskell/pureMD5/default.nix +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, cereal, cryptoApi, tagged }: +{ cabal, binary, Cabal, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { pname = "pureMD5"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0whlsb6zq4zcp3wq0bd6pgcsl0namr8b2s6i4l5aykq8v7fx40ii"; isLibrary = true; isExecutable = true; - buildDepends = [ binary cereal cryptoApi tagged ]; + buildDepends = [ binary Cabal cereal cryptoApi tagged ]; meta = { description = "A Haskell-only implementation of the MD5 digest (hash) algorithm"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index a78471d8ebb..e41890234f0 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -1,10 +1,10 @@ -{ cabal, base64Bytestring, cryptohash, random }: +{ cabal, base64Bytestring, Cabal, cryptohash, random }: cabal.mkDerivation (self: { pname = "pwstore-fast"; version = "2.2"; sha256 = "03b9vr5j6cadvi6w3lr8b9km4jq6jh0vzcmkxzq9qvvly89lx96a"; - buildDepends = [ base64Bytestring cryptohash random ]; + buildDepends = [ base64Bytestring Cabal cryptohash random ]; meta = { homepage = "https://github.com/PeterScott/pwstore"; description = "Secure password storage"; diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index 653a4c8534d..f7f64481e5c 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -1,5 +1,5 @@ -{ cabal, erf, gamma, monadLoops, mtl, randomShuffle, randomSource -, rvar, syb, transformers, vector +{ cabal, Cabal, erf, gamma, monadLoops, mtl, randomShuffle +, randomSource, rvar, syb, transformers, vector }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.1.1"; sha256 = "034pnmagly3akmmcli018258fnyqlyz79av21dqqklfixvw3yja7"; buildDepends = [ - erf gamma monadLoops mtl randomShuffle randomSource rvar syb + Cabal erf gamma monadLoops mtl randomShuffle randomSource rvar syb transformers vector ]; meta = { diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix index 174bc9ef842..91aa59b1093 100644 --- a/pkgs/development/libraries/haskell/random-shuffle/default.nix +++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix @@ -1,10 +1,10 @@ -{ cabal, MonadRandom, random }: +{ cabal, Cabal, MonadRandom, random }: cabal.mkDerivation (self: { pname = "random-shuffle"; version = "0.0.3"; sha256 = "120yh2k1n57vc9mi4dlnvv9dr79qaz4dsbvl3qp3y82mdz8maifw"; - buildDepends = [ MonadRandom random ]; + buildDepends = [ Cabal MonadRandom random ]; meta = { description = "Random shuffle implementation"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix index caa4b65814c..124783fe2fd 100755 --- a/pkgs/development/libraries/haskell/random-source/default.nix +++ b/pkgs/development/libraries/haskell/random-source/default.nix @@ -1,5 +1,5 @@ -{ cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom -, random, stateref, syb, thExtras +{ cabal, Cabal, flexibleDefaults, mersenneRandomPure64, mtl +, mwcRandom, random, stateref, syb, thExtras }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.3.0.2"; sha256 = "0sp39bj7rqg4w4rc4d4zgj0f77c23z4xc47p55chy12znc4frlp2"; buildDepends = [ - flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref - syb thExtras + Cabal flexibleDefaults mersenneRandomPure64 mtl mwcRandom random + stateref syb thExtras ]; meta = { homepage = "https://github.com/mokus0/random-fu"; diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix index a4feee31d02..dfbec81575e 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, time }: +{ cabal, Cabal, time }: cabal.mkDerivation (self: { pname = "random"; version = "1.0.1.1"; sha256 = "0n8m2744gg233s357vqzq3mfhhnbhynqvp4gxsi2gb70bm03nz6z"; - buildDepends = [ time ]; + buildDepends = [ Cabal time ]; meta = { description = "random number library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix index 0ba35027050..5b06d78d24b 100644 --- a/pkgs/development/libraries/haskell/ranges/default.nix +++ b/pkgs/development/libraries/haskell/ranges/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "ranges"; version = "0.2.4"; sha256 = "1ymvmvfvzkdxblg691g9n5y94gpiz782jgyvaisg5mydzj1s1fyv"; + buildDepends = [ Cabal ]; meta = { description = "Ranges and various functions on them"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index 60747bbda68..c0778c69563 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -1,10 +1,10 @@ -{ cabal, HTTP, network, xhtml }: +{ cabal, Cabal, HTTP, network, xhtml }: cabal.mkDerivation (self: { pname = "recaptcha"; version = "0.1"; sha256 = "de00e6e3aadd99a1cd036ce4b413ebe02d59c1b9cfd3032f122735cca1f25144"; - buildDepends = [ HTTP network xhtml ]; + buildDepends = [ Cabal HTTP network xhtml ]; meta = { homepage = "http://github.com/jgm/recaptcha/tree/master"; description = "Functions for using the reCAPTCHA service in web applications"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix index 09e4906da01..2ba070ba9a6 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "regex-base"; version = "0.72.0.2"; sha256 = "38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee"; + buildDepends = [ Cabal ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix index 8fbc2f9e84d..ae062764354 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "regex-base"; version = "0.93.1"; sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix index 50f039a3d27..4280f8a87de 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "regex-base"; version = "0.93.2"; sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix index ed88e247e5b..7790f03eebc 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase, regexPosix }: +{ cabal, Cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { pname = "regex-compat"; version = "0.71.0.1"; sha256 = "904552f7d690686b2602f37494827d09b09fc0a8a2565522b61847bec8d1de8d"; - buildDepends = [ regexBase regexPosix ]; + buildDepends = [ Cabal regexBase regexPosix ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix index 3db0f5d4065..08f8e30d8dc 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase, regexPosix }: +{ cabal, Cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { pname = "regex-compat"; version = "0.92"; sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936"; - buildDepends = [ regexBase regexPosix ]; + buildDepends = [ Cabal regexBase regexPosix ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix index 3a28e505a82..eb5c3752081 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase, regexPosix }: +{ cabal, Cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { pname = "regex-compat"; version = "0.93.1"; sha256 = "1zlsx7a2iz5gmgrwzr6w5fz6s4ayab5bm71xlq28r3iph3vp80zf"; - buildDepends = [ regexBase regexPosix ]; + buildDepends = [ Cabal regexBase regexPosix ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix index 138702e1d41..f3489e30105 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase, regexPosix }: +{ cabal, Cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { pname = "regex-compat"; version = "0.95.1"; sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m"; - buildDepends = [ regexBase regexPosix ]; + buildDepends = [ Cabal regexBase regexPosix ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix index f3c6e02caf5..2eb85bbdb01 100644 --- a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase }: +{ cabal, Cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-pcre-builtin"; version = "0.94.2.1.7.7"; sha256 = "1c4zxfild1fbpxwqcp2jnf6iwfs0z6nc8dry09gmjykxlhisxi8s"; - buildDepends = [ regexBase ]; + buildDepends = [ Cabal regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix index 68c39818517..15081e7f91a 100644 --- a/pkgs/development/libraries/haskell/regex-pcre/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix @@ -1,10 +1,10 @@ -{ cabal, pcre, regexBase }: +{ cabal, Cabal, pcre, regexBase }: cabal.mkDerivation (self: { pname = "regex-pcre"; version = "0.94.2"; sha256 = "0p4az8z4jlrcmmyz9bjf7n90hpg6n242vq4255w2dz5v29l822wn"; - buildDepends = [ regexBase ]; + buildDepends = [ Cabal regexBase ]; extraLibraries = [ pcre ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix index 961aab9e2f7..773217fa4e3 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase }: +{ cabal, Cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.72.0.3"; sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1"; - buildDepends = [ regexBase ]; + buildDepends = [ Cabal regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix index 223c9baedcd..3706c6826dd 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase }: +{ cabal, Cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.94.1"; sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c"; - buildDepends = [ regexBase ]; + buildDepends = [ Cabal regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix index 9a570d4ca20..e7d9e016a96 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase }: +{ cabal, Cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.94.2"; sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067"; - buildDepends = [ regexBase ]; + buildDepends = [ Cabal regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix index e78c7fe2584..af3dc9bc577 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase }: +{ cabal, Cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.94.4"; sha256 = "1ykirysvz9ganm2k7fmrppklsgh0h35mjfsi9g1icv43pqpr6ldw"; - buildDepends = [ regexBase ]; + buildDepends = [ Cabal regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix index ca6358baeed..bf83581748d 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix @@ -1,10 +1,10 @@ -{ cabal, regexBase }: +{ cabal, Cabal, regexBase }: cabal.mkDerivation (self: { pname = "regex-posix"; version = "0.95.1"; sha256 = "02pgxwbgz738kpdmsg18xs6kmq6my5hqd9cl4rm7cg2v39di9vbl"; - buildDepends = [ regexBase ]; + buildDepends = [ Cabal regexBase ]; meta = { homepage = "http://sourceforge.net/projects/lazy-regex"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix index 82fa24016bc..3fc14b45ccc 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec, regexBase }: +{ cabal, Cabal, mtl, parsec, regexBase }: cabal.mkDerivation (self: { pname = "regex-tdfa"; version = "1.1.8"; sha256 = "1m75xh5bwmmgg5f757dc126kv47yfqqnz9fzj1hc80p6jpzs573x"; - buildDepends = [ mtl parsec regexBase ]; + buildDepends = [ Cabal mtl parsec regexBase ]; meta = { homepage = "http://hackage.haskell.org/package/regex-tdfa"; description = "Replaces/Enhances Text.Regex"; diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix index 538b980b438..ea7ec6bc223 100644 --- a/pkgs/development/libraries/haskell/regexpr/default.nix +++ b/pkgs/development/libraries/haskell/regexpr/default.nix @@ -1,10 +1,10 @@ -{ cabal, HUnit, mtl, mtlparse }: +{ cabal, Cabal, HUnit, mtl, mtlparse }: cabal.mkDerivation (self: { pname = "regexpr"; version = "0.5.4"; sha256 = "bf7813247f26877d9fba4ba4b66eb80bfddfc2086a5cd8d635b2da0ccde56604"; - buildDepends = [ HUnit mtl mtlparse ]; + buildDepends = [ Cabal HUnit mtl mtlparse ]; meta = { homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/"; description = "regular expression like Perl/Ruby in Haskell"; diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index 0085d866567..63a8be9ce05 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "regular"; version = "0.3.4"; sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq"; + buildDepends = [ Cabal ]; meta = { description = "Generic programming library for regular datatypes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index 991c1a3d779..ebe526c9559 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -1,10 +1,10 @@ -{ cabal, repa, vector }: +{ cabal, Cabal, repa, vector }: cabal.mkDerivation (self: { pname = "repa-algorithms"; version = "2.2.0.1"; sha256 = "1ggxa2h2swgf7621nrzlqmmyi3h2v526w69zcwvms84kyd257p4p"; - buildDepends = [ repa vector ]; + buildDepends = [ Cabal repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; diff --git a/pkgs/development/libraries/haskell/repa-bytestring/default.nix b/pkgs/development/libraries/haskell/repa-bytestring/default.nix index b06072d798b..ac1b1ca18a1 100644 --- a/pkgs/development/libraries/haskell/repa-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/repa-bytestring/default.nix @@ -1,10 +1,10 @@ -{ cabal, repa, vector }: +{ cabal, Cabal, repa, vector }: cabal.mkDerivation (self: { pname = "repa-bytestring"; version = "2.2.0.1"; sha256 = "0yc814wyiy5cb9j04515rv24mm4qd5xqyz2dxsmg1p46qb69hvsg"; - buildDepends = [ repa vector ]; + buildDepends = [ Cabal repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Conversions between Repa Arrays and ByteStrings"; diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 75d18daa635..80b45228bc7 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -1,4 +1,5 @@ -{ cabal, llvm, random, repa, repaAlgorithms, repaIo, vector }: +{ cabal, Cabal, llvm, random, repa, repaAlgorithms, repaIo, vector +}: cabal.mkDerivation (self: { pname = "repa-examples"; @@ -6,7 +7,7 @@ cabal.mkDerivation (self: { sha256 = "0rqpq4v2ir86x9z0aw8pcz929imcw9lf415j88kg12x2rk451mm0"; isLibrary = false; isExecutable = true; - buildDepends = [ random repa repaAlgorithms repaIo vector ]; + buildDepends = [ Cabal random repa repaAlgorithms repaIo vector ]; extraLibraries = [ llvm ]; meta = { homepage = "http://repa.ouroborus.net"; diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index e4eb113a435..d80cad2627a 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -1,10 +1,10 @@ -{ cabal, binary, bmp, repa, repaBytestring, vector }: +{ cabal, binary, bmp, Cabal, repa, repaBytestring, vector }: cabal.mkDerivation (self: { pname = "repa-io"; version = "2.2.0.1"; sha256 = "1akp6xkfvbc7jmnzlrz4y5fncqrv9d06y981dndcv6lgxz4hv4j1"; - buildDepends = [ binary bmp repa repaBytestring vector ]; + buildDepends = [ binary bmp Cabal repa repaBytestring vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "Read and write Repa arrays in various formats"; diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index ffa75a9fd4f..2dc70a04d1a 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck, vector }: +{ cabal, Cabal, QuickCheck, vector }: cabal.mkDerivation (self: { pname = "repa"; version = "2.2.0.1"; sha256 = "016cigxivjd17g0hysf76b3lznjpk478q0hg9hsy154ms7xap3dy"; - buildDepends = [ QuickCheck vector ]; + buildDepends = [ Cabal QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; description = "High performance, regular, shape polymorphic parallel arrays"; diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix index bad1e93d6b9..09a69eba005 100644 --- a/pkgs/development/libraries/haskell/repr/default.nix +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -1,11 +1,13 @@ -{ cabal, baseUnicodeSymbols, dstring, random, stringCombinators }: +{ cabal, baseUnicodeSymbols, Cabal, dstring, random +, stringCombinators +}: cabal.mkDerivation (self: { pname = "repr"; version = "0.4.1.2"; sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs"; buildDepends = [ - baseUnicodeSymbols dstring random stringCombinators + baseUnicodeSymbols Cabal dstring random stringCombinators ]; meta = { homepage = "https://github.com/basvandijk/repr"; diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index 51952598f61..4c0befe9ac6 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -1,4 +1,4 @@ -{ cabal, hashable, monadControl, stm, time, transformers +{ cabal, Cabal, hashable, monadControl, stm, time, transformers , transformersBase, vector }: @@ -7,7 +7,8 @@ cabal.mkDerivation (self: { version = "0.2.1.0"; sha256 = "12akfi906l1nm7h3wvjkzl9bxn74dbv17xw2c1mqgl6sg470d587"; buildDepends = [ - hashable monadControl stm time transformers transformersBase vector + Cabal hashable monadControl stm time transformers transformersBase + vector ]; meta = { homepage = "http://github.com/bos/pool"; diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix index 640faeb7d59..f643f2cca72 100755 --- a/pkgs/development/libraries/haskell/rvar/default.nix +++ b/pkgs/development/libraries/haskell/rvar/default.nix @@ -1,10 +1,10 @@ -{ cabal, MonadPrompt, mtl, randomSource, transformers }: +{ cabal, Cabal, MonadPrompt, mtl, randomSource, transformers }: cabal.mkDerivation (self: { pname = "rvar"; version = "0.2"; sha256 = "1in2qn1clv9b7ijyllhjflh9zdkna31hpyclhlkfnsc6899z3y1f"; - buildDepends = [ MonadPrompt mtl randomSource transformers ]; + buildDepends = [ Cabal MonadPrompt mtl randomSource transformers ]; meta = { homepage = "https://github.com/mokus0/random-fu"; description = "Random Variables"; diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index 067b7c4cf67..e2a7518dbd0 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "safe"; version = "0.3.3"; sha256 = "0ig9laq1p4iic24smjb304mvlsvdyn90lvxh64c4p75c8g459489"; + buildDepends = [ Cabal ]; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; description = "Library for safe (pattern match free) functions"; diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 71b9a6c6c47..c56e1c26f82 100755 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "semigroups"; version = "0.8"; sha256 = "12ly9f1lxzrxvwkcx25cjik7d1f1l2j1rkd0cabgpcg53hz4158c"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index b2c24da5b1b..aef9c2d3f35 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -1,10 +1,10 @@ -{ cabal, network }: +{ cabal, Cabal, network }: cabal.mkDerivation (self: { pname = "sendfile"; version = "0.7.4"; sha256 = "1h02fjdivsb3divdn3wg2skmw3jcd0n4axhlpgmrrbf92c3m35rq"; - buildDepends = [ network ]; + buildDepends = [ Cabal network ]; meta = { homepage = "http://patch-tag.com/r/mae/sendfile"; description = "A portable sendfile library"; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 613399fa75b..276137912a2 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, shakespeare, text }: +{ cabal, Cabal, parsec, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-css"; version = "0.10.7"; sha256 = "0cla600s5715glimlf58gndpp7njhm26j78bfm16cxia5psp5zav"; - buildDepends = [ parsec shakespeare text ]; + buildDepends = [ Cabal parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; description = "Stick your haskell variables into css at compile time"; diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index fc7025e64da..f00e59d9946 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, shakespeare, text }: +{ cabal, Cabal, parsec, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-i18n"; version = "0.0.2"; sha256 = "1hb144n3fa5qiy3skrmab0qv63fa5vf4vg4ar9hrybmwdksqa410"; - buildDepends = [ parsec shakespeare text ]; + buildDepends = [ Cabal parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/i18n"; description = "A type-based approach to internationalization"; diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index b1dfc72ecec..2272766330f 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -1,10 +1,10 @@ -{ cabal, shakespeare, text }: +{ cabal, Cabal, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-js"; version = "0.11.0.1"; sha256 = "01gmsk1q5iq23m93n8mcmm02jqv3i7ksf1jw4qnla1gssdkx8ggk"; - buildDepends = [ shakespeare text ]; + buildDepends = [ Cabal shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time"; diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 01fff9ff998..4e2f87bfd6e 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -1,10 +1,10 @@ -{ cabal, shakespeare, text }: +{ cabal, Cabal, shakespeare, text }: cabal.mkDerivation (self: { pname = "shakespeare-text"; version = "0.10.5"; sha256 = "13nhasfbza73kv3iin16iidwyz71b8d75vq0ym37zygpxb5izkvw"; - buildDepends = [ shakespeare text ]; + buildDepends = [ Cabal shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; description = "Interpolation with quasi-quotation: put variables strings"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 44fcbb277b7..79d37a95422 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, text }: +{ cabal, Cabal, parsec, text }: cabal.mkDerivation (self: { pname = "shakespeare"; version = "0.10.3.1"; sha256 = "1wfw5qbgl4jl1r4gaw55mnsmn70vpzn7ykz3gbqzrf91wc6s3zj4"; - buildDepends = [ parsec text ]; + buildDepends = [ Cabal parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; description = "A toolkit for making compile-time interpolated templates"; diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index d4f814b2111..53d9d820934 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -1,10 +1,10 @@ -{ cabal, network }: +{ cabal, Cabal, network }: cabal.mkDerivation (self: { pname = "simple-sendfile"; version = "0.2.0"; sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264"; - buildDepends = [ network ]; + buildDepends = [ Cabal network ]; meta = { description = "Cross platform library for the sendfile system call"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 844e13c11dc..e938eef2e49 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -1,10 +1,10 @@ -{ cabal, cereal, cryptoApi, tagged }: +{ cabal, Cabal, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { pname = "skein"; version = "0.1.0.5"; sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb"; - buildDepends = [ cereal cryptoApi tagged ]; + buildDepends = [ Cabal cereal cryptoApi tagged ]; meta = { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index d8a9bf24f55..520a4209da6 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -1,10 +1,10 @@ -{ cabal, dlist }: +{ cabal, Cabal, dlist }: cabal.mkDerivation (self: { pname = "smallcheck"; version = "0.6"; sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v"; - buildDepends = [ dlist ]; + buildDepends = [ Cabal dlist ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index c6be9f80258..56190cb06f1 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,9 +1,9 @@ { cabal, attoparsec, attoparsecEnumerator, base16Bytestring , blazeBuilder, blazeBuilderEnumerator, bytestringMmap -, bytestringNums, caseInsensitive, deepseq, dlist, enumerator -, HUnit, MonadCatchIOTransformers, mtl, mwcRandom, regexPosix, text -, time, transformers, unixCompat, unorderedContainers, vector -, zlibEnum +, bytestringNums, Cabal, caseInsensitive, deepseq, dlist +, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl +, mwcRandom, regexPosix, text, time, transformers, unixCompat +, unorderedContainers, vector, zlibEnum }: cabal.mkDerivation (self: { @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { sha256 = "010w3ycwalz48288342rmwg87pdml7ixg9drw38k206q9s9a9cp9"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder - blazeBuilderEnumerator bytestringMmap bytestringNums - caseInsensitive deepseq dlist enumerator HUnit + blazeBuilderEnumerator bytestringMmap bytestringNums Cabal + caseInsensitive deepseq dlist enumerator filepath HUnit MonadCatchIOTransformers mtl mwcRandom regexPosix text time transformers unixCompat unorderedContainers vector zlibEnum ]; diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index e6eafd47eab..ffb668a995b 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -1,8 +1,8 @@ { cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder -, blazeBuilderEnumerator, bytestringNums, caseInsensitive -, directoryTree, enumerator, MonadCatchIOTransformers, mtl -, murmurHash, network, PSQueue, snapCore, text, time, transformers -, unixCompat, vector, vectorAlgorithms +, blazeBuilderEnumerator, bytestringNums, Cabal, caseInsensitive +, directoryTree, enumerator, filepath, MonadCatchIOTransformers +, mtl, murmurHash, network, PSQueue, snapCore, text, time +, transformers, unixCompat, vector, vectorAlgorithms }: cabal.mkDerivation (self: { @@ -11,9 +11,10 @@ cabal.mkDerivation (self: { sha256 = "149jgd9mcndw9sc051020y7yiai1fipjnqk4s3sbw4lmaysap673"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder - blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree - enumerator MonadCatchIOTransformers mtl murmurHash network PSQueue - snapCore text time transformers unixCompat vector vectorAlgorithms + blazeBuilderEnumerator bytestringNums Cabal caseInsensitive + directoryTree enumerator filepath MonadCatchIOTransformers mtl + murmurHash network PSQueue snapCore text time transformers + unixCompat vector vectorAlgorithms ]; meta = { homepage = "http://snapframework.com/"; diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index ab52a72f6ce..9dd364f6a3c 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -1,10 +1,10 @@ -{ cabal, cereal, network }: +{ cabal, Cabal, cereal, network }: cabal.mkDerivation (self: { pname = "socks"; version = "0.4.1"; sha256 = "0kapic4rf1cwbqy5f229b69kr1mg9blpr5p5jna8sx5ds2b8jdjn"; - buildDepends = [ cereal network ]; + buildDepends = [ Cabal cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; description = "Socks proxy (version 5) implementation"; diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 604c4a0a0f2..2afe2065038 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "split"; version = "0.1.4.2"; sha256 = "09vi7vw4i4r78gyp3bbvhvvyiqi8rgf678ppmq99qrfqm34c2fl9"; + buildDepends = [ Cabal ]; meta = { homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix index b14fd6ebade..9efb9c811cc 100644 --- a/pkgs/development/libraries/haskell/stateref/default.nix +++ b/pkgs/development/libraries/haskell/stateref/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, stm }: +{ cabal, Cabal, mtl, stm }: cabal.mkDerivation (self: { pname = "stateref"; version = "0.3"; sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx"; - buildDepends = [ mtl stm ]; + buildDepends = [ Cabal mtl stm ]; meta = { homepage = "http://code.haskell.org/~mokus/stateref/"; description = "Abstraction for things that work like IORef"; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 97202c4ec60..4a893827aab 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,4 +1,4 @@ -{ cabal, deepseq, erf, mathFunctions, monadPar, mwcRandom +{ cabal, Cabal, deepseq, erf, mathFunctions, monadPar, mwcRandom , primitive, vector, vectorAlgorithms }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.10.1.0"; sha256 = "0fnpwnhcwxjcm81b9daqdy07cw5qgqa7m2bj6fxxwicpvawcyabc"; buildDepends = [ - deepseq erf mathFunctions monadPar mwcRandom primitive vector + Cabal deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms ]; meta = { diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix index 1521763f2bf..34c25af1f3d 100644 --- a/pkgs/development/libraries/haskell/stb-image/default.nix +++ b/pkgs/development/libraries/haskell/stb-image/default.nix @@ -1,10 +1,10 @@ -{ cabal, bitmap }: +{ cabal, bitmap, Cabal }: cabal.mkDerivation (self: { pname = "stb-image"; version = "0.2.1"; sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52"; - buildDepends = [ bitmap ]; + buildDepends = [ bitmap Cabal ]; meta = { homepage = "http://code.haskell.org/~bkomuves/"; description = "A wrapper around Sean Barrett's JPEG/PNG decoder"; diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix index 6184a324181..2a76580ef1d 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "stm"; version = "2.1.1.2"; sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d"; + buildDepends = [ Cabal ]; meta = { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix index 8615f10be80..ca7a07e14f7 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "stm"; version = "2.1.2.1"; sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8"; + buildDepends = [ Cabal ]; meta = { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix index 1174a9740e5..304191c7281 100644 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "stm"; version = "2.2.0.1"; sha256 = "1p0x414ffsd77mmlfz1cmwg2cbhinnbpxypxgvygg05js67msj8q"; + buildDepends = [ Cabal ]; meta = { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix index dc36d53f046..7a559067b11 100644 --- a/pkgs/development/libraries/haskell/storable-complex/default.nix +++ b/pkgs/development/libraries/haskell/storable-complex/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "storable-complex"; version = "0.2.1"; sha256 = "0dnxnsi7m5whwwki3fry6db6gyy5qzfz8jcj1fg3fhfyf4f9wpaz"; + buildDepends = [ Cabal ]; meta = { description = "Storable instance for Complex"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix index 180f47939cc..46edc44f548 100644 --- a/pkgs/development/libraries/haskell/storable-record/default.nix +++ b/pkgs/development/libraries/haskell/storable-record/default.nix @@ -1,4 +1,4 @@ -{ cabal, transformers, utilityHt }: +{ cabal, Cabal, transformers, utilityHt }: cabal.mkDerivation (self: { pname = "storable-record"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "5ed2680dcfc4c3d4fe605d23e797b847fe047b7acd3f4acfd82155c93e72b280"; isLibrary = true; isExecutable = true; - buildDepends = [ transformers utilityHt ]; + buildDepends = [ Cabal transformers utilityHt ]; meta = { homepage = "http://code.haskell.org/~thielema/storable-record/"; description = "Elegant definition of Storable instances for records"; diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index fef81d92212..33fcf1a38f3 100755 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "streamproc"; version = "1.6"; sha256 = "0bb1rdzzpjggw7dk4q3hwa1j1bvkfqhz6vrd45shcp57ixqlp6ws"; + buildDepends = [ Cabal ]; meta = { homepage = "http://gitorious.org/streamproc"; description = "Stream Processer Arrow"; diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix index 99239884b0a..4a883dbecbd 100644 --- a/pkgs/development/libraries/haskell/strict/default.nix +++ b/pkgs/development/libraries/haskell/strict/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "strict"; version = "0.3.2"; sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html"; description = "Strict data types and String IO"; diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index 083f3e06d5b..dab3b1393f8 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "strict-concurrency"; version = "0.2.4.1"; sha256 = "0939212dd0cc3b9bd228dfbb233d9eccad22ca626752d9bad8026ceb0a5c1a89"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { homepage = "http://code.haskell.org/~dons/code/strict-concurrency"; description = "Strict concurrency abstractions"; diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index 6d04dcf10db..100df103d31 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -1,10 +1,10 @@ -{ cabal, baseUnicodeSymbols }: +{ cabal, baseUnicodeSymbols, Cabal }: cabal.mkDerivation (self: { pname = "string-combinators"; version = "0.6.0.3"; sha256 = "18jawxqvcj7zpvb0wf1zln12s03mp6nglhv5ccywrkb5x0r0557j"; - buildDepends = [ baseUnicodeSymbols ]; + buildDepends = [ baseUnicodeSymbols Cabal ]; meta = { homepage = "https://github.com/basvandijk/string-combinators"; description = "Polymorphic functions to build and combine stringlike values"; diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 9d1ae862ee1..808a0822140 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -1,10 +1,11 @@ -{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }: +{ cabal, Cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl +}: cabal.mkDerivation (self: { pname = "svgcairo"; version = "0.12.1"; sha256 = "1nyr849ayk1fyjpxnpam1pychny609d6j2v3is84llh3gsyq99ps"; - buildDepends = [ cairo glib mtl ]; + buildDepends = [ Cabal cairo glib mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; pkgconfigDepends = [ librsvg ]; diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix index 070279fadfd..f65fddfe16c 100644 --- a/pkgs/development/libraries/haskell/syb/0.2.2.nix +++ b/pkgs/development/libraries/haskell/syb/0.2.2.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.2.2"; sha256 = "0m29vnqkkmpf4m3gi42kcbr2gfyxgkcw85xsyrq0mgbxb0zg6ky9"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix index 01cc80c883d..a54213d94ce 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.3.3"; sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.nix b/pkgs/development/libraries/haskell/syb/0.3.6.nix index a40b25cc1bc..2cd457209ec 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.3.6"; sha256 = "1khb5h4gw1f9l9zhb7x1y9rf2qpypbvm9kmpf0b6xgggd2800s25"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix index ddf16ad41e5..90625da1c98 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.3"; sha256 = "1gnqw76zy7xvlabhbyk8hml88hpz2igf7b3mz2ic091f77qkkch7"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; description = "Scrap Your Boilerplate"; diff --git a/pkgs/development/libraries/haskell/syb/default.nix b/pkgs/development/libraries/haskell/syb/default.nix index a98cf1e2da6..5bee78f4c86 100644 --- a/pkgs/development/libraries/haskell/syb/default.nix +++ b/pkgs/development/libraries/haskell/syb/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "syb"; version = "0.1.0.1"; sha256 = "08nf4id26s5iasxzdy5jds6h87fy3a55zgw0zrig4dg6difmwjp3"; + buildDepends = [ Cabal ]; meta = { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix index 2f3167ff628..475375790c5 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix @@ -1,10 +1,10 @@ -{ cabal, sybWithClass, text }: +{ cabal, Cabal, sybWithClass, text }: cabal.mkDerivation (self: { pname = "syb-with-class-instances-text"; version = "0.0.1"; sha256 = "0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e"; - buildDepends = [ sybWithClass text ]; + buildDepends = [ Cabal sybWithClass text ]; meta = { description = "Scrap Your Boilerplate With Class Text instance"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 79b90feaa85..dc20d7421ba 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "syb-with-class"; version = "0.6.1.3"; sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d"; + buildDepends = [ Cabal ]; meta = { description = "Scrap Your Boilerplate With Class"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 56031ed3157..614c678f85b 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -1,10 +1,10 @@ -{ cabal, systemFilepath, text, time }: +{ cabal, Cabal, systemFilepath, text, time }: cabal.mkDerivation (self: { pname = "system-fileio"; version = "0.3.5"; sha256 = "0d1baliykfpg15bzknx98slr0qa5yjr3va3w8hs02wgx6sp3wsy2"; - buildDepends = [ systemFilepath text time ]; + buildDepends = [ Cabal systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "Consistent filesystem interaction across GHC versions"; diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 6dc4d44ee96..fc1b4e2e56c 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq, text }: +{ cabal, Cabal, deepseq, text }: cabal.mkDerivation (self: { pname = "system-filepath"; version = "0.4.6"; sha256 = "0p8lf10b5zn2gw5klpjc397q892cydvnl677srj9rk3lhmsm5jjl"; - buildDepends = [ deepseq text ]; + buildDepends = [ Cabal deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix index a649ca04fec..336de68713f 100644 --- a/pkgs/development/libraries/haskell/tabular/default.nix +++ b/pkgs/development/libraries/haskell/tabular/default.nix @@ -1,10 +1,10 @@ -{ cabal, csv, html, mtl }: +{ cabal, Cabal, csv, html, mtl }: cabal.mkDerivation (self: { pname = "tabular"; version = "0.2.2.3"; sha256 = "cf6d9f1928ec6981edcbb06c4dcbaea7a96deef5272192ad4290caa18711ea76"; - buildDepends = [ csv html mtl ]; + buildDepends = [ Cabal csv html mtl ]; meta = { homepage = "http://patch-tag.com/r/kowey/tabular"; description = "Two-dimensional data tables with rendering functions"; diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 1f30245a320..a68f7e92493 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -1,10 +1,10 @@ -{ cabal, dataDefault, semigroups }: +{ cabal, Cabal, dataDefault, semigroups }: cabal.mkDerivation (self: { pname = "tagged"; version = "0.2.3.1"; sha256 = "0ldc9w35yzlrz78kakkqial32g2c7da9b5v334jh5wpgsn7lrm3n"; - buildDepends = [ dataDefault semigroups ]; + buildDepends = [ Cabal dataDefault semigroups ]; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index a6fcea3c1c2..d85e943a7ee 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -1,4 +1,4 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "tagsoup"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1q1dzsaj131fcvibka72i7si1i0gxkz5d9zl0akd8mbapy5mmlv5"; isLibrary = true; isExecutable = true; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "http://community.haskell.org/~ndm/tagsoup/"; description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix index fd31d246004..01c3b6505ff 100644 --- a/pkgs/development/libraries/haskell/temporary/default.nix +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "temporary"; version = "1.1.2.3"; sha256 = "1x4jljggbcdq90h578yyvc8z1i9zmlhvqfz2dym8kj8pq4qiwixd"; + buildDepends = [ Cabal filepath ]; meta = { homepage = "http://www.github.com/batterseapower/temporary"; description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index 66212bbe385..0bd351b9f6a 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, ncurses }: +{ cabal, Cabal, extensibleExceptions, ncurses }: cabal.mkDerivation (self: { pname = "terminfo"; version = "0.3.2.3"; sha256 = "06y2vx7d4hl55p3p1c7yj2lx8yaw14c5h2qclj8m5xg2wkifnf5f"; - buildDepends = [ extensibleExceptions ]; + buildDepends = [ Cabal extensibleExceptions ]; extraLibraries = [ ncurses ]; meta = { homepage = "http://code.haskell.org/terminfo"; diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix index e280d497bee..e64d3328dfe 100644 --- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, HUnit, testFramework }: +{ cabal, Cabal, extensibleExceptions, HUnit, testFramework }: cabal.mkDerivation (self: { pname = "test-framework-hunit"; version = "0.2.7"; sha256 = "1c7424i5vnggzncwiwqqwq7ir7kaijif2waqmss5pn6db3gj33fc"; - buildDepends = [ extensibleExceptions HUnit testFramework ]; + buildDepends = [ Cabal extensibleExceptions HUnit testFramework ]; meta = { homepage = "http://batterseapower.github.com/test-framework/"; description = "HUnit support for the test-framework package"; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index db70ec18a98..7e638c535e6 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -1,4 +1,4 @@ -{ cabal, deepseq, extensibleExceptions, QuickCheck, random +{ cabal, Cabal, deepseq, extensibleExceptions, QuickCheck, random , testFramework }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.8"; sha256 = "0ca6s7dnrdr9s2gdpfb74lswlj2lj091crk89m3yqjcadchkh3vl"; buildDepends = [ - deepseq extensibleExceptions QuickCheck random testFramework + Cabal deepseq extensibleExceptions QuickCheck random testFramework ]; meta = { homepage = "http://batterseapower.github.com/test-framework/"; diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index 8e3698ab000..bb1aaf2c49a 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -1,11 +1,13 @@ -{ cabal, extensibleExceptions, QuickCheck, random, testFramework }: +{ cabal, Cabal, extensibleExceptions, QuickCheck, random +, testFramework +}: cabal.mkDerivation (self: { pname = "test-framework-quickcheck2"; version = "0.2.12"; sha256 = "08qr2lh1akjy5daxxk1sy59sg94hvv5s5njs9x6lrx648hy7y8iy"; buildDepends = [ - extensibleExceptions QuickCheck random testFramework + Cabal extensibleExceptions QuickCheck random testFramework ]; meta = { homepage = "http://batterseapower.github.com/test-framework/"; diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix index 0c16a9e9e24..094377728b0 100644 --- a/pkgs/development/libraries/haskell/test-framework-th/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix @@ -1,4 +1,4 @@ -{ cabal, haskellSrcExts, languageHaskellExtract, regexPosix +{ cabal, Cabal, haskellSrcExts, languageHaskellExtract, regexPosix , testFramework }: @@ -7,7 +7,8 @@ cabal.mkDerivation (self: { version = "0.2.2"; sha256 = "0nzfvxr5bnxinx41a5w5mwhyxzz2936dl0xhd80cv9plx19ylh0w"; buildDepends = [ - haskellSrcExts languageHaskellExtract regexPosix testFramework + Cabal haskellSrcExts languageHaskellExtract regexPosix + testFramework ]; meta = { homepage = "http://github.com/finnsson/test-generator"; diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 6ac60c1df2d..1e16354b385 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -1,5 +1,5 @@ -{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname -, random, regexPosix, time, xml +{ cabal, ansiTerminal, ansiWlPprint, Cabal, extensibleExceptions +, hostname, random, regexPosix, time, xml }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal ansiWlPprint extensibleExceptions hostname random - regexPosix time xml + ansiTerminal ansiWlPprint Cabal extensibleExceptions hostname + random regexPosix time xml ]; meta = { homepage = "http://batterseapower.github.com/test-framework/"; diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix index 35b619166a4..3b9d0297959 100644 --- a/pkgs/development/libraries/haskell/testpack/default.nix +++ b/pkgs/development/libraries/haskell/testpack/default.nix @@ -1,10 +1,10 @@ -{ cabal, HUnit, mtl, QuickCheck, random }: +{ cabal, Cabal, HUnit, mtl, QuickCheck, random }: cabal.mkDerivation (self: { pname = "testpack"; version = "2.1.1"; sha256 = "1z8g3xhvy901h7kr7q4wcms5b23xniskrgxfpq42w4b34acwvhmg"; - buildDepends = [ HUnit mtl QuickCheck random ]; + buildDepends = [ Cabal HUnit mtl QuickCheck random ]; meta = { homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack"; description = "Test Utililty Pack for HUnit and QuickCheck"; diff --git a/pkgs/development/libraries/haskell/texmath/0.4.nix b/pkgs/development/libraries/haskell/texmath/0.4.nix index a59120015dd..58a8bc3ef4b 100644 --- a/pkgs/development/libraries/haskell/texmath/0.4.nix +++ b/pkgs/development/libraries/haskell/texmath/0.4.nix @@ -1,4 +1,4 @@ -{ cabal, parsec, syb, xml }: +{ cabal, Cabal, parsec, syb, xml }: cabal.mkDerivation (self: { pname = "texmath"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1rvnhqljxkljy8ncpaj8p7b14nvvm6zmiixv13m1zxlcr457j2ai"; isLibrary = true; isExecutable = true; - buildDepends = [ parsec syb xml ]; + buildDepends = [ Cabal parsec syb xml ]; meta = { homepage = "http://github.com/jgm/texmath"; description = "Conversion of LaTeX math formulas to MathML"; diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 7bd8217b434..25286cf2d75 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -1,4 +1,4 @@ -{ cabal, parsec, syb, xml }: +{ cabal, Cabal, parsec, syb, xml }: cabal.mkDerivation (self: { pname = "texmath"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0vj1kh62qs7badv00lcda9m3j53kc069kmrv5lmz62a96y4kx5yi"; isLibrary = true; isExecutable = true; - buildDepends = [ parsec syb xml ]; + buildDepends = [ Cabal parsec syb xml ]; meta = { homepage = "http://github.com/jgm/texmath"; description = "Conversion of LaTeX math formulas to MathML or OMML"; diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix index b997c60868b..849c1ae5847 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.0.5"; sha256 = "1a5y2i7qrkyyvm112q44rhd7jbqxvfxssz2g5ngbx11yypl3hcdv"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { homepage = "http://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix index 5c593235dee..00120cd132b 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.0.6"; sha256 = "103l1c8jfwpddsqzwj9jqh89vay8ax1znxqgjqprv2fvr7s0zvkp"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { homepage = "http://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.12.nix b/pkgs/development/libraries/haskell/text/0.11.1.12.nix index 805c96d2af0..76eaced44c9 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.12.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.12.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.1.12"; sha256 = "0j2044whj3xckmxqmgdjbc2mpwdan481qzjslwplqbqwml2jvkml"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.13.nix b/pkgs/development/libraries/haskell/text/0.11.1.13.nix index 9576e1806e1..1910b347fa7 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.13.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.13.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.1.13"; sha256 = "0lbc4yfqpydps0rd1qjymnnhp87sl9w7n1f5vd5lsixby93zjv2f"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { homepage = "https://github.com/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix index db438a54bc2..116b999cc30 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "text"; version = "0.11.1.5"; sha256 = "0fxxhw932gdvaqafsbw7dfzccc43hv92yhxppzp6jrg0npbyz04l"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { homepage = "https://bitbucket.org/bos/text"; description = "An efficient packed Unicode text type"; diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix index 9a5f4a32cda..98d56bc943d 100644 --- a/pkgs/development/libraries/haskell/th-extras/default.nix +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, Cabal, syb }: cabal.mkDerivation (self: { pname = "th-extras"; version = "0.0.0.1"; sha256 = "13d9fs48z87inma3kg9b7lfjp3h8j85fav6awd1zj3i2nl214hff"; - buildDepends = [ syb ]; + buildDepends = [ Cabal syb ]; meta = { homepage = "https://github.com/mokus0/th-extras"; description = "A grab bag of useful functions for use with Template Haskell"; diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index aa7b5224de6..571d06d55b0 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "th-lift"; version = "0.5.5"; sha256 = "1zp9alv3nbvra1rscddak3i33c2jnv6g6806h94qbfkq3zbimfi0"; + buildDepends = [ Cabal ]; meta = { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix index d4108f0a012..713b548a463 100644 --- a/pkgs/development/libraries/haskell/thespian/default.nix +++ b/pkgs/development/libraries/haskell/thespian/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "thespian"; version = "0.999"; sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn"; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://bitbucket.org/alinabi/thespian"; description = "Lightweight Erlang-style actors for Haskell"; diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index d7f5a70bc34..03904f642c1 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "threadmanager"; version = "0.1.4"; sha256 = "0p35ihdc9k9svzbwiszll5i53km09rvw5mqshph273fby7nvni9i"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/bsl/threadmanager"; description = "Simple thread management"; diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix index 7ced3956a8a..17346ca3c15 100644 --- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix +++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "time"; version = "1.1.2.4"; sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3"; + buildDepends = [ Cabal ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/time/1.1.3.nix b/pkgs/development/libraries/haskell/time/1.1.3.nix index c8a7fe12985..bac6424d690 100644 --- a/pkgs/development/libraries/haskell/time/1.1.3.nix +++ b/pkgs/development/libraries/haskell/time/1.1.3.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "time"; version = "1.1.3"; sha256 = "46d32400bc0099ccef1fb670684c00a31055725403ea15c7a39278ff7dccc65b"; + buildDepends = [ Cabal ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/time/1.2.0.3.nix b/pkgs/development/libraries/haskell/time/1.2.0.3.nix index 23cec7ab90f..34cc32f8c49 100644 --- a/pkgs/development/libraries/haskell/time/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/time/1.2.0.3.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "time"; version = "1.2.0.3"; sha256 = "acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e"; + buildDepends = [ Cabal ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/time/1.2.0.5.nix b/pkgs/development/libraries/haskell/time/1.2.0.5.nix index 78fed9b5754..604459e8aaa 100644 --- a/pkgs/development/libraries/haskell/time/1.2.0.5.nix +++ b/pkgs/development/libraries/haskell/time/1.2.0.5.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "time"; version = "1.2.0.5"; sha256 = "0y4plv9qvpmzzzb5855zngm6lmd38m0vr2mzwm94xhz2xsqhdh2z"; + buildDepends = [ Cabal ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/time/1.4.0.1.nix b/pkgs/development/libraries/haskell/time/1.4.0.1.nix index 8d9f810f724..08ebc4fc1a6 100644 --- a/pkgs/development/libraries/haskell/time/1.4.0.1.nix +++ b/pkgs/development/libraries/haskell/time/1.4.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq }: +{ cabal, Cabal, deepseq }: cabal.mkDerivation (self: { pname = "time"; version = "1.4.0.1"; sha256 = "046jyz2xnbg2s94d9xhpphgq93mqlky7bc50vss40wdk6l7w8aws"; - buildDepends = [ deepseq ]; + buildDepends = [ Cabal deepseq ]; meta = { homepage = "http://semantic.org/TimeLib/"; description = "A time library"; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 278ca4bc1b8..57a7394d9b6 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,5 +1,5 @@ -{ cabal, certificate, cryptoApi, cryptocipher, cryptohash, mtl -, network, text, time, tls, vector +{ cabal, Cabal, certificate, cryptoApi, cryptocipher, cryptohash +, mtl, network, text, time, tls, vector }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - certificate cryptoApi cryptocipher cryptohash mtl network text time - tls vector + Cabal certificate cryptoApi cryptocipher cryptohash mtl network + text time tls vector ]; meta = { homepage = "http://github.com/vincenthz/hs-tls-extra"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index f88b752e68c..34ed3ebf7b0 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,5 +1,5 @@ -{ cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash -, mtl +{ cabal, Cabal, cereal, certificate, cryptoApi, cryptocipher +, cryptohash, mtl }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - cereal certificate cryptoApi cryptocipher cryptohash mtl + Cabal cereal certificate cryptoApi cryptocipher cryptohash mtl ]; meta = { homepage = "http://github.com/vincenthz/hs-tls"; diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index 951458eb4eb..59cff77cc8d 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, Cabal, transformers }: cabal.mkDerivation (self: { pname = "transformers-base"; version = "0.4.1"; sha256 = "1d3w7k7smvdnnn4q6xpdhsj9zvj6372ihyhz4lrhdvgh72pfiaag"; - buildDepends = [ transformers ]; + buildDepends = [ Cabal transformers ]; meta = { homepage = "https://github.com/mvv/transformers-base"; description = "Lift computations from the bottom of a transformer stack"; diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix index f38605c17ad..6ca938fd224 100644 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "transformers"; version = "0.2.2.0"; sha256 = "1nkazxy2p0w5ad76vg1lc4l0nla1kdqjdf9pymjgk75dpiyijbdz"; + buildDepends = [ Cabal ]; meta = { description = "Concrete functor and monad transformers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix index fa06558fc0d..081621953fd 100644 --- a/pkgs/development/libraries/haskell/tuple/default.nix +++ b/pkgs/development/libraries/haskell/tuple/default.nix @@ -1,10 +1,10 @@ -{ cabal, OneTuple }: +{ cabal, Cabal, OneTuple }: cabal.mkDerivation (self: { pname = "tuple"; version = "0.2.0.1"; sha256 = "1c4vf798rjwshnk04avyjp4rjzj8i9qx4yksv00m3rjy6psr57xg"; - buildDepends = [ OneTuple ]; + buildDepends = [ Cabal OneTuple ]; meta = { description = "Various functions on tuples"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix index 922f7bbd62f..2f7031c6633 100644 --- a/pkgs/development/libraries/haskell/type-equality/default.nix +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "type-equality"; version = "0.1.0.2"; sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q"; + buildDepends = [ Cabal ]; noHaddock = true; meta = { homepage = "http://github.com/hesselink/type-equality/"; diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index e58da04d039..2345c95cf93 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, RepLib, transformers }: +{ cabal, Cabal, mtl, RepLib, transformers }: cabal.mkDerivation (self: { pname = "unbound"; version = "0.3.1"; sha256 = "13k53dcap8knvl2qzcykx838laas34xfc0480705vzl1z9z1xppz"; - buildDepends = [ mtl RepLib transformers ]; + buildDepends = [ Cabal mtl RepLib transformers ]; noHaddock = true; meta = { homepage = "http://code.google.com/p/replib/"; diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index c3043d0d14c..69948588bee 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -1,10 +1,10 @@ -{ cabal, hashable, syb, unorderedContainers }: +{ cabal, Cabal, hashable, syb, unorderedContainers }: cabal.mkDerivation (self: { pname = "uniplate"; version = "1.6.5"; sha256 = "1g29jbh2clxp87p8qjihgjgi8hdqgzray34bg6hv7whsy053apqs"; - buildDepends = [ hashable syb unorderedContainers ]; + buildDepends = [ Cabal hashable syb unorderedContainers ]; meta = { homepage = "http://community.haskell.org/~ndm/uniplate/"; description = "Help writing simple, concise and fast generic operations"; diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix index d717bd27871..c252e297bb7 100644 --- a/pkgs/development/libraries/haskell/uniqueid/default.nix +++ b/pkgs/development/libraries/haskell/uniqueid/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "uniqueid"; version = "0.1.1"; sha256 = "e69df591c1ab9901af24bf0e63032765eb2b1ba4ca4fb720a234e9f292e03268"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/sebfisch/uniqueid/wikis"; description = "Splittable Unique Identifier Supply"; diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 83b670ee2c2..46912be1c0e 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "unix-compat"; version = "0.3.0.1"; sha256 = "09y2iih741l4jpi83c15zap94phfms4mavzg04r9rjgbav0ns2c4"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index da4616a1367..fe44f7a7e07 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -1,10 +1,10 @@ -{ cabal, deepseq, hashable }: +{ cabal, Cabal, deepseq, hashable }: cabal.mkDerivation (self: { pname = "unordered-containers"; version = "0.1.4.6"; sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d"; - buildDepends = [ deepseq hashable ]; + buildDepends = [ Cabal deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix index 466d5309019..c3c11da805c 100644 --- a/pkgs/development/libraries/haskell/url/default.nix +++ b/pkgs/development/libraries/haskell/url/default.nix @@ -1,10 +1,10 @@ -{ cabal, utf8String }: +{ cabal, Cabal, utf8String }: cabal.mkDerivation (self: { pname = "url"; version = "2.1.2"; sha256 = "2cf5c4296418afe3940ae4de66d867897b1382cc4d37a0b9a5ccffa16743ef91"; - buildDepends = [ utf8String ]; + buildDepends = [ Cabal utf8String ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Url"; description = "A library for working with URLs"; diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix index 59ebfe3b5e6..d3d05c4b7bf 100644 --- a/pkgs/development/libraries/haskell/utf8-light/default.nix +++ b/pkgs/development/libraries/haskell/utf8-light/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "utf8-light"; version = "0.4.0.1"; sha256 = "1y2vfxjgq8r90bpaxhha0s837vklpwdj4cj3h61bimc0lcx22905"; + buildDepends = [ Cabal ]; meta = { description = "Unicode"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix index 0928ae0347b..678e1215202 100644 --- a/pkgs/development/libraries/haskell/utf8-string/default.nix +++ b/pkgs/development/libraries/haskell/utf8-string/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "utf8-string"; version = "0.3.7"; sha256 = "1s59xsw1i311rpxb7arnd280pjqab5mrlfjmxbabknka8wqlnnvq"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/glguy/utf8-string/"; description = "Support for reading and writing UTF8 Strings"; diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 6b79e4cdda8..60fa978c4a0 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "utility-ht"; version = "0.0.7.1"; sha256 = "0k097kyv6rxjvg1drnphv2mg882xx2lk098hs557fcsr16w658ma"; + buildDepends = [ Cabal ]; meta = { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index ed6701976dd..130959ce6d7 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -1,10 +1,10 @@ -{ cabal, ListLike, time }: +{ cabal, Cabal, ListLike, time }: cabal.mkDerivation (self: { pname = "uu-parsinglib"; version = "2.7.3.2"; sha256 = "0z53s9wvk57g3d9x3iswjydwm7nw5vfrj7k08v75fw6rwldkal60"; - buildDepends = [ ListLike time ]; + buildDepends = [ Cabal ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators"; diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 38e9d27f1f0..b88855f4823 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "uulib"; version = "0.9.14"; sha256 = "0bi62l9fp1ghqq4dagdy4nsxmm08gpsrnfgy6d6k8f4239s3yr0z"; + buildDepends = [ Cabal ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Haskell Utrecht Tools Library"; diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix index ccabd8cc7fa..2132911f679 100644 --- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix @@ -1,4 +1,5 @@ -{ cabal, cairo, deepseq, gtk, strictConcurrency, svgcairo, vacuum +{ cabal, Cabal, cairo, deepseq, gtk, strictConcurrency, svgcairo +, vacuum }: cabal.mkDerivation (self: { @@ -6,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.5"; sha256 = "0jp3xn1h28igcg3xb97ifawx11i7adnyi0ff264w0fril9b8ylwc"; buildDepends = [ - cairo deepseq gtk strictConcurrency svgcairo vacuum + Cabal cairo deepseq gtk strictConcurrency svgcairo vacuum ]; meta = { homepage = "http://code.haskell.org/~dons/code/vacuum-cairo"; diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 1b5b5d540fd..f747be88cb2 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -1,9 +1,10 @@ -{ cabal, ghcPaths }: +{ cabal, Cabal, ghcPaths }: cabal.mkDerivation (self: { pname = "vacuum"; version = "1.0.0.2"; sha256 = "1amlzd89952fvw1sbajf9kv3f2s2i6xbqs1zjxw442achg465y7i"; + buildDepends = [ Cabal ]; extraLibraries = [ ghcPaths ]; meta = { homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/"; diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 2781de9ebe6..f58f26f799a 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "vault"; version = "0.1.0.0"; sha256 = "02gki0g9mwmvvizxhk6myfg3dmlqpcjjiz5c8693a060hkr0grqq"; + buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; description = "a typed, persistent store for values of arbitrary types"; diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 6988cae0276..7f30e147ed2 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -1,10 +1,10 @@ -{ cabal, primitive, vector }: +{ cabal, Cabal, primitive, vector }: cabal.mkDerivation (self: { pname = "vector-algorithms"; version = "0.5.4"; sha256 = "0j16jmnmgksbzsq2vvxjmciywi91clak77i6zjjghvn9dpmnsmv2"; - buildDepends = [ primitive vector ]; + buildDepends = [ Cabal primitive vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; description = "Efficient algorithms for vector arrays"; diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index b9ba9bae525..338156736eb 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -1,10 +1,10 @@ -{ cabal, Boolean, MemoTrie, NumInstances }: +{ cabal, Boolean, Cabal, MemoTrie, NumInstances }: cabal.mkDerivation (self: { pname = "vector-space"; version = "0.8.0"; sha256 = "1wd8psw2s98m8yfr8mam5abz2bhvxz1r78w703hgca8rr6hiaz0g"; - buildDepends = [ Boolean MemoTrie NumInstances ]; + buildDepends = [ Boolean Cabal MemoTrie NumInstances ]; meta = { homepage = "http://haskell.org/haskellwiki/vector-space"; description = "Vector & affine spaces, linear maps, and derivatives"; diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/default.nix index c5c06fe93e5..941fabb0a4b 100644 --- a/pkgs/development/libraries/haskell/vector/default.nix +++ b/pkgs/development/libraries/haskell/vector/default.nix @@ -1,10 +1,10 @@ -{ cabal, primitive }: +{ cabal, Cabal, primitive }: cabal.mkDerivation (self: { pname = "vector"; version = "0.9.1"; sha256 = "1m6p9dy48fwh2y21y7r6svhzs86a1yijkjil7ch1mdn86gv0f9as"; - buildDepends = [ primitive ]; + buildDepends = [ Cabal primitive ]; meta = { homepage = "http://code.haskell.org/vector"; description = "Efficient Arrays"; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 209eb667c77..ab8de466c31 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,5 +1,5 @@ -{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String -, vector +{ cabal, Cabal, deepseq, mtl, parallel, parsec, terminfo +, utf8String, vector }: cabal.mkDerivation (self: { @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "4.7.0.10"; sha256 = "03cvr4z0fvxfyrikgf89777cp1xqhy22yj83p0dysp0i5ds6cd9v"; buildDepends = [ - deepseq mtl parallel parsec terminfo utf8String vector + Cabal deepseq mtl parallel parsec terminfo utf8String vector ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index e7197e293f2..98767a51191 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,6 +1,6 @@ -{ cabal, base64Bytestring, blazeBuilder, blazeHtml, cryptohash -, fileEmbed, httpDate, httpTypes, text, time, transformers -, unixCompat, wai +{ cabal, base64Bytestring, blazeBuilder, blazeHtml, Cabal +, cryptohash, fileEmbed, httpDate, httpTypes, text, time +, transformers, unixCompat, wai }: cabal.mkDerivation (self: { @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { version = "1.1.1"; sha256 = "0i73rxgmng7grs8cgxw8769jg0cvpsb5gi4s0iwrdyh3xd1vj7iy"; buildDepends = [ - base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed + base64Bytestring blazeBuilder blazeHtml Cabal cryptohash fileEmbed httpDate httpTypes text time transformers unixCompat wai ]; meta = { diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index e0a36878582..6a6561a2e64 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive +{ cabal, blazeBuilder, blazeBuilderConduit, Cabal, caseInsensitive , conduit, dataDefault, fastLogger, httpTypes, network, text, time , transformers, wai, zlibConduit }: @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { version = "1.1.0"; sha256 = "1mj2swb2bgsay9prpw6h0wmwsqyan53ndyczmhppdax4y5088f55"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit + blazeBuilder blazeBuilderConduit Cabal caseInsensitive conduit dataDefault fastLogger httpTypes network text time transformers wai zlibConduit ]; diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index 83b43004bc0..21045a42acb 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,5 +1,5 @@ -{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger -, httpTypes, network, time, wai +{ cabal, blazeBuilder, byteorder, Cabal, caseInsensitive +, fastLogger, httpTypes, network, time, wai }: cabal.mkDerivation (self: { @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.1.4"; sha256 = "1rvcqq4jlkcjavy8a3vf61jclwpnjmj6cp3whrzwvay9b1qfsck3"; buildDepends = [ - blazeBuilder byteorder caseInsensitive fastLogger httpTypes network - time wai + blazeBuilder byteorder Cabal caseInsensitive fastLogger httpTypes + network time wai ]; meta = { description = "A logging system for WAI"; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index f1d4210b667..09f8dcdf3dd 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, conduit, httpTypes, network, text +{ cabal, blazeBuilder, Cabal, conduit, httpTypes, network, text , transformers, vault }: @@ -7,7 +7,8 @@ cabal.mkDerivation (self: { version = "1.1.0"; sha256 = "1kmmivcak9v13rgivs2vhr543dfdx19wncwlpda453570ywam7vh"; buildDepends = [ - blazeBuilder conduit httpTypes network text transformers vault + blazeBuilder Cabal conduit httpTypes network text transformers + vault ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index b6380981d00..4b3ccff5a57 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive +{ cabal, blazeBuilder, blazeBuilderConduit, Cabal, caseInsensitive , conduit, httpTypes, liftedBase, network, simpleSendfile , transformers, unixCompat, wai }: @@ -8,8 +8,9 @@ cabal.mkDerivation (self: { version = "1.1.0"; sha256 = "1an2j89422rcvrvrmhg1hwj8vpikjj5xdzb3h37rjsfj6qlqy5cf"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes - liftedBase network simpleSendfile transformers unixCompat wai + blazeBuilder blazeBuilderConduit Cabal caseInsensitive conduit + httpTypes liftedBase network simpleSendfile transformers unixCompat + wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix index 7ecc85742e1..6ba4e6c27c5 100644 --- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix @@ -1,4 +1,4 @@ -{ cabal, pathPieces, text }: +{ cabal, Cabal, pathPieces, text }: cabal.mkDerivation (self: { pname = "web-routes-quasi"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf"; isLibrary = true; isExecutable = true; - buildDepends = [ pathPieces text ]; + buildDepends = [ Cabal pathPieces text ]; meta = { homepage = "http://docs.yesodweb.com/web-routes-quasi/"; description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 0a6d10539e1..838ae3d31b4 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text +{ cabal, blazeBuilder, Cabal, httpTypes, mtl, network, parsec, text , utf8String }: @@ -7,7 +7,7 @@ cabal.mkDerivation (self: { version = "0.26.3"; sha256 = "1ldi4gjraga57qj9drknwp19vmy30fhcp6vw3y7xqcrarvp5n2mx"; buildDepends = [ - blazeBuilder httpTypes mtl network parsec text utf8String + blazeBuilder Cabal httpTypes mtl network parsec text utf8String ]; meta = { description = "Library for maintaining correctness and composability of URLs within an application"; diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index 5833af8efaa..dc852141368 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "wl-pprint-text"; version = "1.0.0.0"; sha256 = "1zvjsbn98g0lja2jj00d7mvqjq4rik7v7wsy5655wibmy0hbll90"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { description = "A Wadler/Leijen Pretty Printer for Text values"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 450597c22e1..712f4aef3a5 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -1,10 +1,10 @@ -{ cabal, stm, wxcore }: +{ cabal, Cabal, stm, wxcore }: cabal.mkDerivation (self: { pname = "wx"; version = "0.13.2.1"; sha256 = "0s5jmsrip26ahvz7mzf12m9rcibrk9is3kwbswz87h0sr0k11nbv"; - buildDepends = [ stm wxcore ]; + buildDepends = [ Cabal stm wxcore ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index ce24888ce14..38808b57b8b 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -1,10 +1,12 @@ -{ cabal, libX11, mesa, parsec, stm, time, wxdirect, wxGTK }: +{ cabal, Cabal, filepath, libX11, mesa, parsec, stm, time, wxdirect +, wxGTK +}: cabal.mkDerivation (self: { pname = "wxcore"; version = "0.13.2.1"; sha256 = "0p0d9vxw2pyvnhswsgasdd62hj86w3ixbbsx41wkswzkjjjib9i6"; - buildDepends = [ parsec stm time wxdirect ]; + buildDepends = [ Cabal filepath parsec stm time wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index b2df725223d..d1c4a609047 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -1,4 +1,4 @@ -{ cabal, parsec, strict, time }: +{ cabal, Cabal, parsec, strict, time }: cabal.mkDerivation (self: { pname = "wxdirect"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1gn5si6939yizlkf7hzm2a2gff5sa98m7q5q1hz23av98zfa8pv7"; isLibrary = true; isExecutable = true; - buildDepends = [ parsec strict time ]; + buildDepends = [ Cabal parsec strict time ]; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix index 3c369103486..fd2233e2833 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "xhtml"; version = "3000.2.0.1"; sha256 = "15pcigascajky67v0lhdhn4bv8xq16cvzib05mg4f1ynwr5a9mv0"; + buildDepends = [ Cabal ]; meta = { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix index 33527b9affd..a758e19c015 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "xhtml"; version = "3000.2.0.4"; sha256 = "07kqii5dsfdaf46y4k19l9llhzhxssr24jbjpr5i8p1qh7117abw"; + buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix index c5a374eb2d0..095c797da78 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "xhtml"; version = "3000.2.0.5"; sha256 = "1gqq910pncqppb2dscxnfxvm1ly4qpb5mwmady2i4irar3gngh9v"; + buildDepends = [ Cabal ]; meta = { homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 132d3de4a8f..1c994cfd73d 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,5 +1,5 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, conduit, dataDefault, failure +, blazeBuilderConduit, Cabal, conduit, dataDefault, failure , systemFilepath, text, transformers, xmlTypes }: @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { version = "0.5.2"; sha256 = "0wr9xbx2dwv0kmnx9jwlm1734a22mc79ydg4sh61335fdjvchfnd"; buildDepends = [ - attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit + attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit Cabal conduit dataDefault failure systemFilepath text transformers xmlTypes ]; diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix index c891096c205..71362f44b88 100644 --- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/xml-enumerator/default.nix @@ -1,6 +1,6 @@ { cabal, attoparsec, attoparsecEnumerator, blazeBuilder -, blazeBuilderEnumerator, dataDefault, enumerator, failure, text -, transformers, xmlTypes +, blazeBuilderEnumerator, Cabal, dataDefault, enumerator, failure +, text, transformers, xmlTypes }: cabal.mkDerivation (self: { @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - dataDefault enumerator failure text transformers xmlTypes + Cabal dataDefault enumerator failure text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index 721d49dc588..b868199f057 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "xml-types"; version = "0.3.1"; sha256 = "0ffmmidb9a1hqfbmvjxjvij2wfrqqlyjc7m7n81czrcrrsmyc1kc"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "https://john-millikin.com/software/haskell-xml/"; description = "Basic types for representing XML"; diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 8a8e6e3e2ad..050edd2d748 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, Cabal, text }: cabal.mkDerivation (self: { pname = "xml"; version = "1.3.12"; sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai"; - buildDepends = [ text ]; + buildDepends = [ Cabal text ]; meta = { homepage = "http://code.galois.com"; description = "A simple XML library"; diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index 745480ecf0c..d7389564f8c 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -1,11 +1,13 @@ -{ cabal, attoparsec, cssText, network, tagsoup, text, utf8String }: +{ cabal, attoparsec, Cabal, cssText, network, tagsoup, text +, utf8String +}: cabal.mkDerivation (self: { pname = "xss-sanitize"; version = "0.3.1"; sha256 = "0s8nqqx5f5b07xxlda4gh0w6vmlkhbqbz36cf6glhbhhyw27jkx5"; buildDepends = [ - attoparsec cssText network tagsoup text utf8String + attoparsec Cabal cssText network tagsoup text utf8String ]; meta = { homepage = "http://github.com/gregwebs/haskell-xss-sanitize"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 4256705fe24..77c3cdbefdd 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,4 +1,4 @@ -{ cabal, aeson, attoparsec, conduit, text, transformers +{ cabal, aeson, attoparsec, Cabal, conduit, text, transformers , unorderedContainers, vector }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.5.2"; sha256 = "1jhzycasfmjlfdpca1cflrggc16jp16852af7d6cwfsy342wh6gp"; buildDepends = [ - aeson attoparsec conduit text transformers unorderedContainers - vector + aeson attoparsec Cabal conduit text transformers + unorderedContainers vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix index 62dc82b1068..03508019b9c 100644 --- a/pkgs/development/libraries/haskell/yap/default.nix +++ b/pkgs/development/libraries/haskell/yap/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "yap"; version = "0.2"; sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i"; + buildDepends = [ Cabal ]; meta = { description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 4cb1bb336ee..02241f56e1d 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,4 +1,4 @@ -{ cabal, aeson, authenticate, blazeHtml, hamlet, httpConduit +{ cabal, aeson, authenticate, blazeHtml, Cabal, hamlet, httpConduit , liftedBase, mimeMail, persistent, persistentTemplate, pureMD5 , pwstoreFast, random, SHA, shakespeareCss, text, transformers , unorderedContainers, wai, yesodCore, yesodForm, yesodJson @@ -10,10 +10,10 @@ cabal.mkDerivation (self: { version = "0.8.1.1"; sha256 = "0wmvywyil6cnpxq777a0w4qknw4lr4i53nni4bcigrvmpg7gzgac"; buildDepends = [ - aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail - persistent persistentTemplate pureMD5 pwstoreFast random SHA - shakespeareCss text transformers unorderedContainers wai yesodCore - yesodForm yesodJson yesodPersistent + aeson authenticate blazeHtml Cabal hamlet httpConduit liftedBase + mimeMail persistent persistentTemplate pureMD5 pwstoreFast random + SHA shakespeareCss text transformers unorderedContainers wai + yesodCore yesodForm yesodJson yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 7699e4d291b..40cf254b69d 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,9 +1,9 @@ -{ cabal, aeson, blazeBuilder, blazeHtml, caseInsensitive, cereal -, clientsession, conduit, cookie, failure, fastLogger, hamlet -, httpTypes, liftedBase, monadControl, parsec, pathPieces, random -, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs, text -, time, transformers, transformersBase, vector, wai, waiExtra -, waiLogger, yesodRoutes +{ cabal, aeson, blazeBuilder, blazeHtml, Cabal, caseInsensitive +, cereal, clientsession, conduit, cookie, failure, fastLogger +, hamlet, httpTypes, liftedBase, monadControl, parsec, pathPieces +, random, shakespeare, shakespeareCss, shakespeareI18n +, shakespeareJs, text, time, transformers, transformersBase, vector +, wai, waiExtra, waiLogger, yesodRoutes }: cabal.mkDerivation (self: { @@ -11,10 +11,10 @@ cabal.mkDerivation (self: { version = "0.10.1"; sha256 = "011bxz0wjd349jhwxh0cs1lhqpjgwq57ia8wzxf21bcwy8c08nj0"; buildDepends = [ - aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession - conduit cookie failure fastLogger hamlet httpTypes liftedBase - monadControl parsec pathPieces random shakespeare shakespeareCss - shakespeareI18n shakespeareJs text time transformers + aeson blazeBuilder blazeHtml Cabal caseInsensitive cereal + clientsession conduit cookie failure fastLogger hamlet httpTypes + liftedBase monadControl parsec pathPieces random shakespeare + shakespeareCss shakespeareI18n shakespeareJs text time transformers transformersBase vector wai waiExtra waiLogger yesodRoutes ]; meta = { diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index fb89b511504..2eae95b6597 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,4 +1,4 @@ -{ cabal, shakespeareCss, shakespeareJs, text, transformers +{ cabal, Cabal, shakespeareCss, shakespeareJs, text, transformers , unorderedContainers, wai, waiExtra, warp, yaml, yesodCore }: @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { version = "0.6.1"; sha256 = "0am5f8r2w7695zfc6vi0gy8yin9kfgj37qzr14r5v6wzhk1gq5da"; buildDepends = [ - shakespeareCss shakespeareJs text transformers unorderedContainers - wai waiExtra warp yaml yesodCore + Cabal shakespeareCss shakespeareJs text transformers + unorderedContainers wai waiExtra warp yaml yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 3b1d6e9170d..216ab5162ca 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, blazeHtml, dataDefault, emailValidate +{ cabal, blazeBuilder, blazeHtml, Cabal, dataDefault, emailValidate , hamlet, network, persistent, shakespeareCss, shakespeareJs, text , time, transformers, wai, xssSanitize, yesodCore, yesodPersistent }: @@ -8,9 +8,9 @@ cabal.mkDerivation (self: { version = "0.4.1"; sha256 = "0l55n7zml3sf8f2qmmii5cq53awajc4vfr5msrm8kvi3ivzjld0s"; buildDepends = [ - blazeBuilder blazeHtml dataDefault emailValidate hamlet network - persistent shakespeareCss shakespeareJs text time transformers wai - xssSanitize yesodCore yesodPersistent + blazeBuilder blazeHtml Cabal dataDefault emailValidate hamlet + network persistent shakespeareCss shakespeareJs text time + transformers wai xssSanitize yesodCore yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 66c31e868d6..a092a4e8f28 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,5 +1,5 @@ -{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, safe -, shakespeareJs, text, transformers, vector, wai, waiExtra +{ cabal, aeson, attoparsecConduit, blazeBuilder, Cabal, conduit +, safe, shakespeareJs, text, transformers, vector, wai, waiExtra , yesodCore, yesodRoutes }: @@ -8,8 +8,9 @@ cabal.mkDerivation (self: { version = "0.3.1"; sha256 = "17w82mfl364dc0k1zk1gqas3fyskz2jc50diq71fiw87apslva4v"; buildDepends = [ - aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs - text transformers vector wai waiExtra yesodCore yesodRoutes + aeson attoparsecConduit blazeBuilder Cabal conduit safe + shakespeareJs text transformers vector wai waiExtra yesodCore + yesodRoutes ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 11a85b9cf8e..005ec768bab 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,11 +1,13 @@ -{ cabal, persistent, persistentTemplate, transformers, yesodCore }: +{ cabal, Cabal, persistent, persistentTemplate, transformers +, yesodCore +}: cabal.mkDerivation (self: { pname = "yesod-persistent"; version = "0.3.1"; sha256 = "0pxzwqrq4wr9hdnppi5ri0iip2a8gg2y7lplmhn2791jc001ll7m"; buildDepends = [ - persistent persistentTemplate transformers yesodCore + Cabal persistent persistentTemplate transformers yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index c93b5e1db8c..0a840769be1 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -1,10 +1,10 @@ -{ cabal, pathPieces, text, vector }: +{ cabal, Cabal, pathPieces, text, vector }: cabal.mkDerivation (self: { pname = "yesod-routes"; version = "0.0.1"; sha256 = "19bnww5idxr0j2l8g838idxkhhn73bhdz0bnvglinv7163fy8xhl"; - buildDepends = [ pathPieces text vector ]; + buildDepends = [ Cabal pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; description = "Efficient routing for Yesod"; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 815932e6248..8fcaaf9627f 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,4 +1,4 @@ -{ cabal, base64Bytestring, cereal, conduit, cryptoConduit +{ cabal, base64Bytestring, Cabal, cereal, conduit, cryptoConduit , cryptohash, fileEmbed, httpTypes, text, transformers, unixCompat , wai, waiAppStatic, yesodCore }: @@ -8,8 +8,9 @@ cabal.mkDerivation (self: { version = "0.10.1"; sha256 = "07dapygk2n6d7sk39gwi06w96b13dqhxgx3l7ac198nil5x2m68m"; buildDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed - httpTypes text transformers unixCompat wai waiAppStatic yesodCore + base64Bytestring Cabal cereal conduit cryptoConduit cryptohash + fileEmbed httpTypes text transformers unixCompat wai waiAppStatic + yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index e74f73ac53f..435aa7492bb 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,8 +1,8 @@ -{ cabal, attoparsec, blazeBuilder, blazeHtml, fastLogger, hamlet -, httpTypes, monadControl, parsec, shakespeareCss, shakespeareJs -, shakespeareText, text, time, transformers, unixCompat, wai -, waiExtra, waiLogger, warp, yesodAuth, yesodCore, yesodForm -, yesodJson, yesodPersistent +{ cabal, attoparsec, blazeBuilder, blazeHtml, Cabal, fastLogger +, filepath, hamlet, httpTypes, monadControl, parsec, shakespeareCss +, shakespeareJs, shakespeareText, text, time, transformers +, unixCompat, wai, waiExtra, waiLogger, warp, yesodAuth, yesodCore +, yesodForm, yesodJson, yesodPersistent }: cabal.mkDerivation (self: { @@ -12,10 +12,11 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec blazeBuilder blazeHtml fastLogger hamlet httpTypes - monadControl parsec shakespeareCss shakespeareJs shakespeareText - text time transformers unixCompat wai waiExtra waiLogger warp - yesodAuth yesodCore yesodForm yesodJson yesodPersistent + attoparsec blazeBuilder blazeHtml Cabal fastLogger filepath hamlet + httpTypes monadControl parsec shakespeareCss shakespeareJs + shakespeareText text time transformers unixCompat wai waiExtra + waiLogger warp yesodAuth yesodCore yesodForm yesodJson + yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 0810157ae54..af079e53187 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -1,5 +1,5 @@ -{ cabal, csv, HsSyck, HStringTemplate, pandoc, parsec, split, time -, utf8String, xhtml +{ cabal, Cabal, csv, filepath, HsSyck, HStringTemplate, pandoc +, parsec, split, time, utf8String, xhtml }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - csv HsSyck HStringTemplate pandoc parsec split time utf8String - xhtml + Cabal csv filepath HsSyck HStringTemplate pandoc parsec split time + utf8String xhtml ]; meta = { homepage = "http://github.com/jgm/yst"; diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index ef2eb97063a..7836e2fbc18 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -1,9 +1,10 @@ -{ cabal, zeromq }: +{ cabal, Cabal, zeromq }: cabal.mkDerivation (self: { pname = "zeromq-haskell"; version = "0.8.3"; sha256 = "1gp85fbgylsqkxacgdxv4ifvgvwca03gy88raphqhrnk59bmjgzd"; + buildDepends = [ Cabal ]; extraLibraries = [ zeromq ]; meta = { homepage = "http://github.com/twittner/zeromq-haskell/"; diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 327a1ec5141..e3fc50cacb4 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,4 +1,4 @@ -{ cabal, binary, digest, mtl, utf8String, zlib }: +{ cabal, binary, Cabal, digest, filepath, mtl, utf8String, zlib }: cabal.mkDerivation (self: { pname = "zip-archive"; @@ -6,7 +6,9 @@ cabal.mkDerivation (self: { sha256 = "1q52v18kl1j049kk3yb7rp0k27p6q7r72mg1vcbdid6qd7a9dh48"; isLibrary = true; isExecutable = true; - buildDepends = [ binary digest mtl utf8String zlib ]; + buildDepends = [ + binary Cabal digest filepath mtl utf8String zlib + ]; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index c36def2683c..57f3ee199ae 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -1,10 +1,10 @@ -{ cabal, multirec }: +{ cabal, Cabal, multirec }: cabal.mkDerivation (self: { pname = "zipper"; version = "0.4.1"; sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi"; - buildDepends = [ multirec ]; + buildDepends = [ Cabal multirec ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; description = "Generic zipper for families of recursive datatypes"; diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index a2240ca327c..79a72eacd96 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -1,10 +1,10 @@ -{ cabal, zlib }: +{ cabal, Cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib-bindings"; version = "0.0.3.2"; sha256 = "0x78fkjinfhhihhfihr0g5rc4d8jkhza3vw5qsyds74skd6rsy1q"; - buildDepends = [ zlib ]; + buildDepends = [ Cabal zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; description = "Low-level bindings to the zlib package"; diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index decdd32676a..2b7204e104b 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, conduit, transformers, zlibBindings }: +{ cabal, Cabal, conduit, transformers, zlibBindings }: cabal.mkDerivation (self: { pname = "zlib-conduit"; version = "0.2.0"; sha256 = "1vwan9vglj7xdna3pfw71bcfcp10s4vn6fd6wwdz7wvxrbn52gsk"; - buildDepends = [ conduit transformers zlibBindings ]; + buildDepends = [ Cabal conduit transformers zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits"; diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index 3e99ed8d5c9..e7c73c60518 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -1,4 +1,4 @@ -{ cabal, enumerator, transformers, zlibBindings }: +{ cabal, Cabal, enumerator, transformers, zlibBindings }: cabal.mkDerivation (self: { pname = "zlib-enum"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0cnx7sbgj6s0gvq6pcqyi3xahx7x3bj47ap10z89qfbk0906rkq8"; isLibrary = true; isExecutable = true; - buildDepends = [ enumerator transformers zlibBindings ]; + buildDepends = [ Cabal enumerator transformers zlibBindings ]; meta = { homepage = "http://github.com/maltem/zlib-enum"; description = "Enumerator interface for zlib compression"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix index 60f81e7f984..a8a06bbd361 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix @@ -1,9 +1,10 @@ -{ cabal, zlib }: +{ cabal, Cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib"; version = "0.5.0.0"; sha256 = "20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891"; + buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix index 5ec59a9690f..87b60d13654 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -1,9 +1,10 @@ -{ cabal, zlib }: +{ cabal, Cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib"; version = "0.5.2.0"; sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f"; + buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix index f4355c0a954..51cbe77722f 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix @@ -1,9 +1,10 @@ -{ cabal, zlib }: +{ cabal, Cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib"; version = "0.5.3.1"; sha256 = "1hj56lk4g2zr7acdda39zib1bj02777q0asm5ms9rfj7kp81caiq"; + buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index 909754db3e7..c632b91b114 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -1,9 +1,10 @@ -{ cabal, zlib }: +{ cabal, Cabal, zlib }: cabal.mkDerivation (self: { pname = "zlib"; version = "0.5.3.3"; sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; + buildDepends = [ Cabal ]; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix index 3abd66fe534..35299f2901a 100644 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix @@ -1,4 +1,4 @@ -{ cabal, alex, ghcPaths, happy }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547"; isLibrary = true; isExecutable = true; - buildDepends = [ ghcPaths ]; + buildDepends = [ Cabal filepath ghcPaths ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix index a0631117650..1303473f807 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix @@ -1,4 +1,4 @@ -{ cabal, alex, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86"; isLibrary = true; isExecutable = true; - buildDepends = [ ghcPaths xhtml ]; + buildDepends = [ Cabal filepath ghcPaths xhtml ]; buildTools = [ alex happy ]; meta = { homepage = "http://www.haskell.org/haddock/"; diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index b269ebb4a88..6f3ac738bff 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, alexMeta, happyMeta, haskellSrcMeta }: +{ cabal, alexMeta, Cabal, happyMeta, haskellSrcMeta }: cabal.mkDerivation (self: { pname = "BNFC-meta"; version = "0.2.2"; sha256 = "07jfc0dcrcckibbw0xca1h7x3lnc9jfylfkcs23f0hyg31irf8dx"; - buildDepends = [ alexMeta happyMeta haskellSrcMeta ]; + buildDepends = [ alexMeta Cabal happyMeta haskellSrcMeta ]; meta = { description = "Deriving Quasi-Quoters from BNF Grammars"; license = self.stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index c06b5eacc24..12357617ae8 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl }: +{ cabal, Cabal, mtl }: cabal.mkDerivation (self: { pname = "BNFC"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0nnalzsql1k5y3s93g5y2hy2gcdsrbi8r7cwzmdcy4vyy589pin0"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; meta = { homepage = "http://www.cse.chalmers.se/research/group/Language-technology/BNFC/"; description = "A compiler front-end generator"; diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 23739451816..74e621fa8d9 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -1,4 +1,4 @@ -{ cabal, hint, mtl, network, syb }: +{ cabal, Cabal, filepath, hint, mtl, network, syb }: cabal.mkDerivation (self: { pname = "HaRe"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "13mi6z37fszrl97mll4injhq8dyhqzm344x7y2vw8krr5xjj3kw2"; isLibrary = false; isExecutable = true; - buildDepends = [ hint mtl network syb ]; + buildDepends = [ Cabal filepath hint mtl network syb ]; meta = { homepage = "http://www.cs.kent.ac.uk/projects/refactor-fp"; description = "the Haskell Refactorer"; diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index 0987989051f..cb476d561f4 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -1,5 +1,5 @@ -{ cabal, extensibleExceptions, fgl, Graphalyze, graphviz -, haskellSrcExts, mtl, multiset, random +{ cabal, Cabal, extensibleExceptions, fgl, filepath, Graphalyze +, graphviz, haskellSrcExts, mtl, multiset, random }: cabal.mkDerivation (self: { @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - extensibleExceptions fgl Graphalyze graphviz haskellSrcExts mtl - multiset random + Cabal extensibleExceptions fgl filepath Graphalyze graphviz + haskellSrcExts mtl multiset random ]; meta = { description = "Static code analysis using graph-theoretic techniques"; diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index 5ec29160bb4..6fe78ac9c7c 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcMeta }: +{ cabal, Cabal, haskellSrcMeta }: cabal.mkDerivation (self: { pname = "alex-meta"; version = "0.2.0.2"; sha256 = "1v47p1nrx2nb92aasq7ml6i0sy1nfyybgm9n4r1sw1g86dg1y8z1"; - buildDepends = [ haskellSrcMeta ]; + buildDepends = [ Cabal haskellSrcMeta ]; meta = { description = "Quasi-quoter for Alex lexers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix index 3dd9cb9926f..c48a6d6a61d 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "cabal-ghci"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal filepath ]; meta = { homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki"; description = "Set up ghci with options taken from a .cabal file"; diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index a57ff5f6b88..f89f22d6cbd 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcMeta, mtl }: +{ cabal, Cabal, haskellSrcMeta, mtl }: cabal.mkDerivation (self: { pname = "happy-meta"; version = "0.2.0.3"; sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9"; - buildDepends = [ haskellSrcMeta mtl ]; + buildDepends = [ Cabal haskellSrcMeta mtl ]; meta = { description = "Quasi-quoter for Happy parsers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 180d0057e1b..42f6135856d 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,4 +1,6 @@ -{ cabal, cpphs, haskellSrcExts, hscolour, transformers, uniplate }: +{ cabal, Cabal, cpphs, filepath, haskellSrcExts, hscolour +, transformers, uniplate +}: cabal.mkDerivation (self: { pname = "hlint"; @@ -7,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - cpphs haskellSrcExts hscolour transformers uniplate + Cabal cpphs filepath haskellSrcExts hscolour transformers uniplate ]; meta = { homepage = "http://community.haskell.org/~ndm/hlint/"; diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index 78863fab185..16125b5b115 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, network, time }: +{ cabal, Cabal, mtl, network, time }: cabal.mkDerivation (self: { pname = "hslogger"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0lk966csxxyjjdg5jg4pzzl5118zj8ms78vn1n9imb7f4vcs8vk7"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl network time ]; + buildDepends = [ Cabal mtl network time ]; meta = { homepage = "http://software.complete.org/hslogger"; description = "Versatile logging framework"; diff --git a/pkgs/development/tools/haskell/tar/0.3.2.0.nix b/pkgs/development/tools/haskell/tar/0.3.2.0.nix index 8bffe95fe89..02db9131f8a 100644 --- a/pkgs/development/tools/haskell/tar/0.3.2.0.nix +++ b/pkgs/development/tools/haskell/tar/0.3.2.0.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "tar"; version = "0.3.2.0"; sha256 = "0yplrfai8bwihyn18whi0jiz1qzll9hgbc37xcy2jkr28480jba9"; + buildDepends = [ Cabal filepath ]; meta = { description = "Reading, writing and manipulating \".tar\" archive files."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/tar/0.4.0.0.nix b/pkgs/development/tools/haskell/tar/0.4.0.0.nix index 70afaa4aa6a..ebabfc2a6f2 100644 --- a/pkgs/development/tools/haskell/tar/0.4.0.0.nix +++ b/pkgs/development/tools/haskell/tar/0.4.0.0.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, Cabal, filepath }: cabal.mkDerivation (self: { pname = "tar"; version = "0.4.0.0"; sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3"; + buildDepends = [ Cabal filepath ]; meta = { description = "Reading, writing and manipulating \".tar\" archive files."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index 0b05713e7b8..84475081014 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,5 +1,5 @@ -{ cabal, binary, cairo, deepseq, ghcEvents, glib, gtk, mtl, pango -, time +{ cabal, binary, Cabal, cairo, deepseq, filepath, ghcEvents, glib +, gtk, mtl, pango, time }: cabal.mkDerivation (self: { @@ -9,7 +9,8 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - binary cairo deepseq ghcEvents glib gtk mtl pango time + binary Cabal cairo deepseq filepath ghcEvents glib gtk mtl pango + time ]; configureFlags = "--ghc-options=-rtsopts"; meta = { diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index c50391efd4e..0705d1d0a3d 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -1,4 +1,4 @@ -{ cabal, haskellSrcExts, mtl, uulib }: +{ cabal, Cabal, filepath, haskellSrcExts, mtl, uulib }: cabal.mkDerivation (self: { pname = "uuagc-bootstrap"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0zsb8pz2zx7y8sjp392hpdk30dzzmppjizcnlgd1wvq2csacnfxq"; isLibrary = true; isExecutable = true; - buildDepends = [ haskellSrcExts mtl uulib ]; + buildDepends = [ Cabal filepath haskellSrcExts mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 9a0ae50fc9a..91899c94638 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, uulib }: +{ cabal, Cabal, filepath, mtl, uulib }: cabal.mkDerivation (self: { pname = "uuagc-cabal"; version = "1.0.2.0"; sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0"; - buildDepends = [ mtl uulib ]; + buildDepends = [ Cabal filepath mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System"; diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 6a662055df4..277e7f6c273 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -1,4 +1,6 @@ -{ cabal, haskellSrcExts, mtl, uuagcBootstrap, uuagcCabal, uulib }: +{ cabal, Cabal, filepath, haskellSrcExts, mtl, uuagcBootstrap +, uuagcCabal, uulib +}: cabal.mkDerivation (self: { pname = "uuagc"; @@ -7,7 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib + Cabal filepath haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 7dd3cf61a82..fb32004497a 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -1,4 +1,4 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "cpphs"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1dnz4992hr662ys1lkf6iyqmi2a3bksim8dlryqwd9wx9h24lhq2"; isLibrary = true; isExecutable = true; + buildDepends = [ Cabal ]; meta = { homepage = "http://haskell.org/cpphs/"; description = "A liberalised re-implementation of cpp, the C pre-processor"; diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index 81815500c61..2e8bea4360d 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -1,4 +1,4 @@ -{ cabal, happy }: +{ cabal, Cabal, happy }: cabal.mkDerivation (self: { pname = "Ebnf2ps"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0xim32bnfapfs53lvmdz2af08rqd15lp5b0rh6yjqm7n1g2061zs"; isLibrary = false; isExecutable = true; + buildDepends = [ Cabal ]; buildTools = [ happy ]; meta = { homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/"; diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix index fd239d580bf..c47c502611d 100644 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ b/pkgs/development/tools/parsing/alex/2.3.1.nix @@ -1,4 +1,4 @@ -{ cabal, perl }: +{ cabal, Cabal, perl }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44"; isLibrary = false; isExecutable = true; + buildDepends = [ Cabal ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix index d3a4778f3f3..e00ec723151 100644 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ b/pkgs/development/tools/parsing/alex/2.3.2.nix @@ -1,4 +1,4 @@ -{ cabal, perl }: +{ cabal, Cabal, perl }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43"; isLibrary = false; isExecutable = true; + buildDepends = [ Cabal ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix index c9e7671c944..f275255fcb0 100644 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ b/pkgs/development/tools/parsing/alex/2.3.3.nix @@ -1,4 +1,4 @@ -{ cabal, perl }: +{ cabal, Cabal, perl }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8"; isLibrary = false; isExecutable = true; + buildDepends = [ Cabal ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix index db676a90684..50b04c64dec 100644 --- a/pkgs/development/tools/parsing/alex/2.3.5.nix +++ b/pkgs/development/tools/parsing/alex/2.3.5.nix @@ -1,4 +1,4 @@ -{ cabal, perl }: +{ cabal, Cabal, perl }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0lyjiq4lmii2syk6838ln32qvn8c0ljf1ypsggahy748k05x79if"; isLibrary = false; isExecutable = true; + buildDepends = [ Cabal ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix index 6725fed5279..41838555133 100644 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ b/pkgs/development/tools/parsing/alex/3.0.1.nix @@ -1,4 +1,4 @@ -{ cabal, perl, QuickCheck }: +{ cabal, Cabal, perl, QuickCheck }: cabal.mkDerivation (self: { pname = "alex"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj"; isLibrary = false; isExecutable = true; - buildDepends = [ QuickCheck ]; + buildDepends = [ Cabal QuickCheck ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/alex/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix index cc5c60a3d43..4f8b3024ea5 100644 --- a/pkgs/development/tools/parsing/happy/1.18.4.nix +++ b/pkgs/development/tools/parsing/happy/1.18.4.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, perl }: +{ cabal, Cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix index 41532651c99..9b0b2721f67 100644 --- a/pkgs/development/tools/parsing/happy/1.18.5.nix +++ b/pkgs/development/tools/parsing/happy/1.18.5.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, perl }: +{ cabal, Cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix index 60b8d253659..161c87e2d1d 100644 --- a/pkgs/development/tools/parsing/happy/1.18.6.nix +++ b/pkgs/development/tools/parsing/happy/1.18.6.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, perl }: +{ cabal, Cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0q6dnwihi1q761qdq0hhi733nh5d53xz6frwmr7slpvrp6v8y344"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix index b1ba0b165dd..282967a55b2 100644 --- a/pkgs/development/tools/parsing/happy/1.18.8.nix +++ b/pkgs/development/tools/parsing/happy/1.18.8.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, perl }: +{ cabal, Cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1mqdawxszmdk71fbl8ljxz7jyhai00sflaw0gahp039n44mrspam"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix index cb47eaa8bdb..13f04fa3345 100644 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ b/pkgs/development/tools/parsing/happy/1.18.9.nix @@ -1,4 +1,4 @@ -{ cabal, mtl, perl }: +{ cabal, Cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "12k1rg7dqa02az9d1zasdnp51zs4h30kpi5lyqsw3jxfp09cad3x"; isLibrary = false; isExecutable = true; - buildDepends = [ mtl ]; + buildDepends = [ Cabal mtl ]; buildTools = [ perl ]; meta = { homepage = "http://www.haskell.org/happy/"; diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index 7609f3abda5..abd9b5d4892 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,4 +1,6 @@ -{ cabal, binary, ConfigFile, gtk, mtl, random, zlib }: +{ cabal, binary, Cabal, ConfigFile, filepath, gtk, mtl, random +, zlib +}: cabal.mkDerivation (self: { pname = "LambdaHack"; @@ -6,7 +8,9 @@ cabal.mkDerivation (self: { sha256 = "09lgbpwrlw29n797q3k5aafvkg04nd8cw6pi41g914phf7lxzq4c"; isLibrary = true; isExecutable = true; - buildDepends = [ binary ConfigFile gtk mtl random zlib ]; + buildDepends = [ + binary Cabal ConfigFile filepath gtk mtl random zlib + ]; meta = { homepage = "http://github.com/kosmikus/LambdaHack"; description = "A roguelike game engine in early and very active development"; diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix index dbf7ecae425..2f253561526 100644 --- a/pkgs/games/MazesOfMonad/default.nix +++ b/pkgs/games/MazesOfMonad/default.nix @@ -1,4 +1,4 @@ -{ cabal, HUnit, mtl, random, regexPosix, time }: +{ cabal, Cabal, filepath, HUnit, mtl, random, regexPosix, time }: cabal.mkDerivation (self: { pname = "MazesOfMonad"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1zk6bckll03b40iq8z13753glkmcan6439w8cc6rn5h2fhp189v9"; isLibrary = false; isExecutable = true; - buildDepends = [ HUnit mtl random regexPosix time ]; + buildDepends = [ Cabal filepath HUnit mtl random regexPosix time ]; meta = { description = "Console-based Role Playing Game"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix index e71c99cd0c3..16853cab7fc 100644 --- a/pkgs/tools/package-management/cabal-install/0.10.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.10.2.nix @@ -1,4 +1,4 @@ -{ cabal, HTTP, network, random, time, zlib }: +{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { pname = "cabal-install"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "05gmgxdlymp66c87szx1vq6hlraispdh6pm0n85s74yihjwwhmv3"; isLibrary = false; isExecutable = true; - buildDepends = [ HTTP network random time zlib ]; + buildDepends = [ Cabal filepath HTTP network random time zlib ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix index 83a2121a16b..140c3628405 100644 --- a/pkgs/tools/package-management/cabal-install/0.6.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.6.2.nix @@ -1,4 +1,4 @@ -{ cabal, HTTP, network, random, zlib }: +{ cabal, Cabal, filepath, HTTP, network, random, zlib }: cabal.mkDerivation (self: { pname = "cabal-install"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "d8ea91bd0a2a624ab1cf52ddfe48cef02b532bb5e2fcda3fd72ca51efc04b41a"; isLibrary = false; isExecutable = true; - buildDepends = [ HTTP network random zlib ]; + buildDepends = [ Cabal filepath HTTP network random zlib ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix index aa6369bb05c..ed84d069d10 100644 --- a/pkgs/tools/package-management/cabal-install/0.8.0.nix +++ b/pkgs/tools/package-management/cabal-install/0.8.0.nix @@ -1,4 +1,4 @@ -{ cabal, HTTP, network, random, time, zlib }: +{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { pname = "cabal-install"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "6d16618ff454f8d732cad64a53b767b5b6bb95ba4970b260a40e8f467035493c"; isLibrary = false; isExecutable = true; - buildDepends = [ HTTP network random time zlib ]; + buildDepends = [ Cabal filepath HTTP network random time zlib ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix index c27b429afb4..a53460b6319 100644 --- a/pkgs/tools/package-management/cabal-install/0.8.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix @@ -1,4 +1,4 @@ -{ cabal, HTTP, network, random, time, zlib }: +{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { pname = "cabal-install"; @@ -6,7 +6,7 @@ cabal.mkDerivation (self: { sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b"; isLibrary = false; isExecutable = true; - buildDepends = [ HTTP network random time zlib ]; + buildDepends = [ Cabal filepath HTTP network random time zlib ]; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; From 219b00faa2f066c6bd0bbab7afb2c26b0fce4387 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 01:09:33 +0000 Subject: [PATCH 157/183] * e2fsprogs updated to 1.42. svn path=/nixpkgs/trunk/; revision=32293 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index eba987774b6..0e0ec13aaeb 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.41.14"; + name = "e2fsprogs-1.42"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0xmisymd0p4pr18gv8260kn5kb6lpp54mgpw194fqjvwvpzc32iz"; + sha256 = "0ijabrxxmmna4y4wmy7d002nrzq1ifl98i71bl7fpqn3rsq6vd2m"; }; buildInputs = [ pkgconfig libuuid ]; From 9882d962d10eb6473d9b593c0fd4aa692df60b02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 15 Feb 2012 10:39:09 +0000 Subject: [PATCH 158/183] haskell-alternative-io: added version 0.0.0 svn path=/nixpkgs/trunk/; revision=32294 --- .../haskell/alternative-io/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/alternative-io/default.nix diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix new file mode 100644 index 00000000000..434393178b5 --- /dev/null +++ b/pkgs/development/libraries/haskell/alternative-io/default.nix @@ -0,0 +1,17 @@ +{ cabal, Cabal, liftedBase, monadControl, transformers +, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "alternative-io"; + version = "0.0.0"; + sha256 = "1nfwiw753m8ljrk47yi5cgncbfkddnr4fz44fk1pv501a86cmk8y"; + buildDepends = [ + Cabal liftedBase monadControl transformers transformersBase + ]; + meta = { + description = "IO as Alternative instance"; + 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 0a7f30e9941..11d68f31cfd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -426,6 +426,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); aeson = callPackage ../development/libraries/haskell/aeson {}; + alternativeIo = callPackage ../development/libraries/haskell/alternative-io {}; + ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; From c37d8c5f90ce88902603b31d2555faaccd5edc7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 15 Feb 2012 10:39:15 +0000 Subject: [PATCH 159/183] haskell-hashable: updated to version 1.1.2.3 svn path=/nixpkgs/trunk/; revision=32295 --- pkgs/development/libraries/haskell/hashable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index 4a9c110a199..cc0c8b7e58c 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.1.2.2"; - sha256 = "0gfg1cyd468czfv5xfhn7rz0r5s0v378c4xjlm6kkw7n10n2zg8y"; + version = "1.1.2.3"; + sha256 = "19v94b34c2j6f9d9xii2hg0mjxdkq51aifkcqw6hbicn97kfcxls"; buildDepends = [ Cabal text ]; meta = { homepage = "http://github.com/tibbe/hashable"; From 2df2202804d452c1f4f33362a0e0e843f3822b70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 15 Feb 2012 10:39:18 +0000 Subject: [PATCH 160/183] haskell-highlighting-kate: updated to version 0.5.0.5 svn path=/nixpkgs/trunk/; revision=32296 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index ad4b6cde79f..9a9413b222e 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.0.4"; - sha256 = "1kn73gcjhndb5wbdy9hbjgar1bdcmy8cy831ib4ik1fn62zmvxrf"; + version = "0.5.0.5"; + sha256 = "005k3yc406h4wz5jk47nk4g5qb409kd7dwyw7n9g31gjqxp73p8v"; isLibrary = true; isExecutable = true; buildDepends = [ From 26d8fc0ca16657d64dcce898a7e7923d1b435b38 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 15 Feb 2012 10:39:20 +0000 Subject: [PATCH 161/183] haskell-language-javascript: updated to version 0.4.8 svn path=/nixpkgs/trunk/; revision=32297 --- .../libraries/haskell/language-javascript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 87e16be4a04..4eb8b40c93b 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.4.7"; - sha256 = "029ncc7hdw3pi9fbnxd0knz7wy3jpj5wcfqsxzyk5dkwji6d95x1"; + version = "0.4.8"; + sha256 = "0zrvlr683r093v4nblxc4wcpb91gxw3y9a92dx02qi9v983pznf7"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal mtl utf8Light ]; From e0cfa587063fcefcf9f79c956bd783d4d424cf2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 15 Feb 2012 11:08:38 +0000 Subject: [PATCH 162/183] Updating the cifs utils (I think even the hash did not match for 4.5), and adding some CIFS support to the sheevaplug kernel. Patch by Rickard Nilsson. svn path=/nixpkgs/trunk/; revision=32298 --- pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++-- pkgs/top-level/platforms.nix | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 8595b6cf6a8..63eafb93e30 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cifs-utils-4.5"; + name = "cifs-utils-5.3"; src = fetchurl { url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "0nzjxhhs86ws1dzi2qgmxbkn6pcri7915r0sd51317b0b5n9k1w2"; + sha256 = "68e969c4107a872e2848992732dc11eafc7bdf084bec894c0ba677572de49b32"; }; makeFlags = "root_sbindir=$(out)/sbin"; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 43fcdea62d0..ca1fdb277be 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -67,6 +67,12 @@ rec { IP_NF_MANGLE y IPV6 m + CIFS y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_ACL y + # Fail to build DRM n SCSI_ADVANSYS n From c29e49241716cfff80b8083245a0bfc277b552e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 15:39:12 +0000 Subject: [PATCH 163/183] * Tribler updated to to 5.5.13. svn path=/nixpkgs/trunk/; revision=32299 --- pkgs/applications/networking/p2p/tribler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index abb4eff6b57..24796880fb2 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }: -let rev = "24763"; in +let rev = "24912"; in stdenv.mkDerivation { - name = "tribler-5.5.10"; + name = "tribler-5.5.13-pre${rev}"; src = fetchsvn { url = http://svn.tribler.org/abc/branches/release-5.5.x; inherit rev; - sha256 = "1lvg2vvwzwf8zzg0fl1mp8wc0kcspxkl84q4qdxalkv4x2d8w5c6"; + sha256 = "1x4rf83gsxif7fwx7p4crfji52i5y8rp54qfv1lbyxr8dfqjx83g"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ]; From 848f583ba3bf9c2d38fb97f0a695294641104111 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 15:42:59 +0000 Subject: [PATCH 164/183] * VLC: build with xcb-util-keysyms instead of xcb-util, otherwise the keyboard doesn't work properly. (xcb-util-keysyms was split from xcb-util.) svn path=/nixpkgs/trunk/; revision=32300 --- pkgs/applications/video/vlc/default.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 8e11dd6068d..02000ffeb21 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -19,20 +19,23 @@ stdenv.mkDerivation rec { sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83"; }; - buildInputs = [ - perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread - dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt - libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec - udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib - libkate libtiger libv4l samba liboggz libass libdvbpsi - ] - ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]); + buildInputs = + [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread + dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt + libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec + udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib + libkate libtiger libv4l samba liboggz libass libdvbpsi libva + xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms + ]; buildNativeInputs = [ pkgconfig ]; - configureFlags = [ "--enable-alsa" - "--with-kde-solid=$out/share/apps/solid/actions" - ]; + configureFlags = + [ "--enable-alsa" + "--with-kde-solid=$out/share/apps/solid/actions" + ]; + + enableParallelBuilding = true; preBuild = '' substituteInPlace modules/misc/freetype.c --replace \ From c5d870f1d8e067e4b36abea05715397fda90051b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 15 Feb 2012 16:07:38 +0000 Subject: [PATCH 165/183] sparse: updated to version 0.4.4 svn path=/nixpkgs/trunk/; revision=32301 --- pkgs/development/tools/analysis/sparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 294c9872e8b..f860f05c36a 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig }: stdenv.mkDerivation rec { - name = "sparse-0.4.1"; + name = "sparse-0.4.4"; src = fetchurl { url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.gz"; - sha256 = "18nkgqkqhfp4gdjhdy8xgwxvla5vjccg1kzyz5ngpjw35q0hp5fb"; + sha256 = "5ad02110130fd8f8d82f2b030de5f2db6f924fd805593a5b8be8072a620414c6"; }; preConfigure = '' From ca1912036b00ff8345df80d07254156282427233 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 15 Feb 2012 16:07:45 +0000 Subject: [PATCH 166/183] cppcheck: added version 1.53 svn path=/nixpkgs/trunk/; revision=32302 --- .../tools/analysis/cppcheck/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/analysis/cppcheck/default.nix diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix new file mode 100644 index 00000000000..b152f0537e3 --- /dev/null +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +# TODO: add support for "make man" + +let + name = "cppcheck"; + version = "1.53"; +in +stdenv.mkDerivation { + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; + sha256 = "878db83d3954d0c45135362308da951ec0670a160c76a7410466a9b539e8677f"; + }; + + configurePhase = "makeFlags=PREFIX=$out"; + + meta = { + description = "check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun, etc."; + homepage = "http://sourceforge.net/apps/mediawiki/cppcheck/"; + license = "GPL"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88101ecf295..f584dfcd26c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2981,6 +2981,8 @@ let cflow = callPackage ../development/tools/misc/cflow { }; + cppcheck = callPackage ../development/tools/analysis/cppcheck { }; + cscope = callPackage ../development/tools/misc/cscope { }; csslint = callPackage ../development/web/csslint { }; From 0b0f44b117d851640a3f0b1e16e7ea72e3a52712 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 16:21:33 +0000 Subject: [PATCH 167/183] * Updated apr to 1.4.6 and apr-util to 1.4.1. svn path=/nixpkgs/trunk/; revision=32303 --- pkgs/development/libraries/apr-util/default.nix | 4 ++-- pkgs/development/libraries/apr/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 8a214a8f16e..ce6337b3b6a 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -6,11 +6,11 @@ assert bdbSupport -> db4 != null; stdenv.mkDerivation rec { - name = "apr-util-1.3.12"; + name = "apr-util-1.4.1"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "0f671b037ca62751a8a7005578085560"; + md5 = "52b31b33fb1aa16e65ddaefc76e41151"; }; configureFlags = '' diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index ed2ec20a9c9..a0b9017d35f 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apr-1.4.5"; + name = "apr-1.4.6"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "8b53f5a5669d0597f2da889a2f576eb6"; + md5 = "ffee70a111fd07372982b0550bbb14b7"; }; configureFlags = From 4b9ef7597230c2fd734daab2e8ef51ed547de435 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 16:21:44 +0000 Subject: [PATCH 168/183] * Updated Apache httpd to 2.2.22. svn path=/nixpkgs/trunk/; revision=32304 --- pkgs/servers/http/apache-httpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix index 0d586b0c3a6..1f5e1ae69bc 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/default.nix @@ -8,12 +8,12 @@ assert sslSupport -> openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.2.21"; + version = "2.2.22"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "c02f9b05da9a7e316ff37d9053dc76a57ba51cb4"; + sha1 = "766cd0843050a8dfb781e48b976f3ba6ebcf8696"; }; buildInputs = [perl apr aprutil pcre] ++ From cdd8d2b163752d51399b1061e73871a72cc42714 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 16:23:40 +0000 Subject: [PATCH 169/183] * Subversion updated to 1.7.3. svn path=/nixpkgs/trunk/; revision=32305 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 9e31e9906c6..6e0f65d4caa 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.2"; + version = "1.7.3"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb"; + sha1 = "624d4070361c0e8d7cf4f5c667629e72459b122d"; }; buildInputs = [ zlib apr aprutil sqlite ] From 95e87e71c58c496acb7a9d56ae707051d2bfb900 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 16:24:02 +0000 Subject: [PATCH 170/183] * Tribler: optionally support streaming playback of torrents via VLC. svn path=/nixpkgs/trunk/; revision=32306 --- pkgs/applications/networking/p2p/tribler/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 24796880fb2..4e02eb9f1e6 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }: +{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools +, enablePlayer ? false, vlc ? null }: let rev = "24912"; in @@ -34,7 +35,10 @@ stdenv.mkDerivation { --set _TRIBLERPATH $out/share/tribler \ --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \ --run 'cd $_TRIBLERPATH' \ - --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" + --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \ + ${stdenv.lib.optionalString enablePlayer '' + --prefix LD_LIBRARY_PATH : ${vlc}/lib + ''} ''; meta = { From b9309ffdafc853fd3f0db5f101fafc9531f3a1fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 16:30:46 +0000 Subject: [PATCH 171/183] * Typo (spotted by Danny Groenewegen). svn path=/nixpkgs/trunk/; revision=32307 --- pkgs/development/libraries/libffcall/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 2a3ad8995f5..0be604c6246 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -33,6 +33,6 @@ rec { name = "libffcall-" + version; meta = { - description = "Foreign fuction call library"; + description = "Foreign function call library"; }; } From 75d4746680e27cb5148395d8a94c04db18cf68b9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 16 Feb 2012 02:07:23 +0000 Subject: [PATCH 172/183] Update rubygems svn path=/nixpkgs/trunk/; revision=32309 --- .../interpreters/ruby/generated.nix | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 4d46a06d7e1..c518b46de78 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,7 +3,7 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_5_0; + ZenTest = g.ZenTest_4_6_2; actionmailer = g.actionmailer_3_2_1; actionpack = g.actionpack_3_2_1; activemodel = g.activemodel_3_2_1; @@ -12,10 +12,10 @@ g: # Get dependencies from patched gems activesupport = g.activesupport_3_2_1; arel = g.arel_3_0_0; atoulme_Antwrap = g.atoulme_Antwrap_0_7_1; - autotest_rails = g.autotest_rails_4_1_1; + autotest_rails = g.autotest_rails_4_1_2; builder = g.builder_3_0_0; buildr = g.buildr_1_4_6; - bundler = g.bundler_1_0_21; + bundler = g.bundler_1_0_22; childprocess = g.childprocess_0_3_1; coffee_script = g.coffee_script_2_2_0; coffee_script_source = g.coffee_script_source_1_2_0; @@ -53,9 +53,9 @@ g: # Get dependencies from patched gems rspec_expectations = g.rspec_expectations_2_1_0; rspec_mocks = g.rspec_mocks_2_1_0; rubyforge = g.rubyforge_2_0_4; - rubyzip = g.rubyzip_0_9_5; - sass = g.sass_3_1_14; - selenium_webdriver = g.selenium_webdriver_2_18_0; + rubyzip = g.rubyzip_0_9_6_1; + sass = g.sass_3_1_15; + selenium_webdriver = g.selenium_webdriver_2_19_0; sprockets = g.sprockets_2_1_2; thor = g.thor_0_14_6; tilt = g.tilt_1_3_3; @@ -65,11 +65,11 @@ g: # Get dependencies from patched gems }; gem_nix_args = [ ''autotest-rails'' ''buildr'' ''coffee-script'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { - ZenTest_4_5_0 = { + ZenTest_4_6_2 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; - homepage = ''http://www.zenspider.com/ZSS/Products/ZenTest/''; + homepage = ''https://github.com/seattlerb/zentest''; longDescription = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby. @@ -80,6 +80,8 @@ tool anymore but it is the package namesake, so it stays. unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong. +Do note that minitest 2.2+ provides an enhanced assert_equal obviating +the need for unit_diff autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the @@ -89,9 +91,9 @@ multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.''; }; - name = ''ZenTest-4.5.0''; + name = ''ZenTest-4.6.2''; requiredGems = [ ]; - sha256 = ''05iam95wqafz4c890b17w7ahp9i4jbz4hsw6304p9zbsaq7d7h1h''; + sha256 = ''0knbim1lvp7q7k529if3h78584x845h9xyz08vykrdqa97x4lkh0''; }; actionmailer_3_2_1 = { basename = ''actionmailer''; @@ -199,7 +201,7 @@ database compatibility and query generation.''; requiredGems = [ g.rjb_1_3_9 ]; sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy''; }; - autotest_rails_4_1_1 = { + autotest_rails_4_1_2 = { basename = ''autotest_rails''; meta = { description = ''This is an autotest plugin to provide rails support''; @@ -207,9 +209,9 @@ database compatibility and query generation.''; longDescription = ''This is an autotest plugin to provide rails support. It provides basic rails support and extra plugins for migrations and fixtures.''; }; - name = ''autotest-rails-4.1.1''; - requiredGems = [ g.ZenTest_4_5_0 ]; - sha256 = ''09i6mpxibs8yfdcr53nazlxq94yswahz9gdjqdz9srfshcccqbal''; + name = ''autotest-rails-4.1.2''; + requiredGems = [ g.ZenTest_4_6_2 ]; + sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; builder_2_1_2 = { basename = ''builder''; @@ -254,16 +256,16 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ]; sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz''; }; - bundler_1_0_21 = { + bundler_1_0_22 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://gembundler.com''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.0.21''; + name = ''bundler-1.0.22''; requiredGems = [ ]; - sha256 = ''0lcxz75vvgqib43wxzv6021qs5d7bxhnds4j4q27hzqs982cn0s6''; + sha256 = ''0hzcsicdvvyhp6b6rv208859a13ag1cxxcd3nd3hf90jldd2iry0''; }; childprocess_0_3_1 = { basename = ''childprocess''; @@ -676,7 +678,7 @@ request helpers feature.''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; name = ''rails-3.2.1''; - requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_21 ]; + requiredGems = [ g.activesupport_3_2_1 g.actionpack_3_2_1 g.activerecord_3_2_1 g.activeresource_3_2_1 g.actionmailer_3_2_1 g.railties_3_2_1 g.bundler_1_0_22 ]; sha256 = ''0fx5pmywvh0s263dd6qv34rbc4qxnla5qzh8r30zrip24j6w0nr5''; }; railties_3_2_1 = { @@ -852,17 +854,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41''; }; - rubyzip_0_9_5 = { + rubyzip_0_9_6_1 = { basename = ''rubyzip''; meta = { description = ''rubyzip is a ruby module for reading and writing zip files''; homepage = ''http://github.com/aussiegeek/rubyzip''; }; - name = ''rubyzip-0.9.5''; + name = ''rubyzip-0.9.6.1''; requiredGems = [ ]; - sha256 = ''1744bds6lc46d1kjfgapf34p2574s70hcyz63877qkry4db2jb54''; + sha256 = ''0azmbbv5j7xx45rn3502vb01n1b2zczi1jk84aw9qc3y9fvkwc3i''; }; - sass_3_1_14 = { + sass_3_1_15 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -873,20 +875,20 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.14''; + name = ''sass-3.1.15''; requiredGems = [ ]; - sha256 = ''0nrgsrqkfn3w8bpqsq9h4jv5wj0wikn3mp0gb3b7qdzkhw0h9947''; + sha256 = ''1lsmqm84w03w8s54i53cf3mplklpasakff2ng6zqf75digg27fzs''; }; - selenium_webdriver_2_18_0 = { + selenium_webdriver_2_19_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.18.0''; - requiredGems = [ g.rubyzip_0_9_5 g.childprocess_0_3_1 ]; - sha256 = ''17am2b6bjv62s02n1bfmhg9wz5n7sppzh7dx1llp28ivj2hdfbg9''; + name = ''selenium-webdriver-2.19.0''; + requiredGems = [ g.rubyzip_0_9_6_1 g.childprocess_0_3_1 ]; + sha256 = ''1phhb8ivv203r4qs2nwxnkd6qmx02lj1xgsc5wkkm0gxl2lgz0ll''; }; sprockets_2_1_2 = { basename = ''sprockets''; From dfda68af54c8b74e07f5e883e9af18b5e413ab8b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 16 Feb 2012 02:21:17 +0000 Subject: [PATCH 173/183] Fix tarball I don't know what nbd is, I just followed the complaints in the log svn path=/nixpkgs/trunk/; revision=32310 --- pkgs/tools/networking/nbd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index af182c9d7e5..ea2fbe5bc57 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ]; - buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional stdenv.isLinux stdenv.glibc.kernelHeaders; + buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; From 3d85ce1843b25e240a2b15f59bd6e6d68a17eea7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2012 09:05:27 +0000 Subject: [PATCH 174/183] haskell-crypto-pubkey-types: updated to version 0.1.1 svn path=/nixpkgs/trunk/; revision=32311 --- .../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 5ac6c2e52db..29e5bdb8d07 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.1.0"; - sha256 = "1ib5bqxydvv37l53wl6b4j6m6y904rsiamhh144lm6rmqiym26f5"; + version = "0.1.1"; + sha256 = "0chlz01nlxnh9bk5b97vm6q6ai0ifybkdaynwibj8px418mmbkib"; buildDepends = [ Cabal cryptoApi ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; From 61175b2026e938290f99dbeb90d3a53ccc32b9f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2012 09:05:33 +0000 Subject: [PATCH 175/183] haskell-haskell-src-meta: updated to version 0.5.1 svn path=/nixpkgs/trunk/; revision=32312 --- .../libraries/haskell/haskell-src-meta/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 51256ed31e4..50bb2946e6a 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, haskellSrcExts, syb, thLift }: +{ cabal, Cabal, haskellSrcExts, syb, thLift, uniplate }: cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.5.0.3"; - sha256 = "0c270088b5p3drr3f75ln210py2h4dfkkfgvly3ry42yl6xkvm2j"; - buildDepends = [ Cabal haskellSrcExts syb thLift ]; + version = "0.5.1"; + sha256 = "1wpddllq651vnsibhi0m7agc6ygj95646k29v0xl75nmfb034lz3"; + buildDepends = [ Cabal haskellSrcExts syb thLift uniplate ]; meta = { description = "Parse source to template-haskell abstract syntax"; license = self.stdenv.lib.licenses.bsd3; From f76039e1e0f1df4bd770ae7400d79b96385b3801 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2012 09:05:35 +0000 Subject: [PATCH 176/183] haskell-hmatrix: updated to version 0.13.1.0 svn path=/nixpkgs/trunk/; revision=32313 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 7ef87a8dcfb..06ec278e0ec 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -8,7 +8,6 @@ cabal.mkDerivation (self: { sha256 = "0pl5z6zsxyvbdfdng77r2c4isq6d4wbyzx2qs9r8rbn6glaxwrmp"; buildDepends = [ binary Cabal storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; - configureFlags = "-fvector"; meta = { homepage = "http://perception.inf.um.es/hmatrix"; description = "Linear algebra and numerical computation"; From f0584f13672be54c208c353cb39380f5f54f1fc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2012 09:05:38 +0000 Subject: [PATCH 177/183] haskell-language-javascript: updated to version 0.4.9 svn path=/nixpkgs/trunk/; revision=32314 --- .../libraries/haskell/language-javascript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 4eb8b40c93b..c9cbb689862 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.4.8"; - sha256 = "0zrvlr683r093v4nblxc4wcpb91gxw3y9a92dx02qi9v983pznf7"; + version = "0.4.9"; + sha256 = "19a8c8bq4s533iyb6h3vl59dnya6d7inaqk1hbhnlil1w2d0n5b5"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal mtl utf8Light ]; From 40919ea624847b1ce9082a93ea6f562b5e4b7d78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2012 09:05:40 +0000 Subject: [PATCH 178/183] haskell-pandoc: updated to version 1.9.1.1 svn path=/nixpkgs/trunk/; revision=32315 --- pkgs/development/libraries/haskell/pandoc/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 472207f4b32..ca03f9be534 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -16,7 +16,6 @@ cabal.mkDerivation (self: { random syb tagsoup temporary texmath time utf8String xml zipArchive zlib ]; - configureFlags = "-fhighlighting -fthreaded"; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; From 62757d7b36f2bfa525312244c74da4916dcdd2d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2012 09:05:43 +0000 Subject: [PATCH 179/183] haskell-simple-sendfile: updated to version 0.2.1 svn path=/nixpkgs/trunk/; revision=32316 --- .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 53d9d820934..3aee20bd69a 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.0"; - sha256 = "1rsbmlnks4q8gsfzwqwcj901b8hzcrfb85z7wy3szj4h0axw4264"; + version = "0.2.1"; + sha256 = "0mbnqdy7g9jp2d6x9mcrz315b4xhp92as28bxygf7jhc0aai66aq"; buildDepends = [ Cabal network ]; meta = { description = "Cross platform library for the sendfile system call"; From 3b0b92288476510ff267b0b9cd4aacf1dcd2fad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2012 09:05:45 +0000 Subject: [PATCH 180/183] haskell-uniplate: updated to version 1.6.6 svn path=/nixpkgs/trunk/; revision=32317 --- pkgs/development/libraries/haskell/uniplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index 69948588bee..827fdc77b3a 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uniplate"; - version = "1.6.5"; - sha256 = "1g29jbh2clxp87p8qjihgjgi8hdqgzray34bg6hv7whsy053apqs"; + version = "1.6.6"; + sha256 = "1n3535yaw44v0krslnmfxgkfry6kih6sn17544qqynnz21x7dlfs"; buildDepends = [ Cabal hashable syb unorderedContainers ]; meta = { homepage = "http://community.haskell.org/~ndm/uniplate/"; From 0fea240440ab4bcaf7e0a207de9c7ccd304872ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2012 09:05:47 +0000 Subject: [PATCH 181/183] haskell-alternative-io: added meta.maintainers section svn path=/nixpkgs/trunk/; revision=32318 --- pkgs/development/libraries/haskell/alternative-io/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/alternative-io/default.nix b/pkgs/development/libraries/haskell/alternative-io/default.nix index 434393178b5..d5c9e248f25 100644 --- a/pkgs/development/libraries/haskell/alternative-io/default.nix +++ b/pkgs/development/libraries/haskell/alternative-io/default.nix @@ -13,5 +13,9 @@ cabal.mkDerivation (self: { description = "IO as Alternative instance"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 4ad673b3f42d827a26a9c71af12c77e39da036a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 16 Feb 2012 11:07:07 +0000 Subject: [PATCH 182/183] Updating paraview. svn path=/nixpkgs/trunk/; revision=32319 --- pkgs/applications/graphics/paraview/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 88e3d32080c..0c00553f271 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { - name = "paraview-3.10.1"; + name = "paraview-3.12.0"; src = fetchurl { - url = "http://www.paraview.org/files/v3.10/ParaView-3.10.1.tar.gz"; - sha256 = "1z2wvywpd3rvz4jhfs3mi35hsx4yqkdim58d075jx9kg7gifwga5"; + url = "http://www.paraview.org/files/v3.12/ParaView-3.12.0.tar.gz"; + sha256 = "0n0n0hrv02rd9rb63z4baalf40m8v870027mr47b93scgp18qyim"; }; # [ 5%] Generating vtkGLSLShaderLibrary.h @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { # "-DPYTHON_LIBRARY=" ]; - # I don't enable it due to memory bounds - enableParallelBuilding = false; + enableParallelBuilding = true; buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ]; From 1eed9f56e3fabde2848197ef80fefc4e3ac74564 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 16 Feb 2012 11:17:16 +0000 Subject: [PATCH 183/183] gimp-2.6.12 svn path=/nixpkgs/trunk/; revision=32320 --- pkgs/applications/graphics/gimp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 490793d29f6..ad35b751231 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gimp-2.6.11"; + name = "gimp-2.6.12"; src = fetchurl { url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2"; - sha256 = "18dhgicc3f04q0js521kq9w3gq8yqawpf6vdb7m14f9vh380hvcv"; + sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym"; }; buildInputs = [