Skip to content

Comments

{cachix,hercules-ci}: remove no longer needed override and update passthru.nixPackage#221036

Merged
Kranzes merged 3 commits intoNixOS:haskell-updatesfrom
Kranzes:haskell-updates
Mar 13, 2023
Merged

{cachix,hercules-ci}: remove no longer needed override and update passthru.nixPackage#221036
Kranzes merged 3 commits intoNixOS:haskell-updatesfrom
Kranzes:haskell-updates

Conversation

@Kranzes
Copy link
Member

@Kranzes Kranzes commented Mar 13, 2023 •
edited
Loading

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
  • Fits CONTRIBUTING.md.

Kranzes added 2 commits March 13, 2023 20:32
@Kranzes
cachix: remove no longer needed src override & patch
6e99f2e 
The patch and overrides removed in this change were only needed
temporarly to avoid waiting for a haskell-updates cycle.
@Kranzes
cachix,hercules-ci-{agent,cnix-expr,cnix-store}: bump nix pin to 2_14
f7d99b7
@Kranzes Kranzes requested a review from domenkozar March 13, 2023 18:37
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Mar 13, 2023
@Kranzes Kranzes requested a review from roberth March 13, 2023 18:37
@Kranzes
Copy link
Member Author

Kranzes commented Mar 13, 2023

ofborg-eval is already failing on #220972.

@Kranzes
Copy link
Member Author

Kranzes commented Mar 13, 2023 •
edited
Loading

cachix builds fine. hercules-ci-agent on the other hand does not, it fails because its dependency tomland fails to build. This build error is not caused by this PR but rather by the current hackage/stackage update bump.

edit: I fixed the build of tomland for now by using doJailbreak on it. In its next release it will no longer be needed -> kowainik/tomland@37f1646. hercules-ci-agent now builds just fine.
cc. @roberth

cdepillabout
cdepillabout approved these changes Mar 13, 2023
View reviewed changes
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.

LGTM, feel free to merge this in (unless you were specifically waiting for a review from robert and/or domen).

@Kranzes
Copy link
Member Author

Kranzes commented Mar 13, 2023 •
edited
Loading

LGTM, feel free to merge this in (unless you were specifically waiting for a review from robert and/or domen).

Robert liked the the PR description so I think that's fine.

@Kranzes Kranzes merged commit 89bea5d into NixOS:haskell-updates Mar 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cdepillabout cdepillabout cdepillabout approved these changes

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@maralorn maralorn Awaiting requested review from maralorn

@domenkozar domenkozar Awaiting requested review from domenkozar

@roberth roberth Awaiting requested review from roberth

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Kranzes @cdepillabout