Skip to content

pkgsi686Linux.haskellPackages.tasty: pull missing unbounded-delays pa…#209543

Merged
maralorn merged 1 commit intoNixOS:haskell-updatesfrom
trofi:tasty-fix-on-i686
Jan 7, 2023
Merged

pkgsi686Linux.haskellPackages.tasty: pull missing unbounded-delays pa…#209543
maralorn merged 1 commit intoNixOS:haskell-updatesfrom
trofi:tasty-fix-on-i686

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jan 7, 2023

…ckage

The package is needed by tasty on a sunset of architectures. Quoting upstream .cabal file:

if(!arch(x86_64) && !arch(aarch64))
build-depends:
unbounded-delays >= 0.1

This fails the build on i686 (a wine depend via shellcheck):

Setup: Encountered missing or private dependencies:
  unbounded-delays >=0.1

The change pulls unbounded-delays unconditionally as it's a small depend.

Description of changes
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.05 Release Notes (or backporting 22.11 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 Jan 7, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Jan 7, 2023
@sternenseemann
Copy link
Member

Please rebase on haskell-updates.

…ckage

The package is needed by tasty on a subset of architectures. Quoting
upstream `.cabal` file:

  if(!arch(x86_64) && !arch(aarch64))
    build-depends:
      unbounded-delays >= 0.1

This fails the build on i686 (a wine depend via shellcheck):

    Setup: Encountered missing or private dependencies:
      unbounded-delays >=0.1

The change pulls unbounded-delays for mentioned targets.

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
@trofi trofi force-pushed the tasty-fix-on-i686 branch from b7e91a4 to 6d724cf Compare January 7, 2023 20:39
@trofi trofi changed the base branch from master to haskell-updates January 7, 2023 20:39
@trofi
Copy link
Contributor Author

trofi commented Jan 7, 2023

Please rebase on haskell-updates.

Done.

@trofi trofi requested a review from sternenseemann January 7, 2023 20:40
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Jan 7, 2023
@maralorn maralorn merged commit 968cfda into NixOS:haskell-updates Jan 7, 2023
@maralorn
Copy link
Member

maralorn commented Jan 7, 2023

thx

@trofi trofi deleted the tasty-fix-on-i686 branch January 7, 2023 21:53
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 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants