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
20138 commits 177 branches 218 tags 162 MiB
Commit graph

20138 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergei Zimmerman
adc17bace9
git-blame-ignore-revs: Add nixfmt 1.0.0 reformat 2025-08-18 22:51:37 +03:00
Sergei Zimmerman
d6aebd8847
flake: Apply nixfmt 1.0.0 2025-08-18 22:50:52 +03:00
Sergei Zimmerman
c53ac76f7b
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 22:48:03 +03:00
mergify[bot]
2454267de0
Merge pull request #13648 from NixOS/mergify/bp/2.29-maintenance/pr-13393 
Fix typo: remove an extra word (backport #13393)
 2025-07-31 03:47:43 +00:00
mergify[bot]
9572fdeb3b
Merge pull request #13650 from NixOS/mergify/bp/2.29-maintenance/pr-13395 
libstore-tests: Don't leak memory in tests (backport #13395)
 2025-07-31 03:47:40 +00:00
mergify[bot]
69d2e6eeef
Merge pull request #13605 from NixOS/mergify/bp/2.29-maintenance/pr-13282 
tests/functional: Add more language tests for `builtins.match` (backport #13282)
 2025-07-31 02:16:21 +00:00
mergify[bot]
2870c177d6
Merge pull request #13612 from NixOS/mergify/bp/2.29-maintenance/pr-13305 
add documentation of tarball-ttl to nix-channel (backport #13305)
 2025-07-31 02:11:59 +00:00
mergify[bot]
b0169fdc5f
Merge pull request #13633 from NixOS/mergify/bp/2.29-maintenance/pr-13360 
libexpr: Remove non-const overload of `listElems` (backport #13360)
 2025-07-31 02:11:56 +00:00
mergify[bot]
7b08e8d20e
Merge pull request #13610 from NixOS/mergify/bp/2.29-maintenance/pr-13304 
Fix overriding gtest with gmock (backport #13304)
 2025-07-31 02:11:52 +00:00
mergify[bot]
aabe327111
Merge pull request #13646 from NixOS/mergify/bp/2.29-maintenance/pr-13382 
Update docs (backport #13382)
 2025-07-31 02:11:49 +00:00
mergify[bot]
ab4951588b
Merge pull request #13620 from NixOS/mergify/bp/2.29-maintenance/pr-13326 
docker.nix: Prevent double copy of nixpkgs source tree (backport #13326)
 2025-07-31 02:11:46 +00:00
mergify[bot]
b41101c815
Merge pull request #13628 from NixOS/mergify/bp/2.29-maintenance/pr-13351 
docker: make sure `nix config check` works (backport #13351)
 2025-07-31 01:53:07 +00:00
mergify[bot]
cb73841205
Merge pull request #13626 from NixOS/mergify/bp/2.29-maintenance/pr-13347 
Fix broken link in configuration description (backport #13347)
 2025-07-31 01:53:04 +00:00
mergify[bot]
931ca7d11a
Merge pull request #13635 from NixOS/mergify/bp/2.29-maintenance/pr-13361 
Fix a minor typo (backport #13361)
 2025-07-31 01:53:01 +00:00
mergify[bot]
b5efc9ac56
Merge pull request #13618 from NixOS/mergify/bp/2.29-maintenance/pr-13321 
Modify docker.nix to use mapAttrsToList instead of mapAttrsFlatten (backport #13321)
 2025-07-31 01:52:59 +00:00
mergify[bot]
012f429104
Merge pull request #13639 from NixOS/mergify/bp/2.29-maintenance/pr-13373 
Fix typo (backport #13373)
 2025-07-31 01:52:55 +00:00
mergify[bot]
830dfc3b60
Merge pull request #13641 from NixOS/mergify/bp/2.29-maintenance/pr-13372 
Fix broken link (backport #13372)
 2025-07-31 01:49:41 +00:00
mergify[bot]
2968e18d37
Merge pull request #13637 from NixOS/mergify/bp/2.29-maintenance/pr-13368 
libstore: fix race condition when creating state directories (backport #13368)
 2025-07-31 01:49:39 +00:00
mergify[bot]
66a379a6de
Merge pull request #13596 from NixOS/mergify/bp/2.29-maintenance/pr-13257 
Make the S3 test more robust (backport #13257)
 2025-07-31 01:49:36 +00:00
mergify[bot]
1dcd12b819
Merge pull request #13592 from NixOS/mergify/bp/2.29-maintenance/pr-13245 
nix-profile{,-daemon}.fish: check for profile in XDG_DATA_HOME (backport #13245)
 2025-07-31 01:49:33 +00:00
mergify[bot]
2298df294b
Merge pull request #13602 from NixOS/mergify/bp/2.29-maintenance/pr-13277 
nix flake archive: add --no-check-sigs option (backport #13277)
 2025-07-31 01:49:30 +00:00
mergify[bot]
b4cd61900b
Merge pull request #13586 from NixOS/mergify/bp/2.29-maintenance/pr-13232 
docs: add another equivalence for the implication operator (backport #13232)
 2025-07-30 19:32:55 +00:00
mergify[bot]
2c258dd275
Merge pull request #13594 from NixOS/mergify/bp/2.29-maintenance/pr-13253 
export/meson: Don't require `-std=c++2a` for -c libraries in `.pc` files (backport #13253)
 2025-07-30 19:13:31 +00:00
mergify[bot]
75bece800d
Merge pull request #13599 from NixOS/mergify/bp/2.29-maintenance/pr-13275 
Remove propagated-build-inputs when static (backport #13275)
 2025-07-30 19:11:57 +00:00
mergify[bot]
582caa9d8f
Merge pull request #13580 from NixOS/mergify/bp/2.29-maintenance/pr-13211 
libexpr: Actually cache line information in PosTable (backport #13211)
 2025-07-30 19:11:53 +00:00
mergify[bot]
8a3d3b2dce
Merge pull request #13590 from NixOS/mergify/bp/2.29-maintenance/pr-13244 
nix-profile{,-daemon}.fish: fix do not source twice (backport #13244)
 2025-07-30 19:06:05 +00:00
mergify[bot]
56069a968b
Merge pull request #13582 from NixOS/mergify/bp/2.29-maintenance/pr-13213 
docs: fix duplicate anchor (backport #13213)
 2025-07-30 13:44:44 +00:00
Sergei Zimmerman
87ee4423ea 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:02:41 +00:00
Egor Konovalov
c9ecc99ce5 Fix link 
Remove extra `realise`

(cherry picked from commit df21f24987)
 2025-07-30 13:01:39 +00:00
Nikita Krasnov
ceb4d561fa Update docs 
(cherry picked from commit 785f3867fd)
 2025-07-30 13:00:38 +00:00
Nikita Krasnov
5d58ab8042 Fix broken link 
(cherry picked from commit da76bc0cac)
 2025-07-30 12:59:29 +00:00
Nikita Krasnov
27a8b457b8 Fix typo 
(cherry picked from commit 86dda9884a)
 2025-07-30 12:58:23 +00:00
Wolfgang Walther
229e97195a 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
e3f4cef054 Fix a minor typo 
(cherry picked from commit 699db04df3)
 2025-07-30 12:55:32 +00:00
Sergei Zimmerman
223d3222b3 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:33 +00:00
Pol Dellaiera
a98f742d67 docker: make sure nix config check works 
(cherry picked from commit 57c72dee9b)
 2025-07-30 12:45:49 +00:00
Luc Perkins
e0ceebe2ee Fix broken link in configuration description 
(cherry picked from commit 525078c59d)
 2025-07-30 12:43:45 +00:00
Eelco Dolstra
bb0e9b20aa Prevent double copy of nixpkgs source tree 
(cherry picked from commit 0a87ba0e39)
 2025-07-30 12:40:33 +00:00
PopeRigby
d7ed70841a 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:36 +00:00
Jade Masker
7d1704218f add reference to the tarball-ttl documentation 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit c0ceaa2d5d)
 2025-07-30 12:36:15 +00:00
Jade Masker
44a1e7e88c remove overly verbose mention of fetchTarball 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit 633d39109b)
 2025-07-30 12:36:14 +00:00
Jade Lynn Masker
ed7ebdfad3 add documentation of tarball-ttl to nix-channel 
(cherry picked from commit 6badd21b6a)
 2025-07-30 12:36:14 +00:00
Farid Zakaria
82fa307ca6 Overriding gtest with gmock 
How did this work before...

* Added .direnv/ to gitignore

(cherry picked from commit 58e34a2d27)
 2025-07-30 12:35:28 +00:00
Sergei Zimmerman
4d9d307477 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:20 +00:00
zimbatm
ee39380c12 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:10 +00:00
Tristan Ross
47ce401222 Remove propagated-build-inputs when static 
(cherry picked from commit d07852b5f3)
 2025-07-30 12:20:06 +00:00
Eelco Dolstra
78ac959e4c Make the S3 test more robust 
Waiting for the minio unit is apparently not reliable enough, so let's
also wait for the port.

(cherry picked from commit ca9696748a)
 2025-07-30 12:13:34 +00:00
Sergei Zimmerman
709349b118 export/meson: Don't require -std=c++2a for -c libraries in .pc files 
(cherry picked from commit d8da8f0cd6)
 2025-07-30 12:11:58 +00:00
Stefan Boca
9106a0b73a 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:56 +00:00
Stefan Boca
1b97d7409a nix-profile{,-daemon}.fish: fix do not source twice 
Commit b36637c8f7 set
`__ETC_PROFILE_NIX_SOURCED` globally, but this is not enough to prevent
the script from being run again by child shells, because the
variable was not exported and thus not inherited by any child process.
Exporting the variable also agrees with the bash scripts.

Notably, the old behavior broke `nix develop -c fish` in some cases,
because the profile bin directory got prepended to the path, causing
binaries from the profile to override binareis from the devshell.

(cherry picked from commit b9ed3ae36e)
 2025-07-30 12:03:51 +00:00