diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-25 18:01:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-25 18:01:20 +0000 |
commit | 08b5c3c46ad3ffd4e31332f69d816004c529b82a (patch) | |
tree | 4cae2a15a9b085eada9789928f5adca70994ea8f /pkgs/desktops | |
parent | 5141ee3a5bd912afc7fcc996e6e2370b2c4f1154 (diff) | |
parent | 194ab008e631b63fb3ab4d93c0bb4a84b63f0515 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
9 files changed, 37 insertions, 40 deletions
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/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 4c84e0053b279..95941a08cb79b 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "46.1"; + version = "46.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-ObtDHxCjH1Vq9im2aFyG1Qyknymhuv6GIZwgwVUQcKY="; + hash = "sha256-K8wzwpHkTVJEj9saRwqKsJ9TxCMEBPbuCoakir8qNGw="; }; nativeBuildInputs = [ |