Skip to content

Upstream tracking #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1,189 commits into
base: 2.30-maintenance
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1189 commits
Select commit Hold shift + click to select a range
268bef8
Use FlakeHub inputs
lucperkins Jun 5, 2025
aed1e02
Use 'published' release type to avoid double uploads
gustavderdrache Jun 5, 2025
76b9be3
Merge pull request #90 from DeterminateSystems/gustavderdrache/releas…
grahamc Jun 5, 2025
fcdffff
lockFlake(): Allow registry lookups for overridden inputs
getchoo May 28, 2025
5c3aed3
Merge pull request #13330 from NixOS/mergify/bp/2.29-maintenance/pr-1…
mergify[bot] Jun 6, 2025
214654d
Remove unnecessary follows directive
lucperkins Jun 6, 2025
112ff50
Use specific revision for git-hooks
lucperkins Jun 6, 2025
a69b99a
Add ForwardingSourceAccessor
edolstra Jun 6, 2025
e18b163
Fix display of paths in substituted source trees
edolstra Jun 6, 2025
a989a23
Fix some instances of 'will'
lucperkins Jun 6, 2025
cddb268
Merge remote-tracking branch 'origin/detsys-main' into flakehub-inputs
lucperkins Jun 6, 2025
74af43e
Remove superfluous semicolon
edolstra Jun 6, 2025
0e1df1c
Merge pull request #91 from DeterminateSystems/fix-substituted-input-…
edolstra Jun 6, 2025
f8ef941
fetchToStore(): Cache in dry-run mode
edolstra Jun 6, 2025
86785fd
fetchToStore(): Fix caching
edolstra Jun 6, 2025
cbb6351
Fixup checks around the error message 'will not fetch unlocked input'
grahamc Jun 6, 2025
62029df
Fixup checks around the error message 'Will not write lock file of fl…
grahamc Jun 6, 2025
6898f04
Merge remote-tracking branch 'origin/detsys-main' into flakehub-inputs
lucperkins Jun 7, 2025
c815961
Make Nixpkgs hash match current hash
lucperkins Jun 11, 2025
054cab0
Provide strict version constraint for Nixpkgs
lucperkins Jun 11, 2025
96874f4
Merge pull request #89 from DeterminateSystems/flakehub-inputs
edolstra Jun 11, 2025
550c894
Merge pull request #93 from DeterminateSystems/fix-fetcher-cache
edolstra Jun 11, 2025
7f6efe9
Don't register extra primops twice
edolstra Jun 11, 2025
ac6318c
Merge pull request #97 from DeterminateSystems/fix-duplicate-builtins
grahamc Jun 11, 2025
c6f8737
Update src/libmain/plugin.cc
grahamc Jun 11, 2025
2f5a545
fetchToStore(): Improve caching in dry-run mode
edolstra Jun 11, 2025
de793b7
Make the S3 test more robust
edolstra May 23, 2025
7bafc99
Run nixpkgsLibTests in lazy trees mode
edolstra Jun 11, 2025
df7a2a1
nix-instantiate --eval --json: Devirtualize the output
edolstra Jun 11, 2025
31e58dc
nix-instantiate --eval --xml: Devirtualize the output
edolstra Jun 11, 2025
7a75a38
Merge pull request #101 from DeterminateSystems/gustavderdrache/backp…
grahamc Jun 11, 2025
42c50aa
Fix broken link in configuration description
lucperkins Jun 11, 2025
e9c6002
Merge pull request #102 from DeterminateSystems/fix-broken-conf-link
edolstra Jun 11, 2025
87fb81a
Make the repl test more robust
edolstra Jun 11, 2025
2775516
Merge pull request #92 from DeterminateSystems/lucperkins/fh-864-fix-…
lucperkins Jun 11, 2025
a95067d
Merge pull request #103 from DeterminateSystems/repl-test-robust
edolstra Jun 11, 2025
168184a
Merge pull request #100 from DeterminateSystems/lib-tests-lazy
edolstra Jun 11, 2025
7051591
Go back to x86 native macOS builds
grahamc Jun 11, 2025
c77a857
Merge pull request #104 from DeterminateSystems/push-kutvxtkvzunk
grahamc Jun 11, 2025
3114862
Merge pull request #98 from DeterminateSystems/fix-fetchToStore-dryRu…
cole-h Jun 12, 2025
db3cecd
Prepare release v3.6.3
github-actions[bot] Jun 12, 2025
c36fc11
Set .version-determinate to 3.6.3
github-actions[bot] Jun 12, 2025
f4a3894
Generare release notes for 3.6.3
github-actions[bot] Jun 12, 2025
92d90e2
Run the Nix test suite with lazy trees enabled
edolstra Jun 11, 2025
0922c72
Fix flakes test with lazy trees enabled
edolstra Jun 11, 2025
b067e65
Git fetcher: Do not consider a null revision (i.e. workdir) to be locked
edolstra Jun 12, 2025
fca291a
Fix NAR hash checking for fetchGit with lazy tees
edolstra Jun 12, 2025
f6b6121
Update doc/manual/source/release-notes-determinate/changes.md
grahamc Jun 12, 2025
4921297
Update doc/manual/source/release-notes-determinate/rl-3.6.3.md
grahamc Jun 12, 2025
829d3f8
Apply suggestions from code review
grahamc Jun 12, 2025
6477d7c
mountInput(): Optimize getting the NAR hash for real store paths
edolstra Jun 12, 2025
279a6b1
Formatting
edolstra Jun 12, 2025
46c1a71
Merge pull request #105 from DeterminateSystems/run-lazy-trees-tests
grahamc Jun 12, 2025
e565571
Re-supply inadvertently deleted word
lucperkins Jun 12, 2025
b8e8214
Fix one more 'will'
lucperkins Jun 12, 2025
b9e8767
Merge pull request #107 from DeterminateSystems/fix-typo
grahamc Jun 12, 2025
642d1bd
Update doc/manual/source/release-notes-determinate/rl-3.6.3.md
grahamc Jun 12, 2025
a572c94
Fix deep overrides
edolstra Jun 12, 2025
9a18a11
Add tests for deep overrides
edolstra Jun 12, 2025
6999183
Don't allow flake inputs to have both a flakeref and a follows
edolstra Jun 12, 2025
60257ec
Merge pull request #106 from DeterminateSystems/release-v3.6.3/1649aa…
grahamc Jun 12, 2025
760e6e5
Prepare release v3.6.4
github-actions[bot] Jun 12, 2025
17de8fd
Set .version-determinate to 3.6.4
github-actions[bot] Jun 12, 2025
ac5cbe7
Generare release notes for 3.6.4
github-actions[bot] Jun 12, 2025
da67f59
Mark 3.6.3 as revoked, and use its notes for 3.6.4
grahamc Jun 12, 2025
1533b85
Merge pull request #109 from DeterminateSystems/release-v3.6.4/afc44a…
grahamc Jun 12, 2025
37ab15a
Drop the complainy 3.6.3 line
grahamc Jun 13, 2025
b3b5dd6
Merge pull request #111 from DeterminateSystems/push-suswmmmyvmxm
edolstra Jun 13, 2025
802f585
Add lazy-locks setting
edolstra Jun 13, 2025
ff5f65d
Move the actual vm tests / flake regressions into the generic build p…
grahamc Jun 13, 2025
b2c762c
Apply suggestions from code review
edolstra Jun 13, 2025
8aa7d7d
Go back to github hosted runners... blacksmith's keep dying
grahamc Jun 13, 2025
e84daa2
Merge pull request #112 from DeterminateSystems/push-xrtwsoznmtqt
grahamc Jun 13, 2025
cbedb8e
Fix broken fetchToStore() caching on unlocked inputs
edolstra Jun 13, 2025
8b9cb38
Fix `path` field in fetcher cache
edolstra Jun 13, 2025
49a059d
Merge pull request #110 from DeterminateSystems/fix-fetcher-cache
edolstra Jun 13, 2025
c7d8087
Parallelize the flake regression suite
grahamc Jun 13, 2025
f764c9e
Add retry to the eval steps, split out m since it takes a while on it…
grahamc Jun 13, 2025
b0a325d
Run on GHA runners, not blacksmith due to timeouts
grahamc Jun 13, 2025
6185afe
Run onnamespace, use their cache
grahamc Jun 13, 2025
97dc226
Use fewer runners
grahamc Jun 13, 2025
cf11e27
Don't stall on a stuck nixos vm test build forever
grahamc Jun 13, 2025
d41480d
Merge pull request #114 from DeterminateSystems/push-zlvvuopvyszo
grahamc Jun 16, 2025
151456a
Change the aarch64 linux / x86 darwin condition to exclude pull reque…
grahamc Jun 16, 2025
eba6cd8
Don't build fallback-paths if we didn't build aarch64-linux and x86 d…
grahamc Jun 16, 2025
b0aa12d
Merge pull request #116 from DeterminateSystems/push-zrwpvlwurrkr
grahamc Jun 16, 2025
dc5e620
fetchToStore() cache: Use content hashes instead of store paths
edolstra Jun 13, 2025
af5815f
Give unit tests access to a $HOME directory
edolstra Jun 16, 2025
e3fa4fa
fetchToStore(): Don't require a valid path in dry run mode
edolstra Jun 16, 2025
b2905dc
fetchToStore(): Address a FIXME
edolstra Jun 16, 2025
1aadf1e
Increase the nixos test timeout to 10 minutes, up from 5
grahamc Jun 16, 2025
20742e6
Use GHA runners for VMs since they have KVM
grahamc Jun 16, 2025
408d4a0
Merge pull request #118 from DeterminateSystems/push-lrtmozosxrvy
grahamc Jun 16, 2025
7f21086
Merge pull request #115 from DeterminateSystems/fetchToStore-cache-ha…
grahamc Jun 16, 2025
2190f6c
Prepare release v3.6.5
github-actions[bot] Jun 16, 2025
11d7250
Set .version-determinate to 3.6.5
github-actions[bot] Jun 16, 2025
fd4ed4c
Generare release notes for 3.6.5
github-actions[bot] Jun 16, 2025
fe6972f
Fixup type (generare)
grahamc Jun 16, 2025
97e2e91
Fixup generar->te in commit automation
grahamc Jun 16, 2025
c0e53f3
Move the 3.6.4 notes over
grahamc Jun 16, 2025
0f38921
Add a final newline in the generated release notes
grahamc Jun 16, 2025
7469e7a
Merge pull request #119 from DeterminateSystems/release-v3.6.5/c7ec43…
grahamc Jun 16, 2025
5329a45
Git fetcher: Make dirty repos with no commits cacheable
edolstra Jun 16, 2025
a175c67
Fix rootFS fingerprint in the impure case
edolstra Jun 16, 2025
3a4e6ca
Improve regression testing for uncachable source paths
edolstra Jun 16, 2025
c6617d6
Remove `buildUser` from `DerivationBuilder`
edolstra May 26, 2025
189fdfa
Remove duplicate comments on DerivationBuilderImpl overriden methods
edolstra May 26, 2025
af1b580
DerivationBuilderImpl: Drop std::optional from derivationType
edolstra May 26, 2025
3733f95
DerivationBuilder: Move Linux/Darwin-specific code into subclasses
edolstra May 26, 2025
2d5d3e4
Move pathsInChroot
edolstra May 26, 2025
305a968
Eliminate useChroot
edolstra May 26, 2025
1acdb91
Move doBind()
edolstra May 26, 2025
5d96e55
Move seccomp code
edolstra May 26, 2025
f517650
Move autoDelChroot
edolstra May 26, 2025
492b684
Get rid of tmpDirInSandbox variable
edolstra May 26, 2025
c9bb16a
Inline initTmpDir()
edolstra May 26, 2025
ab18d8c
Move cgroup support
edolstra May 26, 2025
21fd152
Fix macOS build
edolstra May 27, 2025
d0a2637
Remove unused variable
edolstra May 27, 2025
95f87ab
Cleanup
edolstra May 28, 2025
803d461
Add external builders
edolstra May 28, 2025
a0fb93f
Make sandbox error messages more readable
edolstra May 30, 2025
5842d54
Drop bad std::move
edolstra Jun 11, 2025
1eab423
Prepare release v3.6.6
github-actions[bot] Jun 17, 2025
97af071
Set .version-determinate to 3.6.6
github-actions[bot] Jun 17, 2025
f9b88e3
Generate release notes for 3.6.6
github-actions[bot] Jun 17, 2025
cd01287
Apply suggestions from code review
grahamc Jun 17, 2025
fc2d5a1
Merge pull request #121 from DeterminateSystems/release-v3.6.6/3dd48f…
grahamc Jun 17, 2025
86fbaf3
tests: fixup with jq-1.8.0
vcunat Jun 18, 2025
4c7e5ce
Merge pull request #13375 from NixOS/mergify/bp/2.29-maintenance/pr-1…
mergify[bot] Jun 18, 2025
2f6c758
Revert "Drop magic-nix-cache"
edolstra Jun 18, 2025
075df0b
Merge pull request #13380 from NixOS/mergify/bp/2.29-maintenance/pr-1…
mergify[bot] Jun 19, 2025
5d2986d
tests: fixup with jq-1.8.0
vcunat Jun 18, 2025
692dfb4
Merge pull request #117 from DeterminateSystems/test-uncacheable
edolstra Jun 19, 2025
1d5e161
Merge pull request #113 from DeterminateSystems/eelcodolstra/fh-851-l…
edolstra Jun 19, 2025
8334061
Make the repl test more robust
edolstra Jun 11, 2025
b3b137e
Merge pull request #13392 from NixOS/mergify/bp/2.29-maintenance/pr-1…
mergify[bot] Jun 22, 2025
7059d2b
Merge remote-tracking branch 'origin/2.29-maintenance' into sync-2.29.1
edolstra Jun 23, 2025
5dea62b
Merge pull request #124 from DeterminateSystems/sync-2.29.1
grahamc Jun 23, 2025
58a878d
Prepare release v3.6.7
github-actions[bot] Jun 24, 2025
ff05659
Set .version-determinate to 3.6.7
github-actions[bot] Jun 24, 2025
098be10
Generate release notes for 3.6.7
github-actions[bot] Jun 24, 2025
731b630
Fixes for GHSA-g948-229j-48j3
edolstra Jun 19, 2025
e8f145a
nix flake prefetch-inputs: Add
edolstra Jun 24, 2025
404d824
Update changelogs
grahamc Jun 24, 2025
c224b83
Merge pull request #126 from DeterminateSystems/release-v3.6.7/84df89…
grahamc Jun 24, 2025
a20a7fa
Allow specifying args to external builder program
cole-h Jun 17, 2025
c2baff6
Prepare release v3.6.8
github-actions[bot] Jun 25, 2025
fd8b327
Set .version-determinate to 3.6.8
github-actions[bot] Jun 25, 2025
4ba66db
Generate release notes for 3.6.8
github-actions[bot] Jun 25, 2025
3a8bd3b
Merge pull request #128 from DeterminateSystems/release-v3.6.8/754738…
detsys-spaghetti[bot] Jun 25, 2025
1ef1675
Merge remote-tracking branch 'detsys/detsys-main' into eelcodolstra/f…
edolstra Jun 25, 2025
0e352a6
Merge remote-tracking branch 'detsys/detsys-main' into fix-deep-overr…
edolstra Jun 25, 2025
7bb167d
Merge pull request #108 from DeterminateSystems/fix-deep-overrides
edolstra Jun 25, 2025
e04aa2b
Move FlakeCommand into a header, allow separate registration of subco…
edolstra Jun 26, 2025
9f4d805
nix store delete: Give a more specific error message
edolstra Jun 27, 2025
83a9b92
nix store delete: Show the first root that prevents deletion
edolstra Jun 27, 2025
cae732f
Don't censor root info for trusted users
edolstra Jun 27, 2025
31b0021
Show which PID is causing a temp root
edolstra Jun 27, 2025
51acb1d
Path fetcher: Only show "copying to store" when actually copying
edolstra Jun 27, 2025
38a7320
Fix eval caching for path flakes
edolstra Jun 27, 2025
842b884
Merge pull request #131 from DeterminateSystems/path-fingerprint
edolstra Jun 30, 2025
71aecfc
Fix test
edolstra Jun 30, 2025
572c938
nix flake prefetch-inputs: Keep going if an input fails
edolstra Jun 30, 2025
e809a56
Merge pull request #130 from DeterminateSystems/improve-nix-store-del…
edolstra Jun 30, 2025
4235165
Merge pull request #127 from DeterminateSystems/eelcodolstra/fh-865-a…
edolstra Jun 30, 2025
ef4e7df
Merge detsys-main
cole-h Jun 27, 2025
b64a310
Fix warning when `HAVE_EMBEDDED_SANDBOX_SHELL` is not set
Ericson2314 May 28, 2025
1521a81
external-derivation-builder: `args` must always be specified
cole-h Jun 30, 2025
87dccde
Prepare release v3.7.0
github-actions[bot] Jul 3, 2025
ab327e7
Set .version-determinate to 3.7.0
github-actions[bot] Jul 3, 2025
103b09b
Generate release notes for 3.7.0
github-actions[bot] Jul 3, 2025
a6ad4a5
Clean up changelogs
grahamc Jul 3, 2025
d9541eb
Apply suggestions from code review
grahamc Jul 3, 2025
81672fe
Merge pull request #133 from DeterminateSystems/release-v3.7.0/e73088…
detsys-spaghetti[bot] Jul 3, 2025
53a743b
queryMissing(): Return a struct
edolstra Jul 4, 2025
3a63620
printMissing(): Take a MissingPaths argument
edolstra Jul 4, 2025
1df1773
nix-build: Drop unnecessary call to queryMissing()
edolstra Jul 4, 2025
5c95921
nix flake check: Skip substitutable derivations
edolstra Jul 4, 2025
175406c
Merge remote-tracking branch 'origin/2.30-maintenance' into sync-2.30.0
edolstra Jul 7, 2025
f7c95fd
Bump version
edolstra Jul 8, 2025
48c7e5e
installers, tests: remove --preserve=mode from cp invocations
jsoo1 Jul 7, 2025
65b9e01
Merge pull request #13430 from NixOS/mergify/bp/2.30-maintenance/pr-1…
edolstra Jul 8, 2025
dcc4b7c
docker: fix nixConf
h0nIg Jul 9, 2025
8b0cfae
docker: fix nixConf - fmt
h0nIg Jul 9, 2025
ed8f7df
Merge pull request #13436 from NixOS/mergify/bp/2.30-maintenance/pr-1…
mergify[bot] Jul 9, 2025
0638370
Merge pull request #135 from DeterminateSystems/sync-2.30.0
cole-h Jul 9, 2025
2ecc515
lockFlake(): When updating a lock, respect the input's lock file
edolstra Jul 9, 2025
668088b
Merge pull request #134 from DeterminateSystems/nix-flake-check-dont-…
edolstra Jul 9, 2025
700ceb2
Hide double copy warning
edolstra Jul 9, 2025
facfff4
Merge pull request #137 from DeterminateSystems/eelcodolstra/cf-65-de…
cole-h Jul 9, 2025
e1d45bb
Merge pull request #138 from DeterminateSystems/hide-double-copy-warning
cole-h Jul 9, 2025
47081aa
Remove some dead code to minimize the upstream diff
edolstra Jul 9, 2025
930aabb
Merge pull request #139 from DeterminateSystems/remove-dead
edolstra Jul 9, 2025
37487ee
lockFlake(): When updating a lock, respect the input's lock file
edolstra Jul 9, 2025
f880135
Merge pull request #13439 from NixOS/mergify/bp/2.30-maintenance/pr-1…
tomberek Jul 10, 2025
165afee
Prepare release v3.8.0
github-actions[bot] Jul 10, 2025
a78a2fd
Set .version-determinate to 3.8.0
github-actions[bot] Jul 10, 2025
c0dfe87
Generate release notes for 3.8.0
github-actions[bot] Jul 10, 2025
8f31e84
Update release notes
grahamc Jul 10, 2025
804729b
Merge remote-tracking branch 'detsys/detsys-main' into refactor-deriv…
edolstra Jul 10, 2025
2374da5
Merge pull request #140 from DeterminateSystems/release-v3.8.0/5087c9…
grahamc Jul 10, 2025
7119d59
fetchClosure: Fix gcc warning
edolstra Jul 10, 2025
c8cab89
Merge pull request #13446 from NixOS/mergify/bp/2.30-maintenance/pr-1…
edolstra Jul 10, 2025
d1f57c5
external-derivation-builder: write the json doc into builder's stdin
cole-h Jun 30, 2025
382e254
libexpr: Fix invalid handling of errors for imported functions
xokdvium Jul 11, 2025
eb3c004
Merge pull request #13453 from NixOS/mergify/bp/2.30-maintenance/pr-1…
xokdvium Jul 11, 2025
8e21e61
Address ifdef problem with macOS/BSD sandboxing
gustavderdrache Jul 11, 2025
ebcfa04
Merge pull request #142 from DeterminateSystems/gustavderdrache/push-…
cole-h Jul 11, 2025
861b196
Prepare release v3.8.1
github-actions[bot] Jul 11, 2025
fd3e326
Set .version-determinate to 3.8.1
github-actions[bot] Jul 11, 2025
e635060
Generate release notes for 3.8.1
github-actions[bot] Jul 11, 2025
1cf2026
Address ifdef problem with macOS/BSD sandboxing
gustavderdrache Jul 11, 2025
9497b59
CI: Roll nix version to 2.29.1
gustavderdrache Jul 11, 2025
8a1b94d
Merge pull request #143 from DeterminateSystems/release-v3.8.1/2ab4e7…
detsys-spaghetti[bot] Jul 11, 2025
bbc9d6c
ci: don't run the full test suite for x86_64-darwin
grahamc Jul 12, 2025
2fc9a60
Merge pull request #144 from DeterminateSystems/grahamc-patch-1
grahamc Jul 12, 2025
37071b2
Try publishing the manual again
grahamc Jul 12, 2025
b96c3e4
Maybe this helps
grahamc Jul 12, 2025
15871ad
Merge pull request #145 from DeterminateSystems/push-lxmxkysvvluw
grahamc Jul 12, 2025
857365c
Merge pull request #13458 from NixOS/mergify/bp/2.30-maintenance/pr-1…
edolstra Jul 12, 2025
dea86cd
Merge tag '2.30.1' into sync-2.30.1
edolstra Jul 12, 2025
e25be4a
Prepare release v3.8.2
github-actions[bot] Jul 12, 2025
86fe005
Set .version-determinate to 3.8.2
github-actions[bot] Jul 12, 2025
db0c2ef
Generate release notes for 3.8.2
github-actions[bot] Jul 12, 2025
adab147
Merge pull request #146 from DeterminateSystems/sync-2.30.1
cole-h Jul 12, 2025
04045d5
Merge pull request #147 from DeterminateSystems/release-v3.8.2/f8796e…
detsys-spaghetti[bot] Jul 12, 2025
efa2398
Add an `external-builders` experimental feature
cole-h Jul 14, 2025
b029442
Only build the manual on x86_64-linux
edolstra Jul 14, 2025
5b27325
Revert "external-derivation-builder: write the json doc into builder'…
cole-h Jul 14, 2025
de158c3
fixup: document why we're not writing through stdin right now
cole-h Jul 14, 2025
dedc3b2
Merge pull request #148 from DeterminateSystems/conditional-manual
cole-h Jul 14, 2025
35a8e9c
Merge pull request #141 from DeterminateSystems/external-builder-stdin
edolstra Jul 14, 2025
de560da
Improve rendering of ignored exceptions
edolstra Jul 15, 2025
dc77357
Improve handleSQLiteBusy() message
edolstra Jul 15, 2025
aff4ccd
Use WAL mode for SQLite cache databases
edolstra Jul 15, 2025
c1b0b15
Merge remote-tracking branch 'detsys/detsys-main' into refactor-deriv…
edolstra Jul 15, 2025
c299fba
Merge pull request #150 from DeterminateSystems/concurrent-eval-cache
grahamc Jul 16, 2025
51449d7
external-derivation-builder: run under build user, chown topTmpDir to…
cole-h Jul 15, 2025
d3dc64b
external-derivation-builder: chdir into tmpdir
cole-h Jul 15, 2025
adc16a4
Merge remote-tracking branch 'detsys/detsys-main' into refactor-deriv…
edolstra Jul 17, 2025
e290b52
Merge remote-tracking branch 'detsys/external-builder-under-build-use…
edolstra Jul 17, 2025
3cabd4f
Improve error message parsing external-builders setting
edolstra Jul 17, 2025
6d12193
Merge pull request #78 from DeterminateSystems/refactor-derivation-bu…
grahamc Jul 17, 2025
7fb7e7c
Prepare release v3.8.3
github-actions[bot] Jul 18, 2025
e4a1c33
Set .version-determinate to 3.8.3
github-actions[bot] Jul 18, 2025
8d47834
Generate release notes for 3.8.3
github-actions[bot] Jul 18, 2025
082ffc3
Tweak the release notes
grahamc Jul 18, 2025
e1c2853
fixup release note wording
cole-h Jul 18, 2025
aa49e14
Merge pull request #153 from DeterminateSystems/release-v3.8.3/f94fb5…
detsys-spaghetti[bot] Jul 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions .github/CODEOWNERS

This file was deleted.

21 changes: 9 additions & 12 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Bug report
about: Report unexpected or incorrect behaviour
title: ''
title: ""
labels: bug
assignees: ''

assignees: ""
---

## Describe the bug
Expand Down Expand Up @@ -32,7 +31,9 @@ assignees: ''

## Metadata

<!-- Please insert the output of running `nix-env --version` below this line -->
<!-- Please insert the output of running `determinate-nixd version` below this line -->

<!-- Please insert the output of running `nix --version` below this line -->

## Additional context

Expand All @@ -42,13 +43,9 @@ assignees: ''

<!-- make sure this issue is not redundant or obsolete -->

- [ ] checked [latest Nix manual] \([source])
- [ ] checked [latest Determinate Nix manual] \([source])
- [ ] checked [open bug issues and pull requests] for possible duplicates

[latest Nix manual]: https://nixos.org/manual/nix/unstable/
[source]: https://github.com/NixOS/nix/tree/master/doc/manual/source
[open bug issues and pull requests]: https://github.com/NixOS/nix/labels/bug

---

Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
[latest Determinate Nix manual]: https://manual.determinate.systems/
[source]: https://github.com/DeterminateSystems/nix-src/tree/detsys-main/doc/manual/source
[open bug issues and pull requests]: https://github.com/DeterminateSystems/nix-src/labels/bug
19 changes: 7 additions & 12 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest a new feature
title: ''
title: ""
labels: feature
assignees: ''

assignees: ""
---

## Is your feature request related to a problem?
Expand All @@ -27,13 +26,9 @@ assignees: ''

<!-- make sure this issue is not redundant or obsolete -->

- [ ] checked [latest Nix manual] \([source])
- [ ] checked [open feature issues and pull requests] for possible duplicates

[latest Nix manual]: https://nixos.org/manual/nix/unstable/
[source]: https://github.com/NixOS/nix/tree/master/doc/manual/source
[open feature issues and pull requests]: https://github.com/NixOS/nix/labels/feature

---
- [ ] checked [latest Determinate Nix manual] \([source])
- [ ] checked [open bug issues and pull requests] for possible duplicates

Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
[latest Determinate Nix manual]: https://manual.determinate.systems/
[source]: https://github.com/DeterminateSystems/nix-src/tree/detsys-main/doc/manual/source
[open bug issues and pull requests]: https://github.com/DeterminateSystems/nix-src/labels/bug
23 changes: 9 additions & 14 deletions .github/ISSUE_TEMPLATE/installer.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
---
name: Installer issue
about: Report problems with installation
title: ''
title: ""
labels: installer
assignees: ''

assignees: ""
---

## Platform

<!-- select the platform on which you tried to install Nix -->
<!-- select the platform on which you tried to install Determinate Nix -->

- [ ] Linux: <!-- state your distribution, e.g. Arch Linux, Ubuntu, ... -->
- [ ] macOS
- [ ] Linux: <!-- state your distribution, e.g. Arch Linux, Ubuntu, ... -->
- [ ] WSL

## Additional information
Expand All @@ -35,13 +34,9 @@ assignees: ''

<!-- make sure this issue is not redundant or obsolete -->

- [ ] checked [latest Nix manual] \([source])
- [ ] checked [open installer issues and pull requests] for possible duplicates

[latest Nix manual]: https://nixos.org/manual/nix/unstable/
[source]: https://github.com/NixOS/nix/tree/master/doc/manual/source
[open installer issues and pull requests]: https://github.com/NixOS/nix/labels/installer

---
- [ ] checked [latest Determinate Nix manual] \([source])
- [ ] checked [open bug issues and pull requests] for possible duplicates

Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
[latest Determinate Nix manual]: https://manual.determinate.systems/
[source]: https://github.com/DeterminateSystems/nix-src/tree/detsys-main/doc/manual/source
[open bug issues and pull requests]: https://github.com/DeterminateSystems/nix-src/labels/bug
19 changes: 7 additions & 12 deletions .github/ISSUE_TEMPLATE/missing_documentation.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Missing or incorrect documentation
about: Help us improve the reference manual
title: ''
title: ""
labels: documentation
assignees: ''

assignees: ""
---

## Problem
Expand All @@ -19,13 +18,9 @@ assignees: ''

<!-- make sure this issue is not redundant or obsolete -->

- [ ] checked [latest Nix manual] \([source])
- [ ] checked [open documentation issues and pull requests] for possible duplicates

[latest Nix manual]: https://nixos.org/manual/nix/unstable/
[source]: https://github.com/NixOS/nix/tree/master/doc/manual/source
[open documentation issues and pull requests]: https://github.com/NixOS/nix/labels/documentation

---
- [ ] checked [latest Determinate Nix manual] \([source])
- [ ] checked [open bug issues and pull requests] for possible duplicates

Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
[latest Determinate Nix manual]: https://manual.determinate.systems/
[source]: https://github.com/DeterminateSystems/nix-src/tree/detsys-main/doc/manual/source
[open bug issues and pull requests]: https://github.com/DeterminateSystems/nix-src/labels/bug
25 changes: 0 additions & 25 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
<!--

IMPORTANT

Nix is a non-trivial project, so for your contribution to be successful,
it really is important to follow the contributing guidelines:

https://github.com/NixOS/nix/blob/master/CONTRIBUTING.md

Even if you've contributed to open source before, take a moment to read it,
so you understand the process and the expectations.

- what information to include in commit messages
- proper attribution
- volunteering contributions effectively
- how to get help and our review process.

-->

## Motivation

<!-- Briefly explain what the change is about and why it is desirable. -->
Expand All @@ -30,9 +11,3 @@ so you understand the process and the expectations.
<!-- Invasive change: Discuss alternative designs or approaches you considered. -->

<!-- Large change: Provide instructions to reviewers how to read the diff. -->

---

Add :+1: to [pull requests you find important](https://github.com/NixOS/nix/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc).

The Nix maintainer team uses a [GitHub project board](https://github.com/orgs/NixOS/projects/19) to [schedule and track reviews](https://github.com/NixOS/nix/tree/master/maintainers#project-board-protocol).
25 changes: 6 additions & 19 deletions .github/STALE-BOT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,21 @@

- Thanks for your contribution!
- To remove the stale label, just leave a new comment.
- _How to find the right people to ping?_ &rarr; [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.)
- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/) or on [Matrix - #users:nixos.org](https://matrix.to/#/#users:nixos.org).
- You can always ask for help on [Discord](https://determinate.systems/discord).

## Suggestions for PRs

1. GitHub sometimes doesn't notify people who commented / reviewed a PR previously, when you (force) push commits. If you have addressed the reviews you can [officially ask for a review](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from those who commented to you or anyone else.
2. If it is unfinished but you plan to finish it, please mark it as a draft.
3. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work.
4. To get things rolling again, rebase the PR against the target branch and address valid comments.
5. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604).
6. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions.
1. If it is unfinished but you plan to finish it, please mark it as a draft.
1. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work.
1. To get things rolling again, rebase the PR against the target branch and address valid comments.
1. If you need a review to move forward, ask in [Discord](https://determinate.systems/discord).

## Suggestions for issues

1. If it is resolved (either for you personally, or in general), please consider closing it.
2. If this might still be an issue, but you are not interested in promoting its resolution, please consider closing it while encouraging others to take over and reopen an issue if they care enough.
3. If you still have interest in resolving it, try to ping somebody who you believe might have an interest in the topic. Consider discussing the problem in [our Discourse Forum](https://discourse.nixos.org/).
4. As with all open source projects, your best option is to submit a Pull Request that addresses this issue. We :heart: this attitude!
3. If you still have interest in resolving it, try to ping somebody who you believe might have an interest in the topic. Consider discussing the problem in [Discord](https://determinate.systems/discord).

**Memorandum on closing issues**

Don't be afraid to close an issue that holds valuable information. Closed issues stay in the system for people to search, read, cross-reference, or even reopen--nothing is lost! Closing obsolete issues is an important way to help maintainers focus their time and effort.

## Useful GitHub search queries

- [Open PRs with any stale-bot interaction](https://github.com/NixOS/nix/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+)
- [Open PRs with any stale-bot interaction and `stale`](https://github.com/NixOS/nix/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+label%3A%22stale%22)
- [Open PRs with any stale-bot interaction and NOT `stale`](https://github.com/NixOS/nix/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+-label%3A%22stale%22+)
- [Open Issues with any stale-bot interaction](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+)
- [Open Issues with any stale-bot interaction and `stale`](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+label%3A%22stale%22+)
- [Open Issues with any stale-bot interaction and NOT `stale`](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+-label%3A%22stale%22+)
69 changes: 69 additions & 0 deletions .github/release-notes.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#!/usr/bin/env bash

# SC2002 disables "useless cat" warnings.
# I prefer pipelines that start with an explicit input, and go from there.
# Overly fussy.
# shellcheck disable=SC2002

scratch=$(mktemp -d -t tmp.XXXXXXXXXX)
finish() {
rm -rf "$scratch"
}
trap finish EXIT

DATE=$(date +%Y-%m-%d)
DETERMINATE_NIX_VERSION=$(cat .version-determinate)
TAG_NAME="v${DETERMINATE_NIX_VERSION}"
NIX_VERSION=$(cat .version)
NIX_VERSION_MAJOR_MINOR=$(echo "$NIX_VERSION" | cut -d. -f1,2)
GITHUB_REPOSITORY="${GITHUB_REPOSITORY:-DeterminateSystems/nix-src}"

gh api "/repos/${GITHUB_REPOSITORY}/releases/generate-notes" \
-f "tag_name=${TAG_NAME}" > "$scratch/notes.json"

trim_trailing_newlines() {
local text
text="$(cat)"
echo -n "${text}"
}

linkify_gh() {
sed \
-e 's!\(https://github.com/DeterminateSystems/nix-src/\(pull\|issue\)/\([[:digit:]]\+\)\)![DeterminateSystems/nix-src#\3](\1)!' \
-e 's#\(https://github.com/DeterminateSystems/nix-src/compare/\([^ ]\+\)\)#[\2](\1)#'
}

(
cat doc/manual/source/release-notes-determinate/changes.md \
| sed 's/^.*\(<!-- differences -->\)$/This section lists the differences between upstream Nix '"$NIX_VERSION_MAJOR_MINOR"' and Determinate Nix '"$DETERMINATE_NIX_VERSION"'.\1/' \

printf "\n<!-- Determinate Nix version %s -->\n" "$DETERMINATE_NIX_VERSION"
cat "$scratch/notes.json" \
| jq -r .body \
| grep -v '^#' \
| grep -v "Full Changelog" \
| trim_trailing_newlines \
| sed -e 's/^\* /\n* /' \
| linkify_gh
echo "" # final newline
) > "$scratch/changes.md"

(
printf "# Release %s (%s)\n\n" \
"$DETERMINATE_NIX_VERSION" \
"$DATE"
printf "* Based on [upstream Nix %s](../release-notes/rl-%s.md).\n\n" \
"$NIX_VERSION" \
"$NIX_VERSION_MAJOR_MINOR"

cat "$scratch/notes.json" | jq -r .body | linkify_gh
) > "$scratch/rl.md"

(
cat doc/manual/source/SUMMARY.md.in \
| sed 's/\(<!-- next -->\)$/\1\n - [Release '"$DETERMINATE_NIX_VERSION"' ('"$DATE"')](release-notes-determinate\/rl-'"$DETERMINATE_NIX_VERSION"'.md)/'
) > "$scratch/summary.md"

mv "$scratch/changes.md" doc/manual/source/release-notes-determinate/changes.md
mv "$scratch/rl.md" "doc/manual/source/release-notes-determinate/rl-${DETERMINATE_NIX_VERSION}.md"
mv "$scratch/summary.md" doc/manual/source/SUMMARY.md.in
Loading
Loading