From d3963dbebf0f0457d2feda64d7e83c51a3ffa578 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 May 2013 12:58:58 +0200 Subject: [PATCH] haskell-uu-options: add version 0.1.0.0 --- .../libraries/haskell/uu-options/default.nix | 19 ++++++++++++++++++ .../uu-options/no-executable-stanza.diff | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ pkgs/top-level/release-haskell.nix | 1 + 4 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/haskell/uu-options/default.nix create mode 100644 pkgs/development/libraries/haskell/uu-options/no-executable-stanza.diff diff --git a/pkgs/development/libraries/haskell/uu-options/default.nix b/pkgs/development/libraries/haskell/uu-options/default.nix new file mode 100644 index 00000000000..2c375afac10 --- /dev/null +++ b/pkgs/development/libraries/haskell/uu-options/default.nix @@ -0,0 +1,19 @@ +{ cabal, lenses, mtl, transformers, uuInterleaved, uuParsinglib }: + +cabal.mkDerivation (self: { + pname = "uu-options"; + version = "0.1.0.0"; + sha256 = "08z465w0naw8hx831bcgqbwmp9zdmw3bq4i7rgz7zfzb088nfwzc"; + isLibrary = true; + buildDepends = [ + lenses mtl transformers uuInterleaved uuParsinglib + ]; + patchFlags = "-p0"; + patches = [ ./no-executable-stanza.diff ]; + meta = { + homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; + description = "Parse command line options using uu-interleave and uu-parsinglib"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/uu-options/no-executable-stanza.diff b/pkgs/development/libraries/haskell/uu-options/no-executable-stanza.diff new file mode 100644 index 00000000000..9f711765d53 --- /dev/null +++ b/pkgs/development/libraries/haskell/uu-options/no-executable-stanza.diff @@ -0,0 +1,20 @@ +Index: uu-options.cabal +=================================================================== +--- uu-options.cabal (revision 127) ++++ uu-options.cabal (working copy) +@@ -27,14 +27,8 @@ + type: svn + location: https://svn.science.uu.nl/repos/project.STEC.uu-parsinglib/uu-options + +-executable demo-options +- Main-is: Options/UU/OptionsDemo.hs ++library + hs-source-dirs: src + Build-Depends: base >= 4.2 && <5, uu-parsinglib >=2.8 && < 2.9, uu-interleaved >=0.1.0 && < 0.2, lenses >= 0.1.6 && < 0.1.7, transformers >= 0.3.0.0, mtl +- +-Library +- hs-source-dirs: src +- Build-Depends: base >= 4.2 && <5, uu-parsinglib >=2.8 && < 2.9, uu-interleaved >=0.1.0 && < 0.2, lenses >= 0.1.6 && < 0.1.7, transformers >= 0.3.0.0, mtl + Exposed-modules: Options.UU.Interleaved + Options.UU.OptionsDemo +- diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f0c31fd82fa..6409e39e459 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1930,6 +1930,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uuid = callPackage ../development/libraries/haskell/uuid {}; + uuOptions = callPackage ../development/libraries/haskell/uu-options {}; + uuInterleaved = callPackage ../development/libraries/haskell/uu-interleaved {}; uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {}; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 43e1285698c..dc456554839 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -398,6 +398,7 @@ mapHaskellTestOn { uuid = default; uulib = default ++ latest; uuParsinglib = default; + uuOptions = default; vacuumCairo = default; vacuum = default; vcsRevision = default;