BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskell-modules: add revision argument to callHackageDirect

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

Resolves #134747
This commit is contained in:
Wolfgang Walther 2024-01-28 12:04:13 +01:00
parent 7f500eb92d
commit 747424168c
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/haskell-modules/make-package-set.nix
View file

@ -199,12 +199,16 @@ in package-set { inherit pkgs lib callPackage; } self // {
# for any version that has been released on hackage as opposed to only
# versions released before whatever version of all-cabal-hashes you happen
# to be currently using.
callHackageDirect = {pkg, ver, sha256}:
callHackageDirect = {pkg, ver, sha256, rev ? { revision = null; sha256 = null; }}: args:
let pkgver = "${pkg}-${ver}";
in self.callCabal2nix pkg (pkgs.fetchzip {
url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz";
inherit sha256;
});
firstRevision = self.callCabal2nix pkg (pkgs.fetchzip {
url = "mirror://hackage/${pkgver}/${pkgver}.tar.gz";
inherit sha256;
}) args;
in overrideCabal (orig: {
revision = rev.revision;
editedCabalFile = rev.sha256;
}) firstRevision;
# Creates a Haskell package from a source package by calling cabal2nix on the source.
callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args:
@ -635,7 +639,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
Type: drv -> drv
*/
forceLlvmCodegenBackend = haskellLib.overrideCabal (drv: {
forceLlvmCodegenBackend = overrideCabal (drv: {
configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ];
buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ];
});