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.

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

haskellPackages.c2hsc: apply patchto find gcc #89488

Merged
merged 0 commits into from Jun 12, 2020
Merged

Conversation

teto
Copy link
Member

@teto teto commented Jun 4, 2020

...used in tests.

Fix is upstream but there has been no sign of release for the past 6
months, fixes #63764.

I might need to remove it from the list of borken packages, is that correct ?

Motivation for this change
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.

Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

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

Could you rebase this on the haskell-updates branch?

Also, you're correct. c2hsc needs to be removed from the broken packages section in pkgs/development/haskell-modules/configuration-hackage2nix.yaml.

pkgs/development/haskell-modules/configuration-common.nix Outdated Show resolved Hide resolved
pkgs/development/haskell-modules/configuration-common.nix Outdated Show resolved Hide resolved
@teto teto changed the base branch from master to haskell-updates June 5, 2020 23:06
# waiting for release: https://github.com/jwiegley/c2hsc/issues/41
c2hsc = appendPatch super.c2hsc (pkgs.fetchpatch {
url = "https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch";
sha256 = "0z0x6jsf7jz32kmjxp077h0ca98hwjyx16kpk9660id7ikmbcz91";
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I appear to be getting a different hash for this:

$ nix-build -A haskellPackages.c2hsc --arg config '{allowBroken=true;}'
these derivations will be built:
  /nix/store/b2q7nszrzi629nk1f79jsiya2yv8f1dg-490ecab202e0de7fc995eedf744ad3cb408b53cc.patch.drv
  /nix/store/07llqlbz5b5jjhyxlkwiv82banp4c0dm-c2hsc-0.7.1.drv
building '/nix/store/b2q7nszrzi629nk1f79jsiya2yv8f1dg-490ecab202e0de7fc995eedf744ad3cb408b53cc.patch.drv'...

trying https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  1797  100  1797    0     0  18525      0 --:--:-- --:--:-- --:--:-- 18525
hash mismatch in fixed-output derivation '/nix/store/ilq40b6a9k2n53ch5pikz39wn4xpfsx9-490ecab202e0de7fc995eedf744ad3cb408b53cc.patch':
  wanted: sha256:0z0x6jsf7jz32kmjxp077h0ca98hwjyx16kpk9660id7ikmbcz91
  got:    sha256:1c7knpvxr7p8c159jkyk6w29653z5yzgjjqj11130bbb8mk9qhq7
cannot build derivation '/nix/store/07llqlbz5b5jjhyxlkwiv82banp4c0dm-c2hsc-0.7.1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/07llqlbz5b5jjhyxlkwiv82banp4c0dm-c2hsc-0.7.1.drv' failed

Copy link
Member Author

Choose a reason for hiding this comment

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

not sure what's wrong nix-build -A haskellPackages.c2hsc --arg config '{allowBroken=true;}' --check builds corerclty plus

nix-prefetch-url https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch                                                                           ~/nixpkgs3
path is '/nix/store/d2n0i5i9132pw5ijvg9lirxvnw17y5i7-490ecab202e0de7fc995eedf744ad3cb408b53cc.patch'
0z0x6jsf7jz32kmjxp077h0ca98hwjyx16kpk9660id7ikmbcz91

@teto
Copy link
Member Author

teto commented Jun 9, 2020

@GrahamcOfBorg build haskellPackages.c2hsc

@teto
Copy link
Member Author

teto commented Jun 9, 2020

ofc it won't evalluate since the package set was not regenerated, I sure hope we can get sthg like #62105 before next release.

@teto
Copy link
Member Author

teto commented Jun 9, 2020

@GrahamcOfBorg build haskellPackages.c2hsc

@teto
Copy link
Member Author

teto commented Jun 9, 2020

@GrahamcOfBorg build haskellPackages.c2hsc

@peti peti force-pushed the haskell-updates branch 3 times, most recently from 6d394ab to 7325cc7 Compare June 12, 2020 19:50
@peti peti merged this pull request into NixOS:haskell-updates Jun 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fix haskellPackages.c2hsc tests: Cannot find executable '/usr/bin/gcc'
3 participants