Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

elm-instrument: fix build #122329

Merged
merged 1 commit into from May 13, 2021
Merged

elm-instrument: fix build #122329

merged 1 commit into from May 13, 2021

Conversation

mdevlamynck
Copy link
Contributor

@mdevlamynck mdevlamynck commented May 9, 2021 •
edited

Motivation for this change

Fix build of elm-instrument and elm-coverage that depends on it.
ZHF: #122042

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 9, 2021 •
edited

Result of nixpkgs-review pr 122329 at 39e8d987 run on x86_64-linux 1

2 packages built successfully:
  • elmPackages.elm-coverage
  • elmPackages.elm-instrument

Result of nixpkgs-review pr 122329 at 39e8d987 run on aarch64-linux 1

1 package built successfully:
  • elmPackages.elm-instrument

@mdevlamynck
Copy link
Contributor Author

The pr upstream does not build at the moment since optparse-applicative 0.16 is not available yet on stackage (If I understand correctly, I'm not familiar with haskell package managers). So I've converted the fix to a patch instead for now.

@ofborg ofborg bot requested a review from turboMaCk May 10, 2021 08:21
turboMaCk
turboMaCk reviewed May 10, 2021
View reviewed changes
pkgs/development/compilers/elm/packages/elm-instrument/default.nix Outdated
@@ -14,6 +14,7 @@ mkDerivation {
rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e";
fetchSubmodules = true;
};
patches = [ ./update-optparse-applicative.patch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not to use fetchpatch?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't know about it, it would allow to query the commit of the PR in the form of a patch I guess? I'll update the PR :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's preferable because it makes it much easier to track if the patch is still necessary in the future.

turboMaCk
turboMaCk reviewed May 10, 2021
View reviewed changes
pkgs/development/compilers/elm/packages/elm-instrument.nix
Comment on lines +18 to +25
(fetchpatch {
name = "update-optparse-applicative.patch";
url = "https://github.com/mdevlamynck/elm-instrument/commit/c548709d4818aeef315528e842eaf4c5b34b59b4.patch";
sha256 = "0ln7ik09n3r3hk7jmwwm46kz660mvxfa71120rkbbaib2falfhsc";
})
];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to keep it consistent with most other places where we need this in nixpkgs - can you please add a comment with url to PR above the call to fetchpatch? It just makes it ever so slightly simpler to track the status upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR updated :)

turboMaCk
turboMaCk approved these changes May 10, 2021
View reviewed changes
Copy link
Member

@turboMaCk turboMaCk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks great! Thanks a lot @domenkozar this is ready for merge.

@turboMaCk
Copy link
Member

@GrahamcOfBorg build elmPackages.elm-instrument elmPackages.elm-coverage

jonringer
jonringer approved these changes May 13, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Result of nixpkgs-review pr 122329 run on x86_64-linux 1

2 packages built:
  • elmPackages.elm-coverage
  • elmPackages.elm-instrument

@jonringer jonringer merged commit ef2742b into NixOS:master May 13, 2021
@mdevlamynck mdevlamynck deleted the fix-elm-instrument branch May 25, 2021 08:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turboMaCk turboMaCk turboMaCk approved these changes

@jonringer jonringer jonringer approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mdevlamynck @r-rmcgibbo @turboMaCk @jonringer