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

1 files changed, 5 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/nixpkgs/pkgs/development/libraries/libredwg/default.nix
index 8a01ace46415..58a701bc15cc 100644
--- a/nixpkgs/pkgs/development/libraries/libredwg/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libredwg/default.nix
@@ -17,19 +17,19 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libredwg";
-  version = "0.12.5";
+  version = "0.12.5.6313";
 
   src = fetchFromGitHub {
     owner = "LibreDWG";
     repo = pname;
     rev = version;
-    sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE=";
+    hash = "sha256-TM+cZ7N5PD6UG9cvy0XFa0sNYc3apbAJvEMh3husjRk=";
     fetchSubmodules = true;
   };
 
   postPatch = let
     printVersion = writeShellScript "print-version" ''
-      echo ${lib.escapeShellArg version}
+      echo -n ${lib.escapeShellArg version}
     '';
   in ''
     # avoid git dependency
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
   # prevent python tests from running when not building with python
   configureFlags = lib.optional (!enablePython) "--disable-python";
 
-  doCheck = true;
+  # example_r13.dxf roundtrip fail: expect 5286, got 5285 entities
+  doCheck = !(stdenv.isLinux && stdenv.isAarch64);
 
   # the "xmlsuite" test requires the libxml2 c library as well as the python module
   nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ];