From 117119f96fdb892c09a60cfe8e619c6789da1eaa Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 16 Oct 2022 16:24:38 -0700 Subject: [PATCH 1/9] build2.bootstrap: 0.14.0 -> 0.15.0 --- pkgs/development/tools/build-managers/build2/bootstrap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/bootstrap.nix b/pkgs/development/tools/build-managers/build2/bootstrap.nix index aff1c557d9a2..4f9879840b24 100644 --- a/pkgs/development/tools/build-managers/build2/bootstrap.nix +++ b/pkgs/development/tools/build-managers/build2/bootstrap.nix @@ -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 From f74d48e53a36fa2a5b210789c61b67660274e0ab Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 16 Oct 2022 16:26:32 -0700 Subject: [PATCH 2/9] libbutl: 0.14.0 -> 0.15.0 --- pkgs/development/libraries/libbutl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/development/libraries/libbutl/default.nix index 55aacf160f37..01ff0412b632 100644 --- a/pkgs/development/libraries/libbutl/default.nix +++ b/pkgs/development/libraries/libbutl/default.nix @@ -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 = [ From 024085452c9824503f64be880835821c23f320b9 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Oct 2022 19:48:23 -0700 Subject: [PATCH 3/9] build2: 0.14.0 -> 0.15.0 --- .../tools/build-managers/build2/default.nix | 5 +++-- .../build2/remove-config-store-paths.patch | 20 +++++++++-------- .../build2/remove-const-void-param.patch | 22 +++++++++---------- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/development/tools/build-managers/build2/default.nix index 40899903df29..562d3aa0c472 100644 --- a/pkgs/development/tools/build-managers/build2/default.nix +++ b/pkgs/development/tools/build-managers/build2/default.nix @@ -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 '' diff --git a/pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch b/pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch index 394cf208c439..b5b80fae4d07 100644 --- a/pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch +++ b/pkgs/development/tools/build-managers/build2/remove-config-store-paths.patch @@ -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. diff --git a/pkgs/development/tools/build-managers/build2/remove-const-void-param.patch b/pkgs/development/tools/build-managers/build2/remove-const-void-param.patch index a0fd973caabb..d74b9fe5a0c4 100644 --- a/pkgs/development/tools/build-managers/build2/remove-const-void-param.patch +++ b/pkgs/development/tools/build-managers/build2/remove-const-void-param.patch @@ -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; From 434aa9f6d26d8d3e950ae15bd58bbb35efd70b8a Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Oct 2022 19:48:43 -0700 Subject: [PATCH 4/9] libbpkg: 0.14.0 -> 0.15.0 --- pkgs/development/libraries/libbpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/development/libraries/libbpkg/default.nix index 925b22effea2..1f6b3eb93bf6 100644 --- a/pkgs/development/libraries/libbpkg/default.nix +++ b/pkgs/development/libraries/libbpkg/default.nix @@ -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 = [ From 45330e6bad8f4c60247c20b93a560955c00a0efb Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Oct 2022 19:53:55 -0700 Subject: [PATCH 5/9] libodb: 2.5.0-b.21 -> 2.5.0-b.23 --- pkgs/development/libraries/libodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/development/libraries/libodb/default.nix index 17f316b2cefb..1e76d34e69cd 100644 --- a/pkgs/development/libraries/libodb/default.nix +++ b/pkgs/development/libraries/libodb/default.nix @@ -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 ]; From dedd41a5fc56feaf64cfdb271eb8208e416ce38b Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Oct 2022 19:54:48 -0700 Subject: [PATCH 6/9] libodb-sqlite: 2.5.0-b.21 -> 2.5.0-b.23 --- pkgs/development/libraries/libodb-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/development/libraries/libodb-sqlite/default.nix index 467ae914087f..24cb8350f2bf 100644 --- a/pkgs/development/libraries/libodb-sqlite/default.nix +++ b/pkgs/development/libraries/libodb-sqlite/default.nix @@ -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 = [ From b499b5a5d066b00bbd0d77870b19132579cc9206 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Oct 2022 19:57:04 -0700 Subject: [PATCH 7/9] bpkg: 0.14.0 -> 0.15.0 --- pkgs/development/tools/build-managers/build2/bpkg.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix index 95199e74294d..cf366f39d768 100644 --- a/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -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 From 37806ebf308d646ed8d0007bdf474d766b4d40a9 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Oct 2022 19:58:44 -0700 Subject: [PATCH 8/9] bdep: 0.14.0 -> 0.15.0 --- pkgs/development/tools/build-managers/build2/bdep.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/bdep.nix b/pkgs/development/tools/build-managers/build2/bdep.nix index adfaaf5da71b..5fe7e50e4b65 100644 --- a/pkgs/development/tools/build-managers/build2/bdep.nix +++ b/pkgs/development/tools/build-managers/build2/bdep.nix @@ -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; From 6acda25af6a6570ca18fe826e2c1ab0e2d4022d4 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Oct 2022 20:29:30 -0700 Subject: [PATCH 9/9] bpkg: add postInstall rpath fixup needed on darwin --- pkgs/development/tools/build-managers/build2/bpkg.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix index cf366f39d768..628c9304c1de 100644 --- a/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -49,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