From 0f736cf05ebafa23eb795cdd181eb7312a81ca9f Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 29 Sep 2024 18:56:32 +0800
Subject: [PATCH 1/4] libbde: move to by-name; nixfmt

---
 .../li/libbde/package.nix}                    | 33 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 19 insertions(+), 16 deletions(-)
 rename pkgs/{development/libraries/libbde/default.nix => by-name/li/libbde/package.nix} (52%)

diff --git a/pkgs/development/libraries/libbde/default.nix b/pkgs/by-name/li/libbde/package.nix
similarity index 52%
rename from pkgs/development/libraries/libbde/default.nix
rename to pkgs/by-name/li/libbde/package.nix
index 4bef9748701c..20d509e93eee 100644
--- a/pkgs/development/libraries/libbde/default.nix
+++ b/pkgs/by-name/li/libbde/package.nix
@@ -1,29 +1,34 @@
-{ lib
-, stdenv
-, fetchurl
-, fuse
-, ncurses
-, python3
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fuse,
+  ncurses,
+  python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libbde";
   version = "20221031";
 
   src = fetchurl {
-    url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz";
+    url = "https://github.com/libyal/libbde/releases/download/${finalAttrs.version}/libbde-alpha-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-uMbwofboePCFWlxEOdRbZK7uZuj0MZC/qusWuu0Bm7g=";
   };
 
-  buildInputs = [ fuse ncurses python3 ];
+  buildInputs = [
+    fuse
+    ncurses
+    python3
+  ];
 
   configureFlags = [ "--enable-python" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library to access the BitLocker Drive Encryption (BDE) format";
     homepage = "https://github.com/libyal/libbde/";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ eliasp ];
-    platforms = platforms.all;
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ eliasp ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 131cca72e54e..604a460aa2bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20751,8 +20751,6 @@ with pkgs;
   libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
   libbassmix = (callPackage ../development/libraries/audio/libbass { }).bassmix;
 
-  libbde = callPackage ../development/libraries/libbde { };
-
   libbdplus = callPackage ../development/libraries/libbdplus { };
 
   libblockdev = callPackage ../development/libraries/libblockdev { };

From c1e0ff226624da009bae71d13997e868f4479a91 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 29 Sep 2024 18:56:52 +0800
Subject: [PATCH 2/4] libbde: add bot-wxt1221 as maintainers

---
 pkgs/by-name/li/libbde/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libbde/package.nix b/pkgs/by-name/li/libbde/package.nix
index 20d509e93eee..c90d41c93e6f 100644
--- a/pkgs/by-name/li/libbde/package.nix
+++ b/pkgs/by-name/li/libbde/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library to access the BitLocker Drive Encryption (BDE) format";
     homepage = "https://github.com/libyal/libbde/";
     license = lib.licenses.lgpl3;
-    maintainers = with lib.maintainers; [ eliasp ];
+    maintainers = with lib.maintainers; [ eliasp bot-wxt1221 ];
     platforms = lib.platforms.all;
   };
 })

From 0cc722a00400aee2cd36d8c7abda37eb4185180e Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 29 Sep 2024 18:58:43 +0800
Subject: [PATCH 3/4] libbde: add passthru.updateScript

---
 pkgs/by-name/li/libbde/package.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libbde/package.nix b/pkgs/by-name/li/libbde/package.nix
index c90d41c93e6f..59ee5342e367 100644
--- a/pkgs/by-name/li/libbde/package.nix
+++ b/pkgs/by-name/li/libbde/package.nix
@@ -1,19 +1,22 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   fuse,
   ncurses,
   python3,
+  unstableGitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libbde";
-  version = "20221031";
+  version = "0-unstable-20221031";
 
-  src = fetchurl {
-    url = "https://github.com/libyal/libbde/releases/download/${finalAttrs.version}/libbde-alpha-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-uMbwofboePCFWlxEOdRbZK7uZuj0MZC/qusWuu0Bm7g=";
+  src = fetchFromGitHub {
+    owner = "libyal";
+    repo = "libbde";
+    rev = "a7bf86d0907b84dfb551fdd3f6f548bd687fdcac";
+    hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
   };
 
   buildInputs = [
@@ -24,11 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [ "--enable-python" ];
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     description = "Library to access the BitLocker Drive Encryption (BDE) format";
     homepage = "https://github.com/libyal/libbde/";
     license = lib.licenses.lgpl3;
-    maintainers = with lib.maintainers; [ eliasp bot-wxt1221 ];
+    maintainers = with lib.maintainers; [
+      eliasp
+      bot-wxt1221
+    ];
     platforms = lib.platforms.all;
   };
 })

From f839f4a4802390065ee507d4f23487319b13837c Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 29 Sep 2024 19:03:22 +0800
Subject: [PATCH 4/4] libbde: 20221031 -> 20240502

---
 pkgs/by-name/li/libbde/package.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/li/libbde/package.nix b/pkgs/by-name/li/libbde/package.nix
index 59ee5342e367..acbdb3e1aa30 100644
--- a/pkgs/by-name/li/libbde/package.nix
+++ b/pkgs/by-name/li/libbde/package.nix
@@ -1,22 +1,20 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  fetchurl,
   fuse,
   ncurses,
   python3,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libbde";
-  version = "0-unstable-20221031";
+  version = "20240502";
 
-  src = fetchFromGitHub {
-    owner = "libyal";
-    repo = "libbde";
-    rev = "a7bf86d0907b84dfb551fdd3f6f548bd687fdcac";
-    hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+  src = fetchurl {
+    url = "https://github.com/libyal/libbde/releases/download/${finalAttrs.version}/libbde-alpha-${finalAttrs.version}.tar.gz";
+    hash = "sha256-La6rzBOfyBIXDn78vXb8GUt8jgQkzsqM38kRZ7t3Fp0=";
   };
 
   buildInputs = [
@@ -25,9 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
+  preInstall = ''
+    substituteInPlace pybde/Makefile \
+      --replace-fail '$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install' ' '
+  '';
+
   configureFlags = [ "--enable-python" ];
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Library to access the BitLocker Drive Encryption (BDE) format";