diff --git a/pkgs/by-name/ra/radicle-explorer/0001-remove-dependency-on-plausible.patch b/pkgs/by-name/ra/radicle-explorer/0001-remove-dependency-on-plausible.patch deleted file mode 100644 index 06b3511d4078..000000000000 --- a/pkgs/by-name/ra/radicle-explorer/0001-remove-dependency-on-plausible.patch +++ /dev/null @@ -1,77 +0,0 @@ -From cc4718cbea1bd70de21a2be515a944802246ffc7 Mon Sep 17 00:00:00 2001 -From: Vincent Ambo -Date: Sun, 15 Sep 2024 03:08:28 +0300 -Subject: [PATCH] remove dependency on plausible - ---- - package-lock.json | 9 --------- - package.json | 1 - - src/App.svelte | 8 -------- - 3 files changed, 18 deletions(-) - -diff --git a/package-lock.json b/package-lock.json -index d52de6c0..d96e342f 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -29,7 +29,6 @@ - "marked-katex-extension": "^5.1.1", - "marked-linkify-it": "^3.1.11", - "md5": "^2.3.0", -- "plausible-tracker": "^0.3.9", - "svelte": "^4.2.19", - "twemoji": "^14.0.2", - "zod": "^3.23.8" -@@ -3697,14 +3696,6 @@ - "url": "https://github.com/sponsors/jonschlinkert" - } - }, -- "node_modules/plausible-tracker": { -- "version": "0.3.9", -- "resolved": "https://registry.npmjs.org/plausible-tracker/-/plausible-tracker-0.3.9.tgz", -- "integrity": "sha512-hMhneYm3GCPyQon88SZrVJx+LlqhM1kZFQbuAgXPoh/Az2YvO1B6bitT9qlhpiTdJlsT5lsr3gPmzoVjb5CDXA==", -- "engines": { -- "node": ">=10" -- } -- }, - "node_modules/playwright": { - "version": "1.46.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz", -diff --git a/package.json b/package.json -index 6d569ad9..61e8d892 100644 ---- a/package.json -+++ b/package.json -@@ -73,7 +73,6 @@ - "marked-katex-extension": "^5.1.1", - "marked-linkify-it": "^3.1.11", - "md5": "^2.3.0", -- "plausible-tracker": "^0.3.9", - "svelte": "^4.2.19", - "twemoji": "^14.0.2", - "zod": "^3.23.8" -diff --git a/src/App.svelte b/src/App.svelte -index 8161c390..4281ba61 100644 ---- a/src/App.svelte -+++ b/src/App.svelte -@@ -1,6 +1,4 @@ - --- -2.46.0 - diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix index 21c37268662b..941f2f13c9f5 100644 --- a/pkgs/by-name/ra/radicle-explorer/package.nix +++ b/pkgs/by-name/ra/radicle-explorer/package.nix @@ -57,21 +57,13 @@ let passthru = prev.passthru // mkPassthru final args; }) ); - - # By default, radicle-explorer includes a dependency that sends requests - # to a web analytics tracking service. Using this attribute yields a - # version of radicle-explorer with this dependency removed. - withoutTrackers = self { - patches = [ ./0001-remove-dependency-on-plausible.patch ]; - npmDepsHash = "sha256:1hbrzfjkfc0q8qk03yi6qb9zqm57h7hnkn7fl0yxkrzbrljaljaz"; - }; }; in lib.fix ( self: lib.makeOverridable ( { - npmDepsHash ? "sha256:0kw6rvqm0s21j1rss35idvgcrzzczfy6qi3323y385djw4ygk5xs", + npmDepsHash ? "sha256-XBWwTgfiQX3oW8f4bhfjn85M6KbC6mcIxmwRg224asM=", patches ? [ ], }@args: buildNpmPackage { @@ -85,7 +77,7 @@ lib.fix ( # separate hash. src = fetchgit { inherit (radicle-httpd.src) url rev; - hash = "sha256:09m13238h6j7g02r6332ihgyyzbjx90pgz14rz29pgv7936h6il8"; + hash = "sha256-HQbyQWkp8YikSMMcX+zBfbscuUqDEGIe3oATtaHikZk="; }; postPatch = '' diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index a42bc9a8a110..58d1533e980c 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -13,19 +13,19 @@ }: rustPlatform.buildRustPackage rec { pname = "radicle-httpd"; - version = "0.17.0"; + version = "0.17.1"; env.RADICLE_VERSION = version; # You must update the radicle-explorer source hash when changing this. src = fetchgit { url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; - hash = "sha256-nstyb1rSll3Sl0DlA9JAAwvr6JN8okJ03WoQnE4dXEk="; + hash = "sha256-AhiIpNVDL4XYIQ89aYu8Cp2nKhIPYCzyrcG5hw9xsmE="; sparseCheckout = [ "radicle-httpd" ]; }; sourceRoot = "${src.name}/radicle-httpd"; - cargoHash = "sha256-M4tDtUXS99/Zb1Z71CTdW9gMgRR30rbwA6wK7nlwblQ="; + cargoHash = "sha256-TwK2QsoKVWYXn4mZEERQCnMOY4F9+wzjLBtvhH69wAs="; nativeBuildInputs = [ asciidoctor