From 3c6b6941a2c76c26ebf0c1bfd7f901a22c19dce1 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Mon, 21 Aug 2023 10:43:43 +0200 Subject: maint: Add 'etc/hurd-manifest.scm'. * build-aux/cuirass/hurd-manifest.scm: Move to... * etc/hurd-manifest.scm: ...here. * Makefile.am (EXTRA_DIST): Update accordingly. --- Makefile.am | 6 +-- build-aux/cuirass/hurd-manifest.scm | 77 ------------------------------------- etc/hurd-manifest.scm | 77 +++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 build-aux/cuirass/hurd-manifest.scm create mode 100644 etc/hurd-manifest.scm diff --git a/Makefile.am b/Makefile.am index a976df705f..738532f839 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ # Copyright © 2017 Mathieu Othacehe # Copyright © 2017 Leo Famulari # Copyright © 2017 Ricardo Wurmus -# Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen +# Copyright © 2017, 2020, 2023 Janneke Nieuwenhuizen # Copyright © 2017 Arun Isaac # Copyright © 2018 Nikita # Copyright © 2018 Julien Lepiller @@ -698,8 +698,7 @@ EXTRA_DIST += \ build-aux/compile-all.scm \ build-aux/compile-as-derivation.scm \ build-aux/config.rpath \ - build-aux/convert-xref.scm \ - build-aux/cuirass/hurd-manifest.scm \ + build-aux/convert-xref.scm \ build-aux/generate-authors.scm \ build-aux/test-driver.scm \ build-aux/update-NEWS.scm \ @@ -709,6 +708,7 @@ EXTRA_DIST += \ etc/guix-install.sh \ etc/historical-authorizations \ etc/news.scm \ + etc/hurd-manifest.scm \ etc/kernels-manifest.scm \ etc/release-manifest.scm \ etc/source-manifest.scm \ diff --git a/build-aux/cuirass/hurd-manifest.scm b/build-aux/cuirass/hurd-manifest.scm deleted file mode 100644 index 1b1d0a53b4..0000000000 --- a/build-aux/cuirass/hurd-manifest.scm +++ /dev/null @@ -1,77 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -;;; Commentary: -;;; -;;; This file defines a manifest with a selection of packages for Cuirass to -;;; build for GNU/Hurd. -;;; -;;; Code: - -(use-modules (gnu) - (gnu system hurd) - (guix packages) - (guix utils) - (ice-9 match) - (srfi srfi-1)) - -(use-package-modules - base bootloaders commencement compression file gawk gdb gettext guile - hurd less m4 package-management python ssh version-control) - -(define (input->package input) - "Return the INPUT as package, or #f." - (match input - ((label (and (? package?) package)) - package) - ((label (and (? package?) package . output)) - (cons package output)) - (_ #f))) - -(define guix-dependencies - (filter-map input->package - (fold alist-delete (package-direct-inputs guix) - '("glibc-utf8-locales" "graphviz" "po4a")))) - -(define (package-without-tests p) - (package/inherit p - (arguments - (substitute-keyword-arguments (package-arguments p) - ((#:tests? _ #f) #f))))) - -(packages->manifest - (cons* - ;; where it all starts - hello - - ;; development utililities - diffutils file findutils gawk grep gzip less m4 openssh-sans-x tar xz - - ;; development packages - gcc-toolchain gdb-minimal git-minimal gnu-make - gettext-minimal python-minimal - - ;; ourselves! - (package-without-tests guix) - - ;; system - grub-minimal grub - - (append - guix-dependencies - %base-packages/hurd))) diff --git a/etc/hurd-manifest.scm b/etc/hurd-manifest.scm new file mode 100644 index 0000000000..1b1d0a53b4 --- /dev/null +++ b/etc/hurd-manifest.scm @@ -0,0 +1,77 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +;;; Commentary: +;;; +;;; This file defines a manifest with a selection of packages for Cuirass to +;;; build for GNU/Hurd. +;;; +;;; Code: + +(use-modules (gnu) + (gnu system hurd) + (guix packages) + (guix utils) + (ice-9 match) + (srfi srfi-1)) + +(use-package-modules + base bootloaders commencement compression file gawk gdb gettext guile + hurd less m4 package-management python ssh version-control) + +(define (input->package input) + "Return the INPUT as package, or #f." + (match input + ((label (and (? package?) package)) + package) + ((label (and (? package?) package . output)) + (cons package output)) + (_ #f))) + +(define guix-dependencies + (filter-map input->package + (fold alist-delete (package-direct-inputs guix) + '("glibc-utf8-locales" "graphviz" "po4a")))) + +(define (package-without-tests p) + (package/inherit p + (arguments + (substitute-keyword-arguments (package-arguments p) + ((#:tests? _ #f) #f))))) + +(packages->manifest + (cons* + ;; where it all starts + hello + + ;; development utililities + diffutils file findutils gawk grep gzip less m4 openssh-sans-x tar xz + + ;; development packages + gcc-toolchain gdb-minimal git-minimal gnu-make + gettext-minimal python-minimal + + ;; ourselves! + (package-without-tests guix) + + ;; system + grub-minimal grub + + (append + guix-dependencies + %base-packages/hurd))) -- cgit v1.2.3