hacc/haccfiles
8
0
Fork 1
Code Issues 1 Pull requests Projects Releases Wiki Activity

netbox: remove python override workaround

Browse source 
this is currently unused anyways, but in case we ever do need it again,
https://github.com/NixOS/nixpkgs/pull/223268 has removed the need for
the weird override workaround.
This commit is contained in:
stuebinm 2023-04-05 23:04:59 +02:00
parent 8d9df0e20e
commit eda184ee48
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/default.nix
View file

@ -35,19 +35,16 @@ let
uffd = callPackage ./uffd {}; uffd = callPackage ./uffd {};
# netbox takes a python3, then overrides stuff on it before using it. netbox = pkgs.netbox.override (super: rec {
# since overrides don't accumulate, this does both the override we want python3 = super.python3.override (oldpy: {
# and the one the netbox package would otherwise do, then disables overrides
netbox = pkgs.netbox.override rec {
python3 = (pkgs.python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
django = super.django_4;
social-auth-core = super.social-auth-core.overrideAttrs ( old: { social-auth-core = super.social-auth-core.overrideAttrs ( old: {
name = "social-auth-with-uffd";
patches = [ ./netbox/0001-add-uffd-oauth2-backend.patch ]; patches = [ ./netbox/0001-add-uffd-oauth2-backend.patch ];
} ); });
}; };
}) // { override = ignored: python3; }; });
}; });
inherit (unstable) vaultwarden vaultwarden-vault; inherit (unstable) vaultwarden vaultwarden-vault;
}; };