2010/3/29 Marc Weber <[email protected]>: > Hi François Perrad, > > Sorry for the long delay. I've been busy. You're welcome. > > patch adding perllib ack: > > + ack = perlPackages.ack; > > Do you think your library is used very much?
most of Perl packages are only module/library. but 'ack' is a command line utility (a grep like) > > In any case you should consider calling the global name in > all-packages.nix "perlAck". This naming is consistent and similar to > > perlXMLParser = perlPackages.XMLParser; > > patch adding Scala: > > + license = "bsd"; > > Have a look at: > pkgs/lib/licenses.nix i've read only Nixpkgs Manual (4.2 Licenses) which seems out of date. find attached a new version of 3 patches (scala, groovy, gradle) > > We use upper case characters for BSD license. > > > patch adding groovy: > > + inherit unzip; > > I don't think you have to define ENV var unzip. Adding it to > buildInputs should suffice > > > + installPhase = '' > + mkdir -p $out > + mv * $out > + rm -f $out/bin/*.bat > + ''; > > That's fine. Usually we use ensureDir instead of mkdir -p. > > By removing *.bat before copying to $out you can save some typing (but > this is just a hint - you may ignore it): > > + installPhase = '' > + ensureDir $out > + rm bin/*.bat > + mv * $out > + ''; > > > patch 0002-add-perlcritic-1.105-and-Test-Perl-Critic-1.02.patch > > + perlcritic = perlPackages.PerlCritic; > > Same as ack. See above like ack, perlcritic is a command line utility > > > patch 0003-add-Gradle-0.8.patch > > + inherit unzip; > > + license = "bsd"; # Apache > > See above. I should have a look at Gradle. > > > Note: I didn't test your expressions. If you're fine with those small > changes I'll commit you patches. > > Marc Weber > >
From 4aefd2470d5816b8e8cf2dbd9f2b48f091c64036 Mon Sep 17 00:00:00 2001 From: fperrad <[email protected]> Date: Mon, 29 Mar 2010 10:53:19 +0200 Subject: [PATCH 1/3] update Scala 2.7.7 --- pkgs/development/compilers/scala/default.nix | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 6dacef9..7e0017e 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,22 +1,33 @@ args: with args; +# at runtime, need jre or jdk + stdenv.mkDerivation rec { - name = "scala-2.7.1"; + name = "scala-2.7.7"; src = fetchurl { - url = "http://www.scala-lang.org/downloads/distrib/files/${name}.final.tar.gz";; - sha256 = "3cad113ed7b84f4f009897f6066bee28459e63a1cf1a6d5d56f10f4d1f9819ec"; + url = "http://www.scala-lang.org/downloads/distrib/files/${name}.final.tgz";; + md5 = "5d2294d5aab72fec869c0ba666d28b7e"; }; installPhase = '' - mkdir -p $out + ensureDir $out + rm bin/*.bat mv * $out - rm -f $out/bin/*.bat ''; phases = "unpackPhase installPhase"; meta = { description = "Scala is a general purpose programming language"; + longDescription = '' + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages, enabling Java and other programmers to be more productive. + Code sizes are typically reduced by a factor of two to three when + compared to an equivalent Java application. + ''; + homepage = http://www.scala-lang.org/; }; } -- 1.6.3.3
From 8e4e693dcf99ec115f1784ef34c35702a85b6412 Mon Sep 17 00:00:00 2001 From: fperrad <[email protected]> Date: Mon, 29 Mar 2010 11:14:07 +0200 Subject: [PATCH 2/3] add Groovy 1.7.1 --- pkgs/development/interpreters/groovy/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 31 insertions(+), 0 deletions(-) create mode 100644 pkgs/development/interpreters/groovy/default.nix diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix new file mode 100644 index 0000000..b7dc135 --- /dev/null +++ b/pkgs/development/interpreters/groovy/default.nix @@ -0,0 +1,27 @@ +args: with args; + +# at runtime, need jdk + +stdenv.mkDerivation rec { + name = "groovy-1.7.1"; + + src = fetchurl { + url = "http://dist.groovy.codehaus.org/distributions/groovy-binary-1.7.1.zip";; + sha256 = "0a204f6835f07e6a079bd4761e70cd5e0c31ebc0c9eb293fda11dfb2d8bf137c"; + }; + + installPhase = '' + ensureDir $out + rm bin/*.bat + mv * $out + ''; + + phases = "unpackPhase installPhase"; + + buildInputs = [unzip]; + + meta = { + description = "An agile dynamic language for the Java Platform"; + homepage = http://groovy.codehaus.org/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d43741c..225d1e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2553,6 +2553,10 @@ let inherit fetchurl stdenv perl gnum4 ncurses openssl; }; + groovy = import ../development/interpreters/groovy { + inherit stdenv fetchurl unzip; + }; + guile = import ../development/interpreters/guile { inherit fetchurl stdenv readline libtool gmp gawk makeWrapper; }; -- 1.6.3.3
From 773eaac5bb51457c6c67f6eccc48fba924393a5f Mon Sep 17 00:00:00 2001 From: fperrad <[email protected]> Date: Mon, 29 Mar 2010 11:19:34 +0200 Subject: [PATCH 3/3] add Gradle 0.8 --- .../tools/build-managers/gradle/default.nix | 36 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 40 insertions(+), 0 deletions(-) create mode 100644 pkgs/development/tools/build-managers/gradle/default.nix diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix new file mode 100644 index 0000000..227759f --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -0,0 +1,36 @@ +args: with args; + +# at runtime, need jdk + +stdenv.mkDerivation rec { + name = "gradle-0.8"; + + src = fetchurl { + url = "http://dist.codehaus.org/gradle/gradle-0.8-bin.zip";; + sha256 = "940e623ea98e40ea9ad398770a6ebb91a61c0869d394dda81aa86b0f4f0025e7"; + }; + + installPhase = '' + ensureDir $out + rm bin/*.bat + mv * $out + ''; + + phases = "unpackPhase installPhase"; + + buildInputs = [unzip]; + + meta = { + description = "Gradle is an enterprise-grade build system"; + longDescription = '' + Gradle is a build system which offers you ease, power and freedom. + You can choose the balance for yourself. It has powerful multi-project + build support. It has a layer on top of Ivy that provides a + build-by-convention integration for Ivy. It gives you always the choice + between the flexibility of Ant and the convenience of a + build-by-convention behavior. + ''; + homepage = http://www.gradle.org/; + license = "ASL2.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 225d1e2..654a91f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3080,6 +3080,10 @@ let inherit fetchurl stdenv; }; + gradle = import ../development/tools/build-managers/gradle { + inherit stdenv fetchurl unzip; + }; + gperf = import ../development/tools/misc/gperf { inherit fetchurl stdenv; }; -- 1.6.3.3
_______________________________________________ nix-dev mailing list [email protected] https://mail.cs.uu.nl/mailman/listinfo/nix-dev
