Illia Bobyr
23f07fa974
nix-profile.fish: Look for ca-bundle.crt in $NIX_PROFILES
...
There seems to be no good reason for `nix-profile.fish` and
`nix-profile-daemon.fish` to differ in how they look for the location of
the `ca-bundle.crt` that might be installed by one of the packages.
As `$NIX_PROFILES` points to user local paths, not checking there is
strictly less useful, it seems?
2025-02-05 01:42:21 -08:00
Eelco Dolstra
d2425c5d6a
Merge pull request #12422 from ilya-bobyr/fish-profile-use-set-local
...
nix-profile.fish: set --local NIX_LINK
2025-02-05 09:38:51 +01:00
Illia Bobyr
50300772e4
nix-profile.fish: set --local NIX_LINK
...
Using `set --local` is better than using `set`/`set --erase`. `--local`
will preserve any existing `NIX_LINK` value. And the local variable is
automatically removed for any execution path.
2025-02-04 16:01:29 -08:00
Eelco Dolstra
3e8cd2ffe6
Merge pull request #12412 from obsidiansystems/simplify-state-machine-2
...
Simplify state machine 2
2025-02-04 21:24:42 +01:00
Eelco Dolstra
02e6286e8f
Merge pull request #12414 from ilya-bobyr/fish-profile-daemon-XDG_DATA_DIRS
...
nix-profile-daemon.fish: XDG_DATA_DIRS: .profile/share
2025-02-04 13:38:43 +01:00
Eelco Dolstra
5c6785e0c1
Merge pull request #12392 from obsidiansystems/simplify-state-machine
...
Simplify state machine
2025-02-04 12:08:35 +01:00
Illia Bobyr
85aa624126
nix-profile-daemon.fish: XDG_DATA_DIRS: .profile/share
...
It seems reasonable to add the `share` folder from the user profile into
`$XDG_DATA_DIRS` both for daemon and profile execution. Nix could add
package shared files into this folder regardless of how the nix daemon
itself is running.
2025-02-03 16:24:14 -08:00
John Ericson
b3b741973e
Inline inputsRealised
2025-02-03 13:15:49 -05:00
John Ericson
4b1753e661
Move repairClosure
...
This is necessary in order to inline `inputsRealised` in the next
commit by combing it with its adjacent function (i.e. with a small
diff).
2025-02-03 13:14:13 -05:00
John Ericson
2297cc0dab
Inline getDerivation and loadDerivation
2025-02-03 13:13:04 -05:00
John Ericson
57463ab910
Inline closureRepaired
2025-02-03 13:13:04 -05:00
John Ericson
41274f3c3e
Inline outputsSubstitutionTried
2025-02-03 13:13:04 -05:00
John Ericson
53946fe017
Narrow scope on some local variables
2025-02-03 13:13:04 -05:00
John Ericson
c73096ba5f
Merge pull request #12408 from obsidiansystems/debugging-instructions
...
More debugging documentation
2025-02-03 12:57:42 -05:00
John Ericson
243467e14b
More debugging documentation
...
There are a few things I think people should know, post-Meson.
2025-02-03 10:08:13 -05:00
Eelco Dolstra
cba27bae6d
Merge pull request #12405 from ilya-bobyr/fish-profile-fix-ssl-cert-typo
...
nix-profile.fish: Typo NIX_SS{H => L}_CERT_FILE
2025-02-03 13:35:23 +01:00
Illia Bobyr
803fb83f7f
nix-profile.fish: Typo NIX_SS{H => L}_CERT_FILE
2025-02-02 22:51:47 -08:00
mergify[bot]
63c0ea5702
Merge pull request #12252 from ilya-bobyr/fish-profile-source-once-and-fmt
...
nix-profile{,-daemon}.fish: Do not source twice, fmt
2025-02-02 03:11:23 +00:00
mergify[bot]
24d11d22c3
Merge pull request #12286 from stevalkr/flakes_symlink_path
...
Fix flakes follow symlinks
2025-02-02 03:11:20 +00:00
mergify[bot]
340eae1f23
Merge pull request #12385 from DeterminateSystems/fix-git-workdir-path-display
...
Fix duplicate setPathDisplay()
2025-02-02 02:10:38 +00:00
mergify[bot]
b842103307
Merge pull request #12376 from DeterminateSystems/fetch-using-nar-hash
...
Allow fetching using NAR hash without --allow-dirty-locks
2025-02-02 02:10:35 +00:00
mergify[bot]
d5c00cfab1
Merge pull request #12387 from nix-windows/big-objs
...
Add mbig-obj flag to allow cross-compiling libexpr to mingw32
2025-02-02 01:32:15 +00:00
Steve Walker
453e8dc067
Fix flakes follow symlinks
...
Co-authored-by: Jan Christoph Bischko <jbischko@barracuda.com>
2025-02-02 08:30:04 +07:00
Brian McKenna
f62a287163
Only enable big-obj on Windows
2025-02-01 21:36:50 +11:00
John Ericson
d949c8de7c
Merge pull request #12249 from nix-windows/stack-size
...
Remove broken stack size logic from Windows
2025-01-31 22:57:01 -05:00
Eelco Dolstra
8006196c55
tests/functional/fetchGit.sh: Add a test for NAR hash mismatches
2025-01-31 17:03:27 +01:00
Eelco Dolstra
9e240ecced
Remove isConsideredLocked()
2025-01-31 17:03:27 +01:00
Eelco Dolstra
4113fdf2f0
Allow use of lock files with unlocked entries as long as they have a NAR hash
...
Fixes #12364 .
2025-01-31 17:03:27 +01:00
Eelco Dolstra
5dec1dc086
fetchGit/fetchTree: Allow fetching using only a NAR hash
...
Fixes #12027 .
2025-01-31 17:03:27 +01:00
Eelco Dolstra
a142803c28
tests/functional/fetchGit.sh: Drop unnecessary --impure flags
2025-01-31 17:03:27 +01:00
Eelco Dolstra
39ef2e28cc
Merge pull request #12375 from DeterminateSystems/fetchTree-errors
...
fetchTree: Distinguish between fetchGit and fetchTree consistently in error messages
2025-01-31 15:26:43 +01:00
Eelco Dolstra
5f6658b9c9
fetchTree: Distinguish between fetchGit and fetchTree consistently
2025-01-31 15:10:29 +01:00
Brian McKenna
26539a087f
Add mbig-obj flag to allow cross-compiling libexpr to mingw32
2025-01-31 22:53:42 +11:00
Brian McKenna
7c8c71f8e9
Totally exclude nix::setStackSize on Windows
2025-01-31 21:11:45 +11:00
Eelco Dolstra
3032512425
GitExportIgnoreSourceAccessor: Don't show «unknown»
...
In general we should set the path display prefix on the inner
accessor, so we now pass the display prefix to getAccessor().
2025-01-30 12:41:02 +01:00
Eelco Dolstra
177a067d66
Merge pull request #12372 from roberth/test-characterisation-log-to-stderr
...
tests/functional/characterisation/framework: Log to stderr
2025-01-30 11:34:39 +01:00
Eelco Dolstra
102d90ebf0
Fix duplicate setPathDisplay()
...
Fixes messages like 'copying /tmp/repo/tmp/repo to the store'. The
PosixSourceAccessor already sets the prefix. Setting the prefix twice
shouldn't be a problem, but GitRepoImpl::getAccessor() returns a
wrapped accessor so it's not actually idempotent.
2025-01-30 11:27:24 +01:00
Eelco Dolstra
cfe93299b1
Merge pull request #12378 from DeterminateSystems/fix-shellcheck
...
Fix shellcheck warnings
2025-01-29 15:49:00 +01:00
Eelco Dolstra
fa87ad6a7c
Fix shellcheck warnings
2025-01-29 15:34:49 +01:00
Robert Hensing
a5de2dd274
tests/functional/characterisation/framework: Log to stderr
...
It seems that `meson test --print-errorlogs` only captures stderr,
so this makes it forward the logs as intended.
We might want to redirect stdout in our common setup script instead.
2025-01-28 09:26:33 +01:00
Robert Hensing
fbe2940a08
Merge pull request #12363 from roberth/issue-12161
...
Issue #12161 , add `meta.mainProgram`
2025-01-28 09:15:14 +01:00
Eelco Dolstra
8d744957a6
Merge pull request #12362 from roberth/refactor-realiseString
...
refactor: Extract EvalState::realiseString
2025-01-27 16:49:58 +01:00
Eelco Dolstra
6a2198dfad
Merge pull request #12251 from nix-windows/local-store/fix-infinite-loop
...
local-store: fix infinite loop on Windows
2025-01-27 14:38:57 +01:00
Robert Hensing
850329dea5
packages.nix-cli: Add meta.mainProgram
2025-01-27 14:27:14 +01:00
Robert Hensing
0d7418b4fe
packages.default: Add meta.mainProgram
2025-01-27 14:26:15 +01:00
Robert Hensing
7465fbe926
refactor: Extract EvalState::realiseString
2025-01-27 12:32:46 +01:00
John Ericson
06de255f5c
Merge pull request #12356 from Artturin/illegalpathrefprint
...
Improve "illegal path references in fixed output derivation" error
2025-01-26 14:37:51 -05:00
Ben Millwood
4e5d1b281e
Improve "illegal path references in fixed output derivation" error
...
The main improvement is that the new message gives an example of a path
that is referenced, which should make it easier to track down. While
there, I also clarified the wording, saying exactly why the paths in
question were illegal.
2025-01-25 20:10:43 +02:00
Robert Hensing
85a3071fc9
Merge pull request #12349 from NixOS/nixfmt
...
Apply nixfmt
2025-01-24 20:22:33 +01:00
Robert Hensing
b04077c0ec
fix: Update shifted source positions after formatting
...
Carefully reviewed...
2025-01-24 18:53:42 +01:00
