19558 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eelco Dolstra	584ddd1b4d	UnionSourceAccessor: Don't filter out underlying files of the wrong type ... https://github.com/NixOS/nix/pull/12512#discussion_r1961567140	2025-02-19 13:34:42 +01:00
Eelco Dolstra	99e78c37f7	Use UnionSourceAccessor to mount the chroot store on top of the real store directory	2025-02-19 12:54:09 +01:00
Eelco Dolstra	5b7c240ebd	Add a UnionSourceAccessor	2025-02-19 12:54:09 +01:00
Eelco Dolstra	c3d8799f9f	MountedSourceAccessor: Remove redundant pathExists() method	2025-02-19 12:47:28 +01:00
Eelco Dolstra	641733fd26	Add test	2025-02-19 12:47:28 +01:00
Eelco Dolstra	774b924398	Add a storeFS accessor for paths resulting from IFD ... Hopefully fixes #11503.	2025-02-19 12:47:28 +01:00
Eelco Dolstra	e5e0ce2334	Remove redundant call to canonPath() ... The CanonPath constructor already does that.	2025-02-19 12:47:28 +01:00
Eelco Dolstra	e5fdb4b164	Merge pull request #12524 from NixOS/remove-nixfmt-override ... Remove nixfmt override	2025-02-19 12:45:12 +01:00
Eelco Dolstra	2b3fed4622	Merge pull request #12525 from DeterminateSystems/move-mounted-source-accessor ... MountedSourceAccessor: Move to libutil	2025-02-19 11:11:55 +01:00
Eelco Dolstra	d7f2c1b7f4	Remove mounted-source-accessor.hh	2025-02-19 10:44:46 +01:00
Eelco Dolstra	0da81343d7	Move MountedSourceAccessor to libutil	2025-02-19 10:44:42 +01:00
Robert Hensing	573ffac2e6	Remove nixfmt override ... Closes https://github.com/NixOS/nix/issues/12418 IFD in nixfmt repo	2025-02-19 10:29:58 +01:00
Robert Hensing	f201446983	Merge pull request #12518 from roberth/libgit2-use-ssh-exec ... packaging: Restore libgit2 USE_SSH=exec	2025-02-19 09:53:41 +01:00
Robert Hensing	5488e29d2f	packaging: Restore libgit2 USE_SSH=exec ... ... when nixpkgs is nixos-unstable or the overlay is used.	2025-02-19 09:38:05 +01:00
Robert Hensing	e672243bed	Merge pull request #12503 from roberth/overriding ... Overriding the componentized build	2025-02-19 00:42:34 +01:00
Robert Hensing	f0bdb65216	packaging: Remove dead code ... ... from nixpkgs, my bad.	2025-02-19 00:10:05 +01:00
John Ericson	5aeaa25309	Merge pull request #12513 from tweag/ccacheStdenv-typo ... doc: Fix `ccacheStdenvPackages` typo	2025-02-18 17:44:42 -05:00
Silvan Mosberger	c19914f1ab	doc: Fix ccacheStdenvPackages typo	2025-02-18 23:23:10 +01:00
Ivan Trubach	eb73bfcf73	libstore: fix expected bytes in progress bar	2025-02-18 22:09:05 +03:00
Robert Hensing	d47e3c9576	packaging: Make patch count lazier ... This makes `nix.version` quicker to evaluate, which should speed up package listing operations. If you want an accurate count, use `lib.optionals` in your override instead of `null` values.	2025-02-18 19:06:36 +01:00
Robert Hensing	0dbe28ad9d	packaging: Add patch count to version	2025-02-18 19:04:53 +01:00
Robert Hensing	03efba30da	test: Ignore packaging-overriding check on darwin for now	2025-02-18 19:04:03 +01:00
Robert Hensing	48fb6fdde9	packaging: Add source overriding "methods"	2025-02-18 19:03:29 +01:00
Robert Hensing	f31d86284f	packaging: Add overrideAllMesonComponents	2025-02-18 18:57:02 +01:00
Robert Hensing	cca01407a7	packaging: Move layers from dependencies to components ... This makes it easier to implement batch overriding for the components.	2025-02-18 18:57:02 +01:00
John Ericson	5facd492ad	Merge pull request #12499 from DeterminateSystems/detect-daemon-crash ... startDaemon(): Detect if the daemon crashes before creating the socket	2025-02-18 11:38:16 -05:00
John Ericson	da5109835b	Merge pull request #12498 from NixOS/fix-cli-fine-version ... Restore detailed Nix CLI version	2025-02-18 11:34:07 -05:00
John Ericson	dfb5b2c7cb	Merge pull request #12497 from xokdvium/fix/dont-override-default-man-search-paths ... Don't override default man search paths	2025-02-18 11:31:01 -05:00
Eelco Dolstra	cca4e8c8c7	Merge pull request #12504 from NaN-git/fix-repl ... repl: suppress progress bar in printValue()	2025-02-18 17:10:56 +01:00
Philipp Otterbein	dc359f8b7b	repl: suppress progress bar in printValue()	2025-02-18 16:52:48 +01:00
Sergei Zimmerman	95f16a3275	Don't override default man search paths ... By appending a colon to MANPATH NIX_MAN_DIR gets prepended to the final MANPATH before default search paths. This makes man still consider default search paths, but prefers NIX_MAN_DIR (if it exists). It still makes sense to point NIX_MAN_DIR to a correct location by moving man pages build from nix-manual.man to nix-cli.man, but this should fix most common use-cases where nix is installed globally.	2025-02-18 18:46:52 +03:00
Robert Hensing	2b5365bcf7	tests: Fix installTests	2025-02-18 15:55:19 +01:00
Eelco Dolstra	9b57f9be5e	Remove createDefaultLogger()	2025-02-18 15:19:57 +01:00
Eelco Dolstra	227114d127	Remove startProgressBar()	2025-02-18 15:18:16 +01:00
Eelco Dolstra	1aee6cf974	stopProgressBar() -> logger->stop()	2025-02-18 15:08:32 +01:00
Eelco Dolstra	258b5ef80b	Merge pull request #6962 from edolstra/unique-ptr-logger ... Make 'logger' a std::unique_ptr	2025-02-18 14:54:44 +01:00
Eelco Dolstra	b576e6254a	Fix crash on macOS	2025-02-18 05:12:31 -08:00
Eelco Dolstra	2018413e3e	Make 'logger' a std::unique_ptr ... This prevents it from being leaked (see bb411e4ae1 for an example of this).	2025-02-18 05:12:31 -08:00
Eelco Dolstra	11c42cb2e1	startDaemon(): Detect if the daemon crashes before creating the socket ... This avoids timeouts like those seen in 3735812034.	2025-02-18 11:57:45 +01:00
Robert Hensing	3556f6bf4c	Write just ./.version on all components ... This way it's easier to get right. See previous commit.	2025-02-18 11:41:35 +01:00
Robert Hensing	bba4e6b061	Restore detailed Nix CLI version ... ... as intended. Requirements: - don't build fresh libraries for each git commit - have git commit in the CLI Bug: - echo ${version} went into the wrong file => use the fact that it's a symlink, not just for reading but also for writing.	2025-02-18 11:22:00 +01:00
mergify[bot]	9427c028ec	Merge pull request #12495 from nix-windows/windows-fixes ... windows: fix compilation after recent changes	2025-02-18 04:34:28 +00:00
Brian McKenna	e0617d2545	windows: fix compilation after recent changes ... Specifically last few week's merges involving legacy SSH options and dynamic derivations.	2025-02-18 14:42:24 +11:00
John Ericson	f55eb06d76	Merge pull request #12492 from xokdvium/refactor/move-show-man-page-to-nix-cli ... Move code related to NIX_MAN_DIR from libstore to nix-cli	2025-02-17 22:39:46 -05:00
Sergei Zimmerman	b1a38b3efe	Move code related to NIX_MAN_DIR from libstore to nix-cli ... This is a prerequisite to properly fixing man-pages once and for all [1]. Note that this patch leaves manpages for legacy commands in a borked state, pending the movement of manpages from nix-manual to nix-cli [2]. [1]: https://www.github.com/NixOS/nix/issues/12382 [2]: https://www.github.com/NixOS/nix/issues/12382#issuecomment-2663782043	2025-02-18 01:57:33 +03:00
Eelco Dolstra	1f688d62d7	Merge pull request #12490 from NixOS/warnings-2025-02-17 ... Fix a few warnings	2025-02-17 19:53:15 +01:00
John Ericson	c003f3a4b4	Merge pull request #12292 from obsidiansystems/derivation-options ... Introduce `DerivationOptions`	2025-02-17 13:37:26 -05:00
Robert Hensing	c5fcb1bd50	Fix a few warnings	2025-02-17 19:29:01 +01:00
Eelco Dolstra	db7577a660	Merge pull request #12483 from DeterminateSystems/json-logger ... JSONLogger: Log to a file descriptor instead of another Logger	2025-02-17 18:48:46 +01:00
Eelco Dolstra	c0c14698a3	Use getStandardError()	2025-02-17 18:09:59 +01:00