aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-21Remove std::vector aliasEelco Dolstra
2022-02-21Remove std::set aliasEelco Dolstra
2022-02-21Remove std::list aliasEelco Dolstra
2022-02-21Merge pull request #6052 from ↵Eelco Dolstra
hercules-ci/issue-3294-fix-interruptCallback-deadlock Fix deadlocked nix-daemon zombies on darwin #3294
2022-02-21triggerInterrupt: Refactor to use breakRobert Hensing
2022-02-21Merge pull request #6120 from mayflower/print-full-namesEelco Dolstra
path-info: use full store paths when we have them
2022-02-19path-info: use full store paths when we have themLinus Heckemann
Fixes #5645
2022-02-18Integrate push-docker.sh into the release scriptEelco Dolstra
This also makes sure that we get the Docker images from the same Hydra eval, rather than the latest build from job/nix/.../dockerImage, which may not be the same.
2022-02-18Merge remote-tracking branch 'origin/script-to-make-docker-release'Eelco Dolstra
2022-02-18Merge pull request #6114 from Radvendii/welcomeTextEelco Dolstra
add release notes for welcomeText
2022-02-18remove the manifest before creating themRok Garbas
2022-02-18Merge remote-tracking branch 'origin/master' into script-to-make-docker-releaseRok Garbas
2022-02-17add release notes for welcomeTextTaeer Bar-Yam
2022-02-17Merge pull request #6103 from Radvendii/welcomeTextEelco Dolstra
add descriptive output when creating templates
2022-02-17make flake template welcomeText markdownTaeer Bar-Yam
2022-02-17Merge pull request #6110 from layus/patch-2Eelco Dolstra
Create daemon-socket folder during install
2022-02-17Create to daemon-socket folder during installGuillaume Maudoux
2022-02-16InputScheme::fetch(): Return a StorePath instead of a TreeEelco Dolstra
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-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.