diff --git a/.gitignore b/.gitignore
index de8e9354..70ee11f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@ Makefile.config
# /scripts/
/scripts/nix-profile.sh
-/scripts/nix-pull
/scripts/nix-push
/scripts/nix-switch
/scripts/nix-collect-garbage
@@ -43,11 +42,8 @@ Makefile.config
/scripts/nix-channel
/scripts/nix-build
/scripts/nix-copy-closure
-/scripts/nix-generate-patches
/scripts/NixConfig.pm
/scripts/NixManifest.pm
-/scripts/GeneratePatches.pm
-/scripts/download-using-manifests.pl
/scripts/copy-from-other-stores.pl
/scripts/download-from-binary-cache.pl
/scripts/find-runtime-roots.pl
@@ -55,10 +51,6 @@ Makefile.config
/scripts/nix-reduce-build
/scripts/nix-http-export.cgi
-# /src/bsdiff-4.3/
-/src/bsdiff-4.3/bsdiff
-/src/bsdiff-4.3/bspatch
-
# /src/libexpr/
/src/libexpr/lexer-tab.cc
/src/libexpr/lexer-tab.hh
diff --git a/Makefile b/Makefile
index 39870af7..943b6391 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ makefiles = \
src/download-via-ssh/local.mk \
src/nix-log2xml/local.mk \
src/nix-prefetch-url/local.mk \
- src/bsdiff-4.3/local.mk \
perl/local.mk \
scripts/local.mk \
corepkgs/local.mk \
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index f598d359..598b1582 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 a6f4a272..0a1f2a8b 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 70bec432..00000000
--- 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 f7802a95..e17166ca 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 eb471677..00000000
--- 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 b8156b45..0749824a 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 be2fe6e2..25e457e4 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 3d7e7fed..a0f11038 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, \
diff --git a/perl/lib/Nix/Config.pm.in b/perl/lib/Nix/Config.pm.in
index b0dc71fa..f985c5b0 100644
--- a/perl/lib/Nix/Config.pm.in
+++ b/perl/lib/Nix/Config.pm.in
@@ -7,7 +7,6 @@ $version = "@PACKAGE_VERSION@";
$binDir = $ENV{"NIX_BIN_DIR"} || "@bindir@";
$libexecDir = $ENV{"NIX_LIBEXEC_DIR"} || "@libexecdir@";
$stateDir = $ENV{"NIX_STATE_DIR"} || "@localstatedir@/nix";
-$manifestDir = $ENV{"NIX_MANIFESTS_DIR"} || "@localstatedir@/nix/manifests";
$logDir = $ENV{"NIX_LOG_DIR"} || "@localstatedir@/log/nix";
$confDir = $ENV{"NIX_CONF_DIR"} || "@sysconfdir@/nix";
$storeDir = $ENV{"NIX_STORE_DIR"} || "@storedir@";
diff --git a/perl/lib/Nix/GeneratePatches.pm b/perl/lib/Nix/GeneratePatches.pm
deleted file mode 100644
index 612c8a3a..00000000
--- a/perl/lib/Nix/GeneratePatches.pm
+++ /dev/null
@@ -1,340 +0,0 @@
-package Nix::GeneratePatches;
-
-use strict;
-use File::Temp qw(tempdir);
-use File::stat;
-use Nix::Config;
-use Nix::Manifest;
-
-our @ISA = qw(Exporter);
-our @EXPORT = qw(generatePatches propagatePatches copyPatches);
-
-
-# Some patch generations options.
-
-# Max size of NAR archives to generate patches for.
-my $maxNarSize = $ENV{"NIX_MAX_NAR_SIZE"};
-$maxNarSize = 160 * 1024 * 1024 if !defined $maxNarSize;
-
-# If patch is bigger than this fraction of full archive, reject.
-my $maxPatchFraction = $ENV{"NIX_PATCH_FRACTION"};
-$maxPatchFraction = 0.60 if !defined $maxPatchFraction;
-
-my $timeLimit = $ENV{"NIX_BSDIFF_TIME_LIMIT"};
-$timeLimit = 180 if !defined $timeLimit;
-
-my $hashAlgo = "sha256";
-
-
-sub findOutputPaths {
- my $narFiles = shift;
-
- my %outPaths;
-
- foreach my $p (keys %{$narFiles}) {
-
- # Ignore derivations.
- next if ($p =~ /\.drv$/);
-
- # Ignore builders (too much ambiguity -- they're all called
- # `builder.sh').
- next if ($p =~ /\.sh$/);
- next if ($p =~ /\.patch$/);
-
- # Don't bother including tar files etc.
- next if ($p =~ /\.tar$/ || $p =~ /\.tar\.(gz|bz2|Z|lzma|xz)$/ || $p =~ /\.zip$/ || $p =~ /\.bin$/ || $p =~ /\.tgz$/ || $p =~ /\.rpm$/ || $p =~ /cvs-export$/ || $p =~ /fetchhg$/);
-
- $outPaths{$p} = 1;
- }
-
- return %outPaths;
-}
-
-
-sub getNameVersion {
- my $p = shift;
- $p =~ /\/[0-9a-z]+((?:-[a-zA-Z][^\/-]*)+)([^\/]*)$/;
- my $name = $1;
- my $version = $2;
- return undef unless defined $name && defined $version;
- $name =~ s/^-//;
- $version =~ s/^-//;
- return ($name, $version);
-}
-
-
-# A quick hack to get a measure of the `distance' between two
-# versions: it's just the position of the first character that differs
-# (or 999 if they are the same).
-sub versionDiff {
- my $s = shift;
- my $t = shift;
- my $i;
- return 999 if $s eq $t;
- for ($i = 0; $i < length $s; $i++) {
- return $i if $i >= length $t or
- substr($s, $i, 1) ne substr($t, $i, 1);
- }
- return $i;
-}
-
-
-sub getNarBz2 {
- my $narPath = shift;
- my $narFiles = shift;
- my $storePath = shift;
-
- my $narFileList = $$narFiles{$storePath};
- die "missing path $storePath" unless defined $narFileList;
-
- my $narFile = @{$narFileList}[0];
- die unless defined $narFile;
-
- $narFile->{url} =~ /\/([^\/]+)$/;
- die unless defined $1;
- return "$narPath/$1";
-}
-
-
-sub containsPatch {
- my $patches = shift;
- my $storePath = shift;
- my $basePath = shift;
- my $patchList = $$patches{$storePath};
- return 0 if !defined $patchList;
- my $found = 0;
- foreach my $patch (@{$patchList}) {
- # !!! baseHash might differ
- return 1 if $patch->{basePath} eq $basePath;
- }
- return 0;
-}
-
-
-sub generatePatches {
- my ($srcNarFiles, $dstNarFiles, $srcPatches, $dstPatches, $narPath, $patchesPath, $patchesURL, $tmpDir) = @_;
-
- my %srcOutPaths = findOutputPaths $srcNarFiles;
- my %dstOutPaths = findOutputPaths $dstNarFiles;
-
- # For each output path in the destination, see if we need to / can
- # create a patch.
-
- print STDERR "creating patches...\n";
-
- foreach my $p (keys %dstOutPaths) {
-
- # If exactly the same path already exists in the source, skip it.
- next if defined $srcOutPaths{$p};
-
- print " $p\n";
-
- # If not, then we should find the paths in the source that are
- # `most' likely to be present on a system that wants to
- # install this path.
-
- (my $name, my $version) = getNameVersion $p;
- next unless defined $name && defined $version;
-
- my @closest = ();
- my $closestVersion;
- my $minDist = -1; # actually, larger means closer
-
- # Find all source paths with the same name.
-
- foreach my $q (keys %srcOutPaths) {
- (my $name2, my $version2) = getNameVersion $q;
- next unless defined $name2 && defined $version2;
-
- if ($name eq $name2) {
-
- my $srcSystem = @{$$dstNarFiles{$p}}[0]->{system};
- my $dstSystem = @{$$srcNarFiles{$q}}[0]->{system};
- if (defined $srcSystem && defined $dstSystem && $srcSystem ne $dstSystem) {
- print " SKIPPING $q due to different systems ($srcSystem vs. $dstSystem)\n";
- next;
- }
-
- # If the sizes differ too much, then skip. This
- # disambiguates between, e.g., a real component and a
- # wrapper component (cf. Firefox in Nixpkgs).
- my $srcSize = @{$$srcNarFiles{$q}}[0]->{size};
- my $dstSize = @{$$dstNarFiles{$p}}[0]->{size};
- my $ratio = $srcSize / $dstSize;
- $ratio = 1 / $ratio if $ratio < 1;
- # print " SIZE $srcSize $dstSize $ratio $q\n";
-
- if ($ratio >= 3) {
- print " SKIPPING $q due to size ratio $ratio ($srcSize vs. $dstSize)\n";
- next;
- }
-
- # If there are multiple matching names, include the
- # ones with the closest version numbers.
- my $dist = versionDiff $version, $version2;
- if ($dist > $minDist) {
- $minDist = $dist;
- @closest = ($q);
- $closestVersion = $version2;
- } elsif ($dist == $minDist) {
- push @closest, $q;
- }
- }
- }
-
- if (scalar(@closest) == 0) {
- print " NO BASE: $p\n";
- next;
- }
-
- foreach my $closest (@closest) {
-
- # Generate a patch between $closest and $p.
- print STDERR " $p <- $closest\n";
-
- # If the patch already exists, skip it.
- if (containsPatch($srcPatches, $p, $closest) ||
- containsPatch($dstPatches, $p, $closest))
- {
- print " skipping, already exists\n";
- next;
- }
-
- my $srcNarBz2 = getNarBz2 $narPath, $srcNarFiles, $closest;
- my $dstNarBz2 = getNarBz2 $narPath, $dstNarFiles, $p;
-
- if (! -f $srcNarBz2) {
- warn "patch source archive $srcNarBz2 is missing\n";
- next;
- }
-
- system("$Nix::Config::bzip2 -d < $srcNarBz2 > $tmpDir/A") == 0
- or die "cannot unpack $srcNarBz2";
-
- if (stat("$tmpDir/A")->size >= $maxNarSize) {
- print " skipping, source is too large\n";
- next;
- }
-
- system("$Nix::Config::bzip2 -d < $dstNarBz2 > $tmpDir/B") == 0
- or die "cannot unpack $dstNarBz2";
-
- if (stat("$tmpDir/B")->size >= $maxNarSize) {
- print " skipping, destination is too large\n";
- next;
- }
-
- my $time1 = time();
- my $res = system("ulimit -t $timeLimit; $Nix::Config::libexecDir/nix/bsdiff $tmpDir/A $tmpDir/B $tmpDir/DIFF");
- my $time2 = time();
- if ($res) {
- warn "binary diff computation aborted after ", $time2 - $time1, " seconds\n";
- next;
- }
-
- my $baseHash = `$Nix::Config::binDir/nix-hash --flat --type $hashAlgo --base32 $tmpDir/A` or die;
- chomp $baseHash;
-
- my $narHash = `$Nix::Config::binDir/nix-hash --flat --type $hashAlgo --base32 $tmpDir/B` or die;
- chomp $narHash;
-
- my $narDiffHash = `$Nix::Config::binDir/nix-hash --flat --type $hashAlgo --base32 $tmpDir/DIFF` or die;
- chomp $narDiffHash;
-
- my $narDiffSize = stat("$tmpDir/DIFF")->size;
- my $dstNarBz2Size = stat($dstNarBz2)->size;
-
- print " size $narDiffSize; full size $dstNarBz2Size; ", $time2 - $time1, " seconds\n";
-
- if ($narDiffSize >= $dstNarBz2Size) {
- print " rejecting; patch bigger than full archive\n";
- next;
- }
-
- if ($narDiffSize / $dstNarBz2Size >= $maxPatchFraction) {
- print " rejecting; patch too large relative to full archive\n";
- next;
- }
-
- my $finalName = "$narDiffHash.nar-bsdiff";
-
- if (-e "$patchesPath/$finalName") {
- print " not copying, already exists\n";
- }
-
- else {
- system("cp '$tmpDir/DIFF' '$patchesPath/$finalName.tmp'") == 0
- or die "cannot copy diff";
- rename("$patchesPath/$finalName.tmp", "$patchesPath/$finalName")
- or die "cannot rename $patchesPath/$finalName.tmp";
- }
-
- # Add the patch to the manifest.
- addPatch $dstPatches, $p,
- { url => "$patchesURL/$finalName", hash => "$hashAlgo:$narDiffHash"
- , size => $narDiffSize, basePath => $closest, baseHash => "$hashAlgo:$baseHash"
- , narHash => "$hashAlgo:$narHash", patchType => "nar-bsdiff"
- };
- }
- }
-}
-
-
-# Propagate useful patches from $srcPatches to $dstPatches. A patch
-# is useful if it produces either paths in the $dstNarFiles or paths
-# that can be used as the base for other useful patches.
-sub propagatePatches {
- my ($srcPatches, $dstNarFiles, $dstPatches) = @_;
-
- print STDERR "propagating patches...\n";
-
- my $changed;
- do {
- # !!! we repeat this to reach the transitive closure; inefficient
- $changed = 0;
-
- print STDERR "loop\n";
-
- my %dstBasePaths;
- foreach my $q (keys %{$dstPatches}) {
- foreach my $patch (@{$$dstPatches{$q}}) {
- $dstBasePaths{$patch->{basePath}} = 1;
- }
- }
-
- foreach my $p (keys %{$srcPatches}) {
- my $patchList = $$srcPatches{$p};
-
- my $include = 0;
-
- # Is path $p included in the destination? If so, include
- # patches that produce it.
- $include = 1 if defined $$dstNarFiles{$p};
-
- # Is path $p a path that serves as a base for paths in the
- # destination? If so, include patches that produce it.
- # !!! check baseHash
- $include = 1 if defined $dstBasePaths{$p};
-
- if ($include) {
- foreach my $patch (@{$patchList}) {
- $changed = 1 if addPatch $dstPatches, $p, $patch;
- }
- }
-
- }
-
- } while $changed;
-}
-
-
-# Add all new patches in $srcPatches to $dstPatches.
-sub copyPatches {
- my ($srcPatches, $dstPatches) = @_;
- foreach my $p (keys %{$srcPatches}) {
- addPatch $dstPatches, $p, $_ foreach @{$$srcPatches{$p}};
- }
-}
-
-
-return 1;
diff --git a/perl/lib/Nix/Manifest.pm b/perl/lib/Nix/Manifest.pm
index 428decf0..0da37676 100644
--- a/perl/lib/Nix/Manifest.pm
+++ b/perl/lib/Nix/Manifest.pm
@@ -13,7 +13,7 @@ use Nix::Config;
use Nix::Store;
our @ISA = qw(Exporter);
-our @EXPORT = qw(readManifest writeManifest updateManifestDB addPatch deleteOldManifests parseNARInfo fingerprintPath);
+our @EXPORT = qw(readManifest writeManifest addPatch parseNARInfo fingerprintPath);
sub addNAR {
@@ -228,172 +228,6 @@ sub writeManifest {
}
-sub updateManifestDB {
- my $manifestDir = $Nix::Config::manifestDir;
-
- my @manifests = glob "$manifestDir/*.nixmanifest";
- return undef if scalar @manifests == 0;
-
- mkpath($manifestDir);
-
- unlink "$manifestDir/cache.sqlite"; # remove obsolete cache
- my $dbPath = "$manifestDir/cache-v2.sqlite";
-
- # Open/create the database.
- our $dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "")
- or die "cannot open database ‘$dbPath’";
- $dbh->{RaiseError} = 1;
- $dbh->{PrintError} = 0;
-
- $dbh->do("pragma foreign_keys = on");
- $dbh->do("pragma synchronous = off"); # we can always reproduce the cache
- $dbh->do("pragma journal_mode = truncate");
-
- # Initialise the database schema, if necessary.
- $dbh->do(<do(<do("create index if not exists NARs_storePath on NARs(storePath)");
-
- $dbh->do(<do("create index if not exists Patches_storePath on Patches(storePath)");
-
- # Acquire an exclusive lock to ensure that only one process
- # updates the DB at the same time. This isn't really necessary,
- # but it prevents work duplication and lock contention in SQLite.
- my $lockFile = "$manifestDir/cache.lock";
- open MAINLOCK, ">>$lockFile" or die "unable to acquire lock ‘$lockFile’: $!\n";
- flock(MAINLOCK, LOCK_EX) or die;
-
- our $insertNAR = $dbh->prepare(
- "insert into NARs(manifest, storePath, url, compressionType, hash, size, narHash, " .
- "narSize, refs, deriver, system) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") or die;
-
- our $insertPatch = $dbh->prepare(
- "insert into Patches(manifest, storePath, basePath, baseHash, url, hash, " .
- "size, narHash, narSize, patchType) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-
- $dbh->begin_work;
-
- # Read each manifest in $manifestDir and add it to the database,
- # unless we've already done so on a previous run.
- my %seen;
-
- for my $manifestLink (@manifests) {
- my $manifest = Cwd::abs_path($manifestLink);
- next unless -f $manifest;
- my $timestamp = lstat($manifest)->mtime;
- $seen{$manifest} = 1;
-
- next if scalar @{$dbh->selectcol_arrayref(
- "select 1 from Manifests where path = ? and timestamp = ?",
- {}, $manifest, $timestamp)} == 1;
-
- print STDERR "caching $manifest...\n";
-
- $dbh->do("delete from Manifests where path = ?", {}, $manifest);
-
- $dbh->do("insert into Manifests(path, timestamp) values (?, ?)",
- {}, $manifest, $timestamp);
-
- our $id = $dbh->last_insert_id("", "", "", "");
-
- sub addNARToDB {
- my ($storePath, $narFile) = @_;
- $insertNAR->execute(
- $id, $storePath, $narFile->{url}, $narFile->{compressionType}, $narFile->{hash},
- $narFile->{size}, $narFile->{narHash}, $narFile->{narSize}, $narFile->{references},
- $narFile->{deriver}, $narFile->{system});
- };
-
- sub addPatchToDB {
- my ($storePath, $patch) = @_;
- $insertPatch->execute(
- $id, $storePath, $patch->{basePath}, $patch->{baseHash}, $patch->{url},
- $patch->{hash}, $patch->{size}, $patch->{narHash}, $patch->{narSize},
- $patch->{patchType});
- };
-
- my $version = readManifest_($manifest, \&addNARToDB, \&addPatchToDB);
-
- if ($version < 3) {
- die "you have an old-style or corrupt manifest ‘$manifestLink’; please delete it\n";
- }
- if ($version >= 10) {
- die "manifest ‘$manifestLink’ is too new; please delete it or upgrade Nix\n";
- }
- }
-
- # Removed cached information for removed manifests from the DB.
- foreach my $manifest (@{$dbh->selectcol_arrayref("select path from Manifests")}) {
- next if defined $seen{$manifest};
- $dbh->do("delete from Manifests where path = ?", {}, $manifest);
- }
-
- $dbh->commit;
-
- close MAINLOCK;
-
- return $dbh;
-}
-
-
-# Delete all old manifests downloaded from a given URL.
-sub deleteOldManifests {
- my ($url, $curUrlFile) = @_;
- for my $urlFile (glob "$Nix::Config::manifestDir/*.url") {
- next if defined $curUrlFile && $urlFile eq $curUrlFile;
- open URL, "<$urlFile" or die;
- my $url2 = ;
- chomp $url2;
- close URL;
- next unless $url eq $url2;
- my $base = $urlFile; $base =~ s/.url$//;
- unlink "${base}.url";
- unlink "${base}.nixmanifest";
- }
-}
-
-
# Return a fingerprint of a store path to be used in binary cache
# signatures. It contains the store path, the base-32 SHA-256 hash of
# the contents of the path, and the references.
diff --git a/perl/local.mk b/perl/local.mk
index ed49e3e6..5b43c4b7 100644
--- a/perl/local.mk
+++ b/perl/local.mk
@@ -1,7 +1,6 @@
nix_perl_sources := \
$(d)/lib/Nix/Store.pm \
$(d)/lib/Nix/Manifest.pm \
- $(d)/lib/Nix/GeneratePatches.pm \
$(d)/lib/Nix/SSH.pm \
$(d)/lib/Nix/CopyClosure.pm \
$(d)/lib/Nix/Config.pm.in \
diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in
deleted file mode 100755
index ffc49f8f..00000000
--- a/scripts/download-using-manifests.pl.in
+++ /dev/null
@@ -1,376 +0,0 @@
-#! @perl@ -w @perlFlags@
-
-use utf8;
-use strict;
-use Nix::Config;
-use Nix::Manifest;
-use Nix::Store;
-use Nix::Utils;
-use POSIX qw(strftime);
-
-STDOUT->autoflush(1);
-binmode STDERR, ":encoding(utf8)";
-
-my $logFile = "$Nix::Config::logDir/downloads";
-
-# For queries, skip expensive calls to nix-hash etc. We're just
-# estimating the expected download size.
-my $fast = 1;
-
-my $curl = "$Nix::Config::curl --fail --location";
-
-
-# Open the manifest cache and update it if necessary.
-my $dbh = updateManifestDB();
-exit 0 unless defined $dbh; # exit if there are no manifests
-print "\n";
-
-
-# $hashCache->{$algo}->{$path} yields the $algo-hash of $path.
-my $hashCache;
-
-
-sub parseHash {
- my $hash = shift;
- if ($hash =~ /^(.+):(.+)$/) {
- return ($1, $2);
- } else {
- return ("md5", $hash);
- }
-}
-
-
-# Compute the most efficient sequence of downloads to produce the
-# given path.
-sub computeSmallestDownload {
- my $targetPath = shift;
-
- # Build a graph of all store paths that might contribute to the
- # construction of $targetPath, and the special node "start". The
- # edges are either patch operations, or downloads of full NAR
- # files. The latter edges only occur between "start" and a store
- # path.
- my %graph;
-
- $graph{"start"} = {d => 0, pred => undef, edges => []};
-
- my @queue = ();
- my $queueFront = 0;
- my %done;
-
- sub addNode {
- my $graph = shift;
- my $u = shift;
- $$graph{$u} = {d => 999999999999, pred => undef, edges => []}
- unless defined $$graph{$u};
- }
-
- sub addEdge {
- my $graph = shift;
- my $u = shift;
- my $v = shift;
- my $w = shift;
- my $type = shift;
- my $info = shift;
- addNode $graph, $u;
- push @{$$graph{$u}->{edges}},
- {weight => $w, start => $u, end => $v, type => $type, info => $info};
- my $n = scalar @{$$graph{$u}->{edges}};
- }
-
- push @queue, $targetPath;
-
- while ($queueFront < scalar @queue) {
- my $u = $queue[$queueFront++];
- next if defined $done{$u};
- $done{$u} = 1;
-
- addNode \%graph, $u;
-
- # If the path already exists, it has distance 0 from the
- # "start" node.
- if (isValidPath($u)) {
- addEdge \%graph, "start", $u, 0, "present", undef;
- }
-
- else {
-
- # Add patch edges.
- my $patchList = $dbh->selectall_arrayref(
- "select * from Patches where storePath = ?",
- { Slice => {} }, $u);
-
- foreach my $patch (@{$patchList}) {
- if (isValidPath($patch->{basePath})) {
- my ($baseHashAlgo, $baseHash) = parseHash $patch->{baseHash};
-
- my $hash = $hashCache->{$baseHashAlgo}->{$patch->{basePath}};
- if (!defined $hash) {
- $hash = $fast && $baseHashAlgo eq "sha256"
- ? queryPathHash($patch->{basePath})
- : hashPath($baseHashAlgo, $baseHashAlgo ne "md5", $patch->{basePath});
- $hash =~ s/.*://;
- $hashCache->{$baseHashAlgo}->{$patch->{basePath}} = $hash;
- }
-
- next if $hash ne $baseHash;
- }
- push @queue, $patch->{basePath};
- addEdge \%graph, $patch->{basePath}, $u, $patch->{size}, "patch", $patch;
- }
-
- # Add NAR file edges to the start node.
- my $narFileList = $dbh->selectall_arrayref(
- "select * from NARs where storePath = ?",
- { Slice => {} }, $u);
-
- foreach my $narFile (@{$narFileList}) {
- # !!! how to handle files whose size is not known in advance?
- # For now, assume some arbitrary size (1 GB).
- # This has the side-effect of preferring non-Hydra downloads.
- addEdge \%graph, "start", $u, ($narFile->{size} || 1000000000), "narfile", $narFile;
- }
- }
- }
-
-
- # Run Dijkstra's shortest path algorithm to determine the shortest
- # sequence of download and/or patch actions that will produce
- # $targetPath.
-
- my @todo = keys %graph;
-
- while (scalar @todo > 0) {
-
- # Remove the closest element from the todo list.
- # !!! inefficient, use a priority queue
- @todo = sort { -($graph{$a}->{d} <=> $graph{$b}->{d}) } @todo;
- my $u = pop @todo;
-
- my $u_ = $graph{$u};
-
- foreach my $edge (@{$u_->{edges}}) {
- my $v_ = $graph{$edge->{end}};
- if ($v_->{d} > $u_->{d} + $edge->{weight}) {
- $v_->{d} = $u_->{d} + $edge->{weight};
- # Store the edge; to edge->start is actually the
- # predecessor.
- $v_->{pred} = $edge;
- }
- }
- }
-
-
- # Retrieve the shortest path from "start" to $targetPath.
- my @path = ();
- my $cur = $targetPath;
- return () unless defined $graph{$targetPath}->{pred};
- while ($cur ne "start") {
- push @path, $graph{$cur}->{pred};
- $cur = $graph{$cur}->{pred}->{start};
- }
-
- return @path;
-}
-
-
-# Parse the arguments.
-
-if ($ARGV[0] eq "--query") {
-
- while () {
- chomp;
- my ($cmd, @args) = split " ", $_;
-
- if ($cmd eq "have") {
- foreach my $storePath (@args) {
- print "$storePath\n" if scalar @{$dbh->selectcol_arrayref("select 1 from NARs where storePath = ?", {}, $storePath)} > 0;
- }
- print "\n";
- }
-
- elsif ($cmd eq "info") {
- foreach my $storePath (@args) {
-
- my $infos = $dbh->selectall_arrayref(
- "select * from NARs where storePath = ?",
- { Slice => {} }, $storePath);
-
- next unless scalar @{$infos} > 0;
- my $info = @{$infos}[0];
-
- print "$storePath\n";
- print "$info->{deriver}\n";
- my @references = split " ", $info->{refs};
- print scalar @references, "\n";
- print "$_\n" foreach @references;
-
- my @path = computeSmallestDownload $storePath;
-
- my $downloadSize = 0;
- while (scalar @path > 0) {
- my $edge = pop @path;
- my $u = $edge->{start};
- my $v = $edge->{end};
- if ($edge->{type} eq "patch") {
- $downloadSize += $edge->{info}->{size} || 0;
- }
- elsif ($edge->{type} eq "narfile") {
- $downloadSize += $edge->{info}->{size} || 0;
- }
- }
-
- print "$downloadSize\n";
-
- my $narSize = $info->{narSize} || 0;
- print "$narSize\n";
- }
-
- print "\n";
- }
-
- else { die "unknown command ‘$cmd’"; }
- }
-
- exit 0;
-}
-
-elsif ($ARGV[0] ne "--substitute") {
- die;
-}
-
-
-die unless scalar @ARGV == 3;
-my $targetPath = $ARGV[1];
-my $destPath = $ARGV[2];
-$fast = 0;
-
-
-# Create a temporary directory.
-my $tmpDir = mkTempDir("nix-download");
-
-my $tmpNar = "$tmpDir/nar";
-my $tmpNar2 = "$tmpDir/nar2";
-
-
-open LOGFILE, ">>$logFile" or die "cannot open log file $logFile";
-
-my $date = strftime ("%F %H:%M:%S UTC", gmtime (time));
-print LOGFILE "$$ get $targetPath $date\n";
-
-print STDERR "\n*** Trying to download/patch ‘$targetPath’\n";
-
-
-# Compute the shortest path.
-my @path = computeSmallestDownload $targetPath;
-die "don't know how to produce $targetPath\n" if scalar @path == 0;
-
-
-# We don't need the manifest anymore, so close it as an optimisation:
-# if we still have SQLite locks blocking other processes (we
-# shouldn't), this gets rid of them.
-$dbh->disconnect;
-
-
-# Traverse the shortest path, perform the actions described by the
-# edges.
-my $curStep = 1;
-my $maxStep = scalar @path;
-
-my $finalNarHash;
-
-while (scalar @path > 0) {
- my $edge = pop @path;
- my $u = $edge->{start};
- my $v = $edge->{end};
-
- print STDERR "\n*** Step $curStep/$maxStep: ";
-
- if ($edge->{type} eq "present") {
- print STDERR "using already present path ‘$v’\n";
- print LOGFILE "$$ present $v\n";
-
- if ($curStep < $maxStep) {
- # Since this is not the last step, the path will be used
- # as a base to one or more patches. So turn the base path
- # into a NAR archive, to which we can apply the patch.
- print STDERR " packing base path...\n";
- system("$Nix::Config::binDir/nix-store --dump $v > $tmpNar") == 0
- or die "cannot dump ‘$v’";
- }
- }
-
- elsif ($edge->{type} eq "patch") {
- my $patch = $edge->{info};
- print STDERR "applying patch ‘$patch->{url}’ to ‘$u’ to create ‘$v’\n";
-
- print LOGFILE "$$ patch $patch->{url} $patch->{size} $patch->{baseHash} $u $v\n";
-
- # Download the patch.
- print STDERR " downloading patch...\n";
- my $patchPath = "$tmpDir/patch";
- checkURL $patch->{url};
- system("$curl '$patch->{url}' -o $patchPath") == 0
- or die "cannot download patch ‘$patch->{url}’\n";
-
- # Apply the patch to the NAR archive produced in step 1 (for
- # the already present path) or a later step (for patch sequences).
- print STDERR " applying patch...\n";
- system("$Nix::Config::libexecDir/nix/bspatch $tmpNar $tmpNar2 $patchPath") == 0
- or die "cannot apply patch ‘$patchPath’ to $tmpNar\n";
-
- if ($curStep < $maxStep) {
- # The archive will be used as the base of the next patch.
- rename "$tmpNar2", "$tmpNar" or die "cannot rename NAR archive: $!";
- } else {
- # This was the last patch. Unpack the final NAR archive
- # into the target path.
- print STDERR " unpacking patched archive...\n";
- system("$Nix::Config::binDir/nix-store --restore $destPath < $tmpNar2") == 0
- or die "cannot unpack $tmpNar2 to ‘$v’\n";
- }
-
- $finalNarHash = $patch->{narHash};
- }
-
- elsif ($edge->{type} eq "narfile") {
- my $narFile = $edge->{info};
- print STDERR "downloading ‘$narFile->{url}’ to ‘$v’\n";
-
- my $size = $narFile->{size} || -1;
- print LOGFILE "$$ narfile $narFile->{url} $size $v\n";
-
- checkURL $narFile->{url};
-
- my $decompressor =
- $narFile->{compressionType} eq "bzip2" ? "| $Nix::Config::bzip2 -d" :
- $narFile->{compressionType} eq "xz" ? "| $Nix::Config::xz -d" :
- $narFile->{compressionType} eq "none" ? "" :
- die "unknown compression type ‘$narFile->{compressionType}’";
-
- if ($curStep < $maxStep) {
- # The archive will be used a base to a patch.
- system("$curl '$narFile->{url}' $decompressor > $tmpNar") == 0
- or die "cannot download and unpack ‘$narFile->{url}’ to ‘$v’\n";
- } else {
- # Unpack the archive to the target path.
- system("$curl '$narFile->{url}' $decompressor | $Nix::Config::binDir/nix-store --restore '$destPath'") == 0
- or die "cannot download and unpack ‘$narFile->{url}’ to ‘$v’\n";
- }
-
- $finalNarHash = $narFile->{narHash};
- }
-
- $curStep++;
-}
-
-
-# Tell Nix about the expected hash so it can verify it.
-die "cannot check integrity of the downloaded path since its hash is not known\n"
- unless defined $finalNarHash;
-print "$finalNarHash\n";
-
-
-print STDERR "\n";
-print LOGFILE "$$ success\n";
-close LOGFILE;
diff --git a/scripts/local.mk b/scripts/local.mk
index cdac56bf..f6542a4c 100644
--- a/scripts/local.mk
+++ b/scripts/local.mk
@@ -2,17 +2,14 @@ nix_bin_scripts := \
$(d)/nix-build \
$(d)/nix-channel \
$(d)/nix-copy-closure \
- $(d)/nix-generate-patches \
$(d)/nix-install-package \
- $(d)/nix-pull \
$(d)/nix-push
bin-scripts += $(nix_bin_scripts)
nix_substituters := \
$(d)/copy-from-other-stores.pl \
- $(d)/download-from-binary-cache.pl \
- $(d)/download-using-manifests.pl
+ $(d)/download-from-binary-cache.pl
nix_noinst_scripts := \
$(d)/build-remote.pl \
diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in
index 5191b585..65084ff1 100755
--- a/scripts/nix-channel.in
+++ b/scripts/nix-channel.in
@@ -12,8 +12,6 @@ binmode STDERR, ":encoding(utf8)";
Nix::Config::readConfig;
-my $manifestDir = $Nix::Config::manifestDir;
-
# Turn on caching in nix-prefetch-url.
my $channelCache = "$Nix::Config::stateDir/channel-cache";
@@ -75,7 +73,6 @@ sub removeChannel {
my ($name) = @_;
readChannels;
my $url = $channels{$name};
- deleteOldManifests($url . "/MANIFEST", undef) if defined $url;
delete $channels{$name};
writeChannels;
@@ -84,8 +81,7 @@ sub removeChannel {
}
-# Fetch Nix expressions and pull manifests from the subscribed
-# channels.
+# Fetch Nix expressions and binary cache URLs from the subscribed channels.
sub update {
my @channelNames = @_;
@@ -97,7 +93,6 @@ sub update {
next if scalar @channelNames > 0 && ! grep { $_ eq $name } @{channelNames};
my $url = $channels{$name};
- my $origUrl = "$url/MANIFEST";
# We want to download the url to a file to see if it's a tarball while also checking if we
# got redirected in the process, so that we can grab the various parts of a nix channel
@@ -132,22 +127,8 @@ sub update {
if ($ret != 0) {
# Check if the channel advertises a binary cache.
my $binaryCacheURL = `$Nix::Config::curl --silent '$url'/binary-cache-url`;
- my $getManifest = ($Nix::Config::config{"force-manifest"} // "false") eq "true";
- if ($? == 0 && $binaryCacheURL ne "") {
- $extraAttrs .= "binaryCacheURL = \"$binaryCacheURL\"; ";
- deleteOldManifests($origUrl, undef);
- } else {
- $getManifest = 1;
- }
-
- if ($getManifest) {
- # No binary cache, so pull the channel manifest.
- mkdir $manifestDir, 0755 unless -e $manifestDir;
- die "$0: you do not have write permission to ‘$manifestDir’!\n" unless -W $manifestDir;
- $ENV{'NIX_ORIG_URL'} = $origUrl;
- system("$Nix::Config::binDir/nix-pull", "--skip-wrong-store", "$url/MANIFEST") == 0
- or die "cannot pull manifest from ‘$url’\n";
- }
+ $extraAttrs .= "binaryCacheURL = \"$binaryCacheURL\"; "
+ if $? == 0 && $binaryCacheURL ne "";
# Download the channel tarball.
my $fullURL = "$url/nixexprs.tar.xz";
diff --git a/scripts/nix-generate-patches.in b/scripts/nix-generate-patches.in
deleted file mode 100755
index 0a29c054..00000000
--- a/scripts/nix-generate-patches.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#! @perl@ -w @perlFlags@
-
-use strict;
-use Nix::Manifest;
-use Nix::GeneratePatches;
-use Nix::Utils;
-
-if (scalar @ARGV != 5) {
- print STDERR < /dev/null") == 0) {
- print "fetching list of Nix archives at ‘$url.bz2’...\n";
- $manifest = downloadFile "$url.bz2";
- }
-
- # Otherwise, just get the uncompressed manifest.
- else {
- print "fetching list of Nix archives at ‘$url’...\n";
- $manifest = downloadFile $url;
- }
-
- my $baseName = "unnamed";
- if ($url =~ /\/([^\/]+)\/[^\/]+$/) { # get the forelast component
- $baseName = $1;
- }
-
- my $hash = `$Nix::Config::binDir/nix-hash --flat '$manifest'`
- or die "cannot hash ‘$manifest’";
- chomp $hash;
-
- my $urlFile = "$manifestDir/$baseName-$hash.url";
- open URL, ">$urlFile" or die "cannot create ‘$urlFile’";
- print URL $origUrl;
- close URL;
-
- my $finalPath = "$manifestDir/$baseName-$hash.nixmanifest";
-
- unlink $finalPath if -e $finalPath;
-
- symlink("$manifest", "$finalPath")
- or die "cannot link ‘$finalPath’ to ‘$manifest’";
-
- deleteOldManifests($origUrl, $urlFile);
-}
-
-while (@ARGV) {
- my $url = shift @ARGV;
- if ($url eq "--help") {
- exec "man nix-pull" or die;
- } elsif ($url eq "--skip-wrong-store") {
- # No-op, no longer supported.
- } else {
- processURL $url;
- }
-}
-
-
-# Update the cache.
-updateManifestDB();
diff --git a/src/bsdiff-4.3/bsdiff.1 b/src/bsdiff-4.3/bsdiff.1
deleted file mode 100644
index ead6c4de..00000000
--- a/src/bsdiff-4.3/bsdiff.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"-
-.\" Copyright 2003-2005 Colin Percival
-.\" All rights reserved
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted providing that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-.\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.1,v 1.1 2005/08/06 01:59:05 cperciva Exp $
-.\"
-.Dd May 18, 2003
-.Dt BSDIFF 1
-.Os FreeBSD
-.Sh NAME
-.Nm bsdiff
-.Nd generate a patch between two binary files
-.Sh SYNOPSIS
-.Nm
-.Ao Ar oldfile Ac Ao Ar newfile Ac Ao Ar patchfile Ac
-.Sh DESCRIPTION
-.Nm
-compares
-.Ao Ar oldfile Ac
-to
-.Ao Ar newfile Ac
-and writes to
-.Ao Ar patchfile Ac
-a binary patch suitable for use by bspatch(1).
-When
-.Ao Ar oldfile Ac
-and
-.Ao Ar newfile Ac
-are two versions of an executable program, the
-patches produced are on average a factor of five smaller
-than those produced by any other binary patch tool known
-to the author.
-.Pp
-.Nm
-uses memory equal to 17 times the size of
-.Ao Ar oldfile Ac ,
-and requires
-an absolute minimum working set size of 8 times the size of oldfile.
-.Sh SEE ALSO
-.Xr bspatch 1
-.Sh AUTHORS
-.An Colin Percival Aq cperciva@freebsd.org
diff --git a/src/bsdiff-4.3/bsdiff.c b/src/bsdiff-4.3/bsdiff.c
deleted file mode 100644
index 374ed038..00000000
--- a/src/bsdiff-4.3/bsdiff.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/*-
- * Copyright 2003-2005 Colin Percival
- * All rights reserved
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted providing that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if 0
-__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c,v 1.1 2005/08/06 01:59:05 cperciva Exp $");
-#endif
-
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define MIN(x,y) (((x)<(y)) ? (x) : (y))
-
-static void split(off_t *I,off_t *V,off_t start,off_t len,off_t h)
-{
- off_t i,j,k,x,tmp,jj,kk;
-
- if(len<16) {
- for(k=start;kstart) split(I,V,start,jj-start,h);
-
- for(i=0;ikk) split(I,V,kk,start+len-kk,h);
-}
-
-static void qsufsort(off_t *I,off_t *V,u_char *old,off_t oldsize)
-{
- off_t buckets[256];
- off_t i,h,len;
-
- for(i=0;i<256;i++) buckets[i]=0;
- for(i=0;i0;i--) buckets[i]=buckets[i-1];
- buckets[0]=0;
-
- for(i=0;iy) {
- *pos=I[st];
- return x;
- } else {
- *pos=I[en];
- return y;
- }
- };
-
- x=st+(en-st)/2;
- if(memcmp(old+I[x],new,MIN(oldsize-I[x],newsize))<0) {
- return search(I,old,oldsize,new,newsize,x,en,pos);
- } else {
- return search(I,old,oldsize,new,newsize,st,x,pos);
- };
-}
-
-static void offtout(off_t x,u_char *buf)
-{
- off_t y;
-
- if(x<0) y=-x; else y=x;
-
- buf[0]=y%256;y-=buf[0];
- y=y/256;buf[1]=y%256;y-=buf[1];
- y=y/256;buf[2]=y%256;y-=buf[2];
- y=y/256;buf[3]=y%256;y-=buf[3];
- y=y/256;buf[4]=y%256;y-=buf[4];
- y=y/256;buf[5]=y%256;y-=buf[5];
- y=y/256;buf[6]=y%256;y-=buf[6];
- y=y/256;buf[7]=y%256;
-
- if(x<0) buf[7]|=0x80;
-}
-
-int main(int argc,char *argv[])
-{
- int fd;
- u_char *old,*new;
- off_t oldsize,newsize;
- off_t *I,*V;
- off_t scan,pos,len;
- off_t lastscan,lastpos,lastoffset;
- off_t oldscore,scsc;
- off_t s,Sf,lenf,Sb,lenb;
- off_t overlap,Ss,lens;
- off_t i;
- off_t dblen,eblen;
- u_char *db,*eb;
- u_char buf[8];
- u_char header[32];
- FILE * pf;
- BZFILE * pfbz2;
- int bz2err;
-
- if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]);
-
- /* Allocate oldsize+1 bytes instead of oldsize bytes to ensure
- that we never try to malloc(0) and get a NULL pointer */
- if(((fd=open(argv[1],O_RDONLY,0))<0) ||
- ((oldsize=lseek(fd,0,SEEK_END))==-1) ||
- ((old=malloc(oldsize+1))==NULL) ||
- (lseek(fd,0,SEEK_SET)!=0) ||
- (read(fd,old,oldsize)!=oldsize) ||
- (close(fd)==-1)) err(1,"%s",argv[1]);
-
- if(((I=malloc((oldsize+1)*sizeof(off_t)))==NULL) ||
- ((V=malloc((oldsize+1)*sizeof(off_t)))==NULL)) err(1,NULL);
-
- qsufsort(I,V,old,oldsize);
-
- free(V);
-
- /* Allocate newsize+1 bytes instead of newsize bytes to ensure
- that we never try to malloc(0) and get a NULL pointer */
- if(((fd=open(argv[2],O_RDONLY,0))<0) ||
- ((newsize=lseek(fd,0,SEEK_END))==-1) ||
- ((new=malloc(newsize+1))==NULL) ||
- (lseek(fd,0,SEEK_SET)!=0) ||
- (read(fd,new,newsize)!=newsize) ||
- (close(fd)==-1)) err(1,"%s",argv[2]);
-
- if(((db=malloc(newsize+1))==NULL) ||
- ((eb=malloc(newsize+1))==NULL)) err(1,NULL);
- dblen=0;
- eblen=0;
-
- /* Create the patch file */
- if ((pf = fopen(argv[3], "w")) == NULL)
- err(1, "%s", argv[3]);
-
- /* Header is
- 0 8 "BSDIFF40"
- 8 8 length of bzip2ed ctrl block
- 16 8 length of bzip2ed diff block
- 24 8 length of new file */
- /* File is
- 0 32 Header
- 32 ?? Bzip2ed ctrl block
- ?? ?? Bzip2ed diff block
- ?? ?? Bzip2ed extra block */
- memcpy(header,"BSDIFF40",8);
- offtout(0, header + 8);
- offtout(0, header + 16);
- offtout(newsize, header + 24);
- if (fwrite(header, 32, 1, pf) != 1)
- err(1, "fwrite(%s)", argv[3]);
-
- /* Compute the differences, writing ctrl as we go */
- if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL)
- errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err);
- scan=0;len=0;
- lastscan=0;lastpos=0;lastoffset=0;
- while(scan 64 * 1024) break;
-
- for(;scscoldscore+8)) break;
-
- if((scan+lastoffsetSf*2-lenf) { Sf=s; lenf=i; };
- };
-
- lenb=0;
- if(scan=lastscan+i)&&(pos>=i);i++) {
- if(old[pos-i]==new[scan-i]) s++;
- if(s*2-i>Sb*2-lenb) { Sb=s; lenb=i; };
- };
- };
-
- if(lastscan+lenf>scan-lenb) {
- overlap=(lastscan+lenf)-(scan-lenb);
- s=0;Ss=0;lens=0;
- for(i=0;iSs) { Ss=s; lens=i+1; };
- };
-
- lenf+=lens-overlap;
- lenb-=lens;
- };
-
- for(i=0;i
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-static off_t offtin(u_char *buf)
-{
- off_t y;
-
- y=buf[7]&0x7F;
- y=y*256;y+=buf[6];
- y=y*256;y+=buf[5];
- y=y*256;y+=buf[4];
- y=y*256;y+=buf[3];
- y=y*256;y+=buf[2];
- y=y*256;y+=buf[1];
- y=y*256;y+=buf[0];
-
- if(buf[7]&0x80) y=-y;
-
- return y;
-}
-
-
-void writeFull(const char * name, int fd,
- const unsigned char * buf, size_t count)
-{
- while (count) {
- ssize_t res = write(fd, (char *) buf, count);
- if (res == -1) {
- if (errno == EINTR) continue;
- err(1,"writing to %s",name);
- }
- count -= res;
- buf += res;
- }
-}
-
-
-int main(int argc,char * argv[])
-{
- FILE * f, * cpf, * dpf, * epf;
- BZFILE * cpfbz2, * dpfbz2, * epfbz2;
- int cbz2err, dbz2err, ebz2err;
- int fd;
- ssize_t oldsize,newsize;
- ssize_t bzctrllen,bzdatalen;
- u_char header[32],buf[8];
- u_char *old, *new;
- off_t oldpos,newpos;
- off_t ctrl[3];
- off_t lenread;
- off_t i;
-
- if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]);
-
- /* Open patch file */
- if ((f = fopen(argv[3], "r")) == NULL)
- err(1, "fopen(%s)", argv[3]);
-
- /*
- File format:
- 0 8 "BSDIFF40"
- 8 8 X
- 16 8 Y
- 24 8 sizeof(newfile)
- 32 X bzip2(control block)
- 32+X Y bzip2(diff block)
- 32+X+Y ??? bzip2(extra block)
- with control block a set of triples (x,y,z) meaning "add x bytes
- from oldfile to x bytes from the diff block; copy y bytes from the
- extra block; seek forwards in oldfile by z bytes".
- */
-
- /* Read header */
- if (fread(header, 1, 32, f) < 32) {
- if (feof(f))
- errx(1, "Corrupt patch\n");
- err(1, "fread(%s)", argv[3]);
- }
-
- /* Check for appropriate magic */
- if (memcmp(header, "BSDIFF40", 8) != 0)
- errx(1, "Corrupt patch\n");
-
- /* Read lengths from header */
- bzctrllen=offtin(header+8);
- bzdatalen=offtin(header+16);
- newsize=offtin(header+24);
- if((bzctrllen<0) || (bzdatalen<0) || (newsize<0))
- errx(1,"Corrupt patch\n");
-
- /* Close patch file and re-open it via libbzip2 at the right places */
- if (fclose(f))
- err(1, "fclose(%s)", argv[3]);
- if ((cpf = fopen(argv[3], "r")) == NULL)
- err(1, "fopen(%s)", argv[3]);
- if (fseeko(cpf, 32, SEEK_SET))
- err(1, "fseeko(%s, %lld)", argv[3],
- (long long)32);
- if ((cpfbz2 = BZ2_bzReadOpen(&cbz2err, cpf, 0, 0, NULL, 0)) == NULL)
- errx(1, "BZ2_bzReadOpen, bz2err = %d", cbz2err);
- if ((dpf = fopen(argv[3], "r")) == NULL)
- err(1, "fopen(%s)", argv[3]);
- if (fseeko(dpf, 32 + bzctrllen, SEEK_SET))
- err(1, "fseeko(%s, %lld)", argv[3],
- (long long)(32 + bzctrllen));
- if ((dpfbz2 = BZ2_bzReadOpen(&dbz2err, dpf, 0, 0, NULL, 0)) == NULL)
- errx(1, "BZ2_bzReadOpen, bz2err = %d", dbz2err);
- if ((epf = fopen(argv[3], "r")) == NULL)
- err(1, "fopen(%s)", argv[3]);
- if (fseeko(epf, 32 + bzctrllen + bzdatalen, SEEK_SET))
- err(1, "fseeko(%s, %lld)", argv[3],
- (long long)(32 + bzctrllen + bzdatalen));
- if ((epfbz2 = BZ2_bzReadOpen(&ebz2err, epf, 0, 0, NULL, 0)) == NULL)
- errx(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err);
-
- if(((fd=open(argv[1],O_RDONLY,0))<0) ||
- ((oldsize=lseek(fd,0,SEEK_END))==-1) ||
- ((old=malloc(oldsize+1))==NULL) ||
- (lseek(fd,0,SEEK_SET)!=0) ||
- (read(fd,old,oldsize)!=oldsize) ||
- (close(fd)==-1)) err(1,"%s",argv[1]);
- if((new=malloc(newsize+1))==NULL) err(1,NULL);
-
- oldpos=0;newpos=0;
- while(newposnewsize)
- errx(1,"Corrupt patch\n");
-
- /* Read diff string */
- lenread = BZ2_bzRead(&dbz2err, dpfbz2, new + newpos, ctrl[0]);
- if ((lenread < ctrl[0]) ||
- ((dbz2err != BZ_OK) && (dbz2err != BZ_STREAM_END)))
- errx(1, "Corrupt patch\n");
-
- /* Add old data to diff string */
- for(i=0;i=0) && (oldpos+inewsize)
- errx(1,"Corrupt patch\n");
-
- /* Read extra string */
- lenread = BZ2_bzRead(&ebz2err, epfbz2, new + newpos, ctrl[1]);
- if ((lenread < ctrl[1]) ||
- ((ebz2err != BZ_OK) && (ebz2err != BZ_STREAM_END)))
- errx(1, "Corrupt patch\n");
-
- /* Adjust pointers */
- newpos+=ctrl[1];
- oldpos+=ctrl[2];
- };
-
- /* Clean up the bzip2 reads */
- BZ2_bzReadClose(&cbz2err, cpfbz2);
- BZ2_bzReadClose(&dbz2err, dpfbz2);
- BZ2_bzReadClose(&ebz2err, epfbz2);
- if (fclose(cpf) || fclose(dpf) || fclose(epf))
- err(1, "fclose(%s)", argv[3]);
-
- /* Write the new file */
- if((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0)
- err(1,"%s",argv[2]);
- writeFull(argv[2], fd, new, newsize);
- if(close(fd)==-1)
- err(1,"%s",argv[2]);
-
- free(new);
- free(old);
-
- return 0;
-}
diff --git a/src/bsdiff-4.3/compat-include/err.h b/src/bsdiff-4.3/compat-include/err.h
deleted file mode 100644
index a851ded6..00000000
--- a/src/bsdiff-4.3/compat-include/err.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Simulate BSD's functionality. */
-
-#ifndef COMPAT_ERR_H_INCLUDED
-#define COMPAT_ERR_H_INCLUDED 1
-
-#include
-#include
-
-#define err(rc,...) do { fprintf(stderr,__VA_ARGS__); exit(rc); } while(0)
-#define errx(rc,...) do { fprintf(stderr,__VA_ARGS__); exit(rc); } while(0)
-
-#endif
diff --git a/src/bsdiff-4.3/local.mk b/src/bsdiff-4.3/local.mk
deleted file mode 100644
index c957ceab..00000000
--- a/src/bsdiff-4.3/local.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-programs += bsdiff bspatch
-
-bsdiff_DIR := $(d)
-bsdiff_SOURCES := $(d)/bsdiff.c
-bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include)
-bsdiff_INSTALL_DIR = $(libexecdir)/nix
-
-bspatch_DIR := $(d)
-bspatch_SOURCES := $(d)/bspatch.c
-bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include)
-bspatch_INSTALL_DIR = $(libexecdir)/nix
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index e55144a0..b6078253 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -194,7 +194,6 @@ void Settings::update()
if (getEnv("NIX_OTHER_STORES") != "")
substituters.push_back(nixLibexecDir + "/nix/substituters/copy-from-other-stores.pl");
#endif
- substituters.push_back(nixLibexecDir + "/nix/substituters/download-using-manifests.pl");
substituters.push_back(nixLibexecDir + "/nix/substituters/download-from-binary-cache.pl");
if (useSshSubstituter && !sshSubstituterHosts.empty())
substituters.push_back(nixLibexecDir + "/nix/substituters/download-via-ssh");
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh
index c72d2def..5f88c595 100644
--- a/tests/binary-cache.sh
+++ b/tests/binary-cache.sh
@@ -1,7 +1,6 @@
source common.sh
clearStore
-clearManifests
clearCache
# Create the binary cache.
diff --git a/tests/binary-patching.nix b/tests/binary-patching.nix
deleted file mode 100644
index 8ed474d1..00000000
--- a/tests/binary-patching.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ version }:
-
-with import ./config.nix;
-
-mkDerivation {
- name = "foo-${toString version}";
- builder = builtins.toFile "builder.sh"
- ''
- mkdir $out
- (for ((n = 1; n < 100000; n++)); do echo $n; done) > $out/foo
- ${if version != 1 then ''
- (for ((n = 100000; n < 110000; n++)); do echo $n; done) >> $out/foo
- '' else ""}
- ${if version == 3 then ''
- echo foobar >> $out/foo
- '' else ""}
- '';
-}
diff --git a/tests/binary-patching.sh b/tests/binary-patching.sh
deleted file mode 100644
index 188be109..00000000
--- a/tests/binary-patching.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-source common.sh
-
-clearManifests
-
-mkdir -p $TEST_ROOT/cache2 $TEST_ROOT/patches
-
-RESULT=$TEST_ROOT/result
-
-# Build version 1 and 2 of the "foo" package.
-nix-push --dest $TEST_ROOT/cache2 --manifest --bzip2 \
- $(nix-build -o $RESULT binary-patching.nix --arg version 1)
-mv $TEST_ROOT/cache2/MANIFEST $TEST_ROOT/manifest1
-
-out2=$(nix-build -o $RESULT binary-patching.nix --arg version 2)
-nix-push --dest $TEST_ROOT/cache2 --manifest --bzip2 $out2
-mv $TEST_ROOT/cache2/MANIFEST $TEST_ROOT/manifest2
-
-out3=$(nix-build -o $RESULT binary-patching.nix --arg version 3)
-nix-push --dest $TEST_ROOT/cache2 --manifest --bzip2 $out3
-mv $TEST_ROOT/cache2/MANIFEST $TEST_ROOT/manifest3
-
-rm $RESULT
-
-# Generate binary patches.
-nix-generate-patches $TEST_ROOT/cache2 $TEST_ROOT/patches \
- file://$TEST_ROOT/patches $TEST_ROOT/manifest1 $TEST_ROOT/manifest2
-
-nix-generate-patches $TEST_ROOT/cache2 $TEST_ROOT/patches \
- file://$TEST_ROOT/patches $TEST_ROOT/manifest2 $TEST_ROOT/manifest3
-
-grep -q "patch {" $TEST_ROOT/manifest3
-
-# Get rid of versions 2 and 3.
-nix-store --delete $out2 $out3
-
-# Pull the manifest containing the patches.
-clearManifests
-nix-pull file://$TEST_ROOT/manifest3
-
-# Make sure that the download size prediction uses the patches rather
-# than the full download.
-nix-build -o $RESULT binary-patching.nix --arg version 3 --dry-run 2>&1 | grep -q "0.01 MiB"
-
-# Now rebuild it. This should use the two patches generated above.
-rm -f $TEST_ROOT/var/log/nix/downloads
-nix-build -o $RESULT binary-patching.nix --arg version 3
-rm $RESULT
-[ "$(grep ' patch ' $TEST_ROOT/var/log/nix/downloads | wc -l)" -eq 2 ]
-
-# Add a patch from version 1 directly to version 3.
-nix-generate-patches $TEST_ROOT/cache2 $TEST_ROOT/patches \
- file://$TEST_ROOT/patches $TEST_ROOT/manifest1 $TEST_ROOT/manifest3
-
-# Rebuild version 3. This should use the direct patch rather than the
-# sequence of two patches.
-nix-store --delete $out2 $out3
-clearManifests
-rm $TEST_ROOT/var/log/nix/downloads
-nix-pull file://$TEST_ROOT/manifest3
-nix-build -o $RESULT binary-patching.nix --arg version 3
-[ "$(grep ' patch ' $TEST_ROOT/var/log/nix/downloads | wc -l)" -eq 1 ]
diff --git a/tests/common.sh.in b/tests/common.sh.in
index 50d2c77b..9e8962f1 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -54,10 +54,6 @@ clearStore() {
rm -f "$NIX_STATE_DIR"/gcroots/ref
}
-clearManifests() {
- rm -f $NIX_STATE_DIR/manifests/*
-}
-
clearCache() {
rm -rf "$cacheDir"
}
diff --git a/tests/install-package.sh b/tests/install-package.sh
index 653dfee4..1916f727 100644
--- a/tests/install-package.sh
+++ b/tests/install-package.sh
@@ -1,15 +1,14 @@
source common.sh
-# Note: this test expects to be run *after* nix-push.sh.
-
drvPath=$(nix-instantiate ./dependencies.nix)
-outPath=$(nix-store -q $drvPath)
+outPath=$(nix-store -r $drvPath)
+nix-push --dest $cacheDir $outPath
clearStore
clearProfiles
cat > $TEST_ROOT/foo.nixpkg <