Commit Graph

2513 Commits

Author SHA1 Message Date
Michael Raskin
6008ede40d Merge pull request #24648 from asppsa/php-config-fix2
php: fix php-config header file paths
2017-05-01 11:05:43 +02:00
Alastair Pharo
b330329768 php: fix php-config header file paths
Split outputs mean that the "include" folder from PHP gets placed into a
"dev" derivation. However php-config is not aware of this, which means
that compiling extensions with phpize fails with an error about being
unable to find header files (see #24357, #24420).  This fixes that by:

1. passing the `--includedir` flag to `configure` so that `php-config`
   gives the correct paths.

2. moving the `phpize` and `php-config` scripts and man pages to the
   dev derivation, to prevent cylic references.

3. ensuring that the `configure` script arguments are stripped from
   all binaries, including `php-embed`, to prevent cyclic references.
2017-04-24 16:45:20 +10:00
Frederik Rietdijk
4fc9b1852a Merge remote-tracking branch 'upstream/master' into HEAD 2017-04-23 11:26:47 +02:00
Daiderd Jordan
004ecac47b
perl: add patch for sw_vers on darwin
Fixes #25090
2017-04-22 15:29:46 +02:00
Tomas Hlavaty
bcd349d70d picolisp: 16.6 -> 16.12 2017-04-21 00:25:23 +02:00
Frederik Rietdijk
c275158f06 python36: 3.6.0 -> 3.6.1 2017-04-18 13:14:40 +02:00
Maksim Bronsky
f78c032934
perl: init 5.24.1 and set as default perl 2017-04-18 01:24:44 +02:00
Maksim Bronsky
d6b42b4008
perl: 5.22.2 -> 5.22.3 2017-04-18 01:24:39 +02:00
Frederik Rietdijk
5c8ffe0311 Python 3.x: do not regenerate _sysconfigdata
This commit fixes several issues:

- as reported in https://github.com/NixOS/nixpkgs/issues/24924 it was
possible that the file _sysconfigdata.pyc was generated after the actual
build of the CPython interpreter. We forgot to regenerate that file
during the build. This is now fixed

- the expression of the 3.3 interpreter now also includes some of the
determinism patches even though the output isn't yet reproducible. The
reason for adding them is that this makes the expressions of the
different interpreters more similar.

- references to -dev packages are now also removed in the 3.6 package,
thereby reducing its closure size
2017-04-16 10:41:35 +02:00
Alastair Pharo
813eb41cf6 octaveHg: add package 2017-04-09 21:54:14 +10:00
Alastair Pharo
250ddfe1a2 octave: add runtime texinfo dependency
makeinfo (provided by the texinfo package) is used by the "help"
command in Octave to display info about functions, etc.  By default,
Octave looks for "makeinfo" in the PATH, rather than specifying the
location of the executable.  This results in Nix not being aware that
makeinfo is required at runtime (so unless you happen have makeinfo
available from your path, "help" won't work).

This patch fixes that by setting the path to makeinfo in Octave,
thereby creating a runtime dependency on texinfo.
2017-04-09 16:42:56 +10:00
Vladimír Čunát
26766f0e57
Merge branch 'staging'
There are a few dozen new failures on Darwin, probably related to
updates of stdenv's llvm and/or pkgconfig.
Still the total number of successes increases.
2017-04-08 11:02:36 +02:00
Andrew R. M
106214a7c9 hy: 0.11.1 -> 0.12.1
Fixed build inputs up a little while bumping version
2017-04-07 23:15:16 -04:00
Vladimír Čunát
c6bc4cfdbc
Merge branch 'master' into staging 2017-04-06 00:16:59 +02:00
Tim Steinbach
3535a6bf3c
ruby: 2.0.0-p647 -> 2.0.0-p648 2017-04-03 15:40:26 -04:00
Tim Steinbach
ec2c469230
ruby: 2.2.5 -> 2.2.7 2017-04-03 15:33:26 -04:00
Tim Steinbach
482566939e
ruby: 2.3.3 -> 2.3.4 2017-04-03 15:28:38 -04:00
Tim Steinbach
bc45ee50c4
ruby: 2.4.0 -> 2.4.1 2017-04-03 15:23:18 -04:00
Johannes Bornhold
249b34aadc
python: Move catch_conflicts.py into subdirectory (#23600)
Python does add the script's directory into "sys.path". For the case of
"catch_conflicts.py" this means "/nix/store" is added to "sys.path". This can
result in very long delays if the store contains a lot of entries.

(moved from master commit 76213d102c)
2017-04-01 12:22:36 +02:00
Vladimír Čunát
46ea770b2b Revert "python: Move catch_conflicts.py into subdirectory (#23600)" (#24528)
This reverts commit 76213d102c.
2017-04-01 12:20:31 +02:00
Johannes Bornhold
76213d102c python: Move catch_conflicts.py into subdirectory (#23600)
Python does add the script's directory into "sys.path". For the case of
"catch_conflicts.py" this means "/nix/store" is added to "sys.path". This can
result in very long delays if the store contains a lot of entries.
2017-04-01 12:19:53 +02:00
Lancelot SIX
0848d1c2e1 gnuapl: 1.6 -> 1.7
See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00007.html
for release announcement.
2017-03-31 07:33:53 +02:00
Robin Gloster
84db2dffe9
nix-exec: fix build 2017-03-30 16:23:34 +02:00
Victor Calvert
2fcc32f42b groovy: 2.4.8 -> 2.4.10 2017-03-26 11:18:37 -04:00
Thomas Tuegel
f87d3d6f80
supercollider: pin to Qt 5.6 2017-03-25 08:49:40 -05:00
Anthony Cowley
506a5df014 octave: fix on darwin
This change is required on darwin, but did not make it into the 4.2.1
release of Octave. It is a very small change, and a comment on the
patch includes a link for more information and a note that it should
be removed from subsequent releases.
2017-03-22 10:49:10 -04:00
Robin Gloster
9c730bc40b
clooj: fix url 2017-03-21 11:00:49 +01:00
Eelco Dolstra
b751036a74
php: Add a dev output
This reduces the closure size from 438 to 174 MiB.
2017-03-20 17:31:37 +01:00
Eelco Dolstra
3ff08d6f13
php: Strip modules
This reduces the closure size from 566 to 438 MiB.
2017-03-20 17:31:31 +01:00
Dan Peebles
de0849d180 erlangR14: delete unreferenced ancient file 2017-03-19 14:59:58 -04:00
Dan Peebles
5a81c66906 erlang: patch all versions to work with clang 4 2017-03-19 14:59:58 -04:00
Michael Raskin
0cf93fda07 guile_2_0: init at 2.0.13
Reinstate guile 2.0.x. Use it for autogen
2017-03-19 20:05:14 +01:00
Rahul Gopinath
5498dd6364 guile: 2.0 -> 2.2 2017-03-19 10:47:22 -07:00
Eric Bailey
a91afef89e
erlangR19: update maintainers
Use the list of direct committers:
https://github.com/NixOS/nixpkgs/commits/master/pkgs/development/interpreters/erlang/R19.nix

Originally, I just copied and pasted from R18.nix, I think.
2017-03-18 00:36:57 -05:00
Eric Bailey
05b1f8276b
erlangR19: 19.2.3 -> 19.3 2017-03-18 00:24:18 -05:00
Michael Raskin
8388cb8bff renpy: 6.17.6 -> 6.99.12.4; still a strange mistake on launch 2017-03-17 14:14:38 +01:00
Linus Heckemann
9b62e41c1e renpy: mark as broken 2017-03-17 10:07:12 +00:00
Christopher League
cfc7a1877a clips: init at 6.30
CLIPS is a language for building expert systems.
2017-03-16 00:05:02 +02:00
Andrzej Trzaska
162845d5b1 Use gem 2.6.10 (#23902) 2017-03-15 14:55:45 +00:00
Lluís Batlle i Rossell
46c9eac980 guile: enable parallel building
civodul today on irc said that 2.0.13 likely has the parallel building
issue fixed (case equal-or-over 8 cores). Let's try.
2017-03-13 23:38:52 +01:00
Michael Raskin
a77380b34c Merge pull request #23780 from asppsa/pure-0.66
pure: 0.64 -> 0.66
2017-03-13 10:56:08 +01:00
Michael Raskin
54b7c3b63f clisp-git: update to the upstream fix of 32-bit builds
The current exact tip fails to build on x86_64, there probably is a
fresher safe commit, but I haven't try bisecting.
2017-03-13 00:00:13 +01:00
Vladimír Čunát
848423f223
clisp-tip: make the build more reliable
Hydra shows it sometimes fails without autoconf:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.clisp-tip.x86_64-linux
I can't say I understand why this happened.
2017-03-12 23:07:55 +01:00
Alastair Pharo
2188e0f61f pure: 0.64 -> 0.66 2017-03-12 12:22:52 +11:00
Vladimír Čunát
d56e596da7
lua-{5.2,5.3}: fixup dylib symlink names on Darwin
Hopefully; I didn't test it.
https://github.com/NixOS/nixpkgs/pull/6311#issuecomment-285521028
2017-03-10 00:54:32 +01:00
Henry Till
d95f21f6a1 racket: add readline support 2017-03-07 15:08:02 -05:00
Tim Digel
0b2502a284 elixir: 1.4.0 -> 1.4.2 2017-03-07 11:50:32 +01:00
Henry Till
6ed6731e36 racket: disable i686 builds
ref #23253
2017-03-05 14:51:48 -05:00
Vladimír Čunát
2839b101f9
Merge commit older staging
No new failures on Hydra.
2017-03-05 08:00:42 +01:00
Domen Kožar
fb40889ddb
mk-python-derivation: remove me as maintainer
The time has come ...
2017-03-03 14:37:28 +01:00