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

Commits on Jun 20, 2020

  1. grab-site: use Python 3.7 to unbreak the build 

    ludios_wpull depends on namedlist, which is incompatible with Python 3.8
    @ivan
    ivan committed Jun 20, 2020
    Copy the full SHA
    732b335 View commit details

  2. grab-site: 2.1.16 -> 2.1.19

    @ivan
    ivan committed Jun 20, 2020
    Copy the full SHA
    7606a2a View commit details

Commits on Jun 22, 2020

  1. Merge pull request #91141 from ivan/grab-site-2.1.19 

    grab-site: 2.1.16 -> 2.1.19
    @timokau
    timokau authored Jun 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f72a67f View commit details
Showing with 5 additions and 3 deletions.
  1. +2 −2 pkgs/tools/backup/grab-site/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/tools/backup/grab-site/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, python3Packages, fetchFromGitHub }:

python3Packages.buildPythonApplication rec {
version = "2.1.16";
version = "2.1.19";
name = "grab-site-${version}";

src = fetchFromGitHub {
rev = version;
owner = "ArchiveTeam";
repo = "grab-site";
sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z";
sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4";
};

propagatedBuildInputs = with python3Packages; [
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -12087,7 +12087,9 @@ in

gperftools = callPackage ../development/libraries/gperftools { };

grab-site = callPackage ../tools/backup/grab-site { };
grab-site = callPackage ../tools/backup/grab-site {
python3Packages = python37Packages;
};

grib-api = callPackage ../development/libraries/grib-api { };