aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-21doc: clarify that optional attrs in a function argument will be ignored ↵Maximilian Bosch
unless specified In `args@{ a ? 1 }: /* ... */` the value `a` won't be a part of `args` unless it's specified when calling the function, the default value will be ignored in this case. My personal point of view is that this behavior is a matter of taste, at least I was pretty sure that unmatched arguments will be a part of `args@` while debugging some Nix code last week. I decided to add a warning to the docs which hopefully reduces the confusion of further Nix developers who thought the same about `args@`.
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-21Merge pull request #2800 from flokli/progress-bar-hide-unknown-expectedEelco Dolstra
progress-bar: hide expected if expected is 0 (unknown)
2019-05-21Merge pull request #2812 from matthewbauer/fix-nix-scriptsEelco Dolstra
Sync NIX_PROFILES between single-user and multi-user modes
2019-05-17fetchGit -> fetchTarballEelco Dolstra
(cherry picked from commit cbfdea685764bf66443a999e672656c54289b8c9)
2019-05-17Lockfile handling in `resolveFlake` is fixedNick Van den Broeck
2019-05-17docs: describe $IN_NIX_SHELL values (#2796)Vladimír Čunát
See commit 1bffd83e1a9
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-15Don’t set NIX_REMOTE=daemon in daemon profileMatthew Bauer
This is now autodetected. There is no need to put it in the profile.
2019-05-15Sync NIX_PROFILES between single-user and multi-user modesMatthew Bauer
When we are in single user mode, we still want to have access to profiles. This way things in Nixpkgs that rely on them getting set accurately are done in both cases. The point where I hit this is with using aspell which looks in NIX_PROFILES: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/aspell/default.nix Before this patch, NIX_PROFILES was never set in single user mode! This corrects that.
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
2019-05-15Merge pull request #91 from tweag/disable-some-testsEelco Dolstra
Disable tests introduced by PR #82
2019-05-15Disable tests introduced by PR #82Eelco Dolstra
This PR was not intended to be merged until those tests were actually passing. So disable them for now to unbreak the flakes branch. https://hydra.nixos.org/eval/1519271
2019-05-15Merge remote-tracking branch 'tweag/fixmes' into flakesEelco Dolstra
2019-05-15One FIXME was already fixedNick Van den Broeck
2019-05-13Merge pull request #82 from tweag/failing-testNick Van den Broeck
Add a couple of currently failing tests
2019-05-13Merge pull request #2802 from LnL7/fix-needs-hashrewriteEelco Dolstra
build: move needsHashRewrite initialization to startBuilder
2019-05-12Merge pull request #2798 from grahamc/diff-hookEelco Dolstra
build: run diff-hook under --check and document diff-hook
2019-05-12runProgram: Uncomment chdir supportGraham Christensen
2019-05-12build: make needsHashRewrite a methodDaiderd Jordan
2019-05-12handleDiffHook: stop passing allowVforkGraham Christensen
2019-05-12Clarify where output from the diff hook goes.Graham Christensen
2019-05-12runProgram: support gid, uid, chdirGraham Christensen
2019-05-12chdir, setgroupsGraham Christensen
2019-05-12diff hook: execute as the build user, and pass the temp dirGraham Christensen
2019-05-12build: run diff-hook under --check and document diff-hookGraham Christensen
2019-05-12build: add test for sandboxed --checkDaiderd Jordan
2019-05-12build: move needsHashRewrite initialization to startBuilderDaiderd Jordan
The value of useChroot is not set yet in the constructor, resulting in hash rewriting being enabled in certain cases where it should not be. Fixes #2801
2019-05-11progress-bar: hide expected if expected is 0 (unknown)Florian Klink
Sometimes, "expected" can be "0", but in fact means "unknown". This is for example the case when downloading a file while the http server doesn't send the `Content-Length` header, like when running `nix build` pointing to a nixpkgs checkout streamed from GitHub: ⇒ nix build -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz hello [1.8/0.0 MiB DL] downloading 'https://github.com/NixOS/nixpkgs/archive/master.tar.gz' In that case, don't show that weird progress bar, but only the (slowly increasing) downloaded size ("done"). ⇒ nix build -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz hello [1.8 MiB DL] downloading 'https://github.com/NixOS/nixpkgs/archive/master.tar.gz' This commit also updates fmt calls with three numbers (when something is currently 'running' too) - I'm not sure if this can be provoked, but showing "0" as expected doesn't make any sense, as we're obviously doing more than nothing.
2019-05-11nix dev-shell: Ignore SSL_CERT_FILEEelco Dolstra
2019-05-11Hack to fix tests.evalNixpkgsEelco Dolstra
2019-05-09Update flake.lockEelco Dolstra
2019-05-09Merge remote-tracking branch 'tweag/content-hashes' into flakesEelco Dolstra
2019-05-09Fixed issue #47Nick Van den Broeck
Content hashes