on e0dfbff help sign in
17 files changed+497−169
since splitsnapshots
unifiedsplit
.github/workflows/haskell-ci-bench.yml+71−44 .github/workflows/haskell-ci.yml+102−55 cabal.haskell-ci+5−1 gen-ci.sh → haskell-ci.sh uuid-bench/bench/uuid-benchmark.hs+1 uuid-bench/uuid-bench.cabal+18−17 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+22−20 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+27−18
.github/workflows/haskell-ci-bench.yml+71−44
@@ -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.17.20231004
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.17.20231004",["github","--project","cabal.bench.project","-o",".github/workflows/haskell-ci-bench.yml","--github-action-name","Benchmarks"])
1414#
1515name: Benchmarks
1616on:
@@ -27,34 +27,19 @@ jobs:
2727 timeout-minutes:
2828 60
2929 container:
30− image: buildpack-deps:jammy
30+ image: buildpack-deps:bionic
3131 continue-on-error: ${{ matrix.allow-failure }}
3232 strategy:
3333 matrix:
3434 include:
35− - compiler: ghc-9.10.1
35+ - compiler: ghc-9.4.4
3636 compilerKind: ghc
37− compilerVersion: 9.10.1
37+ compilerVersion: 9.4.4
3838 setup-method: ghcup
3939 allow-failure: false
40− - compiler: ghc-9.8.2
40+ - compiler: ghc-9.2.7
4141 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
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
42+ compilerVersion: 9.2.7
5843 setup-method: ghcup
5944 allow-failure: false
6045 - compiler: ghc-9.0.2
@@ -70,12 +55,27 @@ jobs:
7055 - compiler: ghc-8.8.4
7156 compilerKind: ghc
7257 compilerVersion: 8.8.4
73− setup-method: ghcup
58+ setup-method: hvr-ppa
7459 allow-failure: false
75− - compiler: ghc-8.6.5
60+ - compiler: ghc-8.6.4
7661 compilerKind: ghc
77− compilerVersion: 8.6.5
78− setup-method: ghcup
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
74+ allow-failure: false
75+ - compiler: ghc-8.0.2
76+ compilerKind: ghc
77+ compilerVersion: 8.0.2
78+ setup-method: hvr-ppa
7979 allow-failure: false
8080 fail-fast: false
8181 steps:
@@ -83,11 +83,23 @@ jobs:
8383 run: |
8484 apt-get update
8585 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
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)
86+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
87+ 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"
89+ 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)
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)
102+ fi
91103 env:
92104 HCKIND: ${{ matrix.compilerKind }}
93105 HCNAME: ${{ matrix.compiler }}
@@ -99,13 +111,22 @@ jobs:
99111 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
100112 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
101113 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#')
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"
114+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
115+ HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
116+ HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
117+ HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
118+ echo "HC=$HC" >> "$GITHUB_ENV"
119+ echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
120+ 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"
128+ fi
129+
109130 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
110131 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
111132 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -162,7 +183,7 @@ jobs:
162183 chmod a+x $HOME/.cabal/bin/cabal-plan
163184 cabal-plan --version
164185 - name: checkout
165− uses: actions/checkout@v4
186+ uses: actions/checkout@v3
166187 with:
167188 path: source
168189 - name: initial cabal.project for sdist
@@ -186,11 +207,11 @@ jobs:
186207 touch cabal.project
187208 touch cabal.project.local
188209 echo "packages: ${PKGDIR_uuid_bench}" >> cabal.project
189− echo "package uuid-bench" >> cabal.project
190− echo " ghc-options: -Werror=missing-methods" >> cabal.project
210+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-bench" >> cabal.project ; fi
211+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
191212 cat >> cabal.project <<EOF
192213 EOF
193− $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(uuid-bench)$/; }' >> cabal.project.local
214+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid-bench)$/; }' >> cabal.project.local
194215 cat cabal.project
195216 cat cabal.project.local
196217 - name: dump install plan
@@ -198,7 +219,7 @@ jobs:
198219 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
199220 cabal-plan
200221 - name: restore cache
201− uses: actions/cache/restore@v4
222+ uses: actions/cache/restore@v3
202223 with:
203224 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
204225 path: ~/.cabal/store
@@ -233,8 +254,14 @@ jobs:
233254 cabal-plan topo | sort
234255 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all
235256 $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
236263 - name: save cache
237− uses: actions/cache/save@v4
264+ uses: actions/cache/save@v3
238265 if: always()
239266 with:
240267 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
.github/workflows/haskell-ci.yml+102−55
@@ -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.17.20231004
1212#
13−# REGENDATA ("0.19.20241223",["github","cabal.project"])
13+# REGENDATA ("0.17.20231004",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -27,34 +27,24 @@ jobs:
2727 timeout-minutes:
2828 60
2929 container:
30− image: buildpack-deps:jammy
30+ image: buildpack-deps:bionic
3131 continue-on-error: ${{ matrix.allow-failure }}
3232 strategy:
3333 matrix:
3434 include:
35− - compiler: ghc-9.12.1
35+ - compiler: ghc-9.8.0.20230929
3636 compilerKind: ghc
37− compilerVersion: 9.12.1
37+ compilerVersion: 9.8.0.20230929
3838 setup-method: ghcup
3939 allow-failure: false
40− - compiler: ghc-9.10.1
40+ - compiler: ghc-9.6.3
4141 compilerKind: ghc
42− compilerVersion: 9.10.1
42+ compilerVersion: 9.6.3
4343 setup-method: ghcup
4444 allow-failure: false
45− - compiler: ghc-9.8.4
45+ - compiler: ghc-9.4.7
4646 compilerKind: ghc
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
47+ compilerVersion: 9.4.7
5848 setup-method: ghcup
5949 allow-failure: false
6050 - compiler: ghc-9.2.8
@@ -75,38 +65,71 @@ jobs:
7565 - compiler: ghc-8.8.4
7666 compilerKind: ghc
7767 compilerVersion: 8.8.4
78− setup-method: ghcup
68+ setup-method: hvr-ppa
7969 allow-failure: false
80− - compiler: ghc-8.6.5
70+ - compiler: ghc-8.6.4
8171 compilerKind: ghc
82− compilerVersion: 8.6.5
83− setup-method: ghcup
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
105+ - compiler: ghc-7.4.2
106+ compilerKind: ghc
107+ compilerVersion: 7.4.2
108+ setup-method: hvr-ppa
84109 allow-failure: false
85110 fail-fast: false
86111 steps:
87− - name: apt-get install
112+ - name: apt
88113 run: |
89114 apt-get update
90115 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"
116+ if [ "${{ matrix.setup-method }}" = ghcup ]; then
117+ mkdir -p "$HOME/.ghcup/bin"
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)
122+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123+ else
124+ apt-add-repository -y 'ppa:hvr/ghc'
125+ apt-get update
126+ apt-get install -y "$HCNAME"
127+ mkdir -p "$HOME/.ghcup/bin"
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
110133 env:
111134 HCKIND: ${{ matrix.compilerKind }}
112135 HCNAME: ${{ matrix.compiler }}
@@ -117,12 +140,30 @@ jobs:
117140 echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
118141 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
119142 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+
120160 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
121161 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
122162 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
123163 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
124164 echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
125165 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
166+ echo "GHCJSARITH=0" >> "$GITHUB_ENV"
126167 env:
127168 HCKIND: ${{ matrix.compilerKind }}
128169 HCNAME: ${{ matrix.compiler }}
@@ -172,7 +213,7 @@ jobs:
172213 chmod a+x $HOME/.cabal/bin/cabal-plan
173214 cabal-plan --version
174215 - name: checkout
175− uses: actions/checkout@v4
216+ uses: actions/checkout@v3
176217 with:
177218 path: source
178219 - name: initial cabal.project for sdist
@@ -200,13 +241,13 @@ jobs:
200241 touch cabal.project.local
201242 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
202243 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
244+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-types" >> cabal.project ; fi
245+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
246+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
247+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
207248 cat >> cabal.project <<EOF
208249 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
250+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(uuid|uuid-types)$/; }' >> cabal.project.local
210251 cat cabal.project
211252 cat cabal.project.local
212253 - name: dump install plan
@@ -214,7 +255,7 @@ jobs:
214255 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
215256 cabal-plan
216257 - name: restore cache
217− uses: actions/cache/restore@v4
258+ uses: actions/cache/restore@v3
218259 with:
219260 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
220261 path: ~/.cabal/store
@@ -250,13 +291,19 @@ jobs:
250291 rm -f cabal.project.local
251292 - name: constraint set random-1.2
252293 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
294+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run ; fi
295+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
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
297+ if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all ; fi
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
257304 - name: save cache
305+ uses: actions/cache/save@v3
258306 if: always()
259− uses: actions/cache/save@v4
260307 with:
261308 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
262309 path: ~/.cabal/store
cabal.haskell-ci+5−1
@@ -1,7 +1,11 @@
11branches: master
2−-- jobs-selection: any
2+jobs-selection: any
33head-hackage: False
44
5+constraint-set random-1.1
6+ ghc: <9.7
7+ constraints: random==1.1.*
8+
59constraint-set random-1.2
610 ghc: >=7.10
711 constraints: random==1.2.*
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+18−17
@@ -14,15 +14,15 @@ build-type: Simple
1414
1515-- Benchmarking with older GHCs is not meaningful
1616tested-with:
17− GHC ==8.6.5
17+ GHC ==8.0.2
18+ || ==8.2.2
19+ || ==8.4.4
20+ || ==8.6.4
1821 || ==8.8.4
1922 || ==8.10.7
2023 || ==9.0.2
21− || ==9.2.8
22− || ==9.4.8
23− || ==9.6.6
24− || ==9.8.2
25− || ==9.10.1
24+ || ==9.2.7
25+ || ==9.4.4
2626
2727synopsis: UUID benchmarks
2828description:
@@ -40,24 +40,25 @@ source-repository head
4040
4141library
4242 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
43+ base >=4.9 && <5
44+ , binary >=0.5.1.0 && <0.9
45+ , bytestring >=0.9.2.1 && <0.12
4646 , cryptohash-md5 >=0.11.100 && <0.12
4747 , cryptohash-sha1 >=0.11.100 && <0.12
48− , deepseq >=1.4.4.0 && <1.6
48+ , deepseq >=1.3.0.0 && <1.5
4949 , entropy >=0.3.7 && <0.5
50− , hashable >=1.4.4.0 && <1.6
50+ , hashable >=1.2.7.0 && <1.5
5151 , 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
52+ , random >=1.1 && <1.3
53+ , template-haskell >=2.7.0.0 && <2.20
54+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.1
5555 , time >=1.4 && <1.13
5656
5757 -- uuid modules
5858 exposed-modules:
5959 Data.UUID
6060 Data.UUID.Util
61+ Data.UUID.V1
6162 Data.UUID.V3
6263 Data.UUID.V4
6364 Data.UUID.V5
@@ -99,13 +100,13 @@ benchmark uuid-types-benchmark
99100
100101 -- deps w/o inherited constraints
101102 build-depends:
102− containers >=0.5 && <0.8
103+ containers >=0.5 && <0.7
103104 , criterion >=1.5 && <1.7
104105 , unordered-containers >=0.2.7 && <0.3
105106
106107benchmark uuid-benchmark
107108 type: exitcode-stdio-1.0
108− main-is: uuid-benchmark.hs
109+ main-is: uuid-benchmark.hs
109110 hs-source-dirs: bench
110111 default-language: Haskell2010
111112 default-extensions:
@@ -118,7 +119,7 @@ benchmark uuid-benchmark
118119 build-depends:
119120 base
120121 , random
121− , uuid-bench
122+ , uuid
122123
123124 -- deps w/o inherited constraints
124125 build-depends:
uuid-types/ChangeLog.md−4
@@ -1,7 +1,3 @@
1−## 1.0.6 (2023-04-16)
2−
3−- Support GHC-8.6.5..GHC-9.10.1
4−
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+22−20
@@ -1,7 +1,6 @@
11cabal-version: 1.12
22name: uuid-types
3−version: 1.0.6
4−x-revision: 2
3+version: 1.0.5.1
54copyright:
65 (c) 2017-2018 Herbert Valerio Riedel
76 (c) 2008-2014 Antoine Latter
@@ -13,16 +12,21 @@ license-file: LICENSE
1312category: Data
1413build-type: Simple
1514tested-with:
16− GHC ==8.6.5
15+ GHC ==7.4.2
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
1723 || ==8.8.4
1824 || ==8.10.7
1925 || ==9.0.2
2026 || ==9.2.8
21− || ==9.4.8
22− || ==9.6.6
23− || ==9.8.4
24− || ==9.10.1
25− || ==9.12.1
27+ || ==9.4.7
28+ || ==9.6.3
29+ || ==9.8.1
2630
2731synopsis: Type definitions for Universally Unique Identifiers
2832description:
@@ -46,14 +50,14 @@ source-repository head
4650
4751library
4852 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
53+ base >=4.5 && <5
54+ , binary >=0.5.1.0 && <0.9
55+ , bytestring >=0.9.2.1 && <0.13
56+ , deepseq >=1.3.0.0 && <1.6
57+ , hashable >=1.2.7.0 && <1.5
58+ , random >=1.1 && <1.3
59+ , template-haskell >=2.7.0.0 && <2.22
60+ , text >=1.2.3.0 && <1.3 || >=2.0 && <2.2
5761
5862 exposed-modules: Data.UUID.Types
5963
@@ -77,8 +81,6 @@ test-suite testuuid
7781 default-language: Haskell2010
7882 other-extensions: ViewPatterns
7983 ghc-options: -Wall
80− if impl(ghc >= 8.10)
81− ghc-options: -Wunused-packages
8284
8385 -- inherited constraints
8486 build-depends:
@@ -90,10 +92,10 @@ test-suite testuuid
9092
9193 -- deps w/o inherited constraints
9294 build-depends:
93− QuickCheck >=2.14.2 && <2.16
95+ QuickCheck >=2.14.2 && <2.15
9496 , tasty >=1.4.0.1 && <1.6
9597 , tasty-hunit >=0.10 && <0.11
96− , tasty-quickcheck >=0.10 && <0.12
98+ , tasty-quickcheck >=0.10 && <0.11
9799
98100 if !impl(ghc >=8.4)
99101 build-depends: ghc-byteorder >=4.11 && <4.12
uuid/CHANGES.md−4
@@ -1,7 +1,3 @@
1−1.3.16
2−
3−- Support GHC-8.6.5...9.10.1
4−
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+27−18
@@ -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: 3
55copyright: (c) 2008-2014 Antoine Latter
66author: Antoine Latter
77maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
@@ -10,16 +10,21 @@ 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
1623 || ==9.0.2
1724 || ==9.2.8
18− || ==9.4.8
19− || ==9.6.6
20− || ==9.8.4
21− || ==9.10.1
22− || ==9.12.1
25+ || ==9.4.7
26+ || ==9.6.3
27+ || ==9.8.1
2328
2429synopsis:
2530 For creating, comparing, parsing and printing Universally Unique Identifiers
@@ -41,19 +46,26 @@ source-repository head
4146
4247library
4348 build-depends:
44− base >=4.12 && <5
45− , binary >=0.8.6.0 && <0.9
46− , bytestring >=0.10.8.2 && <0.13
49+ base >=4.5 && <5
50+ , binary >=0.5.1.0 && <0.9
51+ , bytestring >=0.9.2.1 && <0.13
4752 , cryptohash-md5 >=0.11.100 && <0.12
4853 , cryptohash-sha1 >=0.11.100 && <0.12
4954 , 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
5059
5160 -- strict dependency on uuid-types,
5261 -- as we re-rexport datatype, thus leak instances etc.
53− build-depends: uuid-types >=1.0.6 && <1.0.7
62+ build-depends:
63+ uuid-types >=1.0.5 && <1.0.6
64+
5465 exposed-modules:
5566 Data.UUID
5667 Data.UUID.Util
68+ Data.UUID.V1
5769 Data.UUID.V3
5870 Data.UUID.V4
5971 Data.UUID.V5
@@ -66,8 +78,6 @@ library
6678 default-extensions: DeriveDataTypeable
6779 other-extensions: TypeFamilies
6880 ghc-options: -Wall
69− if impl(ghc >= 8.10)
70− ghc-options: -Wunused-packages
7181 hs-source-dirs: src
7282
7383test-suite testuuid
@@ -78,18 +88,17 @@ test-suite testuuid
7888 default-extensions: DeriveDataTypeable
7989 other-extensions: ViewPatterns
8090 ghc-options: -Wall -fno-warn-orphans
81− if impl(ghc >= 8.10)
82− ghc-options: -Wunused-packages
8391
8492 -- inherited constraints
8593 build-depends:
8694 base
8795 , bytestring
96+ , random
8897 , uuid
8998
9099 -- deps w/o inherited constraints
91100 build-depends:
92− QuickCheck >=2.14.2 && <2.16
101+ QuickCheck >=2.14.2 && <2.15
93102 , tasty >=1.4.0.1 && <1.6
94103 , tasty-hunit >=0.10 && <0.11
95− , tasty-quickcheck >=0.10 && <0.12
104+ , tasty-quickcheck >=0.10 && <0.11