Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

Nix
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3ba552b2

Commit 3ba552b2 authored 4 years ago by John Ericson

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into single-ca-drv-build

parents 5aed6f9b 733d2e94

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 7 additions, 1 deletion

.gitignore
README.md 1 addition, 1 deletion

README.md
doc/manual/src/hacking.md 1 addition, 1 deletion

doc/manual/src/hacking.md
doc/manual/src/release-notes/rl-1.7.md 1 addition, 1 deletion

doc/manual/src/release-notes/rl-1.7.md
doc/manual/src/release-notes/rl-2.1.md 1 addition, 1 deletion

doc/manual/src/release-notes/rl-2.1.md
src/libexpr/eval.cc 2 additions, 1 deletion

src/libexpr/eval.cc
src/libstore/daemon.cc 1 addition, 1 deletion

src/libstore/daemon.cc
src/libstore/remote-store.cc 38 additions, 6 deletions

src/libstore/remote-store.cc
src/libstore/remote-store.hh 10 additions, 0 deletions

src/libstore/remote-store.hh
src/libstore/ssh-store.cc 0 additions, 17 deletions

src/libstore/ssh-store.cc
src/nix-build/nix-build.cc 3 additions, 3 deletions

src/nix-build/nix-build.cc
tests/install-darwin.sh 1 addition, 1 deletion

tests/install-darwin.sh
tests/lang/eval-okay-ind-string.exp 1 addition, 1 deletion

tests/lang/eval-okay-ind-string.exp
tests/user-envs.nix 1 addition, 1 deletion

tests/user-envs.nix

with 68 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment