Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 74e5d360bf68
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1d82087bedb
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 4, 2019

  1. update-stackage: make sure the Stackage package list is sorted alphab… 

    …etically

This prevents redundant commits re-ordering the list mindless because upstream
generated the file in a different order.
    @peti
    peti committed Mar 4, 2019
    Copy the full SHA
    d1d8208 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 update-stackage.sh
10 changes: 6 additions & 4 deletions update-stackage.sh
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,9 @@

set -eu -o pipefail

tmpfile=$(mktemp "stackage-update.XXXXXXX")
trap "rm $tmpfile" 0
tmpfile=$(mktemp "update-stackage.XXXXXXX")
# shellcheck disable=SC2064
trap "rm ${tmpfile} ${tmpfile}.new" 0

curl -L -s "https://www.stackage.org/lts/cabal.config" >"$tmpfile"
version=$(sed -n "s/^--.*http:..www.stackage.org.snapshot.lts-//p" "$tmpfile")
@@ -16,7 +17,7 @@ sed -r \
-e 's|,$||' \
-e '/installed$/d' \
-e '/^$/d' \
-i "$tmpfile"
< "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"

# Drop restrictions on some tools where we always want the latest version.
sed -r \
@@ -38,9 +39,10 @@ sed -r \
-e '/ ShellCheck /d' \
-e '/ stack /d' \
-e '/ weeder /d' \
-i "$tmpfile"
< "${tmpfile}.new" > "${tmpfile}"

# Drop the previous configuration ...
# shellcheck disable=SC1004
sed -e '/# LTS Haskell/,/^$/c \TODO\
' -i nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml