1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 14:41:17 +00:00
Commit graph

26299 commits

Author SHA1 Message Date
Marc Weber b50b9bf2b7 add versionedDerivation 2013-05-08 15:43:07 +03:00
Marc Weber e0fab80c27 experimental/multiple-versions-in-one-file
This patch introduces mergeAttrsByVersion to lib.

In some cases it does make sense to keep "experimental" and "older" versions of
the same package in one file because it follows the "do it once only" principle.
Very often many versions share their build instructions - so even though I
understand Eelcos opinion that different versions should be put into their own
.nix files - its my feeling telling me that this is fastest for most cases.

I agree with Eelco that if tweaks for individual versions become too much they
should be split into individual files.

See comments above mergeAttrsByVersion learn about its usage.

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
2013-05-08 15:43:07 +03:00
Eelco Dolstra 5815d18460 Add Fedora 18 2013-05-08 14:08:59 +02:00
Vladimír Čunát 9594a4f6fb xfce: minor updates for several components
Now tumbler doesn't segfault for me
(at least not as soon as it used to).
2013-05-08 13:48:51 +02:00
Vladimír Čunát 80e4a64740 xfce4session: bugfix update, superseding the patches 2013-05-08 13:48:51 +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
Michael Raskin 0c020c98f9 Updates: Wine, SBCL, XBoard 2013-05-08 10:52:47 +04:00
Michael Raskin 14d87f3a9e Update Linux versions 2013-05-08 10:52:46 +04:00
Phreedom 53799435a2 Merge pull request #509 from coroa/elpy-pkg
Add python-elpy-1.0.1: Backend for the elpy Emacs mode
2013-05-07 16:45:29 -07:00
Vladimír Čunát f58d12c31d libgphoto2: fix build on i686 via a minor update 2013-05-07 17:37:38 +02:00
Eelco Dolstra cd6da089a6 nginx: Update to 1.2.8 2013-05-07 17:33:51 +02:00
Evgeny Egorochkin b7bc27cfff KDE 4.10: propagate nepomuk_core along with kdepimlibs. 2013-05-07 17:23:46 +03:00
Evgeny Egorochkin d32fafc9e4 Calligra: fix build with KDE 4.10 2013-05-07 17:23:46 +03:00
Eelco Dolstra 2e77679b0b systemd: Start ctrl-alt-del.target irreversibly
This fixes hangs during EC2 reboots (which are implemented by sending
a ctrl-alt-del to the instance).
2013-05-07 14:34:48 +02:00
Eelco Dolstra 0dfb9ecc35 systemd: Update to 203 2013-05-07 14:34:48 +02:00
Eelco Dolstra d4561be1cb fontconfig: Use /etc/fonts by default again
This removes the need to set $FONTCONFIG_FILE, which is especially
important when using Nixpkgs binaries on non-NixOS systems.

See also 9301524c50.  This is a
regression caused by a change in fontconfig's configure switches.
2013-05-07 13:03:25 +02:00
Jonas Hoersch 17be4b85a3 Add python-elpy-1.0.1: Backend for the elpy Emacs mode 2013-05-07 12:27:10 +02:00
Lluís Batlle i Rossell ce7c7dece5 kdenlive: update to 0.9.6 2013-05-07 12:19:38 +02:00
Lluís Batlle i Rossell e087ce095e filegive: update to 0.5.2
(fixing miniupnpd support)
2013-05-07 12:19:38 +02:00
Eelco Dolstra e7480d9cb7 Add Debian 7.0 2013-05-07 11:19:46 +02:00
Eelco Dolstra abf2d36773 Revert "Revert "Revert "overrideDerivation: Simplify"""
This reverts commit c2b1ca0296.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
2013-05-07 10:49:22 +02:00
Eelco Dolstra 18df66f466 Revert "overrideDerivation: Re-attatch passthru and meta to all outputs"
This reverts commit 6b0e94a516.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
2013-05-07 10:48:53 +02:00
Evgeny Egorochkin b0ad529987 K3b: fix to make it build for KDE4.10. 2013-05-07 11:26:37 +03:00
Evgeny Egorochkin 083637896d Removing konq-plugins, since they have been included in kdebase in all KDE versions we have currently
packaged.
2013-05-07 10:18:35 +03:00
Evgeny Egorochkin 4ad55db0ad Adding myself as a maintainer of Qt and KDE 2013-05-07 09:57:10 +03:00
Evgeny Egorochkin 026b9971f5 Remove KBluetooth. BlueDevil should be used instead. 2013-05-07 09:37:53 +03:00
Evgeny Egorochkin 12be8c30a6 Improve bluedevil meta. 2013-05-07 09:36:46 +03:00
Evgeny Egorochkin eb4c9efb50 KOffice: superceded by Calligra long time ago. Removing. 2013-05-07 09:27:23 +03:00
Phreedom 008308168f Merge pull request #507 from bjornfor/spyder
Spyder: add dependencies to make it more featured and make a desktop item
2013-05-06 13:30:25 -07:00
Evgeny Egorochkin 0256e55934 Fix KDE 4.8 and 4.7 build against new SIP 2013-05-06 22:15:07 +03:00
Evgeny Egorochkin f8ee077afc KDE4.10 dolphin-plugins-*: fix the build.
Patch contributed by Karn Kallio.
2013-05-06 22:15:07 +03:00
Evgeny Egorochkin b2f6770208 KDE4.10 kioslave-{svn,perldoc}: Fix build.
Patch contributed by Karn Kallio.
2013-05-06 22:15:07 +03:00
Evgeny Egorochkin 6e406edf0a KDE4.10: Kate: Add experimental python support. 2013-05-06 22:15:06 +03:00
Evgeny Egorochkin ee4a7cbbf4 KDE4.10 print-manager: Fix build.
Patch contributed by Karn Kallio.
2013-05-06 22:15:06 +03:00
Evgeny Egorochkin a1924fca12 KDE4.10: Fix PyKDE4 build I accidentally left in a broken state. Remove notice from kajongg because it
compiles fine now.
2013-05-06 22:15:06 +03:00
Evgeny Egorochkin a08fba4fce PyQt4: Advance version to 4.10.1. Note: needed for KDE4.10 to build.
Patch contributed by Karn Kallio.
2013-05-06 22:15:06 +03:00
Evgeny Egorochkin 7280f5a44f python sip: Advance to version 4.14.6. Note: Needed for KDE4.10 to build.
Patch contributed by Karn Kallio.
2013-05-06 22:15:06 +03:00
Evgeny Egorochkin 9f0d9a3b01 KDE 4.10: kdesdk-thumbnailers: Patch the build system to fix build failure.
Patch contributed by Karn Kallio.
2013-05-06 22:15:05 +03:00
Evgeny Egorochkin a2359c02cd KRDC: it builds now, so remove the notice 2013-05-06 22:15:05 +03:00
Evgeny Egorochkin 9097d35321 libvncserver: Advance to version 0.9.9. Note: Fixes KDE4.10 build.
Patch contributed by Karn Kallio.
2013-05-06 22:15:05 +03:00
Evgeny Egorochkin ccbea23039 KStars: forgot to remove the notice that it doesn't build. 2013-05-06 22:15:05 +03:00
Evgeny Egorochkin e90c15355c indilib: Advance to version 0.9.6. Note: this fixes the build of kstars from KDE4.10.
Patch contributed by Karn Kallio.
2013-05-06 22:15:05 +03: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
Shea Levy a88306b15f nodePackages.underscore: Update
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-06 12:56:15 -04:00
Shea Levy c2a2a03210 Add extend nodePackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-06 12:47:46 -04:00
Shea Levy 15bdde9071 Add express nodePackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-06 09:29:33 -04: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
Phreedom 592ec52e94 Merge pull request #506 from qknight/byobu-5.37
Package byobu 5.37
2013-05-06 04:16:44 -07:00
Joachim Schiele fd8e249b5d byobu 5.37 integration 2013-05-06 11:06:59 +00:00