diff options
| author | Eduardo Sánchez Muñoz <esm@eduardosm.net> | 2021-01-13 21:39:14 +0100 |
|---|---|---|
| committer | Eduardo Sánchez Muñoz <esm@eduardosm.net> | 2021-01-29 11:23:49 +0100 |
| commit | a2807e67f06f36597bd040a2e1c12bcf93036f86 (patch) | |
| tree | ad4294e87e793fa515d3850d0b2c7ff06513ee3e /pkgs/top-level | |
| parent | 36945fedef3aaaa4fb2ac627a1f27cc76098365b (diff) | |
calibre: 4.23.0 -> 5.10.1
Co-authored-by: ento <ento+github@i.pearlwaffles.xyz>
Co-authored-by: Eduardo Sánchez Muñoz <esm@eduardosm.net>
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 95a063331b27..d4ea4140fd25 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -85,6 +85,8 @@ mapAliases ({ buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 + calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13 + calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement."; # added 2021-01-13 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # added 2020-10-02 cantarell_fonts = cantarell-fonts; # added 2018-03-03 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d3ec256adc0..8909761ea646 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21220,11 +21220,7 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; - - calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; - - calibre = calibre-py3; + calibre = libsForQt5.callPackage ../applications/misc/calibre { }; calligra = libsForQt5.callPackage ../applications/office/calligra { # Must use the same Qt version as Calligra itself: |