Skip to content

[staging-18.09] backport nss, libpng & sqlite updates #50963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 7 commits into from
Dec 3, 2018
Merged

[staging-18.09] backport nss, libpng & sqlite updates #50963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7146449
nss: 3.39 -> 3.40
andir Nov 14, 2018
43ca58e
libpng: 1.6.34 -> 1.6.35
andir Nov 14, 2018
628ea26
sqlite: 3.24.0 -> 3.25.0
dtzWill Sep 18, 2018
631572e
sqlite: 3.25.0 -> 3.25.1
dtzWill Sep 19, 2018
6b52735
sqlite: 3.25.1 -> 3.25.2
dtzWill Sep 26, 2018
06a935b
sqlite: 3.25.2 -> 3.25.3
dtzWill Nov 6, 2018
aa3f523
pythonPackages.sqlalchemy: 1.2.11 -> 1.2.13
dtzWill Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/development/libraries/libpng/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
assert zlib != null;

let
patchVersion = "1.6.34";
patchVersion = "1.6.35";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6";
sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq";
};
whenPatched = stdenv.lib.optionalString apngSupport;

in stdenv.mkDerivation rec {
name = "libpng" + whenPatched "-apng" + "-${version}";
version = "1.6.34";
version = "1.6.35";

src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493";
};
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";

Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/libraries/nss/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ let

in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.39";
version = "3.40";

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
url = "mirror://mozilla/security/nss/releases/NSS_3_40_RTM/src/${name}.tar.gz";
sha256 = "1p9jidi3nysirf3lhkrqkjjrf2cw3y2wz2jgjvsjn1ysidxhhqh5";
};

buildInputs = [ perl zlib sqlite ]
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/sqlite/analyzer.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ in

stdenv.mkDerivation rec {
name = "sqlite-analyzer-${version}";
version = "3.24.0";
version = "3.25.3";

src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
sha256 = "19ck2sg13i6ga5vapxak42jn6050vpfid0zrmah7jh32mksh58vj";
sha256 = "08b4fs9mrah5gxl1865smlqs2ba6g7k7d6pfa084i6d78342p4n7";
};

nativeBuildInputs = [ unzip ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/sqlite/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ in

stdenv.mkDerivation rec {
name = "sqlite-${version}";
version = "3.24.0";
version = "3.25.3";

# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr";
sha256 = "1pgkja0d13qp5p79ik9kh9lm5y79cwyxwwfc80cr8a1rw5xzksq0";
};

outputs = [ "bin" "dev" "out" ];
Expand Down
17 changes: 14 additions & 3 deletions pkgs/development/python-modules/sqlalchemy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ lib
, fetchPypi
, fetchpatch
, buildPythonPackage
, pytest
, mock
Expand All @@ -9,13 +10,23 @@

buildPythonPackage rec {
pname = "SQLAlchemy";
version = "1.2.11";
version = "1.2.13";

src = fetchPypi {
inherit pname version;
sha256 = "ef6569ad403520ee13e180e1bfd6ed71a0254192a934ec1dbd3dbf48f4aa9524";
sha256 = "84412de3794acee05630e7788f25e80e81f78eb4837e7b71d0499129f660486a";
};

patches = [
# fix for failing doc tests
# https://bitbucket.org/zzzeek/sqlalchemy/issues/4370/sqlite-325x-docs-tutorialrst-doctests-fail
(fetchpatch {
name = "doc-test-fixes.patch";
url = https://bitbucket.org/zzzeek/sqlalchemy/commits/63279a69e2b9277df5e97ace161fa3a1bb4f29cd/raw;
sha256 = "1x25aj5hqmgjdak4hllya0rf0srr937k1hwaxb24i9ban607hjri";
})
];

checkInputs = [
pytest
mock
Expand All @@ -32,4 +43,4 @@ buildPythonPackage rec {
description = "A Python SQL toolkit and Object Relational Mapper";
license = licenses.mit;
};
}
}