Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: 49cd7387ad6546571ca31a41f208091b482defaa
      
https://github.com/NixOS/nix/commit/49cd7387ad6546571ca31a41f208091b482defaa
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M scripts/nix-push.in

  Log Message:
  -----------
  nix-push: create a manifest-less binary cache

Manifests are a huge pain, since users need to run nix-pull directly
or indirectly to obtain them.  They tend to be large and lag behind
the available binaries; also, the downloaded manifests in
/nix/var/nix/manifest need to be in sync with the Nixpkgs sources.  So
we want to get rid of them.

The idea of manifest-free operation works as follows.  Nix is
configured with a set of URIs of binary caches, e.g.

  http://nixos.org/binary-cache

Whenever Nix needs a store path X, it checks each binary cache for the
existence of a file <CACHE-URI>/<SHA-256 hash of X>.narinfo, e.g.

  http://nixos.org/binary-cache/bi1gh9...ia17.narinfo

The .narinfo file contains the necessary information about the store
path that was formerly kept in the manifest, i.e., (relative) URI of
the compressed NAR, references, size, hash, etc.  For example:

  StorePath: /nix/store/xqp4l88cr9bxv01jinkz861mnc9p7qfi-neon-0.29.6
  URL: 1bjxbg52l32wj8ww47sw9f4qz0r8n5vs71l93lcbgk2506v3cpfd.nar.bz2
  CompressedHash: sha256:1bjxbg52l32wj8ww47sw9f4qz0r8n5vs71l93lcbgk2506v3cpfd
  CompressedSize: 202542
  NarHash: 
sha256:1af26536781e6134ab84201b33408759fc59b36cc5530f57c0663f67b588e15f
  NarSize: 700440
  References: 043zrsanirjh8nbc5vqpjn93hhrf107f-bash-4.2-p24 
cj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13 ...
  Deriver: 4idz1bgi58h3pazxr3akrw4fsr6zrf3r-neon-0.29.6.drv
  System: x86_64-linux

Nix then knows that it needs to download

  
http://nixos.org/binary-cache/1bjxbg52l32wj8ww47sw9f4qz0r8n5vs71l93lcbgk2506v3cpfd.nar.bz2

to substitute the store path.

Note that the store directory is omitted from the References and
Deriver fields to save space, and that the URL can be relative to the
binary cache prefix.

This patch just makes nix-push create binary caches in this format.
The next step is to make a substituter that supports them.


  Commit: 4911a10a4e51102a21a5d123a852c75d2ec92dbc
      
https://github.com/NixOS/nix/commit/4911a10a4e51102a21a5d123a852c75d2ec92dbc
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M configure.ac
    M corepkgs/config.nix.in
    M corepkgs/nar.nix
    M perl/lib/Nix/Config.pm.in
    M scripts/nix-push.in
    M substitute.mk

  Log Message:
  -----------
  Use XZ compression in binary caches

XZ compresses significantly better than bzip2.  Here are the
compression ratios and execution times (using 4 cores in parallel) on
my /var/run/current-system (3.1 GiB):

  bzip2: total compressed size 849.56 MiB, 30.8% [2m08]
  xz -6: total compressed size 641.84 MiB, 23.4% [6m53]
  xz -7: total compressed size 621.82 MiB, 22.6% [7m19]
  xz -8: total compressed size 599.33 MiB, 21.8% [7m18]
  xz -9: total compressed size 588.18 MiB, 21.4% [7m40]

Note that compression takes much longer.  More importantly, however,
decompression is much faster:

  bzip2: 1m47.274s
  xz -6: 0m55.446s
  xz -7: 0m54.119s
  xz -8: 0m52.388s
  xz -9: 0m51.842s

The only downside to using -9 is that decompression takes a fair
amount (~65 MB) of memory.


  Commit: 91b8814f0d275bbb6c7de9546e5e8cb784dad10b
      
https://github.com/NixOS/nix/commit/91b8814f0d275bbb6c7de9546e5e8cb784dad10b
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M scripts/nix-push.in

  Log Message:
  -----------
  Doh


  Commit: 37f70984645b4fc5e6ed9f30a858ba6fbf402441
      
https://github.com/NixOS/nix/commit/37f70984645b4fc5e6ed9f30a858ba6fbf402441
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M .gitignore
    M perl/lib/Nix/Config.pm.in
    M scripts/Makefile.am
    A scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  First attempt at the manifest-less substituter


  Commit: 000132cbd1624a681a8114a117de07a56a7eed4e
      
https://github.com/NixOS/nix/commit/000132cbd1624a681a8114a117de07a56a7eed4e
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M scripts/nix-push.in

  Log Message:
  -----------
  nix-push: Don't pollute the current directory with result symlink


  Commit: f4190c38bac1efdbfec9b1ff9c524808d23fe1cc
      
https://github.com/NixOS/nix/commit/f4190c38bac1efdbfec9b1ff9c524808d23fe1cc
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-01 (Sun, 01 Jul 2012)

  Changed paths:
    M corepkgs/nar.nix
    M scripts/download-from-binary-cache.pl.in
    M scripts/nix-push.in

  Log Message:
  -----------
  Allow both bzip2 and xz compression


  Commit: 440adfbdd1c99fdf7929db66b64ccf4dcd9097e3
      
https://github.com/NixOS/nix/commit/440adfbdd1c99fdf7929db66b64ccf4dcd9097e3
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-01 (Sun, 01 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Add an environment variable $NIX_BINARY_CACHES specifying URLs of binary 
caches


  Commit: 6b1e671ac6cc0376474dd8c1403582ae1db01576
      
https://github.com/NixOS/nix/commit/6b1e671ac6cc0376474dd8c1403582ae1db01576
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-01 (Sun, 01 Jul 2012)

  Changed paths:
    M corepkgs/nar.nix

  Log Message:
  -----------
  Fix xz compression


  Commit: 6ec7460af1103a23e4d331e0c8a56283350175c5
      
https://github.com/NixOS/nix/commit/6ec7460af1103a23e4d331e0c8a56283350175c5
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in
    M scripts/nix-push.in

  Log Message:
  -----------
  Binary caches: use a better key

Use the hash part of the store path as a key rather than a hash of the
store path.  This is enough to get the desired privacy property.


  Commit: cf49472d601a3d9d34ba92def1eca9a2d2c7c391
      
https://github.com/NixOS/nix/commit/cf49472d601a3d9d34ba92def1eca9a2d2c7c391
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M perl/lib/Nix/Store.xs
    M scripts/nix-push.in

  Log Message:
  -----------
  nix-push: Always generate base-32 hashes


  Commit: 8319b1ab9f1e79ad32871dae602a59df5874d1a9
      
https://github.com/NixOS/nix/commit/8319b1ab9f1e79ad32871dae602a59df5874d1a9
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: Verify NAR hashes


  Commit: d694c599e2b9eee71ade8cc4befb46ed911f4a10
      
https://github.com/NixOS/nix/commit/d694c599e2b9eee71ade8cc4befb46ed911f4a10
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: cache binary cache info in a SQLite DB


  Commit: 2a8e5c8b11d23f3d56cc7548e21f47325a736b79
      
https://github.com/NixOS/nix/commit/2a8e5c8b11d23f3d56cc7548e21f47325a736b79
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: strip trailing / from URLs


  Commit: 89380c03e99dc5ae8a4dcf9edb4f14483bd2f5fc
      
https://github.com/NixOS/nix/commit/89380c03e99dc5ae8a4dcf9edb4f14483bd2f5fc
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: in queries, preferred cached info


  Commit: ae60643c15a2eab2cf53230aa7c5fbc8af3430d1
      
https://github.com/NixOS/nix/commit/ae60643c15a2eab2cf53230aa7c5fbc8af3430d1
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: do negative NAR info caching

I.e. if a NAR info file does *not* exist, we record it in the cache DB
so that we don't retry it later.


  Commit: cd94665f38fbadde38d5d8ae5c9c14dff9aea0ac
      
https://github.com/NixOS/nix/commit/cd94665f38fbadde38d5d8ae5c9c14dff9aea0ac
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: use WWW::Curl

Using WWW::Curl rather than running an external curl process for every
NAR info file halves the time it takes to get info thanks to libcurl's
support for persistent HTTP connections.  (We save a roundtrip per
file.)  But the real gain will come from using parallel and/or
pipelined requests.


  Commit: 11800e61983677f92fd5a08f51beb9036f947d6e
      
https://github.com/NixOS/nix/commit/11800e61983677f92fd5a08f51beb9036f947d6e
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in
    M src/libstore/build.cc
    M src/libstore/globals.cc
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/misc.cc
    M src/libstore/remote-store.cc
    M src/libstore/remote-store.hh
    M src/libstore/store-api.hh

  Log Message:
  -----------
  download-from-binary-cache: parallelise fetching of NAR info files

Getting substitute information using the binary cache substituter has
non-trivial latency overhead.  A package or NixOS system configuration
can have hundreds of dependencies, and in the worst case (when the
local info cache is empty) we have to do a separate HTTP request for
each of these.  If the ping time to the server is t, getting N info
files will take tN seconds; e.g., with a ping time of 0.1s to
nixos.org, sequentially downloading 1000 info files (a typical NixOS
config) will take at least 100 seconds.

To fix this problem, the binary cache substituter can now perform
requests in parallel.  This required changing the substituter
interface to support a function querySubstitutablePathInfos() that
queries multiple paths at the same time, and rewriting queryMissing()
to take advantage of parallelism.  (Due to local caching,
parallelising queryMissing() is sufficient for most use cases, since
it's almost always called before building a derivation and thus fills
the local info cache.)

For example, parallelism speeds up querying all 1056 paths in a
particular NixOS system configuration from 116s to 2.6s.  It works so
well because the eccentricity of the top-level derivation in the
dependency graph is only 9.  So we only need 10 round-trips (when
using an unlimited number of parallel connections) to get everything.

Currently we do a maximum of 150 parallel connections to the server.
Thus it's important that the binary cache server (e.g. nixos.org) has
a high connection limit.  Alternatively we could use HTTP pipelining,
but WWW::Curl doesn't support it and libcurl has a hard-coded limit of
5 requests per pipeline.


  Commit: 400e556b34ff0563f34b191de5f632dc4377f0cd
      
https://github.com/NixOS/nix/commit/400e556b34ff0563f34b191de5f632dc4377f0cd
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Cleanup


  Commit: 425cc612ad4835d29bce081a67ad161d06063b51
      
https://github.com/NixOS/nix/commit/425cc612ad4835d29bce081a67ad161d06063b51
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M src/libstore/build.cc

  Log Message:
  -----------
  build.cc: Don't use hasSubstitute()

Instead make a single call to querySubstitutablePathInfo() per
derivation output.  This is faster and prevents having to implement
the "have" function in the binary cache substituter.


  Commit: 98a423b75aa9061f0164c316f9d2481ce6d5e2f1
      
https://github.com/NixOS/nix/commit/98a423b75aa9061f0164c316f9d2481ce6d5e2f1
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M src/libexpr/primops.cc

  Log Message:
  -----------
  prim_import(): prefetch substitute info in parallel using queryMissing()


  Commit: 099125435fc5ada63365a94ca153c711e706e225
      
https://github.com/NixOS/nix/commit/099125435fc5ada63365a94ca153c711e706e225
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M doc/manual/conf-file.xml
    M perl/lib/Nix/Config.pm.in
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: add nix.conf options


  Commit: ae72be1b8bf65e6b52bc0c9d534e55a79ca6712b
      
https://github.com/NixOS/nix/commit/ae72be1b8bf65e6b52bc0c9d534e55a79ca6712b
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M configure.ac
    M release.nix

  Log Message:
  -----------
  Add WWW::Curl as a dependency


  Commit: 5ee8944155f21a0ab5a100a184163d7bd0e72679
      
https://github.com/NixOS/nix/commit/5ee8944155f21a0ab5a100a184163d7bd0e72679
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Cleanup


  Commit: 6586414bc70c8373faefd49afc5172881f3aad53
      
https://github.com/NixOS/nix/commit/6586414bc70c8373faefd49afc5172881f3aad53
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M src/libexpr/get-drvs.hh
    M src/nix-env/nix-env.cc

  Log Message:
  -----------
  nix-env: Determine which paths have substitutes in parallel


  Commit: eb3036da87659fe7cf384c2362e7f7b8b67189a1
      
https://github.com/NixOS/nix/commit/eb3036da87659fe7cf384c2362e7f7b8b67189a1
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/remote-store.cc
    M src/libstore/remote-store.hh
    M src/libstore/store-api.hh
    M src/libstore/worker-protocol.hh
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Implement querySubstitutablePathInfos() in the daemon

Also removed querySubstitutablePathInfo().


  Commit: 667d5f1936616dc829f9f92f8e5d5141ba5285a7
      
https://github.com/NixOS/nix/commit/667d5f1936616dc829f9f92f8e5d5141ba5285a7
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/optimise-store.cc
    M src/libstore/remote-store.cc
    M src/libstore/remote-store.hh
    M src/libstore/store-api.hh
    M src/libstore/worker-protocol.hh
    M src/nix-store/nix-store.cc
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Rename queryValidPaths() to queryAllValidPaths()


  Commit: 58ef4d9a95584fb89ebcf6222fbac6e698aa6b0b
      
https://github.com/NixOS/nix/commit/58ef4d9a95584fb89ebcf6222fbac6e698aa6b0b
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/remote-store.cc
    M src/libstore/remote-store.hh
    M src/libstore/store-api.hh
    M src/libstore/worker-protocol.hh
    M src/nix-env/nix-env.cc
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Add a function queryValidPaths()

queryValidPaths() combines multiple calls to isValidPath() in one.
This matters when using the Nix daemon because it reduces latency.
For instance, on "nix-env -qas \*" it reduces execution time from 5.7s
to 4.7s (which is indistinguishable from the non-daemon case).


  Commit: 09a6321aeb7393cdb4b5af62d2e4106d83124fdf
      
https://github.com/NixOS/nix/commit/09a6321aeb7393cdb4b5af62d2e4106d83124fdf
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/remote-store.cc
    M src/libstore/remote-store.hh
    M src/libstore/store-api.hh
    M src/libstore/worker-protocol.hh
    M src/nix-env/nix-env.cc
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Replace hasSubstitutes() with querySubstitutablePaths()

querySubstitutablePaths() takes a set of paths, so this greatly
reduces daemon <-> client latency.


  Commit: b74d92755d1ca6a1538f292dcb5a906f66af7b51
      
https://github.com/NixOS/nix/commit/b74d92755d1ca6a1538f292dcb5a906f66af7b51
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: Use HEAD requests if possible

In "nix-env -qas", we don't need the substitute info, we just need to
know if it exists.  This can be done using a HTTP HEAD request, which
saves bandwidth.

Note however that curl currently has a bug that prevents it from
reusing HTTP connections if HEAD requests return a 404:

https://sourceforge.net/tracker/?func=detail&aid=3542731&group_id=976&atid=100976

Without the patch attached to the issue, using HEAD is actually quite
a bit slower than GET.


  Commit: d287b62b6432ce3155e963c6471edf79ec70439a
      
https://github.com/NixOS/nix/commit/d287b62b6432ce3155e963c6471edf79ec70439a
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M perl/lib/Nix/Config.pm.in
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Set the User-Agent header to "Nix/<version>"


  Commit: 15c15da482eb30f95f4dab04b582a45edc10815b
      
https://github.com/NixOS/nix/commit/15c15da482eb30f95f4dab04b582a45edc10815b
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M scripts/nix-build.in
    M scripts/nix-channel.in

  Log Message:
  -----------
  Add some missing --version switches


  Commit: f2bdc87595376efb2d05a8555b0686922a298929
      
https://github.com/NixOS/nix/commit/f2bdc87595376efb2d05a8555b0686922a298929
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M scripts/copy-from-other-stores.pl.in
    M scripts/download-using-manifests.pl.in
    M src/libstore/globals.cc

  Log Message:
  -----------
  Update the other substituters


  Commit: e4d6bcb6cdc34d204ccf49e137dd5070f664c523
      
https://github.com/NixOS/nix/commit/e4d6bcb6cdc34d204ccf49e137dd5070f664c523
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M doc/manual/release-notes.xml

  Log Message:
  -----------
  Update release notes


  Commit: 04559a0d45ad02fc760b09132cca0d875af035e5
      
https://github.com/NixOS/nix/commit/04559a0d45ad02fc760b09132cca0d875af035e5
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M Makefile.am
    M corepkgs/Makefile.am
    M corepkgs/config.nix.in
    A corepkgs/fetchurl.nix
    M doc/manual/Makefile.am
    M doc/manual/conf-file.xml
    M doc/manual/manual.xml
    R nix.conf.example
    M nix.spec.in
    M tests/Makefile.am
    A tests/fetchurl.nix
    A tests/fetchurl.sh

  Log Message:
  -----------
  Merge branch 'master' of github.com:NixOS/nix into no-manifests


  Commit: a6f348599c94d8a5f7b41c7d8e43658dc6407be7
      
https://github.com/NixOS/nix/commit/a6f348599c94d8a5f7b41c7d8e43658dc6407be7
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Print some debug output


  Commit: fe241ece2932492866693d268d02a7912e766ac7
      
https://github.com/NixOS/nix/commit/fe241ece2932492866693d268d02a7912e766ac7
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M doc/manual/conf-file.xml
    M doc/manual/introduction.xml
    M doc/manual/release-notes.xml
    M perl/lib/Nix/Store.pm
    M perl/lib/Nix/Store.xs
    M src/libexpr/eval.cc
    M src/libexpr/eval.hh
    M src/libexpr/primops.cc
    M src/libstore/build.cc
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/remote-store.cc
    M src/libstore/remote-store.hh
    M src/libstore/store-api.hh
    M src/libstore/worker-protocol.hh
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Merge branch 'master' into no-manifests


  Commit: aa115e22df1c80e8878237a9e704d7d70783a243
      
https://github.com/NixOS/nix/commit/aa115e22df1c80e8878237a9e704d7d70783a243
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: Print correct URL


  Commit: 8c7910083976e255300efa797030448f5a1cb864
      
https://github.com/NixOS/nix/commit/8c7910083976e255300efa797030448f5a1cb864
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M .gitignore
    M configure.ac
    M corepkgs/Makefile.am
    A corepkgs/imported-drv-to-derivation.nix
    M doc/manual/conf-file.xml
    M doc/manual/release-notes.xml
    M release.nix
    M scripts/nix-build.in
    M scripts/nix-profile.sh.in
    M src/libexpr/attr-path.hh
    M src/libexpr/common-opts.hh
    M src/libexpr/eval-inline.hh
    M src/libexpr/eval.hh
    M src/libexpr/get-drvs.hh
    M src/libexpr/names.hh
    M src/libexpr/nixexpr.hh
    M src/libexpr/primops.cc
    M src/libexpr/symbol-table.hh
    M src/libexpr/value-to-xml.hh
    M src/libexpr/value.hh
    M src/libmain/shared.hh
    M src/libstore/build.cc
    M src/libstore/derivations.hh
    M src/libstore/gc.cc
    M src/libstore/globals.hh
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/misc.hh
    M src/libstore/optimise-store.cc
    M src/libstore/pathlocks.hh
    M src/libstore/references.hh
    M src/libstore/remote-store.hh
    M src/libstore/store-api.hh
    M src/libstore/worker-protocol.hh
    M src/libutil/archive.hh
    M src/libutil/hash.hh
    M src/libutil/immutable.hh
    M src/libutil/serialise.hh
    M src/libutil/types.hh
    M src/libutil/util.cc
    M src/libutil/util.hh
    M src/libutil/xml-writer.hh
    M src/nix-env/profiles.hh
    M src/nix-env/user-env.hh
    M src/nix-store/dotgraph.hh
    M src/nix-store/nix-store.cc
    M src/nix-store/xmlgraph.hh
    M tests/Makefile.am
    A tests/optimise-store.sh
    M version

  Log Message:
  -----------
  Merge branch 'master' into no-manifests


  Commit: dbce685e91c513341dedf8c1a916ef4c62f5650a
      
https://github.com/NixOS/nix/commit/dbce685e91c513341dedf8c1a916ef4c62f5650a
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add some .gitignore entries


  Commit: 7892ad15ab4b6db0eee619a1fdd14fed129db252
      
https://github.com/NixOS/nix/commit/7892ad15ab4b6db0eee619a1fdd14fed129db252
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: Support file://

The file:// URI schema requires checking for errors in a more general
way.  Also, don't cache file:// lookups.


  Commit: 7861260a5ff33689b1b8f7a89489f5d5e5e4dfcb
      
https://github.com/NixOS/nix/commit/7861260a5ff33689b1b8f7a89489f5d5e5e4dfcb
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M tests/common.sh.in
    M tests/remote-store.sh

  Log Message:
  -----------
  Clear NIX_STORE when running the tests


  Commit: 609586a16de90f8964b9c494aad3c1526feb514f
      
https://github.com/NixOS/nix/commit/609586a16de90f8964b9c494aad3c1526feb514f
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M tests/Makefile.am
    A tests/binary-cache.sh

  Log Message:
  -----------
  Add a test for the binary cache substituter


  Commit: e3ce54cceedb9a3144c4eccfbafd63ed765d8913
      
https://github.com/NixOS/nix/commit/e3ce54cceedb9a3144c4eccfbafd63ed765d8913
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M scripts/nix-push.in

  Log Message:
  -----------
  nix-push: Remove the upload feature


  Commit: 50395b71a90314abfcc39d8343dbaa8e9aa199a6
      
https://github.com/NixOS/nix/commit/50395b71a90314abfcc39d8343dbaa8e9aa199a6
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M src/libstore/local-store.cc
    M tests/substituter.sh
    M tests/substituter2.sh

  Log Message:
  -----------
  Fix the substituter tests


  Commit: 67c6f3eded7dcb7c79243ed41f177c960f2b6aad
      
https://github.com/NixOS/nix/commit/67c6f3eded7dcb7c79243ed41f177c960f2b6aad
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M scripts/nix-push.in
    M tests/binary-patching.sh
    M tests/install-package.sh
    M tests/nix-channel.sh
    M tests/nix-pull.sh
    M tests/nix-push.sh

  Log Message:
  -----------
  nix-push: Support generating a manifest again

This makes all the tests succeed.  Woohoo!


  Commit: 7f8e805c8ef2d7728648553de6b762964730a09a
      
https://github.com/NixOS/nix/commit/7f8e805c8ef2d7728648553de6b762964730a09a
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: Only use the default cache for /nix/store


  Commit: b4ea83249b40dd910daa6a8ee32f13e023e9c858
      
https://github.com/NixOS/nix/commit/b4ea83249b40dd910daa6a8ee32f13e023e9c858
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in
    M src/libstore/build.cc

  Log Message:
  -----------
  Remove trailing whitespace / tabs


  Commit: 3a8f841612f08b9be11cc5346fa3c025413282d6
      
https://github.com/NixOS/nix/commit/3a8f841612f08b9be11cc5346fa3c025413282d6
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in
    M scripts/download-using-manifests.pl.in

  Log Message:
  -----------
  download-using-manifests: Don't use nix-prefetch-url

Instead call curl directly and pipe it into ‘nix-store --restore’.
This saves I/O and prevents creating garbage in the Nix store.


  Commit: fbf59d95f66012349fdcd2b60f34b9efb32e6319
      
https://github.com/NixOS/nix/commit/fbf59d95f66012349fdcd2b60f34b9efb32e6319
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M src/libstore/build.cc

  Log Message:
  -----------
  Remove more tabs


  Commit: 73acb8b836affe5dfade9dd6e3339ad2f9191add
      
https://github.com/NixOS/nix/commit/73acb8b836affe5dfade9dd6e3339ad2f9191add
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M scripts/copy-from-other-stores.pl.in
    M scripts/download-from-binary-cache.pl.in
    M scripts/download-using-manifests.pl.in
    M src/libstore/build.cc
    M tests/substituter.sh

  Log Message:
  -----------
  Let build.cc verify the expected hash of a substituter's output

Since SubstitutionGoal::finished() in build.cc computes the hash
anyway, we can prevent the inefficiency of computing the hash twice by
letting the substituter tell Nix about the expected hash, which can
then verify it.


  Commit: e6ab52cdd1df207c7a007a9cba665ee8a031d94a
      
https://github.com/NixOS/nix/commit/e6ab52cdd1df207c7a007a9cba665ee8a031d94a
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M tests/binary-cache.sh

  Log Message:
  -----------
  Test "nix-env -qas" with the binary cache substituter


  Commit: 6ecf4f13f6a71701f77018a852db2bd4bde0bb67
      
https://github.com/NixOS/nix/commit/6ecf4f13f6a71701f77018a852db2bd4bde0bb67
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M tests/common.sh.in
    M tests/referrers.sh

  Log Message:
  -----------
  Use "set -x" in the tests to see where a test fails


  Commit: 66a3ac6a56cfa70e2ffeb911c1286ba84c2fa048
      
https://github.com/NixOS/nix/commit/66a3ac6a56cfa70e2ffeb911c1286ba84c2fa048
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in
    M scripts/nix-push.in
    M tests/binary-cache.sh

  Log Message:
  -----------
  Allow a binary cache to declare that it doesn't support "nix-env -qas"

Querying all substitutable paths via "nix-env -qas" is potentially
hard on a server, since it involves sending thousands of HEAD
requests.  So a binary cache must now have a meta-info file named
"nix-cache-info" that specifies whether the server wants this.  It
also specifies the store prefix so that we don't send useless queries
to a binary cache for a different store prefix.


  Commit: 6183cf2f197edd079a0134ccb8d320bab083a624
      
https://github.com/NixOS/nix/commit/6183cf2f197edd079a0134ccb8d320bab083a624
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M src/libstore/local-store.cc

  Log Message:
  -----------
  Fix whitespace


  Commit: f9613da18033d0a9835bc57ac2142aca754983cf
      
https://github.com/NixOS/nix/commit/f9613da18033d0a9835bc57ac2142aca754983cf
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh

  Log Message:
  -----------
  Remove unused variables


  Commit: d059bf48e4bd4d1f50593dbe60953de8b2d395c7
      
https://github.com/NixOS/nix/commit/d059bf48e4bd4d1f50593dbe60953de8b2d395c7
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M perl/lib/Nix/Config.pm.in
    M src/libstore/build.cc
    M src/libstore/globals.cc
    M src/libstore/globals.hh
    M src/libstore/local-store.cc

  Log Message:
  -----------
  Pass configuration settings to the substituters

Previously substituters could read nix.conf themselves, but this
didn't take --option flags into account.


  Commit: ab42bf1dab026d10b74e857a76feff475ae8a162
      
https://github.com/NixOS/nix/commit/ab42bf1dab026d10b74e857a76feff475ae8a162
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M scripts/nix-install-package.in

  Log Message:
  -----------
  nix-install-package: Support binary caches

The .nixpkg file format is extended to optionally include the URL of a
binary cache, which will be used in preference to the manifest URL
(which can be set to a non-existent value).


  Commit: 9de6d10d112665ba1c6d807dd3950ed4c43a4404
      
https://github.com/NixOS/nix/commit/9de6d10d112665ba1c6d807dd3950ed4c43a4404
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M doc/manual/conf-file.xml
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Get rid of $NIX_BINARY_CACHES

You can use ‘--option binary-caches URLs’ instead.


  Commit: f3eb29c6530e990b18e9f04390f6fa7bfbc58078
      
https://github.com/NixOS/nix/commit/f3eb29c6530e990b18e9f04390f6fa7bfbc58078
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M tests/binary-cache.sh

  Log Message:
  -----------
  Fix the test


  Commit: 9cd63d224468af87baf74228acc162873c649493
      
https://github.com/NixOS/nix/commit/9cd63d224468af87baf74228acc162873c649493
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M perl/Makefile.am
    M scripts/download-from-binary-cache.pl.in
    M scripts/download-using-manifests.pl.in
    M scripts/nix-install-package.in

  Log Message:
  -----------
  Do some validation of URLs


  Commit: d50d7a287416da2086b0b24f9d998eabb24c1734
      
https://github.com/NixOS/nix/commit/d50d7a287416da2086b0b24f9d998eabb24c1734
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M src/libmain/shared.cc
    M src/libstore/remote-store.cc
    M src/libstore/worker-protocol.hh
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Whitespace


  Commit: 97421eb5ecde86b75441094fda017b12b5eca2a6
      
https://github.com/NixOS/nix/commit/97421eb5ecde86b75441094fda017b12b5eca2a6
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M perl/lib/Nix/Store.xs
    M src/libexpr/eval.cc
    M src/libexpr/primops.cc
    M src/libmain/shared.cc
    M src/libstore/build.cc
    M src/libstore/derivations.cc
    M src/libstore/gc.cc
    M src/libstore/globals.cc
    M src/libstore/globals.hh
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/misc.cc
    M src/libstore/optimise-store.cc
    M src/libstore/remote-store.cc
    M src/libstore/store-api.cc
    M src/nix-env/nix-env.cc
    M src/nix-instantiate/nix-instantiate.cc
    M src/nix-store/nix-store.cc
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Refactor settings processing

Put all Nix configuration flags in a Settings object.


  Commit: 89a8207029e7f6d5cfe3ab972c49ea46f5b9a784
      
https://github.com/NixOS/nix/commit/89a8207029e7f6d5cfe3ab972c49ea46f5b9a784
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M doc/manual/conf-file.xml
    M src/libmain/shared.cc
    M src/libstore/globals.cc

  Log Message:
  -----------
  Add an option ‘build-fallback’ (equivalent to the --fallback flag)


  Commit: 90d9c58d4dabb370849cd523fb9ee471e8140b76
      
https://github.com/NixOS/nix/commit/90d9c58d4dabb370849cd523fb9ee471e8140b76
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M src/libstore/globals.cc
    M src/libstore/globals.hh
    M src/libstore/remote-store.cc
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Pass all --option flags to the daemon


  Commit: eb7849e3a281511a59abf72ae5c3133f903bbaab
      
https://github.com/NixOS/nix/commit/eb7849e3a281511a59abf72ae5c3133f903bbaab
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M src/libstore/globals.cc

  Log Message:
  -----------
  Prevent an injection attack in passing untrusted options to substituters


  Commit: 4d1b64f118cf6ebcbf530bea4a3c531704d7d6ba
      
https://github.com/NixOS/nix/commit/4d1b64f118cf6ebcbf530bea4a3c531704d7d6ba
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M doc/manual/conf-file.xml
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Allow daemon users to override ‘binary-caches’

For security reasons, daemon users can only specify caches that appear
in the ‘binary-caches’ and ‘trusted-binary-caches’ options in
nix.conf.


  Commit: c770a2422a47526d5eb336af6af4292df68dad2b
      
https://github.com/NixOS/nix/commit/c770a2422a47526d5eb336af6af4292df68dad2b
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libutil/util.cc
    M src/libutil/util.hh

  Log Message:
  -----------
  Report substituter errors to clients of the Nix daemon


  Commit: 8a25d787d7f05d612521bd489510aa23d4ef2177
      
https://github.com/NixOS/nix/commit/8a25d787d7f05d612521bd489510aa23d4ef2177
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  download-from-binary-cache: Remove duplicate URLs


  Commit: afa7e0187815d89c8af93fa9c1081bf67ab0f10e
      
https://github.com/NixOS/nix/commit/afa7e0187815d89c8af93fa9c1081bf67ab0f10e
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M corepkgs/Makefile.am
    M corepkgs/unpack-channel.nix
    R corepkgs/unpack-channel.sh

  Log Message:
  -----------
  Inline unpack-channel.sh


  Commit: 46f852cda013b818f113c7905f020131a44f2340
      
https://github.com/NixOS/nix/commit/46f852cda013b818f113c7905f020131a44f2340
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M configure.ac
    M corepkgs/config.nix.in
    M corepkgs/unpack-channel.nix
    M substitute.mk

  Log Message:
  -----------
  Use a GNU tar flag to shut up warnings about implausibly old timestamp


  Commit: ca94b383718f2dc5f4f14ed6eddd8d04ac9d3fc2
      
https://github.com/NixOS/nix/commit/ca94b383718f2dc5f4f14ed6eddd8d04ac9d3fc2
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M src/nix-env/nix-env.cc

  Log Message:
  -----------
  nix-env: Ignore manifest.nix when recursing into ~/.nix-defexpr

Channels are implemented using a profile now, and profiles contain a
manifest.nix file.  This should be ignored to prevent bogus packages
from showing up in nix-env.


  Commit: 79bba3782c275f03954cc9fc03f92aff487db953
      
https://github.com/NixOS/nix/commit/79bba3782c275f03954cc9fc03f92aff487db953
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M src/libutil/util.cc

  Log Message:
  -----------
  Doh


  Commit: 5170c5691aac1bd6abc69be65cf880316e11fe24
      
https://github.com/NixOS/nix/commit/5170c5691aac1bd6abc69be65cf880316e11fe24
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M corepkgs/unpack-channel.nix
    M doc/manual/conf-file.xml
    M scripts/download-from-binary-cache.pl.in
    M scripts/nix-channel.in

  Log Message:
  -----------
  nix-channel: Use binary caches advertised by channels

Channels can now advertise a binary cache by creating a file
<channel-url>/binary-cache-url.  The channel unpacker puts these in
its "binary-caches" subdirectory.  Thus, the URLS of the binary caches
for the channels added by root appear in
/nix/var/nix/profiles/per-user/eelco/channels/binary-caches/*.  The
binary cache substituter reads these and adds them to the list of
binary caches.


  Commit: 9c2decaa1935ae4bf99a9b723d4eab188f8f88ef
      
https://github.com/NixOS/nix/commit/9c2decaa1935ae4bf99a9b723d4eab188f8f88ef
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M doc/manual/opt-common-syn.xml
    M doc/manual/opt-common.xml
    M doc/manual/package-management.xml
    M src/libstore/optimise-store.cc

  Log Message:
  -----------
  Merge branch 'master' into no-manifests


  Commit: e94806d03098f1d6e654542500bbea1eaa0ec60b
      
https://github.com/NixOS/nix/commit/e94806d03098f1d6e654542500bbea1eaa0ec60b
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M scripts/nix-build.in
    M src/libexpr/eval.cc
    M src/libexpr/eval.hh
    M src/libexpr/nixexpr.hh
    M src/libexpr/parser.y
    M src/libexpr/primops.cc
    M src/libmain/shared.cc
    M src/libmain/shared.hh
    M src/libstore/build.cc
    M src/libstore/gc.cc
    M src/libstore/local-store.hh
    M src/libstore/optimise-store.cc
    M src/libstore/remote-store.cc
    M src/libstore/store-api.cc
    M src/libstore/store-api.hh
    M src/libutil/util.cc
    M src/libutil/util.hh
    M src/nix-instantiate/nix-instantiate.cc
    M src/nix-store/nix-store.cc
    M src/nix-worker/nix-worker.cc

  Log Message:
  -----------
  Merge branch 'master' into no-manifests


  Commit: babe54bf97091441353f2219e7846afd0e0d9f16
      
https://github.com/NixOS/nix/commit/babe54bf97091441353f2219e7846afd0e0d9f16
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    A perl/lib/Nix/Utils.pm

  Log Message:
  -----------
  Add missing file


  Commit: 8b8fe6139e05f990b9d2a35652fd9bdb79189f90
      
https://github.com/NixOS/nix/commit/8b8fe6139e05f990b9d2a35652fd9bdb79189f90
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M perl/lib/Nix/Utils.pm
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Drop dependency on List::MoreUtils


  Commit: 8207359227740bfb2fe77cf843a81aa878fd39aa
      
https://github.com/NixOS/nix/commit/8207359227740bfb2fe77cf843a81aa878fd39aa
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M configure.ac
    M release.nix

  Log Message:
  -----------
  Whitespace


  Commit: 2688fb73f1e0bd96003a82c89ac8de12eca2b49f
      
https://github.com/NixOS/nix/commit/2688fb73f1e0bd96003a82c89ac8de12eca2b49f
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M release.nix

  Log Message:
  -----------
  Add perl-WWW-Curl to the RPM image


  Commit: cc8641815b018315ee444c58dd4bc6bfc38c7d0f
      
https://github.com/NixOS/nix/commit/cc8641815b018315ee444c58dd4bc6bfc38c7d0f
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M nix.spec.in

  Log Message:
  -----------
  Add WWW::Curl to the RPM dependencies


  Commit: f3077fd88d6ec8f05a5471687f23589e34dfeaeb
      
https://github.com/NixOS/nix/commit/f3077fd88d6ec8f05a5471687f23589e34dfeaeb
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M release.nix

  Log Message:
  -----------
  Add libwww-curl-perl to the Debian/Ubuntu images


  Commit: cfd968dd94f35c5ef781be9bda883d8818fc1d6e
      
https://github.com/NixOS/nix/commit/cfd968dd94f35c5ef781be9bda883d8818fc1d6e
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M src/libstore/build.cc

  Log Message:
  -----------
  Fix stupid type error in calling std::max


  Commit: 9e2fc6951ca049b15149a2c4b75d2f5bff7f07e1
      
https://github.com/NixOS/nix/commit/9e2fc6951ca049b15149a2c4b75d2f5bff7f07e1
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M doc/manual/conf-file.xml
    M scripts/download-from-binary-cache.pl.in

  Log Message:
  -----------
  Disable the binary cache substituter by default for now


  Commit: 15e1b2c223494ecb5efefc3ea0e3b926a6b1d7dc
      
https://github.com/NixOS/nix/commit/15e1b2c223494ecb5efefc3ea0e3b926a6b1d7dc
  Author: Eelco Dolstra <[email protected]>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M .gitignore
    M configure.ac
    M corepkgs/Makefile.am
    M corepkgs/config.nix.in
    M corepkgs/nar.nix
    M corepkgs/unpack-channel.nix
    R corepkgs/unpack-channel.sh
    M doc/manual/conf-file.xml
    M doc/manual/release-notes.xml
    M nix.spec.in
    M perl/Makefile.am
    M perl/lib/Nix/Config.pm.in
    M perl/lib/Nix/Store.xs
    A perl/lib/Nix/Utils.pm
    M release.nix
    M scripts/Makefile.am
    M scripts/copy-from-other-stores.pl.in
    A scripts/download-from-binary-cache.pl.in
    M scripts/download-using-manifests.pl.in
    M scripts/nix-build.in
    M scripts/nix-channel.in
    M scripts/nix-install-package.in
    M scripts/nix-push.in
    M src/libexpr/eval.cc
    M src/libexpr/get-drvs.hh
    M src/libexpr/primops.cc
    M src/libmain/shared.cc
    M src/libstore/build.cc
    M src/libstore/derivations.cc
    M src/libstore/gc.cc
    M src/libstore/globals.cc
    M src/libstore/globals.hh
    M src/libstore/local-store.cc
    M src/libstore/local-store.hh
    M src/libstore/misc.cc
    M src/libstore/optimise-store.cc
    M src/libstore/remote-store.cc
    M src/libstore/remote-store.hh
    M src/libstore/store-api.cc
    M src/libstore/store-api.hh
    M src/libstore/worker-protocol.hh
    M src/libutil/util.cc
    M src/libutil/util.hh
    M src/nix-env/nix-env.cc
    M src/nix-instantiate/nix-instantiate.cc
    M src/nix-store/nix-store.cc
    M src/nix-worker/nix-worker.cc
    M substitute.mk
    M tests/Makefile.am
    A tests/binary-cache.sh
    M tests/binary-patching.sh
    M tests/common.sh.in
    M tests/install-package.sh
    M tests/nix-channel.sh
    M tests/nix-pull.sh
    M tests/nix-push.sh
    M tests/referrers.sh
    M tests/remote-store.sh
    M tests/substituter.sh
    M tests/substituter2.sh

  Log Message:
  -----------
  Merge branch 'no-manifests'


Compare: https://github.com/NixOS/nix/compare/a9e6752bbd88...15e1b2c22349
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to