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
base: 8f4184739452
Choose a base ref
...
head repository: NixOS/nix
compare: c277231b7d8c
Choose a head ref
  • 14 commits
  • 19 files changed
  • 3 contributors

Commits on Apr 13, 2020

  1. SourceExprCommand: allocate the vSourceExpr via uncollectable memory

    Previously the memory would occasionally be collected during eval since
    the GC doesn't consider the member variable as alive / doesn't scan the
    region of memory where the pointer lives.
    
    By using the traceable_allocator<T> allocator provided by Boehm GC we
    can ensure the memory isn't collected. It should be properly freed when
    SourceExprCommand goes out of scope.
    andir committed Apr 13, 2020
    Copy the full SHA
    d2c3719 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2020

  1. add NIX_USER_CONF_FILES

    Motivation: maintain project-level configuration files.
    
    Document the whole situation a bit better so that it corresponds to the
    implementation, and add NIX_USER_CONF_FILES that allows overriding
    which user files Nix will load during startup.
    zimbatm committed Apr 14, 2020
    Copy the full SHA
    895516c View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Merge pull request #3458 from zimbatm/nix-user-conf-dir

    NIX_USER_CONF_FILES
    edolstra committed Apr 15, 2020
    Copy the full SHA
    a118293 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3492 from andir/nix-build-gc-free

    SourceExprCommand: allocate the vSourceExpr via uncollectable memory
    edolstra committed Apr 15, 2020
    Copy the full SHA
    2f9789c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Copy the full SHA
    1290411 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    b3e5eea View commit details
    Browse the repository at this point in the history
  3. ValueMap, VectorVector: Use traceable_allocator

    We want to *trace* the 'Value *' arrays, not garbage-collect them!
    Otherwise the vectors/maps can end up pointing to nowhere.
    
    Fixes #3377. Closes #3384.
    edolstra committed Apr 16, 2020
    Copy the full SHA
    10e17ea View commit details
    Browse the repository at this point in the history
  4. JSONSax: Use a RootValue

    More #3377.
    edolstra committed Apr 16, 2020
    Copy the full SHA
    9f46f54 View commit details
    Browse the repository at this point in the history
  5. Use RootValue

    edolstra committed Apr 16, 2020
    Copy the full SHA
    fcd048a View commit details
    Browse the repository at this point in the history
  6. Logger: Add method for writing to stdout

    Usually this just writes to stdout, but for ProgressBar, we need to
    clear the current line, write the line to stdout, and then redraw the
    progress bar.
    
    (cherry picked from commit 696c026)
    edolstra committed Apr 16, 2020
    Copy the full SHA
    67a5941 View commit details
    Browse the repository at this point in the history
  7. Use Logger::stdout()

    (cherry picked from commit 8f41847)
    edolstra committed Apr 16, 2020
    Copy the full SHA
    efaffaa View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    0858738 View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    f89349f View commit details
    Browse the repository at this point in the history
  10. Use RootValue

    edolstra committed Apr 16, 2020
    Copy the full SHA
    c277231 View commit details
    Browse the repository at this point in the history