guix: Update darwin native packages dependencies #21337

hebasto commented at 1:41 PM on March 2, 2021: member

It is a #20470 follow up.

DrahtBot added the label Scripts and tools on Mar 2, 2021

hebasto force-pushed on Mar 2, 2021

hebasto commented at 2:49 PM on March 2, 2021: member

Guix build:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | sort -z | xargs -r0 sha256sum
c39d6081b90a28eb477ecff074d803888adb163eaad914d1ac767e96f8aa713d  output/bitcoin-d8b4e3b43832-osx64.tar.gz
1040e7b19e9fd482760e23d1fda199c89f96a77f3a07dae009b355c3412d0b64  output/bitcoin-d8b4e3b43832-osx-unsigned.dmg
ea29f074ba4a6b9707ceda4b8c2c1349f048788cfb06c44e72411ac7ae3f1907  output/bitcoin-d8b4e3b43832-osx-unsigned.tar.gz
09189d3408f3b313036214822142223f2e992006d619ba48bfaec8e907ab16ed  output/src/bitcoin-d8b4e3b43832.tar.gz

practicalswift commented at 3:20 PM on March 2, 2021: contributor

cr ACK d8b4e3b43832beb4221974aecc93de96b8a0e9e4: patch looks correct

MarcoFalke added the label Needs Guix build on Mar 2, 2021

MarcoFalke requested review from dongcarl on Mar 2, 2021

in contrib/guix/libexec/build.sh:66 in d8b4e3b438 outdated

  60 | @@ -61,9 +61,10 @@ case "$HOST" in
  61 |          # When targeting darwin, some native tools built by depends require
  62 |          # native packages not incorporated in depends
  63 |          #
  64 | -        # libcap       required by native_cdrkit/wodim
  65 | -        # zlib, bzip2  required by native_cdrkit/genisoimage
  66 | -        for native_pkg in libcap zlib bzip2; do
  67 | +        # zlib         required by native_libdmg-hfsplus
  68 | +        #
  69 | +        # shellcheck disable=SC2043

fanquake commented at 2:03 AM on March 3, 2021:

The change looks correct, but can't we just remove the loop, rather than adding more shellcheck cruft to disable a warning about what is a pointless loop? You could then also make the comment above zlib specific. i.e: "When targeting darwin, a native zlib is required by libdmg-hfsplus", and just remove the listing.

hebasto commented at 6:36 AM on March 3, 2021:

My thought was if another dependency appears in the future this approach allows to just add a package name into the loop.

But your suggestion is more neat. Going to implement it.

hebasto commented at 6:54 AM on March 3, 2021:

Thanks! Updated.

fanquake commented at 7:23 AM on March 3, 2021:

My thought was if another dependency appears in the future this approach allows to just add a package name into the loop.

If we need to add more packages (I'd think unlikely at this stage), we can just re-add the loop.

fanquake commented at 2:16 AM on March 3, 2021: member

Concept ACK

guix: Update darwin native packages dependencies 7bbb409314

hebasto force-pushed on Mar 3, 2021

hebasto commented at 6:53 AM on March 3, 2021: member

Updated d8b4e3b43832beb4221974aecc93de96b8a0e9e4 -> 7bbb409314c63750a9731dedaaf6dd6ecd17d988 (pr21337.01 -> pr21337.02, diff):

addressed @fanquake's comment

hebasto commented at 7:15 AM on March 3, 2021: member

Guix build:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
ff897bb2b361a3e6e8d9a96add8010061b09bb5c0f880a7e86dd716da18d8f4a  output/bitcoin-7bbb409314c6-osx-unsigned.dmg
1b60543e7b9e5e4ea40cf4e454cea1d7570e7b814760b142a7f0f4de428e96d8  output/bitcoin-7bbb409314c6-osx-unsigned.tar.gz
c2a7960e19f06ed2f78b50e88c099956e590c4559026f2f68e92d1d7b28d5eba  output/bitcoin-7bbb409314c6-osx64.tar.gz
fb01097e36dc0b594c267bbd7ed222a24ce34f98c32be533eaaa8aab462189b1  output/src/bitcoin-7bbb409314c6.tar.gz

fanquake approved

fanquake commented at 7:25 AM on March 3, 2021: member

ACK 7bbb409314c63750a9731dedaaf6dd6ecd17d988 - thanks for noticing the leftovers. This looks ok to me. Guix builds look like they are matching:

bash-5.1# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
ff897bb2b361a3e6e8d9a96add8010061b09bb5c0f880a7e86dd716da18d8f4a  output/bitcoin-7bbb409314c6-osx-unsigned.dmg
1b60543e7b9e5e4ea40cf4e454cea1d7570e7b814760b142a7f0f4de428e96d8  output/bitcoin-7bbb409314c6-osx-unsigned.tar.gz
c2a7960e19f06ed2f78b50e88c099956e590c4559026f2f68e92d1d7b28d5eba  output/bitcoin-7bbb409314c6-osx64.tar.gz
fb01097e36dc0b594c267bbd7ed222a24ce34f98c32be533eaaa8aab462189b1  output/src/bitcoin-7bbb409314c6.tar.gz

dongcarl commented at 7:31 PM on March 3, 2021: member

Concept ACK 7bbb409314c63750a9731dedaaf6dd6ecd17d988

Lovely! ☺️ I believe we can also remove libcap from the manifest?

guix: Remove libcap from manifest c967fb7fb9

hebasto commented at 8:10 PM on March 3, 2021: member

Updated 7bbb409314c63750a9731dedaaf6dd6ecd17d988 -> c967fb7fb97a86fc434912d0fff621f9f50dfe80 (pr21337.02 -> pr21337.03, diff):

addressed @dongcarl's comment:

I believe we can also remove libcap from the manifest?

Guix build:

$ find output -type f -name *$(git rev-parse --short HEAD)*.* -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2cece5e8cc7c5e97ea9691788b02fcc2b7b5a791db12de8e0ef0655ecbfe694d  output/bitcoin-c967fb7fb97a-osx-unsigned.dmg
b3c4f71a656ac1873a12b4a080d2cbc93b7e221ea298ebdb393b397c2c36d76e  output/bitcoin-c967fb7fb97a-osx-unsigned.tar.gz
b0244e16d42f606f91de9dc455c33b01341f03733a0c48c9b2db27a98d02afb7  output/bitcoin-c967fb7fb97a-osx64.tar.gz
2f8d12a78e03f9a3d2971fb9bc8ff9794587557b02a6773992df860041e989d3  output/src/bitcoin-c967fb7fb97a.tar.gz

fanquake approved

fanquake commented at 12:55 PM on March 4, 2021: member

ACK c967fb7fb97a86fc434912d0fff621f9f50dfe80

Guix builds at c967fb7fb97a86fc434912d0fff621f9f50dfe80:

bash-5.1# find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2cece5e8cc7c5e97ea9691788b02fcc2b7b5a791db12de8e0ef0655ecbfe694d  output/bitcoin-c967fb7fb97a-osx-unsigned.dmg
b3c4f71a656ac1873a12b4a080d2cbc93b7e221ea298ebdb393b397c2c36d76e  output/bitcoin-c967fb7fb97a-osx-unsigned.tar.gz
b0244e16d42f606f91de9dc455c33b01341f03733a0c48c9b2db27a98d02afb7  output/bitcoin-c967fb7fb97a-osx64.tar.gz
2f8d12a78e03f9a3d2971fb9bc8ff9794587557b02a6773992df860041e989d3  output/src/bitcoin-c967fb7fb97a.tar.gz

laanwj commented at 2:23 PM on March 4, 2021: member

$ find output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
2cece5e8cc7c5e97ea9691788b02fcc2b7b5a791db12de8e0ef0655ecbfe694d  output/bitcoin-c967fb7fb97a-osx-unsigned.dmg
56c4885e2fd20b09f2acd455ec4c6644a5afc9e7f51803933894b3ed77ed68bc  output/bitcoin-c967fb7fb97a-osx-unsigned.tar.gz
b0244e16d42f606f91de9dc455c33b01341f03733a0c48c9b2db27a98d02afb7  output/bitcoin-c967fb7fb97a-osx64.tar.gz
2f8d12a78e03f9a3d2971fb9bc8ff9794587557b02a6773992df860041e989d3  output/src/bitcoin-c967fb7fb97a.tar.gz

It looks like my output/bitcoin-c967fb7fb97a-osx-unsigned.tar.gz is different (…d68bc instead of …6d76e). In case anyone wants to compare it can be found here. The others match.

fanquake commented at 2:27 PM on March 4, 2021: member

@laanwj that same difference is also popping up elsewhere, and iirc is related to the last Guix update. It should be fixed in the one of the next Guix PRs, but shouldn't block changes here.

laanwj commented at 2:58 PM on March 4, 2021: member

Ok, good to know, will continue to merge this then. I just hoped posting the output would be useful to resolve determinism issues.

laanwj merged this on Mar 4, 2021

laanwj closed this on Mar 4, 2021

hebasto deleted the branch on Mar 4, 2021

MarcoFalke removed the label Needs Guix build on Mar 4, 2021

sidhujag referenced this in commit 1ddff3ed74 on Mar 4, 2021

DrahtBot locked this on Aug 16, 2022