Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d2008f2fff4b
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96310a4d7dff
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 18, 2020

  1. nix repl: Scan NixRepl for GC roots 

    Fixes #3175.

(cherry picked from commit b244e65)
Signed-off-by: Domen Kožar <domen@dev.si>
    @edolstra @domenkozar
    edolstra authored and domenkozar committed Jun 18, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    96310a4 View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/nix/repl.cc
5 changes: 4 additions & 1 deletion src/nix/repl.cc
View file
Original file line number Diff line number Diff line change
@@ -31,6 +31,9 @@ extern "C" {
#include "command.hh"
#include "finally.hh"

#define GC_INCLUDE_NEW
#include <gc/gc_cpp.h>

namespace nix {

#define ESC_RED "\033[31m"
@@ -41,7 +44,7 @@ namespace nix {
#define ESC_CYA "\033[36m"
#define ESC_END "\033[0m"

struct NixRepl
struct NixRepl : gc
{
string curDir;
EvalState state;