pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #139163 from bobby285271/pantheon

Pantheon updates 2021-09-23

authored by

Bobby Rong and committed by
GitHub d0220562 dd4beee6

+12 -28
+6 -14
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 - , fetchpatch 4 3 , nix-update-script 5 4 , pantheon 6 5 , meson 7 6 , ninja 8 7 , pkg-config 9 - , vala 8 + , vala_0_52 10 9 , desktop-file-utils 11 10 , gtk3 12 11 , libaccounts-glib ··· 35 34 36 35 stdenv.mkDerivation rec { 37 36 pname = "elementary-photos"; 38 - version = "2.7.1"; 37 + version = "2.7.2"; 39 38 40 39 repoName = "photos"; 41 40 ··· 43 42 owner = "elementary"; 44 43 repo = repoName; 45 44 rev = version; 46 - sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p"; 45 + sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; 47 46 }; 48 47 49 - patches = [ 50 - # Upstream code not respecting our localedir 51 - # https://github.com/elementary/photos/pull/629 52 - (fetchpatch { 53 - url = "https://github.com/elementary/photos/commit/e5230a4305381734e93f1e3d1177da21a8a4121b.patch"; 54 - sha256 = "1igqq51sj1sx6rl8yrw037jsgnaxfwzfs0m6pqzb9q4jvfdimzfi"; 55 - }) 56 - ]; 57 - 58 48 passthru = { 59 49 updateScript = nix-update-script { 60 50 attrPath = "pantheon.${pname}"; ··· 68 58 ninja 69 59 pkg-config 70 60 python3 71 - vala 61 + # Does not build with vala 0.54 62 + # https://github.com/elementary/photos/issues/638 63 + vala_0_52 72 64 wrapGAppsHook 73 65 ]; 74 66
-1
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
··· 2 2 , fetchFromGitHub 3 3 , nix-update-script 4 4 , pantheon 5 - , fetchpatch 6 5 , substituteAll 7 6 , meson 8 7 , ninja
-1
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 - , fetchpatch 4 3 , nix-update-script 5 4 , substituteAll 6 5 , pantheon
-1
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 - , fetchpatch 4 3 , nix-update-script 5 4 , linkFarm 6 5 , substituteAll
+2 -9
pkgs/desktops/pantheon/desktop/gala/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 3 , nix-update-script 4 - , fetchpatch 5 4 , pantheon 6 5 , pkg-config 7 6 , meson ··· 30 29 31 30 stdenv.mkDerivation rec { 32 31 pname = "gala"; 33 - version = "6.0.1"; 32 + version = "6.2.0"; 34 33 35 34 src = fetchFromGitHub { 36 35 owner = "elementary"; 37 36 repo = pname; 38 37 rev = version; 39 - sha256 = "0xp9vviamzdwlcnx4836sxaz2pyfkxswgvjm73ppn7fkdm0zjpzx"; 38 + sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g"; 40 39 }; 41 40 42 41 passthru = { ··· 75 74 ]; 76 75 77 76 patches = [ 78 - # Upstream code not respecting our localedir 79 - # https://github.com/elementary/gala/pull/1205 80 - (fetchpatch { 81 - url = "https://github.com/elementary/gala/commit/605aa10ea2a78650e001b2a247c5f7afce478b05.patch"; 82 - sha256 = "0bg67wzrnmx8nlw93i35vhyfx8al0bj0lacgci98vwlp2m1jgbd2"; 83 - }) 84 77 ./plugins-dir.patch 85 78 ]; 86 79
+4 -2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
··· 7 7 , meson 8 8 , python3 9 9 , ninja 10 - , vala 10 + , vala_0_52 11 11 , gtk3 12 12 , granite 13 13 , wingpanel ··· 50 50 ninja 51 51 pkg-config 52 52 python3 53 - vala 53 + # Does not build with vala 0.54 54 + # https://github.com/elementary/wingpanel-indicator-sound/issues/219 55 + vala_0_52 54 56 ]; 55 57 56 58 buildInputs = [