Merge pull request #2 from obsidiansystems/aa/14

Update to openmoji v14

.github/workflows/haskell.yml

@@ -6,18 +6,19 @@ jobs:
   build:
     strategy:
       matrix:
-        ghc: ['8.6.5', '8.8.4', '8.10.2']
+        ghc: ['8.6.5', '8.10.7', '9.6.1']
         os: ['ubuntu-latest', 'macos-latest']
     runs-on: ${{ matrix.os }}
 
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
+    - uses: actions/checkout@v3
+    - uses: haskell/actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
+        cabal-version: '3.10.1.0'
     - name: Cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       env:
         cache-name: cache-cabal
       with:
@@ -30,10 +31,10 @@ jobs:
           ${{ runner.os }}
 
     - name: Install dependencies
-      run: |
-        cabal update
-        cabal build --only-dependencies --enable-tests --enable-benchmarks
+      run: cabal build --only-dependencies --enable-tests --enable-benchmarks
     - name: Build
       run: cabal build --enable-tests --enable-benchmarks all
     - name: Run tests
-      run: cabal test all
+      run: cabal test --enable-tests all
+    - name: Build Docs
+      run: cabal haddock

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision history for hs-openmoji
 
+## 14.0.0
+
+* Generated OpenMoji data from [OpenMoji v14.0](https://github.com/hfg-gmuend/openmoji/releases/tag/14.0.0)
+
 ## 13.0.0
 
 * Generated OpenMoji data from [OpenMoji v13.0](https://github.com/hfg-gmuend/openmoji/releases/tag/13.0.0)

hs-openmoji-data.cabal

@@ -1,6 +1,6 @@
 cabal-version:      >=1.10
 name:               hs-openmoji-data
-version:            13.0.0
+version:            14.0.0
 synopsis:           The OpenMoji emoji dataset
 description:
   This library simply exposes the OpenMoji emoji dataset as some data in Haskell
@@ -23,8 +23,8 @@ library
     Text.Emoji.OpenMoji.Types
 
   build-depends:
-      base  >=4.12 && <4.15
-    , text  >=1.2  && <1.3
+      base  >=4.12 && <4.19
+    , text  >=1.2  && <2.1
 
   hs-source-dirs:   src
   default-language: Haskell2010

openmoji/github.json

@@ -3,6 +3,6 @@
   "repo": "openmoji",
   "branch": "master",
   "private": false,
-  "rev": "4a80b536eb62a78822548a2aa371426f912d7e9d",
-  "sha256": "0kn82wk02fjqfyixzzkyvpqkz5gsndjd84av6j9s8j8y517qn98w"
+  "rev": "7fe6c3dbc6b353ea9cbceb5bb0d4641912d520a1",
+  "sha256": "0s89bqcj5s14d0fp0brdvxm76daj88zdw8jf69mj927vcs5ys29m"
 }

openmoji/thunk.nix

@@ -2,7 +2,10 @@
 let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
   if !fetchSubmodules && !private then builtins.fetchTarball {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
-  } else (import <nixpkgs> {}).fetchFromGitHub {
+  } else (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/3aad50c30c826430b0270fcf8264c8c41b005403.tar.gz";
+  sha256 = "0xwqsf08sywd23x0xvw4c4ghq0l28w2ki22h0bdn766i16z9q2gr";
+}) {}).fetchFromGitHub {
     inherit owner repo rev sha256 fetchSubmodules private;
   };
   json = builtins.fromJSON (builtins.readFile ./github.json);