diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index 25143e647bb7..a70474698aad 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HaskellForMaths"; - version = "0.4.3"; - sha256 = "00s502h3pw9i464qn6cn74ihghcnn5gsar891q276ld682m5vdns"; + version = "0.4.4"; + sha256 = "1qijaich0jwlii5wdmv0rnr6skbyacxg09nzh0i7dhk86vimz6q8"; buildDepends = [ random ]; meta = { homepage = "http://haskellformaths.blogspot.com/"; diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix index 42de27483801..44c15b23d4ba 100644 --- a/pkgs/development/libraries/haskell/gd/default.nix +++ b/pkgs/development/libraries/haskell/gd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gd"; - version = "3000.7.1"; - sha256 = "07rb02jfmz6bw853b6snw1inby9qgaygdmlsid35snc2xn2ylb50"; + version = "3000.7.3"; + sha256 = "1dkzv6zs00qi0jmblkw05ywizc8y3baz7pnz0lcqn1cs1mhcpbhl"; extraLibraries = [ expat fontconfig freetype gd libjpeg libpng zlib ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index f6a3d26b24e6..73fe6f0ba68f 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.6.1"; - sha256 = "0chpg04rsp8lxzdj43wqs3wyc7i70hfi3raxdar6bhwxhfxgj4wn"; + version = "3.2.6.2"; + sha256 = "07l2igpmr4kd47zk88hz2salzzc92dh7wpny6xr5pw5xf95lpx7p"; buildDepends = [ binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup time diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 180c84f65192..972e93a69013 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.5.1"; - sha256 = "1wpddllq651vnsibhi0m7agc6ygj95646k29v0xl75nmfb034lz3"; + version = "0.5.1.1"; + sha256 = "1v192j47vxjisa5i2zd9lj7l9xa12jsg858yhx5qz624fcq73ggi"; buildDepends = [ haskellSrcExts syb thLift uniplate ]; meta = { description = "Parse source to template-haskell abstract syntax"; 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 deleted file mode 100644 index ab762c2db63b..000000000000 --- a/pkgs/development/libraries/haskell/mwc-random/0.10.0.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, primitive, time, vector }: - -cabal.mkDerivation (self: { - pname = "mwc-random"; - version = "0.10.0.1"; - sha256 = "0mmkl90rf57f2rxg3y2nibd37l9mwr2j4c71bwyvxqzfk7cylw9b"; - buildDepends = [ primitive time vector ]; - meta = { - homepage = "https://github.com/bos/mwc-random"; - description = "Fast, high quality pseudo random number generation"; - 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/mwc-random/0.12.0.0.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/mwc-random/0.12.0.0.nix rename to pkgs/development/libraries/haskell/mwc-random/default.nix diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 47c364d964d1..e6affc56d2ab 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.2"; - sha256 = "1zrd7v953avmkq40nb7jlsmy45r7dphym3fa6jfqy7d1big1mkzf"; + version = "0.8.2"; + sha256 = "0lmdp2gmrbgnp2ls4b76hnjcrllgmzrsiszkmbywkb2dmlxm5wdq"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index b9014288f806..3ae933f5087b 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.7.0.1"; - sha256 = "010w3ycwalz48288342rmwg87pdml7ixg9drw38k206q9s9a9cp9"; + version = "0.8.0.1"; + sha256 = "0lw1c5gczb75878vr5acjck656aq5zg1hva9bfny321v0442azds"; buildDepends = [ attoparsec attoparsecEnumerator base16Bytestring blazeBuilder blazeBuilderEnumerator bytestringMmap bytestringNums @@ -19,7 +19,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework (Core)"; + description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 73ddf11b81dc..040889ed1d76 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.7.0.1"; - sha256 = "149jgd9mcndw9sc051020y7yiai1fipjnqk4s3sbw4lmaysap673"; + version = "0.8.0.1"; + sha256 = "1648p0m4n4ha4976gw891z112rzxd9q4s7n4x3v0z3qb10aynxjb"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix b/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix deleted file mode 100644 index da4616a1367a..000000000000 --- a/pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, deepseq, hashable }: - -cabal.mkDerivation (self: { - pname = "unordered-containers"; - version = "0.1.4.6"; - sha256 = "1azwxbrzlzaw54idp3z2xx1xlywzsf1r893blbz51nnwcj9v550d"; - buildDepends = [ deepseq hashable ]; - meta = { - description = "Efficient hashing-based container types"; - 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/unordered-containers/0.2.1.0.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/unordered-containers/0.2.1.0.nix rename to pkgs/development/libraries/haskell/unordered-containers/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7785b51a1087..195730a1c40c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1025,9 +1025,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); murmurHash = callPackage ../development/libraries/haskell/murmur-hash {}; - mwcRandom_0_10_0_1 = callPackage ../development/libraries/haskell/mwc-random/0.10.0.1.nix {}; - mwcRandom_0_12_0_0 = callPackage ../development/libraries/haskell/mwc-random/0.12.0.0.nix {}; - mwcRandom = self.mwcRandom_0_12_0_0; + mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; @@ -1227,10 +1225,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; - snapCore = callPackage ../development/libraries/haskell/snap/core.nix { - mwcRandom = self.mwcRandom_0_10_0_1; - unorderedContainers = self.unorderedContainers_0_1_4_6; - }; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; @@ -1389,9 +1384,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; - unorderedContainers_0_1_4_6 = callPackage ../development/libraries/haskell/unordered-containers/0.1.4.6.nix {}; - unorderedContainers_0_2_1_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.1.0.nix {}; - unorderedContainers = self.unorderedContainers_0_2_1_0; + unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; url = callPackage ../development/libraries/haskell/url {};