diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-01 18:00:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-01 18:00:59 +0000 |
| commit | ef44d4677532e2a1e3fb0fe4bb3e0c73faa416dd (patch) | |
| tree | c67eacd9068be4d954124a4a8a8791d9757b3c19 /pkgs/applications/networking/instant-messengers | |
| parent | 2f73b699a30bd1f976d55ee2c22176de288a9486 (diff) | |
| parent | 790bb39e577479e3a5cf760c73e0048b70457d75 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/element/pin.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/toxic/default.nix | 33 |
2 files changed, 5 insertions, 38 deletions
diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index f6e239a89d711..b769f73f948f2 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.61"; + "version" = "1.11.63"; "hashes" = { - "desktopSrcHash" = "sha256-1Pq26e2ngcji7wieHNOQAWPFBKGLoeTRAKQ3Aqnn1jw="; - "desktopYarnHash" = "16psxfai8dyckm4xwrg5czv6l4163x2nlqqcdgly6axabllgacj1"; - "webSrcHash" = "sha256-RJhZgwTMDLMt+ha0lxPwqiP5sipXIcGZfdPVgCxePH4="; - "webYarnHash" = "1vj3f2bml8jyjz6djzvw1hbrv7148wk8y9hwp323zf8n6y4rnk28"; + "desktopSrcHash" = "sha256-wQSFnF3HzERW4iS5leHP2LZKrJkTPW+LUgmj5b0/KZk="; + "desktopYarnHash" = "003d44psrw09dldvp9lfhsnipmcy1fwbicsvmd48mg7n3vnrg0zw"; + "webSrcHash" = "sha256-FjYDwXa+7Lx/K0AERn64mPbjp0QFIoVoYMPx/mG4Zrs="; + "webYarnHash" = "0n7z9y3141rx0c5476zw3ccfck0f4b2jwsaxmq2ff7spwyw81zd2"; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix deleted file mode 100644 index bd3f30adc6887..0000000000000 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl -, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus -, qrencode, gdk-pixbuf, libnotify }: - -stdenv.mkDerivation rec { - pname = "toxic"; - version = "0.11.3"; - - src = fetchFromGitHub { - owner = "Tox"; - repo = "toxic"; - rev = "v${version}"; - sha256 = "sha256-BabRY9iu5ccEXo5POrWkWaIWAeQU4MVlMK8I+Iju6aQ="; - }; - - makeFlags = [ "PREFIX=$(out)"]; - installFlags = [ "PREFIX=$(out)"]; - - buildInputs = [ - libtoxcore libsodium ncurses curl gdk-pixbuf libnotify - ] ++ lib.optionals (!stdenv.isAarch32) [ - openal libopus libvpx freealut qrencode - ]; - nativeBuildInputs = [ pkg-config libconfig ]; - - meta = with lib; src.meta // { - description = "Reference CLI for Tox"; - mainProgram = "toxic"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; - }; -} |