From a6614061b67983b29a987c3d5908cdbc9b535f23 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 7 Oct 2024 01:57:49 +0000 Subject: [PATCH] akkuPackages.*: add an 'akku-' prefix to the package names --- pkgs/tools/package-management/akku/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix index 78cbcace5d5c..bb1fc6c1e256 100644 --- a/pkgs/tools/package-management/akku/default.nix +++ b/pkgs/tools/package-management/akku/default.nix @@ -1,11 +1,5 @@ -{ lib, newScope, stdenv, fetchurl }: +{ lib, newScope, fetchurl }: lib.makeScope newScope (self: rec { - - fetchAkku = { name, url, sha256, ... }: - fetchurl { - inherit url sha256; - }; - akkuDerivation = self.callPackage ./akkuDerivation.nix { }; akku = self.callPackage ./akku.nix { }; @@ -14,11 +8,11 @@ lib.makeScope newScope (self: rec { overrides = self.callPackage ./overrides.nix { }; makeAkkuPackage = akkuself: pname: { version, dependencies, dev-dependencies, license, url, sha256, source, synopsis ? "", homepage ? "", ... }: - (akkuDerivation rec { - inherit version pname; - src = fetchAkku { + (akkuDerivation { + pname = "akku-${pname}"; + inherit version; + src = fetchurl { inherit url sha256; - name = pname; }; buildInputs = builtins.map (x: akkuself.${x}) dependencies; r7rs = source == "snow-fort";