public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-02-13 12:33:29 +01:00
parent 7c3588d8dd 563b491ce8
commit 7257dedd7c
197 changed files with 4356 additions and 3415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/networking/curl/default.nix
View File

@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
assert gssSupport -> libkrb5 != null;
stdenv.mkDerivation rec {
name = "curl-7.63.0";
name = "curl-7.64.0";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/${name}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
];
sha256 = "1n4dzlbllwks8xkz466j362da0pbnxgwr11d64504xzzxka7xawv";
sha256 = "1szj9ia1snbfqzfcsk6hx1j7jhbqsy0f9k5d7x9xiy8w5lfblwym";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];

6
pkgs/tools/networking/flannel/default.nix
View File

@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
name = "flannel-${version}";
version = "0.6.2";
version = "0.11.0";
rev = "v${version}";
goPackagePath = "github.com/coreos/flannel";
@@ -15,14 +15,14 @@ buildGoPackage rec {
inherit rev;
owner = "coreos";
repo = "flannel";
sha256 = "03l0zyv9ajda70zw7jgwlmilw26h849jbb9f4slbycphhvbmpvb9";
sha256 = "0akxlrrsm2w51g0qd7dnsdy0hdajx98sdhxw4iknjr2kn7j3gph9";
};
meta = {
description = "Network fabric for containers, designed for Kubernetes";
license = licenses.asl20;
homepage = https://github.com/coreos/flannel;
maintainers = with maintainers; [offline];
maintainers = with maintainers; [johanot offline];
platforms = with platforms; linux;
};
}