hello, find attached my first Nixpkgs patches.
François Perrad
From 43cd1b3399c0854b85fe6023f2d4d780480c6e81 Mon Sep 17 00:00:00 2001 From: fperrad <[email protected]> Date: Fri, 19 Mar 2010 19:24:49 +0100 Subject: [PATCH 1/3] update Scala 2.7.7 --- pkgs/development/compilers/scala/default.nix | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 6dacef9..eb72122 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,13 @@ 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 = '' @@ -18,5 +20,15 @@ stdenv.mkDerivation rec { 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/; + license = "bsd"; }; } -- 1.6.3.3
From 3ec2c4abb90204d7218e6e4cd546f15095dd8e82 Mon Sep 17 00:00:00 2001 From: fperrad <[email protected]> Date: Thu, 25 Mar 2010 16:24:09 +0100 Subject: [PATCH 2/3] add Groovy 1.7.1 --- pkgs/development/interpreters/groovy/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 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..9d0c1d7 --- /dev/null +++ b/pkgs/development/interpreters/groovy/default.nix @@ -0,0 +1,29 @@ +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 = '' + mkdir -p $out + mv * $out + rm -f $out/bin/*.bat + ''; + + phases = "unpackPhase installPhase"; + + inherit unzip; + buildInputs = [unzip]; + + meta = { + description = "An agile dynamic language for the Java Platform"; + homepage = http://groovy.codehaus.org/; + license = "bsd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f98c194..8a8f50b 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 e25d1af14dd364821ed43459c7cdcce7d3dcc141 Mon Sep 17 00:00:00 2001 From: fperrad <[email protected]> Date: Sat, 20 Mar 2010 10:39:02 +0100 Subject: [PATCH 3/3] add Gradle 0.8 --- .../tools/build-managers/gradle/default.nix | 37 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 41 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..c5bc031 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -0,0 +1,37 @@ +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 = '' + mkdir -p $out + mv * $out + rm -f $out/bin/*.bat + ''; + + phases = "unpackPhase installPhase"; + + inherit unzip; + 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 = "bsd"; # Apache + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a8f50b..b808469 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
From 4f9241cad68b7feb9c32e1cc64021694bb352b65 Mon Sep 17 00:00:00 2001 From: fperrad <[email protected]> Date: Tue, 23 Mar 2010 12:05:12 +0100 Subject: [PATCH 1/2] add ack-1.92 --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/perl-packages.nix | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec0959f..9fa2a69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5281,6 +5281,7 @@ let perlXMLParser = perlPackages.XMLParser; + ack = perlPackages.ack; ### DEVELOPMENT / PYTHON MODULES diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5afb441..575fbfe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11,6 +11,23 @@ rec { inherit (pkgs) buildPerlPackage fetchurl stdenv perl; + ack = buildPerlPackage rec { + name = "ack-1.92"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + sha256 = "8689156cb0639ff60adee47fc4b77e656cf0fc58e6c123ee6c481d9d48e99b88"; + }; + propagatedBuildInputs = [ FileNext ]; + meta = { + description = "grep-like text finder"; + longDescription = '' + ack is a grep-like tool tailored to working with large trees of source code. + ''; + homepage = http://betterthangrep.com/; + license = "free"; # Artistic 2.0 + }; + }; + AlgorithmAnnotate = buildPerlPackage { name = "Algorithm-Annotate-0.10"; src = fetchurl { @@ -1100,6 +1117,14 @@ rec { }; }; + FileNext = buildPerlPackage rec { + name = "File-Next-1.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; + sha256 = "36cc0a4e5e4e44e04f7bea6f7453db517acc1a1b35a2b5fe5bc14cea0f560662"; + }; + }; + FileShareDir = buildPerlPackage rec { name = "File-ShareDir-1.00"; src = fetchurl { -- 1.6.3.3
From b92e8e361b1293f9abf17191485f00bf0c1b6d45 Mon Sep 17 00:00:00 2001 From: fperrad <[email protected]> Date: Tue, 23 Mar 2010 15:51:15 +0100 Subject: [PATCH 2/2] add perlcritic 1.105 (and Test::Perl::Critic 1.02) --- pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/perl-packages.nix | 185 +++++++++++++++++++++++++++++++++++++- 2 files changed, 185 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fa2a69..0923db8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5283,6 +5283,8 @@ let ack = perlPackages.ack; + perlcritic = perlPackages.PerlCritic; + ### DEVELOPMENT / PYTHON MODULES buildPythonPackage = diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 575fbfe..bb455ef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -150,6 +150,14 @@ rec { propagatedBuildInputs = [CarpClan]; }; + BKeywords = buildPerlPackage rec { + name = "B-Keywords-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JJ/JJORE/${name}.tar.gz"; + sha256 = "9a231f54a01a705c574a38702cb3fe8bbb301ea7357a09797e3da876a265d395"; + }; + }; + Boolean = buildPerlPackage rec { name = "boolean-0.20"; src = fetchurl { @@ -671,6 +679,14 @@ rec { }; }; + ConfigTiny = buildPerlPackage rec { + name = "Config-Tiny-2.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "1a5b7f5e8245a3e7be859df571209353be30abc7292815ee0f459b8dc87cdb5b"; + }; + }; + constant = buildPerlPackage { name = "constant-1.15"; src = fetchurl { @@ -1057,6 +1073,15 @@ rec { }; }; + ExceptionClass = buildPerlPackage rec { + name = "Exception-Class-1.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "54e256fdb317c1736c2c257fa63d5b87cfb382870711b24937c36eb5171b3154"; + }; + propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; + }; + ExtUtilsInstall = buildPerlPackage { name = "ExtUtils-Install-1.50"; src = fetchurl { @@ -1125,6 +1150,14 @@ rec { }; }; + FileRemove = buildPerlPackage rec { + name = "File-Remove-1.42"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "2ec2643c4e1a721965ed70ce184b72ae831c82b577420612a59eba8a0ce2a504"; + }; + }; + FileShareDir = buildPerlPackage rec { name = "File-ShareDir-1.00"; src = fetchurl { @@ -1150,6 +1183,15 @@ rec { }; }; + FileWhich = buildPerlPackage rec { + name = "File-Which-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "b72fec6590160737cba97293c094962adf4f7d44d9e68dde7062ecec13f4b2c3"; + }; + propagatedBuildInputs = [ TestScript ]; + }; + FreezeThaw = buildPerlPackage { name = "FreezeThaw-0.43"; src = fetchurl { @@ -1176,6 +1218,15 @@ rec { }; }; + HookLexWrap = buildPerlPackage rec { + name = "Hook-LexWrap-0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHORNY/${name}.zip"; + sha256 = "eda90ba26f8a0cef02d38f08a1786a203beec1309279493c78eed13567d0fa7e"; + }; + buildInputs = [ pkgs.unzip ]; + }; + HTMLFormFu = buildPerlPackage rec { name = "HTML-FormFu-0.03007"; src = fetchurl { @@ -1364,6 +1415,14 @@ rec { }; }; + IOString = buildPerlPackage rec { + name = "IO-String-1.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + sha256 = "2a3f4ad8442d9070780e58ef43722d19d1ee21a803bf7c8206877a10482de5a0"; + }; + }; + IPCRun = buildPerlPackage rec { name = "IPC-Run-0.82"; src = fetchurl { @@ -1373,6 +1432,14 @@ rec { doCheck = false; /* attempts a network connection to localhost */ }; + IPCRun3 = buildPerlPackage rec { + name = "IPC-Run3-0.043"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "96b534e07e1459529ac12a77393628366f30d122b0dfaaa3ed5ec032079097ad"; + }; + }; + ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-8.12"; @@ -1785,10 +1852,10 @@ rec { }; ParamsUtil = buildPerlPackage rec { - name = "Params-Util-0.37"; + name = "Params-Util-1.01"; src = fetchurl { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "1n36vhahbs2mfck5x6g8ab9280zji9zwc5092jiq78s791227cb6"; + sha256 = "6a1613b669f18bf329003c7dbd11435248cffa9c1497645073821a68c0987a40"; }; }; @@ -1832,6 +1899,18 @@ rec { }; }; + PerlCritic = buildPerlPackage rec { + name = "Perl-Critic-1.105"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EL/ELLIOTJS/${name}.tar.gz"; + sha256 = "3e1bd5ab4912ebe20cd3cb81b36ee28dbdd8d410374a31025dc9fb289921ff27"; + }; + propagatedBuildInputs = [ + PPI BKeywords ConfigTiny ExceptionClass Readonly StringFormat + EmailAddress FileWhich PerlTidy PodSpell ReadonlyXS RegexpParser + ]; + }; + PerlIOeol = buildPerlPackage { name = "PerlIO-eol-0.14"; src = fetchurl { @@ -1856,6 +1935,33 @@ rec { }; }; + PerlTidy = buildPerlPackage rec { + name = "Perl-Tidy-20090616"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/${name}.tar.gz"; + sha256 = "c7ca21e287d23c769c235f6742fab7b5779b7c7bf58b6a55ba8cdc492e50a118"; + }; + }; + + PPI = buildPerlPackage rec { + name = "PPI-1.210"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "6c851e86475242fa0def2f02565743d41ab703ff6df3e826166ee9df5b961c7a"; + }; + propagatedBuildInputs = [ + ClassInspector + Clone + FileRemove + IOString + ListMoreUtils + ParamsUtil + TaskWeaken + TestNoWarnings TestObject TestSubCalls + ]; + doCheck = false; + }; + ModulePluggable = buildPerlPackage rec { name = "Module-Pluggable-3.9"; src = fetchurl { @@ -1919,6 +2025,22 @@ rec { propagatedBuildInputs = [constant PodEscapes]; }; + PodSpell = buildPerlPackage rec { + name = "Pod-Spell-1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SB/SBURKE/${name}.tar.gz"; + sha256 = "938648dca5b62e591783347f9d4d4e2a5239f9629c6adfed9a581b9457ef7d2e"; + }; + }; + + ProbePerl = buildPerlPackage rec { + name = "Probe-Perl-0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/${name}.tar.gz"; + sha256 = "9b7d211139e42b2a2952c9a4b9f55ac12705e256f4a0acd4ac6ff665aeaddd87"; + }; + }; + Readonly = buildPerlPackage rec { name = "Readonly-1.03"; src = fetchurl { @@ -1927,6 +2049,14 @@ rec { }; }; + ReadonlyXS = buildPerlPackage rec { + name = "Readonly-XS-1.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; + sha256 = "8ae5c4e85299e5c8bddd1b196f2eea38f00709e0dc0cb60454dc9114ae3fff0d"; + }; + }; + RegexpAssemble = buildPerlPackage rec { name = "Regexp-Assemble-0.34"; src = fetchurl { @@ -1951,6 +2081,14 @@ rec { }; }; + RegexpParser = buildPerlPackage rec { + name = "Regexp-Parser-0.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PI/PINYAN/${name}.tar.gz"; + sha256 = "0dfdbe060724396697303c5522e697679ab6e74151f3c3ef8df49f3bda30a2a5"; + }; + }; + ReturnValue = buildPerlPackage { name = "Return-Value-1.302"; src = fetchurl { @@ -2006,6 +2144,14 @@ rec { buildInputs = [TestPod TestPodCoverage]; }; + StringFormat = buildPerlPackage rec { + name = "String-Format-1.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DARREN/${name}.tar.gz"; + sha256 = "edb27dd055ad71012a439f262f9394517adb585a5c27ba72c1819bae2c23729a"; + }; + }; + StringMkPasswd = buildPerlPackage { name = "String-MkPasswd-0.02"; src = fetchurl { @@ -2242,6 +2388,23 @@ rec { propagatedBuildInputs = [TestTester]; }; + TestObject = buildPerlPackage rec { + name = "Test-Object-0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "d142a91b039928dc5d616c7bd9bb62ffb06e58991f00c54e26ef7e62ed61032a"; + }; + }; + + TestPerlCritic = buildPerlPackage rec { + name = "Test-Perl-Critic-1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TH/THALJEF/${name}.tar.gz"; + sha256 = "89b242ff539034336ed87c11ef3e5ecac47c333a6ab8b46aab4cc449e3739a89"; + }; + propagatedBuildInputs = [ PerlCritic ]; + }; + TestPod = buildPerlPackage { name = "Test-Pod-1.26"; src = fetchurl { @@ -2268,6 +2431,24 @@ rec { propagatedBuildInputs = [TestHarness]; }; + TestScript = buildPerlPackage rec { + name = "Test-Script-1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "e21e5ee43a27b4c51b54ded5c92e60b817309778117a1d98ae6354abff27eb96"; + }; + propagatedBuildInputs = [ProbePerl IPCRun3]; + }; + + TestSubCalls = buildPerlPackage rec { + name = "Test-SubCalls-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "a334b0457da338d79be2dbb62d403701fc90f7607df840115ff45ee1e2bd6e70"; + }; + propagatedBuildInputs = [ HookLexWrap ]; + }; + TestTester = buildPerlPackage { name = "Test-Tester-0.107"; src = fetchurl { -- 1.6.3.3
_______________________________________________ nix-dev mailing list [email protected] https://mail.cs.uu.nl/mailman/listinfo/nix-dev
