flake.nix - mostly cosmetic cleanup

This commit is contained in:
John MacFarlane
2026-02-01 14:50:50 +01:00
parent 4b26f50118
commit 48cb073500
+6 -13
View File
@@ -4,7 +4,6 @@
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";
};
@@ -23,21 +22,17 @@
# };
# }).extend(self: super: {
# citeproc = pkgs.haskell.lib.dontCheck (self.callHackage "citeproc" "0.9.0.1" {});
# commonmark-pandoc = self.callHackage "commonmark-pandoc" "0.2.3" {};
# typst-symbols = self.callHackage "typst-symbols" "0.1.8.1" {};
# typst = self.callHackage "typst" "0.8" {};
# texmath = self.callHackage "texmath" "0.12.10.2" {};
# toml-parser = self.callHackage "toml-parser" "2.0.1.2" {};
# });
jailbreakUnbreak = pkg:
pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; }));
# DON'T FORGET TO PUT YOUR PACKAGE NAME HERE, REMOVING `throw`
# PUT YOUR PACKAGE NAME HERE:
packageName = "pandoc";
wasmToolchain = ghc-wasm-meta.packages.${system}.default;
# Alternatively, if you want a specific "bundle" exposed by ghc-wasm-meta:
# Alternatively, if you want a specific "bundle":
# wasmToolchain = ghc-wasm-meta.packages.${system}.all_9_14;
in {
packages.${packageName} =
@@ -51,12 +46,10 @@
devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [
wasmToolchain
haskellPackages.haskell-language-server # you must build it with your ghc to work
haskellPackages.haskell-language-server
haskellPackages.hlint
haskellPackages.cabal-install
haskellPackages.cabal-plan
haskellPackages.weeder
haskellPackages.hpc
haskellPackages.ghcid
haskellPackages.stylish-haskell
@@ -67,12 +60,12 @@
git
gnumake
bashInteractive
epubcheck # for validate-epub
nodejs # for validate-epub
ripgrep
unzip
libxml2 # for xmllint
jq
libxml2 # for xmllint
epubcheck # for validate-epub
nodejs # for validate-epub
];
inputsFrom = map (__getAttr "env") (__attrValues self.packages.${system});
};