summary refs log tree commit diff
path: root/pkgs/applications/science/electronics
diff options
context:
space:
mode:
authorTobias Mayer <tobim@fastmail.fm>2023-08-24 10:54:44 +0200
committerTobias Mayer <tobim@fastmail.fm>2023-08-30 14:54:42 +0200
commit1b6d20865438bd48511f1e54631bf93d6fadc5f2 (patch)
tree008fea770e4bf57567c1a6b85505b5078feacfca /pkgs/applications/science/electronics
parentc5153127c117479a7b346edb73ef86b4a14b069c (diff)
downloadnixpkgs-1b6d20865438bd48511f1e54631bf93d6fadc5f2.tar
nixpkgs-1b6d20865438bd48511f1e54631bf93d6fadc5f2.tar.gz
nixpkgs-1b6d20865438bd48511f1e54631bf93d6fadc5f2.tar.bz2
nixpkgs-1b6d20865438bd48511f1e54631bf93d6fadc5f2.tar.lz
nixpkgs-1b6d20865438bd48511f1e54631bf93d6fadc5f2.tar.xz
nixpkgs-1b6d20865438bd48511f1e54631bf93d6fadc5f2.tar.zst
nixpkgs-1b6d20865438bd48511f1e54631bf93d6fadc5f2.zip
hal-hardware-analyzer: fix build with fmt 10.1.0
Diffstat (limited to 'pkgs/applications/science/electronics')
-rw-r--r--pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
index 2b74a7de24e..5c1a2d41c67 100644
--- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
+++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix
@@ -67,6 +67,12 @@ in stdenv.mkDerivation rec {
       url = "https://github.com/emsec/hal/commit/37d5c1a0eacb25de57cc552c13e74f559a5aa6e8.patch";
       hash = "sha256-a30VjDt4roJOTntisixqnH17wwCgWc4VWeh1+RgqFuY=";
     })
+    (fetchpatch {
+      name = "hal-fix-fmt-10.1-compat.patch";
+      # https://github.com/emsec/hal/pull/530
+      url = "https://github.com/emsec/hal/commit/b639a56b303141afbf6731b70b7cc7452551f024.patch";
+      hash = "sha256-a7AyDEKkqdbiHpa4OHTRuP9Yewb3Nxs/j6bwez5m0yU=";
+    })
   ];
 
   # make sure bundled dependencies don't get in the way - install also otherwise