3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

116140 commits

Author SHA1 Message Date
Michael Weiss 137142a72c sshfs-fuse: 2.10 -> 3.2.0 2017-09-21 23:59:46 +02:00
Michael Weiss 351f5fc585 fuse3: init at 3.1.1
This includes fuse-common (fusePackages.fuse_3.common) as recommended by
upstream. But while fuse(2) and fuse3 would normally depend on
fuse-common we can't do that in nixpkgs while fuse-common is just
another output from the fuse3 multiple-output derivation (i.e. this
would result in a circular dependency). To avoid building fuse3 twice I
decided it would be best to copy the shared files (i.e. the ones
provided by fuse(2) and fuse3) from fuse-common to fuse (version 2) and
avoid collision warnings by defining priorities. Now it should be
possible to install an arbitrary combination of "fuse", "fuse3", and
"fuse-common" without getting any collision warnings. The end result
should be the same and all changes should be backwards compatible
(assuming that mount.fuse from fuse3 is backwards compatible as stated
by upstream [0] - if not this might break some /etc/fstab definitions
but that should be very unlikely).

My tests with sshfs (version 2 and 3) didn't show any problems.

See #28409 for some additional information.

[0]: https://github.com/libfuse/libfuse/releases/tag/fuse-3.0.0
2017-09-21 23:59:46 +02:00
Daiderd Jordan 62f8e255a4
vapoursynth: fix darwin build 2017-09-21 22:30:56 +02:00
Joachim F 82a4b755b1 Merge pull request #29621 from joachifm/pkg/hydra-git
hydra: 2017-07-27 -> 2017-09-14
2017-09-21 20:28:40 +00:00
Joachim F c913f7155f Merge pull request #27340 from bachp/glusterfs-tls
glusterfs service: add support for TLS communication
2017-09-21 20:27:25 +00:00
Jörg Thalheim 0d391a8e5a Merge pull request #29647 from bachp/riot-web-0.12.5
riot-web: 0.12.3 -> 0.12.5
2017-09-21 21:14:14 +01:00
Jörg Thalheim ba174fc5a7 Merge pull request #29285 from bachp/node-exporter-docs
node-exporter service: fix documentation for enabledCollectors
2017-09-21 21:04:09 +01:00
Jörg Thalheim 4d225b3d40 nodePackages.pulp: init at 12.0.1
fixes #29374
2017-09-21 20:58:43 +01:00
Daiderd Jordan 7c30c83b7b
vmmlib: fix darwin frameworks 2017-09-21 21:52:10 +02:00
John Ericson fe2e7def53 Merge pull request #29646 from obsidiansystems/stdenv-cross-adapter
stdenv cross adapter: Misc changes
2017-09-21 15:46:59 -04:00
José Romildo Malaquias 2bbef7658a google-drive-ocamlfuse: 0.6.17 -> 0.6.21 2017-09-21 21:43:35 +02:00
Jörg Thalheim a0017e2904 Merge pull request #29252 from dywedir/tokei
tokei: 6.0.1 -> 6.1.2
2017-09-21 20:42:57 +01:00
Pascal Bach 50f12373af riot-web: 0.12.3 -> 0.12.5 2017-09-21 21:36:08 +02:00
Daiderd Jordan ef4c15e54d
erlang: add R17-R20 back to all-packages 2017-09-21 21:32:03 +02:00
Daiderd Jordan ab390ab050
erlang: remove erlangR16 and all versioned variants from all-packages
(re-applies commit 0fafa0d7d7)
2017-09-21 21:28:20 +02:00
Peter Simons a68eea3cb0 Merge pull request #29089 from LnL7/vaultenv-0.5.0
vaultenv: init at 0.5.0
2017-09-21 21:13:53 +02:00
Daiderd Jordan bafb9c4d50
vsqlite: fix darwin build 2017-09-21 21:10:03 +02:00
John Ericson 3af3d6efc2 stdenv cross adapater: Remove old extraBuildInputs
They, unlike their native counterparts, run on the wrong platform and
are therefore invalid.
2017-09-21 14:52:42 -04:00
John Ericson 05ef1034c7 stdenv cross adaptor: Add optional overrides parameter
By default, all previous overrides are discarded as before, as they
would only apply to the old host platform. But sometimes it is useful to
add some new ones, and this optional parameter allows that.
2017-09-21 14:52:07 -04:00
Daiderd Jordan 1ae204d2fa
zroc-ice: cleanup and fix darwin build 2017-09-21 20:48:56 +02:00
John Ericson 738bb4777c stdenv: Update autotools scripts on all Aarch64, not just Linux
This is needed when cross-compiling for iOS (Aarch64 + Darwin). I also
changed the syntax of the Linux stdenv for visual consistency, though
that has no effect on semantics as the os is already guaranteed to be
Linux.
2017-09-21 14:40:40 -04:00
Jake Waksbaum a3ba600366 ocamlPackages.merlin: 2.5.4 -> 3.0.2 (#29337) 2017-09-21 19:39:36 +01:00
Tim Steinbach 7d3d276a16
linux-copperhead: 4.13.2.a -> 4.13.3.a 2017-09-21 14:37:44 -04:00
Pascal Bach 8ed758696c gluster service: use str instead of path for private key
This pervents the user from accidently commiting the key to the nix store.
If providing a path instead of a string.
2017-09-21 20:35:35 +02:00
Jörg Thalheim 217add9043 Merge pull request #29451 from jerith666/client-ip-echo-1709
client-ip-echo: init at 0.1.0.1
2017-09-21 19:33:22 +01:00
Robin Gloster e2822f6384
gitlab: 9.5.2 -> 9.5.5 2017-09-21 20:26:12 +02:00
Jörg Thalheim e5b97e36c5 Merge pull request #29642 from Zimmi48/update-compcert
Update CompCert
2017-09-21 18:30:39 +01:00
Thomas Tuegel 5f328b33ab Merge pull request #29616 from ttuegel/hplip
HPLIP: Fix PostScript printers, installed utilities
2017-09-21 11:19:27 -05:00
Michael Weiss a127f91f28 fim: Add X11 support and "USE flags" 2017-09-21 18:00:48 +02:00
Jörg Thalheim 31b7bc4c1e Merge pull request #29243 from hamhut1066/master
traefik: init at 1.3.8
2017-09-21 17:00:37 +01:00
Shea Levy c3b41a77e6 openldap: Use a global localstatedir 2017-09-21 08:18:45 -06:00
Michael Weiss e0ef28c12d fim: init at 0.5rc3 2017-09-21 16:08:32 +02:00
Robert Helgesson 41cca299ef
perl-Scope-Upper: 0.24 -> 0.29 2017-09-21 15:40:51 +02:00
Robert Helgesson 2dae9980cc
perl-File-Slurper: 0.009 -> 0.010 2017-09-21 15:40:51 +02:00
Robert Helgesson 25a2b4b3ec
svtplay-dl: 1.9.4 -> 1.9.6 2017-09-21 15:40:51 +02:00
Théo Zimmermann 8fde5790b4 compcert: fix license
The license of CompCert is not a generic "INRIA" license. It is "INRIA Non-Commercial
Agreement for the CompCert verified compiler". As unfortunate as it may seem, this
is a non-free license (clearly mentioned as such in its preamble). See also #20256.
2017-09-21 15:24:17 +02:00
Théo Zimmermann 3370615a7f compcert: 3.0.1 -> 3.1
Note that the fix of the VERSION file can likely be removed at the next update.
2017-09-21 15:06:51 +02:00
Tim Steinbach 182dd6a9d6 Merge pull request #29634 from edwtjo/jbjdk
jetbrains-jdk
2017-09-21 08:42:01 -04:00
Tim Steinbach 5facacad01 Merge pull request #29591 from andir/update-jetbrains
Update jetbrains packages
2017-09-21 08:01:45 -04:00
Tim Steinbach a80067636e Merge pull request #29481 from neilmayhew/fix/spideroak
spideroak: fix crash due to zlib version mismatch
2017-09-21 07:59:32 -04:00
Jörg Thalheim 521a801863 Merge pull request #29590 from matthiasbeyer/update-khal
khal: 0.9.5 -> 0.9.7
2017-09-21 12:51:14 +01:00
Jörg Thalheim d5b46fdd80 khal: use fetchPypi 2017-09-21 12:50:32 +01:00
Théophane Hufschmitt e76c2c1496 pythonPackages.pafy: 0.5.2 -> 0.5.3.1 (#29588)
* pythonPackages.pafy: 0.5.2 -> 0.5.3.1

* pythonPackages.pafy: move to its own file

* pythonPackages.pafy: fetchurl -> fetchPypi
2017-09-21 12:45:33 +01:00
Diego Zamboni 8b8a2fd542 elvish: 0.9 -> 0.10; fix darwin build (#29587)
* First attempt at making elvish compile on darwin

* Fixed cyclic dependency on darwin

This fixes the "cycle detected in the references of" error when building
on darwin. The fix is based on the solution in issue #18131.

* Use version 0.10 and not 0.10.1, which is not officially released yet
2017-09-21 12:20:37 +01:00
José Romildo Malaquias 595d92eb7a ocamlfuse: 2.7-3 -> 2.7.1_cvs5 (#29606) 2017-09-21 12:14:22 +01:00
Jörg Thalheim 6bdabc7752 Merge pull request #29632 from lheckemann/oil-update
oil: 0.0.0 -> 0.1.0
2017-09-21 12:13:41 +01:00
Thomas Tuegel b0deb1ed48
dropbox: 34.4.22 -> 35.4.20 2017-09-21 06:11:15 -05:00
Jörg Thalheim a3ed686110 Merge pull request #29545 from dotlambda/texworks
texworks: init at 0.6.2
2017-09-21 12:07:00 +01:00
Jörg Thalheim 49d18cd42b Merge pull request #29633 from vaibhavsagar/update-nginx-echo-module
nginxModules.echo: v0.57 -> v0.61
2017-09-21 12:02:35 +01:00
Vaibhav Sagar dea2affe6c nginxModules.echo: 0.57 -> 0.61
This fixes #29555.
2017-09-21 11:01:35 +00:00