Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
name: Cache ~/.stack
with:
path: ~/.stack
key: ${{ runner.os }}-${{ matrix.ghc }}-v6
key: ${{ runner.os }}-${{ matrix.ghc }}-v7

- name: Add ~/.local/bin to PATH
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
Expand Down
4 changes: 2 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ You can also install it using your package manager:

Feature requests are welcome! Use the [issue tracker] for that.

[issue tracker]: https://github.com/jaspervdj/stylish-haskell/issues
[issue tracker]: https://github.com/haskell/stylish-haskell/issues

## Example

Expand Down Expand Up @@ -234,7 +234,7 @@ haskell-mode manual.

You can quickly grab the latest binary and run `stylish-haskell` like so:

curl -sL https://raw.github.com/jaspervdj/stylish-haskell/master/scripts/latest.sh | sh -s .
curl -sL https://raw.github.com/haskell/stylish-haskell/master/scripts/latest.sh | sh -s .

Where the `.` can be replaced with the arguments you pass to `stylish-haskell`.

Expand Down
2 changes: 1 addition & 1 deletion scripts/latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e
PACKAGE=stylish-haskell
echo Downloading and running $PACKAGE...

RELEASES=$(curl --silent https://github.com/jaspervdj/$PACKAGE/releases)
RELEASES=$(curl --silent https://github.com/haskell/$PACKAGE/releases)
URL=https://github.com/$(echo $RELEASES | grep -o '\"[^\"]*-linux-x86_64\.tar\.gz\"' | sed s/\"//g | head -n1)
VERSION=$(echo $URL | sed -e 's/.*-\(v[\.0-9]\+-linux-x86_64\)\.tar\.gz/\1/')
TEMP=$(mktemp --directory .$PACKAGE-XXXXX)
Expand Down
2 changes: 1 addition & 1 deletion scripts/stylish-haskell.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
# Ported from https://github.com/ndmitchell/hlint/blob/master/misc/travis.sh

curl -sL https://raw.github.com/jaspervdj/stylish-haskell/master/scripts/latest.sh | sh -s -- stylish-haskell $*
curl -sL https://raw.github.com/haskell/stylish-haskell/master/scripts/latest.sh | sh -s -- stylish-haskell $*
6 changes: 3 additions & 3 deletions stylish-haskell.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Cabal-version: 2.4
Name: stylish-haskell
Version: 0.12.2.0
Synopsis: Haskell code prettifier
Homepage: https://github.com/jaspervdj/stylish-haskell
Homepage: https://github.com/haskell/stylish-haskell
License: BSD-3-Clause
License-file: LICENSE
Author: Jasper Van der Jeugt <m@jaspervdj.be>
Expand All @@ -16,7 +16,7 @@ Description:

.

<https://github.com/jaspervdj/stylish-haskell/blob/master/README.markdown>
<https://github.com/haskell/stylish-haskell/blob/master/README.markdown>

Extra-source-files:
CHANGELOG,
Expand Down Expand Up @@ -179,4 +179,4 @@ Test-suite stylish-haskell-tests

Source-repository head
Type: git
Location: https://github.com/jaspervdj/stylish-haskell
Location: https://github.com/haskell/stylish-haskell
4 changes: 2 additions & 2 deletions tests/Language/Haskell/Stylish/Step/Data/Tests.hs
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ case19 = expected @=? testStep (step indentIndentStyle) input

-- | Should not break Enums (data without records) formatting
--
-- See https://github.com/jaspervdj/stylish-haskell/issues/262
-- See https://github.com/haskell/stylish-haskell/issues/262
case20 :: Assertion
case20 = input @=? testStep (step indentIndentStyle) input
where
Expand Down Expand Up @@ -1277,7 +1277,7 @@ case57 = assertSnippet (step defaultConfig)

-- | Should not break DataKinds in records
--
-- See https://github.com/jaspervdj/stylish-haskell/issues/330
-- See https://github.com/haskell/stylish-haskell/issues/330
case58 :: Assertion
case58 = expected @=? testStep (step sameIndentStyle) input
where
Expand Down
7 changes: 4 additions & 3 deletions tests/Language/Haskell/Stylish/Step/Imports/FelixTests.hs
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
-- | Tests contributed by Felix Mulder as part of
-- <https://github.com/jaspervdj/stylish-haskell/pull/293>.
-- <https://github.com/haskell/stylish-haskell/pull/293>.
module Language.Haskell.Stylish.Step.Imports.FelixTests
( tests
) where

--------------------------------------------------------------------------------
import GHC.Stack (HasCallStack,
withFrozenCallStack)
import Prelude hiding (lines)
import Test.Framework (Test, testGroup)
import Test.Framework.Providers.HUnit (testCase)
import Test.HUnit (Assertion)
import GHC.Stack (HasCallStack, withFrozenCallStack)
import Prelude hiding (lines)

--------------------------------------------------------------------------------
import Language.Haskell.Stylish.Module
Expand Down