wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 18:31:49 +02:00
Code Activity
6961 commits 245 branches 205 tags 164 MiB
Commit graph

6961 commits

This branch
This branch
All branches
Author SHA1 Message Date
Puck Meerburg
9879e25473 Add testcase for attrset using __overrides and dynamic attrs 
(cherry picked from commit cdadbf7708)
 2020-01-04 14:12:18 +01:00
Puck Meerburg
59bbc31701 Ensure enough space in attrset bindings when using both __overrides and dynamic attributes 
(cherry picked from commit cd55f91ad2)
 2020-01-04 14:12:13 +01:00
Maximilian Bosch
195cc3f883 doc: Document --dry-run option for nix-build 
(cherry picked from commit 52ffe2797a)
 2020-01-04 14:11:52 +01:00
Kevin Stock
a118444f36 docs: correct default location of log directory 
(cherry picked from commit cea05e5ee7)
 2020-01-04 14:11:31 +01:00
Robin Gloster
3130aafd01 builtins.toJSON: fix __toString usage 
(cherry picked from commit e583df5280)
 2020-01-04 14:10:56 +01:00
Eelco Dolstra
6c90e3b9ac install-multi-user.sh: Remove unused variables 
https://hydra.nixos.org/build/104119659
(cherry picked from commit 2f96a89646)
 2020-01-04 14:10:29 +01:00
Chaz Schlarp
9f524d9423 Remove superfluous IAM action for S3 cache 
`s3:ListObjects` isn't a real IAM action, but _is_ the name of an S3 API method. `s3:ListBucket` is the relevant action for that method.

https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazons3.html
(cherry picked from commit c92ea927e5)
 2020-01-04 14:10:23 +01:00
Ersin Akinci
93d6814847 Tweak path hint 
(cherry picked from commit f107a27002)
 2020-01-04 14:10:19 +01:00
Ersin Akinci
e9c0c772b0 Add hint about path in builtins.import 
(cherry picked from commit b7a936224e)
 2020-01-04 14:10:15 +01:00
Ersin Akinci
1ea63a5931 Revert "Document import <path> syntax" 
This reverts commit d8730fb86f.

(cherry picked from commit 9be7787ec0)
 2020-01-04 14:09:59 +01:00
Steven Shaw
e1fb586138 Fix unset variable in installer 
(cherry picked from commit f0ec4b4ce4)
 2020-01-04 14:09:14 +01:00
Dan Callahan
34bf1a8b5f Make nix-daemon.plist less fragile on macOS 
We're calling `wait4path` on the full, resolved `@bindir@/nix-daemon` path.

That means we're hardcoding something like:

    /bin/wait4path /nix/store/zs9c5xhp3zv9p23qnjxp87nl5injsi1i-nix-2.3/bin/nix-daemon &amp;&amp; /nix/var/nix/profiles/default/bin/nix-daemon

That seems unnecessarily fragile.

It might be better to wait4path on the path we intend to call.

(cherry picked from commit 8c4a5e7ba1)
 2020-01-04 14:07:41 +01:00
Matthew Bauer
7a011ded77 Copy instead of linking launch agent 
On Catalina, the /nix filesystem might not be mounted at start time.
To avoid this service not starting, we need to keep the launch agent
outside of the Nix store. A wait4pid will hold for our /nix dir to be
mounted.

Fixes #3125.

(cherry picked from commit 0847f2f1b3)
 2020-01-04 14:06:29 +01:00
Eelco Dolstra
eacc510572 Bump version number 2020-01-04 14:04:38 +01:00
Eelco Dolstra
9cf52dd1cc Disable the evalNixOS test 
It also OOMs.

https://hydra.nixos.org/build/105942679
(cherry picked from commit 99af822004)
 2020-01-04 14:02:40 +01:00
Eelco Dolstra
5526f725a8 Disable the evalNixpkgs test 
It constantly OOMs.

https://hydra.nixos.org/build/105784912
(cherry picked from commit 35732a95bc)
 2020-01-04 14:02:35 +01:00
Matthew Bauer
421f1f4493 Move tmpDirInSandbox to initTmpDir 
(cherry picked from commit 96c84937c4)
 2020-01-04 13:41:42 +01:00
Matthew Bauer
10bf5340ca Fix sandbox fallback settings 
The tmpDirInSandbox is different when in sandboxed vs. non-sandboxed.
Since we don’t know ahead of time here whether sandboxing is enabled,
we need to reset all of the env vars we’ve set previously. This fixes
the issue encountered in https://github.com/NixOS/nixpkgs/issues/70856.

(cherry picked from commit 499b038875)
 2020-01-04 13:41:35 +01:00
Eelco Dolstra
8b44ed08e7 ssh-ng: Don't set CPU affinity on the remote 
Fixes #3138.

(cherry picked from commit 906d56a96b)
 2020-01-04 13:41:06 +01:00
Eelco Dolstra
1ac8c0269a SourceExprCommand::getSourceExpr(): Allocate more space 
Fixes #3140.

(cherry picked from commit 389a2cebed)
 2020-01-04 13:40:56 +01:00
Ersin Akinci
c7b4bf1c9c Document import <path> syntax 
(cherry picked from commit d8730fb86f)
 2020-01-04 13:40:46 +01:00
ng0
a53e4e217b include netinet/in.h in src/nix/main.cc 
Fixes #3186

(cherry picked from commit b811bd2172)
 2020-01-04 13:40:14 +01:00
Harald van Dijk
61855a4e7b Fix progress bar when nix-prefetch-url is piped. 
The intent of the code was that if the window size cannot be determined,
it would be treated as having the maximum possible size. Because of a
missing assignment, it was actually treated as having a width of 0.

The reason the width could not be determined was because it was obtained
from stdout, not stderr, even though the printing was done to stderr.

This commit addresses both issues.

(cherry picked from commit c935ad3f02)
 2020-01-04 13:40:03 +01:00
Brian Wignall
9b4e99801f Fix typos 
(cherry picked from commit 8737980e75)
 2020-01-04 13:39:19 +01:00
Eelco Dolstra
8be0440d44 EvalState::callFunction(): Make FunctionCallTrace use less stack space 
The FunctionCallTrace object consumes a few hundred bytes of stack
space, even when tracing is disabled. This was causing stack overflows:

  $ nix-instantiate '<nixpkgs> -A texlive.combined.scheme-full --dry-run
  error: stack overflow (possible infinite recursion)

This is with the default stack size of 8 MiB.

Putting the object on the heap reduces stack usage to < 5 MiB.

(cherry picked from commit 98ef11677c)
 2020-01-04 13:38:42 +01:00
Eelco Dolstra
61e816217b
nix verify: Fix uninitialized variable 
(cherry picked from commit 95cf23ee7c)
 2019-10-10 15:03:46 +02:00
Eelco Dolstra
21f48ff26a
nix-env: Ignore failures creating ~/.nix-profile and ~/.nix-defexpr 
https://hydra.nixos.org/build/102803093
(cherry picked from commit c3aaf3b8da)
 2019-10-10 09:42:22 +02:00
Eelco Dolstra
e3d44a3b83
Doh 
https://hydra.nixos.org/build/102803044
(cherry picked from commit bda64a2b0f)
 2019-10-10 00:14:59 +02:00
Eelco Dolstra
0fb4744467
nix-env: Create ~/.nix-defexpr automatically 
(cherry picked from commit c9159f86cc)
 2019-10-10 00:00:58 +02:00
Eelco Dolstra
f66108f738
nix-env: Create ~/.nix-profile automatically 
(cherry picked from commit 9348f9291e)
 2019-10-10 00:00:54 +02:00
Eelco Dolstra
2070d55b0b
Force per-user group to a known value 
(cherry picked from commit 20eec802ff)
 2019-10-09 23:58:59 +02:00
Eelco Dolstra
fe51fbaf81
Typo 
(cherry picked from commit 9277e72cb0)
 2019-10-09 23:58:55 +02:00
Eelco Dolstra
7c4589854b
Go back to 755 permission on per-user directories 
700 is pointless since the store is world-readable anyway. And
per-user/root/channels must be world-readable.

(cherry picked from commit d7bae5680f)
 2019-10-09 23:58:51 +02:00
Eelco Dolstra
1c10f739eb
nix-profile.sh: Remove coreutils dependency 
(cherry picked from commit 61a6176aca)
 2019-10-09 23:57:41 +02:00
Eelco Dolstra
2522757e83
nix-profile.sh: Don't create .nix-channels 
This is already done by the installer, so no need to do it again.

(cherry picked from commit 26762ceb86)
 2019-10-09 23:57:35 +02:00
Eelco Dolstra
923b6bd83c
Remove some redundant initialization 
(cherry picked from commit c43d9f6131)
 2019-10-09 23:57:30 +02:00
Eelco Dolstra
65953789bc
Remove world-writability from per-user directories 
'nix-daemon' now creates subdirectories for users when they first
connect.

Fixes #509 (CVE-2019-17365).
Should also fix #3127.

(cherry picked from commit 5a303093dc)
 2019-10-09 23:57:25 +02:00
Eelco Dolstra
910b0fcc11
Filter ANSI escape sequences in -L output 
Otherwise, builds like NixOS VM tests may leave the terminal in a
weird state and do resets.

(cherry picked from commit 4331eeb13d)
 2019-10-09 23:57:14 +02:00
Eelco Dolstra
e232bf2b69
Bump version number 2019-10-09 16:26:03 +02:00
Silvan Mosberger
7c9ad4d0d7
docs: Note that tryEval doesn't do deep evaluation 
(cherry picked from commit e4ea3e0306)
 2019-10-09 16:25:42 +02:00
Eelco Dolstra
fa028194e9
Disable OpenSSL lock callback on OpenSSL >= 1.1.1 
(cherry picked from commit a56b51a0ba)
 2019-10-09 16:25:23 +02:00
Julien Tanguy
ff7fcd3805
docs: Fix a typo in github in an example 
(cherry picked from commit 92ede15dd9)
 2019-10-09 16:25:17 +02:00
Julien Tanguy
ceddbc921f
docs: Use the explicit ref for fetchGit with a tag 
With the merge of #2582, the syntax "tags/1.9" for refs does not work
anymore.
However, the new syntax "refs/tags/1.9" seems to support annotated tags,
such as "refs/tags/2.0".

Closes #2385.

(cherry picked from commit ae244af242)
 2019-10-09 16:25:11 +02:00
Alexandre Esteves
62d1c60fb3
Move 'builtins.splitVersion' to position respecting alphabetical order 
(cherry picked from commit 9533d85ce0)
 2019-10-09 16:24:49 +02:00
zimbatm
f4106e76ff
libstore: don't forward --show-trace 
(cherry picked from commit e63c9e73e3)
 2019-10-09 16:24:35 +02:00
Eelco Dolstra
f3ce4453a6
Don't catch exceptions by value 
(cherry picked from commit 893be6f5e3)
(cherry picked from commit bd79c1f6f6)
 2019-10-09 16:24:28 +02:00
Eelco Dolstra
9f53bc33e7
Shut up some warnings 
(cherry picked from commit 99e8e58f2d)
(cherry picked from commit 3a022d4599)
 2019-10-09 16:24:23 +02:00
Joseph Lucas
4d83eb6206
Update garbage-collection.xml readability 
1. remove a typo space
2. Simplify negative style by using affirmative style

(cherry picked from commit 10bfc5c0d0)
 2019-10-09 16:24:10 +02:00
Eelco Dolstra
3919093e9a
Fix fetchTarball with chroot stores 
Fixes #2405.

(cherry picked from commit 168a887916)
 2019-10-09 16:23:49 +02:00
Sam Doshi
b0ae8fe2db
nix search: remove verbose example 
(cherry picked from commit 6f6cb5e388)
 2019-10-09 16:23:39 +02:00