git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #156801 from bobby285271/pantheon

pantheon.elementary-files: 6.1.1 -> 6.1.2

commite722007bf05802573b41701c49da6c8814878171 authorBobby Rong <rjl931189261@126.com> dateWed 26 Jan 2022, 21:01 (5 years ago) parent555ff755664261
1 file changed+2−12
pkgs/desktops/pantheon/apps/elementary-files/default.nix+2−12
pkgs/desktops/pantheon/apps/elementary-files/default.nix+2−12
@@ -1,7 +1,6 @@
11{ lib
22, stdenv
33, fetchFromGitHub
4−, fetchpatch
54, nix-update-script
65, pkg-config
76, meson
@@ -33,7 +32,7 @@
3332
3433stdenv.mkDerivation rec {
3534 pname = "elementary-files";
36− version = "6.1.1";
35+ version = "6.1.2";
3736
3837 outputs = [ "out" "dev" ];
3938
@@ -41,18 +40,9 @@ stdenv.mkDerivation rec {
4140 owner = "elementary";
4241 repo = "files";
4342 rev = version;
44− sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY=";
43+ sha256 = "sha256-g9g4wJXjjudk4Qt96XGUiV/X86Ae2lqhM+psh9h+XFE=";
4544 };
4645
47− patches = [
48− # Fix build with meson 0.61
49− # https://github.com/elementary/files/pull/1973
50− (fetchpatch {
51− url = "https://github.com/elementary/files/commit/28428fbda905ece59d3427a3a40e986fdf71a916.patch";
52− sha256 = "sha256-GZTHAH9scQWrBqdrDI14cj57f61HD8o79zFcPCXjKmc=";
53− })
54− ];
55−
5646 nativeBuildInputs = [
5747 desktop-file-utils
5848 gettext