Shea Levy
24b65937e1
Remove the unused sCurrentOutput symbol
2011-11-06 06:28:34 +00:00
Shea Levy
3522730316
Embed output name into the context of the *OutPath attributes and extract it for input derivations
...
Multiple outputs test passes!
2011-11-06 06:28:30 +00:00
Shea Levy
46876ff203
Fix stupid typo in multiple outputs test
2011-11-06 06:28:25 +00:00
Shea Levy
af2e53fd48
Include all outputs of derivations in the closure of explicitly-passed derivation paths
...
This required adding a queryOutputDerivationNames function in the store API
2011-11-06 06:28:20 +00:00
Shea Levy
981edeab7b
The 'insert output between = signs' approach was not helpful
2011-11-06 06:28:14 +00:00
Shea Levy
f883afa1a1
The nixinstantiate and nixstore env vars are no longer set in common.sh
2011-11-06 06:28:08 +00:00
Shea Levy
2721e9f56f
Merge from trunk
2011-11-06 00:13:09 +00:00
Eelco Dolstra
a6a3f3a8c2
* Fix race condition in the test.
2011-11-05 21:23:01 +00:00
Eelco Dolstra
fa69ff5726
* Fix the broken reference to bunzip2 in the channel unpack script.
2011-11-05 21:06:24 +00:00
Eelco Dolstra
daed9aeac5
2011-11-03 19:22:24 +00:00
Eelco Dolstra
d7b87bebe3
* The Nix configuration file is usually /etc/nix/nix.conf.
2011-11-03 18:47:10 +00:00
Eelco Dolstra
325b5a8aee
* Fix permission on /nix/store in the manual for multi-user installs
...
(reported by Silvio Frischknecht).
2011-11-02 19:14:54 +00:00
Eelco Dolstra
a12095d3be
* In printValueAsXML, handle the case where a "type" attribute is not
...
a string. This happens in the NixOS option system.
* Remove a bogus comparison of a unsigned integer with -1.
2011-10-27 19:06:23 +00:00
Eelco Dolstra
00b41e46ed
* Print a consistent message.
2011-10-19 21:34:13 +00:00
Eelco Dolstra
f186a9141e
* nix-copy-closure: support ‘--dry-run’ and ‘--include-outputs’.
2011-10-18 21:21:22 +00:00
Eelco Dolstra
6761757428
* Use the Store API bindings in nix-copy-closure.
2011-10-11 15:41:13 +00:00
Eelco Dolstra
d43a148204
* Add a test for nix-copy-closure.
2011-10-11 13:58:47 +00:00
Eelco Dolstra
2492914fbc
* Move the remote building test from the NixOS tree to the Nix tree.
2011-10-11 13:06:59 +00:00
Eelco Dolstra
c362e4d718
* Move SSH.pm.
2011-10-11 11:45:36 +00:00
Eelco Dolstra
7d314b8c95
* Work around a race condition starting the Nix daemon.
2011-10-11 11:14:30 +00:00
Eelco Dolstra
5193db048e
* Set svn:ignore.
2011-10-11 09:32:34 +00:00
Eelco Dolstra
a2a317eb0b
* Distribute GeneratePatches.pm.
2011-10-11 09:31:55 +00:00
Eelco Dolstra
5090c34ee1
* Set the executable bit on scripts.
2011-10-10 22:40:17 +00:00
Eelco Dolstra
8af7d766f0
* Refactoring: remove unnecessary variables from the tests.
2011-10-10 21:32:34 +00:00
Eelco Dolstra
cd6d02c366
2011-10-10 21:30:59 +00:00
Eelco Dolstra
6fcdbcac20
* Install NixManifest.pm, NixConfig.pm and GeneratePatches.pm under
...
the Nix:: namespace.
2011-10-10 21:11:08 +00:00
Eelco Dolstra
659c427caa
* Hopefully perl-devel contains the required headers (untested).
2011-10-10 18:58:49 +00:00
Eelco Dolstra
73fe6871c4
* Include the Nix Perl bindings in Nix itself. This will allow the
...
bindings to be used in Nix's own Perl scripts.
The only downside is that Perl XS and Automake/libtool don't really
like each other, so building is a bit tricky.
2011-10-10 18:12:40 +00:00
Shea Levy
bffe35aced
Update gitignore
2011-09-19 04:36:49 +00:00
Shea Levy
6c38cc9025
Ignore everything created during build
2011-09-19 04:15:26 +00:00
Eelco Dolstra
55481c44d4
* Don't assume that we want a shared Nix store.
2011-09-17 09:53:31 +00:00
Shea Levy
e81c09edbf
Remove the current output metadata from the string for unsaveDiscardOutputDependency
2011-09-16 11:31:00 +00:00
Shea Levy
bf50d6ad32
Add information about which output is active to drvPath's context
...
This will break things that depend on being able to just strip away an equals sign, so those have to be updated next
2011-09-16 11:30:52 +00:00
Shea Levy
ffa038f66d
Add an sCurrentOutput member to EvalState
2011-09-16 11:30:44 +00:00
Shea Levy
f3e410d4bf
Add a currentOutput attribute to derivations keep track of which output is active
2011-09-16 11:30:03 +00:00
Shea Levy
8f28a3ba25
Add a test for multiple outputs
...
This currently fails. Yay test-driven development!
2011-09-14 05:59:29 +00:00
Shea Levy
c172d16b00
First attempt at the output-as-derivation semantics
...
For each output, this adds a corresponding attribute to the derivation that is
the same as the derivation except for outPath, which is set to the path specific
to that output. Additionally, an "all" attribute is added that is a list of all
of the output derivations. This has to be done outside of derivationStrict as
each output is itself a derivation that contains itself (and all other outputs)
as an attribute. The derivation itself is equivalent to the first output in the
outputs list (or "out" if that list isn't set).
2011-09-14 05:59:17 +00:00
Shea Levy
0b34e57eb8
Create a branch for me to play around with finishing off the multiple outputs implementation
2011-09-14 00:41:02 +00:00
Eelco Dolstra
13114daa3e
* Ouch. A store upgrade could cause a substituter to be triggered,
...
causing a deadlock.
2011-09-12 09:07:43 +00:00
Ludovic Courtès
281e3ed059
bootstrap: Simplify & make more robust.
2011-09-06 12:11:05 +00:00
Eelco Dolstra
e6cb3d0a0d
* Added a command ‘nix-store --verify-paths PATHS’ to check whether
...
the contents of any of the given store paths have been modified.
E.g.
$ nix-store --verify-path $(nix-store -qR /var/run/current-system)
path `/nix/store/m2smyiwbxidlprfxfz4rjlvz2c3mg58y-etc' was modified! expected hash `fc87e271c5fdf179b47939b08ad13440493805584b35e3014109d04d8436e7b8', got `20f1a47281b3c0cbe299ce47ad5ca7340b20ab34246426915fce0ee9116483aa'
All paths are checked; the exit code is 1 if any path has been
modified, 0 otherwise.
2011-09-06 12:06:30 +00:00
Eelco Dolstra
82710f96f7
* Add some -f flags, never hurts.
2011-09-06 12:00:11 +00:00
Eelco Dolstra
93227ff65c
* Eliminate all uses of the global variable ‘store’ from libstore.
...
This should also fix:
nix-instantiate: ./../boost/shared_ptr.hpp:254: T* boost::shared_ptr<T>::operator->() const [with T = nix::StoreAPI]: Assertion `px != 0' failed.
which was caused by hashDerivationModulo() calling the ‘store’
object (during store upgrades) before openStore() assigned it.
2011-08-31 21:11:50 +00:00
Eelco Dolstra
5bcdc7e351
* Update the cleanup script.
2011-08-27 16:59:32 +00:00
Eelco Dolstra
a95ba4cdd9
* Use last_insert_id instead of sqlite_last_insert_rowid, which you're
...
not really supposed to use according to the DBD::SQLite docs, and
fails on some systems (e.g. http://hydra.nixos.org/build/1246662 ).
2011-08-17 14:17:19 +00:00
Eelco Dolstra
da18b11b05
* On FreeBSD, ‘touch’ is not in the test $PATH, so don't use it.
2011-08-08 14:08:38 +00:00
Eelco Dolstra
76e0029f7a
* Add perl-DBD-SQLite as a dependency of the RPM builds.
2011-08-08 14:06:10 +00:00
Eelco Dolstra
d374be551d
* Add DBD-SQLite as a dependency to the Debian/Ubuntu builds.
...
* Drop some old Fedora/Debian/Ubuntu releases.
2011-08-08 13:19:00 +00:00
Eelco Dolstra
2d663b502d
* Cache the result of file evaluation (i.e, memoize evalFile()). This
...
prevents files from being evaluated and stored as values multiple
times. For instance, evaluation of the ‘system’ attribute in NixOS
causes ‘nixpkgs/pkgs/lib/lists.nix’ to be evaluated 2019 times.
Caching gives a modest speedup and a decent memory footprint
reduction (e.g., from 1.44s to 1.28s, and from 81 MiB to 59 MiB with
GC_INITIAL_HEAP_SIZE=100000 on my system).
2011-08-06 19:45:43 +00:00
Eelco Dolstra
510033e783
* Handle <path> syntax.
2011-08-06 18:54:29 +00:00
