From 95fb89c6523d78d4fc4caf4ef40313735287bbfe Mon Sep 17 00:00:00 2001 From: Zitrone <74491719+quantenzitrone@users.noreply.github.com> Date: Mon, 17 Jun 2024 01:09:50 +0000 Subject: [PATCH] Sylk: rename to sylk (#320306) * Sylk: rename to sylk * sylk: fix meta.sourceProvenance --------- Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com> --- .../sy/sylk/package.nix} | 19 ++++++++----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 9 insertions(+), 13 deletions(-) rename pkgs/{applications/networking/Sylk/default.nix => by-name/sy/sylk/package.nix} (62%) diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/by-name/sy/sylk/package.nix similarity index 62% rename from pkgs/applications/networking/Sylk/default.nix rename to pkgs/by-name/sy/sylk/package.nix index a83742cf937c..ab32ef5463ff 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/by-name/sy/sylk/package.nix @@ -1,12 +1,8 @@ { appimageTools, fetchurl, lib }: -let - pname = "Sylk"; - version = "3.0.1"; -in - appimageTools.wrapType2 rec { - inherit pname version; + pname = "sylk"; + version = "3.0.1"; src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; @@ -17,12 +13,13 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - meta = with lib; { - description = "Sylk WebRTC client"; + meta = { + description = "Desktop client for SylkServer, a multiparty conferencing tool"; homepage = "https://sylkserver.com/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ zimbatm ]; - platforms = [ "i386-linux" "x86_64-linux" ]; + license = lib.licenses.agpl3Plus; mainProgram = "Sylk"; + maintainers = with lib.maintainers; [ zimbatm ]; + platforms = [ "i386-linux" "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 213afdf99d9a..49918da44dba 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1277,6 +1277,7 @@ mapAliases ({ supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swtpm-tpm2 = swtpm; # Added 2021-02-26 + Sylk = sylk; # Added 2024-06-12 syncthing-cli = syncthing; # Added 2021-04-06 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a867078fdbf..c8420c32a01e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13325,8 +13325,6 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper { }; - Sylk = callPackage ../applications/networking/Sylk { }; - privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; };