diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/development/libraries/libbpkg/default.nix index f5274bee841f..925b22effea2 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.13.0"; + version = "0.14.0"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz"; - sha256 = "732849cdd5d773c589dd0ac220002fa41424784df10617adc4dea729faafb22b"; + sha256 = "sha256-K5KkhJa4qsh3AMDtCV4eA7bh3oU5DYEYMAacLmDoulU="; }; nativeBuildInputs = [ @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { changelog = "https://git.build2.org/cgit/libbpkg/log"; license = licenses.mit; maintainers = with maintainers; [ r-burns ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/development/libraries/libbutl/default.nix index 4fb76bdcf326..55aacf160f37 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.13.0"; + version = "0.14.0"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz"; - sha256 = "d7944637ab4a17d3a299c04ff6f146e89b2a0f433ddd9d08d8632a25bae9c9cb"; + sha256 = "sha256-zKufrUsLZmjw6pNbOAv+dPyolWpgXgygEnW0Lka6zw8="; }; nativeBuildInputs = [ @@ -36,9 +36,7 @@ stdenv.mkDerivation rec { "config.bin.lib=${build2.configSharedStatic enableShared enableStatic}" ]; - # tests broken with -DNDEBUG - # https://github.com/build2/libbutl/issues/4 - # doCheck = true; + doCheck = true; meta = with lib; { description = "build2 utility library"; @@ -50,5 +48,6 @@ stdenv.mkDerivation rec { changelog = "https://git.build2.org/cgit/libbutl/log"; license = licenses.mit; maintainers = with maintainers; [ r-burns ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/development/libraries/libodb-sqlite/default.nix index 0f87cc497e53..467ae914087f 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.19"; + version = "2.5.0-b.21"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz"; - sha256 = "9443653bfc31d02d0d723f18072f6b04083d090e6580844e33c1e769db122494"; + sha256 = "sha256-dxU8HyzowFGNYCrZIKrZEZDGi9zo3G0x3/L7nfQKo0Y="; }; nativeBuildInputs = [ @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { changelog = "https://git.codesynthesis.com/cgit/odb/libodb-sqlite/tree/NEWS"; license = licenses.gpl2Only; maintainers = with maintainers; [ r-burns ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/development/libraries/libodb/default.nix index a100b3183ead..17f316b2cefb 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.19"; + version = "2.5.0-b.21"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz"; - sha256 = "8180d9d40d8e74ed25b1712953f19379a29abdee3896ae98ba9ade35846adb39"; + sha256 = "sha256-Q4HZ8zU5osZ9Phz59ZAjXh0dbB8ELBY5gMRbDnawCWs="; }; nativeBuildInputs = [ build2 ]; @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { changelog = "https://git.codesynthesis.com/cgit/odb/libodb/tree/NEWS"; license = licenses.gpl2Only; maintainers = with maintainers; [ r-burns ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/build2/bdep.nix b/pkgs/development/tools/build-managers/build2/bdep.nix index ac01b421e579..adfaaf5da71b 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.13.0"; + version = "0.14.0"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz"; - sha256 = "8e11b469d875d05c4eb7a228416b78a61c68a49310e5e41db78ed6d048f6ba2a"; + sha256 = "sha256-sizrGmSixkkJL9nocA4B1I5n9OySxyuZ2bNc1Z4zmPg="; }; strictDeps = true; @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { changelog = "https://git.build2.org/cgit/bdep/tree/NEWS"; license = licenses.mit; maintainers = with maintainers; [ r-burns ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/build2/bootstrap.nix b/pkgs/development/tools/build-managers/build2/bootstrap.nix index 2078055dd8e8..aff1c557d9a2 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.13.0"; + version = "0.14.0"; src = fetchurl { url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz"; - sha256 = "01hmr5y8aa28qchwy9ci8x5q746flwxmlxarmy4w9zay9nmvryms"; + sha256 = "sha256-GO/GstQUmPdRbnqKXJECP2GCyGfUI3kjmDkN0MAEz90="; }; 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 e3ca0f522ad1..95199e74294d 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.13.0"; + version = "0.14.0"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz"; - sha256 = "fec41e171c8ea7967bfc44850568cd624def544fd866c383bd413c5b4349e282"; + sha256 = "sha256-4WTFm0NYZOujxQ3PR9MyjXEJ4ql4qZ9OM5BePuHIK1M="; }; strictDeps = true; @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { changelog = "https://git.build2.org/cgit/bpkg/tree/NEWS"; license = licenses.mit; maintainers = with maintainers; [ r-burns ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/development/tools/build-managers/build2/default.nix index 4cb1d274ec84..7af0089117a4 100644 --- a/pkgs/development/tools/build-managers/build2/default.nix +++ b/pkgs/development/tools/build-managers/build2/default.nix @@ -1,7 +1,6 @@ { stdenv, lib , build2 , fetchurl -, fetchpatch , fixDarwinDylibNames , libbutl , libpkgconf @@ -17,7 +16,7 @@ let in stdenv.mkDerivation rec { pname = "build2"; - version = "0.13.0"; + version = "0.14.0"; outputs = [ "out" "dev" "doc" "man" ]; @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz"; - sha256 = "aff53a87c23534e0232b5cf746e0be4b2aaa840c3de4e668b98e382a3973c45e"; + sha256 = "sha256-/pWj68JmBthOJ2CTQHo9Ww3MCv4xBOw0SusJpMfX5Y8="; }; patches = [ @@ -33,11 +32,6 @@ stdenv.mkDerivation rec { ./remove-config-store-paths.patch # Pick up sysdirs from NIX_LDFLAGS ./nix-ldflags-sysdirs.patch - # Fix stray '-l' linker flags in pkg-config files (remove in next release) - (fetchpatch { - url = "https://github.com/build2/build2/commit/d51892e33a0fe69e743e02d9620312133a7ac61d.patch"; - sha256 = "0xzm084bxnfi8lqng0cwxvz8ylbfzk0didbr2wf385gssv4fva81"; - }) ]; 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 037cf8a2f38c..394cf208c439 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,14 @@ --- a/libbuild2/buildfile +++ b/libbuild2/buildfile -@@ -68,7 +68,11 @@ config/cxx{host-config}: config/in{host-config} +@@ -73,7 +73,11 @@ config/cxx{host-config}: config/in{host-config} # - build2_config = $regex.replace_lines( \ -+ $regex.replace_lines( \ - $config.save(), \ - '^ *(#|config\.dist\.|config\.install\.chroot).*$', \ - [null], \ -+ return_lines), \ -+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \ -+ [null], \ + 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], \ return_lines)