780753e...master · typeable/uuid

git.iko.soy/typeable/uuid

17 files changed+223−481

since splitsnapshots

unifiedsplit

.github/workflows/haskell-ci-bench.yml+64−62 .github/workflows/haskell-ci.yml+74−97 cabal.haskell-ci+2−4 haskell-ci.sh → gen-ci.sh uuid-bench/bench/uuid-benchmark.hs−1 uuid-bench/uuid-bench.cabal+23−16 uuid-types/ChangeLog.md+4 uuid-types/src/Data/UUID/Types.hs−4 uuid-types/src/Data/UUID/Types/Internal.hs+2−75 uuid-types/src/Data/UUID/Types/Internal/Builder.hs−3 uuid-types/uuid-types.cabal+26−25 uuid/CHANGES.md+4 uuid/src/Data/UUID.hs−3 uuid/src/Data/UUID/Util.hs−11 uuid/src/Data/UUID/V1.hs−135 uuid/tests/TestUUID.hs+4−20 uuid/uuid.cabal+20−25

.github/workflows/haskell-ci-bench.yml+64−62

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

88#

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

1010#

11−# version: 0.15.20220808

11+# version: 0.19.20240702

1212#

13−# REGENDATA ("0.15.20220808",["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"])

1414#

1515name: Benchmarks

1616on:

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

2727 timeout-minutes:

2828 60

2929 container:

30− image: buildpack-deps:bionic

30+ image: buildpack-deps:jammy

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

3232 strategy:

3333 matrix:

3434 include:

35− - compiler: ghc-8.10.7

35+ - compiler: ghc-9.10.1

3636 compilerKind: ghc

37− compilerVersion: 8.10.7

37+ compilerVersion: 9.10.1

3838 setup-method: ghcup

3939 allow-failure: false

40− - compiler: ghc-8.8.4

40+ - compiler: ghc-9.8.2

4141 compilerKind: ghc

42− compilerVersion: 8.8.4

43− setup-method: hvr-ppa

42+ compilerVersion: 9.8.2

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

4459 allow-failure: false

45− - compiler: ghc-8.6.4

60+ - compiler: ghc-9.0.2

4661 compilerKind: ghc

47− compilerVersion: 8.6.4

48− setup-method: hvr-ppa

62+ compilerVersion: 9.0.2

63+ setup-method: ghcup

4964 allow-failure: false

50− - compiler: ghc-8.4.4

65+ - compiler: ghc-8.10.7

5166 compilerKind: ghc

52− compilerVersion: 8.4.4

53− setup-method: hvr-ppa

67+ compilerVersion: 8.10.7

68+ setup-method: ghcup

5469 allow-failure: false

55− - compiler: ghc-8.2.2

70+ - compiler: ghc-8.8.4

5671 compilerKind: ghc

57− compilerVersion: 8.2.2

58− setup-method: hvr-ppa

72+ compilerVersion: 8.8.4

73+ setup-method: ghcup

5974 allow-failure: false

60− - compiler: ghc-8.0.2

75+ - compiler: ghc-8.6.5

6176 compilerKind: ghc

62− compilerVersion: 8.0.2

63− setup-method: hvr-ppa

77+ compilerVersion: 8.6.5

78+ setup-method: ghcup

6479 allow-failure: false

6580 fail-fast: false

6681 steps:

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

6883 run: |

6984 apt-get update

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

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

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

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

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

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

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

77− else

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

79− apt-get update

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

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

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

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

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

85− fi

86+ 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+ 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 cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

8691 env:

8792 HCKIND: ${{ matrix.compilerKind }}

8893 HCNAME: ${{ matrix.compiler }}

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

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

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

96101 HCDIR=/opt/$HCKIND/$HCVER

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

98− HC=$HOME/.ghcup/bin/$HCKIND-$HCVER

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

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

101− echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"

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

103− else

104− HC=$HCDIR/bin/$HCKIND

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

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

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

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

109− fi

110−

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

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

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

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

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

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

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

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

112110 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

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

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

157155 - name: install cabal-plan

158156 run: |

159157 mkdir -p $HOME/.cabal/bin

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

161− echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -

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

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

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

163161 rm -f cabal-plan.xz

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

165163 cabal-plan --version

166164 - name: checkout

167− uses: actions/checkout@v2

165+ uses: actions/checkout@v4

168166 with:

169167 path: source

170168 - name: initial cabal.project for sdist

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

188186 touch cabal.project

189187 touch cabal.project.local

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

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

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

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

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

193191 cat >> cabal.project <<EOF

194192 EOF

195− $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

196194 cat cabal.project

197195 cat cabal.project.local

198196 - name: dump install plan

199197 run: |

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

201199 cabal-plan

202− - name: cache

203− uses: actions/cache@v2

200+ - name: restore cache

201+ uses: actions/cache/restore@v4

204202 with:

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

206204 path: ~/.cabal/store

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

221219 ${CABAL} -vnormal check

222220 - name: haddock

223221 run: |

224− $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

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

225223 - name: unconstrained build

226224 run: |

227225 rm -f cabal.project.local

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

231229 rm -f cabal.project.local

232230 - name: constraint set random-1.2

233231 run: |

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

233+ cabal-plan topo | sort

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

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

236− - name: constraint set random-1.1

237− run: |

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

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

236+ - name: save cache

237+ uses: actions/cache/save@v4

238+ if: always()

239+ with:

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

241+ path: ~/.cabal/store

.github/workflows/haskell-ci.yml+74−97

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

88#

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

1010#

11−# version: 0.15.20220808

11+# version: 0.19.20241223

1212#

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

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

1414#

1515name: Haskell-CI

1616on:

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

2727 timeout-minutes:

2828 60

2929 container:

30− image: buildpack-deps:bionic

30+ image: buildpack-deps:jammy

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

3232 strategy:

3333 matrix:

3434 include:

35− - compiler: ghc-9.4.1

35+ - compiler: ghc-9.12.1

3636 compilerKind: ghc

37− compilerVersion: 9.4.1

37+ compilerVersion: 9.12.1

3838 setup-method: ghcup

3939 allow-failure: false

40− - compiler: ghc-9.2.4

40+ - compiler: ghc-9.10.1

4141 compilerKind: ghc

42− compilerVersion: 9.2.4

42+ compilerVersion: 9.10.1

4343 setup-method: ghcup

4444 allow-failure: false

45− - compiler: ghc-9.0.2

45+ - compiler: ghc-9.8.4

4646 compilerKind: ghc

47− compilerVersion: 9.0.2

47+ compilerVersion: 9.8.4

4848 setup-method: ghcup

4949 allow-failure: false

50− - compiler: ghc-8.10.7

50+ - compiler: ghc-9.6.6

5151 compilerKind: ghc

52− compilerVersion: 8.10.7

52+ compilerVersion: 9.6.6

5353 setup-method: ghcup

5454 allow-failure: false

55− - compiler: ghc-8.8.4

56− compilerKind: ghc

57− compilerVersion: 8.8.4

58− setup-method: hvr-ppa

59− allow-failure: false

60− - compiler: ghc-8.6.4

55+ - compiler: ghc-9.4.8

6156 compilerKind: ghc

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

73− setup-method: hvr-ppa

57+ compilerVersion: 9.4.8

58+ setup-method: ghcup

7459 allow-failure: false

75− - compiler: ghc-8.0.2

60+ - compiler: ghc-9.2.8

7661 compilerKind: ghc

77− compilerVersion: 8.0.2

78− setup-method: hvr-ppa

62+ compilerVersion: 9.2.8

63+ setup-method: ghcup

7964 allow-failure: false

80− - compiler: ghc-7.10.3

65+ - compiler: ghc-9.0.2

8166 compilerKind: ghc

82− compilerVersion: 7.10.3

83− setup-method: hvr-ppa

67+ compilerVersion: 9.0.2

68+ setup-method: ghcup

8469 allow-failure: false

85− - compiler: ghc-7.8.4

70+ - compiler: ghc-8.10.7

8671 compilerKind: ghc

87− compilerVersion: 7.8.4

88− setup-method: hvr-ppa

72+ compilerVersion: 8.10.7

73+ setup-method: ghcup

8974 allow-failure: false

90− - compiler: ghc-7.6.3

75+ - compiler: ghc-8.8.4

9176 compilerKind: ghc

92− compilerVersion: 7.6.3

93− setup-method: hvr-ppa

77+ compilerVersion: 8.8.4

78+ setup-method: ghcup

9479 allow-failure: false

95− - compiler: ghc-7.4.2

80+ - compiler: ghc-8.6.5

9681 compilerKind: ghc

97− compilerVersion: 7.4.2

98− setup-method: hvr-ppa

82+ compilerVersion: 8.6.5

83+ setup-method: ghcup

9984 allow-failure: false

10085 fail-fast: false

10186 steps:

102− - name: apt

87+ - name: apt-get install

10388 run: |

10489 apt-get update

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

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

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"

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

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

112− else

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

114− apt-get update

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

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

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'

102+ run: |

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

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

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

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

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

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

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

121110 env:

122111 HCKIND: ${{ matrix.compilerKind }}

123112 HCNAME: ${{ matrix.compiler }}

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

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

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

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

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

147121 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

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

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

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

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

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

153126 env:

154127 HCKIND: ${{ matrix.compilerKind }}

155128 HCNAME: ${{ matrix.compiler }}

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

192165 - name: install cabal-plan

193166 run: |

194167 mkdir -p $HOME/.cabal/bin

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

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

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

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

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

198171 rm -f cabal-plan.xz

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

200173 cabal-plan --version

201174 - name: checkout

202− uses: actions/checkout@v2

175+ uses: actions/checkout@v4

203176 with:

204177 path: source

205178 - name: initial cabal.project for sdist

206179 run: |

207180 touch cabal.project

208181 echo "packages: $GITHUB_WORKSPACE/source/uuid-types" >> cabal.project

209− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project ; fi

182+ echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project

210183 cat cabal.project

211184 - name: sdist

212185 run: |

@@ -226,22 +199,22 @@ jobs:

226199 touch cabal.project

227200 touch cabal.project.local

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

229− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then echo "packages: ${PKGDIR_uuid}" >> cabal.project ; fi

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

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

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

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

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

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

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

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

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

234207 cat >> cabal.project <<EOF

235208 EOF

236− $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

237210 cat cabal.project

238211 cat cabal.project.local

239212 - name: dump install plan

240213 run: |

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

242215 cabal-plan

243− - name: cache

244− uses: actions/cache@v2

216+ - name: restore cache

217+ uses: actions/cache/restore@v4

245218 with:

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

247220 path: ~/.cabal/store

@@ -263,11 +236,11 @@ jobs:

263236 run: |

264237 cd ${PKGDIR_uuid_types} || false

265238 ${CABAL} -vnormal check

266− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then cd ${PKGDIR_uuid} || false ; fi

267− if [ $((HCNUMVER < 90200)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi

239+ cd ${PKGDIR_uuid} || false

240+ ${CABAL} -vnormal check

268241 - name: haddock

269242 run: |

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

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

271244 - name: unconstrained build

272245 run: |

273246 rm -f cabal.project.local

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

277250 rm -f cabal.project.local

278251 - name: constraint set random-1.2

279252 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

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: |

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

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

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

254+ cabal-plan topo | sort

255+ $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

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

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

11branches: master

2−jobs-selection: any

3−

4−constraint-set random-1.1

5− constraints: random==1.1.*

2+-- jobs-selection: any

3+head-hackage: False

75constraint-set random-1.2

86 ghc: >=7.10

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)

33import Data.IORef

44import Data.Word

55import qualified Data.UUID as U

6−import qualified Data.UUID.V1 as U

76import qualified Data.UUID.V4 as U

87import qualified Data.UUID.V3 as U3

98import qualified Data.UUID.V5 as U5

uuid-bench/uuid-bench.cabal+23−16

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

1414

1515-- Benchmarking with older GHCs is not meaningful

1616tested-with:

17− GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4 || ==8.8.4 || ==8.10.7

17+ GHC ==8.6.5

18+ || ==8.8.4

19+ || ==8.10.7

20+ || ==9.0.2

21+ || ==9.2.8

22+ || ==9.4.8

23+ || ==9.6.6

24+ || ==9.8.2

25+ || ==9.10.1

1826

1927synopsis: UUID benchmarks

2028description:

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

3240

3341library

3442 build-depends:

35− base >=4.9 && <5

36− , binary >=0.5.1.0 && <0.9

37− , bytestring >=0.9.2.1 && <0.12

43+ base >=4.12.0.0 && <5

44+ , binary >=0.8.6.0 && <0.9

45+ , bytestring >=0.10.8.2 && <0.13

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

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

40− , deepseq >=1.3.0.0 && <1.5

48+ , deepseq >=1.4.4.0 && <1.6

4149 , entropy >=0.3.7 && <0.5

42− , hashable >=1.2.7.0 && <1.4

50+ , hashable >=1.4.4.0 && <1.6

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

44− , random >=1.1 && <1.3

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

46− , text >=1.2.3.0 && <1.3

47− , time >=1.4 && <1.12

52+ , random >=1.2.1.2 && <1.3

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

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

55+ , time >=1.4 && <1.13

4856

4957 -- uuid modules

5058 exposed-modules:

5159 Data.UUID

5260 Data.UUID.Util

53− Data.UUID.V1

5461 Data.UUID.V3

5562 Data.UUID.V4

5663 Data.UUID.V5

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

9299

93100 -- deps w/o inherited constraints

94101 build-depends:

95− containers >=0.5 && <0.7

96− , criterion >=1.5 && <1.6

102+ containers >=0.5 && <0.8

103+ , criterion >=1.5 && <1.7

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

98105

99106benchmark uuid-benchmark

100107 type: exitcode-stdio-1.0

101− main-is: uuid-benchmark.hs

108+ main-is: uuid-benchmark.hs

102109 hs-source-dirs: bench

103110 default-language: Haskell2010

104111 default-extensions:

@@ -111,9 +118,9 @@ benchmark uuid-benchmark

111118 build-depends:

112119 base

113120 , random

114− , uuid

121+ , uuid-bench

115122

116123 -- deps w/o inherited constraints

117124 build-depends:

118− criterion >=1.5 && <1.6

125+ criterion >=1.5 && <1.7

119126 , mersenne-random-pure64 >=0.2 && <0.3

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

15## 1.0.5 (2021-05-03)

37- 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

41{-# LANGUAGE Trustworthy #-}

5−#endif

73{- |

84Module : Data.UUID.Types

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

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

22{-# LANGUAGE DeriveDataTypeable #-}

33{-# LANGUAGE TypeFamilies #-}

44{-# LANGUAGE ViewPatterns #-}

5−#if __GLASGOW_HASKELL__ >= 704

65{-# LANGUAGE Unsafe #-}

7−#endif

8−#if __GLASGOW_HASKELL__ >=800

96{-# LANGUAGE DeriveLift #-}

107{-# LANGUAGE StandaloneDeriving #-}

11−#endif

12−

138{-# OPTIONS_HADDOCK hide #-}

149

1510-- |

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

5146

5247import Prelude hiding (null)

5348

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

5549import Control.DeepSeq (NFData (..))

5650import Control.Monad (guard, liftM2)

5751import Data.Bits

5852import Data.Char

5953import Data.Data

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

6154import Data.Hashable

6255import Data.List (elemIndices)

6356import Foreign.Ptr (Ptr)

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

7669

7770import Data.UUID.Types.Internal.Builder

7871

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

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

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

82−#else

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

84−#endif

8574

86−#if __GLASGOW_HASKELL__ >=800

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

9276

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

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

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

96− deriving (Eq, Ord, Typeable)

80+ deriving (Eq, Ord)

9781{-

9882 Prior to uuid-types-1.0.4:

9983 !Word32 !Word32 !Word32 !Word32

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

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

472456toLazyASCIIBytes :: UUID -> BL.ByteString

473457toLazyASCIIBytes =

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

475458 BL.fromStrict

476−#else

477− BL.fromChunks . return

478−#endif

479459 . toASCIIBytes

480460

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

482462fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID

483463fromLazyASCIIBytes bs =

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

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

491465

492466--

493467-- Class Instances

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

495469

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

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

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

499472instance Random UUID where

500473 random = uniform

501474 randomR _ = random -- range is ignored

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

506479 w0 <- uniformWord64 gen

507480 w1 <- uniformWord64 gen

508481 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

532482

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

534484-- only returns 31 bits of randomness.

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

622572uuidType :: DataType

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

624574

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

634575deriving 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 #-}

21{-# LANGUAGE TypeFamilies #-}

3−#if __GLASGOW_HASKELL__ >= 704

42{-# LANGUAGE Unsafe #-}

5−#endif

74{-# OPTIONS_HADDOCK hide #-}

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

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

11cabal-version: 1.12

22name: uuid-types

3−version: 1.0.5

4−x-revision: 3

3+version: 1.0.6

4+x-revision: 2

55copyright:

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

1313category: Data

1414build-type: Simple

1515tested-with:

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

16+ GHC ==8.6.5

2417 || ==8.8.4

2518 || ==8.10.7

2619 || ==9.0.2

27− || ==9.2.4

28− || ==9.4.1

20+ || ==9.2.8

21+ || ==9.4.8

22+ || ==9.6.6

23+ || ==9.8.4

24+ || ==9.10.1

25+ || ==9.12.1

2926

3027synopsis: Type definitions for Universally Unique Identifiers

3128description:

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

4946

5047library

5148 build-depends:

52− base >=4.5 && <5

53− , binary >=0.5.1.0 && <0.9

54− , bytestring >=0.9.2.1 && <0.12

55− , deepseq >=1.3.0.0 && <1.5

56− , hashable >=1.2.7.0 && <1.5

57− , random >=1.1 && <1.3

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

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

49+ base >=4.12.0.0 && <5

50+ , binary >=0.8.6.0 && <0.9

51+ , bytestring >=0.10.8.2 && <0.13

52+ , deepseq >=1.4.4.0 && <1.6

53+ , hashable >=1.4.4.0 && <1.6

54+ , random >=1.2.1.2 && <1.3

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

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

6057

6158 exposed-modules: Data.UUID.Types

6259

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

8077 default-language: Haskell2010

8178 other-extensions: ViewPatterns

8279 ghc-options: -Wall

80+ if impl(ghc >= 8.10)

81+ ghc-options: -Wunused-packages

8382

8483 -- inherited constraints

8584 build-depends:

8685 base

8786 , binary

8887 , bytestring

89− , uuid-types

9088 , template-haskell

89+ , uuid-types

9190

9291 -- deps w/o inherited constraints

9392 build-depends:

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

95− , QuickCheck >=2.14.2 && <2.15

96− , tasty >=1.4.0.1 && <1.5

93+ QuickCheck >=2.14.2 && <2.16

94+ , tasty >=1.4.0.1 && <1.6

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

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

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

97+

98+ if !impl(ghc >=8.4)

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

151.3.15

37- 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.

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

1919generation of UUIDs.

2020

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

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

23−

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

2522"Data.UUID.V5".

2623-}

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

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

33 UnpackedUUID(..)

44 , unpack, pack

55 , version

6− , extractMac

76 , extractTime

87 , setTime

98 ) where

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

1312import Data.Word.Util

1413import Data.Bits

1514import Data.UUID.Types.Internal

16−import Network.Info

1715import Data.Int (Int64)

1816

1917version :: UUID -> Int

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

4240

4341timeAndVersionToTime :: Word16 -> Word16

4442timeAndVersionToTime 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 @@

11{-# LANGUAGE ViewPatterns #-}

3−import Control.Monad (replicateM)

43import Data.Bits

54import qualified Data.ByteString.Lazy as BL

65import Data.Char (ord)

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

86import Data.Maybe

97import Data.Word

108import qualified Data.UUID as U

11−import qualified Data.UUID.V1 as U

129import qualified Data.UUID.V3 as U3

1310import qualified Data.UUID.V5 as U5

1411

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

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

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

1714import Test.Tasty.HUnit

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

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

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

2522 where bs = U.toByteString u

2623 lenOK = BL.length bs == 16

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

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

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

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

2926

3027

3128instance Arbitrary U.UUID where

3229 -- the UUID random instance ignores bounds

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

30+ arbitrary = pure U.nil

3431

3532

3633test_null :: Test

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

3835 testCase "namespaceDNS is not null" $

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

4037

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−

5238test_v3 :: Test

5339test_v3 =

5440 testCase "V3 computation" $

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

9379

9480main :: IO ()

9581main = do

96− v1s <- replicateM 100 U.nextUUID

9782 defaultMain $

9883 testGroup "tests" $

9984 concat $

10085 [ [

10186 test_null,

102− test_v1 v1s,

10387 test_v3,

10488 test_v5

10589 ]

uuid/uuid.cabal+20−25

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

11cabal-version: 1.12

22name: uuid

3−version: 1.3.15

4−x-revision: 1

3+version: 1.3.16

4+x-revision: 2

66author: Antoine Latter

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

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

1010category: Data

1111build-type: Simple

1212tested-with:

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

13+ GHC ==8.6.5

2114 || ==8.8.4

2215 || ==8.10.7

2316 || ==9.0.2

17+ || ==9.2.8

18+ || ==9.4.8

19+ || ==9.6.6

20+ || ==9.8.4

21+ || ==9.10.1

22+ || ==9.12.1

2423

2524synopsis:

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

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

4241

4342library

4443 build-depends:

45− base >=4.5 && <5

46− , binary >=0.5.1.0 && <0.9

47− , bytestring >=0.9.2.1 && <0.12

44+ base >=4.12 && <5

45+ , binary >=0.8.6.0 && <0.9

46+ , bytestring >=0.10.8.2 && <0.13

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

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

5049 , entropy >=0.3.7 && <0.5

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

52− , random >=1.1 && <1.3

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

54− , time >=1.4 && <1.12

5550

5651 -- strict dependency on uuid-types,

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

58− build-depends:

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

60−

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

6154 exposed-modules:

6255 Data.UUID

6356 Data.UUID.Util

64− Data.UUID.V1

6557 Data.UUID.V3

6658 Data.UUID.V4

6759 Data.UUID.V5

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

7466 default-extensions: DeriveDataTypeable

7567 other-extensions: TypeFamilies

7668 ghc-options: -Wall

69+ if impl(ghc >= 8.10)

70+ ghc-options: -Wunused-packages

7771 hs-source-dirs: src

7872

7973test-suite testuuid

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

8478 default-extensions: DeriveDataTypeable

8579 other-extensions: ViewPatterns

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

81+ if impl(ghc >= 8.10)

82+ ghc-options: -Wunused-packages

8783

8884 -- inherited constraints

8985 build-depends:

9086 base

9187 , bytestring

92− , random

9388 , uuid

9489

9590 -- deps w/o inherited constraints

9691 build-depends:

97− QuickCheck >=2.14.2 && <2.15

98− , tasty >=1.4.0.1 && <1.5

92+ QuickCheck >=2.14.2 && <2.16

93+ , tasty >=1.4.0.1 && <1.6

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

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

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