[bug#65755] [PATCH 0/3] Mark some packages as not supported on the hurd.

[bug#65755] [PATCH 0/3] Mark some packages as not supported on the hurd.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

Mark some packages as not supported on the hurd.

Christopher Baines (3):
  gnu: musl-cross: Remove i586-gnu from supported-systems.
  gnu: linux-libre-headers: Remove i586-gnu from supported-systems.
  gnu: skalibs: Remove i586-gnu from %supported-systems.

 gnu/packages/heads.scm   | 1 +
 gnu/packages/linux.scm   | 1 +
 gnu/packages/skarnet.scm | 1 +
 3 files changed, 3 insertions(+)


base-commit: e7b6cd86ef856b52817428227f9c3d3297312262
-- 
2.41.0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#65755] [PATCH 1/3] gnu: musl-cross: Remove i586-gnu from supported-systems.

[Christopher Baines]

As I don't think musl supports the Hurd.

* gnu/packages/heads.scm (musl-cross)[supported-systems]: Remove i586-gnu.
---
 gnu/packages/heads.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm
index 212849f2a9..268d4d0198 100644
--- a/gnu/packages/heads.scm
+++ b/gnu/packages/heads.scm
@@ -158,6 +158,7 @@ (define-public musl-cross
            (uri "http://www.musl-libc.org/releases/musl-1.1.24.tar.gz")
            (sha256
             (base32 "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"))))))
+    (supported-systems (delete "i586-gnu" %supported-systems))
     (home-page "https://github.com/osresearch/heads")
     (synopsis "Musl-cross gcc 5 toolchain")
     (description "Musl-cross toolchain: binutils, gcc 5 and musl.")

base-commit: e7b6cd86ef856b52817428227f9c3d3297312262
-- 
2.41.0

[bug#65755] [PATCH 2/3] gnu: linux-libre-headers: Remove i586-gnu from supported-systems.

[Christopher Baines]

As I don't think attempting to build for the Hurd is useful.

* gnu/packages/heads.scm (make-linux-libre-headers*): Remove i586-gnu from
supported-systems.
---
 gnu/packages/linux.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9142f6edf1..9e28eb44ad 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -737,6 +737,7 @@ (define (make-linux-libre-headers* version gnu-revision source)
                    (format p "~a-default~%" ,version)))))))
        #:allowed-references ()
        #:tests? #f))
+    (supported-systems (delete "i586-gnu" %supported-systems))
     (home-page "https://www.gnu.org/software/linux-libre/")
     (synopsis "GNU Linux-Libre kernel headers")
     (description "Headers of the Linux-Libre kernel.")
-- 
2.41.0

[bug#65755] [PATCH 3/3] gnu: skalibs: Remove i586-gnu from %supported-systems.

[Christopher Baines]

* gnu/packages/skarnet.scm (skalibs)[supported-systems]: Remove i586-gnu.
---
 gnu/packages/skarnet.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm
index 2c7b0f9c23..6781e2eb58 100644
--- a/gnu/packages/skarnet.scm
+++ b/gnu/packages/skarnet.scm
@@ -49,6 +49,7 @@ (define-public skalibs
                       (substitute* "Makefile"
                         (("\\$\\(wildcard src/lib\\*/\\*.c\\)")
                          "$(sort $(wildcard src/lib*/*.c))")))))))
+    (supported-systems (delete "i586-gnu" %supported-systems))
     (home-page "https://skarnet.org/software/skalibs/")
     (synopsis "Platform abstraction libraries for skarnet.org software")
     (description
-- 
2.41.0

[bug#65755] [PATCH 0/3] Mark some packages as not supported on the hurd.

[Ludovic Courtès]

Hi,

Christopher Baines <mail@cbaines.net> skribis:

>   gnu: musl-cross: Remove i586-gnu from supported-systems.
>   gnu: linux-libre-headers: Remove i586-gnu from supported-systems.
>   gnu: skalibs: Remove i586-gnu from %supported-systems.

LGTM!

Ludo’.

bug#65755: [PATCH 0/3] Mark some packages as not supported on the hurd.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]


Ludovic Courtès <ludo@gnu.org> writes:

> Hi,
>
> Christopher Baines <mail@cbaines.net> skribis:
>
>>   gnu: musl-cross: Remove i586-gnu from supported-systems.
>>   gnu: linux-libre-headers: Remove i586-gnu from supported-systems.
>>   gnu: skalibs: Remove i586-gnu from %supported-systems.
>
> LGTM!

Great, I've pushed this to master as
53f510dad6cc1b55b4abdbbfd55e507a9463a80f.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#65755] This broke make check on master

[Janneke Nieuwenhuizen]

Hi,

Marius found that building the updated "guix" package on the
just-rebased hurd-team branch failed.

It turns out that the packages.scm test on master fails notably:
package-transitive-supported-systems, implicit inputs

--8<---------------cut here---------------start------------->8---
test-name: package-transitive-supported-systems, implicit inputs
location: /home/janneke/src/guix/master/tests/packages.scm:496
source:
+ (test-equal
+   "package-transitive-supported-systems, implicit inputs"
+   %supported-systems
+   (let ((p (dummy-package
+              "foo"
+              (build-system gnu-build-system)
+              (supported-systems
+                `("does-not-exist" "foobar" ,@%supported-systems)))))
+     (parameterize
+       ((%current-system "armhf-linux"))
+       (package-transitive-supported-systems p))))
expected-value: ("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" "i686-linux" "armhf-linux" "i586-gnu" "powerpc-linux")
actual-value: ("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" "i686-linux" "armhf-linux" "powerpc-linux")
result: FAIL
--8<---------------cut here---------------end--------------->8---

The culprit is this commit

    0e08ad7f19d5b29a4883468552b5d213a7bdb66e
    gnu: linux-libre-headers: Remove i586-gnu from supported-systems.

Greetings,
Janneke

-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

[bug#65755] This broke make check on master

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 2263 bytes --]


Janneke Nieuwenhuizen <janneke@gnu.org> writes:

> Marius found that building the updated "guix" package on the
> just-rebased hurd-team branch failed.
>
> It turns out that the packages.scm test on master fails notably:
> package-transitive-supported-systems, implicit inputs
>
> test-name: package-transitive-supported-systems, implicit inputs
> location: /home/janneke/src/guix/master/tests/packages.scm:496
> source:
> + (test-equal
> +   "package-transitive-supported-systems, implicit inputs"
> +   %supported-systems
> +   (let ((p (dummy-package
> +              "foo"
> +              (build-system gnu-build-system)
> +              (supported-systems
> +                `("does-not-exist" "foobar" ,@%supported-systems)))))
> +     (parameterize
> +       ((%current-system "armhf-linux"))
> +       (package-transitive-supported-systems p))))
> expected-value: ("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" "i686-linux" "armhf-linux" "i586-gnu" "powerpc-linux")
> actual-value: ("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" "i686-linux" "armhf-linux" "powerpc-linux")
> result: FAIL

I would say interesting, but I've struggled with the supported system
stuff for years. The data service does use
package-transitive-supported-systems, but in a very weird way. To check
if a package supports a system, you call
package-transitive-supported-systems with the package and system (as the
second optional argument), then check if that system is present in the
returned list.

This is to say that in my uninformed opinion, the presence of the system
which you pass to package-transitive-supported-systems in the returned
list seems to mean something, but I wouldn't be able to say anything
else about the returned value.

I don't think there's anything wrong with adjusting the expectation to
have the test pass, but to me the longer term thing to do is look at
changing the code around supported systems.

On not breaking tests when making changes though, I don't generally run
make check unless I'm changing code in guix/ but it would be nice to
start QA doing that for every patch series. We should also probably try
to avoid tests that break when making changes to packages.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#65755] [PATCH 0/3] Mark some packages as not supported on the hurd.

[Ludovic Courtès]

Christopher Baines <mail@cbaines.net> skribis:

> Janneke Nieuwenhuizen <janneke@gnu.org> writes:
>
>> Marius found that building the updated "guix" package on the
>> just-rebased hurd-team branch failed.
>>
>> It turns out that the packages.scm test on master fails notably:
>> package-transitive-supported-systems, implicit inputs
>>
>> test-name: package-transitive-supported-systems, implicit inputs
>> location: /home/janneke/src/guix/master/tests/packages.scm:496
>> source:
>> + (test-equal
>> +   "package-transitive-supported-systems, implicit inputs"
>> +   %supported-systems
>> +   (let ((p (dummy-package
>> +              "foo"
>> +              (build-system gnu-build-system)
>> +              (supported-systems
>> +                `("does-not-exist" "foobar" ,@%supported-systems)))))
>> +     (parameterize
>> +       ((%current-system "armhf-linux"))
>> +       (package-transitive-supported-systems p))))
>> expected-value: ("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" "i686-linux" "armhf-linux" "i586-gnu" "powerpc-linux")
>> actual-value: ("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux" "i686-linux" "armhf-linux" "powerpc-linux")
>> result: FAIL

[...]

> I don't think there's anything wrong with adjusting the expectation to
> have the test pass, but to me the longer term thing to do is look at
> changing the code around supported systems.

Agreed, we need to change the expected result to:

  (filter target-linux? %supported-systems)

This is expected given that ‘%current-system’ is set to *-linux.

> On not breaking tests when making changes though, I don't generally run
> make check unless I'm changing code in guix/ but it would be nice to
> start QA doing that for every patch series.

Yes!

> We should also probably try to avoid tests that break when making
> changes to packages.

We try to avoid it but there are a few cases where we test real packages
that we hope rarely change.

Thanks,
Ludo’.

[bug#65755] [PATCH 0/3] Mark some packages as not supported on the hurd.

[Janneke Nieuwenhuizen]

Ludovic Courtès writes:

Hi,

> Christopher Baines <mail@cbaines.net> skribis:
>
>> Janneke Nieuwenhuizen <janneke@gnu.org> writes:
>>
>>> Marius found that building the updated "guix" package on the
>>> just-rebased hurd-team branch failed.
[..]

>> I don't think there's anything wrong with adjusting the expectation to
>> have the test pass, but to me the longer term thing to do is look at
>> changing the code around supported systems.
>
> Agreed, we need to change the expected result to:
>
>   (filter target-linux? %supported-systems)
>
> This is expected given that ‘%current-system’ is set to *-linux.

That makes sense (and fixes it :)

Pushed to master as edca2863bcb52388fe454e14136264a4f7490273

Thanks!
Janneke

-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com