diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/by-name/le/legcord/package.nix similarity index 62% rename from pkgs/applications/networking/instant-messengers/armcord/default.nix rename to pkgs/by-name/le/legcord/package.nix index 1c0ad5aa361a..0dcad5b24399 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -3,27 +3,27 @@ , fetchFromGitHub , pnpm , nodejs -, electron_31 +, electron_32 , makeWrapper , copyDesktopItems , makeDesktopItem }: stdenv.mkDerivation rec { - pname = "armcord"; - version = "3.3.1"; + pname = "legcord"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "ArmCord"; - repo = "ArmCord"; + owner = "Legcord"; + repo = "Legcord"; rev = "v${version}"; - hash = "sha256-rCcjanmr4s9Nc5QB3Rb5ptKF/Ge8PSZt0WvgIul3RGs="; + hash = "sha256-/HwKxl3wiLSS7gmEQSddBkE2z1mmcexMgacUynLhdtg="; }; nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-ZfErOj03NdkviNXV4bvZC8uPOk29RhgmSez/Qvw1sGo="; + hash = "sha256-e6plwWf5eFaGsP3/cvIkGTV1nbcw8VRM30E5rwVX1RI="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { npm exec electron-builder -- \ --dir \ - -c.electronDist="${electron_31.dist}" \ - -c.electronVersion="${electron_31.version}" + -c.electronDist="${electron_32.dist}" \ + -c.electronVersion="${electron_32.version}" runHook postBuild ''; @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p "$out/share/lib/armcord" - cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/armcord" + mkdir -p "$out/share/lib/legcord" + cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/legcord" - install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/armcord.png" + install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/legcord.png" - makeShellWrapper "${lib.getExe electron_31}" "$out/bin/armcord" \ - --add-flags "$out/share/lib/armcord/resources/app.asar" \ + makeShellWrapper "${lib.getExe electron_32}" "$out/bin/legcord" \ + --add-flags "$out/share/lib/legcord/resources/app.asar" \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_IS_DEV 0 \ @@ -61,24 +61,24 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = "armcord"; - desktopName = "ArmCord"; - exec = "armcord %U"; - icon = "armcord"; + name = "legcord"; + desktopName = "Legcord"; + exec = "legcord %U"; + icon = "legcord"; comment = meta.description; categories = [ "Network" ]; - startupWMClass = "ArmCord"; + startupWMClass = "Legcord"; terminal = false; }) ]; meta = with lib; { description = "Lightweight, alternative desktop client for Discord"; - homepage = "https://armcord.app"; - downloadPage = "https://github.com/ArmCord/ArmCord"; + homepage = "https://legcord.app"; + downloadPage = "https://github.com/Legcord/Legcord"; license = licenses.osl3; maintainers = with maintainers; [ wrmilling water-sucks ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "armcord"; + mainProgram = "legcord"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc7f0f6fc1ae..303827aa0a91 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -127,6 +127,7 @@ mapAliases { archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aria = aria2; # Added 2024-03-26 + armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f482f2e6503..5e4c131996b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28255,9 +28255,6 @@ with pkgs; boost = boost175; }; - - armcord = callPackage ../applications/networking/instant-messengers/armcord { }; - autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { };