colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #142627 from r-burns/build2

Browse Source
This commit is contained in:
Sandro 2021-10-27 20:47:16 +02:00 committed by GitHub
commit 83219e47af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
};
}

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

@ -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;
};
}

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

@ -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;
};
}

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

@ -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;
};
}

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

@ -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;
};
}

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

@ -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

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

@ -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;
};
}

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

@ -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;

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

@ -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)