Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
John Ericson 2018-02-24 02:39:51 -05:00
commit 9a5171bd22
13 changed files with 79 additions and 49 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
, iptables, coreutils
, components ? [
"cmd/kubeadm"
@ -29,6 +29,14 @@ stdenv.mkDerivation rec {
outputs = ["out" "man" "pause"];
patches = [
# patch is from https://github.com/kubernetes/kubernetes/pull/58207
(fetchpatch {
url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch";
sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w";
})
];
postPatch = ''
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgs }:
let
version = "2.9.5-1";
version = "2.9.5-2";
pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
owner = "drwetter";
repo = "testssl.sh";
rev = "v${version}";
sha256 = "0hz6g685jwl0c0jrdca746425xpwiwc8lnlc2gigga5hkcq8qzl9";
sha256 = "0nrzb2lhjq0s4dabyq8nldjijsld9gq4cxm8ys1cw5jyz1875g2w";
};
nativeBuildInputs = with pkgs; [

View File

@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ glib gnutls libproxy gsettings_desktop_schemas ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
doCheck = false; # tests need to access the certificates (among other things)
meta = with stdenv.lib; {

View File

@ -1,8 +1,10 @@
{ stdenv
, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-raw
{ stdenv, buildPackages
, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison
, libiberty, zlib
}:
let inherit (buildPackages.buildPackages) binutils-raw; in
stdenv.mkDerivation rec {
name = "libbfd-${version}";
inherit (binutils-raw.bintools) version src;

View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, gcc, staticBuild ? false }:
{ stdenv, buildPackages, fetchurl, staticBuild ? false }:
let inherit (buildPackages.buildPackages) gcc; in
stdenv.mkDerivation rec {
name = "libiberty-${gcc.cc.version}";

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
phases = "buildPhase";
buildInputs = [ p7zip makeWrapper ];
nativeBuildInputs = [ p7zip makeWrapper ];
buildCommand = let
bin_path = "$out/bin";

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
phases = "buildPhase";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
buildCommand = let
bin_path = "$out/bin";

View File

@ -1,10 +1,12 @@
{pkgs, pkgs_i686, includeSources ? true}:
{ buildPackages, pkgs, pkgs_i686, targetPackages
, includeSources ? true
}:
rec {
platformTools = import ./platform-tools.nix {
inherit (pkgs) stdenv fetchurl unzip zlib;
inherit buildPackages pkgs;
};
buildTools = import ./build-tools.nix {
inherit (pkgs) stdenv fetchurl unzip zlib file;
stdenv_32bit = pkgs_i686.stdenv;
@ -12,11 +14,11 @@ rec {
ncurses_32bit = pkgs_i686.ncurses5;
ncurses = pkgs.ncurses5;
};
support = import ./support.nix {
inherit (pkgs) stdenv fetchurl unzip;
};
supportRepository = import ./support-repository.nix {
inherit (pkgs) stdenv fetchurl unzip;
};
@ -47,18 +49,18 @@ rec {
inherit (pkgs) stdenv fetchurl unzip makeWrapper;
inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus;
inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig;
inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources;
stdenv_32bit = pkgs_i686.stdenv;
};
androidsdk_2_1 = androidsdk {
platformVersions = [ "7" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_2_2 = androidsdk {
platformVersions = [ "8" ];
abiVersions = [ "armeabi-v7a" ];
@ -70,49 +72,49 @@ rec {
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_3_0 = androidsdk {
platformVersions = [ "11" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_3_1 = androidsdk {
platformVersions = [ "12" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_3_2 = androidsdk {
platformVersions = [ "13" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_4_0 = androidsdk {
platformVersions = [ "14" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_4_0_3 = androidsdk {
platformVersions = [ "15" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_4_1 = androidsdk {
platformVersions = [ "16" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_4_2 = androidsdk {
platformVersions = [ "17" ];
abiVersions = [ "armeabi-v7a" ];
useGoogleAPIs = true;
};
androidsdk_4_3 = androidsdk {
platformVersions = [ "18" ];
abiVersions = [ "armeabi-v7a" "x86" ];
@ -152,7 +154,7 @@ rec {
useExtraSupportLibs = true;
useGooglePlayServices = true;
};
androidsdk_6_0 = androidsdk {
platformVersions = [ "23" ];
abiVersions = [ "armeabi-v7a" "x86" "x86_64"];
@ -214,22 +216,28 @@ rec {
};
androidndk = import ./androidndk.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
inherit (buildPackages)
p7zip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses lib
coreutils file findutils gawk gnugrep gnused jdk which;
inherit platformTools;
};
androidndk_r8e = import ./androidndk_r8e.nix {
inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper;
inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
inherit (buildPackages)
makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses lib
coreutils file findutils gawk gnugrep gnused jdk which;
inherit platformTools;
};
buildApp = import ./build-app.nix {
inherit (pkgs) stdenv jdk ant gnumake gawk file which;
inherit androidsdk androidndk;
};
emulateApp = import ./emulate-app.nix {
inherit (pkgs) stdenv;
inherit androidsdk;

View File

@ -1,4 +1,9 @@
{stdenv, zlib, fetchurl, unzip}:
{ buildPackages, pkgs }:
let
inherit (buildPackages) fetchurl unzip;
inherit (pkgs) stdenv zlib;
in
stdenv.mkDerivation rec {
version = "26.0.2";
@ -42,5 +47,5 @@ stdenv.mkDerivation rec {
done
'';
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
}

View File

@ -1,9 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
homesick (1.1.3)
homesick (1.1.6)
thor (>= 0.14.0)
thor (0.19.1)
thor (0.20.0)
PLATFORMS
ruby
@ -12,4 +12,4 @@ DEPENDENCIES
homesick
BUNDLED WITH
1.10.6
1.14.6

View File

@ -1,6 +1,6 @@
{ lib, bundlerEnv, git}:
bundlerEnv {
name = "homesick-1.1.3";
name = "homesick-1.1.6";
gemdir = ./.;

View File

@ -1,16 +1,19 @@
{
homesick = {
version = "1.1.3";
dependencies = ["thor"];
source = {
type = "gem";
sha256 = "1pqsnbykisc6qamkz1gcbgis4az95sggxfdkq9v5hjr1a46q0s91";
remotes = ["https://rubygems.org"];
sha256 = "0lxvnp4ncbx0irlblfxbd1f8h4hl11hgmyiy35q79w137r3prxml";
type = "gem";
};
version = "1.1.6";
};
thor = {
version = "0.19.1";
source = {
type = "gem";
sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
};
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
type = "gem";
};
version = "0.20.0";
};
}
}

View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, libaio, python, zlib }:
let
version = "3.4";
sha256 = "0img4288ygil36bsgpr4yh06zfbp3mdkf7zbyqjcrjgpr4mai9zf";
version = "3.5";
sha256 = "1h6qwvn0h3xz98420a19v8isfjkfnac9vvx8hsw8q4ycb35r8n3h";
in
stdenv.mkDerivation rec {