diff --git a/nixpkgs.nix b/nixpkgs.nix index 783ede000..1d0131f12 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -4,6 +4,6 @@ import ((nixpkgs {}).fetchFromGitHub { owner = "NixOS"; repo = "nixpkgs"; - rev = "10e61bf5be57736035ec7a804cb0bf3d083bf2cf"; - sha256 = "0fplfm2zx4vk7gs8bdcxnvzkdmpx2w0llqwf8475z9dz9cl132rm"; + rev = "0d97ef510bdc9d66f1023f970be58fdab2eb87fa"; + sha256 = "00lnna6097wzrlmwqk8bqayh4qd2gz61zcd4yh7amirqflz3z2ll"; }) diff --git a/shell.nix b/shell.nix index 08c6dde7c..9a3306edc 100644 --- a/shell.nix +++ b/shell.nix @@ -19,7 +19,7 @@ let ''; override = oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-13_x postgresql openldap google-chrome exiftool ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install weeder ]); + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-13_x postgresql openldap google-chrome exiftool ]) ++ (with pkgs.haskellPackages; [ stack yesod-bin hlint cabal-install weeder ]); shellHook = '' export PROMPT_INFO="${oldAttrs.name}" diff --git a/start.sh b/start.sh index 49f9e79f3..07cf5940a 100755 --- a/start.sh +++ b/start.sh @@ -25,4 +25,6 @@ if [[ -d .stack-work-run ]]; then trap move-back EXIT fi -stack exec -- yesod devel $@ +# stack exec -- yesod devel $@ + +yesod devel $@