Merge branch 'master' into new-cli
Showing
- doc/manual/command-ref/env-common.xml 6 additions, 0 deletionsdoc/manual/command-ref/env-common.xml
- doc/manual/command-ref/nix-shell.xml 1 addition, 1 deletiondoc/manual/command-ref/nix-shell.xml
- doc/manual/expressions/builtins.xml 8 additions, 8 deletionsdoc/manual/expressions/builtins.xml
- doc/manual/expressions/derivations.xml 1 addition, 1 deletiondoc/manual/expressions/derivations.xml
- doc/manual/expressions/language-values.xml 7 additions, 2 deletionsdoc/manual/expressions/language-values.xml
- doc/manual/introduction/about-nix.xml 4 additions, 3 deletionsdoc/manual/introduction/about-nix.xml
- doc/manual/release-notes/rl-1.11.xml 7 additions, 0 deletionsdoc/manual/release-notes/rl-1.11.xml
- perl/lib/Nix/Store.xs 6 additions, 11 deletionsperl/lib/Nix/Store.xs
- release.nix 2 additions, 10 deletionsrelease.nix
- scripts/install-nix-from-closure.sh 2 additions, 2 deletionsscripts/install-nix-from-closure.sh
- scripts/nix-profile.sh.in 4 additions, 2 deletionsscripts/nix-profile.sh.in
- scripts/nix-push.in 3 additions, 6 deletionsscripts/nix-push.in
- src/libexpr/eval.cc 55 additions, 2 deletionssrc/libexpr/eval.cc
- src/libexpr/eval.hh 1 addition, 0 deletionssrc/libexpr/eval.hh
- src/libexpr/get-drvs.cc 18 additions, 3 deletionssrc/libexpr/get-drvs.cc
- src/libexpr/get-drvs.hh 2 additions, 1 deletionsrc/libexpr/get-drvs.hh
- src/libexpr/json-to-value.cc 14 additions, 10 deletionssrc/libexpr/json-to-value.cc
- src/libexpr/lexer.l 9 additions, 0 deletionssrc/libexpr/lexer.l
- src/libexpr/nixexpr.cc 9 additions, 0 deletionssrc/libexpr/nixexpr.cc
- src/libexpr/nixexpr.hh 10 additions, 0 deletionssrc/libexpr/nixexpr.hh
Loading
Please register or sign in to comment