Got rid of flake.minimal.nix.

This commit is contained in:
John MacFarlane
2026-02-06 17:16:14 +01:00
parent 51ca7d1c76
commit 003e8440e0
4 changed files with 3 additions and 40 deletions
+1 -1
View File
@@ -159,7 +159,7 @@ jobs:
dist-newstyle
key: ${{ runner.os }}-nix-cabal-local-${{ secrets.CACHE_VERSION }}
- run: |
nix develop --command bash -c "ln -sf flake.minimal.nix flake.nix && make pandoc.wasm"
nix develop --command bash -c "make pandoc.wasm"
windows:
+1 -1
View File
@@ -122,7 +122,7 @@ jobs:
key: ${{ runner.os }}-nix-cabal-local-${{ secrets.CACHE_VERSION }}
- name: Build pandoc.wasm
run: |
nix develop --command bash -c "ln -sf flake.minimal.nix flake.nix && make pandoc.wasm"
nix develop --command bash -c "make pandoc.wasm"
- name: Upload artifact
uses: actions/upload-artifact@v6
with:
+1 -1
View File
@@ -146,7 +146,7 @@ jobs:
key: ${{ runner.os }}-nix-cabal-local-${{ secrets.CACHE_VERSION }}
- name: Build pandoc.wasm
run: |
nix develop --command bash -c "ln -sf flake.minimal.nix flake.nix && make pandoc.wasm"
nix develop --command bash -c "make pandoc.wasm"
- name: Upload artifact
uses: actions/upload-artifact@v6
with:
-37
View File
@@ -1,37 +0,0 @@
# This skips cabal2nix and doesn't bring in any Haskell libraries from nix.
{
description = "pandoc";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
ghc-wasm-meta.url = "gitlab:haskell-wasm/ghc-wasm-meta?host=gitlab.haskell.org";
};
outputs = { self, nixpkgs, flake-utils, ghc-wasm-meta }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
haskellPackages = pkgs.haskellPackages;
wasmToolchain = ghc-wasm-meta.packages.${system}.default;
# Alternatively, if you want a specific "bundle":
# wasmToolchain = ghc-wasm-meta.packages.${system}.all_9_14;
in {
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
wasmToolchain
haskellPackages.cabal-install
zlib.dev
git
gnumake
bashInteractive
ripgrep
unzip
jq
libxml2 # for xmllint
epubcheck # for validate-epub
nodejs # for validate-epub
];
};
});
}