ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

haskell-ci: update to latest git version

Browse Source 
Drop un-referenced "multi-ghc-travis" directory.
This commit is contained in:
Peter Simons 2019-06-26 14:07:57 +02:00
parent 6ee5152e71
commit c06b8b5988
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1262,14 +1262,14 @@ self: super: {
# The latest release version is ancient. You really need this tool from git. # The latest release version is ancient. You really need this tool from git.
haskell-ci = generateOptparseApplicativeCompletion "haskell-ci" haskell-ci = generateOptparseApplicativeCompletion "haskell-ci"
(addBuildDepend (overrideSrc (dontCheck super.haskell-ci) { (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) {
version = "20190307-git"; version = "20190625-git";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "haskell-CI"; owner = "haskell-CI";
repo = "haskell-ci"; repo = "haskell-ci";
rev = "2baceb59bc2f36e798ff9fb6e8865c449f01d3a2"; rev = "260f967c6973dfb22ecc8061a1811a2ea4b79e01";
sha256 = "1wqhqajxni6h9rrj22xj6421d4m0gs8qk2glghpdp307ns5gr2j4"; sha256 = "1mvn6pqa6wfcm4jxhlhm4l54pwrlgnz7vdrmkwabliwz4q0bzgqk";
}; };
}) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck])); }) (with self; [base-compat generic-lens microlens optparse-applicative ShellCheck exceptions temporary]));
# Fix build with attr-2.4.48 (see #53716) # Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;

29
pkgs/development/tools/haskell/multi-ghc-travis/default.nix
View File

@ -1,29 +0,0 @@
{ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
, deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty
, tasty-golden, transformers, fetchFromGitHub
}:
mkDerivation {
pname = "haskell-ci";
version = "0";
src = fetchFromGitHub {
owner = "haskell-CI";
repo = "haskell-ci";
rev = "18a7f5edcde360cea0740ff143eff1113ecda7d2";
sha256 = "00gxpxb5n1a1v562fd4cg1j92vwmd2zp00c2j60piyl8ppxxa115";
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base Cabal containers deepseq directory filepath ShellCheck
transformers
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
ansi-terminal base bytestring Diff directory filepath tasty
tasty-golden transformers
];
homepage = "https://github.com/haskell-CI/haskell-ci";
description = "Script generator for Travis-CI";
license = stdenv.lib.licenses.bsd3;
}