aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-23Merge remote-tracking branch 'upstream/master' into misc-caJohn Ericson
2020-07-23Merge pull request #3854 from B4dM4n/registry-pin-writeEelco Dolstra
Save changes made by "nix registry pin" to user registry
2020-07-23Save changes made by "nix registry pin" to user registryFabian Möller
2020-07-23Merge pull request #3850 from obsidiansystems/references-scan-cleanupEelco Dolstra
Separate concerns in `scanForReferences` with TeeSink
2020-07-22Separate concerns in `scanForReferences` with TeeSinkJohn Ericson
This also will make it easier to use a `HashModuloSink` instead for CA derivations.
2020-07-22Merge pull request #3848 from knedlsepp/patch-1Eelco Dolstra
README: Fix link to hacking guide
2020-07-22README: Fix link to hacking guideJosef Kemetmüller
The link was previously interpreted as if it were relative to the current file.
2020-07-21Merge pull request #3736 from ↵Eelco Dolstra
obsidiansystems/allow-relative-paths-in-store-option Allow relative paths in --store option
2020-07-21Merge pull request #3714 from obsidiansystems/add-body-to-network-errorsEelco Dolstra
Add response body to network errors
2020-07-21Change logic for deciding what is a relative path for the local storeJohn Ericson
The was Eelco's prefered logic, and it looks good to me!
2020-07-21Merge pull request #3844 from ↵Eelco Dolstra
obsidiansystems/update-chunksize-to-suggested-value Update chunkSize to the suggested value
2020-07-21Update chunkSize to the suggested valueCarlo Nucera
This was a suggested course of action in a review in one of our earlier commits, https://github.com/NixOS/nix/pull/3801#discussion_r457557079
2020-07-21Merge remote-tracking branch 'upstream/master' into add-body-to-network-errorsJohn Ericson
2020-07-21Update src/libstore/build.ccJohn Ericson
2020-07-21Merge pull request #3801 from obsidiansystems/from-dump-streamEelco Dolstra
Constant space `addToStoreFromDump` and deduplicate code
2020-07-21Merge pull request #3840 from Mic92/docsEelco Dolstra
README: improve development docs
2020-07-21Merge pull request #3842 from obsidiansystems/fix-and-document-addToStoreSlowEelco Dolstra
Correct bug, thoroughly document addToStoreSlow
2020-07-21Merge branch 'fix-and-document-addToStoreSlow' of ↵John Ericson
github.com:obsidiansystems/nix into from-dump-stream
2020-07-21Merge branch 'fix-and-document-addToStoreSlow' of ↵John Ericson
github.com:obsidiansystems/nix into misc-ca
2020-07-20Correct bug, thoroughly document addToStoreSlowCarlo Nucera
2020-07-20Update doc/manual/hacking.xmlJörg Thalheim
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-07-20Use heuristics to decide when to show the responseCarlo Nucera
Due to https://github.com/NixOS/nix/issues/3841 we don't know how print different messages for different verbosity levels.
2020-07-20Add another Unimplemented caseCarlo Nucera
2020-07-20Merge branch 'ca-derivation-data-types' of github.com:obsidiansystems/nix ↵Carlo Nucera
into misc-ca
2020-07-20Add UnimplementedError to ease grepping for theseCarlo Nucera
2020-07-20Merge remote-tracking branch 'upstream/master' into from-dump-streamJohn Ericson
2020-07-20Merge pull request #3822 from obsidiansystems/dump-thrice-fixmeEelco Dolstra
Optimize `addToStoreSlow` and remove `TeeParseSink`
2020-07-20Apply suggestions from code reviewJohn Ericson
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-07-20README: improve development docsJörg Thalheim
2020-07-19Merge pull request #3834 from ajkovar/source-line-3393Eelco Dolstra
Add newline to profile sourcing line #3393
2020-07-18Add newline to profile sourcing line #3393Alex Kovar
2020-07-18Merge pull request #3832 from Mic92/shell-impurityEelco Dolstra
fix make's impurity on /bin/sh
2020-07-18Merge pull request #3828 from BurNiinTRee/restore-signals-before-editEelco Dolstra
nix edit: call restoreSignals() before `execvp`-ing the $EDITOR
2020-07-18fix make's impurity on /bin/shJörg Thalheim
This is important when using tooling like BEAR to generate compilation database since the used glibc version needs to match for LD_PRELOAD to work. It might be also beneficial when building on systems other than NixOS with nix develop since /bin/sh might be not bash (which is what all nix devs use for testing). This fix is not perfect because Makefile.config.in itself is also build with make but strictly better than the status quo.
2020-07-17Remove stray added fileJohn Ericson
2020-07-17Add `DerivationType::CAFloating`John Ericson
2020-07-17Test relative store pathsCarlo Nucera
2020-07-17Merge branch 'master' of github.com:NixOS/nix into ↵Carlo Nucera
allow-relative-paths-in-store-option
2020-07-17Revert "Don't anticipate CA but not fixed outputs for now"Carlo Nucera
This reverts commit 3a9e4c32624b36b70cf8d553fd76a85ee97773ab.
2020-07-17Revert "Don't anticipate multiple CA outputs for now"Carlo Nucera
This reverts commit 74b251b2f3d6414de051c8523011c0ee3c5ea154.
2020-07-17Revert "Don't anticipate hash algo without hash in derivation for now"Carlo Nucera
This reverts commit 3804e3df9bb479fe1d399f29d16a1aabaf352c19.
2020-07-17nix edit: call restoreSignals() before `execvp`-ing the $EDITORLars Mühmel
Currently resizing of the terminal doesn't play nicely with nix edit when using kakoune as the editor, as it relies on the SIGWINCH signal which is trapped by nix. How this is not a problem with e.g. vim is beyond me. Virtually all other exec* calls are following a call to restoreSignals(). This commit adds this behavior to nix edit as well.
2020-07-17Merge branch 'ca-drv' of github.com:Ericson2314/nix into misc-caCarlo Nucera
2020-07-17Merge branch 'master' of github.com:NixOS/nix into misc-caCarlo Nucera
2020-07-17Merge pull request #3827 from obsidiansystems/add-back-compat-shell.nixEelco Dolstra
Add back flake-compat shell.nix
2020-07-17Add back flake-compat shell.nixJohn Ericson
This was removed in the merge commit adf2fbbdc2c94644b0d1023d844c7dc0e485a20f. I think this was a mistake that occurred when resolving a conflict.
2020-07-17Merge branch 'multi-output-hashDerivationModulo' of ↵Carlo Nucera
github.com:Ericson2314/nix into misc-ca
2020-07-17parseFlakeRef(): Only search for the top-level directory for CLI flakerefsEelco Dolstra
2020-07-17nix profile diff-closures: Don't inherit EvalCommandEelco Dolstra
2020-07-16Merge branch 'optional-derivation-output-storepath' of ↵Carlo Nucera
github.com:obsidiansystems/nix into ca-derivation-data-types
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 12:40:30 +0000