From 51592009a1c4e8e0e75034886ae5cd16e3fd1ee5 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Thu, 20 Nov 2025 20:12:15 +0200 Subject: [PATCH] Nix integration cleanup Keep the shell used by Stack defined in one place. --- package.nix | 2 +- shell.nix | 7 +++++++ stack.yaml | 6 +----- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 shell.nix diff --git a/package.nix b/package.nix index 2c2d70b..d00005d 100644 --- a/package.nix +++ b/package.nix @@ -40,6 +40,6 @@ in app = hlib.justStaticExecutables hpkgs.stackage-server; shell = hpkgs.shellFor { packages = p: [ p.stackage-server ]; - buildInputs = [ pkgs.cabal-install pkgs.haskell-language-server pkgs.ghcid pkgs.haskellPackages.yesod-bin ]; + buildInputs = [ pkgs.cabal-install pkgs.haskell-language-server pkgs.ghcid pkgs.haskellPackages.yesod-bin pkgs.postgresql ]; }; } diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..8cb1fc7 --- /dev/null +++ b/shell.nix @@ -0,0 +1,7 @@ +(import ( + fetchGit { + url = "https://github.com/edolstra/flake-compat"; + } +) { + src = ./.; +}).shellNix diff --git a/stack.yaml b/stack.yaml index a63ea85..fff6c83 100644 --- a/stack.yaml +++ b/stack.yaml @@ -30,8 +30,4 @@ allow-newer-deps: - pantry nix: - packages: - - zlib - - postgresql - - pkg-config - - cacert + shell-file: shell.nix