public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides

Browse Source 
Temporary attribute until we can get rid of it everywhere.

This was triggered due to the libyaml 0.2.2 incompatibilty requiring
patches and still not building.
This commit is contained in:
Frederik Rietdijk 2019-07-25 11:51:55 +02:00
parent da6101d141
commit 3d00d8e4ee
6 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/build-managers/conan/default.nix
View File

@ -37,13 +37,7 @@ let newPython = python3.override {
sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8";
}; };
}); });
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { pyyaml = super.pyyaml_3;
version = "3.13";
src = oldAttrs.src.override {
inherit version;
sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
};
});
}; };
}; };

9
pkgs/servers/home-assistant/appdaemon.nix
View File

@ -38,15 +38,6 @@ let
sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83"; sha256 = "0f390693f46173d8ffb95669acbb0e2a3ec54ecce676703510ad47f1a6d9dc83";
}; };
}); });
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
version = "5.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95";
};
});
}; };
}; };

8
pkgs/servers/home-assistant/default.nix
View File

@ -36,8 +36,6 @@ let
"03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af") "03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af")
(mkOverride "python-slugify" "3.0.2" (mkOverride "python-slugify" "3.0.2"
"57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758") "57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758")
(mkOverride "pyyaml" "3.13"
"3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf")
(mkOverride "requests" "2.21.0" (mkOverride "requests" "2.21.0"
"502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e")
(mkOverride "ruamel_yaml" "0.15.94" (mkOverride "ruamel_yaml" "0.15.94"
@ -63,6 +61,10 @@ let
}; };
}) })
(self: super: {
pyyaml = super.pyyaml_3;
})
# hass-frontend does not exist in python3.pkgs # hass-frontend does not exist in python3.pkgs
(self: super: { (self: super: {
hass-frontend = self.callPackage ./frontend.nix { }; hass-frontend = self.callPackage ./frontend.nix { };
@ -78,7 +80,7 @@ let
}; };
}); });
}; };
py = python3.override { py = python3.override {
# Put packageOverrides at the start so they are applied after defaultOverrides # Put packageOverrides at the start so they are applied after defaultOverrides
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);

7
pkgs/servers/home-assistant/esphome.nix
View File

@ -3,13 +3,6 @@
let let
python = python3.override { python = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
version = "5.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95";
};
});
tornado = super.tornado.overridePythonAttrs (oldAttrs: rec { tornado = super.tornado.overridePythonAttrs (oldAttrs: rec {
version = "5.1.1"; version = "5.1.1";
src = oldAttrs.src.override { src = oldAttrs.src.override {

13
pkgs/tools/admin/awscli/default.nix
View File

@ -22,18 +22,7 @@ let
sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"; sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1";
}; };
}); });
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { pyyaml = super.pyyaml_3;
version = "3.13";
src = oldAttrs.src.override {
inherit version;
sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
};
# https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948
patches = lib.singleton (fetchpatch {
url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch";
sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn";
});
});
}; };
}; };

15
pkgs/top-level/python-packages.nix
View File

@ -4434,6 +4434,21 @@ in {
pyyaml = callPackage ../development/python-modules/pyyaml { }; pyyaml = callPackage ../development/python-modules/pyyaml { };
pyyaml_3 = (callPackage ../development/python-modules/pyyaml { }).overridePythonAttrs (oldAttrs: rec {
version = "3.13";
src = oldAttrs.src.override {
inherit version;
sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
};
# https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948
patches = singleton (pkgs.fetchpatch {
url = "https://github.com/yaml/pyyaml/commit/c5b135fe39d41cffbdc006f28ccb2032df6005e0.patch";
sha256 = "0x1v45rkmj194c41d1nqi3ihj9z4rsy8zvpfcd8p960g1fia7fhn";
});
# https://github.com/yaml/pyyaml/issues/298#issuecomment-511990948
doCheck = false;
});
rabbitpy = callPackage ../development/python-modules/rabbitpy { }; rabbitpy = callPackage ../development/python-modules/rabbitpy { };
rasterio = callPackage ../development/python-modules/rasterio { rasterio = callPackage ../development/python-modules/rasterio {