From 3a45ce7bb0779c0da6bb38602d6e0cd553132881 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 16 May 2025 23:44:54 +0200 Subject: [PATCH 1/4] adw-gtk3: 5.10 -> 6.2 --- pkgs/by-name/ad/adw-gtk3/package.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index 7511b95242c7..de4424e7a986 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -5,34 +5,27 @@ nix-update-script, meson, ninja, - sassc, + dart-sass, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "adw-gtk3"; - version = "5.10"; + version = "6.2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "adw-gtk3"; tag = "v${finalAttrs.version}"; - hash = "sha256-0OZk27b0kujzWtRX5uvelTMivL19g6sNB1IY6BsrO10="; + hash = "sha256-YYaqSEnIYHHkY4L3UhFBkR3DehoB6QADhSGOP/9NKx8="; }; nativeBuildInputs = [ meson ninja - sassc + dart-sass ]; - postPatch = '' - chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh - patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh - ''; - - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Theme from libadwaita ported to GTK-3"; From 4f91e6463eedb45a9ce6a37083f46cfe7f595532 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 16 May 2025 23:45:04 +0200 Subject: [PATCH 2/4] adw-gtk3: add myself as maintainer --- pkgs/by-name/ad/adw-gtk3/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index de4424e7a986..395f60d5571f 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -32,6 +32,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/lassekongo83/adw-gtk3"; license = lib.licenses.lgpl21Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ciferkey ]; + maintainers = with lib.maintainers; [ + ciferkey + Gliczy + ]; }; }) From 56267970c2a7818a5f89508e1733520d7deb7df8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 26 May 2025 14:35:06 +0200 Subject: [PATCH 3/4] adw-gtk3: add normalcea as maintainer --- pkgs/by-name/ad/adw-gtk3/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index 395f60d5571f..a7695a4d10fe 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ciferkey Gliczy + normalcea ]; }; }) From 1228b36dbf39428356553f19db23c2e152e99885 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 26 May 2025 14:36:33 +0200 Subject: [PATCH 4/4] adw-gtk3: change description --- pkgs/by-name/ad/adw-gtk3/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index a7695a4d10fe..274e21c3af28 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - description = "Theme from libadwaita ported to GTK-3"; + description = "Unofficial GTK 3 port of libadwaita"; homepage = "https://github.com/lassekongo83/adw-gtk3"; license = lib.licenses.lgpl21Only; platforms = lib.platforms.unix;