philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
14794 commits 26 branches 4 tags 76 MiB
Commit graph

14794 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 09320140b5
Merge pull request #8525 from tweag/fix-i686-build 
Don't assume the type of string::size_type
 2023-06-16 13:15:46 +02:00
Théophane Hufschmitt b2247ef4f6 Don't assume the type of string::size_type 
The code accidentally conflated `std::string::size_type` and `long unsigned int`.
This was fine on 64bits machines where they are apparently the same in
practice, but not on 32bits. Fix that by using `std::string::size_type`
everywhere.
 2023-06-15 21:24:14 +02:00
Valentin Gagarin 2ceacce484
Update src/libstore/globals.hh 2023-06-15 15:57:54 +02:00
Robert Hensing d2696cdd1e Fix build hook error for libstore library users 
A library shouldn't require changes to the caller's argument handling,
especially if it doesn't have to, and indeed we don't have to.

This changes the lookup order to prioritize the hardcoded path to nix
if it exists. The static executable still finds itself through /proc
and the like.
 2023-06-15 14:32:00 +02:00
John Ericson e672d52f7c
Merge pull request #8512 from scarf005/install-show-uid 
build: show UID and GID in welcome message
 2023-06-15 13:49:44 +02:00
John Ericson e1fa48f17c
Update src/nix/daemon.cc 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2023-06-15 07:41:37 -04:00
John Ericson 71e53c0c6a
Merge pull request #8522 from amjoseph-nixpkgs/pr/allowed-uris/typo 
src/libexpr/eval.hh: fix typo
 2023-06-15 13:20:42 +02:00
scarf 80451b762d
style: use plurals in uid ranges 
Co-authored-by: John Ericson <git@JohnEricson.me>
 2023-06-15 14:47:18 +09:00
Adam Joseph 098fbf6273 src/libexpr/eval.hh: fix typo 
The option name is `allowed-uris`, not `allowed-uri`.
 2023-06-14 21:47:58 -07:00
Valentin Gagarin b7d47e1d22
fix wording 2023-06-15 04:58:07 +02:00
John Ericson 2e47e53953
Merge pull request #8521 from fricklerhandwerk/issue-templates 
docs issue template: move checklist down
 2023-06-15 03:47:31 +02:00
John Ericson d11faa01b5
Merge pull request #8520 from fricklerhandwerk/rename-antiquote-tests 
Rename files referring to antiquotation
 2023-06-15 03:44:42 +02:00
Valentin Gagarin c3c4076342 make domain-specificity more specific 
also slightly reword the purpose statement to introduce (and explain)
derivations right away.
 2023-06-15 03:08:07 +02:00
Valentin Gagarin 520491607e docs issue template: move checklist down 
it's annoying to write issues with the checklist in the way, and the
proposal is more important.
 2023-06-15 02:31:49 +02:00
Valentin Gagarin c453719d6e rename files referring to antiquotation 
since we renamed this to string interpolation, file names should be
fixed up as well
 2023-06-15 02:29:31 +02:00
Valentin Gagarin e09b40e0d0 reword documentation on trusted users and substituters 
this is to make it slightly easier to scan over
 2023-06-15 02:19:13 +02:00
scarf 4b487317c3
style: use mathematical interval notation 2023-06-15 08:52:34 +09:00
John Ericson 946cd9e3f9
Merge pull request #8351 from obsidiansystems/delete-profiles-tests-docs 
Expanding tests and docs relating to deleting profiles
 2023-06-15 01:47:21 +02:00
John Ericson ca9f544160
Merge pull request #8516 from wentasah/remove-registerprimop 
Remove RegisterPrimOp constructor without support for documentation
 2023-06-15 01:13:46 +02:00
John Ericson 5b7e285727 Improve nix-collect-garbage docs 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2023-06-14 19:01:08 -04:00
John Ericson b55f26c65f Improve nix-env --delete-generations docs 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2023-06-14 19:01:08 -04:00
John Ericson d4a2ced9cb Split out nix-collect-garbage -d test to new file 
Good for test parallelism, and separation of concerns (core GC vs
profiles deleting).
 2023-06-14 19:01:07 -04:00
John Ericson ca5752d4fa Add another case to the nix-collect-garbage -d test 2023-06-14 19:01:07 -04:00
Valentin Gagarin a1cf16563f
Fixup description of substituters (#8291) 
Introduce what substituters "are" in the configuration option entry.
Remove arbitrary line breaks for easier editing in the future.
Link glossary some more.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: John Ericson <git@JohnEricson.me>
 2023-06-14 20:49:58 +00:00
Michal Sojka a0c4d58549 Remove RegisterPrimOp constructor without support for documentation 
The remaining constructor RegisterPrimOp::RegisterPrimOp(Info && info)
allows specifying the documentation in .args and .doc members of the
Info structure.

Commit 8ec1ba0210 removed all uses of the removed constructor in the
nix binary. Here, we remove the constructor completely as well as its
use in a plugin test. According to #8515, we didn't promis to maintain
compatibility with external plugins.

Fixes #8515
 2023-06-14 22:37:52 +02:00
John Ericson 05eb06a1de
Merge pull request #8490 from flox/stdin_handling 
fix: Do not apply default installables when using --stdin
 2023-06-14 20:41:22 +02:00
John Ericson 37bffbc28f
Merge pull request #8488 from Mic92/update-requirements 
nix actually needs c++20 now
 2023-06-14 20:37:52 +02:00
John Ericson e377746842
Merge pull request #8491 from wentasah/builtins-doc 
Document several undocumented builtin functions
 2023-06-14 20:32:37 +02:00
Daniel Asaturov 468add5aa0
Remove dead code (#8504) 
`filesystem.cc` is the only place where `createSymlink()` is used with three arguments:
in the definition of `replaceSymlink()` with three parameters that _is not used at all_.

Closes #8495
 2023-06-14 14:09:11 -04:00
John Ericson 63dc8fbbd6
Merge pull request #3532 from domenkozar/darwin-install-idempotent 
darwin installer: remove the file before installing new one
 2023-06-14 19:12:49 +02:00
John Ericson ff905cb796
Merge pull request #4803 from ShamrockLee/nix-channel-list-generations 
Add `nix-channel --list-generations`
 2023-06-14 18:30:35 +02:00
Domen Kožar c73daea61e darwin installer: remove the file before installing new one 
Otherwise results into:

cp: /Library/LaunchDaemons/org.nixos.nix-daemon.plist and /nix/var/nix/profiles/default/Library/LaunchDaemons/org.nixos.nix-daemon.plist are identical (not copied).
 2023-06-14 12:28:01 -04:00
John Ericson 61a3e1f2e2
Merge pull request #4282 from tweag/fix-ca-hash-rewriting 
fix the hash rewriting for ca-derivations
 2023-06-14 18:25:00 +02:00
scarf bfb5e0bdcd
build: show UID and GID in welcome message 2023-06-14 19:06:04 +09:00
Michal Sojka c6d7c4f9ec Document fromTOML, hasContext and getContext builtins 
Until now, these functions were completely missing in the Nix manual.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2023-06-13 21:53:03 +02:00
Eelco Dolstra 7066d21a0d
Merge pull request #8505 from NixOS/dependabot/github_actions/zeebe-io/backport-action-1.3.1 
Bump zeebe-io/backport-action from 1.3.0 to 1.3.1
 2023-06-13 16:20:33 +02:00
Eelco Dolstra 1ad3328c5e 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.
 2023-06-13 14:17:45 +02:00
Eelco Dolstra 3402b650cd Add a generic check for rev attribute mismatches 2023-06-13 14:13:50 +02:00
David McFarland d5e1eb20a2 Pass common ssh options in isMasterRunning 2023-06-13 00:55:34 -03:00
David McFarland 5454fdcceb 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.
 2023-06-13 00:54:52 -03:00
dependabot[bot] f961b04484
Bump zeebe-io/backport-action from 1.3.0 to 1.3.1 
Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/zeebe-io/backport-action/releases)
- [Commits](https://github.com/zeebe-io/backport-action/compare/v1.3.0...v1.3.1)

---
updated-dependencies:
- dependency-name: zeebe-io/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 22:56:41 +00:00
Tom Bereknyei 0e3849dc65 test: add test for non-defaulting for stding installable input 2023-06-12 08:40:17 -04:00
Eelco Dolstra 041486b116
Merge pull request #8493 from edolstra/no-md-include 
Don't include uds-remote-store.md from a header file
 2023-06-12 12:19:58 +02:00
Eelco Dolstra 87c66f6b0f Don't include uds-remote-store.md from a header file 
Closes #8484.
 2023-06-12 11:10:55 +02:00
Michal Sojka 8ec1ba0210 Register all PrimOps via the Info structure 
This will allow documenting them (in later commits).

Note that we keep the old constructor even if it is no longer used by
Nix code, because it is used in tests/plugins/plugintest.cc, which
suggests that it might be used by some external plugin.
 2023-06-11 21:40:43 +02:00
Tom Bereknyei 08089fdd32 fix: Do not apply default installables when using --stdin 2023-06-11 13:33:38 -04:00
Jörg Thalheim c51f3f1eb2 nix actually needs c++20 now 2023-06-10 13:56:05 +02:00
Eelco Dolstra e54538c461 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.
 2023-06-09 16:09:29 +02:00
John Ericson 03f9ff6ea5
Merge pull request #8168 from angerman/angerman/mac-fix-recursive-nix 
macOS: fix recursive nix
 2023-06-09 13:40:44 +02:00
Eelco Dolstra 381a32981b
Merge branch 'master' into angerman/mac-fix-recursive-nix 2023-06-09 13:06:47 +02:00