Eelco Dolstra
1f94ec3924
Clean up a test warning
2014-02-06 13:54:44 +01:00
Eelco Dolstra
20d0598928
Drop dependency on ‘expr’
...
http://hydra.nixos.org/build/8715639
Not sure why this causes a failure now.
2014-02-06 13:51:57 +01:00
Eelco Dolstra
80b691316c
Fix version in nix.spec
...
http://hydra.nixos.org/build/8715502
2014-02-04 11:21:13 +01:00
Eelco Dolstra
4ee6001f95
GNU Make 3.81 compatibility
...
3.81 doesn't understand the ‘define foo =’ syntax, which was added in
3.82. So use ‘define foo’ instead.
2014-02-04 11:21:13 +01:00
Eelco Dolstra
143224f7cd
Add nix.spec to the distribution
2014-02-04 10:09:45 +01:00
Eelco Dolstra
d210cdc435
Fix assertion failure in ‘nix-store --load-db’
...
Namely:
nix-store: derivations.cc:242: nix::Hash nix::hashDerivationModulo(nix::StoreAPI&, nix::Derivation): Assertion `store.isValidPath(i->first)' failed.
This happened because of the derivation output correctness check being
applied before the references of a derivation are valid.
2014-02-03 22:36:07 +01:00
Eelco Dolstra
73a775f3b7
Merge commit '8468806552d6730abec6431c42b5b0e897c0222c'
2014-02-03 19:57:02 +01:00
Eelco Dolstra
8468806552
Add a basic README
2014-02-03 17:05:55 +01:00
Eelco Dolstra
d6582c04c1
Give a friendly error message if the DB directory is not writable
...
Previously we would say "error: setting synchronous mode: unable to
open database file" which isn't very helpful.
2014-02-01 16:57:38 +01:00
Eelco Dolstra
2f9bb5c7e7
Merge branch 'make'
2014-02-01 16:41:52 +01:00
Eelco Dolstra
6dca72006a
Only run "git ls-files" when doing "make check"
2014-02-01 16:30:24 +01:00
Eelco Dolstra
2a97f7b039
Fix logging test
2014-02-01 16:08:59 +01:00
Eelco Dolstra
965218a62a
Remove obsolete file
2014-02-01 16:08:51 +01:00
Eelco Dolstra
b6465ae5d3
Merge commit '28dc4883356a50f2805a3e3c819a541c44a4ff0a' into make
2014-02-01 15:37:59 +01:00
Eelco Dolstra
762ef464f8
Fix the nix-profile test
2014-02-01 15:37:50 +01:00
Eelco Dolstra
28dc488335
installcheck: Don't depend on install
...
This is a hack to prevent "installcheck" from clobbering files fixed
up by Nixpkgs' fixupPhase.
2014-02-01 15:33:27 +01:00
Eelco Dolstra
844d83352c
More "make dist" fixes
2014-02-01 15:18:48 +01:00
Eelco Dolstra
74ca70da3a
Add 'mk/' from commit '1eff3ad37fdb9dcf9f8528fdacea0ebf0e79d545'
...
git-subtree-dir: mk
git-subtree-mainline: 6ef32bddc1
git-subtree-split: 1eff3ad37f
2014-02-01 14:38:28 +01:00
Eelco Dolstra
6ef32bddc1
Fix "make dist"
2014-02-01 14:38:12 +01:00
Eelco Dolstra
1eff3ad37f
Add missing file
2014-02-01 14:36:44 +01:00
Eelco Dolstra
6f8aa145d4
Improve "make dist"
2014-02-01 14:22:08 +01:00
Eelco Dolstra
0c6d62cf27
Remove Automakefiles
2014-02-01 13:54:38 +01:00
Eelco Dolstra
16e7d69209
Update Makefile variable names
2014-02-01 13:54:38 +01:00
Eelco Dolstra
ec1738589a
Make variable names more regular
2014-02-01 12:20:06 +01:00
Eelco Dolstra
35107038f7
Support adding "make help" text
2014-02-01 11:47:34 +01:00
Eelco Dolstra
f324b49ea1
Change dependency file names from foo.dep to .foo.o.dep
2014-02-01 11:31:25 +01:00
Eelco Dolstra
ac8c2ef1aa
Build/install manual
2014-02-01 11:30:21 +01:00
Eelco Dolstra
4271927c5b
Add support for installing man-pages
2014-01-31 15:33:12 +01:00
Eelco Dolstra
e0234dfddc
Rename Makefile -> local.mk
2014-01-30 12:11:06 +01:00
Eelco Dolstra
4a2ec9c659
Install nix-worker symlink
2014-01-30 12:08:26 +01:00
Eelco Dolstra
c5ba081333
nix-shell: Add --impure flag
...
This is currently the default, but I might change that to --pure in
the future.
2014-01-23 13:34:04 +01:00
Eelco Dolstra
79dee4283d
nix-shell: Preserve the TZ variable of the user
2014-01-23 13:34:04 +01:00
Eelco Dolstra
7fdee6e136
nix-build: Refactor
2014-01-23 13:34:04 +01:00
Eelco Dolstra
5311b2b250
Clang doesn't know the "-z defs" flag
2014-01-23 10:49:53 +01:00
Eelco Dolstra
94f9c14d52
Fix some clang warnings
2014-01-21 18:29:55 +01:00
Eelco Dolstra
a26307b281
Fix build
2014-01-21 17:39:19 +01:00
Eelco Dolstra
625ffd441d
Ugly hack to fix building with clang
2014-01-21 16:38:03 +01:00
Eelco Dolstra
68cde53c47
Fix building against Bison 3.0.2
2014-01-21 15:34:04 +01:00
Eelco Dolstra
81628a6ccc
Merge branch 'master' into make
...
Conflicts:
src/libexpr/eval.cc
2014-01-21 15:30:01 +01:00
Eelco Dolstra
5ef8508a92
Remove unused type
2014-01-21 15:11:57 +01:00
Eelco Dolstra
c8fff6a77f
Fix evaluation
2014-01-21 15:09:59 +01:00
Eelco Dolstra
0e2ca26818
nix.spec: Remove "make check" since it's a no-op
2014-01-20 14:23:07 +01:00
Eelco Dolstra
0f2f44bb0f
Build Fedora 20 RPMs
2014-01-20 14:22:59 +01:00
Eelco Dolstra
bf0ad8aabc
nix-profile.sh: Add the Nixpkgs channel to $NIX_PATH
2014-01-15 14:34:49 +01:00
Shea Levy
f5e5793cd2
Bare dynamic attrs: Match interpolation semantics
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-14 14:00:15 +01:00
Shea Levy
f9913f4422
Allow "bare" dynamic attrs
...
Now, in addition to a."${b}".c, you can write a.${b}.c (applicable
wherever dynamic attributes are valid).
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-14 14:00:15 +01:00
Eelco Dolstra
e640d67144
Document nulls
2014-01-13 13:50:12 +01:00
Eelco Dolstra
f1357059a4
nix-shell: Don't set NIX_INDENT_MAKE
...
It generally is not useful in interactive environments (and messes up
some non-ANSI-compliant terminals).
2014-01-13 13:46:44 +01:00
Eelco Dolstra
ea59f39326
nix-shell: Set $IN_NIX_SHELL before evaluating
2014-01-13 13:43:31 +01:00
Eelco Dolstra
ca73c0102f
Nicer Make output
...
E.g.
CXX src/nix-log2xml/log2xml.o
CC src/bsdiff-4.3/bsdiff.o
GEN scripts/nix-channel
LD src/libmain/libnixmain.so
2014-01-10 22:31:38 +01:00