aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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-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-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 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-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 'master' of github.com:NixOS/nix into add-body-to-network-errorsCarlo Nucera
2020-07-16Add command 'nix profile diff-closure'Eelco Dolstra
This shows all changes between generations of a profile. E.g. $ nix profile diff-closures --profile /nix/var/nix/profiles/system Generation 654 -> 655: nix: 2.4pre20200617_5d69bbf → 2.4pre20200701_6ff9aa8, +42.2 KiB Generation 655 -> 656: blender-bin: 2.83.0 → 2.83.1, -294.2 KiB Generation 656 -> 657: curl: 7.68.0 → 7.70.0, +19.1 KiB firmware-linux-nonfree: 2020-01-22 → 2020-05-19, +30827.7 KiB ibus: -21.8 KiB initrd-linux: 5.4.46 → 5.4.49 ...
2020-07-16Fix bug in TeeSourceJohn Ericson
We use this to simplify `LocalStore::addToStoreFromDump`. Also, hope I fixed build error with old clang (used in Darwin CI).
2020-07-16Generations API cleanupEelco Dolstra
2020-07-16nix diff-closures: Fix buildEelco Dolstra
2020-07-16Merge branch 'diff-closures'Eelco Dolstra
2020-07-16Merge remote-tracking branch 'origin/flakes'Eelco Dolstra
2020-07-16Optimize `addToStoreSlow` and remove `TeeParseSink`John Ericson
2020-07-15Revert "LocalStore::addToStoreFromDump copy in chunks"John Ericson
This reverts commit 592851fb67cd15807109d6f65fb81f6af89af966. We don't need this extra feature anymore
2020-07-15Get rid of `LocalStore::addToStoreCommon`John Ericson
I got it to just become `LocalStore::addToStoreFromDump`, cleanly taking a store and then doing nothing too fancy with it. `LocalStore::addToStore(...Path...)` is now just a simple wrapper with a bare-bones sinkToSource of the right dump command.
2020-07-15Merge branch 'handle-flat-case' into from-dump-streamJohn Ericson
2020-07-15Revert "Revert "LocalStore::addToStore(srcPath): Handle the flat case""John Ericson
This reverts commit cff2157185912025c24a1b9dc99056161634176c.
2020-07-15Merge remote-tracking branch 'obsidian/fix-add-to-star-narhash' into ↵John Ericson
from-dump-stream
2020-07-15nix why-depends: Fix shortest path calculationEelco Dolstra
This was completely broken since d8972317fc4314864619cadd5620ae780da657a3.
2020-07-15nix: Fix examplesEelco Dolstra
2020-07-15nix: Add --derivation flag to operate on .drv pathsEelco Dolstra
For instance, 'nix why-depends --use-derivation nixpkgs#hello nixpkgs#glibc' shows why hello's .drv depends on glibc's .drv.
2020-07-15nix why-depends: Fix misleading messageEelco Dolstra
2020-07-15Clean up RealiseModeEelco Dolstra
2020-07-15Make InstallableStorePath behave consistently with InstallableValueEelco Dolstra
That is, the commands 'nix path-info nixpkgs#hello' and 'nix path-info /nix/store/00ls0qi49qkqpqblmvz5s1ajl3gc63lr-hello-2.10.drv' now do the same thing (i.e. build the derivation and operate on the output store path, rather than the .drv path).
2020-07-15Merge branch 'master' of github.com:NixOS/nix into add-body-to-network-errorsCarlo Nucera