1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 18:31:49 +02:00
Commit graph

20273 commits

Author SHA1 Message Date
Luc Perkins
d0b6f2f26f
Remove one more reference to single-user mode 2025-02-25 14:40:53 -03:00
Luc Perkins
ff8da340ae
Remove references to single-user mode 2025-02-25 14:33:57 -03:00
Robert Hensing
ff2798bf17
Merge pull request #12465 from tomberek/tomberek.access-token-prefixing
Fine-grained access-tokens
2025-02-25 16:04:20 +01:00
Robert Hensing
1222438ae7 Merge remote-tracking branch 'upstream/master' into tomberek.access-token-prefixing 2025-02-25 15:40:34 +01:00
Robert Hensing
c07172220c refact: Rename url -> hostAndPath
https://github.com/NixOS/nix/pull/12465/files#r1955286197

> Perhaps that is a misnomer.
2025-02-25 15:21:09 +01:00
Eelco Dolstra
94347f4622 nix -> determinate-nix 2025-02-24 23:28:09 +01:00
mergify[bot]
1dda07eef2
Merge pull request #12562 from NixOS/mergify/bp/2.26-maintenance/pr-12559
nix flake archive: Recurse into relative path inputs (backport #12559)
2025-02-24 22:18:03 +00:00
Eelco Dolstra
e71a498e25 Disable setVersionLayer
This sets .version to finalAttrs.version, so we would end up with `nix
--version` showing `nix (Determinate Nix 0.37.2) 0.37.2`.
2025-02-24 23:08:53 +01:00
Eelco Dolstra
5fc89adf6c Use Determinate version in store path name 2025-02-24 23:08:53 +01:00
Eelco Dolstra
25c6048fa6 Bump Determinate Nix version to 3.0.0 2025-02-24 23:08:53 +01:00
Eelco Dolstra
827f760ad7
Fix test
We didn't backport `nix flake prefetch --out-link`.
2025-02-24 23:00:07 +01:00
Eelco Dolstra
3299e42413
Merge pull request #65 from DeterminateSystems/sync
Sync with 2.26-maintenance
2025-02-24 21:51:15 +00:00
Eelco Dolstra
6749d26dbb Merge remote-tracking branch 'origin/2.26-maintenance' into detsys-main 2025-02-24 22:41:22 +01:00
Eelco Dolstra
91508de315 nix flake archive: Recurse into relative path inputs
We can't ignore them entirely, since we do want to archive their
transitive inputs.

Fixes #12438.

(cherry picked from commit 14c9755462)
2025-02-24 21:30:45 +00: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
8384e41b76
Merge pull request #12559 from DeterminateSystems/archive-relative-paths
nix flake archive: Recurse into relative path inputs
2025-02-24 22:30:16 +01:00
Eelco Dolstra
14c9755462 nix flake archive: Recurse into relative path inputs
We can't ignore them entirely, since we do want to archive their
transitive inputs.

Fixes #12438.
2025-02-24 22:10:02 +01: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
John Ericson
c8a443df50
Merge pull request #12546 from DeterminateSystems/version-in-manual
Include the Nix version in the title of the manual
2025-02-24 13:11:30 -05:00
Robert Hensing
1f98abee84
Merge pull request #12557 from roberth/packaging-x86_64-darwin-stdenv
packaging: Use correct stdenv for x86_64-darwin
2025-02-24 17:04:48 +01:00
Robert Hensing
0772c2e3ab packaging: Use correct stdenv for x86_64-darwin 2025-02-24 16:44:12 +01: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
Jörg Thalheim
d433a2242e
Merge pull request #12553 from DeterminateSystems/archive-relative-paths
nix flake archive: Skip relative path inputs
2025-02-24 15:48:16 +01:00
Eelco Dolstra
b4dfeafed5 nix flake archive: Skip relative path inputs
Fixes #12438.
2025-02-24 15:30:30 +01:00
Eelco Dolstra
f3ea14c8dc
Merge pull request #12542 from tomberek/tomberek.ssl-default
doc: ssl-cert-file leaks into OSX builds
2025-02-24 14:51:34 +01:00
Eelco Dolstra
779bb3b920 Include the Nix version in the title of the manual
This makes it easy to see at a glance what the version of the manual
is, e.g. "Nix 2.27.0 Reference Manual".
2025-02-24 14:49:58 +01: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