diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/applications/networking/gns3/server.nix | |
parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/gns3/server.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/gns3/server.nix | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/applications/networking/gns3/server.nix b/nixpkgs/pkgs/applications/networking/gns3/server.nix index e7c548c67d08..200153b15e03 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -1,13 +1,12 @@ -{ stable -, branch +{ channel , version -, sha256Hash -, mkOverride +, hash }: { lib , python3 , fetchFromGitHub +, pkgsStatic }: python3.pkgs.buildPythonApplication { @@ -15,28 +14,30 @@ python3.pkgs.buildPythonApplication { inherit version; src = fetchFromGitHub { + inherit hash; owner = "GNS3"; repo = "gns3-server"; rev = "refs/tags/v${version}"; - sha256 = sha256Hash; }; - pythonRelaxDeps = [ - "aiofiles" - "jsonschema" - "psutil" - "sentry-sdk" - ]; + # GNS3 2.3.26 requires a static BusyBox for the Docker integration + prePatch = '' + cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox + ''; nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "jsonschema" + ]; + propagatedBuildInputs = with python3.pkgs; [ aiofiles aiohttp aiohttp-cors - async_generator + async-generator distro importlib-resources jinja2 @@ -47,6 +48,7 @@ python3.pkgs.buildPythonApplication { py-cpuinfo sentry-sdk setuptools + truststore yarl zipstream ]; @@ -59,7 +61,7 @@ python3.pkgs.buildPythonApplication { ''; meta = with lib; { - description = "Graphical Network Simulator 3 server (${branch} release)"; + description = "Graphical Network Simulator 3 server (${channel} release)"; longDescription = '' The GNS3 server manages emulators such as Dynamips, VirtualBox or Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST |