diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-01 19:00:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-01 19:00:33 +0200 |
commit | dca4c5c533e883ce30c6af9fea3bae1d248193a5 (patch) | |
tree | b92d7c9724afb3eb0250760b1809d173fa5ce97a | |
parent | 658da3a32e5b01512a3f9449de8a2ecf9d9827cb (diff) | |
parent | c806d520c3e599ebfd8a3d82db8f2ef44f3435b8 (diff) |
Merge pull request #299633 from r-ryantm/auto-update/libtoxcore
libtoxcore: 0.2.18 -> 0.2.19
-rw-r--r-- | pkgs/by-name/li/libtoxcore/package.nix (renamed from pkgs/development/libraries/libtoxcore/default.nix) | 12 | ||||
-rw-r--r-- | pkgs/by-name/to/toxic/package.nix (renamed from pkgs/applications/networking/instant-messengers/toxic/default.nix) | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 14 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/by-name/li/libtoxcore/package.nix index 87d6633f124e9..00f145d17292e 100644 --- a/pkgs/development/libraries/libtoxcore/default.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,11 @@ 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 ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/by-name/to/toxic/package.nix index bd3f30adc6887..d697420bf32ef 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.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.gpl3Only; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f79bb0112cfe..22444da96608c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23143,8 +23143,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 { }; @@ -35263,8 +35261,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 { }; |