nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-31 09:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #196516 from r-burns/build2-0.15

Browse Source 
build2: 0.14.0 -> 0.15.0
This commit is contained in:
Ryan Burns 2022-10-27 09:06:21 -07:00 committed by GitHub
commit e4d14eb49d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libbpkg/default.nix
View File

@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
pname = "libbpkg";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz";
sha256 = "sha256-K5KkhJa4qsh3AMDtCV4eA7bh3oU5DYEYMAacLmDoulU=";
sha256 = "sha256-KfvkG6bHSU8wTZDKGeEfI1AV9T8uSYZHePMlmjpBXHc=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libbutl/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "libbutl";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz";
sha256 = "sha256-zKufrUsLZmjw6pNbOAv+dPyolWpgXgygEnW0Lka6zw8=";
sha256 = "sha256-yzs6DFt6peJPPaMQ3rtx+kiYu7H+bUuShcdnEN90WWI=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libodb-sqlite/default.nix
View File

@ -8,13 +8,13 @@
}:
stdenv.mkDerivation rec {
pname = "libodb-sqlite";
version = "2.5.0-b.21";
version = "2.5.0-b.23";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
sha256 = "sha256-dxU8HyzowFGNYCrZIKrZEZDGi9zo3G0x3/L7nfQKo0Y=";
sha256 = "sha256-HjEFfNDXduHOexNm82S+vqKRQM3SwgEYiDBZcPXsr/w=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/libodb/default.nix
View File

@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "libodb";
version = "2.5.0-b.21";
version = "2.5.0-b.23";
outputs = [ "out" "dev" "doc" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz";
sha256 = "sha256-Q4HZ8zU5osZ9Phz59ZAjXh0dbB8ELBY5gMRbDnawCWs=";
sha256 = "sha256-j+lW9WFdjwIlP24/GUZsezyMf7/31XTfkuY2WGLdaeA=";
};
nativeBuildInputs = [ build2 ];

4
pkgs/development/tools/build-managers/build2/bdep.nix
View File

@ -11,12 +11,12 @@
stdenv.mkDerivation rec {
pname = "bdep";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "doc" "man" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz";
sha256 = "sha256-sizrGmSixkkJL9nocA4B1I5n9OySxyuZ2bNc1Z4zmPg=";
sha256 = "sha256-dZldNVeQJWim3INBtOaPYP8yQMH3sjBzCLEHemvdxnU=";
};
strictDeps = true;

4
pkgs/development/tools/build-managers/build2/bootstrap.nix
View File

@ -5,10 +5,10 @@
}:
stdenv.mkDerivation rec {
pname = "build2-bootstrap";
version = "0.14.0";
version = "0.15.0";
src = fetchurl {
url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
sha256 = "sha256-GO/GstQUmPdRbnqKXJECP2GCyGfUI3kjmDkN0MAEz90=";
sha256 = "1i1p52fr5sjs5yz6hqhljwhc148mvs4fyq0cf7wjg5pbv9wzclji";
};
patches = [
# Pick up sysdirs from NIX_LDFLAGS

9
pkgs/development/tools/build-managers/build2/bpkg.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "bpkg";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "doc" "man" ];
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz";
sha256 = "sha256-4WTFm0NYZOujxQ3PR9MyjXEJ4ql4qZ9OM5BePuHIK1M=";
sha256 = "sha256-3F4Pv8YX++cNa6aKhPM67mrt/5oE1IeoZUSmljHqBfI=";
};
strictDeps = true;
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
build2
];
buildInputs = [
build2
libbpkg
libbutl
libodb
@ -48,6 +49,10 @@ stdenv.mkDerivation rec {
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
];
postInstall = lib.optionalString stdenv.isDarwin ''
install_name_tool -add_rpath '${lib.getLib build2}/lib' "''${!outputBin}/bin/bpkg"
'';
meta = with lib; {
description = "build2 package dependency manager";
# https://build2.org/bpkg/doc/bpkg.xhtml

5
pkgs/development/tools/build-managers/build2/default.nix
View File

@ -16,7 +16,7 @@ let
in
stdenv.mkDerivation rec {
pname = "build2";
version = "0.14.0";
version = "0.15.0";
outputs = [ "out" "dev" "doc" "man" ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
sha256 = "sha256-/pWj68JmBthOJ2CTQHo9Ww3MCv4xBOw0SusJpMfX5Y8=";
sha256 = "07369gw6zlad6nk29564kj17yp145l3dzbgrx04pyiyl1s84aa1r";
};
patches = [
@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
build2ConfigureFlags = [
"config.bin.lib=${configSharedStatic enableShared enableStatic}"
"config.cc.poptions+=-I${lib.getDev libpkgconf}/include/pkgconf"
"config.build2.libpkgconf=true"
];
postInstall = lib.optionalString stdenv.isDarwin ''

20
pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch
View File

@ -1,14 +1,16 @@
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -73,7 +73,11 @@ config/cxx{host-config}: config/in{host-config}
@@ -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\.(dist\.|install\.chroot|config\.hermetic))).*$', \
[null], \
+ return_lines), \
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
+ [null], \
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)
# Also preserve config.version.

22
pkgs/development/tools/build-managers/build2/remove-const-void-param.patch
View File

@ -1,11 +1,11 @@
--- build2-0.14.0_/libbuild2/cc/pkgconfig.cxx 2022-10-04 14:18:24.864604892 -0400
+++ build2-0.14.0/libbuild2/cc/pkgconfig.cxx 2022-10-04 14:20:58.153254961 -0400
@@ -186,7 +186,7 @@
;
static bool
- pkgconf_error_handler (const char* msg, const pkgconf_client_t*, const void*)
+ pkgconf_error_handler (const char* msg, const pkgconf_client_t*, void*)
{
error << runtime_error (msg); // Sanitize the message.
return true;
--- 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;