Commit Graph
43498 Commits
Author SHA1 Message Date
aszlig e3c4acb3dd python-nevow: Fix indentation of expression.
No functionality change, the expression just got a bit too far to the right :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:26:08 +02:00
aszlig 7c24918a5f python-blivet: Fix path and call to wipefs.
First of all, the path to wipefs didn't work at all, and though it is
documented, the "-f" flag only works when used as a long option ("--force").
This is probably fixed upstream in util-linux, but using the long-option will
stay compatible.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:26:08 +02:00
aszlig 4ba597aa51 tests: Add VM test for partitioning using nixpart.
At the moment, we still use kickstart syntax, but this is going to change
soon[TM] to be more NixOS-integrated. The tests use emptyDiskImages option
introduced in the previous commit, so we don't have to create a whole bunch of
duplicate expressions.

Testing itself is done exclusively on /dev/vdb and /dev/vdc. And there is a
check (ensureSanity) to make sure none of the tests are actually mutating
/dev/vda.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:24:23 +02:00
aszlig aba54edf48 qemu-vm: Add option to create empty disk images.
This allows to add additional raw disk images to the VM, which therein are
available as /dev/vdb, /dev/vdc, /dev/vde and so on. Especially when testing
partitioning, this could be useful.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-28 04:24:23 +02:00
Mathijs Kwik ffddc1be9f eclipse: use latest cairo/gtk
Eclipse seems to work fine without this now (after x-updates merge).
2013-06-27 21:35:22 +02:00
Mathijs Kwik d51c01ac8e firefox 22: use system libpng 2013-06-27 21:35:22 +02:00
Mathijs Kwik f7b3032da7 ffmpeg-1.x: passthrough vdpauSupport 2013-06-27 21:35:22 +02:00
Mathijs Kwik bf61d25dac kde 4.10: option to use a libcanberra with gtk support
by default (as it was before), kde depends on a libcanberra with its
gtk dependency removed so a kde system can be gtk-free.

However, both firefox and chromium depend on gtk+ and libcanberra too.
So this leads to 2 versions being installed. this option combats that
by letting the kde use the other libcanberra
2013-06-27 21:35:22 +02:00
Mathijs Kwik e78b013fe3 libpng: merge apng expression (keep patch disabled by default)
I made sure no rebuild will happen because of this.
Unfortunately this meant merging attrsets instead of just using an
optionalString for postPatch
2013-06-27 21:35:21 +02:00
Mathijs Kwik 0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik 7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Vladimír Čunát 0689016e3e liferea: add -- A GTK-based news feed reader 2013-06-27 20:43:56 +02:00
Vladimír Čunát 38a59aa953 maintainers: change my attrname to be uniform 2013-06-27 20:43:56 +02:00
Rickard Nilsson 916fc48210 moderntimeline: Add extra source URL 2013-06-27 17:49:19 +02:00
Vladimír Čunát 173c9cbb63 builder: fail if patch is missing or fails to unpack 2013-06-27 16:34:31 +02:00
Vladimír Čunát 3314be6b73 cmake: consistent names, to satisfy comments on #567 2013-06-27 16:33:24 +02:00
Vladimír Čunát 4251b70c7e Merge master into stdenv-updates (contains new X stuff) 2013-06-27 16:24:57 +02:00
Sander van der Burg 5dd0ce8c15 Updated disnix to latest 0.3 release 2013-06-27 15:32:49 +02:00
Sander van der Burg 9936b7c230 disnix: push to latest 0.3 development release 2013-06-27 15:32:11 +02:00
Vladimír Čunát 7f1e09c35d Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
This reverts commit b08e12b37a.
2013-06-27 15:14:32 +02:00
Oliver Charles 912a825d1e Disable exec symlink resolution for PostgreSQL 9.2
When building PostgreSQL with plugins under NixOS, NixOS will create a
postgresql-and-plugins directory which symlinks PostgreSQL and all the plugins
into a single directory. Unfortunately, the plugins will not actually be usable
by PostgreSQL because it will still try and locate them in the original
PostgreSQL share directory, not postgresql-and-plugins.

In this commit, I have patched resolve_symlinks to always return success, which
matches the behavior if HAVE_READLINK is false (so presumably invalid paths are
never passed to this function).
2013-06-27 14:09:39 +01:00
Eelco Dolstra 2d521d8404 google-talk-plugin: Enable screen sharing 2013-06-27 14:27:46 +02:00
Joachim Schiele 4d3c59f454 added AES crypt 2013-06-27 13:44:29 +02:00
Eelco Dolstra 989c58eb29 Process /etc/fonts/conf.d before upstream fonts/conf.d
Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
2013-06-27 13:31:35 +02:00
Eelco Dolstra eb110fd3ce fontconfig: Set the default hinting style to "slight"
This works around a bug in infinality that causes broken rendering in
some cases.  Issue NixOS/nixpkgs#663.

Upstream suggests that "slight" is a better/safer default in any case.
It also looks better, IMHO, YMMV.
2013-06-27 13:28:22 +02:00
Eelco Dolstra 0cbf0605d2 Refactoring: Split fonts.nix into smaller modules 2013-06-27 13:12:45 +02:00
Rickard Nilsson 4800a33b88 Linux 3.4: Doesn't support CONFIG_RC_DEVICES option 2013-06-27 12:13:27 +02:00
Joachim Schiele b0c946a86a added mcrypt 2013-06-27 12:04:57 +02:00
Sergey Mironov 6afd6588d3 wicd: fix copying dhclient's config to it's initial location 2013-06-27 14:03:09 +04:00
Domen Kožar 43130a432d Merge pull request #681 from offlinehacker/mrbob_fix
python-mrbob: Make it work, update to 0.1a9 and update python-six to 1.3.0
2013-06-26 23:57:12 -07:00
Evgeny Egorochkin 25cffccc28 Fix binutils_deterministic to not break evaluation in certain cases. Quite a sneaky bug! 2013-06-27 09:50:52 +03:00
Jason "Don" O'Conal 72afda56d5 vim-xdebug: add expression 2013-06-27 11:21:11 +10:00
Jaka Hudoklin 84a4d03b51 python-mrbob: fix it and update to 0.1a9 2013-06-27 00:36:28 +02:00
Jaka Hudoklin 81a0a3d458 python-six: Update to 1.3.0 2013-06-27 00:35:47 +02:00
Lluís Batlle i Rossell 5ff3d84137 Adding sflphone.
Merge branch 'sflphone'
2013-06-27 00:10:13 +02:00
Lluís Batlle i Rossell 538a1d3aa1 Making sflphone build, and its gnome client too. 2013-06-27 00:09:26 +02:00
Lluís Batlle i Rossell 53f38dcbd0 Adding partially sflphone (only daemon, maybe failing to build) 2013-06-26 23:48:55 +02:00
Lluís Batlle i Rossell d3e7649eee Update ucommon to 6.0.5.
The hope that newer means better.
2013-06-26 23:47:34 +02:00
Lluís Batlle i Rossell c77f6a0c2f As libccrtp propagates ucommon, it's not needed in libzrtpcpp. 2013-06-26 23:47:09 +02:00
Lluís Batlle i Rossell 3d8cd48c58 Making ccrtp propagate its build time requirement, ucommon. 2013-06-26 23:46:47 +02:00
Domen Kozar 85d5366c10 synergy: port to systemd and add autoStart option 2013-06-26 22:14:08 +02:00
David Guibert 0db328dde0 String::ToIdentifier::EN: Update to 0.10 2013-06-26 13:37:40 +02:00
Song Wenwu 1e7e9c583d add retroarch 0.9.9 2013-06-26 19:25:09 +08:00
Eelco Dolstra 896da1bf8a Fix reference to firefox21 2013-06-26 11:24:10 +02:00
Evgeny Egorochkin 3eea6e1489 Merge pull request #677 from the-kenny/avrdude
avrdude: Add libusb to enable USB support
2013-06-25 21:57:04 -07:00
Moritz Ulrich 978fa98933 avrdude: Add libusb to enable USB support 2013-06-25 22:19:31 +02:00
Rickard Nilsson 489040bf58 Linux 3.2: Doesn't support CONFIG_RC_DEVICES option 2013-06-25 22:17:13 +02:00
Eelco Dolstra 94d9f18e47 firefox: Update to 22.0 2013-06-25 20:58:25 +02:00
Eelco Dolstra 9da4ccaf3d firefox: Rename 21.0.nix to default.nix 2013-06-25 20:58:25 +02:00
Eelco Dolstra 1802152e93 Remove Firefox 20.0 2013-06-25 20:58:25 +02:00