diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-05 01:07:22 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-05 01:07:22 +0100 |
commit | 8dca8b9ccb05e7abe6b769485a4d224987c15c06 (patch) | |
tree | 80f8e212628d458ecc6d9e9af22661813eed8aa7 /pkgs/desktops/pantheon/granite/default.nix | |
parent | 1ba64dad7c7b29a03ace672b2ff1a01343e853fe (diff) | |
parent | 22906321fbc0d38372d7ae2657adb2597fc384c1 (diff) | |
download | nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.gz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.bz2 nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.lz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.xz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.zst nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.zip |
Merge remote-tracking branch 'origin/master' into gcc-9
Diffstat (limited to 'pkgs/desktops/pantheon/granite/default.nix')
-rw-r--r-- | pkgs/desktops/pantheon/granite/default.nix | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index b93eb2f3f9b..ab673832857 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , python3 , meson , ninja @@ -17,30 +16,15 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "5.2.3"; + version = "5.2.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "10ddq1s2w4jvpzq813cylmqhh8pggzaz890fy3kzg07275i98gah"; + sha256 = "0z40vhcp2w8s8rnc56pzvjc4s77bln8k84rwwypivjmk3lhpw1vi"; }; - patches = [ - # Resolve the circular dependency between granite and the datetime wingpanel indicator - # See: https://github.com/elementary/granite/pull/242 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/granite/raw/0550b44ed6400c9b1ff7e70871913747df2ff323/f/00-datetime-clock-format-gsettings.patch"; - sha256 = "0i9yvdmn77x5fjdwd1raw6ym8js8yxa7w6ydc7syx7hcyls00dmq"; - }) - - # Fix build latest vala. - (fetchpatch { - url = "https://github.com/elementary/granite/commit/fd26013c84afdeb6300ae2f4a574856753fc2b58.patch"; - sha256 = "01nxqhj8gr61n6wx6ccrqdn25nmbrhhk437k21g4mxqx0gnih265"; - }) - ]; - passthru = { updateScript = pantheon.updateScript { repoName = pname; |