Eric Seidel
e08b9ab8d3
kill libiconvOr*
...
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Emil Rangden
36ceb01176
add php 5.6
2015-02-05 20:28:16 +01:00
Emil Rangden
90e8287ce6
add php 5.5
2015-02-05 20:28:16 +01:00
Emil Rangden
1b057e9f6f
remove patch that was only used in 5.3
2015-02-05 20:28:16 +01:00
Nikolay Amiantov
35f1d4459b
bundix: fix checksum
2015-02-04 19:44:19 +03:00
Domen Kožar
a3e23f6535
fix eval
2015-02-04 14:11:33 +01:00
Domen Kožar
d75a91ef1e
pypy: 2.4 -> 2.5
2015-02-04 13:21:20 +01:00
Eric Seidel
dbf3d31727
make llvm-3.5 the default and remove references to gccApple
...
make perl be less dumb
revert change to release.nix
2015-02-03 14:31:04 -08:00
Pascal Wittmann
f086517f81
mujs: update to latest revision
2015-02-03 10:43:41 +01:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Edward O'Callaghan
ed232ef5f8
php: update from 5.4.35 to 5.4.37
...
Potentially fixes CVE-2014-8142, CVE-2014-9427, CVE-2015-0231, CVE-2015-0232
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-30 01:54:20 +11:00
Charles Strahan
6eaa419920
gitlab: fix evaluation
2015-01-25 16:28:18 -05:00
Charles Strahan
989a894fc8
ruby: patch path in tzdata gem
2015-01-25 16:22:30 -05:00
Charles Strahan
c1814073ac
bundlerEnv: use full path to ruby in wrappers
2015-01-24 17:35:11 -05:00
Domen Kožar
8270a5f0eb
Merge pull request #5876 from berdario/pew
...
Update pew to 0.1.14
2015-01-24 20:02:20 +01:00
Henry Till
aa4abb7d9b
racket: add missing libs and clean up
2015-01-24 11:02:23 -05:00
Dario Bertini
57577f2019
Explicitly specify the pythonVersion and use that together with versionOlder/versionAtLeast to specify bounds
2015-01-24 10:38:54 +00:00
Charles Strahan
ad026dab98
ruby: don't reference baseruby
2015-01-23 21:22:34 -05:00
Pascal Wittmann
100c6e85ad
mujs: updated to latest commit
2015-01-22 11:31:27 +01:00
Pascal Wittmann
dff539acd9
groovy: update from 2.3.9 to 2.4.0
2015-01-22 10:53:40 +01:00
Charles Strahan
00f93c494b
ruby: fixup 2.2's passthru
2015-01-22 01:00:00 -05:00
Charles Strahan
98bfaf52f7
ruby: use commit to identify libv8 patch
2015-01-22 00:47:08 -05:00
Charles Strahan
8d49e87dec
Merge pull request #4677 from cstrahan/pleasant-ruby
...
Pleasant ruby
2015-01-21 23:27:38 -05:00
Charles Strahan
034488ec80
ruby: fixup mpdcron
2015-01-21 22:38:29 -05:00
Charles Strahan
8085f088cb
ruby: exorcise the last few remaining rubyPackages
2015-01-21 22:23:37 -05:00
Charles Strahan
65c7c61841
ruby: use patch for libv8
2015-01-21 20:37:05 -05:00
Charles Strahan
317d78d145
consule: use new bundlerEnv
2015-01-21 20:33:19 -05:00
Charles Strahan
f52c32fcfc
ruby: rewrite sup package
2015-01-21 18:23:35 -05:00
Charles Strahan
115c299ea0
ruby: enable curses support by default
2015-01-21 15:22:21 -05:00
Charles Strahan
5f1622e95f
ruby: allow for passing build arguments
2015-01-20 23:33:57 -05:00
Charles Strahan
7d8b2f0d60
ruby: make buildInputs work
2015-01-20 22:20:28 -05:00
Charles Strahan
dfc225d143
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Charles Strahan
bd53746646
ruby: patching gems works
2015-01-20 19:09:02 -05:00
Charles Strahan
221509b0a6
ruby: refactoring, and package bundix
2015-01-20 01:07:55 -05:00
Charles Strahan
bf16d03075
ruby: support for proper bundler installs
2015-01-19 20:02:47 -05:00
Peter Simons
ec6b82a0c2
Merge branch 'master' into staging.
2015-01-19 18:41:17 +01:00
Charles Strahan
673fccf505
ruby: new bundler approach
2015-01-18 18:47:28 -05:00
Domen Kožar
652cfc36e9
python2.6: add a patch to fix parallel make failure
...
(cherry picked from commit 23a202519cb1d8704a0b4294d8d13a224efb1a74)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-18 19:20:07 +01:00
Pascal Wittmann
e4294c27e0
mujs: update to latest commit
2015-01-18 18:42:01 +01:00
Domen Kožar
029dae30ac
Merge pull request #5696 from mdesantis/ruby-2.2.0-package
...
Add Ruby 2.2.0 package
2015-01-18 11:41:03 +01:00
Vladimír Čunát
88089559b9
Merge #5676 : gcc-wrapper -> cc-wrapper and related
2015-01-17 08:43:04 +01:00
Charles Strahan
9ad38ec322
ruby: allow for overriding the src
2015-01-15 20:58:05 -05:00
Vincent Laporte
1fd73de1d4
Lua4: adds branch information
2015-01-15 10:28:40 +01:00
Eric Seidel
f3c6827373
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
2015-01-14 20:27:55 -08:00
Charles Strahan
1a1e6cfc04
ruby: various fixes
2015-01-14 21:19:53 -05:00
Georges Dubus
c2f8791e83
pypy: added patch to fix build with gcc 4.9.2
2015-01-14 16:02:08 +01:00
Charles Strahan
aaa2e9705a
ruby: cache gem files
2015-01-14 04:20:50 -05:00
Charles Strahan
32bae8d09a
bundler: update HEAD version
2015-01-14 01:13:51 -05:00
Vladimír Čunát
1575bc652e
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/os-specific/linux/util-linux/default.nix
It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
2015-01-13 18:07:11 +01:00
Maurizio De Santis
5bcd29466e
ruby: add 2.2.0 package
2015-01-10 19:25:37 +01:00
