git.iko.soy/typeable/uuid
on master help sign in
swap
49f50ae29 ahead, 0 behind
18 files changed+303−421
since splitsnapshots
unifiedsplit
.github/workflows/haskell-ci-bench.yml+101−46 .github/workflows/haskell-ci.yml+112−55 cabal.haskell-ci+2−3 cabal.project+1−1 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+28−23 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+22−25
.github/workflows/haskell-ci-bench.yml+101−46
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.11.20210214
11+# version: 0.19.20240702
1212#
13−# REGENDATA ("0.11.20210214",["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:
@@ -22,57 +22,101 @@ on:
2222 - master
2323jobs:
2424 linux:
25− name: Benchmarks - Linux - GHC ${{ matrix.ghc }}
26− runs-on: ubuntu-18.04
25+ name: Benchmarks - Linux - ${{ matrix.compiler }}
26+ runs-on: ubuntu-20.04
27+ timeout-minutes:
28+ 60
2729 container:
28− image: buildpack-deps:bionic
30+ image: buildpack-deps:jammy
2931 continue-on-error: ${{ matrix.allow-failure }}
3032 strategy:
3133 matrix:
3234 include:
33− - ghc: 8.10.3
35+ - compiler: ghc-9.10.1
36+ compilerKind: ghc
37+ compilerVersion: 9.10.1
38+ setup-method: ghcup
3439 allow-failure: false
35− - ghc: 8.8.4
40+ - compiler: ghc-9.8.2
41+ compilerKind: ghc
42+ compilerVersion: 9.8.2
43+ setup-method: ghcup
3644 allow-failure: false
37− - ghc: 8.6.4
45+ - compiler: ghc-9.6.6
46+ compilerKind: ghc
47+ compilerVersion: 9.6.6
48+ setup-method: ghcup
3849 allow-failure: false
39− - ghc: 8.4.4
50+ - compiler: ghc-9.4.8
51+ compilerKind: ghc
52+ compilerVersion: 9.4.8
53+ setup-method: ghcup
4054 allow-failure: false
41− - ghc: 8.2.2
55+ - compiler: ghc-9.2.8
56+ compilerKind: ghc
57+ compilerVersion: 9.2.8
58+ setup-method: ghcup
4259 allow-failure: false
43− - ghc: 8.0.2
60+ - compiler: ghc-9.0.2
61+ compilerKind: ghc
62+ compilerVersion: 9.0.2
63+ setup-method: ghcup
64+ allow-failure: false
65+ - compiler: ghc-8.10.7
66+ compilerKind: ghc
67+ compilerVersion: 8.10.7
68+ setup-method: ghcup
69+ allow-failure: false
70+ - compiler: ghc-8.8.4
71+ 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
4479 allow-failure: false
4580 fail-fast: false
4681 steps:
4782 - name: apt
4883 run: |
4984 apt-get update
50− apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
51− apt-add-repository -y 'ppa:hvr/ghc'
52− apt-get update
53− apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
85+ 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)
5491 env:
55− GHC_VERSION: ${{ matrix.ghc }}
92+ HCKIND: ${{ matrix.compilerKind }}
93+ HCNAME: ${{ matrix.compiler }}
94+ HCVER: ${{ matrix.compilerVersion }}
5695 - name: Set PATH and environment variables
5796 run: |
5897 echo "$HOME/.cabal/bin" >> $GITHUB_PATH
59− echo "LANG=C.UTF-8" >> $GITHUB_ENV
60− echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
61− echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
62− HC=/opt/ghc/$GHC_VERSION/bin/ghc
63− echo "HC=$HC" >> $GITHUB_ENV
64− echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
65− echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
66− echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
98+ echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
99+ echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
100+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
101+ 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"
67109 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
68− echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
69− echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
70− echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
71− echo "HEADHACKAGE=false" >> $GITHUB_ENV
72− echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
73− echo "GHCJSARITH=0" >> $GITHUB_ENV
110+ echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
111+ echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
112+ echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
113+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
114+ echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
115+ echo "GHCJSARITH=0" >> "$GITHUB_ENV"
74116 env:
75− GHC_VERSION: ${{ matrix.ghc }}
117+ HCKIND: ${{ matrix.compilerKind }}
118+ HCNAME: ${{ matrix.compiler }}
119+ HCVER: ${{ matrix.compilerVersion }}
76120 - name: env
77121 run: |
78122 env
@@ -95,6 +139,10 @@ jobs:
95139 repository hackage.haskell.org
96140 url: http://hackage.haskell.org/
97141 EOF
142+ cat >> $CABAL_CONFIG <<EOF
143+ program-default-options
144+ ghc-options: $GHCJOBS +RTS -M3G -RTS
145+ EOF
98146 cat $CABAL_CONFIG
99147 - name: versions
100148 run: |
@@ -107,14 +155,14 @@ jobs:
107155 - name: install cabal-plan
108156 run: |
109157 mkdir -p $HOME/.cabal/bin
110− 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
111− 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 -
112160 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
113161 rm -f cabal-plan.xz
114162 chmod a+x $HOME/.cabal/bin/cabal-plan
115163 cabal-plan --version
116164 - name: checkout
117− uses: actions/checkout@v2
165+ uses: actions/checkout@v4
118166 with:
119167 path: source
120168 - name: initial cabal.project for sdist
@@ -133,27 +181,28 @@ jobs:
133181 - name: generate cabal.project
134182 run: |
135183 PKGDIR_uuid_bench="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/uuid-bench-[0-9.]*')"
136− echo "PKGDIR_uuid_bench=${PKGDIR_uuid_bench}" >> $GITHUB_ENV
184+ echo "PKGDIR_uuid_bench=${PKGDIR_uuid_bench}" >> "$GITHUB_ENV"
185+ rm -f cabal.project cabal.project.local
137186 touch cabal.project
138187 touch cabal.project.local
139188 echo "packages: ${PKGDIR_uuid_bench}" >> cabal.project
140− if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-bench" >> cabal.project ; fi
141− 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
142191 cat >> cabal.project <<EOF
143192 EOF
144− $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
145194 cat cabal.project
146195 cat cabal.project.local
147196 - name: dump install plan
148197 run: |
149198 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
150199 cabal-plan
151− - name: cache
152− uses: actions/cache@v2
200+ - name: restore cache
201+ uses: actions/cache/restore@v4
153202 with:
154− key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
203+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
155204 path: ~/.cabal/store
156− restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
205+ restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
157206 - name: install dependencies
158207 run: |
159208 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
@@ -170,7 +219,7 @@ jobs:
170219 ${CABAL} -vnormal check
171220 - name: haddock
172221 run: |
173− $CABAL v2-haddock $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
174223 - name: unconstrained build
175224 run: |
176225 rm -f cabal.project.local
@@ -180,7 +229,13 @@ jobs:
180229 rm -f cabal.project.local
181230 - name: constraint set random-1.2
182231 run: |
232+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all --dry-run
233+ cabal-plan topo | sort
234+ $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' --dependencies-only -j2 all
183235 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all
184− - name: constraint set random-1.1
185− run: |
186− $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+112−55
@@ -8,9 +8,9 @@
88#
99# For more information, see https://github.com/haskell-CI/haskell-ci
1010#
11−# version: 0.11.20210214
11+# version: 0.19.20241223
1212#
13−# REGENDATA ("0.11.20210214",["github","cabal.project"])
13+# REGENDATA ("0.19.20241223",["github","cabal.project"])
1414#
1515name: Haskell-CI
1616on:
@@ -22,65 +22,111 @@ on:
2222 - master
2323jobs:
2424 linux:
25− name: Haskell-CI - Linux - GHC ${{ matrix.ghc }}
26− runs-on: ubuntu-18.04
25+ name: Haskell-CI - Linux - ${{ matrix.compiler }}
26+ runs-on: ubuntu-20.04
27+ timeout-minutes:
28+ 60
2729 container:
28− image: buildpack-deps:bionic
30+ image: buildpack-deps:jammy
2931 continue-on-error: ${{ matrix.allow-failure }}
3032 strategy:
3133 matrix:
3234 include:
33− - ghc: 8.10.3
35+ - compiler: ghc-9.12.1
36+ compilerKind: ghc
37+ compilerVersion: 9.12.1
38+ setup-method: ghcup
3439 allow-failure: false
35− - ghc: 8.8.4
40+ - compiler: ghc-9.10.1
41+ compilerKind: ghc
42+ compilerVersion: 9.10.1
43+ setup-method: ghcup
3644 allow-failure: false
37− - ghc: 8.6.4
45+ - compiler: ghc-9.8.4
46+ compilerKind: ghc
47+ compilerVersion: 9.8.4
48+ setup-method: ghcup
3849 allow-failure: false
39− - ghc: 8.4.4
50+ - compiler: ghc-9.6.6
51+ compilerKind: ghc
52+ compilerVersion: 9.6.6
53+ setup-method: ghcup
4054 allow-failure: false
41− - ghc: 8.2.2
55+ - compiler: ghc-9.4.8
56+ compilerKind: ghc
57+ compilerVersion: 9.4.8
58+ setup-method: ghcup
4259 allow-failure: false
43− - ghc: 8.0.2
60+ - compiler: ghc-9.2.8
61+ compilerKind: ghc
62+ compilerVersion: 9.2.8
63+ setup-method: ghcup
4464 allow-failure: false
45− - ghc: 7.10.3
65+ - compiler: ghc-9.0.2
66+ compilerKind: ghc
67+ compilerVersion: 9.0.2
68+ setup-method: ghcup
4669 allow-failure: false
47− - ghc: 7.8.4
70+ - compiler: ghc-8.10.7
71+ compilerKind: ghc
72+ compilerVersion: 8.10.7
73+ setup-method: ghcup
4874 allow-failure: false
49− - ghc: 7.6.3
75+ - compiler: ghc-8.8.4
76+ compilerKind: ghc
77+ compilerVersion: 8.8.4
78+ setup-method: ghcup
5079 allow-failure: false
51− - ghc: 7.4.2
80+ - compiler: ghc-8.6.5
81+ compilerKind: ghc
82+ compilerVersion: 8.6.5
83+ setup-method: ghcup
5284 allow-failure: false
5385 fail-fast: false
5486 steps:
55− - name: apt
87+ - name: apt-get install
5688 run: |
5789 apt-get update
58− apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
59− apt-add-repository -y 'ppa:hvr/ghc'
60− apt-get update
61− apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
90+ apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
91+ - name: Install GHCup
92+ run: |
93+ mkdir -p "$HOME/.ghcup/bin"
94+ curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
95+ chmod a+x "$HOME/.ghcup/bin/ghcup"
96+ - name: Install cabal-install
97+ run: |
98+ "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
99+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
100+ - name: Install GHC (GHCup)
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"
62110 env:
63− GHC_VERSION: ${{ matrix.ghc }}
111+ HCKIND: ${{ matrix.compilerKind }}
112+ HCNAME: ${{ matrix.compiler }}
113+ HCVER: ${{ matrix.compilerVersion }}
64114 - name: Set PATH and environment variables
65115 run: |
66116 echo "$HOME/.cabal/bin" >> $GITHUB_PATH
67− echo "LANG=C.UTF-8" >> $GITHUB_ENV
68− echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
69− echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
70− HC=/opt/ghc/$GHC_VERSION/bin/ghc
71− echo "HC=$HC" >> $GITHUB_ENV
72− echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
73− echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
74− echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
117+ echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
118+ echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
119+ echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
75120 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
76− echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
77− echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
78− echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
79− echo "HEADHACKAGE=false" >> $GITHUB_ENV
80− echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
81− echo "GHCJSARITH=0" >> $GITHUB_ENV
121+ echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
122+ echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
123+ echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
124+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
125+ echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
82126 env:
83− GHC_VERSION: ${{ matrix.ghc }}
127+ HCKIND: ${{ matrix.compilerKind }}
128+ HCNAME: ${{ matrix.compiler }}
129+ HCVER: ${{ matrix.compilerVersion }}
84130 - name: env
85131 run: |
86132 env
@@ -103,6 +149,10 @@ jobs:
103149 repository hackage.haskell.org
104150 url: http://hackage.haskell.org/
105151 EOF
152+ cat >> $CABAL_CONFIG <<EOF
153+ program-default-options
154+ ghc-options: $GHCJOBS +RTS -M3G -RTS
155+ EOF
106156 cat $CABAL_CONFIG
107157 - name: versions
108158 run: |
@@ -115,14 +165,14 @@ jobs:
115165 - name: install cabal-plan
116166 run: |
117167 mkdir -p $HOME/.cabal/bin
118− 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
119− 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 -
120170 xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
121171 rm -f cabal-plan.xz
122172 chmod a+x $HOME/.cabal/bin/cabal-plan
123173 cabal-plan --version
124174 - name: checkout
125− uses: actions/checkout@v2
175+ uses: actions/checkout@v4
126176 with:
127177 path: source
128178 - name: initial cabal.project for sdist
@@ -142,32 +192,33 @@ jobs:
142192 - name: generate cabal.project
143193 run: |
144194 PKGDIR_uuid_types="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/uuid-types-[0-9.]*')"
145− echo "PKGDIR_uuid_types=${PKGDIR_uuid_types}" >> $GITHUB_ENV
195+ echo "PKGDIR_uuid_types=${PKGDIR_uuid_types}" >> "$GITHUB_ENV"
146196 PKGDIR_uuid="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/uuid-[0-9.]*')"
147− echo "PKGDIR_uuid=${PKGDIR_uuid}" >> $GITHUB_ENV
197+ echo "PKGDIR_uuid=${PKGDIR_uuid}" >> "$GITHUB_ENV"
198+ rm -f cabal.project cabal.project.local
148199 touch cabal.project
149200 touch cabal.project.local
150201 echo "packages: ${PKGDIR_uuid_types}" >> cabal.project
151202 echo "packages: ${PKGDIR_uuid}" >> cabal.project
152− if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid-types" >> cabal.project ; fi
153− if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
154− if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package uuid" >> cabal.project ; fi
155− if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
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
156207 cat >> cabal.project <<EOF
157208 EOF
158− $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
159210 cat cabal.project
160211 cat cabal.project.local
161212 - name: dump install plan
162213 run: |
163214 $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
164215 cabal-plan
165− - name: cache
166− uses: actions/cache@v2
216+ - name: restore cache
217+ uses: actions/cache/restore@v4
167218 with:
168− key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
219+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
169220 path: ~/.cabal/store
170− restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
221+ restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
171222 - name: install dependencies
172223 run: |
173224 $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
@@ -189,7 +240,7 @@ jobs:
189240 ${CABAL} -vnormal check
190241 - name: haddock
191242 run: |
192− $CABAL v2-haddock $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
193244 - name: unconstrained build
194245 run: |
195246 rm -f cabal.project.local
@@ -199,7 +250,13 @@ jobs:
199250 rm -f cabal.project.local
200251 - name: constraint set random-1.2
201252 run: |
202− if [ $((HCNUMVER >= 71000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='random==1.2.*' all ; fi
203− - name: constraint set random-1.1
204− run: |
205− $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−3
@@ -1,7 +1,6 @@
11branches: master
2−
3−constraint-set random-1.1
4− constraints: random==1.1.*
2+-- jobs-selection: any
3+head-hackage: False
54
65constraint-set random-1.2
76 ghc: >=7.10
cabal.project+1−1
@@ -2,7 +2,7 @@
22-- for more details
33
44packages: uuid-types/
5− uuid/
5+packages: uuid/
66
77package uuid-types
88 tests: True
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.3
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.18
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)
2+
3+- Support GHC-8.6.5..GHC-9.10.1
4+
15## 1.0.5 (2021-05-03)
26
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
62
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
63
74{-# OPTIONS_HADDOCK hide #-}
85
uuid-types/uuid-types.cabal+28−23
@@ -1,6 +1,7 @@
11cabal-version: 1.12
22name: uuid-types
3−version: 1.0.5
3+version: 1.0.6
4+x-revision: 2
45copyright:
56 (c) 2017-2018 Herbert Valerio Riedel
67 (c) 2008-2014 Antoine Latter
@@ -12,16 +13,16 @@ license-file: LICENSE
1213category: Data
1314build-type: Simple
1415tested-with:
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
16+ GHC ==8.6.5
2317 || ==8.8.4
24− || ==8.10.3
18+ || ==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
2526
2627synopsis: Type definitions for Universally Unique Identifiers
2728description:
@@ -45,14 +46,14 @@ source-repository head
4546
4647library
4748 build-depends:
48− base >=4.5 && <5
49− , binary >=0.5.1.0 && <0.9
50− , bytestring >=0.9.2.1 && <0.12
51− , deepseq >=1.3.0.0 && <1.5
52− , hashable >=1.2.7.0 && <1.4
53− , random >=1.1 && <1.3
54− , template-haskell >=2.7.0.0 && <2.18
55− , text >=1.2.3.0 && <1.3
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
5657
5758 exposed-modules: Data.UUID.Types
5859
@@ -76,19 +77,23 @@ test-suite testuuid
7677 default-language: Haskell2010
7778 other-extensions: ViewPatterns
7879 ghc-options: -Wall
80+ if impl(ghc >= 8.10)
81+ ghc-options: -Wunused-packages
7982
8083 -- inherited constraints
8184 build-depends:
8285 base
8386 , binary
8487 , bytestring
85− , uuid-types
8688 , template-haskell
89+ , uuid-types
8790
8891 -- deps w/o inherited constraints
8992 build-depends:
90− ghc-byteorder >=4.11 && <4.12
91− , QuickCheck >=2.14.2 && <2.15
92− , tasty >=1.4.0.1 && <1.5
93+ QuickCheck >=2.14.2 && <2.16
94+ , tasty >=1.4.0.1 && <1.6
9395 , tasty-hunit >=0.10 && <0.11
94− , 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
2+
3+- Support GHC-8.6.5...9.10.1
4+
151.3.15
26
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
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+4−20
@@ -1,18 +1,15 @@
11{-# LANGUAGE ViewPatterns #-}
22
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+22−25
@@ -1,6 +1,7 @@
11cabal-version: 1.12
22name: uuid
3−version: 1.3.15
3+version: 1.3.16
4+x-revision: 2
45copyright: (c) 2008-2014 Antoine Latter
56author: Antoine Latter
67maintainer: Oleg Grenrus <oleg.grenrus@iki.fi>
@@ -9,16 +10,16 @@ license-file: LICENSE
910category: Data
1011build-type: Simple
1112tested-with:
12− GHC ==7.4.2
13− || ==7.6.3
14− || ==7.8.4
15− || ==7.10.3
16− || ==8.0.2
17− || ==8.2.2
18− || ==8.4.4
19− || ==8.6.4
13+ GHC ==8.6.5
2014 || ==8.8.4
21− || ==8.10.3
15+ || ==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
2223
2324synopsis:
2425 For creating, comparing, parsing and printing Universally Unique Identifiers
@@ -40,26 +41,19 @@ source-repository head
4041
4142library
4243 build-depends:
43− base >=4.5 && <5
44− , binary >=0.5.1.0 && <0.9
45− , 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
4647 , cryptohash-md5 >=0.11.100 && <0.12
4748 , cryptohash-sha1 >=0.11.100 && <0.12
4849 , entropy >=0.3.7 && <0.5
49− , network-info >=0.2 && <0.3
50− , random >=1.1 && <1.3
51− , text >=1.2.3.0 && <1.3
52− , time >=1.4 && <1.12
5350
5451 -- strict dependency on uuid-types,
5552 -- as we re-rexport datatype, thus leak instances etc.
56− build-depends:
57− uuid-types >=1.0.5 && <1.0.6
58−
53+ build-depends: uuid-types >=1.0.6 && <1.0.7
5954 exposed-modules:
6055 Data.UUID
6156 Data.UUID.Util
62− Data.UUID.V1
6357 Data.UUID.V3
6458 Data.UUID.V4
6559 Data.UUID.V5
@@ -72,6 +66,8 @@ library
7266 default-extensions: DeriveDataTypeable
7367 other-extensions: TypeFamilies
7468 ghc-options: -Wall
69+ if impl(ghc >= 8.10)
70+ ghc-options: -Wunused-packages
7571 hs-source-dirs: src
7672
7773test-suite testuuid
@@ -82,17 +78,18 @@ test-suite testuuid
8278 default-extensions: DeriveDataTypeable
8379 other-extensions: ViewPatterns
8480 ghc-options: -Wall -fno-warn-orphans
81+ if impl(ghc >= 8.10)
82+ ghc-options: -Wunused-packages
8583
8684 -- inherited constraints
8785 build-depends:
8886 base
8987 , bytestring
90− , random
9188 , uuid
9289
9390 -- deps w/o inherited constraints
9491 build-depends:
95− QuickCheck >=2.14.2 && <2.15
96− , tasty >=1.4.0.1 && <1.5
92+ QuickCheck >=2.14.2 && <2.16
93+ , tasty >=1.4.0.1 && <1.6
9794 , tasty-hunit >=0.10 && <0.11
98− , tasty-quickcheck >=0.10 && <0.11
95+ , tasty-quickcheck >=0.10 && <0.12