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: 45b21b38a8ca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f0fa1b45430
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 15, 2020

  1. [WIP] {help wanted} calibre: 4.12.0 -> 4.13.0

    @AndersonTorres
    AndersonTorres committed Apr 15, 2020
    Copy the full SHA
    d811d6a View commit details

Commits on Apr 18, 2020

  1. Merge pull request #84370 from AndersonTorres/update-calibre 

    calibre : 4.12.0 -> 4.13.0
    @AndersonTorres
    AndersonTorres authored Apr 18, 2020
    Copy the full SHA
    5f0fa1b View commit details
Showing with 5 additions and 7 deletions.
  1. +5 −7 pkgs/applications/misc/calibre/default.nix
12 changes: 5 additions & 7 deletions pkgs/applications/misc/calibre/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
, hyphen
, unrarSupport ? false
, chmlib
, python2Packages
, python3Packages
, libusb1
, libmtp
, xdg_utils
@@ -25,16 +25,15 @@
}:

let
pypkgs = python2Packages;

pypkgs = python3Packages;
in
mkDerivation rec {
pname = "calibre";
version = "4.12.0";
version = "4.13.0";

src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi";
sha256 = "1xp1fvpdizk6g74diam4nd59s6fhcvp086y1brm6r9wy9zm7sn7r";
};

patches = [
@@ -171,8 +170,7 @@ mkDerivation rec {
description = "Comprehensive e-book software";
homepage = "https://calibre-ebook.com";
license = with licenses; if unrarSupport then unfreeRedistributable else gpl3;
maintainers = with maintainers; [ domenkozar pSub AndersonTorres ];
maintainers = with maintainers; [ domenkozar pSub ];
platforms = platforms.linux;
inherit version;
};
}