mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Code Issues Wiki Activity
112008 commits 203 branches 125 tags 5.6 GiB
Commit graph

2583 commits

Author SHA1 Message Date
Frederik Rietdijk 29825ebf93 Merge pull request #27850 from mimadrid/update/groovy-2.4.12 
groovy: 2.4.10 -> 2.4.12
 2017-08-01 21:50:49 +02:00
mimadrid 5f831b381c
groovy: 2.4.10 -> 2.4.12 2017-08-01 20:56:09 +02:00
Frederik Rietdijk feeed410ff Merge pull request #27751 from FRidh/pythonldconfig 
python36 and python35: Don't use ldconfig and speed up uuid load
 2017-07-30 10:54:36 +02:00
Frederik Rietdijk 6128dd4d50 Python wrapper: undo change 8d76effc17 
because we would otherwise end up with broken wrappers because PATH and
PTYHONPATH weren't set.
 2017-07-30 08:42:33 +02:00
Frederik Rietdijk d64e798c82 python35: Don't use ldconfig and speed up uuid load 
A Python 3.5 version of de1b4e71c1.
 2017-07-29 20:41:02 +02:00
Frederik Rietdijk 0a7e705f62 python36: Don't use ldconfig and speed up uuid load 
A Python 3.6 version of de1b4e71c1.
 2017-07-29 20:40:35 +02:00
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
Frederik Rietdijk 29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +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
Jörg Thalheim 8a4a4efbe6
clooj: fix download src 2017-06-18 11:39:55 +01:00