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

Merge branch 'pr-305518' into current

Browse Source
This commit is contained in:
Florian Brandes
2024-04-21 12:02:37 +02:00
parent 3b5ec43f3f bee30de1fb
commit 46bb636e4d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/calibre/default.nix
View File

@@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "calibre"; pname = "calibre";
version = "7.8.0"; version = "7.9.0";
src = fetchurl { src = fetchurl {
url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
hash = "sha256-FxYuQzzuaWZihSsmeJc6ssG3VBr2YNEi3TkXyyymLUQ="; hash = "sha256-Ilzv4HXW6ZmEVNUWQm04cHZ71FEgjfWVX9IvrfYCHIk=";
}; };
patches = [ patches = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
(fetchpatch { (fetchpatch {
name = "0001-only-plugin-update.patch"; name = "0001-only-plugin-update.patch";
url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch";
hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8=";
}) })
(fetchpatch { (fetchpatch {
name = "0007-Hardening-Qt-code.patch"; name = "0007-Hardening-Qt-code.patch";

3
pkgs/development/python-modules/mechanize/default.nix
View File

@@ -45,6 +45,9 @@ buildPythonPackage rec {
# Tests require network access # Tests require network access
"test_pickling" "test_pickling"
"test_password_manager" "test_password_manager"
# https://github.com/python-mechanize/mechanize/issues/94
"test_ftp"
]; ];
meta = with lib; { meta = with lib; {