From c9dd66fde6a369202e27fe8d08246c34ac9a1db0 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 20 Aug 2014 10:45:59 +0100 Subject: [PATCH 1/2] haskell-ghc-mod: add 5.0.1 Separate expression for now due to big API chanages. --- .../libraries/haskell/djinn-ghc/default.nix | 16 +++++ .../libraries/haskell/djinn-lib/default.nix | 17 +++++ .../ghc-mod/{default.nix => 4.1.6.nix} | 0 .../libraries/haskell/ghc-mod/5.0.1.nix | 63 +++++++++++++++++++ .../haskell/monad-journal/default.nix | 20 ++++++ pkgs/top-level/haskell-packages.nix | 14 ++++- 6 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/djinn-ghc/default.nix create mode 100644 pkgs/development/libraries/haskell/djinn-lib/default.nix rename pkgs/development/libraries/haskell/ghc-mod/{default.nix => 4.1.6.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix create mode 100644 pkgs/development/libraries/haskell/monad-journal/default.nix diff --git a/pkgs/development/libraries/haskell/djinn-ghc/default.nix b/pkgs/development/libraries/haskell/djinn-ghc/default.nix new file mode 100644 index 00000000000..3b5ffae42c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/djinn-ghc/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, djinnLib, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "djinn-ghc"; + version = "0.0.2.2"; + sha256 = "0dz5jg58si9fsc12212rxmzky09zric7b2sdj1ydmvnrjxkh9l70"; + buildDepends = [ async djinnLib mtl transformers ]; + meta = { + description = "Generate Haskell code from a type. Bridge from Djinn to GHC API."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/djinn-lib/default.nix b/pkgs/development/libraries/haskell/djinn-lib/default.nix new file mode 100644 index 00000000000..357ad9a4fdc --- /dev/null +++ b/pkgs/development/libraries/haskell/djinn-lib/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "djinn-lib"; + version = "0.0.1.2"; + sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0"; + buildDepends = [ mtl ]; + meta = { + homepage = "http://www.augustsson.net/Darcs/Djinn/"; + description = "Generate Haskell code from a type. Library extracted from djinn package."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix similarity index 100% rename from pkgs/development/libraries/haskell/ghc-mod/default.nix rename to pkgs/development/libraries/haskell/ghc-mod/4.1.6.nix diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix new file mode 100644 index 00000000000..eea28837a81 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix @@ -0,0 +1,63 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs +, filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec +, ioChoice, monadControl, monadJournal, mtl, split, syb, text, time +, transformers, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "ghc-mod"; + version = "5.0.1"; + sha256 = "01awsi5rfzq6433shfvvnr69ifxb7h8v90mlknxv3dl34zmrhv19"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + Cabal convertible deepseq djinnGhc filepath ghcPaths ghcSybUtils + haskellSrcExts hlint ioChoice monadControl monadJournal mtl split + syb text time transformers transformersBase + ]; + testDepends = [ + Cabal convertible deepseq djinnGhc doctest filepath ghcPaths + ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl + monadJournal mtl split syb text time transformers transformersBase + ]; + buildTools = [ emacs ]; + doCheck = false; + configureFlags = "--datasubdir=${self.pname}-${self.version}"; + postInstall = '' + cd $out/share/$pname-$version + make + rm Makefile + cd .. + ensureDir "$out/share/emacs" + mv $pname-$version emacs/site-lisp + mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped + cat - > $out/bin/ghc-mod < $out/bin/ghc-modi < Date: Wed, 20 Aug 2014 13:21:31 +0200 Subject: [PATCH 2/2] Don't try make first argument the command, the vim plugin mixes up commands with options --- pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix index eea28837a81..ad920721451 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix @@ -35,17 +35,13 @@ cabal.mkDerivation (self: { mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod < $out/bin/ghc-modi <