Bernardo Meurer
2 years ago
parent
ad79594d1e
commit
1ba2428545
@ -0,0 +1,213 @@ |
||||
{ stdenv |
||||
, autoconf-archive |
||||
, autoreconfHook |
||||
, bash |
||||
, bison |
||||
, boehmgc |
||||
, boost |
||||
, brotli |
||||
, busybox-sandbox-shell |
||||
, bzip2 |
||||
, callPackage |
||||
, coreutils |
||||
, curl |
||||
, editline |
||||
, flex |
||||
, gnutar |
||||
, gtest |
||||
, gzip |
||||
, jq |
||||
, lib |
||||
, libarchive |
||||
, libcpuid |
||||
, libsodium |
||||
, lowdown |
||||
, mdbook |
||||
, nlohmann_json |
||||
, openssl |
||||
, perl |
||||
, pkg-config |
||||
, Security |
||||
, sqlite |
||||
, util-linuxMinimal |
||||
, xz |
||||
|
||||
, enableDocumentation ? lib.versionOlder version "2.4pre" || stdenv.hostPlatform == stdenv.buildPlatform |
||||
, enableStatic ? stdenv.hostPlatform.isStatic |
||||
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp |
||||
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp |
||||
|
||||
, confDir |
||||
, stateDir |
||||
, storeDir |
||||
|
||||
, version |
||||
, src |
||||
, suffix ? "" |
||||
, patches ? [ ] |
||||
}: |
||||
let |
||||
sh = busybox-sandbox-shell; |
||||
|
||||
atLeast24 = lib.versionAtLeast version "2.4pre"; |
||||
atLeast25 = lib.versionAtLeast version "2.5pre"; |
||||
|
||||
nix-aws-sdk = (aws-sdk-cpp.override { |
||||
apis = [ "s3" "transfer" ]; |
||||
customMemoryManagement = false; |
||||
}).overrideDerivation (args: { |
||||
patches = (args.patches or [ ]) ++ [ ./patches/aws-sdk-cpp-TransferManager-ContentEncoding.patch ]; |
||||
}); |
||||
in |
||||
stdenv.mkDerivation { |
||||
pname = "nix"; |
||||
inherit src patches; |
||||
|
||||
version = "${version}${suffix}"; |
||||
VERSION_SUFFIX = suffix; |
||||
|
||||
outputs = |
||||
[ "out" "dev" ] |
||||
++ lib.optionals enableDocumentation [ "man" "doc" ]; |
||||
|
||||
hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; |
||||
|
||||
nativeBuildInputs = [ |
||||
pkg-config |
||||
] ++ lib.optionals atLeast24 [ |
||||
autoconf-archive |
||||
autoreconfHook |
||||
bison |
||||
flex |
||||
jq |
||||
] ++ lib.optionals (atLeast24 && enableDocumentation) [ |
||||
(lib.getBin lowdown) |
||||
mdbook |
||||
] ++ lib.optionals stdenv.isLinux [ |
||||
util-linuxMinimal |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
boost |
||||
brotli |
||||
bzip2 |
||||
curl |
||||
editline |
||||
libsodium |
||||
openssl |
||||
sqlite |
||||
xz |
||||
] ++ lib.optionals stdenv.isDarwin [ |
||||
Security |
||||
] ++ lib.optionals atLeast24 [ |
||||
gtest |
||||
libarchive |
||||
lowdown |
||||
] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ |
||||
libcpuid |
||||
] ++ lib.optionals withLibseccomp [ |
||||
libseccomp |
||||
] ++ lib.optionals withAWS [ |
||||
nix-aws-sdk |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ boehmgc ]; |
||||
|
||||
NIX_LDFLAGS = lib.optionals (!atLeast24) [ |
||||
# https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba |
||||
(lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto") |
||||
# https://github.com/NixOS/nix/commits/74b4737d8f0e1922ef5314a158271acf81cd79f8 |
||||
(lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic") |
||||
]; |
||||
|
||||
preConfigure = |
||||
# Copy libboost_context so we don't get all of Boost in our closure. |
||||
# https://github.com/NixOS/nixpkgs/issues/45462 |
||||
lib.optionalString (!enableStatic) '' |
||||
mkdir -p $out/lib |
||||
cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib |
||||
rm -f $out/lib/*.a |
||||
${lib.optionalString stdenv.isLinux '' |
||||
chmod u+w $out/lib/*.so.* |
||||
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* |
||||
''} |
||||
'' + |
||||
# On all versions before c9f51e87057652db0013289a95deffba495b35e7, which |
||||
# removes config.nix entirely and is not present in 2.3.x, we need to |
||||
# patch around an issue where the Nix configure step pulls in the build |
||||
# system's bash and other utilities when cross-compiling. |
||||
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && !atLeast24) '' |
||||
mkdir tmp/ |
||||
substitute corepkgs/config.nix.in tmp/config.nix.in \ |
||||
--subst-var-by bash ${bash}/bin/bash \ |
||||
--subst-var-by coreutils ${coreutils}/bin \ |
||||
--subst-var-by bzip2 ${bzip2}/bin/bzip2 \ |
||||
--subst-var-by gzip ${gzip}/bin/gzip \ |
||||
--subst-var-by xz ${xz}/bin/xz \ |
||||
--subst-var-by tar ${gnutar}/bin/tar \ |
||||
--subst-var-by tr ${coreutils}/bin/tr |
||||
mv tmp/config.nix.in corepkgs/config.nix.in |
||||
''; |
||||
|
||||
configureFlags = [ |
||||
"--with-store-dir=${storeDir}" |
||||
"--localstatedir=${stateDir}" |
||||
"--sysconfdir=${confDir}" |
||||
"--enable-gc" |
||||
] ++ lib.optionals (!enableDocumentation) [ |
||||
"--disable-doc-gen" |
||||
] ++ lib.optionals (!atLeast24) [ |
||||
# option was removed in 2.4 |
||||
"--disable-init-state" |
||||
] ++ lib.optionals stdenv.isLinux [ |
||||
"--with-sandbox-shell=${sh}/bin/busybox" |
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system) [ |
||||
"--with-system=${stdenv.hostPlatform.nix.system}" |
||||
] ++ lib.optionals (!withLibseccomp) [ |
||||
# RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 |
||||
"--disable-seccomp-sandboxing" |
||||
]; |
||||
|
||||
makeFlags = [ |
||||
"profiledir=$(out)/etc/profile.d" |
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; |
||||
|
||||
installFlags = [ "sysconfdir=$(out)/etc" ]; |
||||
|
||||
doInstallCheck = true; |
||||
|
||||
# socket path becomes too long otherwise |
||||
preInstallCheck = lib.optionalString stdenv.isDarwin '' |
||||
export TMPDIR=$NIX_BUILD_TOP |
||||
'' |
||||
# See https://github.com/NixOS/nix/issues/5687 |
||||
+ lib.optionalString (atLeast25 && stdenv.isDarwin) '' |
||||
echo "exit 99" > tests/gc-non-blocking.sh |
||||
''; |
||||
|
||||
separateDebugInfo = stdenv.isLinux && (atLeast24 -> !enableStatic); |
||||
|
||||
enableParallelBuilding = true; |
||||
|
||||
meta = with lib; { |
||||
description = "Powerful package manager that makes package management reliable and reproducible"; |
||||
longDescription = '' |
||||
Nix is a powerful package manager for Linux and other Unix systems that |
||||
makes package management reliable and reproducible. It provides atomic |
||||
upgrades and rollbacks, side-by-side installation of multiple versions of |
||||
a package, multi-user package management and easy setup of build |
||||
environments. |
||||
''; |
||||
homepage = "https://nixos.org/"; |
||||
license = licenses.lgpl2Plus; |
||||
maintainers = with maintainers; [ eelco lovesegfault ]; |
||||
platforms = platforms.unix; |
||||
outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; |
||||
}; |
||||
|
||||
passthru = { |
||||
inherit boehmgc; |
||||
|
||||
perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { inherit version src; }); |
||||
}; |
||||
} |
||||
@ -0,0 +1,44 @@ |
||||
{ stdenv |
||||
, perl |
||||
, pkg-config |
||||
, curl |
||||
, nix |
||||
, libsodium |
||||
, boost |
||||
, autoreconfHook |
||||
, autoconf-archive |
||||
, nlohmann_json |
||||
|
||||
, version |
||||
, src |
||||
}: |
||||
|
||||
stdenv.mkDerivation { |
||||
pname = "nix-perl"; |
||||
inherit version src; |
||||
|
||||
postUnpack = "sourceRoot=$sourceRoot/perl"; |
||||
|
||||
# This is not cross-compile safe, don't have time to fix right now |
||||
# but noting for future travellers. |
||||
nativeBuildInputs = [ |
||||
autoconf-archive |
||||
autoreconfHook |
||||
boost |
||||
curl |
||||
libsodium |
||||
nix |
||||
nlohmann_json |
||||
perl |
||||
pkg-config |
||||
]; |
||||
|
||||
configureFlags = [ |
||||
"--with-dbi=${perl.pkgs.DBI}/${perl.libPrefix}" |
||||
"--with-dbd-sqlite=${perl.pkgs.DBDSQLite}/${perl.libPrefix}" |
||||
]; |
||||
|
||||
preConfigure = "export NIX_STATE_DIR=$TMPDIR"; |
||||
|
||||
preBuild = "unset NIX_INDENT_MAKE"; |
||||
} |
||||
@ -0,0 +1,42 @@ |
||||
diff --git a/pthread_stop_world.c b/pthread_stop_world.c
|
||||
index 1cee6a0b..46c3acd9 100644
|
||||
--- a/pthread_stop_world.c
|
||||
+++ b/pthread_stop_world.c
|
||||
@@ -674,6 +674,8 @@ GC_INNER void GC_push_all_stacks(void)
|
||||
struct GC_traced_stack_sect_s *traced_stack_sect;
|
||||
pthread_t self = pthread_self();
|
||||
word total_size = 0;
|
||||
+ size_t stack_limit;
|
||||
+ pthread_attr_t pattr;
|
||||
|
||||
if (!EXPECT(GC_thr_initialized, TRUE))
|
||||
GC_thr_init();
|
||||
@@ -723,6 +725,28 @@ GC_INNER void GC_push_all_stacks(void)
|
||||
hi = p->altstack + p->altstack_size;
|
||||
/* FIXME: Need to scan the normal stack too, but how ? */
|
||||
/* FIXME: Assume stack grows down */
|
||||
+ } else {
|
||||
+ if (pthread_getattr_np(p->id, &pattr)) {
|
||||
+ ABORT("GC_push_all_stacks: pthread_getattr_np failed!");
|
||||
+ }
|
||||
+ if (pthread_attr_getstacksize(&pattr, &stack_limit)) {
|
||||
+ ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!");
|
||||
+ }
|
||||
+ // When a thread goes into a coroutine, we lose its original sp until
|
||||
+ // control flow returns to the thread.
|
||||
+ // While in the coroutine, the sp points outside the thread stack,
|
||||
+ // so we can detect this and push the entire thread stack instead,
|
||||
+ // as an approximation.
|
||||
+ // We assume that the coroutine has similarly added its entire stack.
|
||||
+ // This could be made accurate by cooperating with the application
|
||||
+ // via new functions and/or callbacks.
|
||||
+ #ifndef STACK_GROWS_UP
|
||||
+ if (lo >= hi || lo < hi - stack_limit) { // sp outside stack
|
||||
+ lo = hi - stack_limit;
|
||||
+ }
|
||||
+ #else
|
||||
+ #error "STACK_GROWS_UP not supported in boost_coroutine2 (as of june 2021), so we don't support it in Nix."
|
||||
+ #endif
|
||||
}
|
||||
GC_push_all_stack_sections(lo, hi, traced_stack_sect);
|
||||
# ifdef STACK_GROWS_UP
|
||||
@ -0,0 +1,36 @@ |
||||
From 3884f7a69a57d8ecfcbcaae476ec2ff53ffbd549 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Hensing <robert@roberthensing.nl>
|
||||
Date: Thu, 11 Nov 2021 11:03:21 +0100
|
||||
Subject: [PATCH] Install nlohmann_json headers
|
||||
|
||||
These headers are included by the libexpr, libfetchers, libstore
|
||||
and libutil headers.
|
||||
Considering that these are vendored sources, Nix should expose them,
|
||||
as it is not a good idea for reverse dependencies to rely on a
|
||||
potentially different source that can go out of sync.
|
||||
---
|
||||
Makefile | 1 +
|
||||
src/nlohmann/local.mk | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
create mode 100644 src/nlohmann/local.mk
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 5040d288485..e6ce50cbdb7 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -10,6 +10,7 @@ makefiles = \
|
||||
src/libexpr/local.mk \
|
||||
src/libcmd/local.mk \
|
||||
src/nix/local.mk \
|
||||
+ src/nlohmann/local.mk \
|
||||
src/resolve-system-dependencies/local.mk \
|
||||
scripts/local.mk \
|
||||
misc/bash/local.mk \
|
||||
diff --git a/src/nlohmann/local.mk b/src/nlohmann/local.mk
|
||||
new file mode 100644
|
||||
index 00000000000..63c427e000e
|
||||
--- /dev/null
|
||||
+++ b/src/nlohmann/local.mk
|
||||
@@ -0,0 +1,2 @@
|
||||
+$(foreach i, $(wildcard src/nlohmann/*.hpp), \
|
||||
+ $(eval $(call install-file-in, $(i), $(includedir)/nlohmann, 0644)))
|
||||
Loading…
Reference in new issue