Bump nixpkgs to latest master (#30)

* Experiment: Bump nixpkgs to latest master

This is to see if there are problems coming up. Some of the things in
nix/haskell-packages.nix can probably be cleaned up now.

Originally https://github.com/dfinity-lab/ic-ref/commit/dce1286a900525607fcc21171b82940e3ec3385f

* Bump again

Originally https://github.com/dfinity-lab/ic-ref/commit/b43f83609fd3a99e0a8ecd8700f4baee0c53b863

* Bump once more

Originally https://github.com/dfinity-lab/ic-ref/commit/a0746ed7be49c8f1619e5b75ba84d5c832730cf8

* Fix merge issue

* Fix path

* Back to master

* Try winter master

* Remove many haskell package changes

* More simplification and upstream cache use

* Update freeze file

* Less versionoverrides needed

* Remove nix/haskell-packages, more DNRY

* Fix patch handling

* Add .gitattributes to mark generated files as such

* s/	/        /

* Run github actions with ghc-8.10.7

* Fix docs jobs

* Fix docs jobs some more

* Update cabal.project

* Bump candid some more

* Checkout before setting up the cache

* Fix cabal keys

* Don’t set active-repositories in freeze file

* Rename workflow

* naersk changed it seems

* Try pkgsStatic, not pkgsMusl

as the latter doesn’t seem to work any more since
NixOS/nixpkgs#130441

* Fix static cborg build

* Try static-haskell-nix

* Revert "Try static-haskell-nix"

This reverts commit b375ad4.

* Revert "Try pkgsStatic, not pkgsMusl"

This reverts commit d1f64f1.

* Try pkgsMusl again

pulling in NixOS/nixpkgs#138429

* Update freeze file

* Right GHC version

* Try NixOS/nixpkgs#138524

.gitattributes

@@ -0,0 +1,2 @@
+nix/generated/* linguist-generated
+cabal.project.freeze linguist-generated

.github/workflows/docs.yml

@@ -1,32 +1,27 @@
-name: Haskell CI
+name: Build and deploy docs
 on: [push, pull_request]
 jobs:
   docs:
-    strategy:
-      matrix:
-        ghc:
-        - '8.8.4'
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v2
+
     - uses: actions/cache@v1
       name: Cache ~/.cabal/store
       with:
         path: ~/.cabal/store
-        key: cabal-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project', 'cabal.project.freeze') }}
-        restore-keys: cabal-${{ runner.os }}-${{ matrix.ghc }}-
+        key: cabal-${{ runner.os }}-${{ hashFiles('cabal.project', 'cabal.project.freeze') }}
+        restore-keys: cabal-${{ runner.os }}-
 
-    - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
+    - uses: haskell/actions/setup@v1
       with:
-        ghc-version: ${{ matrix.ghc }}
+        ghc-version: '8.10'
     - name: Build
       run: |
-        ls -l /opt/ghc/
-        export PATH=/opt/ghc/bin:$PATH
         cabal --version
         ghc --version
         cabal update
-        cabal haddock -w ghc-${{ matrix.ghc }} --haddock-hyperlink-source --haddock-quickjump --haddock-html-location='https://hackage.haskell.org/package/$pkg-$version/docs'
+        cabal haddock --haddock-hyperlink-source --haddock-quickjump --haddock-html-location='https://hackage.haskell.org/package/$pkg-$version/docs'
         mv dist-newstyle/build/*/*/*/doc/html/ic-hs gh-page
         touch gh-page/.nojekyll
     - name: Deploy to Github Pages

.github/workflows/test.yml

@@ -27,9 +27,9 @@ jobs:
     - run: nix-build-uncached -A ic-hs-coverage
     - run: nix-build-uncached -A coverage
     - run: nix-build-uncached -A check-generated
-    - run: nix-build-uncached -A check-cabal-freeze
     - run: nix-build-uncached -A ic-ref-dist
     - run: nix-build-uncached -A ic-ref-test
     - run: nix-build-uncached -A ic-hs-shell
+    - run: nix-build-uncached -A check-cabal-freeze
     # now the rest
     - run: nix-build-uncached

cabal.project

@@ -3,9 +3,9 @@ packages: .
 source-repository-package
     type: git
     location: https://github.com/dfinity-side-projects/winter
-    tag: 2cc31576fe029d85c37d21fc9ea4902c5c64b5a9
+    tag: e62722796e11760947a94285734e7bc29d72c389
 
 source-repository-package
     type: git
     location: https://github.com/nomeata/haskell-candid
-    tag: 01157c50ec29b1f8ab35ca27f38dc592ed5406f9
+    tag: 1b0279928ac05ecabb0c913449b10c9559a0ec45