public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cabal2nix: update to version 20150922

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
View File

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

24
pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
View File

@ -1,31 +1,33 @@
{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
, deepseq-generics, directory, doctest, fetchFromGitHub, filepath , deepseq-generics, directory, doctest, filepath, hackage-db
, hackage-db, hspec, language-nix, lens, pretty, process, SHA , hashable, hspec, language-nix, lens, pretty, process, QuickCheck
, split, stdenv, transformers, utf8-string , SHA, split, stdenv, text, transformers, unordered-containers
, utf8-string, yaml, fetchFromGitHub
}: }:
mkDerivation rec { mkDerivation rec {
pname = "distribution-nixpkgs"; pname = "distribution-nixpkgs";
version = "20150903"; version = "20150922";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nixos"; owner = "nixos";
repo = "cabal2nix"; repo = "cabal2nix";
rev = "v${version}"; rev = "v${version}";
sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a";
}; };
postUnpack = "sourceRoot+=/${pname}"; postUnpack = "sourceRoot+=/${pname}";
libraryHaskellDepends = [ libraryHaskellDepends = [
aeson base bytestring Cabal containers deepseq deepseq-generics aeson base bytestring Cabal containers deepseq-generics directory
directory doctest filepath hackage-db hspec language-nix lens filepath hackage-db hashable language-nix lens pretty process SHA
pretty process SHA split transformers utf8-string split text transformers unordered-containers utf8-string yaml
]; ];
testHaskellDepends = [ testHaskellDepends = [
aeson base bytestring Cabal containers deepseq deepseq-generics aeson base bytestring Cabal containers deepseq deepseq-generics
directory doctest filepath hackage-db hspec language-nix lens directory doctest filepath hackage-db hashable hspec language-nix
pretty process SHA split transformers utf8-string lens pretty process QuickCheck SHA split text transformers
unordered-containers utf8-string yaml
]; ];
homepage = "https://github.com/nixos/cabal2nix#readme"; 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; license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ simons ]; maintainers = with stdenv.lib.maintainers; [ simons ];
} }

18
pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
View File

@ -1,24 +1,28 @@
{ mkDerivation, base, Cabal, containers, distribution-nixpkgs { mkDerivation, aeson, base, bytestring, Cabal, containers
, fetchFromGitHub, filepath, language-nix, lens, monad-par , deepseq-generics, directory, distribution-nixpkgs, filepath
, monad-par-extras, mtl, optparse-applicative, pretty, stdenv , 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 { mkDerivation rec {
pname = "hackage2nix"; pname = "hackage2nix";
version = "20150903"; version = "20150922";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nixos"; owner = "nixos";
repo = "cabal2nix"; repo = "cabal2nix";
rev = "v${version}"; rev = "v${version}";
sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; sha256 = "17s800yd8mm48yjjqiayvycaf8z0y1giwp8jp271875wdrx3p75a";
}; };
postUnpack = "sourceRoot+=/${pname}"; postUnpack = "sourceRoot+=/${pname}";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
enableSharedExecutables = false; enableSharedExecutables = false;
executableHaskellDepends = [ executableHaskellDepends = [
base Cabal containers distribution-nixpkgs filepath language-nix aeson base bytestring Cabal containers deepseq-generics directory
lens monad-par monad-par-extras mtl optparse-applicative pretty 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 = '' postInstall = ''
exe=$out/bin/${pname} exe=$out/bin/${pname}