3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

67586 commits

Author SHA1 Message Date
Jude Taylor 65dd349574 update mysteriously varying git hashes 2015-08-21 12:00:35 -07:00
Eelco Dolstra e1fe23a4be libevent: Use fetchurl 2015-08-21 15:28:30 +02:00
Eelco Dolstra b1104d6082 gdk-pixbuf: Disable tests
The tests take an excessive amount of time (> 1.5 hours) and memory (>
6 GB).

http://hydra.nixos.org/build/24911713
http://hydra.nixos.org/build/24470055#tabs-buildsteps
2015-08-21 12:56:55 +02:00
Eelco Dolstra aba76f23a5 Revert "add Darwin's flavor of lsof"
This reverts commit 7024b4dc62. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
2015-08-21 12:05:06 +02:00
Eelco Dolstra 6769633b64 autogen: Fix build outside of chroot
http://hydra.nixos.org/build/24870256
2015-08-20 20:42:41 +02:00
William A. Kennington III 2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Tobias Geerinckx-Rice 4ec87513b6 packagekit: python3 attr. -> unversioned python 2015-08-20 18:26:15 +02:00
Benno Fünfstück 1f10b44d3e xvkbd: update from 3.5 to 3.6 2015-08-20 17:07:19 +02:00
Benno Fünfstück e059070ad3 ocamlPackages.ocurl: update from 0.7.2 to 0.7.5 2015-08-20 17:07:18 +02:00
Bjørn Forsman c9c3a3cb72 meshlab: add missing patch (doh!)
Should have been included in af7d5f27d0 ("meshlab: 1.3.2 -> 1.3.3").
2015-08-20 16:06:29 +02:00
Jascha Geerds 50d90a2538 gtkdialog: Add missing dependency on hicolor_icon_theme (#9369) 2015-08-20 16:03:58 +02:00
Jascha Geerds 304a5e6168 gnome-calendar: Add missing dependency on hicolor_icon_theme (#9369) 2015-08-20 16:01:49 +02:00
Vladimír Čunát d911cc8d63 harfbuzz: minor update 1.0.1 -> 1.0.2 2015-08-20 15:21:20 +02:00
Vladimír Čunát 3f1fa380b2 gdk-pixbuf: fix CVE-2015-4491 by maintenance update 2015-08-20 15:18:46 +02:00
Arseniy Seroka e8d96bdcf7 Merge pull request #9301 from ssgen/fatresize
Fatresize
2015-08-20 16:18:18 +03:00
Arseniy Seroka 6df52b6c96 Merge pull request #9357 from offlinehacker/pkgs/elasticsearch/update/1.5.2
elasticsearch 1.4.5 -> 1.5.2
2015-08-20 16:04:00 +03:00
Arseniy Seroka 61d86a087b Merge pull request #9348 from offlinehacker/logstash/update/1.5.3
logstash: Update to 1.5.3
2015-08-20 16:03:17 +03:00
Shea Levy 3506c0bf04 emacs: Build cocoa on darwin 2015-08-20 08:37:04 -04:00
Shea Levy b661ebe3cb rcs: Use c99 on darwin 2015-08-20 08:10:27 -04:00
Eelco Dolstra 2d4b6405b3 openssh: Apply some Fedora security backports 2015-08-20 14:08:21 +02:00
Eelco Dolstra 401782cb67 Revert "openssh: 6.9p1 -> 7.0p1"
This reverts commit a8eb2a6a81. OpenSSH
7.0 is causing too many interoperability problems so soon before the
15.08 release.

For instance, it causes NixOps EC2 initial deployments to fail with
"REMOTE HOST IDENTIFICATION HAS CHANGED". This is because the client
knows the server's ssh-dss host key, but this key is no longer
accepted by default. Setting "HostKeyAlgorithms" to "+ssh-dss" does
not work because it causes ssh-dss to be ordered after
"ecdsa-sha2-nistp521", which the server also offers. (Normally, ssh
prioritizes host key algorithms for which the client has a known host
key, but not if you set HostKeyAlgorithms.)
2015-08-20 14:08:18 +02:00
aszlig e4c2f97a27
Merge pull request #9269 from @jraygauthier.
Although I couldn't test this because I'm not using a DE, nobody else
than the one submitting the pull request has commented on this. So if it
should break the icon for other people, nobody would probably start an
assassination because of this and the commit can be easily reverted if
it should break the icon.
2015-08-20 13:02:55 +02:00
aszlig 0ed0669699
nixos/tests/lightdm: Drop "session" screenshot.
Using waitForWindow on the IceWM root window doesn't necessarily mean
that the panel will be shown. In the lightdm test, we only make sure
that the login is working and thus it doesn't matter how the session
itself will look or whether IceWM is broken, so we don't need that
screenshot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-20 12:57:40 +02:00
aszlig fbfdafc2c9
Merge pull request #9263 from @dezgeg.
This looks for the window title instead of OCRing the clock from the
IceWM panel. Of course, this has the drawback, that whenever IceWM is
started it doesn't necessarily mean that the panel is also visible at
that time, so we might want to drop the screenshot of the "session" as
well.
2015-08-20 12:55:23 +02:00
Eelco Dolstra fd38b5fa49 Revert gcc darwin fixes
This reverts commits cb7c053383,
ebda45e6b9,
4a495cfbab 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