Merge staging-next into staging

2019-06-18 11:07:56 +02:00
parent 4d6f65b81f 41377252e5
commit f120248daf
928 changed files with 2418 additions and 2149 deletions
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }:
+{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }:

 with lib;

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

 buildGoPackage rec {
  name = "docker-proxy-${rev}";
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper
-, buildGoPackage, runc, libelf, libcap, libseccomp, glibc }:
+, buildGoPackage, runc, glibc }:

 with lib; let

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, rustPlatform, libseccomp }:
+{ lib, fetchFromGitHub, rustPlatform, libseccomp }:

 rustPlatform.buildRustPackage rec {
  name = "railcar-${version}";
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, go-md2man
+{ lib, fetchFromGitHub, buildGoPackage, go-md2man
 , pkgconfig, libapparmor, apparmor-parser, libseccomp, which }:

 with lib;
@@ -1,12 +1,10 @@
 {stdenv
 , removeReferencesTo
 , lib
-, fetchgit
 , fetchFromGitHub
 , utillinux
 , openssl
 , coreutils
-, gawk
 , go
 , which
 , makeWrapper
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib}:
+{fetchurl, lib}:

 with lib;