diff options
Diffstat (limited to 'pkgs/development/tools/build-managers/build2')
6 files changed, 19 insertions, 44 deletions
diff --git a/pkgs/development/tools/build-managers/build2/bdep.nix b/pkgs/development/tools/build-managers/build2/bdep.nix index 5fe7e50e4b65..904217e29d3a 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.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; diff --git a/pkgs/development/tools/build-managers/build2/bootstrap.nix b/pkgs/development/tools/build-managers/build2/bootstrap.nix index ecb352def6ab..0e1297506d4a 100644 --- a/pkgs/development/tools/build-managers/build2/bootstrap.nix +++ b/pkgs/development/tools/build-managers/build2/bootstrap.nix @@ -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 diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix index b244d92d3a1e..60b9d820ac2f 100644 --- a/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -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 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; |