Fix a bug in github: ...

(introduced with `0.34.0` / f63eb19)

CHANGELOG.md

@@ -1,4 +1,8 @@
-## Changes in 0.34.0
+## Changes in 0.34.1
+ - Fix a bug in `github: ...` introduced with `0.34.0`
+ (f63eb19b956517b4dd8e28dc5785be5889a99298)
+
+## Changes in 0.34.0 (deprecated)
  - Use `PreferNoHash` as default `GenerateHashStrategy`
  - Add support for library `visibility` (see #382)
  - Reject URLs for `github`

hpack.cabal

@@ -1,13 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.33.0.
+-- This file has been generated from package.yaml by hpack version 0.33.1.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 12b7d6619eff1d32190bac55f5a9d29fc4732f7475eb5e450effd690c9f53964
 
 name: hpack
-version: 0.34.0
+version: 0.34.1
 synopsis: A modern format for Haskell packages
 description: See README at <https://github.com/sol/hpack#readme>
 category: Development

package.yaml

@@ -1,5 +1,5 @@
 name: hpack
-version: 0.34.0
+version: 0.34.1
 synopsis: A modern format for Haskell packages
 description: See README at <https://github.com/sol/hpack#readme>
 maintainer: Simon Hengel <[email protected]>

src/Hpack/Config.hs

@@ -1166,7 +1166,7 @@ toPackage_ dir (Product g PackageConfig{..}) = do
  github = toSourceRepository <$> packageConfigGithub
  where
  toSourceRepository :: GitHub -> SourceRepository
- toSourceRepository (GitHub repo owner subdir) = SourceRepository (githubBaseUrl ++ owner ++ "/" ++ repo) subdir
+ toSourceRepository (GitHub owner repo subdir) = SourceRepository (githubBaseUrl ++ owner ++ "/" ++ repo) subdir
 
  homepage :: Maybe String
  homepage = case packageConfigHomepage of

test/EndToEndSpec.hs

@@ -111,13 +111,13 @@ spec = around_ (inTempDirectoryNamed "foo") $ do
  describe "github" $ do
  it "accepts owner/repo" $ do
  [i|
- github: hspec/hspec
+ github: sol/hpack
  |] `shouldRenderTo` package [i|
- homepage: https://github.com/hspec/hspec#readme
- bug-reports: https://github.com/hspec/hspec/issues
+ homepage: https://github.com/sol/hpack#readme
+ bug-reports: https://github.com/sol/hpack/issues
  source-repository head
  type: git
- location: https://github.com/hspec/hspec
+ location: https://github.com/sol/hpack
  |]
 
  it "accepts owner/repo/path" $ do