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

Commits on Feb 12, 2021

  1. epson-escpr2: 1.1.24 -> 1.1.25 

    (cherry picked from commit 2c1b539)
    @Ma27
    Ma27 committed Feb 12, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    jbedo Justin Bedő
    GPG key ID: 2C18202C56C182BD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    321d13c View commit details

  2. python3Packages.todoist: 8.1.2 -> 8.1.3 

    (cherry picked from commit fe4cfcf)
    @Ma27
    Ma27 committed Feb 12, 2021

    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
    7c06b21 View commit details
Showing with 6 additions and 18 deletions.
  1. +2 −14 pkgs/development/python-modules/todoist/default.nix
  2. +4 −4 pkgs/misc/drivers/epson-escpr2/default.nix
16 changes: 2 additions & 14 deletions pkgs/development/python-modules/todoist/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,25 +4,13 @@

buildPythonPackage rec {
pname = "todoist-python";
version = "8.1.2";
version = "8.1.3";

src = fetchPypi {
inherit pname version;
sha256 = "750b2d2300e8590cd56414ab7bbbc8dfcaf8c27102b342398955812176499498";
sha256 = "sha256-AFRKA5VRD6jyiguZYP7WOQOWqHq1GjUzbuez0f1070U=";
};

patches = [
# From https://github.com/Doist/todoist-python/pull/80
(fetchpatch {
url = "https://github.com/Doist/todoist-python/commit/605443c67a8e2f105071e0da001c9f6f2a89ef19.patch";
sha256 = "0ah0s5by783kqlaimsbxz11idz0bhc2428aw9vdjpngmzb7ih1pa";
})
(fetchpatch {
url = "https://github.com/Doist/todoist-python/commit/f2f8e1e5b3ab1674ad9f0dff885702a25d1d18e9.patch";
sha256 = "1kp63yk9kj87zvvgfl60m6lxdm5sx3dny4g0s67ap1jbz350wifn";
})
];

propagatedBuildInputs = [ requests ] ++ stdenv.lib.optional (pythonOlder "3.5") typing;

meta = {
8 changes: 4 additions & 4 deletions pkgs/misc/drivers/epson-escpr2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.24";
version = "1.1.25";

src = fetchurl {
# To find new versions, visit
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
"https://web.archive.org/web/20201112163802if_/https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"
"https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
"https://web.archive.org/web/20210212220538if_/https://download3.ebz.epson.net/dsc/f/03/00/12/46/43/e233a3fefeb49723ba4b0a2f357527e3b45bf53a/epson-inkjet-printer-escpr2-1.1.25-1lsb3.2.src.rpm"
];
sha256 = "sha256-DPzjKKsTWbfDk1MsVPXNsO5D7C/RiNegmwq2sEMx2co=";
sha256 = "sha256-8hgafO/1qOTVdfAdx7FpOOSLqfTl0sBFunuN/2q7KHw=";
};

patches = [ ./cups-filter-ppd-dirs.patch ];