From 5fbe9b6e9190854cc5bde6fdf3dfb85bcec5fcbf Mon Sep 17 00:00:00 2001
From: Konstantin Astafurov <konstantin.astafurov@gmail.com>
Date: Sat, 7 Sep 2024 12:06:49 -0400
Subject: [PATCH] akku: 1.1.0 -> 1.1.0-unstable-2024-03-03

---
 pkgs/tools/package-management/akku/akku.nix    | 18 ++++++------------
 .../package-management/akku/akkuDerivation.nix |  3 +--
 .../package-management/akku/overrides.nix      |  9 ++++++---
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/package-management/akku/akku.nix b/pkgs/tools/package-management/akku/akku.nix
index 40d5b8e15633..3b205776d0d3 100644
--- a/pkgs/tools/package-management/akku/akku.nix
+++ b/pkgs/tools/package-management/akku/akku.nix
@@ -1,26 +1,20 @@
-{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, guile, curl, substituteAll }:
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, git, guile, curl }:
 stdenv.mkDerivation rec {
   pname = "akku";
-  version = "1.1.0";
+  version = "1.1.0-unstable-2024-03-03";
 
   src = fetchFromGitLab {
     owner = "akkuscm";
     repo = "akku";
-    rev = "v${version}";
-    sha256 = "1pi18aamg1fd6f9ynfl7zx92052xzf0zwmhi2pwcwjs1kbah19f5";
+    rev = "cb996572fe0dbe74a42d2abeafadffaea2bf8ae3";
+    sha256 = "sha256-6xqASnFxzz0yE5oJnh15SOB74PVrVkMVwS3PwKAmgks=";
   };
 
-  patches = [
-    # substitute libcurl path
-    (substituteAll {
-      src = ./hardcode-libcurl.patch;
-      libcurl = "${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary}";
-    })
-  ];
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
-  buildInputs = [ guile ];
+  # akku calls curl commands
+  buildInputs = [ guile curl git ];
 
   # Use a dummy package index to boostrap Akku
   preBuild = ''
diff --git a/pkgs/tools/package-management/akku/akkuDerivation.nix b/pkgs/tools/package-management/akku/akkuDerivation.nix
index 1c34518ad5c9..5b4609c3abaa 100644
--- a/pkgs/tools/package-management/akku/akkuDerivation.nix
+++ b/pkgs/tools/package-management/akku/akkuDerivation.nix
@@ -18,8 +18,7 @@ stdenv.mkDerivation ({
     # only install the project
     rm -f Akku.lock Akku.manifest
 
-    # build, filter out guile warnings
-    akku install 2>&1 | grep -v "\(guile-user\)" - | cat
+    akku install
 
     # make sure akku metadata is present during testing and onwards
     echo $PWD $CHEZSCHEMELIBDIRS \
diff --git a/pkgs/tools/package-management/akku/overrides.nix b/pkgs/tools/package-management/akku/overrides.nix
index 4b72545d91a4..8617a3bdb5fc 100644
--- a/pkgs/tools/package-management/akku/overrides.nix
+++ b/pkgs/tools/package-management/akku/overrides.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, akku, curl, git, substituteAll }:
+{ stdenv, lib, akku, curl, git }:
 let
   joinOverrides =
     overrides: pkg: old:
@@ -39,11 +39,14 @@ in
   };
 
   akku = joinOverrides [
+    # uses chez
     (addToBuildInputs [ curl git ])
     (pkg: old: {
-      # hardcode-libcurl
-      patches = akku.patches;
+      # bump akku to 1.1.0-unstable-2024-03-03
+      src = akku.src;
     })
+    # not a tar archive
+    (pkg: old: removeAttrs old [ "unpackPhase" ])
   ];
 
   # circular dependency on wak-trc-testing !?