1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Commit graph

1054 commits

Author SHA1 Message Date
Peter Simons 2a6c7e2874 arbtt: jailbreak to fix the build 2014-08-24 20:28:13 +02:00
Peter Simons bd672dc335 haskell-arbtt: update to version 0.8.1.1 2014-08-24 20:28:13 +02:00
Peter Simons a8c17fb227 haskell-taffybar: update to version 0.4.1 2014-08-24 20:28:11 +02:00
Pascal Wittmann 116930f5ba calibre: update from 1.48.0 to 2.0.0 2014-08-23 12:03:23 +02:00
Michael Raskin 1375ac9032 Merge pull request #3605 from michelk/qgis
qgis: update 1.8.0 -> 2.4.0 and adding sip
2014-08-23 12:54:23 +04:00
AndersonTorres e0f976ba55 vym: new package
VYM (View Your Mind) is a mind-mapping program.

[Bjørn: two whitespace adjustments and quote the "$out" variable.]
2014-08-22 21:28:29 +02:00
Andrew Morsillo 8a465c1dfa robomongo: update to 0.8.4 and fix broken build 2014-08-22 21:00:06 +02:00
Sven Keidel fc152248ce cool-old-term: add 0.9 (close #3685, #3575) 2014-08-21 19:22:37 +02:00
lethalman f25f21b78c Merge pull request #3713 from paulkoerbitz/clipit
Add package for ClipIt, a lightweight GTK clipboard manager
2014-08-21 16:32:10 +02:00
Paul Koerbitz a5cf54a52b Add package for ClipIt, a lightweight GTK clipboard manager 2014-08-21 16:22:08 +02:00
Moritz Ulrich 77437983a2 Slic3r: Bump to 1.1.7. 2014-08-20 16:27:47 +02:00
Emil Rangden 2c0610fb6f updated taffybar 2014-08-19 23:47:58 +02:00
Michel Kuhlmann 043dc2b1b4 qgis: update 1.8.0 -> 2.4.0 and adding sip
Unfortunately adding sip doesn't solve the error-message:

    Couldn't load SIP module.
    Python support will be disabled.
2014-08-15 10:50:10 +02:00
Vladimír Čunát 6c791d41db merge #3340: bitcoin: minor update 2014-08-15 00:15:22 +02:00
John Wiegley 06a324f7dc Merge pull request #3101 from cstrahan/xquartz
Use XQuartz on Darwin
2014-08-14 16:33:46 -05:00
Vladimír Čunát c659c6ca80 lyx: major update and some fixes 2014-08-14 20:23:21 +02:00
Vladimír Čunát 54ae9d8527 blender: fix build by dropping patch integrated upstream
It no longer applied, and the CMakeLists.txt looked completely different.
Such changes without any version bump... (sigh)
2014-08-14 15:13:39 +02:00
Charles Strahan 5ea8497933 get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
Domen Kožar 8c50807c4d dunst: git -> 1.1.0 2014-08-12 21:23:44 +02:00
Vladimír Čunát 665b2c8247 Merge #3408: licenses: prefer spdx.org, improve docs
The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix
2014-08-12 19:08:53 +02:00
Peter Simons e0a7a3a7c3 haskell-xmobar: restrict meta.platforms to Linux; we cannot build that package on Darwin 2014-08-12 11:16:51 +02:00
Peter Simons 18250b97ae Remove 'andres' from the meta.maintainer section of all Haskell package where I
had added him earlier.
2014-08-09 13:49:24 +02:00
Eelco Dolstra 18e422d047 blender: Optionally build with CUDA support
This is required for GPU acceleration of the Cycles renderer.
2014-08-09 12:37:46 +02:00
Pascal Wittmann 17edebfe28 bibletime: fixed build by updating from 2.9.2 to 2.10.1
http://hydra.nixos.org/build/13061214
2014-08-08 22:28:26 +02:00
Vladimír Čunát 52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra 7cfb9545c6 sox: Fix building on Darwin
Fixes #3493.
2014-08-08 18:16:56 +02:00
Eelco Dolstra 8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons 9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Pascal Wittmann 4ec55e64e0 calibre: update from 1.47.0 to 1.48.0 2014-08-08 09:31:51 +02:00
Emery Hemingway 420f18ef5b xscruiser: initial package expression
http://xcruiser.sourceforge.net/
2014-08-07 01:24:25 +02:00
José Romildo Malaquias ba9bfd39ad New packages: libgksu, gksu 2014-08-07 01:10:11 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Rok Garbas d8fa02b508 synergy: update to 1.5.0 2014-08-03 21:47:10 +02:00
Rok Garbas 4b052cb846 zathura: preBuild phase not needed in latest zathura 2014-08-03 21:34:19 +02:00
Rok Garbas 16ae8c3e84 zathura: update to 0.2.9 2014-08-03 14:04:44 +02:00
Rok Garbas 9d38aa6591 girara: update to 0.2.2 2014-08-03 14:04:44 +02:00
Vladimír Čunát 1b169722a3 Merge branch 'x-updates'
Close #3147.
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
Cillian de Róiste d4fb2e83db kde4_next.kde_wacomtablet: update from 2.0 to 2.0.2, potentially fixes CVE-2012-4514, CVE-2012-4514 2014-08-02 11:33:06 +02:00
Vladimír Čunát 4d6503e5b5 blender: fix parallel builds
(cherry picked from commits f63fb3fda0 + 5fa61a2904)
2014-08-02 11:17:25 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Pascal Wittmann bb153cfe72 calibre: update from 1.46.0 to 1.47.0 2014-08-01 11:17:00 +02:00
Bjørn Forsman 62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Vladimír Čunát cb8f8bdbff xlsfonts, xfontsel: fix meta typo 2014-07-30 19:32:53 +02:00
Peter Simons 5cc55e9523 Partially revert 7a45996 some more.
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
2014-07-28 20:52:47 +02:00
Peter Simons 8e6c0afd0f haskell-nc-indicators: update to version 0.3 2014-07-28 20:32:52 +02:00
Peter Simons bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Domen Kožar e3319eb73d doc: modernize meta attributes documentation 2014-07-27 13:54:37 +02:00
Pascal Wittmann 50510d1985 calibre: update from 1.45.0 to 1.46.0 2014-07-25 11:16:24 +02:00