Samuel Dionne-Riel
9478f88681
Adds nix-shell
test for special-cased ruby interpreter.
...
The test fakes the interpreter only to verify the arguments it would be
given.
2018-04-08 00:45:28 -04:00
Samuel Dionne-Riel
399f43c3d5
nix-shell: Fixes use with ruby shebangs.
...
The ported code in 80ebc553ec
was incorrectly ported.
```
- $envCommand = "exec $execArgs $interpreter -e 'load(\"$script\")' -- ${\(join ' ', (map shellEscape, @savedArgs))}";
...
+ envCommand = (format("exec %1% %2% -e 'load(\"%3%\") -- %4%") % execArgs % interpreter % script % joined.str()).str();
```
The single-quote finishing the small ruby snippet was lost in
translation.
2018-04-07 22:38:45 -04:00
Bogdan Seniuc
b828051659
release.nix: Use $sourceRoot instead of hardcoded source directory
2018-04-07 10:15:41 +03:00
Eelco Dolstra
e10a7ec7eb
Merge pull request #2036 from AmineChikhaoui/disk-cache-ttl
...
Make the TTL for disk cache configurable
2018-04-06 12:51:26 +02:00
AmineChikhaoui
e01b01c579
update/re-order the options docs
2018-04-06 11:09:52 +01:00
AmineChikhaoui
62d75ad3e1
rename the options to mention it's a narinfo TTL as disk cache is used all over the place for other operations
2018-04-06 11:05:15 +01:00
AmineChikhaoui
33b08899d5
re-order the options using the alphabetical order and improve the example in the positive lookup case
2018-04-06 10:51:19 +01:00
AmineChikhaoui
86930ed414
add documentation for the local disk cache TTL config
2018-04-06 10:51:18 +01:00
AmineChikhaoui
2855c3d965
Make the TTL for disk cache configurable, we can now completely disable
...
disk cache lookup for example by doing:
nix copy --from <binary-cahe> <store-path> --option \
positive-disk-cache-ttl 0
Issues: #1885 #2035
2018-04-06 10:51:18 +01:00
Eelco Dolstra
27e9ce0eb2
Merge pull request #2040 from erictapen/doc-tofile-writetextfile
...
document that writeTextFile from Nixpkgs is an alternative to toFile
2018-04-06 11:27:55 +02:00
Andrew Dunham
0081a1eac2
Use $CPPFLAGS when detecting version of aws-sdk-cpp
2018-04-06 00:25:34 -07:00
Eelco Dolstra
1d9742b95f
<nix/buildenv.nix>: Ignore dangling symlinks
...
Fixes
error: getting status of '/nix/store/j8p0vv89k1pf0cn7kmfsdcs7bshwga1i-firefox-52.7.2esr/share/icons/hicolor/48x48/apps/firefox.png': No such file or directory
https://github.com/NixOS/nix/issues/1934
Also improve error message on directory/non-directory collisions.
2018-04-05 20:04:42 +02:00
Eelco Dolstra
5c904e10eb
<nix/buildenv.nix>: Skip non-directory top-level paths
...
Fixes https://github.com/NixOS/nix/issues/1934 (at least the "error:
opening directory '/nix/store/...-linux-config-4.4.14': Not a
directory" issue).
2018-04-05 19:34:56 +02:00
Justin Humm
045eb84409
document that writeTextFile from Nixpkgs is an alternative to builtins.toFile
2018-04-03 23:26:47 +02:00
Graham Christensen
3fbaa230a2
Merge pull request #2026 from grahamc/multi-user-linux
...
Expand the multi-user installer to support Linuxes with systemd
2018-03-30 16:04:11 -04:00
Graham Christensen
4eb40c72ed
macos: Handle when a build user doesn't have a user ID
2018-03-30 13:57:00 -04:00
Graham Christensen
f06f8102bd
Use a looser comparison for the 'user note' check
...
We use grep instead of an equality check because it is difficult
to extract _just_ the user's note, instead it is prefixed with
some plist junk. This was causing the user note to always be set,
even if there was no reason for it.
2018-03-30 11:38:08 -04:00
Graham Christensen
4ba91f5bae
Check for the existence of a profile target before seeing if it mentions Nix
...
Grep would ignore files that didn't exist, but would complain
about files in a directory if the directory didn't exist. Simply check
for the directory first, prior to grepping it.
2018-03-30 11:37:32 -04:00
Eelco Dolstra
4ee4fda521
Merge pull request #2025 from zimbatm/document-s3-usage
...
nix copy: add an example with S3
2018-03-30 11:38:30 +02:00
zimbatm
865ca2402f
nix copy: add an example with S3
...
I couldn't find a good example how to use it with non-us-east-1 buckets.
2018-03-30 02:31:14 +01:00
Graham Christensen
2921165a9d
Expand the multi-user installer to support Linuxes with systemd
...
- darwin installer: delete hardware report, not necessary
- moves os-specific code from the darwin installer to to `poly_*`
functions
- adds profile.d support to the profile targets, which automatically
handles many distros which don't have a /etc/bashrc but do have an
/etc/profile.d
- /bin/bash -> /usr/bin/env bash
- document why each excluded shellcheck check is excluded
- rename the multi-user to Daemon-based
2018-03-29 15:38:01 -04:00
Eelco Dolstra
446bb88f13
Remove reference to non-existent manpages
2018-03-29 12:29:10 +02:00
Eelco Dolstra
2b61c74922
Process --option use-case-hack properly
...
Fixes https://github.com/NixOS/nix/issues/2009 .
2018-03-29 12:28:29 +02:00
Eelco Dolstra
9d1220a01d
ValidPathInfo::isContentAddressed(): Ensure there are no references
2018-03-29 12:27:42 +02:00
Eelco Dolstra
e01c01f72c
Merge pull request #2005 from shlevy/fetchgit-docs
...
Document fetchGit.
2018-03-27 15:57:48 +02:00
Eelco Dolstra
7ec13eda9b
Merge pull request #2011 from dezgeg/use-closureinfo
...
release.nix: Use pkgs.closureInfo for binaryTarball
2018-03-27 15:57:17 +02:00
Tuomas Tynkkynen
cc6712ae90
release.nix: Use pkgs.closureInfo for binaryTarball
...
pathsFromGraph is legacy since Nix 2.0.
2018-03-26 15:47:14 +03:00
Shea Levy
6856fe62b0
Document fetchGit.
...
Fixes #1981 .
2018-03-23 07:02:45 -04:00
Eelco Dolstra
0cb1e52052
Merge pull request #2004 from dtzWill/feature/improved-store-mismatch-errors
...
download.cc: improve error for hash mismatch, fixup cache hits w/diverted store
2018-03-23 11:22:43 +01:00
Dmitry Kalinkin
e2f56c1333
doc: don't mention obsolete ssh-substituter-hosts
...
#1840
2018-03-22 19:17:45 -04:00
Will Dietz
74da813912
download: improve error for hash mismatch ("store mismatch")
...
Fixes #1905
2018-03-22 15:22:06 -05:00
Will Dietz
59b32403f2
download.cc: fix path for cached files
2018-03-22 15:05:46 -05:00
Eelco Dolstra
2bc6cfe1ad
Add Boost dependency to Fedora/Ubuntu builds
2018-03-22 14:15:46 +01:00
Eelco Dolstra
28eb9621cc
Fix build
2018-03-22 13:46:19 +01:00
Eelco Dolstra
ed87fd17dd
Remove Fedora / Ubuntu releases that are no longer in Nixpkgs
2018-03-22 13:32:18 +01:00
Eelco Dolstra
dce8af59a6
Tweak
2018-03-22 13:32:18 +01:00
Eelco Dolstra
f87e286e82
Merge branch 'fix/avoid-large-stack-buffers' of https://github.com/dtzWill/nix
2018-03-22 13:19:25 +01:00
Eelco Dolstra
92aee1b7d6
Remove some release-critical jobs
...
The release does not in fact depend on Ubuntu/Fedora builds (we don't
publish the build results).
2018-03-22 13:03:56 +01:00
Shea Levy
c24e0439b2
Merge branch 'fix/execl-null-sentinel' of git://github.com/dtzWill/nix
2018-03-21 23:25:53 -04:00
Eelco Dolstra
ec91840e70
Also make the backwards compatible case of RemoteStore::addToStore run in constant memory
...
Just because we can.
2018-03-21 23:46:03 +01:00
Eelco Dolstra
97002b684c
Make 'nix copy --to daemon' run in constant memory
2018-03-21 23:42:52 +01:00
Will Dietz
f66ae22288
shared.cc: style: prefer "nullptr" over '(char *)NULL'
2018-03-21 17:17:37 -05:00
Eelco Dolstra
11898d6a37
Make 'nix copy --to ssh://...' run in constant memory
2018-03-21 23:13:06 +01:00
Eelco Dolstra
47f7e5585b
Make 'nix copy --from ssh://...' run in constant memory
...
For instance, this reduced the memory consumption of
$ nix copy --from ssh://localhost --to ~/my-nix /nix/store/1n7x0yv8vq6zi90hfmian84vdhd04bgp-blender-2.79a
from 632 MiB to 16 MiB.
2018-03-21 23:10:40 +01:00
Shea Levy
92dfc22327
Merge branch 'master' of git://github.com/coreyoconnor/nix
2018-03-21 12:49:36 -04:00
Eelco Dolstra
8615cfb130
LegacySSHStore: Allow overriding the path to nix-store
2018-03-21 15:10:46 +01:00
Corey O'Connor
22b144fea6
manual: correct repeated "--deriver". Add missing single char option aliases.
2018-03-20 17:58:25 -07:00
Will Dietz
02d36fdab7
execl: cast NULL sentinel to (char *), per man page and compiler warning
...
From exec(3):
> The list of arguments must be terminated by a null pointer, and, since these
> are variadic functions, this pointer must be cast (char *) NULL
2018-03-20 13:31:58 -05:00
Eelco Dolstra
bed22114bf
Merge pull request #1997 from dtzWill/fix/cxx14-std-consistency
...
ask autotools for c++14 support flags, not c++11; don't override later
2018-03-20 18:29:05 +01:00
Eelco Dolstra
03d8136b02
Remove unused channel-cache directory
2018-03-20 18:22:49 +01:00