Unverified Commit 6d3f640b authored by Anthony Roussel's avatar Anthony Roussel
Browse files

gns3-server,gns3-gui: migrate to pkgs/by-name

parent 3334170f

pkgs/applications/networking/gns3/default.nix

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
{

  callPackage,

  libsForQt5,

}:



let

  mkGui =

    args:

    callPackage (import ./gui.nix args) {

      inherit (libsForQt5) wrapQtAppsHook;

    };



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

in

{

  guiStable = mkGui {

    channel = "stable";

    version = "2.2.55";

    hash = "sha256-6jblQakNpoSQXfy5pU68Aedg661VcwpqQilvqOV15pQ=";

  };



  guiPreview = mkGui {

    channel = "stable";

    version = "2.2.55";

    hash = "sha256-6jblQakNpoSQXfy5pU68Aedg661VcwpqQilvqOV15pQ=";

  };



  serverStable = mkServer {

    channel = "stable";

    version = "2.2.55";

    hash = "sha256-o04RrHYsa5sWYUBDLJ5xgcK4iJK8CfZ4YdAiZ4eV/o4=";

  };



  serverPreview = mkServer {

    channel = "stable";

    version = "2.2.55";

    hash = "sha256-o04RrHYsa5sWYUBDLJ5xgcK4iJK8CfZ4YdAiZ4eV/o4=";

  };

}

pkgs/applications/networking/gns3/gui.nix→pkgs/by-name/gn/gns3-gui/package.nix

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

  channel,

  version,

  hash,

}:



{

  fetchFromGitHub,

  gns3-gui,
@@ -11,7 +5,6 @@ 
  python3Packages,

  qt5,

  testers,

  wrapQtAppsHook,

}:



let
@@ -23,17 +16,17 @@ let 
in

pythonPackages.buildPythonApplication rec {

  pname = "gns3-gui";

  inherit version;

  version = "2.2.55";

  format = "setuptools";



  src = fetchFromGitHub {

    inherit hash;

    owner = "GNS3";

    repo = "gns3-gui";

    tag = "v${version}";

    hash = "sha256-6jblQakNpoSQXfy5pU68Aedg661VcwpqQilvqOV15pQ";

  };



  nativeBuildInputs = [ wrapQtAppsHook ];

  nativeBuildInputs = [ qt5.wrapQtAppsHook ];



  build-system = with pythonPackages; [ setuptools ];
@@ -53,7 +46,7 @@ pythonPackages.buildPythonApplication rec { 
  dontWrapQtApps = true;



  preFixup = ''

    wrapQtApp "$out/bin/gns3"

    makeWrapperArgs+=("''${qtWrapperArgs[@]}")

  '';



  doCheck = true;
@@ -73,7 +66,7 @@ pythonPackages.buildPythonApplication rec { 
  };



  meta = {

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

    description = "Graphical Network Simulator 3 GUI";

    longDescription = ''

      Graphical user interface for controlling the GNS3 network simulator. This

      requires access to a local or remote GNS3 server (it's recommended to

pkgs/applications/networking/gns3/server.nix→pkgs/by-name/gn/gns3-server/package.nix

+4 −10
Original line number Diff line number Diff line 
{

  channel,

  version,

  hash,

}:



{

  fetchFromGitHub,

  gns3-server,
@@ -16,16 +10,16 @@ 
  util-linux,

}:



python3Packages.buildPythonApplication {

python3Packages.buildPythonApplication rec {

  pname = "gns3-server";

  inherit version;

  version = "2.2.55";

  format = "setuptools";



  src = fetchFromGitHub {

    inherit hash;

    owner = "GNS3";

    repo = "gns3-server";

    tag = "v${version}";

    hash = "sha256-o04RrHYsa5sWYUBDLJ5xgcK4iJK8CfZ4YdAiZ4eV/o4=";

  };



  # GNS3 2.3.26 requires a static BusyBox for the Docker integration
@@ -94,7 +88,7 @@ python3Packages.buildPythonApplication { 
  };



  meta = {

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

    description = "Graphical Network Simulator 3 server";

    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

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ mapAliases { 
  gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27

  gnome-recipes = throw "'gnome-recipes' has been removed due to lack of upstream maintenance and dependency on insecure libraries"; # Added 2025-09-06

  gnome-resources = throw "'gnome-resources' has been renamed to/replaced by 'resources'"; # Converted to throw 2025-10-27

  gns3Packages = throw "'gns3Packages' has been removed. Use 'gns3-gui' and 'gns3-server' instead."; # Added 2026-01-18

  gnu-cobol = throw "'gnu-cobol' has been renamed to/replaced by 'gnucobol'"; # Converted to throw 2025-10-27

  gnubik = throw "'gnubik' has been removed due to lack of maintenance upstream and its dependency on GTK 2"; # Added 2025-09-16

  go-thumbnailer = throw "'go-thumbnailer' has been renamed to/replaced by 'thud'"; # Converted to throw 2025-10-27

pkgs/top-level/all-packages.nix

+0 −3
Original line number Diff line number Diff line
@@ -6945,9 +6945,6 @@ with pkgs; 


  #GMP ex-satellite, so better keep it near gmp

  # A GMP fork

  gns3Packages = recurseIntoAttrs (callPackage ../applications/networking/gns3 { });

  gns3-gui = gns3Packages.guiStable;

  gns3-server = gns3Packages.serverStable;



  gobject-introspection = callPackage ../development/libraries/gobject-introspection/wrapper.nix { };