cabal2nix: update to version 20150922

This commit is contained in:
Peter Simons 2015-09-22 10:35:21 +02:00
parent e425766b5d
commit 5c1afdd5f6
3 changed files with 31 additions and 24 deletions

View File

@ -1,16 +1,17 @@
{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
, fetchFromGitHub, language-nix, lens, optparse-applicative, pretty, pretty-show
, stdenv, nix-prefetch-scripts, makeWrapper
{ mkDerivation, ansi-wl-pprint, base, Cabal, containers
, distribution-nixpkgs, language-nix, lens, optparse-applicative
, pretty, pretty-show, stdenv, text, yaml
, nix-prefetch-scripts, makeWrapper, fetchFromGitHub
}:
mkDerivation rec {
pname = "cabal2nix";
version = "20150903";
version = "20150922";
src = fetchFromGitHub {
owner = "nixos";
repo = "cabal2nix";
rev = "v${version}";
sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a";
};
postUnpack = "sourceRoot+=/${pname}";
isLibrary = false;
@ -18,7 +19,7 @@ mkDerivation rec {
enableSharedExecutables = false;
executableHaskellDepends = [
ansi-wl-pprint base Cabal containers distribution-nixpkgs
language-nix lens optparse-applicative pretty pretty-show
language-nix lens optparse-applicative pretty pretty-show text yaml
];
executableToolDepends = [ makeWrapper ];
postInstall = ''

View File

@ -1,31 +1,33 @@
{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
, deepseq-generics, directory, doctest, fetchFromGitHub, filepath
, hackage-db, hspec, language-nix, lens, pretty, process, SHA
, split, stdenv, transformers, utf8-string
, deepseq-generics, directory, doctest, filepath, hackage-db
, hashable, hspec, language-nix, lens, pretty, process, QuickCheck
, SHA, split, stdenv, text, transformers, unordered-containers
, utf8-string, yaml, fetchFromGitHub
}:
mkDerivation rec {
pname = "distribution-nixpkgs";
version = "20150903";
version = "20150922";
src = fetchFromGitHub {
owner = "nixos";
repo = "cabal2nix";
rev = "v${version}";
sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a";
};
postUnpack = "sourceRoot+=/${pname}";
libraryHaskellDepends = [
aeson base bytestring Cabal containers deepseq deepseq-generics
directory doctest filepath hackage-db hspec language-nix lens
pretty process SHA split transformers utf8-string
aeson base bytestring Cabal containers deepseq-generics directory
filepath hackage-db hashable language-nix lens pretty process SHA
split text transformers unordered-containers utf8-string yaml
];
testHaskellDepends = [
aeson base bytestring Cabal containers deepseq deepseq-generics
directory doctest filepath hackage-db hspec language-nix lens
pretty process SHA split transformers utf8-string
directory doctest filepath hackage-db hashable hspec language-nix
lens pretty process QuickCheck SHA split text transformers
unordered-containers utf8-string yaml
];
homepage = "https://github.com/nixos/cabal2nix#readme";
description = "Convert Cabal files into Nix build instructions";
description = "Data types and functions to manipulate the Nixpkgs distribution";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ simons ];
}

View File

@ -1,24 +1,28 @@
{ mkDerivation, base, Cabal, containers, distribution-nixpkgs
, fetchFromGitHub, filepath, language-nix, lens, monad-par
, monad-par-extras, mtl, optparse-applicative, pretty, stdenv
{ mkDerivation, aeson, base, bytestring, Cabal, containers
, deepseq-generics, directory, distribution-nixpkgs, filepath
, language-nix, lens, monad-par, monad-par-extras, mtl
, optparse-applicative, pretty, SHA, split, stackage-types, stdenv
, text, time, utf8-string, yaml, fetchFromGitHub
}:
mkDerivation rec {
pname = "hackage2nix";
version = "20150903";
version = "20150922";
src = fetchFromGitHub {
owner = "nixos";
repo = "cabal2nix";
rev = "v${version}";
sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a";
};
postUnpack = "sourceRoot+=/${pname}";
isLibrary = false;
isExecutable = true;
enableSharedExecutables = false;
executableHaskellDepends = [
base Cabal containers distribution-nixpkgs filepath language-nix
lens monad-par monad-par-extras mtl optparse-applicative pretty
aeson base bytestring Cabal containers deepseq-generics directory
distribution-nixpkgs filepath language-nix lens monad-par
monad-par-extras mtl optparse-applicative pretty SHA split
stackage-types text time utf8-string yaml
];
postInstall = ''
exe=$out/bin/${pname}