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

20067 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergei Zimmerman
1b5c8aac12
libutil: Use correct argument to Error format ctor 
It seems that the intention was to format a number in base 8 (as
suggested by the %o format specifier), but `perms` is a `std::string`
and not a number. Looks like `rawMode` is the correct thing to use here.
 2025-04-24 22:27:03 +00:00
Sergei Zimmerman
bfb357c40b
libutil: Fix invalid boost format string in infinite symlink recursion error 
Found while working on an automated migration to `std::format`.
 2025-04-24 21:00:24 +00:00
mergify[bot]
b287f33090
Merge pull request #13085 from NixOS/bump-nixpkgs 
flake.lock: Update
 2025-04-24 20:23:53 +00:00
John Ericson
3e7d85dfdb flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f675531bc7e6657c10a18b565cfebd8aa9e24c14?narHash=sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U%3D' (2025-04-09)
  → 'github:NixOS/nixpkgs/8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7?narHash=sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo%3D' (2025-04-23)
 2025-04-24 13:43:53 -04:00
Jörg Thalheim
a8fb23b716
Merge pull request #13079 from cole-h/cole-h/push-romznoxnzppy 
nix-cli: restore binary-dist artifact to Hydra static builds
 2025-04-24 19:29:59 +02:00
Eelco Dolstra
68de26d38a lockFlake(): Allow registry lookups for the top-level flake 
Fixes #13050.
 2025-04-24 18:59:10 +02:00
Cole Helbling
e1b68244ad
nix-cli: restore binary-dist artifact to Hydra static builds 2025-04-24 08:46:47 -07:00
Eelco Dolstra
dda265f09a Reapply "Actually ignore system/user registries during locking" 
This reverts commit 3b5f0d9fb3.
 2025-04-24 17:33:27 +02:00
Jörg Thalheim
7880afcacd
Merge pull request #13076 from Mic92/fix-ignore-local-registrie 
Revert "Actually ignore system/user registries during locking"
 2025-04-24 13:33:31 +02:00
Jörg Thalheim
3b5f0d9fb3 Revert "Actually ignore system/user registries during locking" 
This reverts commit 77d4316353.
 2025-04-24 11:28:11 +02:00
Robert Hensing
8a1c40b927
Merge pull request #13065 from roberth/escapeShellArg 
Rename `shellEscape` -> `escapeShellArgAlways`
 2025-04-23 23:35:15 +02:00
Robert Hensing
1e5b1d9973 Rename shellEscape -> escapeShellArgAlways 
This name is close to the Nixpkgs lib function `escapeShellArg`,
making it easier to find.

A friendlier function with the same behavior as lib could be added
later.
 2025-04-23 22:56:07 +02:00
John Ericson
cccc26dcb1
Merge pull request #13059 from VitGottwald/patch-1 
Use python3 packages in deps
 2025-04-23 14:43:06 -04:00
John Ericson
9eb608cbef
Merge pull request #13070 from DeterminateSystems/fix-windows 
Don't build MonitorFdHup test on Windows
 2025-04-23 14:23:15 -04:00
John Ericson
714662e675
Merge pull request #13068 from DeterminateSystems/fix-warning 
DerivationBuilder: Fix compiler warning
 2025-04-23 14:10:55 -04:00
John Ericson
052d5cb3fe
Merge pull request #13067 from DeterminateSystems/move-libflake 
Move libflake/flake/* to libflake
 2025-04-23 14:03:35 -04:00
John Ericson
36fa9b90d8
Merge pull request #13069 from DeterminateSystems/fix-freebsd 
Fix signedness error on FreeBSD
 2025-04-23 14:02:13 -04:00
Eelco Dolstra
a9b6213221 Don't build MonitorFdHup on Windows 
https://hydra.nixos.org/build/295398462
 2025-04-23 19:51:13 +02:00
Eelco Dolstra
fd0835e7d7 Fix signedness error on FreeBSD 
https://hydra.nixos.org/build/295398446
 2025-04-23 17:41:35 +02:00
Eelco Dolstra
d07541be29 DerivationBuilder: Fix compiler warning 
Fixes

  ../src/libstore/unix/build/derivation-builder.cc:1130:86: warning: the compiler can assume that the address of ‘nix::DerivationBuilderParams::drv’ will never be NULL [-Waddress]
   1130 |     if (useChroot && settings.preBuildHook != "" && dynamic_cast<const Derivation *>(&drv)) {
        |                                                                                        ^~~~

Assuming this check was left over from the time `drv` could be a
`BasicDerivation`.
 2025-04-23 17:28:09 +02:00
Eelco Dolstra
bc67e47298 Move libflake/flake/* to libflake 2025-04-23 17:20:42 +02:00
John Ericson
876f676d90
Merge pull request #13060 from VitGottwald/patch-3 
Fix perl example
 2025-04-22 13:28:54 -04:00
Vit Gottwald
9f94a1b9fb
Put every package on its own line 2025-04-22 10:45:15 +02:00
Vit Gottwald
aa96bf2faf
Fix perl example 
The perl example does not work with http://nixos.org because it redirects.

Updating the url to https requires additional package.
 2025-04-22 09:49:34 +02:00
Vit Gottwald
aff7facdf6
Use python3 packages in deps 
To be consistent with the sample that uses the packages directly
in inline shebang.
 2025-04-22 09:23:56 +02:00
John Ericson
155411397d
Merge pull request #13055 from obsidiansystems/inlined-resolvedFinished 
Inline `DerivationGoal::resolvedFinished`
 2025-04-20 19:11:38 -04:00
John Ericson
54b7ccc466
Merge pull request #13053 from obsidiansystems/no-more-local-derivation-goal 
Get rid of `LocalDerivationGoal`
 2025-04-20 18:50:05 -04:00
John Ericson
16f640a9b2 Inline DerivationGoal::resolvedFinished 
`resolvedDrvGoal` can just become a local variable!
 2025-04-20 18:32:19 -04:00
Robert Hensing
15fa95f925
Merge pull request #13052 from rhendric/rhendric/increase-429-delay 
libstore: increase retry delay for 429
 2025-04-21 00:31:15 +02:00
John Ericson
4e586149df Get rid of LocalDerivationGoal 
I split it out before to try to separate the building logic, but now we
have the much better `DerivationBuilder` abstraction for that. With that
change, I think `LocalDerivationGoal` has outlived its usefulness.

We just inline it back into `DerivationGoal`, and do so with minimal
`#ifdef` for Windows.

Note that the order of statements in `~DerivationGoal` is different than
it was after the `~LocalDerivationGoal` split, but it is *restored* to
the way it original was before --- evidently I did the split slightly
wrong, but nobody noticed, probably because the order doesn't actually
matter.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2025-04-20 18:09:41 -04:00
John Ericson
bebef8f0c4
Merge pull request #13010 from obsidiansystems/bump-nixpkgs 
flake.lock: Update Nixpkgs
 2025-04-20 17:59:15 -04:00
mergify[bot]
933ed27dd9
Merge pull request #13054 from roberth/fix-non-virt-dtor 
Fix non-virtual destructor warning
 2025-04-20 21:50:32 +00:00
Robert Hensing
047f2bc1af refactor: Extract RETRY_TIME constants in filetransfer 2025-04-20 23:29:22 +02:00
John Ericson
ef36806898
Explain the use of "2" in the overlay 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2025-04-20 17:20:54 -04:00
Robert Hensing
363ee6dfcb Fix non-virtual destructor warning 2025-04-20 23:05:21 +02:00
Robert Hensing
b257ea94e3 Fix pkgs.nixVersions and installTests 
... by moving our stuff out of the way from upstream's
`nixComponents` and `nixDependencies` attrsets.

(I prefer not to use overlays, but let's make it work this way
first)
 2025-04-20 22:20:52 +02:00
John Ericson
f186491db9
Merge pull request #13047 from obsidiansystems/derivation-building-2 
Remove double indirection from `DerivationBuilder` params
 2025-04-20 15:19:35 -04:00
Ryan Hendrickson
85420b8537 libstore: increase retry delay for 429 
A 429 (Too Many Requests) error should not be retried after a quarter of
a second; that's just silly. GitHub recommends a minute.
 2025-04-20 14:49:03 -04:00
John Ericson
5eeeb44f79 Remove double indirection from DerivationBuilder params 
Now that `DerivationBuilder` is created after the underlying data has
already been initialized, we can just refer this data normally, with a
direct reference.

Only `parsedDrv` takes a (borrowing) pointer, because independent of
initialization the derivation may or may not have structured attrs.
 2025-04-18 12:26:05 -04:00
John Ericson
2b2ea218d9 Delay constructing a DerivationBuilder until we're about to build 
This makes the simplification in the following commit possible.
 2025-04-18 12:26:05 -04:00
John Ericson
27907e6cac Add documentation for DerivationBuilder::{parsedDrv, drvOptions} 2025-04-18 12:26:05 -04:00
Jörg Thalheim
f683a555bf
Merge pull request #12423 from ilya-bobyr/fish-profile-local-state-bin-in-PATH 
nix-profile.fish: Add local state bin to $PATH
 2025-04-18 07:27:04 +02:00
Eelco Dolstra
75679b323b
Merge pull request #13043 from Mic92/fix-build 
fix armv7/i686 build
 2025-04-17 17:03:19 +02:00
Jörg Thalheim
b3bbbd2e71 fix armv7/i686 build 2025-04-17 13:56:11 +02:00
Jörg Thalheim
e27d804929
Merge pull request #13039 from obsidiansystems/derivation-builder-in-separate-file 
Move `DerivationBuilder` to its own files
 2025-04-17 13:25:37 +02:00
Jörg Thalheim
6dcbac4278
Merge pull request #13040 from ilya-bobyr/fish-profile-set-MANPATH 
nix-profile-daemon.fish: Set MANPATH
 2025-04-17 10:24:19 +02:00
Jörg Thalheim
6fe0545bf3
Merge pull request #13041 from ilya-bobyr/fish-profile-do-not-test-USER 
nix-profile.fish: Do not check $USER
 2025-04-17 10:23:59 +02:00
Illia Bobyr
66ae8f4f44
nix-profile.fish: Do not check $USER 
While it seems unlikely that `$USER` will be unset while `$HOME` is set,
as `$USER` is not used in the script and as `nix-profile-daemon.fish` is
not checking `$USER`, it seems better to remove this check.

`nix-profile.fish` and `nix-profile-daemon.fish` now become identical.
 2025-04-16 17:16:51 -07:00
Illia Bobyr
470c521bcc
nix-profile-daemon.fish: Set MANPATH 
There seems to be no good reason for `nix-profile.fish` to set
`$MANPATH` while it being unset when `nix-profile-daemon.fish` is used.
 2025-04-16 17:14:47 -07:00
Illia Bobyr
fc8c11be48
nix-profile.fish: Add local state dir bin to $PATH 
It seems reasonable to add both `$HOME/.profile/bin` and
`@localstatedir@/nix/profiles/default/bin` to `$PATH` for both user
local and daemon based nix execution.  Nix daemon execution mode does
not affect these path.
 2025-04-16 17:11:56 -07:00