summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2012-06-04 09:24:14 +0000
committerPeter Simons <simons@cryp.to>2012-06-04 09:24:14 +0000
commit4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b (patch)
treead7e8d8d4841bf5e7224b8aeacc39422b9c367ae /pkgs/development
parent0d719146a20449491a4ad21826122c3290716b36 (diff)
downloadnixlib-4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b.tar
nixlib-4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b.tar.gz
nixlib-4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b.tar.bz2
nixlib-4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b.tar.lz
nixlib-4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b.tar.xz
nixlib-4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b.tar.zst
nixlib-4fdbd75e4fe5e50d2c228691319f8c3d86e96f9b.zip
Updated Haskell packages.
 - ghc-mod: updated to version 1.10.16
 - network: added version 2.3.0.14
 - pandoc: updated to version 1.9.4
 - xmobar: updated to version 0.15

svn path=/nixpkgs/trunk/; revision=34337
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/haskell/ghc-mod/default.nix20
-rw-r--r--pkgs/development/libraries/haskell/network/2.3.0.14.nix15
-rw-r--r--pkgs/development/libraries/haskell/pandoc/default.nix4
3 files changed, 26 insertions, 13 deletions
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index b95d1e6d73be..ca033a36556e 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "1.10.15";
-  sha256 = "1ywsv8nxd5040k3v5r9kf4zb0myicnjg6yckxmp6xnvf5glylylm";
+  version = "1.10.16";
+  sha256 = "1fk4r0zxbgmnk67ra5agfiik8yysvii51r8ikkz0xmi6r3hrf21m";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -14,14 +14,13 @@ cabal.mkDerivation (self: {
   ];
   buildTools = [ emacs ];
   postInstall = ''
-    cd $out/share/$pname-$version
-    make
-    rm Makefile
-    cd ..
-    ensureDir "$out/share/emacs"
-    mv $pname-$version emacs/site-lisp
-  '';
-
+      cd $out/share/$pname-$version
+      make
+      rm Makefile
+      cd ..
+      ensureDir "$out/share/emacs"
+      mv $pname-$version emacs/site-lisp
+    '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
     description = "Happy Haskell programming on Emacs/Vim";
@@ -30,7 +29,6 @@ cabal.mkDerivation (self: {
     maintainers = [
       self.stdenv.lib.maintainers.andres
       self.stdenv.lib.maintainers.bluescreen303
-      self.stdenv.lib.maintainers.simons
     ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.14.nix b/pkgs/development/libraries/haskell/network/2.3.0.14.nix
new file mode 100644
index 000000000000..bbc43abc42bf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network/2.3.0.14.nix
@@ -0,0 +1,15 @@
+{ cabal, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "network";
+  version = "2.3.0.14";
+  sha256 = "0naqg7ai50m3p093mi342w2z0flaagarf9n9smkn1dqvq8jg75x5";
+  buildDepends = [ parsec ];
+  meta = {
+    homepage = "http://github.com/haskell/network";
+    description = "Low-level networking interface";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 5f30b4074917..fba804bb69b4 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.9.3";
-  sha256 = "0dhzzx91ljmrcmi3znz1xvj3gwma5z5bwc4fsp5y8zd5yyb9b4j0";
+  version = "1.9.4";
+  sha256 = "0rqj9a3pkbhlqsmpxvjzahn992lm1pdg1bry677y8f5203ji10p2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [