nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity
19820 commits 177 branches 218 tags 162 MiB
Commit graph

19820 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergei Zimmerman
31005f2236
git-blame-ignore-revs: Add nixfmt 1.0.0, clang-format 19 reformats 2025-08-18 21:26:20 +03:00
Sergei Zimmerman
945d9d7264
treewide: Apply clang-format 
Nixpkgs bump in the flake bumps clang-format, so we now have a diff
compared to what was used to format the codebase previously. We should
have made sure that the nixpkgs input is the same in the first place.
 2025-08-18 21:20:40 +03:00
Sergei Zimmerman
448bbbe0fd
flake: Apply nixfmt 1.0.0 2025-08-18 21:17:24 +03:00
Sergei Zimmerman
2c57edd677
flake: nixpkgs: nixos-unstable -> nixos-25.05-small 
About time we upgraded our nixpkgs flake input. Ideally
we'd have automation to do this.

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/adaa24fbf46737f3f1b5497bf64bae750f82942e?narHash=sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY%3D' (2025-05-13)
  → 'github:NixOS/nixpkgs/cd32a774ac52caaa03bcfc9e7591ac8c18617ced?narHash=sha256-VtMQg02B3kt1oejwwrGn50U9Xbjgzfbb5TV5Wtx8dKI%3D' (2025-08-17)

(cherry picked from commit fc33681583)
 2025-08-18 21:12:30 +03:00
Jörg Thalheim
2939ee0ada
Merge pull request #13584 from NixOS/mergify/bp/2.28-maintenance/pr-13228 
libutil-tests/json-utils: fix -Werror=sign-compare error (backport #13228)
 2025-08-05 21:11:03 +02:00
Sergei Zimmerman
49062664ed
Merge pull request #13677 from NixOS/mergify/bp/2.28-maintenance/pr-13248 
libmain: Catch logger exceptions in `handleExceptions` (backport #13248)
 2025-08-03 00:10:24 +03:00
Sergei Zimmerman
9656003292 libmain: Catch logger exceptions in handleExceptions 
Avoid std::terminate in case logging code also
throws.

(cherry picked from commit 90d1ff4805)
 2025-08-02 19:51:31 +00:00
mergify[bot]
b96f21441d
Merge pull request #13598 from NixOS/mergify/bp/2.28-maintenance/pr-13275 
Remove propagated-build-inputs when static (backport #13275)
 2025-07-31 03:25:58 +00:00
mergify[bot]
a24fddb779
Merge pull request #13636 from NixOS/mergify/bp/2.28-maintenance/pr-13368 
libstore: fix race condition when creating state directories (backport #13368)
 2025-07-31 03:10:04 +00:00
mergify[bot]
2b4e25b49d
Merge pull request #13627 from NixOS/mergify/bp/2.28-maintenance/pr-13351 
docker: make sure `nix config check` works (backport #13351)
 2025-07-31 03:10:01 +00:00
mergify[bot]
b13a119a79
Merge pull request #13632 from NixOS/mergify/bp/2.28-maintenance/pr-13360 
libexpr: Remove non-const overload of `listElems` (backport #13360)
 2025-07-31 03:09:59 +00:00
mergify[bot]
99343a66af
Merge pull request #13604 from NixOS/mergify/bp/2.28-maintenance/pr-13282 
tests/functional: Add more language tests for `builtins.match` (backport #13282)
 2025-07-31 03:09:56 +00:00
mergify[bot]
9956c97ed9
Merge pull request #13601 from NixOS/mergify/bp/2.28-maintenance/pr-13277 
nix flake archive: add --no-check-sigs option (backport #13277)
 2025-07-31 03:09:54 +00:00
mergify[bot]
7ad7c662bb
Merge pull request #13649 from NixOS/mergify/bp/2.28-maintenance/pr-13395 
libstore-tests: Don't leak memory in tests (backport #13395)
 2025-07-31 03:09:51 +00:00
mergify[bot]
63c66c04be
Merge pull request #13581 from NixOS/mergify/bp/2.28-maintenance/pr-13213 
docs: fix duplicate anchor (backport #13213)
 2025-07-31 03:09:47 +00:00
mergify[bot]
2402aa219f
Merge pull request #13617 from NixOS/mergify/bp/2.28-maintenance/pr-13321 
Modify docker.nix to use mapAttrsToList instead of mapAttrsFlatten (backport #13321)
 2025-07-31 03:09:45 +00:00
mergify[bot]
e73d16377a
Merge pull request #13625 from NixOS/mergify/bp/2.28-maintenance/pr-13347 
Fix broken link in configuration description (backport #13347)
 2025-07-31 03:09:42 +00:00
mergify[bot]
84f27a1329
Merge pull request #13645 from NixOS/mergify/bp/2.28-maintenance/pr-13382 
Update docs (backport #13382)
 2025-07-31 03:09:40 +00:00
mergify[bot]
5bd259b311
Merge pull request #13611 from NixOS/mergify/bp/2.28-maintenance/pr-13305 
add documentation of tarball-ttl to nix-channel (backport #13305)
 2025-07-31 02:59:37 +00:00
mergify[bot]
35e563b6bd
Merge pull request #13634 from NixOS/mergify/bp/2.28-maintenance/pr-13361 
Fix a minor typo (backport #13361)
 2025-07-31 02:59:35 +00:00
mergify[bot]
ec920aea61
Merge pull request #13647 from NixOS/mergify/bp/2.28-maintenance/pr-13393 
Fix typo: remove an extra word (backport #13393)
 2025-07-31 02:59:32 +00:00
mergify[bot]
86ffcbcbfe
Merge pull request #13593 from NixOS/mergify/bp/2.28-maintenance/pr-13253 
export/meson: Don't require `-std=c++2a` for -c libraries in `.pc` files (backport #13253)
 2025-07-31 02:59:29 +00:00
mergify[bot]
8450dee5a2
Merge pull request #13609 from NixOS/mergify/bp/2.28-maintenance/pr-13304 
Fix overriding gtest with gmock (backport #13304)
 2025-07-31 02:59:27 +00:00
mergify[bot]
cae5086c60
Merge pull request #13619 from NixOS/mergify/bp/2.28-maintenance/pr-13326 
docker.nix: Prevent double copy of nixpkgs source tree (backport #13326)
 2025-07-30 19:32:18 +00:00
mergify[bot]
b2a2cf6934
Merge pull request #13585 from NixOS/mergify/bp/2.28-maintenance/pr-13232 
docs: add another equivalence for the implication operator (backport #13232)
 2025-07-30 19:32:14 +00:00
mergify[bot]
e261cc8f0d
Merge pull request #13591 from NixOS/mergify/bp/2.28-maintenance/pr-13245 
nix-profile{,-daemon}.fish: check for profile in XDG_DATA_HOME (backport #13245)
 2025-07-30 19:32:10 +00:00
mergify[bot]
8db221bc50
Merge pull request #13578 from NixOS/mergify/bp/2.28-maintenance/pr-13184 
Document more references concepts (backport #13184)
 2025-07-30 19:29:46 +00:00
mergify[bot]
3fe1b42423
Merge pull request #13583 from NixOS/mergify/bp/2.28-maintenance/pr-13221 
doc: Render verbatim `@docroot@` on contributing page (backport #13221)
 2025-07-30 19:29:42 +00:00
mergify[bot]
0d763f7ce2
Merge pull request #13577 from NixOS/mergify/bp/2.28-maintenance/pr-13175 
libutil/tarfile: Create the scratch `std::vector` only once (backport #13175)
 2025-07-30 13:26:14 +00:00
Sergei Zimmerman
9af1782bdf libstore-tests: Don't leak memory in tests 
We shouldn't leak memory in unit tests in order
to make enabling ASAN easier.

(cherry picked from commit 55d12dfc5d)
 2025-07-30 13:01:42 +00:00
Egor Konovalov
01963be827 Fix link 
Remove extra `realise`

(cherry picked from commit df21f24987)
 2025-07-30 13:01:37 +00:00
Nikita Krasnov
66a5d4c31b Update docs 
(cherry picked from commit 785f3867fd)
 2025-07-30 13:00:35 +00:00
Wolfgang Walther
e52fe2cab4 libstore: fix race condition when creating state directories 
Running parallel nix in nix can lead to multiple instances trying to
create the state directories and failing on the `createSymlink` step,
because the link already exists.

`replaceSymlink` is already idempotent, so let's use that.

Resolves #2706

(cherry picked from commit d64c922164)
 2025-07-30 12:56:36 +00:00
jayeshv
cac6cfe51e Fix a minor typo 
(cherry picked from commit 699db04df3)
 2025-07-30 12:54:33 +00:00
Sergei Zimmerman
4f105e7c7d libexpr: Remove non-const overload of listElems 
This overload isn't actually necessary anywhere and
doesn't make much sense. The pointers to `Value`s are
themselves const, but the `Value`s are mutable.
A non-const member function implies that the object itself
can be modified but this doesn't make much sense considering
the return type: `Value * const * `, which is a pointer
to a constant array of pointers to mutable values.

(cherry picked from commit 7b46eb9958)
 2025-07-30 12:54:28 +00:00
Pol Dellaiera
ffe384b21e docker: make sure nix config check works 
(cherry picked from commit 57c72dee9b)
 2025-07-30 12:45:48 +00:00
Luc Perkins
f97ff25aec Fix broken link in configuration description 
(cherry picked from commit 525078c59d)
 2025-07-30 12:43:45 +00:00
Eelco Dolstra
63f18cd0c6 Prevent double copy of nixpkgs source tree 
(cherry picked from commit 0a87ba0e39)
 2025-07-30 12:39:44 +00:00
PopeRigby
556b71d6c0 Modify docker.nix to use mapAttrsToList instead of mapAttrsFlatten 
The latter alias is deprecated in favor of the former, and produces a
warning.

(cherry picked from commit cfc15d6921)
 2025-07-30 12:39:29 +00:00
Jade Masker
aace3d91ac add reference to the tarball-ttl documentation 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit c0ceaa2d5d)
 2025-07-30 12:35:31 +00:00
Jade Masker
ab3ad122db remove overly verbose mention of fetchTarball 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit 633d39109b)
 2025-07-30 12:35:31 +00:00
Jade Lynn Masker
b320aa50fe add documentation of tarball-ttl to nix-channel 
(cherry picked from commit 6badd21b6a)
 2025-07-30 12:35:30 +00:00
Farid Zakaria
59da02def5 Overriding gtest with gmock 
How did this work before...

* Added .direnv/ to gitignore

(cherry picked from commit 58e34a2d27)
 2025-07-30 12:35:11 +00:00
Sergei Zimmerman
8f5e9b38f1 tests/functional: Add more language tests for builtins.match 
These tests have been collected from nixpkgs f870c6ccc8951fc48aeb293cf3e98ade6ac42668
usage of builtins.match for x86_64-linux eval system. At most 2 matching and
non-matching cases are included for each encountered regex. This should
hopefully add more confidence when possibly trying to switch the regex implementation
in the future.

(cherry picked from commit d555d6b404)
 2025-07-30 12:26:17 +00:00
zimbatm
e04004ebc2 nix flake archive: add --no-check-sigs option 
Allows to copy the archive to a remote host and not get

    error: cannot add path '/nix/store/01x2k4nlxcpyd85nnr0b9gm89rm8ff4x-source' because it lacks a signature by a trusted key

(cherry picked from commit 80a4293486)
 2025-07-30 12:24:08 +00:00
Tristan Ross
f56f6e9e14 Remove propagated-build-inputs when static 
(cherry picked from commit d07852b5f3)
 2025-07-30 12:19:48 +00:00
Sergei Zimmerman
354d4c4a32 export/meson: Don't require -std=c++2a for -c libraries in .pc files 
(cherry picked from commit d8da8f0cd6)
 2025-07-30 12:11:06 +00:00
Stefan Boca
3a3ee4a692 nix-profile{,-daemon}.fish: check for profile in XDG_DATA_HOME 
...and also NIX_STATE_HOME in nix-profile.fish. This is directly
translated from the bash scripts and makes the fish scripts equivalent
in functionality to the bash scripts.

Note that nix-profile.fish checks for NIX_STATE_HOME and
nix-profile-daemon.fish does not, so the two scripts are no longer
identical.

(cherry picked from commit 751f50f4ad)
 2025-07-30 12:04:54 +00:00
Gwenn Le Bihan
7126d57220 docs: add another equivalence for the implication operator 
the second equivalence, using a if-else expression, aligns much closer to how most humans think about implication, adding it might help some people :)

(cherry picked from commit 51151c2c28)
 2025-07-30 12:00:02 +00:00
Jörg Thalheim
c0a1e07bca libutil-tests/json-utils: fix -Werror=sign-compare error 
I am on a newer different nixpkgs branch, so I am getting this error

(cherry picked from commit 1290b7e53d)
 2025-07-30 11:58:01 +00:00