From 18dc8c6f0f76b8d128638105eebad2895f9857f0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 18 Apr 2021 09:58:31 -0400 Subject: build-aux: Relax the regexp used to match NEWS sections. A number of packages doesn't really make sense in the name of the section to be substituted. This change allows using simply '*** new packages' instead of '*** 1999 new packages', for example, and have the update-NEWS.scm script update it. * build-aux/update-NEWS.scm (write-packages-added) : Do not care about leading white space in the name of the section. --- build-aux/update-NEWS.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build-aux') diff --git a/build-aux/update-NEWS.scm b/build-aux/update-NEWS.scm index a05ecad091..e916f3f1e8 100644 --- a/build-aux/update-NEWS.scm +++ b/build-aux/update-NEWS.scm @@ -95,7 +95,7 @@ paragraph." (with-atomic-file-replacement news-file (lambda (input output) (rewrite-org-section input output - (make-regexp "^(\\*+) (.*) new packages") + (make-regexp "^(\\*+).*new packages") (lambda (match port) (let ((stars (match:substring match 1))) (format port @@ -141,7 +141,7 @@ paragraph." (with-atomic-file-replacement news-file (lambda (input output) (rewrite-org-section input output - (make-regexp "^(\\*+) (.*) package updates") + (make-regexp "^(\\*+).*package updates") (lambda (match port) (let ((stars (match:substring match 1)) (lst (map (match-lambda -- cgit v1.2.3 From c59cc2383d6620f6ebbed80ce1feecae41a64d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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 v1.2.3 From ed2d4d52dde00bdccc1bb2c93b24ffcc72a7fcd3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 May 2021 12:23:55 -0400 Subject: maint: update-NEWS: Sort packages prior writing to the data file. * build-aux/update-NEWS.scm (main): Sort packages. --- build-aux/update-NEWS.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'build-aux') diff --git a/build-aux/update-NEWS.scm b/build-aux/update-NEWS.scm index e916f3f1e8..c029d2f0da 100644 --- a/build-aux/update-NEWS.scm +++ b/build-aux/update-NEWS.scm @@ -166,16 +166,22 @@ paragraph." (string-append data-directory "/packages-" version ".txt")) + (define (packageversions))) (format (current-error-port) "Updating NEWS for ~a to ~a...~%" previous-version new-version) (let* ((old (call-with-input-file (package-file previous-version) read)) - (new (fold-packages (lambda (p r) - (alist-cons (package-name p) (package-version p) - r)) - '()))) + (all-packages/sorted (sort (fold-packages (lambda (p r) + (cons p r)) + '()) + package