diff options
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/cuirass/hurd-manifest.scm | 74 | ||||
| -rw-r--r-- | build-aux/hydra/guix-modular.scm | 30 |
2 files changed, 93 insertions, 11 deletions
diff --git a/build-aux/cuirass/hurd-manifest.scm b/build-aux/cuirass/hurd-manifest.scm new file mode 100644 index 0000000000..0be8943cd1 --- /dev/null +++ b/build-aux/cuirass/hurd-manifest.scm @@ -0,0 +1,74 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +;;; 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 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 + + ;; guix environment guix --without-tests=python-minimal --without-tests=gettext-minimal + (package-without-tests gettext-minimal) + (package-without-tests python-minimal) + + (append + guix-dependencies + (delete guile-3.0 %base-packages/hurd)))) diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm index 8e07e7cd01..060b84b8ef 100644 --- a/build-aux/hydra/guix-modular.scm +++ b/build-aux/hydra/guix-modular.scm @@ -43,17 +43,25 @@ for SYSTEM. Use VERSION as the version identifier." (define build (primitive-load (string-append source "/build-aux/build-self.scm"))) - `((derivation . ,(derivation-file-name - (run-with-store store - (build source #:version version #:system system - #:pull-version 1 - #:guile-version "2.2")))) ;the latest 2.2.x - (description . "Modular Guix") - (long-description - . "This is the modular Guix package as produced by 'guix pull'.") - (license . ,license:gpl3+) - (home-page . ,%guix-home-page-url) - (maintainers . (,%guix-bug-report-address))))) + (let ((drv (run-with-store store + (build source #:version version #:system system + #:pull-version 1 + #:guile-version "2.2")))) + `((derivation . ,(derivation-file-name drv)) ;the latest 2.2.x + (log . ,(log-file store (derivation-file-name drv))) + (outputs . ,(filter-map (lambda (res) + (match res + ((name . path) + `(,name . ,path)))) + (derivation->output-paths drv))) + (nix-name . ,(derivation-name drv)) + (system . ,(derivation-system drv)) + (description . "Modular Guix") + (long-description + . "This is the modular Guix package as produced by 'guix pull'.") + (license . ,license:gpl3+) + (home-page . ,%guix-home-page-url) + (maintainers . (,%guix-bug-report-address)))))) (define (hydra-jobs store arguments) "Return Hydra jobs." |