Tuomas Tynkkynen
98419b2e54
flac: Remove conflicting outputs produced by auto merge
2015-10-03 13:36:16 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
33373d939a
Merge: staging with systemd
2015-10-02 10:24:41 +02:00
William A. Kennington III
98172435f7
Merge branch 'master.upstream' into staging.upstream
2015-10-01 10:43:44 -07:00
Eelco Dolstra
b23038dd80
Merge remote-tracking branch 'origin/master' into systemd-219
2015-10-01 14:17:46 +02:00
Eelco Dolstra
562851a068
thunderbird: Update to 38.3.0
2015-10-01 13:54:00 +02:00
Eelco Dolstra
25bb1e10f3
firefox: Update to 41.0.1
2015-10-01 13:51:24 +02:00
taku0
57155e04a7
firefox-bin: 41.0 -> 41.0.1, thunderbird-bin: 38.2.0 -> 38.3.0
2015-10-01 20:44:37 +09:00
Arseniy Seroka
3489413f46
Merge pull request #10131 from matthiasbeyer/update-openbox
...
openbox: 3.5.2 -> 3.6.1
2015-10-01 14:21:53 +03:00
Damien Cassou
d5c92d5093
Merge pull request #10163 from DamienCassou/update-sound-juicer-3.16.1
...
sound-juicer: 3.15.92 → 3.16.1
2015-10-01 09:47:39 +02:00
Damien Cassou
fb0cb11471
sound-juicer: 3.15.92 → 3.16.1
2015-10-01 09:41:45 +02:00
Vincent Laporte
dad6e8d5d7
smtube: 15.8.0 -> 15.9.0
2015-10-01 08:54:00 +02:00
Jude Taylor
0870c09854
darwin purity: emacs-24.5-mac
2015-09-30 17:14:43 -07:00
William A. Kennington III
e7bb9e1023
Merge branch 'master.upstream' into staging.upstream
2015-09-30 13:26:04 -07:00
William A. Kennington III
383377437e
chromium: Updates
...
Built and run locally
- Beta: 46.0.2490.33 -> 46.0.2490.42
- Stable: 45.0.2454.99 -> 45.0.2454.101
2015-09-30 13:22:38 -07:00
Bryan Gardiner
4eb5068a13
claws-mail: fix conflict with shared_mime_info link
...
Fixes #10156 . Close #10157 .
2015-09-30 19:43:29 +02:00
Bryan Gardiner
c39a557095
claws-mail: add hicolor_icon_theme dependency
...
We want the hicolor_icon_theme hook to strip Claws's icon-theme.cache.
2015-09-30 19:42:52 +02:00
Thomas Tuegel
3e600a805d
quassel_qt5: fix build with Qt 5.5
2015-09-30 10:53:52 -05:00
Peter Simons
ccd3e52b60
Merge pull request #9917 from FlorentBecker/sage
...
Update sage to 6.8
2015-09-30 17:28:36 +02:00
Arseniy Seroka
df13fd5ae5
Merge pull request #10150 from khumba/netbeans-8
...
netbeans: 7.4 -> 8.0.2
2015-09-30 15:02:14 +03:00
Thomas Tuegel
246e306d2a
kde-workspace: fix build with kdelibs-4.14.12
...
kdelibs-4.14.12 enables stricter CMake policies which break the
build. Patch to disable the offending test.
2015-09-30 06:22:56 -05:00
Tobias Geerinckx-Rice
40503a2eab
redshift: add hicolor_icon_theme dependency
...
This fixes the icon-theme.cache collision by removing it during Fixup.
2015-09-30 10:03:59 +02:00
Bryan Gardiner
eaddd4e5e8
netbeans: additional patching
...
- Patches a new awk call in the Netbeans 8 launcher, to fix a warning
on startup:
/nix/store/...-netbeans-8.0.2/netbeans/platform/lib/nbexec: line 201:
/usr/bin/awk: No such file or directory
- Patches a bunch of sh/perl/python shebangs.
2015-09-29 22:03:38 -07:00
Bryan Gardiner
30cd66910e
netbeans: 7.4 -> 8.0.2
2015-09-29 22:03:38 -07:00
Tobias Geerinckx-Rice
bc46be7fc9
fmit: correct stdenv.lib.{optional -> optionals}
2015-09-30 02:29:51 +02:00
Tobias Geerinckx-Rice
49da51697b
redshift: use our own XDG_DATA_DIRS
2015-09-30 02:29:50 +02:00
William A. Kennington III
271972de0a
Merge branch 'master.upstream' into staging.upstream
2015-09-29 15:54:33 -07:00
Thomas Tuegel
cf5ed04f49
kdeApps_15_08: don't override mkDerivation
...
Provide a globally unique name (kdeApp) instead of using attribute paths
as namespaces and locally overloading the mkDerivation name.
2015-09-29 16:54:51 -05:00
Arseniy Seroka
e166298ed3
Merge pull request #9646 from codedmart/vimDarwinPython
...
vim: update python_framework.patch for darwin
2015-09-29 22:42:36 +03:00
vbgl
b02c07641b
Merge pull request #10014 from vbgl/camlp5-6.13
...
camlp5: 6.12 → 6.14
2015-09-29 19:43:15 +02:00
Brandon Martin
265e675152
vim: update python_framework.patch for darwin
2015-09-29 06:44:17 -06:00
Matthias Beyer
05fab76355
gitAndTools.git-extras: 2.2.0 -> 3.0.0
2015-09-29 12:27:22 +02:00
Matthias Beyer
9d66251812
openbox: 3.5.2 -> 3.6.1
2015-09-29 10:10:31 +02:00
Tobias Geerinckx-Rice
ff2bb85e2c
redshift: clean up a little
...
- Remove bogus second 'python' argument from substituteInPlace
- Format optional dependencies after their *Support argument
2015-09-29 03:21:35 +02:00
Tobias Geerinckx-Rice
19f2be4523
redshift: add gtk3 & correctly set GI_TYPELIB_PATH
...
This should fix https://github.com/NixOS/nixpkgs/issues/10097 .
2015-09-29 03:21:35 +02:00
Tobias Geerinckx-Rice
3e5e151b04
redshift: lib.optional -> lib.optionals
2015-09-29 03:21:34 +02:00
Moritz Ulrich
47c92a87c8
mutt: 1.5.23 -> 1.5.24
...
This change uses a different patchset for mutt-with-sidebar.
2015-09-29 00:23:55 +02:00
Arseniy Seroka
e916273209
Merge pull request #10102 from bdimcheff/add-textile-to-jekyll
...
jekyll: add RedCloth dependency for textile support
2015-09-28 23:57:26 +03:00
Brandon Dimcheff
2131d401ea
jekyll: add RedCloth dependency for textile support
...
This allows jekyll to be used with textile markup
2015-09-28 16:53:43 -04:00
obadz
db31c1c438
orpie: init at 1.5.2
...
[Bjørn: add meta.platforms]
2015-09-28 21:03:11 +02:00
Eelco Dolstra
422e3736d5
thunderbird: Update to 38.2.0
2015-09-28 15:44:37 +02:00
Eelco Dolstra
4b664cb922
chromium-dev: Revert to 47.0.2508.0
...
47.0.2516.0 doesn't build.
http://hydra.nixos.org/build/26422610
http://hydra.nixos.org/build/26422600
2015-09-28 15:40:13 +02:00
Edward Tjörnhammar
e8ebf051a9
idea-{community,ultimate}: 14.1.4 -> 14.1.5
2015-09-28 07:22:59 +02:00
Thomas Tuegel
c20b7ba4f3
cool-retro-term: build with Qt 5.5
2015-09-27 15:09:51 -05:00
Thomas Tuegel
63d95f505e
kdeApps_15_08: allow overriding mkDerivation
2015-09-27 15:09:51 -05:00
Thomas Tuegel
d8d5e9868c
dropbox: prepare for Qt upgrade
2015-09-27 15:09:50 -05:00
Thomas Tuegel
f998d502fc
dropbox: build with Qt 5.5
2015-09-27 15:09:50 -05:00
Thomas Tuegel
f00d622e44
dropbox: set meta.platforms
2015-09-27 15:09:49 -05:00
Thomas Tuegel
60fc0af74a
sddm: build with Qt 5.5
2015-09-27 15:09:49 -05:00
Thomas Tuegel
8d5b2be9ae
lightdm_qt: build with Qt 5.5
2015-09-27 15:09:48 -05:00
