Commit graph

67541 commits

Author SHA1 Message Date
Artjom Vejsel
9c206b6cf7 qtcreator: refactor for using qt54 2015-08-24 11:34:28 +03:00
Artjom Vejsel
e4410bfd85 qt4SDK/qt5SDK: delete (see #9342) 2015-08-24 09:27:14 +03:00
Thomas Tuegel
b5b78eaf44 qt54: create share/ in setupHook 2015-08-23 14:29:09 -05:00
Thomas Tuegel
9f50a1f456 Merge branch 'qt54' 2015-08-23 13:48:11 -05:00
Thomas Tuegel
4098e79378 qt54: set documentation path in setupHook 2015-08-23 13:47:24 -05:00
Thomas Tuegel
4962bc3e3d Merge pull request #9404 from nbp/sane-config
Sane config: Fix config generation to work with the hplip backend in NixOS.
2015-08-23 11:32:39 -05:00
Thomas Tuegel
06717667cc Revert "autogen: don't write temp files outside build dir"
This reverts commit 1ea4ea1375.
2015-08-23 10:28:48 -05:00
Thomas Tuegel
1ea4ea1375 autogen: don't write temp files outside build dir 2015-08-23 10:26:29 -05:00
Thomas Tuegel
04124c45a7 emacs-evil: 20141020 -> 1.2.3
Use the actual upstream source, not some random mirror.
2015-08-23 10:26:23 -05:00
Thomas Tuegel
e40579d91e qt54: set runtime env vars during build for makeWrapper
Set QT_PLUGIN_PATH, QML_IMPORT_PATH, and QML2_IMPORT_PATH during build
so that Qt programs may easily be wrapped for use outside NixOS. The
paths are set appropriately for the dependencies of the package.
2015-08-23 10:16:21 -05:00
Arseniy Seroka
39c76445b9 Merge pull request #9375 from mstarzyk/obnam
obnam: 1.14 -> 1.15
2015-08-23 17:47:25 +03:00
Nikolay Amiantov
d0a03e078c tlp: install man pages 2015-08-23 17:33:49 +03:00
Phil Scott
3bbd79aaa6 scanmem: init at 0.15.2
[Bjørn: Remove trailing dot in description.]
2015-08-23 15:25:52 +02:00
Nicolas B. Pierron
bb81ba7ef6 sane-config: Prevent find warnings by moving maxdepth argument first. 2015-08-23 13:55:25 +02:00
Nicolas B. Pierron
f8caa49f00 sane-config: Merge /etc/sane.d/dll.conf content. 2015-08-23 13:54:34 +02:00
Desmond O. Chang
ef721079ca gradle: 2.2.1 -> 2.6 2015-08-23 12:07:16 +02:00
Bjørn Forsman
2cf8502397 qtcreator: build with documentation
It was disabled due to a build error that is now fixed.
2015-08-23 09:56:09 +02:00
Bjørn Forsman
84c96cd4f6 qt5SDK: build with documentation
It was disabled due to a build error that is now fixed.
2015-08-23 09:56:09 +02:00
Bjørn Forsman
019a23db3e qt5: specify docdir
Due to a bug somewhere, the qt documentation is by default placed in
$out/share/doc although "qmake -query" reports $out/doc. That
discrepancy causes qtcreator withDocumentation builds to fail. This
fixes it.
2015-08-23 09:56:09 +02:00
Bjørn Forsman
c2a8e5e609 qt53: sync plugin/import/qml dirs with qt54
It seems like a sensible thing to keep these in sync.
2015-08-23 09:56:09 +02:00
Domen Kožar
50dc28d7a0 Merge pull request #9399 from abbradar/deluge
deluge: fix translations and desktop file
2015-08-23 01:09:32 +02:00
Tobias Geerinckx-Rice
69114f74aa packagekit: use http:// instead of https://
Proxy weirdness?
2015-08-23 00:02:29 +02:00
Nikolay Amiantov
a4b9b5ce7d deluge: fix translations and desktop file 2015-08-22 23:17:19 +03:00
Peter Simons
75cf3a2767 Merge pull request #9377 from teh/master
haskell-purescript: Disable tests.
2015-08-22 20:50:14 +02:00
Charles Strahan
7408ede358 fanctl: fix state directory 2015-08-22 14:14:56 -04:00
Charles Strahan
648973d641 nixos: rename service 'ubuntu-fan' as 'fan' 2015-08-22 14:05:35 -04:00
roconnor
1be2b63d27 Merge pull request #9387 from doshitan/update-tarsnap
tarsnap: 1.0.35 -> 1.0.36.1 and use upstream bash completion scripts
2015-08-22 12:26:58 -04:00
Nikolay Amiantov
c6c2e253a6 yed: 3.14.2 -> 3.14.3, mark as not redistributable
Their license explicitly prohibits distribution and it's unclear whether they allow to download their binary automatically. I've asked to clarify their terms; this may be temporary.
2015-08-22 13:54:11 +03:00
Nikolay Amiantov
3a768403ba Merge pull request #9396 from dochang/android-udev-rules
android-udev-rules: 20150301 -> 20150821
2015-08-22 13:37:35 +03:00
Desmond O. Chang
5986ec0923 android-udev-rules: 20150301 -> 20150821 2015-08-22 18:24:20 +08:00
Jascha Geerds
a1d85fc261 Merge pull request #9388 from akaWolf/qtox
qtox updated
2015-08-22 11:14:39 +02:00
Nikolay Amiantov
21c9f40b4d yed: fix checksum 2015-08-22 11:38:13 +03:00
Aycan iRiCAN
afe6f05310 cabal2nix: fixed sha256 hash
I was getting below error:
output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’
2015-08-22 11:04:09 +03:00
Kamil Chmielewski
75250d5add vim_configurable: fix revision name and update (close #9365) 2015-08-22 09:14:37 +02:00
Artjom Vejsel
c9ca9db213 qtox: 20150624 -> 20150821 2015-08-22 09:59:49 +03:00
Artjom Vejsel
7f1efceff8 qtox: add wrapper for set runtime qt5.svg plugin 2015-08-22 09:59:33 +03:00
Tanner Doshier
54c7053bff tarsnap: 1.0.35 -> 1.0.36.1 and use upstream bash completion scripts 2015-08-21 19:37:07 -05:00
Nikolay Amiantov
6d6eb1913a Merge pull request #9025 from abbradar/zsnes
zsnes: use Debian patches, fix segfault on saving state
2015-08-21 23:53:44 +03:00
Austin Seipp
1239465314 nixpkgs: lean 20150328 -> 20150821
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-21 13:57:16 -05:00
Jaka Hudoklin
46203a790d kubernetes service: fix option conversion 2015-08-21 20:55:40 +02:00
William A. Kennington III
8712a2d8d1 chromium: Updates 2015-08-21 11:05:11 -07:00
Arseniy Seroka
3ebe6fa802 open-vm-tools: temp fix for https://github.com/NixOS/nixpkgs/issues/9262 2015-08-21 20:29:09 +03:00
Eelco Dolstra
6a54ca7990 dhcpcd: Update to 6.9.2
Upstream recommends this as an important upgrade to 6.9.1 because it
fixes a race that could cause an empty resolv.conf to be created.
2015-08-21 17:03:51 +02:00
Eelco Dolstra
2fc59dc2db Revert "ceptre: init at 2015-08-15"
This reverts commit 8871d16723. Missing
file breaks evaluation.
2015-08-21 16:48:37 +02:00
Moritz Ulrich
726a380457 cura(engine): 15.02.1 -> 15.04. 2015-08-21 15:43:53 +02:00
Moritz Ulrich
9346230743 weechat: 1.2 -> 1.3 2015-08-21 15:43:52 +02:00
Moritz Ulrich
ff162a70c6 chicken: 4.9.0.1 -> 4.10.0 2015-08-21 15:43:52 +02:00
Tom Hunger
9303783649 haskell-purescript: Disable tests.
Tests need network + /homeless-shelter.
2015-08-21 13:39:13 +01:00
Tobias Geerinckx-Rice
5dd593dea5 prompt_toolkit: 0.46 -> 0.47 2015-08-21 13:42:52 +02:00
Tobias Geerinckx-Rice
c757628f0a mcelog: 122 -> 123
Also flesh out descriptions and restrict to Linux platforms.
2015-08-21 13:42:51 +02:00