guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,171 Commits 37 Branches 40 Tags
ecff59d77371b21fef229c33ebb629bc49a8fad5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eelco DolstraandJade Lovelace 0f099ae619 [security] builtin:fetchurl: Enable TLS verification 
This is better for privacy and to avoid leaking netrc credentials in a
MITM attack, but also the assumption that we check the hash no longer
holds in some cases (in particular for impure derivations).

Partially reverts https://github.com/NixOS/nix/commit/5db358d4d78aea7204a8f22c5bf2a309267ee038.

upstream commits:
(cherry picked from commit c04bc17a5a0fdcb725a11ef6541f94730112e7b6)
(cherry picked from commit f2f47fa725fc87bfb536de171a2ea81f2789c9fb)
(cherry picked from commit 7b39cd631e0d3c3d238015c6f450c59bbc9cbc5b)

lix main:
(cherry picked from commit c1631b0a39)

Upstream-PR: https://github.com/NixOS/nix/pull/11585

Change-Id: Ia973420f6098113da05a594d48394ce1fe41fbb9
 2024-09-26 14:44:23 -07:00
Eelco DolstraandQyriad fb7d315411 Merge pull request #10570 from layus/shared_caches 
Share evaluation caches across installables

Before:

$ rm -rf ~/.cache/nix && time -f '%E' nix build --dry-run \
  'nixpkgs#hello' \
  'nixpkgs#clang' \
  'nixpkgs#cargo' \
  'nixpkgs#rustup' \
  'nixpkgs#bear' \
  'nixpkgs#firefox' \
  'nixpkgs#git-revise' \
  'nixpkgs#hyperfine' \
  'nixpkgs#curlie' \
  'nixpkgs#xz' \
  'nixpkgs#ripgrep'
0:03.61

After:

$ rm -rf ~/.cache/nix && time -f '%E' nix build --dry-run \
  'nixpkgs#hello' \
  'nixpkgs#clang' \
  'nixpkgs#cargo' \
  'nixpkgs#rustup' \
  'nixpkgs#bear' \
  'nixpkgs#firefox' \
  'nixpkgs#git-revise' \
  'nixpkgs#hyperfine' \
  'nixpkgs#curlie' \
  'nixpkgs#xz' \
  'nixpkgs#ripgrep'
0:01.46

This could probably use a more proper benchmark...

Fixes #313

(cherry picked from commit de51e5c335865e3e0a8cccd283fec1a52cce243f)
Change-Id: I9350bebd462b6af12c51db5bf432321abfe84a16
 2024-06-19 18:39:11 +00:00
Eelco DolstraandQyriad 5d2031f92d Add profile migration test 
(cherry picked from commit 72560f7bbef2ab3c02b8ca040fe084328bdd5fbe)

Upstream-PR: https://github.com/NixOS/nix/pull/9656
Change-Id: I405e5848e2627a76940220fb6aebadfb8f094afb
 2024-05-02 12:59:15 -06:00
Eelco DolstraandQyriad ce70f02aff getNameFromURL(): Support uppercase characters in attribute names 
In particular, this makes it handle 'legacyPackages' correctly.

(cherry picked from commit 936a3642264ac159f3f9093710be3465b70e0e89)

Upstream-PR: https://github.com/NixOS/nix/pull/9657
Change-Id: Icc4efe02f7f8e90a2970589f72fd3d3cd4418d95
 2024-05-02 12:02:28 -06:00
Eelco Dolstraandlunaphied aa7653608d Minor cleanup in libexpr/flake/flake.cc 
(cherry picked from commit 05316d401fa509557c71140e17bb19814412fcb8)
Change-Id: I6ba0b55709f5fe21beb4e9f3bf72ee28715d15f3
 2024-03-25 15:30:36 +00:00
Eelco Dolstraandlunaphied b525d0f20c Input: Replace markFileChanged() by putFile() 
Committing a lock file using markFileChanged() required the input to
be writable by the caller in the local filesystem (using the path
returned by getSourcePath()). putFile() abstracts over this.

(cherry picked from commit 95d657c8b3ae4282e24628ba7426edb90c8f3942)
Change-Id: Ie081c5d9eb4e923b229191c5e23ece85145557ff
 2024-03-25 15:30:36 +00:00
Eelco Dolstraandeldritch horrors 2442a40393 Merge pull request #9029 from inclyc/users/lyc/pass-value-2 
libexpr: const rvalue reference -> value for nix::Expr nodes

(cherry picked from commit de99647b9c66219b2e7bc698a62377cc4f6148f6)
Change-Id: I96baf96b0a17e401548a926a7015f85e11d7c459
 2024-03-04 04:35:59 +01:00
Eelco DolstraandGitHub 2a6a7aad3f Merge pull request #10018 from NixOS/fix-18-build 
[2.18] Fix the build
 2024-02-15 11:00:13 +01:00
Eelco DolstraandGitHub 5f7f68e0a8 Merge pull request #9827 from NixOS/backport-9363-to-2.18-maintenance 
[Backport 2.18-maintenance] Fix symlink handling
 2024-01-22 14:30:17 +01:00
Eelco Dolstraandgithub-actions[bot] bef68e53b9 Fix symlink handling 
This restores the symlink handling behaviour prior to
94812cca98.

Fixes #9298.

(cherry picked from commit 31ebc6028b3682969d86a7b39ae87131c41cc604)
 2024-01-21 20:53:30 +00:00
Eelco DolstraandGitHub 184a20ec04 Merge pull request #9334 from fricklerhandwerk/backport-2.18-fix-anchors 
backport fix for the `--help` output to 2.18
 2023-11-16 15:02:18 +01:00
Eelco DolstraandGitHub f5f4de6a55 Merge pull request #9086 from NixOS/backport-9081-to-2.18-maintenance 
[Backport 2.18-maintenance] Revert "Adapt scheduler to work with dynamic derivations"
 2023-10-02 17:05:54 +02:00
Eelco DolstraandGitHub 7e2399b123 Merge pull request #9079 from hercules-ci/backport-9022-to-2.18-maintenance 
[Backport 2.18-maintenance] pathExists: isDir when endswith /.
 2023-10-02 14:08:25 +02:00
Eelco DolstraandGitHub 9e212344f9 Merge pull request #9036 from NixOS/backport-9026-to-2.18-maintenance 
[Backport 2.18-maintenance] flake: complete update to 23.05
 2023-09-25 15:05:25 +02:00
Eelco Dolstra 40a014416b Bump version 2023-09-20 15:20:52 +02:00
Eelco Dolstra 44fb119218 Mark official release 2023-09-20 12:49:01 +02:00
Eelco DolstraandGitHub d40e91440d Merge pull request #9002 from NixOS/release-notes 
Release notes
 2023-09-20 12:41:30 +02:00
Eelco Dolstra 10ad052f7d Release notes 2023-09-20 11:42:49 +02:00
Eelco DolstraandGitHub a4a7eca679 Merge pull request #8991 from NixOS/dependabot/github_actions/docker/login-action-3 
Bump docker/login-action from 2 to 3
 2023-09-20 11:37:36 +02:00
Eelco DolstraandGitHub 6ce358b13c Merge pull request #8569 from vcunat/p/flake-update 
flake: update nixpkgs: 22.11 -> 23.05
 2023-09-20 11:30:55 +02:00
Eelco Dolstra b6b2a0aea9 Use "touch -h" 
https://hydra.nixos.org/build/235888160

This is needed because Nixpkgs now contains dangling symlinks
(pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix).
 2023-09-19 17:21:07 +02:00
Eelco Dolstra c6953d1ff6 Disable systemd-nspawn test 
This is broken because of a change in systemd in NixOS 23.05. It fails
with

  Failed to mount proc (type proc) on /proc (MS_NOSUID|MS_NODEV|MS_NOEXEC ""): Operation not permitted
 2023-09-19 17:03:21 +02:00
Eelco Dolstra 126e2645f2 Disable rapidcheck tests in the coverage run 
https://hydra.nixos.org/build/233688539
 2023-09-19 16:04:00 +02:00
Eelco Dolstra c8afa01bc2 Try aws-sdk-cpp fix 2023-09-19 14:51:50 +02:00
Eelco Dolstra c451b48993 Merge remote-tracking branch 'origin/master' into p/flake-update 2023-09-19 13:33:56 +02:00
Eelco DolstraandGitHub 4a8c9bb9aa Merge pull request #8898 from edolstra/fix-catch-polymorphic-by-value 
Fix warning 'catching polymorphic type by value'
 2023-09-01 15:33:56 +02:00
Eelco Dolstra 5c95b32c46 Fix warning 'catching polymorphic type by value' 2023-09-01 14:49:49 +02:00
Eelco DolstraandGitHub 3420b60b39 Merge pull request #8863 from symphorien/valid_deriver_2 
add nix-store --query --valid-derivers command
 2023-09-01 14:16:06 +02:00
Eelco DolstraandGitHub 919781cacc Merge branch 'master' into valid_deriver_2 2023-09-01 13:35:05 +02:00
Eelco DolstraandGitHub b88784278f Merge pull request #8869 from hercules-ci/fix-issue-8838-pathExists-isDir 
Fix #8838, pathExists: isDir when ends with `/ `
 2023-09-01 13:15:54 +02:00
Eelco DolstraandGitHub 5b5f56a9d4 Merge pull request #8859 from edolstra/tarball-last-modified 
Tarball trees: Propagate lastModified
 2023-08-29 17:02:06 +02:00
Eelco Dolstra 56763ff918 Document that redirected tarball flakerefs can specify lastModified 2023-08-29 16:08:29 +02:00
Eelco DolstraandGitHub 9990edf926 Merge pull request #8866 from fricklerhandwerk/glossary-list 
glossary: dedent list and do not use forced line breaks
 2023-08-24 13:24:31 +02:00
Eelco Dolstra 81045f243f Tarball trees: Propagate lastModified 
This makes them behave consistently with GitHub/GitLab flakes.
 2023-08-22 21:51:26 +02:00
Eelco DolstraandGitHub 6459a1c7ad Merge pull request #8857 from NixOS/dependabot/github_actions/zeebe-io/backport-action-1.4.0 
Bump zeebe-io/backport-action from 1.3.1 to 1.4.0
 2023-08-22 16:08:32 +02:00
Eelco DolstraandGitHub 3fcdea4ca0 Merge pull request #8836 from obsidiansystems/rm-addToSearchPath 
Delete `EvalState::addToSearchPath`
 2023-08-21 14:58:00 +02:00
Eelco DolstraandGitHub 735558bea6 Merge pull request #8845 from cole-h/fix-double-percent-encoding 
libutil: fix double-encoding of URLs
 2023-08-18 17:08:03 +02:00
Eelco DolstraandGitHub db3bf180a5 Merge pull request #8833 from hercules-ci/jobcategory-doc 
Document jobCategory()
 2023-08-16 17:11:03 +02:00
Eelco DolstraandGitHub 7f8c99c70c Merge pull request #8825 from trofi/search-path-prefix 
src/libexpr/search-path.cc: avoid out-of-bounds read on string_view
 2023-08-16 16:44:49 +02:00
Eelco DolstraandGitHub 5624777988 Merge pull request #8786 from Ma27/fix-why-depends-precise 
nix/why-depends: fix output of `--precise`
 2023-08-07 19:32:49 +02:00
Eelco DolstraandGitHub eb1302670e Merge pull request #8769 from edolstra/generalize-tarball-urls 
Don't require .tar/.zip extension for tarball flakerefs
 2023-08-07 17:02:17 +02:00
Eelco DolstraandGitHub d00469ebf9 Merge pull request #8762 from obsidiansystems/split-out-eval-settings 
Move evaluator settings (type and global) to separate file/header
 2023-08-02 16:54:02 +02:00
Eelco DolstraandGitHub eea13d6ac5 Merge pull request #8767 from NixOS/stop-removing-labels 
labeler: Stop removing labels
 2023-08-02 16:51:47 +02:00
Eelco Dolstra d9e7758f47 Don't require .tar/.zip extension for tarball flakerefs 
Special-casing the file name is rather ugly, so we shouldn't do
that. So now any {file,http,https} URL is handled by
TarballInputScheme, except for non-flake inputs (i.e. inputs that have
the attribute `flake = false`).
 2023-08-01 16:07:20 +02:00
Eelco DolstraandGitHub c0e735f474 Merge pull request #8607 from hercules-ci/toJSON-trace 
toJSON: Add attribute path to trace
 2023-07-31 15:02:07 +02:00
Eelco DolstraandGitHub ae3a7d6eba Merge pull request #8736 from NixOS/bump-2.18.0 
Bump version to 2.18
 2023-07-24 22:13:09 +02:00
Eelco Dolstra 0c275558e7 Bump version 2023-07-24 21:30:33 +02:00
Eelco DolstraandGitHub e6784f0ca6 Merge pull request #8734 from NixOS/release-notes 
2.17 release notes
 2023-07-24 18:07:43 +02:00
Eelco Dolstra c51be0345e Release notes 2023-07-24 17:19:31 +02:00
Eelco DolstraandGitHub 7ac24d9525 Merge pull request #8650 from obsidiansystems/content-address-simpler 
Simplify `ContentAddress`
 2023-07-21 13:46:53 +02:00
Eelco DolstraandGitHub ab363cd494 Merge pull request #8723 from fricklerhandwerk/doc-constants 
revert anchor prefix for builtin constants
 2023-07-20 17:13:07 +02:00
Eelco DolstraandGitHub fea7d3b1cd Merge pull request #8681 from inclyc/libexpr/parser-move-noeffect 
libexpr: remove std::move() for `basePath` in parser, it has no effect
 2023-07-10 13:30:42 +02:00
Eelco DolstraandGitHub 7bb8d16fcc Merge pull request #8660 from Hoverbear/nix-daemon.service-tasksmax-infinity 
nix-daemon.service: Add TasksMax=1048576
 2023-07-10 13:09:51 +02:00
Eelco DolstraandGitHub 6db66ebfc5 Merge pull request #8631 from iFreilicht/profile-list 
Profile list improvements
 2023-07-05 16:06:17 +02:00
Eelco DolstraandGitHub 2898dc71a8 Merge pull request #8633 from inclyc/libexpr/fix-data-race-in-lexer.l 
libexpr: use `thread_local` to make the parser thread-safe
 2023-07-03 13:29:47 +02:00
Eelco DolstraandFelix Uhl 5fbfbb4c7c Fix test 2023-07-03 12:23:57 +02:00
Eelco DolstraandFelix Uhl a353412c43 nix profile list: Add --json flag 
This just dumps the profile manifest to stdout.
 2023-07-03 12:23:57 +02:00
Eelco DolstraandFelix Uhl b8e8f27159 Rename 'resolvedRef' to 'lockedRef' 
'resolvedRef' was incorrect, since a resolved ref is one after
registry resolution, which may still be unlocked (e.g. 'nixpkgs' ->
'github:NixOS/nixpkgs').
 2023-07-03 12:23:57 +02:00
Eelco DolstraandFelix Uhl 87b82db881 nix profile list: Improve readability of the output 2023-07-02 16:17:09 +02:00
Eelco DolstraandGitHub 7b5ca7ebe2 Merge pull request #8614 from ShamrockLee/quickfix-exdev 
linkOrCopy: Fallback upon cross-device link error (EXDEV)
 2023-06-30 16:42:42 +02:00
Eelco DolstraandGitHub a0c617348b Merge pull request #8589 from jfroche/sign-paths-as-allowed-user 
Allow to sign path as unprivileged user
 2023-06-30 13:13:42 +02:00
Eelco DolstraandGitHub 8e770dac9f Merge pull request #8576 from obsidiansystems/findPath-cleanup 
Use a struct not `std::pair` for `SearchPathElem`
 2023-06-26 12:37:06 +02:00
Eelco DolstraandGitHub 8350f06d6c Merge pull request #8574 from inclyc/nixd/remove-unused-token 
libexpr: remove unused token `ATTRPATH` in token declaration
 2023-06-23 12:02:40 +02:00
Eelco DolstraandGitHub b1352700c4 Merge pull request #8552 from edolstra/fix-eagain 
GC server: Clear O_NONBLOCK on the right file descriptor
 2023-06-20 12:12:53 +02:00
Eelco DolstraandGitHub 6a74e88f51 Merge pull request #8548 from abathur/fix_uninstall_redirects 
redirect old platform uninstall instruction links
 2023-06-20 11:39:01 +02:00
Eelco Dolstra a6a75ecad8 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.
 2023-06-20 11:19:14 +02:00
Eelco DolstraandGitHub f5e620bf2b Merge pull request #8483 from edolstra/save-root 
restoreMountNamespace(): Restore the original root directory
 2023-06-19 12:54:05 +02:00
Eelco DolstraandGitHub 49288d6e40 Merge pull request #8542 from NixOS/maintainers-draft-prs 
maintainers: add note on marking PRs as draft
 2023-06-19 12:47:06 +02:00
Eelco DolstraandGitHub 0a80db5112 Merge pull request #8541 from NixOS/contributing-good-first-issues 
CONTRIBUTING.md: add link to "good first issues"
 2023-06-19 12:46:42 +02:00
Eelco DolstraandGitHub 8f6255b86a Merge pull request #8524 from amjoseph-nixpkgs/pr/doc/linkify-allowed-uris 
src/libexpr/eval.hh: add link for allowed-uris option
 2023-06-19 06:59:07 +02:00
Eelco DolstraandGitHub e503eadafc Merge pull request #8477 from edolstra/tarball-flake-redirects 
Tarball flake improvements
 2023-06-16 18:03:50 +02:00
Eelco DolstraGitHubRobert Hensing
 		b1ed9b4b0c Apply suggestions from code review 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-06-16 16:48:37 +02:00
Eelco Dolstra cab03fb779 Add docs 2023-06-16 15:58:42 +02:00
Eelco DolstraandGitHub 713836112c Merge pull request #8517 from hercules-ci/fix-build-hook-error-for-lib-users 
Fix build hook error for libstore library users
 2023-06-16 13:20:50 +02:00
Eelco DolstraandGitHub 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
Eelco DolstraandGitHub 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
Eelco DolstraandGitHub 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
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
Eelco DolstraandGitHub 381a32981b Merge branch 'master' into angerman/mac-fix-recursive-nix 2023-06-09 13:06:47 +02:00
Eelco DolstraandGitHub bf7dc3c7dc Merge pull request #8463 from edolstra/release-artifacts 
Upload manual + fallback-paths.nix in the release script
 2023-06-06 16:21:06 +02:00
Eelco Dolstra 76e032bcf8 Upload the manual to releases.nixos.org 
Fixes #8451.
 2023-06-06 15:37:26 +02:00
Eelco Dolstra d14f993a76 Fix MIME type 2023-06-06 14:03:24 +02:00
Eelco Dolstra 42e908a308 Upload fallback-paths.nix as part of the release 
https://github.com/NixOS/nixpkgs/pull/235463
 2023-06-06 13:56:43 +02:00
Eelco DolstraandGitHub 2b01e835e2 Merge pull request #8429 from svenz/master 
Update install-multi-user.sh
 2023-06-06 13:34:45 +02:00
Eelco DolstraandGitHub b56319a139 Merge pull request #8391 from aneeshusa/remove-wrong-default-value-in-docs-for-hashed-mirrors 
Remove old default from docs for `hashed-mirrors`
 2023-06-06 12:54:28 +02:00
Eelco DolstraandGitHub 864ab1a7ac Merge pull request #8438 from zhaofengli/armv5tel-linux32 
Also set the PER_LINUX32 personality flag on armv5tel-linux
 2023-06-06 12:47:16 +02:00
Eelco DolstraandGitHub 51b3576855 Merge pull request #8456 from emilytrau/include-select 
Add missing <sys/select.h> include
 2023-06-06 12:45:51 +02:00
Eelco DolstraandGitHub f5ab40c6e3 Merge pull request #8452 from edolstra/fix-relative-symlinks 
SourcePath::resolveSymlinks(): Fix handling of symlinks that start with '..'
 2023-06-06 12:06:23 +02:00
Eelco Dolstra f5c6b29940 Fix SourcePath::resolveSymlinks() 
This fixes handling of symlinks that start with '..', and symlink
targets that contain symlinks themselves.
 2023-06-06 11:24:10 +02:00
Eelco DolstraandGitHub 27f82ef4a8 Merge pull request #8425 from NixOS/bump-2.17.0 
Bump version to 2.17
 2023-05-31 17:45:15 +02:00
Eelco Dolstra ebed259768 Bump version 2023-05-31 17:09:38 +02:00
Eelco DolstraandGitHub 9463689a91 Merge pull request #8424 from NixOS/release-notes 
Typo
 2023-05-31 14:42:05 +02:00
Eelco Dolstra 008f89fa50 Typo 2023-05-31 14:05:00 +02:00
Eelco DolstraandGitHub 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 DolstraandGitHub 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 DolstraandGitHub 9a5b9c588f Merge pull request #8421 from fricklerhandwerk/doc-replaceStrings 
update documentation according to release notes
 2023-05-31 12:10:32 +02:00