Skip to content

haskellPackages.aeson-typescript: fix the testsuite and unbreak#182389

Merged
maralorn merged 1 commit intoNixOS:haskell-updatesfrom
lf-:fix-aeson-ts
Jul 23, 2022
Merged

haskellPackages.aeson-typescript: fix the testsuite and unbreak#182389
maralorn merged 1 commit intoNixOS:haskell-updatesfrom
lf-:fix-aeson-ts

Conversation

@lf-
Copy link
Copy Markdown
Member

@lf- lf- commented Jul 21, 2022

Description of changes

I fixed the testsuite of aeson-typescript, which was failing due to a lack of working tsc. I have manually marked it unbroken (not sure how to use the tools to do it for me; I tried ./maintainers/scripts/haskell/mark-broken.sh and it failed due to #175875).

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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Jul 21, 2022
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 21, 2022
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

One nitpick: I think this should be testToolDepends instead of buildTools.

If you look through pkgs/development/haskell-modules/generic-builder.nix you can see that testToolDepends is used almost the same as buildTools, except that it gets ignored if you set dontCheck (which I believe is what we want in this case).

Other than that, this LGTM, thanks!

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

oh, brilliant, i was looking for that but missed it. Will change.

@cdepillabout
Copy link
Copy Markdown
Member

Thanks for updating this.

Could you change the title on the latest commit to match the format as described in https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md? Or just squashing these two commits together might be the easiest.

After you do that, I think this can be merged.

@lf-
Copy link
Copy Markdown
Member Author

lf- commented Jul 23, 2022

Huh, does nixpkgs have the github squash and merge feature turned off? Usually you can click the little arrow next to the merge button to select that.

@maralorn
Copy link
Copy Markdown
Member

@lf- I am not sure how strong a reason that is, but If we do that, we lose the merge commit. Which is against nixpkgs convention.

@lf-
Copy link
Copy Markdown
Member Author

lf- commented Jul 23, 2022

Oh, wild. I didn't know it did that. Rebased.

@maralorn maralorn merged commit 4f0b8bd into NixOS:haskell-updates Jul 23, 2022
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 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants