Skip to content
This repository has been archived by the owner on Feb 3, 2022. It is now read-only.

Commit

Permalink
rollback accidental local changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
gbaz committed Dec 4, 2017
1 parent ab8e511 commit a3a6b38
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions hptool/src/OS/Win.hs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ getPkgId :: C.HasUnitId pkg => pkg -> String
getPkgId pkg = C.display $ C.installedUnitId pkg
#elif MIN_VERSION_Cabal(1,24,0)
getPkgId :: C.HasUnitId pkg => pkg -> String
getPkgId pkg = display (C.installedUnitId pkg) {-case C.installedUnitId pkg of
getPkgId pkg = case C.installedUnitId pkg of
C.SimpleUnitId (C.ComponentId s) -> s
-}
#else
getPkgId :: C.PackageInstalled pkg => pkg -> String
getPkgId pkg = case C.installedPackageId pkg of
Expand Down
2 changes: 1 addition & 1 deletion platform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.7

set -e

HPTOOL=hptool/dist-newstyle/build/x86_64-osx/ghc-8.2.1/hptool-0.1/c/hptool/build/hptool/hptool
HPTOOL=hptool/dist-newstyle/build/hptool-0.1/build/hptool/hptool
HPTOOL_ALT=hptool/.cabal-sandbox/bin/hptool

#if ( cabal sandbox --help >/dev/null 2>&1 ) ; then
Expand Down

0 comments on commit a3a6b38

Please sign in to comment.