diff options
author | Shea Levy <shea@shealevy.com> | 2014-09-09 14:14:57 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-09-09 14:14:57 -0400 |
commit | 70c27cfc3d24dd6d47ddef7f077380a0971ac8d2 (patch) | |
tree | 2fc6b3a97c2e9776e3f65ce0cb6ef48474199031 /pkgs | |
parent | c888b97e19185933b3024f4e3de6cb78fed4911a (diff) | |
parent | ed5349952a79645e2c0c28faa06927a7edce6df0 (diff) | |
download | nixlib-70c27cfc3d24dd6d47ddef7f077380a0971ac8d2.tar nixlib-70c27cfc3d24dd6d47ddef7f077380a0971ac8d2.tar.gz nixlib-70c27cfc3d24dd6d47ddef7f077380a0971ac8d2.tar.bz2 nixlib-70c27cfc3d24dd6d47ddef7f077380a0971ac8d2.tar.lz nixlib-70c27cfc3d24dd6d47ddef7f077380a0971ac8d2.tar.xz nixlib-70c27cfc3d24dd6d47ddef7f077380a0971ac8d2.tar.zst nixlib-70c27cfc3d24dd6d47ddef7f077380a0971ac8d2.zip |
Merge branch 'add-haskell-managed' of git://github.com/alpmestan/nixpkgs
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/haskell/managed/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/haskell/managed/default.nix b/pkgs/development/libraries/haskell/managed/default.nix new file mode 100644 index 000000000000..5827038627c7 --- /dev/null +++ b/pkgs/development/libraries/haskell/managed/default.nix @@ -0,0 +1,13 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "managed"; + version = "1.0.0"; + sha256 = "06nb71pd68m5l6a48sz5kkrdif74phbg3y6bn9ydd00y515b9gn5"; + buildDepends = [ transformers ]; + meta = { + description = "A monad for managed values"; + 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 06ade738ca5e..e79d3a09a8db 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1548,6 +1548,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in machines = callPackage ../development/libraries/haskell/machines {}; + managed = callPackage ../development/libraries/haskell/managed {}; + markdown = callPackage ../development/libraries/haskell/markdown {}; markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; |