From 7aff8112926043de70ef9b709ce954abc9630863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 23 Nov 2021 02:18:59 +0100 Subject: [PATCH 01/28] nixos/cinnamon: add xapps to extra app list --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a0a5873f72fe..82b07206a8b6 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -202,6 +202,13 @@ in blueberry warpinator + # cinnamon xapps + xviewer + xreader + xed + xplayer + pix + # external apps shipped with linux-mint hexchat gnome-calculator From 4bf3f51a0010e922e4dfc262551edbaca5d08662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 23 Nov 2021 02:22:30 +0100 Subject: [PATCH 02/28] cinnamon.xviewer: add team cinnamon as maintainer --- pkgs/desktops/cinnamon/xviewer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 20c36827cb08..6f68481b92db 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/xviewer"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ tu-maurice ]; + maintainers = with maintainers; [ tu-maurice ] ++ teams.cinnamon.members; }; } From f5d3fd8276f60ba524c8144f2f4038593b2b7f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 23 Nov 2021 02:23:14 +0100 Subject: [PATCH 03/28] cinnamon.warpinator: make team cinnamon the maintainer --- pkgs/desktops/cinnamon/warpinator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 8b316d37f587..348b0fbd5242 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -73,6 +73,6 @@ python3.pkgs.buildPythonApplication rec { description = "Share files across the LAN"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } From 1ed9d6b5f934dc5f8f44b6d8d81a564715bfe6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 23 Nov 2021 02:25:26 +0100 Subject: [PATCH 04/28] cinnamon.mint-artwork: add meta --- pkgs/desktops/cinnamon/mint-artwork/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index b3a542e513e8..5f348917656a 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , glib , nixos-artwork @@ -36,4 +37,12 @@ stdenv.mkDerivation rec { mv etc $out/etc mv usr/share $out/share ''; + + meta = with lib; { + homepage = "https://github.com/linuxmint/mint-artwork"; + description = "Artwork for the cinnamon desktop"; + license = licenses.gpl3; # from debian/copyright + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; } From 5a5617a2be8dc48297ef54aae8e9062148d2ea52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 23 Nov 2021 02:26:09 +0100 Subject: [PATCH 05/28] cinnamon.cinnamon-settings-daemon: make team cinnamon the maintainer --- pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 69b08fc64ed9..62fa5965dbeb 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -121,6 +121,6 @@ stdenv.mkDerivation rec { description = "The settings daemon for the Cinnamon desktop"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } From 3de6d756d165f39da9c754b964650dacd02b1dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 23 Nov 2021 02:27:04 +0100 Subject: [PATCH 06/28] cinnamon.bulky: make team cinnamon the maintainer --- pkgs/desktops/cinnamon/bulky/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 511cb6a1c092..1eab6865d42e 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/linuxmint/bulky"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.mkg20001 ]; + maintainers = teams.cinnamon.members; }; } From db93a29ef36e0177989e01da5eda102a723896b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 23 Nov 2021 02:46:04 +0100 Subject: [PATCH 07/28] cinnamon.xreader: init at 3.0.2 --- pkgs/desktops/cinnamon/default.nix | 1 + pkgs/desktops/cinnamon/xreader/default.nix | 76 ++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 pkgs/desktops/cinnamon/xreader/default.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 4d148fdcdb0b..2bbcddd2976f 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -32,5 +32,6 @@ lib.makeScope pkgs.newScope (self: with self; { muffin = callPackage ./muffin { }; xapps = callPackage ./xapps { }; warpinator = callPackage ./warpinator { }; + xreader = callPackage ./xreader { }; xviewer = callPackage ./xviewer { }; }) diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix new file mode 100644 index 000000000000..39c7e11cbeb8 --- /dev/null +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, fetchFromGitHub +, glib +, gobject-introspection +, intltool +, shared-mime-info +, gtk3 +, wrapGAppsHook +, libxml2 +, xapps +, meson +, pkg-config +, cairo +, libsecret +, poppler +, libspectre +, libgxps +, webkitgtk +, nodePackages +, ninja +, gsettings-desktop-schemas +, djvulibre +, backends ? [ "pdf" "ps" /* "dvi" "t1lib" */ "djvu" "tiff" "pixbuf" "comics" "xps" "epub" ] +}: + +stdenv.mkDerivation rec { + pname = "xreader"; + version = "3.0.2"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "vyZhKsuASbkc6IBtfbhTIHOQ0XYNFaCVua+jS4B5LWk="; + }; + + nativeBuildInputs = [ + shared-mime-info + wrapGAppsHook + meson + ninja + pkg-config + gobject-introspection + intltool + ]; + + mesonFlags = [ + "-Dmathjax-directory=${nodePackages.mathjax}" + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ] ++ (map (x: "-D${x}=true") backends); + + buildInputs = [ + glib + gtk3 + xapps + cairo + libxml2 + libsecret + poppler + libspectre + libgxps + webkitgtk + nodePackages.mathjax + djvulibre + ]; + + meta = with lib; { + description = "A document viewer capable of displaying multiple and single page +document formats like PDF and Postscript"; + homepage = "https://github.com/linuxmint/xreader"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; +} From df84399f53cf5a7ae5a74ff9e05431bf0429009d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 23 Nov 2021 03:03:53 +0100 Subject: [PATCH 08/28] cinnamon.pix: init at 2.6.5 --- pkgs/desktops/cinnamon/default.nix | 1 + pkgs/desktops/cinnamon/pix/default.nix | 75 ++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 pkgs/desktops/cinnamon/pix/default.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 2bbcddd2976f..00927b0fa919 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -30,6 +30,7 @@ lib.makeScope pkgs.newScope (self: with self; { mint-x-icons = callPackage ./mint-x-icons { }; mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; + pix = callPackage ./pix { }; xapps = callPackage ./xapps { }; warpinator = callPackage ./warpinator { }; xreader = callPackage ./xreader { }; diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix new file mode 100644 index 000000000000..c97824db1a72 --- /dev/null +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, cinnamon-desktop +, file +, gdk-pixbuf +, glib +, gobject-introspection +, gtk-doc +, gtk3 +, intltool +, itstool +, libtool +, libxml2 +, pkg-config +, shared-mime-info +, wrapGAppsHook +, xapps +, yelp-tools +, libsecret +, webkitgtk +, libwebp +, librsvg +, json-glib +, gnome +, clutter +}: + +stdenv.mkDerivation rec { + pname = "pix"; + version = "2.6.5"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "qBF5lc7ZNwuTr6x4c4pJA6a7oXqOYsYA1lpTmQkylT0="; + }; + + nativeBuildInputs = [ + wrapGAppsHook + autoreconfHook + cinnamon-desktop + gdk-pixbuf + gnome.gnome-common + gobject-introspection + gtk-doc + intltool + itstool + libtool + pkg-config + yelp-tools + ]; + + buildInputs = [ + glib + gtk3 + xapps + libsecret + webkitgtk + libwebp + librsvg + json-glib + clutter + ]; + + meta = with lib; { + description = "A generic image viewer from Linux Mint"; + homepage = "https://github.com/linuxmint/pix"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = teams.cinnamon.members; + }; +} From 0733df83f8ca90bb2c993c371269c71c4d59d4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:13:10 +0100 Subject: [PATCH 09/28] cinnamon.bulky: 1.7 -> 1.9 --- pkgs/desktops/cinnamon/bulky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 1eab6865d42e..f7579f3e4c6b 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.7"; + version = "1.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - sha256 = "sha256-+3OoeuGuyiHWlUrxm5A7CmNR+ijxdlmecmvqk+i+h08="; + hash = "sha256-OCBFhlnEXZROp47KDiy7Y6l4GDVCCP+i1IFYQa7esyg="; }; nativeBuildInputs = [ From a0cbed6fb9702313de63ac5a9a32858513ac12ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:13:24 +0100 Subject: [PATCH 10/28] cinnamon.cinnamon-common: 4.8.6 -> 5.2.0 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 936c4578ea3d..c8c3a31a5ef7 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "4.8.6"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-4DMXQYH1/RjLhgrn55I7Vkk6+gGsR+OVmiwxVHUIyro="; + hash = "sha256-B2Du2zis0xWeeyh3kSyz1doWImk9Fuk4qQ8HNZZdqdw="; }; patches = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { buildInputs = [ # TODO: review if we really need this all - (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro ])) + (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ])) atk cacert cinnamon-control-center From 3226fb88d4f6a29d3c32e28dd2e3b18ae38c51bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:13:40 +0100 Subject: [PATCH 11/28] cinnamon.cinnamon-control-center: 4.8.2 -> 5.2.0 --- .../desktops/cinnamon/cinnamon-control-center/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 94080e3e47a3..f516e4818308 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -29,17 +29,18 @@ , meson , ninja , cinnamon-translations +, python3 }: stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "4.8.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-vALThDY0uN9bV7b1fga3MK7b2/l5uL33+B2x6oSLPRE="; + hash = "sha256-j7+2uLcHr7bO7i8OGqkw3ifawZULNyihhJ+h2D5gx/k="; }; buildInputs = [ @@ -74,6 +75,8 @@ stdenv.mkDerivation rec { sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c + + patchShebangs meson_install_schemas.py ''; # it needs to have access to that file, otherwise we can't run tests after build @@ -103,6 +106,7 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook gettext + python3 ]; meta = with lib; { From bd0acde36882e22f94d6a996b5e2355778c7efd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:13:55 +0100 Subject: [PATCH 12/28] cinnamon.cinnamon-desktop: 4.8.1 -> 5.2.0 --- pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 25af38d43b5e..717f2633b9a1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "4.8.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-FLruY1lxzB3iJ/So3jSjrbv9e8VoN/0+U2YDXju/u3E="; + hash = "sha256-gOlSmcHjBjnLdDpgC5mZ4M3eUBTG3BuET6Kr/Xby14A="; }; outputs = [ "out" "dev" ]; From 8e9cc0733c2a3c3a0a96b0320500f09beb4e01c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:14:07 +0100 Subject: [PATCH 13/28] cinnamon.cinnamon-menus: 4.8.2 -> 5.2.0 --- pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 44566a94c6df..d143176f765f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "4.8.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-9VSrqCjC8U3js1gqjl5QFctWYECATxN+AdfMdHLxYUY="; + hash = "sha256-ioluv/GdWCNGP2jQqsyEbHncCFm8iu69yR8QVKQTJk8="; }; buildInputs = [ From 36bab07f0c982fedb7f825b26183525c7876368a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:14:21 +0100 Subject: [PATCH 14/28] cinnamon.cinnamon-screensaver: 4.8.1 -> 5.2.0 --- pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index b70673253edf..ad4f079359fe 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "4.8.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-gvSGxSYKnRqJhj2unRYRHp6qGw/O9SxKPzhw5xjCSSQ="; + hash = "sha256-weQ5sw5SY89JFIxamCeLiSLy8xCXGg0Yxj/5Ca5r+6o="; }; nativeBuildInputs = [ From 575e61ac7f1fb2d25ca07e08afdd5e2a2c8c89ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:14:34 +0100 Subject: [PATCH 15/28] cinnamon.cinnamon-session: 4.8.0 -> 5.2.0 --- pkgs/desktops/cinnamon/cinnamon-session/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 3f1ceb2dc610..a26580a56821 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -21,20 +21,19 @@ , xapps , xmlto , xorg -, cmake , libexecinfo , pango }: stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.8.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-lrwR8VSdPzHoc9MeBEQPbVfWNhPZDJ2wYizKSVpobmk="; + hash = "sha256-E5ascwLnpa5NSBAPo9dXRhoraUntzDPHVV32uDU4U8k="; }; patches = [ @@ -85,7 +84,6 @@ stdenv.mkDerivation rec { # TODO: https://github.com/NixOS/nixpkgs/issues/36468 "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" - "-DENABLE_IPV6=true" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; From 5ec4f8bf7f659500c3b04918a90ded7963a42fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:14:47 +0100 Subject: [PATCH 16/28] cinnamon.cinnamon-settings-daemon: 4.8.5 -> 5.2.0 --- .../desktops/cinnamon/cinnamon-settings-daemon/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 62fa5965dbeb..bf83c3d9f594 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -13,7 +13,8 @@ , wrapGAppsHook , pkg-config , pulseaudio -, lib, stdenv +, lib +, stdenv , systemd , upower , dconf @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "4.8.5"; + version = "5.2.0"; /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory #include "csd-power-proxy.h" @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-PAWVTjGFs8yKXgNQ2ucDnEDS+n7bp2n3lhGl9gHXfdQ="; + hash = "sha256-6omif4UxMrXWxL+R9lQ8ogxotW+3E9Kp99toH3PJtaU="; }; patches = [ From d9ab6ff3ffa4fd3bb512e091ac79e98d20720f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:15:00 +0100 Subject: [PATCH 17/28] cinnamon.cinnamon-translations: 5.0.0 -> 5.2.0 --- pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index f790c54052de..f9337f764926 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "5.0.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qBLg0z0ZoS7clclKsIxMG6378Q1iv1NnhS9cz3f4cEc="; + hash = "sha256-t3PydmS2+LU++2NcosgMr9KTXW0Qy1Re9+YcS3KMDi8="; }; nativeBuildInputs = [ From b4aa62ec19b1110df9224037b412b7f5330b99e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:15:10 +0100 Subject: [PATCH 18/28] cinnamon.cjs: 4.8.2 -> 5.2.0 --- pkgs/desktops/cinnamon/cjs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 2e1c739c0f07..3ac4483c5c9a 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -25,23 +25,24 @@ , makeWrapper , which , libxml2 +, gtk4 }: stdenv.mkDerivation rec { pname = "cjs"; - version = "4.8.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-6+zlWL0DmyP+RFp1ECA4XGbgYUlsMqqyTd6z46w99Ug="; + hash = "sha256-06sTk513qVMdznSHJzzB3XIPTcfjgxTB2o+ALqwPpHM="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ - meson # ADDING cmake breaks the build, ignore meson warning + meson ninja pkg-config makeWrapper @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gtk4 gobject-introspection cairo readline From 403e4d7af6c8f6feff903e0a8a78ae3bce9de238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:15:22 +0100 Subject: [PATCH 19/28] cinnamon.mint-artwork: 1.4.3 -> 1.5.4 --- pkgs/desktops/cinnamon/mint-artwork/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 5f348917656a..abc7c172cb77 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.4.3"; + version = "1.5.4"; src = fetchurl { url = "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"; - sha256 = "126asxpg722qfg2wkwcr7bhsplchq3jn6bkdwf1scpc5za8dd62j"; + hash = "sha256-ZRJK1fzIF36BdUlVhLwdFdfgQvN2ashzjgpCxoOIbK8="; }; nativeBuildInputs = [ From 652b0ea6fa0ae8b0619842bbdae55acfd49b73aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:15:36 +0100 Subject: [PATCH 20/28] cinnamon.mint-themes: 1.8.6 -> 1.8.8 --- pkgs/desktops/cinnamon/mint-themes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index 67020ce0b36a..acdd293050df 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-themes"; - version = "1.8.6"; + version = "1.8.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # commit is named 1.8.6, tags=404 - rev = "fa0b9530f6e68c390aecd622b229072fcd08f05f"; - sha256 = "0pgv5hglsscip5s7nv0mn301vkn0j6wp4rv34vr941yai1jfk2wb"; + # they don't exactly do tags, it's just a named commit + rev = "a833fba6917043bf410dee4364c9a36af1ce4c83"; + hash = "sha256-8abjjD0XoApvqB8SNlWsqIEp7ozgiERGS0kWglw2DWA="; }; nativeBuildInputs = [ From 11372c16cfaa82b7d7042da367a287eff0c5ae90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:15:50 +0100 Subject: [PATCH 21/28] cinnamon.mint-x-icons: 1.5.5 -> 1.6.3 --- pkgs/desktops/cinnamon/mint-x-icons/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index f4a04cf33a84..c0a82dd24a96 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "mint-x-icons"; - version = "1.5.5"; + version = "1.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # commit is named 1.5.5, tags=404 - rev = "ecfbeb62bba41e85a61099df467c4700ac63c1e0"; - sha256 = "1yxm7h7giag5hmymgxsg16vc0rhxb2vn3piaksc463mic4vwfa3i"; + # they don't exactly do tags, it's just a named commit + rev = "286eb4acdfc3e3c77572dfd0cd70ffd4208d3a35"; + hash = "sha256-mZkCEBC1O2mW8rM1kpOWdC5CwIeafyBS95cMY6x1yco="; }; propagatedBuildInputs = [ From c27e5b5e9d55b91c2ff75d69e2ce6b407839c439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:16:02 +0100 Subject: [PATCH 22/28] cinnamon.mint-y-icons: 1.4.3 -> 1.5.8 --- pkgs/desktops/cinnamon/mint-y-icons/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index e04a1baa6696..e400ab14ff19 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "mint-y-icons"; - version = "1.4.3"; + version = "1.5.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # commit is named 1.4.3, tags=404 - rev = "c997af402d425889f2e4277966eebe473f7451f7"; - sha256 = "0yfas949xm85a28vgjqm9ym3bhhynrq256w9vfs8aiqq9nbm18mf"; + # they don't exactly do tags, it's just a named commit + rev = "9489bd161e9503d071227dd36057386a34cfc0a3"; + hash = "sha256-53yTCWNSJjCpVvrxLfsiaCPNDEZWxJgGVAmVNMNql2M="; }; propagatedBuildInputs = [ From a8d1dab1a8755503e06791a07c73859e6a464e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:16:11 +0100 Subject: [PATCH 23/28] cinnamon.muffin: 4.8.1 -> 5.2.0 --- 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 5470933d619b..6377737d6b0e 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "4.8.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-zRW+hnoaKKTe4zIJpY1D0Ahc8k5zRbvYBF5Y4vZ6Rbs="; + hash = "sha256-WAp0HbfRtwsPjJX1kPBqUStqLaudQPZ8E+h4jmggmw8="; }; buildInputs = [ From b64907452c37cb89bd3cb6bc76de154f6a50c81b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:16:20 +0100 Subject: [PATCH 24/28] cinnamon.nemo: 5.0.3 -> 5.2.0 --- pkgs/desktops/cinnamon/nemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index c801342ff2c2..f931ac3158ae 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.0.3"; + version = "5.2.0"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Ah1Rp/o4LPdYm+wj2W5ljjMkCI3PgoAHrlM8yEQP77o="; + hash = "sha256-ehcqRlI1d/KWNas36dz+hb7KU1H8wtQHTpg2fz1XdXU="; }; outputs = [ "out" "dev" ]; From 56ba20a3138d122e9ce91d2a68e48889f0c3f6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:16:31 +0100 Subject: [PATCH 25/28] cinnamon.warpinator: 1.0.8 -> 1.2.5 --- pkgs/desktops/cinnamon/warpinator/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 348b0fbd5242..8ed66dc54d55 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.0.8"; + version = "1.2.5"; format = "other"; @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0n1b50j2w76qnhfj5yg5q2j7fgxr9gbmzpazmbml4q41h8ybcmxm"; + hash = "sha256-pTLM4CrkBLEZS9IdM9IBSGH0WPOj1rlAgvWLOUy6MxY="; }; nativeBuildInputs = [ @@ -54,6 +54,10 @@ python3.pkgs.buildPythonApplication rec { netifaces ]; + mesonFlags = [ + "-Dbundle-zeroconf=false" + ]; + postPatch = '' chmod +x install-scripts/* patchShebangs . From a5f5b39a976ed85abd6c60857191d217f729642d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:16:40 +0100 Subject: [PATCH 26/28] cinnamon.xapps: 2.2.3 -> 2.2.5 --- pkgs/desktops/cinnamon/xapps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index 011c5c2906f4..9e7654827b0d 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xapps"; - version = "2.2.3"; + version = "2.2.5"; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-hrSyoHA3XQXQb9N3YJ+NNfBjJNOuUhXhKEimh/n73MM="; + hash = "sha256-Ev+gTl9jY1HLbXKnCsVVSsY8ZrHyzsIkp+JTaXOTm6I="; }; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 From c11c15c7322dc07369fdce78d23cc1c061e379d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 24 Nov 2021 10:48:19 +0100 Subject: [PATCH 27/28] python3.pkgs.xapp: 2.0.2 -> 2.2.1 --- pkgs/development/python-modules/xapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 72f386b36272..7cb664d77fcd 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.0.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - sha256 = "1zgh4k96i939w4scikajmlriayk1zg3md16f8fckjvqbphpxrysl"; + hash = "sha256-UC+0nbf+SRQsF5R0LcrPpmNbaoRM14DC82JccSpsKsY="; }; propagatedBuildInputs = [ From 078a4f9f3fe7373f774e6ca17a269280745c970d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 27 Nov 2021 09:07:59 +0100 Subject: [PATCH 28/28] cinnamon.cinnamon-common: fix #146507 online-accounts in cinnamon-settings broken --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index c8c3a31a5ef7..0ce9c53c2fef 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -62,6 +62,11 @@ stdenv.mkDerivation rec { patches = [ ./use-sane-install-dir.patch ./libdir.patch + + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/77ed66050f7df889fcb7a10b702c7b8bcdeaa130.patch"; + sha256 = "sha256-OegLxz6Xr/nxVwVOAd2oOY62ohZ3r6uYn1+YED5EBHQ="; + }) ]; buildInputs = [