aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-29Merge pull request #2897 from NixOS/source-infoEelco Dolstra
Store SourceInfo in Flake/NonFlake
2019-05-28nix flake info: Add missing newlineEelco Dolstra
2019-05-28printFlakeInfo: Separate JSON outputEelco Dolstra
2019-05-28callFlake(): Emit source info attributes for non-flake dependenciesEelco Dolstra
2019-05-28nix flake deps: Remove --json flag for nowEelco Dolstra
It doesn't produce valid JSON at the moment (but a concatenation of JSON objects). Anyway we probably should merge this command info 'nix flake info'.
2019-05-28printFlakeInfo/printNonFlakeInfo: Factor out commonalityEelco Dolstra
2019-05-28nix flake info/deps: Stop progress bar before printing outputEelco Dolstra
2019-05-28Remove redundant resolvedRef fields since they're already in SourceInfoEelco Dolstra
2019-05-28Rename contentHash -> narHash for consistencyEelco Dolstra
2019-05-28Move hash into SourceInfo and rename to narHash to avoid ambiguityEelco Dolstra
2019-05-28Store SourceInfo in Flake and NonFlakeEelco Dolstra
This deduplicates some shared fields. Factoring out the commonality is useful in places like makeFlakeValue().
2019-05-28Merge branch 'nonFlakeRequiresTest' of https://github.com/CSVdB/nix into flakesEelco Dolstra
2019-05-28Added nonFlakeRequires testNick Van den Broeck
Fixes #2888
2019-05-28Merge pull request #2895 from CSVdB/fixRelativePathsEelco Dolstra
Fixed relative path parsing
2019-05-28Fixed relative path parsingNick Van den Broeck
Fixed #2821
2019-05-26Remove outdated fetchGit testEelco Dolstra
It's no longer an error if we can't update our clone.
2019-05-25Merge pull request #2890 from NixOS/offline-flakesEelco Dolstra
Offline flakes
2019-05-23Register flake source trees as GC rootsEelco Dolstra
This ensures that flakes don't get garbage-collected, which is important to get nix-channel-like behaviour. For example, running $ nix build hydra: will create a GC root ~/.cache/nix/flake-closures/hydra -> /nix/store/xarfiqcwa4w8r4qpz1a769xxs8c3phgn-flake-closure where the contents/references of the linked file in the store are the flake source trees used by the 'hydra' flake: /nix/store/n6d5f5lkpfjbmkyby0nlg8y1wbkmbc7i-source /nix/store/vbkg4zy1qd29fnhflsv9k2j9jnbqd5m2-source /nix/store/z46xni7d47s5wk694359mq9ay353ar94-source Note that this in itself is not enough to allow offline use; the fetcher for the flakeref (e.g. fetchGit or downloadCached) must not fail if it cannot fetch the latest version of the file, so long as it knows a cached version. Issue #2868.
2019-05-23FlakeRef::to_string(): Check round tripEelco Dolstra
2019-05-23fetchGit: Don't barf if we can't update our Git cloneEelco Dolstra
Instead print a warning that we're continuing with the most recently fetched version.
2019-05-23Fix testsEelco Dolstra
https://hydra.nixos.org/eval/1521131
2019-05-23Merge pull request #2886 from NixOS/fetch-registryEelco Dolstra
Use online global registry
2019-05-22Add a test for the registry GC rootEelco Dolstra
2019-05-22Prevent the global registry from being GC'edEelco Dolstra
Issue #2868.
2019-05-22Refactor downloadCached() interfaceEelco Dolstra
2019-05-22Fetch the flake registry from the NixOS/flake-registry repoEelco Dolstra
2019-05-22Merge pull request #2884 from NixOS/check-epochEelco Dolstra
Check the flake epoch
2019-05-22flake-registry: tweag/nix -> NixOS/nixEelco Dolstra
2019-05-22Check the flake epochEelco Dolstra
Closes #2883.
2019-05-22Merge pull request #2877 from NixOS/improve-flake-commandEelco Dolstra
FlakeCommand improvements
2019-05-22nix flake deps: Print flake dependenciesEelco Dolstra
2019-05-22Move flake-related flags into a separate classEelco Dolstra
Also, rename --dont-save-lock-file to --no-save-lock-file and change noRegistries to useRegistries.
2019-05-22Add some testsEelco Dolstra
2019-05-22Improve FlakeCommandEelco Dolstra
It now handles commonality like calling getFlake() and resolving relative local flake refs. Fixes #2822.
2019-05-21Merge pull request #2881 from NixOS/misc-fixesEelco Dolstra
Improve lockfile warnings
2019-05-21Use warn(), tweak messagesEelco Dolstra
2019-05-21Only rewrite the lockfile if it changedEelco Dolstra
This removes spurious warnings about failure to write the lockfile.
2019-05-21Merge branch 'fixLockFile' of https://github.com/CSVdB/nix into flakesEelco Dolstra
2019-05-17Lockfile handling in `resolveFlake` is fixedNick Van den Broeck
2019-05-16Give errors in resolveFlakeNick Van den Broeck
If DontUpdate but the lockfile isn't correct
2019-05-16Fixed issue 65Nick Van den Broeck
lockfile updating
2019-05-16Merge pull request #96 from tweag/support-chroot-storeEelco Dolstra
Make flakes work with 'nix build --store ...'
2019-05-16Merge pull request #97 from tweag/flake-docsEelco Dolstra
Start of flake documentation
2019-05-15Start of flake documentationEelco Dolstra
Imported from https://gist.github.com/edolstra/40da6e3a4d4ee8fd019395365e0772e7. The goal is to turn this into an RFC eventually and later to integrate it into the manual.
2019-05-15Merge remote-tracking branch 'origin/master' into flakesEelco Dolstra
2019-05-15Merge pull request #2810 from NixOS/print-build-logsEelco Dolstra
nix: Add --print-build-logs flag
2019-05-15nix: Add --print-build-logs flagEelco Dolstra
This causes 'nix' to print build log output to stderr rather than showing the last log line in the progress bar. Log lines are prefixed by the name of the derivation (minus the version string), e.g. binutils> make[1]: Leaving directory '/build/binutils-2.31.1' binutils-wrapper> unpacking sources binutils-wrapper> patching sources ... binutils-wrapper> Using dynamic linker: '/nix/store/kr51dlsj9v5cr4n8700jliyz8v5b2q7q-bootstrap-stage0-glibc/lib/ld-linux-x86-64.so.2' bootstrap-stage2-gcc-wrapper> unpacking sources ... linux-headers> unpacking sources linux-headers> unpacking source archive /nix/store/8javli69jhj3bkql2c35gsj5vl91p382-linux-4.19.16.tar.xz
2019-05-15Make flakes work with 'nix build --store ...'Eelco Dolstra
It was getting confused between logical and real store paths. Also, make fetchGit and fetchMercurial update allowedPaths properly. (Maybe the evaluator, rather than the caller of the evaluator, should apply toRealPath(), but that's a bigger change.)
2019-05-15nix-profile: Add all channels to $NIX_PATHEelco Dolstra
Fixes #2709.
2019-05-15Fix shellcheck errorEelco Dolstra
https://hydra.nixos.org/build/93359951