diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/GeneratePatches.pm.in | 1 | ||||
| -rw-r--r-- | scripts/Makefile.am | 20 | ||||
| -rw-r--r-- | scripts/NixConfig.pm.in (renamed from scripts/readconfig.pm.in) | 0 | ||||
| -rw-r--r-- | scripts/NixManifest.pm.in (renamed from scripts/readmanifest.pm.in) | 0 | ||||
| -rw-r--r-- | scripts/SSH.pm (renamed from scripts/ssh.pm) | 0 | ||||
| -rwxr-xr-x | scripts/build-remote.pl.in | 2 | ||||
| -rw-r--r-- | scripts/download-using-manifests.pl.in | 2 | ||||
| -rw-r--r-- | scripts/nix-copy-closure.in | 2 | ||||
| -rw-r--r-- | scripts/nix-generate-patches.in | 2 | ||||
| -rw-r--r-- | scripts/nix-pull.in | 2 | ||||
| -rw-r--r-- | scripts/nix-push.in | 2 |
11 files changed, 16 insertions, 17 deletions
diff --git a/scripts/GeneratePatches.pm.in b/scripts/GeneratePatches.pm.in index bb7111f8e34b..2d2653255e54 100755 --- a/scripts/GeneratePatches.pm.in +++ b/scripts/GeneratePatches.pm.in @@ -2,7 +2,6 @@ use strict; use File::Temp qw(tempdir); -use readmanifest; # Some patch generations options. diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 5f20dcfaf7a2..60bb0a9b8105 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -7,17 +7,17 @@ noinst_SCRIPTS = nix-profile.sh GeneratePatches.pm \ find-runtime-roots.pl build-remote.pl nix-reduce-build \ copy-from-other-stores.pl nix-http-export.cgi -nix-pull nix-push: readmanifest.pm readconfig.pm download-using-manifests.pl +nix-pull nix-push: NixManifest.pm NixConfig.pm download-using-manifests.pl -install-exec-local: readmanifest.pm download-using-manifests.pl copy-from-other-stores.pl find-runtime-roots.pl +install-exec-local: NixManifest.pm GeneratePatches.pm download-using-manifests.pl copy-from-other-stores.pl find-runtime-roots.pl $(INSTALL) -d $(DESTDIR)$(sysconfdir)/profile.d $(INSTALL_PROGRAM) nix-profile.sh $(DESTDIR)$(sysconfdir)/profile.d/nix.sh $(INSTALL) -d $(DESTDIR)$(libexecdir)/nix - $(INSTALL_DATA) readmanifest.pm $(DESTDIR)$(libexecdir)/nix - $(INSTALL_DATA) readconfig.pm $(DESTDIR)$(libexecdir)/nix - $(INSTALL_DATA) ssh.pm $(DESTDIR)$(libexecdir)/nix + $(INSTALL_DATA) NixManifest.pm $(DESTDIR)$(libexecdir)/nix + $(INSTALL_DATA) NixConfig.pm $(DESTDIR)$(libexecdir)/nix + $(INSTALL_DATA) SSH.pm $(DESTDIR)$(libexecdir)/nix + $(INSTALL_DATA) GeneratePatches.pm $(DESTDIR)$(libexecdir)/nix $(INSTALL_PROGRAM) find-runtime-roots.pl $(DESTDIR)$(libexecdir)/nix - $(INSTALL_PROGRAM) GeneratePatches.pm $(DESTDIR)$(libexecdir)/nix $(INSTALL_PROGRAM) build-remote.pl $(DESTDIR)$(libexecdir)/nix $(INSTALL) -d $(DESTDIR)$(libexecdir)/nix/substituters $(INSTALL_PROGRAM) download-using-manifests.pl $(DESTDIR)$(libexecdir)/nix/substituters @@ -30,13 +30,13 @@ EXTRA_DIST = nix-collect-garbage.in \ nix-pull.in nix-push.in nix-profile.sh.in \ nix-prefetch-url.in nix-install-package.in \ nix-channel.in \ - readmanifest.pm.in \ - readconfig.pm.in \ - ssh.pm \ + NixManifest.pm.in \ + NixConfig.pm.in \ + SSH.pm \ + GeneratePatches.pm.in \ nix-build.in \ download-using-manifests.pl.in \ copy-from-other-stores.pl.in \ - GeneratePatches.pm.in \ nix-copy-closure.in \ find-runtime-roots.pl.in \ build-remote.pl.in \ diff --git a/scripts/readconfig.pm.in b/scripts/NixConfig.pm.in index aeb443aeed3a..aeb443aeed3a 100644 --- a/scripts/readconfig.pm.in +++ b/scripts/NixConfig.pm.in diff --git a/scripts/readmanifest.pm.in b/scripts/NixManifest.pm.in index be0dda616922..be0dda616922 100644 --- a/scripts/readmanifest.pm.in +++ b/scripts/NixManifest.pm.in diff --git a/scripts/ssh.pm b/scripts/SSH.pm index 44a0e6f31b1c..44a0e6f31b1c 100644 --- a/scripts/ssh.pm +++ b/scripts/SSH.pm diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index f9bff9c41d72..c551f63607bc 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -3,7 +3,7 @@ use Fcntl ':flock'; use English '-no_match_vars'; use IO::Handle; -use ssh qw/sshOpts openSSHConnection/; +use SSH qw/sshOpts openSSHConnection/; no warnings('once'); diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index c50f540f3464..47ff09e609c7 100644 --- a/scripts/download-using-manifests.pl.in +++ b/scripts/download-using-manifests.pl.in @@ -1,7 +1,7 @@ #! @perl@ -w -I@libexecdir@/nix use strict; -use readmanifest; +use NixManifest; use POSIX qw(strftime); use File::Temp qw(tempdir); diff --git a/scripts/nix-copy-closure.in b/scripts/nix-copy-closure.in index a477cc01a4cf..1f1fded36669 100644 --- a/scripts/nix-copy-closure.in +++ b/scripts/nix-copy-closure.in @@ -1,6 +1,6 @@ #! @perl@ -w -I@libexecdir@/nix -use ssh; +use SSH; my $binDir = $ENV{"NIX_BIN_DIR"} || "@bindir@"; diff --git a/scripts/nix-generate-patches.in b/scripts/nix-generate-patches.in index d22098a109de..c96cc704a1e8 100644 --- a/scripts/nix-generate-patches.in +++ b/scripts/nix-generate-patches.in @@ -2,7 +2,7 @@ use strict; use File::Temp qw(tempdir); -use readmanifest; +use NixManifest; use GeneratePatches; if (scalar @ARGV != 5) { diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in index e2a0cc1fafdf..f3b533ff7a4c 100644 --- a/scripts/nix-pull.in +++ b/scripts/nix-pull.in @@ -2,7 +2,7 @@ use strict; use File::Temp qw(tempdir); -use readmanifest; +use NixManifest; my $tmpDir = tempdir("nix-pull.XXXXXX", CLEANUP => 1, TMPDIR => 1) or die "cannot create a temporary directory"; diff --git a/scripts/nix-push.in b/scripts/nix-push.in index 6760baa7e937..1d8ba86a8d0c 100644 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -2,7 +2,7 @@ use strict; use File::Temp qw(tempdir); -use readmanifest; +use NixManifest; my $hashAlgo = "sha256"; |