Eelco Dolstra
1789c56f43
Fix macOS build
...
https://hydra.nixos.org/build/107716759
2019-12-04 00:36:04 +01:00
Eelco Dolstra
c3c23a52ee
Merge remote-tracking branch 'origin/master' into flakes
2019-12-04 00:31:09 +01:00
Eelco Dolstra
c1d18050b4
Disable recursive Nix test on macOS
...
https://hydra.nixos.org/build/107724274
2019-12-03 19:19:14 +01:00
Profpatsch
7923e22276
doc/manual: add ids to the advanced attribute definitions
...
This makes it possible to reference single attribute definitions,
for pointing people to their exact definition.
2019-12-03 18:22:27 +01:00
Profpatsch
7395e091c5
doc/manual: add note to allowSubstitutes advanced attribute
2019-12-03 18:01:45 +01:00
Eelco Dolstra
e721f99817
nix: Add --refresh as an alias for --tarball-ttl 0
2019-12-02 15:56:37 +01:00
Eelco Dolstra
e59e2b2951
Merge branch 'pkg-config-static' of https://github.com/matthewbauer/nix
2019-12-02 13:20:02 +01:00
Eelco Dolstra
0456a4ec65
Merge branch 'run-environment' of https://github.com/mkenigs/nix into flakes
2019-12-02 13:01:43 +01:00
Eelco Dolstra
ac2bc721d8
Merge remote-tracking branch 'origin/recursive-nix'
2019-12-02 12:34:46 +01:00
matthew
062012eee1
typo
2019-12-01 18:34:59 -07:00
Graham Christensen
ec364582eb
Merge pull request #3252 from bwignall/typo
...
Fix typos
2019-11-30 19:05:43 -05:00
Brian Wignall
8737980e75
Fix typos
2019-11-30 19:04:14 -05:00
Eelco Dolstra
f102d793f1
Merge pull request #2748 from edolstra/rust
...
Make nix/unpack-channel.nix a builtin builder
2019-11-29 19:33:31 +01:00
Eelco Dolstra
39954a9586
Make libnixrust a dynamic library
...
This is a hack to fix the build on macOS, which was failing because
libnixrust.a contains compiler builtins that clash with
libclang_rt.osx.a. There's probably a better solution...
https://hydra.nixos.org/build/107473280
2019-11-29 18:30:39 +01:00
Eelco Dolstra
895ed4cef0
Remove RPM spec file
...
Closes #3225 .
Closes #3226 .
2019-11-28 15:10:18 +01:00
Eelco Dolstra
2d6f1ddbb5
Remove builtins.valueSize
...
Fixes #3246 .
2019-11-28 13:52:42 +01:00
Eelco Dolstra
895ce1bb6c
make clean: Delete nix-rust/target
2019-11-27 17:33:59 +01:00
Eelco Dolstra
f553a8bdea
When OPTIMIZE=0, build rust code in debug mode
2019-11-27 14:18:57 +01:00
Eelco Dolstra
949dc84894
Fix segfault on i686-linux
...
https://hydra.nixos.org/build/107467517
Seems that on i686-linux, gcc and rustc disagree on how to return
1-word structs: gcc has the caller pass a pointer to the result, while
rustc has the callee return the result in a register. Work around this
by using a bare pointer.
2019-11-27 14:17:15 +01:00
Eelco Dolstra
dbc4f9d478
Fix macOS build
...
https://hydra.nixos.org/build/107466992
2019-11-27 00:17:39 +01:00
Eelco Dolstra
ca8caaec5e
nix: Add --expr flag
...
This replaces the '(...)' installable syntax, which is not very
discoverable. The downside is that you can't have multiple expressions
or mix expressions and other installables.
2019-11-27 00:05:30 +01:00
Eelco Dolstra
e6c1d1b474
Update Cargo.lock
2019-11-26 22:46:36 +01:00
Eelco Dolstra
88f8063917
-Z offline -> --offline
2019-11-26 22:45:15 +01:00
Eelco Dolstra
8918bae098
Drop remaining uses of external "tar"
...
Also, fetchGit now runs in O(1) memory since we pipe the output of
'git archive' directly into unpackTarball() (rather than first reading
it all into memory).
2019-11-26 22:07:28 +01:00
Eelco Dolstra
f2bd847092
Ignore tar header entries
...
In particular, these are emitted by 'git archive' (in fetchGit).
2019-11-26 22:07:28 +01:00
Eelco Dolstra
d33dd6e6c0
Move code around
2019-11-26 22:07:28 +01:00
Eelco Dolstra
d14b1c261c
Shut up some rust warnings
2019-11-26 22:07:28 +01:00
Eelco Dolstra
b7fba16613
Move code around
2019-11-26 22:07:28 +01:00
Eelco Dolstra
f738cd4d97
More Rust FFI adventures
...
We can now convert Rust Errors to C++ exceptions. At the Rust->C++ FFI
boundary, Result<T, Error> will cause Error to be converted to and
thrown as a C++ exception.
2019-11-26 22:07:28 +01:00
Eelco Dolstra
8110b4ebb2
Rust cleanup
2019-11-26 22:07:28 +01:00
Eelco Dolstra
343ebcc048
Only pass '-Z offline' to cargo if we have a vendor directory
2019-11-26 22:07:28 +01:00
Eelco Dolstra
afb021893b
Reduce the size of the vendor directory by removing some winapi cruft
2019-11-26 22:07:28 +01:00
Eelco Dolstra
d722e2175e
Include cargo dependencies in the Nix tarball
2019-11-26 22:07:28 +01:00
Eelco Dolstra
0dbb249b36
Update Rust dependencies
2019-11-26 22:07:28 +01:00
Eelco Dolstra
87b7b25e13
Clean up the configure script
2019-11-26 22:07:28 +01:00
Eelco Dolstra
6a9c815734
Remove most of <nix/config.nix>
...
This is no longer needed.
2019-11-26 22:07:28 +01:00
Eelco Dolstra
045708db43
Make <nix/unpack-channel.nix> a builtin builder
...
This was the last function using a shell script, so this allows us to
get rid of tar, coreutils, bash etc.
2019-11-26 22:07:28 +01:00
Eelco Dolstra
e60f6bd4ce
Enable Rust code to call C++ Source objects
2019-11-26 22:07:28 +01:00
Eelco Dolstra
11da5b2816
Add some Rust code
2019-11-26 22:07:28 +01:00
Eelco Dolstra
abb8ef619b
Fix macOS build
...
https://hydra.nixos.org/build/107457009
2019-11-26 21:08:56 +01:00
Eelco Dolstra
313106d549
Fix clang warnings
2019-11-26 21:07:44 +01:00
Eelco Dolstra
425991883a
Merge pull request #3141 from xbreak/nocafile
...
Downloader: Log configured CA file
2019-11-26 20:52:25 +01:00
Eelco Dolstra
7c8d7c17f8
Merge pull request #3144 from matthewbauer/fix-sandbox-fallback
...
Fix sandbox fallback settings
2019-11-26 20:51:52 +01:00
Eelco Dolstra
0be8d7784f
Typo
2019-11-26 20:33:46 +01:00
Eelco Dolstra
73efc1e8e7
Merge branch 'document-dry-run-option' of https://github.com/Ma27/nix
2019-11-26 20:32:50 +01:00
Eelco Dolstra
ec5e7b44ff
Simplify
2019-11-26 20:26:22 +01:00
Eelco Dolstra
96e1c39bb7
Merge branch 'repair-bad-links' of https://github.com/chkno/nix
2019-11-26 20:21:48 +01:00
Eelco Dolstra
872740cf60
Merge pull request #3238 from puckipedia/attrset-overrides-dynamic
...
Ensure enough space in attrset bindings
2019-11-26 20:14:55 +01:00
Eelco Dolstra
c13193017f
Disallow empty store path names
...
Fixes #3239 .
2019-11-26 20:12:15 +01:00
Eelco Dolstra
89db9353d7
Doh
2019-11-26 20:08:25 +01:00
