Skip to content

haskell-modules: Add revision argument to callHackageDirect - #284490

Merged
maralorn merged 1 commit into
NixOS:haskell-updatesfrom
wolfgangwalther:hackage-direct-revision
Feb 26, 2024
Merged

haskell-modules: Add revision argument to callHackageDirect#284490
maralorn merged 1 commit into
NixOS:haskell-updatesfrom
wolfgangwalther:hackage-direct-revision

Conversation

@wolfgangwalther

Copy link
Copy Markdown
Contributor

Previously, callHackageDirect was only able to fetch the first revision of a package.

Resolves #134747

Description of changes

Tested with a random package which needs a revision. Fails without revision argument:

nix-build -E - <<EOE
with import ./default.nix {};
haskellPackages.callHackageDirect {
  pkg = "hopfli";
  ver = "0.2.2.1";
  sha256 = "sha256-tW96rAmt0SyWXEfm6GdzCFQVS8JigA4ID2rkd9u9pMg=";
} {}
EOE

[...]
Error: Setup: Encountered missing or private dependencies:
QuickCheck >=2.6 && <2.11, hspec >=1.7.2.1 && <2.5

error: builder for '/nix/store/sm9p7bd4kdqpq4yyc2fb24fy8f5q6yrh-hopfli-0.2.2.1.drv' failed with exit code 1

Succeeds with revision argument:

nix-build -E - <<EOE
with import ./default.nix {};
haskellPackages.callHackageDirect {
  pkg = "hopfli";
  ver = "0.2.2.1";
  sha256 = "sha256-tW96rAmt0SyWXEfm6GdzCFQVS8JigA4ID2rkd9u9pMg=";
  rev = { revision = "1"; sha256 = "116jns5im51sb9xiwpx308wz3pr67335633anrf8f704pz8vwjka"; };
} {}
EOE

/nix/store/7hfbgajzlbxjpffc858glcq7j37ygl9g-hopfli-0.2.2.1

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.05 Release Notes (or backporting 23.05 and 23.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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions Bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Jan 28, 2024
Comment thread pkgs/development/haskell-modules/make-package-set.nix Outdated
@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. labels Jan 28, 2024

@maralorn maralorn left a comment

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.

This change makes sense to me.

Luckily for you, those functions are still undocumented in the nixpkgs manual so we can’t force you to update that …

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 28, 2024
@wolfgangwalther

Copy link
Copy Markdown
Contributor Author

Luckily for you, those functions are still undocumented in the nixpkgs manual so we can’t force you to update that …

Tbh, I did grep the docs to update them, only to see that they are in fact not documented, yet, ... at which point I stopped ;)

Previously, callHackageDirect was only able to fetch the first revision
of a package.

Resolves NixOS#134747
@wolfgangwalther

Copy link
Copy Markdown
Contributor Author

@maralorn is there anything that this is still blocked on or can this be merged?

@maralorn

Copy link
Copy Markdown
Member

Nope, thank you!

And thank you for posting an easy test in the description. Very helpful.

@maralorn
maralorn merged commit e533928 into NixOS:haskell-updates Feb 26, 2024
@wolfgangwalther
wolfgangwalther deleted the hackage-direct-revision branch February 26, 2024 11:30
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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants