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

cabal2nix: re-generate the build files to make sure all dependencies are listed correctly 

Fixes https://github.com/NixOS/cabal2nix/issues/203.
This commit is contained in:
Peter Simons 2015-09-07 14:17:45 +02:00
parent afdbfd9552
commit d4f7bf9c29
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs { mkDerivation, ansi-wl-pprint, base, Cabal, containers
, language-nix, lens, optparse-applicative, pretty , distribution-nixpkgs, fetchFromGitHub, language-nix, lens
, pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper , optparse-applicative, pretty, pretty-show, stdenv
}: }:
mkDerivation rec { mkDerivation rec {
@ -18,8 +18,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 language-nix lens optparse-applicative pretty pretty-show
pretty pretty-show
]; ];
executableToolDepends = [ makeWrapper ]; executableToolDepends = [ makeWrapper ];
postInstall = '' postInstall = ''

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

@ -1,7 +1,7 @@
{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
, deepseq-generics, directory, doctest, filepath, hackage-db, hspec , deepseq-generics, directory, doctest, fetchFromGitHub, filepath
, language-nix, lens, pretty, process, SHA, split, stdenv , hackage-db, hspec, language-nix, lens, pretty, process, SHA
, transformers, utf8-string, fetchFromGitHub , split, stdenv, transformers, utf8-string
}: }:
mkDerivation rec { mkDerivation rec {

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

@ -1,6 +1,6 @@
{ mkDerivation, base, Cabal, containers, distribution-nixpkgs { mkDerivation, base, Cabal, containers, distribution-nixpkgs
, filepath, language-nix, lens, monad-par, monad-par-extras, mtl , fetchFromGitHub, filepath, language-nix, lens, monad-par
, optparse-applicative, pretty, stdenv, fetchFromGitHub , monad-par-extras, mtl, optparse-applicative, pretty, stdenv
}: }:
mkDerivation rec { mkDerivation rec {

8
pkgs/development/tools/haskell/cabal2nix/language-nix.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, base, deepseq, doctest, lens, pretty, regex-posix { mkDerivation, base, deepseq, doctest, fetchFromGitHub, lens
, stdenv, fetchFromGitHub, QuickCheck , pretty, QuickCheck, regex-posix, stdenv
}: }:
mkDerivation rec { mkDerivation rec {
@ -13,10 +13,10 @@ mkDerivation rec {
}; };
postUnpack = "sourceRoot+=/${pname}"; postUnpack = "sourceRoot+=/${pname}";
libraryHaskellDepends = [ libraryHaskellDepends = [
base deepseq lens pretty regex-posix base deepseq doctest lens pretty QuickCheck regex-posix
]; ];
testHaskellDepends = [ testHaskellDepends = [
base deepseq doctest lens pretty regex-posix QuickCheck base deepseq doctest lens pretty QuickCheck regex-posix
]; ];
homepage = "https://github.com/nixos/cabal2nix#readme"; homepage = "https://github.com/nixos/cabal2nix#readme";
description = "Data types and useful functions to represent and manipulate the Nix language"; description = "Data types and useful functions to represent and manipulate the Nix language";