Eelco Dolstra
bc1773fe16
Merge remote-tracking branch 'origin/staging' into systemd-219
...
Conflicts:
pkgs/os-specific/linux/kernel/linux-3.4.nix
pkgs/os-specific/linux/systemd/default.nix
2015-07-20 22:57:23 +02:00
William A. Kennington III
05c0fc15c0
Merge branch 'master.upstream' into staging.upstream
2015-07-19 15:20:04 -07:00
Austin Seipp
3d031a0764
Merge pull request #8873 from joachifm/nano-2_4_2
...
nano: 2.4.1 -> 2.4.2
2015-07-19 16:58:00 -05:00
Austin Seipp
6475be23bc
Merge pull request #8866 from spencerjanssen/obs-version-bump
...
obs-studio: 0.10.0 -> 0.11.1
2015-07-19 16:56:55 -05:00
Arseniy Seroka
6745ffb1c9
Merge pull request #8889 from ctheune/submit/syncthing-0.11.16
...
syncthing: 0.11.15 -> 0.11.16
2015-07-20 00:32:19 +03:00
Arseniy Seroka
5a8f779359
Merge pull request #8886 from matthiasbeyer/update-mdp
...
mdp: 1.0.0 -> 1.0.1
2015-07-20 00:31:36 +03:00
Arseniy Seroka
d3676f5943
Merge pull request #8885 from matthiasbeyer/update-khard
...
khard: 0.4.0 -> 0.4.1
2015-07-20 00:30:21 +03:00
Arseniy Seroka
bc7ced083f
Merge pull request #8852 from rowanblush/calcurse
...
calcurse: init at 4.0.0
2015-07-20 00:12:08 +03:00
devhell
d8a8ed12bb
canto-{curses,daemon}: 0.9.{3,1} -> 0.9.{4,3}
...
Close #8884 .
A very detailed changelog and discussion can be found here:
http://codezen.org/canto-ng/news/
This change was built locally and tested by me. There will be changes
noticable in the `canto-curses` interface since color support has been
reworked. For more details follow the hint in `canto-curses` or read the
changelog/manual liked to above. There also have been many
under-the-hood improvements which can also be found in the link above.
2015-07-19 22:13:31 +02:00
Rowan Blush
f796345f6a
calcurse: init at 4.0.0
2015-07-19 08:17:18 -07:00
Christian Theune
79d020de49
syncthing: 0.11.15 -> 0.11.16
2015-07-19 16:02:40 +02:00
Oliver Charles
a296639b9e
udevil: New package
2015-07-19 13:39:00 +01:00
Matthias Beyer
cd46c76d1b
khard: 0.4.0 -> 0.4.1
2015-07-19 13:12:05 +02:00
Matthias Beyer
79dea486c1
mdp: 1.0.0 -> 1.0.1
2015-07-19 13:11:51 +02:00
William A. Kennington III
2ad250f4fa
Merge branch 'staging.next' into staging.upstream
2015-07-19 02:21:28 -07:00
Vladimír Čunát
d54659fe96
libreoffice: work around a build problem
...
Started on staging and just hidden by #7524 , most likely.
Now it builds and runs for me. Only the "development build" tag is strange.
/cc #8844 , maintainers @viric, @7c6f434c.
2015-07-19 11:21:25 +02:00
Vladimír Čunát
9a80550cc4
Merge branch 'staging', discussion #8844
2015-07-19 08:09:29 +02:00
Thomas Tuegel
e4e8c5f5b5
update to kde-applications-15.04.3
2015-07-18 18:48:28 -05:00
Joachim Fasting
19d6b78cc5
nano: 2.4.1 -> 2.4.2
2015-07-18 11:44:54 +02:00
John Chee
225ae4c5f8
tribler: strip pngs ( close #8810 )
...
This prevents libpng exceptions from being thrown.
Accepted upstream: https://github.com/Tribler/tribler/pull/1561
2015-07-18 10:11:03 +02:00
William A. Kennington III
e6d4367e92
ed: 1.10 -> 1.12
2015-07-17 14:37:34 -07:00
William A. Kennington III
1caf3e1724
Merge branch 'master.upstream' into staging.next
2015-07-17 14:34:56 -07:00
Peter Simons
c523633b09
Merge pull request #8869 from taku0/flashplayer_2.2.202.491
...
flashplayer: 11.2.202.481 -> 11.2.202.491
2015-07-17 18:29:23 +02:00
Lluís Batlle i Rossell
026f09cea5
Updating gtkwave 3.3.64 to 3.3.66
2015-07-17 18:24:35 +02:00
Luca Bruno
5ec54be235
znc: add back 1.4 because xchat does not support TLS
2015-07-17 17:51:44 +02:00
taku0
6e5308df3f
flashplayer: 11.2.202.481 -> 11.2.202.491
2015-07-18 00:19:39 +09:00
Vladimír Čunát
9f37e91ec5
Merge master into staging
...
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
d7b917e612
git: 2.4.5 -> 2.4.6
2015-07-16 20:07:17 -07:00
Spencer Janssen
664af7b909
obs-studio: 0.10.0 -> 0.11.1
...
This version also adds a curl dependency.
2015-07-16 16:43:09 -05:00
Robin Gloster
aaa44b7c57
phpstorm: 8.0.3 -> 9.0
2015-07-16 19:39:29 +00:00
Arseniy Seroka
166aed1228
Merge pull request #8794 from sfultong/bitcoin-0.11
...
updating bitcoin to 0.11.0
2015-07-16 15:06:08 +03:00
William A. Kennington III
ec5f94fbcc
chromium: Minor updates
...
Notably a version bump for
Flash Player to 18.0.0.209-r1
2015-07-15 17:55:11 -07:00
lethalman
106c336a5f
Merge pull request #8804 from leonardoce/leo-editor
...
leo-editor: init at 5.1
2015-07-15 18:20:24 +02:00
Moritz Ulrich
022527a5e1
Gnuradio: Add gnuradio-wrapper and gnuradio-full.
...
gnuradio-wrapper is a simple derivation wrapping $(gnuradio)/bin/* to
make other blocks (from `extraPackages') available.
gnuradio-full uses gnuradio-wrapper to build gnuradio with blocks from
gnuradio-osmosdr (therefore allowing the use of rtl-sdr, hackrf, the
ccc-camp2015 badge, and similar).
2015-07-15 15:39:10 +02:00
Moritz Ulrich
b9c32340a7
Gnuradio: 3.7.5.1 -> 3.7.7.1.
2015-07-15 15:39:10 +02:00
lostdj
a643e25286
SmartGitHg: 6.5.7 -> 6.5.9
2015-07-15 13:13:01 +03:00
William A. Kennington III
25e60feb72
Merge branch 'master.upstream' into staging.upstream
2015-07-15 02:02:46 -07:00
ts468
dceb24d703
Merge pull request #8723 from ts468/upstream.cbfstool
...
cbfstool: init at git-2015-07-09
2015-07-15 10:57:50 +02:00
Thomas Strobel
90cad1bc0c
cbfstool: init at git-2015-07-09
2015-07-15 10:50:58 +02:00
ts468
723eaf845d
Merge pull request #8829 from ts468/upstream.tpmmanager
...
tpmmanager: init at 0.8.1
2015-07-15 10:29:24 +02:00
ts468
d6acd47035
Merge pull request #8828 from ts468/upstream.diffpdf
...
diffpdf: fix icon
2015-07-15 10:28:55 +02:00
Thomas Strobel
e0da9ec935
tpmmanager: init at 0.8.1
2015-07-15 10:21:11 +02:00
Thomas Strobel
6f9cc87bf5
diffpdf: fix icon
2015-07-15 10:20:09 +02:00
Tobias Geerinckx-Rice
828f9ea8cc
keyfinder-cli: use old libkeyfinder 0.11 "for now"
...
The tool doesn't compile against versions 2.x.
Also, fix the incorrect version number & use src.meta.homepage.
2015-07-15 03:31:55 +02:00
Tobias Geerinckx-Rice
82cac9f9ac
keyfinder 1.16 -> 2.00
2015-07-15 03:31:55 +02:00
Arseniy Seroka
f80a9d052f
Merge pull request #8811 from ctheune/submit/syncthing-0.11.15
...
syncthing: 0.11.13 -> 0.11.15
2015-07-15 00:31:10 +03:00
Christian Theune
a932d14dd9
syncthing: 0.11.13 -> 0.11.15
2015-07-14 22:46:54 +02:00
Peter Simons
7f9cc5dc61
stellarium: build with qt5Full to fix run-time crashes
...
The build with the modularized qt expression succeeded, but the resulting binary
would crash immediately, complaining about the lack of a "qt.labs.shader" module.
This patch works around that issue.
2015-07-14 22:39:34 +02:00
Leonardo Cecchi
3f2de3eb64
leo-editor: init at 5.1
2015-07-14 21:49:28 +02:00
Sam Griffin
368fee5ff3
bitcoin: 0.10.2 -> 0.11.0
2015-07-13 23:49:52 -04:00