Merge branch 'master' into staging

Conflicts:
	pkgs/development/libraries/fontconfig/default.nix

pkgs/servers/etcd/default.nix

@@ -1,7 +1,7 @@
 { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0-alpha.3";
+  version = "0.5.0-alpha.4";
   name = "etcd-${version}";
 
   src = import ./deps.nix {

pkgs/servers/etcd/deps.nix

@@ -8,8 +8,8 @@ let
       src = fetchFromGitHub {
         owner = "coreos";
         repo = "etcd";
-        rev = "a817ca705b5a06b3d8c008e1a59f08895971cb1e";
-        sha256 = "1lksjrb7anh6z8ajnp8jpfz9mxmvm762acdczvc6h1h4997dz982";
+        rev = "d01d6119e54f729f54e9776ad5729277fcf38668";
+        sha256 = "0h9d6rc8yx7vyv2ggvzsddyng03pjhyb7avm9wrc805qr7p8nhns";
       };
     }
   ];

pkgs/servers/fleet/default.nix

@@ -1,30 +1,33 @@
-{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
+{ stdenv, lib, go, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
   name = "fleet-${version}";
+  version = "0.9.0";
 
-  src = import ./deps.nix {
-    inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
+  src = fetchFromGitHub {
+    owner = "coreos";
+    repo = "fleet";
+    rev = "v${version}";
+    sha256 = "0gjminfprprs1nmg9y9a0qkyl9spixrk4pc2b7bl0lxdgpq2yiid";
   };
 
   buildInputs = [ go ];
 
   buildPhase = ''
-    export GOPATH=$src
-    go build -v -o fleet github.com/coreos/fleet
+    patchShebangs build
+    ./build
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    mv fleet $out/bin
+    mkdir -p $out
+    mv bin $out
   '';
 
   meta = with stdenv.lib; {
     description = "A distributed init system";
     homepage = http://coreos.com/using-coreos/clustering/;
     license = licenses.asl20;
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = with maintainers; [ cstrahan offline ];
     platforms = platforms.unix;
   };
 }

pkgs/servers/fleet/deps.nix

@@ -1,81 +0,0 @@
-{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
-
-let
-  goDeps = [
-    {
-      root = "code.google.com/p/gogoprotobuf";
-      src = fetchgit {
-        url = "https://code.google.com/p/gogoprotobuf";
-        rev = "7fd1620f09261338b6b1ca1289ace83aee0ec946";
-        sha256 = "0f13y29zpxkv7b7kwnszygvg04fd5m9r8vpkl1wa3gxnc6az54i9";
-      };
-    }
-    {
-      root = "github.com/coreos/etcd";
-      src = fetchFromGitHub {
-        owner = "coreos";
-        repo = "etcd";
-        rev = "1359d29fa451b059bb76b51260610d92853e7316";
-        sha256 = "0iz3vmf3nfp1i5r8al207wm0jvj68i47a814w90b1jl8g4f2amp7";
-      };
-    }
-    {
-      root = "github.com/coreos/fleet";
-      src = fetchFromGitHub {
-        owner = "coreos";
-        repo = "fleet";
-        rev = "da0a02ed3b07d83b0b542dcdee56e08d2457ab9c";
-        sha256 = "0b8aq4ppyv1fjvf3f2qjq80mvjvf9r104bf4048wgsrs0pccs6s8";
-      };
-    }
-    {
-      root = "github.com/coreos/raft";
-      src = fetchFromGitHub {
-        owner = "coreos";
-        repo = "raft";
-        rev = "67dca7288f1665b59860421673d46314f4348e45";
-        sha256 = "1l27kjkwcxgx89d2m537plagbp1wh6qlzxirza6lliblrgxry6mw";
-      };
-    }
-    {
-      root = "github.com/stathat/go";
-      src = fetchFromGitHub {
-        owner = "stathat";
-        repo = "go";
-        rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77";
-        sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi";
-      };
-    }
-    {
-      root = "github.com/stretchr/objx";
-      src = fetchFromGitHub {
-        owner = "stretchr";
-        repo = "objx";
-        rev = "cbeaeb16a013161a98496fad62933b1d21786672";
-        sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1";
-      };
-    }
-    {
-      root = "github.com/stretchr/testify";
-      src = fetchFromGitHub {
-        owner = "stretchr";
-        repo = "testify";
-        rev = "3e03dde72495487a4deb74152ac205d0619fbc8d";
-        sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls";
-      };
-    }
-  ];
-
-in
-
-stdenv.mkDerivation rec {
-  name = "go-deps";
-
-  buildCommand =
-    lib.concatStrings
-      (map (dep: ''
-              mkdir -p $out/src/`dirname ${dep.root}`
-              ln -s ${dep.src} $out/src/${dep.root}
-            '') goDeps);
-}
-

pkgs/servers/monitoring/bosun/default.nix

@@ -1,31 +1,21 @@
-{ stdenv, fetchgit, fetchurl, go }:
-let
-  go-fs = fetchgit {
-    url = git://github.com/rakyll/statik.git;
-    rev = "f19d7c21cd036701d42ec176b13e0946cc9591b0";
-    sha256 = "0vaa8xzkmj1dgiayg7ccrniapz4f4rhsizx2hybyc5rgmalfj9ac";
-  };
-
-in stdenv.mkDerivation rec {
+{ stdenv, fetchurl, go }:
+stdenv.mkDerivation rec {
   name = "bosun-${version}";
-  version = "20141119233013";
+  version = "20141204222654";
   src = fetchurl {
     url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz";
-    sha256 = "0l16g073ixk42g3jz1r0lhmvssc0k8s1vnr9pvgxs897rzpdjjm1";
+    sha256 = "1jwhfwf24zhncrirna3q1vhap4f955bqx3sws3ryk5gp1w99l36n";
   };
   buildInputs = [ go ];
 
   sourceRoot = ".";
 
   buildPhase = ''
-    mkdir -p src/github.com/bosun-monitor
-    mv bosun-${version} src/github.com/bosun-monitor/bosun
-
-    mkdir -p src/github.com/rakyll
-    ln -s ${go-fs} src/github.com/rakyll/statik
+    mkdir -p src
+    mv bosun-${version} src/bosun.org
 
     export GOPATH=$PWD
-    go build -v -o bosun src/github.com/bosun-monitor/bosun/main.go
+    go build -v -o bosun src/bosun.org/cmd/bosun/main.go
   '';
 
   installPhase = ''
@@ -40,6 +30,6 @@ in stdenv.mkDerivation rec {
     '';
     homepage = http://bosun.org;
     license = licenses.mit;
-    platforms = ["x86_64-linux"];
+    platforms = platforms.unix;
   };
 }

pkgs/servers/monitoring/bosun/scollector.nix

@@ -1,22 +1,21 @@
-{ stdenv, fetchgit, fetchurl, go }:
-let
-
-in stdenv.mkDerivation rec {
-  name = "scollector-20141119233025";
+{ stdenv, fetchurl, go }:
+stdenv.mkDerivation rec {
+  name = "scollector-${version}";
+  version = "20141204222654";
   src = fetchurl {
-    url = https://github.com/bosun-monitor/scollector/archive/20141119233025.tar.gz;
-    sha256 = "13f7hg4mswcdl76ksx8ds3297rslsswb1hq327b3xm1wyr42k6wa";
+    url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz";
+    sha256 = "1jwhfwf24zhncrirna3q1vhap4f955bqx3sws3ryk5gp1w99l36n";
   };
   buildInputs = [ go ];
 
   sourceRoot = ".";
 
   buildPhase = ''
-    mkdir -p src/github.com/bosun-monitor
-    mv scollector-20141119233025 src/github.com/bosun-monitor/scollector
+    mkdir -p src
+    mv bosun-${version} src/bosun.org
 
     export GOPATH=$PWD
-    go build -v -o scollector src/github.com/bosun-monitor/scollector/main.go
+    go build -v -o scollector src/bosun.org/cmd/scollector/main.go
   '';
 
   installPhase = ''

pkgs/servers/monitoring/munin/default.nix

@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.21";
+  version = "2.0.25";
   name = "munin-${version}";
 
   src = fetchurl {
     url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz";
-    sha256 = "18ipk8n78iik07190h9r8mj5209ha6yhbiw7da0l4khw0y00cvf8";
+    sha256 = "1ig67l3p5fnx44fcvbbinajxlin9i7g9cbac93h2hcvb2qhzzzra";
   };
 
   buildInputs = [ 

pkgs/servers/mpd/default.nix

@@ -25,13 +25,13 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.19";
-  minor = "4";
+  minor = "5";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${major}.${minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz";
-    sha256 = "1mxs30z96px5vgz0786xln2k8cs0l58gnac5py58pbigcqgihi3p";
+    sha256 = "09rhppfspzhx7jjz3rv8b71gasrkg6i9l25xm94l9sf36jgd2m33";
   };
 
   buildInputs = [ pkgconfig glib boost ]

pkgs/servers/prayer/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, htmlTidy, pam}:
+{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, html-tidy, pam}:
 
 let
   ssl = stdenv.lib.optionals uwimap.withSSL
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
   };
 
-  buildInputs = [ openssl db zlib uwimap htmlTidy pam ];
+  buildInputs = [ openssl db zlib uwimap html-tidy pam ];
   nativeBuildInputs = [ perl ];
 
   NIX_LDFLAGS = "-lpam";

pkgs/servers/s6/default.nix

@@ -1,4 +1,9 @@
-{stdenv, fetchurl, skalibs, execline}:
+{ stdenv
+, execline
+, fetchurl
+, skalibs
+, skarnetConfCompile
+}:
 
 let
 
@@ -13,38 +18,13 @@ in stdenv.mkDerivation rec {
     sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp";
   };
 
-  buildInputs = [ skalibs execline ];
+  buildInputs = [ skalibs execline skarnetConfCompile ];
 
   sourceRoot = "admin/${name}";
 
-  configurePhase = ''
-    pushd conf-compile
-
-    printf "$out/bin"           > conf-install-command
-    printf "$out/include"       > conf-install-include
-    printf "$out/lib"           > conf-install-library
-    printf "$out/lib"           > conf-install-library.so
-    printf "$out/sysdeps"       > conf-install-sysdeps
-
-    # let nix builder strip things, cross-platform
-    truncate --size 0 conf-stripbins
-    truncate --size 0 conf-striplibs
-
-    printf "${skalibs}/sysdeps" > import
-    printf "%s\n%s" "${skalibs}/include" "${execline}/include" > path-include
-    printf "%s\n%s" "${skalibs}/lib"     "${execline}/lib"     > path-library
-
-    rm -f flag-slashpackage
-    touch flag-allstatic
-
-    popd
-  '';
-
   preBuild = ''
     substituteInPlace "src/daemontools-extras/s6-log.c" \
       --replace '"execlineb"' '"${execline}/bin/execlineb"'
-
-    patchShebangs src/sys
   '';
 
   meta = {