aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-14Merge pull request #1870 from shlevy/split-versionEelco Dolstra
Add splitVersion primop.
2018-02-14Add splitVersion primop.Shea Levy
Fixes #1868.
2018-02-13Fix plugin tests on darwinShea Levy
2018-02-13Merge pull request #1863 from shlevy/conf-includesEelco Dolstra
Allow includes from nix.conf
2018-02-13Merge pull request #1862 from shlevy/plugin-dirsEelco Dolstra
Enable specifying directories in plugin-files.
2018-02-13Enable specifying directories in plugin-files.Shea Levy
2018-02-13Allow includes from nix.confShea Levy
2018-02-13Merge pull request #1775 from LnL7/darwin-build-usersEelco Dolstra
installer: create 'enough' build users
2018-02-13Merge branch 'register-constant' of https://github.com/shlevy/nixEelco Dolstra
2018-02-13Merge branch 'plugins' of https://github.com/shlevy/nixEelco Dolstra
2018-02-13Merge pull request #1859 from FRidh/flattenEelco Dolstra
Nix stats: flatten statistics
2018-02-12Fix hang in build-remoteEelco Dolstra
2018-02-12Fix 'deadlock: trying to re-acquire self-held lock'Eelco Dolstra
This was caused by derivations with 'allowSubstitutes = false'. Such derivations will be built locally. However, if there is another SubstitionGoal that has the output of the first derivation in its closure, then the path will be simultaneously built and substituted. There was a check to catch this situation (via pathIsLockedByMe()), but it no longer worked reliably because substitutions are now done in another thread. (Thus the comment 'It can't happen between here and the lockPaths() call below because we're not allowing multi-threading' was no longer valid.) The fix is to handle the path already being locked in both SubstitutionGoal and DerivationGoal.
2018-02-12toBuildables -> buildEelco Dolstra
2018-02-11Nix stats: flatten statisticsFrederik Rietdijk
Flattens the list of statistics as suggested in https://github.com/NixOS/ofborg/issues/67. This makes it easier to work with.
2018-02-09nix: Ensure that the user sees errors from substitutersEelco Dolstra
2018-02-09getDefaultSubstituters(): Skip broken substitutersEelco Dolstra
Fixes #1340.
2018-02-09Merge pull request #1848 from AmineChikhaoui/parallel-xzEelco Dolstra
support multi threaded xz encoder
2018-02-08Allow using RegisterPrimop to define constants.Shea Levy
This enables plugins to add new constants, as well as new primops.
2018-02-08Add plugins to make Nix more extensible.Shea Levy
All plugins in plugin-files will be dlopened, allowing them to statically construct instances of the various Register* types Nix supports.
2018-02-08nix-env: Fix parsing of --systemEelco Dolstra
https://hydra.nixos.org/build/68827814
2018-02-08dsa -> ed25519Eelco Dolstra
DSS is disabled by default in NixOS 18.03. https://hydra.nixos.org/build/68788560
2018-02-08Merge branch 'master' of https://github.com/NixOS/nix into parallel-xzAmineChikhaoui
2018-02-07More completely fix recursive nix, unbreak testsWill Dietz
See: https://github.com/NixOS/nix/commit/88b5d0c8e89afefbc547b6243c5aa5a3ec8176e9#commitcomment-27406365
2018-02-07Merge branch 'master' of https://github.com/NixOS/nix into parallel-xzAmineChikhaoui
2018-02-07move the parallel-compression setting to binary-cache-store, the settingAmineChikhaoui
can be done now from the url e.g s3://nix-cache?parallel-compression=1 instead of nix.conf.
2018-02-07Prevent accidental recursive NixEelco Dolstra
2018-02-07make multi threaded compression configurable and use single threadedAmineChikhaoui
by default.
2018-02-07Merge branch 'master' of https://github.com/NixOS/nix into parallel-xzAmineChikhaoui
2018-02-07builtins.path test: Don't rely on shlevy's XDG_RUNTIME_DIRShea Levy
2018-02-07Improve filtering of ANSI escape sequences in build logsEelco Dolstra
All ANSI sequences except color setting are now filtered out. In particular, terminal resets (such as from NixOS VM tests) are filtered out. Also, fix the completely broken tab character handling.
2018-02-07SimplifyEelco Dolstra
2018-02-07Merge branch 'fix-aarch64-test' of https://github.com/grahamc/nixEelco Dolstra
2018-02-07Merge pull request #1816 from shlevy/add-pathEelco Dolstra
Add path primop.
2018-02-07set block size to 0 to let the lzma lib choose the right one, addAmineChikhaoui
some comments about possible improvements wrt memory usage/threading.
2018-02-06Add path primop.Shea Levy
builtins.path allows specifying the name of a path (which makes paths with store-illegal names now addable), allows adding paths with flat instead of recursive hashes, allows specifying a filter (so is a generalization of filterSource), and allows specifying an expected hash (enabling safe path adding in pure mode).
2018-02-06support multi threaded xz encoder, this might be particularly useful inAmineChikhaoui
the case of hydra where the overhead of single threaded encoding is more noticeable e.g most of the time spent in "Sending inputs"/"Receiving outputs" is due to compression while the actual upload to the binary cache seems to be negligible.
2018-02-06Update the progress bar at most 20 times per secondEelco Dolstra
Fixes #1834.
2018-02-06Merge branch 'fix/busybox-sandbox-shell-attribute' of ↵Shea Levy
git://github.com/dtzWill/nix
2018-02-06realiseContext(): Add derivation outputs to the allowed pathsEelco Dolstra
This makes import-from-derivation work in restricted mode again.
2018-02-06checkURI(): Check file URIs against allowedPathsEelco Dolstra
This makes e.g. 'fetchGit ./.' work (assuming that ./. is an allowed path).
2018-02-05Fix evaluationEelco Dolstra
2018-02-05release-common: use shell from nixpkgs, provide fallback for compatWill Dietz
2018-02-05Tweak progress bar messageEelco Dolstra
Say "copying" instead of "fetching" when copying from another local store. Nice for nixos-install.
2018-02-05Allow substituters to be marked as trustedEelco Dolstra
This is needed by nixos-install, which uses the Nix store on the installation CD as a substituter. We don't want to disable signature checking entirely because substitutes from cache.nixos.org should still be checked. So now we can pas "local?trusted=1" to mark only the Nix store in /nix as not requiring signatures. Fixes #1819.
2018-02-05Fix segfault using non-binary cache stores as substitutersEelco Dolstra
2018-02-03Remove nix-build --hashEelco Dolstra
Instead, if a fixed-output derivation produces has an incorrect output hash, we now unconditionally move the outputs to the path corresponding with the actual hash and register it as valid. Thus, after correcting the hash in the Nix expression (e.g. in a fetchurl call), the fixed-output derivation doesn't have to be built again. It would still be good to have a command for reporting the actual hash of a fixed-output derivation (instead of throwing an error), but "nix-build --hash" didn't do that.
2018-02-01Merge branch 'master' of git://github.com/catern/nixShea Levy
2018-02-01nix-build: Ignore --indirectEelco Dolstra
Note that nix-build always creates indirect roots. Fixes #1830.
2018-02-01Remove docs on removed --drv-link and --add-drv-link optionsEelco Dolstra