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: 30f7de04fffb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d9fd85f9fb88
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 4, 2021

  1. Revert "python3Packages.python-smarttub: pin pyjwt at 1.7.1" 

    Overriding within the package set is not allowed. Doing so makes it
possible one ends up with multiple versions of a package, something
Python cannot handle.

This reverts commit 4e9c515.
    @FRidh
    FRidh committed Apr 4, 2021
    Copy the full SHA
    d9fd85f View commit details
Showing with 2 additions and 12 deletions.
  1. +2 −12 pkgs/development/python-modules/python-smarttub/default.nix
14 changes: 2 additions & 12 deletions pkgs/development/python-modules/python-smarttub/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,17 +11,6 @@
, pythonOlder
}:

let
# https://github.com/mdz/python-smarttub/issues/10
pyjwt' = pyjwt.overridePythonAttrs (oldAttrs: rec {
version = "1.7.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
};
});
in

buildPythonPackage rec {
pname = "python-smarttub";
version = "0.0.19";
@@ -37,7 +26,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
inflection
pyjwt'
pyjwt
python-dateutil
];

@@ -54,5 +43,6 @@ buildPythonPackage rec {
homepage = "https://github.com/mdz/python-smarttub";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
broken = pyjwt.version != "1.7.1";
};
}