furtherance: 1.8.3 -> 25.3.0 (#466097)

maintainers/maintainer-list.nix

@@ -15158,6 +15158,12 @@
     name = "Jan Schmitt";
     keys = [ { fingerprint = "1763 9903 2D7C 5B82 5D5A  0EAD A2BC 3C6F 1435 1991"; } ];
   };
+  locnide = {
+    email = "locnide@alpaga.dev";
+    github = "locnide";
+    githubId = 49921473;
+    name = "locnide";
+  };
   locochoco = {
     email = "contact@locochoco.dev";
     github = "loco-choco";

pkgs/by-name/fu/furtherance/package.nix

@@ -3,63 +3,68 @@
   stdenv,
   fetchFromGitHub,
   rustPlatform,
-  appstream-glib,
-  cargo,
-  desktop-file-utils,
-  glib,
-  libadwaita,
-  meson,
-  ninja,
+  fontconfig,
+  libxkbcommon,
+  openssl,
   pkg-config,
-  rustc,
-  wrapGAppsHook4,
-  dbus,
-  gtk4,
-  sqlite,
+  xorg,
+  vulkan-loader,
+  wayland,
 }:
-
-stdenv.mkDerivation (finalAttrs: {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "furtherance";
-  version = "1.8.3";
+  version = "25.3.0";
 
   src = fetchFromGitHub {
-    owner = "lakoliu";
+    owner = "unobserved-io";
     repo = "Furtherance";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-TxYARpCqqjjwinoRU2Wjihp+FYIvcI0YCGlOuumX6To=";
+    rev = finalAttrs.version;
+    hash = "sha256-LyGO+fbsu16Us0+sK0T6HlGq7EwZWSetd+gCIKKEbkk=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) pname version src;
-    hash = "sha256-SFp9YCmneOll2pItWmg2b2jrpRqPnvV9vwz4mjjvwM4=";
-  };
+  cargoHash = "sha256-j/5O40k12rl/gmRc1obo9ImdkZ0Mdrke2PCf6tFCWIo=";
 
   nativeBuildInputs = [
-    appstream-glib
-    desktop-file-utils
-    meson
-    ninja
     pkg-config
-    rustPlatform.cargoSetupHook
-    cargo
-    rustc
-    wrapGAppsHook4
   ];
 
   buildInputs = [
-    dbus
-    glib
-    gtk4
-    libadwaita
-    sqlite
+    fontconfig
+    openssl
+    libxkbcommon
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXcursor
+    xorg.libXi
+    vulkan-loader
+    wayland
   ];
 
+  checkFlags = [
+    # panicked at src/tests/timer_tests.rs:30:9
+    "--skip=tests::timer_tests::timer_tests::test_split_task_input_basic"
+  ];
+
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf $out/bin/${finalAttrs.pname} \
+      --add-rpath ${
+        lib.makeLibraryPath [
+          vulkan-loader
+          libxkbcommon
+          wayland
+        ]
+      }
+  '';
+
   meta = {
     description = "Track your time without being tracked";
     mainProgram = "furtherance";
-    homepage = "https://github.com/lakoliu/Furtherance";
+    homepage = "https://github.com/unobserved-io/Furtherance";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ CaptainJawZ ];
+    maintainers = with lib.maintainers; [
+      CaptainJawZ
+      locnide
+    ];
   };
 })