3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

12641 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice e45c1aad66 simple-scan: 3.19.92 -> 3.20.0 2016-03-20 23:56:15 +01:00
aszlig 5ebd629c6f
chromium: Fix comment of upstream-info.nix
As of 6041cfe, the upstream-info.nix (back then it was called
sources.nix) is no longer in the source/ subdirectory, so we need to fix
that comment to say that the file is autogenerated from update.sh in the
*same* directory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 23:10:13 +01:00
Rommel M. Martinez ae81e1f528 emem: 0.2.14 -> 0.2.15 2016-03-21 04:53:16 +08:00
Pascal Wittmann e5343cd9e6 bitlbee: write pid file to /var/lib/bitlbee/bitlbee.pid
Previously it was written to /var/lib/bitlbee.pid but on
NixOS the user bitlbee has no write access to /var/lib/.
2016-03-20 21:23:53 +01:00
Domen Kožar 1536834ee0 Merge pull request #14066 from jerith666/crashplan-46
crashplan: 3.6.4 -> 4.6.0
2016-03-20 20:10:28 +00:00
aszlig fb65a0048a
chromium: Revert working around --sysroot filter
This reverts commit 5979946c41.

I have tested this by building against the stable version of Chromium
and it seems to compile just fine, so it doesn't seem to be needed
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 21:05:49 +01:00
zimbatm 3f909d8f64 Revert "quassel: 0.12.2 -> 0.12.3"
This reverts commit f2e051b29e.
2016-03-20 19:38:05 +00:00
zimbatm f2e051b29e quassel: 0.12.2 -> 0.12.3 2016-03-20 19:33:53 +00:00
Thomas Tuegel f8ab300767 Merge pull request #14080 from zimbatm/quassel-0.12.3
quassel: 0.12.2 -> 0.12.3
2016-03-20 14:23:31 -05:00
Arseniy Seroka 2d1893899b Merge pull request #14081 from simonvandel/patch-1
kodiPlusings.pvr-hts: fix loading of plugin
2016-03-20 21:53:30 +03:00
Matt McHenry 447c97f929 crashplan: 3.6.4 -> 4.6.0
* the major change is to set TARGETDIR=${vardir}, and symlink from
  ${vardir} back to ${out} instead of the other way around.  this
  gives CP more liberty to write to more directories -- in particular
  it seems to want to write some configuration files outside of conf?

* run.conf does not need 'export'

* minor tweaks to CrashPlanDesktop.patch
2016-03-20 13:56:54 -04:00
aszlig 1f497204f7
chromium: Show status about precompiling .py files
Only a aesthetics thingy, but also corrects the comment, because we're
essentially precompiling .py files, NOT the .pyc files (the latter are
the results).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 18:44:56 +01:00
Joachim Fasting 0e05d552f8 electrum: 2.6.2 -> 2.6.3 2016-03-20 18:09:27 +01:00
aszlig 4f981b4f84
chromium: Move source/default.nix into common.nix
This addresses #12794 so that we now have only a single tarball where we
base our build on instead of splitting the source into different outputs
first and then reference the outputs.

The reason I did this in the first place is that we previously built the
sandbox as a different derivation and unpacking the whole source tree
just for building the sandbox was a bit too much.

As we now have namespaces sandbox built in by default we no longer have
that derivation anymore. It still might come up however if we want to
build NaCl as a separate derivation (see #8560), but splitting the
source code into things only NaCl might require is already too much work
and doesn't weight out the benefits.

Another issue with the source splitup is that Hydra now has an output
limit for non-fixed-output derivations which we're already hitting.

Tested the build against the stable channel and it went well, but I
haven't tested running the browser.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:50:17 +01:00
aszlig 37dbd62a83
chromium: Move fetchurl calls to getChannel
We always do something like "fetchurl channelProduct", so let's move it
to getChannel directly so we can avoid those fetchurl calls all over the
place.

Also, we can still access subattributes from the fetchurl call if we
need to, so there really is no need to expose the product's attributes
directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:13:44 +01:00
aszlig 4984a2bf76
chromium/plugins: Break long line
Yes, I know I'm a bit nitpicky, but lines >80 chars are very ugly if you
have two windows side-by-side.

Thus no feature changes here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:07:28 +01:00
Simon Vandel Sillesen 76ce988c50 kodiPlusings.pvr-hts: fix loading of plugin
The plugin was looking for pvr.hts.so.2.2.13, so as only pvr.hts.so was copied, the plugin would not load. This symlinks all variants of the name to the addons folder.
2016-03-20 17:03:12 +01:00
aszlig 985df3900d
chromium/common.nix: Remove unreferenced attrs
We're going to refactor things anyway, so let's first get rid of
everything that's not used anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 17:01:58 +01:00
zimbatm f48cde5b74 quassel: 0.12.2 -> 0.12.3 2016-03-20 15:55:17 +00:00
aszlig 6041cfe2af
chromium/source: Move update.nix to parent dir
We now should have only the default.nix left in the source directory and
we can start to factor out the pieces into the Chromium main derivation
attributes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:53:08 +01:00
aszlig 2d9a604907
chromium: Rename sources.nix to upstream-info.nix
The "sources.nix" also contains information about where to get binary
packages, so calling it "upstream-info.nix" fits better in terms of
naming.

Also, we're moving it away from the sources dir, because the latter will
soon vanish.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:48:54 +01:00
aszlig d6b11ed722
chromium/source: Move patches into its own subdir
We're going to reference the patches in the Chromium main build rather
than applying it to the sources. So as a first step, this should keep
the patches away from the "source" subdirectory so we can make it flat.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-03-20 16:44:34 +01:00
joachifm 3273605aef Merge pull request #14033 from joachifm/clfswm-broken
Mark clfswm as broken
2016-03-20 15:27:41 +00:00
Peter Hoeg afa4a27a25 dropbox-cli: minor refactoring to play nice with dropbox
We were previously getting collissions for the following
2 files with files from the dropbox package:

 - bin/dropbox
 - share/applications/dropbox.desktop

As a consequence the binary has been renamed to dropbox-cli and
the .desktop removed as it is redundant.
2016-03-20 21:16:49 +08:00
zimbatm 64fe2b5eb6 gitlab: remove unused parameter 2016-03-19 22:04:12 +00:00
Edward Tjörnhammar dcf8c1573b
kodiPlugins.svtplay: 4.0.21 -> 4.0.23 2016-03-19 22:55:41 +01:00
Edward Tjörnhammar cf40f1f8c6
kodiPlugins.steam-launcher: 3.1.1 -> 3.1.4 2016-03-19 22:55:20 +01:00
Edward Tjörnhammar 4422731542
kodiPlugins.salts: 2.0.6 -> 2.0.19 2016-03-19 22:55:07 +01:00
Edward Tjörnhammar c871c625c0
kodiPlugins.hyper-launcher.{plugin,service}: init at 1.2.0 2016-03-19 22:54:52 +01:00
Edward Tjörnhammar 7d0b492731
kodiPlugins.pdfreader: init at 1.0.2 2016-03-19 22:54:37 +01:00
Edward Tjörnhammar 0f3618da1e
kodiPlugins: sort collection alphabetically 2016-03-19 22:54:18 +01:00
Jude Taylor 76947878cb add xautoclick 2016-03-19 13:11:29 -07:00
zimbatm 25122f05b0 Merge pull request #14037 from joachifm/lp_solve-broken
lp_solve: mark as broken
2016-03-19 18:22:05 +00:00
Sven Keidel c2dc5a3e98 eclipse: add eclipse platform 4.5.2 2016-03-19 18:50:20 +01:00
Joachim Fasting 9ae0e6633e clfswm: mark as broken
This package has been broken for quite a long time.  I attempted
to fix it, to no avail.

See also: https://hydra.nixos.org/build/33498133/nixlog/2/raw
2016-03-19 15:52:12 +01:00
Peter Simons 8ef926fcce Merge pull request #14038 from sigma/t/version/git
git: 2.7.3 -> 2.7.4
2016-03-19 15:30:07 +01:00
Joachim Fasting 649c2cd027 lp_solve: mark as broken
See https://hydra.nixos.org/build/32393768/log/raw
2016-03-19 12:46:22 +01:00
Pascal Wittmann de8cc270c1 filezilla: 3.16.0 -> 3.16.1 2016-03-19 11:20:12 +01:00
joachifm ef9efd0d04 Merge pull request #14032 from pdalpra/patch-1
docker: 1.10.0 -> 1.10.3
2016-03-19 09:49:07 +00:00
taku0 9aa6ca99e4 firefox-bin: 45.0 -> 45.0.1 2016-03-19 14:28:10 +09:00
Yann Hodique 31c317e09e git: 2.7.3 -> 2.7.4 2016-03-18 18:07:33 -07:00
joachifm 7e48d80b7d Merge pull request #14001 from romildo/new.catfish
catfish: init at 1.4.1
2016-03-19 00:19:31 +00:00
Arseniy Seroka 4d82228a63 vim: 7.4.827 -> 7.4.1585 2016-03-19 00:21:27 +03:00
Pierre Dal-Pra d97805ccd0 docker: 1.10.0 -> 1.10.3 2016-03-18 22:12:42 +01:00
Arseniy Seroka 1fb354d1ab Merge pull request #14008 from bzizou/scotch
scotch: init at 6.0.4
2016-03-18 22:50:20 +03:00
José Romildo Malaquias 00b5bd3fb3 catfish: init at 1.4.1 2016-03-18 14:43:36 -03:00
Edward Tjörnhammar 5bb0aa3bac
idea.idea-{community,ultimate}: 15.0.4 -> 2016.1 2016-03-18 18:26:23 +01:00
joachifm 8f0cd81708 Merge pull request #14014 from romildo/update.subtitleeditor
subtitleeditor: 0.41.0 -> 0.52.1
2016-03-18 15:00:14 +00:00
José Romildo Malaquias 9929ddd1a9 subtitleeditor: 0.41.0 -> 0.52.1 2016-03-18 09:29:10 -03:00
Tim Steinbach a1dfa5f913 atom: 1.5.4 -> 1.6.0 2016-03-18 08:24:58 -04:00
Bruno Bzeznik Bruno.Bzeznik@imag.fr 75af59f8eb scotch: init at 6.0.4 2016-03-18 10:54:41 +01:00
Franz Pletz cf230c0b37 Merge pull request #14004 from ebzzry/emem-0.2.14
emem: 0.2.13 -> 0.2.14
2016-03-18 10:40:51 +01:00
Rommel M. Martinez 23cdd8e940 emem: 0.2.13 -> 0.2.14 2016-03-18 15:17:45 +08:00
Tobias Geerinckx-Rice 87ca9b9629 lynx: use full version, ‘official’ URI & lib.optionals 2016-03-18 08:03:48 +01:00
joachifm 0c0ed5824a Merge pull request #13989 from puffnfresh/package/hipchat
hipchat: 2.2.1388 -> 4.0.1631
2016-03-18 00:02:41 +00:00
Brian McKenna 411b4a1df1 hipchat: 2.2.1388 -> 4.0.1631 2016-03-18 10:47:03 +11:00
Eelco Dolstra aa6ab92d93 thunderbird: 38.6.0 -> 38.7.0
Lots of security fixes: https://www.mozilla.org/en-US/security/known-vulnerabilities/thunderbird/#thunderbird38.7
2016-03-17 13:24:39 +01:00
Franz Pletz b72d055aa6 Merge pull request #13951 from uralbash/pencil
pencil: 2.0.15 -> 2.0.18
2016-03-17 06:40:52 +01:00
Svintsov Dmitry e8fb05f818 pencil: 2.0.15 -> 2.0.18 2016-03-17 10:06:52 +05:00
Franz Pletz 1cd99b1a48 gitlab: 8.5.5 -> 8.5.7 2016-03-17 03:39:16 +01:00
Domen Kožar bd45d53eaf Merge pull request #13972 from rnhmjoj/popcorntime
popcorntime: 0.3.8-3 -> 0.3.9
2016-03-16 21:12:26 +00:00
rnhmjoj fa683ab455 popcorntime: 0.3.8-3 -> 0.3.9 2016-03-16 21:54:00 +01:00
Peter Simons abcf57a8db git: update from version 2.7.1 to 2.7.3 2016-03-16 21:35:55 +01:00
Tobias Geerinckx-Rice be7253d846 cdrtools: stop installing useless man pages
The installed man{3,4} pages are for silly NIH build tools (!), and
conflict with useful packages like `man-pages`. Drop 'em.
2016-03-16 21:10:20 +01:00
Tobias Geerinckx-Rice d920f67b64 seq24: 0.9.2 -> 0.9.3
Five years in the making. Fixed bugs:
* Fix LASH support (crash on 64 Bit systems)
* Fix broken JACK transport with newer jackd version
* Fix clock tick drift
* Fix jack session commandline (obsolete --file option removed)

General Changes:
* C++11 compatible compiler required
2016-03-16 21:10:20 +01:00
Robert Helgesson 5afb014ffb josm: 9900 -> 9979 2016-03-16 17:01:19 +01:00
Arseniy Seroka 249201fe58 Merge pull request #13964 from nathanielbaxter/dev/keepass
keepass: 2.31 -> 2.32
2016-03-16 18:40:14 +03:00
Nathaniel Baxter 601af249b1 keepass: 2.31 -> 2.32 2016-03-17 02:22:00 +11:00
Arseniy Seroka a3b6bd1ed6 Merge pull request #13963 from devhell/zotero
zotero: 4.0.28 -> 4.0.29
2016-03-16 18:08:31 +03:00
Tuomas Tynkkynen 13eee8e593 Merge pull request #13960 from hrdinka/fix/communi-desktop
communi: fix .desktop file's `Exec` path
2016-03-16 17:07:53 +02:00
devhell e3054a2bde zotero: 4.0.28 -> 4.0.29
Built and tested locally.

From the changelog:
```
Firefox 45/46 compatibility
  * [Zotero Standalone] Save PDFs directly from browsers via the Save to
    Zotero button
  * Requires Chrome connector version 4.0.29; updated Safari connector
    coming soon
  * To convert a standalone PDF attachment to a full item, right-click
    the item and choose “Retrieve Metadata for PDF” or “Create Parent
    Item”.
  * [Zotero for Firefox] Don't show Firefox open/save dialog when
    showing style installation prompt
  * Retry additional file sync failures automatically
  * Fixed potential crash when dragging in files on some systems
  * Fixed potential crash when dragging collections to another library
  * Miscellaneous bibliographic output and word processor integration
    fixes
  * Updated citeproc-js to version 1.1.71
  * Fixed spacing of toolbar icons on Windows/Linux in Firefox 43+
  * Use larger text field for Book Title
  * Make highlight color of selected items list rows on Linux more
    distinct when items pane doesn't have focus
  * [Zotero for Firefox] Improved error message on Firefox login manager
    failure
  * Improved error message when trying to use a later database version
```
2016-03-16 14:48:19 +00:00
Christoph Hrdinka 1f51e3b8af communi: fix .desktop file's Exec path
Changes `Exec` in `communi.desktop` from `/usr/bin/communi` to
`$out/bin/communi`.
2016-03-16 15:30:01 +01:00
Edward Tjörnhammar 929cc074b0 Revert "zotero: patch firefox xpi loading"
Since firefox{,-bin} 45 this patch isn't needed.

This reverts commit a6d3b3f97f.
2016-03-16 13:54:44 +01:00
Vladimír Čunát 9be0c7d463 firefox: disable optimization hack (i686-linux)
It seems to build fine even without it, so the original reason doesn't
hold anymore:
https://github.com/NixOS/nixpkgs/commit/f4b5671b0d9e8904a4ad6b3fd85268
2016-03-16 10:05:09 +01:00
Joachim Schiele f7446f69af stardict-3.0.3: removed abandoned codebase; use goldendict instead 2016-03-16 09:16:31 +01:00
Rommel M. Martinez 59e03ae85e emem: 0.2.12 -> 0.2.13 2016-03-16 08:14:28 +08:00
Pascal Wittmann ba3153ee08 calibre: 2.52.0 -> 2.53.0 2016-03-15 18:56:41 +01:00
joachifm 71655b0b69 Merge pull request #13843 from ambrop72/kdevelop-473
kdevelop: 4.7.1 -> 4.7.3
2016-03-14 21:30:12 +00:00
Graham Christensen 2c8cb42c71 d4x: Update download URL to fedora, d4k.krasu.ru no longer exists 2016-03-14 20:48:17 +01:00
zimbatm 9504992e1d Merge pull request #13897 from nbp/fix-ocaml-pkgs-platform
Ensure that we can evaluate the platform attribute of ocaml packages.
2016-03-14 19:25:40 +00:00
Eelco Dolstra 06bebedf66 Merge pull request #13919 from grahamc/samba
samba: 4.3.1 -> 4.3.6 for CVE-2015-7560 CVE-2016-0771
2016-03-14 17:32:00 +01:00
Graham Christensen ddbb28844d stardict: 3.0.3 is broken by upstream deleting 3.0.3 2016-03-14 10:50:42 -05:00
joachifm 94f7f756b0 Merge pull request #13855 from jraygauthier/jrg/update_smart_git_from_710_to_712
smartgit: 7.1.0 -> 7.1.2
2016-03-14 15:12:30 +00:00
Raymond Gauthier 62f47641b1 smartgithg: 7.1.0 -> 7.1.2
Also fixes broken download link.
2016-03-14 10:27:22 -04:00
Robin Gloster 0713c1c630 Merge pull request #13915 from joachifm/fix-sway
sway: fix build
2016-03-14 15:11:22 +01:00
Damien Cassou 4fd22b6a70 khal: add setuptools_scm to dependencies
This is required because vdirsyncer does not depend on it at runtime
anymore.
2016-03-14 14:41:07 +01:00
Robin Gloster 3f9b00c2d8 Merge pull request #13906 from Zer0-/gitlab_version_bump
Gitlab version bump
2016-03-14 13:29:13 +01:00
Nikolay Amiantov 363f024864 Merge pull request #13861 from abbradar/mjpg-streamer
mjpg-streamer: update and add NixOS service
2016-03-14 15:19:03 +03:00
Joachim Fasting 868082f616 sway: fix build
Building the manual requires docbook_xsl; in sandboxed environments,
the build would fail due to being unable to download missing docbook
resources.

Also include some minor improvements to the build recipe:
- use fetchFromGitHub
- move build-time dependencies to nativeBuildInputs

xref: https://github.com/NixOS/nixpkgs/pull/13900
2016-03-14 13:02:01 +01:00
Vincent Laporte 13c6b9ba85 zim: 0.63 -> 0.65 2016-03-14 12:06:18 +01:00
joachifm cdd78ce133 Merge pull request #13874 from joachifm/transmission-cli
transmission: build transmission-cli
2016-03-14 10:25:25 +00:00
Tobias Geerinckx-Rice 11c486cd19 simple-scan: 3.19.91 -> 3.19.92 2016-03-14 03:42:12 +01:00
zimbatm 34721289d9 Merge pull request #10219 from jraygauthier/jrg/digikam_improvement_rebased_head
digikam: improvements
2016-03-13 23:57:24 +00:00
Philipp Volguine a2424fffd3 Gitlab package version 8.5.1 -> 8.5.5
-had to bump the versions on a few gem dependencies
2016-03-13 21:05:11 +00:00
Edward Tjörnhammar 7da494b8ae qtox: 1.2.4 -> 1.3.0 2016-03-13 21:36:30 +01:00
Nicolas B. Pierron 72c6f8a140 Ensure that we can evaluate the platform attribute of ocaml packages. 2016-03-13 19:08:26 +00:00
zimbatm 94774a717b Merge pull request #13889 from frlan/Update/Geany/1.27
geany: 1.26 -> 1.27
2016-03-13 18:29:18 +00:00
Frank Lanitz 9d34f2054d geany: 1.26 -> 1.27
Also adding myself as list of maintainers
2016-03-13 18:41:08 +01:00
宋文武 93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Joachim Fasting 1b3d974c98 electrum: 2.6.1 -> 2.6.2 2016-03-13 16:58:41 +01:00