summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/networking/gns3
diff options
context:
space:
mode:
authorAnthony Roussel <anthony@roussel.dev>2023-09-20 22:36:57 +0200
committerAnthony Roussel <anthony@roussel.dev>2023-09-20 22:43:22 +0200
commit1387e36a73873e1f74b2cee267616a2fa37cb28b (patch)
treed278c0282e46d6d42e7b36e6cb50579fcdc332c8 /pkgs/applications/networking/gns3
parent4fc8d8b9ace09c69ba791cb0615d54b1f1bb6053 (diff)
gns3-server,gns3-gui: 2.2.42 -> 2.2.43
https://github.com/GNS3/gns3-server/releases/tag/v2.2.43 https://github.com/GNS3/gns3-gui/releases/tag/v2.2.43
Diffstat (limited to 'pkgs/applications/networking/gns3')
-rw-r--r--pkgs/applications/networking/gns3/default.nix16
-rw-r--r--pkgs/applications/networking/gns3/gui.nix8
-rw-r--r--pkgs/applications/networking/gns3/server.nix9
3 files changed, 11 insertions, 22 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 43aa6e7343a7..bd1b74fe4a74 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -12,25 +12,25 @@ in {
guiStable = mkGui {
channel = "stable";
- version = "2.2.42";
- hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84=";
+ version = "2.2.43";
+ hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM=";
};
guiPreview = mkGui {
channel = "stable";
- version = "2.2.42";
- hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84=";
+ version = "2.2.43";
+ hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM=";
};
serverStable = mkServer {
channel = "stable";
- version = "2.2.42";
- hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA=";
+ version = "2.2.43";
+ hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8=";
};
serverPreview = mkServer {
channel = "stable";
- version = "2.2.42";
- hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA=";
+ version = "2.2.43";
+ hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8=";
};
}
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index 13764d506697..57228d1a97f6 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = with python3.pkgs; [
- pythonRelaxDepsHook
wrapQtAppsHook
];
@@ -33,11 +32,8 @@ python3.pkgs.buildPythonApplication rec {
setuptools
sip_4 (pyqt5.override { withWebSockets = true; })
truststore
- ];
-
- pythonRelaxDeps = [
- "jsonschema"
- "sentry-sdk"
+ ] ++ lib.optionals (pythonOlder "3.9") [
+ importlib-resources
];
doCheck = false; # Failing
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 200153b15e03..f8d8d7381ec5 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -25,14 +25,6 @@ python3.pkgs.buildPythonApplication {
cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox
'';
- nativeBuildInputs = with python3.pkgs; [
- pythonRelaxDepsHook
- ];
-
- pythonRelaxDeps = [
- "jsonschema"
- ];
-
propagatedBuildInputs = with python3.pkgs; [
aiofiles
aiohttp
@@ -43,6 +35,7 @@ python3.pkgs.buildPythonApplication {
jinja2
jsonschema
multidict
+ platformdirs
prompt-toolkit
psutil
py-cpuinfo