mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
hare: format with nixfmt-rfc-style
This commit is contained in:
parent
da515e5d0b
commit
4876a6883f
@ -1,53 +1,61 @@
|
|||||||
{ lib
|
{
|
||||||
, stdenv
|
lib,
|
||||||
, fetchFromSourcehut
|
stdenv,
|
||||||
, binutils-unwrapped
|
fetchFromSourcehut,
|
||||||
, harec
|
binutils-unwrapped,
|
||||||
, makeWrapper
|
harec,
|
||||||
, qbe
|
makeWrapper,
|
||||||
, gitUpdater
|
qbe,
|
||||||
, scdoc
|
gitUpdater,
|
||||||
, tzdata
|
scdoc,
|
||||||
, substituteAll
|
tzdata,
|
||||||
, fetchpatch
|
substituteAll,
|
||||||
, callPackage
|
fetchpatch,
|
||||||
, enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit)
|
callPackage,
|
||||||
, pkgsCross
|
enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit),
|
||||||
, x86_64PkgsCrossToolchain ? pkgsCross.gnu64
|
pkgsCross,
|
||||||
, aarch64PkgsCrossToolchain ? pkgsCross.aarch64-multiplatform
|
x86_64PkgsCrossToolchain ? pkgsCross.gnu64,
|
||||||
, riscv64PkgsCrossToolchain ? pkgsCross.riscv64
|
aarch64PkgsCrossToolchain ? pkgsCross.aarch64-multiplatform,
|
||||||
|
riscv64PkgsCrossToolchain ? pkgsCross.riscv64,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# There's no support for `aarch64` or `riscv64` for freebsd nor for openbsd on nix.
|
# There's no support for `aarch64` or `riscv64` for freebsd nor for openbsd on nix.
|
||||||
# See `lib.systems.doubles.aarch64` and `lib.systems.doubles.riscv64`.
|
# See `lib.systems.doubles.aarch64` and `lib.systems.doubles.riscv64`.
|
||||||
assert let
|
assert
|
||||||
inherit (stdenv.hostPlatform) isLinux is64bit;
|
let
|
||||||
inherit (lib) intersectLists platforms concatStringsSep;
|
inherit (stdenv.hostPlatform) isLinux is64bit;
|
||||||
workingPlatforms = intersectLists platforms.linux (with platforms; x86_64 ++ aarch64 ++ riscv64);
|
inherit (lib) intersectLists platforms concatStringsSep;
|
||||||
in
|
workingPlatforms = intersectLists platforms.linux (with platforms; x86_64 ++ aarch64 ++ riscv64);
|
||||||
(enableCrossCompilation -> !(isLinux && is64bit))
|
in
|
||||||
|
(enableCrossCompilation -> !(isLinux && is64bit))
|
||||||
-> builtins.throw ''
|
-> builtins.throw ''
|
||||||
The cross-compilation toolchains may only be enabled on the following platforms:
|
The cross-compilation toolchains may only be enabled on the following platforms:
|
||||||
${concatStringsSep "\n" workingPlatforms}
|
${concatStringsSep "\n" workingPlatforms}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
let
|
let
|
||||||
arch = stdenv.hostPlatform.uname.processor;
|
arch = stdenv.hostPlatform.uname.processor;
|
||||||
qbePlatform = {
|
qbePlatform =
|
||||||
x86_64 = "amd64_sysv";
|
{
|
||||||
aarch64 = "arm64";
|
x86_64 = "amd64_sysv";
|
||||||
riscv64 = "rv64";
|
aarch64 = "arm64";
|
||||||
}.${arch};
|
riscv64 = "rv64";
|
||||||
|
}
|
||||||
|
.${arch};
|
||||||
platform = lib.toLower stdenv.hostPlatform.uname.system;
|
platform = lib.toLower stdenv.hostPlatform.uname.system;
|
||||||
embeddedOnBinaryTools =
|
embeddedOnBinaryTools =
|
||||||
let
|
let
|
||||||
genToolsFromToolchain = toolchain:
|
genToolsFromToolchain =
|
||||||
|
toolchain:
|
||||||
let
|
let
|
||||||
crossTargetPrefix = toolchain.stdenv.cc.targetPrefix;
|
crossTargetPrefix = toolchain.stdenv.cc.targetPrefix;
|
||||||
toolchainArch = toolchain.stdenv.hostPlatform.uname.processor;
|
toolchainArch = toolchain.stdenv.hostPlatform.uname.processor;
|
||||||
absOrRelPath = toolDrv: toolBasename:
|
absOrRelPath =
|
||||||
if arch == toolchainArch then toolBasename
|
toolDrv: toolBasename:
|
||||||
else lib.getExe' toolDrv "${crossTargetPrefix}${toolBasename}";
|
if arch == toolchainArch then
|
||||||
|
toolBasename
|
||||||
|
else
|
||||||
|
lib.getExe' toolDrv "${crossTargetPrefix}${toolBasename}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
"ld" = absOrRelPath toolchain.buildPackages.binutils "ld";
|
"ld" = absOrRelPath toolchain.buildPackages.binutils "ld";
|
||||||
@ -65,7 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
pname = "hare";
|
pname = "hare";
|
||||||
version = "0.24.0";
|
version = "0.24.0";
|
||||||
|
|
||||||
outputs = [ "out" "man" ];
|
outputs = [
|
||||||
|
"out"
|
||||||
|
"man"
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchFromSourcehut {
|
src = fetchFromSourcehut {
|
||||||
owner = "~sircmpwn";
|
owner = "~sircmpwn";
|
||||||
@ -104,29 +115,31 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
tzdata
|
tzdata
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags =
|
||||||
"HARECACHE=.harecache"
|
[
|
||||||
"PREFIX=${builtins.placeholder "out"}"
|
"HARECACHE=.harecache"
|
||||||
"ARCH=${arch}"
|
"PREFIX=${builtins.placeholder "out"}"
|
||||||
"VERSION=${finalAttrs.version}-nixpkgs"
|
"ARCH=${arch}"
|
||||||
"QBEFLAGS=-t${qbePlatform}"
|
"VERSION=${finalAttrs.version}-nixpkgs"
|
||||||
"CC=${stdenv.cc.targetPrefix}cc"
|
"QBEFLAGS=-t${qbePlatform}"
|
||||||
"AS=${stdenv.cc.targetPrefix}as"
|
"CC=${stdenv.cc.targetPrefix}cc"
|
||||||
"LD=${stdenv.cc.targetPrefix}ld"
|
"AS=${stdenv.cc.targetPrefix}as"
|
||||||
# Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does
|
"LD=${stdenv.cc.targetPrefix}ld"
|
||||||
# not follow the FHS.
|
# Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does
|
||||||
"HAREPATH=$(SRCDIR)/hare/stdlib"
|
# not follow the FHS.
|
||||||
] ++ lib.optionals enableCrossCompilation [
|
"HAREPATH=$(SRCDIR)/hare/stdlib"
|
||||||
"RISCV64_AS=${embeddedOnBinaryTools.riscv64.as}"
|
]
|
||||||
"RISCV64_CC=${embeddedOnBinaryTools.riscv64.cc}"
|
++ lib.optionals enableCrossCompilation [
|
||||||
"RISCV64_LD=${embeddedOnBinaryTools.riscv64.ld}"
|
"RISCV64_AS=${embeddedOnBinaryTools.riscv64.as}"
|
||||||
"AARCH64_AS=${embeddedOnBinaryTools.aarch64.as}"
|
"RISCV64_CC=${embeddedOnBinaryTools.riscv64.cc}"
|
||||||
"AARCH64_CC=${embeddedOnBinaryTools.aarch64.cc}"
|
"RISCV64_LD=${embeddedOnBinaryTools.riscv64.ld}"
|
||||||
"AARCH64_LD=${embeddedOnBinaryTools.aarch64.ld}"
|
"AARCH64_AS=${embeddedOnBinaryTools.aarch64.as}"
|
||||||
"x86_64_AS=${embeddedOnBinaryTools.x86_64.as}"
|
"AARCH64_CC=${embeddedOnBinaryTools.aarch64.cc}"
|
||||||
"x86_64_CC=${embeddedOnBinaryTools.x86_64.cc}"
|
"AARCH64_LD=${embeddedOnBinaryTools.aarch64.ld}"
|
||||||
"x86_64_LD=${embeddedOnBinaryTools.x86_64.ld}"
|
"x86_64_AS=${embeddedOnBinaryTools.x86_64.as}"
|
||||||
];
|
"x86_64_CC=${embeddedOnBinaryTools.x86_64.cc}"
|
||||||
|
"x86_64_LD=${embeddedOnBinaryTools.x86_64.ld}"
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
@ -143,7 +156,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/hare \
|
wrapProgram $out/bin/hare \
|
||||||
--prefix PATH : ${lib.makeBinPath [binutils-unwrapped harec qbe]}
|
--prefix PATH : ${
|
||||||
|
lib.makeBinPath [
|
||||||
|
binutils-unwrapped
|
||||||
|
harec
|
||||||
|
qbe
|
||||||
|
]
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
@ -151,9 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
passthru = {
|
passthru = {
|
||||||
updateScript = gitUpdater { };
|
updateScript = gitUpdater { };
|
||||||
tests = lib.optionalAttrs enableCrossCompilation {
|
tests = lib.optionalAttrs enableCrossCompilation {
|
||||||
crossCompilation = callPackage ./cross-compilation-tests.nix {
|
crossCompilation = callPackage ./cross-compilation-tests.nix { hare = finalAttrs.finalPackage; };
|
||||||
hare = finalAttrs.finalPackage;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user