pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #172429 from bobby285271/pantheon

Pantheon 7 updates 2022-05-10

authored by Bobby Rong and committed by GitHub 61e657a2 6a52ba18

+12 -20
unified split
+10 -18
pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , nix-update-script 5 - , pkg-config 6 5 , meson 7 6 , ninja 8 - , vala 9 - , desktop-file-utils 10 - , libxml2 11 - , gtk3 7 + , pkg-config 12 8 , python3 13 - , granite 9 + , vala 10 + , wrapGAppsHook4 11 + , granite7 12 + , gtk4 14 13 , libgee 15 - , libhandy 16 - , appstream 17 - , wrapGAppsHook 18 14 }: 19 15 20 16 stdenv.mkDerivation rec { 21 17 pname = "elementary-calculator"; 22 - version = "1.7.2"; 18 + version = "2.0.0"; 23 19 24 20 src = fetchFromGitHub { 25 21 owner = "elementary"; 26 22 repo = "calculator"; 27 23 rev = version; 28 - sha256 = "sha256-U0wXrw9ZJwkqZAtTTHmTzqYhwF9V2JZEZZdDak3kPIc="; 24 + sha256 = "sha256-NE7x5vSfwakwJJe2VGRFiYc7GCB1M6xU5945EC6Em34="; 29 25 }; 30 26 31 27 nativeBuildInputs = [ 32 - appstream 33 - desktop-file-utils 34 - libxml2 35 28 meson 36 29 ninja 37 30 pkg-config 38 31 python3 39 32 vala 40 - wrapGAppsHook 33 + wrapGAppsHook4 41 34 ]; 42 35 43 36 buildInputs = [ 44 - granite 45 - gtk3 37 + granite7 38 + gtk4 46 39 libgee 47 - libhandy 48 40 ]; 49 41 50 42 postPatch = ''
+2 -2
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
··· 30 30 31 31 stdenv.mkDerivation rec { 32 32 pname = "elementary-greeter"; 33 - version = "6.0.2"; 33 + version = "6.1.0"; 34 34 35 35 src = fetchFromGitHub { 36 36 owner = "elementary"; 37 37 repo = "greeter"; 38 38 rev = version; 39 - sha256 = "sha256-0chBM8JuCYgZXHneiSxSICZwBVm2Vgx+bas9wUjbnyg="; 39 + sha256 = "sha256-CY+dPSyQ/ovSdI80uEipDdnWy1KjbZnwpn9sd8HrbPQ="; 40 40 }; 41 41 42 42 patches = [