1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-30 11:43:15 +02:00
Commit graph

19452 commits

Author SHA1 Message Date
Eelco Dolstra
6749d26dbb Merge remote-tracking branch 'origin/2.26-maintenance' into detsys-main 2025-02-24 22:41:22 +01:00
mergify[bot]
605b2371f9
windows: fix compilation after recent changes (backport #12495) (#12561)
* windows: fix compilation after recent changes

Specifically last few week's merges involving legacy SSH options and
dynamic derivations.

(cherry picked from commit e0617d2545)

# Conflicts:
#	src/libstore/build/derivation-creation-and-realisation-goal.hh

* Remove unneeded

* Remove unneeded

---------

Co-authored-by: Brian McKenna <brian@brianmckenna.org>
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2025-02-24 21:30:35 +00:00
Eelco Dolstra
6d9724a2b3
Merge pull request #12560 from NixOS/mergify/bp/2.26-maintenance/pr-12557
packaging: Use correct stdenv for x86_64-darwin (backport #12557)
2025-02-24 22:04:52 +01:00
Robert Hensing
9e87a58314 packaging: Use correct stdenv for x86_64-darwin
(cherry picked from commit 0772c2e3ab)
2025-02-24 20:55:05 +00:00
Cole Helbling
599957ee73
Merge pull request #62 from DeterminateSystems/cole/fh-630-update-the-nix-ci-to-push-to-ids-on-prs-with-label-tags-and
fixup: upload-release needs to configure allowed_branches
2025-02-24 19:26:02 +00:00
Cole Helbling
ab493636cd fixup: upload-release needs to configure allowed_branches 2025-02-24 11:19:08 -08:00
mergify[bot]
31a29e66ea
Merge pull request #12554 from NixOS/mergify/bp/2.26-maintenance/pr-12553
nix flake archive: Skip relative path inputs (backport #12553)
2025-02-24 15:03:38 +00:00
Eelco Dolstra
d670380bd9 nix flake archive: Skip relative path inputs
Fixes #12438.

(cherry picked from commit b4dfeafed5)
2025-02-24 14:49:11 +00:00
mergify[bot]
6d3ee99463
Merge pull request #12545 from NixOS/mergify/bp/2.26-maintenance/pr-12543
Fix perl store bindings (backport #12543)
2025-02-22 18:34:00 +00:00
Graham Christensen
39aa3d816f
Merge pull request #61 from DeterminateSystems/release-v0.37.2/2ce368b0-7af3-4bc2-b2bf-4dda6b7e32b8
Release v0.37.2
2025-02-22 16:52:54 +00:00
github-actions[bot]
84fb833d5b
Set .version-determinate to 0.37.2 2025-02-22 16:45:19 +00:00
github-actions[bot]
158d79ddb5
Prepare release v0.37.2 2025-02-22 16:45:16 +00:00
Cole Helbling
c36bbbf275
Merge pull request #60 from DeterminateSystems/cole/fh-630-update-the-nix-ci-to-push-to-ids-on-prs-with-label-tags-and
fixup: default branch name
2025-02-21 22:21:42 +00:00
Cole Helbling
ec42d3a077 fixup: default branch name 2025-02-21 14:16:36 -08:00
Cole Helbling
c05a9b5c1f
Merge pull request #50 from DeterminateSystems/cole/fh-630-update-the-nix-ci-to-push-to-ids-on-prs-with-label-tags-and
Setup uploading PRs, tags, and branches to IDS
2025-02-21 21:57:22 +00:00
Cole Helbling
a4e9b65c3a fixup: remove unsafeDiscardStringContext? 2025-02-21 13:51:25 -08:00
Cole Helbling
a341be4d9b fixup: fold publish.yml into upload-release.yml 2025-02-21 13:33:56 -08:00
Cole Helbling
14818b0d88 fixup: use release not tags 2025-02-21 13:31:58 -08:00
Cole Helbling
dee23a0c14 Fold the release things into one workflow 2025-02-21 13:29:34 -08:00
Cole Helbling
702bde8bf0 Revert "wip: delete unnecessary CI for now"
This reverts commit d712540206.
2025-02-21 13:02:04 -08:00
Cole Helbling
90581c9d66 Setup uploading PRs, tags, and branches to IDS 2025-02-21 13:01:26 -08:00
Graham Christensen
edd9e34bb8
Merge pull request #59 from DeterminateSystems/release-v0.37.1/df76b25b-caae-47bb-8cfe-051a330cdb4e
Release v0.37.1
2025-02-21 20:21:02 +00:00
github-actions[bot]
0c1e1e65d6
Set .version-determinate to 0.37.1 2025-02-21 20:13:14 +00:00
github-actions[bot]
8bc379cad2
Prepare release v0.37.1 2025-02-21 20:13:11 +00:00
Luc Perkins
a1e18867dc
Merge pull request #58 from DeterminateSystems/detsys-logo
Use DetSys logo
2025-02-21 19:45:48 +00:00
mergify[bot]
a30588365b
Merge pull request #12547 from NixOS/mergify/bp/2.26-maintenance/pr-12510
libstore: fix expected bytes in progress bar (backport #12510)
2025-02-21 19:34:30 +00:00
Luc Perkins
6b8a751498
Make image smaller 2025-02-21 14:26:12 -05:00
Luc Perkins
8bf0408d3c
Use DetSys logo 2025-02-21 14:20:35 -05:00
Graham Christensen
7b61927a5f
Merge pull request #57 from DeterminateSystems/release-v0.37.0/755ef003-ca9f-40d6-9359-52e1629980ff
Release v0.37.0
2025-02-21 19:17:50 +00:00
Ivan Trubach
c69d5af105 libstore: fix expected bytes in progress bar
(cherry picked from commit eb73bfcf73)
2025-02-21 19:12:02 +00:00
github-actions[bot]
2616e857c5
Set .version-determinate to 0.37.0 2025-02-21 19:09:56 +00:00
github-actions[bot]
86f6902e73
Prepare release v0.37.0 2025-02-21 19:09:53 +00:00
Eelco Dolstra
bfc4745797
Merge pull request #56 from DeterminateSystems/stable-cli-in-manual
Mark the nix CLI as *the* interface in the manual, deprecate nix-*
2025-02-21 18:30:52 +00:00
Eelco Dolstra
f7aaa31978 Tweak title 2025-02-21 19:23:03 +01:00
Eelco Dolstra
247ec94041 Remove unnecessary ./.version-determinate symlink 2025-02-21 19:20:23 +01:00
Eelco Dolstra
a1d27ff6d2 Include Determinate Nix version number in the manual 2025-02-21 19:20:23 +01:00
Eelco Dolstra
69553dfc36 Mark the nix CLI as *the* interface in the manual, deprecate nix-* 2025-02-21 19:20:23 +01:00
Luc Perkins
a48757359a
Merge pull request #55 from DeterminateSystems/remove-sidebar-release-notes
Include only 2.26 in the sidebar release notes
2025-02-21 17:51:34 +00:00
Luc Perkins
d6bd787e5e
s/releases notes/release notes 2025-02-21 12:45:39 -05:00
Luc Perkins
e77d1a760e
Fix release notes version list 2025-02-21 12:38:05 -05:00
Luc Perkins
2f70d15f7f
Use /latest URL rather than version specific 2025-02-21 12:36:08 -05:00
Luc Perkins
8caa66b492
Fix merge conflict in template 2025-02-21 12:35:09 -05:00
Luc Perkins
2f64b0ff10
Provide external link instead of internal release notes link 2025-02-21 12:30:42 -05:00
Luc Perkins
b9e654819a
Include only 2.26 in the sidebar release notes 2025-02-21 12:26:28 -05:00
Eelco Dolstra
85077c8a5e
Merge pull request #54 from DeterminateSystems/detsys-release-notes
Fix Detsys Nix manual, add release notes
2025-02-21 17:16:45 +00:00
Cole Helbling
d712540206 wip: delete unnecessary CI for now 2025-02-21 09:09:05 -08:00
Fabian Möller
cd1935468d Fix perl store bindings
When #9863 converted the `Nix::Store` free functions into member functions, the
implicit `this` argument was not accounted for when iterating over the variable
number of arguments in some functions.

(cherry picked from commit 5cf9e18167)
2025-02-21 14:47:37 +00:00
Eelco Dolstra
237c9bda79 Add release notes for 1.0.0 2025-02-21 13:27:21 +01:00
Eelco Dolstra
3f59f80e6c Fix location of release-notes-determinate 2025-02-21 13:07:37 +01:00
Eelco Dolstra
5a647b670c
Merge pull request #44 from DeterminateSystems/build-manual
Build the Nix manual in CI
2025-02-21 01:21:00 +00:00