From a6d4e3d86ab1838dd5e0b4f1eb613f4ff6924e90 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 13:36:01 +0800 Subject: [PATCH 1/9] cinnamon.cinnamon-common: 5.4.8 -> 5.4.9 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 87d500cf617b..3581355387e5 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -53,13 +53,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.4.8"; + version = "5.4.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-Z+BbvLgH4gOsLMSC0r5Hp9yDZz4XMH7NR/A9to+/djA="; + hash = "sha256-nM87NO/dwOd+hN5/3zX7XUjyKvXh4uDhLcGFcKE9ccA="; }; patches = [ From 880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 13:49:14 +0800 Subject: [PATCH 2/9] cinnamon.cinnamon-control-center: 5.4.4 -> 5.4.6 Upstream don't really add gio-unix-2.0 as dependency when doing gdbus_codegen so this regressed again :-( --- .../cinnamon-control-center/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 6a8e344ba47c..dded4a9ff610 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , glib , gettext @@ -18,6 +17,7 @@ , libgnomekbd , libxklavier , networkmanager +, libgudev , libwacom , gnome , wrapGAppsHook @@ -36,22 +36,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.4.4"; - - patches = [ - # Add missing gio-unix-2.0 dependency, can be removed on next update - # https://github.com/linuxmint/cinnamon-control-center/pull/294 - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon-control-center/commit/7f5ba6e7a691547840f8482445c09c729e10a397.patch"; - sha256 = "sha256-xcf/O/DfhOvCpWJl0XZD+xAwWs4STAeCaFMZ9Lftv2w="; - }) - ]; + version = "5.4.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-c2JbRAMcTnqaqt8MXQl4AxnENVmfYyHcCteWBWQUSO0="; + hash = "sha256-8BDmQT/xDnpwR2YC0TGaqWPnZ61IBmVvft2Mcf6YN+A="; }; buildInputs = [ @@ -66,6 +57,7 @@ stdenv.mkDerivation rec { libxklavier colord cinnamon-settings-daemon + libgudev libwacom gnome-online-accounts tzdata @@ -98,6 +90,8 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; From 6adcb48c0da52060eef9437f469b4a57d67a8043 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 13:53:25 +0800 Subject: [PATCH 3/9] cinnamon.cinnamon-screensaver: 5.4.1 -> 5.4.2 --- .../cinnamon/cinnamon-screensaver/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 23be4175ab6d..5f0ace4ad1ee 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , meson , ninja @@ -30,22 +29,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.4.1"; - - patches = [ - # Add missing gio-unix-2.0 dependency, can be removed on next update - # https://github.com/linuxmint/cinnamon-screensaver/pull/411 - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon-screensaver/commit/8d658e7f313879579322dce666551f132795540b.patch"; - sha256 = "sha256-HjVQSX2yYqgZVIio2I8GBWLYOddvaFiqZzf0zaYf+OE="; - }) - ]; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-PpBtLAIboXMnX5V/u06aoZ6WfPrn4mdCu0NXTGb6pAE="; + hash = "sha256-GRa3ChUCL/AFDg1F01DNwkC4tmrNaOWoOXwFvwpvSck="; }; nativeBuildInputs = [ From 5c5585f7ac24db04b9b496552c2b3a9cb54cf497 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 13:58:51 +0800 Subject: [PATCH 4/9] cinnamon.cinnamon-settings-daemon: 5.4.3 -> 5.4.5 --- .../desktops/cinnamon/cinnamon-settings-daemon/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index d4d05df8f558..ed947ee2b508 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -21,7 +21,6 @@ , polkit , librsvg , libwacom -, xf86_input_wacom , xorg , fontconfig , tzdata @@ -33,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.4.3"; + version = "5.4.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-3ELsb0hH7GjMjwjsIg2m8k/EBCHIQGW3O7eDaqT2V7I="; + hash = "sha256-qjI1z1MuaI5JFqjHap/+aYDQ0YuP9VNnnY6vy/AaKqs="; }; patches = [ @@ -65,11 +64,9 @@ stdenv.mkDerivation rec { polkit librsvg libwacom - xf86_input_wacom xorg.libXext xorg.libX11 xorg.libXi - xorg.libXtst xorg.libXfixes fontconfig nss From 9e2fd038fbf470728aa74d270f03406afbda2c4a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 14:01:00 +0800 Subject: [PATCH 5/9] cinnamon.mint-themes: 2.0.3 -> 2.0.4 --- pkgs/desktops/cinnamon/mint-themes/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index db57de2aee07..bfb2d74e8ea9 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "mint-themes"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "38b5606c3889a9a0bac0e2ab39196f675496982c"; - hash = "sha256-Cc5p9WWLFPQ8K0CpL236LilAgBuO6HdfGt/rb0wiVpc="; + rev = "73d6cfea807ea84a645f43424c60916cb6214693"; + hash = "sha256-WyEabE3K7xuBzXuLqJO0N4nxrc67bKT5YD9yn/bELl0="; }; nativeBuildInputs = [ @@ -29,8 +29,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p $out mv usr/share $out + runHook postInstall ''; meta = with lib; { From 9217c8084d8bc067d48c8edf5768e9dc54962970 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 14:13:48 +0800 Subject: [PATCH 6/9] cinnamon.mint-y-icons: 1.6.0 -> 1.6.1 --- pkgs/desktops/cinnamon/mint-y-icons/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 48df2b260ca7..212de9646223 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "mint-y-icons"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "6294c4538a08a2a6c5fd68e223472d9c144ff8b0"; - hash = "sha256-6tR3OFvU1ID61n4gr0R6pJyo3CjKvu8mgtXzMOINgq0="; + rev = "57d16eb85f2af40be17e2232d279bb65b689f5b7"; + hash = "sha256-voFYz0MiuqyNSngi4QZUJKDIjggQWOAV5B30zMP8iTk="; }; propagatedBuildInputs = [ From b8529450c6a3d4b6ec5ec6a19ef32ef5505f47a9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 14:15:08 +0800 Subject: [PATCH 7/9] cinnamon.muffin: 5.4.4 -> 5.4.5 --- pkgs/desktops/cinnamon/muffin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index c7d803ed5aca..bf385a8186d8 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "5.4.4"; + version = "5.4.5"; outputs = [ "out" "dev" "man" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-u3PNSyjxtPLFdA+2Iz+NuqlcQC9IwsFb7Tb5eVAJunY="; + hash = "sha256-gtki0MTIMI1JggtVn0dAhkq364hkTuH7Zf7CF32Lc8E="; }; nativeBuildInputs = [ From ae47d9f9fa4680b8621ddc3b6d1b2736b28c605e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 14:16:03 +0800 Subject: [PATCH 8/9] cinnamon.xviewer: 3.2.9 -> 3.2.10 --- pkgs/desktops/cinnamon/xviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index c0dc50182c01..2c55f6140244 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-sDDQ/LGhHH13gRjVfpTyHYsYhelp80KNE75I8AlskoU="; + sha256 = "sha256-c3K9yjeaAlyXqgxzHgnLXgqwaB5Fdw+mS9jricy8QA8="; }; nativeBuildInputs = [ From 44d3de2222753b185b5b49dcbc03dd0afc408b70 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Aug 2022 14:18:10 +0800 Subject: [PATCH 9/9] xplayer: 2.4.3 -> 2.4.4 --- pkgs/applications/video/xplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index 3bbbb115fbea..c75635b44b31 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "xplayer"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-0hQHhf2me28YTTKOzEkzoxRoSoHLwtiaHPKNPJ/Fg+0="; + sha256 = "sha256-o2vLNIELd1EYWG26t5gOpnamJrBJeg4P6fcLirkcmfM="; }; # configure wants to find gst-inspect-1.0 via pkgconfig but