From 82e9715be8b9d388e578fe729c9482668df9f7b9 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 8 Oct 2022 09:50:26 +0200
Subject: [PATCH] libdwarf: use latest version by default

The legacy version has been kept for the `elf-dissector` but the package
is broken anyway.
---
 pkgs/development/libraries/libdwarf/0.4.nix      |  8 --------
 pkgs/development/libraries/libdwarf/20210528.nix |  8 ++++++++
 pkgs/development/libraries/libdwarf/default.nix  | 12 ++++++------
 pkgs/top-level/all-packages.nix                  |  6 ++++--
 4 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/libdwarf/0.4.nix
 create mode 100644 pkgs/development/libraries/libdwarf/20210528.nix

diff --git a/pkgs/development/libraries/libdwarf/0.4.nix b/pkgs/development/libraries/libdwarf/0.4.nix
deleted file mode 100644
index 2beb4efc4bcd..000000000000
--- a/pkgs/development/libraries/libdwarf/0.4.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, zlib }:
-callPackage ./common.nix rec {
-  version = "0.4.2";
-  url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
-  sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2";
-  buildInputs = [ zlib ];
-  knownVulnerabilities = [];
-}
diff --git a/pkgs/development/libraries/libdwarf/20210528.nix b/pkgs/development/libraries/libdwarf/20210528.nix
new file mode 100644
index 000000000000..01ab2d720bf0
--- /dev/null
+++ b/pkgs/development/libraries/libdwarf/20210528.nix
@@ -0,0 +1,8 @@
+{ callPackage, zlib, libelf }:
+callPackage ./common.nix rec {
+  version = "20210528";
+  url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
+  sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
+  buildInputs = [ zlib libelf ];
+  knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ];
+}
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 01ab2d720bf0..2beb4efc4bcd 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,8 +1,8 @@
-{ callPackage, zlib, libelf }:
+{ callPackage, zlib }:
 callPackage ./common.nix rec {
-  version = "20210528";
-  url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
-  sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
-  buildInputs = [ zlib libelf ];
-  knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ];
+  version = "0.4.2";
+  url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
+  sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2";
+  buildInputs = [ zlib ];
+  knownVulnerabilities = [];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33ca400bbb81..99516ce4f93d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19690,7 +19690,7 @@ with pkgs;
 
   libdwarf = callPackage ../development/libraries/libdwarf { };
   dwarfdump = libdwarf.bin;
-  libdwarf_0_4 = callPackage ../development/libraries/libdwarf/0.4.nix { };
+  libdwarf_20210528 = callPackage ../development/libraries/libdwarf/20210528.nix { };
 
   libe57format = callPackage ../development/libraries/libe57format { };
 
@@ -27622,7 +27622,9 @@ with pkgs;
 
   elementary-planner = callPackage ../applications/office/elementary-planner { };
 
-  elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { };
+  elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector {
+    libdwarf = libdwarf_20210528;
+  };
 
   elfx86exts = callPackage ../applications/misc/elfx86exts { };