Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove PPA repo of ghc #3268

Merged
merged 1 commit into from
Apr 28, 2021
Merged

Remove PPA repo of ghc #3268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ function Build-PHPTable {
function Get-GHCVersion {
$(ghc --version) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null
$ghcVersion = $Matches.version
return "GHC $ghcVersion"
$aptSourceRepo = Get-AptSourceRepository -PackageName "ghc"
return "GHC $ghcVersion (apt source repository: $aptSourceRepo)"
}

function Get-GHCupVersion {
Expand Down
6 changes: 5 additions & 1 deletion images/linux/scripts/installers/haskell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,8 @@ ln -s "/opt/ghc/$defaultGHCVersion/bin/ghc" "/usr/bin/ghc"
# Install the latest stable release of haskell stack
curl -sSL https://get.haskellstack.org/ | sh

invoke_tests "Haskell"
# remove PPA repo
echo "ghc ppa:hvr/ghc" >> $HELPER_SCRIPTS/apt-sources.txt
add-apt-repository --remove ppa:hvr/ghc

invoke_tests "Haskell"