2018c2f..master · typeable/uuid

git.iko.soy/typeable/uuid

on master help sign in

.github/workflows/haskell-ci-bench.yml+44−71

since splitsnapshots

unifiedsplit

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

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

10#

11−# version: 0.17.20231004

11+# version: 0.19.20240702

12#

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

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

14#

15name: Benchmarks

16on:

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

27 timeout-minutes:

28 60

29 container:

30− image: buildpack-deps:bionic

30+ image: buildpack-deps:jammy

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

32 strategy:

33 matrix:

34 include:

35− - compiler: ghc-9.4.4

35+ - compiler: ghc-9.10.1

36 compilerKind: ghc

37− compilerVersion: 9.4.4

37+ compilerVersion: 9.10.1

38 setup-method: ghcup

39 allow-failure: false

40− - compiler: ghc-9.2.7

40+ - compiler: ghc-9.8.2

41 compilerKind: ghc

42− compilerVersion: 9.2.7

42+ compilerVersion: 9.8.2

43 setup-method: ghcup

44 allow-failure: false

45− - compiler: ghc-9.0.2

45+ - compiler: ghc-9.6.6

46 compilerKind: ghc

47− compilerVersion: 9.0.2

47+ compilerVersion: 9.6.6

48 setup-method: ghcup

49 allow-failure: false

50− - compiler: ghc-8.10.7

50+ - compiler: ghc-9.4.8

51 compilerKind: ghc

52− compilerVersion: 8.10.7

52+ compilerVersion: 9.4.8

53 setup-method: ghcup

54 allow-failure: false

55− - compiler: ghc-8.8.4

55+ - compiler: ghc-9.2.8

56 compilerKind: ghc

57− compilerVersion: 8.8.4

57+ compilerVersion: 9.2.8

58− setup-method: hvr-ppa

58+ setup-method: ghcup

59 allow-failure: false

60− - compiler: ghc-8.6.4

60+ - compiler: ghc-9.0.2

61 compilerKind: ghc

62− compilerVersion: 8.6.4

62+ compilerVersion: 9.0.2

63− setup-method: hvr-ppa

63+ setup-method: ghcup

64 allow-failure: false

65− - compiler: ghc-8.4.4

65+ - compiler: ghc-8.10.7

66 compilerKind: ghc

67− compilerVersion: 8.4.4

67+ compilerVersion: 8.10.7

68− setup-method: hvr-ppa

68+ setup-method: ghcup

69 allow-failure: false

70− - compiler: ghc-8.2.2

70+ - compiler: ghc-8.8.4

71 compilerKind: ghc

72− compilerVersion: 8.2.2

72+ compilerVersion: 8.8.4

73− setup-method: hvr-ppa

73+ setup-method: ghcup

74 allow-failure: false

75− - compiler: ghc-8.0.2

75+ - compiler: ghc-8.6.5

76 compilerKind: ghc

77− compilerVersion: 8.0.2

77+ compilerVersion: 8.6.5

78− setup-method: hvr-ppa

78+ setup-method: ghcup

79 allow-failure: false

80 fail-fast: false

81 steps:

@@ -83,23 +83,11 @@ 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

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

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

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

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

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

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

90− "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;

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

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

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

93− else

94− apt-add-repository -y 'ppa:hvr/ghc'

95− apt-get update

96− apt-get install -y "$HCNAME"

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

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

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

100− "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;

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

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

102− fi

103 env:

91 env:

104 HCKIND: ${{ matrix.compilerKind }}

92 HCKIND: ${{ matrix.compilerKind }}

105 HCNAME: ${{ matrix.compiler }}

93 HCNAME: ${{ matrix.compiler }}

@@ -111,22 +99,13 @@ jobs:

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

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

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

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

113 HCDIR=/opt/$HCKIND/$HCVER

101 HCDIR=/opt/$HCKIND/$HCVER

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

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

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

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

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

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

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

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

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

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

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

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

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

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

122− else

123− HC=$HCDIR/bin/$HCKIND

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

125− echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

126− echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

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

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

128− fi

129−

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

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

131 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

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

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

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

@@ -183,7 +162,7 @@ jobs:

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

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

184 cabal-plan --version

163 cabal-plan --version

185 - name: checkout

164 - name: checkout

186− uses: actions/checkout@v3

165+ uses: actions/checkout@v4

187 with:

166 with:

188 path: source

167 path: source

189 - name: initial cabal.project for sdist

168 - name: initial cabal.project for sdist

@@ -207,11 +186,11 @@ jobs:

207 touch cabal.project

186 touch cabal.project

208 touch cabal.project.local

187 touch cabal.project.local

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

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

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

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

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

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

212 cat >> cabal.project <<EOF

191 cat >> cabal.project <<EOF

213 EOF

192 EOF

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

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

215 cat cabal.project

194 cat cabal.project

216 cat cabal.project.local

195 cat cabal.project.local

217 - name: dump install plan

196 - name: dump install plan

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

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

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

220 cabal-plan

199 cabal-plan

221 - name: restore cache

200 - name: restore cache

222− uses: actions/cache/restore@v3

201+ uses: actions/cache/restore@v4

223 with:

202 with:

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

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

225 path: ~/.cabal/store

204 path: ~/.cabal/store

@@ -254,14 +233,8 @@ jobs:

254 cabal-plan topo | sort

233 cabal-plan topo | sort

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

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

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

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

257− - name: constraint set random-1.1

258− run: |

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

260− cabal-plan topo | sort

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

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

263 - name: save cache

236 - name: save cache

264− uses: actions/cache/save@v3

237+ uses: actions/cache/save@v4

265 if: always()

238 if: always()

266 with:

239 with:

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

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

.github/workflows/haskell-ci.yml+55−102

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

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

10#

11−# version: 0.17.20231004

11+# version: 0.19.20241223

12#

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

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

14#

15name: Haskell-CI

16on:

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

27 timeout-minutes:

28 60

29 container:

30− image: buildpack-deps:bionic

30+ image: buildpack-deps:jammy

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

32 strategy:

33 matrix:

34 include:

35− - compiler: ghc-9.8.0.20230929

35+ - compiler: ghc-9.12.1

36 compilerKind: ghc

37− compilerVersion: 9.8.0.20230929

37+ compilerVersion: 9.12.1

38 setup-method: ghcup

39 allow-failure: false

40− - compiler: ghc-9.6.3

40+ - compiler: ghc-9.10.1

41 compilerKind: ghc

42− compilerVersion: 9.6.3

42+ compilerVersion: 9.10.1

43 setup-method: ghcup

44 allow-failure: false

45− - compiler: ghc-9.4.7

45+ - compiler: ghc-9.8.4

46 compilerKind: ghc

47− compilerVersion: 9.4.7

47+ compilerVersion: 9.8.4

48+ setup-method: ghcup

49+ allow-failure: false

50+ - compiler: ghc-9.6.6

51+ compilerKind: ghc

52+ compilerVersion: 9.6.6

53+ setup-method: ghcup

54+ allow-failure: false

55+ - compiler: ghc-9.4.8

56+ compilerKind: ghc

57+ compilerVersion: 9.4.8

48 setup-method: ghcup

58 setup-method: ghcup

49 allow-failure: false

59 allow-failure: false

50 - compiler: ghc-9.2.8

60 - compiler: ghc-9.2.8

@@ -65,71 +75,38 @@ jobs:

65 - compiler: ghc-8.8.4

75 - compiler: ghc-8.8.4

66 compilerKind: ghc

76 compilerKind: ghc

67 compilerVersion: 8.8.4

77 compilerVersion: 8.8.4

68− setup-method: hvr-ppa

78+ setup-method: ghcup

69− allow-failure: false

70− - compiler: ghc-8.6.4

71− compilerKind: ghc

72− compilerVersion: 8.6.4

73− setup-method: hvr-ppa

74− allow-failure: false

75− - compiler: ghc-8.4.4

76− compilerKind: ghc

77− compilerVersion: 8.4.4

78− setup-method: hvr-ppa

79− allow-failure: false

80− - compiler: ghc-8.2.2

81− compilerKind: ghc

82− compilerVersion: 8.2.2

83− setup-method: hvr-ppa

84− allow-failure: false

85− - compiler: ghc-8.0.2

86− compilerKind: ghc

87− compilerVersion: 8.0.2

88− setup-method: hvr-ppa

89− allow-failure: false

90− - compiler: ghc-7.10.3

91− compilerKind: ghc

92− compilerVersion: 7.10.3

93− setup-method: hvr-ppa

94− allow-failure: false

95− - compiler: ghc-7.8.4

96− compilerKind: ghc

97− compilerVersion: 7.8.4

98− setup-method: hvr-ppa

99− allow-failure: false

100− - compiler: ghc-7.6.3

101− compilerKind: ghc

102− compilerVersion: 7.6.3

103− setup-method: hvr-ppa

104 allow-failure: false

79 allow-failure: false

105− - compiler: ghc-7.4.2

80+ - compiler: ghc-8.6.5

106 compilerKind: ghc

81 compilerKind: ghc

107− compilerVersion: 7.4.2

82+ compilerVersion: 8.6.5

108− setup-method: hvr-ppa

83+ setup-method: ghcup

109 allow-failure: false

84 allow-failure: false

110 fail-fast: false

85 fail-fast: false

111 steps:

86 steps:

112− - name: apt

87+ - name: apt-get install

113 run: |

88 run: |

114 apt-get update

89 apt-get update

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

90 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)

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

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

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

102+ run: |

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

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

120− "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;

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

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

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

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

123− else

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

124− apt-add-repository -y 'ppa:hvr/ghc'

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

125− apt-get update

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

126− apt-get install -y "$HCNAME"

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

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

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

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

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

130− "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;

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

132− fi

133 env:

110 env:

134 HCKIND: ${{ matrix.compilerKind }}

111 HCKIND: ${{ matrix.compilerKind }}

135 HCNAME: ${{ matrix.compiler }}

112 HCNAME: ${{ matrix.compiler }}

@@ -140,30 +117,12 @@ jobs:

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

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

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

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

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

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

143− HCDIR=/opt/$HCKIND/$HCVER

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

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

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

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

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

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

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

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

152− else

153− HC=$HCDIR/bin/$HCKIND

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

155− echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

156− echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

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

158− fi

159−

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

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

161 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

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

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

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

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

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

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

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

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

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

166− echo "GHCJSARITH=0" >> "$GITHUB_ENV"

167 env:

126 env:

168 HCKIND: ${{ matrix.compilerKind }}

127 HCKIND: ${{ matrix.compilerKind }}

169 HCNAME: ${{ matrix.compiler }}

128 HCNAME: ${{ matrix.compiler }}

@@ -213,7 +172,7 @@ jobs:

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

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

214 cabal-plan --version

173 cabal-plan --version

215 - name: checkout

174 - name: checkout

216− uses: actions/checkout@v3

175+ uses: actions/checkout@v4

217 with:

176 with:

218 path: source

177 path: source

219 - name: initial cabal.project for sdist

178 - name: initial cabal.project for sdist

@@ -241,13 +200,13 @@ jobs:

241 touch cabal.project.local

200 touch cabal.project.local

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

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

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

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

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

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

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

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

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

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

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

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

248 cat >> cabal.project <<EOF

207 cat >> cabal.project <<EOF

249 EOF

208 EOF

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

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

251 cat cabal.project

210 cat cabal.project

252 cat cabal.project.local

211 cat cabal.project.local

253 - name: dump install plan

212 - name: dump install plan

@@ -255,7 +214,7 @@ jobs:

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

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

256 cabal-plan

215 cabal-plan

257 - name: restore cache

216 - name: restore cache

258− uses: actions/cache/restore@v3

217+ uses: actions/cache/restore@v4

259 with:

218 with:

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

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

261 path: ~/.cabal/store

220 path: ~/.cabal/store

@@ -291,19 +250,13 @@ jobs:

291 rm -f cabal.project.local

250 rm -f cabal.project.local

292 - name: constraint set random-1.2

251 - name: constraint set random-1.2

293 run: |

252 run: |

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

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

295− if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then cabal-plan topo | sort ; fi

254+ cabal-plan topo | sort

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

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

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

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

298− - name: constraint set random-1.1

299− run: |

300− if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all --dry-run ; fi

301− if [ $((HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi

302− if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all ; fi

303− if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all ; fi

304 - name: save cache

257 - name: save cache

305− uses: actions/cache/save@v3

306 if: always()

258 if: always()

259+ uses: actions/cache/save@v4

307 with:

260 with:

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

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

309 path: ~/.cabal/store

262 path: ~/.cabal/store

cabal.haskell-ci+1−5

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

1branches: master

2−jobs-selection: any

2+-- jobs-selection: any

3head-hackage: False

5−constraint-set random-1.1

6− ghc: <9.7

7− constraints: random==1.1.*

8−

9constraint-set random-1.2

5constraint-set random-1.2

10 ghc: >=7.10

6 ghc: >=7.10

11 constraints: random==1.2.*

7 constraints: random==1.2.*

haskell-ci.sh → gen-ci.shrenamed

The content is the same.

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

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

3import Data.IORef

4import Data.Word

5import qualified Data.UUID as U

6−import qualified Data.UUID.V1 as U

7import qualified Data.UUID.V4 as U

6import qualified Data.UUID.V4 as U

8import qualified Data.UUID.V3 as U3

7import qualified Data.UUID.V3 as U3

9import qualified Data.UUID.V5 as U5

8import qualified Data.UUID.V5 as U5

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

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

15-- Benchmarking with older GHCs is not meaningful

16tested-with:

17− GHC ==8.0.2

17+ GHC ==8.6.5

18− || ==8.2.2

19− || ==8.4.4

20− || ==8.6.4

21 || ==8.8.4

18 || ==8.8.4

22 || ==8.10.7

19 || ==8.10.7

23 || ==9.0.2

20 || ==9.0.2

24− || ==9.2.7

21+ || ==9.2.8

25− || ==9.4.4

22+ || ==9.4.8

23+ || ==9.6.6

24+ || ==9.8.2

25+ || ==9.10.1

27synopsis: UUID benchmarks

28description:

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

41library

42 build-depends:

43− base >=4.9 && <5

43+ base >=4.12.0.0 && <5

44− , binary >=0.5.1.0 && <0.9

44+ , binary >=0.8.6.0 && <0.9

45− , bytestring >=0.9.2.1 && <0.12

45+ , bytestring >=0.10.8.2 && <0.13

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

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

48− , deepseq >=1.3.0.0 && <1.5

48+ , deepseq >=1.4.4.0 && <1.6

49 , entropy >=0.3.7 && <0.5

50− , hashable >=1.2.7.0 && <1.5

50+ , hashable >=1.4.4.0 && <1.6

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

52− , random >=1.1 && <1.3

52+ , random >=1.2.1.2 && <1.3

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

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

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

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

55 , time >=1.4 && <1.13

57 -- uuid modules

58 exposed-modules:

59 Data.UUID

60 Data.UUID.Util

61− Data.UUID.V1

62 Data.UUID.V3

61 Data.UUID.V3

63 Data.UUID.V4

62 Data.UUID.V4

64 Data.UUID.V5

63 Data.UUID.V5

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

100

101 -- deps w/o inherited constraints

100 -- deps w/o inherited constraints

102 build-depends:

101 build-depends:

103− containers >=0.5 && <0.7

102+ containers >=0.5 && <0.8

104 , criterion >=1.5 && <1.7

103 , criterion >=1.5 && <1.7

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

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

106

105

107benchmark uuid-benchmark

106benchmark uuid-benchmark

108 type: exitcode-stdio-1.0

107 type: exitcode-stdio-1.0

109− main-is: uuid-benchmark.hs

108+ main-is: uuid-benchmark.hs

110 hs-source-dirs: bench

109 hs-source-dirs: bench

111 default-language: Haskell2010

110 default-language: Haskell2010

112 default-extensions:

111 default-extensions:

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

119 build-depends:

118 build-depends:

120 base

119 base

121 , random

120 , random

122− , uuid

121+ , uuid-bench

123

122

124 -- deps w/o inherited constraints

123 -- deps w/o inherited constraints

125 build-depends:

124 build-depends:

uuid-types/ChangeLog.md+4

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

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

3+- Support GHC-8.6.5..GHC-9.10.1

1## 1.0.5 (2021-05-03)

5## 1.0.5 (2021-05-03)

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

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

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

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

1−{-# LANGUAGE CPP #-}

2−

3−#if __GLASGOW_HASKELL__ >= 702

4{-# LANGUAGE Trustworthy #-}

1{-# LANGUAGE Trustworthy #-}

5−#endif

7{- |

3{- |

8Module : Data.UUID.Types

4Module : Data.UUID.Types

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

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

2{-# LANGUAGE DeriveDataTypeable #-}

3{-# LANGUAGE TypeFamilies #-}

4{-# LANGUAGE ViewPatterns #-}

5−#if __GLASGOW_HASKELL__ >= 704

6{-# LANGUAGE Unsafe #-}

5{-# LANGUAGE Unsafe #-}

7−#endif

8−#if __GLASGOW_HASKELL__ >=800

9{-# LANGUAGE DeriveLift #-}

6{-# LANGUAGE DeriveLift #-}

10{-# LANGUAGE StandaloneDeriving #-}

7{-# LANGUAGE StandaloneDeriving #-}

11−#endif

12−

13{-# OPTIONS_HADDOCK hide #-}

8{-# OPTIONS_HADDOCK hide #-}

15-- |

10-- |

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

52import Prelude hiding (null)

47import Prelude hiding (null)

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

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

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

56import Control.Monad (guard, liftM2)

50import Control.Monad (guard, liftM2)

57import Data.Bits

51import Data.Bits

58import Data.Char

52import Data.Char

59import Data.Data

53import Data.Data

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

61import Data.Hashable

54import Data.Hashable

62import Data.List (elemIndices)

55import Data.List (elemIndices)

63import Foreign.Ptr (Ptr)

56import Foreign.Ptr (Ptr)

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

77import Data.UUID.Types.Internal.Builder

70import Data.UUID.Types.Internal.Builder

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

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

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

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

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

82−#else

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

84−#endif

86−#if __GLASGOW_HASKELL__ >=800

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

75import 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

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

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

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

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

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

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

96− deriving (Eq, Ord, Typeable)

80+ deriving (Eq, Ord)

97{-

81{-

98 Prior to uuid-types-1.0.4:

82 Prior to uuid-types-1.0.4:

99 !Word32 !Word32 !Word32 !Word32

83 !Word32 !Word32 !Word32 !Word32

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

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

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

472toLazyASCIIBytes :: UUID -> BL.ByteString

456toLazyASCIIBytes :: UUID -> BL.ByteString

473toLazyASCIIBytes =

457toLazyASCIIBytes =

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

475 BL.fromStrict

458 BL.fromStrict

476−#else

477− BL.fromChunks . return

478−#endif

479 . toASCIIBytes

459 . toASCIIBytes

480

460

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

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

482fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID

462fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID

483fromLazyASCIIBytes bs =

463fromLazyASCIIBytes bs =

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

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

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

491

465

492--

466--

493-- Class Instances

467-- Class Instances

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

495

469

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

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

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

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

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

499instance Random UUID where

472instance Random UUID where

500 random = uniform

473 random = uniform

501 randomR _ = random -- range is ignored

474 randomR _ = random -- range is ignored

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

506 w0 <- uniformWord64 gen

479 w0 <- uniformWord64 gen

507 w1 <- uniformWord64 gen

480 w1 <- uniformWord64 gen

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

481 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

532

482

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

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

534-- only returns 31 bits of randomness.

484-- only returns 31 bits of randomness.

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

622uuidType :: DataType

572uuidType :: DataType

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

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

624

574

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

634deriving instance Lift UUID

575deriving 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,8 +1,5 @@

1−{-# LANGUAGE CPP #-}

2{-# LANGUAGE TypeFamilies #-}

1{-# LANGUAGE TypeFamilies #-}

3−#if __GLASGOW_HASKELL__ >= 704

4{-# LANGUAGE Unsafe #-}

2{-# LANGUAGE Unsafe #-}

5−#endif

7{-# OPTIONS_HADDOCK hide #-}

4{-# OPTIONS_HADDOCK hide #-}

uuid-types/uuid-types.cabal+20−22

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

1cabal-version: 1.12

2name: uuid-types

3−version: 1.0.5.1

3+version: 1.0.6

4+x-revision: 2

4copyright:

5copyright:

@@ -12,21 +13,16 @@ license-file: LICENSE

12category: Data

13category: Data

13build-type: Simple

14build-type: Simple

14tested-with:

15tested-with:

15− GHC ==7.4.2

16+ GHC ==8.6.5

16− || ==7.6.3

17− || ==7.8.4

18− || ==7.10.3

19− || ==8.0.2

20− || ==8.2.2

21− || ==8.4.4

22− || ==8.6.4

23 || ==8.8.4

17 || ==8.8.4

24 || ==8.10.7

18 || ==8.10.7

25 || ==9.0.2

19 || ==9.0.2

26 || ==9.2.8

20 || ==9.2.8

27− || ==9.4.7

21+ || ==9.4.8

28− || ==9.6.3

22+ || ==9.6.6

29− || ==9.8.1

23+ || ==9.8.4

24+ || ==9.10.1

25+ || ==9.12.1

31synopsis: Type definitions for Universally Unique Identifiers

27synopsis: Type definitions for Universally Unique Identifiers

32description:

28description:

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

51library

47library

52 build-depends:

48 build-depends:

53− base >=4.5 && <5

49+ base >=4.12.0.0 && <5

54− , binary >=0.5.1.0 && <0.9

50+ , binary >=0.8.6.0 && <0.9

55− , bytestring >=0.9.2.1 && <0.13

51+ , bytestring >=0.10.8.2 && <0.13

56− , deepseq >=1.3.0.0 && <1.6

52+ , deepseq >=1.4.4.0 && <1.6

57− , hashable >=1.2.7.0 && <1.5

53+ , hashable >=1.4.4.0 && <1.6

58− , random >=1.1 && <1.3

54+ , random >=1.2.1.2 && <1.3

59− , template-haskell >=2.7.0.0 && <2.22

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

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

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

62 exposed-modules: Data.UUID.Types

58 exposed-modules: Data.UUID.Types

@@ -81,6 +77,8 @@ test-suite testuuid

81 default-language: Haskell2010

77 default-language: Haskell2010

82 other-extensions: ViewPatterns

78 other-extensions: ViewPatterns

83 ghc-options: -Wall

79 ghc-options: -Wall

80+ if impl(ghc >= 8.10)

81+ ghc-options: -Wunused-packages

85 -- inherited constraints

83 -- inherited constraints

86 build-depends:

84 build-depends:

@@ -92,10 +90,10 @@ test-suite testuuid

93 -- deps w/o inherited constraints

91 -- deps w/o inherited constraints

94 build-depends:

92 build-depends:

95− QuickCheck >=2.14.2 && <2.15

93+ QuickCheck >=2.14.2 && <2.16

96 , tasty >=1.4.0.1 && <1.6

94 , tasty >=1.4.0.1 && <1.6

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

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

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

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

100 if !impl(ghc >=8.4)

98 if !impl(ghc >=8.4)

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

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

uuid/CHANGES.md+4

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

1+1.3.16

3+- Support GHC-8.6.5...9.10.1

11.3.15

51.3.15

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

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

uuid/src/Data/UUID.hs−3

@@ -18,9 +18,6 @@ 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−

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

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

25"Data.UUID.V5".

22"Data.UUID.V5".

26-}

23-}

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

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

3 UnpackedUUID(..)

4 , unpack, pack

5 , version

6− , extractMac

7 , extractTime

6 , extractTime

8 , setTime

7 , setTime

9 ) where

8 ) where

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

13import Data.Word.Util

12import Data.Word.Util

14import Data.Bits

13import Data.Bits

15import Data.UUID.Types.Internal

14import Data.UUID.Types.Internal

16−import Network.Info

17import Data.Int (Int64)

15import Data.Int (Int64)

19version :: UUID -> Int

17version :: UUID -> Int

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

43timeAndVersionToTime :: Word16 -> Word16

41timeAndVersionToTime :: Word16 -> Word16

44timeAndVersionToTime tv = tv .&. 0x0FFF

42timeAndVersionToTime 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.hsdeleted−135

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

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

2−{-# LANGUAGE TypeFamilies #-}

3−

4−{- |

5−Module : Data.UUID.V1

9−

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+4−20

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

1{-# LANGUAGE ViewPatterns #-}

3−import Control.Monad (replicateM)

4import Data.Bits

3import Data.Bits

5import qualified Data.ByteString.Lazy as BL

4import qualified Data.ByteString.Lazy as BL

6import Data.Char (ord)

5import Data.Char (ord)

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

8import Data.Maybe

6import Data.Maybe

9import Data.Word

7import Data.Word

10import qualified Data.UUID as U

8import qualified Data.UUID as U

11−import qualified Data.UUID.V1 as U

12import qualified Data.UUID.V3 as U3

9import qualified Data.UUID.V3 as U3

13import qualified Data.UUID.V5 as U5

10import qualified Data.UUID.V5 as U5

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

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

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

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

17import Test.Tasty.HUnit

14import Test.Tasty.HUnit

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

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

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

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

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

25 where bs = U.toByteString u

22 where bs = U.toByteString u

26 lenOK = BL.length bs == 16

23 lenOK = BL.length bs == 16

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

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

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

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

31instance Arbitrary U.UUID where

28instance Arbitrary U.UUID where

32 -- the UUID random instance ignores bounds

29 -- the UUID random instance ignores bounds

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

30+ arbitrary = pure U.nil

36test_null :: Test

33test_null :: Test

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

38 testCase "namespaceDNS is not null" $

35 testCase "namespaceDNS is not null" $

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

36 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−

52test_v3 :: Test

38test_v3 :: Test

53test_v3 =

39test_v3 =

54 testCase "V3 computation" $

40 testCase "V3 computation" $

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

94main :: IO ()

80main :: IO ()

95main = do

81main = do

96− v1s <- replicateM 100 U.nextUUID

97 defaultMain $

82 defaultMain $

98 testGroup "tests" $

83 testGroup "tests" $

99 concat $

84 concat $

100 [ [

85 [ [

101 test_null,

86 test_null,

102− test_v1 v1s,

103 test_v3,

87 test_v3,

104 test_v5

88 test_v5

105 ]

89 ]

uuid/uuid.cabal+18−27

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

1cabal-version: 1.12

2name: uuid

3−version: 1.3.15

3+version: 1.3.16

4−x-revision: 3

4+x-revision: 2

6author: Antoine Latter

7maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>

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

10category: Data

11build-type: Simple

12tested-with:

13− GHC ==7.4.2

13+ GHC ==8.6.5

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

21 || ==8.8.4

14 || ==8.8.4

22 || ==8.10.7

15 || ==8.10.7

23 || ==9.0.2

16 || ==9.0.2

24 || ==9.2.8

17 || ==9.2.8

25− || ==9.4.7

18+ || ==9.4.8

26− || ==9.6.3

19+ || ==9.6.6

27− || ==9.8.1

20+ || ==9.8.4

21+ || ==9.10.1

22+ || ==9.12.1

29synopsis:

24synopsis:

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

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

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

47library

42library

48 build-depends:

43 build-depends:

49− base >=4.5 && <5

44+ base >=4.12 && <5

50− , binary >=0.5.1.0 && <0.9

45+ , binary >=0.8.6.0 && <0.9

51− , bytestring >=0.9.2.1 && <0.13

46+ , bytestring >=0.10.8.2 && <0.13

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

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

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

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

54 , entropy >=0.3.7 && <0.5

49 , entropy >=0.3.7 && <0.5

55− , network-info >=0.2 && <0.3

56− , random >=1.1 && <1.3

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

58− , time >=1.4 && <1.13

60 -- strict dependency on uuid-types,

51 -- strict dependency on uuid-types,

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

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

62− build-depends:

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

63− uuid-types >=1.0.5 && <1.0.6

64−

65 exposed-modules:

54 exposed-modules:

66 Data.UUID

55 Data.UUID

67 Data.UUID.Util

56 Data.UUID.Util

68− Data.UUID.V1

69 Data.UUID.V3

57 Data.UUID.V3

70 Data.UUID.V4

58 Data.UUID.V4

71 Data.UUID.V5

59 Data.UUID.V5

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

78 default-extensions: DeriveDataTypeable

66 default-extensions: DeriveDataTypeable

79 other-extensions: TypeFamilies

67 other-extensions: TypeFamilies

80 ghc-options: -Wall

68 ghc-options: -Wall

69+ if impl(ghc >= 8.10)

70+ ghc-options: -Wunused-packages

81 hs-source-dirs: src

71 hs-source-dirs: src

83test-suite testuuid

73test-suite testuuid

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

88 default-extensions: DeriveDataTypeable

78 default-extensions: DeriveDataTypeable

89 other-extensions: ViewPatterns

79 other-extensions: ViewPatterns

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

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

81+ if impl(ghc >= 8.10)

82+ ghc-options: -Wunused-packages

92 -- inherited constraints

84 -- inherited constraints

93 build-depends:

85 build-depends:

94 base

86 base

95 , bytestring

87 , bytestring

96− , random

97 , uuid

88 , uuid

99 -- deps w/o inherited constraints

90 -- deps w/o inherited constraints

100 build-depends:

91 build-depends:

101− QuickCheck >=2.14.2 && <2.15

92+ QuickCheck >=2.14.2 && <2.16

102 , tasty >=1.4.0.1 && <1.6

93 , tasty >=1.4.0.1 && <1.6

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

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

104− , tasty-quickcheck >=0.10 && <0.11

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