* Guix on a Dell XPS 13 DE - 9350
@ 2016-06-16 22:12 Jan Nieuwenhuizen
2016-06-16 23:31 ` Leo Famulari
0 siblings, 1 reply; 7+ messages in thread
From: Jan Nieuwenhuizen @ 2016-06-16 22:12 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 659 bytes --]
Hi,
There were some hurdles I had to get over so sharing my experiences
here.
The XPS ships with Ubuntu 14.04, but uses UEFI boot and GPT disk.
In the bios I selected "legacy" boot and used gdisk (from gptfdisk,
see patch below) to change it to MBR.
The SSD uses the NVMe protocol, which means I needed to include that
module in the initial ramdisk (patch below). Grub 2.0 cannot handle
NVMe devices and needs a patch from 2014. I decided to use
grub-2.02~beta3 (patch below...using a custom url because guix does
not like the ~).
I expect we want to include probably patches #1 and #2, we may want
to cherry pick the patch...not sure.
Greetings,
Jan
[-- Attachment #2: 0001-gnu-Add-gptfdisk.patch --]
[-- Type: text/x-patch, Size: 3122 bytes --]
From aefd6bc706de3019d7dbfe2760ae0074abefb40a 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/3] gnu: Add gptfdisk.
* gnu/packages/disk.scm (gptfdisk): New variable.
---
gnu/packages/disk.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index c60eacb..fec3681 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,9 +26,12 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
#:use-module (gnu packages gettext)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages popt)
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (gnu packages guile)
@@ -97,6 +101,48 @@ fdisk. fdisk is used for the creation and manipulation of disk partition
tables, and it understands a variety of different formats.")
(license gpl3+)))
+(define-public gptfdisk
+ (package
+ (name "gptfdisk")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/gptfdisk/" version "/"
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1izazbyv5n2d81qdym77i8mg9m870hiydmq4d0s51npx5vp8lk46"))
+ ;; (patches
+ ;; (search-patches "gdisk.patch"))
+ ))
+ (build-system gnu-build-system)
+ (inputs
+ `(("gettext" ,gnu-gettext)
+ ("ncurses" ,ncurses)
+ ("popt" ,popt)
+ ("util-linux" ,util-linux)))
+ (arguments
+ `(#:tests? #f ; no "check" target
+ #:phases
+ (modify-phases %standard-phases
+ ;; no configure script
+ (delete 'configure)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+ (install-file "gdisk" bin)
+ (install-file "sgdisk" bin)
+ (install-file "cgdisk" bin)
+ (install-file "fixparts" bin)))))))
+ (home-page "http://www.rodsbooks.com/gdisk/")
+ (synopsis "Low-level GPT disk partitioning and formatting")
+ (description "GPT fdisk (aka gdisk) is a text-mode partitioning tool that
+works on Globally Unique Identifier (GUID) Partition Table (GPT) disks, rather
+than on the more common (through 2009) Master Boot Record (MBR) partition
+tables.")
+ (license gpl2)))
+
(define-public ddrescue
(package
(name "ddrescue")
--
2.8.4
[-- Attachment #3: 0002-gnu-linux-initrd-Support-NVMe-devices.patch --]
[-- Type: text/x-patch, Size: 1478 bytes --]
From b021b01fcb69d52c16f8eabb61cef8a5db592526 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/3] gnu: linux-initrd: Support NVMe devices.
* gnu/system/linux-initrd.scm (base-initrd): Add nvme to linux-modules.
---
gnu/system/linux-initrd.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 484bce7..5260898 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -183,6 +184,7 @@ loaded at boot time in the order in which they appear."
"usb-storage" "uas" ;for the installation image etc.
"usbhid" "hid-generic" "hid-apple" ;keyboards during early boot
"dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions
+ "nvme" ; for new ssd NVMe devices
,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system))
'("pata_acpi" "pata_atiixp" ;for ATA controllers
"isci") ;for SAS controllers like Intel C602
--
2.8.4
[-- Attachment #4: 0003-gnu-Update-grub-to-2.02-beta3.patch --]
[-- Type: text/x-patch, Size: 2080 bytes --]
From e31dbeff2cb619d9d2589436f5bd71eeb0711431 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 16 Jun 2016 09:50:27 +0200
Subject: [PATCH 3/3] 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 | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 31b270c..b7bef89 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,21 @@
(define-public grub
(package
(name "grub")
- (version "2.00")
+ ;;(version "2.02~beta3")
+ (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-"
+ "http://janneke.lilypond.org/download/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
[-- Attachment #5: Type: text/plain, Size: 156 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: Guix on a Dell XPS 13 DE - 9350
2016-06-16 22:12 Guix on a Dell XPS 13 DE - 9350 Jan Nieuwenhuizen
@ 2016-06-16 23:31 ` Leo Famulari
2016-06-17 11:58 ` Jan Nieuwenhuizen
0 siblings, 1 reply; 7+ messages in thread
From: Leo Famulari @ 2016-06-16 23:31 UTC (permalink / raw)
To: Jan Nieuwenhuizen; +Cc: guix-devel
On Fri, Jun 17, 2016 at 12:12:58AM +0200, Jan Nieuwenhuizen wrote:
> Hi,
>
> There were some hurdles I had to get over so sharing my experiences
> here.
>
> The XPS ships with Ubuntu 14.04, but uses UEFI boot and GPT disk.
> In the bios I selected "legacy" boot and used gdisk (from gptfdisk,
> see patch below) to change it to MBR.
>
> The SSD uses the NVMe protocol, which means I needed to include that
> module in the initial ramdisk (patch below). Grub 2.0 cannot handle
> NVMe devices and needs a patch from 2014. I decided to use
> grub-2.02~beta3 (patch below...using a custom url because guix does
> not like the ~).
>
> I expect we want to include probably patches #1 and #2, we may want
> to cherry pick the patch...not sure.
>
> Greetings,
> Jan
>
> +(define-public gptfdisk
[...]
> + ;; (patches
> + ;; (search-patches "gdisk.patch"))
Leftover?
> + ("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.
> + (replace 'install
Can you leave a comment saying "No 'install' target", if that's
accurate? Or explain why we replace the install phase.
> * 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 :)
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: Guix on a Dell XPS 13 DE - 9350
2016-06-16 23:31 ` Leo Famulari
@ 2016-06-17 11:58 ` Jan Nieuwenhuizen
2016-06-29 14:07 ` Ludovic Courtès
0 siblings, 1 reply; 7+ messages in thread
From: Jan Nieuwenhuizen @ 2016-06-17 11:58 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]
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
[-- Attachment #2: 0001-gnu-Add-gptfdisk.patch --]
[-- Type: text/x-patch, Size: 3047 bytes --]
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.
---
gnu/packages/disk.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index c60eacb..5ddbd75 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,9 +26,12 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
#:use-module (gnu packages gettext)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages popt)
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (gnu packages guile)
@@ -97,6 +101,45 @@ fdisk. fdisk is used for the creation and manipulation of disk partition
tables, and it understands a variety of different formats.")
(license gpl3+)))
+(define-public gptfdisk
+ (package
+ (name "gptfdisk")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/gptfdisk/" version "/"
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1izazbyv5n2d81qdym77i8mg9m870hiydmq4d0s51npx5vp8lk46"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("gettext" ,gnu-gettext)
+ ("ncurses" ,ncurses)
+ ("popt" ,popt)
+ ("util-linux" ,util-linux))) ; libuuid
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; no configure script
+ (delete 'configure)
+ ;; no install target
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+ (install-file "gdisk" bin)
+ (install-file "sgdisk" bin)
+ (install-file "cgdisk" bin)
+ (install-file "fixparts" bin)))))))
+ (home-page "http://www.rodsbooks.com/gdisk/")
+ (synopsis "Low-level GPT disk partitioning and formatting")
+ (description "GPT fdisk (aka gdisk) is a text-mode partitioning tool that
+works on Globally Unique Identifier (GUID) Partition Table (GPT) disks, rather
+than on the more common (through 2009) Master Boot Record (MBR) partition
+tables.")
+ (license gpl2)))
+
(define-public ddrescue
(package
(name "ddrescue")
--
2.8.4
[-- Attachment #3: 0002-gnu-linux-initrd-Support-NVMe-devices.patch --]
[-- Type: text/x-patch, Size: 1478 bytes --]
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.
---
gnu/system/linux-initrd.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 484bce7..5260898 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -183,6 +184,7 @@ loaded at boot time in the order in which they appear."
"usb-storage" "uas" ;for the installation image etc.
"usbhid" "hid-generic" "hid-apple" ;keyboards during early boot
"dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions
+ "nvme" ; for new ssd NVMe devices
,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system))
'("pata_acpi" "pata_atiixp" ;for ATA controllers
"isci") ;for SAS controllers like Intel C602
--
2.8.4
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-nix-Allow-in-store-names.patch --]
[-- Type: text/x-patch, Size: 847 bytes --]
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.
---
nix/libstore/store-api.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc
index 30af5f5..a3a30cd 100644
--- a/nix/libstore/store-api.cc
+++ b/nix/libstore/store-api.cc
@@ -77,7 +77,7 @@ string storePathToName(const Path & path)
void checkStoreName(const string & name)
{
- string validChars = "+-._?=";
+ string validChars = "+-._?=~";
/* Disallow names starting with a dot for possible security
reasons (e.g., "." and ".."). */
if (string(name, 0, 1) == ".")
--
2.8.4
[-- Attachment #5: 0004-gnu-Update-grub-to-2.02-beta3.patch --]
[-- Type: text/x-patch, Size: 1979 bytes --]
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
[-- Attachment #6: Type: text/plain, Size: 156 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: Guix on a Dell XPS 13 DE - 9350
2016-06-17 11:58 ` Jan Nieuwenhuizen
@ 2016-06-29 14:07 ` Ludovic Courtès
2016-07-02 10:52 ` Jan Nieuwenhuizen
0 siblings, 1 reply; 7+ messages in thread
From: Ludovic Courtès @ 2016-06-29 14:07 UTC (permalink / raw)
To: Jan Nieuwenhuizen; +Cc: guix-devel
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’.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: Guix on a Dell XPS 13 DE - 9350
2016-06-29 14:07 ` Ludovic Courtès
@ 2016-07-02 10:52 ` Jan Nieuwenhuizen
2016-07-13 22:06 ` Ludovic Courtès
0 siblings, 1 reply; 7+ messages in thread
From: Jan Nieuwenhuizen @ 2016-07-02 10:52 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 2184 bytes --]
Ludovic Courtès writes:
> It fails to build here:
>
> starting phase `check'
> make: *** No rule to make target 'check'. Stop.
> phase `check' failed after 0.0 seconds
Here also. Weird. Added
`(#:test-target "test"
>> + (license gpl2)))
>
> Version 2 only?
Yes, double checked.
> Could you send an updated patch?
Sure, find attached.
>> * gnu/system/linux-initrd.scm (base-initrd): Add nvme to linux-modules.
>
> Applied!
Thanks!
>> 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.
Fine! :-)
>> (name "grub")
>> - (version "2.00")
>> + (version "2.02~beta3")
>
> Could you make it “2.02beta3”?
Okay...
>> (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"))
> Likewise, add a ‘file-name’ here to avoid “~”.
Ah, that's what I've been missing. Thanks!
>> (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.
Added
+ '(;; two warnings: suggest braces, signed/unsigned comparison
+ #:configure-flags '("--disable-werror")
these seem harmless...
and this one test
+ ;; fails
+ (substitute* "tests/grub_func_test.in"
+ (("set -e") "exit 77\nset -e")))))))
fails, I haven't looked into whether it's a new test or what it does or
why it may fail.
Greetings,
Jan
[-- Attachment #2: 0001-gnu-Add-gptfdisk.patch --]
[-- Type: text/x-patch, Size: 3078 bytes --]
From aa977fad90feb68ecafbfdb377734d91e4203856 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/2] gnu: Add gptfdisk.
* gnu/packages/disk.scm (gptfdisk): New variable.
---
gnu/packages/disk.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index c60eacb..d5734be 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,9 +26,12 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
#:use-module (gnu packages gettext)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages popt)
#:use-module (gnu packages python)
#:use-module (gnu packages readline)
#:use-module (gnu packages guile)
@@ -97,6 +101,46 @@ fdisk. fdisk is used for the creation and manipulation of disk partition
tables, and it understands a variety of different formats.")
(license gpl3+)))
+(define-public gptfdisk
+ (package
+ (name "gptfdisk")
+ (version "1.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/gptfdisk/" version "/"
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1izazbyv5n2d81qdym77i8mg9m870hiydmq4d0s51npx5vp8lk46"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("gettext" ,gnu-gettext)
+ ("ncurses" ,ncurses)
+ ("popt" ,popt)
+ ("util-linux" ,util-linux))) ; libuuid
+ (arguments
+ `(#:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ ;; no configure script
+ (delete 'configure)
+ ;; no install target
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+ (install-file "gdisk" bin)
+ (install-file "sgdisk" bin)
+ (install-file "cgdisk" bin)
+ (install-file "fixparts" bin)))))))
+ (home-page "http://www.rodsbooks.com/gdisk/")
+ (synopsis "Low-level GPT disk partitioning and formatting")
+ (description "GPT fdisk (aka gdisk) is a text-mode partitioning tool that
+works on Globally Unique Identifier (GUID) Partition Table (GPT) disks, rather
+than on the more common (through 2009) Master Boot Record (MBR) partition
+tables.")
+ (license gpl2)))
+
(define-public ddrescue
(package
(name "ddrescue")
--
2.8.4
[-- Attachment #3: 0002-gnu-Update-grub-to-2.02-beta3.patch --]
[-- Type: text/x-patch, Size: 2644 bytes --]
From c86003e7a0f1c48e34effe9a909ce79cd9773fdd Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 16 Jun 2016 09:50:27 +0200
Subject: [PATCH 2/2] 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 | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 31b270c..d1799d7 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,21 @@
(define-public grub
(package
(name "grub")
- (version "2.00")
+ (version "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-"
+ "2.02~beta3"
+ ".tar.xz"))
+ (file-name (string-append name "-" 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")
+ '(;; two warnings: suggest braces, signed/unsigned comparison
+ #:configure-flags '("--disable-werror")
#:phases (modify-phases %standard-phases
(add-after
'unpack 'patch-stuff
@@ -100,7 +102,9 @@
;; Make the font visible.
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
(system* "gunzip" "unifont.bdf.gz")
- #t)))))
+ ;; fails
+ (substitute* "tests/grub_func_test.in"
+ (("set -e") "exit 77\nset -e")))))))
(inputs
`(;; ("lvm2" ,lvm2)
("gettext" ,gnu-gettext)
--
2.8.4
[-- Attachment #4: Type: text/plain, Size: 156 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: Guix on a Dell XPS 13 DE - 9350
2016-07-02 10:52 ` Jan Nieuwenhuizen
@ 2016-07-13 22:06 ` Ludovic Courtès
2016-07-15 15:06 ` Ludovic Courtès
0 siblings, 1 reply; 7+ messages in thread
From: Ludovic Courtès @ 2016-07-13 22:06 UTC (permalink / raw)
To: Jan Nieuwenhuizen; +Cc: guix-devel
Jan Nieuwenhuizen <janneke@gnu.org> skribis:
> From aa977fad90feb68ecafbfdb377734d91e4203856 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/2] gnu: Add gptfdisk.
>
> * gnu/packages/disk.scm (gptfdisk): New variable.
Pushed.
> From c86003e7a0f1c48e34effe9a909ce79cd9773fdd Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Thu, 16 Jun 2016 09:50:27 +0200
> Subject: [PATCH 2/2] 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.
Pushed also.
I tested with “make check-system TESTS=installed-os” that it yields a
bootable system. I’ll check on the bare metal soonish.
> + ;; fails
> + (substitute* "tests/grub_func_test.in"
> + (("set -e") "exit 77\nset -e")))))))
I’ve reported this issue at
<https://lists.gnu.org/archive/html/grub-devel/2016-07/msg00026.html>.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: Guix on a Dell XPS 13 DE - 9350
2016-07-13 22:06 ` Ludovic Courtès
@ 2016-07-15 15:06 ` Ludovic Courtès
0 siblings, 0 replies; 7+ messages in thread
From: Ludovic Courtès @ 2016-07-15 15:06 UTC (permalink / raw)
To: Jan Nieuwenhuizen; +Cc: guix-devel
ludo@gnu.org (Ludovic Courtès) skribis:
> Jan Nieuwenhuizen <janneke@gnu.org> skribis:
[...]
>> From c86003e7a0f1c48e34effe9a909ce79cd9773fdd Mon Sep 17 00:00:00 2001
>> From: Jan Nieuwenhuizen <janneke@gnu.org>
>> Date: Thu, 16 Jun 2016 09:50:27 +0200
>> Subject: [PATCH 2/2] 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.
>
> Pushed also.
>
> I tested with “make check-system TESTS=installed-os” that it yields a
> bootable system. I’ll check on the bare metal soonish.
I can now confirm that it works fine on the bare metal too. :-)
Ludo’.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-07-15 15:06 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-16 22:12 Guix on a Dell XPS 13 DE - 9350 Jan Nieuwenhuizen
2016-06-16 23:31 ` Leo Famulari
2016-06-17 11:58 ` Jan Nieuwenhuizen
2016-06-29 14:07 ` Ludovic Courtès
2016-07-02 10:52 ` Jan Nieuwenhuizen
2016-07-13 22:06 ` Ludovic Courtès
2016-07-15 15:06 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).