haskellPackages.apecs-physics: fix build on darwin #107395

sternenseemann · 2020-12-22T11:54:11Z

Motivation for this change

apecs-physics was broken by glibc 2.32 which removed sys/sysctl.h. Since
sysctl is only used on macOS in the offending source file, we patch it
to only include the header on macOS, fixing the build on linux.

Resolves #107358.

Testing this fix on darwin may be a good idea.

apecs-stm is broken for an unrelated reason, it seems.

Things done

sternenseemann · 2020-12-22T12:09:59Z

cc @siraben for testing

siraben · 2020-12-22T12:16:39Z

Result of nixpkgs-review pr 107395 run on x86_64-darwin 1

EDIT: seems like nixpkgs-review didn't produce any build outputs, I'll compile it manually.

siraben · 2020-12-22T12:45:18Z

Suggest removing broken label.

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f172a3d4247..8eb07a0dfbe 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -30736,7 +30736,6 @@ self: {
        description = "Simple gloss renderer for apecs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apecs-physics" = callPackage
@@ -30754,7 +30753,6 @@ self: {
        description = "2D physics for apecs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apecs-physics-gloss" = callPackage
@@ -30767,7 +30765,6 @@ self: {
        description = "Gloss rendering for apecs-physics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apecs-stm" = callPackage

sternenseemann · 2020-12-22T13:01:20Z

No, this is done automatically during the next haskellPackage update. The process is described here. To test the change, you'll have to checkout the branch, build and set NIXPKGS_ALLOW_BROKEN=1 temporarily.

siraben · 2020-12-22T13:02:48Z

I see, I wasn't aware of that! Thanks!

siraben · 2020-12-22T13:22:09Z

Build fails on darwin

Preprocessing library for apecs-physics-0.4.4..
Building library for apecs-physics-0.4.4..
[1 of 9] Compiling Apecs.Physics.Types ( src/Apecs/Physics/Types.hs, dist/build/Apecs/Physics/Types.o, dist/build/Apecs/Physics/Types.dyn_o )

src/Apecs/Physics/Types.hs:24:1: warning: [-Wunused-imports]
    The import of ‘Data.Monoid’ is redundant
      except perhaps to import instances from ‘Data.Monoid’
    To import instances alone, use: import Data.Monoid()
   |
24 | import           Data.Monoid               ((<>))
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[2 of 9] Compiling Apecs.Physics.Space ( src/Apecs/Physics/Space.hs, dist/build/Apecs/Physics/Space.o, dist/build/Apecs/Physics/Space.dyn_o )

src/Apecs/Physics/Space.hs:19:1: warning: [-Wunused-imports]
    The import of ‘liftIO’
    from module ‘Control.Monad.IO.Class’ is redundant
   |
19 | import           Control.Monad.IO.Class (liftIO, MonadIO)
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

In file included from /private/tmp/nix-build-apecs-physics-0.4.4.drv-0/ghc65731_0/ghc_13.c:2:0: error:
    

In file included from Chipmunk2D/include/chipmunk/chipmunk.h:60:0: error:
    

Chipmunk2D/include/chipmunk/chipmunk_types.h:45:12: error:
     fatal error: 'ApplicationServices/ApplicationServices.h' file not found
                    #include <ApplicationServices/ApplicationServices.h>
                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   |
45 |                 #include <ApplicationServices/ApplicationServices.h>
   |            ^
1 error generated.

<no location info>: error:
    `cc' failed in phase `C Compiler'. (Exit code: 1)
[5 of 9] Compiling Apecs.Physics.Geometry ( src/Apecs/Physics/Geometry.hs, dist/build/Apecs/Physics/Geometry.o, dist/build/Apecs/Physics/Geometry.dyn_o )
builder for '/nix/store/g9704wwzvl8iazs2wmim2r8wqb7xx3i5-apecs-physics-0.4.4.drv' failed with exit code 1
error: build of '/nix/store/g9704wwzvl8iazs2wmim2r8wqb7xx3i5-apecs-physics-0.4.4.drv', '/nix/store/knwc67mbs388ag01rdmqbjxz79ryhnfy-apecs-gloss-0.2.4.drv' failed

sternenseemann · 2020-12-22T13:44:08Z

This build failure is at least unrelated to the change, seems like it is caused by this inclusion https://github.com/slembcke/Chipmunk2D/blob/edf83e5603c5a0a104996bd816fca6d3facedd6a/include/chipmunk/chipmunk_types.h#L44-L46.

I tried adding ApplicationServices in the latest commit, can you try again?

siraben · 2020-12-22T14:14:01Z

Builds succeed.

/nix/store/c1pg6nwma239hl3frmnps5xvraqs0490-apecs-physics-gloss-0.1.0.0/lib/ghc-8.10.2/x86_64-osx-ghc-8.10.2/libHSapecs-physics-gloss-0.1.0.0-3bBGdoAytgO4tSFqGMPwDX-ghc8.10.2.dylib: fixing dylib
/nix/store/c1pg6nwma239hl3frmnps5xvraqs0490-apecs-physics-gloss-0.1.0.0/lib/ghc-8.10.2/x86_64-osx-ghc-8.10.2/libHSapecs-physics-gloss-0.1.0.0-3bBGdoAytgO4tSFqGMPwDX-ghc8.10.2.dylib: fixing dylib
strip is /nix/store/i1mccwrczhhacpk0jn58wmixqiqh1vkb-cctools-binutils-darwin-949.0.1/bin/strip
patching script interpreter paths in /nix/store/d6wx7dvw47hr6ymhg5nwfvz9pasa9kc5-apecs-physics-gloss-0.1.0.0-doc
/nix/store/7v431007lprfk4m6hxh6lalikvdmm5ha-apecs-physics-0.4.4
/nix/store/98kvmwv6as2n0svrxwxi7mwslniclzql-apecs-gloss-0.2.4
/nix/store/c1pg6nwma239hl3frmnps5xvraqs0490-apecs-physics-gloss-0.1.0.0

cdepillabout · 2020-12-22T23:46:31Z

pkgs/development/haskell-modules/configuration-common.nix

+  # Add ApplicationServices on darwin
+  # Patch can be removed if https://github.com/jonascarpay/apecs/pull/77 is resolved
+  apecs-physics =
+    let
+      sysDeps = pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices;
+    in addPkgconfigDepends (appendPatch super.apecs-physics (pkgs.fetchpatch {
+      url = "https://github.com/jonascarpay/apecs/pull/77/commits/24975a4e689fb9920168bbbcb451d8fb8a16abdb.patch";
+      sha256 = "0w7ivv9wgrkba9psbc4920y0apg5cpyz9fwwzizfgqhy0gz6ss7y";
+      stripLen = 1;
+    })) sysDeps;


Ping @jonascarpay.

Does this change look okay to you, or does it make more sense just to wait for you to release a new version of apecs-physics to Hackage?

jonascarpay · 2020-12-23T06:48:22Z

@cdepillabout Yeah, I think this is best fixed properly upstream. I'll push a new version today.

sternenseemann · 2020-12-23T09:29:16Z

To fix the darwin build, 96376c6 should be cherry-picked or merged either way though.

jonascarpay · 2020-12-23T09:55:47Z

@sternenseemann Why is that the case? The stock Chipmunk2D doesn't have that. Is there something I can do about that?

sternenseemann · 2020-12-23T10:00:13Z

@jonascarpay Judging from this comment, seems like the normal Chipmunk hasn't been really tested on macOS:

nixpkgs/pkgs/development/libraries/chipmunk/default.nix

Line 35 in 179eb03

    
           platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work

As far as I understand in apec-physics Chipmunk is vendored anyways right?

On darwin the build fails because ApplicationServices/ApplicationServices.h is missing on macOS (#107395 (comment)) which is fixed by the mentioned commit by adding that as a build dependency.

jonascarpay · 2020-12-23T10:05:28Z

Judging from this comment, seems like the normal Chipmunk hasn't been really tested on macOS

ahh I see, thanks, I overlooked that line

As far as I understand in apec-physics Chipmunk is vendored anyways right?

Yeah, just asking for my own edification.

jonascarpay · 2020-12-23T12:00:14Z

I just pushed 0.4.5 to hackage, which includes the sysctl.h guard. Thanks for letting me know.

sternenseemann · 2020-12-23T12:15:32Z

@cdepillabout is it alright to just update the pin to 0.4.5 for the next haskell-update like in 96796994bf684689bcc6997d65d91d1368c17049?

cdepillabout · 2020-12-23T12:30:59Z

@cdepillabout is it alright to just update the pin to 0.4.5 for the next haskell-update like in 9679699?

I think this should be okay, but let's confirm with @maralorn.

@maralorn, a short explanation is that apecs-physics just had a new version released which partially fixed it here in nixpkgs. I imagine this will be available next time the stackage-nightly version is bumped. @sternenseemann has directly bumped it in 9679699, and I just wanted to confirm that this won't cause any weird problems next time you and peti bump it during the weekly merge thing?

siraben · 2020-12-23T13:47:27Z

Build still succeeds on darwin

strip is /nix/store/i1mccwrczhhacpk0jn58wmixqiqh1vkb-cctools-binutils-darwin-949.0.1/bin/strip
patching script interpreter paths in /nix/store/qij59k6ccvv1liagvwwp1fb7d14vbdc3-apecs-physics-gloss-0.1.0.0-doc
/nix/store/yafv97h26d1iig2m6cqx4a96sijdxx6a-apecs-physics-0.4.4
/nix/store/lc80b4n4zlblganrplmpn1mrr17kwgv7-apecs-gloss-0.2.4
/nix/store/yhc0axljjmvwk5jcnprck1xvkhdzd2zg-apecs-physics-gloss-0.1.0.0

sternenseemann · 2020-12-23T14:04:42Z

(Should be broken on linux until the update is actually performed though)

maralorn · 2020-12-23T18:24:07Z

Huh, @cdepillabout, the problem is that those pins are automatically generated from stackage-nightly. So I am pretty sure this bump would just be reverted if it hasn‘t happened in stackage-nightly. The next time peti updates the stackage pin.

I think normally we do this by using a "apecs-physics = super.apecs-physics_0_4_5" override. I am not sure if there is a way to override the stackage version in the yaml file.

sternenseemann · 2020-12-23T21:31:20Z

Maybe it's a better idea to merge the darwin fix only which can be done right now and I check after the next haskell-update if we have to override apecs-physics or can just mark the packages as unbroken?

cdepillabout · 2020-12-24T04:08:25Z

@sternenseemann That sounds like an easy thing to do right away if you're willing to update this PR again.

sternenseemann · 2020-12-24T13:32:17Z

@cdepillabout Yeah, no problem!

hackage2nix is run on fridays usually right?

cdepillabout · 2020-12-24T13:51:33Z

hackage2nix is run on fridays usually right?

hackage2nix is usually run once a day, but haskell-updates is merged into master normally once a week on fridays. I think at the same time the stackage nightly version is updated. It is normally peti and maralorn doing this: https://www.twitch.tv/videos/841867369

sternenseemann · 2020-12-24T14:18:16Z

@cdepillabout okay, then I'll wait till the new stackage-nightly is out.

Should I force push to drop the second commit then, so you can merge the darwin fix?

cdepillabout · 2020-12-25T00:30:37Z

@sternenseemann This looks good, thanks.

Also, I checked the stackage nightly releases, and it looks like they completely stopped two weeks ago or so. Don't know what's up: https://www.stackage.org/snapshots

sternenseemann requested a review from cdepillabout as a code owner December 22, 2020 11:54

ofborg bot added 6.topic: haskell 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Dec 22, 2020

cdepillabout reviewed Dec 22, 2020

View reviewed changes

haskellPackages.apecs-physics: depend on ApplicationServices on darwin

96376c6

sternenseemann force-pushed the fix-apecs-physics branch from 2d6d7f4 to cb44da7 Compare December 23, 2020 09:28

sternenseemann force-pushed the fix-apecs-physics branch 2 times, most recently from 901e618 to 54e44bf Compare December 23, 2020 09:32

sternenseemann force-pushed the fix-apecs-physics branch 2 times, most recently from dea822a to 9679699 Compare December 23, 2020 12:14

sternenseemann mentioned this pull request Dec 24, 2020

Update Haskell package set to ghc-8.10.3 (plus other fixes) #107549

Merged

sternenseemann force-pushed the fix-apecs-physics branch from 9679699 to 96376c6 Compare December 24, 2020 22:39

sternenseemann changed the title ~~haskellPackages.apecs-physics: unbreak~~ haskellPackages.apecs-physics: fix build on darwin Dec 24, 2020

cdepillabout merged commit 5c2517c into NixOS:haskell-updates Dec 25, 2020

sternenseemann deleted the fix-apecs-physics branch December 25, 2020 09:30

sternenseemann mentioned this pull request Dec 25, 2020

haskellPackages.apecs-physics: push to 0.4.5 to unbreak build #107573

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

haskellPackages.apecs-physics: fix build on darwin #107395

haskellPackages.apecs-physics: fix build on darwin #107395

sternenseemann commented Dec 22, 2020

sternenseemann commented Dec 22, 2020

siraben commented Dec 22, 2020 •

edited

siraben commented Dec 22, 2020 •

edited

sternenseemann commented Dec 22, 2020

siraben commented Dec 22, 2020

siraben commented Dec 22, 2020

sternenseemann commented Dec 22, 2020 •

edited

siraben commented Dec 22, 2020

cdepillabout Dec 22, 2020

jonascarpay commented Dec 23, 2020

sternenseemann commented Dec 23, 2020

jonascarpay commented Dec 23, 2020

sternenseemann commented Dec 23, 2020

jonascarpay commented Dec 23, 2020

jonascarpay commented Dec 23, 2020 •

edited

sternenseemann commented Dec 23, 2020

cdepillabout commented Dec 23, 2020

siraben commented Dec 23, 2020 •

edited

sternenseemann commented Dec 23, 2020

maralorn commented Dec 23, 2020 •

edited

sternenseemann commented Dec 23, 2020

cdepillabout commented Dec 24, 2020

sternenseemann commented Dec 24, 2020

cdepillabout commented Dec 24, 2020

sternenseemann commented Dec 24, 2020

cdepillabout commented Dec 25, 2020

haskellPackages.apecs-physics: fix build on darwin #107395

haskellPackages.apecs-physics: fix build on darwin #107395

Conversation

sternenseemann commented Dec 22, 2020

Motivation for this change

Things done

sternenseemann commented Dec 22, 2020

siraben commented Dec 22, 2020 • edited

siraben commented Dec 22, 2020 • edited

sternenseemann commented Dec 22, 2020

siraben commented Dec 22, 2020

siraben commented Dec 22, 2020

sternenseemann commented Dec 22, 2020 • edited

siraben commented Dec 22, 2020

cdepillabout Dec 22, 2020

Choose a reason for hiding this comment

jonascarpay commented Dec 23, 2020

sternenseemann commented Dec 23, 2020

jonascarpay commented Dec 23, 2020

sternenseemann commented Dec 23, 2020

jonascarpay commented Dec 23, 2020

jonascarpay commented Dec 23, 2020 • edited

sternenseemann commented Dec 23, 2020

cdepillabout commented Dec 23, 2020

siraben commented Dec 23, 2020 • edited

sternenseemann commented Dec 23, 2020

maralorn commented Dec 23, 2020 • edited

sternenseemann commented Dec 23, 2020

cdepillabout commented Dec 24, 2020

sternenseemann commented Dec 24, 2020

cdepillabout commented Dec 24, 2020

sternenseemann commented Dec 24, 2020

cdepillabout commented Dec 25, 2020

siraben commented Dec 22, 2020 •

edited

siraben commented Dec 22, 2020 •

edited

sternenseemann commented Dec 22, 2020 •

edited

jonascarpay commented Dec 23, 2020 •

edited

siraben commented Dec 23, 2020 •

edited

maralorn commented Dec 23, 2020 •

edited