From 77bf849490bcbde182382d981861f65f99dfcd00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Oct 2011 16:06:34 +0000 Subject: [PATCH] haskell-network: updated to version 2.3.0.7 svn path=/nixpkgs/trunk/; revision=30132 --- .../libraries/haskell/network/2.3.0.6.nix | 18 ------------------ .../network/{2.3.0.5.nix => 2.3.0.7.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 7 +++---- 3 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/network/2.3.0.6.nix rename pkgs/development/libraries/haskell/network/{2.3.0.5.nix => 2.3.0.7.nix} (82%) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.6.nix b/pkgs/development/libraries/haskell/network/2.3.0.6.nix deleted file mode 100644 index a62a0f597731..000000000000 --- a/pkgs/development/libraries/haskell/network/2.3.0.6.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, parsec }: - -cabal.mkDerivation (self: { - pname = "network"; - version = "2.3.0.6"; - sha256 = "0xdqcf7zfxpa7qmvwzxf11y61b6xn4v2jjrqpibr2pfqqr0p3gkw"; - 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/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.7.nix similarity index 82% rename from pkgs/development/libraries/haskell/network/2.3.0.5.nix rename to pkgs/development/libraries/haskell/network/2.3.0.7.nix index bf9330eb256a..3c0e0065ed9d 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.7.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.0.5"; - sha256 = "0y1sbgsffzr0skm6xl8907iclgw9vmf395zvpwgakp69i3snh1z0"; + version = "2.3.0.7"; + sha256 = "1rlzdacgaq8nv0bwczsrkw47rw4aamf9y4ynm3xjw0r3w1xcg9yv"; buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f726c7244f60..0a594d3c8a6b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -129,7 +129,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_4; # 7.2 fails, 7.3 fails html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok - network = self.network_2_3_0_5; # 7.2 ok, 7.3 ok + network = self.network_2_3_0_7; # 7.2 ok, 7.3 ok OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok parsec = self.parsec_3_1_1; # 7.2 ok, 7.3 ok @@ -891,9 +891,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {}; 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_6 = callPackage ../development/libraries/haskell/network/2.3.0.6.nix {}; - network = self.network_2_3_0_6; + network_2_3_0_7 = callPackage ../development/libraries/haskell/network/2.3.0.7.nix {}; + network = self.network_2_3_0_7; nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};