mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-23 04:25:14 +00:00
Merge release-24.05 into staging-next-24.05
This commit is contained in:
github-actions[bot]
GitHub
commit
68f5d74d54
@ -39,7 +39,7 @@ with lib;
|
||||
# dep of graphviz, libXpm is optional for Xpm support
|
||||
gd = super.gd.override { withXorg = false; };
|
||||
ghostscript = super.ghostscript.override { cupsSupport = false; x11Support = false; };
|
||||
gjs = super.gjs.overrideAttrs { doCheck = false; installTests = false; }; # avoid test dependency on gtk3
|
||||
gjs = (super.gjs.override { installTests = false; }).overrideAttrs { doCheck = false; }; # avoid test dependency on gtk3
|
||||
gobject-introspection = super.gobject-introspection.override { x11Support = false; };
|
||||
gpg-tui = super.gpg-tui.override { x11Support = false; };
|
||||
gpsd = super.gpsd.override { guiSupport = false; };
|
||||
|
||||
@ -73,6 +73,7 @@ in
|
||||
virtualHosts.${cfg.domain}.locations."/oauth2/" = {
|
||||
proxyPass = cfg.proxy;
|
||||
extraConfig = ''
|
||||
auth_request off;
|
||||
proxy_set_header X-Scheme $scheme;
|
||||
proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri;
|
||||
'';
|
||||
|
||||
@ -49,10 +49,10 @@ let
|
||||
version = src.version;
|
||||
src = pkgs.invoiceplane;
|
||||
|
||||
postPhase = ''
|
||||
postPatch = ''
|
||||
# Patch index.php file to load additional config file
|
||||
substituteInPlace index.php \
|
||||
--replace "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();";
|
||||
--replace-fail "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();";
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -453,15 +453,17 @@
|
||||
dependencies = with self; [ copilot-lua plenary-nvim ];
|
||||
};
|
||||
|
||||
copilot-vim = super.copilot-vim.overrideAttrs {
|
||||
copilot-vim = super.copilot-vim.overrideAttrs (old: {
|
||||
postInstall = ''
|
||||
substituteInPlace $out/autoload/copilot/agent.vim \
|
||||
--replace " let node = get(g:, 'copilot_node_command', ''\'''\')" \
|
||||
" let node = get(g:, 'copilot_node_command', '${nodejs}/bin/node')"
|
||||
'';
|
||||
|
||||
meta.license = lib.licenses.unfree;
|
||||
};
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
});
|
||||
|
||||
coq_nvim = super.coq_nvim.overrideAttrs {
|
||||
passthru.python3Dependencies = ps:
|
||||
|
||||
@ -27,11 +27,11 @@
|
||||
version = "2024-05-13";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-2Yt91vWR5SYLBTO+PIEgFswkvwxJsNpKidOwxUBgLeg=";
|
||||
rev = "126.0.6478.55-1";
|
||||
hash = "sha256-vQrUQMmNSw+b9nPzP1RmkncQHasmZvnxNHjfiPoMUXo=";
|
||||
rev = "126.0.6478.61-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-nXRzISkU37TIgV8rjO0qgnhq8uM37M6IpMoGHdsOGIM=";
|
||||
version = "126.0.6478.55";
|
||||
hash = "sha256-cB2jrasrtaFWM8tpG9leuC+jUAvoU8g5977cn4r7rbw=";
|
||||
version = "126.0.6478.61";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, electron_28
|
||||
, electron
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
@ -52,7 +52,7 @@ stdenv.mkDerivation {
|
||||
substituteInPlace $out/share/applications/Mattermost.desktop \
|
||||
--replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop
|
||||
|
||||
makeWrapper '${lib.getExe electron_28}' $out/bin/${pname} \
|
||||
makeWrapper '${lib.getExe electron}' $out/bin/${pname} \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--add-flags $out/share/${pname}/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "7.12.0-beta.2";
|
||||
version = "7.13.0-beta.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-Hpg9pkRXbwF5uKhLzn1cfHTzlYmsZd5tndtwVFcL7iU=";
|
||||
hash = "sha256-DvYRvIA+rg4RKXbqWjWj7oFnfLboEiMeP7HgGYkRBDM=";
|
||||
}
|
||||
|
||||
@ -28,6 +28,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
url = "https://github.com/virt-manager/virt-manager/commit/83fcc5b2e8f2cede84564387756fe8971de72188.patch";
|
||||
hash = "sha256-yEk+md5EkwYpP27u3E+oTJ8thgtH2Uy1x3JIWPBhqeE=";
|
||||
})
|
||||
# fix crash with some cursor themes
|
||||
(fetchpatch {
|
||||
url = "https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67.patch";
|
||||
hash = "sha256-dw6yrMaAOnTh8Z6xJQQKmYelOkOl6EBAOfJQU9vQ8Ws=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stats";
|
||||
version = "2.10.16";
|
||||
version = "2.10.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
|
||||
hash = "sha256-fSn4qZMXRlWxqIZ2Jh1anLQPbx/TqHA7UFRq+pR3o+4=";
|
||||
hash = "sha256-iBo6rP8V7jGTFaKyd3er3L2EWW3slCyV6eFoJT3w7z8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "JuliaMono-ttf";
|
||||
version = "0.055";
|
||||
version = "0.054";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz";
|
||||
stripRoot = false;
|
||||
hash = "sha256-bE7XjVzleSo5hjc7Azcl8R4OgJzsj1U21UOuXrBkulA=";
|
||||
hash = "sha256-DtvaFu3r2r5WmlFCbkbzqAk/Y2BNEnxR6hPDfKM+/aQ=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jasmin-compiler";
|
||||
version = "2023.06.3";
|
||||
version = "2023.06.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
|
||||
hash = "sha256-Fp3QMsBaPOA6L6kOgffoHaJAypJDt8JxT8EVDDpPAKs=";
|
||||
hash = "sha256-b1lrVbXJQeg+7tI7JcR9JTuiel/b/mctU1caT/y/4SA=";
|
||||
};
|
||||
|
||||
sourceRoot = "jasmin-compiler-v${version}/compiler";
|
||||
|
||||
@ -13,17 +13,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unison-code-manager";
|
||||
version = "0.5.21";
|
||||
version = "0.5.22";
|
||||
|
||||
src = if stdenv.isDarwin then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz";
|
||||
hash = "sha256-AtLky8RevRRAZFAzGz4UqWhBP+Qm/kRu4fMTdx9KB+w=";
|
||||
hash = "sha256-Exgi0eKk+ZngpnbfY/btHf+uiXcmummnWKfmCUESWgc=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz";
|
||||
hash = "sha256-ninkfYB9dmOD6+LsQNDJW89FrwZn2GrZkLGbafMsrHg=";
|
||||
hash = "sha256-EWfyqaFtGJJ5GE0mRTtNC9hHOzbqG9MsvRh5sFq5pRY=";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, cudaSupport ? opencv.cudaSupport or false
|
||||
|
||||
# build
|
||||
, scons
|
||||
, addOpenGLRunpath
|
||||
, autoPatchelfHook
|
||||
, cmake
|
||||
@ -25,7 +26,7 @@
|
||||
, protobuf
|
||||
, pugixml
|
||||
, snappy
|
||||
, tbb
|
||||
, tbb_2021_5
|
||||
, cudaPackages
|
||||
}:
|
||||
|
||||
@ -36,6 +37,9 @@ let
|
||||
|
||||
stdenv = gcc12Stdenv;
|
||||
|
||||
# prevent scons from leaking in the default python version
|
||||
scons' = scons.override { python3 = python3Packages.python; };
|
||||
|
||||
tbbbind_version = "2_5";
|
||||
tbbbind = fetchurl {
|
||||
url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz";
|
||||
@ -54,14 +58,14 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvino";
|
||||
version = "2024.1.0";
|
||||
version = "2024.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openvinotoolkit";
|
||||
repo = "openvino";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-OOSxXpLjmhOgKvrSO6SmY7xLhJSzGXT8w/Y4FnfwTqU=";
|
||||
hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -78,6 +82,7 @@ stdenv.mkDerivation rec {
|
||||
patchelf
|
||||
pkg-config
|
||||
python
|
||||
scons'
|
||||
shellcheck
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
@ -91,7 +96,9 @@ stdenv.mkDerivation rec {
|
||||
popd
|
||||
'';
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
dontUseSconsCheck = true;
|
||||
dontUseSconsBuild = true;
|
||||
dontUseSconsInstall = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
@ -109,7 +116,7 @@ stdenv.mkDerivation rec {
|
||||
(cmakeBool "ENABLE_SAMPLES" false)
|
||||
|
||||
# features
|
||||
(cmakeBool "ENABLE_INTEL_CPU" true)
|
||||
(cmakeBool "ENABLE_INTEL_CPU" stdenv.isx86_64)
|
||||
(cmakeBool "ENABLE_JS" false)
|
||||
(cmakeBool "ENABLE_LTO" true)
|
||||
(cmakeBool "ENABLE_ONEDNN_FOR_GPU" false)
|
||||
@ -125,8 +132,6 @@ stdenv.mkDerivation rec {
|
||||
(cmakeBool "ENABLE_SYSTEM_TBB" true)
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing";
|
||||
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
"libngraph_backend.so"
|
||||
];
|
||||
@ -140,7 +145,7 @@ stdenv.mkDerivation rec {
|
||||
opencv.cxxdev
|
||||
pugixml
|
||||
snappy
|
||||
tbb
|
||||
tbb_2021_5
|
||||
] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
];
|
||||
@ -172,8 +177,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://docs.openvinotoolkit.org/";
|
||||
license = with licenses; [ asl20 ];
|
||||
platforms = platforms.all;
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) # requires scons, then fails with *** Source directory cannot be under variant directory.
|
||||
|| stdenv.isDarwin; # Cannot find macos sdk
|
||||
broken = stdenv.isDarwin; # Cannot find macos sdk
|
||||
maintainers = with maintainers; [ tfmoraes ];
|
||||
};
|
||||
}
|
||||
|
||||
71
pkgs/development/libraries/tbb/2021_5.nix
Normal file
71
pkgs/development/libraries/tbb/2021_5.nix
Normal file
@ -0,0 +1,71 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tbb";
|
||||
version = "2021.5.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneTBB";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TJ/oSSMvgtKuz7PVyIoFEbBW6EZz7t2wr/kP093HF/w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
patches = [
|
||||
# port of https://github.com/oneapi-src/oneTBB/pull/1031
|
||||
./gcc13-fixes-2021.5.0.patch
|
||||
|
||||
(fetchpatch {
|
||||
# Fix "field used uninitialized" on modern gcc versions (https://github.com/oneapi-src/oneTBB/pull/958)
|
||||
url = "https://github.com/oneapi-src/oneTBB/commit/3003ec07740703e6aed12b028af20f4b0f16adae.patch";
|
||||
hash = "sha256-l4+9IxIEdRX/q8JyDY9CPKWzSLatpIVSiNjmIM7ilj0=";
|
||||
})
|
||||
];
|
||||
|
||||
# Disable failing test on musl
|
||||
# test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
substituteInPlace test/CMakeLists.txt \
|
||||
--replace-fail 'conformance_resumable_tasks' ""
|
||||
'';
|
||||
|
||||
# Fix build with modern gcc
|
||||
# In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=array-bounds" "-Wno-error=stringop-overflow" "-Wno-address" ] ++
|
||||
# error: variable 'val' set but not used
|
||||
lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++
|
||||
# Workaround for gcc-12 ICE when using -O3
|
||||
# https://gcc.gnu.org/PR108854
|
||||
lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ];
|
||||
|
||||
# Fix undefined reference errors with version script under LLVM.
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version";
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Intel Thread Building Blocks C++ Library";
|
||||
homepage = "http://threadingbuildingblocks.org/";
|
||||
license = licenses.asl20;
|
||||
longDescription = ''
|
||||
Intel Threading Building Blocks offers a rich and complete approach to
|
||||
expressing parallelism in a C++ program. It is a library that helps you
|
||||
take advantage of multi-core processor performance without having to be a
|
||||
threading expert. Intel TBB is not just a threads-replacement library. It
|
||||
represents a higher-level, task-based parallelism that abstracts platform
|
||||
details and threading mechanisms for scalability and performance.
|
||||
'';
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thoughtpolice tmarkus ];
|
||||
};
|
||||
}
|
||||
13
pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch
Normal file
13
pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h
|
||||
index 33bc8ab4..a3d21baf 100644
|
||||
--- a/test/common/utils_assert.h
|
||||
+++ b/test/common/utils_assert.h
|
||||
@@ -20,6 +20,8 @@
|
||||
#include "config.h"
|
||||
#include "utils_report.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
+
|
||||
#define REPORT_FATAL_ERROR REPORT
|
||||
|
||||
namespace utils {
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
./configure -prefix $out
|
||||
./configure -prefix $out ${lib.optionalString stdenv.isDarwin "--no-strip"}
|
||||
mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.43.6";
|
||||
version = "1.44.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8yBcSiaav28AevAH5wh0VwpMR5U5Vong8D+UFCx/wjo=";
|
||||
hash = "sha256-Q76j1cbRL52jmmkpTZMkpP3/FCeGZqKYAN819mQY9BE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o8DsFtn3+gtIMO5LS3mHbQS1iWT46iC9ZHr8hEOXZrs=";
|
||||
cargoHash = "sha256-UtnHOzlko5RUAbohwU755BDLSF/Rx20vabaKokEsRLU=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@ -10,11 +10,11 @@ let
|
||||
};
|
||||
in
|
||||
fetch_librusty_v8 {
|
||||
version = "0.91.1";
|
||||
version = "0.93.1";
|
||||
shas = {
|
||||
x86_64-linux = "sha256-2J/YDTtSCXo2nsO0Lx6mJqKSFu2hUc8HmNAL2SD9ImI=";
|
||||
aarch64-linux = "sha256-NwuDVaEbYWZfF2epVPPhIKM1aw35e8Bp5siBoREpym8=";
|
||||
x86_64-darwin = "sha256-JNf4Me4VMdvjgYM4OyCUlQW6Q/OdQ2BuDNWFKI4sbtg=";
|
||||
aarch64-darwin = "sha256-WVBDiGWVBvMiKNgPaPw8KQChARkFDfx8Nt9QEobGNG4=";
|
||||
x86_64-linux = "sha256-ttbwIxzMgihfwwjh3usu7FxVTwLt7ceXU+MyaxXfkxk=";
|
||||
aarch64-linux = "sha256-rlyY4C4FMHTyPUzqHKYzToIs9tJunTXEor9wc/7zH/0=";
|
||||
x86_64-darwin = "sha256-IUDe0ogBSCaz1q+uXepOi883hamtJYqBPtNfrm/y6Qo=";
|
||||
aarch64-darwin = "sha256-53PuHq7AUi21cjopoFakzLuJyqSJ9VeF7g53IWxFXAI=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "flyctl";
|
||||
version = "0.2.66";
|
||||
version = "0.2.71";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superfly";
|
||||
repo = "flyctl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vdiTlUzrldbxWo5LoYnWTGq/P/QA+Qybk78pqxDoUlQ=";
|
||||
hash = "sha256-d2qoTRWuUh7Kn0uqT3fIlB8BbFJmyVEIlfInS3m+etc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VdOBAxIaQzld4uX42RPYg4+p5F6mnBnI5efV8X48Eh8=";
|
||||
vendorHash = "sha256-iRZrjkWQxuUW/YM5TygFt+g8suM5iLGsWsCt4QQOX3M=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -35,12 +35,14 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
# We override checkPhase to be able to test ./... while using subPackages
|
||||
# Temporary fix for https://github.com/superfly/flyctl/issues/3642. We
|
||||
# should go back to buildGoDir instead of go test once that is resolved.
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# We do not set trimpath for tests, in case they reference test assets
|
||||
export GOFLAGS=''${GOFLAGS//-trimpath/}
|
||||
|
||||
buildGoDir test ./...
|
||||
go test ./...
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
@ -2,12 +2,11 @@ diff --git a/tools/build/Makefile b/tools/build/Makefile
|
||||
index 948a5f9dfdb..592af84eeae 100644
|
||||
--- a/tools/build/Makefile
|
||||
+++ b/tools/build/Makefile
|
||||
@@ -327,15 +327,15 @@ host-symlinks:
|
||||
@@ -327,14 +327,14 @@ host-symlinks:
|
||||
# and cross-tools stages. We do this here using mkdir since mtree may not exist
|
||||
# yet (this happens if we are crossbuilding from Linux/Mac).
|
||||
INSTALLDIR_LIST= \
|
||||
- bin \
|
||||
- lib/casper \
|
||||
- lib/geom \
|
||||
- usr/include/casper \
|
||||
- usr/include/private/ucl \
|
||||
@ -16,7 +15,6 @@ index 948a5f9dfdb..592af84eeae 100644
|
||||
- usr/libdata/pkgconfig \
|
||||
- usr/libexec
|
||||
+ ${BINDIR} \
|
||||
+ ${LIBDIR}/casper \
|
||||
+ ${LIBDIR}/geom \
|
||||
+ ${INCLUDEDIR}/casper \
|
||||
+ ${INCLUDEDIR}/private/ucl \
|
||||
|
||||
158
pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch
Normal file
158
pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch
Normal file
@ -0,0 +1,158 @@
|
||||
diff --git a/include/_ctype.h b/include/_ctype.h
|
||||
index 91e6b1d14f6b..a6896b598da3 100644
|
||||
--- a/include/_ctype.h
|
||||
+++ b/include/_ctype.h
|
||||
@@ -44,7 +44,7 @@
|
||||
#define __CTYPE_H_
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
-#include <sys/_types.h>
|
||||
+#include <sys/types.h>
|
||||
|
||||
#define _CTYPE_A 0x00000100L /* Alpha */
|
||||
#define _CTYPE_C 0x00000200L /* Control */
|
||||
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
|
||||
index 2d3723b49f5b..6bbff732b9d7 100644
|
||||
--- a/lib/libc/locale/collate.h
|
||||
+++ b/lib/libc/locale/collate.h
|
||||
@@ -36,6 +36,7 @@
|
||||
#ifndef _COLLATE_H_
|
||||
#define _COLLATE_H_
|
||||
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/types.h>
|
||||
#include <limits.h>
|
||||
diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c
|
||||
index 44b7e3292eae..79c30b7cf372 100644
|
||||
--- a/usr.bin/localedef/charmap.c
|
||||
+++ b/usr.bin/localedef/charmap.c
|
||||
@@ -31,6 +31,7 @@
|
||||
/*
|
||||
* CHARMAP file handling for localedef.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/tree.h>
|
||||
diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c
|
||||
index 2a080773a95e..3f0030c638f5 100644
|
||||
--- a/usr.bin/localedef/collate.c
|
||||
+++ b/usr.bin/localedef/collate.c
|
||||
@@ -31,6 +31,7 @@
|
||||
/*
|
||||
* LC_COLLATE database generation routines for localedef.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/tree.h>
|
||||
diff --git a/usr.bin/localedef/ctype.c b/usr.bin/localedef/ctype.c
|
||||
index ab7b76e57b2d..846c6d6480a8 100644
|
||||
--- a/usr.bin/localedef/ctype.c
|
||||
+++ b/usr.bin/localedef/ctype.c
|
||||
@@ -32,6 +32,7 @@
|
||||
/*
|
||||
* LC_CTYPE database generation routines for localedef.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/tree.h>
|
||||
|
||||
diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c
|
||||
index 5ff146d6f655..ed69aa1f0c0e 100644
|
||||
--- a/usr.bin/localedef/localedef.c
|
||||
+++ b/usr.bin/localedef/localedef.c
|
||||
@@ -32,7 +32,7 @@
|
||||
* POSIX localedef.
|
||||
*/
|
||||
#include <sys/cdefs.h>
|
||||
-#include <sys/endian.h>
|
||||
+#include <endian.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
diff --git a/usr.bin/localedef/messages.c b/usr.bin/localedef/messages.c
|
||||
index 6b8eb9d684dd..0155821d0e56 100644
|
||||
--- a/usr.bin/localedef/messages.c
|
||||
+++ b/usr.bin/localedef/messages.c
|
||||
@@ -31,6 +31,7 @@
|
||||
/*
|
||||
* LC_MESSAGES database generation routines for localedef.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c
|
||||
index 7a77ac7e256c..7636c4deca1f 100644
|
||||
--- a/usr.bin/localedef/monetary.c
|
||||
+++ b/usr.bin/localedef/monetary.c
|
||||
@@ -31,6 +31,7 @@
|
||||
/*
|
||||
* LC_MONETARY database generation routines for localedef.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c
|
||||
index 5533b7c10e1a..9c47494f815c 100644
|
||||
--- a/usr.bin/localedef/numeric.c
|
||||
+++ b/usr.bin/localedef/numeric.c
|
||||
@@ -31,6 +31,7 @@
|
||||
/*
|
||||
* LC_NUMERIC database generation routines for localedef.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
diff --git a/usr.bin/localedef/parser.y b/usr.bin/localedef/parser.y
|
||||
index 23b3b54f8a6e..e01330f0152d 100644
|
||||
--- a/usr.bin/localedef/parser.y
|
||||
+++ b/usr.bin/localedef/parser.y
|
||||
@@ -33,6 +33,7 @@
|
||||
* POSIX localedef grammar.
|
||||
*/
|
||||
|
||||
+#include <stdint.h>
|
||||
#include <wchar.h>
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
diff --git a/usr.bin/localedef/scanner.c b/usr.bin/localedef/scanner.c
|
||||
index c6d45a993f28..b17670ef4b4a 100644
|
||||
--- a/usr.bin/localedef/scanner.c
|
||||
+++ b/usr.bin/localedef/scanner.c
|
||||
@@ -32,6 +32,7 @@
|
||||
* This file contains the "scanner", which tokenizes the input files
|
||||
* for localedef for processing by the higher level grammar processor.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c
|
||||
index 7a56e244c921..0e409a742d0a 100644
|
||||
--- a/usr.bin/localedef/time.c
|
||||
+++ b/usr.bin/localedef/time.c
|
||||
@@ -31,6 +31,7 @@
|
||||
/*
|
||||
* LC_TIME database generation routines for localedef.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
diff --git a/usr.bin/localedef/wide.c b/usr.bin/localedef/wide.c
|
||||
index 062e120e6912..a199cddb198d 100644
|
||||
--- a/usr.bin/localedef/wide.c
|
||||
+++ b/usr.bin/localedef/wide.c
|
||||
@@ -34,6 +34,7 @@
|
||||
* to the wide character forms used internally by libc. Unfortunately,
|
||||
* this approach means that we need a method for each and every encoding.
|
||||
*/
|
||||
+#include <stdint.h>
|
||||
#include <sys/cdefs.h>
|
||||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
@ -0,0 +1,15 @@
|
||||
--- a/lib/ncurses/tinfo/Makefile 2023-12-26 23:02:07.827892619 -0800
|
||||
+++ b/lib/ncurses/tinfo/Makefile 2023-12-26 23:01:24.175546100 -0800
|
||||
@@ -282,10 +282,10 @@
|
||||
build-tools: make_hash make_keys
|
||||
|
||||
make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META}
|
||||
- ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c
|
||||
+ ${CC_HOST:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c
|
||||
|
||||
make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META}
|
||||
- ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \
|
||||
+ ${CC_HOST:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \
|
||||
${NCURSES_DIR}/ncurses/tinfo/make_hash.c
|
||||
.endif
|
||||
.if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host"
|
||||
92
pkgs/os-specific/bsd/freebsd/pkgs/bin.nix
Normal file
92
pkgs/os-specific/bsd/freebsd/pkgs/bin.nix
Normal file
@ -0,0 +1,92 @@
|
||||
{
|
||||
mkDerivation,
|
||||
pkgsBuildBuild,
|
||||
libjail,
|
||||
libmd,
|
||||
libnetbsd,
|
||||
libcapsicum,
|
||||
libcasper,
|
||||
libelf,
|
||||
libxo,
|
||||
libncurses-tinfo,
|
||||
libedit,
|
||||
lib,
|
||||
stdenv,
|
||||
bsdSetupHook,
|
||||
freebsdSetupHook,
|
||||
makeMinimal,
|
||||
install,
|
||||
tsort,
|
||||
lorder,
|
||||
mandoc,
|
||||
groff,
|
||||
byacc,
|
||||
gencat,
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "bins";
|
||||
path = "bin";
|
||||
extraPaths = [
|
||||
"sys/conf"
|
||||
"sys/sys/param.h"
|
||||
"contrib/sendmail"
|
||||
"contrib/tcsh"
|
||||
"usr.bin/printf"
|
||||
"lib/libsm"
|
||||
];
|
||||
buildInputs = [
|
||||
libjail
|
||||
libmd
|
||||
libnetbsd
|
||||
libcapsicum
|
||||
libcasper
|
||||
libelf
|
||||
libxo
|
||||
libncurses-tinfo
|
||||
libedit
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
bsdSetupHook
|
||||
freebsdSetupHook
|
||||
makeMinimal
|
||||
install
|
||||
tsort
|
||||
lorder
|
||||
mandoc
|
||||
groff
|
||||
|
||||
byacc
|
||||
gencat
|
||||
];
|
||||
|
||||
MK_TESTS = "no";
|
||||
|
||||
postPatch = ''
|
||||
sed -E -i -e '/#define\tBSD.*/d' $BSDSRCDIR/sys/sys/param.h
|
||||
sed -E -i -e '/^SYMLINKS.*/d' $BSDSRCDIR/bin/*/Makefile
|
||||
sed -E -i -e 's/mktemp -t ka/mktemp -t kaXXXXXX/' $BSDSRCDIR/bin/sh/mkbuiltins $BSDSRCDIR/bin/sh/mktokens
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export NIX_CFLAGS_COMPILE="-I$BSDSRCDIR/sys $NIX_CFLAGS_COMPILE"
|
||||
|
||||
make -C $BSDSRCDIR/lib/libsm $makeFlags
|
||||
|
||||
make -C $BSDSRCDIR/bin/sh $makeFlags "CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" CFLAGS="-D__unused= -D__printf0like\(a,b\)= -D__dead2=" ${
|
||||
lib.optionalString (!stdenv.buildPlatform.isFreeBSD) "MK_PIE=no "
|
||||
}mkbuiltins mksyntax mktokens mknodes
|
||||
make -C $BSDSRCDIR/bin/csh $makeFlags "CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" CFLAGS="-D__unused= -D__printf0like\(a,b\)= -D__dead2= -I$BSDSRCDIR/contrib/tcsh -I." ${
|
||||
lib.optionalString (!stdenv.buildPlatform.isFreeBSD) "MK_PIE=no "
|
||||
}gethost
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
makeFlags="$makeFlags ROOTDIR=$out/root"
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
"debug"
|
||||
];
|
||||
}
|
||||
@ -1,10 +1,23 @@
|
||||
{ buildPackages, freebsd-lib }:
|
||||
|
||||
# Wrap NetBSD's install
|
||||
# Wrap GNU coreutils' install
|
||||
# The -l flag causes a symlink instead of a copy to be installed, so
|
||||
# it is safe to discard during bootstrap since coreutils does not support it.
|
||||
|
||||
buildPackages.writeShellScriptBin "boot-install" (
|
||||
freebsd-lib.install-wrapper
|
||||
+ ''
|
||||
fixed_args=()
|
||||
while [[ ''${#args[0]} > 0 ]]; do
|
||||
case "''${args[0]}" in
|
||||
-l)
|
||||
args=("''${args[@]:2}")
|
||||
continue
|
||||
esac
|
||||
fixed_args+=("''${args[0]}")
|
||||
args=("''${args[@]:1}")
|
||||
done
|
||||
|
||||
${buildPackages.netbsd.install}/bin/xinstall "''${args[@]}"
|
||||
${buildPackages.coreutils}/bin/install "''${fixed_args[@]}"
|
||||
''
|
||||
)
|
||||
|
||||
10
pkgs/os-specific/bsd/freebsd/pkgs/cp.nix
Normal file
10
pkgs/os-specific/bsd/freebsd/pkgs/cp.nix
Normal file
@ -0,0 +1,10 @@
|
||||
{ mkDerivation }:
|
||||
mkDerivation {
|
||||
path = "bin/cp";
|
||||
|
||||
extraPaths = [ "sys" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace $BSDSRCDIR/bin/cp/Makefile --replace 'tests' ""
|
||||
'';
|
||||
}
|
||||
@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
isStatic = true;
|
||||
noLibc = true;
|
||||
path = "lib/csu";
|
||||
extraPaths = [
|
||||
"lib/Makefile.inc"
|
||||
|
||||
@ -18,6 +18,17 @@ let
|
||||
lib.concatMapStringsSep "\n" (path: "/${path}") sortedPaths
|
||||
);
|
||||
in
|
||||
runCommand "${pname}-filtered-src" { nativeBuildInputs = [ pkgsBuildBuild.rsync ]; } ''
|
||||
rsync -a -r --files-from=${filterText} ${source}/ $out
|
||||
''
|
||||
runCommand "${pname}-filtered-src"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
(pkgsBuildBuild.rsync.override {
|
||||
enableZstd = false;
|
||||
enableXXHash = false;
|
||||
enableOpenSSL = false;
|
||||
enableLZ4 = false;
|
||||
})
|
||||
];
|
||||
}
|
||||
''
|
||||
rsync -a -r --files-from=${filterText} ${source}/ $out
|
||||
''
|
||||
|
||||
12
pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix
Normal file
12
pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{
|
||||
mkDerivation,
|
||||
libcapsicum,
|
||||
libcasper,
|
||||
}:
|
||||
mkDerivation {
|
||||
path = "usr.bin/iconv";
|
||||
buildInputs = [
|
||||
libcapsicum
|
||||
libcasper
|
||||
];
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
isStatic = true;
|
||||
noLibc = true;
|
||||
path = "include";
|
||||
|
||||
extraPaths = [
|
||||
|
||||
21
pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix
Normal file
21
pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
mkDerivation,
|
||||
libelf,
|
||||
}:
|
||||
mkDerivation {
|
||||
path = "usr.bin/ldd";
|
||||
extraPaths = [
|
||||
"libexec/rtld-elf"
|
||||
"contrib/elftoolchain/libelf"
|
||||
];
|
||||
|
||||
buildInputs = [ libelf ];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-D_RTLD_PATH=${lib.getLib stdenv.cc.libc}/libexec/ld-elf.so.1";
|
||||
};
|
||||
|
||||
meta.platforms = lib.platforms.freebsd;
|
||||
}
|
||||
@ -21,7 +21,7 @@
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
isStatic = true;
|
||||
noLibc = true;
|
||||
pname = "libc";
|
||||
path = "lib/libc";
|
||||
extraPaths =
|
||||
|
||||
1
pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix
Normal file
1
pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix
Normal file
@ -0,0 +1 @@
|
||||
{ mkDerivation }: mkDerivation { path = "lib/libcapsicum"; }
|
||||
26
pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix
Normal file
26
pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
mkDerivation,
|
||||
libnv,
|
||||
}:
|
||||
mkDerivation {
|
||||
path = "lib/libcasper/libcasper";
|
||||
extraPaths = [
|
||||
"lib/Makefile.inc"
|
||||
"lib/libcasper"
|
||||
];
|
||||
buildInputs = [ libnv ];
|
||||
|
||||
MK_TESTS = "no";
|
||||
|
||||
makeFlags = [
|
||||
"STRIP=-s" # flag to install, not command
|
||||
"CFLAGS=-DWITH_CASPER"
|
||||
] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no";
|
||||
|
||||
postInstall = ''
|
||||
make -C $BSDSRCDIR/lib/libcasper/services $makeFlags CFLAGS="-DWITH_CASPER -I$out/include"
|
||||
make -C $BSDSRCDIR/lib/libcasper/services $makeFlags install
|
||||
'';
|
||||
}
|
||||
9
pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix
Normal file
9
pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ mkDerivation, ... }:
|
||||
mkDerivation {
|
||||
path = "lib/libdl";
|
||||
extraPaths = [
|
||||
"lib/libc"
|
||||
"libexec/rtld-elf"
|
||||
];
|
||||
buildInputs = [ ];
|
||||
}
|
||||
7
pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix
Normal file
7
pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{ mkDerivation, libncurses-tinfo }:
|
||||
mkDerivation {
|
||||
path = "lib/libedit";
|
||||
extraPaths = [ "contrib/libedit" ];
|
||||
buildInputs = [ libncurses-tinfo ];
|
||||
MK_TESTS = "no";
|
||||
}
|
||||
29
pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
Normal file
29
pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
bsdSetupHook,
|
||||
freebsdSetupHook,
|
||||
makeMinimal,
|
||||
install,
|
||||
m4,
|
||||
}:
|
||||
mkDerivation {
|
||||
path = "lib/libelf";
|
||||
extraPaths = [
|
||||
"lib/libc"
|
||||
"contrib/elftoolchain"
|
||||
"sys/sys/elf32.h"
|
||||
"sys/sys/elf64.h"
|
||||
"sys/sys/elf_common.h"
|
||||
];
|
||||
buildInputs = [ ];
|
||||
nativeBuildInputs = [
|
||||
bsdSetupHook
|
||||
freebsdSetupHook
|
||||
makeMinimal
|
||||
install
|
||||
m4
|
||||
];
|
||||
|
||||
meta.platforms = lib.platforms.freebsd;
|
||||
}
|
||||
5
pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix
Normal file
5
pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix
Normal file
@ -0,0 +1,5 @@
|
||||
{ mkDerivation }:
|
||||
mkDerivation {
|
||||
path = "lib/libjail";
|
||||
MK_TESTS = "no";
|
||||
}
|
||||
15
pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix
Normal file
15
pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ mkDerivation, pkgsBuildBuild }:
|
||||
mkDerivation {
|
||||
path = "lib/ncurses/tinfo";
|
||||
extraPaths = [
|
||||
"lib/ncurses"
|
||||
"contrib/ncurses"
|
||||
"lib/Makefile.inc"
|
||||
];
|
||||
CC_HOST = "${pkgsBuildBuild.stdenv.cc}/bin/cc";
|
||||
MK_TESTS = "no";
|
||||
preBuild = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -D_SIZE_T -D_WCHAR_T"
|
||||
make $makeFlags "CFLAGS=-D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -I$BSDSRCDIR/contrib/ncurses/ncurses -I$BSDSRCDIR/contrib/ncurses/include -I." ncurses_dll.h make_hash make_keys
|
||||
'';
|
||||
}
|
||||
25
pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix
Normal file
25
pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
versionData,
|
||||
mkDerivation,
|
||||
libncurses-tinfo,
|
||||
...
|
||||
}:
|
||||
mkDerivation {
|
||||
path = "lib/ncurses/ncurses";
|
||||
extraPaths = [
|
||||
"lib/ncurses"
|
||||
"contrib/ncurses"
|
||||
"lib/Makefile.inc"
|
||||
];
|
||||
MK_TESTS = "no";
|
||||
preBuild = lib.optionalString (versionData.major == 14) ''
|
||||
make -C ../tinfo $makeFlags curses.h ncurses_dll.h ncurses_def.h
|
||||
'';
|
||||
buildInputs = lib.optionals (versionData.major == 14) [ libncurses-tinfo ];
|
||||
|
||||
# some packages depend on libncursesw.so.8
|
||||
postInstall = ''
|
||||
ln -s $out/lib/libncursesw.so.9 $out/lib/libncursesw.so.8
|
||||
'';
|
||||
}
|
||||
6
pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix
Normal file
6
pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix
Normal file
@ -0,0 +1,6 @@
|
||||
{ mkDerivation }:
|
||||
mkDerivation {
|
||||
path = "lib/libxo";
|
||||
extraPaths = [ "contrib/libxo" ];
|
||||
MK_TESTS = "no";
|
||||
}
|
||||
7
pkgs/os-specific/bsd/freebsd/pkgs/locale.nix
Normal file
7
pkgs/os-specific/bsd/freebsd/pkgs/locale.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{ mkDerivation, libsbuf }:
|
||||
mkDerivation {
|
||||
path = "usr.bin/locale";
|
||||
buildInputs = [ libsbuf ];
|
||||
extraPaths = [ "lib/libc/locale" ];
|
||||
MK_TESTS = "no";
|
||||
}
|
||||
39
pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
Normal file
39
pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
stdenv,
|
||||
compat,
|
||||
bsdSetupHook,
|
||||
byacc,
|
||||
freebsdSetupHook,
|
||||
makeMinimal,
|
||||
install,
|
||||
}:
|
||||
mkDerivation (
|
||||
{
|
||||
path = "usr.bin/localedef";
|
||||
|
||||
extraPaths = [
|
||||
"lib/libc/locale"
|
||||
"lib/libc/stdtime"
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ "." ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bsdSetupHook
|
||||
byacc
|
||||
freebsdSetupHook
|
||||
makeMinimal
|
||||
install
|
||||
];
|
||||
|
||||
buildInputs = [ ];
|
||||
|
||||
preBuild = lib.optionalString (!stdenv.hostPlatform.isFreeBSD) ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${compat}/include -D__unused= -D__pure= -Wno-strict-aliasing"
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L${compat}/lib"
|
||||
'';
|
||||
|
||||
MK_TESTS = "no";
|
||||
}
|
||||
// lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = 1; }
|
||||
)
|
||||
51
pkgs/os-specific/bsd/freebsd/pkgs/locales.nix
Normal file
51
pkgs/os-specific/bsd/freebsd/pkgs/locales.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
symlinkJoin,
|
||||
bsdSetupHook,
|
||||
freebsdSetupHook,
|
||||
makeMinimal,
|
||||
install,
|
||||
tsort,
|
||||
lorder,
|
||||
mandoc,
|
||||
groff,
|
||||
localedef,
|
||||
allLocales ? true,
|
||||
locales ? [ "en_US.UTF-8" ],
|
||||
}:
|
||||
let
|
||||
build =
|
||||
name: needsLocaledef:
|
||||
mkDerivation {
|
||||
path = "share/${name}";
|
||||
|
||||
extraPaths = lib.optional needsLocaledef "tools/tools/locale/etc/final-maps";
|
||||
nativeBuildInputs = [
|
||||
bsdSetupHook
|
||||
freebsdSetupHook
|
||||
makeMinimal
|
||||
install
|
||||
tsort
|
||||
lorder
|
||||
mandoc
|
||||
groff
|
||||
] ++ lib.optional needsLocaledef localedef;
|
||||
};
|
||||
directories = {
|
||||
colldef = true;
|
||||
colldef_unicode = true;
|
||||
ctypedef = true;
|
||||
monetdef = false;
|
||||
monetdef_unicode = false;
|
||||
msgdef = false;
|
||||
msgdef_unicode = false;
|
||||
numericdef = false;
|
||||
numericdef_unicode = false;
|
||||
timedef = false;
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "freebsd-locales";
|
||||
paths = lib.mapAttrsToList build directories;
|
||||
}
|
||||
@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
stdenvNoLibs,
|
||||
versionData,
|
||||
writeText,
|
||||
patches,
|
||||
@ -21,7 +22,13 @@
|
||||
lib.makeOverridable (
|
||||
attrs:
|
||||
let
|
||||
stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv;
|
||||
stdenv' =
|
||||
if attrs.noCC or false then
|
||||
stdenvNoCC
|
||||
else if attrs.noLibc or false then
|
||||
stdenvNoLibs
|
||||
else
|
||||
stdenv;
|
||||
in
|
||||
stdenv'.mkDerivation (
|
||||
rec {
|
||||
@ -128,15 +135,17 @@ lib.makeOverridable (
|
||||
splitPatch =
|
||||
patchFile:
|
||||
let
|
||||
allLines' = lib.strings.splitString "\n" (builtins.readFile patchFile);
|
||||
allLines = builtins.filter (
|
||||
line: !((lib.strings.hasPrefix "diff --git" line) || (lib.strings.hasPrefix "index " line))
|
||||
) allLines';
|
||||
foldFunc =
|
||||
a: b:
|
||||
if (lib.strings.hasPrefix "--- " b) then
|
||||
if ((lib.strings.hasPrefix "--- " b) || (lib.strings.hasPrefix "diff --git " b)) then
|
||||
(a ++ [ [ b ] ])
|
||||
else
|
||||
((lib.lists.init a) ++ (lib.lists.singleton ((lib.lists.last a) ++ [ b ])));
|
||||
partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] (
|
||||
lib.strings.splitString "\n" (builtins.readFile patchFile)
|
||||
);
|
||||
partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] allLines;
|
||||
partitionedPatches =
|
||||
if (builtins.length partitionedPatches' > 1) then
|
||||
(lib.lists.drop 1 partitionedPatches')
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "raycast";
|
||||
version = "1.76.0";
|
||||
version = "1.76.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "Raycast.dmg";
|
||||
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
|
||||
hash = "sha256-9qvXUmCATwugK8lB1LeSnjfr5MNCjF9QTKR29LmbKes=";
|
||||
hash = "sha256-dZshCh1MSHf7ywwmNOvYNCXfSqC6C8vTCNsh/+klomk=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@ -32,20 +32,20 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.108.0";
|
||||
version = "1.109.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Pvn6mf1EM7Dj3N7frBzPGU9YmTDhJuAVuvXbYgjnRqk=";
|
||||
hash = "sha256-AUaHgMKte1EIfI0EQm8YeQVtlXGTm+MZwq22WzYHGsE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-R4V/Z8f2nbSifjlYP2NCP0B6KiAAa+YSmpVLdzeuXWY=";
|
||||
hash = "sha256-KwRNn2Ypt87QRUTCsj00zsu6uQtP5MSuM6B2DemoFGs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "outline";
|
||||
version = "0.76.1";
|
||||
version = "0.77.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outline";
|
||||
repo = "outline";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i+1Bd9equlYxxdmvoUim31SM5ymJjnauvqGOmnPmTWA=";
|
||||
hash = "sha256-Ri2qN7nR79Y1tsUsga/92nS7EuP/nqaUG2FiYJQNAr4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ];
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-xR6W9Kclgt7YZvkqNg7hOtY39mMNZvtDR/a1aOgD2Ko=";
|
||||
hash = "sha256-wxXnvi58mBfAQiMSxhXWK7sYLvr8nfQ+u6kMYnRWI3s=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@ -16909,6 +16909,7 @@ with pkgs;
|
||||
swiPrologWithGui = swiProlog.override { withGui = true; };
|
||||
|
||||
tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { };
|
||||
tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ;
|
||||
tbb_2021_11 = callPackage ../development/libraries/tbb { };
|
||||
# many packages still fail with latest version
|
||||
tbb = tbb_2020_3;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user