fix nix-build
This commit is contained in:
parent
c1123fb1a0
commit
5d8b2fc5a9
13
.vim.custom
13
.vim.custom
@ -1,14 +1,5 @@
|
||||
function s:hdevtools_options(rgs)
|
||||
return join(map(a:rgs, "'-g ' . v:val"))
|
||||
endfunction
|
||||
|
||||
function s:discover_cabal_sandbox(glob)
|
||||
let l:sandboxes = split(glob(a:glob, "."), "\n")
|
||||
if len(l:sandboxes) > 0
|
||||
return ['-no-user-package-db', '-package-db=' . l:sandboxes[-1]]
|
||||
else
|
||||
return []
|
||||
endif
|
||||
return join(["-s", "/tmp/" . substitute(system("sha1sum <<< $PWD | cut -d' ' -f1"), '\n\+$', '', '') . ".sock"] + map(a:rgs, "'-g ' . v:val"))
|
||||
endfunction
|
||||
|
||||
let g:syntastic_haskell_hdevtools_args = s:hdevtools_options
|
||||
@ -23,5 +14,5 @@ let g:syntastic_haskell_hdevtools_args = s:hdevtools_options
|
||||
\ , '-Wall'
|
||||
\ , '-fno-warn-unused-do-bind'
|
||||
\ , '-fno-warn-type-defaults'
|
||||
\ ] + s:discover_cabal_sandbox(".cabal-sandbox/*.conf.d")
|
||||
\ ]
|
||||
\ )
|
||||
|
||||
11
default.nix
11
default.nix
@ -1,2 +1,9 @@
|
||||
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }:
|
||||
nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./ldap-client.nix {}
|
||||
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc7102" }: let
|
||||
ghc = nixpkgs.pkgs.haskell.packages.${compiler};
|
||||
npm = import ./npm {};
|
||||
in
|
||||
ghc.callPackage ./package.nix {
|
||||
mkDerivation = args: ghc.mkDerivation(args // {
|
||||
buildTools = (if args ? buildTools then args.buildTools else []) ++ [ npm.nodePackages.ldapjs ];
|
||||
});
|
||||
}
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
ps.hdevtools ps.doctest ps.hspec-discover ps.hlint ps.ghc-mod
|
||||
]);
|
||||
cabal-install = pkgs.haskell.packages.${compiler}.cabal-install;
|
||||
pkg = (import ./default.nix { inherit nixpkgs compiler; });
|
||||
npm = (import ./npm {});
|
||||
pkg = import ./default.nix { inherit nixpkgs compiler; };
|
||||
npm = import ./npm {};
|
||||
in
|
||||
pkgs.stdenv.mkDerivation rec {
|
||||
name = pkg.pname;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user