Skip to content

Commit

Permalink
ghcSplices-8_10: Use upstream ghc-8.10.7-release instead of ghc-8.10
Browse files Browse the repository at this point in the history
There are changes in upstream's ghc-8.10 that aren't part of ghc-8.10.7
and this causes the nixpkgs to fail (because it tries to apply patches
that have since been upstreamed)
  • Loading branch information
ali-abrar committed Jul 18, 2022
1 parent d574c2f commit 629e6ae
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ let iosSupport = system == "x86_64-darwin";
# When building from the ghc git repo, ./boot must be run before configuring, whereas
# in the distribution tarball on the haskell.org downloads page, ./boot has already been
# run.
preConfigure= ''
preConfigure = ''
echo ${drv.version} >VERSION
./boot
'' + drv.preConfigure or "";
Expand All @@ -59,8 +59,9 @@ let iosSupport = system == "x86_64-darwin";
# When building from the ghc git repo, ./boot must be run before configuring, whereas
# in the distribution tarball on the haskell.org downloads page, ./boot has already been
# run.
preConfigure= ''
prePatch = ''
echo ${drv.version} >VERSION
patchShebangs boot
./boot
'' + drv.preConfigure or "";
});
Expand Down
6 changes: 3 additions & 3 deletions haskell-overlays/splices-load-save/dep/ghc-8.10/github.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"owner": "obsidiansystems",
"repo": "ghc",
"branch": "ghc-8.10-android",
"branch": "ghc-8.10.7-android",
"private": false,
"rev": "8c8bb87f4ba16a5262f68e6cfde31b2ec0a92067",
"sha256": "sha256-fNs3I27mv47mFV0D6iz8fQ1cs8yX3X5usw87km9CTwA=",
"rev": "bd86357260ee65c8a9fe884419346d408b399aab",
"sha256": "1crm7496q29mn50vfij25ii05vvw18g31b2sj6c2ihdn9ws3g7v1",
"fetchSubmodules": true
}

0 comments on commit 629e6ae

Please sign in to comment.