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

14489 commits

Author SHA1 Message Date
John Ericson
c86080d308
Merge pull request #9434 from NixOS/backport-9431-to-2.16-maintenance
[Backport 2.16-maintenance] Add missing `-lrapidcheck` fixing build with shared lib
2023-11-22 09:35:56 -05:00
John Ericson
45ac34e90c Add missing -lrapidcheck fixing build with shared lib
https://github.com/NixOS/nixpkgs/pull/269064 makes rapidcheck be build
as a shared lib, but that broke Nix because the `-lrapidcheck` was
missing. This fixes that (and doesn't break Nix what the library is a
static archive as today).

(cherry picked from commit 46131567da)
2023-11-22 04:48:04 +00:00
Théophane Hufschmitt
40cb457496
Merge pull request #9404 from NixOS/backport-9390-to-2.16-maintenance
[Backport 2.16-maintenance] fetchTree: clarify docs for shallow flag
2023-11-20 15:38:17 +01:00
DavHau
e7c9ce0b70 fetchTree: clarify docs for shallow flag
(cherry picked from commit 796a7eb92d)
2023-11-20 14:15:55 +00:00
Robert Hensing
5ab9384b33
Merge pull request #9120 from NixOS/backport-9095-to-2.16-maintenance
[Backport 2.16-maintenance] StorePath: reject names starting with '.'
2023-10-23 22:44:44 +02:00
Robert Hensing
49dfdd6d88
Merge pull request #9211 from NixOS/backport-8534-to-2.16-maintenance
[Backport 2.16-maintenance] ci: bump install-nix-action, don't fail fast
2023-10-23 17:19:29 +02:00
Naïm Favier
ade3bffad3 ci: bump install-nix-action, don't fail fast
(cherry picked from commit b931d83550)
2023-10-23 13:27:50 +00:00
Eelco Dolstra
a5a01a7674 Bump version 2023-10-19 21:35:14 +02:00
Eelco Dolstra
0201a31342 Fix C++17 build
(cherry picked from commit 2cf2bb45fc)
(cherry picked from commit 83a035aafe)
2023-10-19 19:00:28 +02:00
Eelco Dolstra
8c9e4668b2 Tarball trees: Propagate lastModified
This makes them behave consistently with GitHub/GitLab flakes.

(cherry picked from commit 81045f243f)
2023-10-19 19:00:24 +02:00
Eelco Dolstra
a0f07ae3fa Document that redirected tarball flakerefs can specify lastModified
(cherry picked from commit 56763ff918)
2023-10-19 19:00:19 +02:00
Eelco Dolstra
ec2baaaaac Add docs
(cherry picked from commit cab03fb779)
2023-10-19 19:00:13 +02:00
Eelco Dolstra
114ba0e363 Allow tarball URLs to redirect to a lockable immutable URL
Previously, for tarball flakes, we recorded the original URL of the
tarball flake, rather than the URL to which it ultimately
redirects. Thus, a flake URL like
http://example.org/patchelf-latest.tar that redirects to
http://example.org/patchelf-<revision>.tar was not really usable. We
couldn't record the redirected URL, because sites like GitHub redirect
to CDN URLs that we can't rely on to be stable.

So now we use the redirected URL only if the server returns the
`x-nix-is-immutable` or `x-amz-meta-nix-is-immutable` headers in its
response.

(cherry picked from commit 1ad3328c5e)
2023-10-19 18:59:57 +02:00
Eelco Dolstra
8ce966ee00 Add a generic check for rev attribute mismatches
(cherry picked from commit 3402b650cd)
2023-10-19 18:59:47 +02:00
edef
10b38a55cf StorePath: reject names starting with '.'
This has been the behaviour before Nix 2.4. It was dropped in a rewrite
in 759947bf72, allowing the creation of
store paths that aren't considered valid by older Nix versions or other
Nix tooling.

Nix 2.4 didn't ship in NixOS until 22.05, and stdenv.mkDerivation in
nixpkgs drops leading periods since April 2022, so it's unlikely anyone
is relying on the current lax behaviour.

Closes #9091.

Change-Id: I4a57bd9899e1b0dba56870ae5a1b680918a18ce9
(cherry picked from commit 24bda0c7b3)
2023-10-08 12:21:13 +00:00
Eelco Dolstra
15a3e6e282
Merge pull request #9083 from NixOS/backport-9079-to-2.16-maintenance
[Backport 2.16-maintenance] [Backport 2.18-maintenance] pathExists: isDir when endswith /.
2023-10-02 14:09:32 +02:00
Robert Hensing
7cebcde9cc pathExists: isDir when endswith /.
(cherry picked from commit f8a3893e8d)
(cherry picked from commit 860f64c345)
2023-10-02 12:08:45 +00:00
Eelco Dolstra
0529a89988
Merge pull request #8896 from NixOS/backport-8869-to-2.16-maintenance
[Backport 2.16-maintenance] Fix #8838, pathExists: isDir when ends with `/ `
2023-09-01 14:57:02 +02:00
Robert Hensing
6305ea6ad2 pathExists: isDir when endswith /
Fixes https://github.com/NixOS/nix/issues/8838

(cherry picked from commit 1e08e12d81)
2023-09-01 11:16:18 +00:00
Robert Hensing
9fcf142ee0 tests/lang/eval-okay-pathexists: Add cases
(cherry picked from commit d2e6cfa075)
2023-09-01 11:16:18 +00:00
Eelco Dolstra
24dd90e988
Merge pull request #8714 from NixOS/backport-8506-to-2.16-maintenance
[Backport 2.16-maintenance] Pass NIX_SSHOPTS when checking for an ssh master connection.
2023-07-20 17:15:48 +02:00
Théophane Hufschmitt
681c322f25
Merge pull request #8712 from NixOS/backport-8483-to-2.16-maintenance
[Backport 2.16-maintenance] restoreMountNamespace(): Restore the original root directory
2023-07-19 09:39:27 +02:00
David McFarland
52ddb32f4a Pass common ssh options in isMasterRunning
(cherry picked from commit d5e1eb20a2)
2023-07-18 13:48:57 +00:00
David McFarland
ba0400f918 Add test of explicit ssh control path in nix-copy test
This highlights a problem caused by SSHMaster::isMasterRunning returning
false when NIX_SSHOPTS contains -oControlPath.

(cherry picked from commit 5454fdcceb)
2023-07-18 13:48:57 +00:00
Eelco Dolstra
92e198f1db restoreMountNamespace(): Restore the original root directory
This is necessary when we're in a chroot environment, where the
process root is not the same as the root of the mount namespace
(e.g. in nixos-enter).

Fixes #7602.

(cherry picked from commit e54538c461)
2023-07-17 20:25:23 +00:00
Eelco Dolstra
96aae7ac03
Merge pull request #8555 from NixOS/backport-8552-to-2.16-maintenance
[Backport 2.16-maintenance] GC server: Clear O_NONBLOCK on the right file descriptor
2023-06-20 13:00:38 +02:00
github-actions[bot]
afd1c095c8
redirect old platform uninstall instruction links (#8553)
Uninstall instructions were moved to their own page in #8267. The
overall section link was redirected in #8286, but platform-specific
links (which I give out frequently when I triage installer trouble)
weren't included.

(cherry picked from commit 33d3889831)

Co-authored-by: Travis A. Everett <travis.a.everett@gmail.com>
2023-06-20 12:14:56 +02:00
Eelco Dolstra
ac32609ed9 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-06-20 10:13:13 +00:00
Eelco Dolstra
6906d1185e Bump version 2023-06-06 15:47:39 +02:00
Eelco Dolstra
84050709ea
Merge pull request #8460 from NixOS/backport-8391-to-2.16-maintenance
[Backport 2.16-maintenance] Remove old default from docs for `hashed-mirrors`
2023-06-06 12:55:23 +02:00
Aneesh Agrawal
567a5f0146 Remove old default from docs for hashed-mirrors
The `hashed-mirrors` option did use to have this default value,
but it was removed and re-added with an empty default value.
As the autogenerated docs show the (actual) default values from code,
remove this incorrect reference from the docs.

I was updating my nix.conf settings after a few years and noticed this.

(cherry picked from commit c694f1a2f3)
2023-06-06 10:54:46 +00:00
Eelco Dolstra
5ba5bdde36
Merge pull request #8458 from NixOS/backport-8452-to-2.16-maintenance
[Backport 2.16-maintenance] SourcePath::resolveSymlinks(): Fix handling of symlinks that start with '..'
2023-06-06 12:39:10 +02:00
Eelco Dolstra
5b1b25695c Fix SourcePath::resolveSymlinks()
This fixes handling of symlinks that start with '..', and symlink
targets that contain symlinks themselves.

(cherry picked from commit f5c6b29940)
2023-06-06 10:06:42 +00:00
Eelco Dolstra
39018fd42e Bump version 2023-05-31 17:08:37 +02:00
Eelco Dolstra
1ac5f9eac2 Mark official release 2023-05-31 14:06:00 +02:00
Eelco Dolstra
c7fa41563d
Merge pull request #8423 from NixOS/release-notes
2.16 release notes
2023-05-31 13:14:23 +02:00
Eelco Dolstra
afc24e6a66 Release notes 2023-05-31 12:38:05 +02:00
Eelco Dolstra
41b6665603
Merge pull request #8415 from NixOS/dependabot/github_actions/zeebe-io/backport-action-1.3.0
Bump zeebe-io/backport-action from 1.2.0 to 1.3.0
2023-05-31 12:10:55 +02:00
Eelco Dolstra
9a5b9c588f
Merge pull request #8421 from fricklerhandwerk/doc-replaceStrings
update documentation according to release notes
2023-05-31 12:10:32 +02:00
Eelco Dolstra
3849144303
Merge pull request #8418 from edolstra/fallback-paths
maintainers/upload-release.pl: Don't update nix-fallback-paths.nix
2023-05-31 12:09:52 +02:00
Valentin Gagarin
738c0d5064
Merge pull request #8318 from fricklerhandwerk/doc-currentTime
document `builtins.currentTime`
2023-05-31 03:15:54 +02:00
Valentin Gagarin
52004696c0
Merge pull request #8413 from doronbehar/doc/distributed-builds/clearer-warning
distributed-builds.md: Clarify warning ssh access requirements
2023-05-31 02:05:05 +02:00
Valentin Gagarin
e2f33e0df1 rewrap lines to use one line per sentence
this makes future reviews easier as it reduces diff noise
2023-05-31 01:32:03 +02:00
Doron Behar
76287a9207 distributed-builds.md: Clarify warning ssh access requirements 2023-05-31 01:28:15 +02:00
Valentin Gagarin
9afd525e18 update documentation according to release notes 2023-05-30 22:58:15 +02:00
Valentin Gagarin
7a5731aa07 link to mentioned builtin 2023-05-30 22:58:00 +02:00
Robert Hensing
bed2fe2312
Merge pull request #8398 from polykernel/perf/lazy-eval-replacements-replacestrings
primops: lazy evaluation of replaceStrings replacements
2023-05-30 22:49:42 +02:00
Eelco Dolstra
ecae62020b
Merge pull request #8406 from NixOS/fix-ca-attrs-false
Restore Nix 2.3 behaviour for {__impure,__contentAddressed} = false
2023-05-30 11:59:14 +02:00
Eelco Dolstra
a35e041ce2
Merge pull request #8414 from NixOS/dependabot/github_actions/cachix/install-nix-action-21
Bump cachix/install-nix-action from 20 to 21
2023-05-30 11:57:41 +02:00
Eelco Dolstra
f3a88857b4 maintainers/upload-release.pl: Don't update nix-fallback-paths.nix 2023-05-30 11:49:59 +02:00