Unverified Commit 02b58370 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

gns3-gui,gns3-server: 2.2.47 -> 2.2.49 (#326662)

parents ccc20c81 76940007

pkgs/applications/networking/gns3/default.nix

+12 −12
Original line number Diff line number Diff line 
{ callPackage

, libsForQt5

, python311

, python311Packages

}:



let

  mkGui = args: callPackage (import ./gui.nix (args)) {

    inherit (libsForQt5) wrapQtAppsHook;

    python3 = python311;

    python3Packages = python311Packages;

  };



  mkServer = args: callPackage (import ./server.nix (args)) { };

in {



in

{

  guiStable = mkGui {

    channel = "stable";

    version = "2.2.47";

    hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA=";

    version = "2.2.49";

    hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU=";

  };



  guiPreview = mkGui {

    channel = "stable";

    version = "2.2.47";

    hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA=";

    version = "2.2.49";

    hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU=";

  };



  serverStable = mkServer {

    channel = "stable";

    version = "2.2.47";

    hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0=";

    version = "2.2.49";

    hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So=";

  };



  serverPreview = mkServer {

    channel = "stable";

    version = "2.2.47";

    hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0=";

    version = "2.2.49";

    hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So=";

  };

}

pkgs/applications/networking/gns3/gui.nix

+25 −24
Original line number Diff line number Diff line 
{ channel

, version

, hash

{

  channel,

  version,

  hash,

}:



{ lib

, python3

, fetchFromGitHub

, qt5

, wrapQtAppsHook

, testers

, gns3-gui

{

  fetchFromGitHub,

  gns3-gui,

  lib,

  python3Packages,

  qt5,

  testers,

  wrapQtAppsHook,

}:



python3.pkgs.buildPythonApplication rec {

python3Packages.buildPythonApplication rec {

  pname = "gns3-gui";

  inherit version;



  src = fetchFromGitHub {

    inherit hash;

    owner = "GNS3";

    repo = pname;

    repo = "gns3-gui";

    rev = "refs/tags/v${version}";

  };



  nativeBuildInputs = with python3.pkgs; [

    wrapQtAppsHook

  ];

  nativeBuildInputs = with python3Packages; [ wrapQtAppsHook ];



  build-system = with python3Packages; [ setuptools ];



  propagatedBuildInputs = with python3.pkgs; [

  propagatedBuildInputs = [ qt5.qtwayland ];



  dependencies = with python3Packages; [

    distro

    jsonschema

    psutil
@@ -36,7 +40,6 @@ python3.pkgs.buildPythonApplication rec { 
    sip

    (pyqt5.override { withWebSockets = true; })

    truststore

    qt5.qtwayland

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

    importlib-resources

  ];
@@ -49,9 +52,7 @@ python3.pkgs.buildPythonApplication rec { 


  doCheck = true;



  checkInputs = with python3.pkgs; [

    pytestCheckHook

  ];

  checkInputs = with python3Packages; [ pytestCheckHook ];



  preCheck = ''

    export HOME=$(mktemp -d)
@@ -65,7 +66,7 @@ python3.pkgs.buildPythonApplication rec { 
    command = "${lib.getExe gns3-gui} --version";

  };



  meta = with lib; {

  meta = {

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

    longDescription = ''

      Graphical user interface for controlling the GNS3 network simulator. This
@@ -74,9 +75,9 @@ python3.pkgs.buildPythonApplication rec { 
    '';

    homepage = "https://www.gns3.com/";

    changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}";

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ anthonyroussel ];

    license = lib.licenses.gpl3Plus;

    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [ anthonyroussel ];

    mainProgram = "gns3";

  };

}

pkgs/applications/networking/gns3/server.nix

+22 −19
Original line number Diff line number Diff line 
{ channel

, version

, hash

{

  channel,

  version,

  hash,

}:



{ lib

, python3Packages

, fetchFromGitHub

, pkgsStatic

, stdenv

, nixosTests

, testers

, util-linux

, gns3-server

{

  fetchFromGitHub,

  gns3-server,

  lib,

  nixosTests,

  pkgsStatic,

  python3Packages,

  stdenv,

  testers,

  util-linux,

}:



python3Packages.buildPythonApplication {
@@ -30,7 +32,9 @@ python3Packages.buildPythonApplication { 
    cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox

  '';



  propagatedBuildInputs = with python3Packages; [

  build-system = with python3Packages; [ setuptools ];



  dependencies = with python3Packages; [

    aiofiles

    aiohttp

    aiohttp-cors
@@ -44,7 +48,6 @@ python3Packages.buildPythonApplication { 
    psutil

    py-cpuinfo

    sentry-sdk

    setuptools

    truststore

    yarl

  ] ++ lib.optionals (pythonOlder "3.9") [
@@ -69,7 +72,7 @@ python3Packages.buildPythonApplication { 
  checkInputs = with python3Packages; [

    pytest-aiohttp

    pytest-rerunfailures

    (pytestCheckHook.override { pytest = pytest_7; })

    pytestCheckHook

  ];



  pytestFlagsArray = [
@@ -87,7 +90,7 @@ python3Packages.buildPythonApplication { 
    };

  };



  meta = with lib; {

  meta = {

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

    longDescription = ''

      The GNS3 server manages emulators such as Dynamips, VirtualBox or
@@ -96,9 +99,9 @@ python3Packages.buildPythonApplication { 
    '';

    homepage = "https://www.gns3.com/";

    changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}";

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    maintainers = with maintainers; [ anthonyroussel ];

    license = lib.licenses.gpl3Plus;

    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [ anthonyroussel ];

    mainProgram = "gns3server";

  };

}