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

peering-manager: remove unnecessary python overrides

Browse Source 
The drf-nested-routers patches are already applied globally in our
drf-nested-routers package. django 4 is already the default.
This commit is contained in:
Yureka 2023-09-25 23:11:05 +02:00
parent 8213eb1aed
commit aae9566b59
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/servers/web-apps/peering-manager/default.nix
View File

@ -7,31 +7,7 @@
, plugins ? ps: []
}:
let
py = python3.override {
packageOverrides = final: prev: {
django = final.django_4;
drf-nested-routers = prev.drf-nested-routers.overridePythonAttrs (oldAttrs: {
patches = [
# all for django 4 compat
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff";
hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI=";
})
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff";
hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU=";
})
(fetchpatch {
url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff";
hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0=";
})
];
});
};
};
in py.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "peering-manager";
version = "1.7.4";
@ -44,7 +20,7 @@ in py.pkgs.buildPythonApplication rec {
format = "other";
propagatedBuildInputs = with py.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
django
djangorestframework
django-cacheops
@ -65,7 +41,7 @@ in py.pkgs.buildPythonApplication rec {
pyyaml
requests
tzdata
] ++ plugins py.pkgs;
] ++ plugins python3.pkgs;
buildPhase = ''
runHook preBuild
@ -87,8 +63,8 @@ in py.pkgs.buildPythonApplication rec {
passthru = {
# PYTHONPATH of all dependencies used by the package
python = py;
pythonPath = py.pkgs.makePythonPath propagatedBuildInputs;
python = python3;
pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;
tests = {
inherit (nixosTests) peering-manager;