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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2019-04-05 21:02:42 +02:00
commit 81a6df8f88
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/data/misc/tzdata/default.nix
View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tzdata-${version}"; name = "tzdata-${version}";
version = "2018g"; version = "2019a";
srcs = srcs =
[ (fetchurl { [ (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
sha256 = "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2"; sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh";
}) })
(fetchurl { (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
sha256 = "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"; sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7";
}) })
]; ];

4
pkgs/development/libraries/gnutls/3.6.nix
View File

@ -1,11 +1,11 @@
{ callPackage, fetchurl, ... } @ args: { callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "3.6.6"; version = "3.6.7";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"; sha256 = "1ql8l6l5bxks2pgpwb1602zc0j6ivhpy27hdfc49h8xgbanhjd2v";
}; };
# Skip some tests: # Skip some tests:

2
pkgs/tools/security/notary/default.nix
View File

@ -30,7 +30,7 @@ buildGoPackage rec {
runHook postInstall runHook postInstall
''; '';
doCheck = true; #doCheck = true; # broken by tzdata: 2018g -> 2019a
checkPhase = '' checkPhase = ''
make test PKGS=github.com/theupdateframework/notary/cmd/notary make test PKGS=github.com/theupdateframework/notary/cmd/notary
''; '';