From c59cc2383d6620f6ebbed80ce1feecae41a64d69 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 18 Apr 2021 15:37:20 +0200 Subject: import: Remove Nix importer. This importer has suffered from bitrot and no longer works with current Nix and Nixpkgs. See and . * guix/import/snix.scm, guix/scripts/import/nix.scm, tests/snix.scm: Remove. * Makefile.am (MODULES, SCM_TESTS): Remove them. * guix/scripts/import.scm (importers): Remove "nix". * build-aux/test-env.in: Remove NIXPKGS variable. * configure.ac: Remove '--with-nixpkgs' option. * doc/guix.texi (Invoking guix import): Remove bit about "guix import nix". * etc/completion/fish/guix.fish: Likewise. --- build-aux/test-env.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'build-aux') diff --git a/build-aux/test-env.in b/build-aux/test-env.in index 59ab58cc94..7efc43206c 100644 --- a/build-aux/test-env.in +++ b/build-aux/test-env.in @@ -1,7 +1,7 @@ #!/bin/sh # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ludovic Courtès # # This file is part of GNU Guix. # @@ -91,14 +91,11 @@ then # Place for the substituter's cache. XDG_CACHE_HOME="$GUIX_STATE_DIRECTORY/cache-$$" - # For the (guix import snix) tests. - NIXPKGS="@NIXPKGS@" - export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \ GUIX_LOG_DIRECTORY GUIX_STATE_DIRECTORY GUIX_DATABASE_DIRECTORY \ GUIX_BINARY_SUBSTITUTE_URL \ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \ - GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME NIXPKGS + GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME # Launch the daemon without chroot support because is may be # unavailable, for instance if we're not running as root. -- cgit 1.4.1