Eelco Dolstra
cb425af931
Add a generic check for rev attribute mismatches
...
(cherry picked from commit 3402b650cd
)
2023-08-07 16:33:57 +02:00
Eelco Dolstra
3cc2ff77da
GC server: Clear O_NONBLOCK on the right file descriptor
...
The bug fix in 6d30f9e6fe
erroneously
cleared O_NONBLOCK on the server rather than client FD (leaving both
in an incorrect state).
Fixes #8551 .
(cherry picked from commit a6a75ecad8
)
2023-08-07 16:31:04 +02:00
Eelco Dolstra
25e1eb4dfd
Bump version
2023-05-30 11:53:09 +02:00
Théophane Hufschmitt
43aa47cf8a
Merge pull request #8410 from tweag/backport-7957-to-2.13-maintenance
...
[Backport 2.13-maintenance] Switch to cachix/install-nix-action@v20
2023-05-28 17:24:13 +02:00
Théophane Hufschmitt
d17ecc5177
Switch to cachix/install-nix-action@v20
...
Fixes the installation issue with the latest Nix.
Also revert the pinning to nix-2.13 since it's not needed any more.
(cherry picked from commit c3b5499dff
)
2023-05-28 17:23:37 +02:00
Théophane Hufschmitt
e0afeef10f
Merge pull request #8409 from NixOS/backport-7766-to-2.13-maintenance
...
[Backport 2.13-maintenance] Bump cachix/install-nix-action from 18 to 19
2023-05-28 17:18:25 +02:00
dependabot[bot]
478b015577
Bump cachix/install-nix-action from 18 to 19
...
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action ) from 18 to 19.
- [Release notes](https://github.com/cachix/install-nix-action/releases )
- [Commits](https://github.com/cachix/install-nix-action/compare/v18...v19 )
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 6fdce7a9df
)
2023-05-28 15:18:06 +00:00
Théophane Hufschmitt
691d1170e5
Merge pull request #8408 from NixOS/backport-8399-to-2.13-maintenance
...
[Backport 2.13-maintenance] Properly report build errors on chrooted stores
2023-05-28 17:11:48 +02:00
Théophane Hufschmitt
00811f98fb
Properly report build errors on chrooted stores
...
When encountering a build error, Nix moves the output paths out of the
chroot into their final location (for “easier debugging of build
failures”). However this was broken for chroot stores as it was moving
it to the _logical_ location, not the _physical_ one.
Fix it by moving to the physical (_real_) location.
Fix https://github.com/NixOS/nix/issues/8395
(cherry picked from commit d16a1994fb
)
2023-05-28 15:11:26 +00:00
Théophane Hufschmitt
8aa178f75b
Merge pull request #8181 from NixOS/backport-8179-to-2.13-maintenance
...
[Backport 2.13-maintenance] disable gc on coroutine
2023-04-08 13:44:15 +02:00
Yorick van Pelt
ad96bf9791
Add talkative msg for coro gc debug
...
(cherry picked from commit 62ddd8633c
)
2023-04-07 16:21:30 +00:00
Yorick van Pelt
de7803e15f
Always disable GC in a coroutine unless the patch is applied
...
(cherry picked from commit 58d24a4cb6
)
2023-04-07 16:21:30 +00:00
Yorick van Pelt
cc90264a7d
DisableGC: replace by CoroutineContext, std::shared_ptr<void>
...
(cherry picked from commit 00bc34430b
)
2023-04-07 16:21:30 +00:00
Yorick van Pelt
325ea715b3
Disable GC inside coroutines on mac OS
...
(cherry picked from commit 2c53ef1bfe
)
2023-04-07 16:21:30 +00:00
John Ericson
11f12253ce
Merge pull request #8054 from NixOS/backport-8053-to-2.13-maintenance
...
[Backport 2.13-maintenance] LocalDerivationGoal: set NIX_ATTRS_*_FILE correctly for sandboxed builds
2023-03-16 18:24:51 -04:00
Linus Heckemann
e697c74269
LocalDerivationGoal: set NIX_ATTRS_*_FILE correctly for sandboxed builds
...
(cherry picked from commit af4cbdafe7
)
2023-03-16 15:04:52 +00:00
Eelco Dolstra
9bf0baa7f4
Bump version
2023-02-27 18:13:04 +01:00
Théophane Hufschmitt
4acc684ef7
Merge pull request #7878 from NixOS/backport-7856-to-2.13-maintenance
...
[Backport 2.13-maintenance] Wait with making /etc unwritable until after build env setup
2023-02-22 06:52:14 +01:00
Yorick van Pelt
11522a573d
Wait with making /etc unwritable until after build env setup
...
This fixes /etc/nsswitch.conf
(cherry picked from commit bbba49b3e4
)
2023-02-21 19:22:35 +00:00
Eelco Dolstra
1083ecbb2b
Merge pull request #7833 from hercules-ci/backport-7616-to-2.13-maintenance
...
Backport 7616 to 2.13 maintenance
2023-02-14 16:53:27 +01:00
Eelco Dolstra
911cd5b45a
Merge pull request #7837 from NixOS/backport-7830-to-2.13-maintenance
...
[Backport 2.13-maintenance] Don't allow writing to /etc
2023-02-14 16:52:50 +01:00
Yorick van Pelt
bca7075edc
Make /etc writability conditional on uid-range feature
...
(cherry picked from commit 49fd72a903
)
2023-02-14 15:50:29 +00:00
Yorick van Pelt
459832e5c2
container test: make /etc writable
...
(cherry picked from commit ad1f61c39b
)
2023-02-14 15:50:29 +00:00
Yorick van Pelt
58210e5306
Don't allow writing to /etc
...
(cherry picked from commit db41f74af3
)
2023-02-14 15:50:29 +00:00
Robert Hensing
4ca48e3c7f
NarInfoDiskCache: Also test id consistency with updated fields
...
And clarify test
(cherry picked from commit 19b495a48a
)
2023-02-14 14:54:51 +01:00
Robert Hensing
2e31c54ce5
NarInfoDiskCache: Keep BinaryCache.id stable and improve test
...
Fixes #3898
The entire `BinaryCaches` row used to get replaced after it became
stale according to the `timestamp` column. In a concurrent scenario,
this leads to foreign key conflicts as different instances of the
in-process `state.caches` cache now differ, with the consequence that
the older process still tries to use the `id` number of the old record.
Furthermore, this phenomenon appears to have caused the cache for
actual narinfos to be erased about every week, while the default
ttl for narinfos was supposed to be 30 days.
(cherry picked from commit fb94d5cabd
)
2023-02-14 14:54:51 +01:00
Robert Hensing
e404ae5bb6
NarInfoDiskCache: Prepare reproducer for #3898
...
(cherry picked from commit 2ceece3ef3
)
2023-02-14 14:54:51 +01:00
Robert Hensing
80498bd923
NarInfoDiskCacheImpl: Make dbPath a parameter
...
This allows testing with a clean database.
(cherry picked from commit 79f62d2dda
)
2023-02-13 12:02:46 +00:00
Robert Hensing
7a67baf951
NarInfoDiskCache: Rename cacheExists -> upToDateCacheExists
...
This is slightly more accurate considering that an outdated record
may exist in the persistent cache. Possibly-outdated records are
quite relevant as they may be foreign keys to more recent information
that we want to keep, but we will not return them here.
(cherry picked from commit 29f0b196f4
)
2023-02-13 12:02:46 +00:00
Robert Hensing
9f788403cf
sqlite.cc: Add SQL tracing
...
Set environment variable NIX_DEBUG_SQLITE_TRACES=1 to log all sql statements.
(cherry picked from commit 8a0ef5d58e
)
2023-02-13 12:02:46 +00:00
Robert Hensing
b6ce4e100a
local.mk: Don't log docroot comments
...
These were accidentally logged and do not need to appear in make's
log output.
(cherry picked from commit 1a86d3e98e
)
2023-02-13 12:02:46 +00:00
Robert Hensing
9157f94e77
Merge pull request #7746 from NixOS/backport-7705-to-2.13-maintenance
...
[Backport 2.13-maintenance] perl: run `initLibStore()` on `openStore()`
2023-02-04 13:39:00 +01:00
Maximilian Bosch
77d8066e83
perl: run initLibStore()
on openStore()
...
Since #7478 it's mandatory that `initLibStore()` is called for store
operations. However that's not the case when running `openStore()` in
Perl using the perl-bindings. That breaks e.g. `hydra-eval-jobset` when
built against Nix 2.13 which uses small portions of the store API.
(cherry picked from commit 51013da921
)
2023-02-03 22:33:58 +00:00
Eelco Dolstra
286d212d10
Bump version
2023-01-26 12:42:03 +01:00
Eelco Dolstra
435a16b555
Merge pull request #7694 from NixOS/backport-7685-to-2.13-maintenance
...
[Backport 2.13-maintenance] Fix the 2.13 changelog
2023-01-25 21:28:02 +01:00
John Ericson
13c00e2969
Update doc/manual/src/release-notes/rl-2.13.md
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
(cherry picked from commit f465e378c4
)
2023-01-25 20:08:59 +00:00
John Ericson
e60a492173
Fix the 2.13 changelog
...
It is just the new CLI that gets the `^` syntax. The old CLI already has
a (slightly different) `!` syntax.
Fixes #7682
(cherry picked from commit 816031173c
)
2023-01-25 20:08:59 +00:00
Robert Hensing
da3faaf8a6
Merge pull request #7687 from hercules-ci/2.13-maintenance-revert-addition-of-property-tests
...
[2.13-maintenance] revert addition of property tests
2023-01-25 18:54:17 +01:00
Robert Hensing
cdad101bc9
Restore some non-rapidcheck tests
2023-01-25 18:11:36 +01:00
Robert Hensing
3424e1e055
Revert "Try to fix #7669 "
...
We've decided against backporting rapidcheck
This reverts commit e60ee9e90a
.
2023-01-25 18:09:10 +01:00
Robert Hensing
9566203d0d
Partially revert "Test store paths, with property tests"
...
This reverts the addition of property tests from commit d111d2ed49
.
2023-01-25 11:33:29 +01:00
Robert Hensing
65e690a087
Revert "Add rapidcheck
dependency for testing"
...
This reverts commit c92e51ecec
.
2023-01-25 11:27:52 +01:00
Robert Hensing
2e66fe9b1e
Merge pull request #7680 from NixOS/backport-7679-to-2.13-maintenance
...
[Backport 2.13-maintenance] Revert "fixup: remove boehmgc patch"
2023-01-24 17:17:24 +01:00
Robert Hensing
7ddbc12bc8
Update boehmgc-coroutine-sp-fallback.diff
...
(cherry picked from commit 46054f932b
)
2023-01-24 15:27:09 +00:00
Robert Hensing
8f170f98f4
Actually complete the revert
...
(cherry picked from commit 8270dccf60
)
2023-01-24 15:27:09 +00:00
Robert Hensing
46daba3852
Revert "fixup: remove boehmgc patch"
...
It is still necessary.
Please do your research, or f ask the author, which happens to be me.
An evaluator like this is not an environment where "it compiles, so
it works" will ever hold.
This reverts commit 1c40182b12
.
(cherry picked from commit 0664ba0a67
)
2023-01-24 15:27:09 +00:00
Robert Hensing
75d33d3e89
Merge pull request #7678 from NixOS/backport-7670-to-2.13-maintenance
...
[Backport 2.13-maintenance] Try to fix #7669
2023-01-24 13:51:31 +01:00
John Ericson
e60ee9e90a
Try to fix #7669
...
The issue *seems* to be the cross jobs, which are missing the `CXXFLAGS`
needed to get rapidcheck.
PR #6538 would be really nice to resurrect which will prevent the
`configureFlags` from going out of sync between the regular build and
the cross build again.
(cherry picked from commit a91709a604
)
2023-01-24 11:44:19 +00:00
Robert Hensing
2c552c66af
Merge pull request #7666 from NixOS/backport-7657-to-2.13-maintenance
...
[Backport 2.13-maintenance] Fix #7655
2023-01-23 16:22:59 +01:00
Robert Hensing
aff2c1c642
Merge pull request #7664 from NixOS/backport-7639-to-2.13-maintenance
...
[Backport 2.13-maintenance] Test store paths, with property tests, fix bug
2023-01-23 15:58:43 +01:00