From 127a2fc8e05a87c57e326142b6441c00f19e2cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 28 Mar 2011 15:03:51 +0000 Subject: [PATCH] Added random-fu plus dependencies. (Unfortunately doesn't compile yet with ghc-7.) svn path=/nixpkgs/trunk/; revision=26569 --- .../libraries/haskell/MonadPrompt/default.nix | 17 +++++++++++++++++ .../libraries/haskell/data-default/default.nix | 13 +++++++++++++ .../haskell/mersenne-random-pure64/default.nix | 13 +++++++++++++ .../libraries/haskell/monad-loops/default.nix | 13 +++++++++++++ .../libraries/haskell/random-fu/default.nix | 17 +++++++++++++++++ .../haskell/random-shuffle/default.nix | 13 +++++++++++++ .../libraries/haskell/stateref/default.nix | 14 ++++++++++++++ .../libraries/haskell/tagged/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 16 ++++++++++++++++ 9 files changed, 130 insertions(+) create mode 100644 pkgs/development/libraries/haskell/MonadPrompt/default.nix create mode 100644 pkgs/development/libraries/haskell/data-default/default.nix create mode 100644 pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix create mode 100644 pkgs/development/libraries/haskell/monad-loops/default.nix create mode 100644 pkgs/development/libraries/haskell/random-fu/default.nix create mode 100644 pkgs/development/libraries/haskell/random-shuffle/default.nix create mode 100644 pkgs/development/libraries/haskell/stateref/default.nix create mode 100644 pkgs/development/libraries/haskell/tagged/default.nix diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix new file mode 100644 index 00000000000..34b4bd14db4 --- /dev/null +++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix @@ -0,0 +1,17 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "MonadPrompt"; + version = "1.0.0.2"; + sha256 = "01inbw0lfjrsgs68fvak1rxi76nhwsiyarfwl1g5mis4glmh4w4c"; + propagatedBuildInputs = [mtl]; + preConfigure = '' + sed -i 's|base<=4|base >= 3 \&\& < 5|' ${self.pname}.cabal + ''; + meta = { + description = "MonadPrompt, implementation & examples"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix new file mode 100644 index 00000000000..52292209e59 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "data-default"; + version = "0.2.0.1"; + sha256 = "0hhrzaykwybqpig0kss4iq1i93ygb80g8i1chpr84akmvdr07w0i"; + meta = { + description = "A class for types with a default value"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix new file mode 100644 index 00000000000..a0617a0190d --- /dev/null +++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "mersenne-random-pure64"; + version = "0.2.0.3"; + sha256 = "0cyjfdl17n5al04vliykx0m7zncqh3201vn9b9fqfqqpmm61grqz"; + meta = { + description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix new file mode 100644 index 00000000000..c8ec938318b --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-loops/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "monad-loops"; + version = "0.3.1.1"; + sha256 = "086aqd1x1xc6irp24z1lwhzrknw9r2wbs8fnxz6vyi75m3rqvdcv"; + meta = { + description = "Monadic loops"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix new file mode 100644 index 00000000000..7773e53cb8b --- /dev/null +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -0,0 +1,17 @@ +{cabal, erf, mtl, mersenneRandomPure64, monadLoops, MonadPrompt, + mwcRandom, randomShuffle, stateref, tagged, vector, syb}: + +cabal.mkDerivation (self : { + pname = "random-fu"; + version = "0.1.3"; + sha256 = "1l7czlll6y02m5xzdky95m78806gnj5y3nk3cxs5zqgxwskq73bk"; + propagatedBuildInputs = + [erf mtl mersenneRandomPure64 monadLoops MonadPrompt + mwcRandom randomShuffle stateref tagged vector syb]; + meta = { + description = "Random number generation"; + license = "Public Domain"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix new file mode 100644 index 00000000000..c420f5f0e35 --- /dev/null +++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "random-shuffle"; + version = "0.0.2"; + sha256 = "1csq0ffsqbbv6ymf707nzfb7c9bmykwk9bcgj21mxmh6khlqn9jp"; + meta = { + description = "Random shuffle implementation"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix new file mode 100644 index 00000000000..6391f25261d --- /dev/null +++ b/pkgs/development/libraries/haskell/stateref/default.nix @@ -0,0 +1,14 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "stateref"; + version = "0.3"; + sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx"; + propagatedBuildInputs = [mtl]; + meta = { + description = "Abstraction for things that work like IORef"; + license = "Public Domain"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix new file mode 100644 index 00000000000..97d42cf62f0 --- /dev/null +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -0,0 +1,14 @@ +{cabal, dataDefault}: + +cabal.mkDerivation (self : { + pname = "tagged"; + version = "0.2"; + sha256 = "0hwc0hhq5pzihx6danxvgs4k1z0nqcrwf3ji0w2i1gx3298cwrz5"; + propagatedBuildInputs = [dataDefault]; + meta = { + description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index beec7429fb2..8108326d099 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -355,6 +355,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {}; + dataDefault = callPackage ../development/libraries/haskell/data-default {}; + dataenc = callPackage ../development/libraries/haskell/dataenc {}; dataReify = callPackage ../development/libraries/haskell/data-reify {}; @@ -590,6 +592,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {}; + mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {}; + MissingH = callPackage ../development/libraries/haskell/MissingH {}; mmap = callPackage ../development/libraries/haskell/mmap {}; @@ -600,8 +604,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadlab = callPackage ../development/libraries/haskell/monadlab {}; + monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; + monadPeel = callPackage ../development/libraries/haskell/monad-peel {}; + MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; + MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; monadsFd = callPackage ../development/libraries/haskell/monads-fd {}; @@ -709,6 +717,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); time = self.time_1_2_0_3; }; + randomFu = callPackage ../development/libraries/haskell/random-fu {}; + + randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {}; + readline = callPackage ../development/libraries/haskell/readline { inherit (pkgs) readline ncurses; }; @@ -745,6 +757,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); sendfile = callPackage ../development/libraries/haskell/sendfile {}; + stateref = callPackage ../development/libraries/haskell/stateref {}; + statistics = callPackage ../development/libraries/haskell/statistics {}; # TODO: investigate status of syb in older platform versions @@ -800,6 +814,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); svgcairo = callPackage ../development/libraries/haskell/svgcairo {}; + tagged = callPackage ../development/libraries/haskell/tagged {}; + tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; terminfo = callPackage ../development/libraries/haskell/terminfo {