On Wednesday 13 October 2010 20:52:30 you wrote:
> > haskell-Graphalyze_and_deps : add Graphalyze haskell package (as well
as
> > its deps: bktrees, colour, graphviz)
>
> I have only looked at this one. Thanks for the contribution. Could I
> ask you to edit your patch slightly?
>
> The descriptions are too long. I usually use just the one-sentence
> synopsis from the Cabal file. If you want longer descriptions, use
> longDescription instead.
>
> It would be nice if you could include a license field as well. Not all
> old Haskell packages have one, but I try to include it at least for
> all packages I add or modify.
>
> Finally, the relatively recent use of callPackage makes the use of
> "inherit" more or less superfluous. So you should be able to omit the
> "inherit" lines for Graphalyze and graphviz and just keep the fgl =
> fgl_5_4_2_3 line.
>
> If you resend the edited patch, I'll apply it.
Here they are! (*packages*.diff for top-level/haskell-packages.nix)
Ilya
diff -r ddfb03691c34 pkgs/development/libraries/haskell/Graphalyze/default.nix
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix Wed Oct 13 21:32:16 2010 +0200
@@ -0,0 +1,13 @@
+{cabal, bktrees, fgl, graphviz, pandoc}:
+
+cabal.mkDerivation (self : {
+ pname = "Graphalyze";
+ version = "0.10.0.1";
+ sha256 = "8f273de41c7c340d2c7c8b4797d30535e4038616055099cc52bc5d21c10d9f22";
+ propagatedBuildInputs = [bktrees fgl graphviz pandoc ];
+ meta = {
+ description = "A library to use graph theory analysis";
+ license = "OtherLicene";
+ };
+})
+
diff -r ddfb03691c34 pkgs/development/libraries/haskell/bktrees/default.nix
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgs/development/libraries/haskell/bktrees/default.nix Wed Oct 13 21:32:16 2010 +0200
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+ pname = "bktrees";
+ version = "0.3";
+ sha256 = "ddef9fbf5114175cefe2908cd4360a4b94cbc91daac6d5194a8911bacaa1a5da";
+ meta = {
+ description = "Burkhard-Keller trees sets implementation";
+ license = "BSD3";
+ };
+})
+
diff -r ddfb03691c34 pkgs/development/libraries/haskell/colour/default.nix
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgs/development/libraries/haskell/colour/default.nix Wed Oct 13 21:32:16 2010 +0200
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+ pname = "colour";
+ version = "2.3.1";
+ sha256 = "58cf12b8abf7d01a752b1b778b64cc406903874702e3475d65c2aa35689fa49b";
+ meta = {
+ description = "Data type, conversion and composition of colours";
+ license = "OtherLicense";
+ };
+})
+
diff -r ddfb03691c34 pkgs/development/libraries/haskell/graphviz/default.nix
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix Wed Oct 13 21:32:16 2010 +0200
@@ -0,0 +1,13 @@
+{cabal, colour, fgl, polyparse, transformers, QuickCheck}:
+
+cabal.mkDerivation (self : {
+ pname = "graphviz";
+ version = "2999.10.0.1";
+ sha256 = "5a3aebd3874303dcf554aef3bf511dd22e72053a9672c823d1d820d2b90ca076";
+ propagatedBuildInputs = [colour fgl polyparse transformers QuickCheck];
+ meta = {
+ description = "Bindings for the Dot language (Graphviz)";
+ license = "BSD3";
+ };
+})
+
diff -r ddfb03691c34 pkgs/top-level/haskell-packages.nix
--- a/pkgs/top-level/haskell-packages.nix Tue Oct 12 23:15:25 2010 +0000
+++ b/pkgs/top-level/haskell-packages.nix Wed Oct 13 21:33:10 2010 +0200
@@ -50,6 +50,8 @@
blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
+ bktrees = callPackage ../development/libraries/haskell/bktrees {};
+
Boolean = callPackage ../development/libraries/haskell/Boolean {};
bytestring = callPackage ../development/libraries/haskell/bytestring {};
@@ -78,6 +80,8 @@
colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
+ colour = callPackage ../development/libraries/haskell/colour {};
+
ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
convertible = callPackage ../development/libraries/haskell/convertible {
@@ -192,6 +196,14 @@
happy = happy_1_18_5;
};
+ Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {
+ fgl = fgl_5_4_2_3;
+ };
+
+ graphviz = callPackage ../development/libraries/haskell/graphviz {
+ fgl = fgl_5_4_2_3;
+ };
+
hakyll = callPackage ../development/libraries/haskell/hakyll {
regexBase = regexBase_0_93_2;
network = network_2_2_1_7;
_______________________________________________
nix-dev mailing list
[email protected]
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
