Merge remote-tracking branch 'upstream/master' into add-body-to-network-errors
Showing
- Makefile.config.in 1 addition, 0 deletionsMakefile.config.in
- README.md 3 additions, 22 deletionsREADME.md
- doc/manual/hacking.xml 39 additions, 6 deletionsdoc/manual/hacking.xml
- scripts/install-nix-from-closure.sh 2 additions, 2 deletionsscripts/install-nix-from-closure.sh
- shell.nix 3 additions, 0 deletionsshell.nix
- src/libexpr/flake/flakeref.cc 49 additions, 44 deletionssrc/libexpr/flake/flakeref.cc
- src/libstore/build.cc 1 addition, 1 deletionsrc/libstore/build.cc
- src/libstore/daemon.cc 19 additions, 43 deletionssrc/libstore/daemon.cc
- src/libstore/export-import.cc 7 additions, 5 deletionssrc/libstore/export-import.cc
- src/libstore/local-store.cc 61 additions, 111 deletionssrc/libstore/local-store.cc
- src/libstore/local-store.hh 1 addition, 1 deletionsrc/libstore/local-store.hh
- src/libstore/profiles.cc 37 additions, 44 deletionssrc/libstore/profiles.cc
- src/libstore/profiles.hh 10 additions, 15 deletionssrc/libstore/profiles.hh
- src/libstore/store-api.cc 63 additions, 10 deletionssrc/libstore/store-api.cc
- src/libstore/store-api.hh 1 addition, 1 deletionsrc/libstore/store-api.hh
- src/libutil/archive.hh 21 additions, 4 deletionssrc/libutil/archive.hh
- src/libutil/serialise.cc 13 additions, 0 deletionssrc/libutil/serialise.cc
- src/libutil/serialise.hh 14 additions, 1 deletionsrc/libutil/serialise.hh
- src/nix-env/nix-env.cc 12 additions, 16 deletionssrc/nix-env/nix-env.cc
- src/nix/command.hh 6 additions, 0 deletionssrc/nix/command.hh
Loading
Please register or sign in to comment