netbox: 3.3.9 -> 3.4.1

This commit is contained in:
Minijackson 2022-12-20 09:58:54 +01:00 committed by Raito Bezarius
parent 82a315a053
commit bc4b08acbe
2 changed files with 3 additions and 30 deletions

View file

@ -18,7 +18,7 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "netbox";
version = "3.3.9";
version = "3.4.1";
format = "other";
@ -26,18 +26,12 @@ py.pkgs.buildPythonApplication rec {
owner = "netbox-community";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-KhnxD5pjlEIgISl4RMbhLCDwgUDfGFRi88ZcP1ndMhI=";
sha256 = "sha256-qwgheyhekbYdwSKPR9h/iJprsXFbdiaWmfXqG/HDspo=";
};
patches = [
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
./config.patch
./graphql-3_2_0.patch
# fix compatibility ith django 4.1
(fetchpatch {
url = "https://github.com/netbox-community/netbox/pull/10341/commits/ce6bf9e5c1bc08edc80f6ea1e55cf1318ae6e14b.patch";
sha256 = "sha256-aCPQp6k7Zwga29euASAd+f13hIcZnIUu3RPAzNPqgxc=";
})
];
propagatedBuildInputs = with py.pkgs; [
@ -111,6 +105,6 @@ py.pkgs.buildPythonApplication rec {
homepage = "https://github.com/netbox-community/netbox";
description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
license = licenses.asl20;
maintainers = with maintainers; [ n0emis raitobezarius ];
maintainers = with maintainers; [ minijackson n0emis raitobezarius ];
};
}

View file

@ -1,21 +0,0 @@
diff --git a/netbox/netbox/graphql/scalars.py b/netbox/netbox/graphql/scalars.py
index 7d14189dd..0a18e79d2 100644
--- a/netbox/netbox/graphql/scalars.py
+++ b/netbox/netbox/graphql/scalars.py
@@ -1,6 +1,6 @@
from graphene import Scalar
from graphql.language import ast
-from graphql.type.scalars import MAX_INT, MIN_INT
+from graphql.type.scalars import GRAPHQL_MAX_INT, GRAPHQL_MIN_INT
class BigInt(Scalar):
@@ -10,7 +10,7 @@ class BigInt(Scalar):
@staticmethod
def to_float(value):
num = int(value)
- if num > MAX_INT or num < MIN_INT:
+ if num > GRAPHQL_MAX_INT or num < GRAPHQL_MIN_INT:
return float(num)
return num