Re: [PATCH] Hotfix (repeat)

[Ludovic Courtès]

Deck Pickard <address@hidden> skribis:

> Because google sucks, this time attaching the patches...

Indeed, this is much better than the mangled HTML version.  :-)

> From 5ad37d9ab4febcbec8bbae8f7c14d7a49683c771 Mon Sep 17 00:00:00 2001
> From: nebuli <address@hidden>
> Date: Sat, 22 Nov 2014 19:16:51 +0100
> Subject: [PATCH 1/4] store: default to serial "scheduler"
> Status: RO
> Content-Length: 1172
> Lines: 28
>
> * guix/store.scm (set-build-options): exchange default argument values

Applied.

> From 8e297904d80b39cd510ba0cced37acdb9b1aeb89 Mon Sep 17 00:00:00 2001
> From: nebuli <address@hidden>
> Date: Sat, 22 Nov 2014 19:58:24 +0100
> Subject: [PATCH 2/4] guix build: Add --max-jobs option (without handling
>  code).
>
> * doc/guix.texi: Mention in the docs.
> * guix/scripts/build.scm: Extend (show-build-options-help) and
>   (%standard-build-options) functions.

Applied; I adjusted guix.texi to use a description similar to that in
“Invoking guix-daemon”.

> From 49d5d2c5e60e10566b8e87ea7956e8775b1325bc Mon Sep 17 00:00:00 2001
> From: nebuli <address@hidden>
> Date: Sat, 22 Nov 2014 20:13:07 +0100
> Subject: [PATCH 3/4] guix: Add schedule module.
>
> * guix/schedule.scm: New file. To handle --cores and --max-jobs
>   options in 'guix build'.
> * Makefile.am (MODULES): Add *this.

[...]

> +(define-module (guix schedule)

[...]

> From d22504209d43080d04d798c960bd29f3d4891bd4 Mon Sep 17 00:00:00 2001
> From: nebuli <address@hidden>
> Date: Sat, 22 Nov 2014 20:25:11 +0100
> Subject: [PATCH 4/4] guix build: Try to handle --cores and --max-jobs in a

[...]

> +  (let ((sched (make-schedule-sane #:max-cores (assoc-ref opts 'cores)
> +                                   #:max-jobs  (assoc-ref opts 'max-jobs))))
> +    (set-build-options store
> +                       #:keep-failed? (assoc-ref opts 'keep-failed?)
> +                       #:build-cores (schedule-max-cores sched)
> +                       #:max-build-jobs (schedule-max-jobs sched)

I’m not sure what the goal is.  Should use be prevented from frying
their laptop even when that’s what they ask for?  I don’t think so.  :-)
WDYT?

Thank you!

Ludo’.

PS: I left “nebuli <address@hidden>” as the author of the commits under the
    assumption that you preferred not to use your real name.  If I
    that’s not the case, make sure to configure Git to use the name you
    want to see there.