Merge master into staging-next

2018-07-21 19:43:53 +02:00
parent 8213ff161c cc218fc915
commit ad47d658d1
2090 changed files with 4329 additions and 3730 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "bfs-${version}";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchFromGitHub {
    repo = "bfs";
    owner = "tavianator";
    rev = version;
-    sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g";
+    sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
  };

  # Disable fstype test, tries to read /etc/mtab
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }:
+{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }:

 stdenv.mkDerivation rec {
  version = "0.14.7";
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "confd-${version}";
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "consul-template-${version}";
@@ -1,10 +1,7 @@
 { stdenv
 , fetchurl, lzip
-, hostPlatform, buildPlatform
 }:

-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
  name = "ddrescue-1.23";

@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages
-, libevdev, linuxHeaders
+, libevdev
 }:

 stdenv.mkDerivation rec {
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ lib, buildGoPackage, fetchgit }:

 buildGoPackage rec {
  name = "gohai-${version}";
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }:
+{ stdenv, buildPythonPackage, fetchurl, pythonOlder, systemd, pytest }:

 buildPythonPackage rec {
  pname = "journalwatch";
@@ -4,7 +4,7 @@
 , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
 , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
 , openssl, file, doxygen
-, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, path
+, gtest, sqlite, fpm, zstd, rdkafka, rapidjson
 }:

 let
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  name = "pcstat-unstable-${version}";
@@ -1,4 +1,4 @@
-{ lib, bundlerEnv, ruby, stdenv }:
+{ lib, bundlerEnv, ruby }:

 bundlerEnv rec {
  name = "procodile-${version}";