diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2019-10-22 21:36:09 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2019-10-22 22:22:39 +0200 |
| commit | f1d46d094a19e57dd0b20193ace5a51479285a3c (patch) | |
| tree | edc994e3c1f4f5bfc80209dc1840b3e1c2b87e3f | |
| parent | 4ca7e3d75f72d901667d18c491df213ee18126ab (diff) | |
| download | nixpkgs-f1d46d094a19e57dd0b20193ace5a51479285a3c.tar nixpkgs-f1d46d094a19e57dd0b20193ace5a51479285a3c.tar.gz nixpkgs-f1d46d094a19e57dd0b20193ace5a51479285a3c.tar.bz2 nixpkgs-f1d46d094a19e57dd0b20193ace5a51479285a3c.tar.lz nixpkgs-f1d46d094a19e57dd0b20193ace5a51479285a3c.tar.xz nixpkgs-f1d46d094a19e57dd0b20193ace5a51479285a3c.tar.zst nixpkgs-f1d46d094a19e57dd0b20193ace5a51479285a3c.zip | |
home-assistant: Fix the build after baf54943305
| -rw-r--r-- | pkgs/servers/home-assistant/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f8eeb97849a..ee07ff8ad46 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, python3, protobuf3_6 +{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] @@ -9,7 +9,16 @@ # Override Python packages using # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } # Applied after defaultOverrides -, packageOverrides ? self: super: { } +, packageOverrides ? self: super: { + # TODO: Remove this override after updating to cryptography 2.8: + cryptography = super.cryptography.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.asn1crypto ]; + patches = [ (fetchpatch { + url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch"; + sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp"; + }) ]; + }); +} # Skip pip install of required packages on startup , skipPip ? true }: @@ -30,7 +39,7 @@ let "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42") (mkOverride "pyjwt" "1.7.1" "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96") - (mkOverride "cryptography" "2.7" + (mkOverride "cryptography" "2.7" # TODO for 2.8: Remove the override above "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6") (mkOverride "cryptography_vectors" "2.7" # required by cryptography==2.7 "f12dfb9bd669a68004074cb5b26df6e93ed1a95ebd1a999dff0a840212ff68bc") |