[core-updates] [PATCH] distro: coreutils: Add 'acl', 'gmp', and 'perl' to 'inputs'.

[core-updates] [PATCH] distro: coreutils: Add 'acl', 'gmp', and 'perl' to 'inputs'.

[Nikita Karetnikov]

[-- Attachment #1.1: Type: text/plain, Size: 760 bytes --]

Hi,

I'm attaching the patch. It builds in 'master', but I can't test it in
'core-updates'.

(Note that some tweaking is required to apply it in 'master'.)

# ./bootstrap
# ./configure --with-nixpkgs=/home/nixpkgs-github --localstatedir=/nix/var
# make
# nix-worker --daemon &
# ./pre-inst-env guix-build -K coreutils

[...]

starting download of `/nix/store/yhgwc596bny14wh6567pwsxj7lrcypiy-binutils-2.22.tar.bz2' from `http://ftpmirror.gnu.org/binutils/binutils-2.22.tar.bz2'...
ERROR: In procedure getaddrinfo: Name or service not known

[...]

error: build failed: build of `/nix/store/14l27j4hmzlpzfbmkw298bddg73v64di-coreutils-8.20.drv' failed

# wget --spider http://ftpmirror.gnu.org/binutils/binutils-2.22.tar.bz2

[...]

Remote file exists.

Nikita


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-distro-coreutils-Add-acl-gmp-and-perl-to-inputs.patch --]
[-- Type: text/x-diff, Size: 1488 bytes --]

From bc37a36ca748aa81f5aa86bf5435e2ea22705d86 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Mon, 31 Dec 2012 04:43:30 +0000
Subject: [PATCH] distro: coreutils: Add 'acl', 'gmp', and 'perl' to 'inputs'.

* distro/packages/base.scm: Import 'acl'.
  (coreutils): Add 'acl', 'gmp', and 'perl'.
---
 distro/packages/base.scm |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/distro/packages/base.scm b/distro/packages/base.scm
index 0289b6c..070363d 100644
--- a/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@ -20,6 +20,7 @@
 (define-module (distro packages base)
   #:use-module (guix licenses)
   #:use-module (distro)
+  #:use-module (distro packages acl)
   #:use-module (distro packages bash)
   #:use-module (distro packages bootstrap)
   #:use-module (distro packages compression)
@@ -261,10 +262,9 @@ The tools supplied with this package are:
              (base32
               "1cly97xdy3v4nbbx631k43smqw0nnpn651kkprs0yyl2cj3pkjyv"))))
    (build-system gnu-build-system)
-   (inputs `())                      ; TODO: optional deps: SELinux, ACL, GMP
-   (arguments
-    '(;; Perl is missing, and some tests are failing.
-      #:tests? #f))
+   (inputs `(("acl"  ,acl)
+             ("gmp"  ,gmp)
+             ("perl" ,perl))) ; TODO: add SELinux
    (synopsis
     "The basic file, shell and text manipulation utilities of the GNU
 operating system")
-- 
1.7.5.4


[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [core-updates] [PATCH] distro: coreutils: Add 'acl', 'gmp', and 'perl' to 'inputs'.

[Ludovic Courtès]

Hi,

Nikita Karetnikov <nikita@karetnikov.org> skribis:

> From bc37a36ca748aa81f5aa86bf5435e2ea22705d86 Mon Sep 17 00:00:00 2001
> From: Nikita Karetnikov <nikita@karetnikov.org>
> Date: Mon, 31 Dec 2012 04:43:30 +0000
> Subject: [PATCH] distro: coreutils: Add 'acl', 'gmp', and 'perl' to 'inputs'.
>
> * distro/packages/base.scm: Import 'acl'.
>   (coreutils): Add 'acl', 'gmp', and 'perl'.

Thanks.  Commit 8ba8aeb does that and more, because getting the tests to
pass proved to be somewhat more demanding...

Ludo’.