on cf5f253 help sign in
17 files changed+461−238
since splitsnapshots
unifiedsplit
.github/workflows/haskell-ci-bench.yml+44−69 .github/workflows/haskell-ci.yml+95−83 cabal.haskell-ci+4−2 gen-ci.sh → haskell-ci.sh uuid-bench/bench/uuid-benchmark.hs+1 uuid-bench/uuid-bench.cabal+16−23 uuid-types/ChangeLog.md−4 uuid-types/src/Data/UUID/Types.hs+4 uuid-types/src/Data/UUID/Types/Internal.hs+75−2 uuid-types/src/Data/UUID/Types/Internal/Builder.hs+3 uuid-types/uuid-types.cabal+24−26 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+20−4 uuid/uuid.cabal+26−21
.github/workflows/haskell-ci-bench.yml+44−69
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.19.20240702
11+# version: 0.13.20211030
1212#
13−# REGENDATA ("0.19.20240702",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
13+# REGENDATA ("0.13.20211030",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
1414#
1515name: Benchmarks
1616on:
@@ -23,59 +23,42 @@ on:
2323jobs:
2424 linux:
2525 name: Benchmarks - Linux - ${{ matrix.compiler }}
26− runs-on: ubuntu-20.04
27− timeout-minutes:
28− 60
26+ runs-on: ubuntu-18.04
2927 container:
30− image: buildpack-deps:jammy
28+ image: buildpack-deps:bionic
3129 continue-on-error: ${{ matrix.allow-failure }}
3230 strategy:
3331 matrix:
3432 include:
35− - compiler: ghc-9.10.1
33+ - compiler: ghc-8.10.3
3634 compilerKind: ghc
37− compilerVersion: 9.10.1
38− setup-method: ghcup
35+ compilerVersion: 8.10.3
36+ setup-method: hvr-ppa
3937 allow-failure: false
40− - compiler: ghc-9.8.2
41− compilerKind: ghc
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
38+ - compiler: ghc-8.8.4
5139 compilerKind: ghc
52− compilerVersion: 9.4.8
53− setup-method: ghcup
40+ compilerVersion: 8.8.4
41+ setup-method: hvr-ppa
5442 allow-failure: false
55− - compiler: ghc-9.2.8
43+ - compiler: ghc-8.6.4
5644 compilerKind: ghc
57− compilerVersion: 9.2.8
58− setup-method: ghcup
45+ compilerVersion: 8.6.4
46+ setup-method: hvr-ppa
5947 allow-failure: false
60− - compiler: ghc-9.0.2
48+ - compiler: ghc-8.4.4
6149 compilerKind: ghc
62− compilerVersion: 9.0.2
63− setup-method: ghcup
50+ compilerVersion: 8.4.4
51+ setup-method: hvr-ppa
6452 allow-failure: false
65− - compiler: ghc-8.10.7
53+ - compiler: ghc-8.2.2
6654 compilerKind: ghc
67− compilerVersion: 8.10.7
68− setup-method: ghcup
55+ compilerVersion: 8.2.2
56+ setup-method: hvr-ppa
6957 allow-failure: false
70− - compiler: ghc-8.8.4
58+ - compiler: ghc-8.0.2
7159 compilerKind: ghc
72− compilerVersion: 8.8.4
73− setup-method: ghcup
74− allow-failure: false
75− - compiler: ghc-8.6.5
76− compilerKind: ghc
77− compilerVersion: 8.6.5
78− setup-method: ghcup
60+ compilerVersion: 8.0.2
61+ setup-method: hvr-ppa
7962 allow-failure: false
8063 fail-fast: false
8164 steps:
@@ -83,11 +66,13 @@ jobs:
8366 run: |
8467 apt-get update
8568 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
69+ apt-add-repository -y 'ppa:hvr/ghc'
70+ apt-get update
71+ apt-get install -y "$HCNAME"
8672 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"
73+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
8874 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)
75+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
9176 env:
9277 HCKIND: ${{ matrix.compilerKind }}
9378 HCNAME: ${{ matrix.compiler }}
@@ -99,13 +84,11 @@ jobs:
9984 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
10085 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
10186 HCDIR=/opt/$HCKIND/$HCVER
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#')
87+ HC=$HCDIR/bin/$HCKIND
10588 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"
89+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
90+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
91+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
10992 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
11093 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
11194 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -139,10 +122,6 @@ jobs:
139122 repository hackage.haskell.org
140123 url: http://hackage.haskell.org/
141124 EOF
142− cat >> $CABAL_CONFIG <<EOF
143− program-default-options
144− ghc-options: $GHCJOBS +RTS -M3G -RTS
145− EOF
146125 cat $CABAL_CONFIG
147126 - name: versions
148127 run: |
@@ -155,14 +134,14 @@ jobs:
155134 - name: install cabal-plan
156135 run: |
157136 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
159− echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
137+ 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
138+ echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
160139 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
161140 rm -f cabal-plan.xz
162141 chmod a+x $HOME/.cabal/bin/cabal-plan
163142 cabal-plan --version
164143 - name: checkout
165− uses: actions/checkout@v4
144+ uses: actions/checkout@v2
166145 with:
167146 path: source
168147 - name: initial cabal.project for sdist
@@ -186,19 +165,19 @@ jobs:
186165 touch cabal.project
187166 touch cabal.project.local
188167 echo "packages: ${PKGDIR_uuid_bench}" >> cabal.project
189− echo "package uuid-bench" >> cabal.project
190− echo " ghc-options: -Werror=missing-methods" >> cabal.project
168+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-bench" >> cabal.project ; fi
169+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
191170 cat >> cabal.project <<EOF
192171 EOF
193− $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(uuid-bench)$/; }' >> cabal.project.local
172+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid-bench)$/; }' >> cabal.project.local
194173 cat cabal.project
195174 cat cabal.project.local
196175 - name: dump install plan
197176 run: |
198177 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
199178 cabal-plan
200− - name: restore cache
201− uses: actions/cache/restore@v4
179+ - name: cache
180+ uses: actions/cache@v2
202181 with:
203182 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
204183 path: ~/.cabal/store
@@ -219,7 +198,7 @@ jobs:
219198 ${CABAL} -vnormal check
220199 - name: haddock
221200 run: |
222− $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
201+ $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
223202 - name: unconstrained build
224203 run: |
225204 rm -f cabal.project.local
@@ -229,13 +208,9 @@ jobs:
229208 rm -f cabal.project.local
230209 - name: constraint set random-1.2
231210 run: |
232− $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run
233− cabal-plan topo | sort
234211 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all
235212 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' 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
213+ - name: constraint set random-1.1
214+ run: |
215+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all
216+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all
.github/workflows/haskell-ci.yml+95−83
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.19.20241223
11+# version: 0.13.20211030
1212#
13−# REGENDATA ("0.19.20241223",["github","cabal.project"])
13+# REGENDATA ("0.13.20211030",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -23,90 +23,94 @@ on:
2323jobs:
2424 linux:
2525 name: Haskell-CI - Linux - ${{ matrix.compiler }}
26− runs-on: ubuntu-20.04
27− timeout-minutes:
28− 60
26+ runs-on: ubuntu-18.04
2927 container:
30− image: buildpack-deps:jammy
28+ image: buildpack-deps:bionic
3129 continue-on-error: ${{ matrix.allow-failure }}
3230 strategy:
3331 matrix:
3432 include:
35− - compiler: ghc-9.12.1
33+ - compiler: ghc-9.2.1
3634 compilerKind: ghc
37− compilerVersion: 9.12.1
35+ compilerVersion: 9.2.1
3836 setup-method: ghcup
3937 allow-failure: false
40− - compiler: ghc-9.10.1
38+ - compiler: ghc-9.0.1
4139 compilerKind: ghc
42− compilerVersion: 9.10.1
43− setup-method: ghcup
40+ compilerVersion: 9.0.1
41+ setup-method: hvr-ppa
4442 allow-failure: false
45− - compiler: ghc-9.8.4
43+ - compiler: ghc-8.10.7
4644 compilerKind: ghc
47− compilerVersion: 9.8.4
45+ compilerVersion: 8.10.7
4846 setup-method: ghcup
4947 allow-failure: false
50− - compiler: ghc-9.6.6
48+ - compiler: ghc-8.8.4
5149 compilerKind: ghc
52− compilerVersion: 9.6.6
53− setup-method: ghcup
50+ compilerVersion: 8.8.4
51+ setup-method: hvr-ppa
5452 allow-failure: false
55− - compiler: ghc-9.4.8
53+ - compiler: ghc-8.6.4
5654 compilerKind: ghc
57− compilerVersion: 9.4.8
58− setup-method: ghcup
55+ compilerVersion: 8.6.4
56+ setup-method: hvr-ppa
5957 allow-failure: false
60− - compiler: ghc-9.2.8
58+ - compiler: ghc-8.4.4
6159 compilerKind: ghc
62− compilerVersion: 9.2.8
63− setup-method: ghcup
60+ compilerVersion: 8.4.4
61+ setup-method: hvr-ppa
6462 allow-failure: false
65− - compiler: ghc-9.0.2
63+ - compiler: ghc-8.2.2
6664 compilerKind: ghc
67− compilerVersion: 9.0.2
68− setup-method: ghcup
65+ compilerVersion: 8.2.2
66+ setup-method: hvr-ppa
6967 allow-failure: false
70− - compiler: ghc-8.10.7
68+ - compiler: ghc-8.0.2
7169 compilerKind: ghc
72− compilerVersion: 8.10.7
73− setup-method: ghcup
70+ compilerVersion: 8.0.2
71+ setup-method: hvr-ppa
7472 allow-failure: false
75− - compiler: ghc-8.8.4
73+ - compiler: ghc-7.10.3
7674 compilerKind: ghc
77− compilerVersion: 8.8.4
78− setup-method: ghcup
75+ compilerVersion: 7.10.3
76+ setup-method: hvr-ppa
7977 allow-failure: false
80− - compiler: ghc-8.6.5
78+ - compiler: ghc-7.8.4
8179 compilerKind: ghc
82− compilerVersion: 8.6.5
83− setup-method: ghcup
80+ compilerVersion: 7.8.4
81+ setup-method: hvr-ppa
82+ allow-failure: false
83+ - compiler: ghc-7.6.3
84+ compilerKind: ghc
85+ compilerVersion: 7.6.3
86+ setup-method: hvr-ppa
87+ allow-failure: false
88+ - compiler: ghc-7.4.2
89+ compilerKind: ghc
90+ compilerVersion: 7.4.2
91+ setup-method: hvr-ppa
8492 allow-failure: false
8593 fail-fast: false
8694 steps:
87− - name: apt-get install
95+ - name: apt
8896 run: |
8997 apt-get update
9098 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'
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"
99+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
100+ mkdir -p "$HOME/.ghcup/bin"
101+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
102+ chmod a+x "$HOME/.ghcup/bin/ghcup"
103+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
104+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
105+ else
106+ apt-add-repository -y 'ppa:hvr/ghc'
107+ apt-get update
108+ apt-get install -y "$HCNAME"
109+ mkdir -p "$HOME/.ghcup/bin"
110+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
111+ chmod a+x "$HOME/.ghcup/bin/ghcup"
112+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
113+ fi
110114 env:
111115 HCKIND: ${{ matrix.compilerKind }}
112116 HCNAME: ${{ matrix.compiler }}
@@ -117,12 +121,28 @@ jobs:
117121 echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
118122 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
119123 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
124+ HCDIR=/opt/$HCKIND/$HCVER
125+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
126+ HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
127+ echo "HC=$HC" >> "$GITHUB_ENV"
128+ echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
129+ echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
130+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
131+ else
132+ HC=$HCDIR/bin/$HCKIND
133+ echo "HC=$HC" >> "$GITHUB_ENV"
134+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
135+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
136+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
137+ fi
138+
120139 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
121140 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
122141 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
123142 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
124143 echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
125144 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
145+ echo "GHCJSARITH=0" >> "$GITHUB_ENV"
126146 env:
127147 HCKIND: ${{ matrix.compilerKind }}
128148 HCNAME: ${{ matrix.compiler }}
@@ -149,10 +169,6 @@ jobs:
149169 repository hackage.haskell.org
150170 url: http://hackage.haskell.org/
151171 EOF
152− cat >> $CABAL_CONFIG <<EOF
153− program-default-options
154− ghc-options: $GHCJOBS +RTS -M3G -RTS
155− EOF
156172 cat $CABAL_CONFIG
157173 - name: versions
158174 run: |
@@ -165,21 +181,21 @@ jobs:
165181 - name: install cabal-plan
166182 run: |
167183 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
169− echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c -
184+ 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
185+ echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
170186 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
171187 rm -f cabal-plan.xz
172188 chmod a+x $HOME/.cabal/bin/cabal-plan
173189 cabal-plan --version
174190 - name: checkout
175− uses: actions/checkout@v4
191+ uses: actions/checkout@v2
176192 with:
177193 path: source
178194 - name: initial cabal.project for sdist
179195 run: |
180196 touch cabal.project
181197 echo "packages: $GITHUB_WORKSPACE/source/uuid-types" >> cabal.project
182− echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project
198+ if [ $((HCNUMVER < 90200)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/uuid" >> cabal.project ; fi
183199 cat cabal.project
184200 - name: sdist
185201 run: |
@@ -199,22 +215,22 @@ jobs:
199215 touch cabal.project
200216 touch cabal.project.local
201217 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
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
218+ if [ $((HCNUMVER < 90200)) -ne 0 ] ; then echo "packages: ${PKGDIR_uuid}" >> cabal.project ; fi
219+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-types" >> cabal.project ; fi
220+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
221+ if [ $((HCNUMVER >= 80200 && HCNUMVER < 90200)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
222+ if [ $((HCNUMVER >= 80200 && HCNUMVER < 90200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
207223 cat >> cabal.project <<EOF
208224 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
225+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local
210226 cat cabal.project
211227 cat cabal.project.local
212228 - name: dump install plan
213229 run: |
214230 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
215231 cabal-plan
216− - name: restore cache
217− uses: actions/cache/restore@v4
232+ - name: cache
233+ uses: actions/cache@v2
218234 with:
219235 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
220236 path: ~/.cabal/store
@@ -236,11 +252,11 @@ jobs:
236252 run: |
237253 cd ${PKGDIR_uuid_types} || false
238254 ${CABAL} -vnormal check
239− cd ${PKGDIR_uuid} || false
240− ${CABAL} -vnormal check
255+ if [ $((HCNUMVER < 90200)) -ne 0 ] ; then cd ${PKGDIR_uuid} || false ; fi
256+ if [ $((HCNUMVER < 90200)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
241257 - name: haddock
242258 run: |
243− $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
259+ $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
244260 - name: unconstrained build
245261 run: |
246262 rm -f cabal.project.local
@@ -250,13 +266,9 @@ jobs:
250266 rm -f cabal.project.local
251267 - name: constraint set random-1.2
252268 run: |
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
269+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all ; fi
270+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all ; fi
271+ - name: constraint set random-1.1
272+ run: |
273+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' --dependencies-only -j2 all
274+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.1.*' all
cabal.haskell-ci+4−2
@@ -1,6 +1,8 @@
11branches: master
2−-- jobs-selection: any
3−head-hackage: False
2+jobs-selection: any
3+
4+constraint-set random-1.1
5+ constraints: random==1.1.*
46
57constraint-set random-1.2
68 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)
33import Data.IORef
44import Data.Word
55import qualified Data.UUID as U
6+import qualified Data.UUID.V1 as U
67import qualified Data.UUID.V4 as U
78import qualified Data.UUID.V3 as U3
89import qualified Data.UUID.V5 as U5
uuid-bench/uuid-bench.cabal+16−23
@@ -14,15 +14,7 @@ build-type: Simple
1414
1515-- Benchmarking with older GHCs is not meaningful
1616tested-with:
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
17+ GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.4 || ==8.8.4 || ==8.10.3
2618
2719synopsis: UUID benchmarks
2820description:
@@ -40,24 +32,25 @@ source-repository head
4032
4133library
4234 build-depends:
43− base >=4.12.0.0 && <5
44− , binary >=0.8.6.0 && <0.9
45− , bytestring >=0.10.8.2 && <0.13
35+ base >=4.9 && <5
36+ , binary >=0.5.1.0 && <0.9
37+ , bytestring >=0.9.2.1 && <0.12
4638 , cryptohash-md5 >=0.11.100 && <0.12
4739 , cryptohash-sha1 >=0.11.100 && <0.12
48− , deepseq >=1.4.4.0 && <1.6
40+ , deepseq >=1.3.0.0 && <1.5
4941 , entropy >=0.3.7 && <0.5
50− , hashable >=1.4.4.0 && <1.6
42+ , hashable >=1.2.7.0 && <1.4
5143 , network-info >=0.2 && <0.3
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
44+ , random >=1.1 && <1.3
45+ , template-haskell >=2.7.0.0 && <2.18
46+ , text >=1.2.3.0 && <1.3
47+ , time >=1.4 && <1.12
5648
5749 -- uuid modules
5850 exposed-modules:
5951 Data.UUID
6052 Data.UUID.Util
53+ Data.UUID.V1
6154 Data.UUID.V3
6255 Data.UUID.V4
6356 Data.UUID.V5
@@ -99,13 +92,13 @@ benchmark uuid-types-benchmark
9992
10093 -- deps w/o inherited constraints
10194 build-depends:
102− containers >=0.5 && <0.8
103− , criterion >=1.5 && <1.7
95+ containers >=0.5 && <0.7
96+ , criterion >=1.5 && <1.6
10497 , unordered-containers >=0.2.7 && <0.3
10598
10699benchmark uuid-benchmark
107100 type: exitcode-stdio-1.0
108− main-is: uuid-benchmark.hs
101+ main-is: uuid-benchmark.hs
109102 hs-source-dirs: bench
110103 default-language: Haskell2010
111104 default-extensions:
@@ -118,9 +111,9 @@ benchmark uuid-benchmark
118111 build-depends:
119112 base
120113 , random
121− , uuid-bench
114+ , uuid
122115
123116 -- deps w/o inherited constraints
124117 build-depends:
125− criterion >=1.5 && <1.7
118+ criterion >=1.5 && <1.6
126119 , mersenne-random-pure64 >=0.2 && <0.3
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−
51## 1.0.5 (2021-05-03)
62
73- Add (Template Haskell) `Lift UUID` instance
uuid-types/src/Data/UUID/Types.hs+4
@@ -1,4 +1,8 @@
1+{-# LANGUAGE CPP #-}
2+
3+#if __GLASGOW_HASKELL__ >= 702
14{-# LANGUAGE Trustworthy #-}
5+#endif
26
37{- |
48Module : Data.UUID.Types
uuid-types/src/Data/UUID/Types/Internal.hs+75−2
@@ -2,9 +2,14 @@
22{-# LANGUAGE DeriveDataTypeable #-}
33{-# LANGUAGE TypeFamilies #-}
44{-# LANGUAGE ViewPatterns #-}
5+#if __GLASGOW_HASKELL__ >= 704
56{-# LANGUAGE Unsafe #-}
7+#endif
8+#if __GLASGOW_HASKELL__ >=800
69{-# LANGUAGE DeriveLift #-}
710{-# LANGUAGE StandaloneDeriving #-}
11+#endif
12+
813{-# OPTIONS_HADDOCK hide #-}
914
1015-- |
@@ -46,11 +51,13 @@ module Data.UUID.Types.Internal
4651
4752import Prelude hiding (null)
4853
54+import Control.Applicative ((<*>))
4955import Control.DeepSeq (NFData (..))
5056import Control.Monad (guard, liftM2)
5157import Data.Bits
5258import Data.Char
5359import Data.Data
60+import Data.Functor ((<$>))
5461import Data.Hashable
5562import Data.List (elemIndices)
5663import Foreign.Ptr (Ptr)
@@ -69,15 +76,24 @@ import qualified Data.Text.Encoding as T
6976
7077import Data.UUID.Types.Internal.Builder
7178
79+#if MIN_VERSION_random(1,2,0)
7280import System.Random (Random (..), uniform)
7381import System.Random.Stateful (Uniform (..), uniformWord64)
82+#else
83+import System.Random (Random (..), next)
84+#endif
7485
86+#if __GLASGOW_HASKELL__ >=800
7587import 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
7692
7793-- | Type representing <https://en.wikipedia.org/wiki/UUID Universally Unique Identifiers (UUID)> as specified in
7894-- <http://tools.ietf.org/html/rfc4122 RFC 4122>.
7995data UUID = UUID {-# UNPACK #-} !Word64 {-# UNPACK #-} !Word64
80− deriving (Eq, Ord)
96+ deriving (Eq, Ord, Typeable)
8197{-
8298 Prior to uuid-types-1.0.4:
8399 !Word32 !Word32 !Word32 !Word32
@@ -455,13 +471,23 @@ fromASCIIBytes bs = do
455471-- | Similar to `toASCIIBytes` except we produce a lazy `BL.ByteString`.
456472toLazyASCIIBytes :: UUID -> BL.ByteString
457473toLazyASCIIBytes =
474+#if MIN_VERSION_bytestring(0,10,0)
458475 BL.fromStrict
476+#else
477+ BL.fromChunks . return
478+#endif
459479 . toASCIIBytes
460480
461481-- | Similar to `fromASCIIBytes` except parses from a lazy `BL.ByteString`.
462482fromLazyASCIIBytes :: BL.ByteString -> Maybe UUID
463483fromLazyASCIIBytes 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
465491
466492--
467493-- Class Instances
@@ -469,6 +495,7 @@ fromLazyASCIIBytes bs =
469495
470496-- | This 'Random' instance produces __insecure__ version 4 UUIDs as
471497-- specified in <http://tools.ietf.org/html/rfc4122 RFC 4122>.
498+#if MIN_VERSION_random(1,2,0)
472499instance Random UUID where
473500 random = uniform
474501 randomR _ = random -- range is ignored
@@ -479,6 +506,29 @@ instance Uniform UUID where
479506 w0 <- uniformWord64 gen
480507 w1 <- uniformWord64 gen
481508 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
482532
483533-- |A ByteSource to extract only three bytes from an Int, since next on StdGet
484534-- only returns 31 bits of randomness.
@@ -572,4 +622,27 @@ instance Data UUID where
572622uuidType :: DataType
573623uuidType = mkNoRepType "Data.UUID.Types.UUID"
574624
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
575634deriving 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 #-}
12{-# LANGUAGE TypeFamilies #-}
3+#if __GLASGOW_HASKELL__ >= 704
24{-# LANGUAGE Unsafe #-}
5+#endif
36
47{-# OPTIONS_HADDOCK hide #-}
58
uuid-types/uuid-types.cabal+24−26
@@ -1,6 +1,6 @@
11cabal-version: 1.12
22name: uuid-types
3−version: 1.0.6
3+version: 1.0.5
44x-revision: 2
55copyright:
66 (c) 2017-2018 Herbert Valerio Riedel
@@ -13,16 +13,18 @@ license-file: LICENSE
1313category: Data
1414build-type: Simple
1515tested-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
1724 || ==8.8.4
1825 || ==8.10.7
19− || ==9.0.2
20− || ==9.2.8
21− || ==9.4.8
22− || ==9.6.6
23− || ==9.8.4
24− || ==9.10.1
25− || ==9.12.1
26+ || ==9.0.1
27+ || ==9.2.1
2628
2729synopsis: Type definitions for Universally Unique Identifiers
2830description:
@@ -46,14 +48,14 @@ source-repository head
4648
4749library
4850 build-depends:
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
51+ base >=4.5 && <5
52+ , binary >=0.5.1.0 && <0.9
53+ , bytestring >=0.9.2.1 && <0.12
54+ , deepseq >=1.3.0.0 && <1.5
55+ , hashable >=1.2.7.0 && <1.5
56+ , random >=1.1 && <1.3
57+ , template-haskell >=2.7.0.0 && <2.19
58+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
5759
5860 exposed-modules: Data.UUID.Types
5961
@@ -77,23 +79,19 @@ test-suite testuuid
7779 default-language: Haskell2010
7880 other-extensions: ViewPatterns
7981 ghc-options: -Wall
80− if impl(ghc >= 8.10)
81− ghc-options: -Wunused-packages
8282
8383 -- inherited constraints
8484 build-depends:
8585 base
8686 , binary
8787 , bytestring
88− , template-haskell
8988 , uuid-types
89+ , template-haskell
9090
9191 -- deps w/o inherited constraints
9292 build-depends:
93− QuickCheck >=2.14.2 && <2.16
94− , tasty >=1.4.0.1 && <1.6
93+ ghc-byteorder >=4.11 && <4.12
94+ , QuickCheck >=2.14.2 && <2.15
95+ , tasty >=1.4.0.1 && <1.5
9596 , tasty-hunit >=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
97+ , tasty-quickcheck >=0.10 && <0.11
uuid/CHANGES.md−4
@@ -1,7 +1,3 @@
1−1.3.16
2−
3−- Support GHC-8.6.5...9.10.1
4−
511.3.15
62
73- 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.
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+
2124* For name-based generation of UUIDs using SHA-1 hashing see
2225"Data.UUID.V5".
2326-}
uuid/src/Data/UUID/Util.hs+11
@@ -3,6 +3,7 @@ module Data.UUID.Util (
33 UnpackedUUID(..)
44 , unpack, pack
55 , version
6+ , extractMac
67 , extractTime
78 , setTime
89 ) where
@@ -12,6 +13,7 @@ import Data.Word
1213import Data.Word.Util
1314import Data.Bits
1415import Data.UUID.Types.Internal
16+import Network.Info
1517import Data.Int (Int64)
1618
1719version :: UUID -> Int
@@ -40,3 +42,12 @@ extractTime uuid =
4042
4143timeAndVersionToTime :: Word16 -> Word16
4244timeAndVersionToTime 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 #-}
3+
4+{- |
5+Module : Data.UUID.V1
6+Copyright : (c) 2008 Jason Dusek
7+ (c) 2009 Mark Lentczner
8+ (c) 2009-2010,2012 Antoine Latter
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+20−4
@@ -1,15 +1,18 @@
11{-# LANGUAGE ViewPatterns #-}
22
3+import Control.Monad (replicateM)
34import Data.Bits
45import qualified Data.ByteString.Lazy as BL
56import Data.Char (ord)
7+import Data.List (nub, (\\))
68import Data.Maybe
79import Data.Word
810import qualified Data.UUID as U
11+import qualified Data.UUID.V1 as U
912import qualified Data.UUID.V3 as U3
1013import qualified Data.UUID.V5 as U5
1114
12−import Test.QuickCheck ( Arbitrary(arbitrary) )
15+import Test.QuickCheck ( Arbitrary(arbitrary), choose )
1316import Test.Tasty ( TestTree, testGroup, defaultMain )
1417import Test.Tasty.HUnit
1518 ( assertBool, (@?=), testCase )
@@ -21,13 +24,13 @@ isValidVersion :: Int -> U.UUID -> Bool
2124isValidVersion v u = lenOK && variantOK && versionOK
2225 where bs = U.toByteString u
2326 lenOK = BL.length bs == 16
24− variantOK = BL.index bs 8 .&. 0xc0 == 0x80
25− versionOK = BL.index bs 6 .&. 0xf0 == fromIntegral (v `shiftL` 4)
27+ variantOK = (BL.index bs 8) .&. 0xc0 == 0x80
28+ versionOK = (BL.index bs 6) .&. 0xf0 == fromIntegral (v `shiftL` 4)
2629
2730
2831instance Arbitrary U.UUID where
2932 -- the UUID random instance ignores bounds
30− arbitrary = pure U.nil
33+ arbitrary = choose (U.nil, U.nil)
3134
3235
3336test_null :: Test
@@ -35,6 +38,17 @@ test_null =
3538 testCase "namespaceDNS is not null" $
3639 assertBool "" (not $ U.null U3.namespaceDNS)
3740
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+
3852test_v3 :: Test
3953test_v3 =
4054 testCase "V3 computation" $
@@ -79,11 +93,13 @@ prop_v5Valid = testProperty "V5 valid" v5Valid
7993
8094main :: IO ()
8195main = do
96+ v1s <- replicateM 100 U.nextUUID
8297 defaultMain $
8398 testGroup "tests" $
8499 concat $
85100 [ [
86101 test_null,
102+ test_v1 v1s,
87103 test_v3,
88104 test_v5
89105 ]
uuid/uuid.cabal+26−21
@@ -1,7 +1,7 @@
11cabal-version: 1.12
22name: uuid
3−version: 1.3.16
4−x-revision: 2
3+version: 1.3.15
4+x-revision: 1
55copyright: (c) 2008-2014 Antoine Latter
66author: Antoine Latter
77maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
@@ -10,16 +10,17 @@ license-file: LICENSE
1010category: Data
1111build-type: Simple
1212tested-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
1421 || ==8.8.4
1522 || ==8.10.7
16− || ==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
23+ || ==9.0.1
2324
2425synopsis:
2526 For creating, comparing, parsing and printing Universally Unique Identifiers
@@ -41,19 +42,26 @@ source-repository head
4142
4243library
4344 build-depends:
44− base >=4.12 && <5
45− , binary >=0.8.6.0 && <0.9
46− , bytestring >=0.10.8.2 && <0.13
45+ base >=4.5 && <5
46+ , binary >=0.5.1.0 && <0.9
47+ , bytestring >=0.9.2.1 && <0.12
4748 , cryptohash-md5 >=0.11.100 && <0.12
4849 , cryptohash-sha1 >=0.11.100 && <0.12
4950 , 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
5055
5156 -- strict dependency on uuid-types,
5257 -- as we re-rexport datatype, thus leak instances etc.
53− build-depends: uuid-types >=1.0.6 && <1.0.7
58+ build-depends:
59+ uuid-types >=1.0.5 && <1.0.6
60+
5461 exposed-modules:
5562 Data.UUID
5663 Data.UUID.Util
64+ Data.UUID.V1
5765 Data.UUID.V3
5866 Data.UUID.V4
5967 Data.UUID.V5
@@ -66,8 +74,6 @@ library
6674 default-extensions: DeriveDataTypeable
6775 other-extensions: TypeFamilies
6876 ghc-options: -Wall
69− if impl(ghc >= 8.10)
70− ghc-options: -Wunused-packages
7177 hs-source-dirs: src
7278
7379test-suite testuuid
@@ -78,18 +84,17 @@ test-suite testuuid
7884 default-extensions: DeriveDataTypeable
7985 other-extensions: ViewPatterns
8086 ghc-options: -Wall -fno-warn-orphans
81− if impl(ghc >= 8.10)
82− ghc-options: -Wunused-packages
8387
8488 -- inherited constraints
8589 build-depends:
8690 base
8791 , bytestring
92+ , random
8893 , uuid
8994
9095 -- deps w/o inherited constraints
9196 build-depends:
92− QuickCheck >=2.14.2 && <2.16
93− , tasty >=1.4.0.1 && <1.6
97+ QuickCheck >=2.14.2 && <2.15
98+ , tasty >=1.4.0.1 && <1.5
9499 , tasty-hunit >=0.10 && <0.11
95− , tasty-quickcheck >=0.10 && <0.12
100+ , tasty-quickcheck >=0.10 && <0.11