|
|
|
@ -21,57 +21,124 @@
|
|
|
|
...
|
|
|
|
...
|
|
|
|
}: let
|
|
|
|
}: let
|
|
|
|
lib = nixpkgs.lib;
|
|
|
|
lib = nixpkgs.lib;
|
|
|
|
|
|
|
|
ncl = nci.lib.nci-lib;
|
|
|
|
mkRootPath = rel:
|
|
|
|
mkRootPath = rel:
|
|
|
|
builtins.path {
|
|
|
|
builtins.path {
|
|
|
|
path = "${toString ./.}/${rel}";
|
|
|
|
path = "${toString ./.}/${rel}";
|
|
|
|
name = rel;
|
|
|
|
name = rel;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
filteredSource = let
|
|
|
|
|
|
|
|
pathsToIgnore = [
|
|
|
|
|
|
|
|
".envrc"
|
|
|
|
|
|
|
|
".ignore"
|
|
|
|
|
|
|
|
".github"
|
|
|
|
|
|
|
|
"runtime"
|
|
|
|
|
|
|
|
"screenshot.png"
|
|
|
|
|
|
|
|
"book"
|
|
|
|
|
|
|
|
"contrib"
|
|
|
|
|
|
|
|
"docs"
|
|
|
|
|
|
|
|
"README.md"
|
|
|
|
|
|
|
|
"CHANGELOG.md"
|
|
|
|
|
|
|
|
"shell.nix"
|
|
|
|
|
|
|
|
"default.nix"
|
|
|
|
|
|
|
|
"grammars.nix"
|
|
|
|
|
|
|
|
"flake.nix"
|
|
|
|
|
|
|
|
"flake.lock"
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
ignorePaths = path: type: let
|
|
|
|
|
|
|
|
# split the nix store path into its components
|
|
|
|
|
|
|
|
components = lib.splitString "/" path;
|
|
|
|
|
|
|
|
# drop off the `/nix/hash-source` section from the path
|
|
|
|
|
|
|
|
relPathComponents = lib.drop 4 components;
|
|
|
|
|
|
|
|
# reassemble the path components
|
|
|
|
|
|
|
|
relPath = lib.concatStringsSep "/" relPathComponents;
|
|
|
|
|
|
|
|
in
|
|
|
|
|
|
|
|
lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
|
|
|
|
|
|
|
|
in
|
|
|
|
|
|
|
|
builtins.path {
|
|
|
|
|
|
|
|
name = "helix-source";
|
|
|
|
|
|
|
|
path = toString ./.;
|
|
|
|
|
|
|
|
# filter out unnecessary paths
|
|
|
|
|
|
|
|
filter = ignorePaths;
|
|
|
|
|
|
|
|
};
|
|
|
|
outputs = nci.lib.makeOutputs {
|
|
|
|
outputs = nci.lib.makeOutputs {
|
|
|
|
root = ./.;
|
|
|
|
root = ./.;
|
|
|
|
renameOutputs = {"helix-term" = "helix";};
|
|
|
|
config = common: {
|
|
|
|
# Set default app to hx (binary is from helix-term release build)
|
|
|
|
outputs = {
|
|
|
|
# Set default package to helix-term release build
|
|
|
|
# rename helix-term to helix since it's our main package
|
|
|
|
defaultOutputs = {
|
|
|
|
rename = {"helix-term" = "helix";};
|
|
|
|
app = "hx";
|
|
|
|
# Set default app to hx (binary is from helix-term release build)
|
|
|
|
package = "helix";
|
|
|
|
# Set default package to helix-term release build
|
|
|
|
|
|
|
|
defaults = {
|
|
|
|
|
|
|
|
app = "hx";
|
|
|
|
|
|
|
|
package = "helix";
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
cCompiler.package = with common.pkgs;
|
|
|
|
|
|
|
|
if stdenv.isLinux
|
|
|
|
|
|
|
|
then gcc
|
|
|
|
|
|
|
|
else clang;
|
|
|
|
|
|
|
|
shell = {
|
|
|
|
|
|
|
|
packages = with common.pkgs;
|
|
|
|
|
|
|
|
[lld_13 cargo-flamegraph rust-analyzer]
|
|
|
|
|
|
|
|
++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
|
|
|
|
|
|
|
|
++ (lib.optional stdenv.isLinux lldb);
|
|
|
|
|
|
|
|
env = [
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
name = "HELIX_RUNTIME";
|
|
|
|
|
|
|
|
eval = "$PWD/runtime";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
name = "RUST_BACKTRACE";
|
|
|
|
|
|
|
|
value = "1";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
name = "RUSTFLAGS";
|
|
|
|
|
|
|
|
value =
|
|
|
|
|
|
|
|
if common.pkgs.stdenv.isLinux
|
|
|
|
|
|
|
|
then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
|
|
|
|
|
|
|
|
else "";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
overrides = {
|
|
|
|
pkgConfig = common: {
|
|
|
|
cCompiler = common:
|
|
|
|
helix-term = {
|
|
|
|
with common.pkgs;
|
|
|
|
# Wrap helix with runtime
|
|
|
|
if stdenv.isLinux
|
|
|
|
wrapper = _: old: let
|
|
|
|
then gcc
|
|
|
|
inherit (common) pkgs;
|
|
|
|
else clang;
|
|
|
|
makeOverridableHelix = old: config: let
|
|
|
|
crateOverrides = common: _: {
|
|
|
|
grammars = pkgs.callPackage ./grammars.nix config;
|
|
|
|
helix-term = prev: {
|
|
|
|
runtimeDir = pkgs.runCommand "helix-runtime" {} ''
|
|
|
|
src = builtins.path {
|
|
|
|
mkdir -p $out
|
|
|
|
name = "helix-source";
|
|
|
|
ln -s ${mkRootPath "runtime"}/* $out
|
|
|
|
path = toString ./.;
|
|
|
|
rm -r $out/grammars
|
|
|
|
# filter out unneeded stuff that cause rebuilds
|
|
|
|
ln -s ${grammars} $out/grammars
|
|
|
|
filter = path: type:
|
|
|
|
'';
|
|
|
|
lib.all
|
|
|
|
helix-wrapped =
|
|
|
|
(n: builtins.baseNameOf path != n)
|
|
|
|
common.internal.pkgsSet.utils.wrapDerivation old
|
|
|
|
[
|
|
|
|
{
|
|
|
|
".envrc"
|
|
|
|
nativeBuildInputs = [pkgs.makeWrapper];
|
|
|
|
".ignore"
|
|
|
|
makeWrapperArgs = config.makeWrapperArgs or [];
|
|
|
|
".github"
|
|
|
|
}
|
|
|
|
"runtime"
|
|
|
|
''
|
|
|
|
"screenshot.png"
|
|
|
|
rm -rf $out/bin
|
|
|
|
"book"
|
|
|
|
mkdir -p $out/bin
|
|
|
|
"contrib"
|
|
|
|
ln -sf ${old}/bin/* $out/bin/
|
|
|
|
"docs"
|
|
|
|
wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
|
|
|
|
"README.md"
|
|
|
|
'';
|
|
|
|
"shell.nix"
|
|
|
|
in
|
|
|
|
"default.nix"
|
|
|
|
helix-wrapped
|
|
|
|
"grammars.nix"
|
|
|
|
// {override = makeOverridableHelix old;};
|
|
|
|
"flake.nix"
|
|
|
|
in
|
|
|
|
"flake.lock"
|
|
|
|
makeOverridableHelix old {};
|
|
|
|
];
|
|
|
|
overrides.fix-build.overrideAttrs = prev: {
|
|
|
|
};
|
|
|
|
src = filteredSource;
|
|
|
|
|
|
|
|
|
|
|
|
# disable fetching and building of tree-sitter grammars in the helix-term build.rs
|
|
|
|
# disable fetching and building of tree-sitter grammars in the helix-term build.rs
|
|
|
|
HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
|
|
|
|
HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
|
|
|
|
|
|
|
|
|
|
|
|
buildInputs = (prev.buildInputs or []) ++ [common.cCompiler.cc.lib];
|
|
|
|
buildInputs = ncl.addBuildInputs prev [common.config.cCompiler.package.cc.lib];
|
|
|
|
|
|
|
|
|
|
|
|
# link languages and theme toml files since helix-term expects them (for tests)
|
|
|
|
# link languages and theme toml files since helix-term expects them (for tests)
|
|
|
|
preConfigure = ''
|
|
|
|
preConfigure = ''
|
|
|
|
@ -87,88 +154,20 @@
|
|
|
|
meta.mainProgram = "hx";
|
|
|
|
meta.mainProgram = "hx";
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
shell = common: prev: {
|
|
|
|
|
|
|
|
packages =
|
|
|
|
|
|
|
|
prev.packages
|
|
|
|
|
|
|
|
++ (
|
|
|
|
|
|
|
|
with common.pkgs;
|
|
|
|
|
|
|
|
[lld_13 cargo-flamegraph rust-analyzer]
|
|
|
|
|
|
|
|
++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
|
|
|
|
|
|
|
|
++ (lib.optional stdenv.isLinux lldb)
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
env =
|
|
|
|
|
|
|
|
prev.env
|
|
|
|
|
|
|
|
++ [
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
name = "HELIX_RUNTIME";
|
|
|
|
|
|
|
|
eval = "$PWD/runtime";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
name = "RUST_BACKTRACE";
|
|
|
|
|
|
|
|
value = "1";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
name = "RUSTFLAGS";
|
|
|
|
|
|
|
|
value =
|
|
|
|
|
|
|
|
if common.pkgs.stdenv.isLinux
|
|
|
|
|
|
|
|
then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
|
|
|
|
|
|
|
|
else "";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
makeOverridableHelix = system: old: config: let
|
|
|
|
|
|
|
|
pkgs = nixpkgs.legacyPackages.${system};
|
|
|
|
|
|
|
|
grammars = pkgs.callPackage ./grammars.nix config;
|
|
|
|
|
|
|
|
runtimeDir = pkgs.runCommand "helix-runtime" {} ''
|
|
|
|
|
|
|
|
mkdir -p $out
|
|
|
|
|
|
|
|
ln -s ${mkRootPath "runtime"}/* $out
|
|
|
|
|
|
|
|
rm -r $out/grammars
|
|
|
|
|
|
|
|
ln -s ${grammars} $out/grammars
|
|
|
|
|
|
|
|
'';
|
|
|
|
|
|
|
|
helix-wrapped =
|
|
|
|
|
|
|
|
pkgs.runCommand "${old.name}-wrapped"
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
inherit (old) pname version meta;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
nativeBuildInputs = [pkgs.makeWrapper];
|
|
|
|
|
|
|
|
makeWrapperArgs = config.makeWrapperArgs or [];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
''
|
|
|
|
|
|
|
|
mkdir -p $out
|
|
|
|
|
|
|
|
cp -r --no-preserve=mode,ownership ${old}/* $out/
|
|
|
|
|
|
|
|
chmod +x $out/bin/*
|
|
|
|
|
|
|
|
wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
|
|
|
|
|
|
|
|
'';
|
|
|
|
|
|
|
|
in
|
|
|
|
|
|
|
|
helix-wrapped
|
|
|
|
|
|
|
|
// {override = makeOverridableHelix system old;};
|
|
|
|
|
|
|
|
in
|
|
|
|
in
|
|
|
|
outputs
|
|
|
|
outputs
|
|
|
|
// {
|
|
|
|
// {
|
|
|
|
apps =
|
|
|
|
|
|
|
|
lib.mapAttrs
|
|
|
|
|
|
|
|
(
|
|
|
|
|
|
|
|
system: apps: rec {
|
|
|
|
|
|
|
|
default = hx;
|
|
|
|
|
|
|
|
hx = {
|
|
|
|
|
|
|
|
type = "app";
|
|
|
|
|
|
|
|
program = lib.getExe self.${system}.packages.helix;
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
outputs.apps;
|
|
|
|
|
|
|
|
packages =
|
|
|
|
packages =
|
|
|
|
lib.mapAttrs
|
|
|
|
lib.mapAttrs
|
|
|
|
(
|
|
|
|
(
|
|
|
|
system: packages: rec {
|
|
|
|
system: packages:
|
|
|
|
default = helix;
|
|
|
|
packages
|
|
|
|
helix = makeOverridableHelix system helix-unwrapped {};
|
|
|
|
// {
|
|
|
|
helix-debug = makeOverridableHelix system helix-unwrapped-debug {};
|
|
|
|
helix-unwrapped = packages.helix.passthru.unwrapped;
|
|
|
|
helix-unwrapped = packages.helix;
|
|
|
|
helix-unwrapped-debug = packages.helix-debug.passthru.unwrapped;
|
|
|
|
helix-unwrapped-debug = packages.helix-debug;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
outputs.packages;
|
|
|
|
outputs.packages;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
Yusuf Bera Ertan
2 years ago
committed by
GitHub