diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-04-05 21:02:42 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-04-05 21:03:37 +0200 |
| commit | 81a6df8f8856854f35f25f6382d5afd7467cf9ec (patch) | |
| tree | b1b9383041c021e1ce7a5a48ba720448128d473d /pkgs | |
| parent | 9d156a1a3287326e989838905ec84341b884068d (diff) | |
| parent | 742416addbb5665f39c98337a921eb52f37adf85 (diff) | |
| download | nixpkgs-81a6df8f8856854f35f25f6382d5afd7467cf9ec.tar nixpkgs-81a6df8f8856854f35f25f6382d5afd7467cf9ec.tar.gz nixpkgs-81a6df8f8856854f35f25f6382d5afd7467cf9ec.tar.bz2 nixpkgs-81a6df8f8856854f35f25f6382d5afd7467cf9ec.tar.lz nixpkgs-81a6df8f8856854f35f25f6382d5afd7467cf9ec.tar.xz nixpkgs-81a6df8f8856854f35f25f6382d5afd7467cf9ec.tar.zst nixpkgs-81a6df8f8856854f35f25f6382d5afd7467cf9ec.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/data/misc/tzdata/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/3.6.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/notary/default.nix | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 59079b28efc..0d19d8c9dca 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2018g"; + version = "2019a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2"; + sha256 = "0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"; + sha256 = "1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7"; }) ]; diff --git a/pkgs/development/libraries/gnutls/3.6.nix b/pkgs/development/libraries/gnutls/3.6.nix index 513f20fd835..b05624ee0b2 100644 --- a/pkgs/development/libraries/gnutls/3.6.nix +++ b/pkgs/development/libraries/gnutls/3.6.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv"; + sha256 = "1ql8l6l5bxks2pgpwb1602zc0j6ivhpy27hdfc49h8xgbanhjd2v"; }; # Skip some tests: diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 071bfdaea00..221817b004d 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { runHook postInstall ''; - doCheck = true; + #doCheck = true; # broken by tzdata: 2018g -> 2019a checkPhase = '' make test PKGS=github.com/theupdateframework/notary/cmd/notary ''; |