Commit graph

17661 commits

Author SHA1 Message Date
ndowens 736ee61442 dashpay: 0.12.055 -> 0.12.1.3 (#23761)
- fixed mistype
- Cosmetic change; camelCase
- removed gui option, causes build issue
- cmake flag issue fixed
2017-03-19 18:41:36 +01:00
Frank Lanitz 01f706b30b Geany: 1.30 -> 1.30.1 2017-03-19 18:39:39 +01:00
Joachim F 575cf2e17f Merge pull request #24035 from ndowens/leocad
leocad: 0.81 -> 17.02
2017-03-19 18:22:59 +01:00
Nathan Isom b82f3f6943 mpvc: init at unstable-2017-03-18 (#24037)
* mpvc: init at unstable-2017-03-18

* mpvc: simplify build

* mpvc: add maintainer
2017-03-19 18:17:52 +01:00
Daiderd Jordan 6653d9f812 Merge pull request #24048 from dhess/emacs-macport-fix
emacs25Macport: fix for new macOS 10.10 frameworks.
2017-03-19 18:15:12 +01:00
ndowens 26187da45c Merge pull request #24038 from ndowens/openimageio
openimageio: 1.6.11 -> 1.7.12
2017-03-19 12:12:40 -05:00
Drew Hess b800655639
emacs25Macport: fix for new macOS 10.10 frameworks.
See https://github.com/NixOS/nixpkgs/pull/23907#issuecomment-286627100.
2017-03-19 18:11:21 +01:00
ndowens de494f5842 Merge pull request #24060 from ndowens/awesomewm
awesomewm: 4.0 -> 4.1
2017-03-19 12:09:30 -05:00
Pascal Wittmann 23e1bcabd0 Merge pull request #24061 from danielfullmer/rclone-1.36
rclone: 1.35 -> 1.36
2017-03-19 17:12:37 +01:00
Daniel Fullmer 8e8302cc1f rclone: 1.35 -> 1.36 2017-03-19 11:56:59 -04:00
ndowens 6a851cde94 awesomewm: 4.0 -> 4.1 2017-03-19 10:26:22 -05:00
ndowens 20e62c3b76 Merge pull request #24030 from ndowens/fontmatrix
fontmatrix: Changed URL & homepage; they no longer exist
2017-03-19 10:03:34 -05:00
ndowens cb231786af Merge pull request #24033 from ndowens/glabels
glabels: 3.2.1 -> 3.4.0
2017-03-19 10:03:06 -05:00
ndowens 1b3dda03c7 Merge pull request #24022 from ndowens/shout
shout: 0.51.1 -> 0.53.0
2017-03-19 09:59:35 -05:00
Robin Gloster 9c7b771a6e
rapidsvn: fix build 2017-03-19 15:55:19 +01:00
Frederik Rietdijk a4e7e0d3c1 Merge pull request #24025 from ndowens/ahoviewer
ahoviewer: 1.4.6 -> 1.4.8
2017-03-19 15:06:44 +01:00
Frederik Rietdijk b1f7157675 Merge pull request #24024 from ndowens/alchemy
alchemy: 007 -> 008
2017-03-19 15:06:13 +01:00
Frederik Rietdijk 6405cb2ea9 Merge pull request #24034 from ndowens/jpegoptim
jpegoptim: 1.4.3 -> 1.4.4
2017-03-19 15:04:18 +01:00
Frederik Rietdijk 67a6eb6021 Merge pull request #24039 from ebzzry/emem-0.2.43
emem: 0.2.42 -> 0.2.43
2017-03-19 15:03:04 +01:00
ndowens 64a880faa6 djview: 4.10.5 -> 4.10.6 (#24029) 2017-03-19 14:40:15 +01:00
Daiderd Jordan de96020789 Merge pull request #24031 from neeasade/add-xrq
xrq: init at d5dc19c63881ebdd1287a02968e3a1447dde14a9
2017-03-19 14:14:12 +01:00
ndowens 705b2d9b66 feh: 2.18.1 -> 2.18.2 2017-03-19 10:45:52 +01:00
Michael Raskin d860d9aedf Merge pull request #24043 from ndowens/potrace
potrace: 1.13 -> 1.14
2017-03-19 09:59:18 +01:00
Benjamin Staffin 85af430be3 Merge pull request #24046 from ndowens/gthumb
gthumb: 3.4.4 -> 3.5.1
2017-03-19 03:47:10 -04:00
Benjamin Staffin 3effae81f1 Merge pull request #24044 from ndowens/pqiv
pqiv: 0.12 -> 2.8.3
2017-03-19 03:44:24 -04:00
Benjamin Staffin 3b762fb201 Merge pull request #24049 from ndowens/rapcad
rapcad: 0.9.5 -> 0.9.8
2017-03-19 03:42:54 -04:00
Benjamin Staffin 1fe9860958 Merge pull request #24041 from neeasade/add-colort
colort: init at unstable-2017-03-13
2017-03-19 03:41:29 -04:00
Benjamin Staffin 14d676dfcf
colort: PR tweaks 2017-03-19 03:39:40 -04:00
Benjamin Staffin e32d5a8f56 Merge pull request #24042 from romildo/upd.windowmaker
windowmaker: 0.95.7 -> 0.95.8
2017-03-19 03:33:38 -04:00
Shane Pearlman 63bd364cf9 htmldoc: add darwin support
I also added a long description and updated the homepage to point to
the author’s new github.io site.
2017-03-18 21:44:55 -07:00
ndowens ec85bdb6c6 rapcad: 0.9.5 -> 0.9.8 2017-03-18 22:39:18 -05:00
ndowens 8a8b80d289 gthumb: 3.4.4 -> 3.5.1 2017-03-18 21:52:04 -05:00
ndowens 237ac13370 pqiv: 0.12 -> 2.8.3 2017-03-18 21:20:23 -05:00
Daiderd Jordan 0f4d515834 Merge pull request #24027 from neeasade/add-meh
meh: init at 0.3
2017-03-19 03:17:52 +01:00
ndowens 56504fcb2c potrace: 1.13 -> 1.14 2017-03-18 21:11:39 -05:00
neeasade 78a0bdfa98 meh: init at unstable-2015-04-11 2017-03-18 21:11:22 -05:00
romildo afcea0c27a windowmaker: 0.95.7 -> 0.95.8 2017-03-18 23:08:14 -03:00
neeasade 9eed726b4f colort: init at unstable-2017-03-13 2017-03-18 20:59:09 -05:00
Peter Hoeg f4f29bcd8b handbrake: 0.10.5 -> 1.0.3 2017-03-19 09:48:22 +08:00
Rommel M. Martinez 8f9e2c6e6b emem: 0.2.42 -> 0.2.43 2017-03-19 09:25:58 +08:00
ndowens f5d6dd6e83 openimageio: 1.6.11 -> 1.7.12 2017-03-18 20:22:54 -05:00
ndowens 7b1e1f3cd7 leocad: 0.81 -> 17.02 2017-03-18 19:32:30 -05:00
ndowens 7364b6c252 jpegoptim: 1.4.3 -> 1.4.4 2017-03-18 19:09:17 -05:00
Michael Raskin 203e8fa205 wtftw: init at 0.0pre20161001; patch mostly by @kcomplexes 2017-03-19 01:08:11 +01:00
neeasade 1ef5a38108 xrq: init at unstable-2016-01-15 2017-03-18 18:52:00 -05:00
ndowens 3dfd03b382 glabels: 3.2.1 -> 3.4.0 2017-03-18 18:38:47 -05:00
ndowens 4024c6354e fontmatrix: Changed URL & homepage; they no longer exist 2017-03-18 18:30:57 -05:00
ndowens 35e7df6bee ahoviewer: 1.4.6 -> 1.4.8 2017-03-18 16:42:47 -05:00
ndowens 98b9b07a98 alchemy: 007 -> 008 2017-03-18 16:38:41 -05:00
Michael Raskin 7960739f86 Merge pull request #24023 from ndowens/pythonmagick
pythonmagick: 0.9.14 -> 0.9.16
2017-03-18 22:33:54 +01:00
Michael Raskin 081557a66e Merge pull request #23597 from orivej/psi-plus
psi-plus: init at 0.16.572.639
2017-03-18 22:33:31 +01:00
ndowens f6bae24590 pythonmagick: 0.9.14 -> 0.9.16 2017-03-18 16:27:12 -05:00
Orivej Desh cea6a24bfc psi-plus: enable plugins 2017-03-18 21:19:57 +00:00
Orivej Desh 48bd3ae648 psi-plus: switch to qt5 2017-03-18 21:19:57 +00:00
Orivej Desh f812e39fb4 psi-plus: init at 0.16.575.639 2017-03-18 21:19:54 +00:00
Daiderd Jordan a48df6fba6 Merge pull request #22508 from matthewbauer/remove-emacs24macport
emacs24macport: remove
2017-03-18 22:19:20 +01:00
ndowens d016d4fea2 shout: 0.51.1 -> 0.53.0 2017-03-18 16:05:56 -05:00
Michael Raskin 28eb668131 libreoffice-fresh: 5.3.0.3 -> 5.3.1.2 2017-03-18 21:27:31 +01:00
Michael Raskin 219ae809a3 Merge pull request #23998 from ndowens/owncloudclient
owncloud-client: 2.2.3 -> 2.3.0
2017-03-18 20:16:34 +01:00
Michael Raskin 6959a1d156 Merge pull request #23997 from ndowens/trans-gtk
transmission-remote-gtk: 1.2 -> 1.3.1
2017-03-18 20:09:09 +01:00
Michael Raskin 242abd815c Merge pull request #23969 from jlesquembre/hyper_1.3.1
hyper: 0.8.3 -> 1.3.1
2017-03-18 20:03:59 +01:00
Michael Raskin 79ef974ff4 Merge pull request #23829 from sleexyz/bitwig-studio
bitwig-studio: 1.3.12 -> 2.0
2017-03-18 19:56:59 +01:00
Michael Raskin 9098a52311 Merge pull request #23745 from PierreR/albert
albert: fix #23710
2017-03-18 19:24:02 +01:00
Michael Raskin 87f7ef87fe Merge pull request #23722 from joachifm/surf-webkit2
surf-webkit2: init at 2017-03-06
2017-03-18 19:18:35 +01:00
Michael Raskin 68cf4d1dfc Merge pull request #23677 from bcdarwin/c3d
c3d: init at 1.1.0
2017-03-18 19:07:09 +01:00
Michael Raskin dfbd2dd659 Merge pull request #23624 from volth/virt-viewer-5.0
virt-viewer: 2.0 -> 5.0
2017-03-18 19:05:11 +01:00
Tuomas Tynkkynen 5658324d82 neovim: Fix eval error
Not sure at all if this is the right thing to do. cc @edanaher
2017-03-18 20:01:15 +02:00
Michael Raskin 4d5f33deff Merge pull request #23376 from bcdarwin/ants
ANTs: init at 2.1.0 (0gyys1lf) and update ITK accordingly
2017-03-18 18:42:24 +01:00
Michael Raskin 846b6d250a Merge pull request #23256 from edanaher/ensime
Ensime
2017-03-18 18:24:19 +01:00
Frederik Rietdijk 2478f7b92c kdelibs: remove sanitize patch
because its included in 4.14.30 which was part of Applications 16.12.3.
https://github.com/NixOS/nixpkgs/pull/23992#issuecomment-287553865
2017-03-18 17:46:36 +01:00
Michael Raskin bbeaf8abf6 Merge pull request #23081 from Kendos-Kenlen/rubymine
RubyMine
2017-03-18 17:22:11 +01:00
Michael Raskin b89d66a198 Merge pull request #23062 from spacefrogg/ptask
ptask: init at 1.0.0
2017-03-18 17:21:13 +01:00
Michael Raskin e8d7014dac Merge pull request #22722 from patternspandemic/kodestudio
kodestudio: init at 17.1
2017-03-18 17:18:10 +01:00
Frederik Rietdijk e67b979ab5 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-18 15:32:43 +01:00
Daiderd Jordan 7d81be90c2 Merge pull request #23569 from LnL7/darwin-idutils
idutils: disable tests on darwin
2017-03-18 13:26:25 +01:00
Robin Gloster 4e2f802ce8
gnome_mplayer: fix src and build 2017-03-18 12:47:57 +01:00
Michael Raskin 54aff5c3a7 Merge pull request #23999 from ndowens/salut-a-toi
salut-a-toi: 0.2.0 -> 0.6.1
2017-03-18 11:43:54 +01:00
Vladimír Čunát 742b120ddc
Merge branch 'master' into staging
Nontrivial rebuilds from master, again :-/
2017-03-18 11:00:31 +01:00
Frederik Rietdijk 553964ca71 Merge pull request #23976 from ebzzry/emem-0.2.42
emem: 0.2.41 -> 0.2.42
2017-03-18 10:33:02 +01:00
Frederik Rietdijk b0ba94310d Merge pull request #23959 from LnL7/znc-1.6.5
znc: 1.6.4 -> 1.6.5
2017-03-18 09:29:22 +01:00
Frederik Rietdijk ce9576dc47 Merge pull request #24001 from ndowens/mpop
mpop: 1.2.4 -> 1.2.6
2017-03-18 09:10:42 +01:00
Peter Hoeg ee20e89644 virtmanager-qt: 0.39.60 -> 0.42.67 2017-03-18 12:32:49 +08:00
obadz 17bfb6a08a citrix-receiver: add link to webpage with all versions and adjust to change in nix-prefetch-url
Helps with #23975
2017-03-18 02:18:28 +00:00
Joachim F 5d51f1d7b1 Merge pull request #24000 from taku0/firefox-bin-52.0.1
firefox, firefox-bin: 52.0 -> 52.0.1, firefox-esr: 52.0esr -> 52.0.1esr [Critical security fix]
2017-03-18 02:32:27 +01:00
ndowens 8ef05d3010 mpop: 1.2.4 -> 1.2.6 2017-03-17 20:02:23 -05:00
Benno Fünfstück a4d6e2cf16 atom: avoid using LD_PRELOAD. Fixes glibc compat issues
The wrapper for Atom was loading libraries via LD_PRELOAD, for example
libxkbfile. Now, if you installed atom via nix-env and happened to use a newer
nixpkgs for that than what your system environment is build against, you could
end up with an error like this:

```
uname: relocation error:
/nix/store/68sa3m89shpfaqq1b9xp5p1360vqhwx6-glibc-2.25/lib/libdl.so.2:
symbol _dl_catch_error, version GLIBC_PRIVATE not defined in file libc.so.6
with link time reference
```

This happens because atom calls the `uname` executable from the system to
determine the platform. Because that inherits the `LD_PRELOAD` environment
variable, so the libxkbfile library that the `atom` wrapper was build against
is loaded into `uname`. But since `atom` comes from `nix-env`, the `libxkbfile`
it was built with might be compiled against a newer version of `glibc` than
`uname`, which comes from the system, was! Having two versions of glibc loaded
into the same processes results in chaos.

To fix this, we avoid setting `LD_PRELOAD` and instead use patchelf to set the
correct RPATH. RPATH is not inherited by child processes, so the above issue
can no longer occur.

The only small complication here is that the library that actually loads
libxkbfile is not the atom binary itself, but a node extension that atom uses.
So instead of setting the RPATH on `atom` only, we also set the `rpath` on all
node extensions (`*.node`) the output.
2017-03-18 01:51:36 +01:00
ndowens d26775fce7 salut-a-toi: 0.2.0 -> 0.6.1
salut-a-toi: Removed un-needed python variable in function
2017-03-17 19:50:04 -05:00
taku0 a038f91871 firefox-esr: 52.0esr -> 52.0.1esr 2017-03-18 09:36:27 +09:00
taku0 3f175876e8 firefox, firefox-bin: 52.0 -> 52.0.1 2017-03-18 09:36:12 +09:00
ndowens 8b23d535d3 owncloud-client: 2.2.3 -> 2.3.0 2017-03-17 17:53:41 -05:00
Nikolay Amiantov a8785daf0e emacs: fix runtime GTK3 dependencies
Fixes #23845.
2017-03-18 01:32:42 +03:00
ndowens fbe960a635 transmission-remote-gtk: 1.2 -> 1.3.1 2017-03-17 17:31:59 -05:00
Thomas Tuegel 73ccc49448 Merge pull request #23992 from ttuegel/kde-applications-16.12.3
KDE Applications: 16.12.2 -> 16.12.3
2017-03-17 15:40:42 -05:00
Daiderd Jordan 908e3ffd65
znc: 1.6.4 -> 1.6.5 2017-03-17 21:02:01 +01:00
Rommel M. Martinez dbee6b6ef8 emem: 0.2.41 -> 0.2.42 2017-03-18 01:39:03 +08:00
Emery Hemingway fa65cc067b
xaster: init at release 208 2017-03-17 12:09:37 -05:00
Robin Gloster 427edf1e5d
robomongo: mark as broken 2017-03-17 16:45:37 +01:00
Tim Steinbach f1c2d047ed Merge pull request #23872 from NeQuissimus/docker_17_03_0
docker: 1.13.1 -> 17.03.0-ce
2017-03-17 10:07:04 -04:00
rnhmjoj 918f331104
firefox: reenable ALSA backend 2017-03-17 14:43:27 +01:00
Sean Lee 579219db49 bitwig-studio: 1.3.12 -> 2.0 2017-03-17 09:33:10 -04:00
Peter Hoeg c216a71215 terraform: use generic builder and add 0.9.0 (#23979) 2017-03-17 09:05:16 +00:00
Daiderd Jordan 6f226a8725 Merge pull request #23954 from jbaum98/pdfpc-darwin
pdfpc, libgee_0_8: Add darwin support
2017-03-17 07:59:41 +01:00
José Luis Lafuente b2a37a7986
hyper: 0.8.3 -> 1.3.1 2017-03-17 01:36:12 +01:00
Marti Serra b760bfd9f6 clementine: added switches for optional dependences (#23730)
Added switches for ipod, mtp, cd and cloud support.

The switch for ipod support, specifically, allows users to build it without libplist, wich is currently marked as insecure.
2017-03-17 00:47:37 +01:00
patternspandemic bb728268b5
kodestudio: init at 17.1 2017-03-16 15:50:01 -07:00
Jörg Thalheim 989c7c7812 Merge pull request #23823 from orivej/qmetro
qmetro: init at 0.7.1
2017-03-16 21:11:00 +01:00
Jörg Thalheim 9ae51deffa Merge pull request #23886 from dtzWill/fix/timewarrior-install-docs-themes
timewarrior: patch to install all themes; use default install target.
2017-03-16 18:48:53 +01:00
Jörg Thalheim b3c14bbf03 Merge pull request #23919 from pradeepchhetri/nomad-v0.5.5
nomad: 0.5.4 -> 0.5.5
2017-03-16 18:27:32 +01:00
Jörg Thalheim 8e6247844b Merge pull request #23911 from Mic92/taskjuggler
taskjuggler: remove 2.x series
2017-03-16 18:24:39 +01:00
Volth fd61a33d2b icewm: fix CFGDIR 2017-03-16 16:43:33 +00:00
Jake Waksbaum 12da885e45
pdfpc: Add darwin support 2017-03-16 12:21:14 -04:00
Jörg Thalheim 7f6d92356b Merge pull request #23939 from ebzzry/emem-0.2.41
emem: 0.2.40 -> 0.2.41
2017-03-16 16:18:36 +01:00
Jörg Thalheim 8b8ee6c450 Merge pull request #23948 from rbasso/sc-im-bump-to-v0.5.0
sc-im: 0.4.0 -> 0.5.0
2017-03-16 13:55:33 +01:00
rbasso 4f531a1d2b sc-im: 0.4.0 -> 0.5.0
- Bump version to 0.5.0
- Enable support for reading '.xls' and '.xlsx' files.

The support for reading Excel files depends on:
  - libxml2, which was already a build input.
  - libzip
  - libxls
2017-03-16 20:45:00 +09:00
Kamil Chmielewski df3044cb2e chromium: flashplayer: 24.0.0.221 -> 25.0.0.127
[Critical security fix]
https://github.com/NixOS/nixpkgs/pull/23889
2017-03-16 12:00:17 +01:00
Rommel M. Martinez 9b0a175af9 emem: 0.2.40 -> 0.2.41 2017-03-16 06:52:19 +08:00
NWDD a8f269d014
gitkraken: 2.1.0 -> 2.2.0
also added myself as a maintainer
2017-03-15 23:37:18 +01:00
Nikolay Amiantov 545e267adf wireshark-gtk: wrap properly 2017-03-16 00:53:42 +03:00
Rommel M. Martinez ef56873e98 emem: 0.2.35 -> 0.2.39 2017-03-15 23:48:59 +02:00
Vladimír Čunát e99bc64552
Merge branch 'master' into staging
More larger rebuilds from master, unfortunately.
2017-03-15 19:09:56 +01:00
Leon Isenberg 6505c6e3df keepass-keeagent: init at 0.8.1
[Bjørn: change fetchurl indent 4 -> 2 spaces.]
2017-03-15 17:55:57 +01:00
Vladimír Čunát 9adcebb1a9
Merge #23917: fix firefox crashes 2017-03-15 17:01:32 +01:00
Daniel Peebles d78f3de21b Merge pull request #23907 from copumpkin/update-frameworks
Update macOS frameworks from 10.9 to 10.10
2017-03-15 11:22:55 -04:00
Shea Levy 0c928f4a1d terragrunt: Set the version variable properly 2017-03-15 11:01:09 -04:00
Pradeep Chhetri 8d83fbe439 nomad: 0.5.4 -> 0.5.5 2017-03-15 18:55:03 +05:45
David McFarland c037f54ffb firefox: fix debugBuild = true 2017-03-15 08:49:56 -03:00
Mogria 1893ed54dc sublime3: fix hardcoded /bin/bash when executing commands for build systems (#23561)
* sublime3: replace hardcoded /bin/bash with /usr/bin/env

exec.py in Default.package-sublime calls /bin/bash with subprocess.
See Issue #12011. Because of this builds could not be started from
withtin Sublime Text.

* sublime3: use wrapped of bash to fix internal build system

Without the wrapped version of bash (a symlink to $bash/bin/bash)
with LD_PRELOAD to glibc an relocation error occurs when trying
to run builds from within Sublime Text 3.  See Issue #12011.
2017-03-15 11:32:44 +01:00
Jörg Thalheim 61f20c94ca
taskjuggler: remove 2.x series
The version was released 8 years ago and does not build anymore
2017-03-15 10:32:55 +01:00
Dan Peebles dc61ff31a7 xhyve: update and fix to use our Hypervisor framework
(this is a cherry-picked version of f3b65f67d9,
which got reverted because it depended on my 10.11 frameworks, which were
flawed)
2017-03-14 22:38:35 -04:00
Charles Strahan f5ccf24028 Merge pull request #23737 from bendlas/update-chromium
chromium: 56.0.2924.87 -> 57.0.2987.98 [Security]
2017-03-14 20:39:06 -04:00
Marius Bergmann 2876cd7e98 inspectrum: 20160403 -> 20170218 2017-03-14 23:42:18 +01:00
Shea Levy 5fa84fb1a8 terra{form,grunt}: Add some needed old versions 2017-03-14 16:31:08 -04:00
Jörg Thalheim d6f586bbff
git-octopus: init at 1.4 2017-03-14 21:01:10 +01:00
Robert Helgesson 5228bc9f2e
eclipses: add dependencies as build inputs
Having `glib` in the build inputs will allow its build hook to
trigger. Also adds `gsettings_desktop_schemas` as a dependency since
Eclipse appears to need the schemas under certain circumstances.
2017-03-14 20:38:04 +01:00
Nick Hu 4e439b2393 qutebrowser: 0.9.1 -> 0.10.1 2017-03-14 20:19:25 +03:00
taku0 c3772678e9 flashplayer: 24.0.0.221 -> 25.0.0.127 (#23889) 2017-03-14 16:02:08 +01:00
Robin Gloster f70a896094
hol: mark as broken 2017-03-14 15:36:06 +01:00
Peter Simons 58807f75bc esniper: 2.32.0 -> 2.33.0 2017-03-14 14:15:29 +01:00
Will Dietz dc32b87082 timewarrior: patch to install all themes; use default install target. 2017-03-14 07:54:32 -05:00
zimbatm b63aab2433 slack: 2.5.1 -> 2.5.2 2017-03-14 12:39:16 +00:00
Tim Steinbach aed4918795
docker: 1.13.1 -> 17.03.0-ce 2017-03-14 08:02:35 -04:00
Benjamin Staffin d96cde35b7 Merge pull request #23840 from WilliButz/master
spotify: get source via https instead of plain http
2017-03-14 06:13:47 -04:00
Nick Novitski 1e8476c5b6 links2: build on all unix platforms 2017-03-14 18:55:52 +13:00
Volth d4294265fd virt-viewer: 2.0 -> 5.0 2017-03-14 04:54:11 +00:00
Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
Joachim F 40c1406b18 Merge pull request #23856 from mdorman/emacs-updates
Automated emacs package updates
2017-03-13 23:33:01 +01:00
Tim Steinbach 2d1ea867b7 Merge pull request #23866 from mimadrid/update/bluefish-2.2.10
bluefish: 2.2.9 -> 2.2.10
2017-03-13 18:26:58 -04:00
mimadrid 61e8c0370d
bluefish: 2.2.9 -> 2.2.10 2017-03-13 23:01:35 +01:00
Tim Steinbach 6e0c3e1a6d Merge pull request #23862 from mimadrid/update/filezilla-3.25.0
filezilla: 3.24.0 -> 3.25.0
2017-03-13 17:58:34 -04:00
Vincent Laporte 88d7718a64 mkvtoolnix-cli: fix build on darwin 2017-03-13 21:20:26 +00:00