Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0c0a2434db58
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 99c1efa199da
Choose a head ref
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 16, 2018

  1. sqlite: 3.24.0 -> 3.25.0 

    https://sqlite.org/releaselog/3_25_0.html
    @dtzWill @andir
    dtzWill authored and andir committed Nov 16, 2018
    Copy the full SHA
    0c7b157 View commit details

  2. sqlite: 3.25.0 -> 3.25.1

    @dtzWill @andir
    dtzWill authored and andir committed Nov 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    daf738f View commit details

  3. sqlite: 3.25.1 -> 3.25.2

    @dtzWill @andir
    dtzWill authored and andir committed Nov 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2e27401 View commit details

  4. sqlite: 3.25.2 -> 3.25.3 

    https://sqlite.org/releaselog/3_25_3.html
    @dtzWill @andir
    dtzWill authored and andir committed Nov 16, 2018
    Copy the full SHA
    6f0c65e View commit details

  5. pythonPackages.sqlalchemy: 1.2.12 -> 1.2.13

    @dtzWill @andir
    dtzWill authored and andir committed Nov 16, 2018
    Copy the full SHA
    b8229dd View commit details

Commits on Nov 19, 2018

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

    sqlite: 3.24.0 -> 3.25.3
    @andir
    andir authored Nov 19, 2018
    Copy the full SHA
    99c1efa View commit details
Showing with 18 additions and 7 deletions.
  1. +2 −2 pkgs/development/libraries/sqlite/analyzer.nix
  2. +2 −2 pkgs/development/libraries/sqlite/default.nix
  3. +14 −3 pkgs/development/python-modules/sqlalchemy/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/sqlite/analyzer.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/sqlite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ];
17 changes: 14 additions & 3 deletions pkgs/development/python-modules/sqlalchemy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
}