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: 645694199368
Choose a base ref
...
head repository: NixOS/nix
compare: 880375366602
Choose a head ref
  • 9 commits
  • 8 files changed
  • 5 contributors

Commits on Dec 4, 2020

  1. When moving paths out of sandbox, ensure we have write permission.

    If we're a single-user installation of Nix, then we won't have root
    superpowers to just ignore the permission bits. This means that we'll
    need permission on the directory (if it's a directory) that we're moving
    in order to move it with rename, because it must update the ".."
    directory entry.
    
    Fixes #4295.
    
    This is already working in master, thanks to
    e913a29 (and followup cleanups).
    lukegb committed Dec 4, 2020
    Copy the full SHA
    2239953 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4312 from lukegb/bug4295

    When moving paths out of sandbox, ensure we have write permission
    edolstra committed Dec 4, 2020
    Copy the full SHA
    8d65ec5 View commit details
    Browse the repository at this point in the history
  3. Update config.guess for proper arm64 macOS detection

    This fixes results for arm64 macOS so config.guess now reports:
    
      aarch64-apple-darwin20.1.0
    
    instead of
    
      arm-apple-darwin20.1.0
    
    (cherry picked from commit 94f3595)
    matthewbauer authored and edolstra committed Dec 4, 2020
    Copy the full SHA
    f82490c View commit details
    Browse the repository at this point in the history
  4. Bump version

    edolstra committed Dec 4, 2020
    Copy the full SHA
    62f01d7 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2020

  1. Remove redundant check in parseJSONString

    knl authored and piegamesde committed Dec 15, 2020
    Copy the full SHA
    b595df5 View commit details
    Browse the repository at this point in the history
  2. Add support for \u escape in fromJSON

    As fromTOML supports \u and \U escapes, bring fromJSON on par. As JSON defaults
    to UTF-8 encoding (every JSON parser must support UTF-8), this change parses the
    `\u hex hex hex hex` sequence (\u followed by 4 hexadecimal digits) into an
    UTF-8 representation.
    
    Add a test to verify correct parsing, using all escape sequences from json.org.
    knl authored and piegamesde committed Dec 15, 2020
    Copy the full SHA
    0f35904 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2020

  1. Merge pull request #4368 from piegamesde/backport-json-unicode-escape

    Backport json unicode escaping to 2.3
    edolstra committed Dec 16, 2020
    Copy the full SHA
    359c07b View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    6de15f7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #4374 from NixOS/2.3-absolute-url-in-binary-caches

    Allow HTTP binary cache to request absolute uris
    edolstra committed Dec 16, 2020
    Copy the full SHA
    8803753 View commit details
    Browse the repository at this point in the history