0e1a160 · stackage · git.iko.soy

ChangeLog.mdnew file+5

compare with master

unifiedsplit

@@ -0,0 +1,5 @@

1+## 0.1.0.0

2+

3+First version of Stackage which is made available as its own package. The

4+codebase has been completely rewritten at this point, to be ready for generated

5+both Stackage Nightly and LTS Haskell distributions.

README.md+2−2

@@ -5,7 +5,7 @@ stackage

5

6__NOTE__ This repository is for package authors to get their code into

7Stackage. If you simply want to use Stackage as an end user, please follow the

8−instructions on http://www.stackage.org/.

8+instructions on [http://www.stackage.org/](http://www.stackage.org).

9

10A note about the codebase: the goal is to minimize dependencies and have

11the maximum range of supported compiler versions. Therefore, we avoid

@@ -16,7 +16,7 @@ Get your package included

16-------------------------

17

18In order to get your package included in the set of stable packages, you should

19−send a pull request against this repository. In the `Stackage.Config` module,

19+send a pull request against this repository. In the `build-constraints.yaml` file,

20there's a function called `defaultStablePackages`. In general, to add a set of

21packages, you would add:

22

Stackage2/BuildConstraints.hs → Stackage/BuildConstraints.hsrenamed+3−3

@@ -3,7 +3,7 @@

3{-# LANGUAGE RecordWildCards #-}

4{-# LANGUAGE TupleSections #-}

5-- | The constraints on package selection for a new build plan.

6−module Stackage2.BuildConstraints

6+module Stackage.BuildConstraints

7 ( BuildConstraints (..)

8 , PackageConstraints (..)

9 , TestState (..)

@@ -23,8 +23,8 @@ import Distribution.Version (anyVersion)

23import Distribution.Version (anyVersion)

24import Filesystem (isFile)

25import Network.HTTP.Client (Manager, httpLbs, responseBody)

26−import Stackage2.CorePackages

26+import Stackage.CorePackages

27−import Stackage2.Prelude

27+import Stackage.Prelude

28

29data TestState = ExpectSuccess

30 | ExpectFailure

Stackage2/BuildPlan.hs → Stackage/BuildPlan.hsrenamed+6−6

@@ -9,7 +9,7 @@

9{-# LANGUAGE TypeFamilies #-}

10-- | Representation of a concrete build plan, and how to generate a new one

11-- based on constraints.

12−module Stackage2.BuildPlan

12+module Stackage.BuildPlan

13 ( BuildPlan (..)

14 , PackagePlan (..)

15 , newBuildPlan

@@ -22,11 +22,11 @@ import qualified Data.Map as Map

22import qualified Data.Set as Set

23import qualified Distribution.Compiler

24import Distribution.PackageDescription

25−import Stackage2.BuildConstraints

25+import Stackage.BuildConstraints

26−import Stackage2.GithubPings

26+import Stackage.GithubPings

27−import Stackage2.PackageDescription

27+import Stackage.PackageDescription

28−import Stackage2.PackageIndex

28+import Stackage.PackageIndex

29−import Stackage2.Prelude

29+import Stackage.Prelude

30

31data BuildPlan = BuildPlan

32 { bpSystemInfo :: SystemInfo

Stackage2/CheckBuildPlan.hs → Stackage/CheckBuildPlan.hsrenamed+5−5

@@ -5,15 +5,15 @@

5{-# LANGUAGE RecordWildCards #-}

6{-# LANGUAGE ViewPatterns #-}

7-- | Confirm that a build plan has a consistent set of dependencies.

8−module Stackage2.CheckBuildPlan

8+module Stackage.CheckBuildPlan

9 ( checkBuildPlan

10 ) where

11

12import Control.Monad.Writer.Strict (Writer, execWriter, tell)

13−import Stackage2.BuildConstraints

13+import Stackage.BuildConstraints

14−import Stackage2.BuildPlan

14+import Stackage.BuildPlan

15−import Stackage2.PackageDescription

15+import Stackage.PackageDescription

16−import Stackage2.Prelude

16+import Stackage.Prelude

17

18-- FIXME check cycles in dependencies, only looking at libraries and

19-- executables

Stackage2/CompleteBuild.hs → Stackage/CompleteBuild.hsrenamed+9−9

@@ -1,7 +1,7 @@

1{-# LANGUAGE NoImplicitPrelude #-}

2{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE RecordWildCards #-}

4−module Stackage2.CompleteBuild

4+module Stackage.CompleteBuild

5 ( BuildType (..)

6 , BumpType (..)

7 , completeBuild

@@ -12,14 +12,14 @@ import Data.Text.Read (decimal)

12import Data.Time

13import Data.Yaml (decodeFileEither, encodeFile)

14import Network.HTTP.Client

15−import Stackage2.BuildConstraints

15+import Stackage.BuildConstraints

16−import Stackage2.BuildPlan

16+import Stackage.BuildPlan

17−import Stackage2.CheckBuildPlan

17+import Stackage.CheckBuildPlan

18−import Stackage2.PerformBuild

18+import Stackage.PerformBuild

19−import Stackage2.Prelude

19+import Stackage.Prelude

20−import Stackage2.ServerBundle

20+import Stackage.ServerBundle

21−import Stackage2.UpdateBuildPlan

21+import Stackage.UpdateBuildPlan

22−import Stackage2.Upload

22+import Stackage.Upload

23import System.IO (BufferMode (LineBuffering), hSetBuffering)

24

25data BuildType = Nightly | LTS BumpType

Stackage2/CorePackages.hs → Stackage/CorePackages.hsrenamed+2−2

@@ -1,6 +1,6 @@

1{-# LANGUAGE NoImplicitPrelude #-}

2{-# LANGUAGE OverloadedStrings #-}

3−module Stackage2.CorePackages

3+module Stackage.CorePackages

4 ( getCorePackages

5 , getCoreExecutables

6 , getGhcVersion

@@ -8,7 +8,7 @@ module Stackage2.CorePackages

8

9import qualified Data.Text as T

10import Filesystem (listDirectory)

11−import Stackage2.Prelude

11+import Stackage.Prelude

12import System.Directory (findExecutable)

13

14-- | Get a @Map@ of all of the core packages. Core packages are defined as

Stackage2/GithubPings.hs → Stackage/GithubPings.hsrenamed+3−3

@@ -1,13 +1,13 @@

1{-# LANGUAGE NoImplicitPrelude #-}

2{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE ViewPatterns #-}

4−module Stackage2.GithubPings

4+module Stackage.GithubPings

5 ( getGithubPings

6 ) where

7

8import Distribution.PackageDescription

9−import Stackage2.BuildConstraints

9+import Stackage.BuildConstraints

10−import Stackage2.Prelude

10+import Stackage.Prelude

11

12-- | Determine accounts to be pinged on Github based on various metadata in the

13-- package description.

Stackage2/PackageDescription.hs → Stackage/PackageDescription.hsrenamed+2−2

@@ -9,7 +9,7 @@

9{-# LANGUAGE TypeFamilies #-}

10-- | Manipulate @GenericPackageDescription@ from Cabal into something more

11-- useful for us.

12−module Stackage2.PackageDescription

12+module Stackage.PackageDescription

13 ( SimpleDesc (..)

14 , toSimpleDesc

15 , CheckCond (..)

@@ -25,7 +25,7 @@ import Distribution.Compiler (CompilerFlavor)

25import Distribution.Package (Dependency (..))

26import Distribution.PackageDescription

27import Distribution.System (Arch, OS)

28−import Stackage2.Prelude

28+import Stackage.Prelude

29

30data Component = CompLibrary

31 | CompExecutable

Stackage2/PackageIndex.hs → Stackage/PackageIndex.hsrenamed+2−2

@@ -5,7 +5,7 @@

5{-# LANGUAGE RankNTypes #-}

6{-# LANGUAGE ViewPatterns #-}

7-- | Dealing with the 00-index file and all its cabal files.

8−module Stackage2.PackageIndex

8+module Stackage.PackageIndex

9 ( sourcePackageIndex

10 , UnparsedCabalFile (..)

11 , getLatestDescriptions

@@ -20,7 +20,7 @@ import Distribution.PackageDescription (package,

20import Distribution.PackageDescription.Parse (ParseResult (..),

21 parsePackageDescription)

22import Distribution.ParseUtils (PError)

23−import Stackage2.Prelude

23+import Stackage.Prelude

24import System.Directory (getAppUserDataDirectory)

25

26-- | Name of the 00-index.tar downloaded from Hackage.

Stackage2/PerformBuild.hs → Stackage/PerformBuild.hsrenamed+5−5

@@ -5,17 +5,17 @@

5{-# LANGUAGE RecordWildCards #-}

6{-# LANGUAGE NoImplicitPrelude #-}

7{-# LANGUAGE OverloadedStrings #-}

8−module Stackage2.PerformBuild

8+module Stackage.PerformBuild

9 ( performBuild

10 , PerformBuild (..)

11 , BuildException (..)

12 , pbDocDir

13 ) where

14

15−import Stackage2.BuildConstraints

15+import Stackage.BuildConstraints

16−import Stackage2.PackageDescription

16+import Stackage.PackageDescription

17−import Stackage2.BuildPlan

17+import Stackage.BuildPlan

18−import Stackage2.Prelude hiding (pi)

18+import Stackage.Prelude hiding (pi)

19import qualified Data.Map as Map

20import Control.Concurrent.STM.TSem

21import Data.NonNull (fromNullable)

Stackage2/Prelude.hs → Stackage/Prelude.hsrenamed+2−2

@@ -3,9 +3,9 @@

3{-# LANGUAGE NoImplicitPrelude #-}

4{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE TypeFamilies #-}

6−module Stackage2.Prelude

6+module Stackage.Prelude

7 ( module X

8− , module Stackage2.Prelude

8+ , module Stackage.Prelude

9 ) where

10

11import ClassyPrelude.Conduit as X

Stackage2/ServerBundle.hs → Stackage/ServerBundle.hsrenamed+4−4

@@ -2,7 +2,7 @@

2{-# LANGUAGE NoImplicitPrelude #-}

3{-# LANGUAGE OverloadedStrings #-}

4{-# LANGUAGE RecordWildCards #-}

5−module Stackage2.ServerBundle

5+module Stackage.ServerBundle

6 ( serverBundle

7 , epochTime

8 , bpAllPackages

@@ -14,9 +14,9 @@ import qualified Codec.Archive.Tar.Entry as Tar

14import qualified Codec.Compression.GZip as GZip

15import qualified Data.Yaml as Y

16import Foreign.C.Types (CTime (CTime))

17−import Stackage2.BuildConstraints

17+import Stackage.BuildConstraints

18−import Stackage2.BuildPlan

18+import Stackage.BuildPlan

19−import Stackage2.Prelude

19+import Stackage.Prelude

20import qualified System.PosixCompat.Time as PC

21import qualified Text.XML as X

22import Text.XML.Cursor

Stackage2/UpdateBuildPlan.hs → Stackage/UpdateBuildPlan.hsrenamed+4−4

@@ -3,7 +3,7 @@

3{-# LANGUAGE RecordWildCards #-}

4-- | Take an existing build plan and bump all packages to the newest version in

5-- the same major version number.

6−module Stackage2.UpdateBuildPlan

6+module Stackage.UpdateBuildPlan

7 ( updateBuildConstraints

8 , updateBuildPlan

9 ) where

@@ -11,9 +11,9 @@ module Stackage2.UpdateBuildPlan

11import qualified Data.Map as Map

12import Distribution.Version (anyVersion, earlierVersion,

13 orLaterVersion)

14−import Stackage2.BuildConstraints

14+import Stackage.BuildConstraints

15−import Stackage2.BuildPlan

15+import Stackage.BuildPlan

16−import Stackage2.Prelude

16+import Stackage.Prelude

17

18updateBuildPlan :: BuildPlan -> IO BuildPlan

19updateBuildPlan = newBuildPlan . updateBuildConstraints

Stackage2/Upload.hs → Stackage/Upload.hsrenamed+4−4

@@ -4,7 +4,7 @@

4{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE RecordWildCards #-}

6{-# LANGUAGE TupleSections #-}

7−module Stackage2.Upload

7+module Stackage.Upload

8 ( UploadBundle (..)

9 , SnapshotIdent (..)

10 , uploadBundle

@@ -20,9 +20,9 @@ import Data.Default.Class (Default (..))

20import Filesystem (isDirectory, isFile)

21import Network.HTTP.Client

22import Network.HTTP.Client.MultipartFormData

23−import Stackage2.BuildPlan (BuildPlan)

23+import Stackage.BuildPlan (BuildPlan)

24−import Stackage2.Prelude

24+import Stackage.Prelude

25−import Stackage2.ServerBundle (bpAllPackages, docsListing)

25+import Stackage.ServerBundle (bpAllPackages, docsListing)

26import System.IO.Temp (withSystemTempFile)

27

28newtype StackageServer = StackageServer { unStackageServer :: Text }

app/lts-major-bump.hsdeleted−4

@@ -1,4 +0,0 @@

1−import Stackage2.CompleteBuild

2−

3−main :: IO ()

4−main = completeBuild (LTS Major)

app/lts-minor-bump.hsdeleted−4

@@ -1,4 +0,0 @@

1−import Stackage2.CompleteBuild

2−

3−main :: IO ()

4−main = completeBuild (LTS Minor)

app/stackage-nightly.hsdeleted−4

@@ -1,4 +0,0 @@

1−import Stackage2.CompleteBuild

2−

3−main :: IO ()

4−main = completeBuild Nightly

app/stackage.hsnew file+15

@@ -0,0 +1,15 @@

1+import Stackage.CompleteBuild

2+import System.Environment (getArgs)

3+

4+main :: IO ()

5+main = do

6+ args <- getArgs

7+ case args of

8+ [x] | Just y <- lookup x m -> completeBuild y

9+ _ -> error $ "Expected one argument, one of: " ++ unwords (map fst m)

10+ where

11+ m =

12+ [ ("nightly", Nightly)

13+ , ("lts-major", LTS Major)

14+ , ("lts-minor", LTS Minor)

15+ ]

stackage.cabal+22−35

@@ -1,7 +1,7 @@

1name: stackage

2version: 0.1.0.0

3synopsis: "Stable Hackage," tools for creating a vetted set of packages from Hackage.

4−-- description:

4+description: Please see <http://www.stackage.org/package/stackage> for a description and documentation.

5homepage: https://github.com/fpco/stackage

6license: MIT

7license-file: LICENSE

@@ -10,22 +10,25 @@ maintainer: michael@fpcomplete.com

10category: Distribution

11build-type: Simple

12cabal-version: >=1.10

13+extra-source-files: README.md

14+ ChangeLog.md

15+ build-constraints.yaml

13

16

14library

17library

15 default-language: Haskell2010

18 default-language: Haskell2010

16− exposed-modules: Stackage2.Prelude

19+ exposed-modules: Stackage.Prelude

17− Stackage2.BuildConstraints

20+ Stackage.BuildConstraints

18− Stackage2.CorePackages

21+ Stackage.CorePackages

19− Stackage2.PackageIndex

22+ Stackage.PackageIndex

20− Stackage2.BuildPlan

23+ Stackage.BuildPlan

21− Stackage2.CheckBuildPlan

24+ Stackage.CheckBuildPlan

22− Stackage2.UpdateBuildPlan

25+ Stackage.UpdateBuildPlan

23− Stackage2.GithubPings

26+ Stackage.GithubPings

24− Stackage2.PackageDescription

27+ Stackage.PackageDescription

25− Stackage2.ServerBundle

28+ Stackage.ServerBundle

26− Stackage2.Upload

29+ Stackage.Upload

27− Stackage2.PerformBuild

30+ Stackage.PerformBuild

28− Stackage2.CompleteBuild

31+ Stackage.CompleteBuild

29 build-depends: base >= 4 && < 5

32 build-depends: base >= 4 && < 5

30 , containers

33 , containers

31 , Cabal >= 1.14

34 , Cabal >= 1.14

@@ -59,26 +62,10 @@ library

59 , semigroups

62 , semigroups

60 , xml-conduit

63 , xml-conduit

61

64

62−executable stackage-nightly

65+executable stackage

63 default-language: Haskell2010

66 default-language: Haskell2010

64 hs-source-dirs: app

67 hs-source-dirs: app

65− main-is: stackage-nightly.hs

68+ main-is: stackage.hs

66− build-depends: base

67− , stackage

68− ghc-options: -rtsopts -threaded -with-rtsopts=-N

69−

70−executable lts-minor-bump

71− default-language: Haskell2010

72− hs-source-dirs: app

73− main-is: lts-minor-bump.hs

74− build-depends: base

75− , stackage

76− ghc-options: -rtsopts -threaded -with-rtsopts=-N

77−

78−executable lts-major-bump

79− default-language: Haskell2010

80− hs-source-dirs: app

81− main-is: lts-major-bump.hs

82 build-depends: base

69 build-depends: base

83 , stackage

70 , stackage

84 ghc-options: -rtsopts -threaded -with-rtsopts=-N

71 ghc-options: -rtsopts -threaded -with-rtsopts=-N

@@ -88,9 +75,9 @@ test-suite spec

88 default-language: Haskell2010

75 default-language: Haskell2010

89 hs-source-dirs: test

76 hs-source-dirs: test

90 main-is: Spec.hs

77 main-is: Spec.hs

91− other-modules: Stackage2.CorePackagesSpec

78+ other-modules: Stackage.CorePackagesSpec

92− Stackage2.PackageIndexSpec

79+ Stackage.PackageIndexSpec

93− Stackage2.BuildPlanSpec

80+ Stackage.BuildPlanSpec

94 build-depends: base

81 build-depends: base

95 , stackage

82 , stackage

96 , hspec

83 , hspec

test/Stackage2/BuildPlanSpec.hs → test/Stackage/BuildPlanSpec.hsrenamed+6−6

@@ -1,10 +1,10 @@

1{-# LANGUAGE OverloadedStrings, NoImplicitPrelude #-}

2−module Stackage2.BuildPlanSpec (spec) where

2+module Stackage.BuildPlanSpec (spec) where

3

4−import Stackage2.BuildPlan

4+import Stackage.BuildPlan

5−import Stackage2.Prelude

5+import Stackage.Prelude

6−import Stackage2.BuildConstraints

6+import Stackage.BuildConstraints

7−import Stackage2.UpdateBuildPlan

7+import Stackage.UpdateBuildPlan

8import Test.Hspec

9import qualified Data.Yaml as Y

10import Distribution.Version (anyVersion)

@@ -12,7 +12,7 @@ import qualified Data.Map as Map

12

13spec :: Spec

14spec = it "works" $ do

15− bc <- defaultBuildConstraints

15+ bc <- defaultBuildConstraints (error "manager should not be used")

16 bp <- newBuildPlan bc

17 let bs = Y.encode bp

18 ebp' = Y.decodeEither bs

test/Stackage2/CorePackagesSpec.hs → test/Stackage/CorePackagesSpec.hsrenamed+3−3

@@ -1,8 +1,8 @@

1{-# LANGUAGE OverloadedStrings, NoImplicitPrelude #-}

2−module Stackage2.CorePackagesSpec (spec) where

2+module Stackage.CorePackagesSpec (spec) where

3

4−import Stackage2.CorePackages

4+import Stackage.CorePackages

5−import Stackage2.Prelude

5+import Stackage.Prelude

6import Test.Hspec

7

8spec :: Spec

test/Stackage2/PackageIndexSpec.hs → test/Stackage/PackageIndexSpec.hsrenamed+3−3

@@ -1,8 +1,8 @@

1{-# LANGUAGE OverloadedStrings, NoImplicitPrelude #-}

2−module Stackage2.PackageIndexSpec (spec) where

2+module Stackage.PackageIndexSpec (spec) where

3

4−import Stackage2.PackageIndex

4+import Stackage.PackageIndex

5−import Stackage2.Prelude

5+import Stackage.Prelude

6import Test.Hspec

7import Distribution.Package (packageId)

8