Commit Graph

59613 Commits

Author SHA1 Message Date
Luis G. Torres
e8d85753cf Added Darwin case for java.swt. This still can't be built on Darwin, but at least this derivation won't cause nix-env -qas to crash on Darwin. 2015-03-22 13:28:34 -04:00
Damien Cassou
47df54d618 Merge pull request #6936 from DamienCassou/update-syncthing-0.10.29
syncthing 0.10.26 -> 0.10.29
2015-03-22 17:42:35 +01:00
Damien Cassou
acd999e4bd syncthing 0.10.26 -> 0.10.29 2015-03-22 17:33:39 +01:00
Damien Cassou
6e5ae05dfe Merge pull request #6935 from DamienCassou/update-syncthing-gtk-0.6.3
Update syncthing 0.6.2 -> 0.6.3
2015-03-22 17:22:08 +01:00
Damien Cassou
a94891c315 Update syncthing 0.6.2 -> 0.6.3 2015-03-22 17:19:26 +01:00
Michael Raskin
6e0d57fa4b Merge pull request #6932 from taku0/firefox-bin-36.0.4
firefox-bin: update to version 36.0.4
2015-03-22 18:31:28 +03:00
taku0
f4f340e833 firefox-bin: update to version 36.0.4 2015-03-22 23:03:04 +09:00
Thomas Tuegel
2d6566bb85 Merge branch 'kde4' 2015-03-22 09:02:01 -05:00
Thomas Tuegel
70f2112231 libgit2: build with cmake-3.2 2015-03-22 09:01:13 -05:00
Tobias Geerinckx-Rice
627e2bf90c nx-libs 3.5.0.30 -> 3.5.0.31 2015-03-22 14:20:59 +01:00
Mathijs Kwik
5cac50b3bf kernel: add support for experimental Realtek2800 models
tested with AVM Fritz wlan Stick N
2015-03-22 13:49:29 +01:00
cillianderoiste
b1295c6b48 Merge pull request #6931 from svenkeidel/a2jmidid-python-path
a2jmidid: wrap python path for a2j_control, fixes #6916
2015-03-22 11:31:12 +01:00
Michael Raskin
166614ee41 Update Firefox. Second take. 2015-03-22 13:22:41 +03:00
Sven Keidel
c44c3d21ba a2jmidid: wrap python path for a2j_control, fixes #6916
a2j_control fails because dbus is not in the python path. The exact error
message is:

    Traceback (most recent call last):
      File ".nix-profile/bin/a2j_control", line 11, in <module>
	import dbus
    ImportError: No module named dbus

The fix is to add the python dbus module to the build inputs and wrap the
python path for a2j_control.
2015-03-22 11:16:22 +01:00
Domen Kožar
6a7875fe39 Merge pull request #6929 from phunehehe/autojump-zsh
simplify convoluted path to autojump.zsh
2015-03-22 10:43:47 +01:00
Hoang Xuan Phu
ad7bb0d129 simplify convoluted path to autojump.zsh 2015-03-22 13:44:27 +08:00
William A. Kennington III
935938f262 Merge pull request #6924 from joachifm/picolisp-update
picolisp: bump to 3.1.9
2015-03-21 20:46:41 -07:00
Kirill Elagin
efb4fe269e Yakuake: hardcode path to konsole 2015-03-21 18:57:28 -05:00
Kirill Elagin
370e40aef5 startkde: Fix kdostartupconfig5 path 2015-03-21 18:56:59 -05:00
Kirill Elagin
29808a11b6 startkde: Qt 5.4 is here 2015-03-21 18:56:49 -05:00
Thomas Tuegel
c918f57ebb kde4: remove obsolete kdelibs derivation 2015-03-21 18:54:29 -05:00
Thomas Tuegel
2c4c712a70 kde4: use kdelibs from kdeApps_stable
Upstream is releasing bugfixes to kdelibs only through KDE Applications
releases, so this is the correct way to get updates until we discontinue
KDE 4. This also ensures that kdeApps and kde4 are using the same
version of kdelibs; different versions appear to be causing integration issues.
2015-03-21 18:46:54 -05:00
Joachim Fasting
262a3ac3c4 picolisp: bump to 3.1.9 2015-03-21 23:49:57 +01:00
Peter Simons
5238bfb73f r-modules: fix evaluation errors 2015-03-21 23:33:50 +01:00
Peter Simons
701251e435 r-modules: update from CRAN state at 2015-03-21T20:01:16+0100) 2015-03-21 23:33:50 +01:00
Russell O'Connor
e2e4c1182e Update OpenSSL dependency of bitcoin to be the latest OpenSSL.
Purge OpenSSL version 1.0.1j.
2015-03-21 17:49:42 -04:00
Jaka Hudoklin
ad10db7617 Merge pull request #6882 from offlinehacker/nixos/fluentd
Add fluentd package and module
2015-03-21 22:37:48 +01:00
Jaka Hudoklin
916aab2927 Merge pull request #6875 from offlinehacker/nixos/cadvisor/fix
nixos/cadvisor: fixes
2015-03-21 22:36:11 +01:00
Jaka Hudoklin
ffaabcd622 remove unintentional code 2015-03-21 20:49:04 +01:00
Jaka Hudoklin
f73ff9c5a4 nodePackages: do not build on hydra 2015-03-21 20:40:32 +01:00
Thomas Tuegel
acd7515a63 kde4: build with cmake-3.2 2015-03-21 13:54:14 -05:00
Peter Simons
d242b5220a haskell-bytestring-arbitrary: fix build by passing an older LLVM version 2015-03-21 19:47:53 +01:00
Peter Simons
fddc2fa8bc haskell-hydrogen-syntax does not compile. 2015-03-21 19:44:12 +01:00
Peter Simons
16b9fd71f9 haskell-ansi-wl-pprint: fix the build with ghc-7.10.x 2015-03-21 19:44:12 +01:00
Peter Simons
61b1ef496f haskell-bindings-GLFW has been fixed upstream. 2015-03-21 19:44:12 +01:00
Peter Simons
446f301078 hackage-packages: re-generate from Hackage 2015-03-20T11:29:46+0100 2015-03-21 19:44:12 +01:00
Peter Simons
5c268bca2e haskell-locators test suite is broken. 2015-03-21 19:44:12 +01:00
Michael Raskin
e68b486f6e update lrzip 2015-03-21 21:29:40 +03:00
Michael Raskin
3c19c7d236 update zpaq 2015-03-21 21:29:40 +03:00
Michael Raskin
05265a220c Update Apache Jena 2015-03-21 21:29:40 +03:00
Michael Raskin
d5b558c613 update sysdig 2015-03-21 21:29:39 +03:00
Michael Raskin
15e66fa577 update eudev 2015-03-21 21:29:39 +03:00
Michael Raskin
d77a4f17f9 update wine 2015-03-21 21:29:39 +03:00
Michael Raskin
c64b5270fe update luarocks 2015-03-21 21:29:39 +03:00
Michael Raskin
0d2a00fdee update lush 2015-03-21 21:29:38 +03:00
Domen Kožar
5491cb0903 Merge pull request #6889 from benley/honcho
New package: Honcho (Python clone of Foreman)
2015-03-21 19:21:56 +01:00
Domen Kožar
ca98016c2a Merge pull request #6915 from phunehehe/autojump-zsh
document workaround for sourcing autojump init file from zsh
2015-03-21 19:19:28 +01:00
Domen Kožar
007ab6f4df Merge pull request #6907 from jb55/spectrwm-patch
add: spectrwm window manager
2015-03-21 19:18:55 +01:00
William Casarin
ea2baa8abf spectrwm window manager 2015-03-21 11:02:44 -07:00
Thomas Tuegel
0451646382 Merge branch 'cmake32'
Packages that use CMake and depend on OpenSSL should use CMake 3.2 or later.
2015-03-21 12:34:48 -05:00