Merge branch 'master' into build

Author: expipiplus1

.github/pull_request_template.md

@@ -0,0 +1 @@
+Please don't forget to add to the "WIP" section of the changelog!

.github/workflows/ci.yml

@@ -4,89 +4,75 @@ on: [pull_request]
 
 jobs:
   cabal:
-
+    name: "Cabal: ${{ matrix.ghc }} on ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ghc: ['8.10.1', '8.8.3', '8.6.5', '8.4.4', '8.2.2', '8.0.2']
-        cabal: ['3.0']
-        os: [ubuntu-latest]
-
-    runs-on: ${{ matrix.os }}
-
-
+        ghc: ['8.10', '9.0', '9.2']
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
+    - name: Checkout base repo
+      uses: actions/[email protected]
+    - name: Set up Haskell
+      id: setup-haskell
+      uses: haskell/actions/setup@v1
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
-
-    - uses: actions/cache@v1
-      name: Cache ~/.cabal/packages
-      with:
-        path: ~/.cabal/packages
-        key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-packages
-    - uses: actions/cache@v1
-      name: Cache ~/.cabal/store
+        cabal-version: 'latest'
+    - name: Configure
+      run: cabal new-configure
+    - name: Freeze
+      run: cabal freeze
+    - name: Cache
+      uses: actions/[email protected]
       with:
-        path: ~/.cabal/store
-        key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-store
-    - uses: actions/cache@v1
-      name: Cache dist-newstyle
-      with:
-        path: dist-newstyle
-        key: ${{ runner.os }}-${{ matrix.ghc }}-dist-newstyle
-
-    - name: Install dependencies
-      run: |
-        cabal update
-        cabal build --only-dependencies --enable-tests --enable-benchmarks
-
+        path: ${{ steps.setup-haskell.outputs.cabal-store }}
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+        restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
     - name: Build
-      run: cabal build --enable-tests --enable-benchmarks all
-
+      run: cabal build
   stack:
-
+    name: "Stack: ${{ matrix.resolver }} on ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        stack-args: ['']
-
-    runs-on: ${{ matrix.os }}
-
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        resolver: ['lts-18.22', 'nightly-2022-01-20']
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
-      with:
-        stack-version: 'latest'
-
-    - name: Cache stack global package db
-      id:   stack-global
-      uses: actions/cache@v1
-      with:
-        path: ~/.stack
-        key: ${{ runner.os }}-stack-global-${{ matrix.stack-args }}-${{ hashFiles('**.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-stack-global-${{ matrix.stack-args }}
-          ${{ runner.os }}-stack-global
-    - name: Cache .stack-work
-      id: stack-work
-      uses: actions/cache@v1
+      - name: Checkout base repo
+        uses: actions/[email protected]
+      - name: Set up Haskell
+        id: setup-haskell
+        uses: haskell/actions/setup@v1
+        with:
+          stack-version: 'latest'
+      - name: Cache Stack global package DB
+        uses: actions/[email protected]
+        with:
+          path: ~/.stack
+          key: ${{ runner.os }}-stack-global-${{ matrix.resolver }}-${{ hashFiles('**.yaml') }}
+          restore-keys: ${{ runner.os }}-stack-global-${{ matrix.resolver }}
+      - name: Cache .stack-work
+        uses: actions/[email protected]
+        with:
+          path: .stack-work
+          key: ${{ runner.os }}-stack-work-${{ matrix.resolver}}-${{ hashFiles('**.yaml') }}
+          restore-keys: ${{ runner.os }}-stack-work-${{ matrix.resolver }}
+      # https://github.com/commercialhaskell/stack/issues/5405
+      - name: Clear setup-exe-cache directory
+        if: runner.os == 'macOS'
+        continue-on-error: true
+        run: rm -r ~/.stack/setup-exe-cache
+      - name: Build
+        run: stack build --resolver=${{ matrix.resolver }}
+  nix:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: cachix/install-nix-action@v12
       with:
-        path: .stack-work
-        key: ${{ runner.os }}-stack-work-${{ matrix.stack-args }}-${{ hashFiles('**.yaml') }}
-        restore-keys: |
-          ${{ runner.os }}-stack-work-${{ matrix.stack-args }}
-          ${{ runner.os }}-stack-work
-
-    - name: Install dependencies
-      run: |
-        stack build --test --bench --only-dependencies $ARGS
-      env:
-        ARGS: ${{ matrix.args }}
-
-    - name: Build
-      run: |
-        stack build $ARGS
-      env:
-        ARGS: ${{ matrix.args }}
+        nix_path: nixpkgs=channel:nixos-unstable
+    - uses: actions/checkout@v2
+    - run: nix-build
+    - run: nix-build release.nix -A tarball
+    - run: nix-build release.nix -A sdistTest
+    - run: nix-build release.nix -A docs

.github/workflows/release.yml

@@ -0,0 +1,39 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+    - v*
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: cachix/install-nix-action@v12
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+    - uses: actions/checkout@v2
+
+    - name: Build project
+      run: |
+        mkdir assets
+        nix-build ./release.nix -A sdistTest --no-out-link
+        ln -s "$(nix-build release.nix -A tarball --no-out-link)"/*.tar.gz assets/
+        ln -s "$(nix-build release.nix -A docs --no-out-link)"/*.tar.gz assets/
+        ref="${{ github.ref }}"
+        printf "Release ${ref#"refs/tags/"}\n\n" >release-note.md
+        # Get the section after the WIP section
+        awk '/## WIP/{flag=0;next};/##/{flag=flag+1};flag==1' <changelog.md |
+          sed "/^##/d" >>"release-note.md"
+
+    - name: Create Release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        if [ -f release-note.md ]; then
+          hub release create \
+            $(find assets -type f -o -type l -printf "--attach %p ") \
+            --file release-note.md \
+            ${{ github.ref }}
+        fi

.github/workflows/tag-release.yml

@@ -0,0 +1,21 @@
+name: Tag Latest Release
+
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  update:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: cachix/install-nix-action@v12
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0 # Fetch everything
+        ssh-key: ${{ secrets.DEPLOY_KEY }}
+    - uses: expipiplus1/tag-latest-release/tag-latest-release@HEAD
+      with:
+        tagsAndFiles: v vector-sized.cabal

.gitignore

@@ -1,5 +1,5 @@
 .ghc.environment.*
-cabal.project.local
+cabal.project.local*
 dist
 dist-*
 cabal-dev
@@ -19,3 +19,4 @@ cabal.sandbox.config
 .stack-work/
 .nvimrc
 .vimrc
+

changelog.md

@@ -1,8 +1,31 @@
 # Change Log
 
 ## WIP
+- Drop support for GHC older than 8.10
+
+## [1.5.0] - 2021-08-25
+
+- Change indexes used by `accum` from `Int` to `Finite`.
+
+## [1.4.4] - 2021-06-26
+
+- Add `ix'`
+
+## [1.4.3.1] - 2020-12-13
+
+- Fix Bits instance, shiftl and shiftr were incorrect
+
+## [1.4.3] - 2020-12-08
+
+- Add Primitive flavour of sized vectors
+- Add `instance Bits (v a) => Bits (Vector v n a)`
+
+Thanks to @Bodigrim and @mstksg
+
+## [1.4.2] - 2020-08-20
 
 - Add `instance Unbox a, KnownNat n) => Unbox (Vector n a)`
+- Add `zipVectorsUnsafe`
 
 ## [1.4.1.0] - 2020-05-04
 

default.nix

@@ -1,36 +1,12 @@
-{ pkgs ? import <nixpkgs> {}
-, compiler ? "ghc882"
-, hoogle ? true
-}:
-
-let src = pkgs.nix-gitignore.gitignoreSource [] ./.;
-
-    # Any overrides we require to the specified haskell package set
-    haskellPackages = with pkgs.haskell.lib;
-      pkgs.haskell.packages.${compiler}.override {
-      overrides = self: super: {
-      } // pkgs.lib.optionalAttrs hoogle {
-        ghc = super.ghc // { withPackages = super.ghc.withHoogle; };
-        ghcWithPackages = self.ghc.withPackages;
-      };
-    };
-
-    # Any packages to appear in the environment provisioned by nix-shell
-    extraEnvPackages = with haskellPackages; [
-    ];
-
-    # Generate a haskell derivation using the cabal2nix tool on `package.yaml`
-    drv = haskellPackages.callCabal2nix "" src {};
-
-    # Insert the extra environment packages into the environment generated by
-    # cabal2nix
-    envWithExtras = pkgs.lib.overrideDerivation drv.env (attrs: {
-      buildInputs = attrs.buildInputs ++ extraEnvPackages;
-    } // pkgs.lib.optionalAttrs hoogle {
-      shellHook   = attrs.shellHook + ''
-        export HIE_HOOGLE_DATABASE="$(cat $(which hoogle) | sed -n -e 's|.*--database \(.*\.hoo\).*|\1|p')"
-      '';
-    });
-
-in
-  drv // { env = envWithExtras; }
+{ nixpkgsSrc ? <nixpkgs>, pkgs ? import nixpkgsSrc { }, compiler ? null }:
+
+let
+  haskellPackages = if compiler == null then
+    pkgs.haskellPackages
+  else
+    pkgs.haskell.packages.${compiler};
+
+in haskellPackages.developPackage {
+  name = "";
+  root = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
+}

package.yaml

@@ -0,0 +1,10 @@
+{ pkgs ? import <nixpkgs> { }, compiler ? null }:
+
+with pkgs.haskell.lib;
+
+let drv = import ./default.nix { inherit pkgs compiler; };
+in {
+  tarball = sdistTarball drv;
+  docs = documentationTarball drv;
+  sdistTest = buildFromSdist drv;
+}