alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
51513 commits 217 branches 121 tags 4.5 GiB
Commit graph

1155 commits

Author SHA1 Message Date
ambrop7@gmail.com 5f2167627e Add Cura. 2014-03-25 23:17:17 +01:00
Shea Levy ff6febb75d sox: Update, get rid of composableDerivation 2014-03-24 12:01:20 -04:00
Emery Hemingway e91daf327d electrum: initial expression 
Electrum is a Bitcoin thin-wallet.
https://electrum.org
 2014-03-23 11:22:57 -04:00
Peter Simons bfa2466d71 haskell-xmobar: update to version 0.20.1 2014-03-17 18:33:54 +01:00
Vladimír Čunát d6349df0dd put systemd unit dirs on the right place 
Also see #1936.
 2014-03-13 21:44:51 +01:00
William A. Kennington III 635599c611 st: Add builtInput for pkgconfig 
During the build process st fails to find pkg-config. This does not throw a fatal error but it should be included during build time.
 2014-03-11 12:11:19 -05:00
Peter Simons 423b2e2cd4 haskell-xmobar: update to version 0.20 2014-03-11 13:50:47 +01:00
Bjørn Forsman d23ea79667 gnuradio: also use PYTHONPATH from runtime environment 
So that extra modules can be used without rebuilding (e.g. in
gnuradio-companion). PYTHONPATH from the environment is added *after*
the default deps.
 2014-03-09 22:35:36 +01:00
Bjørn Forsman 28e28acc36 gqrx: new package 
Gqrx is a software defined radio receiver powered by GNU Radio and the Qt
GUI toolkit. It can process I/Q data from many types of input devices,
including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal
Software Radio Peripheral (USRP) devices.

http://gqrx.dk/
 2014-03-08 21:46:13 +01:00
Bjørn Forsman 24d9bc576a gnuradio-osmosdr: new package 
This is a Gnuradio block for OsmoSDR and rtl-sdr.

http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
 2014-03-08 21:46:13 +01:00
Bjørn Forsman f0af1e7512 rtl-sdr: new package 
rtl-sdr turns your Realtek RTL2832 based DVB dongle into a SDR receiver.

http://sdr.osmocom.org/trac/wiki/rtl-sdr
 2014-03-08 21:46:12 +01:00
Evgeny Egorochkin 568f9e953f xterm: update from 301 to 303 2014-03-08 17:53:12 +02:00
Bjørn Forsman b0ec4b54e7 gnuradio: update 3.7.1 -> 3.7.2.1 
I verified that gnuradio-companion (the GUI) still starts.
 2014-03-07 23:59:36 +01:00
Bjørn Forsman 084ff142ad gnuradio: wrap example programs too 
Without this the examples don't work. Example:

$ /nix/store/HASH-gnuradio-3.7.1/share/gnuradio/examples/uhd/usrp_am_mw_rcv.py
Traceback (most recent call last):
  File "/nix/store/HASH-gnuradio-3.7.1/share/gnuradio/examples/uhd/usrp_am_mw_rcv.py", line 24, in <module>
    from gnuradio import gr, eng_notation
ImportError: No module named gnuradio
 2014-03-07 23:59:35 +01:00
Thomas Tuegel df5639183c Claim maintainership of recently added packages 
Also set platforms for some packages where it was missing.
 2014-03-07 11:23:30 -06:00
Domen Kožar 2ff577e558 Merge pull request #1861 from ttuegel/pcmanfm 
Add pcmanfm-1.2.0
 2014-03-07 12:27:10 +01:00
Vladimír Čunát be58c4f9e4 mupdf: fix CVE-2014-2013 by upstream patch 2014-03-06 21:21:03 +01:00
Domen Kožar 402198de56 Merge pull request #1838 from pSub/calibre-update 
calibre: upgrade from 1.23.0 to 1.25.0
 2014-03-05 08:35:21 +01:00
Peter Simons 164cf167b4 xmobar: drop obsolete patch files 2014-03-03 22:12:28 +01:00
Peter Simons 34ef383d45 xterm: update from 300 to 301 2014-03-03 11:10:26 +01:00
Thomas Tuegel 90759ebf63 Add pcmanfm-1.2.0 2014-03-01 12:39:11 -06:00
Pascal Wittmann 78e7d5db00 calibre: upgrade from 1.23.0 to 1.25.0 2014-02-26 09:36:14 +01:00
Sergey Mironov 5b223d457e zathura: set default window-icon 2014-02-22 18:38:06 +01:00
Matej Cotman 9f06f92fd2 remove a dot; add matejc as maintainer 2014-02-22 18:17:19 +01:00
Matej Cotman 72fb60117e twmn: new package 2014-02-22 18:17:19 +01:00
Cillian de Róiste c5e1cc5f37 Minor whitespace cleanup 2014-02-20 23:12:54 +01:00
cillianderoiste f47d6a1314 Merge pull request #1792 from larkery/davmail-and-lxappearance 
Add lxappearance and davmail
 2014-02-20 23:08:04 +01:00
Tom Hinton f6ba040bdc Add me to maintainers list 
Add a derivation for davmail
Add a derivation for lxappearance
Add both new derivations to all-packages
 2014-02-20 09:49:50 +00:00
Sergey Mironov 2142d7542b zathura: version bump (0.2.6 -> 0.2.7) (close #1782) 2014-02-19 20:51:50 +01:00
Peter Simons 40debd63ca nc-indicators: re-generate with cabal2nix 2014-02-19 16:07:34 +01:00
Cillian de Róiste 6af0b814f5 kde_wacomtablet: upgrade from 1.3.5 to 2.0 2014-02-18 23:45:36 +01:00
Cillian de Róiste 8c83ae965f blender: upgrade from 2.67 to 2.69 and add myself as maintainter 2014-02-18 22:11:39 +01:00
Mihaly Barasz 668e81ad5a Add nc-indicators-0.1 Haskell package 2014-02-17 23:06:26 +01:00
Bjørn Forsman 493adc9227 Rename 'gnome-terminator' to 'terminator' 
Align the package name with what other distros call it.

Other distros: Fedora, Debian, Archlinux, OpenSUSE, Mageia, Slackware
(and probably more).
 2014-02-17 20:56:03 +01:00
Bjørn Forsman 0fa9dca362 gnome-terminator: add missing dependencies (for extra features) 
Add 'keybinder' and 'python-notify' as dependencies. Fixes this:

  $ terminator
  [...]
  Warning: python-keybinder is not installed. This means the hide_window shortcut will be unavailable
  [...]
  ActivityWatch plugin unavailable: please install python-notify
 2014-02-17 20:53:55 +01:00
Bjørn Forsman 351951f315 gnome-terminal: clean up a bit and add/update meta attributes 
* No need to set 'phases', the default works.
* Use shell globbing instead of running 'ls' in a subshell.
* Quote shell variables.
* The project has got a new homepage; the old one points users to the
  new one (or the launchpad page)
* Make it available in the channel (meta.platforms = linux)
 2014-02-16 19:05:09 +01:00
Bjørn Forsman 5fefa65747 gnome-terminator: update 0.96 -> 0.97 2014-02-16 19:05:09 +01:00
William A. Kennington III bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Evgeny Egorochkin 882721b6d0 librecad: update from 1.0.2 to 1.0.4 2014-02-14 21:50:06 +02:00
Evgeny Egorochkin a0b1954611 librecad2: update from 2.0.0beta1 to 2.0.2 2014-02-14 09:31:27 +02:00
Peter Simons c3945b2a8c ikiwiki: update from 3.20140102 to 3.20140125 2014-02-13 23:22:16 +01:00
Domen Kožar 0bcfef653f Merge pull request #1726 from urv/master 
calibre: upgrade from 1.21.0 to 1.23.0
 2014-02-11 09:55:39 +01:00
Vladimír Čunát 161d029d7d preferLocalBuild: set to true for wrappers and fetchers 2014-02-10 21:04:17 +01:00
Arvin Moezzi f99f60af32 calibre: upgrade from 1.21.0 to 1.23.0 2014-02-10 20:10:05 +01:00
PkmX 3f30c971c8 Add haskell package 'taffybar' 2014-02-09 06:24:22 +08:00
Thomas Tuegel 4424edccf4 rxvt-unicode: calculate font width correctly 
It is (fairly) well known among rxvt-unicode users that its method of
calculating the width of Xft fonts is not correct. This is the Gentoo
version of the patch which corrects the problem.
 2014-02-05 21:19:57 +00:00
Evgeny Egorochkin ab9dcd9ad0 gphoto2: update from 2.5.2 to 2.5.3 2014-02-04 21:58:25 +02:00
Michael Raskin 546315d933 Update/fix merkaartor to 0.18.1 2014-02-02 12:54:46 +04:00
Rob Vermaas d5b2ea44f3 Merge pull request #1622 from urv/master 
calibre: upgrade from 1.20.0 to 1.21.0
 2014-01-31 01:46:36 -08:00
Petr Rockai 2062abfd4f Merge branch 'yubikey' of git://github.com/Calrama/nixpkgs 2014-01-29 18:54:07 +01:00
Moritz Maxeiner b0d2f0e3f0 Add myself as a maintainer for ykpers and libyubikey 2014-01-29 18:05:17 +01:00
Eelco Dolstra 91ab556236 amdadl-sdk: Don't build on Hydra 
Since it uses requireFile, it won't build.  Likewise for cgminer which
depends on amdadl-sdk.
 2014-01-29 11:53:39 +01:00
Arvin Moezzi 03857fe2ec calibre: upgrade from 1.20.0 to 1.21.0 2014-01-29 02:26:11 +01:00
Petr Rockai 4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Rob Vermaas 3f56d9f4b4 Add keepassx 2.0alpha5, contributed by Thomas Tuegel. 2014-01-27 21:55:04 +01:00
Vladimír Čunát bf8b81f538 lyx: bugfix update 2.0.6 -> .7 2014-01-26 00:59:59 +01:00
Moritz Maxeiner 8f9300fb0e Add ykpers (aka yubikey-personalization) package 2014-01-25 03:17:06 +01:00
Aristid Breitkreuz 5acc2fef25 fix keepassx under gcc 4.8 2014-01-21 22:20:21 +01:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Arvin Moezzi da4dbbfd11 calibre: upgrade from 1.17.0 to 1.20.0 2014-01-19 22:04:41 +01:00
Vladimír Čunát 83a2e8554b spacefm: fix schema-crash (in preferences), nitpicks 
I also did some style changes to be closer to most in nixpkgs.
 2014-01-19 12:11:19 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Peter Simons 2719254e46 ikiwiki: update to version 3.20140102 2014-01-13 17:05:45 +01:00
Peter Simons 7148f50ef3 fetchmail: update to version 6.3.26 2014-01-13 17:05:45 +01:00
Vladimír Čunát a2c316288c Merge master into stdenv-updates 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
 2014-01-12 12:29:24 +01:00
Arseniy Seroka 32e08f53ce spaceFM: add package 2014-01-11 19:25:23 +01:00
Peter Simons 066abcc047 xmobar: re-generate with cabal2nix 2014-01-11 14:52:13 +01:00
Arseniy Seroka 8b95f0ed78 xmobar alsa support 2014-01-11 14:52:13 +01:00
Vladimír Čunát 80396084b9 kde.krusader: fix build with newer gcc versions (-fpermissive) 2014-01-05 11:48:09 +01:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Marius Rejdak 2da33b4ecf tint2 nixpkg 2013-12-29 23:35:46 +01:00
Michael Raskin c356b67ce7 Merge pull request #1414 from coroa/gammu 
Add gammu version 1.33.0 - a library and command line utility for interfacing phones
 2013-12-29 07:02:35 -08:00
Jonas Hoersch 4418c1e1d7 Add gammu version 1.33.0 - a library and command line utility for interfacing phones 2013-12-29 15:13:23 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Arvin Moezzi 8fc2319320 calibre: upgrade from 1.15.0 to 1.17.0 2013-12-25 14:51:08 +01:00
Mathijs Kwik 82131d5013 clucene_core: switch to versioning scheme to make overriding easier 2013-12-23 15:48:35 +01:00
Mathijs Kwik c5d05a5652 jigdo: depend on db4 instead of db45 2013-12-23 10:25:15 +01:00
Nixpkgs Monitor c23bf0548e xterm: update from 281 to 300 2013-12-23 03:27:46 +02:00
Nixpkgs Monitor bb1b1bb1a5 xchm: update from 1.18 to 1.23 2013-12-21 02:28:27 +02:00
Nixpkgs Monitor 3e2fc2338c xfontsel: update from 1.0.2 to 1.0.5 2013-12-21 02:28:27 +02:00
Evgeny Egorochkin c857d90619 nut: update from 2.6.5 to 2.7.1; fix nut-scanner 2013-12-21 02:28:24 +02:00
Nixpkgs Monitor c7a7cfc9d2 calibre: update from 1.14.0 to 1.15.0 2013-12-18 18:18:20 +02:00
Nixpkgs Monitor e66756f350 bitcoin: update from 0.8.5 to 0.8.6 2013-12-18 18:18:19 +02:00
Nixpkgs Monitor b07899be32 bibletime: update from 2.9.1 to 2.9.2 2013-12-18 18:18:19 +02:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/misc/less/default.nix
 2013-12-16 21:13:24 +01:00
Nixpkgs Monitor a49d2ee8b5 hello: update from 2.8 to 2.9 2013-12-15 13:05:36 +02:00
Michael Raskin fc3a316d55 Merge pull request #1361 from iyzsong/ranger 
add ranger 1.6.1
 2013-12-14 22:51:15 -08:00
Nixpkgs Monitor 48949544e5 xlsfonts: update from 1.0.2 to 1.0.4 2013-12-14 00:44:09 +02:00
Jaka Hudoklin faf82de7d2 cgminer: update to 3.7.2 2013-12-13 10:16:16 +01:00
Song Wenwu 85372d5fba add ranger 1.6.1 2013-12-12 11:04:38 +08:00
Nixpkgs Monitor b35d255286 gkrellm: update from 2.3.4 to 2.3.5 2013-12-12 03:11:34 +02:00
Peter Simons 2bc29e4e6d Merge branch 'master' into stdenv-updates. 2013-12-10 22:29:20 +01:00
Arvin Moezzi 36cb2af057 calibre: upgrade 1.13.0 -> 1.14.0 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-12-10 16:45:49 +00:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Andrew Morsillo 3814415be4 Add robomongo, a GUI for exploring mongodb data and building queries. 2013-12-06 19:40:40 +01:00
Lluís Batlle i Rossell e5b0867492 Updating zathura to 0.2.6 2013-12-05 10:44:49 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Nixpkgs Monitor b067405540 kde4.krename: update from 4.0.4 to 4.0.9 2013-12-04 03:12:55 +02:00
Mathijs Kwik 1b5422d611 rxvt_unicode: stop creation of unnecessary symlink 
rxvt will depend on the terminfo output automatically and knows where
to find the terminfo files.
 2013-11-30 11:19:13 +01:00
Arvin Moezzi 95f43b9e8e calibre: upgrade 1.11.0 -> 1.13.0 2013-11-30 03:04:44 +01:00
Peter Simons a9986874c0 xmobar: re-generate expression with cabal2nix 2013-11-26 21:09:21 +01:00
Aristid Breitkreuz 608bfa50ff xmobar: add support for wireless 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-23 15:50:28 +01:00
Rok Garbas b06462f9ec vifm: update 0.7.6 2013-11-23 15:33:43 +01:00
Rok Garbas 6aff4d5ee5 zathuraCollection: update to latest 
girara -> 0.1.9
zathura-core -> 0.2.5
zathura-djvu -> 0.2.3
zathura-pdf-poppler -> 0.2.4
zathura-ps -> 0.2.2
 2013-11-23 15:19:54 +01:00
Michael Raskin 50ee1b2498 Updating Visual Understanding Environment 2013-11-22 10:35:10 +04:00
Arvin Moezzi bb8406b3c0 calibre: upgrade 1.8.0 -> 1.11.0 2013-11-17 19:49:29 +01:00
Evgeny Egorochkin 829b29153b clean up git revision handling in several packages 2013-11-13 12:46:55 +02:00
Bjørn Forsman 25b822db37 gnuradio: new package 
Add GNU Radio, the free & open-source software development toolkit that
provides signal processing blocks to implement software radios.
 2013-11-09 22:16:55 +01:00
Jonas Hoersch a131ce533d fbreader: add meta.platforms attribute 2013-11-09 18:16:17 +01:00
Lluís Batlle i Rossell cadd213230 Making mupdf build in 'release', not 'debug'. 2013-11-06 09:10:51 +01:00
Eelco Dolstra b232825c07 adobe-reader: Update to 9.5.5 2013-11-04 18:46:44 +01:00
Domen Kožar 8274bd331a redshift: add platforms 2013-11-04 12:34:46 +01:00
Peter Simons dac108f51b ikiwiki: update to version 3.20130904 2013-11-01 16:33:59 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-11-01 08:31:54 +01:00
Mathijs Kwik 588db4727c calibre: fix hash 2013-11-01 07:59:11 +01:00
Peter Simons 893282109e haskell-xmobar: update to version 0.19 2013-10-31 09:02:24 +01:00
Arvin Moezzi 162b874469 calibre: upgrade 1.5.0 -> 1.8.0 
from #1144
 2013-10-30 15:44:03 +02:00
Rok Garbas b040814679 changes in: redshift, geoclue, libsoup 
- added support for geoclue for redshift
 - package geoclue 2.0.0 (as geoclue2)
 - package libsoup 2.44.1 (as libsoup_2_40)
 2013-10-29 16:25:31 +01:00
Peter Simons 9eea6c64fb Merge branch 'origin/master' into stdenv-updates. 2013-10-27 10:58:24 +01:00
Rok Garbas ff8e06d4cc redshift: update to 1.8 and fix redshift-gtk script 2013-10-26 19:21:37 +02:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/top-level/all-packages.nix
 2013-10-26 18:28:05 +02:00
Arvin Moezzi 4e60450858 Package urlview 0.9-19 
urlview extracts URLs from text.

Close #1118.
 2013-10-26 12:48:08 +03:00
aszlig 8a0b424296
synergy: Update to new upstream version 1.4.15. 
This is a bugfix release which fixes the following bugs:

 * Synergy Service - Error 87: The parameter is incorrect.
 * Option not supported on Linux: --enable-drag-drop (server not
   starting)

Bug IDs and the announcement can be found at:

http://synergy-foss.org/blog/synergy-1-4-15-released/

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-10-23 17:16:17 +02:00
Peter Simons 757161cb81 xpdf: fix configure-time bug that prevented the man pages from being installed 2013-10-22 13:02:21 +02:00
aszlig c01a5b5442
synergy: Update to version 1.4.14. 
This new upstream release comes with the following changes:

New features:

 * Drag and drop between computers (Windows and Mac)

Fixed bugs:

 * Mac does not wake up
 * Unstable service (synergyd)
 * Exploit: C:\Program.exe (if it exists) is run by service (elevated)
 * Encryption broken (GCM, CTR and OFB)
 * Start button is visible when Synergy is running
 * Apply button is disabled for Mac and Linux

Release announcement with links to detailed descriptions about each
change can be found here:

http://synergy-foss.org/blog/synergy-1-4-14/

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-10-19 22:10:58 +02:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
 2013-10-18 18:57:24 +02:00
Lluís Batlle i Rossell 7f62880468 Updating bitcoin to 0.8.5 2013-10-12 19:06:42 +02:00
Lluís Batlle i Rossell 08e327b284 Updating freicoin to 0.8.3-1. 2013-10-11 21:54:01 +02:00
Mathijs Kwik 79b7f8dc45 rxvt-unicode: use multiple outputs for terminfo 
this is useful for installing the terminfo files to headless/Xless
machines, which currently produce warnings when ssh'ing to them with
urxvt.
 2013-10-11 00:59:12 +02:00
viric 446c6daccd Merge pull request #1052 from offlinehacker/xca 
Add xca, interface for managing keys like RSA or DSA
 2013-10-08 01:56:05 -07:00
Jaka Hudoklin a19bbd49b7 Add xca, interface for managing keys like RSA or DSA 2013-10-08 09:36:03 +02:00
Eelco Dolstra 2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman 083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Bjørn Forsman 28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Mathijs Kwik 0dfab04ef1 calibre: upgrade to 1.5.0 2013-10-04 09:07:45 +02:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Domen Kožar 920b0d910c Merge pull request #1026 from coroa/fbreader 
Add Fbreader, an e-book reader for Linux
 2013-09-30 04:01:58 -07:00
Jonas Hoersch b260d7111a Add fbreader, an e-book reader for Linux 2013-09-29 23:41:57 +02:00
Edward Tjörnhammar 596581914f URxvt: Use 256 colors not just 88. 2013-09-27 22:30:49 +02:00
Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/gettext/default.nix
 2013-09-23 10:59:44 +02:00
Mathijs Kwik edf4f3a7f5 calibre: upgrade to 1.4.0 2013-09-22 20:03:26 +02:00
Lluís Batlle i Rossell 50a1eb53ff Navit update to current svn 2013-09-15 11:39:23 +02:00
Jason \"Don\" O'Conal 9767a725cc djvulibre: fix build on darwin (close #931) 2013-09-14 15:21:35 +02:00
Peter Simons 3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Mathijs Kwik 0021d4495e calibre: upgrade to 1.2.0 2013-09-08 13:36:34 +02:00
Edward Tjörnhammar 485d22f862 Added abook 0.6.0pre2 
Abook is a text-based addressbook program designed to use with mutt mail
client.
 2013-09-06 05:37:28 +02:00
Mathijs Kwik 97ac37f8fd calibre: upgrade to 1.1 2013-09-04 09:28:59 +02:00
Peter Simons 98fcc2f746 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
Rickard Nilsson f90bdd6a09 mupdf: Update to 1.3, and add mupdf.desktop file 2013-08-29 19:29:56 +02:00
Gergely Risko 74d6995f44 Add platforms meta attribute to vanitygen 2013-08-29 00:55:01 +03:00
Peter Simons 9ac8ea937c Merge branch 'origin/master' into stdenv-updates. 2013-08-26 12:21:23 +02:00
Mathijs Kwik 946f219a32 calibre: really fix building on master 
It turns out I hardcoded the output path that qt's tarball extracts.
But that path is versioned (4.8.5 for example).
As I've already merged x-updates on my own system, my qt version was
different (4.8.4 vs 4.8.5). Made the path-guessing more flexible, so
now it should work with any 4.8.*
 2013-08-25 23:42:44 +02:00
Mathijs Kwik 4326c06319 calibre: fix for chroot builds (probably) 2013-08-25 18:16:02 +02:00
Mathijs Kwik c9318f4d2d calibre: upgrade to 1.0 
Upstream insists on using private qt headers.
We do not want nixpkgs' qt to export those.
So I provided a small hack to take them directly from qt's source tarball.
I made sure everything uses the normal system qt and headers, except for the
1 .so file (qt_hack) that needs these private headers.

Because of this, there is barely any increate in size or buildtime.
 2013-08-25 14:31:05 +02:00
Domen Kožar 7837b994bf fix eval 2013-08-21 01:23:40 +02:00
Domen Kožar 8cd9be89fd Merge pull request #849 from bencahill/master 
nvpy: Add platforms
 2013-08-20 15:00:52 -07:00
bencahill f8240030f1 nvpy: Add platforms 2013-08-20 16:56:26 -05:00
Domen Kožar e9ec76b8a7 Merge pull request #743 from bencahill/master 
Add nvpy, a Simplenote syncing note-taking application
 2013-08-20 14:36:41 -07:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +02:00
aszlig a3bd1be27b
redshift: Update to new upstream version 1.7. 
Upstream release notes:

 - Add Geoclue location provider by Mathieu Trudel-Lapierre.
 - Allow brightness to be adjusted (-b).
 - Provide option to set color temperature directly (Joe Hillenbrand).
 - Add option to show program version (-V).
 - Add configure.ac option to install ubuntu icons. They will no longer
   be installed by default (Francesco Marella).
 - config: Look in %userprofile%/.config/redshift.conf on windows platform.
 - Fix: w32gdi: Obtain a new DC handle on every adjustment. This fixes a
   bug where redshift stops updating the screen.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-14 20:50:57 +02:00
Peter Simons e1379d02cb xmobar: disable 'wireless' support 
That particular feature depends on iwlib, which is broken in modern Linux kernels
 2013-08-14 10:03:03 +02:00
Rok Garbas 3c6b2f7501 vifm: update to 0.7.5 and enabling new options 2013-08-10 02:32:21 +02:00
Domen Kožar 6ad9ad6160 pgadmin: 1.10.0 -> 1.16.1, add to channel 2013-08-08 16:49:38 +02:00
Domen Kožar 12cc79f844 dunst: upgrade to git version to fix 100% CPU problems 2013-08-07 14:08:21 +02:00
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +02:00
Jason \"Don\" O'Conal b43d1c014a sdcv: fix build on darwin (close #744) 
* add -lintl flag to NIX_CFLAGS_COMPILE
 2013-07-27 20:00:24 +02:00
Domen Kožar 7d032bc892 Merge pull request #780 from grwlf/urxvt-gdkpixbuf 
urxvt: Enable Gdk_pixbuf to be able to set custom icons/images
 2013-07-26 06:45:22 -07:00
Sergey Mironov 60761e94b8 urxvt: Enable Gdk_pixbuf to be able to set custom icons/images 2013-07-26 17:06:54 +04:00
Domen Kozar f6a60d6640 calibre: upgrade to 0.9.11 (fixes #777) 2013-07-26 13:18:08 +02:00
Lluís Batlle i Rossell 4e94dafa4e nut: adding libtool enables nut-scanner 2013-07-19 16:33:42 +02:00
Lluís Batlle i Rossell b57cdc584a Fixing evtest and updating to 1.31. 
The fetchgit wasn't a fixed-output, so on chroot, it couldn't connect.
 2013-07-19 16:21:15 +02:00
Lluís Batlle i Rossell 328774ab1f Updating qgis (1.8.0 & geos (3.3.8). 
I also add libspatialindex and libspatialite, to get the latest qgis building.
 2013-07-18 11:43:01 +02:00
Gergely Risko 97b64665f5 Use fetchgit for vanitygen instead of fetchurl, github changed something 2013-07-17 12:16:47 +02:00
Evgeny Egorochkin fba8b902da fix packages to use mirror://xorg 2013-07-14 05:39:02 +03:00
Evgeny Egorochkin b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin d0b4c8bfaa gktspell: version bump to 2.0.16 because the old one has disappeared 2013-07-14 03:09:34 +03:00
Benjamin Cahill ba1ed681b6 Add nvpy, a Simplenote syncing note-taking application 2013-07-12 18:09:53 -05:00
Bjørn Forsman 49fccb03e9 slic3r: new package 
Slic3r is a G-code generator for 3D printers.

- Math-Clipper and Boost-Geometry-Utils have been bumped to satisfy
  Slic3r.

- Slic3r has problems with perl 5.16 due to a locale issue (comma vs
  period in floating point numbers). So we use perl 5.14.

- The tests fail, so we skip them. According to the author of Slic3r,
  that should be safe:

    "Tests failed because of a typo when the 0.9.10b tag was applied.
    You can safely ignore the test results, Slic3r will work."

  See https://github.com/alexrj/Slic3r/issues/1303

  For reference, the errors look like this:

    Use of uninitialized value $deg in numeric eq (==) at /tmp/nix-build-perl-slic3r-0.9.10b.drv-0/git-export/t/../lib/Slic3r/TriangleMesh.pm line 328.
    # Looks like your test exited with 255 before it could output anything.
 2013-07-11 01:35:00 +02:00
Peter Simons 1f6fbcb176 ikiwiki: update to version 3.20130518 2013-07-09 16:08:42 +02:00
Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-08 10:48:05 +02:00
Vladimír Čunát 9cf9b24dc4 kde4.rsibreak: fix broken download and homepage 2013-07-01 08:55:55 +02:00
Rob Vermaas f01588653c Update get_iplayer to 2.83, and fix the package. 2013-06-29 20:50:44 +02:00
Vladimír Čunát 38a59aa953 maintainers: change my attrname to be uniform 2013-06-27 20:43:56 +02:00
aszlig 467608f614
synergy: Only pass cryptopp on Linux platforms. 
The second failure, and the last one I'm going to try today:

http://hydra.nixos.org/build/5404634

On the bright side there is at least the fact that version 1.4.10 has failed on
Darwin already, so I guess we don't have a lot of Mac users using Synergy.

Latest (failed) build of 1.4.10:

http://hydra.nixos.org/build/5359408

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 13:46:22 +02:00
aszlig cfd284443e
synergy: Use bundled crypto++ on non-Linux archs. 
Seems that crypto++ in nixpkgs doesn't build on Darwin, so let's use bundled
crypto++ until the version in nixpkgs works well.

This refers to the following build:

http://hydra.nixos.org/build/5404516

Hopefully, this will fix it on Mac OS X, because I don't have a Darwin machine
for testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 13:21:43 +02:00
aszlig 467962b185
synergy: Take over maintenance. 
I'm heavily using synergy for daily work, so I'm most probably going to watch
out for changes/improvements/bugs :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:18:21 +02:00
aszlig 9a37a306b8
synergy: Enable unit tests. 
Integration tests don't seem to work right now, so let's see if we can figure
out a way to enable them later. But at least running unit tests is better than
not running any tests :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:54 +02:00
aszlig d9e0c355a0
synergy: Add support for Xinput2. 
This is needed in order to support devices such as gamepads or tablets.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:53 +02:00
aszlig ea4afb73d8
synergy: Add support for XrandR. 
Nowadays, multiple monitor setups are quite common, so I suppose we'd want
support for that. Especially because users might get confused if synergy is
unable to pick the right screen resolution and thus cause edges to be cut off
from the available pointing area.

The postPatch hook is to force cmake into thinking that we have XRRNotifyEvent,
which we _do_ have with the xrandr version shipped in nixpkgs. Automatic
detection from CMakeLists.txt fails here because it tries to search for the
symbol within the libX11 store path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:53 +02:00
aszlig 57dee2a27e
synergy: Update to new upstream version 1.4.12. 
This brings in support for encryption and thus requires the crypto++ library as
an additional dependency. Unfortunately the upstream integration isn't quite the
way we'd like it to be, so we need to add a small patch to ignore the bundled
version and use the package from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-06-21 12:17:53 +02:00
Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates 
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
 2013-06-20 19:21:25 +02:00
Evgeny Egorochkin 88eff1efac Merge pull request #619 from lovek323/sdcv 
sdcv: add expression
 2013-06-17 16:29:53 -07:00
Vladimír Čunát 6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Peter Simons 12b29fadcb Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-17 10:14:45 +02:00
Jaka Hudoklin 4d76f87c13 Add cgminer: gpu, fpga and asic crypto currencies mining application 2013-06-16 21:51:27 +00:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal 2956b5db46 sdcv: add expression 2013-06-13 22:33:52 +10:00
Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates. 
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
 2013-06-11 12:11:25 +02:00
Andrew Morsillo e1bd332758 Added keepass password manager. Updated mono DLLMap to allow mono to run WinForms applications (keepass). 2013-06-09 23:17:09 +02:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates 
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
 2013-06-08 15:41:39 +00:00
Jack Cummings bbbf625b7d Cherry-picking gphoto update by Jack Cummings, too 2013-06-08 19:32:52 +04:00
Jack Cummings b0cef0b6b8 gphoto2-2.5.2 and libgphoto2-2.5.2 2013-06-07 10:58:39 -07:00
Evgeny Egorochkin 9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00
Peter Simons 14ecb17f61 haskell-xmobar: update to version 0.18 2013-06-05 12:17:35 +02:00
Vladimír Čunát 7cfdfda910 audacity: minor update, prefer system-wide libs 
- Using system-wide libs where we have them (except for portaudio, which
  I couldn't make work).
- Add the soxr library (now the preferred way of audio resampling).
 2013-06-04 11:37:43 +02:00
Peter Simons 5718931dd3 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-06-01 11:48:21 +02:00
Gergely Risko 02c1dd624f Add vanitygen 2013-05-30 12:41:29 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Peter Simons 93d7adcba3 Merge pull request #561 from offlinehacker/st 
st: Update to 0.4.1 and add support for custom config
 2013-05-29 02:16:56 -07:00
Jaka Hudoklin 431fc8b250 st: Update to 0.4.1 and add support for custom config 2013-05-26 12:18:45 +00:00
Peter Simons 728e305205 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-05-22 12:30:02 +02:00
Rob Vermaas d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman 05bb66ce20 Add myself as maintainer for several packages 
And set missing meta.platforms for the packages I've added earlier.
 2013-05-20 20:28:15 +02:00
Peter Simons d35466a1f5 Re-generate Haskell expressions with Hackage4Nix. 2013-05-18 19:32:44 +02:00
Petr Rockai 8151d9594b Add "arbtt" along with its Haskell dependencies. 2013-05-18 13:35:13 +02:00
Lluís Batlle i Rossell d8f9f47e56 Updating xfe (1.34) and fox (1.6.48) 2013-05-17 16:32:25 +02:00
Lluís Batlle i Rossell 6a4350b68f Making xfe find and load icons fine 
I added more dependencies to fox, for that.
I tried to add mesa too, but it wasn't trivial for it to find it, so
I took it out.
 2013-05-16 23:40:26 +02:00
Domen Kozar 6c56602e55 dunst: upgrade, set maintainers, set default config file 2013-05-13 18:48:42 +02:00
Lluís Batlle i Rossell 3810378b79 blender: update to 2.67 2013-05-13 10:03:33 +02:00
Vladimír Čunát 82f5dc59cf lyx: maintenance update, enable check phase 2013-05-13 00:07:15 +02:00
Peter Simons 3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages. 
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
 2013-05-11 00:36:59 +02:00
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
Lluís Batlle i Rossell e64b223c8b freicoin: update to 0.0.2 2013-05-08 22:51:39 +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
Evgeny Egorochkin b0ad529987 K3b: fix to make it build for KDE4.10. 2013-05-07 11:26:37 +03:00
Peter Simons 15716e3659 haskell-xmobar: update to version 0.17 2013-05-05 23:11:23 +02:00
modulistic 185d102b66 pstree: version bump from 2.33 to 2.36 2013-05-05 21:45:06 +02:00
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates 
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
 2013-05-04 18:28:48 -04:00
Vladimír Čunát 8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Peter Simons d2b9e65019 Merge pull request #491 from ierton/zathura-fix-file 
zathura: fix missing [/bin/]file issue
 2013-04-26 10:14:07 -07:00
Sergey Mironov 492645a347 zathura: fix missing [/bin/]file issue 2013-04-26 15:24:16 +04:00
Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates 
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
 2013-04-24 06:29:09 +00:00
Peter Simons 2ffd0b6dac Merge changes from branch 'origin/master' into stdenv-updates. 2013-04-20 22:19:39 +02:00
Vladimír Čunát 7a25aa94cd gphoto*: update for changed libgphoto version 2013-04-20 12:44:05 +02:00
Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
 2013-04-19 11:48:11 +02:00
Vladimír Čunát 8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +02:00
aszlig dcff78f580
taskwarrior: Update to version 2.2.0. 
This update roughly includes the following changes:

 * Spanish es-ES translation
 * New configuration option: print.empty.columns
 * Much improved Asian character support
 * More virtual tags
 * Improved bash completion
 * Task modification time
 * Stats show blocked and blocking tasks
 * New 'blocking' report
 * Additional color rules
 * New helper commands for third-party tools
 * 'columns' command searchable
 * New date shortcuts 'socm' and 'eocm'
 * Improved push/pull messages

For a full list of changes, please head over to:

http://taskwarrior.org/projects/taskwarrior/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-04-08 08:51:46 +02:00
Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Peter Simons 62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-04 00:51:30 +02:00
Peter Simons f3a16d0dd5 update meta.maintainers section 2013-04-01 18:44:33 +02:00
Peter Simons 64f600a010 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-04-01 13:39:57 +02:00
Moritz Ulrich 72a724c0d2 New: yeganesh, a small wrapper around dmenu. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-04-01 12:13:01 +02:00
Domen Kožar c2b44a8da0 Merge pull request #418 from bjornfor/pitz 
pitz: new package
 2013-03-28 09:39:53 -07:00
Bjørn Forsman 4b1042cf02 pitz: new package 
pitz is a distributed bug tracker, inspired by ditz. Homepage:
http://pitz.tplus1.com/

pitz has a command line interface, pitz-<command>, and a webapp,
pitz-webapp.

TODO: pitz has a pitz-shell utility that depends on ipython, but when I
enabled it it raised an exception. I think it depends on an old IPython
version:

  from IPython.Shell import IPShellEmbed
  ImportError: No module named Shell

A broken pitz-shell doesn't affect the rest of the command line
interface nor the webapp, so it is not critical to have it working.

There are not many distributed bug trackers out there, so I hope that
adding pitz to nixpkgs may inspire people to support pitz (or similar
software).
 2013-03-28 17:25:42 +01:00
Peter Simons fdbe2878f0 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-28 14:02:56 +01:00
Domen Kozar 229616de83 set platforms and correct license to synergy 2013-03-28 13:24:37 +01:00
Cillian de Róiste 49b23b29dd Blender: Tidy up, sort inputs, remove unused OPENJPEG option 2013-03-28 01:00:22 +01:00
Cillian de Róiste ca2a39757c Blender: enable extra features in the Video Sequence Editor 
FFMPEG support allows a greater variety of export and import options.
SNDFILE support allows WAV and other sound file formats to be used.
JACK support allows blender to be used with XJadeo, Ardour or any other JACK away audio editor.
 2013-03-28 00:52:08 +01:00
Cillian de Róiste 64bc336f50 Blender 2.66 WIP 2013-03-27 22:25:33 +01:00
Paolo Capriotti 1ff424afaf Update bitcoin-qt to 0.8.1 2013-03-25 13:50:32 +00:00
Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/development/libraries/libxslt/default.nix

Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
 2013-03-25 13:43:45 +01:00
Moritz Ulrich c4ffd2cac9 dunst: Add meta.platforms. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-22 13:00:49 +01:00
Peter Simons 22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-03-21 09:23:54 +01:00
Vladimír Čunát d210a4a8fa goldendict: fix build with gcc47 2013-03-21 00:08:24 +01:00
Moritz Ulrich c2d3d24349 Add dunst, a lightweight notification daemon. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-03-20 21:35:13 +01:00
Peter Simons 4fcb4a1ca1 gv: update to version 3.7.4 2013-03-18 11:36:16 +01:00
Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
 2013-03-17 11:28:28 +01:00
Vladimír Čunát 9ac8a16277 vimprobable2, surf: fix the settings-schemas problem 
Note that they still segfault.
 2013-03-14 16:01:53 +01:00
Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Shea Levy e07a7e6156 Merge branch 'master' of git://github.com/fignuts/nixpkgs 
This updates mysql-workbench. Didn't compile before, compiles now.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 19:01:04 -05:00
Peter Simons d96af07c9f xmobar: patch to support <freeratio> variable in memory monitor 2013-03-08 13:37:58 +01:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Andrew Morsillo 7d4d40e82b Update mysql workbench version 2013-03-06 20:08:30 +01:00
Vladimír Čunát e6143c35e2 Merge pull request #344 from ierton/zathura-improve 
zathura: fix manpages, include .desktop icon
 2013-03-03 05:21:03 -08:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Jordi cf8d64b458 New wraper for surf 2013-03-01 19:53:42 +01:00
Jordi 0d6f6e6d37 Wraper with glib_network 2013-03-01 19:31:00 +01:00
Vladimír Čunát a606eab76e tangogps: fix bad includes 2013-02-28 14:07:50 +01:00
Sergey Mironov 061627feed zathura: fix man pages; include .desktop icon 2013-02-28 12:08:36 +04:00
Sergey Mironov 7cd4a5b0a1 zathura: set myself as a maintainer 
Conflicts:
	pkgs/applications/misc/zathura/default.nix
 2013-02-28 12:07:46 +04:00
Lluís Batlle i Rossell a5192222e9 surf: updating to 0.6 
it didn't work since the libsoup update, and now it doesn't work either.
Let's see after fixing libsoup.
 2013-02-25 21:08:16 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Peter Simons ce9500ea1d grip: update to version 3.3.1 2013-02-23 20:44:23 +01:00
Rok Garbas 5077600d9a zathura: update to 0.2.2 (also plugins), added correct license and myself as maintainer 2013-02-23 11:39:32 +01:00
Rok Garbas e4236f1ade girara: update to 0.1.5, correct license and add myself as maintainer 2013-02-23 11:38:30 +01:00
Vladimír Čunát dd4a846b0f update evince, seems to work now 2013-02-21 21:19:50 +01:00
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
 2013-02-21 11:13:30 -05:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Bjørn Forsman 224a5ea9da Add evtest, a simple tool for input event debugging 2013-02-20 21:17:32 +01:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Peter Simons 9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Peter Simons 33b130ee69 ikiwiki: update to version 3.20130212 2013-02-18 11:11:34 +01:00
Vladimír Čunát 26e4a5561c blender: add the forgotten patch 2013-02-16 18:38:52 +01:00
Vladimír Čunát 08abf5a84a blender: minor update to work with libpng-1.6 
also other fixes needed in order to build
 2013-02-16 18:13:05 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát ee9a5d864c calibre: make build by minor upgrade + new dependencies 
0.9.* won't build: https://bugs.launchpad.net/calibre/+bug/1094719
 2013-02-13 09:18:27 +01:00
Vladimír Čunát 35a927149f Merge branch 'master' into x-updates 
Conflicts (both messed with mesa):
	pkgs/top-level/all-packages.nix
 2013-02-02 21:11:00 +01:00
Vladimír Čunát c4daf6d2b5 djvulibre: minor update, refactored dependencies 2013-01-29 14:55:14 +01:00
Eelco Dolstra 8317cd1f14 kde-3: Remove 
KDE 3 hasn't built in a long time.  Also remove six, the only package
with a dependency on KDE 3.
 2013-01-29 12:43:53 +01:00
Eelco Dolstra 0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Vladimír Čunát 9397f5b25f goldendict: fix missing pkgconfig 2013-01-21 17:49:37 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra eeda226b02 Merge branch 'master' into systemd 2013-01-15 12:11:07 +01:00
Eelco Dolstra 7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Jack Cummings 3fe43187fb urxvt-9.16 2013-01-11 09:28:52 -08:00
Peter Simons b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00