From 7146449bf40f53b015634e23f9a25c9a4954b2d5 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 15 Nov 2018 00:18:26 +0100 Subject: [PATCH 1/7] nss: 3.39 -> 3.40 (cherry picked from commit 376f4b9f0570d5609da6d5cc9a1e80de24a895a1) --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8a3de28b7842e..e559b9a076ac9 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -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 ] From 43ca58ebed9e06daf8187942964633cbff85ba5b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 14 Nov 2018 23:43:05 +0100 Subject: [PATCH 2/7] libpng: 1.6.34 -> 1.6.35 (cherry picked from commit e5deb04fedcc6dd775d10613ed56efb3aecd8949) --- pkgs/development/libraries/libpng/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 0e5a4a866e8ff..9c1ed80e51ed8 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -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"; From 628ea26c63164e7d4f7987a5e2dc9e52cb019eea Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 18 Sep 2018 13:54:40 -0500 Subject: [PATCH 3/7] sqlite: 3.24.0 -> 3.25.0 https://sqlite.org/releaselog/3_25_0.html (cherry picked from commit 0c7b1576dd83865b171693e5b09e1585405c405f) --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 5b68b4901f9ac..106cade7aa886 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.24.0"; + version = "3.25.0"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "19ck2sg13i6ga5vapxak42jn6050vpfid0zrmah7jh32mksh58vj"; + sha256 = "020dyfd948l4zdw2izirjaw90pq4668ihms0c9kqj5rmzhk88n81"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 166ea39493bf6..12a3fd815780c 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.24.0"; + version = "3.25.0"; # 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 = "0wbz638p1q8fxr2rdhi5dy9wvffh8x1zwh2lx0zdj8zaq7gr66ny"; }; outputs = [ "bin" "dev" "out" ]; From 631572e453be29e31bb2cd645bc438f49b2f9405 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 09:46:07 -0500 Subject: [PATCH 4/7] sqlite: 3.25.0 -> 3.25.1 (cherry picked from commit daf738f55db1ccd368d26be4e8d5015797c49aa0) --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 106cade7aa886..db7bb6d9f96d7 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.25.0"; + version = "3.25.1"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "020dyfd948l4zdw2izirjaw90pq4668ihms0c9kqj5rmzhk88n81"; + sha256 = "1bkz5n8zshh51brcxvyfysdy6mmx6zy4xhhdnwvsavnynk042bz6"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 12a3fd815780c..5e8d3f1f8cac5 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.25.0"; + version = "3.25.1"; # 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 = "0wbz638p1q8fxr2rdhi5dy9wvffh8x1zwh2lx0zdj8zaq7gr66ny"; + sha256 = "1lbgxhrdjjy2gcwrzj0inq4p117g1l117mmgm0y0g4zhhyyldvcn"; }; outputs = [ "bin" "dev" "out" ]; From 6b5273508b83c102f949bfb7d3729d9771ab8107 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 26 Sep 2018 10:28:05 -0500 Subject: [PATCH 5/7] sqlite: 3.25.1 -> 3.25.2 (cherry picked from commit 2e2740165a56497654dfb6a2845efb4fe1e9cb74) --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index db7bb6d9f96d7..4f8203523c4b7 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.25.1"; + version = "3.25.2"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1bkz5n8zshh51brcxvyfysdy6mmx6zy4xhhdnwvsavnynk042bz6"; + sha256 = "0n7lzp671x1xz6fx138xa1jhi4vfwib3awaxac5skw6fv9q61940"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5e8d3f1f8cac5..1d71aa9863269 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.25.1"; + version = "3.25.2"; # 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 = "1lbgxhrdjjy2gcwrzj0inq4p117g1l117mmgm0y0g4zhhyyldvcn"; + sha256 = "109i1sfryghrdaynkqq9s9aq4347vy653bwkqwx4slix8a2196ns"; }; outputs = [ "bin" "dev" "out" ]; From 06a935b7ee1aa477d9a6aeb6e302264b16c0e493 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Nov 2018 22:41:29 -0600 Subject: [PATCH 6/7] sqlite: 3.25.2 -> 3.25.3 https://sqlite.org/releaselog/3_25_3.html (cherry picked from commit 6f0c65ee3f72cc4f1c3195610fc285a2ed441c0b) --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 4f8203523c4b7..f3d69f094447a 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "sqlite-analyzer-${version}"; - version = "3.25.2"; + version = "3.25.3"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0n7lzp671x1xz6fx138xa1jhi4vfwib3awaxac5skw6fv9q61940"; + sha256 = "08b4fs9mrah5gxl1865smlqs2ba6g7k7d6pfa084i6d78342p4n7"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 1d71aa9863269..83e3912261b5f 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "sqlite-${version}"; - version = "3.25.2"; + 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 = "109i1sfryghrdaynkqq9s9aq4347vy653bwkqwx4slix8a2196ns"; + sha256 = "1pgkja0d13qp5p79ik9kh9lm5y79cwyxwwfc80cr8a1rw5xzksq0"; }; outputs = [ "bin" "dev" "out" ]; From aa3f523dd578dc9b8c819b2156bdce0ffc7f9e73 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Nov 2018 23:19:19 -0600 Subject: [PATCH 7/7] pythonPackages.sqlalchemy: 1.2.11 -> 1.2.13 (cherry picked from commit b8229dd2dc9db325c31010112dabf06564c5eff4) --- .../python-modules/sqlalchemy/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 2f755869d796d..c0cca3562f778 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , pytest , mock @@ -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 @@ -32,4 +43,4 @@ buildPythonPackage rec { description = "A Python SQL toolkit and Object Relational Mapper"; license = licenses.mit; }; -} \ No newline at end of file +}