aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-16addToStoreFromDump(): Take std::string_viewEelco Dolstra
2022-02-16Merge pull request #6104 from rrbutani/masterEelco Dolstra
Fix formatting for options with "machine-specific" defaults
2022-02-15manual: fix formatting for options with "machine-specific" defaultsRahul Butani
2022-02-15add descriptive output when creating templatesTaeer Bar-Yam
this includes a `welcomeText` attribute which can be set in the template, as well as outputing which files were created.
2022-02-14add sourcehut input schemeGabriel Fontes
2022-02-14Merge pull request #6100 from edolstra/installables-cleanupEelco Dolstra
InstallableFlake: Default attr paths cleanup
2022-02-14InstallableFlake: Default attr paths cleanupEelco Dolstra
This removes some duplicated logic, and fixes "nix bundle" parsing its installable twice.
2022-02-14Merge pull request #6092 from Kha/sandbox-wo-usernsEelco Dolstra
Fix using sandbox without user namespaces
2022-02-12Fix using sandbox without user namespacesSebastian Ullrich
2022-02-11Merge pull request #6085 from edolstra/fix-flake-defaultsEelco Dolstra
parseInstallables(): Don't try the flake attr path prefixes when no fragment is specified
2022-02-11Merge pull request #6086 from tomberek/profile_removeEelco Dolstra
profile: add verbosity
2022-02-11profile: add verbosityTom Bereknyei
warn if there are no matches and give notice of removing packages as they are found
2022-02-11parseInstallables(): Don't try the flake attr path prefixes when no fragment ↵Eelco Dolstra
is specified Fixes #5880.
2022-02-11flake.nix: Fix indentEelco Dolstra
2022-02-10check-hydra-status.sh: Ignore unfinished buildsEelco Dolstra
2022-02-10check-hydra-status.sh: Improve error behaviourEelco Dolstra
2022-02-09Merge pull request #6067 from trofi/revert-6060-prefer-inplace-libsEelco Dolstra
Revert "mk: prefert inplace library paths to system ones (take 2)"
2022-02-09Revert "mk: prefert inplace library paths to system ones (take 2)"Sergei Trofimovich
2022-02-08Merge pull request #6060 from trofi/prefer-inplace-libsEelco Dolstra
mk: prefert inplace library paths to system ones (take 2)
2022-02-07mk: prefert inplace library paths to system ones (take 2)Sergei Trofimovich
It's a second attempt to merge the change. Previous attempt was reverted in b976b34a5b05ba303904cc7b8e0a2579bdb52807. Since then underlying failure exposed by original change was fixed by https://github.com/NixOS/nix/pull/5354. Below goes description of original change: The link failure happens on a system with stable nix-2.3.15 installed in /usr/lib64 (it's libutil.so API differs from master): ``` LANG=C make V=1 g++ -o /home/slyfox/dev/git/nix/src/libstore/libnixstore.so \ -shared -L/usr/lib64 -Wl,--no-copy-dt-needed-entries \ src/libstore/binary-cache-store.o ... src/libstore/uds-remote-store.o \ -lsqlite3 -lcurl -lsodium -pthread -ldl -lseccomp -Wl,-z,defs -Wl,-soname=libnixstore.so -Wl,-rpath,/home/slyfox/dev/git/nix/src/libutil -Lsrc/libutil -lnixutil ld: src/libstore/binary-cache-store.o: in function `nix::BinaryCacheStore::BinaryCacheStore( std::map<std::__cxx11::basic_string<char, std::char_traits<char>, ... nix/src/libstore/binary-cache-store.cc:30: undefined reference to `nix::readFile( std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)' ... ... ``` This happens due to `-L/usr/lib64 -Lsrc/libutil` search path ordering. The change turns it into `-Lsrc/libutil -L/usr/lib64`. Closes: https://github.com/NixOS/nix/issues/3087
2022-02-07Merge pull request #6054 from lincolnauster/lf-reporterrEelco Dolstra
repl/load-flake: throw error if path isn't specified
2022-02-07Merge pull request #6057 from trofi/fix-daemon-crashesEelco Dolstra
Make sure no exceptions leave ignoreException()
2022-02-07Make sure no exceptions leave ignoreException()Sergei Trofimovich
I noticed that occasional Ctrl-C leaves *.lock files around. `nix-daemon`'s journal logs contained crashes like: nix-daemon[30416]: terminate called after throwing an instance of 'nix::SysError' nix-daemon[30416]: what(): error: writing to file: Broken pipe And core dump backtraces pointed at `teriminate()` call from destructors: ... _Unwind_Resume () nix::ignoreException() () nix::LocalDerivationGoal::~LocalDerivationGoal() ... void ignoreException() { try { throw; } catch (std::exception & e) { printError("error (ignored): %1%", e.what()); } } The crashes happen when client side closes early and printError() throws an IO error. The change wraps `ignoreException()` into blanket `try { ... } catch (...) {}`. Closes: https://github.com/NixOS/nix/issues/6046
2022-02-07fix markuplincoln auster
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2022-02-07Fix 'basic_string::_M_construct null not valid' in interrupted downloadEelco Dolstra
Fixes #5985.
2022-02-06repl/load-flake: throw error if path isn't specifiedlincoln auster [they/them]
2022-02-06Don't hold interruptCallbacks lock during interrupt handlingRobert Hensing
This changes the representation of the interrupt callback list to be safe to use during interrupt handling. Holding a lock while executing arbitrary functions is something to avoid in general, because of the risk of deadlock. Such a deadlock occurs in https://github.com/NixOS/nix/issues/3294 where ~CurlDownloader tries to deregister its interrupt callback. This happens during what seems to be a triggerInterrupt() by the daemon connection's MonitorFdHup thread. This bit I can not confirm based on the stack trace though; it's based on reading the code, so no absolute certainty, but a smoking gun nonetheless.
2022-02-06Merge pull request #6040 from matthewbauer/allow-missing-override-inputEelco Dolstra
Allow missing flake.nix for --override-input target
2022-02-06Merge pull request #6047 from SuperSandro2000/nix-shell-BASHEelco Dolstra
nix-shell: set BASH variable to correct shell
2022-02-06Merge pull request #6042 from pennae/fix-repl-aEelco Dolstra
fix nix repl not overriding existing bindings in :a
2022-02-06Merge pull request #6043 from Ma27/fix-compEelco Dolstra
completions: pipe stderr to /dev/null
2022-02-05nix-shell: set BASH variable to correct shellSandro Jäckel
2022-02-04completions: pipe stderr to /dev/nullMaximilian Bosch
This fixes weird issues where e.g. nix build -L .#<tab> deletes the current line from the prompt.
2022-02-04fix nix repl not overriding existing bindings in :apennae
previously :a would override old bindings of a name with new values if the added set contained names that were already bound. in nix 2.6 this doesn't happen any more, which is potentially confusing. fixes #6041
2022-02-03Allow missing flake.nix for --override-input targetMatthew Bauer
At this point, we don’t know if the input is a flake or not. So, we should allow the user to override the input with a directory without a flake.nix. Ideally, we could figure whether the input was originally a flake or not, but that would require instantiating the whole flake. So just allow it to be missing here, and rely on checks later on to verify the input for us.
2022-02-04Make most calls to determinePos() lazyEelco Dolstra
2022-02-04Merge branch 'issue-3505' of https://github.com/kamadorueda/nixEelco Dolstra
2022-02-03Merge pull request #5456 from tomberek/bundler_drvEelco Dolstra
bundle: pass drv attrset instead of path
2022-02-03Merge branch 'master' into bundler_drvtomberek
2022-02-02Merge pull request #6036 from tweag/balsoft/and-yet-another-follows-bugfixEelco Dolstra
Flake follows: resolve all follows to absolute
2022-02-02Flake follows: resolve all follows to absoluteAlexander Bantyev
It's not possible in general to know in computeLocks, relative to which path the follows was intended to be. So, we always resolve follows to their absolute states when we encounter them (which can either be in parseFlakeInput or computeLocks' fake input population). Fixes https://github.com/NixOS/nix/issues/6013 Fixes https://github.com/NixOS/nix/issues/5609 Fixes https://github.com/NixOS/nix/issues/5697 (again)
2022-02-02Merge branch 'parser-improvements' of https://github.com/pennae/nixEelco Dolstra
2022-02-02Merge branch 'more-stringviews' of https://github.com/pennae/nixEelco Dolstra
2022-02-01Require lowdown 0.9.0Eelco Dolstra
Fixes #6021.
2022-01-31Merge pull request #6022 from thkoch2001/fix-lowdown_libsEelco Dolstra
use LOWDOWN_LIBS variable
2022-01-31Merge pull request #5990 from lincolnauster/flakes-nixconfig-docsEelco Dolstra
flakes: document nixConfig option
2022-01-30use LOWDOWN_LIBS variableThomas Koch
fixes: #5931
2022-01-30Merge pull request #6018 from dtzWill/fix/issue-6017Eelco Dolstra
canonPath: fix missing slash when resolving links
2022-01-30Merge pull request #6019 from thkoch2001/fix_spelling_mistakesEelco Dolstra
fix spelling mistakes reported by Debian's lintian tool
2022-01-30fix spelling mistakes reported by Debian's lintian toolThomas Koch