Domen Kožar
|
4aa3eec330
|
Merge branch 'master' into staging
Conflicts:
pkgs/development/libraries/fontconfig/default.nix
|
2014-12-07 14:02:48 +01:00 |
|
Shea Levy
|
b02d059f5d
|
nix-exec: bump
|
2014-12-03 22:23:47 -05:00 |
|
Jaka Hudoklin
|
61e19d6e81
|
rubyLibs: add tmuxinator, update
|
2014-12-01 00:39:40 +01:00 |
|
Pascal Wittmann
|
faf6e067d1
|
add mujs, a lightweight, embeddable Javascript interpreter
|
2014-11-29 14:21:16 +01:00 |
|
Vladimír Čunát
|
e75fe2e528
|
cairo: pull an upstream patch to fix racket
Close #5165, #5166.
Also enableParallelBuilding in racket.
|
2014-11-28 20:28:47 +01:00 |
|
Vladimír Čunát
|
cbd2305d4d
|
Merge branch 'master' into staging
|
2014-11-28 18:59:07 +01:00 |
|
Pascal Wittmann
|
02ca1adc05
|
groovy: update from 2.3.7 to 2.3.8
|
2014-11-28 11:08:12 +01:00 |
|
Vladimír Čunát
|
b5ff06eda4
|
Merge branch 'master' into staging
|
2014-11-26 21:48:26 +01:00 |
|
Edward Tjörnhammar
|
456882b142
|
Merge pull request #5115 from iu-parfunc/racket
racket: add libreadline to ffi libs - enables xrepl.
|
2014-11-26 12:08:50 +01:00 |
|
Vladimír Čunát
|
a9bad25ffe
|
Merge branch 'master' into staging
|
2014-11-24 22:14:25 +01:00 |
|
Ryan Newton
|
fd73e9948d
|
racket: add libreadline to ffi libs - enables xrepl.
|
2014-11-24 13:58:22 -05:00 |
|
Shea Levy
|
5c9ee48de1
|
nix-exec: bump
|
2014-11-24 10:13:31 -05:00 |
|
Domen Kožar
|
d562934ee7
|
nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux
|
2014-11-22 21:13:22 +01:00 |
|
Shea Levy
|
76854052f9
|
nix-exec: bump
|
2014-11-21 09:59:53 -05:00 |
|
Shea Levy
|
b7b956ffec
|
nix-exec: bump
|
2014-11-20 19:40:14 -05:00 |
|
Vladimír Čunát
|
a19eeddd70
|
ruby-2.1.1: fix patch numbering (and build)
Wrong patch paths were ignored until recently by our stdenv.
It's slightly unclear to me which patches were supposed to be used.
|
2014-11-20 13:22:56 +01:00 |
|
Vladimír Čunát
|
c14dee55e8
|
ruby-2.0: fix patch paths (and build)
Wrong patch paths were ignored until recently by our stdenv.
|
2014-11-20 12:54:49 +01:00 |
|
Pascal Wittmann
|
75738437a4
|
php: update from 5.4.34 to 5.4.35 (fixes CVE-2014-3710)
|
2014-11-19 08:47:41 +01:00 |
|
Eelco Dolstra
|
9f914a3f82
|
perl-5.14: Remove
It's EOL and unmaintained. There was only one package using it which
I've marked as broken.
|
2014-11-18 10:42:23 +01:00 |
|
Eelco Dolstra
|
847b7fe697
|
perl: Fix evaluation on Darwin
|
2014-11-17 15:21:29 +01:00 |
|
Shea Levy
|
eba921130b
|
nix-exec: bump
|
2014-11-16 00:02:29 -05:00 |
|
Domen Kožar
|
dc626a9f5c
|
pypy: disable test_default_ciphers test
|
2014-11-15 19:32:05 +01:00 |
|
Vladimír Čunát
|
b4af993c3f
|
Merge branch 'master' into staging
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
|
2014-11-14 14:28:23 +01:00 |
|
Michael Raskin
|
a6d991ea07
|
Merge pull request #4980 from henrytill/racket
racket: update to 6.1.1
|
2014-11-13 23:44:35 +03:00 |
|
Domen Kožar
|
419e96a5ce
|
Merge branch 'python/docs'
|
2014-11-13 21:32:01 +01:00 |
|
Henry Till
|
67ee94b237
|
racket: update to 6.1.1
|
2014-11-13 14:29:44 -05:00 |
|
Shea Levy
|
f1b8880a2f
|
nix-exec: bump
|
2014-11-12 21:06:37 -05:00 |
|
Domen Kožar
|
39d1bc755e
|
python: add python.interpreter attribute
|
2014-11-13 00:42:36 +01:00 |
|
Luca Bruno
|
6af0d6974f
|
Merge branch 'master' into staging
|
2014-11-10 10:03:52 +01:00 |
|
Domen Kožar
|
c1d6a4a8fb
|
remove unused pythonLinkmeWrapper
|
2014-11-08 20:19:55 +01:00 |
|
James Cook
|
576092eec4
|
Revert "ruby: Fix build on systems with store optimisation. Closes #4273. #4266 promises a better fix."
This reverts commit d2c0011c2f .
c04e492898 gives a cleaner solution that's
not specific to ruby.
|
2014-11-06 09:22:20 -08:00 |
|
Eelco Dolstra
|
0518ccf5af
|
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
pkgs/stdenv/generic/default.nix
|
2014-11-06 10:16:39 +01:00 |
|
Mateusz Kowalczyk
|
007f80c1d0
|
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999, issue #739
|
2014-11-06 00:48:16 +00:00 |
|
Vladimír Čunát
|
52404a868d
|
Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
|
2014-11-05 15:00:44 +01:00 |
|
Eelco Dolstra
|
7495c61d49
|
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
pkgs/applications/editors/vim/macvim.nix
|
2014-11-04 14:30:43 +01:00 |
|
Michael Raskin
|
05c8f5c102
|
Disable parallel building of Guile for now
|
2014-11-04 14:24:23 +03:00 |
|
Rob Vermaas
|
6d79132553
|
php: update from 5.4.33 to 5.4.34, potentially fixes CVE-2014-3668, CVE-2014-3669, CVE-2014-3670
|
2014-11-04 10:16:14 +01:00 |
|
Michael Raskin
|
19645e229c
|
Update PicoLisp
|
2014-11-04 12:04:43 +03:00 |
|
Arseniy Seroka
|
2d47366e4c
|
Merge pull request #4756 from iyzsong/guile-sdl
add guile-sdl and bump guile to 2.0.11
|
2014-11-03 17:09:57 +03:00 |
|
Michael Raskin
|
ec186d5f16
|
Update Angelscript
|
2014-11-02 23:51:58 +03:00 |
|
Michael Raskin
|
1b49e78cd4
|
Update Regina interpreter
|
2014-11-02 23:51:57 +03:00 |
|
Peter Simons
|
a9c53037fa
|
Merge remote-tracking branch 'origin/master' into staging.
|
2014-11-02 16:15:53 +01:00 |
|
宋文武
|
1e4e719ffb
|
guile: 2.0.9 -> 2.0.11
|
2014-11-01 16:56:09 +08:00 |
|
Domen Kožar
|
92503a0424
|
python: 3.3.5 -> 3.3.6
|
2014-11-01 04:50:26 +01:00 |
|
Domen Kožar
|
7fe78cad98
|
python: 3.2.5 -> 3.2.6
|
2014-11-01 04:50:26 +01:00 |
|
Peter Simons
|
b11060d8db
|
Merge remote-tracking branch 'origin/master' into staging.
|
2014-10-31 11:14:24 +01:00 |
|
cillianderoiste
|
60bf93c5da
|
Merge pull request #4701 from jirkamarsik/eff
Added eff-20140928
|
2014-10-28 17:59:45 +01:00 |
|
Jirka Marsik
|
3ee1f6ee79
|
Added eff-20140928
|
2014-10-28 17:21:55 +01:00 |
|
Shea Levy
|
c8be814f25
|
nix-exec: bump
|
2014-10-27 14:27:55 -04:00 |
|
Charles Strahan
|
7231b95f4f
|
Ruby: 2.1.3 and Fiddle support
This packages Ruby 2.1.3, and adds Fiddle support for all 2.x versions.
closes #4656
|
2014-10-26 04:48:09 +00:00 |
|