push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,69 @@
{
lib,
stdenv,
build2,
DarwinTools,
fetchurl,
libuuid,
enableShared ? !stdenv.hostPlatform.isStatic,
enableStatic ? !enableShared,
}:
stdenv.mkDerivation rec {
pname = "libbutl";
version = "0.17.0";
outputs = [
"out"
"dev"
"doc"
];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz";
hash = "sha256-sFqaEf6s2rF1YcZjw5J6oY5ol5PbO9vy6NseKjrvTvs=";
};
nativeBuildInputs = [
build2
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
DarwinTools
];
patches = [
# Install missing .h files needed by dependers
# https://github.com/build2/libbutl/issues/5
./install-h-files.patch
];
strictDeps = true;
# Should be true for anything built with build2,
# but especially important when bootstrapping
disallowedReferences = [ build2 ];
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace libbutl/uuid-linux.cxx \
--replace '"libuuid.so' '"${lib.getLib libuuid}/lib/libuuid.so'
'';
build2ConfigureFlags = [
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
];
doCheck = true;
meta = with lib; {
description = "build2 utility library";
longDescription = ''
This library is a collection of utilities that are used throughout the
build2 toolchain.
'';
homepage = "https://build2.org/";
changelog = "https://git.build2.org/cgit/libbutl/log";
license = licenses.mit;
maintainers = with maintainers; [ r-burns ];
platforms = platforms.all;
};
}

View File

@@ -0,0 +1,22 @@
diff --git a/libbutl/buildfile b/libbutl/buildfile
index ba4ad96..f5356a1 100644
--- a/libbutl/buildfile
+++ b/libbutl/buildfile
@@ -1,7 +1,7 @@
# file : libbutl/buildfile
# license : MIT; see accompanying LICENSE file
-lib{butl}: {hxx ixx txx cxx}{** -uuid-* +uuid-io \
+lib{butl}: {h hxx ixx txx cxx}{** -uuid-* +uuid-io \
-win32-utility \
-mingw-* \
-version \
@@ -154,7 +154,7 @@ else
# Install into the libbutl/ subdirectory of, say, /usr/include/
# recreating subdirectories.
#
-{hxx ixx txx}{*}:
+{h hxx ixx txx}{*}:
{
install = include/libbutl/
install.subdirs = true