master..83e8cc9 · typeable/uuid

git.iko.soy/typeable/uuid

on 83e8cc9 help sign in

.github/workflows/haskell-ci-bench.yml+68−55

since splitsnapshots

unifiedsplit

@@ -8,9 +8,9 @@

9# For more information, see https://github.com/haskell-CI/haskell-ci

10#

11−# version: 0.19.20240702

11+# version: 0.15.20220826

12#

13−# REGENDATA ("0.19.20240702",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])

13+# REGENDATA ("0.15.20220826",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])

14#

15name: Benchmarks

16on:

@@ -27,34 +27,19 @@ jobs:

27 timeout-minutes:

28 60

29 container:

30− image: buildpack-deps:jammy

30+ image: buildpack-deps:bionic

31 continue-on-error: ${{ matrix.allow-failure }}

32 strategy:

33 matrix:

34 include:

35− - compiler: ghc-9.10.1

35+ - compiler: ghc-9.4.2

36 compilerKind: ghc

37− compilerVersion: 9.10.1

37+ compilerVersion: 9.4.2

38 setup-method: ghcup

39 allow-failure: false

40− - compiler: ghc-9.8.2

40+ - compiler: ghc-9.2.4

41 compilerKind: ghc

42− compilerVersion: 9.8.2

42+ compilerVersion: 9.2.4

43− setup-method: ghcup

44− allow-failure: false

45− - compiler: ghc-9.6.6

46− compilerKind: ghc

47− compilerVersion: 9.6.6

48− setup-method: ghcup

49− allow-failure: false

50− - compiler: ghc-9.4.8

51− compilerKind: ghc

52− compilerVersion: 9.4.8

53− setup-method: ghcup

54− allow-failure: false

55− - compiler: ghc-9.2.8

56− compilerKind: ghc

57− compilerVersion: 9.2.8

58 setup-method: ghcup

43 setup-method: ghcup

59 allow-failure: false

44 allow-failure: false

60 - compiler: ghc-9.0.2

45 - compiler: ghc-9.0.2

@@ -70,12 +55,27 @@ jobs:

70 - compiler: ghc-8.8.4

55 - compiler: ghc-8.8.4

71 compilerKind: ghc

56 compilerKind: ghc

72 compilerVersion: 8.8.4

57 compilerVersion: 8.8.4

73− setup-method: ghcup

58+ setup-method: hvr-ppa

74 allow-failure: false

59 allow-failure: false

75− - compiler: ghc-8.6.5

60+ - compiler: ghc-8.6.4

76 compilerKind: ghc

61 compilerKind: ghc

77− compilerVersion: 8.6.5

62+ compilerVersion: 8.6.4

63+ setup-method: hvr-ppa

64+ allow-failure: false

65+ - compiler: ghc-8.4.4

66+ compilerKind: ghc

67+ compilerVersion: 8.4.4

68+ setup-method: hvr-ppa

69+ allow-failure: false

70+ - compiler: ghc-8.2.2

71+ compilerKind: ghc

72+ compilerVersion: 8.2.2

78− setup-method: ghcup

73+ setup-method: hvr-ppa

74+ allow-failure: false

75+ - compiler: ghc-8.0.2

76+ compilerKind: ghc

77+ compilerVersion: 8.0.2

78+ setup-method: hvr-ppa

79 allow-failure: false

80 fail-fast: false

81 steps:

@@ -83,11 +83,21 @@ jobs:

83 run: |

84 apt-get update

85 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

86+ if [ "${{ matrix.setup-method }}" = ghcup ]; then

86− mkdir -p "$HOME/.ghcup/bin"

87+ mkdir -p "$HOME/.ghcup/bin"

87− curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"

88+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"

88− chmod a+x "$HOME/.ghcup/bin/ghcup"

89+ chmod a+x "$HOME/.ghcup/bin/ghcup"

89− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

90+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

90− "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

91+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

92+ else

93+ apt-add-repository -y 'ppa:hvr/ghc'

94+ apt-get update

95+ apt-get install -y "$HCNAME"

96+ mkdir -p "$HOME/.ghcup/bin"

97+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"

98+ chmod a+x "$HOME/.ghcup/bin/ghcup"

99+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

100+ fi

91 env:

101 env:

92 HCKIND: ${{ matrix.compilerKind }}

102 HCKIND: ${{ matrix.compilerKind }}

93 HCNAME: ${{ matrix.compiler }}

103 HCNAME: ${{ matrix.compiler }}

@@ -99,13 +109,20 @@ jobs:

99 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

109 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

100 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

110 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

101 HCDIR=/opt/$HCKIND/$HCVER

111 HCDIR=/opt/$HCKIND/$HCVER

112+ if [ "${{ matrix.setup-method }}" = ghcup ]; then

102− HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")

113+ HC=$HOME/.ghcup/bin/$HCKIND-$HCVER

103− HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')

114+ echo "HC=$HC" >> "$GITHUB_ENV"

104− HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')

115+ echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"

116+ echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"

117+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

118+ else

119+ HC=$HCDIR/bin/$HCKIND

105− echo "HC=$HC" >> "$GITHUB_ENV"

120+ echo "HC=$HC" >> "$GITHUB_ENV"

106− echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"

121+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

107− echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"

122+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

108− echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"

123+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

124+ fi

125+

109 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

126 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

110 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

127 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

111 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

128 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

@@ -155,14 +172,14 @@ jobs:

155 - name: install cabal-plan

172 - name: install cabal-plan

156 run: |

173 run: |

157 mkdir -p $HOME/.cabal/bin

174 mkdir -p $HOME/.cabal/bin

158− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz

175+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz

159− echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -

176+ echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -

160 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan

177 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan

161 rm -f cabal-plan.xz

178 rm -f cabal-plan.xz

162 chmod a+x $HOME/.cabal/bin/cabal-plan

179 chmod a+x $HOME/.cabal/bin/cabal-plan

163 cabal-plan --version

180 cabal-plan --version

164 - name: checkout

181 - name: checkout

165− uses: actions/checkout@v4

182+ uses: actions/checkout@v2

166 with:

183 with:

167 path: source

184 path: source

168 - name: initial cabal.project for sdist

185 - name: initial cabal.project for sdist

@@ -186,19 +203,19 @@ jobs:

186 touch cabal.project

203 touch cabal.project

187 touch cabal.project.local

204 touch cabal.project.local

188 echo "packages: ${PKGDIR_uuid_bench}" >> cabal.project

205 echo "packages: ${PKGDIR_uuid_bench}" >> cabal.project

189− echo "package uuid-bench" >> cabal.project

206+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-bench" >> cabal.project ; fi

190− echo " ghc-options: -Werror=missing-methods" >> cabal.project

207+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

191 cat >> cabal.project <<EOF

208 cat >> cabal.project <<EOF

192 EOF

209 EOF

193− $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(uuid-bench)$/; }' >> cabal.project.local

210+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid-bench)$/; }' >> cabal.project.local

194 cat cabal.project

211 cat cabal.project

195 cat cabal.project.local

212 cat cabal.project.local

196 - name: dump install plan

213 - name: dump install plan

197 run: |

214 run: |

198 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all

215 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all

199 cabal-plan

216 cabal-plan

200− - name: restore cache

217+ - name: cache

201− uses: actions/cache/restore@v4

218+ uses: actions/cache@v2

202 with:

219 with:

203 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

220 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

204 path: ~/.cabal/store

221 path: ~/.cabal/store

@@ -219,7 +236,7 @@ jobs:

219 ${CABAL} -vnormal check

236 ${CABAL} -vnormal check

220 - name: haddock

237 - name: haddock

221 run: |

238 run: |

222− $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

239+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

223 - name: unconstrained build

240 - name: unconstrained build

224 run: |

241 run: |

225 rm -f cabal.project.local

242 rm -f cabal.project.local

@@ -229,13 +246,9 @@ jobs:

229 rm -f cabal.project.local

246 rm -f cabal.project.local

230 - name: constraint set random-1.2

247 - name: constraint set random-1.2

231 run: |

248 run: |

232− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run

233− cabal-plan topo | sort

234 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all

249 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all

235 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all

250 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all

236− - name: save cache

251+ - name: constraint set random-1.1

237− uses: actions/cache/save@v4

252+ run: |

238− if: always()

253+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all

239− with:

254+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all

240− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

241− path: ~/.cabal/store

.github/workflows/haskell-ci.yml+93−70

@@ -8,9 +8,9 @@

9# For more information, see https://github.com/haskell-CI/haskell-ci

10#

11−# version: 0.19.20241223

11+# version: 0.15.20220826

12#

13−# REGENDATA ("0.19.20241223",["github","cabal.project"])

13+# REGENDATA ("0.15.20220826",["github","cabal.project"])

14#

15name: Haskell-CI

16on:

@@ -27,86 +27,97 @@ jobs:

27 timeout-minutes:

28 60

29 container:

30− image: buildpack-deps:jammy

30+ image: buildpack-deps:bionic

31 continue-on-error: ${{ matrix.allow-failure }}

32 strategy:

33 matrix:

34 include:

35− - compiler: ghc-9.12.1

35+ - compiler: ghc-9.4.2

36 compilerKind: ghc

37− compilerVersion: 9.12.1

37+ compilerVersion: 9.4.2

38 setup-method: ghcup

39 allow-failure: false

40− - compiler: ghc-9.10.1

40+ - compiler: ghc-9.2.4

41 compilerKind: ghc

42− compilerVersion: 9.10.1

42+ compilerVersion: 9.2.4

43 setup-method: ghcup

44 allow-failure: false

45− - compiler: ghc-9.8.4

45+ - compiler: ghc-9.0.2

46 compilerKind: ghc

47− compilerVersion: 9.8.4

47+ compilerVersion: 9.0.2

48 setup-method: ghcup

49 allow-failure: false

50− - compiler: ghc-9.6.6

50+ - compiler: ghc-8.10.7

51 compilerKind: ghc

52− compilerVersion: 9.6.6

52+ compilerVersion: 8.10.7

53 setup-method: ghcup

54 allow-failure: false

55− - compiler: ghc-9.4.8

55+ - compiler: ghc-8.8.4

56 compilerKind: ghc

57− compilerVersion: 9.4.8

57+ compilerVersion: 8.8.4

58− setup-method: ghcup

58+ setup-method: hvr-ppa

59 allow-failure: false

60− - compiler: ghc-9.2.8

60+ - compiler: ghc-8.6.4

61 compilerKind: ghc

62− compilerVersion: 9.2.8

62+ compilerVersion: 8.6.4

63− setup-method: ghcup

63+ setup-method: hvr-ppa

64 allow-failure: false

65− - compiler: ghc-9.0.2

65+ - compiler: ghc-8.4.4

66 compilerKind: ghc

67− compilerVersion: 9.0.2

67+ compilerVersion: 8.4.4

68− setup-method: ghcup

68+ setup-method: hvr-ppa

69 allow-failure: false

70− - compiler: ghc-8.10.7

70+ - compiler: ghc-8.2.2

71 compilerKind: ghc

72− compilerVersion: 8.10.7

72+ compilerVersion: 8.2.2

73− setup-method: ghcup

73+ setup-method: hvr-ppa

74 allow-failure: false

75− - compiler: ghc-8.8.4

75+ - compiler: ghc-8.0.2

76 compilerKind: ghc

77− compilerVersion: 8.8.4

77+ compilerVersion: 8.0.2

78− setup-method: ghcup

78+ setup-method: hvr-ppa

79 allow-failure: false

80− - compiler: ghc-8.6.5

80+ - compiler: ghc-7.10.3

81 compilerKind: ghc

82− compilerVersion: 8.6.5

82+ compilerVersion: 7.10.3

83+ setup-method: hvr-ppa

84+ allow-failure: false

85+ - compiler: ghc-7.8.4

86+ compilerKind: ghc

87+ compilerVersion: 7.8.4

88+ setup-method: hvr-ppa

89+ allow-failure: false

90+ - compiler: ghc-7.6.3

91+ compilerKind: ghc

92+ compilerVersion: 7.6.3

83− setup-method: ghcup

93+ setup-method: hvr-ppa

94+ allow-failure: false

95+ - compiler: ghc-7.4.2

96+ compilerKind: ghc

97+ compilerVersion: 7.4.2

98+ setup-method: hvr-ppa

84 allow-failure: false

99 allow-failure: false

85 fail-fast: false

100 fail-fast: false

86 steps:

101 steps:

87− - name: apt-get install

102+ - name: apt

88 run: |

103 run: |

89 apt-get update

104 apt-get update

90 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

105 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

91− - name: Install GHCup

92− run: |

93− mkdir -p "$HOME/.ghcup/bin"

94− curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"

95− chmod a+x "$HOME/.ghcup/bin/ghcup"

96− - name: Install cabal-install

97− run: |

98− "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

99− echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"

100− - name: Install GHC (GHCup)

101− if: matrix.setup-method == 'ghcup'

106+ if [ "${{ matrix.setup-method }}" = ghcup ]; then

102− run: |

107+ mkdir -p "$HOME/.ghcup/bin"

108+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"

109+ chmod a+x "$HOME/.ghcup/bin/ghcup"

103− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

110+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

104− HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")

111+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

105− HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')

112+ else

106− HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')

113+ apt-add-repository -y 'ppa:hvr/ghc'

107− echo "HC=$HC" >> "$GITHUB_ENV"

114+ apt-get update

108− echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"

115+ apt-get install -y "$HCNAME"

109− echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"

116+ mkdir -p "$HOME/.ghcup/bin"

117+ curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"

118+ chmod a+x "$HOME/.ghcup/bin/ghcup"

119+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

120+ fi

110 env:

121 env:

111 HCKIND: ${{ matrix.compilerKind }}

122 HCKIND: ${{ matrix.compilerKind }}

112 HCNAME: ${{ matrix.compiler }}

123 HCNAME: ${{ matrix.compiler }}

@@ -117,12 +128,28 @@ jobs:

117 echo "LANG=C.UTF-8" >> "$GITHUB_ENV"

128 echo "LANG=C.UTF-8" >> "$GITHUB_ENV"

118 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

129 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

119 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

130 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

131+ HCDIR=/opt/$HCKIND/$HCVER

132+ if [ "${{ matrix.setup-method }}" = ghcup ]; then

133+ HC=$HOME/.ghcup/bin/$HCKIND-$HCVER

134+ echo "HC=$HC" >> "$GITHUB_ENV"

135+ echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"

136+ echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"

137+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

138+ else

139+ HC=$HCDIR/bin/$HCKIND

140+ echo "HC=$HC" >> "$GITHUB_ENV"

141+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

142+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

143+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

144+ fi

145+

120 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

146 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

121 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

147 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

122 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

148 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

123 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

149 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

124 echo "HEADHACKAGE=false" >> "$GITHUB_ENV"

150 echo "HEADHACKAGE=false" >> "$GITHUB_ENV"

125 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

151 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

152+ echo "GHCJSARITH=0" >> "$GITHUB_ENV"

126 env:

153 env:

127 HCKIND: ${{ matrix.compilerKind }}

154 HCKIND: ${{ matrix.compilerKind }}

128 HCNAME: ${{ matrix.compiler }}

155 HCNAME: ${{ matrix.compiler }}

@@ -165,14 +192,14 @@ jobs:

165 - name: install cabal-plan

192 - name: install cabal-plan

166 run: |

193 run: |

167 mkdir -p $HOME/.cabal/bin

194 mkdir -p $HOME/.cabal/bin

168− curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz

195+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz

169− echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -

196+ echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -

170 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan

197 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan

171 rm -f cabal-plan.xz

198 rm -f cabal-plan.xz

172 chmod a+x $HOME/.cabal/bin/cabal-plan

199 chmod a+x $HOME/.cabal/bin/cabal-plan

173 cabal-plan --version

200 cabal-plan --version

174 - name: checkout

201 - name: checkout

175− uses: actions/checkout@v4

202+ uses: actions/checkout@v2

176 with:

203 with:

177 path: source

204 path: source

178 - name: initial cabal.project for sdist

205 - name: initial cabal.project for sdist

@@ -200,21 +227,21 @@ jobs:

200 touch cabal.project.local

227 touch cabal.project.local

201 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project

228 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project

202 echo "packages: ${PKGDIR_uuid}" >> cabal.project

229 echo "packages: ${PKGDIR_uuid}" >> cabal.project

203− echo "package uuid-types" >> cabal.project

230+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-types" >> cabal.project ; fi

204− echo " ghc-options: -Werror=missing-methods" >> cabal.project

231+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

205− echo "package uuid" >> cabal.project

232+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi

206− echo " ghc-options: -Werror=missing-methods" >> cabal.project

233+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

207 cat >> cabal.project <<EOF

234 cat >> cabal.project <<EOF

208 EOF

235 EOF

209− $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local

236+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local

210 cat cabal.project

237 cat cabal.project

211 cat cabal.project.local

238 cat cabal.project.local

212 - name: dump install plan

239 - name: dump install plan

213 run: |

240 run: |

214 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all

241 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all

215 cabal-plan

242 cabal-plan

216− - name: restore cache

243+ - name: cache

217− uses: actions/cache/restore@v4

244+ uses: actions/cache@v2

218 with:

245 with:

219 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

246 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

220 path: ~/.cabal/store

247 path: ~/.cabal/store

@@ -240,7 +267,7 @@ jobs:

240 ${CABAL} -vnormal check

267 ${CABAL} -vnormal check

241 - name: haddock

268 - name: haddock

242 run: |

269 run: |

243− $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

270+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

244 - name: unconstrained build

271 - name: unconstrained build

245 run: |

272 run: |

246 rm -f cabal.project.local

273 rm -f cabal.project.local

@@ -250,13 +277,9 @@ jobs:

250 rm -f cabal.project.local

277 rm -f cabal.project.local

251 - name: constraint set random-1.2

278 - name: constraint set random-1.2

252 run: |

279 run: |

253− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run

280+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all ; fi

254− cabal-plan topo | sort

281+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all ; fi

282+ - name: constraint set random-1.1

283+ run: |

255− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all

284+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all

256− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all

285+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all

257− - name: save cache

258− if: always()

259− uses: actions/cache/save@v4

260− with:

261− key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

262− path: ~/.cabal/store

cabal.haskell-ci+4−2

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

1branches: master

2−-- jobs-selection: any

2+jobs-selection: any

3−head-hackage: False

4+constraint-set random-1.1

5+ constraints: random==1.1.*

5constraint-set random-1.2

7constraint-set random-1.2

6 ghc: >=7.10

8 ghc: >=7.10

gen-ci.sh → haskell-ci.shrenamed

The content is the same.

uuid-bench/bench/uuid-benchmark.hs+1

@@ -3,6 +3,7 @@ import Data.Char (ord)

3import Data.IORef

4import Data.Word

5import qualified Data.UUID as U

6+import qualified Data.UUID.V1 as U

6import qualified Data.UUID.V4 as U

7import qualified Data.UUID.V4 as U

7import qualified Data.UUID.V3 as U3

8import qualified Data.UUID.V3 as U3

8import qualified Data.UUID.V5 as U5

9import qualified Data.UUID.V5 as U5

uuid-bench/uuid-bench.cabal+18−17

@@ -14,15 +14,15 @@ build-type: Simple

15-- Benchmarking with older GHCs is not meaningful

16tested-with:

17− GHC ==8.6.5

17+ GHC ==8.0.2

18+ || ==8.2.2

19+ || ==8.4.4

20+ || ==8.6.4

18 || ==8.8.4

21 || ==8.8.4

19 || ==8.10.7

22 || ==8.10.7

20 || ==9.0.2

23 || ==9.0.2

21− || ==9.2.8

24+ || ==9.2.4

22− || ==9.4.8

25+ || ==9.4.2

23− || ==9.6.6

24− || ==9.8.2

25− || ==9.10.1

27synopsis: UUID benchmarks

28description:

@@ -40,24 +40,25 @@ source-repository head

41library

42 build-depends:

43− base >=4.12.0.0 && <5

43+ base >=4.9 && <5

44− , binary >=0.8.6.0 && <0.9

44+ , binary >=0.5.1.0 && <0.9

45− , bytestring >=0.10.8.2 && <0.13

45+ , bytestring >=0.9.2.1 && <0.12

46 , cryptohash-md5 >=0.11.100 && <0.12

47 , cryptohash-sha1 >=0.11.100 && <0.12

48− , deepseq >=1.4.4.0 && <1.6

48+ , deepseq >=1.3.0.0 && <1.5

49 , entropy >=0.3.7 && <0.5

50− , hashable >=1.4.4.0 && <1.6

50+ , hashable >=1.2.7.0 && <1.5

51 , network-info >=0.2 && <0.3

52− , random >=1.2.1.2 && <1.3

52+ , random >=1.1 && <1.3

53− , template-haskell >=2.14.0.0 && <2.23

53+ , template-haskell >=2.7.0.0 && <2.20

54− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2

54+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1

55 , time >=1.4 && <1.13

57 -- uuid modules

58 exposed-modules:

59 Data.UUID

60 Data.UUID.Util

61+ Data.UUID.V1

61 Data.UUID.V3

62 Data.UUID.V3

62 Data.UUID.V4

63 Data.UUID.V4

63 Data.UUID.V5

64 Data.UUID.V5

@@ -99,13 +100,13 @@ benchmark uuid-types-benchmark

100

100 -- deps w/o inherited constraints

101 -- deps w/o inherited constraints

101 build-depends:

102 build-depends:

102− containers >=0.5 && <0.8

103+ containers >=0.5 && <0.7

103 , criterion >=1.5 && <1.7

104 , criterion >=1.5 && <1.7

104 , unordered-containers >=0.2.7 && <0.3

105 , unordered-containers >=0.2.7 && <0.3

105

106

106benchmark uuid-benchmark

107benchmark uuid-benchmark

107 type: exitcode-stdio-1.0

108 type: exitcode-stdio-1.0

108− main-is: uuid-benchmark.hs

109+ main-is: uuid-benchmark.hs

109 hs-source-dirs: bench

110 hs-source-dirs: bench

110 default-language: Haskell2010

111 default-language: Haskell2010

111 default-extensions:

112 default-extensions:

@@ -118,7 +119,7 @@ benchmark uuid-benchmark

118 build-depends:

119 build-depends:

119 base

120 base

120 , random

121 , random

121− , uuid-bench

122+ , uuid

122

123

123 -- deps w/o inherited constraints

124 -- deps w/o inherited constraints

124 build-depends:

125 build-depends:

uuid-types/ChangeLog.md−4

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

1−## 1.0.6 (2023-04-16)

2−

3−- Support GHC-8.6.5..GHC-9.10.1

4−

5## 1.0.5 (2021-05-03)

1## 1.0.5 (2021-05-03)

7- Add (Template Haskell) `Lift UUID` instance

3- Add (Template Haskell) `Lift UUID` instance

uuid-types/src/Data/UUID/Types.hs+4

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

1+{-# LANGUAGE CPP #-}

3+#if __GLASGOW_HASKELL__ >= 702

1{-# LANGUAGE Trustworthy #-}

4{-# LANGUAGE Trustworthy #-}

5+#endif

3{- |

7{- |

4Module : Data.UUID.Types

8Module : Data.UUID.Types

uuid-types/src/Data/UUID/Types/Internal.hs+75−2

@@ -2,9 +2,14 @@

2{-# LANGUAGE DeriveDataTypeable #-}

3{-# LANGUAGE TypeFamilies #-}

4{-# LANGUAGE ViewPatterns #-}

5+#if __GLASGOW_HASKELL__ >= 704

5{-# LANGUAGE Unsafe #-}

6{-# LANGUAGE Unsafe #-}

7+#endif

8+#if __GLASGOW_HASKELL__ >=800

6{-# LANGUAGE DeriveLift #-}

9{-# LANGUAGE DeriveLift #-}

7{-# LANGUAGE StandaloneDeriving #-}

10{-# LANGUAGE StandaloneDeriving #-}

11+#endif

12+

8{-# OPTIONS_HADDOCK hide #-}

13{-# OPTIONS_HADDOCK hide #-}

10-- |

15-- |

@@ -46,11 +51,13 @@ module Data.UUID.Types.Internal

47import Prelude hiding (null)

52import Prelude hiding (null)

54+import Control.Applicative ((<*>))

49import Control.DeepSeq (NFData (..))

55import Control.DeepSeq (NFData (..))

50import Control.Monad (guard, liftM2)

56import Control.Monad (guard, liftM2)

51import Data.Bits

57import Data.Bits

52import Data.Char

58import Data.Char

53import Data.Data

59import Data.Data

60+import Data.Functor ((<$>))

54import Data.Hashable

61import Data.Hashable

55import Data.List (elemIndices)

62import Data.List (elemIndices)

56import Foreign.Ptr (Ptr)

63import Foreign.Ptr (Ptr)

@@ -69,15 +76,24 @@ import qualified Data.Text.Encoding as T

70import Data.UUID.Types.Internal.Builder

77import Data.UUID.Types.Internal.Builder

79+#if MIN_VERSION_random(1,2,0)

72import System.Random (Random (..), uniform)

80import System.Random (Random (..), uniform)

73import System.Random.Stateful (Uniform (..), uniformWord64)

81import System.Random.Stateful (Uniform (..), uniformWord64)

82+#else

83+import System.Random (Random (..), next)

84+#endif

86+#if __GLASGOW_HASKELL__ >=800

75import Language.Haskell.TH.Syntax (Lift)

87import Language.Haskell.TH.Syntax (Lift)

88+#else

89+import Language.Haskell.TH (appE, varE)

90+import Language.Haskell.TH.Syntax (Lift (..), mkNameG_v, Lit (IntegerL), Exp (LitE))

91+#endif

77-- | Type representing <https://en.wikipedia.org/wiki/UUID Universally Unique Identifiers (UUID)> as specified in

93-- | Type representing <https://en.wikipedia.org/wiki/UUID Universally Unique Identifiers (UUID)> as specified in

78-- <http://tools.ietf.org/html/rfc4122 RFC 4122>.

94-- <http://tools.ietf.org/html/rfc4122 RFC 4122>.

79data UUID = UUID {-# UNPACK #-} !Word64 {-# UNPACK #-} !Word64

95data UUID = UUID {-# UNPACK #-} !Word64 {-# UNPACK #-} !Word64

80− deriving (Eq, Ord)

96+ deriving (Eq, Ord, Typeable)

81{-

97{-

82 Prior to uuid-types-1.0.4:

98 Prior to uuid-types-1.0.4:

83 !Word32 !Word32 !Word32 !Word32

99 !Word32 !Word32 !Word32 !Word32

@@ -455,13 +471,23 @@ fromASCIIBytes bs = do

455-- | Similar to `toASCIIBytes` except we produce a lazy `BL.ByteString`.

471-- | Similar to `toASCIIBytes` except we produce a lazy `BL.ByteString`.

456toLazyASCIIBytes :: UUID -> BL.ByteString

472toLazyASCIIBytes :: UUID -> BL.ByteString

457toLazyASCIIBytes =

473toLazyASCIIBytes =

474+#if MIN_VERSION_bytestring(0,10,0)

458 BL.fromStrict

475 BL.fromStrict

476+#else

477+ BL.fromChunks . return

478+#endif

459 . toASCIIBytes

479 . toASCIIBytes

460

480

461-- | Similar to `fromASCIIBytes` except parses from a lazy `BL.ByteString`.

481-- | Similar to `fromASCIIBytes` except parses from a lazy `BL.ByteString`.

462fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID

482fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID

463fromLazyASCIIBytes bs =

483fromLazyASCIIBytes bs =

464− if BL.length bs == 36 then fromASCIIBytes (BL.toStrict bs) else Nothing

484+ if BL.length bs == 36 then fromASCIIBytes (

485+#if MIN_VERSION_bytestring(0,10,0)

486+ BL.toStrict bs

487+#else

488+ B.concat $ BL.toChunks bs

489+#endif

490+ ) else Nothing

465

491

466--

492--

467-- Class Instances

493-- Class Instances

@@ -469,6 +495,7 @@ fromLazyASCIIBytes bs =

469

495

470-- | This 'Random' instance produces __insecure__ version 4 UUIDs as

496-- | This 'Random' instance produces __insecure__ version 4 UUIDs as

471-- specified in <http://tools.ietf.org/html/rfc4122 RFC 4122>.

497-- specified in <http://tools.ietf.org/html/rfc4122 RFC 4122>.

498+#if MIN_VERSION_random(1,2,0)

472instance Random UUID where

499instance Random UUID where

473 random = uniform

500 random = uniform

474 randomR _ = random -- range is ignored

501 randomR _ = random -- range is ignored

@@ -479,6 +506,29 @@ instance Uniform UUID where

479 w0 <- uniformWord64 gen

506 w0 <- uniformWord64 gen

480 w1 <- uniformWord64 gen

507 w1 <- uniformWord64 gen

481 pure $ buildFromBytes 4 /-/ w0 /-/ w1

508 pure $ buildFromBytes 4 /-/ w0 /-/ w1

509+#else

510+instance Random UUID where

511+ random g = (fromGenNext w0 w1 w2 w3 w4, g4)

512+ where (w0, g0) = next g

513+ (w1, g1) = next g0

514+ (w2, g2) = next g1

515+ (w3, g3) = next g2

516+ (w4, g4) = next g3

517+ randomR _ = random -- range is ignored

518+

519+-- |Build a UUID from the results of five calls to next on a StdGen.

520+-- While next on StdGet returns an Int, it doesn't provide 32 bits of

521+-- randomness. This code relies on at last 28 bits of randomness in the

522+-- and optimizes its use so as to make only five random values, not six.

523+fromGenNext :: Int -> Int -> Int -> Int -> Int -> UUID

524+fromGenNext w0 w1 w2 w3 w4 =

525+ buildFromBytes 4 /-/ (ThreeByte w0)

526+ /-/ (ThreeByte w1)

527+ /-/ w2 -- use all 4 bytes because we know the version

528+ -- field will "cover" the upper, non-random bits

529+ /-/ (ThreeByte w3)

530+ /-/ (ThreeByte w4)

531+#endif

482

532

483-- |A ByteSource to extract only three bytes from an Int, since next on StdGet

533-- |A ByteSource to extract only three bytes from an Int, since next on StdGet

484-- only returns 31 bits of randomness.

534-- only returns 31 bits of randomness.

@@ -572,4 +622,27 @@ instance Data UUID where

572uuidType :: DataType

622uuidType :: DataType

573uuidType = mkNoRepType "Data.UUID.Types.UUID"

623uuidType = mkNoRepType "Data.UUID.Types.UUID"

574

624

625+#if !MIN_VERSION_base(4,5,0)

626+unsafeShiftR, unsafeShiftL :: Bits w => w -> Int -> w

627+{-# INLINE unsafeShiftR #-}

628+unsafeShiftR = shiftR

629+{-# INLINE unsafeShiftL #-}

630+unsafeShiftL = shiftL

631+#endif

632+

633+#if __GLASGOW_HASKELL__ >=800

575deriving instance Lift UUID

634deriving instance Lift UUID

635+#else

636+instance Lift UUID where

637+ lift (UUID w1 w2) = varE fromWords64Name `appE` liftW64 w1 `appE` liftW64 w2

638+ where

639+ fromWords64Name = mkNameG_v currentPackageKey "Data.UUID.Types.Internal" "fromWords64"

640+ liftW64 x = return (LitE (IntegerL (fromIntegral x)))

641+

642+currentPackageKey :: String

643+#ifdef CURRENT_PACKAGE_KEY

644+currentPackageKey = CURRENT_PACKAGE_KEY

645+#else

646+currentPackageKey = "uuid-types-1.0.5"

647+#endif

648+#endif

uuid-types/src/Data/UUID/Types/Internal/Builder.hs+3

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

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE TypeFamilies #-}

2{-# LANGUAGE TypeFamilies #-}

3+#if __GLASGOW_HASKELL__ >= 704

2{-# LANGUAGE Unsafe #-}

4{-# LANGUAGE Unsafe #-}

5+#endif

4{-# OPTIONS_HADDOCK hide #-}

7{-# OPTIONS_HADDOCK hide #-}

uuid-types/uuid-types.cabal+25−26

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

1cabal-version: 1.12

2name: uuid-types

3−version: 1.0.6

3+version: 1.0.5

4−x-revision: 2

4+x-revision: 3

5copyright:

@@ -13,16 +13,19 @@ license-file: LICENSE

13category: Data

14build-type: Simple

15tested-with:

16− GHC ==8.6.5

16+ GHC ==7.4.2

17+ || ==7.6.3

18+ || ==7.8.4

19+ || ==7.10.3

20+ || ==8.0.2

21+ || ==8.2.2

22+ || ==8.4.4

23+ || ==8.6.4

17 || ==8.8.4

24 || ==8.8.4

18 || ==8.10.7

25 || ==8.10.7

19 || ==9.0.2

26 || ==9.0.2

20− || ==9.2.8

27+ || ==9.2.4

21− || ==9.4.8

28+ || ==9.4.2

22− || ==9.6.6

23− || ==9.8.4

24− || ==9.10.1

25− || ==9.12.1

27synopsis: Type definitions for Universally Unique Identifiers

30synopsis: Type definitions for Universally Unique Identifiers

28description:

31description:

@@ -46,14 +49,14 @@ source-repository head

47library

50library

48 build-depends:

51 build-depends:

49− base >=4.12.0.0 && <5

52+ base >=4.5 && <5

50− , binary >=0.8.6.0 && <0.9

53+ , binary >=0.5.1.0 && <0.9

51− , bytestring >=0.10.8.2 && <0.13

54+ , bytestring >=0.9.2.1 && <0.12

52− , deepseq >=1.4.4.0 && <1.6

55+ , deepseq >=1.3.0.0 && <1.5

53− , hashable >=1.4.4.0 && <1.6

56+ , hashable >=1.2.7.0 && <1.5

54− , random >=1.2.1.2 && <1.3

57+ , random >=1.1 && <1.3

55− , template-haskell >=2.14.0.0 && <2.24

58+ , template-haskell >=2.7.0.0 && <2.20

56− , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2

59+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1

58 exposed-modules: Data.UUID.Types

61 exposed-modules: Data.UUID.Types

@@ -77,23 +80,19 @@ test-suite testuuid

77 default-language: Haskell2010

80 default-language: Haskell2010

78 other-extensions: ViewPatterns

81 other-extensions: ViewPatterns

79 ghc-options: -Wall

82 ghc-options: -Wall

80− if impl(ghc >= 8.10)

81− ghc-options: -Wunused-packages

83 -- inherited constraints

84 -- inherited constraints

84 build-depends:

85 build-depends:

85 base

86 base

86 , binary

87 , binary

87 , bytestring

88 , bytestring

88− , template-haskell

89 , uuid-types

90+ , template-haskell

91 -- deps w/o inherited constraints

92 -- deps w/o inherited constraints

92 build-depends:

93 build-depends:

94+ ghc-byteorder >=4.11 && <4.12

93− QuickCheck >=2.14.2 && <2.16

95+ , QuickCheck >=2.14.2 && <2.15

94− , tasty >=1.4.0.1 && <1.6

96+ , tasty >=1.4.0.1 && <1.5

95 , tasty-hunit >=0.10 && <0.11

97 , tasty-hunit >=0.10 && <0.11

96− , tasty-quickcheck >=0.10 && <0.12

98+ , tasty-quickcheck >=0.10 && <0.11

97−

98− if !impl(ghc >=8.4)

99− build-depends: ghc-byteorder >=4.11 && <4.12

uuid/CHANGES.md−4

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

1−1.3.16

2−

3−- Support GHC-8.6.5...9.10.1

4−

51.3.15

11.3.15

7- Add (Template Haskell) `Lift UUID` instance

3- Add (Template Haskell) `Lift UUID` instance

uuid/src/Data/UUID.hs+3

@@ -18,6 +18,9 @@ See <http://tools.ietf.org/html/rfc4122> for the specification.

18favorite instance of 'System.Random.Random' for faster but insecure

19generation of UUIDs.

21+* We have an implementation of generating a UUID from the hardware

22+MAC address and current system time in "Data.UUID.V1".

23+

21* For name-based generation of UUIDs using SHA-1 hashing see

24* For name-based generation of UUIDs using SHA-1 hashing see

22"Data.UUID.V5".

25"Data.UUID.V5".

23-}

26-}

uuid/src/Data/UUID/Util.hs+11

@@ -3,6 +3,7 @@ module Data.UUID.Util (

3 UnpackedUUID(..)

4 , unpack, pack

5 , version

6+ , extractMac

6 , extractTime

7 , extractTime

7 , setTime

8 , setTime

8 ) where

9 ) where

@@ -12,6 +13,7 @@ import Data.Word

12import Data.Word.Util

13import Data.Word.Util

13import Data.Bits

14import Data.Bits

14import Data.UUID.Types.Internal

15import Data.UUID.Types.Internal

16+import Network.Info

15import Data.Int (Int64)

17import Data.Int (Int64)

17version :: UUID -> Int

19version :: UUID -> Int

@@ -40,3 +42,12 @@ extractTime uuid =

41timeAndVersionToTime :: Word16 -> Word16

43timeAndVersionToTime :: Word16 -> Word16

42timeAndVersionToTime tv = tv .&. 0x0FFF

44timeAndVersionToTime tv = tv .&. 0x0FFF

45+

46+extractMac :: UUID -> Maybe MAC

47+extractMac uuid =

48+ if version uuid == 1

49+ then Just $

50+ MAC (node_0 unpacked) (node_1 unpacked) (node_2 unpacked) (node_3 unpacked) (node_4 unpacked) (node_5 unpacked)

51+ else Nothing

52+ where

53+ unpacked = unpack uuid

uuid/src/Data/UUID/V1.hsnew file+135

@@ -0,0 +1,135 @@

1+{-# OPTIONS_GHC -fno-cse #-}

2+{-# LANGUAGE TypeFamilies #-}

4+{- |

5+Module : Data.UUID.V1

10+License : BSD-style

11+

12+Maintainer : aslatter@gmail.com

13+Stability : experimental

14+Portability : portable

15+

16+RFC 4122 Version 1 UUID state machine.

17+

18+The generated UUID is based on the hardware MAC

19+address and the system clock.

20+

21+If we cannot lookup the MAC address we seed the

22+generator with a pseudo-random number.

23+-}

24+

25+module Data.UUID.V1(nextUUID)

26+where

27+

28+

29+import Data.Bits

30+import Data.Maybe

31+import Data.Time

32+import Data.Word

33+

34+import Control.Applicative ((<$>),(<*>))

35+import Control.Concurrent.MVar

36+import System.IO.Unsafe

37+

38+import qualified System.Random as R

39+

40+import Network.Info

41+

42+import Data.UUID.Types.Internal.Builder

43+import Data.UUID.Types.Internal

44+

45+-- | Returns a new UUID derived from the local hardware MAC

46+-- address and the current system time.

47+-- Is generated according to the Version 1 UUID specified in

48+-- RFC 4122.

49+--

50+-- Returns 'Nothing' if you request UUIDs too quickly.

51+nextUUID :: IO (Maybe UUID)

52+nextUUID = do

53+ res <- stepTime

54+ case res of

55+ Just (mac', c, t) -> return $ Just $ makeUUID t c mac'

56+ _ -> return Nothing

57+

58+

59+makeUUID :: Word64 -> Word16 -> MAC -> UUID

60+makeUUID time clock mac' =

61+ buildFromBytes 1 /-/ tLow /-/ tMid /-/ tHigh /-/ clock /-/ (MACSource mac')

62+ where tLow = (fromIntegral time) :: Word32

63+ tMid = (fromIntegral (time `shiftR` 32)) :: Word16

64+ tHigh = (fromIntegral (time `shiftR` 48)) :: Word16

65+

66+newtype MACSource = MACSource MAC

67+instance ByteSource MACSource where

68+ z /-/ (MACSource (MAC a b c d e f)) = z a b c d e f

69+type instance ByteSink MACSource g = Takes3Bytes (Takes3Bytes g)

70+

71+

72+-- |Approximates the clock algorithm in RFC 4122, section 4.2

73+-- Isn't system wide or thread safe, nor does it properly randomize

74+-- the clock value on initialization.

75+stepTime :: IO (Maybe (MAC, Word16, Word64))

76+stepTime = do

77+ h1 <- fmap hundredsOfNanosSinceGregorianReform getCurrentTime

78+ modifyMVar state $ \s@(State mac' c0 h0) ->

79+ if h1 > h0

80+ then

81+ return (State mac' c0 h1, Just (mac', c0, h1))

82+ else

83+ let

84+ c1 = succ c0

85+ in if c1 <= 0x3fff -- when clock is initially randomized,

86+ -- then this test will need to change

87+ then

88+ return (State mac' c1 h1, Just (mac', c1, h1))

89+ else

90+ return (s, Nothing)

91+

92+

93+{-# NOINLINE state #-}

94+state :: MVar State

95+state = unsafePerformIO $ do

96+ h0 <- fmap hundredsOfNanosSinceGregorianReform getCurrentTime

97+ mac' <- getMac

98+ newMVar $ State mac' 0 h0 -- the 0 should be a random number

99+

100+-- SysMAC.mac can fail on some machines.

101+-- In those cases we fake it with a random

102+-- 6 bytes seed.

103+getMac :: IO MAC

104+getMac =

105+ getNetworkInterfaces >>=

106+ return . listToMaybe . filter (minBound /=) . map mac >>=

107+ \macM -> case macM of

108+ Just m -> return m

109+ Nothing -> randomMac

110+

111+randomMac :: IO MAC

112+randomMac =

113+ -- I'm too lazy to thread through

114+ -- the random state ...

115+ MAC

116+ <$> (R.randomIO >>= return . (1 .|.)) -- We must set the multicast bit to True. See section 4.5 of the RFC.

117+ <*> R.randomIO

118+ <*> R.randomIO

119+ <*> R.randomIO

120+ <*> R.randomIO

121+ <*> R.randomIO

122+

123+data State = State

124+ {-# UNPACK #-} !MAC

125+ {-# UNPACK #-} !Word16

126+ {-# UNPACK #-} !Word64

127+ deriving (Show)

128+

129+

130+

131+hundredsOfNanosSinceGregorianReform :: UTCTime -> Word64

132+hundredsOfNanosSinceGregorianReform t = floor $ 10000000 * dt

133+ where

134+ gregorianReform = UTCTime (fromGregorian 1582 10 15) 0

135+ dt = t `diffUTCTime` gregorianReform

uuid/tests/TestUUID.hs+20−4

@@ -1,15 +1,18 @@

1{-# LANGUAGE ViewPatterns #-}

3+import Control.Monad (replicateM)

3import Data.Bits

4import Data.Bits

4import qualified Data.ByteString.Lazy as BL

5import qualified Data.ByteString.Lazy as BL

5import Data.Char (ord)

6import Data.Char (ord)

7+import Data.List (nub, (\\))

6import Data.Maybe

8import Data.Maybe

7import Data.Word

9import Data.Word

8import qualified Data.UUID as U

10import qualified Data.UUID as U

11+import qualified Data.UUID.V1 as U

9import qualified Data.UUID.V3 as U3

12import qualified Data.UUID.V3 as U3

10import qualified Data.UUID.V5 as U5

13import qualified Data.UUID.V5 as U5

12−import Test.QuickCheck ( Arbitrary(arbitrary) )

15+import Test.QuickCheck ( Arbitrary(arbitrary), choose )

13import Test.Tasty ( TestTree, testGroup, defaultMain )

16import Test.Tasty ( TestTree, testGroup, defaultMain )

14import Test.Tasty.HUnit

17import Test.Tasty.HUnit

15 ( assertBool, (@?=), testCase )

18 ( assertBool, (@?=), testCase )

@@ -21,13 +24,13 @@ isValidVersion :: Int -> U.UUID -> Bool

21isValidVersion v u = lenOK && variantOK && versionOK

24isValidVersion v u = lenOK && variantOK && versionOK

22 where bs = U.toByteString u

25 where bs = U.toByteString u

23 lenOK = BL.length bs == 16

26 lenOK = BL.length bs == 16

24− variantOK = BL.index bs 8 .&. 0xc0 == 0x80

27+ variantOK = (BL.index bs 8) .&. 0xc0 == 0x80

25− versionOK = BL.index bs 6 .&. 0xf0 == fromIntegral (v `shiftL` 4)

28+ versionOK = (BL.index bs 6) .&. 0xf0 == fromIntegral (v `shiftL` 4)

28instance Arbitrary U.UUID where

31instance Arbitrary U.UUID where

29 -- the UUID random instance ignores bounds

32 -- the UUID random instance ignores bounds

30− arbitrary = pure U.nil

33+ arbitrary = choose (U.nil, U.nil)

33test_null :: Test

36test_null :: Test

@@ -35,6 +38,17 @@ test_null =

35 testCase "namespaceDNS is not null" $

38 testCase "namespaceDNS is not null" $

36 assertBool "" (not $ U.null U3.namespaceDNS)

39 assertBool "" (not $ U.null U3.namespaceDNS)

41+test_v1 :: [Maybe U.UUID] -> Test

42+test_v1 v1s = testGroup "version 1" [

43+ testCase "V1 unique" $ nub (v1s \\ nub v1s) @?= [],

44+ testGroup "V1 not null" $ map (testUUID (not . U.null)) v1s,

45+ testGroup "V1 valid" $ map (testUUID (isValidVersion 1)) v1s

46+ ]

47+ where testUUID :: (U.UUID -> Bool) -> Maybe U.UUID -> Test

48+ testUUID p u =

49+ testCase (show u) $

50+ assertBool "" $ maybe False p u

51+

38test_v3 :: Test

52test_v3 :: Test

39test_v3 =

53test_v3 =

40 testCase "V3 computation" $

54 testCase "V3 computation" $

@@ -79,11 +93,13 @@ prop_v5Valid = testProperty "V5 valid" v5Valid

80main :: IO ()

94main :: IO ()

81main = do

95main = do

96+ v1s <- replicateM 100 U.nextUUID

82 defaultMain $

97 defaultMain $

83 testGroup "tests" $

98 testGroup "tests" $

84 concat $

99 concat $

85 [ [

100 [ [

86 test_null,

101 test_null,

102+ test_v1 v1s,

87 test_v3,

103 test_v3,

88 test_v5

104 test_v5

89 ]

105 ]

uuid/uuid.cabal+26−19

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

1cabal-version: 1.12

2name: uuid

3−version: 1.3.16

3+version: 1.3.15

4x-revision: 2

6author: Antoine Latter

@@ -10,16 +10,19 @@ license-file: LICENSE

10category: Data

11build-type: Simple

12tested-with:

13− GHC ==8.6.5

13+ GHC ==7.4.2

14+ || ==7.6.3

15+ || ==7.8.4

16+ || ==7.10.3

17+ || ==8.0.2

18+ || ==8.2.2

19+ || ==8.4.4

20+ || ==8.6.4

14 || ==8.8.4

21 || ==8.8.4

15 || ==8.10.7

22 || ==8.10.7

16 || ==9.0.2

23 || ==9.0.2

17− || ==9.2.8

24+ || ==9.2.4

18− || ==9.4.8

25+ || ==9.4.2

19− || ==9.6.6

20− || ==9.8.4

21− || ==9.10.1

22− || ==9.12.1

24synopsis:

27synopsis:

25 For creating, comparing, parsing and printing Universally Unique Identifiers

28 For creating, comparing, parsing and printing Universally Unique Identifiers

@@ -41,19 +44,26 @@ source-repository head

42library

45library

43 build-depends:

46 build-depends:

44− base >=4.12 && <5

47+ base >=4.5 && <5

45− , binary >=0.8.6.0 && <0.9

48+ , binary >=0.5.1.0 && <0.9

46− , bytestring >=0.10.8.2 && <0.13

49+ , bytestring >=0.9.2.1 && <0.12

47 , cryptohash-md5 >=0.11.100 && <0.12

50 , cryptohash-md5 >=0.11.100 && <0.12

48 , cryptohash-sha1 >=0.11.100 && <0.12

51 , cryptohash-sha1 >=0.11.100 && <0.12

49 , entropy >=0.3.7 && <0.5

52 , entropy >=0.3.7 && <0.5

53+ , network-info >=0.2 && <0.3

54+ , random >=1.1 && <1.3

55+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1

56+ , time >=1.4 && <1.13

51 -- strict dependency on uuid-types,

58 -- strict dependency on uuid-types,

52 -- as we re-rexport datatype, thus leak instances etc.

59 -- as we re-rexport datatype, thus leak instances etc.

53− build-depends: uuid-types >=1.0.6 && <1.0.7

60+ build-depends:

61+ uuid-types >=1.0.5 && <1.0.6

62+

54 exposed-modules:

63 exposed-modules:

55 Data.UUID

64 Data.UUID

56 Data.UUID.Util

65 Data.UUID.Util

66+ Data.UUID.V1

57 Data.UUID.V3

67 Data.UUID.V3

58 Data.UUID.V4

68 Data.UUID.V4

59 Data.UUID.V5

69 Data.UUID.V5

@@ -66,8 +76,6 @@ library

66 default-extensions: DeriveDataTypeable

76 default-extensions: DeriveDataTypeable

67 other-extensions: TypeFamilies

77 other-extensions: TypeFamilies

68 ghc-options: -Wall

78 ghc-options: -Wall

69− if impl(ghc >= 8.10)

70− ghc-options: -Wunused-packages

71 hs-source-dirs: src

79 hs-source-dirs: src

73test-suite testuuid

81test-suite testuuid

@@ -78,18 +86,17 @@ test-suite testuuid

78 default-extensions: DeriveDataTypeable

86 default-extensions: DeriveDataTypeable

79 other-extensions: ViewPatterns

87 other-extensions: ViewPatterns

80 ghc-options: -Wall -fno-warn-orphans

88 ghc-options: -Wall -fno-warn-orphans

81− if impl(ghc >= 8.10)

82− ghc-options: -Wunused-packages

84 -- inherited constraints

90 -- inherited constraints

85 build-depends:

91 build-depends:

86 base

92 base

87 , bytestring

93 , bytestring

94+ , random

88 , uuid

95 , uuid

90 -- deps w/o inherited constraints

97 -- deps w/o inherited constraints

91 build-depends:

98 build-depends:

92− QuickCheck >=2.14.2 && <2.16

99+ QuickCheck >=2.14.2 && <2.15

93− , tasty >=1.4.0.1 && <1.6

100+ , tasty >=1.4.0.1 && <1.5

94 , tasty-hunit >=0.10 && <0.11

101 , tasty-hunit >=0.10 && <0.11

95− , tasty-quickcheck >=0.10 && <0.12

102+ , tasty-quickcheck >=0.10 && <0.11