aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
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-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-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-15One FIXME was already fixedNick Van den Broeck
2019-05-13Merge pull request #2802 from LnL7/fix-needs-hashrewriteEelco Dolstra
build: move needsHashRewrite initialization to startBuilder
2019-05-12runProgram: Uncomment chdir supportGraham Christensen
2019-05-12build: make needsHashRewrite a methodDaiderd Jordan
2019-05-12handleDiffHook: stop passing allowVforkGraham 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: 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-09Fixed issue #47Nick Van den Broeck
Content hashes
2019-05-08Fix assertion failure in FlakeRef::to_string()Eelco Dolstra
Fixes $ nix build nix: src/libexpr/primops/flakeref.cc:169: std::__cxx11::string nix::FlakeRef::to_string() const: Assertion `!rev' failed. Aborted e.g. when flake.nix doesn't exist. Also use gitRev().
2019-05-08Add newline at end of lockfileEelco Dolstra
Suggested by @grahamc.
2019-05-08nix dev-shell: Keep $TERMEelco Dolstra
2019-05-08Merge remote-tracking branch 'origin/master' into flakesEelco Dolstra
2019-05-08nix-shell: Don't absolutize '-p' expressionsEelco Dolstra
This prevents spurious syscalls like 25011 lstat("/home/eelco/with import <nixpkgs> { }; (pkgs.runCommandCC or pkgs.runCommand) \"shell\" { buildInputs = [ (hello) ]; } \"\"", 0x7ffe9c67f580) = -1 ENOENT (No such file or directory)
2019-05-08nix-shell: Don't fail if run from a path containing the string "nix-shell"Eelco Dolstra
2019-05-08Merge remote-tracking branch 'tweag/flake-test' into flakesEelco Dolstra
2019-05-08Merge remote-tracking branch 'tweag/nix-shell' into flakesEelco Dolstra
2019-05-08Export missing rev/shortRev attributesEelco Dolstra
2019-05-08updateLockFile: Do "git add" in a slightly nicer wayEelco Dolstra
"--intent-to-add" ensures the change shows up in "git diff".
2019-05-08Merge branch 'repl/ctrlc' of https://github.com/xbreak/nixEelco Dolstra
2019-05-08Merge pull request #2790 from samueldr/fix/minor-comment-NIX_ROOT_FINDEREelco Dolstra
findRootsNoTemp: fixes comment about findRuntimeRoots
2019-05-07Fix immutable flakeref constructionEelco Dolstra
We were appending ref/revs incorrectly for the IsGit case (by appending /<ref>/<rev> rather than ?ref=<ref>&rev=<rev).
2019-05-07Improve FlakeRef::to_string()Eelco Dolstra
We were incorrectly using path syntax (i.e. /<ref>/<rev>) for Git repositories. This is only valid for GitHub flakerefs.
2019-05-07Make the URL/path of the global flake registry configurableEelco Dolstra
2019-05-07Fixed Flake data type and flake fetchingNick Van den Broeck
2019-05-03Add builtins.hashFileDaniel Schaefer
For text files it is possible to do it like so: `builtins.hashString "sha256" (builtins.readFile /tmp/a)` but that doesn't work for binary files. With builtins.hashFile any kind of file can be conveniently hashed.
2019-05-03Fix 'git add' when subdir is emptyEelco Dolstra
2019-05-03Merge remote-tracking branch 'tweag/subdir' into flakesEelco Dolstra
2019-05-03Fix "Bad system call" running i686-linux binaries on x86_64-linuxEelco Dolstra
To determine which seccomp filters to install, we were incorrectly using settings.thisSystem, which doesn't denote the actual system when --system is used. Fixes #2791.
2019-05-02nix dev-shell: Less purityEelco Dolstra
2019-05-02Move createTempFile to libutilEelco Dolstra
2019-05-02nix dev-shell: Execute shellHookEelco Dolstra
2019-05-02nix dev-shell: Use 'provides.devShell' by defaultEelco Dolstra
Thus $ nix dev-shell will now build the 'provides.devShell' attribute from the flake in the current directory. If it doesn't exist, it falls back to 'provides.defaultPackage'.
2019-05-02Add function for quoting stringsEelco Dolstra
2019-05-02Add 'nix dev-shell' and 'nix print-dev-env' commandEelco Dolstra
'nix dev-shell' is intended to replace nix-shell. It supports flakes, e.g. $ nix dev-shell nixpkgs:hello starts a bash shell providing an environment for building 'hello'. Like Lorri (and unlike nix-shell), it computes the build environment by building a modified top-level derivation that writes the environment after running $stdenv/setup to $out and exits. This provides some caching, so it's faster than nix-shell in some cases (especially for packages with lots of dependencies, where the setup script takes a long time). There also is a command 'nix print-dev-env' that prints out shell code for setting up the build environment in an existing shell, e.g. $ . <(nix print-dev-env nixpkgs:hello) https://github.com/tweag/nix/issues/21
2019-05-02Fixed compile errorsNick Van den Broeck
2019-05-01Allow 'dir' parameter in github: URIsEelco Dolstra
E.g. 'github:edolstra/dwarffs/flake?dir=foo/bar'.