From c466c229453905d84f0bc3258eda525d91feb7ed Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 25 Nov 2024 22:26:57 +0800 Subject: [PATCH 1/9] xdg-desktop-portal-xapp: 1.0.9 -> 1.1.0 https://github.com/linuxmint/xdg-desktop-portal-xapp/compare/1.0.9...1.1.0 --- pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix index 7180e6992e91..3adb978f0d4e 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix @@ -10,17 +10,18 @@ , gsettings-desktop-schemas , mate , xdg-desktop-portal +, xapp }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-4U8d9lQxMHQ2XYXnNCQjrNup8z14Q8Ke1Bkf09AVM6k="; + hash = "sha256-9v0faB5HhUUPXOWDDyTUPaPwzMjhqdiAyuv9kM4mm2Q="; }; nativeBuildInputs = [ @@ -42,6 +43,11 @@ stdenv.mkDerivation rec { "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" ]; + preFixup = '' + # For xfce4-set-wallpaper + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ xapp ]}") + ''; + meta = with lib; { description = "Backend implementation for xdg-desktop-portal for Cinnamon, MATE, Xfce"; homepage = "https://github.com/linuxmint/xdg-desktop-portal-xapp"; From d5ba75979a0713b7e0540f88cc132f51acb869c0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 25 Nov 2024 23:02:39 +0800 Subject: [PATCH 2/9] lightdm-slick-greeter: 2.0.6 -> 2.0.7 https://github.com/linuxmint/slick-greeter/compare/2.0.6...2.0.7 --- pkgs/by-name/li/lightdm-slick-greeter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index ca3767b5db60..77e3a449ba4e 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-Q6V4axKlGhX1/uaugNkjoynHSL5jWA/eqzAsbJYcRSo="; + sha256 = "sha256-ZsbX4xB6sLpZH6vaVFlkC7hAhPLZa1T+FlPANqBQTOg="; }; nativeBuildInputs = [ From 94fe01900a552c05cbd78fdc98d8591b8f714766 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 25 Nov 2024 23:04:55 +0800 Subject: [PATCH 3/9] xapp: 2.8.5 -> 2.8.6 https://github.com/linuxmint/xapp/compare/2.8.5...2.8.6 --- pkgs/by-name/xa/xapp/package.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index a483513d30ef..a8454fda4239 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -14,6 +14,7 @@ , stdenv , vala , wrapGAppsHook3 +, file , inxi , mate , dbus @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.5"; + version = "2.8.6"; outputs = [ "out" "dev" ]; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-HGWaa1S+maphP9colWdWSzGyoA0f4vJkF889X5/rzvs="; + hash = "sha256-OQfP0XPBQrxJDrKb5PEqpBtinkQ35NMUbsYnxhbuehU="; }; # Recommended by upstream, which enables the build of xapp-debug. @@ -76,13 +77,18 @@ stdenv.mkDerivation rec { chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file patchShebangs schemas/meson_install_schemas.py - # Patch pastebin & inxi location - sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info - sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info + # Used in cinnamon-settings + substituteInPlace scripts/upload-system-info \ + --replace-fail "'/usr/bin/pastebin'" "'$out/bin/pastebin'" \ + --replace-fail "'inxi'" "'${inxi}/bin/inxi'" + + # Used in x-d-p-xapp + substituteInPlace scripts/xfce4-set-wallpaper \ + --replace-fail "file --mime-type" "${file}/bin/file --mime-type" ''; # Fix gtk3 module target dir. Proper upstream solution should be using define_variable. - PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib"; + env.PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib"; meta = with lib; { homepage = "https://github.com/linuxmint/xapp"; From 5f93d3f0e2ac0058e4a929aea80c80ad1de4084f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Nov 2024 21:18:46 +0800 Subject: [PATCH 4/9] xed-editor: 3.6.6 -> 3.6.7 https://github.com/linuxmint/xed/compare/3.6.6...3.6.7 --- pkgs/by-name/xe/xed-editor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix index 80fe7d8fc49f..94646ba66547 100644 --- a/pkgs/by-name/xe/xed-editor/package.nix +++ b/pkgs/by-name/xe/xed-editor/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - hash = "sha256-Lpdv8mX3GDzXH1FGGdmgK9b8P3EY7ETuEhGfSwc6IIE="; + hash = "sha256-hQy06+/8rJIvHK7uKyMsIMH0qAZgza/2l/hOHDMOgo4="; }; patches = [ From 36e403d7e44c1d73d89e2530be97a3924a224506 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Nov 2024 21:22:33 +0800 Subject: [PATCH 5/9] mint-l-icons: 1.7.2 -> 1.7.3 https://github.com/linuxmint/mint-l-icons/compare/ee03e6dad0b1f9e25847977eae42766e2ddd4877...f1900facf915715623ef0ca2874ae4dd04039e81 --- pkgs/by-name/mi/mint-l-icons/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/mint-l-icons/package.nix b/pkgs/by-name/mi/mint-l-icons/package.nix index 8de1c8be2d22..f58266a6d668 100644 --- a/pkgs/by-name/mi/mint-l-icons/package.nix +++ b/pkgs/by-name/mi/mint-l-icons/package.nix @@ -9,14 +9,14 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-icons"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # https://github.com/linuxmint/mint-l-icons/issues/11 - rev = "ee03e6dad0b1f9e25847977eae42766e2ddd4877"; - hash = "sha256-OKlkqDp9mZOeM4M9QN9H0WH4k+5eMEUshvadaV6qhBA="; + # They don't really do tags, this is just a named commit. + rev = "f1900facf915715623ef0ca2874ae4dd04039e81"; + hash = "sha256-UpVuhzZdw0Ri6X20N/yGFMmwEymMvLr78DwYaHD+CNY="; }; propagatedBuildInputs = [ From 354c08e5585ef09234d558e11962811eea25f7bd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Nov 2024 21:24:25 +0800 Subject: [PATCH 6/9] mint-y-icons: 1.7.7 -> 1.7.8 https://github.com/linuxmint/mint-y-icons/compare/1.7.7...1.7.8 --- pkgs/by-name/mi/mint-y-icons/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mint-y-icons/package.nix b/pkgs/by-name/mi/mint-y-icons/package.nix index 7e2fb23df1ce..b3fb96dfab4f 100644 --- a/pkgs/by-name/mi/mint-y-icons/package.nix +++ b/pkgs/by-name/mi/mint-y-icons/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-SJ6h1All5bub+Yue8zUrAYdlNf005MAdnl+pkOelods="; + hash = "sha256-30Mv6ixNgXK2CbLoX7Dw9i57QCkG8U3RA48WB4e3e8o="; }; propagatedBuildInputs = [ From 1e191cba1e4b2ba3984a6930ff05ab3742b0dabc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Nov 2024 21:25:09 +0800 Subject: [PATCH 7/9] mint-x-icons: 1.7.1 -> 1.7.2 https://github.com/linuxmint/mint-x-icons/compare/1.7.1...1.7.2 --- pkgs/by-name/mi/mint-x-icons/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mint-x-icons/package.nix b/pkgs/by-name/mi/mint-x-icons/package.nix index b4ee6d7259fa..4b9b420e35f5 100644 --- a/pkgs/by-name/mi/mint-x-icons/package.nix +++ b/pkgs/by-name/mi/mint-x-icons/package.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-OiMQpVT5cydhw6Lb+vW+LiB/4gRuRhKXe93ocFj6qa4="; + hash = "sha256-9oXMMLVjirzRVJ0Pmd/1LjeeNUgYMKaGeih3eQA7k5U="; }; propagatedBuildInputs = [ From a608ec048bfbcd11a34926e91c88664cd5ce7108 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 26 Nov 2024 21:25:35 +0800 Subject: [PATCH 8/9] mint-themes: 2.1.8 -> 2.1.9 https://github.com/linuxmint/mint-themes/compare/2.1.8...2.1.9 --- pkgs/by-name/mi/mint-themes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix index 13db58183cb5..e8a6caba1575 100644 --- a/pkgs/by-name/mi/mint-themes/package.nix +++ b/pkgs/by-name/mi/mint-themes/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.8"; + version = "2.1.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-mkcIhZRaOUom1Rurz/IO646FSF50efLN6xfesPdyVHc="; + hash = "sha256-+RuhpM4Qk5iU+Mxi8adneUL8fpC896FGKR2HNTnc1+U="; }; nativeBuildInputs = [ From 84151e088b81838ae151703f948848834b8479dc Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 25 Nov 2024 22:22:13 +0800 Subject: [PATCH 9/9] folder-color-switcher: 1.6.4 -> 1.6.5 https://github.com/linuxmint/folder-color-switcher/compare/c9d1a2b9c7f40ff7bb77ee74a277988bb8a4adf2...ba8ea15a48a1a31f318676f4079789af20bdf099 --- pkgs/by-name/fo/folder-color-switcher/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/folder-color-switcher/package.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix index e6fd9dd0e569..c219574fb1c2 100644 --- a/pkgs/by-name/fo/folder-color-switcher/package.nix +++ b/pkgs/by-name/fo/folder-color-switcher/package.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "c9d1a2b9c7f40ff7bb77ee74a277988bb8a4adf2"; - hash = "sha256-5k0YybA40MefqQixNFyQFMuy7t4aSGsI3BK0RbZDu28="; + rev = "ba8ea15a48a1a31f318676f4079789af20bdf099"; + hash = "sha256-jbfc831wTA3NMa905ZzMnV0dyzzqZxOzrRPdgS7E2ZU="; }; nativeBuildInputs = [