From cf686eaa503b79301373171005c5e3700bb39112 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Feb 2012 11:32:35 +0000 Subject: [PATCH 01/48] 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 000000000000..05b1b0c173c6 --- /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 fd6d412be6af..af5967c2285c 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 02/48] 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 000000000000..2c5fc47ea314 --- /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 af5967c2285c..757377816522 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 03/48] 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 000000000000..5882fe3c5bf8 --- /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 757377816522..1ce97f035b1f 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 04/48] 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 000000000000..9a130902c47e --- /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 1ce97f035b1f..0a01ceee1715 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 05/48] 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 59fe42ff65eb..51fdacfcf2b3 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 0a01ceee1715..5ca8288a5c9d 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 06/48] 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 0037573cea7e..e9cfbaeff508 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 07/48] 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 7a32591b97c5..00dc40fc2f24 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 08/48] 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 0ce16db4466a..9a17ef135630 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 09/48] 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 0c41a3501038..8818aa2d9727 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 10/48] 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 f48243a027a2..da3bd570e05d 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 11/48] 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 33b36578bc82..abb4bcad6433 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 12/48] 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 bd8d1632af24..59130a5b864b 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 13/48] 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 698c643d3395..4896ba1d39e4 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 14/48] 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 a4f7e906a9ea..795488adfd05 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 15/48] 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 0a4dd110fee2..5b58909231d3 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 16/48] 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 39e23b3253d2..25346362b887 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 17/48] 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 77f1d07bab26..8de94769cb8d 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 18/48] 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 fb23dbce0efe..613399fa75b5 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 19/48] 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 1a1e4f1d20b0..85139482ad9f 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 20/48] 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 d127725a73e3..b1dfc72ecec9 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 21/48] 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 26ce04559ec6..01fff9ff9988 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 22/48] 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 bc5f3097855e..44fcbb277b7b 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 23/48] 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 2a5fe84c20ac..aa7b5224de61 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 24/48] 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 6ea11c7d6ad6..278ca4bc1b8d 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 25/48] 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 326e40198f7e..f88b752e68c8 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 26/48] 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 2cb4ae16ce7b..e7197e293f2a 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 27/48] 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 a2840ad66ce3..e0a368785824 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 28/48] 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 b118d794563a..f1d4210b667e 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 29/48] 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 95caf840ad0c..b6380981d00f 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 30/48] 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 e65737a94b9e..4256705fe243 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 31/48] 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 2ed7486eff45..be251edffc62 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 32/48] 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 b747179b0f37..7699e4d291bb 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 33/48] 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 bfed775756fd..fb89b511504f 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 34/48] 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 2f384e2e878c..3b1d6e9170dd 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 35/48] 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 379d7319b120..66c31e868d65 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 36/48] 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 00b5fb317fdb..11a85b9cf8ec 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 37/48] 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 46f989c53a53..815932e62485 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 38/48] 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 ab0bc9f89dd9..e74f73ac53f1 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 39/48] 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 d19157382a80..decdd32676ab 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 40/48] 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 c34160976e31..7609f3abda5a 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 41/48] * 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 87a75b2559bb..abb766928d74 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 42/48] 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 000000000000..3b835f6e9e5f --- /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 88a27cad732c..1b1457dac1e7 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 43/48] 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 3b835f6e9e5f..14db3dd52b80 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 44/48] 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 4f8dc30653f9..a7d246d34fbf 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 45/48] 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 ecc3c1a36fc2..f958897cd401 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 46/48] 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 67254084d8e2..003157dd1291 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 47/48] 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 000000000000..252f881c3752 --- /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 1b1457dac1e7..629b4217dd25 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 48/48] 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 4bbe8400fd55..da815c5fb6b4 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 000000000000..7e9a44337cd9 --- /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="<