From f1abe7d1957d16c96b648def367bc8aec70616ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Feb 2012 16:58:24 +0000 Subject: [PATCH] haskell-network: updated 2.3.x version to 2.3.0.11 svn path=/nixpkgs/trunk/; revision=32276 --- .../network/{2.3.0.10.nix => 2.3.0.11.nix} | 4 ++-- .../libraries/haskell/network/2.3.0.8.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 7 +++---- 3 files changed, 5 insertions(+), 24 deletions(-) rename pkgs/development/libraries/haskell/network/{2.3.0.10.nix => 2.3.0.11.nix} (82%) delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.8.nix diff --git a/pkgs/development/libraries/haskell/network/2.3.0.10.nix b/pkgs/development/libraries/haskell/network/2.3.0.11.nix similarity index 82% rename from pkgs/development/libraries/haskell/network/2.3.0.10.nix rename to pkgs/development/libraries/haskell/network/2.3.0.11.nix index d3e72fa72ed..7007211a721 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.10.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.11.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.0.10"; - sha256 = "1f1z7wggxl2rzix1r4bhvcdl0fmx2mzkn70iy3w5yl54vmym21bm"; + version = "2.3.0.11"; + sha256 = "1ghm8rw0m3x71pnndbmzm9j99yh8bmmrlhz4ykslsk2my7ihmxdk"; buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; diff --git a/pkgs/development/libraries/haskell/network/2.3.0.8.nix b/pkgs/development/libraries/haskell/network/2.3.0.8.nix deleted file mode 100644 index 93e57b0ec01..00000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.8.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.8"; - sha256 = "10y7spi1qwjmq7mz7h09ijrzq0jl4r02jrgxiqavsiw6j35r4yfv"; - buildDepends = [ parsec ]; - meta = { - homepage = "http://github.com/haskell/network"; - description = "Low-level networking interface"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 49c2d39e9fd..f4f7906a4d3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -141,7 +141,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok HUnit = self.HUnit_1_2_2_3; # 7.4.1 ok - network = self.network_2_3_0_10; # 7.4.1 ok + network = self.network_2_3_0_11; # 7.4.1 ok OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok parallel = self.parallel_3_2_0_2; # 7.4.1 ok parsec = self.parsec_3_1_2; # 7.4.1 ok @@ -1036,9 +1036,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {}; network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; - network_2_3_0_8 = callPackage ../development/libraries/haskell/network/2.3.0.8.nix {}; - network_2_3_0_10 = callPackage ../development/libraries/haskell/network/2.3.0.10.nix {}; - network = self.network_2_3_0_10; + network_2_3_0_11 = callPackage ../development/libraries/haskell/network/2.3.0.11.nix {}; + network = self.network_2_3_0_11; nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};