diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-22 12:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-22 12:01:16 +0000 |
| commit | 6859dda947dbdb5b52f4053a4bf9791e69f6c9eb (patch) | |
| tree | d56c8aecae0c3aaa441ac79f18aaa1830b72e943 /pkgs/desktops | |
| parent | 205550361751469660155c0b7bcfbd68ff68acb3 (diff) | |
| parent | 3eccda7f1a5b134e52d8fb7c1710ddb0879636c5 (diff) | |
| download | nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.gz nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.bz2 nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.lz nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.xz nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.zst nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/desktops/cinnamon/mint-y-icons/default.nix | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index f3bc244eba00..a42fa79c6768 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 @@ -29,24 +28,15 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-5hXhCPXC7b2SsmvNSLDe/WYQcufN7FfhnaAgTNtqg0I="; + hash = "sha256-jWUPn5+ynuLdb2GaqKph1M62Ky00sRP/vUXedEvBT7A="; }; - patches = [ - # Fix broken theming with pygobject >= 3.46.0 - # https://github.com/linuxmint/cinnamon-screensaver/issues/446 - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon-screensaver/commit/37ab8ed18f35591f2bd99043f12c06d98b4527db.patch"; - hash = "sha256-4YSithosyTLy8OFu6DEhLT4c+EGEg84EenTKAiBiWo4="; - }) - ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index b5d2df761fad..9e86a0fb9dda 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-T2tZUMXc3kvTFkWf9AGUTNkkmQ0OT8qTKpQk+ZuvEc0="; + hash = "sha256-Uzayo1hmNwOMszTV8/KqOLxjERBC/L16hRpCWbK10Uc="; }; propagatedBuildInputs = [ |