diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/cisco-packet-tracer_8/package.nix similarity index 95% rename from pkgs/by-name/ci/ciscoPacketTracer8/package.nix rename to pkgs/by-name/ci/cisco-packet-tracer_8/package.nix index acae24140b3d..0690c18b8fcc 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/cisco-packet-tracer_8/package.nix @@ -59,7 +59,7 @@ let }; unwrapped = stdenvNoCC.mkDerivation { - name = "ciscoPacketTracer8-unwrapped"; + name = "cisco-packet-tracer-unwrapped"; inherit version; src = @@ -135,14 +135,15 @@ let }; fhs-env = buildFHSEnv { - name = "ciscoPacketTracer8-fhs-env"; + pname = "cisco-packet-tracer-fhs-env"; + inherit version; runScript = lib.getExe' unwrapped "packettracer8"; targetPkgs = _: [ libudev0-shim ]; }; in stdenvNoCC.mkDerivation { - pname = "ciscoPacketTracer8"; + pname = "cisco-packet-tracer"; inherit version; dontUnpack = true; @@ -155,7 +156,7 @@ stdenvNoCC.mkDerivation { runHook preInstall mkdir -p $out/bin - ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer8 + ln -s ${fhs-env}/bin/${fhs-env.pname} $out/bin/packettracer8 mkdir -p $out/share/icons/hicolor/48x48/apps ln -s ${unwrapped}/opt/pt/art/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-8.png diff --git a/pkgs/by-name/ci/ciscoPacketTracer9/package.nix b/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix similarity index 95% rename from pkgs/by-name/ci/ciscoPacketTracer9/package.nix rename to pkgs/by-name/ci/cisco-packet-tracer_9/package.nix index d0e59507f916..8fc360fef57a 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer9/package.nix +++ b/pkgs/by-name/ci/cisco-packet-tracer_9/package.nix @@ -10,10 +10,8 @@ }: let - pname = "ciscoPacketTracer9"; - appimage = stdenvNoCC.mkDerivation { - pname = "ciscoPacketTracer9-appimage"; + pname = "cisco-packet-tracer-appimage"; inherit version; src = @@ -45,7 +43,9 @@ let in appimageTools.wrapType2 rec { - inherit pname version; + pname = "cisco-packet-tracer"; + inherit version; + src = appimage; extraPkgs = _: [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 45239bd1f633..8c797b06d2a2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -447,7 +447,9 @@ mapAliases { chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27 ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26 cinnamon-common = cinnamon; # Added 2025-08-06 - ciscoPacketTracer7 = throw "'ciscoPacketTracer7' has been removed in favor of 'ciscoPacketTracer8' and 'ciscoPacketTracer9'"; + ciscoPacketTracer7 = throw "'ciscoPacketTracer7' has been removed in favor of 'cisco-packet-tracer_8' and 'cisco-packet-tracer_9'"; + ciscoPacketTracer8 = cisco-packet-tracer_8; # Added 2026-02-08 + ciscoPacketTracer9 = cisco-packet-tracer_9; # Added 2026-02-08 citrix_workspace_23_11_0 = throw "'citrix_workspace_23_11_0' has been removed because it has reached EOL."; # Added 2025-11-25 citrix_workspace_24_02_0 = throw "'citrix_workspace_24_02_0' has been removed because it has reached EOL."; # Added 2025-11-25 citrix_workspace_24_05_0 = throw "'citrix_workspace_24_05_0' has been removed because it depended on the removed webkitgtk_4_0."; # Added 2025-11-25