diff --git a/flake.nix b/flake.nix index 5612537..8c4fe4e 100644 --- a/flake.nix +++ b/flake.nix @@ -17,16 +17,61 @@ inputs.flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: let pkgs = (import inputs.nixpkgs { inherit system; }).extend (import inputs.rust-overlay); - nix-haskell = import inputs.nix-haskell { inherit system inputs; }; crane = (inputs.crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.selectLatestNightlyWith ( toolchain: toolchain.default.override { extensions = [ "rust-src" ]; targets = [ "x86_64-unknown-linux-gnu" ]; } )); - project = - (nix-haskell (import ./project.nix { inherit (inputs) hls-src hs-bindgen-src libclang-src; inherit garnet-rs; }) - ).project.haskell-nix; + project = (import inputs.nix-haskell { inherit system inputs; } { + name = "garnet"; + src = ./.; + compiler-nix-name = "ghc914"; + source-repository-packages = { + # not on Hackage yet: https://well-typed.com/blog/2026/02/hs-bindgen-alpha + # we're using more recent versions than in that post, because we want record-dot support: + # https://github.com/well-typed/hs-bindgen/issues/1829#issuecomment-4081875451 + c-expr-dsl = inputs.hs-bindgen-src + "/c-expr-dsl"; + c-expr-runtime = inputs.hs-bindgen-src + "/c-expr-runtime"; + hs-bindgen = inputs.hs-bindgen-src + "/hs-bindgen"; + hs-bindgen-runtime = inputs.hs-bindgen-src + "/hs-bindgen-runtime"; + libclang-bindings = inputs.libclang-src; + }; + overrides = [ + ({ pkgs, ... }: { + packages.libclang-bindings.components.library = { + build-tools = [ pkgs.llvmPackages.llvm ]; + libs = [ pkgs.llvmPackages.libclang ]; + }; + }) + (_: { + packages.garnet.components.library = { + preConfigure = '' + mkdir -p rust/target/debug + ln -s ${garnet-rs}/include/garnet_rs.h rust/target/debug/garnet_rs.h + ln -s ${garnet-rs}/lib/libCgarnet_rs.a rust/target/debug/libCgarnet_rs.a + ''; + preInstall = '' + cp ${garnet-rs}/lib/libCgarnet_rs.a dist/build/libCgarnet_rs.a + ''; + configureFlags = [ "--extra-lib-dirs=${garnet-rs}/lib" ]; + }; + }) + ]; + shell = { + tools = { + cabal = "latest"; + haskell-language-server = { + src = inputs.hls-src; + sha256map = { + "https://github.com/snowleopard/alga"."d4e43fb42db05413459fb2df493361d5a666588a" = "0s1mlnl64wj7pkg3iipv5bb4syy3bhxwqzqv93zqlvkyfn64015i"; + }; + }; + }; + withHoogle = false; + withHaddock = true; + }; + }).project.haskell-nix; garnet-rs = crane.buildPackage { src = crane.cleanCargoSource ./rust; doCheck = false; diff --git a/project.nix b/project.nix deleted file mode 100644 index ffcffbe..0000000 --- a/project.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ hls-src -, hs-bindgen-src -, libclang-src -, garnet-rs -}: -{ - name = "garnet"; - src = ./.; - compiler-nix-name = "ghc914"; - source-repository-packages = { - # not on Hackage yet: https://well-typed.com/blog/2026/02/hs-bindgen-alpha - # we're using more recent versions than in that post, because we want record-dot support: - # https://github.com/well-typed/hs-bindgen/issues/1829#issuecomment-4081875451 - c-expr-dsl = hs-bindgen-src + "/c-expr-dsl"; - c-expr-runtime = hs-bindgen-src + "/c-expr-runtime"; - hs-bindgen = hs-bindgen-src + "/hs-bindgen"; - hs-bindgen-runtime = hs-bindgen-src + "/hs-bindgen-runtime"; - libclang-bindings = libclang-src; - }; - overrides = [ - ({ pkgs, ... }: { - packages.libclang-bindings.components.library = { - build-tools = [ pkgs.llvmPackages.llvm ]; - libs = [ pkgs.llvmPackages.libclang ]; - }; - }) - (_: { - packages.garnet.components.library = { - preConfigure = '' - mkdir -p rust/target/debug - ln -s ${garnet-rs}/include/garnet_rs.h rust/target/debug/garnet_rs.h - ln -s ${garnet-rs}/lib/libCgarnet_rs.a rust/target/debug/libCgarnet_rs.a - ''; - preInstall = '' - cp ${garnet-rs}/lib/libCgarnet_rs.a dist/build/libCgarnet_rs.a - ''; - configureFlags = [ "--extra-lib-dirs=${garnet-rs}/lib" ]; - }; - }) - ]; - shell = { - tools = { - cabal = "latest"; - haskell-language-server = { - src = hls-src; - sha256map = { - "https://github.com/snowleopard/alga"."d4e43fb42db05413459fb2df493361d5a666588a" = "0s1mlnl64wj7pkg3iipv5bb4syy3bhxwqzqv93zqlvkyfn64015i"; - }; - }; - }; - withHoogle = false; - withHaddock = true; - }; -}