Merge pull request #171471 from bobby285271/pantheon

pantheon.switchboard: 6.0.0 -> 6.0.1

authored by Bobby Rong and committed by GitHub ac72b18d 1333a380

+2 -15
+2 -15
pkgs/desktops/pantheon/apps/switchboard/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , nix-update-script 6 5 , pkg-config 7 6 , meson ··· 18 17 19 18 stdenv.mkDerivation rec { 20 19 pname = "switchboard"; 21 - version = "6.0.0"; 20 + version = "6.0.1"; 22 21 23 22 src = fetchFromGitHub { 24 23 owner = "elementary"; 25 24 repo = pname; 26 25 rev = version; 27 - sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim"; 26 + sha256 = "sha256-QMh9m6Xc0BeprZHrOgcmSireWb8Ja7Td0COYMgYw+5M="; 28 27 }; 29 28 30 29 nativeBuildInputs = [ ··· 46 45 47 46 patches = [ 48 47 ./plugs-path-env.patch 49 - # Upstream code not respecting our localedir 50 - # https://github.com/elementary/switchboard/pull/214 51 - (fetchpatch { 52 - url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch"; 53 - sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc"; 54 - }) 55 - # Fix build with meson 0.61 56 - # https://github.com/elementary/switchboard/pull/226 57 - (fetchpatch { 58 - url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch"; 59 - sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0="; 60 - }) 61 48 ]; 62 49 63 50 postPatch = ''