From a83f32b335d312c69923af45be8c0997e996d4d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Apr 2013 11:29:20 +0200 Subject: [PATCH] haskell-hspec-expectations: drop obsolete version 0.3.0.3 --- .../haskell/hspec-expectations/0.3.0.3.nix | 17 ----------------- .../{0.3.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix rename pkgs/development/libraries/haskell/hspec-expectations/{0.3.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix b/pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix deleted file mode 100644 index 41019c9caa3..00000000000 --- a/pkgs/development/libraries/haskell/hspec-expectations/0.3.0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, hspec, HUnit, markdownUnlit, silently }: - -cabal.mkDerivation (self: { - pname = "hspec-expectations"; - version = "0.3.0.3"; - sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74"; - buildDepends = [ HUnit ]; - testDepends = [ hspec HUnit markdownUnlit silently ]; - doCheck = false; - meta = { - homepage = "https://github.com/sol/hspec-expectations#readme"; - description = "Catchy combinators for HUnit"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/hspec-expectations/0.3.2.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/hspec-expectations/0.3.2.nix rename to pkgs/development/libraries/haskell/hspec-expectations/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4534adee337..610f26d5541 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1111,9 +1111,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hspec = callPackage ../development/libraries/haskell/hspec {}; - hspecExpectations_0_3_0_3 = callPackage ../development/libraries/haskell/hspec-expectations/0.3.0.3.nix {}; - hspecExpectations_0_3_2 = callPackage ../development/libraries/haskell/hspec-expectations/0.3.2.nix {}; - hspecExpectations = self.hspecExpectations_0_3_2; + hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};