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: a85e58ac13db
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 120b6b06dfa8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 23, 2019

  1. pythonPackages.apsw: 3.22.0-r1 -> 3.29.0-r1 + sqlite fix 

    Bumping version of apsw to be able to backport an upstream fix for
SQLite >= 3.30.0 which fixes a failing test.
    @d-goldin @FRidh
    d-goldin authored and FRidh committed Oct 23, 2019
    Copy the full SHA
    120b6b0 View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/development/python-modules/apsw/default.nix
14 changes: 11 additions & 3 deletions pkgs/development/python-modules/apsw/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
, sqlite, isPyPy }:

buildPythonPackage rec {
pname = "apsw";
version = "3.22.0-r1";
version = "3.29.0-r1";

disabled = isPyPy;

src = fetchFromGitHub {
owner = "rogerbinns";
repo = "apsw";
rev = version;
sha256 = "02ldvshcgr4c7c8anp4flfnw8g8ys5bflkb8b51rb618qxhhwyak";
sha256 = "1p3sgmk9qwd0a634lirva44qgpyq0a74r9d70wxb6hsa52yjj9xb";
};

buildInputs = [ sqlite ];

patches = [
# Fixes a test failure with sqlite 3.30, see https://github.com/rogerbinns/apsw/issues/275
(fetchpatch {
url = "https://github.com/rogerbinns/apsw/commit/13df0b57bff59542978abf7c0a440c9274e3aac3.diff";
sha256 = "1wi1mfis2mr21389wdnvq44phg0bpm5vpwmxhvrj211vwfm0q7dv";
})
];

meta = with stdenv.lib; {
description = "A Python wrapper for the SQLite embedded relational database engine";
homepage = https://github.com/rogerbinns/apsw;