Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gns3-server: add util-linux to PATH and replace python3.pkgs by python3Packages #303472

Merged
merged 2 commits into from May 11, 2024
Merged

gns3-server: add util-linux to PATH and replace python3.pkgs by python3Packages #303472

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a337642
gns3-server: add util-linux to PATH
anthonyroussel Apr 18, 2024
ebe855c
gns3-server: replace `python3.pkgs` by `python3Packages`
anthonyroussel Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkgs/applications/networking/gns3/server.nix
View file
Open in desktop
Expand Up @@ -4,16 +4,17 @@
}:

{ lib
, python3
, python3Packages
, fetchFromGitHub
, pkgsStatic
, stdenv
, nixosTests
, testers
, util-linux
, gns3-server
}:

python3.pkgs.buildPythonApplication {
python3Packages.buildPythonApplication {
pname = "gns3-server";
inherit version;

Expand All @@ -29,7 +30,7 @@ python3.pkgs.buildPythonApplication {
cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox
'';

propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with python3Packages; [
aiofiles
aiohttp
aiohttp-cors
Expand All @@ -55,6 +56,9 @@ python3.pkgs.buildPythonApplication {
rm $out/bin/gns3loopback
'';

# util-linux (script program) is required for Docker support
makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ util-linux ]}" ];

doCheck = true;

# Otherwise tests will fail to create directory
Expand All @@ -63,7 +67,7 @@ python3.pkgs.buildPythonApplication {
export HOME=$(mktemp -d)
'';

checkInputs = with python3.pkgs; [
checkInputs = with python3Packages; [
pytest-aiohttp
pytest-rerunfailures
(pytestCheckHook.override { pytest = pytest_7; })
Expand Down