From 65ad7bd2c294e8a91613fdb21d91bd2690f6e799 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 5 Jun 2024 13:46:58 +0000 Subject: [PATCH 1/7] python3Packages.xapp: 2.4.1 -> 2.4.2 https://github.com/linuxmint/python3-xapp/compare/2.4.1...2.4.2 --- pkgs/development/python-modules/xapp/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index ba55391ca66f..631857b89d5b 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.4.1"; + version = "2.4.2"; format = "other"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o="; + hash = "sha256-Gbm4YT9ZyrROOAbKz5xYd9J9YG9cUL2Oo6dDCPciaBs="; }; nativeBuildInputs = [ @@ -42,14 +42,8 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" - ''; - - postInstall = '' - # This is typically set by pipInstallHook/eggInstallHook, - # so we have to do so manually when using meson. - # https://github.com/NixOS/nixpkgs/issues/175227 - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + substituteInPlace "xapp/os.py" \ + --replace-fail "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; doCheck = false; @@ -63,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/linuxmint/python-xapp"; description = "Cross-desktop libraries and common resources for python"; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = teams.cinnamon.members; }; From e0d69e6ba699dd527c8c870035722537b23e814e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 5 Jun 2024 21:31:25 +0800 Subject: [PATCH 2/7] cinnamon.xapp: 2.8.2 -> 2.8.3 https://github.com/linuxmint/xapp/compare/2.8.2...2.8.3 --- pkgs/desktops/cinnamon/xapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 14b706fbd4c3..b55830b56c45 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.2"; + version = "2.8.3"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-n600mc8/4+bYUtYaHUnmr90ThVkngcu8Ft02iuSrWWQ="; + hash = "sha256-uWBHCsKcW0vP2HYHQWXPrCSr5NsN2nYWAzBByxJBVrY="; }; # Recommended by upstream, which enables the build of xapp-debug. From 6fb8a55a3b6a2d7bb498d9af44d674a0d04bf8ff Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 5 Jun 2024 21:32:48 +0800 Subject: [PATCH 3/7] cinnamon.xreader: 4.0.2 -> 4.2.0 https://github.com/linuxmint/xreader/compare/4.0.2...4.2.0 --- pkgs/desktops/cinnamon/xreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 05a4aedfb6ed..19e8ced87c90 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "4.0.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-X5XMkO2JFceLyH7KEp8mnDltdjGpCT4kVGdcpGRpUJI="; + sha256 = "sha256-MWSAyXQcE8cDdzJISFV7UHheHX+7zF1Ula+LGicvUPM="; }; nativeBuildInputs = [ From fd6788b5d50c50b1e34bdaffe5b5595ed7e37161 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 5 Jun 2024 21:33:27 +0800 Subject: [PATCH 4/7] xdg-desktop-portal-xapp: 1.0.4 -> 1.0.5 https://github.com/linuxmint/xdg-desktop-portal-xapp/compare/1.0.4...1.0.5 --- .../libraries/xdg-desktop-portal-xapp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index d614627a0749..a0808f78c268 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -8,19 +8,20 @@ , cinnamon , glib , gsettings-desktop-schemas +, gtk3 , mate , xdg-desktop-portal }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-Zz44PCociYhUuHTS3HJNxJPCkiIl01FFe4//7jtgDsk="; + hash = "sha256-dQDz5x6rCJ9BprwrVZVL9BgYqgWmC5eZ8xamX9elLD0="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { cinnamon.cinnamon-desktop # org.cinnamon.desktop.background glib gsettings-desktop-schemas # org.gnome.system.location + gtk3 mate.mate-desktop # org.mate.background xdg-desktop-portal ]; From a3800d7e5dc78f5cf941f134ffea3d11ed256682 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 5 Jun 2024 21:33:58 +0800 Subject: [PATCH 5/7] xed-editor: 3.4.5 -> 3.6.1 https://github.com/linuxmint/xed/compare/3.4.5...3.6.1 --- pkgs/applications/editors/xed-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index cb147cf099eb..9034b2eb375c 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.4.5"; + version = "3.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-MXRxzmRo/dRhp5Llib9ng1gzWW8uvzqTMjUVK8a3eJ8="; + sha256 = "sha256-RFauTXwiaSd+J8zoJQmib4bKNR4NC/LSCCqCHv8Hdr8="; }; patches = [ From 6bdc9ea86df237482d3be1828265e7ba11271955 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 6 Jun 2024 20:41:38 +0800 Subject: [PATCH 6/7] timeshift: 24.01.1 -> 24.06.1 https://github.com/linuxmint/timeshift/compare/24.01.1...24.06.1 --- pkgs/applications/backup/timeshift/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index dd0cff4d5555..74fff5fb87ed 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.01.1"; + version = "24.06.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-vAKUR0VsOuiQmB+1jPOR0KufzfXaxAsf3EOPzdgFt0A="; + hash = "sha256-H4PCZ1WwNg34WSDXgmH6pUPBglXafLTFfIzvmWiyeCw="; }; patches = [ From 073a07cc63891f7076bf2db257078f2008a78fae Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 6 Jun 2024 22:27:16 +0800 Subject: [PATCH 7/7] cinnamon.pix: 3.2.2 -> 3.4.0 https://github.com/linuxmint/pix/compare/3.2.2...3.4.0 --- pkgs/desktops/cinnamon/pix/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 45b8da1760ba..a0ef67a9302b 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -7,6 +7,7 @@ , exiv2 , libheif , libjpeg +, libjxl , libtiff , gst_all_1 , libraw @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.2.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-tRndJjUw/k5mJPFTBMfW88Mvp2wZtC3RUzyS8bBO1jc="; + sha256 = "sha256-XXt5tq+Zfm6fqorsFAWV3guii6gTK5JRgw26GkNkoos="; }; nativeBuildInputs = [ @@ -65,6 +66,7 @@ stdenv.mkDerivation rec { lcms2 libheif libjpeg + libjxl libraw librsvg libsecret