From edc79b33fb9b4fdd0f79ecc2e1f8e1de1d15533d Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sat, 24 Aug 2024 12:55:40 +0800
Subject: [PATCH] pkgs: update package definitions to their non-aliased names

---
 pkgs/gnome-search-provider-recoll.nix | 4 ++--
 pkgs/nautilus-annotations/default.nix | 4 ++--
 pkgs/smile/default.nix                | 4 ++--
 pkgs/vgc/default.nix                  | 9 ++++-----
 pkgs/willow/default.nix               | 8 ++++----
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/gnome-search-provider-recoll.nix b/pkgs/gnome-search-provider-recoll.nix
index 1832de6e..a6248f77 100644
--- a/pkgs/gnome-search-provider-recoll.nix
+++ b/pkgs/gnome-search-provider-recoll.nix
@@ -6,7 +6,7 @@
 , python3Packages
 , glib
 , gobject-introspection
-, wrapGAppsHook
+, wrapGAppsHook3
 , gnome
 }:
 
@@ -23,7 +23,7 @@ python3Packages.buildPythonPackage rec {
   format = "other";
   strictDeps = false;
   dontWrapGApps = true;
-  nativeBuildInputs = [ wrapGAppsHook autoreconfHook gobject-introspection ];
+  nativeBuildInputs = [ wrapGAppsHook3 autoreconfHook gobject-introspection ];
   propagatedBuildInputs = [ recoll ]
     ++ (with python3Packages; [ pydbus pygobject3 ]);
   buildInputs = [ glib ];
diff --git a/pkgs/nautilus-annotations/default.nix b/pkgs/nautilus-annotations/default.nix
index 0566d746..37cdc1ee 100644
--- a/pkgs/nautilus-annotations/default.nix
+++ b/pkgs/nautilus-annotations/default.nix
@@ -6,7 +6,7 @@
 , gtksourceview5
 , libadwaita
 , autoreconfHook
-, wrapGAppsHook
+, wrapGAppsHook4
 , pkg-config
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     glib
     gnome.nautilus
     pkg-config
-    wrapGAppsHook
+    wrapGAppsHook4
   ];
 
   buildInputs = [
diff --git a/pkgs/smile/default.nix b/pkgs/smile/default.nix
index c3278a22..7ad5dc4f 100644
--- a/pkgs/smile/default.nix
+++ b/pkgs/smile/default.nix
@@ -8,7 +8,7 @@
 , gettext
 , glib
 , gtk4
-, libwnck3
+, libwnck
 , wrapGAppsHook4
 , pkg-config
 , python3Packages
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    libwnck3
+    libwnck
     gtk4
   ];
 
diff --git a/pkgs/vgc/default.nix b/pkgs/vgc/default.nix
index f38568d8..50b1e7ca 100644
--- a/pkgs/vgc/default.nix
+++ b/pkgs/vgc/default.nix
@@ -11,17 +11,15 @@
 , git
 }:
 
-# TODO: Get rid of the build date or at least set the build date to zero to be
-# reproducible.
 stdenv.mkDerivation rec {
   pname = "vgc";
-  version = "unstable-2023-02-05";
+  version = "unstable-2024-08-16";
 
   src = fetchFromGitHub {
     owner = "vgc";
     repo = "vgc";
-    rev = "8e8d958ab9f7fa6f741346d60f17af44d7abb592";
-    sha256 = "sha256-84dckIOrHmxVX7U7VM1Le6tEqG1cJYaAfBcbKqJ6Ros=";
+    rev = "f9814daf5b7d411feeca0a1d994b344243402989";
+    sha256 = "sha256-86Ze8+aKMn0EU+RjcyUuDCCaEleh48gzyU9ZuYxpSdM=";
     fetchSubmodules = true;
   };
 
@@ -45,5 +43,6 @@ stdenv.mkDerivation rec {
     description =
       "Upcoming suite of vector-drawing applications that makes use of Vector Graphics Complex (VGC)";
     license = licenses.asl20;
+    maintainers = with maintainers; [ foo-dogsquared ];
   };
 }
diff --git a/pkgs/willow/default.nix b/pkgs/willow/default.nix
index 0bd43dd6..0c69b51a 100644
--- a/pkgs/willow/default.nix
+++ b/pkgs/willow/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule {
   pname = "willow";
-  version = "unstable-2024-05-17";
+  version = "unstable-2024-08-15";
 
   src = fetchFromGitHub {
     owner = "Amolith";
     repo = "willow";
-    rev = "5219377958faf103e16f16c29b2eb82f33a4f1c4";
-    hash = "sha256-MGz+X8Az2Cqzp5SB7L/RU18m15WOIS8vnAjCJwcTQ/s=";
+    rev = "af7202f230e42808b705bb9d4ddd04cfa28b401b";
+    hash = "sha256-ewXYkx2P2LO6Stg4P4WuVeDLgy2Zh/NYGkMl43DJ+Es=";
   };
 
-  vendorHash = "sha256-DCqD9GTszw7KJ+BlEX4T1Mra/D7uAFcWsMXg73V8a7k=";
+  vendorHash = "sha256-KLDoAd/YbQGW1v8bxffJS1PC8fJyEwWT5vT7g0a7rsg=";
 
   meta = with lib; {
     homepage = "https://github.com/Amolith/willow";