mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 17:41:12 +00:00
Code Issues Wiki Activity
54060 commits 267 branches 125 tags 5.3 GiB
Commit graph

7959 commits

Author SHA1 Message Date
Merlin Gaillard 5ee08d42f1 updated to v0.150.0 and fixed apm LD_LIBRARY_PATH 2014-11-23 14:18:55 +01:00
William A. Kennington III 9a33f806ff synergy: 1.5.1 -> 1.6.1 2014-11-22 20:25:24 -08:00
Eduard Bachmakov 1ac091712f Add gramps package. 
Basic functionality works. No plugins yet (TODO: GExiv2, pyICU, webkit,
osmgsmmap).

Gives error messages about errors in GTK installation regarding
localization. No impact other than the messages visible.
 2014-11-22 22:24:00 -05:00
Eike Kettner 52c311547c add sqliteman package 2014-11-23 01:35:16 +01:00
Jaka Hudoklin a5703dd8fc kubernetes: fix kube-proxy wrapper 2014-11-23 01:24:53 +01:00
Jonathan Rudenberg f5e8b86e29 makemkv: Update 1.8.14 -> 1.9.0 2014-11-22 16:24:39 -05:00
Henry Till d4bd9779dc mr: update to 1.20141024 2014-11-22 09:30:30 -05:00
aszlig aebbc5db01
tomahawk: Propagate phonon_backend_vlc. 
Otherwise it won't work outside of KDE.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-22 05:02:08 +01:00
aszlig 392a4c0a26
Merge branch 'chromium'. 
This introduces Chromium 39 as the new stable version along with a bunch
of fixes.

Fixes #2799, particularily the PDF plugin, which now is open source and
thus no longer an issue.

Also fixes #3219 and merges #2906, so we no longer get a crash while
trying to bring up the print preview dialog.

Thanks to @edwtjo for the CUPS version bump.

 * chromium: Switch to use open-source PDF plugin.
 * cups: bump 1.5.4 -> 1.7.5
 * chromium: Allow env vars for passing plugin paths.
 * chromium: Update all channels to latest versions.
 * protobuf: Clean up and update to version 2.6.1.
 2014-11-22 04:34:16 +01:00
aszlig 7eb4d3a3a9
chromium: Switch to use open-source PDF plugin. 
The Chromium PDF plugin is now available as open source software and is
already included in the Chromium source tree in current stable, so there
is no need to extract it from the Chrome binary package anymore.

See release announcement at http://blog.foxitsoftware.com/?p=641

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-22 04:26:18 +01:00
aszlig 1b84fbf0ca
chromium: Allow env vars for passing plugin paths. 
Introduces environment variables to set plugin base paths. The schema
for these is like NIX_CHROMIUM_PLUGIN_PATH_<N>. Where <N> is the path
type we want to change, the supported (full) variable names are:

 * NIX_CHROMIUM_PLUGIN_PATH_ALL
 * NIX_CHROMIUM_PLUGIN_PATH_PEPPERFLASH
 * NIX_CHROMIUM_PLUGIN_PATH_FILEFLASH
 * NIX_CHROMIUM_PLUGIN_PATH_PDF
 * NIX_CHROMIUM_PLUGIN_PATH_FILE_EFFECTS
 * NIX_CHROMIUM_PLUGIN_PATH_NACL
 * NIX_CHROMIUM_PLUGIN_PATH_PNACL
 * NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE

Whereas NIX_CHROMIUM_PLUGIN_PATH_ALL is the plugin base path for every
path which is not set explicitly, so by setting ..._ALL and not setting
..._WIDEVINE, the widevine plugin will be searched in the directory
specified using ..._ALL.

Right now, the only plugin where this is used is widevine, and it still
doesn't properly work yet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-22 04:26:17 +01:00
aszlig 2495e819aa
chromium: Update all channels to latest versions. 
With this commit, the following new upstream versions are introduced:

stable: 38.0.2125.101 -> 39.0.2171.65
beta:   39.0.2171.19  -> 40.0.2214.10
dev:    40.0.2182.3   -> 41.0.2224.3

We can now remove missing_alg_import.patch, because version 39 is nom
stable and thus fixes the missing include directive upstream.

However, starting with version 40, we hit a few bugs with system
protobuf, so we're disabling it for every version >=40 to avoid
runtime/startup errors.

Here is the stable channel announcement for version 39 on the official
blog:

http://googlechromereleases.blogspot.de/2014/11/stable-channel-update_18.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-22 03:45:10 +01:00
Jaka Hudoklin 99ab2b14b9 Merge pull request #4992 from offlinehacker/pkgs/kubernetes/add 
Add kubernetes
 2014-11-22 00:54:37 +01:00
Cillian de Róiste c9fab7eb97 ardour: update from 3.5.380 to 3.5.403 2014-11-21 23:23:39 +01:00
Shea Levy 5c7c63af66 Add src revision control software 2014-11-21 16:12:33 -05:00
Michael Raskin 4027494334 We had hash for wrong mcabber version and the tarball was cached 2014-11-21 23:39:35 +03:00
Cillian de Róiste e668e2650f guitarix: update from 0.31.0 to 0.32.0 2014-11-21 20:29:43 +01:00
Pascal Wittmann 77fffad1ab calibre: update from 2.10.0 to 2.11.0 2014-11-21 15:40:23 +01:00
Jaka Hudoklin 52b848861a Add kubernetes 2014-11-21 14:34:57 +01:00
jz ba930acc44 add vimus and myself as maintainer 
add vimus to all-packages.nix

should be in haskell-packages.nix not all-packages.nix

i don't think this can be both a library and an executable
 2014-11-20 16:12:38 -07:00
Joachim Schiele 44e3246811 owncloudclient: initial 1.7.0 packaged added 2014-11-20 12:47:47 +01:00
Thomas Tuegel 1286572302 qvim: add ttuegel to maintainers 2014-11-20 05:14:02 -06:00
Thomas Tuegel f383ecb8c4 qvim: upgrade to 20140827 (stable) 2014-11-20 05:14:02 -06:00
David Virgilio df59a24730 new package: pond 2014-11-20 01:18:51 -06:00
Aycan iRiCAN f578c0ce5d emacsPackages.js2-mode updated to latest release. 2014-11-20 00:37:37 +02:00
Domen Kožar 8236ca5d70 properly package pyopenssl 2014-11-19 19:41:44 +01:00
lethalman f0e4b745f7 Merge pull request #5046 from abbradar/checksum-fixes 
Checksum fixes
 2014-11-19 18:02:09 +01:00
Nikolay Amiantov 9c658343dd mutt-with-sidebar: simplify, fix checksum 2014-11-19 19:48:01 +03:00
lethalman 44628e9e90 Merge pull request #5036 from abbradar/sane-mfd-fix 
sane: fix multifunctional devices rights conflict with cups
 2014-11-19 17:29:40 +01:00
Nikolay Amiantov a726dd7697 eaglemode: update and fix 404 2014-11-19 17:37:16 +03:00
Nikolay Amiantov a2efa84ccb praat: update, fix checksum 2014-11-19 15:35:33 +03:00
Nikolay Amiantov bddffb705f gosmore: update, fix checksum 2014-11-19 15:35:33 +03:00
Cray Elliott 825e99808c add a platform to all of my packages 2014-11-19 03:03:00 -08:00
Vincent Laporte 4ec6e0c935 mldonkey: adds license information 2014-11-19 08:26:43 +00:00
Pascal Wittmann fb5dfbdbc7 gource: update from 0.42 to 0.43 and adopt it 2014-11-19 08:47:41 +01:00
Cillian de Róiste 71d1542c2d redshift: update from 1.8 to 1.9.1 2014-11-18 21:52:57 +01:00
Cillian de Róiste aa3ba007c1 mpv: update from 0.6.1 to 0.6.2 2014-11-18 21:52:47 +01:00
Cillian de Róiste 86fd3ad7a4 kde4.digikam: update from 3.5.0 to 4.4.0, potentially fixes CVE-2012-4514 2014-11-18 21:32:58 +01:00
Cillian de Róiste 369ea045de csound: update from 5.19.01 to 6.03.2 2014-11-18 21:31:08 +01:00
Cillian de Róiste 546ece8f25 emacs24Packages.rainbowDelimiters: update from 1.3.12 to 1.3.13 2014-11-18 21:23:41 +01:00
aszlig 84979667f3
Merge branch 'tomahawk'. 
Adds the Tomahawk music player (https://www.tomahawk-player.org/) in
version 0.8.1 and all its required and optional dependencies.

* tomahawk:
  tomahawk: Add new package, version 0.8.1.
  libjreen: Add new package, version 1.2.0.
  websocketpp: Add new package, version 0.4.0.
  lucenepp: Add new package, version 3.0.6.
  qtkeychain: Add new package, version 0.4.0.
  libechonest: Add new package, version 2.3.0.
  quazip: Use qt instead of qt5 for refering to Qt.
 2014-11-18 18:46:26 +01:00
Pascal Wittmann 66359df5a5 Merge pull request #5035 from robberer/pkgs/jmeter 
jmeter: fix download URL
 2014-11-18 17:53:46 +01:00
Rob Vermaas f54c852a36 docker: update from 1.3.0 to 1.3.1, potentially fixes CVE-2014-5277 2014-11-18 16:06:36 +01:00
Longrin Wischnewski 8d2b3e11f3 jmeter: fix download URL 2014-11-18 15:43:09 +01:00
Georges Dubus 7162292c4e Merge pull request #5027 from AndersonTorres/bochs 
Bochs: upgrade to 2.6.7
 2014-11-18 15:01:34 +01:00
Michel Kuhlmann a8dd23a221 saga: update from 2.1.2 to 2.1.4 and re-enable build on x86_64-linux 2014-11-18 14:50:01 +01:00
Max Gonzih 849232f13d Update sha256 for mutt sidebar patch 
Seems like file was changed.
 2014-11-18 14:42:07 +01:00
Pascal Wittmann e89b78cbaa Merge pull request #5029 from sztupi/crashplan 
crashplan: 3.6.3 -> 3.6.4
 2014-11-18 14:32:47 +01:00
Pascal Wittmann a4813b3e5f Merge pull request #5030 from AndersonTorres/tilda 
Tilda: update to 1.2.2
 2014-11-18 14:32:26 +01:00
AndersonTorres 213536568b Tilda: update to 1.2.2 2014-11-18 11:26:02 -02:00
AndersonTorres c7d83e5ee0 Bochs: upgrade to 2.6.7 
Now, with SDL2 upgrade!
 2014-11-18 10:53:40 -02:00
Attila Sztupak 76167c6d15 crashplan: 3.6.3 -> 3.6.4 2014-11-18 12:40:57 +00:00
Pascal Wittmann bb298fb0bf Merge pull request #5020 from svenkeidel/gpodder 
gpodder: update from 3.8.0 to 3.8.3
 2014-11-18 13:40:03 +01:00
Eelco Dolstra c4364d5914 firefox: Update to 33.1.1 2014-11-18 09:56:41 +01:00
Charles Strahan 4d807e55aa sublime3: set rpath for libbz2 and libssl 
This fixes the Package Control package.
 2014-11-18 00:38:36 +00:00
John Wiegley 1825255272 coq_HEAD: update 2014-11-17 17:29:42 -06:00
Sven Keidel 3000c1b1e9 gpodder: update from 3.8.0 to 3.8.3 2014-11-17 21:00:03 +01:00
Mateusz Kowalczyk 43b6d42fbd imapfilter: update from 2.5.6 to 2.5.7 2014-11-17 16:42:28 +00:00
aszlig d31b62d288
tomahawk: Add new package, version 0.8.1. 
Although I've not tested the Tomahawk build on Mac OS X, it *should*
work on it, so I'm using platforms.all here.

Telepathy and KDE support are disabled by default in order to not get in
the way of users who want to use a more minimalistic window-manager-only
setup. But I'm not sure whether it matters in reality, we'll see once
more people are using Tomahawk.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-17 17:04:16 +01:00
John Wiegley adeb4fb56b emacs24Macport: emacs-24.4-mac-5.0 -> emacs-24.4-mac-5.1 2014-11-17 02:49:06 -06:00
Vladimír Čunát 6e75afb5cf pidgin: enableParallelBuilding 2014-11-17 09:27:55 +01:00
Antoine R. Dumont cab722f816 pidgin-with-plugins: fix plugin directories (close #5009) 2014-11-17 09:27:55 +01:00
Vincent Laporte 8227297567 hol_light: update from 199 to 205 2014-11-17 06:53:45 +00:00
Eelco Dolstra b205cdc8d6 hello: Update to 2.10 2014-11-16 22:41:38 +01:00
Aristid Breitkreuz 199e7908a5 emacs-clang-complete-async: fix build (untested, but at least it builds) 2014-11-16 17:12:05 +01:00
Michael Raskin fb76f0fe7d Fix XSane build 2014-11-16 11:28:21 +03:00
Nikolay Amiantov 88d731925d sane: fix multifunctional devices rights conflict with cups 2014-11-16 03:44:37 +03:00
Evgeny Egorochkin 272fe7f81c kde4.konversation: update from 1.5 to 1.5.1 2014-11-15 22:20:16 +02:00
Moritz Ulrich 0fc8d92e53 slic3r: Bump to 1.2.1 
Also adds OpenGL and WxGLCanvas to perlPackages..

OpenGL currently contains some pretty ugly hacks regarding OpenGL
feature-detection. Expect it to fail on different systems.
 2014-11-15 19:22:59 +01:00
Moritz Ulrich c227e8f259 notmuch: Update to 0.19. 
This commit also enables manpages.
 2014-11-15 17:58:40 +01:00
aszlig fdd9d132ca
mpv: Remove waf script from buildInputs. 
Since b23dbb1a5d, if buildInputs contains
a plain file it is used as a setup hook. The waf script which is used
here in mpv however isn't a setup hook and also shouldn't be included in
buildInputs as it was kind of a no-op before already.

Failed build log:

https://headcounter.org/hydra/build/582548/nixlog/1/raw

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-15 16:47:44 +01:00
Nikolay Amiantov 5a5f732d83 epdfview: fix patches' hashes 2014-11-15 16:59:44 +03:00
Michael Raskin a7c8d00b27 Merge pull request #4857 from abbradar/cups2 
[WIP] Improve printing experience and update related packages
 2014-11-15 15:18:35 +03:00
Mateusz Kowalczyk 55ec78eac4 sxiv: update revision 
Mainly to kick off Hydra again: it thinks the build is broken because we
used a SSH URL for git before.
 2014-11-15 01:54:00 +00:00
Vincent Laporte 25a52470f8 pcmanfm: update from 1.2.2 to 1.2.3 2014-11-14 23:28:30 +00:00
Vladimír Čunát c76b399644 vim-configurable: update the patch-version 2014-11-14 23:16:17 +01:00
Vincent Laporte 2995072b53 cmus: update from 2.5.0 to 2.6.0 
Adds CUE and pulseaudio support
 2014-11-14 21:22:26 +00:00
Vladimír Čunát 6d6695ec14 vim: improve *.nix plugin (#4662) 
- Sync syntax from source.
- Add indentation conventions.
 2014-11-14 22:08:31 +01:00
Nikolay Amiantov 237bf5443f epdfview: fix building with cups 2.0 2014-11-14 16:30:38 +03:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
 2014-11-14 14:28:23 +01:00
Pascal Wittmann ea05587309 calibre: update from 2.9.0 to 2.10.0 2014-11-14 14:05:39 +01:00
Pascal Wittmann 16c30d7d70 ettercap: update from 0.8.0 to 0.8.1 and adopt it 2014-11-14 13:03:23 +01:00
Michael Raskin 113961c681 Merge pull request #4978 from abbradar/bitcoin-fix 
bitcoin(d): fix builing on hydra and with boost 1.56
 2014-11-14 00:19:08 +03:00
Vincent Laporte 7361406e20 Adds bluefish 
Bluefish is a powerful editor targeted towards programmers and
webdevelopers, with many options to write websites, scripts and
programming code.

Homepage: http://bluefish.openoffice.nl/
 2014-11-13 19:49:44 +00:00
Nikolay Amiantov 7a5090d794 bitcoin(d): fix builing on hydra and with boost 1.56 2014-11-13 21:12:43 +03:00
Pascal Wittmann 4d59ac9e67 Merge pull request #4977 from 23a1a74/caudec 
Caudec
 2014-11-13 17:50:16 +01:00
Michael Raskin 2126714a84 Merge pull request #4979 from bosu/vim-cscope 
vim_configurable: add cscope support by default
 2014-11-13 19:49:07 +03:00
Michael Raskin 221a78739e Merge pull request #4964 from ehmry/qtbitcointrader 
QtBitcoinTrader: 1.07.98 -> 1.08.02
 2014-11-13 19:42:20 +03:00
_1126 e2bfd40083 caudec: adds new package 2014-11-13 17:32:23 +01:00
Boris Sukholitko 8bc9e80d94 vim_configurable: add cscope support by default 2014-11-13 18:02:14 +02:00
Emery Hemingway d925fcf384 QtBitcoinTrader: 1.07.98 -> 1.08.02 2014-11-13 10:21:30 -05:00
Peter Simons d1cec0c92d haskell-github-backup: update to version 1.20141110 2014-11-13 14:51:36 +01:00
cillianderoiste 81680a17a8 Merge pull request #4214 from manveru/keybase 
keybase-node-client: 0.7.0
 2014-11-13 13:13:14 +01:00
Vincent Laporte 6e737145d7 jEdit: update from 4.4.2 to 5.1.0 2014-11-13 07:53:37 +00:00
Shea Levy 8bc56d5d8e Merge branch 'nix-exec-git' of git://github.com/proger/nixpkgs 2014-11-12 20:04:11 -05:00
Ricardo M. Correia ace49e400c flashplayer: Update from 11.2.202.411 -> 11.2.202.418 2014-11-12 22:31:14 +01:00
Cillian de Róiste f9fddf1e78 yoshimi: update from 1.2.4 to 1.2.5 2014-11-12 20:56:49 +01:00
Vladimir Kirillov 1b9f756e4e git: do not do install-doc when !withManual 2014-11-12 17:36:17 +02:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Eelco Dolstra 19e5c3c306 firefox-13.0: Remove 
It's outdated, insecure and not used anywhere in Nixpkgs.
 2014-11-11 15:37:58 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Vladimír Čunát fb3e83d091 firefox: update to 33.1 2014-11-11 07:46:26 +01:00
taku0 b5a925a972 Update firefox-bin to 33.1 2014-11-11 10:05:33 +09:00
Michael Raskin 98878bc5a0 Link Golly against libperl and libpython so it finds them in runtime 2014-11-10 12:31:29 +03:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
koral bc1166c021 ncmpcpp: removed old beta. 2014-11-09 20:57:48 +01:00
Michael Raskin 7476bca0ea Merge pull request #4909 from k0ral/ncmpcpp 
ncmpcpp: 0.5.10 -> 0.6.1
 2014-11-09 19:37:16 +03:00
Michael Raskin 6d0518fbdf Merge pull request #4282 from sztupi/crashplan 
Crashplan

OK, it is an external service with unfree client, so let's declare that ensuring usability of the service is not our headache.
 2014-11-09 18:09:33 +03:00
Michael Raskin 41ff7d75fd Add mutt sidebar patch — Fixes #3222 (a PR by Leon Waldman) 2014-11-09 17:55:19 +03:00
Peter Simons 820f6f2e4c haskell-git-annex: update to version 5.20141125 2014-11-09 14:59:30 +01:00
Mateusz Kowalczyk 57a84615c6 vite: fix and update package 2014-11-09 12:59:51 +00:00
Michael Raskin 45387d7143 Apparently there is no need to unpack the tarballs on our own as LibreOffice would prefer to unpack them on its own and sometimes fails if we do unpack them 2014-11-09 15:18:12 +03:00
koral 28fbf33554 ncmpcpp: 0.5.10 -> 0.6.1 2014-11-09 13:03:34 +01:00
Aristid Breitkreuz 03400ab9ae Merge pull request #4730 from shdpl/teamviewer 
optional config for teamviewer
 2014-11-09 11:43:16 +01:00
Arseniy Seroka bc7b19111b fix sha for a slim's theme 2014-11-08 22:40:36 +03:00
Peter Simons 7da8ef80a7 emacs-ess: update checksum of the tarball 2014-11-08 18:44:15 +01:00
Vincent Laporte 2e9339891f FileZilla: update from 3.8.1 to 3.9.0.6 2014-11-08 17:27:18 +00:00
Peter Simons 6835392708 Merge pull request #4895 from joachifm/ess-14_09 
ess: bump version to 14.09
 2014-11-08 16:06:52 +01:00
Joachim Fasting 47bc68a687 ess: bump version to 14.09 2014-11-08 16:01:07 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Domen Kožar 555a094326 fix libreoffice build 2014-11-08 14:24:32 +01:00
Arseniy Seroka 5973392f60 gmpc: fix missing dependence 2014-11-08 04:19:52 +03:00
Arseniy Seroka d3bcc4ac98 Merge pull request #4877 from rycee/morituri 
New packages 'morituri' and 'pycdio'
 2014-11-07 23:33:24 +03:00
Robert Helgesson c85b1c63df Add package 'morituri', a CD ripper. 2014-11-07 21:26:53 +01:00
Michael Raskin 0934ddf3e0 Update firefox source build, too 2014-11-07 21:42:45 +03:00
Michael Raskin f5da4dab72 Merge pull request #4873 from taku0/firefox-bin-33.0.3 
Update firefox-bin to 33.0.3
 2014-11-07 20:57:45 +03:00
Moritz Ulrich df995253e3 ledger3: Update to 3.1 
This commit also adds pkgs.ledger2 and pkgs.ledger3 plus a default
attribute pkgs.ledger pointing at ledger3.
 2014-11-07 16:29:15 +01:00
taku0 ffcf930daa Update firefox-bin to 33.0.3 2014-11-08 00:00:13 +09:00
Eelco Dolstra dde6d5708c Add set apacheHttpdPackages containing modules for specific Apache versions 
Similar to linuxPackages etc.
 2014-11-07 12:08:30 +01:00
Peter Simons 69bb66902f emacs-icicles: add current icicles snapshot to emacsPackages 2014-11-07 11:55:57 +01:00
Vincent Laporte fbbd88017f zarith: propagate build input gmp 2014-11-07 09:50:39 +00:00
Pascal Wittmann 647f58bfaf calibre: update from 2.8.0 to 2.9.0 2014-11-07 09:55:21 +01:00
Brian McKenna f8dd99cf83 Add Pinpoint presentation software 2014-11-06 20:50:40 -07:00
Mateusz Kowalczyk b8c561451f haskell-yi: update to version 0.11.1 
cc @peti ; I took the courtesy to cherry-pick your yi-rope update ahead
 2014-11-07 02:51:01 +00:00
Edward Tjörnhammar beb14981bb idea-{community,ultimate}: 14pre -> 14 2014-11-06 21:19:47 +01:00
Vincent Laporte 3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Eelco Dolstra 6f53886360 imagemagick: Use --with-gcc-arch 
Without this, ImageMagick's configure script will generate code
specific to the machine building the package. This code may then fail
on other CPU types.

http://hydra.nixos.org/build/16564129
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-11-06 11:10:32 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/stdenv/generic/default.nix
 2014-11-06 10:16:39 +01:00
Vincent Laporte 6e8a9b8145 wxmaxima: update from 13.04.2 to 14.09.0 2014-11-06 01:41:02 +00:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Vincent Laporte 9ad81702f7 scribus: update from 1.4.3 to 1.4.4 2014-11-05 23:59:11 +00:00
Cillian de Róiste 21f57b8d78 Add tessel: cli tools and node libs for tessel.io devices 2014-11-06 00:54:12 +01:00
Mathijs Kwik 8913f14a5f emacs-idris-mode: upgrade to 0.9.15 2014-11-05 18:28:59 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Eelco Dolstra ebfdfdb7e4 geeqie: Disable libchamplain dependency for now 
It causes Geeqie to depend on both GTK+ 2 and 3, which is undesirable.
 2014-11-05 14:45:52 +01:00
Eelco Dolstra 4942acc0d9 geeqie: Don't use fetchgit 
Fetchgit considered harmful.
 2014-11-05 14:45:49 +01:00
Eelco Dolstra 1aafb0a700 Revert "geeqie: xxd is required as build dependency" 
This reverts commit 852f0bf2d4. Geeqie
builds fine without vim.
 2014-11-05 14:45:20 +01:00
Pascal Wittmann 852f0bf2d4 geeqie: xxd is required as build dependency 2014-11-05 13:52:58 +01:00
Mateusz Kowalczyk 6e726e1348 sxiv: use https 2014-11-05 11:33:45 +00:00
Michael Raskin 91435c5e28 Update ViFM 2014-11-05 11:56:19 +03:00