nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 23:42:43 +01:00
Code Activity
20960 commits 180 branches 219 tags 174 MiB
Commit graph

20960 commits

This branch
This branch
All branches
Author SHA1 Message Date
github-actions[bot]
8b7b413e8b
Prepare release v3.0.0 2025-03-05 18:44:02 +00:00
Eelco Dolstra
853252b3ae
Merge pull request #3 from DeterminateSystems/grahamc-patch-1 
Fixup propose-release: don't puke if the version number didn't change
 2025-03-05 18:26:15 +00:00
Graham Christensen
07d8bf7a66
Fixup propose-release: don't puke if the version number didn't change 2025-03-05 10:09:06 -08:00
Eelco Dolstra
4e607c9ff3
Merge pull request #2 from DeterminateSystems/sync-with-2.26 
Sync with 2.26
 2025-03-05 17:49:44 +00:00
Eelco Dolstra
25ba7c55d3 Merge remote-tracking branch 'origin/2.26-maintenance' into sync-with-2.26 2025-03-05 18:01:03 +01:00
Sergei Zimmerman
82f337de10 {libutil,libstore}: Factor out chmodIfNeeded 
Using std::filesystem::path directly because we need .c_str()
anyway to interact with chmod. Path/string views don't have to be
null-terminated.
 2025-03-05 02:43:11 +03:00
mergify[bot]
96f0fd3ce0
Merge pull request #12605 from NixOS/mergify/bp/2.27-maintenance/pr-12604 
Fix chopped up repl output (backport #12604)
 2025-03-04 19:33:00 +00:00
Robert Hensing
dc6a936d97 repl: Fix :print corruption 
See preceding commits.

(cherry picked from commit 1e1c587073)
 2025-03-04 19:10:02 +00:00
Robert Hensing
ac3fc8876c refactor: RAII logger suspension 
(cherry picked from commit 30694b5d8a)
 2025-03-04 19:10:01 +00:00
Robert Hensing
375df6c086 repl: Fix value printing corruption 
The resume call would get some non-flushed(?) data.
Extending the pause to include the newline makes the complete flush
part of the pause.

(cherry picked from commit 880489051a)
 2025-03-04 19:10:01 +00:00
Robert Hensing
88e6b7d6b2 progress-bar: Make pause/resume nestable 
(cherry picked from commit 49d8ee5359)
 2025-03-04 19:10:01 +00:00
Robert Hensing
2c1447b7f2
Merge pull request #12604 from NixOS/issue-12599 
Fix chopped up repl output
 2025-03-04 20:09:16 +01:00
Robert Hensing
1e1c587073 repl: Fix :print corruption 
See preceding commits.
 2025-03-04 19:48:22 +01:00
Robert Hensing
30694b5d8a refactor: RAII logger suspension 2025-03-04 19:48:22 +01:00
Robert Hensing
880489051a repl: Fix value printing corruption 
The resume call would get some non-flushed(?) data.
Extending the pause to include the newline makes the complete flush
part of the pause.
 2025-03-04 19:48:22 +01:00
Robert Hensing
49d8ee5359 progress-bar: Make pause/resume nestable 2025-03-04 19:48:22 +01:00
mergify[bot]
181ffe30be
Merge pull request #12602 from NixOS/mergify/bp/2.27-maintenance/pr-12600 
packaging: Typo in setVersionLayer / preConfigure (backport #12600)
 2025-03-04 17:09:29 +00:00
mergify[bot]
42fc03dd1f
Merge pull request #12601 from NixOS/mergify/bp/2.26-maintenance/pr-12600 
packaging: Typo in setVersionLayer / preConfigure (backport #12600)
 2025-03-04 17:08:09 +00:00
Philipp Otterbein
b129fc8237 libstore: curl retry: reset content-encoding and don't use string after move 2025-03-04 18:05:33 +01:00
Robert Hensing
afad1e536e packaging: Typo in setVersionLayer / preConfigure 
Apparently dead code in our use case, but good to keep nonetheless.
Credit: ztzg in https://github.com/NixOS/nix/pull/12498#pullrequestreview-2658031853

(cherry picked from commit dcaea8cb1c)
 2025-03-04 16:46:18 +00:00
Robert Hensing
87bf338612 packaging: Typo in setVersionLayer / preConfigure 
Apparently dead code in our use case, but good to keep nonetheless.
Credit: ztzg in https://github.com/NixOS/nix/pull/12498#pullrequestreview-2658031853

(cherry picked from commit dcaea8cb1c)
 2025-03-04 16:46:15 +00:00
Robert Hensing
a5cf291dde
Merge pull request #12600 from roberth/packaging-typo-preConfigure 
packaging: Typo in setVersionLayer / preConfigure
 2025-03-04 17:44:47 +01:00
Robert Hensing
dcaea8cb1c packaging: Typo in setVersionLayer / preConfigure 
Apparently dead code in our use case, but good to keep nonetheless.
Credit: ztzg in https://github.com/NixOS/nix/pull/12498#pullrequestreview-2658031853
 2025-03-04 17:22:24 +01:00
John Ericson
24463dd025
Merge pull request #11672 from fricklerhandwerk/at-pattern-default 
doc: note that @-pattern is accessible in default values
 2025-03-04 00:57:17 -05:00
Valentin Gagarin
9c3dd34cfe doc: note that function bindings are accessible in default values 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2025-03-04 00:44:46 -05:00
John Ericson
fffb54d8f7
Merge pull request #12594 from NixOS/mergify/bp/2.27-maintenance/pr-12442 
Expand manual on derivation outputs (backport #12442)
 2025-03-03 17:28:32 -05:00
Robert Hensing
8b9d401fe4 manual: Edit 
(cherry picked from commit 1e00d14c29)
 2025-03-03 22:13:09 +00:00
John Ericson
f278a631b0 Expand manual on derivation outputs 
Note, this includes some text adapted from from Eelco's dissertation

(cherry picked from commit 2aa6e0f084)
 2025-03-03 22:13:08 +00:00
Robert Hensing
efbd4c1ebb
Merge pull request #12442 from NixOS/store-derivation-options 
Expand manual on derivation outputs
 2025-03-03 23:11:51 +01:00
Robert Hensing
1e00d14c29 manual: Edit 2025-03-03 19:09:24 +01:00
John Ericson
a58e0584f5 Rework derivation input resolution 
I refactored the way that input resolution works in `DerivationGoal`. To
be honest, it is probably unclear to the reader whether this new way is
better or worse. I suppose *intrinsic* motivation, I can say that

- the more structured use of `inputGoal` (a local variable) is better
  than the shotgrun approach with `inputDrvOutputs`

- A virtual `waiteeDone` was a hack, and now it's gone.

However, the *real* motivation of this is not the above things, but that
it is needed for my mammoth refactor fixing #11897 and #11928.

It is nice that this step could come first, rather than making that
refactor even bigger.
 2025-03-03 10:31:56 -05:00
John Ericson
8fdb50761d SingleDerivedPath should be const in recursive data structures 2025-03-03 10:31:23 -05:00
Robert Hensing
89b495520d
Merge pull request #12591 from obsidiansystems/temp-revert-no-dyn-drv 
Once again temporarily revert "Adapt scheduler to work with dynamic derivations"
 2025-03-02 21:57:56 +01:00
John Ericson
f4f28cdd0e Revert "Revert "Revert "Adapt scheduler to work with dynamic derivations""" 
The bug reappeared after all, and the fix introduced a different bug. I
just reverted on 2.27 first, in #12576, but upon further introspection
and discussion with @roberth, with preparing for and travelling to
Planet Nix I will not be able to fix it on `master` soon enough for a
revert to not be warranted here in the meantime also.

This reverts commit c98525235f.
 2025-03-02 15:34:21 -05:00
mergify[bot]
7e61e9650c
Merge pull request #12590 from NixOS/mergify/bp/2.27-maintenance/pr-12582 
packaging/everything.nix: Use a multi-output derivation (backport #12582)
 2025-03-02 13:16:07 +00:00
Robert Hensing
7e7e9d9eab packaging/everything.nix: Use a multi-output derivation 
This should fix a few packaging regressions.

`dev` also includes a merged `includes/`, which may be helpful until
inter-component includes are fixed properly.

(cherry picked from commit 41085295ab)
 2025-03-02 13:09:49 +00:00
Robert Hensing
7cfc52fd42
Merge pull request #12587 from NixOS/mergiy-2-27-backports 
.mergify.yml: Add backport 2.27-maintenance entry
 2025-03-02 14:08:49 +01:00
Eelco Dolstra
67aaed7f99
Merge pull request #12588 from fricklerhandwerk/exit-fricklerhandwerk 
remove fricklerhandwerk from CODEOWNERS
 2025-03-02 12:28:41 +01:00
Valentin Gagarin
0358007da3 remove fricklerhandwerk from CODEOWNERS 
stepping aside as a Nix maintainer:
https://discourse.nixos.org/t/time-to-step-aside/61050
 2025-03-02 00:06:15 +01:00
Robert Hensing
529cbea343
.mergify.yml: Add backport 2.27-maintenance entry 2025-03-01 22:54:57 +01:00
Sergei Zimmerman
c99edc840c libutil/file-system.hh: Fix typos 2025-03-01 18:44:48 +00:00
mergify[bot]
cd3688101d
Merge pull request #12585 from NixOS/mergify/bp/2.26-maintenance/pr-12582 
packaging/everything.nix: Use a multi-output derivation (backport #12582)
 2025-03-01 10:41:47 +00:00
Robert Hensing
d8606f96ee packaging/everything.nix: Use a multi-output derivation 
This should fix a few packaging regressions.

`dev` also includes a merged `includes/`, which may be helpful until
inter-component includes are fixed properly.

(cherry picked from commit 41085295ab)
 2025-03-01 10:36:41 +00:00
John Ericson
77f22db567
Merge pull request #12582 from roberth/nix-everything-symlink-megafarm 
packaging/everything.nix: Use a multi-output derivation
 2025-02-28 12:47:11 -05:00
Robert Hensing
41085295ab packaging/everything.nix: Use a multi-output derivation 
This should fix a few packaging regressions.

`dev` also includes a merged `includes/`, which may be helpful until
inter-component includes are fixed properly.
 2025-02-28 17:40:32 +01:00
Graham Christensen
edb0c4d1b0
Merge pull request #73 from DeterminateSystems/user-agent 
Include DeterminateNix in the User-Agent header
 2025-02-28 15:43:45 +00:00
Eelco Dolstra
288c5b0abd Include DeterminateNix in the User-Agent header 
The User-Agent now shows `curl/8.11.0 Nix/2.26.3
DeterminateNix/3.0.0`. This is useful for distinguishing Determinate
Nix from upstream Nix in binary cache logs.
 2025-02-28 16:35:46 +01:00
Eelco Dolstra
d8a7c50495
Merge pull request #12580 from ysndr/fix/fetchers/host-in-locked-url 
Add host attribute of github/gitlab flakerefs to URL serialization
 2025-02-28 15:41:02 +01:00
Yannik Sander
954e9101ba Add host attribute of github/gitlab flakerefs to URL serialization 
`GitArchiveInputScheme::toUrl` currently drops the `host` attribute,
creating invalid urls when locking `github:` or `gitlab:` urls pointing to alterative instances and serializing the input back to a url.

```
❯ cat flake.nix
{
  inputs.gnome-2048 = {
    url = "gitlab:GNOME/gnome-2048?host=gitlab.gnome.org";
    flake = false;
  };

  outputs = inputs: {};
}
f1xb57354q79t_jpw5_h79cw0000gq/T/tmp.MOBbzbpT35
❯ nix flake metadata
warning: creating lock file '/private/var/folders/fb/f1xb57354q79t_jpw5_h79cw0000gq/T/tmp.MOBbzbpT35/flake.lock':
• Added input 'gnome-2048':
    'gitlab:GNOME/gnome-2048/70e0e430ca4bf590990433a3abdce6b631d50e6e?narHash=sha256-bya45ug2mDSU4SMn0fSBlZCuPl9y15B12ubKeb2A58s%3D' (2025-02-21)
Resolved URL:  path:/private/var/folders/fb/f1xb57354q79t_jpw5_h79cw0000gq/T/tmp.MOBbzbpT35
Locked URL:    path:/private/var/folders/fb/f1xb57354q79t_jpw5_h79cw0000gq/T/tmp.MOBbzbpT35?lastModified=1740744684&narHash=sha256-nxUL/JiTYbZX2c1XiN/TC6aA1hf%2B1YXsUvhL7ASY2uE%3D
Path:          /nix/store/f4xczpwhdxs8gal1rika1c5bvhyd472l-source
Last modified: 2025-02-28 13:11:24
Inputs:
└───gnome-2048: gitlab:GNOME/gnome-2048/70e0e430ca4bf590990433a3abdce6b631d50e6e?narHash=sha256-bya45ug2mDSU4SMn0fSBlZCuPl9y15B12ubKeb2A58s%3D (2025-02-21 23:18:46)
```

Note the gnome-2048 input url missing the original host query.

The Url after this commit:

```
[...]
Inputs:
└───gnome-2048: gitlab:GNOME/gnome-2048/70e0e430ca4bf590990433a3abdce6b631d50e6e?host=gitlab.gnome.org&narHash=sha256-bya45ug2mDSU4SMn0fSBlZCuPl9y15B12ubKeb2A58s%3D (2025-02-21 23:18:46)
```
 2025-02-28 13:14:16 +01:00
John Ericson
92c4789ec7
Merge pull request #12573 from tomberek/tomberek.update_meeting 
fix: update work meeting calendar link
 2025-02-27 16:37:45 -05:00