wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-08 11:03:54 +02:00
Code Activity
19504 commits 245 branches 205 tags 164 MiB
Commit graph

19504 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
a673084733 Fix tests 2024-09-18 19:06:48 +02:00
Eelco Dolstra
d772a8b3dc shellcheck 2024-09-18 18:05:08 +02:00
Jörg Thalheim
f0a4f19087 add description + example for nix flake archive 
Update src/nix/flake-archive.md

Update src/nix/flake-archive.md
 2024-09-18 17:31:40 +02:00
Eelco Dolstra
0ed2ab0533
Merge pull request #11527 from Mic92/macos-test-fix 
Fix macOS tests with meson
 2024-09-18 15:07:22 +02:00
Jörg Thalheim
2b7642632e devShell: increase priority of clang-tools 
Before we would get the unwrapped version of clang-tools from clang
itself, which doesn't quite work.
 2024-09-18 14:29:26 +02:00
Nikodem Rabuliński
8105307f0f Always initialize curl in parent process on darwin 
Because of an objc quirk[1], calling curl_global_init for the first time
after fork() will always result in a crash.
Up until now the solution has been to set
OBJC_DISABLE_INITIALIZE_FORK_SAFETY for every nix process to ignore
that error.
This is less than ideal because we were setting it in package.nix,
which meant that running nix tests locally would fail because
that variable was not set.
Instead of working around that error we address it at the core -
by calling curl_global_init inside initLibStore, which should mean
curl will already have been initialized by the time we try to do so in
a forked process.

[1] 01edf1705f/runtime/objc-initialize.mm (L614-L636)

(cherry-picked and adapted from c7d97802e4)
 2024-09-18 14:29:26 +02:00
Valentin Gagarin
ec2b01585f
Merge pull request #11526 from quatquatt/update-multiple-inputs 
docs: Provide an example of updating multiple inputs
 2024-09-18 13:34:50 +02:00
Eelco Dolstra
8690b6f138 Test IFD/filterSource in a chroot 
Relevant to #11503.
 2024-09-18 12:42:20 +02:00
Jörg Thalheim
0624cf0f59 mergify: enable merge-queue for backports 2024-09-18 08:46:07 +02:00
quatquatt
9e335ee3b9 docs: Provide an example of updating multiple inputs with nix flake update 
docs: Provide an example of updating multiple inputs with `nix flake update`
 2024-09-17 22:50:21 -04:00
Jörg Thalheim
a20659f4fa unitests: fix tmpdir when running with meson on macOS 2024-09-17 19:15:01 +02:00
Jörg Thalheim
98db531df2 libstore-support: check that we can create the store 2024-09-17 18:46:50 +02:00
John Ericson
00013c7348
Merge pull request #11522 from tweag/fix-meson-build-in-sandbox 
Fix meson build on macOS in sandbox
 2024-09-17 12:04:16 -04:00
Eelco Dolstra
ee3f0b7a8b Rename import-derivation -> import-from-derivation 2024-09-17 16:56:40 +02:00
Yuriy Taraday
c7c3a7f667 Fix meson build on macOS in sandbox 
Workaround at src/libstore/meson.build#L429-L434 by @Ericson2314 from
https://github.com/NixOS/nix/pull/11302 erroneously used `macos` instead
of `darwin` to distinguish macOS, while meson docs list only `darwin`:
https://mesonbuild.com/Reference-tables.html#operating-system-names.

Original thread: https://github.com/NixOS/nix/issues/2503#issuecomment-2353184049
 2024-09-17 16:15:39 +02:00
Brian McGee
9941f620c4 base64Decode: clearer error message when an invalid character is detected 
Output the offending string in its entirety to provide context.

Closes #8479

(cherry picked from commit dc3ccf02bf)
 2024-09-17 14:03:19 +00:00
John Ericson
95f2b2beab
Merge pull request #8766 from brianmcgee/fix/base64-decode-error-message 
base64Decode: clearer error message when an invalid character is detected
 2024-09-17 09:59:15 -04:00
Eelco Dolstra
3fb6605d3d
Merge pull request #11514 from DeterminateSystems/fix-derivation-add 
nix derivation add: Remove reference to "installable"
 2024-09-17 13:12:12 +02:00
Eelco Dolstra
65f138f669 nix derivation add: Remove reference to "installable" 
It doesn't operate on an installable, so don't mention it.
 2024-09-17 12:37:33 +02:00
Eelco Dolstra
8321fe7c2b
Merge pull request #11512 from NixOS/dependabot/github_actions/cachix/install-nix-action-V28 
Bump cachix/install-nix-action from V27 to 28
 2024-09-17 12:29:11 +02:00
Valentin Gagarin
5b2a8c223e
Merge pull request #11497 from Mic92/mergify/bp/2.24-maintenance/pr-11378 2024-09-17 07:09:32 +02:00
dependabot[bot]
afa6cc7271
Bump cachix/install-nix-action from V27 to 28 
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from V27 to 28. This release includes the previously tagged commit.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/V27...V28)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-16 22:59:12 +00:00
mergify[bot]
1b076b4f84
doc: add admonitions for macOS 15 Sequoia update (#11487) (#11509) 
The impending release of macOS 15 Sequoia will break many existing nix
installs on macOS, which may lead to an increased number of people who
are looking to try to reinstall Nix without noticing the open/pinned
issue (#10892) that explains the problem and outlines how to migrate
existing installs.

These admonitions are a short-term measure until we are over the hump
and support volumes dwindle.

(cherry picked from commit 48477d4a3e)

Co-authored-by: Travis A. Everett <travis.a.everett@gmail.com>
 2024-09-16 16:03:05 +02:00
Eelco Dolstra
71d4bb8c2e parentPath -> parentInputPath 2024-09-16 14:52:23 +02:00
Robert Hensing
799abea0c4
Merge pull request #11330 from NixOS/packfile 
libgit2, GitRepo: Write (thin) packfiles
 2024-09-16 14:42:59 +02:00
Eelco Dolstra
09d71974ef shellcheck 2024-09-16 14:11:08 +02:00
Eelco Dolstra
21fc07c1a4 Merge remote-tracking branch 'origin/master' into relative-flakes 2024-09-16 13:45:58 +02:00
Robert Hensing
459d02672c fix Windows build 2024-09-16 13:42:46 +02:00
Robert Hensing
976f539f7d Make Repo::flush interruptible 2024-09-16 13:42:46 +02:00
Eelco Dolstra
176334d8be
Merge pull request #10612 from edolstra/no-flake-substitution 
Input::fetchToStore(): Don't try to substitute
 2024-09-16 12:47:50 +02:00
Robert Hensing
d9ef3dd012
Merge pull request #11484 from NixOS/mergify/bp/2.24-maintenance/pr-11473 
Fix making the build directory kept by `keep-failed` readable (backport #11473)
 2024-09-16 12:46:23 +02:00
Robert Hensing
f9714bac34
Merge pull request #11456 from NixOS/mergify/bp/2.24-maintenance/pr-11321 
replace backport github action with mergify (backport #11321)
 2024-09-16 12:41:14 +02:00
Eelco Dolstra
2c42a9dbaa
Merge pull request #11485 from abathur/sequoia_migration_errexit 
sequoia-nixbld-user-migration: halt on error
 2024-09-13 17:12:28 +02:00
Jörg Thalheim
684a690480 update filesystem-errors changelog to 2.24 release 2024-09-13 14:20:34 +02:00
John Ericson
4354d90384 tweak unpack channel built-in, std::filesystem::path for tarball 
(cherry picked from commit 193dc49097)
 2024-09-13 14:11:36 +02:00
Jörg Thalheim
60001b1936 add release notes for filesystem fixes 
Update doc/manual/rl-next/filesystem-errors.md

Co-authored-by: John Ericson <git@JohnEricson.me>
(cherry picked from commit 04ce0e648a)
 2024-09-13 14:11:36 +02:00
Jörg Thalheim
c84fc0120f builtins.unpackChannel: wrap filesystem errors and sanitize channelName 
Otherwise these errors are not caught correctly

(cherry picked from commit 70c52d72f4)
 2024-09-13 14:11:36 +02:00
Jörg Thalheim
cd97688bce builtins.readDir: fix nix error trace on filesystem errors 
Before:

nix-env % ./src/nix/nix eval --impure --expr 'let f = builtins.readDir "/nix/store/hs3yxdq9knimwdm51gvbs4dvncz46f9d-hello-2.12.1/foo"; in f' --show-trace
error: filesystem error: directory iterator cannot open directory: No such file or directory [/nix/store/hs3yxdq9knimwdm51gvbs4dvncz46f9d-hello-2.12.1/foo]

After:

error:
       … while calling the 'readDir' builtin
         at «string»:1:9:
            1| let f = builtins.readDir "/nix/store/hs3yxdq9knimwdm51gvbs4dvncz46f9d-hello-2.12.1/foo"; in f
             |         ^

       error: reading directory '/nix/store/hs3yxdq9knimwdm51gvbs4dvncz46f9d-hello-2.12.1/foo': No such file or directory

(cherry picked from commit 22ba4dc78d)
 2024-09-13 11:56:41 +00:00
Eelco Dolstra
07909de6ed
Merge pull request #11493 from NixOS/mergify/bp/2.24-maintenance/pr-11423 
Git fetcher: Ignore .gitmodules entries that are not submodules (backport #11423)
 2024-09-12 20:30:45 +02:00
Eelco Dolstra
11452ce674
Merge pull request #11490 from bryanhonof/bryanhonof.add-mixenvironment-to-run 
Add MixEnvironment to CmdRun
 2024-09-12 20:29:16 +02:00
Eelco Dolstra
751907dc8a Git fetcher: Ignore .gitmodules entries that are not submodules 
Fixes #10739.

(cherry picked from commit 9d24080090)
 2024-09-12 16:16:36 +00:00
Robert Hensing
bbef37b4a6
Merge pull request #11423 from DeterminateSystems/ignore-stale-submodules 
Git fetcher: Ignore .gitmodules entries that are not submodules
 2024-09-12 18:14:18 +02:00
Eelco Dolstra
bb1ce014be
Merge pull request #11492 from DeterminateSystems/canon-nars 
Make the NAR parser stricter and add some tests
 2024-09-12 18:14:06 +02:00
Bryan Honof
2226f9864e
feat(run): inherit from MixEnvironment 2024-09-12 17:47:48 +02:00
Eelco Dolstra
5737d31d4e Test the case hack a bit more 2024-09-12 17:27:41 +02:00
Eelco Dolstra
7aa3e7e3a5 Make the NAR parser much stricter wrt field order 
We really want to enforce a canonical representation since NAR
hashing/signing/deduplication depends on that.
 2024-09-12 15:57:46 +02:00
Eelco Dolstra
27ec0def74 Typo 2024-09-12 15:33:55 +02:00
Eelco Dolstra
69bf9947c7 Put 'names' in the right scope 2024-09-12 15:29:54 +02:00
Eelco Dolstra
4de9587e50 Improve badArchive() 2024-09-12 15:27:55 +02:00
Eelco Dolstra
421aa1add1 Add tests for invalid file names in NARs 
Note: in general, we rely on the OS to tell us if a name is invalid or
if two names normalize in the same way. But for security, we do want
to make sure that we catch '.', '..', slashes and NUL characters. (NUL
characters aren't really a security issue, but since they would be
truncated when we pass them to the OS, it would be canonicity problem.)
 2024-09-12 15:02:30 +02:00