Merge remote-tracking branch 'upstream/master' into hardened-stdenv

9 files changed, 125 insertions, 82 deletions

diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 0dd6d5e09b6a..bc1472576759 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.4";
+  name = "disnixos-0.4.1";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/31143419/download/3/disnixos-0.4.tar.gz;
-    sha256 = "0ff2k15j34b947b8pnw5xhsv9blk9kq350pcp3p3p2qclgf9ahfh";
+    url = http://hydra.nixos.org/build/33130082/download/3/disnixos-0.4.1.tar.gz;
+    sha256 = "1r6b73qhz64z7xms6hkmm495yz0114pqa61b2qzlmzmlywhhy15b";
   };
   
   buildInputs = [ socat pkgconfig disnix getopt ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 720526d72a62..e9bb704c7725 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null;
 assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.5";
+  name = "dysnomia-0.5.1";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/31143399/download/1/dysnomia-0.5.tar.gz;
-    sha256 = "1dxilzcqnv60l418k1ihyh0gkai5xgzj13s9hcbbb0yp71mv7n9x";
+    url = http://hydra.nixos.org/build/33508870/download/1/dysnomia-0.5.1.tar.gz;
+    sha256 = "0mrbg0wirixqzx0qw8lg6mklr8npr29ghbj7lq1mygjgzr1hyhzm";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index f65b25d119d8..ad351914cb3b 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    # dpkg tries to force some dependents like debian_devscripts to use
+    # dpkg tries to force some dependents like debian-devscripts to use
     # -fstack-protector-strong - not (yet?) a good idea. Disable for now:
     substituteInPlace scripts/Dpkg/Vendor/Debian.pm \
       --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0"
diff --git a/pkgs/tools/package-management/fpm/Gemfile b/pkgs/tools/package-management/fpm/Gemfile
new file mode 100644
index 000000000000..95916cf4322a
--- /dev/null
+++ b/pkgs/tools/package-management/fpm/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'fpm'
diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock
new file mode 100644
index 000000000000..a2a652c4056d
--- /dev/null
+++ b/pkgs/tools/package-management/fpm/Gemfile.lock
@@ -0,0 +1,29 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    arr-pm (0.0.10)
+      cabin (> 0)
+    backports (3.6.8)
+    cabin (0.8.1)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    clamp (0.6.5)
+    ffi (1.9.10)
+    fpm (1.4.0)
+      arr-pm (~> 0.0.10)
+      backports (>= 2.6.2)
+      cabin (>= 0.6.0)
+      childprocess
+      clamp (~> 0.6)
+      ffi
+      json (>= 1.7.7)
+    json (1.8.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fpm
+
+BUNDLED WITH
+   1.10.6
diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix
new file mode 100644
index 000000000000..ca2e44fcaf00
--- /dev/null
+++ b/pkgs/tools/package-management/fpm/default.nix
@@ -0,0 +1,18 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv rec {
+  name = "fpm-${version}";
+
+  version = (import gemset).fpm.version;
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "Tool to build packages for multiple platforms with ease";
+    homepage    = https://github.com/jordansissel/fpm;
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix
new file mode 100644
index 000000000000..0751fdc48bcb
--- /dev/null
+++ b/pkgs/tools/package-management/fpm/gemset.nix
@@ -0,0 +1,66 @@
+{
+  arr-pm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg";
+      type = "gem";
+    };
+    version = "0.0.10";
+  };
+  backports = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k";
+      type = "gem";
+    };
+    version = "3.6.8";
+  };
+  cabin = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06b5ri2629ad9xjc419xswz17zli90v8x640k2sd6v2yb90zkr1b";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  childprocess = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1is253wm9k2s325nfryjnzdqv9flq8bm4y2076mhdrncxamrh7r2";
+      type = "gem";
+    };
+    version = "0.5.9";
+  };
+  clamp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gpz9jvg1gpr8xmfqd35gvyzsvmjvlvwm2sq3pyhml3i84a6qjrq";
+      type = "gem";
+    };
+    version = "0.6.5";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
+      type = "gem";
+    };
+    version = "1.9.10";
+  };
+  fpm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ljifrfzjirad5ql5yvs1prpbivsjnwdbhzlqb8r7sdidd9kwakz";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix
deleted file mode 100644
index 1d5d995a1896..000000000000
--- a/pkgs/tools/package-management/guix/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ fetchurl, stdenv, guile, libgcrypt, sqlite, bzip2, pkgconfig }:
-
-let
-  # Getting the bootstrap Guile binary.  This is normally performed by Guix's build system.
-  base_url = arch:
-    "http://alpha.gnu.org/gnu/guix/bootstrap/${arch}-linux/20130105/guile-2.0.7.tar.xz";
-  boot_guile = {
-    i686 = fetchurl {
-      url = base_url "i686";
-      sha256 = "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c";
-    };
-    x86_64 = fetchurl {
-      url = base_url "x86_64";
-      sha256 = "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c";
-    };
-  };
-in stdenv.mkDerivation rec {
-  name = "guix-0.3";
-
-  src = fetchurl {
-    url = "ftp://alpha.gnu.org/gnu/guix/${name}.tar.gz";
-    sha256 = "0xpfdmlfkkpmgrb8lpaqs5wxx31m4jslajs6b9waz5wp91zk7fix";
-  };
-
-  configureFlags =
-     [ "--localstatedir=/nix/var"
-       "--with-libgcrypt-prefix=${libgcrypt}"
-     ];
-
-  preBuild =
-    # Copy the bootstrap Guile tarballs like Guix's makefile normally does.
-    '' cp -v "${boot_guile.i686}" gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
-       cp -v "${boot_guile.x86_64}" gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
-    '';
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ guile libgcrypt sqlite bzip2 ];
-
-  doCheck = true;
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Functional package manager with a Scheme interface";
-
-    longDescription = ''
-      GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof.
-
-      In addition to standard package management features, Guix supports
-      transactional upgrades and roll-backs, unprivileged package management,
-      per-user profiles, and garbage collection.
-
-      It provides Guile Scheme APIs, including high-level embedded
-      domain-specific languages (EDSLs), to describe how packages are built
-      and composed.
-
-      A user-land free software distribution for GNU/Linux comes as part of
-      Guix.
-
-      Guix is based on the Nix package manager.
-    '';
-
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
-
-    homepage = http://www.gnu.org/software/guix;
-  };
-}
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3b303bab3b74..608fb31df783 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -96,15 +96,12 @@ in rec {
     };
   };
 
-  nixUnstable = nixStable;
-  /*
   nixUnstable = lib.lowPrio (common rec {
-    name = "nix-1.11pre4379_786046c";
+    name = "nix-1.12pre4523_3b81b26";
     src = fetchurl {
-      url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz";
-      sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5";
+      url = "http://hydra.nixos.org/build/33598573/download/4/${name}.tar.xz";
+      sha256 = "0469zv09m85824w4vqj2ag0nciq51xvrvsys7bd5v4nrxihk9991";
     };
   });
-  */
 
 }