mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge pull request #254327 from r-burns/build2
build2 package suite: 0.15.0 -> 0.16.0
This commit is contained in:
commit
14cb8882a6
|
@ -8,12 +8,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbpkg";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz";
|
||||
sha256 = "sha256-KfvkG6bHSU8wTZDKGeEfI1AV9T8uSYZHePMlmjpBXHc=";
|
||||
hash = "sha256-h3Stt1n1057ASf3n16plr5cNGIKOjHiiuOfqrcCJ5tA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv
|
||||
, build2
|
||||
, DarwinTools
|
||||
, fetchurl
|
||||
, libuuid
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
|
@ -8,17 +9,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbutl";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz";
|
||||
sha256 = "sha256-yzs6DFt6peJPPaMQ3rtx+kiYu7H+bUuShcdnEN90WWI=";
|
||||
hash = "sha256-MGL6P/lG2sJdJXZiTcDvdy4jmU+2jYHsvaX4eEO9J2g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build2
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
DarwinTools
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Install missing .h files needed by dependers
|
||||
# https://github.com/build2/libbutl/issues/5
|
||||
./install-h-files.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
22
pkgs/development/libraries/libbutl/install-h-files.patch
Normal file
22
pkgs/development/libraries/libbutl/install-h-files.patch
Normal 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
|
|
@ -8,13 +8,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libodb-sqlite";
|
||||
version = "2.5.0-b.23";
|
||||
version = "2.5.0-b.25";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
|
||||
sha256 = "sha256-HjEFfNDXduHOexNm82S+vqKRQM3SwgEYiDBZcPXsr/w=";
|
||||
hash = "sha256-Ko40WZErbL77B4eoJ5FFko/gTFYhADGlBzxPLuy8Wqc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libodb";
|
||||
version = "2.5.0-b.23";
|
||||
version = "2.5.0-b.25";
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz";
|
||||
sha256 = "sha256-j+lW9WFdjwIlP24/GUZsezyMf7/31XTfkuY2WGLdaeA=";
|
||||
hash = "sha256-G634kVRbgwfBmIh8QqUclr/xvY3o0ouVmp/jxJrHzcs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ build2 ];
|
||||
|
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bdep";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz";
|
||||
sha256 = "sha256-dZldNVeQJWim3INBtOaPYP8yQMH3sjBzCLEHemvdxnU=";
|
||||
hash = "sha256-5w8Ng8TS8g+Nkbixn5txg4FGi57TSfc6ii+2wh8apCo=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "build2-bootstrap";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
src = fetchurl {
|
||||
url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
|
||||
sha256 = "1i1p52fr5sjs5yz6hqhljwhc148mvs4fyq0cf7wjg5pbv9wzclji";
|
||||
hash = "sha256-I3k/aCoXsdlcgLvYSSRHNe1Zo+JzYVKapIZdJ3b/itw=";
|
||||
};
|
||||
patches = [
|
||||
# Pick up sysdirs from NIX_LDFLAGS
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, build2
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, git
|
||||
, libbpkg
|
||||
|
@ -14,24 +13,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpkg";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz";
|
||||
sha256 = "sha256-3F4Pv8YX++cNa6aKhPM67mrt/5oE1IeoZUSmljHqBfI=";
|
||||
hash = "sha256-sxzVidVL8dpoH82IevcwjcIWj4LQzliGv9zasTYqeok=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patch git tests for git v2.38+
|
||||
# Remove when bumping to v0.16.0 or greater
|
||||
(fetchpatch {
|
||||
url = "https://github.com/build2/bpkg/commit/a97b12a027546b37f66d3e08064f92f5539cf79.patch";
|
||||
sha256 = "sha256-x5iJQXt84XyjZYdAmYO4FymSV2vi7nfIoeMOxFm/2eQ=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
build2
|
||||
|
|
|
@ -17,7 +17,7 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "build2";
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
|
||||
outputs = [ "out" "dev" "doc" "man" ];
|
||||
|
||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
|
||||
sha256 = "07369gw6zlad6nk29564kj17yp145l3dzbgrx04pyiyl1s84aa1r";
|
||||
hash = "sha256-ZK4+UACsAs51bC1dE0sIxmCiHlH3pYGPWJNsl61oSOY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
|
|||
./remove-config-store-paths.patch
|
||||
# Pick up sysdirs from NIX_LDFLAGS
|
||||
./nix-ldflags-sysdirs.patch
|
||||
|
||||
./remove-const-void-param.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -1,16 +1,14 @@
|
|||
--- a/libbuild2/buildfile
|
||||
+++ b/libbuild2/buildfile
|
||||
@@ -83,9 +83,13 @@ config/cxx{host-config}: config/in{host-config}
|
||||
# want it).
|
||||
#
|
||||
build2_config = $regex.replace_lines( \
|
||||
+ $regex.replace_lines( \
|
||||
$config.save(), \
|
||||
'^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
|
||||
[null], \
|
||||
+ return_lines), \
|
||||
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
|
||||
+ [null], \
|
||||
return_lines)
|
||||
@@ -86,8 +86,11 @@ build2_config_lines = [strings]
|
||||
host_config_lines = [strings]
|
||||
|
||||
# Also preserve config.version.
|
||||
for l: $regex.replace_lines( \
|
||||
+ $regex.replace_lines( \
|
||||
$config.save(), \
|
||||
'^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \
|
||||
+ [null], return_lines), \
|
||||
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
|
||||
[null])
|
||||
{
|
||||
build2_config_lines += $l
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/libbuild2/cc/pkgconfig-libpkgconf.cxx
|
||||
+++ b/libbuild2/cc/pkgconfig-libpkgconf.cxx
|
||||
@@ -84,7 +84,7 @@ namespace build2
|
||||
static bool
|
||||
pkgconf_error_handler (const char* msg,
|
||||
const pkgconf_client_t*,
|
||||
- const void*)
|
||||
+ void*)
|
||||
{
|
||||
error << runtime_error (msg); // Sanitize the message (trailing dot).
|
||||
return true;
|
|
@ -18713,6 +18713,7 @@ with pkgs;
|
|||
# Dependency of build2, must also break cycle for this
|
||||
libbutl = callPackage ../development/libraries/libbutl {
|
||||
build2 = build2.bootstrap;
|
||||
inherit (darwin) DarwinTools;
|
||||
};
|
||||
|
||||
libbpkg = callPackage ../development/libraries/libbpkg { };
|
||||
|
|
Loading…
Reference in a new issue