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

pakcs: 3.6.0 -> 3.7.2, build on ghc9 #346268

Merged
merged 3 commits into from
Oct 5, 2024
Merged

Conversation

t4ccer
Copy link
Member

@t4ccer t4ccer commented Oct 3, 2024

version bump and switch to ghc9

cc #346214

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@maralorn
Copy link
Member

maralorn commented Oct 4, 2024

I’d prefer not vendoring the patch but fetching it with fetchpatch from a PR against upstream, but its your decision.

@maralorn
Copy link
Member

maralorn commented Oct 4, 2024

I seriously recommend that we activate the pakcs job in pkgs/top-level/release-haskell.nix (uncomment line 335) so that we notice when one of the haskell-updates breaks pakcs again.

inherit src;
postUnpack = "sourceRoot+=/frontend";

# NOTE: We cannot use `appendPatches` because it conflicts with `overrideCabal`
Copy link
Member

Choose a reason for hiding this comment

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

appendPatches should do the same as you have written out here. Any specific problems?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh ok haskell.lib.compose.appendPatch works, I've tried haskell.lib.appendPatch before and it doesn't compose well with overrideCabal I guess

error:
       … while calling the 'derivationStrict' builtin
         at <nix/derivation-internal.nix>:34:12:
           33|
           34|   strict = derivationStrict drvAttrs;
             |            ^
           35|

       … while evaluating derivation 'pakcs-3.7.2'
         whose name attribute is located at /home/t4ccer/repos/github/NixOS/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:336:7

       … while evaluating attribute 'makeFlags' of derivation 'pakcs-3.7.2'
         at /home/t4ccer/repos/github/NixOS/nixpkgs/pkgs/development/compilers/pakcs/default.nix:43:3:
           42|
           43|   makeFlags = [
             |   ^
           44|     "CURRYFRONTEND=${curry-frontend}/bin/curry-frontend"

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: attribute 'override' missing
       at /home/t4ccer/repos/github/NixOS/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix:38:28:
           37|    */
           38|   overrideCabal = f: drv: (drv.override (args: args // {
             |                            ^
           39|     mkDerivation = drv: (args.mkDerivation drv).override f;
           ```

Copy link
Member Author

Choose a reason for hiding this comment

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

I've pushed this change, doesn't even trigger a rebuild

@sternenseemann sternenseemann merged commit 2306dc4 into NixOS:master Oct 5, 2024
25 of 26 checks passed
@t4ccer t4ccer deleted the t4/pakcs/ghc9 branch October 5, 2024 19:45
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.

3 participants