wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 13:41:15 +02:00
Code Activity
19668 commits 245 branches 205 tags 160 MiB
Commit graph

11813 commits

Author SHA1 Message Date
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
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
John Ericson
2ea8d3580c
Merge pull request #12481 from DeterminateSystems/search-path-spam 
resolveLookupPathPath(): Fix caching of negative lookups
 2025-02-17 12:02:48 -05:00
Eelco Dolstra
bc66a9bbcf JSONLogger: Log to a file descriptor instead of another Logger 
Logging to another Logger was kind of nonsensical - it was really just
an easy way to get it to write its output to stderr, but that only
works if the underlying logger writes to stderr.

This change is needed to make it easy to log JSON output somewhere
else (like a file or socket).
 2025-02-17 17:02:15 +01:00
Eelco Dolstra
df08e1e204 resolveLookupPathPath(): Fix caching of negative lookups 
This avoids spamming in case the missing search path entry does not
exist (#12480).
 2025-02-17 11:50:54 +01:00
Eelco Dolstra
8ac49ea5de getDefaultNixPath(): Don't add symlinks if the target doesn't exist 2025-02-17 11:36:47 +01:00
John Ericson
94a7c34b2f Allow setting ssh:// pipe size 
Exposed for Hydra. We could make it fancier but with (a) new store
settings (b) switch to `ssh-ng://` both in the works, it doesn't seem
worth it.
 2025-02-16 20:02:56 -05:00
John Ericson
0d25cc6541 Add SSHMaster::Connection::trySetBufferSize 
It is unused in Nix currently, but will be used in Hydra. This reflects
what Hydra does in https://github.com/NixOS/hydra/pull/1387.

We may probably to use it more widely for better SSH store performance,
but this needs to be subject to more testing before we do that.
 2025-02-16 19:45:02 -05:00
John Ericson
917b8b2f77 Introduce DerivationOptions 
This is a first step towards PR #10760, and the issues it addresses.
See the Doxygen for details.

Thanks to these changes, we are able to drastically restrict how the
rest of the code-base uses `ParseDerivation`.

Co-Authored-By: HaeNoe <git@haenoe.party>
 2025-02-16 18:52:44 -05:00
Robert Hensing
07f853b295
Merge pull request #9415 from NixOS/fix-dynamic-derivations 
Revert "Revert "Adapt scheduler to work with dynamic derivations
 2025-02-16 23:59:39 +01:00
John Ericson
8b911271f1
Merge pull request #10748 from NixOS/legacy-ssh-extensions-for-hydra 
Expose a bunch of things in the Legacy SSH Store for Hydra
 2025-02-16 17:37:50 -05:00
Robert Hensing
1068b9657f
Merge pull request #12400 from aidenfoxivey/add-rosetta-2-info-msg 
Add Rosetta 2 Info Message
 2025-02-15 17:47:04 +01:00
Robert Hensing
2d36679663
Merge pull request #12468 from kip93/self-input-attrs-lfs 
Add `inputs.self.lfs` flake attribute
 2025-02-15 17:30:57 +01:00
John Ericson
5eade48252 Expose a bunch of things in the Legacy SSH Store for Hydra 2025-02-14 17:04:57 -05:00
Someone
6985598153
doc: recursive-nix: advertise requiredSystemFeatures 
It's best we teach users that the "foo" derivation is less than pure in the sense that it cannot be built just on any system, in particular that builders cannot be selected arbitrarily but based on their system-features. The `"recursive-nix"` system-feature is automatically defined by `--extra-experimental-features recursive-nix`
 2025-02-14 09:50:18 +00:00
Thomas Bereknyei
3b5514e0c6 fix: linting 2025-02-13 13:04:38 -05:00
Thomas Bereknyei
753f00c351 fix: add comment about longest-possible match 2025-02-13 12:47:09 -05:00
Thomas Bereknyei
269efa01b3 fix: ensure access-token matches are complete 2025-02-13 12:45:37 -05:00
Leandro Reina
b2d352e6a3 Add inputs.self.lfs 2025-02-13 17:59:27 +01:00
Robert Hensing
693a38ae2e
Merge pull request #10153 from b-camacho/lfs 
git-lfs support
 2025-02-13 14:25:30 +01:00
Thomas Bereknyei
a9f4d73d3e feat: test and document access-token prefix support 2025-02-13 07:10:51 -05:00
Thomas Bereknyei
69c7b42d28 feat: access tokens per repo 2025-02-13 06:07:43 -05:00
Robert Hensing
eb91014928
Merge pull request #12443 from DeterminateSystems/prefetch-out-link 
nix flake prefetch: Add --out-link option
 2025-02-12 22:22:04 +01:00
Eelco Dolstra
a902b84374 Formatting 2025-02-12 21:51:41 +01:00
John Ericson
0abc264f7d
Merge pull request #6346 from Ericson2314/impure-derivations-ng 
Get rid of `impureOutputHash`; fix possible bug
 2025-02-12 15:22:31 -05:00
Eelco Dolstra
5c552b62fc lockFlake(): When refetching a locked flake, use the locked ref 
Otherwise we may accidentally update a lock when we shouldn't.

Fixes #12445.
 2025-02-12 14:53:04 +01:00
Eelco Dolstra
ca7e686f4d
Merge pull request #12439 from MaxHearnden/cloexec 
Set FD_CLOEXEC on sockets created by curl
 2025-02-12 12:49:55 +01:00
John Ericson
50912d02e2 Get rid of impureOutputHash 
I do not believe there is any problem with computing
`hashDerivationModulo` the normal way with impure derivations.

Conversely, the way this used to work is very suspicious because two
almost-equal derivations that only differ in depending on different
impure derivations could have the same drv hash modulo. That is very
suspicious because there is no reason to think those two different
impure derivations will end up producing the same content-addressed
data!

Co-authored-by: Alain Zscheile <zseri.devel@ytrizja.de>
 2025-02-12 01:35:07 -05:00
Jörg Thalheim
23259bde1a
Merge pull request #12255 from NaN-git/fix-7359 
SinkToSource: avoid heap allocation
 2025-02-12 13:00:36 +07:00
Eelco Dolstra
26b87e78b5 copyPathToStore(): Preserve symlinks 
E.g. in a derivation attribute `foo = ./bar`, if ./bar is a symlink,
we should copy the symlink to the store, not its target. This restores
the behaviour of Nix <= 2.19.
 2025-02-11 20:58:48 +01:00
Sandro Jäckel
dcbf4dcc09
Only try to chmod /nix/var/nix/profiles/per-user when necessary 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2025-02-11 18:21:50 +01:00
Eelco Dolstra
254b7afe66 nix flake prefetch: Add --out-link option 
This makes `nix flake prefetch` more useful for scripting and prevents
the result from being GC'ed prematurely.
 2025-02-10 17:52:26 +01:00
Aiden Fox Ivey
55c1e4454e
Update src/libstore/unix/build/local-derivation-goal.cc 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2025-02-10 11:37:37 -05:00
Eelco Dolstra
528b286cf7 Remove stray line 2025-02-10 17:14:55 +01:00
Eelco Dolstra
4b75edacd7 Restore NAR hash assertion 2025-02-10 17:13:17 +01:00
Eelco Dolstra
b813a764e0 Merge remote-tracking branch 'origin/master' into self-input-attrs 2025-02-10 17:01:19 +01:00
John Ericson
1f485b6c5e
Merge pull request #12430 from DeterminateSystems/relative-path-literals 
Parser: Respect the accessor of the source file for relative paths
 2025-02-10 10:28:44 -05:00
Eelco Dolstra
428a3e8cc8 Add TODO 2025-02-10 16:18:57 +01:00
Eelco Dolstra
d4ecf15dad smudgeLfs: Use default value 
Eventually this should probably become a struct of options.
 2025-02-10 16:11:53 +01:00
Eelco Dolstra
d78daaa416 getLfsEndpointUrl(): Use our RAII helpers 2025-02-10 15:59:32 +01:00
Eelco Dolstra
c210efa9ae Move git-lfs-fetch into its own source file 2025-02-10 15:55:25 +01:00
Eelco Dolstra
9db070d7a2 Misc code cleanups 2025-02-10 15:46:46 +01:00
Eelco Dolstra
c10dbdccac libfetchers: Drop no longer needed curl dependency 2025-02-10 15:19:28 +01:00