diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-11 08:54:49 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-11 08:54:49 +0100 |
| commit | 9d69ebe5a859e5da57595b1a7ffd98eef5d98001 (patch) | |
| tree | 5b44d811e27380a2e0ac6b74663d2ab213c6fb00 /pkgs/development | |
| parent | 773aca9632b4834d5c4824c1c5e0f093337e828d (diff) | |
| parent | 256ba86fffc079b6035637eed1a85b2ff299d239 (diff) | |
| download | nixlib-9d69ebe5a859e5da57595b1a7ffd98eef5d98001.tar nixlib-9d69ebe5a859e5da57595b1a7ffd98eef5d98001.tar.gz nixlib-9d69ebe5a859e5da57595b1a7ffd98eef5d98001.tar.bz2 nixlib-9d69ebe5a859e5da57595b1a7ffd98eef5d98001.tar.lz nixlib-9d69ebe5a859e5da57595b1a7ffd98eef5d98001.tar.xz nixlib-9d69ebe5a859e5da57595b1a7ffd98eef5d98001.tar.zst nixlib-9d69ebe5a859e5da57595b1a7ffd98eef5d98001.zip | |
Merge staging at '256ba86' into master
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libtasn1/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pytz/default.nix | 5 |
2 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index ccdc3aba6118..cc5b19f7a595 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,21 +1,13 @@ { stdenv, fetchurl, perl, texinfo }: stdenv.mkDerivation rec { - name = "libtasn1-4.12"; + name = "libtasn1-4.13"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0ls7jdq3y5fnrwg0pzhq11m21r8pshac2705bczz6mqjc8pdllv7"; + sha256 = "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky"; }; - patches = [ - (fetchurl { - name = "CVE-2017-10790.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; - sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; - }) - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 96f0ad136a06..65f3d80bdaa7 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,12 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2017.3"; + version = "2018.3"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "fae4cffc040921b8a2d60c6cf0b5d662c1190fe54d718271db4eb17d44a185b7"; + sha256 = "410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0"; }; checkPhase = '' |