Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

2 files changed, 21 insertions, 39 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
index bec3bba51e6e..7be484538ab1 100644
--- a/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libeatmydata/default.nix
@@ -1,45 +1,47 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, strace, which }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch2
+, autoreconfHook
+, strace
+, which
+}:
 
 stdenv.mkDerivation rec {
   pname = "libeatmydata";
-  version = "105";
+  version = "131";
 
   src = fetchFromGitHub {
     owner = "stewartsmith";
     repo = pname;
-    rev = "${pname}-${version}";
-    sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc=";
   };
 
   patches = [
-    ./find-shell-lib.patch
-
     # Fixes "error: redefinition of 'open'" on musl
-    (fetchpatch {
+    (fetchpatch2 {
       url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch";
-      stripLen = 1;
-      sha256 = "sha256-yfMfISbYL7r/R2C9hYPjvGcpUB553QSiW0rMrxG11Oo=";
+      hash = "sha256-MZfTgf2Qn94UpPlYNRM2zK99iKQorKQrlbU5/1WJhJM=";
     })
   ];
 
-  patchFlags = [ "-p0" ];
-
   postPatch = ''
-    substituteInPlace eatmydata.in \
-      --replace NIX_OUT_DIR $out
-
     patchShebangs .
   '';
 
   nativeBuildInputs = [
     autoreconfHook
-  ] ++ lib.optionals doCheck [ strace which ];
+  ];
+
+  nativeCheckInputs = [
+    strace
+    which
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
-  # while we can *build* in parallel, the tests also run in parallel which does
-  # not work with v105. Later versions (unreleased) have a fix for that. The
-  # problem is that on hydra we cannot use strace, so the tests don't run there.
   enableParallelBuilding = true;
-  doCheck = false;
 
   meta = with lib; {
     description = "Small LD_PRELOAD library to disable fsync and friends";
diff --git a/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch b/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch
deleted file mode 100644
index a6320edda29d..000000000000
--- a/nixpkgs/pkgs/development/libraries/libeatmydata/find-shell-lib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- eatmydata.in	2020-02-01 18:10:59.618679823 -0800
-+++ eatmydata.in.new	2020-02-01 18:08:25.092620247 -0800
-@@ -15,15 +15,8 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
--export `dpkg-architecture|grep DEB_BUILD_MULTIARCH`
--
--shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh"
--if [ -f "$shlib" ]; then
--    . "$shlib"
--else
--    echo "Unable to locate eatmydata shell library, it was not enabled" >&2
--    exec "$@"
--fi
-+shlib="NIX_OUT_DIR/libexec/eatmydata.sh"
-+. "$shlib"
- 
- usage()
- {