lix-project/lix
18
49
Fork 26
Code Issues 335 Code Review (Gerrit) Projects 1 Releases Wiki Activity
7402 commits 29 branches 5 tags 81 MiB
Commit graph

7402 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 72748b4088
Merge pull request #3173 from mkenigs/typo 
fix typo
 2019-11-05 11:17:26 +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
Eelco Dolstra 8ec1b1e7b8
Merge pull request #3203 from hvdijk/prefetch-progress 
Fix progress bar when nix-prefetch-url is piped.
 2019-11-04 09:28:17 +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
Eelco Dolstra 06f9364e5f
Merge pull request #3192 from ng-0/ng0/issue3186 
include netinet/in.h in src/nix/main.cc
 2019-11-01 16:17:30 +01:00
ng0 b811bd2172 include netinet/in.h in src/nix/main.cc 
Fixes #3186
 2019-11-01 14:09:42 +00:00
Eelco Dolstra 6c8d0133ef
Merge pull request #3187 from Mic92/travis 
travis: enable linux builds
 2019-10-31 17:40:57 +01:00
Jörg Thalheim f1782642d3
travis: enable linux builds 
Also disable email to not notify the whole NixOS community about build failures
 2019-10-31 16:37:33 +00: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
Eelco Dolstra 4e840fc541
Merge pull request #3179 from dtzWill/fix/struct-class-mismatch-minor 
minor: fix mismatch of struct/class forward decl of 'Source'
 2019-10-31 14:03:04 +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
Eelco Dolstra e34b317bbf
Merge pull request #3178 from helsinki-systems/flakes-git-log 
[flakes] Replace git show with git log
 2019-10-30 17:20:13 +01: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
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
Eelco Dolstra 2f96a89646 install-multi-user.sh: Remove unused variables 
https://hydra.nixos.org/build/104119659
 2019-10-23 21:24:21 +02:00
Eelco Dolstra b421895c1e
Merge pull request #3161 from schlarpc/patch-1 
Remove superfluous IAM action for S3 cache
 2019-10-23 16:34:54 +02:00
Eelco Dolstra dfe1fdf9e8
Merge pull request #3159 from earksiinni/docs-import-brackets 
Document import <path> syntax
 2019-10-23 16:33:58 +02:00
Chaz Schlarp c92ea927e5
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
 2019-10-22 16:04:49 -07: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
Ersin Akinci f107a27002 Tweak path hint 2019-10-21 14:16:55 -07: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
Ersin Akinci b7a936224e Add hint about path in builtins.import 2019-10-21 14:11:26 -07:00
Ersin Akinci 9be7787ec0 Revert "Document import <path> syntax" 
This reverts commit d8730fb86f.
 2019-10-21 13:12:41 -07: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