diff options
author | Matthieu Coudron <teto@users.noreply.github.com> | 2021-07-23 00:25:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-23 00:25:28 +0200 |
commit | daa29dd4b87c8a4288346a5e12fae0b02ea7843c (patch) | |
tree | 4ffcd29c4bd517ce9611f72e211e2dd3823ca603 | |
parent | 45980bc62c38b85eae194b6766a9bd080e0d3a24 (diff) | |
parent | b47a85441986b14661fd2109eab6834c6a2b9c55 (diff) | |
download | nixlib-daa29dd4b87c8a4288346a5e12fae0b02ea7843c.tar nixlib-daa29dd4b87c8a4288346a5e12fae0b02ea7843c.tar.gz nixlib-daa29dd4b87c8a4288346a5e12fae0b02ea7843c.tar.bz2 nixlib-daa29dd4b87c8a4288346a5e12fae0b02ea7843c.tar.lz nixlib-daa29dd4b87c8a4288346a5e12fae0b02ea7843c.tar.xz nixlib-daa29dd4b87c8a4288346a5e12fae0b02ea7843c.tar.zst nixlib-daa29dd4b87c8a4288346a5e12fae0b02ea7843c.zip |
Merge pull request #131140 from Ma27/bump-buku
buku: fix build, 4.5 -> 4.6
-rw-r--r-- | pkgs/applications/misc/buku/default.nix | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index c559e239c09e..e8b8714ca2ab 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,20 +1,41 @@ { lib, python3, fetchFromGitHub }: -with python3.pkgs; buildPythonApplication rec { - version = "4.5"; +let + python3' = python3.override { + packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + }; + }); + sqlalchemy-utils = super.sqlalchemy-utils.overridePythonAttrs (oldAttrs: rec { + version = "0.36.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0srs5w486wp5zydjs70igi5ypgxhm6h73grb85jz03fqpqaanzvs"; + }; + }); + }; + }; +in +with python3'.pkgs; buildPythonApplication rec { + version = "4.6"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1lcq5fk8d5j2kfhn9m5l2hk46v7nj4vfa22m1psz35c9zpw4px8q"; + sha256 = "sha256-hr9qiP7SbloigDcs+6KVWu0SOlggMaBr7CCfY8zoJG0="; }; checkInputs = [ pytest-cov hypothesis pytest + pytest-vcr pylint flake8 pyyaml @@ -55,8 +76,8 @@ with python3.pkgs; buildPythonApplication rec { # Disables a test which requires internet substituteInPlace tests/test_bukuDb.py \ --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" \ - --replace "self.assertEqual(shorturl, 'http://tny.im/yt')" "" \ - --replace "self.assertEqual(url, 'https://www.google.com')" "" + --replace "self.assertEqual(shorturl, \"http://tny.im/yt\")" "" \ + --replace "self.assertEqual(url, \"https://www.google.com\")" "" substituteInPlace setup.py \ --replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1 ''; @@ -75,7 +96,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ]; }; } |