diff options
| -rw-r--r-- | .editorconfig | 5 | ||||
| -rw-r--r-- | doc/manual/rl-next/repl-tstp.md | 7 | ||||
| -rw-r--r-- | justfile | 2 | ||||
| -rw-r--r-- | package.nix | 14 |
4 files changed, 24 insertions, 4 deletions
diff --git a/.editorconfig b/.editorconfig index 887ecadba..bcee9cfce 100644 --- a/.editorconfig +++ b/.editorconfig @@ -24,3 +24,8 @@ indent_size = 4 # Match diffs, avoid to trim trailing whitespace [*.{diff,patch}] trim_trailing_whitespace = false + +[*.md] +indent_style = space +indent_size = 2 +max_line_length = 0 diff --git a/doc/manual/rl-next/repl-tstp.md b/doc/manual/rl-next/repl-tstp.md new file mode 100644 index 000000000..61d87f255 --- /dev/null +++ b/doc/manual/rl-next/repl-tstp.md @@ -0,0 +1,7 @@ +--- +synopsis: "REPL now supports CTRL+Z to suspend" +credits: [Qyriad] +category: Improvements +--- + +Editline is now built with SIGTSTP support, so now typing CTRL+Z in the REPL will suspend the REPL and allow it to be resumed later or backgrounded. @@ -24,4 +24,4 @@ install *OPTIONS: (build OPTIONS) # Run tests test *OPTIONS: - meson test -C build --print-errorlogs --quiet {{ OPTIONS }} + meson test -C build --print-errorlogs {{ OPTIONS }} diff --git a/package.nix b/package.nix index 2d4f6c2cd..c888d67d4 100644 --- a/package.nix +++ b/package.nix @@ -18,6 +18,7 @@ cmake, curl, doxygen, + editline-lix ? __forDefaults.editline-lix, editline, flex, git, @@ -73,6 +74,10 @@ ]; }; + editline-lix = editline.overrideAttrs (prev: { + configureFlags = prev.configureFlags or [ ] ++ [ (lib.enableFeature true "sigstop") ]; + }); + lix-doc = pkgs.callPackage ./lix-doc/package.nix { }; build-release-notes = pkgs.callPackage ./maintainers/build-release-notes.nix { }; }, @@ -236,7 +241,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 xz brotli - editline + editline-lix openssl sqlite libarchive @@ -366,14 +371,17 @@ stdenv.mkDerivation (finalAttrs: { # strictoverflow is disabled because we trap on signed overflow instead hardeningDisable = [ "strictoverflow" ] ++ lib.optional stdenv.hostPlatform.isStatic "pie"; - meta.platforms = lib.platforms.unix; + meta = { + mainProgram = "nix"; + platforms = lib.platforms.unix; + }; passthru.perl-bindings = pkgs.callPackage ./perl { inherit fileset stdenv; }; # Export the patched version of boehmgc. # flake.nix exports that into its overlay. passthru = { - inherit (__forDefaults) boehmgc-nix build-release-notes; + inherit (__forDefaults) boehmgc-nix editline-lix build-release-notes; # The collection of dependency logic for this derivation is complicated enough that # it's easier to parameterize the devShell off an already called package.nix. |