Skip to content

haskell.packages.ghc94.gtk2hs-buildtools: remove patch for upstream fix#236366

Merged
cdepillabout merged 1 commit intoNixOS:haskell-updatesfrom
tbidne:gtk2hs-buildtools-fix
Jun 7, 2023
Merged

haskell.packages.ghc94.gtk2hs-buildtools: remove patch for upstream fix#236366
cdepillabout merged 1 commit intoNixOS:haskell-updatesfrom
tbidne:gtk2hs-buildtools-fix

Conversation

@tbidne
Copy link
Contributor

@tbidne tbidne commented Jun 6, 2023

Description of changes

The gtk2hs-buildtools-fix-ghc-9.4 patch was introduced in 962633e to address gtk2hs/gtk2hs#323. That issue has since been fixed upstream and a new release added to hackage on 2023-05-12, so if you try to run nix build .#haskell.packages.ghc945.gtk2hs-buildtools now you get an error like:

gtk2hs-buildtools> src/Gtk2HsSetup.hs:297:20: error:
gtk2hs-buildtools>     duplicate field name ‘ppOrdering’ in record construction
gtk2hs-buildtools>     |
gtk2hs-buildtools> 297 | ourC2hs bi lbi _ = PreProcessor {
gtk2hs-buildtools>     |                    ^^^^^^^^^^^^^^...
error: builder for '/nix/store/v138akp5dfcjky86d83gzgjgij64p2zr-gtk2hs-buildtools-0.13.10.0.drv' failed with exit code 1;
       last 10 log lines:
       > [43 of 46] Compiling GenBind          ( c2hs/gen/GenBind.hs, dist/build/GenBind.o, dist/build/GenBind.dyn_o )
       > [44 of 46] Compiling Version          ( c2hs/toplevel/Version.hs, dist/build/Version.o, dist/build/Version.dyn_o )
       > [45 of 46] Compiling Gtk2HsC2Hs       ( c2hs/toplevel/Gtk2HsC2Hs.hs, dist/build/Gtk2HsC2Hs.o, dist/build/Gtk2HsC2Hs.dyn_o )
       > [46 of 46] Compiling Gtk2HsSetup      ( src/Gtk2HsSetup.hs, dist/build/Gtk2HsSetup.o, dist/build/Gtk2HsSetup.dyn_o )
       >
       > src/Gtk2HsSetup.hs:297:20: error:
       >     duplicate field name ‘ppOrdering’ in record construction
       >     |
       > 297 | ourC2hs bi lbi _ = PreProcessor {
       >     |                    ^^^^^^^^^^^^^^...
       For full logs, run 'nix log /nix/store/v138akp5dfcjky86d83gzgjgij64p2zr-gtk2hs-buildtools-0.13.10.0.drv'.

due to both upstream and the patch adding the ppOrdering field. This PR removes the unnecessary patch.

Thanks!

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Jun 6, 2023
@tbidne tbidne force-pushed the gtk2hs-buildtools-fix branch from 3551485 to 7a8c364 Compare June 6, 2023 22:10
@cdepillabout
Copy link
Member

Thanks!

Could you rebase this on the haskell-updates branch? We generally ask all Haskell-related PRs to be targeted on the haskell-updates branch.

https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging

@tbidne tbidne force-pushed the gtk2hs-buildtools-fix branch from 7a8c364 to 6795426 Compare June 6, 2023 22:25
@tbidne tbidne changed the base branch from master to haskell-updates June 6, 2023 22:25
@tbidne
Copy link
Contributor Author

tbidne commented Jun 6, 2023

Ah of course, oversight.

@cdepillabout
Copy link
Member

@ofborg build haskell.packages.ghc94.gtk2hs-buildtools

@cdepillabout
Copy link
Member

Looks like it now builds fine, thanks!

@cdepillabout cdepillabout merged commit a433cd1 into NixOS:haskell-updates Jun 7, 2023
@tbidne
Copy link
Contributor Author

tbidne commented Jun 7, 2023

Thank you!

@tbidne tbidne deleted the gtk2hs-buildtools-fix branch May 24, 2024 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants