From 81e18dae4fb9a2d53b4831c34f814169595fd5f9 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 31 Mar 2024 09:30:06 +0100 Subject: [PATCH 1/6] libtoxcore: move to pkgs/by-name --- .../default.nix => by-name/li/libtoxcore/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libtoxcore/default.nix => by-name/li/libtoxcore/package.nix} (100%) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/by-name/li/libtoxcore/package.nix similarity index 100% rename from pkgs/development/libraries/libtoxcore/default.nix rename to pkgs/by-name/li/libtoxcore/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 818a3c4f5e7b..8ae75e89f77f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23131,8 +23131,6 @@ with pkgs; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; - libtoxcore = callPackage ../development/libraries/libtoxcore { }; - libtpms = callPackage ../tools/security/libtpms { }; libtap = callPackage ../development/libraries/libtap { }; From d9b42d5143563e0c8d3dd10d108a8aa8c43be3f0 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 31 Mar 2024 09:39:19 +0100 Subject: [PATCH 2/6] libtoxcore: 0.2.18 -> 0.2.19 --- pkgs/by-name/li/libtoxcore/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libtoxcore/package.nix b/pkgs/by-name/li/libtoxcore/package.nix index 87d6633f124e..2c56dec2aea8 100644 --- a/pkgs/by-name/li/libtoxcore/package.nix +++ b/pkgs/by-name/li/libtoxcore/package.nix @@ -14,14 +14,14 @@ let buildToxAV = !stdenv.isAarch32; in stdenv.mkDerivation rec { pname = "libtoxcore"; - version = "0.2.18"; + version = "0.2.19"; src = # We need the prepared sources tarball. fetchurl { url = "https://github.com/TokTok/c-toxcore/releases/download/v${version}/c-toxcore-${version}.tar.gz"; - sha256 = "sha256-8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI="; + sha256 = "sha256-i0GPZHDbCFz1mpkVaFYTVWVW3yv0JxSPGBS3sRhihZQ="; }; cmakeFlags = [ @@ -51,11 +51,10 @@ in stdenv.mkDerivation rec { # We might be getting the wrong pkg-config file anyway: # https://github.com/TokTok/c-toxcore/issues/2334 - meta = with lib; { + meta = { description = "P2P FOSS instant messaging application aimed to replace Skype"; homepage = "https://tox.chat"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ peterhoeg ehmry ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ peterhoeg ehmry ]; }; } From 8736da4cc6e35748c6e6d06059971fb1063e75ff Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 31 Mar 2024 09:32:35 +0100 Subject: [PATCH 3/6] toxic: move to pkgs/by-name --- .../toxic/default.nix => by-name/to/toxic/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/instant-messengers/toxic/default.nix => by-name/to/toxic/package.nix} (100%) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/by-name/to/toxic/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/toxic/default.nix rename to pkgs/by-name/to/toxic/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ae75e89f77f..80406a0920e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35250,8 +35250,6 @@ with pkgs; toipe = callPackage ../applications/misc/toipe { }; - toxic = callPackage ../applications/networking/instant-messengers/toxic { }; - toxiproxy = callPackage ../development/tools/toxiproxy { }; tqsl = callPackage ../applications/radio/tqsl { }; From 636d8e09e56d13dce8525cfd2e0900b42309dc92 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 31 Mar 2024 09:36:36 +0100 Subject: [PATCH 4/6] toxic: 0.11.3 -> 0.15.1 --- pkgs/by-name/to/toxic/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/to/toxic/package.nix b/pkgs/by-name/to/toxic/package.nix index bd3f30adc688..e33505d7373b 100644 --- a/pkgs/by-name/to/toxic/package.nix +++ b/pkgs/by-name/to/toxic/package.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.11.3"; + version = "0.15.1"; src = fetchFromGitHub { - owner = "Tox"; + owner = "TokTok"; repo = "toxic"; rev = "v${version}"; - sha256 = "sha256-BabRY9iu5ccEXo5POrWkWaIWAeQU4MVlMK8I+Iju6aQ="; + sha256 = "sha256-+nOjlQED2pbYwGV6IGeKK1pymBSrDVWCWKjZ42vib7E="; }; makeFlags = [ "PREFIX=$(out)"]; @@ -23,11 +23,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config libconfig ]; - meta = with lib; src.meta // { + meta = src.meta // { description = "Reference CLI for Tox"; mainProgram = "toxic"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; + homepage = "https://github.com/TokTok/toxic"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.linux; }; } From 62bc9629d3efe119a37e7a07e3132218ed152d61 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 1 Apr 2024 00:10:33 +0200 Subject: [PATCH 5/6] toxic: fix license --- pkgs/by-name/to/toxic/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/to/toxic/package.nix b/pkgs/by-name/to/toxic/package.nix index e33505d7373b..d697420bf32e 100644 --- a/pkgs/by-name/to/toxic/package.nix +++ b/pkgs/by-name/to/toxic/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Reference CLI for Tox"; mainProgram = "toxic"; homepage = "https://github.com/TokTok/toxic"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ ehmry ]; platforms = lib.platforms.linux; }; From c806d520c3e599ebfd8a3d82db8f2ef44f3435b8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 1 Apr 2024 18:43:37 +0200 Subject: [PATCH 6/6] libtoxcore: restore meta.platforms --- pkgs/by-name/li/libtoxcore/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/li/libtoxcore/package.nix b/pkgs/by-name/li/libtoxcore/package.nix index 2c56dec2aea8..00f145d17292 100644 --- a/pkgs/by-name/li/libtoxcore/package.nix +++ b/pkgs/by-name/li/libtoxcore/package.nix @@ -56,5 +56,6 @@ in stdenv.mkDerivation rec { homepage = "https://tox.chat"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ peterhoeg ehmry ]; + platforms = lib.platforms.all; }; }