Unverified Commit ead9fd51 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #265931 from anthonyroussel/gns3-update 

gns3-gui,gns3-server: 2.2.43 -> 2.2.44.1
parents ea13055d b8f2227c

pkgs/applications/networking/gns3/default.nix

+8 −8
Original line number Diff line number Diff line
@@ -12,25 +12,25 @@ in { 


  guiStable = mkGui {

    channel = "stable";

    version = "2.2.43";

    hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM=";

    version = "2.2.44.1";

    hash = "sha256-Ae1Yij81/rhZOMMfLYaQKR4Dxx1gDGZBpBj0gLCSToI=";

  };



  guiPreview = mkGui {

    channel = "stable";

    version = "2.2.43";

    hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM=";

    version = "2.2.44.1";

    hash = "sha256-Ae1Yij81/rhZOMMfLYaQKR4Dxx1gDGZBpBj0gLCSToI=";

  };



  serverStable = mkServer {

    channel = "stable";

    version = "2.2.43";

    hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8=";

    version = "2.2.44.1";

    hash = "sha256-YtYXTEZj5009L8OU7jdhegYu5Xll3jZAW6NJFWOvxHQ=";

  };



  serverPreview = mkServer {

    channel = "stable";

    version = "2.2.43";

    hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8=";

    version = "2.2.44.1";

    hash = "sha256-YtYXTEZj5009L8OU7jdhegYu5Xll3jZAW6NJFWOvxHQ=";

  };

}

pkgs/applications/networking/gns3/gui.nix

+7 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
, fetchFromGitHub

, qt5

, wrapQtAppsHook

, testers

, gns3-gui

}:



python3.pkgs.buildPythonApplication rec {
@@ -56,6 +58,11 @@ python3.pkgs.buildPythonApplication rec { 
    export QT_QPA_PLATFORM=offscreen

  '';



  passthru.tests.version = testers.testVersion {

    package = gns3-gui;

    command = "${lib.getExe gns3-gui} --version";

  };



  meta = with lib; {

    description = "Graphical Network Simulator 3 GUI (${channel} release)";

    longDescription = ''

pkgs/applications/networking/gns3/server.nix

+10 −1
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
, fetchFromGitHub

, pkgsStatic

, stdenv

, testers

, gns3-server

}:



python3.pkgs.buildPythonApplication {
@@ -32,7 +34,6 @@ python3.pkgs.buildPythonApplication { 
    aiohttp-cors

    async-generator

    distro

    importlib-resources

    jinja2

    jsonschema

    multidict
@@ -45,6 +46,8 @@ python3.pkgs.buildPythonApplication { 
    truststore

    yarl

    zipstream

  ] ++ lib.optionals (pythonOlder "3.9") [

    importlib-resources

  ];



  postInstall = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
@@ -72,6 +75,11 @@ python3.pkgs.buildPythonApplication { 
    "--reruns 3"

  ];



  passthru.tests.version = testers.testVersion {

    package = gns3-server;

    command = "${lib.getExe gns3-server} --version";

  };



  meta = with lib; {

    description = "Graphical Network Simulator 3 server (${channel} release)";

    longDescription = ''
@@ -84,5 +92,6 @@ python3.pkgs.buildPythonApplication { 
    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ anthonyroussel ];

    mainProgram = "gns3server";

  };

}