68222 Commits

Author SHA1 Message Date
Eelco Dolstra
fd38b5fa49 Revert gcc darwin fixes
This reverts commits cb7c053383ff76a454484992b3a6d6a2f1530c15,
ebda45e6b9db3225c30a998b2624d90b0c08edb4,
4a495cfbab2b3ab9ae8219ef1812c766bf27b01e because they broke Nixpkgs
evaluation.

http://hydra.nixos.org/build/24813270
2015-08-20 11:49:55 +02:00
Bjørn Forsman
ac8f2391f3 pcl: 1.6.0 -> 1.7.2 (unbreaks build)
New deps added: libXt (required), libpcap (optional).

Releases are now at github.
2015-08-20 07:45:37 +02:00
Bjørn Forsman
af7d5f27d0 meshlab: 1.3.2 -> 1.3.3
Remove patches that no longer apply (integrated upstream I guess), but
forward port the part that adds the missing "include <unistd.h>"[1].

Build and run tested.

[1]: http://sourceforge.net/p/meshlab/bugs/342/
2015-08-20 07:36:47 +02:00
William A. Kennington III
4f22eadf2c Merge branch 'master.upstream' into staging.upstream 2015-08-19 20:52:17 -07:00
William A. Kennington III
6f92c20795 go1.5: Use as the default 2015-08-19 20:52:09 -07:00
William A. Kennington III
d730646832 go1.5: Fix pcre and port the remove-tools patch 2015-08-19 20:49:11 -07:00
William A. Kennington III
15a7e0ab71 go1.4: Fix some of the tests by adding missing pcre 2015-08-19 20:49:10 -07:00
Tobias Geerinckx-Rice
fb6502892a stress-ng: update 0.04.14 -> 0.04.15 2015-08-20 04:52:16 +02:00
Tobias Geerinckx-Rice
72e8bf518f netsniff-ng: update 0.5.9-{80-g3384ee7 -> 85-g71c28ef} 2015-08-20 04:52:15 +02:00
Tobias Geerinckx-Rice
8131ca52d1 simple-scan: update 3.17.4 -> 3.17.90
Adds a dependency on PackageKit...

In better news:
 - Default to PDF when saving in all cases.
 - Always show file format options and use a combo box to fit better into
   dialog.
 - Detect HP scanners and install drivers using PackageKit if found.
 - If SANE detects no scanners but we see USB IDs of Brother, Epson or
   Samsung scanners then prompt the user to go to their website to install
   drivers.
 - Use GUsb instead of GUdev.
 - Fix error dialogs not showing.
2015-08-20 04:41:11 +02:00
Tobias Geerinckx-Rice
46df28d371 packagekit: init at 1.0.7
Don't worry, this does absolutely nothing on Nix and only serves to
satisfy simple-scan's zany new dep.
2015-08-20 04:41:11 +02:00
Jaka Hudoklin
d06eb2951b Merge pull request #9355 from offlinehacker/nixos/etcd/fixstart
etcd service: do not wait for cluster up
2015-08-20 02:26:49 +02:00
Jaka Hudoklin
40582b68f4 Merge pull request #9354 from offlinehacker/nixos/skydns/fixdns
skydns service: fix skydns nameservers env option
2015-08-20 02:26:33 +02:00
Jaka Hudoklin
e057cbe580 Merge pull request #9352 from offlinehacker/nixos/racoon/fix_start
nixos/racoon: create /var/racoon upon start
2015-08-20 02:26:17 +02:00
ts468
fd7262ecc4 Merge pull request #9359 from ts468/master
canon-cups-ufr2: init at 2.90
2015-08-20 01:30:25 +02:00
Thomas Strobel
26ef514981 canon-cups-ufr2: init at 2.90 2015-08-20 01:22:10 +02:00
Jaka Hudoklin
7a7895bcad Merge pull request #9353 from offlinehacker/pkgs/kubernetes/update/1.0.3
kubernetes: update to 1.0.3, fix module
2015-08-20 00:35:28 +02:00
Jaka Hudoklin
9146edd5be logstash: 1.4.2 -> 1.5.3 2015-08-20 00:34:23 +02:00
Arseniy Seroka
7e1c5f416c Merge pull request #9349 from offlinehacker/pkgs/s3fs/update/1.79
s3fs: Update to 1.79
2015-08-20 01:23:06 +03:00
Jaka Hudoklin
2bec93dde8 elasticsearch: add search_guard plugin 2015-08-20 00:20:44 +02:00
Jaka Hudoklin
1d1a336c6a elasticsearch: update plugins 2015-08-20 00:20:31 +02:00
Jaka Hudoklin
8aa50beb1f elasticsearch 1.4.5 -> 1.5.2 2015-08-20 00:18:46 +02:00
Jaka Hudoklin
86ee6c2512 etcd service: do not wait for cluster up 2015-08-20 00:02:27 +02:00
Jaka Hudoklin
ed356eefa6 skydns service: fix skydns nameservers env option 2015-08-19 23:54:54 +02:00
William A. Kennington III
5344252155 go1.4: Cleanup compiler expression 2015-08-19 14:54:38 -07:00
Jaka Hudoklin
c33d282278 kubernetes service: fix for 1.0.3 2015-08-19 23:52:19 +02:00
Jaka Hudoklin
559e2ab951 kubernetes: 0.18.0 -> 1.0.3 2015-08-19 23:51:54 +02:00
Jaka Hudoklin
4ecf102ebf s3fs: 1.78 -> 1.79 2015-08-19 23:50:27 +02:00
ssgen
62e2b2124a fatresize: init at 1.0.2 2015-08-20 00:43:34 +03:00
Domen Kožar
15bc70b1a4 Merge pull request #9350 from iand675/docker-compose
Upgrade to latest docker compose version
2015-08-19 23:41:45 +02:00
Jaka Hudoklin
c171cfabed nixos/racoon: create /var/racoon upon start 2015-08-19 23:38:44 +02:00
Peter Simons
81ce9be104 Revert "Move licenseAllowed check into the builder attribute (fixes #7541)"
This reverts commit 4d6452ba. The change affects Hydra in a way we didn't
expect: https://github.com/NixOS/nixpkgs/pull/9305#issuecomment-132791730.
2015-08-19 23:37:45 +02:00
Arseniy Seroka
bbc7812d37 Merge pull request #9341 from taku0/oraclejdk-8u60
oraclejdk: 8u51 -> 8u60
2015-08-20 00:33:47 +03:00
Luca Bruno
d05cb3e0ea go: add 1.5 compiler and packages 2015-08-19 23:25:16 +02:00
Jaka Hudoklin
24a626020a Merge pull request #8681 from offlinehacker/pkgs/driftnet/add
Add driftnet
2015-08-19 22:58:27 +02:00
William A. Kennington III
bf0da55a8c gotools: Fix build and update to 2015-08-19 2015-08-19 13:54:54 -07:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
William A. Kennington III
ef07bd04dc golang: Remove the last references to go-1.3 2015-08-19 13:53:11 -07:00
William A. Kennington III
c3592084cf golint: Update to 2015-06-23 2015-08-19 13:51:09 -07:00
William A. Kennington III
e27567cff1 golang: Remove old, unused compilers 2015-08-19 13:25:44 -07:00
William A. Kennington III
88b1d7e5d9 logstash-forwarder: 20141216 -> 0.4.0 2015-08-19 13:25:44 -07:00
Peter Simons
082b0ee2a1 Merge pull request #9305 from Mathnerd314/broken-fix
Move licenseAllowed check into the builder attribute (fixes #7541)
2015-08-19 22:08:24 +02:00
Peter Simons
24664e9cb3 Merge pull request #9345 from kquick/haskell-vty-ui-disable-tests
Specify no-tests cabal flag for vty-ui under ghc 7.10.x
2015-08-19 22:00:36 +02:00
Rok Garbas
32c9606827 Merge pull request #9346 from pesterhazy/fix/pass-on-darwin
pass: Fix for Darwin
2015-08-19 21:10:53 +02:00
Paulus Esterhazy
f683031df2 pass: Fix for Darwin 2015-08-19 20:50:58 +02:00
Ian Duncan
8d9e45c89e Upgrade to latest docker compose version 2015-08-19 14:11:20 -04:00
Nikolay Amiantov
8f59f4c78c firefox: build with pulseaudio support (close #8087) 2015-08-19 20:08:54 +02:00
Luca Bruno
e53e1c7070 nixos xfs_quota: simplify restartTriggers 2015-08-19 20:04:20 +02:00
William A. Kennington III
62b589a54f libressl: 2.2.1 -> 2.2.2 2015-08-19 10:42:55 -07:00
Kevin Quick
2066ac2956 Specify no-tests cabal flag for vty-ui under ghc 7.10.x 2015-08-19 10:15:38 -07:00