diff options
-rw-r--r-- | pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/uniplate/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/unordered-containers/0.1.4.6.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/unordered-containers/default.nix (renamed from pkgs/development/libraries/haskell/unordered-containers/0.2.0.0.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 |
5 files changed, 6 insertions, 27 deletions
diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 1c8a1ca9120d..3060eb2fa908 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.1.3"; - sha256 = "0r6gns729nfaxlig0sxlal5cx4ipyjk62zrmwn5i1i7lighp10y0"; + version = "0.10.1.4"; + sha256 = "1zrmngxm1xs51ql5za46lw6xkiyczx6qyvpami9k13g8k6kznqbz"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index e821c00f9137..1e5aea854fc7 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uniplate"; - version = "1.6.6"; - sha256 = "1n3535yaw44v0krslnmfxgkfry6kih6sn17544qqynnz21x7dlfs"; + version = "1.6.7"; + sha256 = "1f71dinmp3vmx9j0a1sxm0f8gzxknsvhnyb8sxfjrvpvixzyg0dx"; buildDepends = [ hashable syb unorderedContainers ]; meta = { homepage = "http://community.haskell.org/~ndm/uniplate/"; 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.0.0.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 098e265bf735..098e265bf735 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.0.0.nix +++ b/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 f780f8f10fbf..315cad463ecb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1372,17 +1372,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unbound = callPackage ../development/libraries/haskell/unbound {}; - uniplate = callPackage ../development/libraries/haskell/uniplate { - unorderedContainers = self.unorderedContainers_0_1_4_6; - }; + uniplate = callPackage ../development/libraries/haskell/uniplate {}; uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; 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_0_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.0.0.nix {}; - unorderedContainers = self.unorderedContainers_0_2_0_0; + unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; url = callPackage ../development/libraries/haskell/url {}; |