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

cabal2nix: update to version 20180903

Browse Source
This commit is contained in:
Peter Simons 2015-09-03 17:49:50 +02:00
parent 90dc8da64d
commit 65a415a1b2
6 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -757,7 +757,6 @@ self: super: {
# Override the obsolete version from Hackage with our more up-to-date copy. # Override the obsolete version from Hackage with our more up-to-date copy.
cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {}; cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {}; hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
lens-construction-helper = self.callPackage ../tools/haskell/cabal2nix/lens-construction-helper.nix {};
language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {}; language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {}; distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {};

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

@ -1,16 +1,16 @@
{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs { mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
, language-nix, lens, lens-construction-helper, optparse-applicative, pretty , language-nix, lens, optparse-applicative, pretty
, pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper , pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper
}: }:
mkDerivation rec { mkDerivation rec {
pname = "cabal2nix"; pname = "cabal2nix";
version = "20150824-66-gd281a60"; version = "20180903";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nixos"; owner = "nixos";
repo = "cabal2nix"; repo = "cabal2nix";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
}; };
postUnpack = "sourceRoot+=/${pname}"; postUnpack = "sourceRoot+=/${pname}";
isLibrary = false; isLibrary = false;
@ -18,7 +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 lens-construction-helper optparse-applicative language-nix lens optparse-applicative
pretty pretty-show pretty pretty-show
]; ];
executableToolDepends = [ makeWrapper ]; executableToolDepends = [ makeWrapper ];

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

@ -1,30 +1,28 @@
{ 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, filepath, hackage-db, hspec
, language-nix, lens, lens-construction-helper, pretty, process , language-nix, lens, pretty, process, SHA, split, stdenv
, SHA, split, stdenv, transformers, utf8-string, fetchFromGitHub , transformers, utf8-string, fetchFromGitHub
}: }:
mkDerivation rec { mkDerivation rec {
pname = "distribution-nixpkgs"; pname = "distribution-nixpkgs";
version = "20150824-66-gd281a60"; version = "20180903";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nixos"; owner = "nixos";
repo = "cabal2nix"; repo = "cabal2nix";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
}; };
postUnpack = "sourceRoot+=/${pname}"; postUnpack = "sourceRoot+=/${pname}";
libraryHaskellDepends = [ libraryHaskellDepends = [
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 hspec language-nix lens
lens-construction-helper pretty process SHA split transformers pretty process SHA split transformers utf8-string
utf8-string
]; ];
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 hspec language-nix lens
lens-construction-helper pretty process SHA split transformers pretty process SHA split transformers utf8-string
utf8-string
]; ];
homepage = "https://github.com/nixos/cabal2nix#readme"; homepage = "https://github.com/nixos/cabal2nix#readme";
description = "Convert Cabal files into Nix build instructions"; description = "Convert Cabal files into Nix build instructions";

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

@ -5,12 +5,12 @@
mkDerivation rec { mkDerivation rec {
pname = "hackage2nix"; pname = "hackage2nix";
version = "20150824-66-gd281a60"; version = "20180903";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nixos"; owner = "nixos";
repo = "cabal2nix"; repo = "cabal2nix";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
}; };
postUnpack = "sourceRoot+=/${pname}"; postUnpack = "sourceRoot+=/${pname}";
isLibrary = false; isLibrary = false;

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

@ -1,20 +1,22 @@
{ mkDerivation, base, data-default-class, deepseq-generics, lens { mkDerivation, base, deepseq, doctest, lens, pretty, regex-posix
, lens-construction-helper, pretty, regex-posix, stdenv, fetchFromGitHub , stdenv, fetchFromGitHub, QuickCheck
}: }:
mkDerivation rec { mkDerivation rec {
pname = "language-nix"; pname = "language-nix";
version = "20150824-66-gd281a60"; version = "20180903";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nixos"; owner = "nixos";
repo = "cabal2nix"; repo = "cabal2nix";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas"; sha256 = "1qb7h4bgd1gv025hdbrpwaajpfkyz95id7br3k3danrj1havr9ja";
}; };
postUnpack = "sourceRoot+=/${pname}"; postUnpack = "sourceRoot+=/${pname}";
libraryHaskellDepends = [ libraryHaskellDepends = [
base data-default-class deepseq-generics lens base deepseq lens pretty regex-posix
lens-construction-helper pretty regex-posix ];
testHaskellDepends = [
base deepseq doctest lens pretty regex-posix QuickCheck
]; ];
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";

18
pkgs/development/tools/haskell/cabal2nix/lens-construction-helper.nix
View File

@ -1,18 +0,0 @@
{ mkDerivation, base, data-default-class, fetchFromGitHub, lens, stdenv }:
mkDerivation rec {
pname = "lens-construction-helper";
version = "20150824-66-gd281a60";
src = fetchFromGitHub {
owner = "nixos";
repo = "cabal2nix";
rev = "v${version}";
sha256 = "1ffizg60ihkipcgqr5km4vxgnqv2pdw4716amqlxgf31wj59nyas";
};
postUnpack = "sourceRoot+=/${pname}";
libraryHaskellDepends = [ base data-default-class lens ];
homepage = "https://github.com/nixos/cabal2nix#readme";
description = "Use data-default to create default instances of various types";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ simons ];
}