Eelco Dolstra
2c6dbcd5e7
Fix 'nix flake init' test
2019-11-20 13:07:44 +01:00
Eelco Dolstra
fd8ee94ab2
Remove #include
2019-11-20 13:04:39 +01:00
Eelco Dolstra
8beedd4486
Move #include
2019-11-20 13:04:39 +01:00
Eelco Dolstra
9b8cb6809b
Merge pull request #3228 from Ma27/flake-fix-template
...
Fix attr path to nixpkgs flake in flake template
2019-11-19 13:55:58 +01:00
b8bddb63e6
Fix attr path to nixpkgs flake in flake template
...
This doesn't work anymore since `packages` was removed from the
`nixpkgs`-fork with flake support[1], now it's only possible to refer to
pkgs via `legacyPackages`.
[1] 49c9b71e4c
2019-11-14 23:13:37 +01:00
Eelco Dolstra
8d2eb1ff56
nix dev-shell: Improve bash output parsing
...
Fixes handling of '=' in unquoted strings and escaped characters in
$'...' strings.
2019-11-12 12:45:48 +01:00
Eelco Dolstra
2c1e05ae93
Merge remote-tracking branch 'origin/master' into flakes
2019-11-08 15:22:54 +01:00
Eelco Dolstra
0d6774468c
Move editorFor srom libutil to nix
...
libutil should not depend on libexpr.
2019-11-08 15:13:32 +01:00
Eelco Dolstra
0bc0d35b6b
Merge remote-tracking branch 'origin/master' into flakes
2019-11-08 14:29:10 +01:00
Eelco Dolstra
48f0a76372
Fix installerScript job
...
https://hydra.nixos.org/build/105961653
2019-11-07 18:31:16 +01:00
Eelco Dolstra
4145cd2da0
Use upstream nlohmann_json
2019-11-07 18:23:17 +01:00
Eelco Dolstra
0ba8a4e942
Merge remote-tracking branch 'origin/master' into flakes
2019-11-07 13:56:41 +01:00
Eelco Dolstra
e5bf81256c
Fix Perl bindings
2019-11-07 12:18:37 +01:00
Eelco Dolstra
6d2605500f
Fix macOS build
2019-11-07 11:53:28 +01:00
Eelco Dolstra
f730841db4
Merge remote-tracking branch 'origin/master' into flakes
2019-11-07 11:44:02 +01:00
Eelco Dolstra
99af822004
Disable the evalNixOS test
...
It also OOMs.
https://hydra.nixos.org/build/105942679
2019-11-07 10:14:00 +01:00
Eelco Dolstra
04bf9acd22
Remove #include
2019-11-07 10:12:35 +01:00
Eelco Dolstra
f5b7991e59
Revert "autoconf: Allow overriding CFLAGS/CXXFLAGS from outside."
...
This reverts commit 717e821b99
2019-11-07 10:12:35 +01:00
Eelco Dolstra
5ff4d77f55
Precompile headers
...
This cuts 'make install -j6' on my laptop from 170s to 134s.
2019-11-07 10:12:35 +01:00
Eelco Dolstra
39a2e166dd
Cleanup
2019-11-06 16:53:02 +01:00
Eelco Dolstra
850f73045f
Fix GitHub test
2019-11-06 14:48:35 +01:00
Eelco Dolstra
f01304b573
Fix build
2019-11-06 14:47:58 +01:00
Eelco Dolstra
e491efe9fb
Use more stable registry URL
2019-11-06 14:20:16 +01:00
Eelco Dolstra
d5f1cc3e94
Use revcount/last-modified for computing the flake fingerprint
...
The store path is not enough. For example, when we build a dirty tree,
commit, and build the clean tree, a re-evaluation is necessary because
the flake may depend on the lastModified or revCount attributes.
2019-11-06 12:01:37 +01:00
Eelco Dolstra
88c452d160
Merge remote-tracking branch 'origin/master' into flakes
2019-11-06 10:56:33 +01:00
Eelco Dolstra
35732a95bc
Disable the evalNixpkgs test
...
It constantly OOMs.
https://hydra.nixos.org/build/105784912
2019-11-06 10:36:06 +01:00
Eelco Dolstra
7614a127a0
Fix binaryTarball test
2019-11-06 10:35:50 +01:00
Eelco Dolstra
b874272f7a
Make --enable-gc the default
2019-11-06 00:46:37 +01:00
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
b4e260d887
Disable shellcheck
...
It's broken at the moment: https://hydra.nixos.org/build/105746055
Also it pulls in GHC which is a pretty big dependency.
2019-11-05 16:00:30 +01:00
Eelco Dolstra
81a9b93689
Fix manual build
2019-11-05 11:21:32 +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
7876027071
Merge pull request #3193 from matthewbauer/patch-11
...
Update man to show that nix-shell allows --arg
2019-11-05 11:18:24 +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
78b8203e50
Merge pull request #3180 from kevinastock/patch-1
...
docs: fix upper bound on number of consumed cores
2019-11-05 11:17:02 +01:00
Eelco Dolstra
376802c9b8
Merge pull request #3199 from kevinastock/patch-2
...
docs: xref doesn't render in title
2019-11-05 11:16:15 +01:00
Eelco Dolstra
e1725ba946
Fix VM tests
2019-11-05 11:12:25 +01:00
Eelco Dolstra
6b708711f5
Merge branch 'switch-to-19.09' of https://github.com/Ericson2314/nix
2019-11-05 10:32:11 +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
3770f5c944
Merge pull request #3206 from kevinastock/patch-3
...
docs: correct default location of log directory
2019-11-04 22:30:07 +01:00
Eelco Dolstra
b81d9d26f5
Merge remote-tracking branch 'origin/master' into flakes
2019-11-04 22:29:31 +01:00
Kevin Stock
cea05e5ee7
docs: correct default location of log directory
2019-11-04 16:23:03 -05: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
Kevin Stock
808cb6444e
docs: xref doesn't render in title
...
The `post-build-hook` text currently appears in the index, but not on the actual title line of the section, this follows the pattern used in a previous section to get a reference into a title.
2019-11-02 17:55:53 -04:00
Matthew Bauer
f1d4ba2afd
Update man to show that nix-shell allows --arg
2019-11-01 13:25:15 -04: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
