From ea3abf84fdaaef0f232cee571e3a84a2bfc9dcfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Wed, 8 Jan 2025 21:14:02 +0100 Subject: [PATCH] Add flake.nix and test on CI --- .github/workflows/ci.yml | 39 ++++++++++++++++++++++++- flake.lock | 61 ++++++++++++++++++++++++++++++++++++++++ flake.nix | 50 ++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c188070..e85241b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.2', '9.4.2', '9.6.3', '9.8.1', '9.10.1', '9.12.1'] + # Always keep in sync with the tested-with section in the cabal file + ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.2', '9.4.2', '9.6.6', '9.8.1', '9.10.1', '9.12.1'] name: Haskell GHC ${{ matrix.ghc }} cabal env: cabal_project_freeze: cabal.project.${{ matrix.ghc }}.freeze @@ -33,3 +34,39 @@ jobs: - name: Cabal test run: | cabal test all --enable-tests --test-show-details=Always --project-file=cabal.project.${{ matrix.ghc }} + + generate-flake-ghc-matrix: + name: Generate GHC versions for nix flake build matrix + runs-on: ubuntu-latest + outputs: + versions: ${{ steps.generate-versions.outputs.versions }} + steps: + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + - uses: DeterminateSystems/magic-nix-cache-action@v8 + - name: Generate versions + id: generate-versions + run: | + echo -n "versions=" >> "$GITHUB_OUTPUT" + nix eval .#supportedGhcs --json >> "$GITHUB_OUTPUT" + + build-flake: + name: Nix Flake + needs: + - generate-flake-ghc-matrix + strategy: + matrix: + version: ${{ fromJSON(needs.generate-flake-ghc-matrix.outputs.versions) }} + os: + - ubuntu-latest + - macos-latest + fail-fast: false # So the cache is still filled + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + - uses: DeterminateSystems/magic-nix-cache-action@v8 + - run: nix flake check + - run: nix build .#${{ matrix.version }} + - run: nix develop .#${{ matrix.version }} -c cabal update + - run: nix develop .#${{ matrix.version }} -c cabal test diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..32a3fae --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1736342874, + "narHash": "sha256-9UvbaO67VjGznblNG+hfvPZ58y2PsHDUeDBiIbzlnA4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e0f30269669360e509c4de9af2fb48cb65f0e681", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..e8c70b5 --- /dev/null +++ b/flake.nix @@ -0,0 +1,50 @@ +{ + description = "clay"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + let + supportedGhcs = [ "ghc810" "ghc90" "ghc92" "ghc94" "ghc96" "ghc98" "ghc910" "ghc912" ]; + in + flake-utils.lib.eachDefaultSystem (system: + let + inherit (nixpkgs) lib; + # Always keep in sync with the tested-with section in the cabal file + haskellPackagesFor = pkgs: lib.genAttrs supportedGhcs (ghc: pkgs.haskell.packages.${ghc}) // {default = pkgs.haskellPackages;}; + hoverlay = hfinal: hprev: { + clay = hfinal.callCabal2nix "clay" ./. {}; + }; + overlay = final: prev: { + haskell = prev.haskell // { + packageOverrides = lib.composeManyExtensions [ + hoverlay + prev.haskell.packageOverrides + ]; + }; + }; + pkgs = nixpkgs.legacyPackages.${system}; + pkgsOverridden = pkgs.extend overlay; + clay-all = pkgsOverridden.linkFarm "clay-all" (lib.mapAttrs (_ghcVersion: haskellPackages: haskellPackages.clay) (haskellPackagesFor pkgsOverridden)); + in { + inherit self nixpkgs; + + overlay.default = overlay; + packages = lib.mapAttrs (_ghcVersion: haskellPackages: haskellPackages.clay) (haskellPackagesFor pkgsOverridden) // { + default = clay-all; + }; + devShells = lib.mapAttrs (_ghcVersion: haskellPackages: haskellPackages.shellFor { + packages = hps: with hps; [clay]; + nativeBuildInputs = with haskellPackages; [ + haskell-language-server + ]; + }) (haskellPackagesFor pkgs); + + }) // { + inherit supportedGhcs; + + }; +}