From 44192d772140d124e45c0f196d90f24a7dc68962 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 14 May 2025 12:32:19 +0200
Subject: [PATCH] fider: 0.24.0 -> 0.26.0

Changelogs:

- https://github.com/getfider/fider/releases/tag/v0.26.0
- https://github.com/getfider/fider/releases/tag/v0.25.0
---
 pkgs/by-name/fi/fider/frontend.nix |  5 -----
 pkgs/by-name/fi/fider/package.nix  | 35 ++++--------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/fi/fider/frontend.nix b/pkgs/by-name/fi/fider/frontend.nix
index 1361c3f5bee0..d979b0f8a481 100644
--- a/pkgs/by-name/fi/fider/frontend.nix
+++ b/pkgs/by-name/fi/fider/frontend.nix
@@ -1,6 +1,4 @@
 {
-  lib,
-  esbuild,
   buildNpmPackage,
 
   pname,
@@ -13,8 +11,6 @@ buildNpmPackage {
   inherit version src npmDepsHash;
   pname = "${pname}-frontend";
 
-  nativeBuildInputs = [ esbuild ];
-
   buildPhase = ''
     runHook preBuild
 
@@ -37,6 +33,5 @@ buildNpmPackage {
 
   env = {
     PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1;
-    ESBUILD_BINARY_PATH = lib.getExe esbuild;
   };
 }
diff --git a/pkgs/by-name/fi/fider/package.nix b/pkgs/by-name/fi/fider/package.nix
index 5efe096109fd..0c547b190bbb 100644
--- a/pkgs/by-name/fi/fider/package.nix
+++ b/pkgs/by-name/fi/fider/package.nix
@@ -3,21 +3,19 @@
   stdenvNoCC,
   fetchFromGitHub,
   callPackage,
-  esbuild,
-  buildGoModule,
   nixosTests,
   nix-update-script,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "fider";
-  version = "0.24.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "getfider";
     repo = "fider";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nzOplwsE0ppmxbTrNAgePnIQIAD/5Uu4gXlebFKWGfc=";
+    hash = "sha256-uABRIR/3D+//qYu/396qqVizP0kLmAA8auYd83rABhE=";
   };
 
   dontConfigure = true;
@@ -32,8 +30,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   #   vendorHash = "...";
   #   npmDepsHash = "...";
   # })
-  vendorHash = "sha256-CfopU72fpXiTaBtdf9A57Wb+flDu2XEtTISxImeJLL0=";
-  npmDepsHash = "sha256-gnboT5WQzftOCZ2Ouuza7bqpxJf+Zs7OWC8OHMZNHvw=";
+  vendorHash = "sha256-4ilOdUblpwteY0ZInitSuzuB8mU1ltYgRJjla6LiziU=";
+  npmDepsHash = "sha256-c8CFMMmFcLZkJL50bfLlk2HP9B/rexNZ2WWJkV0x4Rk=";
 
   server = callPackage ./server.nix {
     inherit (finalAttrs)
@@ -50,31 +48,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       src
       npmDepsHash
       ;
-    # We specify the esbuild override here instead of in frontend.nix so end users can
-    # again easily override it if necessary, for example when changing to an unreleased
-    # version of fider requiring a newer esbuild than specified here:
-    # pkgs.fider.overrideAttrs (prev: {
-    #   frontend = prev.frontend.override {
-    #     esbuild = ...;
-    #   };
-    # })
-    esbuild = esbuild.override {
-      buildGoModule =
-        args:
-        buildGoModule (
-          args
-          // rec {
-            version = "0.14.38";
-            src = fetchFromGitHub {
-              owner = "evanw";
-              repo = "esbuild";
-              tag = "v${version}";
-              hash = "sha256-rvMi1oC7qGidvi4zrm9KCMMntu6LJGVOGN6VmU2ivQE=";
-            };
-            vendorHash = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
-          }
-        );
-    };
   };
 
   installPhase = ''