Skip to content

Commit 384c1c9

Browse files
committed
Arch Linux: no longer release AUR package
Stack has been adopted into the official community repo.
1 parent c4d36d8 commit 384c1c9

File tree

4 files changed

+8
-42
lines changed

4 files changed

+8
-42
lines changed

ChangeLog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
Release notes:
66

7+
- Arch Linux: Stack has been adopted into the
8+
[official community repository](https://www.archlinux.org/packages/community/x86_64/stack/),
9+
so we will no longer be updating the AUR with new versions. See the
10+
[install/upgrade guide](http://docs.haskellstack.org/en/stable/install_and_upgrade.html#arch-linux)
11+
for current download instructions.
12+
713
Major changes:
814

915
Other enhancements:

doc/MAINTAINER_GUIDE.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,7 @@ for requirements to perform the release, and more details about the tool.
101101
* Be sure to update the SHA sum
102102
* The commit message should just be `haskell-stack <VERSION>`
103103

104-
* Update in Arch Linux's
105-
[haskell-stack.git](ssh+git://[email protected]/haskell-stack.git):
106-
`PKGBUILD` and `.SRCINFO`
107-
* Be sure to reset `pkgrel` in both files, and update the SHA1 sum
104+
* [Flag the Arch Linux package as out-of-date](https://www.archlinux.org/packages/community/x86_64/stack/flag/)
108105

109106
* Keep an eye on the
110107
[Hackage matrix builder](http://matrix.hackage.haskell.org/package/stack)

etc/scripts/release.hs

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ rules global@Global{..} args = do
131131
distroPhonies debianDistro debianVersions debPackageFileName
132132
distroPhonies centosDistro centosVersions rpmPackageFileName
133133
distroPhonies fedoraDistro fedoraVersions rpmPackageFileName
134-
phony archUploadPhony $ need [archDir </> archPackageFileName <.> uploadExt]
135-
phony archBuildPhony $ need [archDir </> archPackageFileName]
136134

137135
releaseDir </> "*" <.> uploadExt %> \out -> do
138136
let srcFile = dropExtension out
@@ -234,30 +232,6 @@ rules global@Global{..} args = do
234232
rpmDistroRules centosDistro centosVersions
235233
rpmDistroRules fedoraDistro fedoraVersions
236234

237-
archDir </> archPackageFileName <.> uploadExt %> \out -> do
238-
let pkgFile = dropExtension out
239-
need [pkgFile]
240-
() <- cmd "aws s3 cp"
241-
[ pkgFile
242-
, "s3://download.fpcomplete.com/archlinux/" ++ takeFileName pkgFile ]
243-
copyFileChanged pkgFile out
244-
archDir </> archPackageFileName %> \out -> do
245-
docFiles <- getDocFiles
246-
let inputFiles = concat
247-
[[archStagedExeFile
248-
,archStagedBashCompletionFile]
249-
,map (archStagedDocDir </>) docFiles]
250-
need inputFiles
251-
putNormal $ "tar gzip " ++ out
252-
writeTarGz out archStagingDir inputFiles
253-
archStagedExeFile %> \out -> do
254-
copyFileChanged (releaseDir </> binaryExeFileName) out
255-
archStagedBashCompletionFile %> \out -> do
256-
writeBashCompletion archStagedExeFile out
257-
archStagedDocDir ++ "//*" %> \out -> do
258-
let origFile = dropDirectoryPrefix archStagedDocDir out
259-
copyFileChanged origFile out
260-
261235
where
262236

263237
debDistroRules debDistro0 debVersions = do
@@ -396,8 +370,6 @@ rules global@Global{..} args = do
396370
buildPhony = "build"
397371
distroUploadPhony DistroVersion{..} = "upload-" ++ dvDistro ++ "-" ++ dvVersion
398372
distroBuildPhony DistroVersion{..} = "build-" ++ dvDistro ++ "-" ++ dvVersion
399-
archUploadPhony = "upload-" ++ archDistro
400-
archBuildPhony = "build-" ++ archDistro
401373

402374
releaseCheckDir = releaseDir </> "check"
403375
releaseStageDir = releaseDir </> "stage"
@@ -442,14 +414,6 @@ rules global@Global{..} args = do
442414
rpmPackageIterationStr DistroVersion{..} = "0." ++ dvCodeName
443415
rpmPackageVersionStr _ = stackVersionStr global
444416

445-
archStagedDocDir = archStagingDir </> "usr/share/doc" </> stackProgName
446-
archStagedBashCompletionFile = archStagingDir </> "usr/share/bash-completion/completions/stack"
447-
archStagedExeFile = archStagingDir </> "usr/bin" </> stackProgName
448-
archStagingDir = archDir </> archPackageName
449-
archPackageFileName = archPackageName <.> tarGzExt
450-
archPackageName = stackProgName ++ "_" ++ stackVersionStr global ++ "-" ++ "x86_64"
451-
archDir = releaseDir </> archDistro
452-
453417
ubuntuVersions =
454418
[ ("12.04", "precise")
455419
, ("14.04", "trusty")
@@ -471,7 +435,6 @@ rules global@Global{..} args = do
471435
debianDistro = "debian"
472436
centosDistro = "centos"
473437
fedoraDistro = "fedora"
474-
archDistro = "arch"
475438

476439
anyDistroVersion distro = DistroVersion distro "*" "*"
477440

etc/scripts/vagrant-releases.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if [[ "$(basename "$0")" == "vagrant-releases.sh" ]]; then
2121
with_vagrant centos-6-x86_64 "--binary-variant=gmp4 --upload-label='Linux 64-bit, libgmp4 for CentOS 6.x' release"
2222
with_vagrant centos-6-i386 "--binary-variant=gmp4 --upload-label='Linux 32-bit, libgmp4 for CentOS 6.x' release"
2323
elif [[ "$(basename "$0")" == "vagrant-distros.sh" ]]; then
24-
with_vagrant debian-7-amd64 "upload-ubuntu-12.04 upload-ubuntu-14.04 upload-ubuntu-14.10 upload-ubuntu-15.04 upload-ubuntu-15.10 upload-debian-7 upload-debian-8 upload-arch"
24+
with_vagrant debian-7-amd64 "upload-ubuntu-12.04 upload-ubuntu-14.04 upload-ubuntu-14.10 upload-ubuntu-15.04 upload-ubuntu-15.10 upload-debian-7 upload-debian-8"
2525
with_vagrant centos-7-x86_64 "upload-centos-7 upload-fedora-21 upload-fedora-22 upload-fedora-23"
2626
with_vagrant centos-6-x86_64 "--binary-variant=gmp4 upload-centos-6"
2727
else

0 commit comments

Comments
 (0)