Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ocharles committed Jul 7, 2023
1 parent beacf44 commit 383fe19
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 7 deletions.
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "nixos-20.09",
"branch": "nixos-23.05",
"description": "Nix Packages collection",
"homepage": null,
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361",
"sha256": "0f2nvdijyxfgl5kwyb4465pppd5vkhqxddx6v40k2s0z9jfhj0xl",
"rev": "e11142026e2cef35ea52c9205703823df225c947",
"sha256": "1w5bp7vv56878g4zzykgbcvqib40dwg4fn9mxrwlg6gc8gdjimfx",
"type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/1c1f5649bb9c1b0d98637c8c365228f57126f361.tar.gz",
"url": "https://github.com/nixos/nixpkgs/archive/e11142026e2cef35ea52c9205703823df225c947.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
24 changes: 21 additions & 3 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
let
sources = import ./nix/sources.nix;
pkgs = import sources.nixpkgs { overlays = [ ]; };

hsPkgs = import ./default.nix;

haskellNix = import sources."haskell.nix" { };
nixpkgsSrc = haskellNix.sources.nixpkgs-unstable;
nixpkgsArgs = haskellNix.nixpkgsArgs;
compiler-nix-name = "ghc943";

haskell-nix = (import nixpkgsSrc nixpkgsArgs).haskell-nix;

ch-hs-imports =
let
project = haskell-nix.project {
src = sources.ch-hs-imports;
inherit compiler-nix-name;
};
in
project.hsPkgs.ch-hs-imports.components.exes.ch-hs-imports;

pkgs = import sources.nixpkgs { overlays = [ ]; };
in
hsPkgs.shellFor {
withHoogle = false;
tools = { cabal = "latest"; };
tools = { cabal = "latest"; fourmolu = "latest"; cabal-fmt = "latest"; };
exactDeps = false;
buildInputs = [ pkgs.postgresql pkgs.pythonPackages.sphinx ];
buildInputs = [ pkgs.nixpkgs-fmt pkgs.postgresql pkgs.treefmt ];
}

0 comments on commit 383fe19

Please sign in to comment.