suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,994 Commits
24 Branches
30 Tags
110 MiB
Commit Graph

77 Commits (2411202b1af8f0cba7422b600825eccc541e4530)

Author SHA1 Message Date
Matt Paras 7a006f7e30 clean up 2025-06-12 17:47:26 -07:00
Matt Paras 8eae56f548 merge latest from master 2025-06-05 22:54:31 -07:00
Tobias Kohlbau f249949598
address warning nix build 
mkCargoDerivation warns about not using a hardcoded stdenv but isntead
providing a selector function. In addition the log output from cargo
should be captured into a special file.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2025-05-20 11:01:38 +02:00
Matt Paras 0b5741fa84 attempt to get nix working 2025-05-10 11:53:35 -07:00
omahs bfd2c72715
fix: typos (#13505) 2025-05-10 10:36:17 -05:00
Bloxx12 cb1ecc9128 flake: checks: build the release package 2025-05-09 11:57:48 -04:00
Bloxx12 60a03a35c6 flake: drop flake-utils dependency 2025-05-09 11:57:48 -04:00
Michael Davis 8da226f0b4
flake: Revert devShell linker to lld 
`mold` does not appear to work on macOS as stated in the parent commit.
 2025-03-07 12:06:33 -05:00
Michael Davis fab08c0981
flake: Use mold for linking in devShell 
Our `lld` was a bit out of date. Mold seems to be slightly faster
anyways and seems to work well on both Linux & macOS.
 2025-03-07 09:41:48 -05:00
Michael Davis b6e58c0fa4
flake: Split platform and common RUSTFLAGS in devShell 
The `--no-rosegment` is not supported on macOS but the other flag
configurations can be used on both macOS and Linux.
 2025-03-07 09:36:58 -05:00
Michael Davis 19558839b7
flake: Avoid setting HELIX_RUNTIME in devShell 
The runtime directory should be correctly set without the need to set
HELIX_RUNTIME manually because we check for a runtime directory within
CARGO_MANIFEST_DIR.

This change also filters the runtime directory out of the source file
set passed to buildRustPackage since the runtime directory is not needed
at compilation time.
 2025-03-06 18:40:35 -05:00
Christopher Smyth b1ee4ab5c6
Fix the git hash missing and add some more comments. (#13024) 2025-03-04 13:12:48 -06:00
Christopher Smyth 1d453785e5
Clean up Nix Flake & make it easier to customize (#12831) 2025-03-04 10:23:28 -06:00
Matt Paras a9d5557a3b merge from master 2025-01-11 10:14:03 -08:00
0rphee 7b9b9329b9
Make git revision available for nix flake builds (#12331) 2024-12-25 11:26:53 -06:00
Matthew Paras 29ce6fffda
Merge pull request #7 from MatrixManAtYrService/cogs-output 
Add a flake output for the helix cogs
 2024-10-22 22:34:41 -07:00
Michael Davis 6d64e6288a Bump flake dependencies 
`nix flake update`
 2024-10-21 11:27:46 +09:00
Michael Davis f371dcaa4e flake: Include --cfg tokio_unstable in Rust flags 
The flake sets `RUSTFLAGS` and that overwrites the setting in
`.cargo/config.toml`. We need to add the `--cfg tokio_unstable` flag to
enable integration tests to run when called from the devShell.
 2024-10-21 11:27:46 +09:00
Tobias Kohlbau 7ebfd90d92
Merge remote-tracking branch 'upstream/master' into steel-event-system 2024-10-09 11:07:30 +02:00
Matt Rixman 5b4a04718f Adding helix-cogs as a flake output 
These are necessary for creating dev environments which use the plugin
system.  Making them a flake output makes it easy to get them without
having `cargo xtask code-gen` modify your ~/.config directory.
 2024-09-16 04:04:53 +00:00
nryz e290479474
copy shell completion to nix output (#11518) 2024-08-19 15:45:38 -05:00
mattwparas 9ea77a26a4 merge in latest from master 2024-07-15 21:50:58 -07:00
Asger Juul Brunshøj a1cda3c19e
in flake mkShell default RUSTFLAGS to an empty string if unset (#10880) 2024-06-10 17:08:39 +02:00
mattwparas 392275ddb2 merge latest from master 2024-01-30 20:07:31 -08:00
Tanguy 510928618d
Fix version of Nix package (#9013) 2023-12-09 03:04:09 +09:00
Evan Richter 455b206a8c
nix: update flake inputs (#8943) 
* removed non-existent crane flake input overrides
 2023-12-04 01:46:17 +01:00
mattwparas db3e9ed31d Merge remote-tracking branch 'origin' into mwp-steel-integration 2023-09-14 08:53:23 -07:00
Evan Richter c680721aae flake: add Security apple framework 
Now steel can be built with this Nix devshell
 2023-09-05 20:53:25 -06:00
Michael Davis 7cf775d512
Build flake packages with stable Rust (#8133) 
We can continue to use the MSRV for local development and checks while
building release executables with the latest stable Rust, as we do in
CI.
 2023-09-01 08:57:38 +09:00
Tanguy 40d7e6c9c8
Copy desktop and icon files to Nix output (#7979) 2023-08-29 16:22:03 +09:00
Michael Davis d6856cfeec
Refactor Nix flake to use crane (#7763) 
This resolves a build issue with nci/dream2nix and git dependencies.
We can keep most of the helix-specific parts of the flake, we just need
to switch from configuring nci to calling craneLib functions.

We also switch to flake-utils from flake-parts:

* Using rust-overlay with flake-parts directly is unergonomic
  (see https://github.com/hercules-ci/flake-parts/discussions/83).
* Removing flake-parts reduces the overall dependencies: rust-overlay
  already depends on flake-utils.
 2023-07-28 13:30:26 +09:00
Yt ff442eecd0
nix: add overlay for convenient package usage (#7078) 2023-05-19 22:21:05 +09:00
Yusuf Bera Ertan c3c87741d9
build(nix): update flake dependencies, remove deprecated code from flake 2023-04-02 01:58:10 +03:00
Yusuf Bera Ertan 309735aa2d
build(nix): fix devshell 2023-02-25 07:06:30 +03:00
Yusuf Bera Ertan e5af0f1d49
build(nix): update flake to use flake-parts and nci flake-parts module 2023-02-25 06:27:13 +03:00
Austreelis f7edc34e7b
flake: pass helix' wrapper through (#5994) 
This allows easily (re)making helix (wrapped)
from an overriden helix-unwrapped derivation,
e.g. if one wanted to patch helix from nix.
 2023-02-17 15:17:38 +09:00
Michael Davis d6704ed117
flake: Fix devshell for darwin hosts (#5368) 
Runs of `cargo build` would fail with `ld: framework not found
CoreFoundation` inside a devshell (`nix develop`) on a Darwin host.

This is fixed with two changes:

* Including the `CoreFoundation` package within the devshell's
  derivation.
* Switching from `value` to `eval` so that we append to the `RUSTFLAGS`
  environment variable rather than overwriting it. `numtide/devshell`
  already exposes the `Library/Frameworks` path within the devshell
  derivation but it was being overwritten by the manual setting of
  `RUSTFLAGS` in `env`.
 2023-01-03 01:12:32 +09:00
Yusuf Bera Ertan 48e44720e4
build(nix): don't run tests in builds since CI runs them already, update inputs (#4834) 2022-11-21 09:06:43 -06:00
Yusuf Bera Ertan 3881fef39d
build(nix): update nci, fixup flake (#4537) 2022-10-31 19:52:03 -05:00
Michael Davis ec81ec1e8d
flake: Fix devShell on aarch64-darwin (#3810) 
LLDB is marked broken on all arches except for x86_64-linux. With this
change, I can use `nix develop` on aarch64-darwin.
 2022-09-13 22:50:53 +09:00
Yusuf Bera Ertan e917a8e0be
build(nix): update nci, refactor flake, seperate wrapping, add source filtering (#3657) 2022-09-02 17:54:07 -05:00
Charlie Groves 9f4802e101
Only add cargo-tarpaulin on x86_64 (#3252) 
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
 2022-07-31 14:52:54 -05:00
Yusuf Bera Ertan 85a5df0391
build(nix): add a way to override what grammars get built (#3141) 2022-07-27 12:52:07 -05:00
Timothy DeHerrera 718c3baebe
nix: pass makeWrapperArgs to wrapProgram (#3003) 2022-07-09 11:17:44 -05:00
Timothy DeHerrera fefa4d8c59
nix flake: make the binary cache "just work" (#2999) 2022-07-09 11:09:37 -05:00
Yusuf Bera Ertan 8c86cd56cb build(nix): update flake deps, add default.nix file 2022-06-21 17:39:30 -05:00
Daniel Hines 9b9c3e5ae2
add rust-analyzer to shell environment (#2739) 2022-06-11 17:23:18 +09:00
Yusuf Bera Ertan bb83ea8393
chore(nix): format nix files with alejandra, update deps, minor code refactors (#2683) 2022-06-06 14:24:52 -05:00
Johann Dahm e529ca1b92
Fix build on aarch64-darwin (#1789) 
Co-authored-by: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
 2022-05-03 17:32:44 -05:00
Michael Davis e01c53551d flake: use builtins.fetchTree to shallow-clone grammar repos 
Here we perform a shallow fetch using builtins.fetchTree. In order
to make this work, we need to specify the `ref' for any repository
that doesn't have `master' as its default branch (I'm not sure why
this limitation exists since we don't need this when performing
the shallow fetch in `--grammar build')

This `ref' field is ignored by helix, so I have left it undocumented
for now, but I could be open to documenting it.
 2022-03-10 17:31:57 +09:00