From 2525aac13432f274367373f61dc02839a5cf7d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 5 May 2014 17:32:23 +0200 Subject: [PATCH 1/7] haskell-unix-memory: new expression --- .../libraries/haskell/unix-memory/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/unix-memory/default.nix diff --git a/pkgs/development/libraries/haskell/unix-memory/default.nix b/pkgs/development/libraries/haskell/unix-memory/default.nix new file mode 100644 index 00000000000..d4c65ff0475 --- /dev/null +++ b/pkgs/development/libraries/haskell/unix-memory/default.nix @@ -0,0 +1,19 @@ +{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "unix-memory"; + version = "0.1.1"; + sha256 = "02jmccs7mcg2lhpnb1ps7ycxzmn46b4drf994vv0pawwjrkrhnhk"; + testDepends = [ + HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-unix-memory"; + description = "Unix memory syscalls"; + 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 1e7a7297758..01512765333 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2681,6 +2681,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; + unixMemory = callPackage ../development/libraries/haskell/unix-memory {}; + unixProcessConduit = callPackage ../development/libraries/haskell/unix-process-conduit {}; unixTime = callPackage ../development/libraries/haskell/unix-time {}; From 97dde61662a7968e1849dc24fbae67c570c615ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 5 May 2014 17:33:05 +0200 Subject: [PATCH 2/7] haskell-system-time-monotonic: new expression --- .../haskell/system-time-monotonic/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/system-time-monotonic/default.nix diff --git a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix new file mode 100644 index 00000000000..230dc5fd6d1 --- /dev/null +++ b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix @@ -0,0 +1,14 @@ +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "system-time-monotonic"; + version = "0.2"; + sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v"; + buildDepends = [ time ]; + meta = { + homepage = "https://github.com/joeyadams/haskell-system-time-monotonic"; + description = "Simple library for using the system's monotonic clock"; + 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 01512765333..06dadad9539 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2500,6 +2500,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x systemPosixRedirect = callPackage ../development/libraries/haskell/system-posix-redirect {}; + systemTimeMonotonic = callPackage ../development/libraries/haskell/system-time-monotonic {}; + TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {}; tabular = callPackage ../development/libraries/haskell/tabular {}; From b49de7164e929e26e1c5bf8d729dad6563c5afc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 5 May 2014 21:43:10 +0200 Subject: [PATCH 3/7] haskell-generate: new expression --- .../haskell/haskell-generate/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/haskell-generate/default.nix diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix new file mode 100644 index 00000000000..b650714127c --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-generate/default.nix @@ -0,0 +1,15 @@ +{ cabal, doctest, filepath, haskellSrcExts, transformers }: + +cabal.mkDerivation (self: { + pname = "haskell-generate"; + version = "0.2"; + sha256 = "0bkaarc40lcw3v2y6qdf91rx21v3w82y62kaadhmmh5ikq99pybw"; + buildDepends = [ haskellSrcExts transformers ]; + testDepends = [ doctest filepath ]; + meta = { + homepage = "http://github.com/bennofs/haskell-generate/"; + description = "haskell-generate"; + 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 06dadad9539..b45dcfc2695 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1339,6 +1339,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; + haskellGenerate = callPackage ../development/libraries/haskell/haskell-generate {}; + haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {}; haskellMpi = callPackage ../development/libraries/haskell/haskell-mpi { From e61e23b6c7cd31ebe60e3455fe8f88ba666a5e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 5 May 2014 21:44:28 +0200 Subject: [PATCH 4/7] haskell-hcltest: new expression --- .../libraries/haskell/hcltest/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hcltest/default.nix diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix new file mode 100644 index 00000000000..170c885d240 --- /dev/null +++ b/pkgs/development/libraries/haskell/hcltest/default.nix @@ -0,0 +1,22 @@ +{ cabal, dlist, doctest, either, filepath, free, lens, mmorph +, monadControl, mtl, optparseApplicative, randomShuffle, split, stm +, tagged, tasty, temporary, text, transformers, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "hcltest"; + version = "0.3.1"; + sha256 = "0qnf6ib01njcbjfbwxff8y4sqmrj6nyy9y9hb0l0kw21cxsgl7c9"; + buildDepends = [ + dlist either filepath free lens mmorph monadControl mtl + optparseApplicative randomShuffle split stm tagged tasty temporary + text transformers transformersBase + ]; + testDepends = [ doctest filepath ]; + meta = { + homepage = "http://github.com/bennofs/hcltest/"; + description = "A testing library for command line applications"; + 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 b45dcfc2695..89bc849915d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1365,6 +1365,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hastache = callPackage ../development/libraries/haskell/hastache {}; + hcltest = callPackage ../development/libraries/haskell/hcltest {}; + heredoc = callPackage ../development/libraries/haskell/heredoc {}; hexpat = callPackage ../development/libraries/haskell/hexpat {}; From 52bd5978a047ab63e7bc61870c019b49c5255899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 5 May 2014 21:45:42 +0200 Subject: [PATCH 5/7] haskell-quickcheck-property-monad: new expression --- .../haskell/quickcheck-property-monad/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix diff --git a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix new file mode 100644 index 00000000000..203f22146b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix @@ -0,0 +1,15 @@ +{ cabal, doctest, either, filepath, QuickCheck, transformers }: + +cabal.mkDerivation (self: { + pname = "quickcheck-property-monad"; + version = "0.2.1"; + sha256 = "1ln8bcsc8hd8jyhd9rp2j90p5h5nhmwidb5my91p09h43y4z9xds"; + buildDepends = [ either QuickCheck transformers ]; + testDepends = [ doctest filepath QuickCheck ]; + meta = { + homepage = "http://github.com/bennofs/quickcheck-property-monad/"; + description = "quickcheck-property-monad"; + 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 89bc849915d..2019ec0c8ff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2182,6 +2182,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; + quickcheckPropertyMonad = callPackage ../development/libraries/haskell/quickcheck-property-monad {}; + qrencode = callPackage ../development/libraries/haskell/qrencode { inherit (pkgs) qrencode; }; From fb2d8ab9aa1aa672b0bae71a9f8d968534eb5f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 5 May 2014 21:47:14 +0200 Subject: [PATCH 6/7] haskell-th-lift-instances: new expression --- .../haskell/th-lift-instances/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/th-lift-instances/default.nix diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix new file mode 100644 index 00000000000..27eb090443b --- /dev/null +++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix @@ -0,0 +1,15 @@ +{ cabal, doctest, filepath, QuickCheck, text, thLift, vector }: + +cabal.mkDerivation (self: { + pname = "th-lift-instances"; + version = "0.1.2"; + sha256 = "0xfz7jnhqxqxd6ijn6vpd0nay38kj862ylsb71xqi35137g5zl9w"; + buildDepends = [ text thLift vector ]; + testDepends = [ doctest filepath QuickCheck text vector ]; + meta = { + homepage = "http://github.com/bennofs/th-lift-instances/"; + description = "Lift instances for template-haskell for common data types"; + 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 2019ec0c8ff..4c63b3e0ad2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2602,6 +2602,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x thLift = callPackage ../development/libraries/haskell/th-lift {}; + thLiftInstances = callPackage ../development/libraries/haskell/th-lift-instances {}; + thOrphans = callPackage ../development/libraries/haskell/th-orphans {}; threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; From 631e74963f7597dc2296bfeea219a22ea4beb19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 5 May 2014 21:48:53 +0200 Subject: [PATCH 7/7] haskell-dynamic-cabal: new expression --- .../haskell/dynamic-cabal/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/dynamic-cabal/default.nix diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix new file mode 100644 index 00000000000..c2ecb09824f --- /dev/null +++ b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix @@ -0,0 +1,20 @@ +{ cabal, dataDefault, doctest, filepath, ghcPaths, haskellGenerate +, haskellSrcExts, HUnit, tasty, tastyHunit, tastyTh, time, void +}: + +cabal.mkDerivation (self: { + pname = "dynamic-cabal"; + version = "0.3.1"; + sha256 = "0jjhz6h1ggznbvi4qgv0p5x1s7j0fgv1xvkfgid57jrjvdvd4gic"; + buildDepends = [ + dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time + void + ]; + testDepends = [ doctest filepath HUnit tasty tastyHunit tastyTh ]; + meta = { + homepage = "http://github.com/bennofs/dynamic-cabal/"; + description = "dynamic-cabal"; + 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 4c63b3e0ad2..c421a5e3b65 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1040,6 +1040,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x dualTree = callPackage ../development/libraries/haskell/dual-tree {}; + dynamicCabal = callPackage ../development/libraries/haskell/dynamic-cabal {}; + dyre = callPackage ../development/libraries/haskell/dyre {}; editDistance = callPackage ../development/libraries/haskell/edit-distance {};