Patchwork Guix on a Dell XPS 13 DE - 9350

login
register
mail settings
Submitter Jan Nieuwenhuizen
Date June 17, 2016, 11:58 a.m.
Message ID <87porg9gcm.fsf@gnu.org>
Download mbox | patch
Permalink /patch/13162/
State New
Headers show

Comments

Jan Nieuwenhuizen - June 17, 2016, 11:58 a.m.
Leo Famulari writes:

Hi!

>> +(define-public gptfdisk
>
> [...]
>
>> +      ;; (patches
>> +      ;;  (search-patches "gdisk.patch"))
>
> Leftover?

Oops ;-)

>> +       ("util-linux" ,util-linux)))
>
> What part of util-linux is used? Since it's a grab-bag of miscellaneous
> utilities, it's nice to say in a comment what part is used. Or, if it's
> just one component, to use that component as the name. For examples, see
> btrfs-progs or ntfs-3g.

That makes sense, changed to

       ("util-linux" ,util-linux))) ; libuuid

>> +         (replace 'install
>
> Can you leave a comment saying "No 'install' target", if that's
> accurate? Or explain why we replace the install phase.

Indeed, added:

         ;; no install target
         (replace 'install

>> * gnu/system/linux-initrd.scm (base-initrd): Add nvme to linux-modules.
>
> Sounds like a good addition.

:-)

>> * gnu/packages/grub.scm (grub): Change version no 2.02.beta3, use
>> custom url symlinked to 2.02~beta3.
>
> We should fix the problem that requires this workaround :)

I have added a patch --not sure if we can change such things, I searched
but did not find any subtitute* that we do on URLs--and changed Grub
back to using the original url.

Greetings,
Jan
Ludovic Courtès - June 29, 2016, 2:07 p.m.
Jan Nieuwenhuizen <janneke@gnu.org> skribis:

> From 58427605c4b981669b50d953971596ae36f70530 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Thu, 16 Jun 2016 23:58:45 +0200
> Subject: [PATCH 1/4] gnu: Add gptfdisk.
>
> * gnu/packages/disk.scm (gptfdisk): New variable.

[...]

> +(define-public gptfdisk
> +  (package
> +    (name "gptfdisk")

It fails to build here:

--8<---------------cut here---------------start------------->8---
starting phase `check'
make: *** No rule to make target 'check'.  Stop.
phase `check' failed after 0.0 seconds
--8<---------------cut here---------------end--------------->8---

> +    (license gpl2)))

Version 2 only?

Could you send an updated patch?

> From f0ae5fde7c2965b61b62f8e636421a4066b2c1c4 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Thu, 16 Jun 2016 09:50:32 +0200
> Subject: [PATCH 2/4] gnu: linux-initrd: Support NVMe devices.
>
> * gnu/system/linux-initrd.scm (base-initrd): Add nvme to linux-modules.

Applied!

> From 37ab729322b21acd325b43c97b47c8e217635cd1 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Fri, 17 Jun 2016 13:45:28 +0200
> Subject: [PATCH 3/4] nix: Allow ~ in store names.
>
> * nix/libstore/store-api.cc (checkStoreName): Add ~ to validChars.

Nack!  :-)  This looks like a can of worms, so I’d rather change the GRUB
version name.

> From 4dd99e90153bcd57b696234edf52efd2398fb7e4 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Thu, 16 Jun 2016 09:50:27 +0200
> Subject: [PATCH 4/4] gnu: Update grub to 2.02~beta3.
>
> * gnu/packages/grub.scm (grub): Change version no 2.02.beta3, use
> custom url symlinked to 2.02~beta3.

[...]

>  (define-public grub
>    (package
>      (name "grub")
> -    (version "2.00")
> +    (version "2.02~beta3")

Could you make it “2.02beta3”?

>      (source (origin
>               (method url-fetch)
> -             (uri (string-append "mirror://gnu/grub/grub-"
> -                                 version ".tar.xz"))
> +             (uri (string-append
> +                   "ftp://alpha.gnu.org/gnu/grub/grub-"
> +                   version ".tar.xz"))
>               (sha256
>                (base32
> -               "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"))
> -             (patches (search-patches "grub-gets-undeclared.patch"
> -                                      "grub-freetype.patch"
> -                                      "grub-CVE-2015-8370.patch"))))
> +               "18ddwnw0vxs7zigvah0g6a5z5vvlz0p8fjglxv1h59sjbrakvv1h"))))

Likewise, add a ‘file-name’ here to avoid “~”.

>      (arguments
>       '(#:configure-flags '("--disable-werror")
> +       #:tests? #f ;; fail

That’s cheating.  :-)

Could you explain why/how it fails?  I would rather address it or at
least make sure we have a good understanding of what’s going on.

Thanks!

Ludo’.

Patch

From 4dd99e90153bcd57b696234edf52efd2398fb7e4 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 16 Jun 2016 09:50:27 +0200
Subject: [PATCH 4/4] gnu: Update grub to 2.02~beta3.

* gnu/packages/grub.scm (grub): Change version no 2.02.beta3, use
custom url symlinked to 2.02~beta3.
---
 gnu/packages/grub.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 31b270c..f6d71f1 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -2,6 +2,7 @@ 
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -76,20 +77,19 @@ 
 (define-public grub
   (package
     (name "grub")
-    (version "2.00")
+    (version "2.02~beta3")
     (source (origin
              (method url-fetch)
-             (uri (string-append "mirror://gnu/grub/grub-"
-                                 version ".tar.xz"))
+             (uri (string-append
+                   "ftp://alpha.gnu.org/gnu/grub/grub-"
+                   version ".tar.xz"))
              (sha256
               (base32
-               "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"))
-             (patches (search-patches "grub-gets-undeclared.patch"
-                                      "grub-freetype.patch"
-                                      "grub-CVE-2015-8370.patch"))))
+               "18ddwnw0vxs7zigvah0g6a5z5vvlz0p8fjglxv1h59sjbrakvv1h"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--disable-werror")
+       #:tests? #f ;; fail
        #:phases (modify-phases %standard-phases
                   (add-after
                    'unpack 'patch-stuff
-- 
2.8.4