Unverified Commit 97265813 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

akku: 1.1.0 -> 1.1.0-unstable-2024-03-03 (#339857)

parents d0f7accc 5fbe9b6e

pkgs/tools/package-management/akku/akku.nix

+6 −12
Original line number Diff line number Diff line 
{ 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 = ''

pkgs/tools/package-management/akku/akkuDerivation.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 \

pkgs/tools/package-management/akku/overrides.nix

+6 −3
Original line number Diff line number Diff line 
{ 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 !?