wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity
19163 commits 244 branches 205 tags 158 MiB
Commit graph

19163 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson
ae7bc5f2c7
Merge pull request #12297 from NixOS/fix-static 
Fix static build of nix
 2025-01-20 11:13:30 -05:00
Robert Hensing
fcc501b730 mergify: Add automatic backport label 
This label will be useful for constructing queries to find backportable PRs.
Specifically, those should omit both automatic backports and
"backports reviewed" PRs.
 2025-01-20 17:11:06 +01:00
Eelco Dolstra
8e05ddfd84 Use fs::symlink_exists 2025-01-20 16:48:20 +01:00
Eelco Dolstra
4adb579c42
Merge pull request #12302 from NixOS/nixos-tests-network 
tests: Wait for network *online* and multi-user targets
 2025-01-20 16:28:06 +01:00
Robert Hensing
dccabc8f84
Merge pull request #12294 from DeterminateSystems/fix-thread-pool-error 
processGraph(): Don't throw ThreadPoolShutDown if there is an exception
 2025-01-20 16:23:32 +01:00
Robert Hensing
809f157a49 maint: Disable LTO for static due to build failure 2025-01-20 16:11:48 +01:00
Eelco Dolstra
2cb494f561 nix upgrade-nix: Fix build on mingw 2025-01-20 16:06:55 +01:00
Robert Hensing
0c85477f8e maint: Remove perl bindings from static build for now 2025-01-20 16:03:21 +01:00
Eelco Dolstra
89e5047e12 Fix libflake build on mingw 2025-01-20 15:50:04 +01:00
Robert Hensing
15073e86a8 tests: Wait for network *online* and multi-user targets 
This should help prevent some test stalls.

By default, multi-user.target does not imply that the network is fully up.
 2025-01-20 15:47:10 +01:00
Eelco Dolstra
a78f55ef97 GitInputScheme: Fix mingw build 
Mingw apparently is less smart about coercing std::filesystem::path into strings.
 2025-01-20 15:39:14 +01:00
Eelco Dolstra
263a818bee
Merge pull request #12296 from DeterminateSystems/release-source-early 
addMultipleToStore(): Move pathsToCopy
 2025-01-20 15:16:59 +01:00
mergify[bot]
991be65272
Merge pull request #12298 from edolstra/fix-mingw 
mingw fixes
 2025-01-20 14:15:34 +00:00
Eelco Dolstra
2669e4ac4f
Add comment 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2025-01-20 14:57:56 +01:00
Eelco Dolstra
d8636843b1 mingw: Don't do LTO 
This breaks the build with "symbol wrong type (4 vs 3)".

https://stackoverflow.com/questions/28267100/dll-linking-failed-with-lto-using-mingw-w64
 2025-01-20 14:52:50 +01:00
Eelco Dolstra
c656725a15 mingw: Check for S_ISSOCK 2025-01-20 14:52:23 +01:00
Eelco Dolstra
cc838e8181 addMultipleToStore(): Move pathsToCopy 
This allows RemoteStore::addMultipleToStore() to free the Source
objects early (and in particular the associated sinkToSource()
buffers). This should fix #7359. For example, memory consumption of

  nix copy --derivation --to ssh-ng://localhost?remote-store=/tmp/nix --derivation --no-check-sigs \
    /nix/store/4p9xmfgnvclqpii8pxqcwcvl9bxqy2xf-nixos-system-...drv

went from 353 MB to 74 MB.
 2025-01-20 14:23:02 +01:00
Eelco Dolstra
a8c69cc907 processGraph(): Don't throw ThreadPoolShutDown if there is an exception 
Fixes

  $ nix copy --derivation --to /tmp/nix /nix/store/...
  error: cannot enqueue a work item while the thread pool is shutting down

The ThreadPoolShutDown exception was hiding the reason for the thread
pool shut down, e.g.

  error: cannot add path '/nix/store/03sl46khd8gmjpsad7223m32ma965vy9-fix-static.patch' because it lacks a signature by a trusted key
 2025-01-20 13:25:31 +01:00
Ilja Kotirinta
c59aa3ec87 Remove character not needed for a command 2025-01-20 14:03:29 +02:00
mergify[bot]
bcb92a5fa0
Merge pull request #12133 from momeemt/#11991-logs_ignore_empty_lines 
libmain: fix ignoring empty lines in the print-build-logs option
 2025-01-18 13:52:25 +00:00
mergify[bot]
4f0e352ef2
Merge pull request #12283 from DeterminateSystems/type-safe-git-url 
Git fetcher: Replace RepoInfo::url by a std::variant
 2025-01-18 09:37:23 +00:00
John Ericson
69fde530a6 Clean up packaging a bit 
- Multiple choices of stdenv are handled more consistently, especially for the dev
  shells which were previously not done correctly.

- Some stray nix code was moving into the `packaging` directory
 2025-01-17 15:09:43 -05:00
Eelco Dolstra
f5548c17ed getSourcePath(): Return std::filesystem::path 2025-01-17 13:21:53 +01:00
Eelco Dolstra
9003343b53 Git fetcher: Replace RepoInfo::url by a std::variant 
Previously the 'url' field was either a path or a URL, depending on
'isLocal'. This replaces both fields by a std::variant, which is more
type-safe.
 2025-01-17 13:21:53 +01:00
Eelco Dolstra
43a170a554
Merge pull request #12277 from DeterminateSystems/warn-relative-git 
Warn against the use of relative 'git+file:' flake inputs
 2025-01-17 12:49:24 +01:00
Eelco Dolstra
3197c19a31 Add link to tracking issue 2025-01-17 12:34:38 +01:00
Eelco Dolstra
12aff40ad7
Merge pull request #12282 from DeterminateSystems/trivial-changes 
Trivial changes from lazy-trees
 2025-01-17 00:00:07 +01:00
Eelco Dolstra
f0271090b2 Drop unused 'settings' argument 2025-01-16 23:47:57 +01:00
Eelco Dolstra
5807b5cda0 Trivial changes from lazy-trees 
Rename allowLookup -> useRegistries, rename lockRootPath ->
followsPrefix, drop an unnecessary getFlake() variant.
 2025-01-16 23:44:18 +01:00
Eelco Dolstra
17b6557c03
Merge pull request #12275 from andrewhamon/ah/set-priority-nix-env-install 
nix-env: add a --priority flag to --install
 2025-01-16 22:04:35 +01:00
Andy Hamon
6ea339ce8a
Update src/nix-env/nix-env.cc 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2025-01-16 11:53:43 -08:00
Andy Hamon
3716ded8df nix-env: add a --priority flag to --install 
nix-env can read priorities from a derivations meta attributes, but this
only works when installing a nix expression.

nix-env can also install bare store paths, however meta attributes are
not readable in that case. This means that a store path can not be
installed with a specific priority.

Some cases where it is advantageous to install a store path: a remote
host following a `nix copy`, or any time you want to save some
evaluation time and happen to already know the store path.

This PR addresses this shortcoming by adding a --priority flag to
nix-env --install.
 2025-01-16 11:46:25 -08:00
Eelco Dolstra
f36cbee7fd
Merge pull request #12258 from abathur/fix_paths_in_sequoia_script 
sequoia-nixbld-user-migration: nail down PATH
 2025-01-16 17:42:20 +01:00
Eelco Dolstra
d388a691f3
Merge pull request #12276 from DeterminateSystems/remove-unneeded-quotes 
Remove some unnecessary quotes around std::filesystem::path
 2025-01-16 17:28:05 +01:00
Eelco Dolstra
12e14956e2 Warn against the use of relative 'git+file:' flake inputs 2025-01-16 17:23:31 +01:00
Eelco Dolstra
2ca0c62a8d Remove some unnecessary quotes around std::filesystem::path 2025-01-16 17:06:59 +01:00
Eelco Dolstra
043df13f72
Merge pull request #10089 from edolstra/relative-flakes 
Improve support for relative path inputs
 2025-01-16 14:21:27 +01:00
Eelco Dolstra
db46d40b12 Update release note 2025-01-16 13:15:20 +01:00
Eelco Dolstra
8b1fb92a0c flakes.md: Fix indentation that broke the list 2025-01-16 11:31:22 +01:00
Eelco Dolstra
5d03ef9caf PathInputSchema::getAbsPath(): Return std::filesystem::path 2025-01-16 11:26:14 +01:00
Eelco Dolstra
521667eb89 Fix follow-paths test 
Since ff8e2fe84e, 'path:' URLs on the
CLI are interpreted as relative to the current directory of the user,
not the path of the flake we're overriding.
 2025-01-16 11:19:20 +01:00
Eelco Dolstra
550fe889ee Merge remote-tracking branch 'origin/master' into relative-flakes 2025-01-16 11:05:10 +01:00
John Ericson
0c101679b4
Merge pull request #12261 from NixOS/packaging 
Packaging cleanups, add RossComputerGuy as `-llvm` maintainer
 2025-01-15 17:25:15 -05:00
John Ericson
e02026adae
Merge pull request #12254 from DeterminateSystems/fix-relative-path-on-cli 
Fix relative 'path:' flakerefs in the CLI
 2025-01-15 15:19:56 -05:00
mergify[bot]
c45dfeeef3
Merge pull request #12220 from DeterminateSystems/allow-dirty-locks 
Add setting 'allow-dirty-locks'
 2025-01-15 20:18:28 +00:00
mergify[bot]
9c239d4353
Merge pull request #12107 from bryango/feature 
fetchers/git: make relative path absolute for local repo
 2025-01-15 19:55:12 +00:00
Robert Hensing
7ad02b62e0 refactor: Remove redundant parameters 2025-01-15 20:01:00 +01:00
Robert Hensing
cab347b4eb refactor: Move ld=gold rule to mesonBuildLayer 2025-01-15 20:01:00 +01:00
Robert Hensing
3d078cd508 Add RossComputerGuy as -llvm maintainer 2025-01-15 20:00:40 +01:00
Robert Hensing
61467b72af
Merge pull request #12229 from RossComputerGuy/feat/llvm 
Add LLVM to Flake
 2025-01-15 19:35:19 +01:00