diff options
| author | Alexander Tsamutali <astsmtl@yandex.ru> | 2014-07-18 20:12:00 +0400 |
|---|---|---|
| committer | Alexander Tsamutali <astsmtl@yandex.ru> | 2014-07-18 20:12:00 +0400 |
| commit | a1a9c26cccaaeafea7cf97db39d3936a5c24d390 (patch) | |
| tree | ee95257386d50da5361a8b97bd63007ff6b200b0 /pkgs/development/tools | |
| parent | cc4c108965f2d4ec51d35214f9e1ec45eb20f0ef (diff) | |
| parent | 489923be2a7db2c3a5a75b5370727adbc795947e (diff) | |
| download | nixlib-a1a9c26cccaaeafea7cf97db39d3936a5c24d390.tar nixlib-a1a9c26cccaaeafea7cf97db39d3936a5c24d390.tar.gz nixlib-a1a9c26cccaaeafea7cf97db39d3936a5c24d390.tar.bz2 nixlib-a1a9c26cccaaeafea7cf97db39d3936a5c24d390.tar.lz nixlib-a1a9c26cccaaeafea7cf97db39d3936a5c24d390.tar.xz nixlib-a1a9c26cccaaeafea7cf97db39d3936a5c24d390.tar.zst nixlib-a1a9c26cccaaeafea7cf97db39d3936a5c24d390.zip | |
Merge branch 'master' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/documentation/haddock/2.14.3.nix | 23 | ||||
| -rw-r--r-- | pkgs/development/tools/haskell/HaRe/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/haskell/codex/default.nix | 4 |
3 files changed, 27 insertions, 4 deletions
diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix new file mode 100644 index 000000000000..2ee55bebd014 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.14.3.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck +, xhtml +}: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.14.3"; + sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; + doCheck = false; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 66048f7cc09e..377f3c6f08de 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.2.4"; - sha256 = "1ljyvs3mdgxzyvss071yvgnrnmhdyp9a10cmvij1d47li1wbj1j1"; + version = "0.7.2.5"; + sha256 = "09v0z1r03bzazgjf26fv54q1jpmv14zyl6w9083xcf2cs3yy6vfh"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index 0a68e7939d71..f0c9a6a6aaac 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "codex"; - version = "0.1.0.1"; - sha256 = "1s2sn2i0ah4wgyzz5vqkm65jkl3c38cwa2kp0az4xl3vb8y6x7la"; + version = "0.1.0.2"; + sha256 = "0dsc5dx5zcxf5wd2qf6gqzr8d613z1gkllmzzkbny3lxa512crsw"; isLibrary = true; isExecutable = true; buildDepends = [ |