3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2888 commits

Author SHA1 Message Date
John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
Justin Wood b7709539b4 elixir: 1.5.0-rc.2 -> 1.5.0 2017-07-25 09:44:49 -04:00
Herwig Hochleitner fec79a9b15 pypy: 5.6 -> 5.8
this commit includes a patch, backported from master, to skip a
failing test
2017-07-25 12:01:28 +02:00
Frederik Rietdijk 29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
Eelco Dolstra a13802b2c8
Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-21 11:05:58 +02:00
Justin Wood b61f0fe40b
elixir: 1.5.0-rc.1 -> 1.5.0-rc.2 2017-07-20 08:14:35 -04:00
Alastair Pharo 0383c0aa6b jruby: make package compatible with bundix; add devEnv
- Adds the necessary passthru vars for bundler, bundix, etc. to accept
  the package as a ruby.
- Adds the devEnv attribute, so that jruby.devEnv can be used to get
  an environment with bundler and bundix installed.
2017-07-19 16:17:44 +10:00
Alastair Pharo 5c6e4ea4be jruby: only wrap jruby executables
Other executables all invoke jruby, and so don't need to be wrapped.

In some cases wrapping breaks the executables because one file is a ruby
script that directly loads the other (e.g. `gem` is a wrapper that loads
`jgem`).  In this case, if the latter script has been wrapped by nix,
loading will fail.
2017-07-19 16:13:09 +10:00
Frederik Rietdijk 3eceecb90d Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-17 13:52:01 +02:00
Frederik Rietdijk 8e98811f76 python36: 3.6.1 -> 3.6.2 2017-07-17 10:06:14 +02:00
Daiderd Jordan fa74d99e42 Merge pull request #27295 from ankhers/generalize_lfe
Generalize building of LFE
2017-07-16 14:36:24 +02:00
Vladimír Čunát e2b7b09960
Merge branch 'master' into staging 2017-07-15 12:15:56 +02:00
Kirill Radzikhovskyy 9728d77cf3 jruby: 9.1.5.0 -> 9.1.12.0 2017-07-14 17:21:31 +10:00
John Ericson ea9af6e3bd Merge pull request #27336 from obsidiansystems/stdenv-setup-cleanup
Stdenv setup misc cleanups
2017-07-13 18:41:33 -04:00
John Ericson 8d76effc17 stdenv-setup: Make the package accumulators associative arrays instead of strings
This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
2017-07-12 15:30:56 -04:00
Justin Wood 811142aa71
elixir: 1.5.0-rc.0 -> 1.5.0-rc.1 2017-07-12 10:10:13 -04:00
Justin Wood 8dc7d34942
LFE 1.2 does not support OTP 20 2017-07-12 10:01:40 -04:00
Justin Wood 0573610a5f
Make sure the LFE test suite is being run 2017-07-11 14:16:48 -04:00
Justin Wood c87d4d4a19 Generalize building of LFE 2017-07-10 20:37:33 -04:00
Vladimír Čunát 08743fe0a3
luajit: 2.0 actually doesn't support aarch64 at all
I suppose 2.1 with caveats with some pointers is better than nothing.
I'm sorry for the potential confusion.  In particular, the problem
about 64-bit pointers is the same in 2.0 and 2.1, despite the warning
only being shown for 2.1 on the web site.
2017-07-10 14:22:35 +02:00
Franz Pletz 456c76169d
php71: 7.1.5 -> 7.1.7
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.1.6
  * https://secure.php.net/ChangeLog-7.php#7.1.7
2017-07-10 00:22:15 +02:00
Franz Pletz f15f580cca
php70: 7.0.19 -> 7.0.21 for multiple CVEs
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.0.20
  * https://secure.php.net/ChangeLog-7.php#7.0.21
2017-07-10 00:22:14 +02:00
Franz Pletz 586f780828
php56: 5.6.30 -> 5.6.31 for multiple CVEs
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See https://secure.php.net/ChangeLog-5.php#5.6.31.
2017-07-10 00:22:14 +02:00
Daiderd Jordan 5ba05aaab9 Merge pull request #26716 from ankhers/generalize-elixir
Generalize building of Elixir interpreter
2017-07-09 10:50:24 +02:00
Justin Wood 6db77ccef4
Fix quoting in Elixir generic builder 2017-07-08 20:32:16 -04:00
Daiderd Jordan 980346592c
Merge branch 'staging' into master 2017-07-08 22:22:17 +02:00
Vladimír Čunát e08e354e04
luajit: revert to 2.1 on aarch64 for now
https://nix-cache.s3.amazonaws.com/log/irncmyl5d6h21jzg5rm10q8s2sxqirmv-luajit-2.0.5.drv
It's hard to debug for me, without an aarch64 machine.
2017-07-07 18:25:17 +02:00
Vladimír Čunát b8726c346c
luajit: switch to 2.0.5 on aarch64 by default 2017-07-07 10:54:06 +02:00
Vladimír Čunát e36b588f93
luajit: add 2.0 version again
The reason will be apparent from the followup commit.
Also order the phases, quote shell variables, add myself to
maintainers, etc.
2017-07-07 10:54:05 +02:00
Eelco Dolstra 942422a646
Merge branch 'glibc' of https://github.com/rnhmjoj/nixpkgs into staging 2017-07-06 15:14:57 +02:00
Vincent Laporte f9a2866508 maude: set available on all Unix platforms 2017-07-05 17:29:13 +00:00
Volth b935b21ffd fix regressions where "${repo}-${rev}-scr" pattern was hardcoded 2017-07-04 20:22:13 +00:00
Vladimír Čunát d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Vincent Laporte 982af09d2c perl522: fix build on Darwin
The sw_vers patch only applies to version 5.24
2017-07-01 12:26:44 +00:00
Vladimír Čunát ddf864f8aa
Merge branch 'master' into staging
Mass rebuilds from master (>7k on x86_64-linux).
2017-06-30 18:16:58 +02:00
John Ericson 16be434b0b Merge accepted cross compilation PRs into staging 2017-06-28 23:17:21 -04:00
John Ericson e1faeb574a Merge pull request #26884 from obsidiansystems/purge-stdenv-cross
Purge stdenv cross
2017-06-28 21:39:16 -04:00
John Ericson 5d1e51a199 lua 5: Don't use stdenv.cross, and use less make flags
cc-wrapper will define environment variables matching those now
2017-06-28 18:21:06 -04:00
John Ericson c3c5793ab2 guile: Don't use stdenv.cross 2017-06-28 18:21:05 -04:00
Justin Wood 46faaa69b8 Make assertion for OTP version in the generic elixir builder
Changed Elixir 1.5 to include the fact it is an rc release
2017-06-26 23:13:58 -04:00
Justin Wood 909da3998e Include Elixir 1.5 rc 2017-06-26 23:13:58 -04:00
Justin Wood 019afb0c80 Generalize building of Elixir interpreter 2017-06-26 23:13:58 -04:00
Michael Zaccari 107fabf41c jruby: 9.0.5.0 -> 9.1.5.0 2017-06-26 14:45:15 -04:00
David McFarland 087c32715b python2: copy stub library to output on cygwin 2017-06-26 09:26:10 -03:00
Matthew Daiter d79b4766a5 erlangR20: init 2017-06-23 12:51:58 +02:00
Robin Gloster 15f6dcb668
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-06-20 11:24:39 +02:00
Jörg Thalheim 8a4a4efbe6
clooj: fix download src 2017-06-18 11:39:55 +01:00
Daiderd Jordan 4010313ab9 Merge pull request #26381 from gleber/generalize-beam
erlang: refactor to generalize Erlang/OTP derivations
2017-06-11 20:35:07 +02:00
Gleb Peregud c9cb6403d3 erlang: move erlang_basho_R16B02 to Erlang's general builder. 2017-06-11 13:31:25 +02:00
Tuomas Tynkkynen d373b7b61a pixie: Broken on aarch64
https://nix-cache.s3.amazonaws.com/log/m7r1nzz080wvgrbph7ss145aiwgs24dh-pixie-0-r1356-jit.drv
2017-06-11 04:45:44 +03:00
Gleb Peregud 3426c88bff erlang: Generalize Erlang/OTP derivations.
Switch official Erlang versions to use a common builder.
2017-06-08 11:29:47 +02:00
geistesk c57d0be40a racket: 6.8 -> 6.9 2017-06-04 09:20:55 +02:00
Robin Gloster c1359ce04b
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-06-02 15:39:25 +02:00
Pascal Bach 624887a354 php: set extension dir to correct location
The extension dir was no longer correctly set to $out/lib/php/extensions
as PHP expects the EXTENSION_DIR as environment variable not config flag.
2017-06-01 23:17:13 +02:00
Eelco Dolstra 1318120484
Fix indentation 2017-05-30 18:11:37 +02:00
Robert Scott 45ac7700fa mkPythonDerivation: obey a dontWrapPythonPrograms attribute
This should allow a python derivation to disable possibly overzealous
python program wrapping without having to override the whole fixupPhase
2017-05-27 14:25:08 +02:00
Frederik Rietdijk c10af9e744 Python: wrapPythonPrograms: only wrap in $out/bin
Thus far all executables in a derivation were wrapped. This commit
only wraps executables in $out/bin. If other scripts need to be wrapped
as well, then one can use wrapPythonProgramsIn.
2017-05-27 14:25:08 +02:00
Frederik Rietdijk 97f67d1b5a buildPythonPackage: do not keep checkInputs
When tests are disabled, we do not want to pass checkInputs to
stdenv.mkDerivation. This reduces the build requirements and, more
importantly, helps cutting cycles.
2017-05-27 14:25:08 +02:00
Peter Simons 8a11612d50 maude: disable CVC4 support to fix the build 2017-05-26 20:37:36 +02:00
Vladimír Čunát 00672dec8a
Merge older staging
This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.
2017-05-26 15:45:43 +02:00
Franz Pletz 9bb358316f
php71: 7.1.2 -> 7.1.5 2017-05-25 02:44:16 +02:00
Vladimír Čunát b7fed33057
python-3.3: fixup evaluation after #25916 2017-05-24 14:09:14 +02:00
Frederik Rietdijk 1267b155c4 Merge pull request #25916 from FRidh/reproducible
Python: set DETERMINISTIC_BUILD and PYTHONHASHSEED in setupHook
2017-05-22 10:20:04 +02:00
Robin Gloster da9adb8fab
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-05-20 14:55:44 +02:00
Robin Gloster d0ffb23442
php70: 7.0.16 -> 7.0.19
fixes build with openssl 1.1
2017-05-20 13:22:46 +02:00
Frederik Rietdijk acd32a4caf Python: set DETERMINISTIC_BUILD and PYTHONHASHSEED in setupHook
The Python interpreters are patched so they can build .pyc bytecode free
of certain indeterminism.

When building Python packages we currently set

```
compiling python files.
in nix store.
DETERMINISTIC_BUILD=1;
PYTHONHASHSEED = 0;
```

Instead if setting these environment variables in the function that
builds the package, this commit sets the variables instead in the Python
setup hook. That way, whenever Python is included in a derivation, these
variables are set.

See also the issue https://github.com/NixOS/nixpkgs/issues/25707.
2017-05-19 16:28:11 +02:00
mimadrid 4187d31ab7
elixir: 1.4.2 -> 1.4.4 2017-05-15 20:10:45 +02:00
Vladimír Čunát d7501b986a
luajit: 2.1.0-beta2 -> 2.1.0-beta3
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
2017-05-02 14:00:45 +02:00
Vladimír Čunát 9ad1aaae53
lua5_{sec,1_sockets,expat}: convert to aliases
There's nothing better in these expressions than what we have in
lua-packages.nix
2017-05-02 14:00:44 +02:00
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
Vladimír Čunát 5060f22839
Merge branch 'master' into staging 2017-03-03 14:20:15 +01:00
Frederik Rietdijk a1f6b8b5fc Python 3.6 fixup expat and libffi, fixes #23406 2017-03-03 07:46:52 +01:00
Daiderd Jordan 423bab129a Merge pull request #23330 from yurrriq/update/pkgs/development/interpreters/erlang/R19
erlangR19: 19.2 -> 19.2.3
2017-03-02 21:07:59 +01:00
Frederik Rietdijk b588ed95b9 Python 3.4: fixup expat and libffi, fixes #23325 2017-03-02 13:17:40 +01:00
Eric Bailey 6e9133fec1
erlangR19: 19.2 -> 19.2.3
This fixes dialyzer for me.

- http://erlang.org/pipermail/erlang-bugs/2017-January/005213.html
- e27119948f
2017-03-01 05:52:23 -06:00
Vladimír Čunát b43614a6bb
Merge branch 'staging'
(Truly, this time :-)
2017-03-01 11:34:44 +01:00
Michael Raskin 366b227af4 Merge pull request #23273 from lsix/update_octave
octave: 4.2.0 -> 4.2.1
2017-03-01 09:03:49 +00:00
Jörg Thalheim a6e2d5fcbb
lua5_{2,3}: replace sha1 with sha256 2017-02-28 18:02:51 +01:00
Lancelot SIX 3adee0aac9
octave: 4.2.0 -> 4.2.1
See glists.gnu.org/archive/html/info-gnu/2017-02/msg00011.html for
release announcements.
2017-02-28 14:17:44 +01:00
Vladimír Čunát a1919db7cd
Merge branch 'master' into staging 2017-02-27 20:15:27 +01:00
Frederik Rietdijk 079353e208 Python 2.7: increase priority - fixup
From the manual:

> This attribute should be a number, with a higher value denoting a
lower priority. The default priority is 0.

Just passing -5 or -10 wasn't sufficient, so let's make it -100.
2017-02-26 16:27:45 +01:00
Frederik Rietdijk 4bc1d02698 Python 2.7: increase priority
Higher priority than Python 3.x so that `/bin/python` points to
`/bin/python2` in case both 2 and 3 are installed.
2017-02-26 16:07:52 +01:00
Frederik Rietdijk 04b7a2791e Python 3.4: improve determinism 2017-02-26 14:51:26 +01:00
Frederik Rietdijk 57ded03833 Python 3.4: use system expat and ffi 2017-02-26 14:51:26 +01:00
Frederik Rietdijk 1bbf249bef Python 3.4: improve determinism 2017-02-26 14:51:26 +01:00
Frederik Rietdijk d33f6f4032 Python 3.6: use system expat and ffi 2017-02-26 14:51:26 +01:00
Frederik Rietdijk 1531b5edd2 Python 3.6: improve determinism 2017-02-26 14:51:26 +01:00
Frederik Rietdijk 14a88e76cf Python 3.5: use system expat and ffi 2017-02-26 14:50:09 +01:00
Frederik Rietdijk dd3a501a4b Python: mkPythonDerivation: use PYTHONHASHSEED=0 2017-02-26 14:50:09 +01:00
Frederik Rietdijk 8970a9c86e Python 3.5: improve determinism
- Windows installers are indeterministic and we don't need them.
- since Python 3 ensurepip is installed by default. pip is indeteministic and we don't need it.
- rebuild bytecode to ensure its deterministic
2017-02-26 14:50:09 +01:00
Frederik Rietdijk 09f6b03b2e Python 2.7: improve determinism
There is some randomness in the Windows installers. Since we don't need
them, we delete them.
2017-02-26 14:50:09 +01:00
Bart Brouns 4bb14b23ab supercollider: 3.7.2 -> 3.8.0 2017-02-26 14:21:21 +01:00
Vladimír Čunát 2f1945dcd3
python-3.6: fix random numbers with glibc-2.25
I missed this upstream patch. /cc #22874.
2017-02-22 17:34:33 +01:00
Vladimír Čunát cab0b445be
python-3.4: fixup with glibc-2.25 (/cc #22874)
Upstream won't support it, but let me trick the code into behaving
as if glibc was older.  It seems 3.3 branch should be unaffected.
2017-02-21 17:56:32 +01:00
Vladimír Čunát 5a38ab8add
Merge branch 'master' into staging 2017-02-20 21:24:35 +01:00
Vladimír Čunát 2cb76ff1ff
Merge branch 'glibc-2.25' into staging
The largest problem-causers should be fixed now (within).
2017-02-20 21:18:48 +01:00
Nikolay Amiantov 7cbe538e94 pythonPackages.wrapPython: fix for paths with spaces 2017-02-19 01:43:12 +03:00
Franz Pletz 78abfe951b
php71: 7.1.1 -> 7.1.2 2017-02-18 14:50:16 +01:00
Franz Pletz 405e117d31
php70: 7.0.15 -> 7.0.16 2017-02-18 14:49:59 +01:00
Vladimír Čunát 110f136dc2
python*: upstream patches to fix with glibc-2.25
https://bugs.python.org/issue29157
The 3.6 release already contains the fix (from 3.5);
the branches in-between are claimed to be unaffected.
/cc #22874.
2017-02-16 23:13:38 +01:00
Vladimír Čunát 62ca214d4a
guile: fix include path in guile-2.0.pc
I forgot to /cc maintainer @civodul about the output-splitting.
2017-02-14 11:22:29 +01:00
Frederik Rietdijk 12285d162c pypy: inherit pythonVersion 2017-02-14 09:23:59 +01:00
Vladimír Čunát 218713aa3d
guile*: split outputs to fix #22757
The main aim is to decouple propagatedBuildInputs from $out.
2017-02-14 00:14:41 +01:00
Vladimír Čunát 0c524c63c6
guile: refactor expression
No rebuild on non-Solaris.
2017-02-13 23:01:46 +01:00
Frederik Rietdijk c2e2a4d2c5 Python: remove 2.6 2017-02-13 14:42:24 +01:00
Michael Raskin b2fcf9fec5 love_0_10: 0.10.1 -> 0.10.2 2017-02-13 12:49:31 +01:00
Graham Christensen b793d69f12 Merge pull request #22537 from vrthra/jimtcl-0.77
jimtcl: 0.76 -> 0.77
2017-02-12 18:58:14 -05:00
Rahul Gopinath 36d6a3041a jimtcl: 0.76 -> 0.77 2017-02-11 11:33:33 -08:00
Joachim F 5627dd27b9 Merge pull request #22540 from vrthra/rakudo-star-2017.01
rakudo-star: 2016.07 -> 2017.01
2017-02-11 19:48:37 +01:00
Vladimír Čunát 6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Frederik Rietdijk b846a53d2a python34: 3.4.5 -> 3.4.6 2017-02-08 20:48:14 +01:00
Frederik Rietdijk 939f426906 python35: 3.5.2 -> 3.5.3 2017-02-08 20:48:14 +01:00
Rahul Gopinath b09215bed5 rakudo-star: 2016.07 -> 2017.01 2017-02-07 16:58:14 -08:00
Vladimír Čunát a2c867fd39
Merge branch 'staging' 2017-02-04 21:02:46 +01:00
Vladimír Čunát 94a7a80f0b
Revert "spidermonkey_24: remove"
This reverts commit 5dacc53af3.
2017-02-04 11:53:23 +01:00
Pascal Wittmann ef3fc82fc4
mujs: 2016-11-30 -> 2017-01-24 2017-02-03 19:42:14 +01:00
Vladimír Čunát adab4cd58b
Merge branch 'master' into staging 2017-02-03 11:47:38 +01:00
Frederik Rietdijk 50bc1dc0df Merge pull request #22345 from NixOS/python-wip
Python package updates and new fetchers
2017-02-02 11:04:32 +01:00
Vladimír Čunát a2e7770b51
Merge branch 'master' into staging
There have been some larger security rebuilds on master.
2017-02-01 15:56:35 +01:00
Frederik Rietdijk 7b6b7f6b78 Python Flit: run tests by default 2017-02-01 14:54:20 +01:00
Shea Levy 73f07ecb28 nix-exec: 4.1.5 -> 4.1.6
Closes #22316
2017-01-31 12:02:46 -05:00
Nikolay Amiantov db99892817 treewide: quote homepages in my packages 2017-01-31 03:27:10 +03:00
Vladimír Čunát 9cd2dbc569
Merge branch 'master' into staging
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
2017-01-30 18:39:36 +01:00
Rahul Gopinath 19180957f5 ruby_1_9: remove package
Remove ruby 1.9 since it is EOLed upstream
2017-01-30 11:18:44 +00:00
Rahul Gopinath 51dc13b148 ruby: cleanup unneeded files 2017-01-30 11:18:01 +00:00
Tuomas Tynkkynen 424cfe7686 Merge remote-tracking branch 'upstream/master' into staging 2017-01-29 02:16:29 +02:00
Tuomas Tynkkynen 4d059f6f27 spidermonkey_17: Add one more patch for Aarch64 2017-01-29 01:34:02 +02:00
Karn Kallio 9027474b7e racket 6.8
The attached patch advances the version of the racket expression in
nixpkgs to the latest released 6.8 version.

From 815aae487d5ed4b70145ebadc03a5bd040a8a829 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 27 Jan 2017 22:55:18 -0400
Subject: [PATCH] racket: advance to the 6.8 latest released version.
2017-01-27 22:01:57 -05:00
Robin Gloster edef570ad7
clooj: fix download 2017-01-27 20:09:49 +01:00
Tuomas Tynkkynen be0e48e48f Merge remote-tracking branch 'upstream/master' into staging 2017-01-27 02:18:44 +02:00
Tuomas Tynkkynen e2a2f6d595 Merge pull request #22117 from dezgeg/aarch64-for-merge
Aarch64 (ARM64) support
2017-01-26 17:52:28 +02:00
Vladimír Čunát 6973c7739e
Merge branch 'master' into staging
There were some larger rebuilds because of security.
2017-01-26 16:49:41 +01:00
Robin Gloster 5dacc53af3
spidermonkey_24: remove 2017-01-25 20:12:42 +01:00
Robin Gloster d3cd8b1d58
spidermonkey_1_8_5: add patch to fix build with gcc6 2017-01-25 20:12:39 +01:00
Robin Gloster 9beb44fb84
spidermonkey_24: remove 2017-01-25 20:07:57 +01:00
Robin Gloster cb30150bd5
php: fix build in case mysql is not mariadb
fixes #20986
2017-01-25 18:11:38 +01:00
Nathan Zadoks 15b6374918 spidermonkey_17: add AArch64 support patch 2017-01-25 00:01:54 +02:00
Frederik Rietdijk e33bc13349 Merge pull request #22086 from timbertson/pip-stderr
buildPythonPackage: send pip output to stderr
2017-01-24 11:20:53 +01:00
Tim Cuthbertson 7af2d3d6e2 buildPythonPackage: send pip output to stderr 2017-01-24 21:08:42 +11:00
Robin Gloster 563dd7886c
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-01-23 00:21:18 +01:00
Charles Strahan d298a961f1 Merge pull request #21416 from cstrahan/mesos-1.1.0
mesos: 1.0.1 -> 1.1.0
2017-01-21 19:05:18 -05:00
Pascal Wittmann 487f2cfef8
groovy: 2.4.7 -> 2.4.8 2017-01-21 23:40:13 +01:00
Robin Gloster 3bc2154f99
spidermonkey_1_8_5: add patch to fix build with gcc6 2017-01-21 13:49:24 +01:00
Robin Gloster c273823585
Merge remote-tracking branch 'upstream/master' into gcc-6 2017-01-20 16:37:16 +01:00
Michael Raskin e5acde0cf4 php71: 7.1.0 -> 7.1.1
@NixOS/security-notifications (for all three updates)

Relevant to #21967
2017-01-20 11:54:44 +01:00
Michael Raskin ff5ef7d052 php70: 7.0.14 -> 7.0.15 2017-01-20 11:54:34 +01:00
Michael Raskin 35fdfd88d4 php56: 5.6.29 -> 5.6.30 2017-01-20 11:54:03 +01:00
schneefux a7f25fe167 php: add embedded package 2017-01-19 22:47:10 +01:00
Robin Gloster 9cb67274fc
treewide: fix evaluation
cc @Mic92 @nixy @7c6f434c
2017-01-19 16:50:42 +01:00
Michael Raskin 90e7568bfc Merge pull request #21973 from nixy/init/hy
hy: init at 0.11.1
2017-01-19 09:32:09 +00:00
Andrew R. M b8acb928cc hy: init at 0.11.1
This is the hy language, a dialect of lisp designed to be closely
intergrated with python.
2017-01-18 09:32:59 -05:00
Moritz Ulrich 666810cd25
elixir: 1.3.3 -> 1.4.0 2017-01-14 20:30:57 +01:00
Eric Bailey ad3e589c6d
erlangR19: 19.1.6 -> 19.2
Include sw_vers patch as discussed on #21775.
2017-01-11 01:43:56 -06:00
Nikolay Amiantov 41b69a09b6 spidermonkey_{31,38}: fix sed problem with build 2017-01-10 01:30:11 +03:00
Pascal Wittmann 655db9b266
ceptre: 2016-01-01 -> 2016-11-27 2017-01-09 21:36:36 +01:00
Jörg Thalheim 90ea0c000c
octave: 4.0.3 -> 4.2.0 2017-01-08 23:40:40 +01:00
Frederik Rietdijk a3018650a3 Merge pull request #21643 from symphorien/python-tix
Python tix module
2017-01-04 20:51:33 +01:00
Symphorien Gibol a6e3d71361 python: support the tkinter.tix module 2017-01-04 19:39:33 +01:00
Daiderd Jordan 27660cfdc0
Merge branch 'master' into staging 2017-01-04 01:42:26 +01:00
Daiderd Jordan 538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Michael Raskin 6565d7f12e angelscript: 2.31.1 -> 2.31.2 2017-01-02 20:18:51 +01:00
Herwig Hochleitner 09f66a7457 pypy: 5.4.1 -> 5.6.0 2017-01-02 13:41:28 +01:00
Frederik Rietdijk d68aba4cfb Python: script names now include full path
Certain programs, like zim, calibre and now also apparently mercurial,
rely on sys.argv[0] providing not just the script name but the full
path.

The Python docs [1] state the following on the matter:

> argv[0] is the script name (it is operating system dependent whether
this is a full pathname or not).

Therefore, scripts should not expect to receive a full path.
Unfortunately some do. While this can be considered a bug, there doesn't
seem any reason not to provide the full path. Therefore we now provide
the full path.

[1]
https://docs.python.org/3.5/library/sys.html?highlight=sys.argv#sys.argv
2017-01-02 11:29:11 +01:00
Charles Strahan 7ebcada020
mesos: 1.0.1 -> 1.1.0 2016-12-29 20:09:46 -05:00
Michael Raskin d7bda1ed40 clisp-tip: init at 2.50pre20161201. There hasn't been a release for quite some time, but there has been some development. It is rumored that the fresh version can be built on darwin, but I don't know and cannot test 2016-12-29 17:37:10 +01:00
Peter Simons 774435d0aa maude: update to 2.7.1 2016-12-29 12:18:44 +01:00
Michael Fellinger df5f88070e ruby: 2.4.0 (#21419) 2016-12-27 17:55:10 +00:00
Frederik Rietdijk b09000e785 python36: 3.6.0rc1 -> 3.6.0 2016-12-24 16:00:52 +01:00
Frederik Rietdijk 591eda8310 python27: 2.7.12 -> 2.7.13 2016-12-24 16:00:31 +01:00
Peter Simons 9f1880039f maude: update to version 2.7 2016-12-22 13:04:30 +01:00
Eelco Dolstra 3373a55cac
Merge remote-tracking branch 'origin/master' into gcc-6 2016-12-21 15:51:18 +01:00
Matthew Daiter 4bef3ee358 gnuapl: add Darwin support 2016-12-18 13:07:52 +01:00
Jascha Geerds f92544fe12 falcon: Fix typo in derivation name (closes #21112) 2016-12-15 22:47:45 +01:00
Matthew Daiter 46fc2db7df erlang_basho_R16: add explicit Carbon and Cocoa support 2016-12-15 17:16:00 +01:00
Franz Pletz 60dfc245c7
php70: 7.0.13 -> 7.0.14 2016-12-13 21:56:47 +01:00
Franz Pletz 2ec19900ab
php56: 5.6.28 -> 5.6.29 2016-12-13 21:56:10 +01:00
Franz Pletz 762d902b1d
php71: init at 7.1.0 2016-12-13 21:55:05 +01:00
Frederik Rietdijk 2bcd41b9ff buildPythonPackage: install builds reproducibly
Without --build a temporary directory is created to unpack the wheel in.
We now set a directory instead.
2016-12-13 14:45:05 +01:00
Frederik Rietdijk 7c8b1e7b24 python36: 3.6.0b2 -> 3.6.0rc1 2016-12-12 09:31:25 +01:00
Svend Sorensen e942ed29b3 rubygems: 2.6.6 -> 2.6.8 (#21028) 2016-12-10 17:30:39 +00:00
Eric Bailey 6a86b603f9 lfe: 1.1.1 -> 1.2.1
- Use buildRebar3 instead of mkDerivation, obviating the need for setup-hook.sh
- Manually build proper and patch rebar.config s.t. it doesn't try to fetch it
- Set checkTarget = "travis" and actually run the tests
2016-12-08 00:36:38 +02:00
Frederik Rietdijk 736169d01d buildPythonPackage: yet another fix, fixes #20943
I didn't copy the old behaviour correctly with
c1d98d959b
2016-12-06 16:48:55 +01:00
Frederik Rietdijk c1d98d959b buildPythonPackage: add configurePhase, fixes #20926
I had removed the configurePhase in
https://github.com/NixOS/nixpkgs/pull/20894 because it was empty. This
seemed to break packages that use cmake.
2016-12-05 17:33:17 +01:00
Frederik Rietdijk 42bad32e13 buildPythonPackage: refactor 2016-12-05 10:29:22 +01:00
Frederik Rietdijk 5ba37dfc7a Merge pull request #20893 from FRidh/fixed3
Python: use fixed-point combinator, add pkgs to interpreter
2016-12-05 09:47:43 +01:00
Frederik Rietdijk 31e32b6d9e Python interpreters: add pkgs attribute
A package set is constructed for a specific interpreter. Therefore, we add the
possibility to override the package set to the interpreter. This should make it
easier to override the interpreter and the package set at the same time.
2016-12-05 09:43:44 +01:00
Vladimír Čunát ad0d7f6a05
Merge branch 'staging' 2016-12-04 19:22:36 +01:00
Tomas Hlavaty 13f82b0445 picolisp: 15.11 -> 16.6 2016-12-04 14:26:30 +01:00
Vladimír Čunát 61aa9cb9b2
guile: doCheck = false, as it causes problems sometimes
... and I don't feel like digging into the exact cause.
It's made worse by the fact that guile is quite a mass rebuild.
2016-12-04 10:12:13 +01:00
Vladimír Čunát 84d737cfe9
clisp: remove Darwin from meta.platforms for now
It's problematic.  See #20062.
2016-12-04 10:01:08 +01:00
Matthew Daiter d331e538c2 erlang_basho_R16: B03-1 -> B02-8 2016-12-02 16:12:14 +01:00
Graham Christensen eeb15153b9 Merge pull request #20830 from grahamc/guile
guile: apply patch fixing 00-repl-server.test stability (WIP)
2016-11-30 22:45:33 -05:00
Graham Christensen f1fd88f7f4
guile: apply patch fixing 00-repl-server.test stability 2016-11-30 22:17:04 -05:00
Graham Christensen 0707962235
mujs: 2016-09-21 -> 2016-11-30 for multiple CVEs
- CVE-2016-7504
 - CVE-2016-7505
 - CVE-2016-7506
 - CVE-2016-9017
 - CVE-2016-9108
 - CVE-2016-9109
 - CVE-2016-9294

See more information: https://lwn.net/Vulnerabilities/707361/
2016-11-30 08:29:44 -05:00
Tuomas Tynkkynen 8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Michael Fellinger bff2b98290
ruby: 3.2.1 -> 2.3.3 2016-11-27 22:11:49 -05:00
Vladimír Čunát 7a88f314cb
guile: doCheck = false on i686-linux
It fails on Hydra now; I can't reproduce it locally and don't feel like
debugging it. It might be due to the warning below. That appears on
x86_64-linux as well, but we've got no problems in there so far...

warning: call to primitive-fork while multiple threads are running;
         further behavior unspecified.  See "Processes" in the
         manual, for more information.
2016-11-26 11:35:23 +01:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk 27180b67ce pixie: use python2 2016-11-24 22:28:03 +01:00
Vladimír Čunát 2d7cb1f6c3
luajit: 2.1.0-beta1 -> 2.1.0-beta2
I'm not very certain about beta as the default,
but let me not change that ATM.
2016-11-24 13:35:13 +01:00
Nikolay Amiantov 69e649503f Merge pull request #20586 from abbradar/spidermonkey
SpiderMonkey cleanup
2016-11-22 11:46:14 +03:00
Daiderd Jordan dcb37919f7 Merge pull request #20610 from mdaiter/erlang18EnableDirtySchedulers
erlang: added dirty scheduler support
2016-11-21 20:36:16 +01:00
Daiderd Jordan a76076e7d6 Merge pull request #20611 from mdaiter/erlang17EnableDirtySchedulers
erlang17: enable dirty schedulers
2016-11-21 20:34:42 +01:00
Matthew Daiter 89ca3425b0 erlang19: enable dirty schedulers 2016-11-21 18:23:15 +01:00
Matthew Daiter fd0f247658 erlang17: enable dirty schedulers 2016-11-21 18:18:45 +01:00
Matthew Daiter bbb3299409 erlang: added dirty scheduler support
erlang: formatting
2016-11-21 18:16:38 +01:00
Nikolay Amiantov bc5b9a3fa4 spidermonkey_38: init at 38.2.1.rc0 2016-11-21 02:46:35 +03:00
Nikolay Amiantov c2274cdfb5 spidermonkey: cleanup and rename versions 2016-11-21 02:46:35 +03:00
Matthew Daiter b1be1eee51 erlang_basho_R16B03: Limit platforms to x86_64 2016-11-20 16:06:00 +01:00
Pascal Wittmann c49cd8ee96
groovy: 2.4.6 -> 2.4.7 2016-11-19 21:11:56 +01:00
Tim Steinbach 29356a3ac1 Merge pull request #20457 from DerTim1/erlang
erlang: 18.3.4 -> 18.3.4.4, erlang: 19.1 -> 19.1.6
2016-11-17 22:18:30 -05:00
Franz Pletz 7c65e225dd
php70: 7.0.12 -> 7.0.13 2016-11-17 21:17:56 +01:00
Franz Pletz e53b902559
php56: 5.6.27 -> 5.6.28 2016-11-17 21:17:56 +01:00
Matthew Daiter 8f765490e4 erlang_basho: Init at R16B03
erlang_basho_R16B03: added package file

erlang_basho_R16B03: added to top-level/all-packages.nix file

erlang_basho_R16B03_odbc: added to top-level/all-packages.nix file

erlang_basho_R16B03: Added the Carbon and Cocoa fields

erlang_basho_R16B03: Removed faulty maintainer

erlang_basho_R16B03: Added license as APL20

erlang_basho_R16B03: Made long and short description more informative

erlang_basho: added myself as a maintainer

erlang_basho: made configureFlags into an array

erlang_basho: added gcc as a dependency

erlang_basho: added escript replacement

erlang_basho: removed debugging cat statement

erlang_basho: changed subsitituteInPlace command to sed command

erlang_basho: added package

erlang_basho: Init at <R16B03
2016-11-17 12:25:04 +01:00
Tim Digel 2bcaa93aa7 erlang: 19.1 -> 19.1.6 2016-11-16 09:25:04 +01:00
Tim Digel 4c70064cc5 erlang: 18.3.4 -> 18.3.4.4 2016-11-15 15:13:22 +01:00
Eelco Dolstra 820186434a guile: Fix random test failure
Also, let's try parallel building again. Seems to work on several
tries.

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24769#12

http://hydra.nixos.org/build/43385084
2016-11-09 14:47:27 +01:00
Frederik Rietdijk 68d15b81c6 Merge pull request #20227 from michalrus/octave
octave: 4.0.1 → 4.0.3 (+ portaudio dep)
2016-11-07 13:42:41 +01:00
Peter Simons 6b964d953a erlang-R14: remove invalid meta.maintainer 2016-11-07 12:05:26 +01:00
Michal Rus 91d6779b96
octave: 4.0.1 → 4.0.3 (+ portaudio dep) 2016-11-07 00:26:56 +01:00
Daiderd Jordan 3187b01720 Merge pull request #19816 from veprbl/octave_fixes
octave: darwin fix
2016-11-05 10:49:33 +01:00
Karn Kallio 967d3c1192 racket release 6.7
The attached patch advances racket to the latest released version 6.7

From 30a1d275376ed2f156314c5f99c4a4a9ba69d2b4 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Fri, 4 Nov 2016 01:13:58 -0400
Subject: [PATCH] racket : advance to the latest release 6.7
2016-11-04 09:03:30 -04:00
Tim Steinbach 79424a0c7f Merge pull request #19984 from sternenseemann/license-clash
groovy: no easily conflicting files in top-level (#19872)
2016-11-01 09:09:35 -04:00
Dan Peebles d0bb7f0c53 ruby: remove unnecessary runtime dependency on groff 2016-10-31 22:16:26 +00:00
sternenseemann ce90d09404 groovy: no easily conflicting files in top-level (#19872) 2016-10-31 10:52:34 +01:00
Dmitry Kalinkin 46dd9dfc52 numpy: enable numpy.distutils patch only if it's also in distutils
Fixes: 095095c ('python: add C++ compiler support for distutils')
2016-10-26 21:29:55 +00:00
Vladimír Čunát 1cd7466650
Merge #19800: fix clisp + xindy -> texlive on Darwin 2016-10-26 21:01:12 +02:00
Frederik Rietdijk 7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Frederik Rietdijk 85a87f5155 mkPythonDerivation: append postFixup, fixes #9204 2016-10-26 10:46:12 +02:00
Frederik Rietdijk fea23020fe Merge pull request #19585 from veprbl/distutils_fix
python: add C++ compiler support for distutils
2016-10-25 14:16:28 +02:00
Mike Sperber 6f7504d450 clisp: Unbreak on Darwin
Clisp depended on libffcall, which does not compile on Darwin.  The
dependency is optional though, so omit it on Darwin.  Also, make
conditional transitive dependencies on libffcall.
2016-10-25 10:45:46 +02:00
Dmitry Kalinkin 5994c12470
octave: mesa and libX11 are not used on darwin 2016-10-24 17:27:10 -04:00
Frederik Rietdijk 3b9d7260a3 python27: add missing parameter
that was accidentally removed during merging.
2016-10-22 22:33:15 +02:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát d26a6a87df Merge #19450: python: fix 'nproc not found' on darwin 2016-10-22 16:49:44 +02:00
Graham Christensen 9835b9a943 Merge pull request #19614 from lsix/update_guile_2_0_13
guile: 2.0.12 -> 2.0.13 (for CVE)
2016-10-19 21:13:16 -04:00
Dmitry Kalinkin 95237f828b
python: fix 'nproc not found' on darwin
Fixes: 58b862b75 ('darwin purity: pythonPackages.pandas')
Cc: @pikajude
2016-10-19 19:29:17 -04:00
Periklis Tsirakidis 61ce404598 php: fix pr review comments 2016-10-19 09:35:06 +02:00
Periklis Tsirakidis b336be90cc php: fix darwin build 2016-10-19 09:32:06 +02:00
Frederik Rietdijk 2081a69092 pypy: fix build 2016-10-18 23:16:10 +02:00
Frederik Rietdijk 2365726ecb spidermonkey_24: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk 7c8b3550b6 spidermonkey_185: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk caac67aabe spidermonkey_31: use python2 2016-10-18 23:16:06 +02:00
Frederik Rietdijk 635b4fbce8 Python3: also create symlink pkgconfig/python.pc 2016-10-18 23:16:03 +02:00
Frederik Rietdijk ff069a2aa1 pyrex: use python2 2016-10-18 23:14:35 +02:00
Aneesh Agrawal 708822250e Python 3.x: Add python symlink
Add a symlink for "python" in the python3 derivation to provide a
default Python executable.
2016-10-18 23:14:31 +02:00
Franz Pletz 5456d8f007
php70: 7.0.11 -> 7.0.12
Fixes some security vulnerabilities:

    https://secure.php.net/ChangeLog-7.php#7.0.12
2016-10-18 14:18:04 +02:00
Franz Pletz 0f42ee7c88
php56: 5.6.26 -> 5.6.27
Fixes some security vulnerabilities:

    https://secure.php.net/ChangeLog-5.php#5.6.27
2016-10-18 14:17:01 +02:00
Dmitry Kalinkin 095095c479
python: add C++ compiler support for distutils
This should help with builds against clang
2016-10-17 11:23:13 -04:00
Lancelot SIX c959cc3d9c guile: 2.0.12 -> 2.0.13
This is a maintenance release on the stable series, containing
security fixes.

It addresses CVE-2016-8606

See http://lists.gnu.org/archive/html/info-gnu/2016-10/msg00009.html
for upstream announcement
2016-10-17 09:44:48 +02:00
Frederik Rietdijk 107c035bf0 Python: remove pythonSmall
In #19309 a separate output for tkinter was added.

Several dependencies of Python depend indirectly on Python. We have the
following two paths:
```
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ -
‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ -
‘python-2.7.12’

‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ -
‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’
```
Because only `tkinter` needs this, I added
```
pythonSmall = python.override {x11Support = false;};
```
to break the infinite recursion. We also still have the output
`tkinter`.

However, we might as well build without x11Support by default. Then we build with x11Support as well so we get the tkinter module and put that in a separate package.
2016-10-16 14:31:26 +02:00
Frederik Rietdijk 80433e7030 Python: further unify expressions interpreters 2016-10-14 15:52:14 +02:00
Vladimír Čunát 061758490f Merge branch 'master' into staging
... to get the openssl mass rebuild: 942dbf89c.
2016-10-14 13:16:11 +02:00
Graham Christensen 85c9f014ed
mujs: 2016-02-22 -> 2016-09-21 2016-10-13 07:42:30 -04:00
Frederik Rietdijk cffdffe1f6 Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
Louis Taylor 39e8623906
Python 3.6: 3.6b1 -> 3.6b2 2016-10-11 22:29:22 +01:00
Frederik Rietdijk 104c50dd1a Python: remove modules and pythonFull 2016-10-10 10:33:24 +02:00
Frederik Rietdijk a2720a25b9 Python 3.6: separate output for tkinter 2016-10-10 10:33:24 +02:00
Frederik Rietdijk 0a08fcd858 Python 3.5: separate output for tkinter 2016-10-10 10:33:24 +02:00
Frederik Rietdijk 0bd4b31f87 Python 3.4: separate output for tkinter 2016-10-10 10:33:24 +02:00
Frederik Rietdijk cf0932ee84 Python 3.3: separate output for tkinter 2016-10-10 10:33:24 +02:00
Frederik Rietdijk bee439207b Python 2.7: separate output for tkinter 2016-10-10 10:33:24 +02:00
Jörg Thalheim 8a690b2a9f Merge pull request #17922 from bjornfor/php-config-file-scan-dir
php: change config-file-scan-dir from /etc to /etc/php.d
2016-10-09 21:45:48 +02:00
Vincent Laporte 4168706d4f OCaml modules: make explicit some dependencies to ocamlbuild 2016-10-09 11:55:19 +02:00
Vladimír Čunát 30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Peter Hoeg 5a6626f47c php fpm: add systemd support
PHP FPM will now notify systemd when it's done initializing and ready to
serve requests.

Additionally ```systemctl status phpfpm``` will now show statistics such
as:

```
Status: "Processes active: 0, idle: 8, Requests: 0, slow: 0, Traffic: 0req/sec"
```
2016-10-05 23:30:31 +08:00
Jörg Thalheim 888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash
help2man: fix hash
2016-10-03 19:26:44 +02:00
zimbatm b8bcbec5fd ruby: fixes rubygems user installs
* Manage patches in git
* Fixes the hook invocation to be more safe. Thanks @Mic92
* Install gems as user by default
* Install gem binaries with the /usr/bin/env shebang
* Fixes a bug where the passthru.libPath and passthru.gemPath would
  point to the wrong directory
* Overhaul ruby version heuristics
2016-10-02 22:07:22 +01:00
Tuomas Tynkkynen 19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00
Tuomas Tynkkynen eda2dd3d2f treewide: Fix more 'lib.optional' misuses 2016-10-02 00:44:10 +03:00
Vladimír Čunát 77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Frederik Rietdijk d5fd65df4e Merge pull request #18982 from aneeshusa/pin-packages-to-python2-part2
Pin packages to python2 part2
2016-09-26 18:33:26 +02:00
Aneesh Agrawal 9ad3c23b39 spidermonkey_17: Pin to Python 2 2016-09-26 11:42:47 -04:00
Michael Raskin 05f56082da lush2: fix update metadata 2016-09-26 15:49:30 +02:00
c74d 87b8465830 chibi-scheme: 0.7 -> 0.7.3
Update the `chibi-scheme` (attribute `chibi`) package from version 0.7
to version 0.7.3.

The homepage listed for this package before this change,
<https://code.google.com/p/chibi-scheme/>, now redirects to
<https://github.com/ashinn/chibi-scheme>; this patch changes this
package to use this GitHub version of the software.

I have tested this change per nixpkgs manual section 10.1 ("Making
patches").
2016-09-26 04:36:33 +00:00
Vladimír Čunát fffc7638cd Merge branch 'master' into staging 2016-09-24 18:54:31 +02:00
Daiderd Jordan 306bfa889a Merge pull request #18869 from couchemar/erlang-r19.1
erlang: 19.0.2 -> 19.1
2016-09-24 00:48:38 +02:00
Andrey Pavlov 0a1ae92bb9 erlang: 19.0.2 -> 19.1 2016-09-23 10:20:50 +03:00
Graham Christensen f01e56e576
php5: 5.6.25 -> 5.6.26 for CVEs (http://www.php.net/ChangeLog-5.php\#5.6.26) 2016-09-22 21:36:30 -04:00
Eelco Dolstra 7a4209c356 Merge remote-tracking branch 'origin/master' into staging 2016-09-20 17:46:09 +02:00
Frederik Rietdijk 8c30f3d962 python3.6: 3.6.0a3 -> 3.6.0b1
/Lib/plat* has been removed in this release.
http://bugs.python.org/issue28027
2016-09-20 15:48:32 +02:00
Frederik Rietdijk 63ec0068a7 Python on Nix is not manylinux1 compatible
Fixes https://github.com/NixOS/nixpkgs/issues/18484
2016-09-20 15:48:32 +02:00
Frederik Rietdijk 2b66563cde Python: make versions/prefixes more similar 2016-09-20 15:48:32 +02:00
Lancelot SIX 6fe5b7a2e7 Merge pull request #18696 from FRidh/buildenv
python.buildenv: don't filter non-python packages
2016-09-19 12:22:53 +02:00
Aaron Bull Schaefer e067546765 elixir: 1.3.2 -> 1.3.3 2016-09-18 11:07:10 -07:00
Frederik Rietdijk 1dbb72b91a python.buildenv: don't filter non-python packages
python.buildenv is used to build an env that provides binaries that can
import all modules that were passed in to the env.

Before this change it filtered the propagatedBuildInputs to remove all
non-Python packages, thereby possibly reducing the amount of packages
that were referenced. However, Python packages often don't have non-
Python packages as propagatedBuildInputs. And occasionally, we do want
to be able to add other packages to the env.
2016-09-17 14:28:12 +02:00
Vladimír Čunát 52e1a198cf Merge branch 'master' into staging 2016-09-17 00:31:34 +02:00
Franz Pletz a32281639e
php70: 7.0.10 -> 7.0.11 (security)
See https://secure.php.net/ChangeLog-7.php#7.0.11.
2016-09-15 13:57:32 +02:00
Herwig Hochleitner 1172c6be9b pypy: 5.4.0 -> 5.4.1 2016-09-14 18:11:17 +02:00
Nikolay Amiantov 4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Franz Pletz fb9117efa6 Merge pull request #18488 from chris-martin/md5-2
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Kirill Boltaev bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Dan Peebles 7b9d3f8605 stdenv-darwin: upgrade a few more things
It's a long build and generally painful to split into smaller commits,
so I apologize for lumping many changes into one commit but this is far
easier.

There are still several outdated parts of the darwin stdenv but these
changes should bring us closer to the goal.

Fixes #18461
2016-09-12 01:46:44 -04:00
Chris Martin c9d609d0e2 lua-4: md5->sha256 2016-09-10 13:57:03 -04:00
Frederik Rietdijk f6ccecefd9 Merge pull request #18025 from knedlsepp/fix-python3.5-jupyter-1.0.0
python3.5-jupyter: Fix build issue #17902
2016-09-10 11:28:48 +02:00
Domen Kožar d7f1af2fba renpy: fix build after multiple outputs
(cherry picked from commit d56bf31655)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:45:30 +02:00
Moritz Ulrich e57b658049 elixir: 1.3.1 -> 1.3.2 2016-09-08 11:10:27 +02:00
Bjørn Forsman 41c8aa8d63 php: change config-file-scan-dir from /etc to /etc/php.d
By chance I noticed that php picked up my /etc/odbc.ini file (clearly
wrong!). This fixes it by adding a namespace for php.

WARNING: This is a breaking change for anyone that happen to rely on php
picking up .ini files from /etc.
2016-09-08 09:40:07 +02:00
Domen Kožar 4c22a048d7 Revert "Revert "xulrunner: Remove""
This reverts commit 5041cae5b7.

This is fixed in follow up commit.
2016-09-07 16:51:38 +02:00
Eelco Dolstra 5041cae5b7 Revert "xulrunner: Remove"
This reverts commit 8c3e9ea53e.
2016-09-07 15:17:39 +02:00
Eelco Dolstra 8c3e9ea53e xulrunner: Remove 2016-09-07 14:43:29 +02:00