From eda184ee486eaa4f216b0a0a7013820ef57efca7 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Wed, 5 Apr 2023 23:04:59 +0200 Subject: [PATCH] netbox: remove python override workaround 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. --- pkgs/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index c01a636..7e101c0 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -35,19 +35,16 @@ let uffd = callPackage ./uffd {}; - # netbox takes a python3, then overrides stuff on it before using it. - # since overrides don't accumulate, this does both the override we want - # and the one the netbox package would otherwise do, then disables overrides - netbox = pkgs.netbox.override rec { - python3 = (pkgs.python3.override { + netbox = pkgs.netbox.override (super: rec { + python3 = super.python3.override (oldpy: { packageOverrides = self: super: { - django = super.django_4; social-auth-core = super.social-auth-core.overrideAttrs ( old: { + name = "social-auth-with-uffd"; patches = [ ./netbox/0001-add-uffd-oauth2-backend.patch ]; - } ); + }); }; - }) // { override = ignored: python3; }; - }; + }); + }); inherit (unstable) vaultwarden vaultwarden-vault; };