From 867967265b80946dfe1db72d40324b4f9af988ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Apr 2016 14:16:56 +0200 Subject: Remove manifest support Manifests have been superseded by binary caches for years. This also gets rid of nix-pull, nix-generate-patches and bsdiff/bspatch. --- doc/manual/command-ref/conf-file.xml | 12 ------ doc/manual/command-ref/nix-channel.xml | 17 ++------ doc/manual/command-ref/nix-generate-patches.xml | 44 -------------------- doc/manual/command-ref/nix-install-package.xml | 4 +- doc/manual/command-ref/nix-pull.xml | 54 ------------------------- doc/manual/command-ref/nix-push.xml | 19 +-------- doc/manual/command-ref/utilities.xml | 4 -- doc/manual/local.mk | 2 +- 8 files changed, 7 insertions(+), 149 deletions(-) delete mode 100644 doc/manual/command-ref/nix-generate-patches.xml delete mode 100644 doc/manual/command-ref/nix-pull.xml (limited to 'doc/manual') diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index f598d359e15f..598b15827883 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -435,18 +435,6 @@ flag, e.g. --option gc-keep-outputs false. - force-manifest - - If this option is set to false - (default) and a Nix channel provides both a manifest and a binary - cache, only the binary cache will be used. If set to - true, the manifest will be fetched as well. - This is useful if you want to use binary patches (which are - currently not supported by binary caches). - - - - system This option specifies the canonical Nix system diff --git a/doc/manual/command-ref/nix-channel.xml b/doc/manual/command-ref/nix-channel.xml index a6f4a27203ac..0a1f2a8b722d 100644 --- a/doc/manual/command-ref/nix-channel.xml +++ b/doc/manual/command-ref/nix-channel.xml @@ -73,11 +73,10 @@ condition="manual">See also Downloads the Nix expressions of all subscribed channels (or only those included in - names if specified), makes them the + names if specified) and makes them the default for nix-env operations (by symlinking - them from the directory ~/.nix-defexpr), and - performs a nix-pull on the manifests of all - channels to make pre-built binaries available. + them from the directory + ~/.nix-defexpr). @@ -187,16 +186,6 @@ following files: - MANIFEST.bz2 - - (Deprecated in favour of binary caches.) A - manifest as created by nix-push. Only used if - binary-cache-url is not present or if the - nix.conf option - is set. - - - diff --git a/doc/manual/command-ref/nix-generate-patches.xml b/doc/manual/command-ref/nix-generate-patches.xml deleted file mode 100644 index 70bec432d28e..000000000000 --- a/doc/manual/command-ref/nix-generate-patches.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - nix-generate-patches - 1 - Nix - - - - - nix-generate-patches - generates binary patches between NAR files - - - - - nix-generate-patches - NAR-DIR - PATCH-DIR - PATCH-URI - OLD-MANIFEST - NEW-MANIFEST - - - - -Description - -The command nix-generate-patches generates -binary patches between NAR files listed in OLD-MANIFEST and NEW-MANIFEST. -The patches are written to the directory PATCH-DIR, and the prefix -PATCH-URI is used to generate URIs for the patches. The patches are -added to NEW-MANIFEST. All NARs are required to exist in NAR-DIR. -Patches are generated between succeeding versions of packages with -the same name. - - - - - diff --git a/doc/manual/command-ref/nix-install-package.xml b/doc/manual/command-ref/nix-install-package.xml index f7802a95d55e..e17166caaaf3 100644 --- a/doc/manual/command-ref/nix-install-package.xml +++ b/doc/manual/command-ref/nix-install-package.xml @@ -146,9 +146,7 @@ The elements are as follows: manifestURL - The manifest to be pulled by - nix-pull. The manifest must contain - outPath. + Obsolete. diff --git a/doc/manual/command-ref/nix-pull.xml b/doc/manual/command-ref/nix-pull.xml deleted file mode 100644 index eb471677b63f..000000000000 --- a/doc/manual/command-ref/nix-pull.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - nix-pull - 1 - Nix - - - - - nix-pull - register availability of pre-built binaries (deprecated) - - - - - nix-pull - url - - - - -Description - -This command and the use of manifests is deprecated. It is -better to use binary caches. - -The command nix-pull obtains a list of -pre-built store paths from the URL url, and -for each of these store paths, registers a substitute derivation that -downloads and unpacks it into the Nix store. This is used to speed up -installations: if you attempt to install something that has already -been built and stored into the network cache, Nix can transparently -re-use the pre-built store paths. - -The file at url must be compatible -with the files created by nix-push. - - - - -Examples - - -$ nix-pull https://nixos.org/releases/nixpkgs/nixpkgs-15.05pre54468.69858d7/MANIFEST - - - - - diff --git a/doc/manual/command-ref/nix-push.xml b/doc/manual/command-ref/nix-push.xml index b8156b4554fd..0749824a0ad4 100644 --- a/doc/manual/command-ref/nix-push.xml +++ b/doc/manual/command-ref/nix-push.xml @@ -73,8 +73,7 @@ automatically. Optionally, a single manifest file is created that contains the same metadata as the .narinfo files. This is for compatibility with - Nix versions prior to 1.2 (see nix-pull for - details). + Nix versions prior to 1.2. A file named is placed in the destination directory. The existence of this file @@ -135,7 +134,7 @@ automatically. Force the generation of a manifest suitable for - use by nix-pull. The manifest is stored as + use by old versions of Nix. The manifest is stored as dest-dir/MANIFEST. @@ -203,20 +202,6 @@ $ nix-push --dest /tmp/cache $(nix-instantiate -A thunderbird) -To generate a manifest suitable for nix-pull: - - -$ nix-push --dest /tmp/cache $(nix-build -A thunderbird) --manifest - - -On another machine you can then do: - - -$ nix-pull http://example.org/cache - - -to cause the binaries to be used by subsequent Nix operations. - To generate a signed binary cache, you must first generate a key pair, in this example called cache.example.org-1, storing the secret key in ./sk and the public key diff --git a/doc/manual/command-ref/utilities.xml b/doc/manual/command-ref/utilities.xml index be2fe6e2d235..25e457e4e554 100644 --- a/doc/manual/command-ref/utilities.xml +++ b/doc/manual/command-ref/utilities.xml @@ -13,14 +13,10 @@ work with Nix. - - diff --git a/doc/manual/local.mk b/doc/manual/local.mk index 3d7e7fed9631..a0f110385676 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk @@ -39,7 +39,7 @@ dist-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid # Generate man pages. man-pages := $(foreach n, \ nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \ - nix-collect-garbage.1 nix-push.1 nix-pull.1 \ + nix-collect-garbage.1 nix-push.1 \ nix-prefetch-url.1 nix-channel.1 \ nix-install-package.1 nix-hash.1 nix-copy-closure.1 \ nix.conf.5 nix-daemon.8, \ -- cgit 1.4.1