wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-01 16:41:47 +02:00
Code Activity
19157 commits 245 branches 205 tags 160 MiB
Commit graph

19157 commits

This branch
This branch
All branches
Author SHA1 Message Date
Illia Bobyr
491aaaf116 nix-profile.fish: Typo NIX_SS{H => L}_CERT_FILE 
(cherry picked from commit 803fb83f7f)

# Conflicts:
#	scripts/nix-profile.fish.in
 2025-02-03 12:36:51 +00:00
mergify[bot]
862b3f41a4
Merge pull request #12396 from NixOS/mergify/bp/2.26-maintenance/pr-12385 
Fix duplicate setPathDisplay() (backport #12385)
 2025-02-02 03:05:49 +00:00
Eelco Dolstra
28684af74b 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().

(cherry picked from commit 3032512425)
 2025-02-02 02:10:53 +00:00
Eelco Dolstra
1c1f8b2343 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.

(cherry picked from commit 102d90ebf0)
 2025-02-02 02:10:53 +00:00
mergify[bot]
a02e814b4b
Merge pull request #12371 from NixOS/mergify/bp/2.26-maintenance/pr-12363 
Issue #12161, add `meta.mainProgram` (backport #12363)
 2025-01-28 08:39:15 +00:00
Robert Hensing
a75cf57702 packages.nix-cli: Add meta.mainProgram 
(cherry picked from commit 850329dea5)
 2025-01-28 08:16:00 +00:00
Robert Hensing
605bd06ca4 packages.default: Add meta.mainProgram 
(cherry picked from commit 0d7418b4fe)
 2025-01-28 08:16:00 +00:00
mergify[bot]
84efd3ecf2
Merge pull request #12367 from NixOS/mergify/bp/2.26-maintenance/pr-12362 
refactor: Extract EvalState::realiseString (backport #12362)
 2025-01-27 16:08:41 +00:00
Robert Hensing
527e68ac3e refactor: Extract EvalState::realiseString 
(cherry picked from commit 7465fbe926)
 2025-01-27 15:51:30 +00:00
mergify[bot]
2fce659c7d
Merge pull request #12359 from NixOS/mergify/bp/2.26-maintenance/pr-12356 
Improve "illegal path references in fixed output derivation" error (backport #12356)
 2025-01-26 20:10:39 +00:00
Ben Millwood
791d6cf433 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.

(cherry picked from commit 4e5d1b281e)
 2025-01-26 19:39:33 +00:00
Robert Hensing
3e0d9ff937
Merge pull request #12354 from NixOS/nixfmt-on-2.26 
Apply nixfmt (backport 2.26)
 2025-01-24 22:43:06 +01:00
Robert Hensing
f629d81df0 test: Fix shifted source positions after formatting 2025-01-24 22:21:27 +01:00
Robert Hensing
32aed360b8 Format .nix files 
This does not include any automation for the release branch, but
is based on the configuration of https://github.com/NixOS/nix/pull/12349

    pre-commit run -a nixfmt-rfc-style
 2025-01-24 20:40:21 +01:00
Eelco Dolstra
6cb17fd836 Bump version 2025-01-24 16:20:43 +01:00
mergify[bot]
36bd92736f
Merge pull request #12350 from NixOS/mergify/bp/2.26-maintenance/pr-12347 
EvalState::resolveLookupPathPath(): Call resolveSymlinks() before pathExists() (backport #12347)
 2025-01-24 14:02:15 +00:00
Eelco Dolstra
90159cb197 EvalState::resolveLookupPathPath(): Call resolveSymlinks() before pathExists() 
Fixes #12339.

(cherry picked from commit 00d9e7e1f4)
 2025-01-24 13:46:16 +00:00
mergify[bot]
4cfeb8d1bb
Merge pull request #12346 from NixOS/mergify/bp/2.26-maintenance/pr-12336 
libstore: Fix progress bars (backport #12336)
 2025-01-24 11:46:16 +00:00
Philipp Otterbein
9cf3d3368e libstore: fix progress bars 
(cherry picked from commit be97dc1efc)
 2025-01-24 11:10:50 +00:00
Eelco Dolstra
aab6419b63
Merge pull request #12334 from NixOS/mergify/bp/2.26-maintenance/pr-12331 
GitRepo::fetch(): Ignore $GIT_DIR (backport #12331)
 2025-01-22 22:00:16 +01:00
Eelco Dolstra
832221650b GitRepo::fetch(): Ignore $GIT_DIR 
Fixes #12325.

(cherry picked from commit 41983dba8f)
 2025-01-22 20:30:29 +00:00
Eelco Dolstra
2301d86f32 GitRepo::fetch(): Cleanup 
(cherry picked from commit bd10b859f7)
 2025-01-22 20:30:28 +00:00
Eelco Dolstra
91e60321f6 Bump version 2025-01-22 13:36:30 +01:00
Eelco Dolstra
28752fe288 Mark official release 2025-01-22 12:16:44 +01:00
Eelco Dolstra
7af6329005
Merge pull request #12326 from NixOS/release-notes 
Nix 2.26 release notes
 2025-01-22 12:12:04 +01:00
Eelco Dolstra
21f2e29176 Add release credits 2025-01-22 12:01:00 +01:00
Eelco Dolstra
617bf84518 Add a few more release notes 2025-01-22 11:55:20 +01:00
Eelco Dolstra
d8dbb71c92 release notes: 2.26.0 2025-01-22 11:45:04 +01:00
Eelco Dolstra
069ca2a21a
Merge pull request #12324 from NixOS/disable-lto 
x86_64-darwin: Disable LTO
 2025-01-21 18:29:35 +01:00
Eelco Dolstra
b09b4dc995 x86_64-darwin: Disable LTO 
LTO on x86_64-darwin appears to break the ability to catch exceptions
correctly (maybe just for exception types defined in different
libraries). This leads to many weird test failures,
e.g. https://hydra.nixos.org/build/286312387 and
https://hydra.nixos.org/build/286312341.
 2025-01-21 18:10:12 +01:00
Eelco Dolstra
b8c296f0de
Merge pull request #12322 from DeterminateSystems/fix-fetchurl-test 
Fix fetchurl test
 2025-01-21 14:19:54 +01:00
Eelco Dolstra
9e324df383 Fix fetchurl test 
https://hydra.nixos.org/build/286311974
 2025-01-21 14:09:17 +01:00
Eelco Dolstra
27c9f7ef78 Fix name 2025-01-21 14:07:20 +01:00
Eelco Dolstra
9a71c3c60d
Merge pull request #12321 from DeterminateSystems/fix-nix-everything 
Fix nix-everything build
 2025-01-21 11:26:27 +01:00
Eelco Dolstra
a82c63f5d8 Fix nix-everything build 
https://hydra.nixos.org/build/286306734
 2025-01-21 09:54:57 +01:00
Eelco Dolstra
f358ab2b0c
Merge pull request #12317 from kusold/patch-1 
Add unit of measurement for download-buffer-size
 2025-01-20 23:42:59 +01:00
Mike Kusold
f0c209fb14
Use standardize units for megabytes 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2025-01-20 11:32:47 -07:00
Robert Hensing
432e3a1cbf
Merge pull request #12315 from NixOS/more-nixos-tests-network 
tests: Wait for network *online* targets and/or multi-user targets (more)
 2025-01-20 19:15:48 +01:00
Eelco Dolstra
e3a285f229
Merge pull request #12316 from obsidiansystems/fix-eval-error 
Fixes for `nix-everything` wrapper
 2025-01-20 19:10:28 +01:00
Mike Kusold
6b987206ce
Add unit of measurement for download-buffer-size 
I started getting these warnings `warning: download buffer is full; consider increasing the 'download-buffer-size' setting` but the documentation does not make it obvious what unit of measurement it accepts.
 2025-01-20 11:04:53 -07:00
Robert Hensing
6f0bdd9ae7 tests: Wait for network *online* targets 
More prevalent than I thought in 15073e86a

See also 3588783032
which is a failed github-flakes test without "Network is Online"
 2025-01-20 18:24:22 +01:00
John Ericson
0fe92067fb Fixes for nix-everything wrapper 
1. Fix this eval error:
   https://hydra.nixos.org/jobset/nix/master#tabs-errors

   The dev package output (actually a separate derivation) needs to skip
   this for cross just as the main package output does.

2. Deduplicate libs attrset and list.

3. Move `nix-functional-tests` to `checkInputs`.

   With the Meson build system, we no longer need a `check` vs
   `install-check` distinction, so it is simpler to just keeep
   everything in one place.
 2025-01-20 12:19:21 -05:00
Eelco Dolstra
ac31767c57
Merge pull request #12293 from suruaku/remove-unneeded-character 
Remove character not needed for a command
 2025-01-20 18:00:13 +01:00
Robert Hensing
0be69d4573
Merge pull request #12309 from NixOS/mergify-label-automatic-backports 
mergify: Add automatic backport label
 2025-01-20 17:39:43 +01:00
Eelco Dolstra
f12ef308f6
Merge pull request #12303 from NixOS/fix-mingw-2 
More mingw build fixes
 2025-01-20 17:38:48 +01:00
John Ericson
ae7bc5f2c7
Merge pull request #12297 from NixOS/fix-static 
Fix static build of nix
 2025-01-20 11:13:30 -05:00
Robert Hensing
fcc501b730 mergify: Add automatic backport label 
This label will be useful for constructing queries to find backportable PRs.
Specifically, those should omit both automatic backports and
"backports reviewed" PRs.
 2025-01-20 17:11:06 +01:00
Eelco Dolstra
8e05ddfd84 Use fs::symlink_exists 2025-01-20 16:48:20 +01:00
Eelco Dolstra
4adb579c42
Merge pull request #12302 from NixOS/nixos-tests-network 
tests: Wait for network *online* and multi-user targets
 2025-01-20 16:28:06 +01:00
Robert Hensing
dccabc8f84
Merge pull request #12294 from DeterminateSystems/fix-thread-pool-error 
processGraph(): Don't throw ThreadPoolShutDown if there is an exception
 2025-01-20 16:23:32 +01:00