From bdae7f99eaef3a92ab0fff833f99c3b31f434ed6 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 23 Dec 2013 09:42:41 +0100 Subject: [PATCH 1/5] add haskellPackages.eventList --- .../libraries/haskell/event-list/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/event-list/default.nix diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix new file mode 100644 index 00000000000..16b73d9bfb3 --- /dev/null +++ b/pkgs/development/libraries/haskell/event-list/default.nix @@ -0,0 +1,16 @@ +{ cabal, nonNegative, QuickCheck, transformers, utilityHt }: + +cabal.mkDerivation (self: { + pname = "event-list"; + version = "0.1.0.2"; + sha256 = "01j48871nijhkbqdsfvbvq01yr9b5a056fn03ccgazikfsd368ri"; + isLibrary = true; + isExecutable = true; + buildDepends = [ nonNegative QuickCheck transformers utilityHt ]; + meta = { + homepage = "http://code.haskell.org/~thielema/event-list/"; + description = "Event lists with relative or absolute time stamps"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a837314cee1..a5fdaa16002 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -981,6 +981,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x esqueleto = callPackage ../development/libraries/haskell/esqueleto {}; + eventList = callPackage ../development/libraries/haskell/event-list {}; + exPool = callPackage ../development/libraries/haskell/ex-pool { hashable = self.hashable_1_2_1_0; }; exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; From d62b286c7f311788bac431c1f8eb86251bb63c46 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 23 Dec 2013 09:53:48 +0100 Subject: [PATCH 2/5] add haskellPackages.monoidTransformer --- .../libraries/haskell/monoid-transformer/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/monoid-transformer/default.nix diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix new file mode 100644 index 00000000000..d4e5962ec85 --- /dev/null +++ b/pkgs/development/libraries/haskell/monoid-transformer/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "monoid-transformer"; + version = "0.0.2"; + sha256 = "0hd8jb1iw6lbgml3f08n680bdij56cjanpkr4fc1jr7qn6yzzb2j"; + meta = { + description = "Monoid counterparts to some ubiquitous monad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a5fdaa16002..01c663c6708 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1554,6 +1554,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {}; + monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {}; + mongoDB = callPackage ../development/libraries/haskell/mongoDB {}; monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {}; From f4204813c698d62508418ac8f9d36c0bad3a1d94 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 23 Dec 2013 10:13:34 +0100 Subject: [PATCH 3/5] add haskellPackages.markovChain --- .../libraries/haskell/markov-chain/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/markov-chain/default.nix diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix new file mode 100644 index 00000000000..5907fce4f17 --- /dev/null +++ b/pkgs/development/libraries/haskell/markov-chain/default.nix @@ -0,0 +1,14 @@ +{ cabal, random, transformers }: + +cabal.mkDerivation (self: { + pname = "markov-chain"; + version = "0.0.3.2"; + sha256 = "0shld9b6vdi5274wyhwpw5ggfm6xi5j7m3ag989bxarhrfzjxgdk"; + buildDepends = [ random transformers ]; + meta = { + homepage = "http://code.haskell.org/~thielema/markov-chain/"; + description = "Markov Chains for generating random sequences with a user definable behaviour"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 01c663c6708..bfd4ed7fd09 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1500,6 +1500,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; + markovChain = callPackage ../development/libraries/haskell/markov-chain {}; + maude = callPackage ../development/libraries/haskell/maude {}; MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; From 1e8dcf3921143c2697b1ec560126fe71ac158132 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 23 Dec 2013 10:21:27 +0100 Subject: [PATCH 4/5] add haskellPackages.midi --- .../libraries/haskell/midi/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/midi/default.nix diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix new file mode 100644 index 00000000000..e50843c6ff2 --- /dev/null +++ b/pkgs/development/libraries/haskell/midi/default.nix @@ -0,0 +1,21 @@ +{ cabal, binary, eventList, explicitException, monoidTransformer +, nonNegative, QuickCheck, random, transformers, utilityHt +}: + +cabal.mkDerivation (self: { + pname = "midi"; + version = "0.2.1"; + sha256 = "0i767y0835979s9i3wm8qwzh2awhhmfvhc5zvq2lkn8xlsp3wa6y"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary eventList explicitException monoidTransformer nonNegative + QuickCheck random transformers utilityHt + ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/MIDI"; + description = "Handling of MIDI messages and files"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bfd4ed7fd09..cf73f683313 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1510,6 +1510,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {}; + midi = callPackage ../development/libraries/haskell/midi {}; + minimorph = callPackage ../development/libraries/haskell/minimorph {}; miniutter = callPackage ../development/libraries/haskell/miniutter {}; From 5a90dd86da8045d0fdbc6107cf1303129d504888 Mon Sep 17 00:00:00 2001 From: Emil Rangden Date: Mon, 23 Dec 2013 10:22:37 +0100 Subject: [PATCH 5/5] add haskellPackages.haskore --- .../libraries/haskell/haskore/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/haskore/default.nix diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix new file mode 100644 index 00000000000..7e3ebb6476b --- /dev/null +++ b/pkgs/development/libraries/haskell/haskore/default.nix @@ -0,0 +1,21 @@ +{ cabal, dataAccessor, eventList, haskellSrc, markovChain, midi +, nonNegative, parsec, random, transformers, utilityHt +}: + +cabal.mkDerivation (self: { + pname = "haskore"; + version = "0.2.0.3"; + sha256 = "0vg4m2cmy1fabfnck9v22jicflb0if64h0wjvyrgpn2ykb9wwbpa"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + dataAccessor eventList haskellSrc markovChain midi nonNegative + parsec random transformers utilityHt + ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Haskore"; + description = "The Haskore Computer Music System"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cf73f683313..f8411263135 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1207,6 +1207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; + haskore = callPackage ../development/libraries/haskell/haskore {}; + hastache = callPackage ../development/libraries/haskell/hastache {}; hexpat = callPackage ../development/libraries/haskell/hexpat {};