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
84b0bf63b7
pwnat: Fix evaluation
2013-05-09 13:21:10 +02:00
Lluís Batlle i Rossell
f1e2c585b6
Adding pcl. (Also updating flann, reworking vtk)
2013-05-09 12:36:22 +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
Phreedom
d63a9277bf
Merge pull request #512 from dysinger/t/libcello
...
Add libcello (libcello.org)
2013-05-08 20:16:11 -07:00
Tim Dysinger
d52b1931f7
added libcello
2013-05-08 16:18:45 -10:00
Phreedom
7a4b06e0e8
Merge pull request #511 from bjornfor/buildbot
...
Buildbot version bump and add buildbot-slave
2013-05-08 15:45:20 -07:00
Lluís Batlle i Rossell
e9cbe5439e
Adding udptunnel
...
(Fixing a semicolon in pwnat expr too)
2013-05-08 22:51:39 +02:00
Lluís Batlle i Rossell
a8b576ecaf
Adding pwnat.
2013-05-08 22:51:39 +02:00
Lluís Batlle i Rossell
e64b223c8b
freicoin: update to 0.0.2
2013-05-08 22:51:39 +02:00
Mathijs Kwik
1264fafe98
linux-3.4: upgrade to 3.4.44
2013-05-08 22:33:05 +02:00
Mathijs Kwik
7d2f148c53
linux-3.0: upgrade to 3.0.77
2013-05-08 22:33:05 +02:00
Bjørn Forsman
9fa9afe71e
buildbot-slave: new package
...
Tested with buildbot (master).
2013-05-08 22:26:43 +02:00
Bjørn Forsman
a36577367e
buildbot: bump to version 0.8.7p1 (latest stable)
...
* 0.8.7p1 doesn't contain *.info documentation; use manpage
instead
* Update meta.description to not contain the package name (redundant)
* 0.8.7p1 only builds with python dateutil==1.5, so that has to be added
as well
Runtime tested with the buildbot slave that is added in the next commit.
2013-05-08 22:09:05 +02:00
Evgeny Egorochkin
0223566f6e
Calligra: bump to 2.5.5. Should be a bugfix release with no surprises.
2013-05-08 18:46:17 +03:00
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