diff options
author | Bobby Rong <rjl931189261@126.com> | 2024-06-25 21:33:27 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-25 21:33:27 +0800 |
commit | 1373dd5ac8e60753260c3e7ed7a0440515d94f50 (patch) | |
tree | 3ddaceb96682488f36f404398133edcf1e6c7f69 | |
parent | 6038b015e0a0137d1d4576f7e9eab9c52f33527b (diff) | |
parent | d08a3f7e966a5b9748883bc767da41cc3e059026 (diff) |
Merge pull request #322186 from bobby285271/upd/cinnamon-xapps
Cinnamon updates 2024-06-24
11 files changed, 39 insertions, 44 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 2e0eef67c0b3e..fa67441e7ac49 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -229,7 +229,6 @@ in }) (mkIf serviceCfg.apps.enable { - programs.geary.enable = mkDefault (notExcluded pkgs.gnome.geary); programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility); programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller); @@ -247,7 +246,6 @@ in pix # external apps shipped with linux-mint - hexchat gnome-calculator gnome-calendar gnome-screenshot diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index d009522f5c976..e9d6e5795c5a1 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.06.1"; + version = "24.06.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-H4PCZ1WwNg34WSDXgmH6pUPBglXafLTFfIzvmWiyeCw="; + hash = "sha256-/Rk95fAAquPrKwRchIgU8p9dpwvEV25ku1rknbJNlJc="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 35a7a2247f5a1..a548b8a6503dd 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -160,16 +160,17 @@ stdenv.mkDerivation rec { {} + pushd ./files/usr/share/cinnamon/cinnamon-settings - substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"' - substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" - substituteInPlace ./bin/Spices.py --replace "subprocess.run(['/usr/bin/" "subprocess.run(['" \ - --replace 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ - --replace "msgfmt" "${gettext}/bin/msgfmt" - substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" - substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" + substituteInPlace ./bin/capi.py --replace-fail '"/usr/lib"' '"${cinnamon-control-center}/lib"' + substituteInPlace ./bin/SettingsWidgets.py --replace-fail "/usr/share/sounds" "/run/current-system/sw/share/sounds" + substituteInPlace ./bin/Spices.py --replace-fail "subprocess.run(['/usr/bin/" "subprocess.run(['" \ + --replace-fail 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ + --replace-fail "msgfmt" "${gettext}/bin/msgfmt" + substituteInPlace ./modules/cs_info.py --replace-fail "lspci" "${pciutils}/bin/lspci" + substituteInPlace ./modules/cs_themes.py --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" popd - sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} + substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \ + --replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session" patchShebangs src/data-to-c.pl ''; diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index d0feadedbf338..9870ed046d34b 100644 --- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "18102c72ba072cd83ccee69e9051e87e93cab01a"; - sha256 = "sha256-o2+KfHwPvoqDMBa9C/Sm/grDf0GWcjx2OtT4rhnCk5Q="; + rev = "35aa5b9839935fc3415ba6b7c77171459e7325fa"; + sha256 = "sha256-2ItjQ3CO1kG2QdAEqNxlrZ1AOfHmUBCE99kLalU7AUc="; }; nativeBuildInputs = [ @@ -41,12 +41,9 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - preFixup = '' - # For Gdk.cairo_surface_create_from_pixbuf() - # TypeError: Couldn't find foreign struct converter for 'cairo.Surface' - buildPythonPath ${python3.pkgs.pycairo} - patchPythonScript $out/share/nemo-python/extensions/nemo-folder-color-switcher.py - ''; + # For Gdk.cairo_surface_create_from_pixbuf() + # TypeError: Couldn't find foreign struct converter for 'cairo.Surface' + passthru.nemoPythonExtensionDeps = [ python3.pkgs.pycairo ]; meta = with lib; { homepage = "https://github.com/linuxmint/folder-color-switcher"; diff --git a/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/pkgs/desktops/cinnamon/mint-l-icons/default.nix index 1fa0dd74242d9..6a3956e53ca96 100644 --- a/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-icons/default.nix @@ -9,13 +9,14 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-icons"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - rev = version; - hash = "sha256-nVdx+d+KpTh9EPLhW0+FFzq3OEyacDSxHgllMm51BKk="; + # https://github.com/linuxmint/mint-l-icons/issues/11 + rev = "f5edf5683c7e7e51da2c0e66a9a288d5342edc63"; + hash = "sha256-MKrynS9W5kHRwCKwkXMsUx43KIhtGMaYYWhb/j+vDpk="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-l-theme/default.nix b/pkgs/desktops/cinnamon/mint-l-theme/default.nix index 7d5b84dd8ca07..a9a8a5bd68503 100644 --- a/pkgs/desktops/cinnamon/mint-l-theme/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-theme/default.nix @@ -8,14 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; - # They don't really do tags, this is just a named commit. - rev = "1444bacf3ff470db05b663b9c5c3a3419decba60"; - hash = "sha256-n+5PMfNUNJrVSvCXiFdiRQrq6A6WPINcT110J8OV6FQ="; + rev = version; + hash = "sha256-pgb1lkrBRDYgfrLx0/afEuTz+5gZt/IG1u+dn4V7Spo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index 59d1fb142500e..e1e22781690b4 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -2,25 +2,23 @@ , lib , stdenvNoCC , python3 -, sassc -, sass +, python3Packages }: stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Acf9cwTKDUF1WwIqT3BR8wFpfUNRyZ+8anOIIg3O3CQ="; + hash = "sha256-pakD7qVlivokFlIBNjibOkneS6WV4BBOBePWSOjVVy0="; }; nativeBuildInputs = [ python3 - sassc - sass + python3Packages.libsass ]; preBuild = '' diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix index 8b6f5f07a1c35..f2a872b71e963 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/default.nix @@ -8,7 +8,6 @@ , gtk3 , nemo , python3 -, substituteAll }: let @@ -25,11 +24,8 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/78327 ./load-extensions-from-env.patch - # Required for pygobject_init (). - (substituteAll { - src = ./python-path.patch; - env = "${python3.pkgs.pygobject3}/${python3.sitePackages}"; - }) + # Pick up all passthru.nemoPythonExtensionDeps via nemo-with-extensions wrapper + ./python-path.patch ]; nativeBuildInputs = [ @@ -54,6 +50,8 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + passthru.nemoPythonExtensionDeps = [ python3.pkgs.pygobject3 ]; + meta = with lib; { homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-python"; description = "Python bindings for the Nemo extension library"; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch index bf6db93385c8a..62a6a7043076c 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-python/python-path.patch @@ -7,7 +7,7 @@ index 8d2acdb..ee24143 100644 debug("Sanitize the python search path"); - PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]"); -+ PyRun_SimpleString("import sys; sys.path = [path for path in sys.path if path]; sys.path.append('@env@')"); ++ PyRun_SimpleString("import sys; import os; sys.path = [path for path in sys.path if path]; sys.path += os.getenv(\"NEMO_PYTHON_SEARCH_PATH\").split(os.pathsep)"); if (PyErr_Occurred()) { PyErr_Print(); diff --git a/pkgs/desktops/cinnamon/nemo/wrapper.nix b/pkgs/desktops/cinnamon/nemo/wrapper.nix index 604247566b84c..0c9cba55370c8 100644 --- a/pkgs/desktops/cinnamon/nemo/wrapper.nix +++ b/pkgs/desktops/cinnamon/nemo/wrapper.nix @@ -3,12 +3,14 @@ , makeWrapper , nemo , nemoExtensions +, python3 , extensions ? [ ] , useDefaultExtensions ? true }: let selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions nemoExtensions); + nemoPythonExtensionsDeps = lib.concatMap (x: x.nemoPythonExtensionDeps or []) selectedExtensions; in symlinkJoin { name = "nemo-with-extensions-${nemo.version}"; @@ -21,7 +23,8 @@ symlinkJoin { for f in $(find $out/bin/ $out/libexec/ -type l -not -path "*/.*"); do wrapProgram "$f" \ --set "NEMO_EXTENSION_DIR" "$out/${nemo.extensiondir}" \ - --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" + --set "NEMO_PYTHON_EXTENSION_DIR" "$out/share/nemo-python/extensions" \ + --set "NEMO_PYTHON_SEARCH_PATH" "${python3.pkgs.makePythonPath nemoPythonExtensionsDeps}" done # Don't populate the same nemo actions twice when having this globally installed diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 6f5cac6983c34..8675bab269c08 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-ujfXZfBXr3T4e8+bIfkvdvBnEQfW7oPByaiXg/SBwJY="; + hash = "sha256-1Q00aEWl/mk37NcBJPgg443V1IXmNaJcSlilzvAJ1QQ="; }; nativeBuildInputs = [ |