JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,197 Commits 2 Branches 0 Tags 13 GiB
755be0e1ce
Commit Graph

2119 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
288912c2c4 treewide: Make explicit that 'dev' output of freetype is used 2016-05-19 10:00:34 +02:00
Tuomas Tynkkynen
e28e010b36 treewide: Make explicit that 'dev' output of curl is used 2016-05-19 10:00:29 +02:00
Tuomas Tynkkynen
c22f86a853 treewide: Make explicit that 'dev' output of bzip2 is used 2016-05-19 10:00:28 +02:00
Alexander Ried
3e39cfe860 dust: add meta field 2016-05-18 17:31:12 +02:00
Alexander Ried
b5ae9ad3fb dust: use fetchFromGitHub (sha was broken) 2016-05-18 17:31:07 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Frederik Rietdijk
022f5fdf83 Merge pull request #15477 from FRidh/pythonbuildinputs 
Python: be explicit about buildInputs
 2016-05-16 12:11:39 +02:00
Frederik Rietdijk
91834cfe3e Python 3.5: be explicit about buildInputs 2016-05-16 12:10:33 +02:00
Frederik Rietdijk
56e96b8b10 Python 3.4: be explicit about buildInputs 2016-05-16 12:10:32 +02:00
Frederik Rietdijk
58ec2d47ea Python 3.3: be explicit about buildInputs 2016-05-16 12:10:32 +02:00
Frederik Rietdijk
885a1318b0 octave: add libsndfile to buildInputs, fixes #15494 2016-05-16 12:09:48 +02:00
Vladimír Čunát
e5d40c6fa3 Merge branch 'staging' 
Hydra is only half-finished, but we'd better get secure glibc fast.
 2016-05-16 10:15:28 +02:00
Rok Garbas
913e869f8d remove python32 due to pip 8.1.2 not supporting python 3.2 anymore 2016-05-15 15:09:23 +02:00
Frederik Rietdijk
6c51676476 Merge pull request #15366 from bendlas/update-pypy 
pypy: 4.0.1 -> 5.1.1
 2016-05-15 13:12:11 +02:00
Vladimír Čunát
b1ac3404e0 Merge branch 'master' into staging 2016-05-14 21:37:55 +02:00
Franz Pletz
4d750ae2c7 php: 7.0.5 -> 7.0.6 2016-05-13 17:27:59 +02:00
Franz Pletz
468d35fc8e perl: 5.22.1 -> 5.22.2 2016-05-13 17:04:50 +02:00
Vladimír Čunát
3e387c3e00 Merge branch 'staging' 
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
 2016-05-13 10:14:53 +02:00
Pascal Wittmann
be482b2314 groovy: 2.4.5 -> 2.4.6 2016-05-12 20:57:46 +02:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Herwig Hochleitner
668f9159ab pypy: deactivate test_zipfile64 again 2016-05-11 18:33:36 +02:00
Herwig Hochleitner
2a4af7ef72 pixie: 1333 -> 1352 2016-05-10 19:56:55 +02:00
Herwig Hochleitner
e87cbf9fa3 pypy: revise test expression 2016-05-10 19:51:06 +02:00
Herwig Hochleitner
14e73a6e6f pypy: 4.0.1 -> 5.1.1 2016-05-10 19:49:53 +02:00
Eelco Dolstra
cb37ab146b Add mirror://mozilla scheme 2016-05-09 19:37:22 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Nikolay Amiantov
2d57767974 openspades-git: drop yet another hack, fix accidential python merge 2016-05-07 12:03:24 +03:00
Nikolay Amiantov
c7193c1506 openspades: less hacks 2016-05-07 11:59:53 +03:00
zimbatm
e8803166ef elixir: 1.2.4 -> 1.2.5 2016-05-06 11:23:10 +02:00
Karn Kallio
deb1c67411
racket: 6.4 -> 6.5 2016-05-05 20:25:25 +02:00
Joachim Fasting
23fd70b719 Merge pull request #15018 from ericsagnes/pkg-fix/php 
php: add default php.ini
 2016-05-05 19:16:04 +02:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
zimbatm
007ea84222 Merge pull request #15181 from bradediger/ruby-2.3.1 
ruby: update 2.3 series to 2.3.1
 2016-05-04 10:31:08 +01:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
Franz Pletz
c0f4361902 php: Fix openssl module build 2016-05-03 16:04:40 +02:00
Brad Ediger
6e353bb17f ruby: update 2.3 series to 2.3.1 2016-05-02 15:49:05 -05:00
Joachim Fasting
594bdfc74d Merge pull request #15125 from Beauhurst/php_updates 
PHP security updates
 2016-05-01 19:02:19 +02:00
Nikolay Amiantov
37563c2d96 spidermonkey: add meta 2016-05-01 12:37:48 +03:00
Robert Scott
11a716491b php: 5.5.34 -> 5.4.35 2016-04-30 22:32:34 +00:00
Robert Scott
e9c16b7902 php: 5.6.20 -> 5.6.21 2016-04-30 20:48:12 +00:00
Eric Sagnes
a8bc5b67f8 php: add default php.ini 2016-04-29 15:26:20 +09:00
Tuomas Tynkkynen
b465dc202f boost: Kill unnecessary 'lib' output 
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
 2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Vladimír Čunát
387915e99c python3*: port the fix from parent commit 
I really love such copied expressions...
but this case was easy compared to usual consequences
of file-copying in long-running branches.
 2016-04-26 10:52:18 +02:00
Vladimír Čunát
626e5bd4dd python3: fix build after 5ff40dded, refactor 
The path list was passed in a format not suitable for gcc command-line.
Also, let's utilize that we had `with stdenv.lib;`.
/cc @abbradar.
 2016-04-26 10:43:48 +02:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Eric Merritt
2d6d9682bb elixir: set ERL_LIBS for elixir apps 
Previously Elixir didn't correct set the ERL_LIBS environment
variable for the OTP Applications that it supplies. This
change fixes that
 2016-04-23 19:03:29 -07:00
Eric Merritt
e214f29168 elixir: modify elixir to allow debug information 
This modifies the elixir derivation to allow 'debugInfo' to be set. This
will build the elixir library with debug information and allow dializer
to be used it derivative projects
 2016-04-23 19:03:29 -07:00
Lluís Batlle i Rossell
e741a302d4 Make rigsofrods build the latest code. 
I add angelscript 2.22 too, as it makes RoR happy.
 2016-04-18 12:30:47 +02:00
Michael Raskin
7c0f4882f3 angelscript: 2.30.2 -> 2.31.0 2016-04-13 14:47:04 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Robert Scott
d61b739f07 php: 5.6.19 -> 5.6.20 2016-04-10 18:41:57 +00:00
Robert Scott
1773c53fcf php55: 5.5.33 -> 5.5.34 2016-04-10 14:45:35 +00:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size 
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
 2016-04-07 14:40:51 +02:00
Tomas Hlavaty
106d0f6b51 clisp: control build options and fix non x86* architectures 2016-04-04 22:22:30 +02:00
joachifm
b83efcc906 Merge pull request #14419 from micxjo/update-rakudo 
rakudo-star: 2015.11 -> 2016.01
 2016-04-03 19:05:03 +00:00
Micxjo Funkcio
8949de8cfd
rakudo-star: 2015.11 -> 2016.01 
Support for the JVM backend has been temporarily switched off as
it's not fully functional yet and upstream recommends against
using it.
 2016-04-03 11:46:45 -07:00
zimbatm
3dfe4297ae racket: 6.3 -> 6.4 2016-04-03 14:10:35 +01:00
Eric Bailey
e549aad2f2 elixir: 1.2.3 -> 1.2.4 2016-04-02 15:46:58 -05:00
Eric Bailey
456ce67462 Patch erlang-R17 
Fix R17 build on OS X, modeling changes after R18,
i.e. inherit Carbon, Cocoa.
 2016-04-01 19:06:20 -05:00
Arseniy Seroka
b3792fa38b Merge pull request #14355 from kragniz/jython-2.7.0 
jython: 2.7-rc3 -> 2.7.0
 2016-04-01 15:15:48 +03:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Louis Taylor
4cd54c5ce9 jython: 2.7-rc3 -> 2.7.0 2016-04-01 01:51:00 +01:00
Franz Pletz
fc1e886f1b php: 7.0.2 -> 7.0.5 (security) 
https://secure.php.net/ChangeLog-7.php#7.0.5
 2016-03-31 16:07:43 +02:00
Domen Kožar
a1cfdb9c88 remove erlangR14: outdated and doesn't build 2016-03-30 18:54:58 +01:00
joachifm
532beaa2a3 Merge pull request #13913 from grwlf/torch 
torch: add expression for Torch7 the machine-learning framework
 2016-03-30 14:29:32 +00:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Joachim Fasting
3fe86ac582 io: fix gcc5 build 
c11 inline semantics breaks the build

See https://github.com/stevedekorte/io/issues/316
and https://hydra.nixos.org/build/33606216/nixlog/1/raw
 2016-03-26 16:54:19 +01:00
Joachim Fasting
04bcb88332 hugs: fix build & meta fixups 
Fix build by applying a patch from Arch Linux.
See https://hydra.nixos.org/build/33247205/log/raw

Meta fixups
- The license is actually 3-clause BSD license.
- Use HTTPS homepage
- Adopt the package
- Convert src.sha256 to base32
 2016-03-25 00:39:49 +01:00
Lluís Batlle i Rossell
1f8ffdde5b octave: update to 4.0.1 
bugfix release, they say.
 2016-03-24 12:04:07 +01:00
Lluís Batlle i Rossell
74ccfd690d octave: parallel building and check. 
I think those were not updated since 3.8.2. They worked for me. Let's see.
 2016-03-24 12:04:07 +01:00
Joachim Fasting
1972c5aa17 clisp: fix i686 build 
Requires -falign-functions=4

See https://hydra.nixos.org/build/33256640/nixlog/1/raw
 2016-03-23 13:54:58 +01:00
Shea Levy
49e53e6701 nix-exec: bump for new nix 2016-03-22 18:20:16 -04:00
Domen Kožar
ba78130c21 remove elrangR15 and riak 1.3.0 as they're outdated 
(cherry picked from commit 4452a68425e4eaf9db95e0fc5ac8474a2b19bc71)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-22 21:40:07 +00:00
Tobias Geerinckx-Rice
c0a35241f0 mcelog: 133 -> 134 
trigger: Avoid warning from earlier merge
 2016-03-22 00:59:15 +01:00
Sergey Mironov
c899444c69 luajit: symlinked as 'lua' 2016-03-22 00:17:31 +03:00
zimbatm
5a64bc44ea move all ruby modules to development/ruby-modules 2016-03-19 22:06:26 +00:00
zimbatm
3547ffa89f ruby: remove unused patches 2016-03-19 22:04:12 +00:00
zimbatm
06e4186f4e Merge pull request #14061 from zimbatm/bundler-env-fix 
bundlerEnv: fix wrapping of programs
 2016-03-19 22:03:12 +00:00
zimbatm
53c9edef34 bundlerEnv: fix wrapping of programs 
Setting the GEM_PATH after ruby is started is not reliable enough. In
some cases rubygems would have already loaded and ignore these settings.

Fixes #14048
 2016-03-19 20:25:34 +00:00
Charles Strahan
2802785675 Merge pull request #13975 from aespinosa/proper-script-gempaths 
buildRubyGem: use Gem.use_paths to load gems
 2016-03-19 16:15:50 -04:00
Robert Scott
9f54f755a9 php: 5.5.32 -> 5.5.33 (security update) 2016-03-19 11:18:12 +00:00
Robert Scott
e4817b7d99 php: 5.6.18 -> 5.6.19 (security update) 2016-03-19 11:15:48 +00:00
Sergey Mironov
da66fd2b11 luajit: bump to 2.1.0-beta1 2016-03-19 12:37:01 +03:00
zimbatm
9c4b45fafe Merge pull request #13601 from zimbatm/ruby-dev 
ruby.dev
 2016-03-18 19:05:45 +00:00
Michael Fellinger
bb59ba117d bundix: 2.0.6 -> 2.0.8 2016-03-17 18:12:38 +01:00
Allan Espinosa
52b61dce47 buildRubyGem: use Gem.use_paths to load gems 
After ruby initializes, rubygems no longer reads the GEM_PATH. Before,
we have the following scenario:

    Gem.path # => ["a"]
    ENV['GEM_PATH'] = ["b"]
    Gem.path # => ["a"] # Still returns the same

Gem.use_paths is the documented way to create isolated environments as
documented in [1].

[1] http://www.rubydoc.info/github/rubygems/rubygems/Gem.use_paths
 2016-03-16 17:28:02 -05:00
Vladimír Čunát
c643ccaa8c Merge #13950: move ncurses utilities to $out 2016-03-16 08:39:37 +01:00
zimbatm
d9cf99225b rubygems: 2.4.8 -> 2.6.2 2016-03-14 23:46:01 +00:00
zimbatm
19820e9a96 ruby: add a new .dev output to ruby derivations 
The idea is to bundle ruby, bundler and bundix together. I was
having issues where bundler was installed with ruby 2.3.0 and I wanted to use
ruby 2.0.0.

With this change all the developer has to do is install `ruby_2_0_0.dev`
either in his environment or in a nix-shell.
 2016-03-14 22:25:48 +00:00
zimbatm
4637cfa51f bundler: 1.10.6 -> 1.11.2 2016-03-14 22:25:19 +00:00
zimbatm
86f1579266 ruby: install rubygems directly into the derivation 
Having a separate rubygems package can lead to split-brain scenarios.

Since rubygems is designed to replace himself on a ruby installation,
let's do that.
 2016-03-14 22:23:25 +00:00
zimbatm
9504992e1d Merge pull request #13897 from nbp/fix-ocaml-pkgs-platform 
Ensure that we can evaluate the platform attribute of ocaml packages.
 2016-03-14 19:25:40 +00:00
Nicolas B. Pierron
72c6f8a140 Ensure that we can evaluate the platform attribute of ocaml packages. 2016-03-13 19:08:26 +00:00
宋文武
93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Michael Fellinger
075b3b449d bundix: 2.0.5 -> 2.0.6 
Fixes issue caused by changed nix-prefetch-git output.
 2016-03-13 13:59:38 +01:00
Joachim Fasting
098c04683a scsh: move build deps to nativeBuildInputs 
Also remove redundant inputs already implied by autoreconfHook.
 2016-03-12 19:06:40 +01:00
Eelco Dolstra
dd53c65dcc Merge remote-tracking branch 'origin/gcc-5' into staging 
Still some breakage but no blockers:

http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
 2016-03-11 16:02:38 +01:00
Thomas Tuegel
cd5e923f55 luajit: fix evaluation on Darwin 2016-03-11 08:57:39 -06:00
Vladimír Čunát
c801cd1a04 php: fixup build when configured with httpd via nixos 2016-03-11 11:54:53 +01:00
Mayeu - Cast
7db78e0412 elixir: 1.2.2 -> 1.2.3 2016-03-09 17:11:10 +01:00
Thomas Tuegel
3ef7671cea ncurses: combine $lib and $out outputs 
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
 2016-03-08 11:35:24 -06:00
Vladimír Čunát
b291f1682f perl merge fixup 2016-03-08 09:59:12 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Henry Till
cf71bc9255 racket: fix build error 
https://github.com/racket/racket/issues/1222

closes #13733
 2016-03-07 10:49:19 -05:00
Eelco Dolstra
669d59711f Merge remote-tracking branch 'origin/perl-5.22' into staging 
Small number of regressions: http://hydra.nixos.org/eval/1239239?compare=1237919#tabs-now-fail
 2016-03-07 11:58:17 +01:00
Joachim Fasting
fe37f28939 pixie: fix description 2016-03-06 14:04:37 +01:00
joachifm
ee8d210828 Merge pull request #13528 from bendlas/init-pixie 
pixie: init at 0-1333
 2016-03-05 19:30:49 +00:00
zimbatm
7c4c151a94 ruby: only keep the latest tiny per major.minor 
Tiny versions are just for bug-fixes and should be upgraded. I think that the
list has grown a bit too much organically and should be trimmed.
 2016-03-04 14:24:37 +00:00
Eelco Dolstra
62c562a522 gcc: Remove 4.3 and 4.4 
GCC 4.3 was used by only one package ("self"), which I've marked as
broken.
 2016-03-02 18:01:17 +01:00
Robin Gloster
5936d6dbbb Revert "rubygems: 2.4.8 -> 2.5.2" 
This reverts commit 7e8faf022f.

This breaks the rake call in gitlab see
https://github.com/NixOS/nixpkgs/pull/13468#issuecomment-191286066
 2016-03-02 15:25:35 +00:00
Pascal Wittmann
d2e15a02d7 mujs: 2015-09-29 -> 2016-02-22 2016-03-01 22:08:26 +01:00
Pascal Wittmann
69237f371c Merge pull request #13586 from zimbatm/bats-fixup 
bats: fixes installation
 2016-03-01 15:19:03 +01:00
Lancelot SIX
75591b49be Merge pull request #13468 from zimbatm/rubygems-2.5.2 
rubygems: 2.4.8 -> 2.5.2
 2016-03-01 09:31:36 +01:00
zimbatm
a3119bd35d bats: fixes installation 
The build was failing with:

  /...-stdenv/setup: ./install.sh: /usr/bin/env: bad interpreter: No such file
  or directory

See https://hydra.nixos.org/build/32353411/log
 2016-03-01 00:19:27 +00:00
Herwig Hochleitner
de5fa8339f dust: init at 0-91 2016-02-29 21:14:52 +01:00
Michael Raskin
c0f20c5912 Merge pull request #13518 from leenaars/love2 
love: fix broken 0.8.2 + added version 0.72
 2016-02-28 09:35:54 +00:00
Herwig Hochleitner
1c380842d1 pixie: init at 0-1333 
This is the pixie language, a clojure-like lisp, utilizing the pypy vm
toolkit for JIT, GC and C bindings.
 2016-02-28 03:15:07 +01:00
Michiel Leenaars
62c3ad1dde love: fix broken 0.8 + added version 0.72 2016-02-27 22:37:36 +01:00
Eelco Dolstra
a85ba820a4 perl: Make 5.22 the default 2016-02-27 22:36:54 +01:00
Eelco Dolstra
be4ebe0046 perl: 5.22.0 -> 5.22.1 2016-02-27 22:22:26 +01:00
Eelco Dolstra
7627bf6f3f perl: Unify 5.20 and 5.22 expressions 2016-02-27 22:22:26 +01:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
zimbatm
7e8faf022f rubygems: 2.4.8 -> 2.5.2 
Closes #11950
 2016-02-26 18:02:24 +00:00
zimbatm
cdbaee7d4b Merge pull request #12866 from nathan7/rubygem-drvname-fix 
buildRubyGem: ensure gem versions don't get misparsed
 2016-02-23 23:13:12 +00:00
zimbatm
49217b724f Merge pull request #12786 from phunehehe/unused-bundler-head 
remove unused file bundler-head.nix
 2016-02-23 22:39:55 +00:00
Charles Strahan
123a9104e4 Merge pull request #13109 from zimbatm/ruby-fixes 
Ruby fixes
 2016-02-20 20:29:25 -05:00
zimbatm
a92c609ec6 gemconfig: add eventmachine and msgpack 2016-02-18 23:44:50 +00:00
zimbatm
24e0fc99f9 buildRubyGem: remove unecessary duplication 2016-02-18 23:44:49 +00:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Arseniy Seroka
7c477195aa Merge pull request #12991 from leenaars/love 
love -> 0.10 added
 2016-02-15 22:12:57 +03:00
Michiel Leenaars
f4a32be729 love: 0.8 -> 0.10.1 2016-02-15 17:10:26 +01:00
zimbatm
9acbb9021b bundix: cleaner substitution 
Use the builtin substituteInPlace instead of sed
 2016-02-14 17:57:18 +00:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Tuomas Tynkkynen
34922a3951 python2: Fix on non-Linux 
The location of this 'regen' script (whatever is does) depends on the
platform. AFAICT it always exists due to this:

$(srcdir)/Lib/$(PLATDIR):
        mkdir $(srcdir)/Lib/$(PLATDIR)
        cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
 2016-02-13 16:03:55 -05:00
Tuomas Tynkkynen
78e62da7f1 python2: Fix on Darwin 
Presumably $out/lib/python*/plat-linux2/ is a Linux-only thing.
 2016-02-13 15:52:23 -05:00
Arseniy Seroka
af8a9e2203 Merge pull request #12944 from zimbatm/jruby-9.0.5.0 
jruby: 1.7.21 -> 9.0.5.0
 2016-02-12 20:56:29 +03:00
Michael Fellinger
b9c13dcbc7 bundix: 2.0.4 -> 2.0.5 
Fixes issue with the -d flag creating duplicated `dependencies` properties.
 2016-02-12 09:56:02 +01:00
zimbatm
447851b9d2 jruby: 1.7.21 -> 9.0.5.0 2016-02-11 23:31:41 +00:00
Eelco Dolstra
fc84ee22df php: Remove version 5.4 which is EOL 2016-02-11 11:27:34 +01:00
Eelco Dolstra
42634fe6cc php: 5.5.31 -> 5.5.32 2016-02-11 11:24:54 +01:00
Eelco Dolstra
b061225c54 php: 5.6.17 -> 5.6.18 2016-02-11 11:24:48 +01:00
Arseniy Seroka
3b1d18ff48 Merge pull request #12919 from zimbatm/new-bundix2 
bundix: 1.0.4 -> 2.0.4
 2016-02-10 16:04:31 +03:00
Michael Fellinger
112476ec96 bundix: 1.0.4 -> 2.0.4 2016-02-10 12:02:10 +00:00
Nathan Zadoks
c998447a13 buildRubyGem: pass the gem version through into the derivation name 2016-02-07 16:53:31 +01:00
Nathan Zadoks
b4da3bb88b buildRubyGem: ensure gem versions don't get misparsed 
Without this, every nix-env --upgrade replaces ruby with an
arbitrary gem, which makes Ruby unusuable from user environments.
 2016-02-07 16:53:27 +01:00
Daiderd Jordan
4b4d5c96c8 bats: init at 4.0.4 2016-02-07 14:53:54 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00