ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 18:37:04 +03:00
Code Issues Projects Releases Wiki Activity
39,529 Commits 96 Branches 102 Tags 4.5 GiB
1d1667b7b0
Commit Graph

1031 Commits

Author SHA1 Message Date
Michael Raskin
81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Peter Simons
fc165c0db9 Merge pull request #626 from lovek323/sup 
sup: add required gems and separate dependencies
 2013-06-15 03:26:10 -07:00
aszlig
486e918215
php: Fix support for JPEG and PNG over GD. 
Set an explicit path to the location of libjpeg for version 5.4 and an explicit
path to libjpeg _and_ libpng for version 5.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-14 17:50:35 +02:00
Jason "Don" O'Conal
d0d9470519 sup: add required gems and separate dependencies 2013-06-14 18:06:14 +10:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal
a5e65e66b1 sup: separate dependencies 
create separate expressions for gems requiring native extensions to be
built:

* gpgme
* ncursesw_sup
* xapian_full_alaveteli
 2013-06-13 10:45:51 +10:00
Michael Raskin
1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Peter Simons
6b1ebeccf2 Merge branch 'master' into stdenv-updates. 
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
 2013-06-11 12:11:25 +02:00
Evgeny Egorochkin
dbcfef8c41 Ruby 1.9: update and reenable parallel build, since there's a chance it was fixed. 2013-06-11 00:59:26 +03:00
Evgeny Egorochkin
24b1c74b7c Ruby 1.8: update 2013-06-11 00:10:34 +03:00
Evgeny Egorochkin
b93ac14bf6 Ruby 1.9 parallel build sometimes fails due to races. 2013-06-10 23:34:06 +03:00
Michael Raskin
8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/misc/emulators/wine/default.nix
 2013-06-10 10:04:46 +04:00
Song Wenwu
d4c6b5924d add Ren'Py 6.15.5 
Ren'Py is a visual novel engine that helps you use words,
images, and sounds to tell stories with the computer.
This is just the minimal launcher.
 2013-06-09 12:45:56 +08:00
Domen Kozar
1a1d8dfc69 Python: 2.7.4 -> 2.7.5 2013-06-05 21:07:46 +02:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00
Eelco Dolstra
94dfd4bdf9 php: Get rid of unnecessary runtime dependencies like gettext 2013-06-04 14:57:37 +02:00
Peter Simons
5718931dd3 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-01 11:48:21 +02:00
bbenoist
23fb448242 php-5.4: Reintroduce the ftpSupport build option 
The ftpSupport build option I added on the 5.3 version of PHP was not
present in the version 5.4 because it was not yet merged when I wrote my
commit.
 2013-06-01 01:16:36 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Peter Simons
7ef3aea921 erlang: drop obsolete version R15B02 2013-05-25 11:11:37 +02:00
Eelco Dolstra
b976fc2b61 Merge branch 'master' into stdenv-fixes 2013-05-23 09:09:10 -04:00
Malcolm Matalka
33eb2832c3 Add R15B03-1 2013-05-23 11:27:49 +02:00
Peter Simons
728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Domen Kozar
541f2ad531 Revert "python: first fix towards cross-compiling" 
This reverts commit c89fe1c0ee.
 2013-05-20 12:03:58 +02:00
Domen Kozar
c89fe1c0ee python: first fix towards cross-compiling 2013-05-20 11:15:32 +02:00
Eelco Dolstra
8b1bcb720a php: Update to 5.3.25, 5.4.15 2013-05-17 14:06:29 +02:00
Michael Raskin
76d685d347 Update Racket: patch by Karn Kallio 2013-05-10 00:50:18 +04:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Eelco Dolstra
5911c1f45a perl: Update to 5.16.3, 5.14.4 
CVE-2013-1667

Cherry-picked from stdenv-updates.
 2013-05-09 13:37:53 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Eelco Dolstra
7480746a12 php-5.4: Don't build gd as a dynamically-loaded extension 
We didn't do this in PHP 5.3 either, so it causes regressions if
php.ini isn't set up to load the gd extension.
 2013-05-06 14:03:26 +02:00
Shea Levy
fde3526e7d Merge branch 'master' into stdenv-updates 
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
 2013-05-04 18:28:48 -04:00
Domen Kozar
b5241215b1 cython: set platforms 2013-05-04 22:20:27 +02:00
Domen Kozar
bf58711b2b python: 2.7.3 -> 2.7.4 2013-05-03 09:06:06 +02:00
Moritz Ulrich
ff4d3d88d2 Fix clisp 2.44.1 (needed by stumpwm). 
This fix applies the patch used for the newest clisp to the old,
fixing errors with new glibc.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-05-01 14:33:00 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
 2013-04-24 06:29:09 +00:00
Michael Raskin
b1ff6273d9 Merge pull request #468 from zefhemel/dartsdk 
Added Google Dart M4
 2013-04-22 22:34:18 -07:00
Michael Raskin
f328c45b25 Merge pull request #440 from bbenoist/master 
php: add FTP support by default
 2013-04-22 22:31:57 -07:00
Eelco Dolstra
4539668937 php: Add 5.4 
We'll keep 5.3 around for a while.
 2013-04-22 19:17:35 +02:00
Ludovic Courtès
6aa8c5761c guile: fix non-GNU builds 2013-04-21 12:06:45 +02:00
Ludovic Courtès
7dd6b5f812 guile: update to 2.0.9 2013-04-21 11:44:40 +02:00
Peter Simons
4914e63a89 Merge changes from branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
 2013-04-19 11:48:11 +02:00
Vladimír Čunát
ec736312d4 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
 2013-04-17 18:26:28 +02:00
Zef Hemel
237192ce6e Adjusted to point to version URL (hosted by me -- had to). 2013-04-17 16:54:03 +02:00
Zef Hemel
6464f450d5 Added Dart SDK M4 2013-04-17 16:54:03 +02:00
Eelco Dolstra
7745357f0e meta.license should be a (list of) string(s), not an attribute set 
http://hydra.nixos.org/build/4744513
 2013-04-14 20:10:58 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
Eelco Dolstra
70b36815fc php: Update to 5.3.24 
CVE-2013-1635, CVE-2013-1643, CVE-2013-1824.
 2013-04-11 16:47:08 +02:00
Vladimír Čunát
d7be1e84d0 ruby19: fix build via a patch-level update 2013-04-10 15:28:54 +02:00
Peter Simons
022f120a2c Merge branch 'master' into stdenv-updates. 2013-04-07 23:37:12 +02:00
Vladimír Čunát
70f0d79d06 perl: remove one more unreliable test, fixes #454 2013-04-07 21:52:24 +02:00
Domen Kozar
b4ac9a4c9f python: 2.7.3 -> 2.7.4 2013-04-07 12:22:40 +02:00
Domen Kozar
ec25d38261 python 3.3.1rc1 -> 3.3.1 2013-04-07 11:13:37 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Eelco Dolstra
e12e62001b perl: Update to 5.16.3, 5.14.4 
CVE-2013-1667
 2013-04-04 14:50:22 +02:00
Peter Simons
62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-04 00:51:30 +02:00
Vladimír Čunát
2660b9115f perl: fix bad syntax in FreeBSD commit 2013-04-02 21:18:14 +02:00
Lluis Batlle
1aef67362f guile: adding a patch to allow guile builds without chroots 
Otherwise, the NSS troubles may make a test fail.

Patch suggested by ludo.
 2013-04-02 18:03:08 +02:00
Baptist BENOIST
dba7f8b4fb php: add FTP support by default 
...as this does not requires any third party library.
 2013-04-02 12:38:42 +02:00
Vladimír Čunát
322c2f36a3 perl: attempt to fix on FreeBSD by disabling two tests 2013-04-02 10:39:20 +02:00
Vladimír Čunát
5e202a2221 perl: fix bash syntax 
I thought I could make a small syntax change without trying, I was being
foolish.
 2013-04-02 09:20:58 +02:00
Rommel M. Martinez
e77b526e0c racket: enable HTML docs 2013-04-02 11:39:36 +08:00
Vladimír Čunát
21cd5376b4 perl: disable one more test 
It worked for me, but fails on hydra (probably not very pure).
 2013-04-01 23:31:00 +02:00
Peter Simons
64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +02:00
Vladimír Čunát
ff92538aec perl: enable doCheck, almost all tests work for me 2013-03-29 02:50:41 +01:00
Vladimír Čunát
73b0fa8720 perl: modify patch for better purity 
This probably solves problems on some platforms that expose /usr and
/lib during build, see #386.
 2013-03-29 02:50:41 +01:00
Cillian de Róiste
0ad1f78760 Python3: fix the download URL 2013-03-28 22:57:37 +01:00
Shea Levy
f39310b525 Add right_aws gem 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-28 09:59:18 -04:00
Shea Levy
6cd1dc255e Update rubygems 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-28 09:42:15 -04:00
Peter Simons
fdbe2878f0 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-28 14:02:56 +01:00
Cillian de Róiste
a5e48c0f20 Python 3.3 upgrade to 3.3.1rc1 to fix an important bug for Nix 
http://bugs.python.org/issue15833

When Python 3.3.0 attempts to compile python bytecode in the system
directories it raises and exception and stops. Since Python 3.3 is
only required by the latest Blender, I hope it's OK to use the RC
until the final release.
 2013-03-28 01:10:23 +01:00
Peter Simons
270a0009be python3: update to version 3.3.0 2013-03-26 01:16:15 +01:00
Florian Friesdorf
870f4cca73 fix pythonWrapper for non-gnu ln 2013-03-25 15:13:08 +01:00
Peter Simons
a28ff44c76 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 16:26:34 +01:00
Sander van der Burg
1dbd3a55c4 libv8-rubygem: Implemented a very depressing workaround that allows scons to build libv8.a, it's ugly but it works 2013-03-21 13:56:33 +01:00
Peter Simons
22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Lluís Batlle i Rossell
8c5eaf1840 octave: update to 3.6.4 2013-03-17 22:05:14 +01:00
Lluís Batlle i Rossell
e8ab3a7549 octave: removing texlive dependency 
I saw I added it, but I can't remember why, and now I don't see what is
it for. It gets into octave closure, so it's a bit annoying for its size.
 2013-03-17 21:18:00 +01:00
Danny Wilson
d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos 
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
 2013-03-17 13:22:24 +01:00
Vladimír Čunát
b1eeae8cac Merge branch 'master' into x-updates 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
 2013-03-17 11:28:28 +01:00
Shea Levy
725e27fb58 Add papertrail-cli rubygem 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-15 09:25:06 -04:00
Shea Levy
bbf57c5a25 Add remote_syslog rubygem 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-15 09:24:52 -04:00
Shea Levy
cf20b47473 Update rubygems 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-15 09:22:52 -04:00
Shea Levy
101eba7bef rubyLibs.libv8 needs python 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-15 08:55:48 -04:00
Florian Friesdorf
94f2013c0c pythonDocs: recurseIntoAttrs does not recurse, bypass problem 2013-03-13 13:16:03 +01:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Florian Friesdorf
b345bca3af pythonDocs: group in subfolders pythonXY/TYPE 
I got it now - promised.
 2013-03-05 12:41:30 +01:00
Florian Friesdorf
2e21e4fadc fix pythondocs (missing lib, doc instead of docs) 2013-03-05 12:28:48 +01:00
Shea Levy
ae2b08aeb3 Add some fixes for gem nix. 
Ideally these would be picked up upstream. Pull request at https://gitorious.org/ruby-nix/ruby-nix/merge_requests/1
 2013-03-04 10:43:20 -05:00
Shea Levy
cddc4c6f63 Update rubygems 2013-03-04 10:23:05 -05:00
Florian Friesdorf
930e4d5391 pythonDocs: add meta.maintainers, subgroup attrset by doctype 2013-03-03 06:48:05 +01:00
Florian Friesdorf
06e4059f80 fix pythonDocs install path 2013-03-02 16:01:42 +01:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Florian Friesdorf
0314b8b00f add python docs 2013-03-02 05:42:26 +01:00
Danny Wilson
9baf9e98d1 Fix Perl builds on Illumos. 2013-02-28 20:04:04 +01:00
Shea Levy
6fe8fc00cf Add bitbucket-backup rubygem 2013-02-25 12:49:37 -05:00
Shea Levy
f5c334e1ab Update rubygems 2013-02-25 12:49:06 -05:00
Shea Levy
f01c52e848 Merge pull request #276 from aforemny/php 
Enable intl and exif support in PHP
 2013-02-25 05:31:06 -08:00
Shea Levy
d380c264c3 Add ruby-2.0.0-p0 2013-02-25 06:16:32 -05:00
Peter Simons
5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát
07d26cea06 racket: fix by update 2013-02-24 10:59:54 +01:00
Vladimír Čunát
b913af9fce pltScheme: remove -- didn't build and it's "racket" now 2013-02-24 10:32:47 +01:00
Vladimír Čunát
0415253eaf octave: fix via minor update 2013-02-24 09:22:50 +01:00
Shea Levy
07bd695e45 Add jsduck rubygem 2013-02-22 11:12:49 -05:00
Shea Levy
0202ddea63 Update rubygems 2013-02-22 11:08:50 -05:00
Alexander Foremny
0c01ceab78 Merge remote-tracking branch 'upstream/master' into php 2013-02-22 09:33:26 +01:00
Alexander Foremny
bd0903b90b Merge remote-tracking branch 'bbenoist/phpfix' into php 
Conflicts:
	pkgs/development/interpreters/php/5.3.nix
 2013-02-22 09:33:06 +01:00
Alexander Foremny
fec1d4b2f7 Remove misconfigured mcrypt support 2013-02-22 09:24:48 +01:00
Shea Levy
acd4299e75 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
 2013-02-21 11:13:30 -05:00
Peter Simons
210126bbae love: fix typo in meta.maintainer attribute 2013-02-21 14:28:58 +01:00
Song Wenwu
e270a609eb love: update to 0.8.0 2013-02-21 14:23:39 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell
bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Shea Levy
c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát
b2f8432ad3 pure: update and fix by patching 2013-02-17 11:01:20 +01:00
Vladimír Čunát
b3ce50d88a add python33 (needed by new blender) 2013-02-16 18:11:32 +01:00
Vladimír Čunát
dbcdc27e03 python3: fix libPrefix passthru 2013-02-16 18:10:43 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Florian Friesdorf
1a52c7659d python: fix linkme-wrapper 2013-02-15 06:14:58 +01:00
bbenoist
99934eb363 php: Add zip and optional bz2 support 
Use the overload bz2 = true to enable bz2 support for php.
zip support is enabled by default as it doesn't require any library.
 2013-02-12 21:23:24 +01:00
bbenoist
8fd5fcbda5 php: Add mcrypt optional support 
Use an override with mcrypt = true to enable libmcrypt support in php.
The --disable-posix-threadsds mcrypt build option was required by php.
 2013-02-12 19:52:37 +01:00
Baptist BENOIST
b42ba898e1 php: Add xsl optional support 
Use an override with xsl = true to enable xsl support in php.
 2013-02-12 19:52:34 +01:00
Shea Levy
b97aa0c4b1 Update rubygems. 
More vulnerabilities:
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/KtmwSbEpzrU
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8
 2013-02-11 14:31:12 -05:00
Shea Levy
831d72cede Update rubygems. 
Particularly for rack-1.5.2, fixes CVE-2013-0263 and CVE-2013-0262.
 2013-02-08 18:26:38 -05:00
Shea Levy
30658882e8 Rubygems: Fix deps. 
Gem nix in nixpkgs is broken, will have to update it.
 2013-02-05 20:24:42 -05:00
Shea Levy
6cc91771a8 Mark ruby gems as such 2013-02-05 19:08:04 -05:00
Florian Friesdorf
906be2ea98 python-linkme-wrapper: optimize some escaping 2013-02-05 20:12:28 +01:00
Vladimír Čunát
bb7f1f38c2 clisp: fix after glibc update 2013-02-05 15:23:09 +01:00
Shea Levy
76cc4e760b Add thin rubygem 2013-02-04 15:53:09 -05:00
Shea Levy
af847fd8ce Add aws-sdk gem 2013-02-04 15:52:40 -05:00
Shea Levy
064638b0fd Add uuid rubygem 2013-02-04 15:51:25 -05:00
Shea Levy
e08ab1ebe5 Add sinatra-1.3.2 rubygem 2013-02-04 15:50:36 -05:00
Shea Levy
ff95e66e96 Add foreman rubygem 2013-02-04 15:16:13 -05:00
Shea Levy
ebfc26b43d Update rubygems 2013-01-31 14:33:02 -05:00
Eelco Dolstra
35af62f998 gperftools: Update to 2.0 and fix build 
http://hydra.nixos.org/build/3875478
 2013-01-28 17:19:01 +01:00
Shea Levy
3b34b3610e Add clojureUnstable (clojure 1.5.0-RC1). 
Patch thanks to Patrick Lee.
 2013-01-27 20:43:38 -05:00
Alexander Foremny
18180858af Enable mcrypt, intl and exif support in PHP 2013-01-26 16:08:43 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Florian Friesdorf
a63bb419f2 remove pythonhome-wrapper, python-linkme-wrapper is more flexible 2013-01-22 15:28:30 +01:00
Florian Friesdorf
1fa2e7f9a9 python-linkme-wrapper 2013-01-22 15:28:30 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Florian Friesdorf
212b4df91c recursivePthLoader included via wrapper, not propagated by modules 2013-01-11 09:53:28 +01:00
Florian Friesdorf
0f007baf70 Merge branch 'channel-nixos' into python 2013-01-09 10:44:45 +01:00
Florian Friesdorf
a37cabdbb7 fix python-2.6 build: purity for systems with stdenv.gcc.libc 
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
 2013-01-09 08:45:03 +01:00
Florian Friesdorf
56517508d8 python-2.6.8: long overdue 2013-01-09 08:44:58 +01:00
Florian Friesdorf
ee0204d2c8 for some reason the python2.6 manpage is not gzipped 2013-01-09 08:27:39 +01:00
Florian Friesdorf
723d5a5581 fix python-2.6 build: purity for systems with stdenv.gcc.libc 
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
 2013-01-09 08:26:15 +01:00
Florian Friesdorf
16e2a9133f python-2.6.8: long overdue 2013-01-09 08:06:46 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
 2012-12-28 23:28:16 +01:00
Eelco Dolstra
84779a6f7d Remove unnecessary parentheses around if conditions 
Pet peeve...
 2012-12-28 19:54:15 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Peter Simons
5bf938a635 lua-5.1: build liblua.so and install the pkgconfig file and the documentation 2012-12-25 11:25:56 +01:00
Florian Friesdorf
838761cad2 python manpages as python2.6, python2.7 and python 
see #68
 2012-12-22 03:26:26 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
cillianderoiste
5b0cd954f1 Merge pull request #206 from chaoflow/python-merge 
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
 2012-12-05 14:28:09 -08:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Rob Vermaas
dd0ba5d093 Only build hiphopvm on x86_64-linux. 2012-12-02 20:49:59 +01:00
Rob Vermaas
8c5d9098fa Add hiphopvm 2012-12-02 15:24:28 +01:00
Rob Vermaas
86a5ad6d80 Add some PHP support for gettext and gd/freetype needed for zabbix 2.0 2012-12-01 21:19:19 +01:00
Ludovic Courtès
5b1cbc54b5 guile: update to 2.0.7 2012-11-30 22:34:01 +01:00
Florian Friesdorf
3438681d80 Merge branch 'channel-nixos' into python-merge 2012-11-29 21:40:33 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Eelco Dolstra
7774506201 perl: Update to 5.16.2 2012-11-23 17:29:06 +01:00
Florian Friesdorf
1b013ac1ea Merge branch 'py/pdb' into python-merge 2012-11-22 13:38:08 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates. 
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
 2012-11-21 16:20:36 +01:00
Michael Raskin
1d010bea6d Erlang: fix my typo, too 2012-11-12 23:51:45 +04:00
Michael Raskin
f3a64ff8f9 Erlang: fix a typo 2012-11-12 23:49:30 +04:00
Peter Simons
5ecec6f399 erlang: add meta section 2012-11-11 20:48:33 +01:00
Peter Simons
73533ce2a0 erlang: drop the leading 'R' from the Erlang version number so that nix-env recognizes it and allows "nix-env -i erlang" to work 2012-11-11 20:44:37 +01:00
Peter Simons
724d416fae erlang: drop obsolete R15B01 version 2012-11-11 20:41:50 +01:00
Malcolm
4fbd441418 Adding Erlang R15B02 2012-11-11 20:38:53 +01:00
Eelco Dolstra
620e3a1516 php: Update to 5.3.18 2012-10-26 16:23:30 +02:00
Eelco Dolstra
5af277bbd1 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-15 12:16:58 -04:00
Eelco Dolstra
873595ee6d php: Update to 5.3.17 
Also remove unsupported PHP 5.2 (which doesn't build anymore).

http://hydra.nixos.org/build/3131326
 2012-10-15 11:14:26 -04:00
Michael Raskin
29980e0d54 Add threads support to CLisp 2012-10-14 22:28:49 +04:00
Peter Simons
a352796e0d lua: add version 5.1 
The 5.1 build system doesn't seem to support building a shared object anymore?
 2012-10-10 19:24:37 +02:00
Ludovic Courtès
d1279b6a0b guile: Explicitly link against libgcc_s. 2012-09-24 15:40:33 +02:00
Eelco Dolstra
1fffc94956 Fix evaluation on non-Linux platforms 2012-09-21 15:29:05 -04:00
Eelco Dolstra
e6077fbc46 Remove getConfig helper function 
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
 2012-09-19 13:56:56 -04:00
Eelco Dolstra
8ed71a1ee5 perl: Add 5.16.1 2012-09-18 15:23:07 -04:00
aszlig
ae32dd91d4
tcl: Set license to licenses.tcltk. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-09 07:00:01 +02:00
Ludovic Courtès
cb76c03216 guile: fix Solaris builds 2012-08-11 21:53:43 +02:00
Ludovic Courtès
986f04c87e guile: disable thread support on Solaris 2012-08-10 23:16:02 +02:00
Ludovic Courtès
9b70bc6e34 guile: allow libunistring and Readline to be found on OpenSolaris 2012-08-10 16:30:28 +02:00
Ludovic Courtès
55cf142175 guile: allow GMP to be found on OpenSolaris 2012-08-09 18:39:30 +02:00
Lluís Batlle i Rossell
54146ea191 octave: updating to 3.6.2 (bugfix release) 
I don't know what they fixed.
 2012-07-27 16:11:31 +02:00
Eelco Dolstra
16d2d9acab php: Update to 5.3.15 
Includes fixes for CVE-2012-2688 and CVE-2012-3365.
 2012-07-23 13:46:50 -04:00
Florian Friesdorf
3665e02901 python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion} 2012-07-20 21:43:14 +02:00
Eelco Dolstra
5750566c2a Fix Pyrex build 2012-07-18 09:50:36 -04:00
Peter Simons
36265e9c66 Merge pull request #5 from aszlig/xpra 
New version of Xpra from the fork
 2012-07-16 02:32:02 -07:00
Eelco Dolstra
baf5e27aaf ruby: Fix URL and enable parallel building 2012-07-09 17:32:11 -04:00
Shea Levy
be48fe265a ruby: update to 1.9.3-p194 2012-07-09 17:29:57 -04:00
Eelco Dolstra
03964c1032 Add fakes3, an implementation of the S3 protocol for testing 2012-07-09 17:25:23 -04:00
Ludovic Courtès
ac1081fb48 guile: update to 2.0.6 2012-07-08 23:48:00 +02:00
Eelco Dolstra
4184e580a9 php: Update to 5.3.14 2012-07-06 15:14:16 -04:00
aszlig
af9924b929 Add Cython, because it's needed to build xpra. 2012-07-06 03:12:08 +02:00
Lluís Batlle i Rossell
40b91ced40 octave: disabling parallel building 
The error http://hydra.nixos.org/build/2748254/log/tail-reload
makes me think there are concurrency problems in the octave build.
In my computer it builds fine.
 2012-07-02 21:27:18 +02:00
Eelco Dolstra
4c868ec330 * PHP updated to 5.3.13. 
svn path=/nixpkgs/trunk/; revision=34480
 2012-06-12 17:39:59 +00:00
Cillian de Roiste
4b2c3d52de Adding optional wx (GUI) support for Erlang, which enables the graphical debugger although pman (the process manager) fails to start. 
svn path=/nixpkgs/trunk/; revision=34372
 2012-06-06 19:05:06 +00:00
Ludovic Courtès
801c82da55 GNU Guile 2.0: Provide a 2.0ish setup hook. 
svn path=/nixpkgs/trunk/; revision=34215
 2012-05-22 21:18:20 +00:00
Cillian de Roiste
e9548cc845 Upgrading default erlang to R15 and keeping R14 as an older option, removing extra random older versions. I assume they are not of interest. 
svn path=/nixpkgs/trunk/; revision=34117
 2012-05-15 17:57:50 +00:00
Cillian de Roiste
a5d77fcf2b Updating erlange to R14B04 
svn path=/nixpkgs/trunk/; revision=34116
 2012-05-15 17:54:05 +00:00
Eelco Dolstra
a78d2f55fb * Perl: set passthru.libPrefix to communicate the relative location of 
Perl packages for $PERL5LIB.

svn path=/nixpkgs/trunk/; revision=34061
 2012-05-11 13:41:24 +00:00
Eelco Dolstra
3bb2f92106 * Final sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34045
 2012-05-10 14:41:16 +00:00
Ludovic Courtès
c1dd4327dc GNU Guile 2.0: Fix cross-GNU builds. 
svn path=/nixpkgs/trunk/; revision=34029
 2012-05-09 13:42:46 +00:00
Eelco Dolstra
24594b0fb3 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34028
 2012-05-09 11:49:52 +00:00
Eelco Dolstra
356ce12cd0 * Python 2.7.3 (including various security fixes). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34008
 2012-05-07 20:08:10 +00:00
Eelco Dolstra
08b6b9fa3a * Cygwin: provide a Perl setup hook so that Perl dependencies work 
properly.

svn path=/nixpkgs/trunk/; revision=34002
 2012-05-07 02:06:29 +00:00
Shea Levy
4a292d3bd6 gem nix missed a lot of hashes, strange... 
svn path=/nixpkgs/trunk/; revision=33995
 2012-05-05 20:25:42 +00:00
Shea Levy
c21ab61f9a gem nix failed to fill in the hash for bundler 
svn path=/nixpkgs/trunk/; revision=33994
 2012-05-05 20:12:54 +00:00
Shea Levy
5425b06ef6 Update rubygems 
svn path=/nixpkgs/trunk/; revision=33993
 2012-05-05 20:09:48 +00:00
Michael Raskin
6ed169c19d Update Clojure to 1.4.0 
svn path=/nixpkgs/trunk/; revision=33963
 2012-05-01 11:39:58 +00:00
Peter Simons
27de563164 Updated Python 3.x. 
- updated to version 3.2.3
 - fixed version numbers in setup-hook.sh
 - sort input variable list alphabetically
 - tk support needs x11 support as well
 - deleted obsolete version 3.1

Furthermore, all CPPFLAGS and LDFLAGS required to find the build inputs are now
explicitly passed to ./configure. The python 3.x build systems tries to ignore
the environment as much as possible to provide deterministic builds. This means
that our magic environment variable stuff won't work, and previously built
python3 binaries lacked all kinds of extensions, such as zlib, etc.

svn path=/nixpkgs/trunk/; revision=33937
 2012-04-27 08:20:46 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'. 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
 2012-04-23 15:47:31 +00:00
Eelco Dolstra
934ef8e3fc * Fix evaluation of pythonPackages.bugz. 
svn path=/nixpkgs/trunk/; revision=33815
 2012-04-17 15:31:44 +00:00
Nicolas Pierron
82b308bf11 Add armv7l support. 
svn path=/nixpkgs/trunk/; revision=33798
 2012-04-15 23:41:25 +00:00
Lluís Batlle i Rossell
163c7375a3 Adding a version of sqlite with more things, based on the upstream repository src. 
svn path=/nixpkgs/trunk/; revision=33788
 2012-04-14 21:40:55 +00:00
Lluís Batlle i Rossell
700bedb833 Adding me as a maintainer for octave. 
svn path=/nixpkgs/trunk/; revision=33757
 2012-04-12 10:00:18 +00:00
Michael Raskin
fa1ecfed54 Update Kona/fix its build 
svn path=/nixpkgs/trunk/; revision=33753
 2012-04-12 07:12:07 +00:00
Shea Levy
db28c68df0 mkDerivation handles propagatedUserEnvPkgs properly now 
svn path=/nixpkgs/trunk/; revision=33444
 2012-03-27 15:20:37 +00:00
Shea Levy
092487c1fb Update rubygems 
svn path=/nixpkgs/trunk/; revision=33443
 2012-03-27 15:14:13 +00:00
Shea Levy
26789f2e89 Update rubygems 
svn path=/nixpkgs/trunk/; revision=33333
 2012-03-21 14:07:29 +00:00
Lluís Batlle i Rossell
6b4810d310 Updating php 5.3 to 5.3.10 
svn path=/nixpkgs/trunk/; revision=33170
 2012-03-16 19:40:36 +00:00
Shea Levy
a09a78165c Update rubygems 
svn path=/nixpkgs/trunk/; revision=33155
 2012-03-16 13:28:35 +00:00
Lluís Batlle i Rossell
46b258acb4 Updating octave to the new major release 3.6.1 
svn path=/nixpkgs/trunk/; revision=32904
 2012-03-08 16:24:37 +00:00
Shea Levy
9eb1b81548 Update rubygems 
svn path=/nixpkgs/trunk/; revision=32873
 2012-03-08 05:45:23 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Shea Levy
62a2b075e4 Update rubygems 
svn path=/nixpkgs/trunk/; revision=32755
 2012-03-03 17:32:11 +00:00
Yury G. Kudryashov
92f1b06907 This is sha256, not md5 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32715
 2012-03-01 07:19:01 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Lluís Batlle i Rossell
1ad3da0ca8 Taking back 32635. An older Rigs of Rods does not work better. Same throttle issues. Let's keep with 0.39.4. 
svn path=/nixpkgs/trunk/; revision=32685
 2012-02-28 23:01:25 +00:00
Eelco Dolstra
b14a737a4d * Since we're rebuilding everything that depends on Python anyway, we 
may as well update Python to the latest stable version.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32675
 2012-02-28 11:09:36 +00:00
Florian Friesdorf
ff37a57373 Revert "remove empty readonly site-packages" 
This reverts commit 92b56e5686b06237c23ba41b6b8918ea643781dc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32674
 2012-02-28 10:31:28 +00:00
Florian Friesdorf
4956884de5 Revert "do not propagate makeWrapper via pythonXYFull" 
This reverts commit 3ee2667e4c60c2ed850da8538cf135fe7f716f30.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32656
 2012-02-28 00:07:33 +00:00
Florian Friesdorf
bf1fe3aa09 Revert "pysite support for pythonXYFull wrapper" 
This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32653
 2012-02-28 00:07:23 +00:00
Lluís Batlle i Rossell
11aceede25 Downgrading rigsofrods to a version that might work, where cars may run fast. 
This rev should be very close to the stablest 0.38.

I had to bring an old angelscript in.


svn path=/nixpkgs/trunk/; revision=32635
 2012-02-27 22:39:23 +00:00
Ludovic Courtès
5afbf9075e GNU Guile 1.8: Build without `-Werror'. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32631
 2012-02-27 20:10:10 +00:00
Florian Friesdorf
1d2e06e068 pysite support for pythonXYFull wrapper 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32593
 2012-02-26 17:23:42 +00:00
Florian Friesdorf
1c504b49b4 remove empty readonly site-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32590
 2012-02-26 17:23:31 +00:00
Florian Friesdorf
95f0b6119c do not propagate makeWrapper via pythonXYFull 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32589
 2012-02-26 17:23:28 +00:00
Florian Friesdorf
fe9d9530ba symlink python manpage for pythonXYFull 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32588
 2012-02-26 17:23:25 +00:00
Florian Friesdorf
09ae58fcd7 python wrapper comment 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32587
 2012-02-26 17:23:22 +00:00
Florian Friesdorf
8e32380a79 add PSFL, update python meta (license, maintainers, unify description) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
 2012-02-26 17:23:16 +00:00
Eelco Dolstra
a488f53a54 * Many buildr Buildfiles rely on RUBYLIB containing the current directory 
(as was the default in Ruby < 1.9.2).  So make sure that's the case
  when running buildr.

svn path=/nixpkgs/trunk/; revision=32573
 2012-02-26 11:10:00 +00:00
Eelco Dolstra
91e3d54b8f * Remove the ruby/default.nix, it's not very useful. 
svn path=/nixpkgs/trunk/; revision=32572
 2012-02-26 11:07:56 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
 2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell
d6f6caea6b Updating angelscript to 2.22.1. 
Adding mysocketw.

Adding ogre-paged.

Fixing the caelum licence.


svn path=/nixpkgs/trunk/; revision=32549
 2012-02-24 21:13:14 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
 2012-02-23 20:06:21 +00:00