Merge branch 'upstream'

pkgs/applications/editors/emacs-modes/gh/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, emacs, pcache, logito }:
+
+stdenv.mkDerivation rec {
+  name = "gh-0.5.3";
+
+  src = fetchgit {
+    url = "https://github.com/sigma/gh.el.git";
+    rev = "v0.5.3";
+    sha256 = "efa231e0091e8c7785385149dc97b2d8dc24aba65f4b0974b8ed7f62b7596ad3";
+  };
+
+  buildInputs = [ emacs ];
+  propagatedUserEnvPkgs = [ pcache logito ];
+
+  patchPhase = ''
+    sed -i Makefile \
+      -e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \
+      -e "s|/usr/local|$out|" \
+      -e "s|/site-lisp/\$(PKGNAME)|/site-lisp|"
+  '';
+
+  buildPhase = "make lisp";
+
+  meta = {
+    description = "A (very early) GitHub client library for Emacs";
+    homepage = https://github.com/sigma/gh.el;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/gist/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, emacs, gh, pcache, logito }:
+
+stdenv.mkDerivation rec {
+  name = "gist-1.0";
+
+  src = fetchgit {
+    url = "https://github.com/sigma/gist.el.git";
+    rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed";
+    sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L ${gh}/share/emacs/site-lisp \
+          -L ${pcache}/share/emacs/site-lisp \
+          -L ${logito}/share/emacs/site-lisp \
+          --eval '(setq user-emacs-directory "./")' \
+          --batch -f batch-byte-compile gist.el
+  '';
+
+  propagatedUserEnvPkgs = [ gh pcache logito ];
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install gist.el gist.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Emacs integration for gist.github.com";
+    homepage = https://github.com/sigma/gist.el;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/logito/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "logito-0.1";
+
+  src = fetchgit {
+    url = "https://github.com/sigma/logito.git";
+    rev = "v0.1";
+    sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile logito.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install logito.el logito.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "tiny logging framework for Emacs";
+    homepage = https://github.com/sigma/logito;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "lorem-ipsum-0.1";
+
+  src = fetchurl {
+    url = "http://www.emacswiki.org/emacs/download/lorem-ipsum.el";
+    sha256 = "122d0z3xqfaikgk34l7bh989mfxddin2ljinysp2lqw8djfi7jsl";
+  };
+
+  phases = [ "buildPhase" "installPhase"];
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    cp $src lorem-ipsum.el
+    emacs --batch -f batch-byte-compile lorem-ipsum.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install lorem-ipsum.el lorem-ipsum.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Insert dummy pseudo Latin text for emacs.";
+    homepage = http://www.emacswiki.org/emacs/LoremIpsum;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/editors/emacs-modes/pcache/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "pcache-0.2.3";
+
+  src = fetchgit {
+    url = "https://github.com/sigma/pcache.git";
+    rev = "v0.2.3";
+    sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs --batch -f batch-byte-compile pcache.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install pcache.el pcache.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Persistent caching for Emacs";
+    homepage = https://github.com/sigma/pcache.el;
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/applications/misc/lyx/default.nix

@@ -4,12 +4,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.3";
+  version = "2.0.4";
   name = "lyx-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
-    sha256 = "1j2sl22w41h4vrgnxv2n0s7d11k6zchjbggjw3ai9yxcahvrj72f";
+    sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8";
   };
 
   buildInputs = [texLive qt python makeWrapper pkgconfig ];

pkgs/applications/misc/st/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, libX11, ncurses}:
+
+stdenv.mkDerivation rec {
+  name = "st-0.2.1";
+
+  src = fetchurl {
+    url = http://hg.suckless.org/st/archive/0.2.1.tar.gz;
+    sha256 = "15yqyys69ifjc4vrzvamrg7x0pwa60mnjpi0kap4y9ykhds83xab";
+  };
+
+  buildInputs = [ libX11 ncurses ];
+
+  installPhase = ''
+    TERMINFO=$out/share/terminfo make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = http://st.suckless.org/;
+    license = "MIT";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/misc/surf/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "surf-${version}";
-  version="0.4.1";
+  version="0.5";
 
   src = fetchurl {
     url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
-    sha256 = "0im5psjw0r8av3zjyy2wqcl6y5ylwnrab5kfcwc23bsbx2irnw4k";
+    sha256 = "19qfkwdk6p5hcwnnplscp1kmypz74mga7x6iqy6w3g18s221f2mx";
   };
 
   buildInputs = [ gtk webkit pkgconfig glib libsoup ];

pkgs/applications/version-management/git-and-tools/git/default.nix

@@ -9,18 +9,18 @@
 
 let
 
-  version = "1.7.11";
-  
+  version = "1.7.11.4";
+
   svn = subversionClient.override { perlBindings = true; };
-  
+
 in
 
 stdenv.mkDerivation {
   name = "git-${version}";
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "0qgi1cj19dnn0sl3n38dbz68nllvyppdvs2jb77ksiar4jb9lsc3";
+    sha256 = "16a1gm256w82j9ardzyfyqi0f35l3x92xsqz8ghz1pnja8jns7g9";
   };
 
   patches = [ ./docbook2texi.patch ];
@@ -100,7 +100,7 @@ stdenv.mkDerivation {
        for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
          sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
                 -e "s|exec wish|exec '${tk}/bin/wish'|g" \
-		"$out/$prog"
+                "$out/$prog"
        done
      '' else ''
        # Don't wrap Tcl/Tk, replace them by notification scripts

pkgs/applications/window-managers/awesome/default.nix

@@ -6,15 +6,15 @@
 , docbook_xml_dtd_45, libxslt, coreutils}:
 
 let
-  version = "3.4.11";
+  version = "3.4.13";
 in
 
 stdenv.mkDerivation rec {
   name = "awesome-${version}";
 
   src = fetchurl {
     url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d";
+    sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr";
   };
 
   buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango
@@ -36,19 +36,9 @@ stdenv.mkDerivation rec {
     #  asciidoc: FAILED: <stdin>: line 3: section title expected
     #  make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
     substituteInPlace CMakeLists.txt \
-      --replace "set(AWE_MAN_LANGS es fr de ru)" \
-                "set(AWE_MAN_LANGS es fr de)"
+      --replace "set(AWE_MAN_LANGS it es fr de ru)" \
+                "set(AWE_MAN_LANGS it es fr de)"
   '';
-
-  # XXX: maybe not needed anymore
-  # Somehow libev does not get into the rpath, although it should.
-  # Something may be wrong in the gcc wrapper.
-  preBuild = ''
-    export NIX_LDFLAGS_BEFORE="-lev";
-  '';
-
-  # Cmake fails strangely at finding lua. Looks to me like a cmake 2.8 error.
-  cmakeFlags = [ "-DLUA_LIBRARIES=${lua}/lib/liblua.a" ];
 
   meta = {
     homepage = http://awesome.naquadah.org/;

pkgs/development/compilers/go/cacert.patch

@@ -0,0 +1,15 @@
+Go comes with hardcoded cacert. We add the usual in NixOS,
+for easier NixOS life.
+
+diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go
+index 76e79f4..6ef1dd3 100644
+--- a/src/pkg/crypto/x509/root_unix.go
++++ b/src/pkg/crypto/x509/root_unix.go
+@@ -15,6 +15,7 @@ var certFiles = []string{
+ 	"/etc/ssl/ca-bundle.pem",                 // OpenSUSE
+ 	"/etc/ssl/cert.pem",                      // OpenBSD
+ 	"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD
++	"/etc/ssl/certs/ca-bundle.crt",           // NixOS
+ }
+
+ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {

pkgs/development/compilers/go/default.nix

@@ -44,6 +44,7 @@ stdenv.mkDerivation {
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
   '';
 
+  patches = [ ./cacert.patch ];
 
   GOOS = "linux";
   GOARCH = if (stdenv.system == "i686-linux") then "386"

pkgs/development/libraries/haskell/accelerate-cuda/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "accelerate-cuda";
-  version = "0.12.1.0";
-  sha256 = "1y6viivizv4frdh3xk5wqhs7wwnhqyjr9wid1y1d5l42mz41vp84";
+  version = "0.12.1.1";
+  sha256 = "1kj9i6djjb46ad3dnzk72mf33r8h1mjxljs7x5rf2d658hqk5yfv";
   buildDepends = [
     accelerate binary blazeBuilder cryptohash cuda fclabels filepath
     hashable hashtables languageCQuote mainlandPretty mtl srcloc

pkgs/development/libraries/haskell/digestive-functors-heist/default.nix

@@ -0,0 +1,14 @@
+{ cabal, digestiveFunctors, heist, text, xmlhtml }:
+
+cabal.mkDerivation (self: {
+  pname = "digestive-functors-heist";
+  version = "0.5.0.0";
+  sha256 = "1cqzpnr53mailnmjgkbqk4f4hrjd84h6682mr8x7qg5v27zvcdbn";
+  buildDepends = [ digestiveFunctors heist text xmlhtml ];
+  meta = {
+    homepage = "http://github.com/jaspervdj/digestive-functors";
+    description = "Heist frontend for the digestive-functors library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/irc/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "irc";
-  version = "0.5.0.0";
-  sha256 = "0bid9iqgrppkl7hl1cd2m1pvvk5qva53fqfl0v5ld52j904c50sr";
+  version = "0.5.1.0";
+  sha256 = "1xkgqcjxlxqg60qlv26ypmvf9x288sjz1n47rb7zfvjhdimws8gj";
   buildDepends = [ parsec ];
   meta = {
     description = "A small library for parsing IRC messages";