aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2020-07-23Merge remote-tracking branch 'upstream/master' into misc-caJohn Ericson
2020-07-23Merge remote-tracking branch 'upstream/master' into misc-caJohn Ericson
2020-07-23Get rid of `basicDerivation::findOutput`John Ericson
It's a tiny function which is: - hardly worth abstrating over, and also only used once. - doesn't work once we get CA drvs I rewrote the one callsite to be forwards compatable with CA derivations, and also potentially more performant: instead of reading in the derivation it can ust consult the SQLite DB in the common case.
2020-07-23Save changes made by "nix registry pin" to user registryFabian Möller
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-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-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 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-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-17Add `DerivationType::CAFloating`John Ericson
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 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
2020-07-16Merge branch 'master' of github.com:NixOS/nix into ↵Carlo Nucera
optional-derivation-output-storepath
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.