travis please

This commit is contained in:
Matvey Aksenov 2017-02-23 20:38:20 +00:00
parent 9921b3178e
commit 87a9b3b26e
4 changed files with 17 additions and 11 deletions

View File

@ -4,9 +4,9 @@ sudo: false
matrix: matrix:
include: include:
- env: CABALVER=1.16 GHCVER=7.6.3 RUN_TESTS= - env: CABALVER=1.16 GHCVER=7.6.3
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}} addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
- env: CABALVER=1.18 GHCVER=7.8.4 RUN_TESTS= - env: CABALVER=1.18 GHCVER=7.8.4
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}} addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
- env: CABALVER=1.22 GHCVER=7.10.3 RUN_TESTS=--run-tests - env: CABALVER=1.22 GHCVER=7.10.3 RUN_TESTS=--run-tests
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}} addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3],sources: [hvr-ghc]}}

View File

@ -1,4 +1,4 @@
Copyright (c) 2015, Matvey Aksenov Copyright (c) 2015-2017, Matvey Aksenov
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

View File

@ -1,4 +1,4 @@
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc801" }: let { nixpkgs ? import <nixpkgs> {}, compiler ? "ghc802" }: let
ghc = nixpkgs.pkgs.haskell.packages.${compiler}; ghc = nixpkgs.pkgs.haskell.packages.${compiler};
npm = import ./npm {}; npm = import ./npm {};
in in

View File

@ -1,17 +1,23 @@
{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc801" }: let { nixpkgs ? import <nixpkgs> {}, compiler ? "ghc802" }: let
inherit (nixpkgs) pkgs; inherit (nixpkgs) pkgs;
ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages(ps: [ haskell = pkgs.haskell.packages.${compiler};
ghc = haskell.ghcWithPackages(ps: [
ps.hdevtools ps.doctest ps.hspec-discover ps.hlint ps.ghc-mod 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 {}; npm = import ./npm {};
this = import ./default.nix { inherit nixpkgs compiler; };
in in
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
name = pkg.pname; name = this.pname;
buildInputs = [ ghc cabal-install npm.nodePackages.ldapjs ] ++ pkg.env.buildInputs; buildInputs = [
ghc
haskell.cabal-install
npm.nodePackages.ldapjs
] ++ this.env.buildInputs;
shellHook = '' shellHook = ''
${pkg.env.shellHook} ${this.env.shellHook}
cabal configure --enable-tests --package-db=$NIX_GHC_LIBDIR/package.conf.d cabal configure --enable-tests --package-db=$NIX_GHC_LIBDIR/package.conf.d
''; '';
} }