From 0c7b1576dd83865b171693e5b09e1585405c405f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 18 Sep 2018 13:54:40 -0500 Subject: [PATCH 1/5] sqlite: 3.24.0 -> 3.25.0 https://sqlite.org/releaselog/3_25_0.html --- 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 5b68b4901f9..106cade7aa8 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 92574091558..2033d560a67 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 daf738f55db1ccd368d26be4e8d5015797c49aa0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 09:46:07 -0500 Subject: [PATCH 2/5] sqlite: 3.25.0 -> 3.25.1 --- 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 106cade7aa8..db7bb6d9f96 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 2033d560a67..560825646e8 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 2e2740165a56497654dfb6a2845efb4fe1e9cb74 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 26 Sep 2018 10:28:05 -0500 Subject: [PATCH 3/5] sqlite: 3.25.1 -> 3.25.2 --- 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 db7bb6d9f96..4f8203523c4 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 560825646e8..74d8310777d 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 6f0c65ee3f72cc4f1c3195610fc285a2ed441c0b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Nov 2018 22:41:29 -0600 Subject: [PATCH 4/5] sqlite: 3.25.2 -> 3.25.3 https://sqlite.org/releaselog/3_25_3.html --- 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 4f8203523c4..f3d69f09444 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 74d8310777d..c98164ae63b 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 b8229dd2dc9db325c31010112dabf06564c5eff4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Nov 2018 23:19:19 -0600 Subject: [PATCH 5/5] pythonPackages.sqlalchemy: 1.2.12 -> 1.2.13 --- .../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 e1c576f9427..c0cca3562f7 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.12"; + version = "1.2.13"; src = fetchPypi { inherit pname version; - sha256 = "c5951d9ef1d5404ed04bae5a16b60a0779087378928f997a294d1229c6ca4d3e"; + 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 +}