Merge pull request #3689 from Fuuzetsu/ghc-mod

haskell-ghc-mod: add 5.0.1

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 ];
+  };
+})

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 ];
+  };
+})

pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix

@@ -0,0 +1,59 @@
+# 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 <<EOF
+    #! ${self.stdenv.shell}
+    eval exec $out/bin/.ghc-mod-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    EOF
+
+    mv $out/bin/ghc-modi $out/bin/.ghc-modi-wrapped
+    cat - > $out/bin/ghc-modi <<EOF
+    #! ${self.stdenv.shell}
+    eval exec $out/bin/.ghc-modi-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    EOF
+
+    chmod +x $out/bin/ghc-mod
+    chmod +x $out/bin/ghc-modi
+  '';
+  meta = {
+    homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
+    description = "Happy Haskell Programming";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [
+      andres bluescreen303 ocharles
+    ];
+  };
+})

pkgs/development/libraries/haskell/monad-journal/default.nix

@@ -0,0 +1,20 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, either, monadControl, mtl, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "monad-journal";
+  version = "0.2.3.0";
+  sha256 = "1k0da0fwk05k8530rlys3n2s1z8glnfdivx93isy6cjr8amndc6b";
+  buildDepends = [
+    either monadControl mtl transformers transformersBase
+  ];
+  meta = {
+    homepage = "https://github.com/phaazon/monad-journal";
+    description = "Pure logger typeclass and monad transformer";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
+  };
+})

pkgs/top-level/haskell-packages.nix

@@ -678,6 +678,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   djinn = callPackage ../development/libraries/haskell/djinn {};
 
+  djinnGhc = callPackage ../development/libraries/haskell/djinn-ghc {};
+
+  djinnLib = callPackage ../development/libraries/haskell/djinn-lib {};
+
   dlist = callPackage ../development/libraries/haskell/dlist {};
 
   dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {};
@@ -893,10 +897,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {};
 
-  ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
+  ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix {
     inherit (pkgs) emacs;
   };
 
+  ghcMod_5_0_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.nix {
+    inherit (pkgs) emacs;
+  };
+
+  ghcMod = self.ghcMod_4_1_6;
+
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
 
   ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {};
@@ -1585,6 +1595,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   monadExtras = callPackage ../development/libraries/haskell/monad-extras {};
 
+  monadJournal = callPackage ../development/libraries/haskell/monad-journal {};
+
   monadLib = callPackage ../development/libraries/haskell/monadlib {};
 
   monadloc = callPackage ../development/libraries/haskell/monadloc {};