From d88a86d8ee6daf5ec06068a0cccceab809d0b152 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Jan 2012 13:30:08 +0000 Subject: [PATCH] haskell-unix-compat: updated to version 0.3.0.1 svn path=/nixpkgs/trunk/; revision=31347 --- .../libraries/haskell/unix-compat/0.3.nix | 17 ----------------- .../unix-compat/{0.2.2.1.nix => default.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/unix-compat/0.3.nix rename pkgs/development/libraries/haskell/unix-compat/{0.2.2.1.nix => default.nix} (81%) diff --git a/pkgs/development/libraries/haskell/unix-compat/0.3.nix b/pkgs/development/libraries/haskell/unix-compat/0.3.nix deleted file mode 100644 index da13c9313ac..00000000000 --- a/pkgs/development/libraries/haskell/unix-compat/0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "unix-compat"; - version = "0.3"; - sha256 = "0zgz9s5z2kca37sgnf4dyfdw90435h20bznx485y1ggvh377jan7"; - meta = { - homepage = "http://github.com/jystic/unix-compat"; - description = "Portable POSIX-compatibility layer"; - 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/unix-compat/0.2.2.1.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix similarity index 81% rename from pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix rename to pkgs/development/libraries/haskell/unix-compat/default.nix index 34cbd4072f6..83b670ee2c2 100644 --- a/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-compat"; - version = "0.2.2.1"; - sha256 = "009dg6mxjmdkcmr2d1qq9r3f4qfx4d362lyxj9vvgwrzcdnsgzqi"; + version = "0.3.0.1"; + sha256 = "09y2iih741l4jpi83c15zap94phfms4mavzg04r9rjgbav0ns2c4"; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e467afb26f1..f123b119340 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1317,9 +1317,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; - unixCompat_0_2_2_1 = callPackage ../development/libraries/haskell/unix-compat/0.2.2.1.nix {}; - unixCompat_0_3 = callPackage ../development/libraries/haskell/unix-compat/0.3.nix {}; - unixCompat = self.unixCompat_0_2_2_1; + unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {};