public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46852 from dtzWill/update/sqlite-3.25 

sqlite: 3.24.0 -> 3.25.3
This commit is contained in:
Andreas Rammhold 2018-11-19 20:53:48 +01:00 committed by GitHub
parent 0c0a2434db b8229dd2dc
commit 99c1efa199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/sqlite/analyzer.nix
View File

@ -6,11 +6,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sqlite-analyzer-${version}"; name = "sqlite-analyzer-${version}";
version = "3.24.0"; version = "3.25.3";
src = assert version == sqlite.version; fetchurl { src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
sha256 = "19ck2sg13i6ga5vapxak42jn6050vpfid0zrmah7jh32mksh58vj"; sha256 = "08b4fs9mrah5gxl1865smlqs2ba6g7k7d6pfa084i6d78342p4n7";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

4
pkgs/development/libraries/sqlite/default.nix
View File

@ -10,12 +10,12 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sqlite-${version}"; name = "sqlite-${version}";
version = "3.24.0"; version = "3.25.3";
# NB! Make sure to update analyzer.nix src (in the same directory). # NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl { src = fetchurl {
url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr"; sha256 = "1pgkja0d13qp5p79ik9kh9lm5y79cwyxwwfc80cr8a1rw5xzksq0";
}; };
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];

15
pkgs/development/python-modules/sqlalchemy/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, fetchPypi , fetchPypi
, fetchpatch
, buildPythonPackage , buildPythonPackage
, pytest , pytest
, mock , mock
@ -9,13 +10,23 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "SQLAlchemy"; pname = "SQLAlchemy";
version = "1.2.12"; version = "1.2.13";
src = fetchPypi { src = fetchPypi {
inherit pname version; 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 = [ checkInputs = [
pytest pytest
mock mock