From b4df3a109fa008afde40a7092d69bf8ce2fd1277 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 20 Jun 2024 17:49:45 +0800 Subject: [PATCH 1/2] gabutdm: move to pkgs/by-name --- .../gabutdm/default.nix => by-name/ga/gabutdm/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/gabutdm/default.nix => by-name/ga/gabutdm/package.nix} (100%) diff --git a/pkgs/applications/networking/gabutdm/default.nix b/pkgs/by-name/ga/gabutdm/package.nix similarity index 100% rename from pkgs/applications/networking/gabutdm/default.nix rename to pkgs/by-name/ga/gabutdm/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e6d8abd8253..ac65543a5261 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1753,8 +1753,6 @@ with pkgs; copier = callPackage ../tools/misc/copier { }; - gabutdm = callPackage ../applications/networking/gabutdm { }; - gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; From 676266e8a7daaa9042c03d3d61968af54b5ee78b Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 20 Jun 2024 17:56:36 +0800 Subject: [PATCH 2/2] gabutdm: 2.1.6 -> 2.2.8 --- pkgs/by-name/ga/gabutdm/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ga/gabutdm/package.nix b/pkgs/by-name/ga/gabutdm/package.nix index cb587ea7f093..4458efcce5f4 100644 --- a/pkgs/by-name/ga/gabutdm/package.nix +++ b/pkgs/by-name/ga/gabutdm/package.nix @@ -14,18 +14,19 @@ , json-glib , qrencode , curl +, libadwaita , aria2 }: stdenv.mkDerivation rec { pname = "gabutdm"; - version = "2.1.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "gabutakut"; - repo = pname; + repo = "gabutdm"; rev = version; - hash = "sha256-ai5LsoK21XwXqL4LRuKsOR1/JV6LnP+1ZJ9fMHpj178="; + hash = "sha256-HF+zBDkA9fYauLUYsvJJxcRggHu+5qH4rm0IM/tL9Hc="; }; nativeBuildInputs = [ @@ -45,11 +46,12 @@ stdenv.mkDerivation rec { json-glib qrencode curl + libadwaita ]; postPatch = '' substituteInPlace meson/post_install.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache + --replace-fail gtk-update-icon-cache gtk4-update-icon-cache ''; preFixup = ''