3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1314 commits

Author SHA1 Message Date
Peter Simons 1b68c7b134 ikiwiki: update to version 3.20141016 2014-10-31 13:02:01 +01:00
Bjørn Forsman 346f20305b rtl-sdr: add "Require: libusb-1.0" to pkg-config file
So that building 3rd party code works out of the box. (E.g. building
dump1090[1] works now).

[1]: https://github.com/antirez/dump1090
2014-10-30 08:33:16 +01:00
lethalman f73f5b9e24 Merge pull request #4237 from k0ral/termite
Upgraded termite to v8, and its dependency vte to v0.38.0
2014-10-29 15:16:28 +01:00
Cray Elliott a30e5e4481 add doomseeker, a server browser for multiple doom ports 2014-10-29 05:06:34 -07:00
koral f53ba30c87 Upgraded termite to v8, and its dependency vte to v0.38.0 2014-10-29 12:32:29 +01:00
David Rusu d73ae615c5 Merge https://github.com/NixOS/nixpkgs 2014-10-25 21:08:11 -04:00
David Rusu 67f8da419a added sync support to taskwarrior 2014-10-25 21:08:00 -04:00
Arseniy Seroka 4a1b6f8f0b termite: update to v8 2014-10-25 16:45:00 +02:00
Pascal Wittmann 4ecacf55b9 calibre: update from 2.6.0 to 2.7.0 2014-10-24 16:39:54 +02:00
Nikolay Amiantov 21dae01ea6 rxvt_unicode: add some plugins and a wrapper 2014-10-24 12:03:58 +02:00
Charles Strahan 28fab5baf3 dmenu2: new package 2014-10-24 02:27:53 +02:00
rejuvyesh 136813d219 zathura-pdf-mupdf: correct patch 2014-10-24 01:42:23 +05:30
me@vikramverma.com e6f7910551 zathura: 0.2.9 -> 0.3.1; girara: 0.2.2 -> 0.2.3 2014-10-23 19:03:19 +02:00
Eelco Dolstra 2ed8458cf2 blender: Update to 2.72b 2014-10-22 22:22:39 +02:00
Michael Raskin d5658da944 Merge pull request #4589 from bosu/k2pdfopt
New package: k2pdfopt - mobile PDF/DJVU optimizer
2014-10-19 12:25:23 +04:00
Boris Sukholitko f9c2cb6b27 Add k2pdfopt: mobile PDF/DJVU optimizer 2014-10-19 10:55:06 +03:00
Michael Raskin 441cc2fc22 Add qpdfview PDF viewer with tabs. It also supports DjVu and some PostScript files. 2014-10-18 21:47:49 +04:00
Pascal Wittmann cd223ad0ac calibre: update from 2.5.0 to 2.6.0 2014-10-17 18:22:52 +02:00
Domen Kožar 74fde7c388 Merge pull request #4495 from NixOS/pythonFull_improvements
PythonFull improvements
2014-10-16 13:24:18 +02:00
Peter Simons a558fdca16 haskell-taffybar: update to version 0.4.3 2014-10-14 17:39:28 +02:00
Domen Kožar a2a7abc67c pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv 2014-10-13 21:35:21 +02:00
Peter Simons 950adbe487 Merge pull request #4498 from robberer/remove/md5
change md5sum to sha256sum for a few packages
2014-10-12 16:20:10 +02:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Peter Simons 258a47fcc7 haskell-xmobar: update to version 0.22.1 2014-10-12 16:12:27 +02:00
Pascal Wittmann a1cf6de6c8 Merge pull request #4446 from nathanielbaxter/dev/keepass
keepass: Bump version to 2.28
2014-10-11 21:00:29 +02:00
rejuvyesh 36f29dfeb9 Update xmobar to 0.22 2014-10-11 18:38:06 +02:00
Moritz Ulrich ed62f798b2 gphoto2: update from 2.5.3 to 2.5.5 2014-10-11 01:57:57 +02:00
Moritz Ulrich a58961d0c0 cura: update from 14.07 to 14.09 2014-10-11 01:57:57 +02:00
Nathaniel Baxter 8d0954e72e keepass: Bump version to 2.28 2014-10-10 10:27:00 +11:00
Aristid Breitkreuz e2adb5fa0f xterm: update from 303 to 312 2014-10-08 20:23:26 +02:00
Aristid Breitkreuz 1f3b58cb4f ikiwiki: update from 3.20140227 to 3.20140916 2014-10-07 21:50:40 +02:00
Bjørn Forsman 4005ae48ab sweethome3d: add icon to desktop file 2014-10-07 08:45:26 +02:00
Aristid Breitkreuz 681b5f4b4a bitcoind: update from 0.9.2.1 to 0.9.3 2014-10-06 22:06:56 +02:00
Michael Raskin b72a1462e0 Update muPDF 2014-10-06 02:43:57 +04:00
Eelco Dolstra 58de52c6f0 blender: Update to 2.72 2014-10-05 21:50:22 +02:00
Bjørn Forsman e657a596b1 sweethome3d: update to latest 2014-10-05 15:59:12 +02:00
AndersonTorres e7f5263456 Batti: adjusting icon paths 2014-10-05 09:11:35 -03:00
Pascal Wittmann 1a8ca0b8bf calibre: update from 2.4.0 to 2.5.0 2014-10-03 16:21:50 +02:00
Baptist BENOIST def23d5694 xfe: Update from 1.34 to 1.37
Closes #4362
2014-10-02 06:45:59 +01:00
Moritz Ulrich 63289f088a Cura(engine): Append version to name. 2014-10-01 20:26:02 +02:00
Shell Turner f85a8ab9e2 Update Namecoin to 0.3.76 2014-10-01 06:49:49 +02:00
AndersonTorres 77887c621b Xiphos: update to 3.2.2
Closes #4312
2014-09-28 22:47:29 +01:00
AndersonTorres 0a6bfe69e5 Tilda: update to 1.1.13
Closes #4307
2014-09-28 22:45:26 +01:00
Vladimír Čunát 7a47efe8f4 lyx: maintenance update 2014-09-27 13:00:21 +02:00
Pascal Wittmann d346a9cc07 fixed some meta.maintainers attributes 2014-09-26 23:44:29 +02:00
Pascal Wittmann e28f8e5cca calibre: update from 2.3.0 to 2.4.0 2014-09-26 20:08:15 +02:00
Pascal Wittmann a4e66d77d9 Merge pull request #4241 from bodil/notify-osd
Added notify-osd package.
2014-09-24 10:17:33 +02:00
Bodil Stokke 99e0bdde8a Removed superfluous $XDG_DATA_DIRS. 2014-09-23 22:45:56 +01:00
Mateusz Kowalczyk f0a39395f1 Merge pull request #4223 from michelk/saga
Saga: Initial Expression
2014-09-23 22:38:57 +01:00
Bodil Stokke 1536c1cc0b Added notify-osd package. 2014-09-23 21:58:44 +01:00
Michael Fellinger b5e7e94238 keybase-node-client: add missing gnupg runtime dependency 2014-09-23 08:05:12 +02:00
Michael Fellinger 4bdf8ca43e keybase-node-client: 0.7.0 2014-09-22 22:52:24 +02:00
Michel Kuhlmann 6516bf4dd0 new 'gis' hierachy and initial saga expression 2014-09-22 13:57:20 +02:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
(cdep)illabout 7a5be25ba0 Add myself to the maintainers of roxterm. 2014-09-21 15:09:25 +02:00
(cdep)illabout 2561380af0 Fixed error with loading svg in roxterm.
Wrapped the GDK_PIXBUF_MODULE_FILE envvar so that roxterm is able to
load svg files.
2014-09-21 15:09:06 +02:00
AndersonTorres 5c834022e8 Batti (version 0.3.8): New Package
Batti is a small, GTK+UPower-based battery monitor, ideal for
lightweight desktop environments/window managers.

Closes #4031
2014-09-21 00:22:27 +01:00
Thomas Tuegel ca76b95260 pcmanfm: version bump to 1.2.2 2014-09-20 13:21:01 -05:00
(cdep)illabout e52caabe63 Took out builder script for default builder.
Removed the builder script in order to use the default builder based on
comments from a code review.
2014-09-19 17:28:24 +02:00
(cdep)illabout 62e4bf2716 Adding roxterm package. 2014-09-19 16:13:05 +02:00
lethalman 76c4278014 Merge pull request #4154 from k0ral/termite
Added termite package and updated vte to be compatible.
2014-09-19 12:24:53 +02:00
Cillian de Róiste 74f6be0e5f monero: only build on x86_64-linux, fails for i686 on hydra 2014-09-19 10:50:24 +02:00
koral 2a56f3d3f3 Added termite package and updated vte to be compatible. 2014-09-18 23:29:58 +02:00
Charles Strahan f0692e4355 update camlistore to 0.8 2014-09-16 00:22:55 -04:00
cillianderoiste 8e60e221b5 Merge pull request #4094 from romildo/master
New package: openbox-menu
2014-09-15 22:10:06 +02:00
Emery Hemingway 82de6b87d6 monero: intial expression for 0.8.8.3
http://monero.cc
2014-09-15 15:31:15 -04:00
José Romildo Malaquias 63f6cc0f7b New package: openbox-menu 2014-09-15 08:34:16 -03:00
Pascal Wittmann a47ef22751 Merge pull request #4080 from nathanielbaxter/dev/keepass
keepass: Bump version to 2.27
2014-09-14 16:16:13 +02:00
Nathaniel Baxter 958be357a5 keepass: Bump version to 2.27 2014-09-14 22:05:15 +10:00
Peter Simons 83f40f7b5e haskell-arbtt: update to version 0.8.1.4 2014-09-14 00:06:36 +02:00
Pascal Wittmann 8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Pascal Wittmann 245f34fef7 calibre: update from 2.2.0 to 2.3.0 2014-09-12 21:37:39 +02:00
William A. Kennington III 56411e9457 Fix typo in meta 2014-09-11 22:19:53 -07:00
AndersonTorres b39e5ce957 Small style fixups
In this commit, I modified some files, conforming them to a
idiosyncratic standard - mainly, a template for meta attribs.
2014-09-10 21:34:50 -03:00
Vladimír Čunát dd3192f5ee Revert "spaceFM: update from 0.9.2 to 0.9.4" (fixes #3916)
This reverts commit c53ae9b462.
It's just a temporary work-around until someone finds a real fix.
2014-09-08 18:28:14 +02:00
Pascal Wittmann 1d263f3776 calibre: update from 2.1.0 to 2.2.0 2014-09-05 23:53:50 +02:00
Moritz Ulrich bff6e8de3c gnuradio: update from 3.7.3 to 3.7.5 2014-09-04 19:31:33 +02:00
Moritz Ulrich 963a554b31 cura(engine): update to 14.0{7,3}. 2014-09-04 17:05:21 +02:00
Michael Raskin 7a7a034f30 Merge pull request #3865 from edwtjo/dogecoin-1.8.0-refactor
dogecoin: autotools build factored out
2014-09-03 21:33:54 +04:00
Tom Fitzhenry 03ff6450b9 keepassx: update to 2.0-alpha6 2014-09-03 12:32:11 +01:00
aszlig fc434d1f5c
synergy: Update to new upstream version 1.5.1.
Bugfix release, fixing the following bugs:

 - Configuration file paths containing spaces don't work
 - Log path needs to be in quotes on windows
 - Installer fails when Windows Firewall is disabled

http://svn.synergy-project.org/tags/1.5.1/ChangeLog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-09-03 12:52:08 +02:00
AndersonTorres 4dac1990d7 FME: New Package #3695 2014-09-03 11:47:58 +04:00
Michael Raskin 18c5119f18 Fix maintainers entry 2014-09-03 11:36:44 +04:00
Michael Raskin 9976dd3c4f Merge pull request #3644 from AndersonTorres/xiphos
Xiphos: New Package
2014-09-03 11:19:02 +04:00
Michael Raskin 6bfc32f376 Merge pull request #3729 from vandenoever/k3b
Install runtime executables for k3b.
2014-09-03 11:12:22 +04:00
Michael Raskin e743d1ca85 Minor cleanup 2014-09-02 02:04:59 +04:00
Michael Raskin b761b5cc09 Merge pull request #3135 from doublec/namecoin
Add namecoin cryptocurrency
2014-09-02 01:56:05 +04:00
Vladimír Čunát a1814ea2b0 pinfo: resurrect, update, add meta 2014-08-31 18:34:02 +02:00
Peter Simons f9b780abd8 Merge pull request #3871 from robberer/pkgs/nanoblogger
nanoblogger: adding version 3.5-rc1
2014-08-30 09:24:15 +02:00
Longrin Wischnewski 685cded7b5 nanoblogger: adding version 3.5-rc1 2014-08-30 09:14:19 +02:00
Edward Tjörnhammar feee5f16e1 dogecoin: autotools build factored out 2014-08-29 22:45:18 +02:00
aszlig 0ffa7dc0f2
sox: Enable support for FLAC and PNG.
In case you wonder: PNG support is needed for example to generate
spectograms.

For example:

sox shiny-song.flac -n spectrogram -o even-shinier.png

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-29 20:21:10 +02:00
Edward Tjörnhammar ac73fbcda9 dogecoin: 1.4 -> 1.8 2014-08-29 14:37:24 +01:00
Vladimír Čunát aeca8b6c3e tilda: fixups; seems to work now
- xgettext hack inspired by a guix thread
- gsettings to prevent crashes
- expression refactoring
2014-08-29 11:27:21 +02:00
AndersonTorres a4738b27cf Tilda (version 1.1.12): New Package
Tida is a GTK-based drop-down terminal emulator
2014-08-29 11:08:39 +02:00
Pascal Wittmann b90dd7089f calibre: update from 2.0.0 to 2.1.0 2014-08-29 10:36:04 +02:00
Michael Raskin 5f91365a21 Merge pull request #3813 from AndersonTorres/lilyterm
Lilyterm: New Package (version 0.9.9.4)
2014-08-29 01:30:35 +04:00
Michael Raskin 50b0fd46fb Merge pull request #3817 from bodil/master
Add evilvte package.
2014-08-29 01:29:23 +04:00
Domen Kožar 1fc1e9c82c xca: mark as broken 2014-08-27 19:11:08 +02:00
Bodil Stokke 2faf1c5b81 Add evilvte package. 2014-08-27 15:48:14 +01:00
AndersonTorres 0ac13e87d7 Lilyterm: New Package (version 0.9.9.4)
LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight.
2014-08-27 10:11:14 -03:00
Jaka Hudoklin 212d91a7dd bitcoin: add support for altcoins 2014-08-27 12:08:16 +02:00
Mathijs Kwik feeca09ecf eaglemode: upgrade to 0.85.0 2014-08-25 13:56:53 +02:00
Georges Dubus 7cd9bebb26 posterazor: update from 1.5 to 1.5.1 2014-08-25 11:50:13 +01:00
Peter Simons 3ba066cd84 haskell-arbtt: update to version 0.8.1.2 2014-08-25 12:17:15 +02:00
Cray Elliott d14ed33c50 Update jigdo 2014-08-25 10:43:27 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
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
AndersonTorres 72132d5ed0 Xiphos - New Package (version 3.2.1)
This is a new expression for Xiphos 3.2.1,
followed by an update of Sword library to 1.7.3 (required)
2014-08-23 20:37:10 -03:00
Pascal Wittmann 116930f5ba calibre: update from 1.48.0 to 2.0.0 2014-08-23 12:03:23 +02:00
Jos van den Oever 5722f4950a Install runtime executables for k3b. 2014-08-23 11:07:34 +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
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Bjørn Forsman 3a060bbcc6 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát 5fa61a2904 blender: use permanent URL for the patch
No hash changes.
2014-07-22 18:06:42 +02:00
Eelco Dolstra 4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Sam Griffin 6ae6071c94 fixing whitespace 2014-07-21 23:59:26 -04:00
Sam Griffin 36aa19814b updating bitcoin to 0.9.2.1 2014-07-21 23:53:37 -04:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát f63fb3fda0 blender: fix parallel builds 2014-07-21 09:57:16 +02:00
Cillian de Róiste 2405a94701 KDE Connect 0.7 -> 0.7.2 2014-07-19 18:02:17 +02:00
Pascal Wittmann a49e2f866d calibre: update from 1.44.0 to 1.45.0 2014-07-18 16:20:00 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Eelco Dolstra 327c2061d1 blender: Don't use system openjpeg
It was ignored anyway (instead using the internal openjpeg copy).
2014-07-15 23:34:34 +02:00
Eelco Dolstra 12fb52b08a blender: Enable ocean modifier 2014-07-15 23:34:24 +02:00
Eelco Dolstra 457e539048 blender: Fix jackaudio dependency 2014-07-15 23:33:09 +02:00
Eelco Dolstra 2d8e880c82 blender: Update to 2.71 2014-07-15 23:31:55 +02:00
Vladimír Čunát 0ef81572d8 Merge pull request #3263 from cstrahan/finalterm
finalterm: New package
2014-07-15 14:50:25 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Charles Strahan cd8063c4b2 finalterm: Add package 2014-07-13 19:36:43 -04:00
Pascal Wittmann e8ef98cea2 calibre: update from 1.35.0 to 1.44.0 2014-07-11 22:57:59 +02:00
Peter Simons 61b60fb1ad cdrtools: mark as broken
https://github.com/NixOS/nixos/issues/231
2014-07-10 13:11:32 +02:00
Vladimír Čunát 5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Peter Simons 99c6b978a7 haskell-arbtt: update to version 0.8.1 2014-07-04 11:45:43 +02:00
Peter Simons 20a931aa8b xmobar: set the proper home page url 2014-07-03 16:52:23 +02:00
Vladimír Čunát aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
_1126 5cc1245a11 xmobar: Updated to 0.21 2014-07-02 01:30:49 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Oliver Charles 37e8ebc456 Merge pull request #3144 from wmertens/source-missing-fixes
Source missing fixes
2014-07-01 08:43:27 +01:00
Mihaly Barasz c3c41f4ba0 nc-indicators 0.1 -> 0.2 2014-06-30 16:16:38 +02:00
Wout Mertens ea4207f7a3 makeself: bump to 2.2.0 2014-06-30 16:10:04 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Chris Double de4d6f0447 Add namecoin cryptocurrency 2014-06-30 13:38:16 +12:00
John Wiegley 79aaef4846 Merge pull request #3038 from bennofs/fetch-rev-attr
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
2014-06-28 17:04:04 -07:00
Cillian de Róiste 009196d02c KDE Connect 0.5.2 -> 0.7 2014-06-28 21:11:10 +02:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
John Wiegley d3790c569f Merge pull request #3067 from cstrahan/camlistore
add camlistore package
2014-06-24 15:21:12 -07:00
Charles Strahan 79e805e281 add camlistore package 2014-06-23 06:26:56 -04:00