Eelco Dolstra
d823381c0a
Merge branch 'fix/nix-doctor-output' of https://github.com/bhipple/nix
2019-11-05 16:04:40 +01:00
Eelco Dolstra
852554bb16
Merge branch 'nix-repl-e' of https://github.com/zimbatm/nix
2019-11-05 11:20:53 +01:00
Eelco Dolstra
9ff4060d26
Merge pull request #3190 from mkenigs/examples
...
change deprecated attribute syntax in run examples
2019-11-05 11:17:54 +01:00
Eelco Dolstra
72748b4088
Merge pull request #3173 from mkenigs/typo
...
fix typo
2019-11-05 11:17:26 +01:00
Eelco Dolstra
1b600ecd14
Don't use SOCK_CLOEXEC on macOS
...
https://hydra.nixos.org/build/105428308
2019-11-05 10:25:09 +01:00
Eelco Dolstra
b81d9d26f5
Merge remote-tracking branch 'origin/master' into flakes
2019-11-04 22:29:31 +01:00
Eelco Dolstra
f5a46ef0b1
Merge pull request #3202 from kraem/master
...
Update nix eval --help msg to not include deprecated command
2019-11-04 09:34:30 +01:00
Harald van Dijk
c935ad3f02
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.
2019-11-03 21:46:59 +00:00
kraem
dcd7a26063
Update nix eval --help msg to not include deprecated command
2019-11-03 18:47:28 +01:00
ng0
b811bd2172
include netinet/in.h in src/nix/main.cc
...
Fixes #3186
2019-11-01 14:09:42 +00:00
matthew
d865085c7e
change deprecated attribute syntax in run examples
2019-10-31 23:13:08 -05:00
Eelco Dolstra
6bff1aa46d
Merge pull request #3182 from bhipple/fixup/comments
...
Minor updates to inline comments
2019-10-31 14:14:35 +01:00
Benjamin Hipple
80d5ec6ff4
Minor updates to inline comments
...
Add missing docstring on InstallableCommand. Also, some of these were wrapped
when they're right next to a line longer than the unwrapped line, so we can just
unwrap them to save vertical space.
2019-10-31 05:56:37 -04:00
Will Dietz
0e9b72e097
minor: fix mismatch of struct/class forward decl of 'Source'
...
Fixes the following warning and the indicate potential issue:
src/libstore/worker-protocol.hh:66:1: warning: class 'Source' was previously declared as a struct; this is valid, but may result in linker errors
under the Microsoft C++ ABI [-Wmismatched-tags]
(cherry picked from commit 6e1bb04870b1b723282d32182af286646f13bf3c)
2019-10-30 14:39:01 -05:00
Janne Heß
2d1d1e3083
Replace git show with git log
...
git show seems to print the entire tag message when being called on a tag
instead of a commit. git log instead always prints the correct timestamp
in my tests.
The error nix prints is: `error: stoull`.
2019-10-30 17:15:38 +01:00
Eelco Dolstra
e5319a87ce
queryPathInfoUncached(): Return const ValidPathInfo
2019-10-29 13:53:04 +01:00
Eelco Dolstra
992a2ad475
Move addToStoreFromDump to Store
2019-10-29 13:38:24 +01:00
Eelco Dolstra
05819d013f
Don't create a Store in processConnection()
2019-10-29 13:36:19 +01:00
Eelco Dolstra
63b99af85a
Move Unix domain socket creation to libutil
...
Also drop multithread-unfriendly hacks like doing a temporary
chmod/umask.
2019-10-29 13:30:51 +01:00
Eelco Dolstra
2d37e88319
Move most of the daemon implementation to libstore
2019-10-29 13:25:33 +01:00
Eelco Dolstra
95c727caef
Remove the check against concurrent builds in the same process
2019-10-29 12:43:20 +01:00
matthew
e0bcacf79f
fix typo
2019-10-28 18:02:47 -05:00
zimbatm
9a25059656
findDerivationFilename: add FIXME
2019-10-28 21:40:02 +01:00
zimbatm
d407f4d15f
nix repl: also handle lambda edit
2019-10-28 21:37:22 +01:00
zimbatm
3774fe55fd
editorFor: take a pos object instead
2019-10-28 21:36:34 +01:00
zimbatm
ec448f8bb6
libexpr: findDerivationFilename return Pos instead of tuple
2019-10-28 21:29:54 +01:00
Eelco Dolstra
f7ce80f90a
Factor out linkOrCopy()
2019-10-27 18:19:13 +01:00
Eelco Dolstra
f1c0b2c0e1
Add O(1)-memory copyPath() function
2019-10-27 18:18:58 +01:00
Eelco Dolstra
3913afdd69
Simplification
2019-10-27 18:00:09 +01:00
Eelco Dolstra
0e459d79a6
Merge branch 'issue-3147-inNixShell-arg' of https://github.com/hercules-ci/nix
2019-10-27 17:10:19 +01:00
Robert Hensing
9d612c393a
Add inNixShell = true to nix-shell auto-call
...
This is an alternative to the IN_NIX_SHELL environment variable,
allowing the expression to adapt itself to nix-shell without
triggering those adaptations when used as a dependency of another
shell.
Closes #3147
2019-10-27 13:16:02 +01:00
Eelco Dolstra
e012384fe9
Merge branch 'tojson-tostring-fix' of https://github.com/mayflower/nix
2019-10-27 12:18:35 +01:00
Robin Gloster
e583df5280
builtins.toJSON: fix __toString usage
2019-10-27 10:15:51 +01:00
zimbatm
59c7249769
libexpr: add findDerivationFilename
...
extract the derivation to filename:lineno heuristic
2019-10-23 17:21:16 +02:00
zimbatm
207a537343
libutil: add editorFor heuristic
2019-10-23 16:48:28 +02:00
zimbatm
73ff84f6a8
nix repl: add :edit command
...
This allows to have a repl-centric workflow to working on nixpkgs.
Usage:
:edit <package> - heuristic that find the package file path
:edit <path> - just open the editor on the file path
Once invoked, `nix repl` will open $EDITOR on that file path. Once the
editor exits, `nix repl` will automatically reload itself.
2019-10-23 16:09:42 +02:00
Eelco Dolstra
9cac895406
Use upstream nlohmann_json
2019-10-22 20:12:23 +02:00
Eelco Dolstra
ac9b427541
Convert old-style profile manifest
2019-10-22 15:16:57 +02:00
Eelco Dolstra
af786432c5
Add "nix profile upgrade" command
2019-10-22 14:44:51 +02:00
Eelco Dolstra
e30a0155d4
Add "nix profile remove" command
2019-10-22 13:06:32 +02:00
Eelco Dolstra
555ca59f2b
nix profile info: Index elements
2019-10-22 00:28:16 +02:00
Eelco Dolstra
ce27920936
Add start of 'nix profile' command
2019-10-22 00:22:15 +02:00
Eelco Dolstra
91a88f3acb
Fix "nixpkgs." compatibility
2019-10-21 23:38:07 +02:00
Eelco Dolstra
1e23b82a53
exportGitHub(): Don't rely on the ETag from GitHub
...
We relied on it being the Git revision, but that stopped being the
case.
2019-10-21 23:14:29 +02:00
Eelco Dolstra
45b740c18b
Use upstream json_fwd.hpp to speed up compilation
2019-10-21 22:11:21 +02:00
Eelco Dolstra
cb1a79a96a
Fix build
2019-10-21 18:58:38 +02:00
Eelco Dolstra
9a18f544ac
Merge remote-tracking branch 'origin/master' into flakes
2019-10-21 18:48:21 +02:00
Eelco Dolstra
629b9b0049
Mark content-addressable paths with references as experimental
2019-10-21 18:05:31 +02:00
Eelco Dolstra
e68736936a
nix make-content-addressable: Add examples
2019-10-21 17:58:17 +02:00
Eelco Dolstra
d77970fde7
Fix build
2019-10-21 17:49:16 +02:00
