summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-06-01 23:51:13 +0200
committerGitHub <noreply@github.com>2023-06-01 23:51:13 +0200
commit50f1969bfa42113715adf0f7b9b42a6d8f534c84 (patch)
treef7927669a7c5b297c326bbd9bbdde9fe21cb16f3
parent5f43d5c8d18196ca0adc6ca6e36dfeae8054db60 (diff)
parent4b4b293b621d44dd00d2793fbae7db8a699793d1 (diff)
downloadnixpkgs-50f1969bfa42113715adf0f7b9b42a6d8f534c84.tar
nixpkgs-50f1969bfa42113715adf0f7b9b42a6d8f534c84.tar.gz
nixpkgs-50f1969bfa42113715adf0f7b9b42a6d8f534c84.tar.bz2
nixpkgs-50f1969bfa42113715adf0f7b9b42a6d8f534c84.tar.lz
nixpkgs-50f1969bfa42113715adf0f7b9b42a6d8f534c84.tar.xz
nixpkgs-50f1969bfa42113715adf0f7b9b42a6d8f534c84.tar.zst
nixpkgs-50f1969bfa42113715adf0f7b9b42a6d8f534c84.zip
Merge pull request #235404 from nim65s/master
hpp-fcl: 2.3.3 -> 2.3.4
-rw-r--r--pkgs/development/libraries/hpp-fcl/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix
index 20895529f2a..ba58835ea5d 100644
--- a/pkgs/development/libraries/hpp-fcl/default.nix
+++ b/pkgs/development/libraries/hpp-fcl/default.nix
@@ -14,25 +14,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hpp-fcl";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "humanoid-path-planner";
     repo = finalAttrs.pname;
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-7MXQ5+S/lvaTBVGY2gTJ1nUegtf9cp7p0JLJ4oPJAUY=";
+    hash = "sha256-tX8AvlR/Az8fFs4ylqFijw3hXiNRoEWffmYbTcaqO90=";
   };
 
-  patches = [
-    # Fix unittest where nix env set `boost::archive::tmpdir()` to `/build` and trigger a path concatenation bug.
-    (fetchpatch {
-      name = "tests-use-boost-filesystem.patch";
-      url = "https://github.com/humanoid-path-planner/hpp-fcl/commit/7e8fde64a5d2c2412325f6cb5d78623bf2409176.patch";
-      hash = "sha256-YjESkj8SqYiyrJuXIa5mSnHIph/D04J10poTDcYgs2c=";
-    })
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [