From 34380b91a61b3459b896d73d54a2962db6ab975a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:07:42 +0200 Subject: [PATCH 01/11] haskell-network-info: add version 0.2.0.2 --- .../libraries/haskell/network-info/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/network-info/default.nix diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix new file mode 100644 index 000000000000..d218af973624 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-info/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "network-info"; + version = "0.2.0.2"; + sha256 = "132cna6dc8azpll3rm2y4wv6sdcavwjq3x9f8m4p2952vr53bw3m"; + meta = { + homepage = "http://github.com/jystic/network-info"; + description = "Access the local computer's basic network configuration"; + 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 546656694004..ca82c29fa2d4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1189,6 +1189,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; + networkInfo = callPackage ../development/libraries/haskell/network-info {}; + networkMulticast = callPackage ../development/libraries/haskell/network-multicast {}; networkTransport = callPackage ../development/libraries/haskell/network-transport {}; From e7121b6f27ebc50035a540c5f0f0e023ea9792d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:07:54 +0200 Subject: [PATCH 02/11] haskell-libxml-sax: add version 0.7.3 --- .../libraries/haskell/libxml-sax/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/libxml-sax/default.nix diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix new file mode 100644 index 000000000000..b41ca8dfa543 --- /dev/null +++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix @@ -0,0 +1,16 @@ +{ cabal, libxml2, text, xmlTypes }: + +cabal.mkDerivation (self: { + pname = "libxml-sax"; + version = "0.7.3"; + sha256 = "1514ix5n8y1dwjdm0kmr17fdigc0ic89gzwdvfgh542sjm11100r"; + buildDepends = [ text xmlTypes ]; + extraLibraries = [ libxml2 ]; + pkgconfigDepends = [ libxml2 ]; + meta = { + homepage = "https://john-millikin.com/software/haskell-libxml/"; + description = "Bindings for the libXML2 SAX interface"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ca82c29fa2d4..5bb1b88527aa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1089,6 +1089,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; + libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; + liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; ListLike = callPackage ../development/libraries/haskell/ListLike {}; From c8851cefbc7521af4191d9e93806dc05473d9984 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:08:01 +0200 Subject: [PATCH 03/11] haskell-dbus: add version 0.10.1 --- .../libraries/haskell/dbus/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/dbus/default.nix diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix new file mode 100644 index 000000000000..c32edff30443 --- /dev/null +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -0,0 +1,19 @@ +{ cabal, cereal, libxmlSax, network, parsec, random, text +, transformers, vector, xmlTypes +}: + +cabal.mkDerivation (self: { + pname = "dbus"; + version = "0.10.1"; + sha256 = "180923lp09pwcvxffxyq753mq7zp7dyxgaj3h13wfsrhfia0awz8"; + buildDepends = [ + cereal libxmlSax network parsec random text transformers vector + xmlTypes + ]; + meta = { + homepage = "https://john-millikin.com/software/haskell-dbus/"; + description = "A client library for the D-Bus IPC system"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5bb1b88527aa..4acc9ab0186b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -660,6 +660,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); datetime = callPackage ../development/libraries/haskell/datetime {}; + dbus = callPackage ../development/libraries/haskell/dbus {}; + deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; From c90a15a604aa1c605883dd5d5eeac099244fe210 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:17:23 +0200 Subject: [PATCH 04/11] git-annex: update to version 3.20121010 --- .../git-and-tools/default.nix | 11 +++--- .../git-and-tools/git-annex/default.nix | 34 ++++++++++++------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 6ee19832750c..e12d4157ec23 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -43,10 +43,13 @@ rec { }); gitAnnex = lib.makeOverridable (import ./git-annex) { - inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh; - inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse - QuickCheck bloomfilter editDistance stm hinotify; + inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh; + inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP + blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl + network pcreLight QuickCheck SHA stm utf8String networkInfo dbus + clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet + httpTypes networkMulticast text time transformers transformersBase wai + waiLogger warp yesod yesodDefault yesodStatic testpack; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 86c8e9717b16..13b3d263ad40 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,27 +1,35 @@ -{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt -, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl -, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils -, IfElse, bloomfilter, editDistance, openssh, stm, hinotify +{ stdenv, ghc, fetchurl, perl, coreutils, git, libuuid, rsync +, findutils, curl, ikiwiki, which, openssh +, blazeBuilder, blazeHtml, bloomfilter, caseInsensitive +, clientsession, cryptoApi, dataDefault, dataenc, dbus +, editDistance, extensibleExceptions, filepath, hamlet, hinotify +, hS3, hslogger, HTTP, httpTypes, IfElse, json, liftedBase +, MissingH, monadControl, mtl, network, networkInfo +, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time +, transformers, transformersBase, utf8String, wai, waiLogger, warp +, yesod, yesodDefault, yesodStatic, testpack }: let - version = "3.20120825"; + version = "3.20121010"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; - sha256 = "edffe6a99d07599f62d4d5f6823de8a830abe8977c7671fd6eb21aeaebc0b8d0"; + sha256 = "4db543af6cbcb2d92c808c01969425d1fd1a916b37386dcdfe1a3101876ccde2"; name = "git-annex-${version}.tar.gz"; }; - buildInputs = [ - curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json - libuuid MissingH monadControl mtl network pcreLight perl QuickCheck - rsync SHA testpack utf8String which liftedBase IfElse bloomfilter - editDistance openssh stm hinotify - ]; + buildInputs = [ ghc git libuuid rsync findutils curl ikiwiki which + openssh blazeBuilder blazeHtml bloomfilter caseInsensitive + clientsession cryptoApi dataDefault dataenc dbus editDistance + extensibleExceptions filepath hamlet hinotify hS3 hslogger HTTP + httpTypes IfElse json liftedBase MissingH monadControl mtl network + networkInfo networkMulticast pcreLight QuickCheck SHA stm text time + transformers transformersBase utf8String wai waiLogger warp yesod + yesodDefault yesodStatic testpack ]; checkTarget = "test"; doCheck = true; @@ -29,7 +37,7 @@ stdenv.mkDerivation { # The 'add_url' test fails because it attempts to use the network. preConfigure = '' makeFlagsArray=( PREFIX=$out ) - sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man + sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs ''; From a13346961f34acb7c2604599b2603028d4fe1a46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:23:43 +0200 Subject: [PATCH 05/11] haskell-cabal2nix: update to version 1.40 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 72c032342d91..6eac3153009e 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.39"; - sha256 = "0q2kgzjbcrqxml12hncsrkjdwjiq52dp00v6i3qdgiyj460iy60d"; + version = "1.40"; + sha256 = "0finmky9lyzg5gs0y95fb0gmzraszljv7l5271185jmhky4wppim"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From eb89801acff8cf455b65cd8ca78d05014104cb02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:32 +0200 Subject: [PATCH 06/11] haskell-digestive-functors-snap: update to version 0.5.0.1 --- .../libraries/haskell/digestive-functors-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index 3d5725e603ff..a6490953341c 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-snap"; - version = "0.5.0.0"; - sha256 = "01lbd42rsryzqzra8ax22iw6c9fyv5az8q7dkdi6yyfxdq976l0x"; + version = "0.5.0.1"; + sha256 = "149c01vxzlwskqsncc5l26mk67icmsq2zbav2asjxpp6z8b53i3b"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From 41d4bf099c6bb0a6b66176dd63cc15fbc9de29e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:32 +0200 Subject: [PATCH 07/11] haskell-digestive-functors: update to version 0.5.0.3 --- .../libraries/haskell/digestive-functors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index d6d4710f3060..31a81778f450 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.5.0.2"; - sha256 = "1phakcljl6ri2p9lfzjnn001jw0inyxa5zd7lp2k9lhq1yq0byb0"; + version = "0.5.0.3"; + sha256 = "176wpnwg4zpfwphl0ifb3zdm0dhw5xyd3vr81rc98s4db5y9csl0"; buildDepends = [ mtl text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From 4fd9c94e0a7019ce0ba6e4c66418e9a7f798c11c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:33 +0200 Subject: [PATCH 08/11] haskell-hxt: update to version 9.3.1.1 --- pkgs/development/libraries/haskell/hxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index ee79d374d428..35783c7762ef 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.3.1.0"; - sha256 = "0nv7d7ffwq81671c7gyzaqx7xgrgs42svbq5xraij4jbq5406719"; + version = "9.3.1.1"; + sha256 = "1x0z85vx49s2b9bgjm14c2152cwr0vzf02rlxrla5dj5g565985y"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec From 5984182d0308296c789a90817ad0107187b28834 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:33 +0200 Subject: [PATCH 09/11] haskell-language-c-quote: update to version 0.4.3 --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 9ccd9ccb13e3..77396e3cf555 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.4.2"; - sha256 = "0l69kn8flx36z3cl9ckdls8w2sq8361w6abmi3gsa80l8yg3cpl4"; + version = "0.4.3"; + sha256 = "13xpmj3jrqkcgilkh4p8ycxhlk5yvfsisx4c1ax7n7aafg1n7phf"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol From 5679ad6964de1db649cc02ac7ba762d99bbb4d35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:33 +0200 Subject: [PATCH 10/11] haskell-language-javascript: update to version 0.5.6 --- .../libraries/haskell/language-javascript/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index ccf9d4fd238b..1d649ba27a91 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,11 +1,11 @@ -{ cabal, alex, blazeBuilder, happy, mtl, utf8Light, utf8String }: +{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }: cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.5.5"; - sha256 = "1p02n6rh98nvkh7g5kj18ggcnyvds8lqbgjwgzm83bnd5ayizrw7"; + version = "0.5.6"; + sha256 = "1a1nki2z7x0rna5jg6g0gqnipvd115k4xgagg6prrvj284ml44wd"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; - buildTools = [ alex happy ]; + buildTools = [ happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; description = "Parser for JavaScript"; From 31b7510e222a7dd2d94cb3681b98d82067c2782e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 18:25:56 +0200 Subject: [PATCH 11/11] bash-completion: remove NixOS-specific patch The new bash-completion support in NixOS doesn't require this patch anymore. Besides, the patch was insufficient for most purposes anyway: Bash completion modules are spread out over all user profiles listed in $NIX_PROFILES (plus the current-system profile), so getting full support for all installed modules requires support for more than one "bash_completion.d" directory anyway. --- pkgs/shells/bash-completion/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index d79c9774569b..7e4c0f230155 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -11,11 +11,6 @@ stdenv.mkDerivation { sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"; }; - postInstall = '' - sed -i "$out/share/bash-completion/bash_completion" \ - -e 's|: .{BASH_COMPLETION_COMPAT_DIR:=.*}|BASH_COMPLETION_COMPAT_DIR="$HOME/.nix-profile/etc/bash_completion.d"|' - ''; - doCheck = true; meta = {