wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity
18744 commits 245 branches 205 tags 163 MiB
Commit graph

18744 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
bb08cc7cc2
Merge pull request #12065 from NixOS/mergify/bp/2.25-maintenance/pr-12048 
Fix `nix upgrade-nix` profile search (backport #12048)
 2024-12-15 21:24:09 +00:00
Jörg Thalheim
51166bb388 upgrade-nix: don't double quote path on error 
the format error already adds quotes.

(cherry picked from commit ccaa4c259a)
 2024-12-15 20:52:06 +00:00
Greg Curtis
e467269a44 Fix nix upgrade-nix profile search 
Commit cfe66dbec updated `nix upgrade-nix` to use
`ExecutablePath::load().find`, which broke the logic for finding the
profile associated with the nix executable. The error looks something
like:

```
$ sudo -i nix upgrade-nix --debug
found Nix in '"/nix/store/46p1z0w9ad605kky62dr53z4h24k2a5r-nix-2.25.2/bin/nix"'
found profile '/nix/store/46p1z0w9ad605kky62dr53z4h24k2a5r-nix-2.25.2/bin'
error: directory '"/nix/store/46p1z0w9ad605kky62dr53z4h24k2a5r-nix-2.25.2/bin/nix"' does not appear to be part of a Nix profile
```

This seems to happen for two reasons:

1. The original PATH search resulted in a directory, but `find` returns
   the path to the executable. Fixed by getting the path's parent.
2. The profile symlink cannot be found because
   `ExecutablePath::load().find` canonicalizes the executable path. I
   updated find to normalize the path instead, which seems more in line
   with how other programs resolve paths. I'm not sure if this affects
   other callers though.

I manually tested this on macOS and Linux, and it seemed to fix
upgrading from 2.25.2 to 2.25.3.

(cherry picked from commit 4f831e2be5)
 2024-12-15 20:52:05 +00:00
mergify[bot]
fd087ceec6
Merge pull request #12055 from NixOS/mergify/bp/2.25-maintenance/pr-12050 
speed up ci by splitting off eval and build + fix ci with restricted namespaces (backport #12050)
 2024-12-14 15:51:12 +00:00
Jörg Thalheim
75b657cf7c ci: disable apparmor restrictions 
For our tests we need to map the root user for some tests.
However ubuntu no longer allows this by default:
https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces

(cherry picked from commit 9f2b9256b6)
 2024-12-14 15:24:51 +00:00
Jörg Thalheim
cdd3e3015d binary-tarball: create tarball without listing files 
This is producing quite a bit of log output in CI.

(cherry picked from commit 31b3a34e5b)
 2024-12-14 15:24:51 +00:00
Jörg Thalheim
79a52afe82 speed up ci by splitting off eval and build 
- This speeds up macOS builds from 30 minutes to 11 minutes (3x faster).
- Also improve error reporting e.g. printing out what actually failed to build.
- As a result we also no longer need swap.

(cherry picked from commit 691b1ea237)
 2024-12-14 15:24:50 +00:00
Jörg Thalheim
fe3c94d5c2
Merge pull request #12035 from NixOS/mergify/bp/2.25-maintenance/pr-11921 
Make @nix json structured build log parsing warn instead of fail (backport #11921)
 2024-12-10 05:37:59 +01:00
Robert Hensing
9f2df5899c tests: Make unusual logging test conditional on fixed daemon version 
(cherry picked from commit c783cd22ac)
 2024-12-10 00:16:09 +01:00
Robert Hensing
2eb816226e Remove redundant warning: prefix from structured build log warning 
(cherry picked from commit f3c722cab2)
 2024-12-09 21:40:41 +00:00
Robert Hensing
a867747c05 test: Move unusual-logging to run only in logging test case 
(cherry picked from commit 1421420e86)
 2024-12-09 21:40:37 +00:00
Robert Hensing
c709ca6e36 Push log source description out of libutil and report build hook @nix warning correctly 
(cherry picked from commit 03d4bfd852)
 2024-12-09 21:40:32 +00:00
Robert Hensing
b1058ee0d2 tests/functional/dependencies.nix: Check that we tolerate syntax and type errors 
(cherry picked from commit 1485937b89)
 2024-12-09 21:40:27 +00:00
Linus Heckemann
7c98167eab libutil: handle json builder log messages with unexpected format 
Before this change, expressions like:

with import <nixpkgs> {};
runCommand "foo" {} ''
  echo '@nix {}' >&$NIX_LOG_FD
''

would result in Lix crashing, because accessing nonexistent fields of
a JSON object throws an exception.

Rather than handling each field individually, we just catch JSON
exceptions wholesale. Since these log messages are an unusual
circumstance, log a warning when this happens.

Fixes #544.

Change-Id: Idc2d8acf6e37046b3ec212f42e29269163dca893
(cherry picked from commit e55cd3beea710db727fd966f265a1b715b7285f3)
(cherry picked from commit ee03fd478e)
 2024-12-09 21:40:23 +00:00
Robert Hensing
c797848b88 tests/functional/dependencies.nix: Refactor, replace arcane let 
(cherry picked from commit e82ff51726)
 2024-12-09 21:40:19 +00:00
Eelco Dolstra
8a81c2428a
Merge pull request #12018 from NixOS/mergify/bp/2.25-maintenance/pr-12013 
nix hash convert: Support SRI hashes that lack trailing '=' characters (backport #12013)
 2024-12-09 13:14:29 +01:00
Eelco Dolstra
a5ee9a3e99
Resolve conflicts 2024-12-06 12:13:51 +01:00
Eelco Dolstra
0a2545b23a nix hash: Don't print 'nix hash' deprecation message 
Fixes #11997.

(cherry picked from commit 408c2faf93)

# Conflicts:
#	src/nix/hash.cc
 2024-12-05 22:30:33 +00:00
Eelco Dolstra
97f0c68389 nix hash convert: Don't fail on uppercase base-16 hashes 
(cherry picked from commit 33b645cedf)
 2024-12-05 22:30:32 +00:00
Eelco Dolstra
26741bcfda nix hash convert: Support SRI hashes that lack trailing '=' characters 
Fixes #11996.

(cherry picked from commit 52f1cd0595)
 2024-12-05 22:30:32 +00:00
Eelco Dolstra
218cd6c16c
Merge pull request #11981 from h0nIg/patch-2 
docker: Fix command "nix profile install", Don't require --impure (fix for 2.25)
 2024-11-29 12:53:47 +01:00
h0nIg
61950c3375
docker: Fix command "nix profile install", Don't require --impure 2024-11-27 13:35:18 +01:00
Jörg Thalheim
282bfbdacb
Merge pull request #11973 from NixOS/mergify/bp/2.25-maintenance/pr-11959 
more readable errors if symlinks cannot be created (backport #11959)
 2024-11-27 08:04:06 +01:00
Jörg Thalheim
14432ea4a2
Merge pull request #11962 from NixOS/mergify/bp/2.25-maintenance/pr-11915 
Bump fetcher cache version (backport #11915)
 2024-11-27 07:23:52 +01:00
Jörg Thalheim
8d51c90872 more readable errors if symlinks cannot be created 
Before:

filesystem error: cannot create symlink: Permission denied [/nix/store/1s2p3a4rs172336hj2l8n20nz74hf71j-nix-eval-jobs-2.24.1.drv] [/1s2p3a4rs172336hj2l8n20nz74hf71j-nix-eval-jobs-2.24.1.drv.tmp-2772352-1316231068]

Now:

creating symlink '/wfxz2q489c811n08cdqj7ywxm3n4z6m5-nix-eval-jobs-2.24.1.drv.tmp-2971297-324653080' -> '/nix/store/wfxz2q489c811n08cdqj7ywxm3n4z6m5-nix-eval-jobs-2.24.1.drv': Permission denied

(cherry picked from commit 5b8728d393)

# Conflicts:
#	src/nix/flake.cc
 2024-11-27 07:21:10 +01:00
Eelco Dolstra
118d50992c
Merge pull request #11968 from NixOS/mergify/bp/2.25-maintenance/pr-11878 
Remove warning that interpretation of .drv has changed (backport #11878)
 2024-11-26 14:51:50 +01:00
Eelco Dolstra
9f9b2ed48c
Merge pull request #11966 from NixOS/mergify/bp/2.25-maintenance/pr-11876 
Filter OSC 8 correctly (backport #11876)
 2024-11-26 14:10:16 +01:00
Eelco Dolstra
eb50683e81
Merge pull request #11965 from NixOS/mergify/bp/2.25-maintenance/pr-11884 
nix path-info: Don't write to std::cout directly (backport #11884)
 2024-11-26 13:58:42 +01:00
Eelco Dolstra
c381199e97
Merge pull request #11964 from NixOS/mergify/bp/2.25-maintenance/pr-11901 
tests/functional/flakes/develop.sh: Don't hang (backport #11901)
 2024-11-26 13:35:14 +01:00
Eelco Dolstra
072ebeee79
Merge pull request #11963 from NixOS/mergify/bp/2.25-maintenance/pr-11902 
Fix issue #11892 (backport #11902)
 2024-11-26 13:16:35 +01:00
Robert Hensing
3501c737d3 Remove warning that interpretation of .drv has changed 
This was first tagged as 2.15.0, 1½ years ago; plenty of time for
everyone to catch up.

By now, the warning is causing more confusion than that it is helpful,
because passing a `.drv` or `drvPath` has legitimate use cases.

(cherry picked from commit f534a7a524)
 2024-11-26 11:27:41 +00:00
Jack Wilsdon
12eff94815 Filter OSC 8 correctly 
This allows Nix to use lowdown 1.2.0 which outputs OSC-8 links.

(cherry picked from commit 1301f8434d)
 2024-11-26 11:20:35 +00:00
Eelco Dolstra
89f4ac3d2c nix path-info: Don't write to std::cout directly 
This interferes with the progress bar, resulting in output like

  evaluating derivation 'git+file:///home/eelco/Dev/nix-master#packages.x86_64-linux.default'/nix/store/zz8v96j5md952x0mxfix12xqnvq5qv5x-nix-2.26.0pre20241114_a95f6ea.drv

(cherry picked from commit 33a0fa882f)
 2024-11-26 11:20:35 +00:00
Eelco Dolstra
1dbe60e073 tests/functional/flakes/develop.sh: Don't hang 
The bash shell started by `nix develop` waited forever for stdin
input.

Fixes #11827.

(cherry picked from commit 428af8c66f)
 2024-11-26 11:19:33 +00:00
Robert Hensing
4e2824ce93 Bump fetcher cache version 
We're getting more reports in https://github.com/NixOS/nix/issues/10985

It appears that something hasn't gone right process-wise.
I find this mistake not to be worth investigating, but rather something
to pay attention to going forward.

Let's nip this in the bud.

Closes https://github.com/NixOS/nix/issues/10985

(cherry picked from commit e948c8e033)
 2024-11-26 11:19:29 +00:00
Robert Hensing
3bc3e55736 Fix issue 11892 
It seems that I copied the expression for baseDir thoughtlessly and
did not come back to it.

- `baseDir` was only used in the `fromArgs` branch.
- `fromArgs` is true when `packages` is true.

(cherry picked from commit c4b95dbdd1)
 2024-11-26 11:19:29 +00:00
Eelco Dolstra
d97ebe519a Bump version 2024-11-14 11:37:15 +01:00
Eelco Dolstra
f87f87120a Bump version 2024-11-13 21:04:28 +01:00
Eelco Dolstra
5ae53d4730 nix-everything: Pass through a version attribute 
The existence of this attribute is assumed by the Determinate
Installer packaging and maybe others.

(cherry picked from commit 06769eb2bf)
 2024-11-13 14:49:51 +01:00
Eelco Dolstra
7bc52df684
Merge pull request #11861 from DeterminateSystems/nix-2.25-default 
[2.25] Make the default package point to the old build
 2024-11-12 17:12:12 +01:00
Eelco Dolstra
3e883b9eaf Make the default package point to the old build 
There are some differences that are causing issues, like the fact that
nix-ng doesn't have a version attribute.
 2024-11-12 16:26:40 +01:00
Eelco Dolstra
6b96c66302
Merge pull request #11856 from nix-windows/fix-windows-env-var-arg-order 
[Backport 2.25] Fix argument order in the Windows implementation of `getEnvOs`
 2024-11-12 11:04:59 +01:00
John Ericson
355f08a728 Fix argument order in the Windows implementation of getEnvOs 
See the build failure in https://github.com/msys2/MINGW-packages/pull/22499
 2024-11-12 00:52:17 -05:00
Eelco Dolstra
9213bf55ce Bump version 2024-11-11 17:08:24 +01:00
Eelco Dolstra
5c5a737885 Mark stable release 2024-11-11 15:14:57 +01:00
Eelco Dolstra
fa4bd39c6a
Merge pull request #11701 from DeterminateSystems/flake-substitution 
Restore input substitution
 2024-11-11 14:40:22 +01:00
Eelco Dolstra
036359ac84 Remove release note about flake substitution 2024-11-11 13:58:12 +01:00
Eelco Dolstra
67a42e6240 Merge remote-tracking branch 'origin/master' into flake-substitution 2024-11-11 13:57:24 +01:00
Valentin Gagarin
17c94b7ff7
Merge pull request #11842 from DeterminateSystems/release-notes 
Nix 2.25 release notes
 2024-11-11 12:24:05 +01:00
Robert Hensing
6f50e6a3fa
maintainers/onboarding: Subscribe to discourse category (#11848) 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
 2024-11-10 22:20:06 +00:00