mirror of
https://codeberg.org/icewind/mill-scale.git
synced 2026-06-03 09:54:19 +02:00
switch to alejandra for nix formatting
This commit is contained in:
parent
ad3de3f170
commit
576d0418c8
8 changed files with 500 additions and 386 deletions
|
|
@ -1,51 +1,55 @@
|
|||
{ lib, src, config }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
src,
|
||||
config,
|
||||
}: let
|
||||
inherit (builtins) readFile pathExists attrNames hasAttr;
|
||||
inherit (lib) map intersectLists foldl splitString getAttrFromPath;
|
||||
|
||||
cargoLockDeps =
|
||||
if pathExists (src + /Cargo.lock) then
|
||||
let
|
||||
if pathExists (src + /Cargo.lock)
|
||||
then let
|
||||
cargoLock = fromTOML (readFile (src + /Cargo.lock));
|
||||
in
|
||||
map (package: package.name) cargoLock.package
|
||||
else [ ];
|
||||
else [];
|
||||
availableAutoDeps = import ./deps.nix;
|
||||
detectedDeps = intersectLists cargoLockDeps (attrNames availableAutoDeps);
|
||||
mergedDetectedDeps =
|
||||
if config.autodeps then
|
||||
if config.autodeps
|
||||
then
|
||||
foldl
|
||||
(merged: dep: {
|
||||
build = merged.build ++ (availableAutoDeps.${dep}.build or [ ]);
|
||||
native = merged.native ++ (availableAutoDeps.${dep}.native or [ ]);
|
||||
runtime = merged.runtime ++ (availableAutoDeps.${dep}.runtime or [ ]);
|
||||
build = merged.build ++ (availableAutoDeps.${dep}.build or []);
|
||||
native = merged.native ++ (availableAutoDeps.${dep}.native or []);
|
||||
runtime = merged.runtime ++ (availableAutoDeps.${dep}.runtime or []);
|
||||
env =
|
||||
if (hasAttr "env" availableAutoDeps.${dep}) then
|
||||
pkgs: (merged.env pkgs) // (availableAutoDeps.${dep}.env pkgs)
|
||||
if (hasAttr "env" availableAutoDeps.${dep})
|
||||
then pkgs: (merged.env pkgs) // (availableAutoDeps.${dep}.env pkgs)
|
||||
else merged.env;
|
||||
})
|
||||
{
|
||||
build = [ ];
|
||||
native = [ ];
|
||||
runtime = [ ];
|
||||
env = pkgs: { };
|
||||
build = [];
|
||||
native = [];
|
||||
runtime = [];
|
||||
env = pkgs: {};
|
||||
}
|
||||
detectedDeps else {
|
||||
build = [ ];
|
||||
native = [ ];
|
||||
runtime = [ ];
|
||||
env = pkgs: { };
|
||||
detectedDeps
|
||||
else {
|
||||
build = [];
|
||||
native = [];
|
||||
runtime = [];
|
||||
env = pkgs: {};
|
||||
};
|
||||
getPkgs = pkgs: deps:
|
||||
let
|
||||
getPkgs = pkgs: deps: let
|
||||
depPaths = map (splitString ".") deps;
|
||||
in
|
||||
map (path: getAttrFromPath path pkgs) depPaths;
|
||||
autoDeps = pkgs: {
|
||||
buildInputs = getPkgs pkgs mergedDetectedDeps.build;
|
||||
nativeBuildInputs = with pkgs; [ pkg-config ] ++ (getPkgs pkgs mergedDetectedDeps.native);
|
||||
nativeBuildInputs = with pkgs; [pkg-config] ++ (getPkgs pkgs mergedDetectedDeps.native);
|
||||
runtimeInputs = getPkgs pkgs mergedDetectedDeps.runtime;
|
||||
env = mergedDetectedDeps.env pkgs;
|
||||
};
|
||||
in
|
||||
autoDeps
|
||||
autoDeps
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"openssl-sys" = { build = [ "openssl" ]; };
|
||||
"libudev-sys" = { build = [ "eudev" ]; };
|
||||
"libdbus-sys" = { build = [ "dbus" ]; };
|
||||
"expat-sys" = { native = [ "cmake" ]; };
|
||||
"servo-fontconfig-sys" = { build = [ "fontconfig" ]; };
|
||||
"x11-dl" = { build = [ "xorg.libX11" "xorg.libXcursor" "xorg.libXrandr" "xorg.libXi" ]; };
|
||||
"glutin_glx_sys" = { runtime = [ "libGL" "libGLU" ]; };
|
||||
"wayland-egl" = { build = [ "egl-wayland" ]; };
|
||||
"wayland-sys" = { runtime = [ "wayland" "libxkbcommon" ]; };
|
||||
"libsodium-sys" = { build = [ "libsodium" ]; };
|
||||
"openssl-sys" = {build = ["openssl"];};
|
||||
"libudev-sys" = {build = ["eudev"];};
|
||||
"libdbus-sys" = {build = ["dbus"];};
|
||||
"expat-sys" = {native = ["cmake"];};
|
||||
"servo-fontconfig-sys" = {build = ["fontconfig"];};
|
||||
"x11-dl" = {build = ["xorg.libX11" "xorg.libXcursor" "xorg.libXrandr" "xorg.libXi"];};
|
||||
"glutin_glx_sys" = {runtime = ["libGL" "libGLU"];};
|
||||
"wayland-egl" = {build = ["egl-wayland"];};
|
||||
"wayland-sys" = {runtime = ["wayland" "libxkbcommon"];};
|
||||
"libsodium-sys" = {build = ["libsodium"];};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
{ lib }:
|
||||
let
|
||||
{lib}: let
|
||||
inherit (builtins) isAttrs attrNames;
|
||||
inherit (lib) assertMsg remove;
|
||||
in
|
||||
cargoToml: rec {
|
||||
cargoToml: rec {
|
||||
tomlPackage = cargoToml.package or cargoToml.workspace.package;
|
||||
hasMsrv = tomlPackage ? rust-version;
|
||||
hasWorkspace = tomlPackage ? workspace;
|
||||
hasFeatures = cargoToml ? features && isAttrs cargoToml.features;
|
||||
features = cargoToml.features or { };
|
||||
defaultFeatures = features.default or [ ];
|
||||
features = cargoToml.features or {};
|
||||
defaultFeatures = features.default or [];
|
||||
nonDefaultFeatures = remove "default" (attrNames features);
|
||||
hasNonDefaultFeatures = hasFeatures && (defaultFeatures != nonDefaultFeatures);
|
||||
hasDefaultFeatures = cargoToml ? features && cargoToml.features ? default;
|
||||
msrv = assert assertMsg hasMsrv ''"rust-version" not set in Cargo.toml''; tomlPackage.rust-version;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,39 @@
|
|||
{ callPackage, pkgsCross, stdenv, lib }:
|
||||
let
|
||||
{
|
||||
callPackage,
|
||||
pkgsCross,
|
||||
stdenv,
|
||||
lib,
|
||||
}: let
|
||||
inherit (lib) mapAttrs hasInfix replaceStrings toUpper concatStrings recursiveUpdate;
|
||||
isMusl = hasInfix "-musl";
|
||||
crossOpts = callPackage ./crossOpts.nix { };
|
||||
crossOpts = callPackage ./crossOpts.nix {};
|
||||
|
||||
buildCrossArgs = target: { targetDeps ? [ ]
|
||||
, rustFlags ? (if isMusl target then "-C target-feature=+crt-static" else "")
|
||||
, cFlags ? ""
|
||||
, targetStdenv
|
||||
, ...
|
||||
} @ args:
|
||||
let
|
||||
buildCrossArgs = target: {
|
||||
targetDeps ? [],
|
||||
rustFlags ? (
|
||||
if isMusl target
|
||||
then "-C target-feature=+crt-static"
|
||||
else ""
|
||||
),
|
||||
cFlags ? "",
|
||||
targetStdenv,
|
||||
...
|
||||
} @ args: let
|
||||
isHostTarget = targetStdenv.targetPlatform.config == stdenv.targetPlatform.config;
|
||||
# don't use the pkgsCross cc if the target is the host platform
|
||||
targetCc = if isHostTarget then stdenv.cc else targetStdenv.cc;
|
||||
targetUnderscore = replaceStrings [ "-" ] [ "_" ] target;
|
||||
targetCc =
|
||||
if isHostTarget
|
||||
then stdenv.cc
|
||||
else targetStdenv.cc;
|
||||
targetUnderscore = replaceStrings ["-"] ["_"] target;
|
||||
targetUpperCase = toUpper targetUnderscore;
|
||||
rest = removeAttrs args [ "rustFlags" "cc" "cFlags" "targetDeps" "targetStdenv" "nativeBuildInputs" ];
|
||||
rest = removeAttrs args ["rustFlags" "cc" "cFlags" "targetDeps" "targetStdenv" "nativeBuildInputs"];
|
||||
# by adding the dependency in the (target specific) linker args instead of buildInputs
|
||||
# we can prevent it trying to link to it for host build dependencies
|
||||
rustFlagsWithDeps = rustFlags + concatStrings (map (targetDep: " -Clink-arg=-L${targetDep}/lib") targetDeps);
|
||||
in
|
||||
(
|
||||
in (
|
||||
{
|
||||
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ targetCc stdenv.cc ];
|
||||
nativeBuildInputs = (args.nativeBuildInputs or []) ++ [targetCc stdenv.cc];
|
||||
"CARGO_TARGET_${targetUpperCase}_RUSTFLAGS" = rustFlagsWithDeps;
|
||||
"CARGO_TARGET_${targetUpperCase}_LINKER" = "${targetCc.targetPrefix}cc";
|
||||
"AR_${targetUnderscore}" = "${targetCc.targetPrefix}ar";
|
||||
|
|
@ -31,8 +41,8 @@ let
|
|||
"CCX_${targetUnderscore}" = "${targetCc.targetPrefix}ccx";
|
||||
"HOST_CC" = "${stdenv.cc.targetPrefix}cc";
|
||||
"CFLAGS_${targetUnderscore}" = cFlags;
|
||||
} //
|
||||
rest
|
||||
}
|
||||
// rest
|
||||
);
|
||||
in
|
||||
target: buildCrossArgs target crossOpts.${target}
|
||||
target: buildCrossArgs target crossOpts.${target}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
{ pkgsCross, perl, callPackage, freebsdCross }:
|
||||
let
|
||||
{
|
||||
pkgsCross,
|
||||
perl,
|
||||
callPackage,
|
||||
freebsdCross,
|
||||
}: let
|
||||
freebsdSysrootX86 = callPackage ./freebsd-sysroot.nix {
|
||||
arch = "amd64";
|
||||
sha256 = "sha256-/XZXt0bPI9bTXrD+TR2KYzhE7wKpVAvKndWL3tqe5cg=";
|
||||
version = freebsdCross.versionData.revision;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
"armv7-unknown-linux-musleabihf" = {
|
||||
targetStdenv = pkgsCross.muslpi.stdenv;
|
||||
};
|
||||
|
|
@ -29,14 +32,14 @@ in
|
|||
"x86_64-pc-windows-gnu" = {
|
||||
targetStdenv = pkgsCross.mingwW64.stdenv;
|
||||
# rink wants perl for windows targets
|
||||
buildInputs = [ perl ];
|
||||
targetDeps = [ pkgsCross.mingwW64.windows.pthreads ];
|
||||
buildInputs = [perl];
|
||||
targetDeps = [pkgsCross.mingwW64.windows.pthreads];
|
||||
rustFlags = "-C target-feature=+crt-static";
|
||||
BINARY_SUFFIX = ".exe";
|
||||
};
|
||||
"x86_64-unknown-freebsd" = {
|
||||
targetStdenv = pkgsCross.x86_64-freebsd.stdenv;
|
||||
targetDeps = [ freebsdSysrootX86 ];
|
||||
targetDeps = [freebsdSysrootX86];
|
||||
dontPatchELF = true;
|
||||
postInstall = ''
|
||||
patchelf --set-interpreter /libexec/ld-elf.so.1 $out/bin/*
|
||||
|
|
|
|||
19
flake.nix
19
flake.nix
|
|
@ -1,7 +1,6 @@
|
|||
# mill-scale -- Another rust module for flakelight
|
||||
# Copyright (C) 2024 Robin Appelman <robin@icewind.nl>
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
{
|
||||
description = "Another rust module for flakelite";
|
||||
inputs = {
|
||||
|
|
@ -12,10 +11,20 @@
|
|||
inputs.nixpkgs.follows = "flakelight/nixpkgs";
|
||||
};
|
||||
};
|
||||
outputs = { flakelight, crane, rust-overlay, ... }: flakelight ./. {
|
||||
imports = [ flakelight.flakelightModules.flakelightModule ];
|
||||
flakelightModule = { lib, ... }: {
|
||||
imports = [ ./mill-scale.nix ];
|
||||
outputs = {
|
||||
flakelight,
|
||||
crane,
|
||||
rust-overlay,
|
||||
...
|
||||
}:
|
||||
flakelight ./. {
|
||||
imports = [flakelight.flakelightModules.flakelightModule];
|
||||
formatters = pkgs:
|
||||
with pkgs; {
|
||||
"*.nix" = pkgs.lib.getExe alejandra;
|
||||
};
|
||||
flakelightModule = {lib, ...}: {
|
||||
imports = [./mill-scale.nix];
|
||||
inputs.crane = lib.mkDefault crane;
|
||||
inputs.rust-overlay = lib.mkDefault rust-overlay;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ stdenv
|
||||
, fetchzip
|
||||
, arch
|
||||
, version
|
||||
, sha256
|
||||
,
|
||||
{
|
||||
stdenv,
|
||||
fetchzip,
|
||||
arch,
|
||||
version,
|
||||
sha256,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "freebsd-sysroot";
|
||||
|
|
|
|||
291
mill-scale.nix
291
mill-scale.nix
|
|
@ -1,86 +1,98 @@
|
|||
# mill-scale -- Another rust module for flakelight
|
||||
# Copyright (C) 2024 Robin Appelman <robin@icewind.nl>
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
{ lib, src, config, flakelight, inputs, ... }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
src,
|
||||
config,
|
||||
flakelight,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
inherit (builtins) elem readFile pathExists isAttrs match any;
|
||||
inherit (lib) map mkDefault mkIf mkMerge mkOption warnIf assertMsg optionalAttrs types optionalString genAttrs hasInfix intersectLists attrVals;
|
||||
inherit (lib) getExe map mkDefault mkIf mkMerge mkOption warnIf assertMsg optionalAttrs types optionalString genAttrs hasInfix intersectLists attrVals;
|
||||
inherit (lib.fileset) fileFilter toSource unions;
|
||||
inherit (flakelight.types) fileset function optFunctionTo;
|
||||
|
||||
filteredSrc = toSource { root = src; fileset = unions (config.extraPaths ++ [ config.fileset ]); };
|
||||
filteredSrc = toSource {
|
||||
root = src;
|
||||
fileset = unions (config.extraPaths ++ [config.fileset]);
|
||||
};
|
||||
|
||||
cargoToml = fromTOML (readFile (src + /Cargo.toml));
|
||||
cargoMeta = (import ./cargo-meta.nix { inherit lib; }) cargoToml;
|
||||
cargoMeta = (import ./cargo-meta.nix {inherit lib;}) cargoToml;
|
||||
inherit (cargoMeta) tomlPackage hasMsrv hasWorkspace hasFeatures hasNonDefaultFeatures hasDefaultFeatures msrv;
|
||||
|
||||
maybeWorkspace = optionalString hasWorkspace "--workspace";
|
||||
hasExamples = pathExists (src + /examples);
|
||||
hasDefaultPackage = pathExists (src + /nix/package.nix);
|
||||
|
||||
autoDeps = (import ./autodeps { inherit lib src config; });
|
||||
autoDeps = import ./autodeps {inherit lib src config;};
|
||||
buildDeps = pkgs: rec {
|
||||
buildInputs = (autoDeps pkgs).buildInputs ++ (config.buildInputs pkgs);
|
||||
nativeBuildInputs = (autoDeps pkgs).nativeBuildInputs ++ (config.nativeBuildInputs pkgs);
|
||||
runtimeInputs = (autoDeps pkgs).runtimeInputs ++ (config.runtimeInputs pkgs);
|
||||
env = (autoDeps pkgs).env // (config.buildEnv pkgs) // {
|
||||
LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath (runtimeInputs)}";
|
||||
env =
|
||||
(autoDeps pkgs).env
|
||||
// (config.buildEnv pkgs)
|
||||
// {
|
||||
LD_LIBRARY_PATH = "/run/opengl-driver/lib/:${lib.makeLibraryPath runtimeInputs}";
|
||||
};
|
||||
};
|
||||
in
|
||||
warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
||||
{
|
||||
warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
||||
{
|
||||
options = {
|
||||
extraFiles = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [ ];
|
||||
default = [];
|
||||
};
|
||||
extraFilesRegex = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [ ];
|
||||
default = [];
|
||||
};
|
||||
extraPaths = mkOption {
|
||||
type = with types; listOf path;
|
||||
default = [ ];
|
||||
default = [];
|
||||
};
|
||||
fileset = mkOption {
|
||||
type = fileset;
|
||||
default = fileFilter
|
||||
default =
|
||||
fileFilter
|
||||
(file:
|
||||
file.hasExt "rs" ||
|
||||
match "snapshot__.*\.snap" file.name != null ||
|
||||
elem file.name ([ "Cargo.toml" "Cargo.lock" ] ++ config.extraFiles) ||
|
||||
any (re: match re file.name != null) config.extraFilesRegex)
|
||||
file.hasExt "rs"
|
||||
|| match "snapshot__.*\.snap" file.name != null
|
||||
|| elem file.name (["Cargo.toml" "Cargo.lock"] ++ config.extraFiles)
|
||||
|| any (re: match re file.name != null) config.extraFilesRegex)
|
||||
src;
|
||||
};
|
||||
crossTargets = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [ ];
|
||||
default = [];
|
||||
};
|
||||
buildInputs = mkOption {
|
||||
type = function;
|
||||
default = pkgs: [ ];
|
||||
default = pkgs: [];
|
||||
description = "build inputs for the package";
|
||||
};
|
||||
nativeBuildInputs = mkOption {
|
||||
type = function;
|
||||
default = pkgs: [ ];
|
||||
default = pkgs: [];
|
||||
description = "native build inputs for the package";
|
||||
};
|
||||
buildEnv = mkOption {
|
||||
type = function;
|
||||
default = pkgs: { };
|
||||
default = pkgs: {};
|
||||
description = "build environent variables for the package";
|
||||
};
|
||||
runtimeInputs = mkOption {
|
||||
type = function;
|
||||
default = pkgs: [ ];
|
||||
default = pkgs: [];
|
||||
description = "runtime inputs for the package";
|
||||
};
|
||||
tools = mkOption {
|
||||
type = function;
|
||||
default = pkgs: with pkgs; [ cargo-edit bacon ];
|
||||
default = pkgs: with pkgs; [cargo-edit bacon];
|
||||
description = "extra packages to make available in the dev shells";
|
||||
};
|
||||
autodeps = mkOption {
|
||||
|
|
@ -90,7 +102,7 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
|||
};
|
||||
packageOpts = mkOption {
|
||||
type = optFunctionTo types.attrs;
|
||||
default = { };
|
||||
default = {};
|
||||
};
|
||||
toolchain = mkOption {
|
||||
type = function;
|
||||
|
|
@ -104,8 +116,10 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
|||
};
|
||||
miriToolchain = mkOption {
|
||||
type = function;
|
||||
default = pkgs: pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default.override {
|
||||
extensions = [ "miri" "rust-src" ];
|
||||
default = pkgs:
|
||||
pkgs.rust-bin.selectLatestNightlyWith (toolchain:
|
||||
toolchain.default.override {
|
||||
extensions = ["miri" "rust-src"];
|
||||
});
|
||||
description = "rust toolchain to use for miri";
|
||||
};
|
||||
|
|
@ -115,30 +129,41 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
|||
(mkIf (pathExists (src + /Cargo.toml)) {
|
||||
withOverlays = [
|
||||
(import inputs.rust-overlay)
|
||||
(final: { inputs, rust-bin, writeShellApplication, stdenvNoCC, ... } @ prev: rec {
|
||||
|
||||
(final: {
|
||||
inputs,
|
||||
rust-bin,
|
||||
writeShellApplication,
|
||||
stdenvNoCC,
|
||||
...
|
||||
} @ prev: rec {
|
||||
commonCraneArgs = {
|
||||
src = filteredSrc;
|
||||
strictDeps = true;
|
||||
doCheck = false;
|
||||
inherit ((buildDeps final)) buildInputs nativeBuildInputs;
|
||||
};
|
||||
allFeaturesCraneArgs = commonCraneArgs // {
|
||||
allFeaturesCraneArgs =
|
||||
commonCraneArgs
|
||||
// {
|
||||
cargoExtraArgs = "--locked --all-features ${maybeWorkspace}";
|
||||
pname = "${crateName}-all-features";
|
||||
};
|
||||
noDefaultFeaturesCraneArgs = commonCraneArgs // {
|
||||
noDefaultFeaturesCraneArgs =
|
||||
commonCraneArgs
|
||||
// {
|
||||
cargoExtraArgs = "--locked --no-default-features ${maybeWorkspace}";
|
||||
pname = "${crateName}-all-features";
|
||||
};
|
||||
msrvCraneArgs = commonCraneArgs // {
|
||||
msrvCraneArgs =
|
||||
commonCraneArgs
|
||||
// {
|
||||
cargoExtraArgs = "--locked --all-features ${maybeWorkspace}";
|
||||
pname = "${crateName}-msrv";
|
||||
};
|
||||
|
||||
crateName = (craneLib.crateNameFromCargoToml { inherit src; }).pname;
|
||||
crateName = (craneLib.crateNameFromCargoToml {inherit src;}).pname;
|
||||
craneLib = (inputs.crane.mkLib final).overrideToolchain (p: p.rustToolchain);
|
||||
craneLibForTargets = targets: (inputs.crane.mkLib final).overrideToolchain (p: p.rustToolchain.override { inherit targets; });
|
||||
craneLibForTargets = targets: (inputs.crane.mkLib final).overrideToolchain (p: p.rustToolchain.override {inherit targets;});
|
||||
craneLibMsrv = (inputs.crane.mkLib final).overrideToolchain (p: p.msrvRustToolchain);
|
||||
|
||||
cargoArtifacts = craneLib.buildDepsOnly commonCraneArgs;
|
||||
|
|
@ -149,22 +174,22 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
|||
rustToolchain = config.toolchain prev;
|
||||
msrvRustToolchain = config.msrvToolchain prev;
|
||||
miriRustToolchain = config.miriToolchain prev;
|
||||
cargo-expand = (writeShellApplication {
|
||||
cargo-expand = writeShellApplication {
|
||||
name = "cargo-expand";
|
||||
runtimeInputs = [ prev.cargo-expand ];
|
||||
runtimeInputs = [prev.cargo-expand];
|
||||
text = ''
|
||||
# shellcheck disable=SC2068
|
||||
RUSTC_BOOTSTRAP=1 cargo-expand $@
|
||||
'';
|
||||
});
|
||||
cargo-miri = (writeShellApplication {
|
||||
};
|
||||
cargo-miri = writeShellApplication {
|
||||
name = "cargo-miri";
|
||||
runtimeInputs = [ miriRustToolchain ];
|
||||
runtimeInputs = [miriRustToolchain];
|
||||
text = ''
|
||||
# shellcheck disable=SC2068
|
||||
cargo miri $@
|
||||
'';
|
||||
});
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -175,30 +200,54 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
|||
|
||||
pname = tomlPackage.name;
|
||||
|
||||
packages = (optionalAttrs (!hasDefaultPackage) {
|
||||
default = { craneLib, cargoArtifacts, defaultMeta, commonCraneArgs, pkgs }: craneLib.buildPackage (commonCraneArgs // {
|
||||
packages =
|
||||
(optionalAttrs (!hasDefaultPackage) {
|
||||
default = {
|
||||
craneLib,
|
||||
cargoArtifacts,
|
||||
defaultMeta,
|
||||
commonCraneArgs,
|
||||
pkgs,
|
||||
}:
|
||||
craneLib.buildPackage (commonCraneArgs
|
||||
// {
|
||||
inherit cargoArtifacts;
|
||||
meta = defaultMeta;
|
||||
} // (config.packageOpts pkgs));
|
||||
}) // (genAttrs config.crossTargets (
|
||||
target: { craneLibForTargets, cargoArtifacts, defaultMeta, callPackage, crateName, commonCraneArgs, pkgs }:
|
||||
let
|
||||
targetCraneLib = craneLibForTargets [ target ];
|
||||
crossArgs = callPackage ./crossArgs.nix { } target;
|
||||
}
|
||||
// (config.packageOpts pkgs));
|
||||
})
|
||||
// (genAttrs config.crossTargets (
|
||||
target: {
|
||||
craneLibForTargets,
|
||||
cargoArtifacts,
|
||||
defaultMeta,
|
||||
callPackage,
|
||||
crateName,
|
||||
commonCraneArgs,
|
||||
pkgs,
|
||||
}: let
|
||||
targetCraneLib = craneLibForTargets [target];
|
||||
crossArgs = callPackage ./crossArgs.nix {} target;
|
||||
in
|
||||
targetCraneLib.buildPackage
|
||||
(commonCraneArgs // {
|
||||
meta = defaultMeta // {
|
||||
(commonCraneArgs
|
||||
// {
|
||||
meta =
|
||||
defaultMeta
|
||||
// {
|
||||
targetPlatform = target;
|
||||
binarySuffix = crossArgs.BINARY_SUFFIX or "";
|
||||
};
|
||||
pname = "${crateName}-${target}";
|
||||
cargoExtraArgs = "--target ${target}";
|
||||
} // crossArgs // (config.packageOpts pkgs))
|
||||
}
|
||||
// crossArgs
|
||||
// (config.packageOpts pkgs))
|
||||
));
|
||||
|
||||
outputs = {
|
||||
lib.crossMatrix = map
|
||||
lib.crossMatrix =
|
||||
map
|
||||
(target: {
|
||||
inherit target;
|
||||
binary-suffix = optionalString (hasInfix "windows" target) ".exe";
|
||||
|
|
@ -206,98 +255,136 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
|||
config.crossTargets;
|
||||
};
|
||||
|
||||
checks =
|
||||
{ craneLib
|
||||
, craneLibMsrv
|
||||
, cargoArtifacts
|
||||
, cargoArtifactsMsrv
|
||||
, cargoArtifactsAllFeatures
|
||||
, cargoArtifactsNoDefault
|
||||
, crateName
|
||||
, commonCraneArgs
|
||||
, allFeaturesCraneArgs
|
||||
, noDefaultFeaturesCraneArgs
|
||||
, msrvCraneArgs
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
checks = {
|
||||
craneLib,
|
||||
craneLibMsrv,
|
||||
cargoArtifacts,
|
||||
cargoArtifactsMsrv,
|
||||
cargoArtifactsAllFeatures,
|
||||
cargoArtifactsNoDefault,
|
||||
crateName,
|
||||
commonCraneArgs,
|
||||
allFeaturesCraneArgs,
|
||||
noDefaultFeaturesCraneArgs,
|
||||
msrvCraneArgs,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
packageOpts = config.packageOpts pkgs;
|
||||
in
|
||||
{
|
||||
test = craneLib.cargoTest (commonCraneArgs // {
|
||||
test = craneLib.cargoTest (commonCraneArgs
|
||||
// {
|
||||
inherit cargoArtifacts;
|
||||
doCheck = true;
|
||||
cargoExtraArgs = "--locked --all-targets ${maybeWorkspace}";
|
||||
} // packageOpts);
|
||||
clippy = craneLib.cargoClippy (commonCraneArgs // {
|
||||
}
|
||||
// packageOpts);
|
||||
clippy = craneLib.cargoClippy (commonCraneArgs
|
||||
// {
|
||||
inherit cargoArtifacts;
|
||||
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
||||
} // packageOpts);
|
||||
} // (optionalAttrs hasMsrv
|
||||
}
|
||||
// packageOpts);
|
||||
}
|
||||
// (optionalAttrs hasMsrv
|
||||
{
|
||||
msrv = craneLibMsrv.buildPackage
|
||||
(msrvCraneArgs // {
|
||||
msrv =
|
||||
craneLibMsrv.buildPackage
|
||||
(msrvCraneArgs
|
||||
// {
|
||||
pname = "${crateName}-msrv";
|
||||
cargoArtifacts = cargoArtifactsMsrv;
|
||||
cargoBuildCommand = "cargo check";
|
||||
cargoExtraArgs = "--release --locked --all-targets --all-features ${maybeWorkspace}";
|
||||
installPhaseCommand = "mkdir $out";
|
||||
} // packageOpts);
|
||||
}) // (optionalAttrs hasNonDefaultFeatures {
|
||||
test-all-features = craneLib.cargoTest (allFeaturesCraneArgs // {
|
||||
}
|
||||
// packageOpts);
|
||||
})
|
||||
// (optionalAttrs hasNonDefaultFeatures {
|
||||
test-all-features = craneLib.cargoTest (allFeaturesCraneArgs
|
||||
// {
|
||||
cargoArtifacts = cargoArtifactsAllFeatures;
|
||||
doCheck = true;
|
||||
} // packageOpts);
|
||||
clippy-all-features = craneLib.cargoClippy (allFeaturesCraneArgs // {
|
||||
}
|
||||
// packageOpts);
|
||||
clippy-all-features = craneLib.cargoClippy (allFeaturesCraneArgs
|
||||
// {
|
||||
cargoArtifacts = cargoArtifactsAllFeatures;
|
||||
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
||||
} // packageOpts);
|
||||
}) // (optionalAttrs hasDefaultFeatures {
|
||||
test-no-default-features = craneLib.cargoTest (noDefaultFeaturesCraneArgs // {
|
||||
}
|
||||
// packageOpts);
|
||||
})
|
||||
// (optionalAttrs hasDefaultFeatures {
|
||||
test-no-default-features = craneLib.cargoTest (noDefaultFeaturesCraneArgs
|
||||
// {
|
||||
cargoArtifacts = cargoArtifactsNoDefault;
|
||||
doCheck = true;
|
||||
} // packageOpts);
|
||||
clippy-no-default-features = craneLib.cargoClippy (noDefaultFeaturesCraneArgs // {
|
||||
}
|
||||
// packageOpts);
|
||||
clippy-no-default-features = craneLib.cargoClippy (noDefaultFeaturesCraneArgs
|
||||
// {
|
||||
cargoArtifacts = cargoArtifactsNoDefault;
|
||||
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
||||
} // packageOpts);
|
||||
}) // (optionalAttrs hasExamples {
|
||||
examples = craneLibMsrv.buildPackage (commonCraneArgs // {
|
||||
}
|
||||
// packageOpts);
|
||||
})
|
||||
// (optionalAttrs hasExamples {
|
||||
examples = craneLibMsrv.buildPackage (commonCraneArgs
|
||||
// {
|
||||
pname = "${crateName}-examples";
|
||||
cargoExtraArgs = "--examples ${optionalString hasNonDefaultFeatures "--all-features"} ${maybeWorkspace}";
|
||||
} // packageOpts);
|
||||
}
|
||||
// packageOpts);
|
||||
});
|
||||
|
||||
apps = { cargo-miri, cargo-semver-checks, ... }: {
|
||||
apps = {
|
||||
cargo-miri,
|
||||
cargo-semver-checks,
|
||||
...
|
||||
}: {
|
||||
miri = "${cargo-miri}/bin/cargo-miri";
|
||||
semver-checks = "${cargo-semver-checks}/bin/cargo-semver-checks semver-checks";
|
||||
};
|
||||
})
|
||||
|
||||
rec {
|
||||
devShells = rec {
|
||||
devShells =
|
||||
rec {
|
||||
default = {
|
||||
packages = pkgs: with pkgs; [ rustToolchain ]
|
||||
packages = pkgs:
|
||||
with pkgs;
|
||||
[rustToolchain]
|
||||
++ (config.tools pkgs)
|
||||
++ (buildDeps pkgs).buildInputs
|
||||
++ (buildDeps pkgs).nativeBuildInputs;
|
||||
|
||||
env = { rustPlatform, pkgs, ... }: {
|
||||
env = {
|
||||
rustPlatform,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
RUST_SRC_PATH = toString rustPlatform.rustLibSrc;
|
||||
} // (buildDeps pkgs).env;
|
||||
}
|
||||
// (buildDeps pkgs).env;
|
||||
};
|
||||
miri = {
|
||||
packages = pkgs: with pkgs; [ miriRustToolchain ]
|
||||
packages = pkgs:
|
||||
with pkgs;
|
||||
[miriRustToolchain]
|
||||
++ (config.tools pkgs)
|
||||
++ (buildDeps pkgs).buildInputs
|
||||
++ (buildDeps pkgs).nativeBuildInputs;
|
||||
|
||||
inherit (default) env;
|
||||
};
|
||||
} // (optionalAttrs hasMsrv {
|
||||
}
|
||||
// (optionalAttrs hasMsrv {
|
||||
msrv = {
|
||||
packages = pkgs: with pkgs; [ msrvRustToolchain ]
|
||||
packages = pkgs:
|
||||
with pkgs;
|
||||
[msrvRustToolchain]
|
||||
++ (config.tools pkgs)
|
||||
++ (buildDeps pkgs).buildInputs
|
||||
++ (buildDeps pkgs).nativeBuildInputs;
|
||||
|
|
@ -306,9 +393,11 @@ warnIf (! builtins ? readFileType) "Unsupported Nix version in use."
|
|||
};
|
||||
});
|
||||
|
||||
formatters = pkgs: {
|
||||
"*.rs" = "${pkgs.rustfmt}/bin/rustfmt";
|
||||
formatters = pkgs:
|
||||
with pkgs; {
|
||||
"*.nix" = getExe alejandra;
|
||||
"*.rs" = getExe rustfmt;
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue