3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

338 commits

Author SHA1 Message Date
Vladimír Čunát 4a0952d2fa fix bad "licence" names
Mostly what I merged from @lovek323.
Such errors can be easily checked by
  nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
2013-07-04 18:16:34 +02:00
Peter Simons 9185515611 R: add various features
* Ensure that R can link blas, liblapack, and libgfortran at run-time.
 * Ensure that R can run the Tcl/Tk interpreter.
 * Add Java support.
 * Install texinfo and PDF documentation.
2013-07-04 13:42:47 +02:00
Mathijs Kwik 0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Lluís Batlle i Rossell 4c6a981070 Adding 'weka'. 2013-06-19 16:19:06 +02:00
Evgeny Egorochkin 6b4eaf71fe Merge pull request #636 from craff/glsurf
Glsurf (3D drawing of implicit surfaces and curves)
2013-06-18 22:34:08 -07:00
Christophe Raffalli 102216f8c9 Drop useless dependencies in glsurf 2013-06-19 05:03:42 +02:00
Peter Simons e006c2fd49 celestia: fix compilation and linking after x-updates merge 2013-06-18 13:11:03 +02:00
Peter Simons efac6d8e73 celestia: help the package find the gtk related libraries 2013-06-18 12:44:24 +02:00
Peter Simons 3e241c3f83 celestia: add patch to support libpng 1.6 2013-06-18 12:44:24 +02:00
Peter Simons e6c48a73f8 celestia: update hashes for the downloaded patches 2013-06-18 12:44:23 +02:00
Christophe Raffalli cb980d97d7 added glsurf package 2013-06-16 22:33:47 +02:00
Michael Raskin 81b7f5fe63 Merge remote-tracking branch 'upstream/master' into x-updates 2013-06-15 17:15:32 +04:00
Russell O'Connor c9f5959285 Update Coq to version 8.4pl2. 2013-06-14 12:16:52 -04:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03: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
Bjørn Forsman a31ba7ed65 eagle: new package
Eagle is a schematic capture and PCB layout program from CadSoft. This
is proprietary software; CadSoft provide a self-extracting shell script
with embedded tarball of the prebuilt application.

Add the latest Eagle version, 6.4.0.

I've added a small LD_PRELOAD library that redirects operations on the
license file from <eagle_install_path>/bin/eagle.key to
$HOME/.eagle.key. Without this Eagle will never get past the license
dialog (because you cannot write to the nix store).

Eagle also has issues copying its example projects to other locations;
it seems that it wants to preserve the read-only permissions from the
source over to the destination. Because of this it cannot complete the
copy operation because it cannot write the project files into to the
(read-only) project directory it just created. So wrap chmod by OR'ing
in the write-by-owner bit.
2013-05-25 21:12:47 +02:00
Peter Simons 5779dfc8e4 R: add version 3.0.1 2013-05-23 11:35:59 +02:00
Peter Simons 398e4a15b0 stellarium: update to version 0.12.1 2013-05-22 11:42:45 +02:00
Peter Simons b72a91b6a5 wxmaxima: update to version 13.04.1 2013-05-22 11:21:55 +02:00
Rob Vermaas d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Michael Raskin 9d92fe013e Adding E-KRHyper theorem prover 2013-05-09 17:47:58 +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
Michael Raskin 646868b2e6 Adding Otter theorem prover. The development is frozen, but because of that Otter is considered a very reliable prover from soundness point of view. 2013-05-09 12:23:27 +04: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
Bjørn Forsman 36c6a05fd9 spyder: create desktop menu item 2013-05-06 20:52:58 +02:00
Bjørn Forsman 78169ec020 spyder: add recommended and optional dependencies
Spyder says about itself that it has

  ...the support of IPython (enhanced interactive Python interpreter) and
  popular Python libraries such as NumPy (linear algebra), SciPy (signal
  and image processing) or matplotlib (interactive 2D/3D plotting).

So I think having those available as default is a the right thing to to.
(We can easily make a stripped down spyder expression if needed later.)

I've added the list of recommended and optional dependencies as
described here:

  http://pythonhosted.org/spyder/installation.html#dependencies
2013-05-06 20:36:17 +02:00
Bjørn Forsman 8095d76a73 spyder: new package
Spyder (previously known as Pydee) is a powerful interactive development
environment for the Python language with advanced editing, interactive
testing, debugging and introspection features.

The name Spyder comes from Scientific PYthon Development EnviRonment.
2013-05-05 13:13:45 +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 e7b491a7e1 Update E prover 2013-04-21 16:30:40 +04: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
Michael Ashton 7b01680d87 kicad: upgrade to stable version 20130325, libraries to r220
- changed to require wxWidgets 2.9 -- seems to satisfy requirement for
libgtkprint, even with gtk2
2013-03-31 19:17:02 -07:00
Marco Maggesi fa2d85fded Update HOL Light to rev 157 2013-03-25 10:56:57 +01:00
Peter Simons 7df21af242 wxmaxima: don't try to build this package on FreeBSD 2013-03-22 12:53:07 +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
Michael Raskin d5288c7e3a TPTP had a bugfix without version change 2013-03-09 14:24:45 +04:00
Vladimír Čunát 7421ee673c qucs: minor update and fix for new gcc 2013-02-24 15:11:19 +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
Vladimír Čunát 9885d04033 Revert "WIP", sorry, I got confused, somehow
This reverts commit 524d9b656e.
2013-02-17 11:02:25 +01:00
Vladimír Čunát 524d9b656e WIP 2013-02-17 11:01:20 +01:00
Vladimír Čunát c55f5ae19d tulip: update to fix compilation with libpng-1.6 2013-02-16 16:16:32 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Marco Maggesi 42a4178c2b Update HOL Light to revision 155 2013-02-08 15:26:35 +01:00
Marco Maggesi 34411286a6 Update HOL Light to revision 154 2013-02-08 15:20:06 +01:00
Rickard Nilsson 1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Peter Simons ff461b0755 maxima: update to version 5.29.1 2013-01-19 02:31:21 +01:00
Peter Simons c296be5519 stellarium: update to version 0.11.4a 2013-01-19 02:26:03 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00