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: f2f50aa985d1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ff5423cdca4a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 7, 2017

  1. pythonPackages.mechanize: 0.2.5 -> 0.3.5

    @calvertvl @FRidh
    calvertvl authored and FRidh committed Jul 7, 2017
    Copy the full SHA
    bdabf6a View commit details

  2. calibre: use bundled html5lib 

    The bundled html5lib may be old and insecure, but that's all upstream
supports. Since dependencies are now requiring a newer html5lib we have
no choice but to let it use the bundled version.
    @FRidh
    FRidh committed Jul 7, 2017
    Copy the full SHA
    ff5423c View commit details
Showing with 7 additions and 7 deletions.
  1. +4 −4 pkgs/applications/misc/calibre/default.nix
  2. +3 −3 pkgs/top-level/python-packages.nix
8 changes: 4 additions & 4 deletions pkgs/applications/misc/calibre/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@
}:

stdenv.mkDerivation rec {
version = "3.1.1";
version = "3.3.0";
name = "calibre-${version}";

src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
sha256 = "1lh1gz0915r49igfhy1icz79qx36s3d8m32qlih0g3zn7jahp86g";
sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c";
};

patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
# Remove unneeded files and libs
rm -rf resources/calibre-portable.* \
src/{chardet,cherrypy,html5lib,odf,routes}
src/{chardet,cherrypy,odf,routes}
'';

dontUseQmakeConfigure = true;
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
python pyqt5 sip
regex msgpack
# the following are distributed with calibre, but we use upstream instead
chardet cherrypy html5lib_0_9999999 odfpy routes
chardet cherrypy odfpy routes
]);

installPhase = ''
6 changes: 3 additions & 3 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -13512,15 +13512,15 @@ in {
mccabe = callPackage ../development/python-modules/mccabe { };

mechanize = buildPythonPackage (rec {
name = "mechanize-0.2.5";
name = "mechanize-0.3.5";
disabled = isPy3k;

src = pkgs.fetchurl {
url = "mirror://pypi/m/mechanize/${name}.tar.gz";
sha256 = "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf";
sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl";
};

propagatedBuildInputs = with self; [ clientform ];
propagatedBuildInputs = with self; [ clientform html5lib ];

doCheck = false;