Commit graph

72 commits

Author SHA1 Message Date
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Aristid Breitkreuz
34e2c6cc6f perl520: update from 5.20.0 to 5.20.1 2014-10-07 22:43:08 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Eelco Dolstra
f32e964cc4 perl: Fix assertion failure on Darwin
This assertion doesn't make sense to me, because a multi-threaded
build on Darwin works fine, despite not having Glibc.
2014-09-18 22:27:20 +02:00
Gergely Risko
3a2134d46f Disable perl 5.16 tests
They are on the path to stdenv rebuild.

Accidentally re-enabled by conflict resolution in cherry-pick 3196d4f.
2014-09-14 22:34:51 +02:00
Gergely Risko
c5df246ba9 Cleanup perl logic in stdenvLinux
Make thread disabling explicit.  This changes the semantics of the perl
derivation, so on other platforms it may require setting

  enableThreading = false

This commit doesn't change the derivation or out hash of stdenvLinux.
2014-09-14 21:36:14 +02:00
Alexander Kjeldaas
3196d4f7c7 perl-5.16: make it binary deterministic 2014-09-13 14:40:04 +02:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Vladimír Čunát
e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Eelco Dolstra
0c781b3d8f perl-5.8: Remove 2014-08-21 16:54:29 +02:00
Eelco Dolstra
36a00a0f93 perl-5.10: Remove 2014-08-21 16:54:29 +02:00
Eelco Dolstra
315e58762d perl: Disable tests
It appears that these got re-enabled accidentally in
d1ed0f44cd.

http://hydra.nixos.org/build/13369824
2014-08-17 16:04:47 +02:00
Vladimír Čunát
d1ed0f44cd Merge #2823: better cygwin support, also add x86_64
Conflicts (easy):
	pkgs/development/interpreters/perl/5.16/default.nix
2014-08-14 20:38:09 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
f56567ce74 perl: Add 5.20.0 2014-06-25 11:06:23 +02:00
Eelco Dolstra
da7a12b908 perl: Disable tests
They're on the critical path for stdenv rebuilds.
2014-06-24 13:24:12 +02:00
Sander van der Burg
86e18c965f Fix perl compilation 2014-05-31 14:25:46 +02:00
Sander van der Burg
9ec52d6323 Fixes to make basic builds on Cygwin work again + additions to support x86_64-cygwin 2014-05-29 14:47:07 +02:00
Vladimír Čunát
1046b4ccab Merge #1905: perl: disable tests that involve networking
I rebased the branch not to include newer changes from master.
2014-04-02 19:06:10 +02:00
Vladimír Čunát
b035c33fe8 perl: avoid --no-cpp-precomp on darwin, (close #1160)
Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch
2013-11-02 11:53:04 +01:00
Peter Simons
71f191bdba perl: revert "re-enable the postPatch hook on Darwin"
This reverts commit 1778200519.
Apparently, the sed -i syntax is different from what I thought, because
now the build fails on Darwin, saying:

  sed: -i.bak: No such file or directory

See http://hydra.nixos.org/build/5829944/nixlog/1/raw for more details.
2013-08-29 12:06:39 +02:00
Peter Simons
1778200519 perl: re-enable the postPatch hook on Darwin
The problem was that sed(1) variants other than GNU sed require a backup suffix
to the -i option.
2013-08-29 10:40:50 +02:00
Vladimír Čunát
2c217cc0b1 perl: disable tests on Darwin, refactor stdenv.lib usage
There was a mysterious error, which I don't have resources to investigate:

Removing test lib/Net/hostent.t
sed: -i: No such file or directory
2013-08-27 14:51:35 +02:00
Vladimír Čunát
70f0d79d06 perl: remove one more unreliable test, fixes #454 2013-04-07 21:52:24 +02:00
Eelco Dolstra
e12e62001b perl: Update to 5.16.3, 5.14.4
CVE-2013-1667
2013-04-04 14:50:22 +02:00
Vladimír Čunát
2660b9115f perl: fix bad syntax in FreeBSD commit 2013-04-02 21:18:14 +02:00
Vladimír Čunát
322c2f36a3 perl: attempt to fix on FreeBSD by disabling two tests 2013-04-02 10:39:20 +02:00
Vladimír Čunát
5e202a2221 perl: fix bash syntax
I thought I could make a small syntax change without trying, I was being
foolish.
2013-04-02 09:20:58 +02:00
Vladimír Čunát
21cd5376b4 perl: disable one more test
It worked for me, but fails on hydra (probably not very pure).
2013-04-01 23:31:00 +02:00
Vladimír Čunát
ff92538aec perl: enable doCheck, almost all tests work for me 2013-03-29 02:50:41 +01:00
Vladimír Čunát
73b0fa8720 perl: modify patch for better purity
This probably solves problems on some platforms that expose /usr and
/lib during build, see #386.
2013-03-29 02:50:41 +01:00
Danny Wilson
9baf9e98d1 Fix Perl builds on Illumos. 2013-02-28 20:04:04 +01:00
Eelco Dolstra
7774506201 perl: Update to 5.16.2 2012-11-23 17:29:06 +01:00
Eelco Dolstra
1fffc94956 Fix evaluation on non-Linux platforms 2012-09-21 15:29:05 -04:00
Eelco Dolstra
8ed71a1ee5 perl: Add 5.16.1 2012-09-18 15:23:07 -04:00
Eelco Dolstra
a78d2f55fb * Perl: set passthru.libPrefix to communicate the relative location of
Perl packages for $PERL5LIB.

svn path=/nixpkgs/trunk/; revision=34061
2012-05-11 13:41:24 +00:00
Eelco Dolstra
08b6b9fa3a * Cygwin: provide a Perl setup hook so that Perl dependencies work
properly.

svn path=/nixpkgs/trunk/; revision=34002
2012-05-07 02:06:29 +00:00
Nicolas Pierron
82b308bf11 Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Eelco Dolstra
0e6c77befa * On Darwin, don't link Perl against /usr/lib/libutil.dylib. Libutil
uses /usr/lib/libstdc++.dylib, and so we get segfaults when using
  Perl modules that depend on another libstdc++.dylib (like Nix's Perl
  bindings).  It doesn't appear that libutil provides useful
  functionality for Perl on Darwin.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32364
2012-02-17 19:32:15 +00:00
Eelco Dolstra
25e0ae0f39 * Fix building Perl on FreeBSD. Its configure script was looking for
libraries in /usr/local/lib, but the linker doesn't look there by
  default, so linking against libgdbm failed.  So don't look in 
  /usr/local/lib.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31741
2012-01-20 16:42:16 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
5649122458 * Added Perl 5.14.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30057
2011-10-27 15:58:25 +00:00
Eelco Dolstra
20ab6cfbf7 * Move perl-5.8 and perl-5.10 into perl/ per the coding conventions.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30055
2011-10-27 15:35:43 +00:00
Eelco Dolstra
59d88c1772 * Revert r10833, it doesn't really work. Instead build ghcboot
with Perl 5.8.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10834
2008-02-22 14:43:00 +00:00
Eelco Dolstra
5e985bc375 * Perl 5.10.0, while we're at it.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10808
2008-02-21 16:19:09 +00:00
Eelco Dolstra
af40c15c30 * Use CPAN mirrors.
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10806
2008-02-21 15:52:31 +00:00