diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-26 06:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-26 06:01:06 +0000 |
| commit | ff3e86d2b497bb8bf0d07ffe31702a7ce228074d (patch) | |
| tree | 98419bc468f82cd78890c2b0be755c49e8e9d30f /pkgs/desktops | |
| parent | c94802a08df794b37ee63d8c71b748f3b0755e8a (diff) | |
| parent | e3eeeecadd5e6ef055a83c5eaed8a660b5b464dd (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index b6148ee1d6744..75995109629d5 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchFromGitHub -, fetchpatch , nix-update-script , gettext , meson @@ -12,36 +11,15 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-KUo9IbB10JRgFrn6I5y4+34PEihuwp78b+YsX2Wqip8="; + sha256 = "sha256-AFiREZ4pDIwQ4OeZDIHEJUNSeUsMjAlDd5h0pB0ilNw="; }; - patches = [ - # All patches listed below are fixes for Epiphany 44. - # https://github.com/elementary/browser/discussions/82 - (fetchpatch { - url = "https://github.com/elementary/stylesheet/commit/c0028159dd5a7767ead9a12e9a4cfb693159c823.patch"; - sha256 = "sha256-JgJ6FoE2aSTmjJ7klAoYXITbxJwy1HFGvr6F6lVQysY="; - }) - (fetchpatch { - url = "https://github.com/elementary/stylesheet/commit/2b9aa7aabce8ab2656340de41f7d5194ddd62078.patch"; - sha256 = "sha256-84sCbVw3JChw25FIKG4eFbj3EkDioefJp5Q938TwXPc="; - }) - (fetchpatch { - url = "https://github.com/elementary/stylesheet/commit/88682d3e931fdd46682d3ac8f1f1e700e2514c56.patch"; - sha256 = "sha256-2/yYO9Upt33bZembRRuvcfwpQunD1hhJ/BC2DZSuWPk="; - }) - (fetchpatch { - url = "https://github.com/elementary/stylesheet/commit/bb15232abc6167a305b4404467498d11901aea69.patch"; - sha256 = "sha256-L6y61CVRTakSHDvFanhbpsSzLkiSp5Dsm0Fg3RKccQk="; - }) - ]; - nativeBuildInputs = [ gettext meson |