diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2023-09-09 17:36:09 -0700 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2024-01-02 21:02:50 -0800 |
| commit | b9ed2eb5ece61f878a8e2ec81ffd8249da0a3d21 (patch) | |
| tree | d184c792274572bf1e8fc1d1b889cab28894ab5c /pkgs/development/tools/build-managers | |
| parent | 5a46feaabcc21693fdbba545b377e99cc389cebd (diff) | |
| download | nixlib-b9ed2eb5ece61f878a8e2ec81ffd8249da0a3d21.tar nixlib-b9ed2eb5ece61f878a8e2ec81ffd8249da0a3d21.tar.gz nixlib-b9ed2eb5ece61f878a8e2ec81ffd8249da0a3d21.tar.bz2 nixlib-b9ed2eb5ece61f878a8e2ec81ffd8249da0a3d21.tar.lz nixlib-b9ed2eb5ece61f878a8e2ec81ffd8249da0a3d21.tar.xz nixlib-b9ed2eb5ece61f878a8e2ec81ffd8249da0a3d21.tar.zst nixlib-b9ed2eb5ece61f878a8e2ec81ffd8249da0a3d21.zip | |
build2: 0.15.0 -> 0.16.0
Diffstat (limited to 'pkgs/development/tools/build-managers')
3 files changed, 13 insertions, 28 deletions
diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/development/tools/build-managers/build2/default.nix index 85804b90decc..bbe1739392fe 100644 --- a/pkgs/development/tools/build-managers/build2/default.nix +++ b/pkgs/development/tools/build-managers/build2/default.nix @@ -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; 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 b5b80fae4d07..6eeed0eb061b 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,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 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 deleted file mode 100644 index d74b9fe5a0c4..000000000000 --- a/pkgs/development/tools/build-managers/build2/remove-const-void-param.patch +++ /dev/null @@ -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; |