3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

105574 commits

Author SHA1 Message Date
Vladimír Čunát 2090aa4f65
Merge: fixup a bad merge
For details see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:11:17 +02:00
Vladimír Čunát 4aec96b379
Merge the two "same" merges
This only takes the state from the second parent.
The purpose is that when this commit depends on the failed one,
simply merging this commit is a safe way to fix the problems.  Details:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:08:59 +02:00
Vladimír Čunát 6617c8bd87
A fixed version of commit eb750f9a7b
For detailed explanation see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 18:59:36 +02:00
John Ericson eec35cb6bd Merge pull request #24889 from formaltech/halvm-bump
Remove hardening at HaLVM 2.4.0
2017-04-14 12:58:46 -04:00
Lancelot SIX 9a10e5ae46
nano: 2.8.0 -> 2.8.1
See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00005.html
for release announcement

(cherry picked from commit 474d112b7a)
2017-04-14 18:54:18 +02:00
Armijn Hemel b6f88093a2 icoutils: update to 0.31.3 2017-04-14 17:21:54 +02:00
Vincent Laporte 31fef05c7c ocamlPackages.lwt: 2.6.0 -> 2.7.1 2017-04-14 13:59:55 +00:00
Frederik Rietdijk 46403f57b0 Merge pull request #24841 from loskutov/bleech-unix
pythonPackages.bleach: declare unix support
2017-04-14 14:58:47 +02:00
Ignat Loskutov 31a28a38a1 pythonPackages.bleach: remove the 'platforms' attribute; update homepage 2017-04-14 15:56:54 +03:00
Peter Hoeg 862fc1b465 tensor: init at (post) 0.3 2017-04-14 19:05:01 +08:00
Thomas Tuegel 48b5b77bb7 Merge pull request #24813 from benley/nm-openvpn
nixos: Add nm-openvpn to the networkmanager group
2017-04-14 05:44:01 -05:00
Tristan Helmich c395568b7a
openssh_hpn: use new sources and version (7_5_P1)
Close #23990.
2017-04-14 12:22:15 +02:00
Vladimír Čunát 5b3f807597
Merge #24179: openssh: 7.4p1 -> 7.5p1 2017-04-14 12:16:26 +02:00
Eelco Dolstra 3124f5ab22 Merge pull request #24892 from matthiasbeyer/update-mutt
mutt: 1.8.0 -> 1.8.1
2017-04-14 12:04:11 +02:00
Eelco Dolstra 6a1f168b1e
flashplayer-standalone: 25.0.0.127 -> 25.0.0.148 2017-04-14 11:44:22 +02:00
Eelco Dolstra 72605647a4
flashplayer: 25.0.0.127 -> 25.0.0.148 2017-04-14 11:44:18 +02:00
Matthias Beyer 77e71c2f99 mutt: 1.8.0 -> 1.8.1
From the announce email:

    This is a bug fix release.  In particular, it has fixes for setenv,
    sidebar_whitelist, some refresh issues, and a potential segfault.
    Details can be seen in the ChangeLog file.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2017-04-14 11:34:13 +02:00
Eelco Dolstra 7f09c06c58
usbredir: Use dev output 2017-04-14 11:22:28 +02:00
Vladimír Čunát da20d0e488
murmur service: fix typos from #24830 2017-04-14 11:05:42 +02:00
Vladimír Čunát 24444513fb
Merge branch 'staging' 2017-04-14 10:32:13 +02:00
Vladimír Čunát 304d30ce3f
all-tarballs: fixup evaluation (and the tarball job) 2017-04-14 10:31:31 +02:00
Jörg Thalheim 3085e95a20 Merge pull request #24886 from benley/latte-dock-0.6
latte-dock: 0.5.98 -> 0.6.0
2017-04-14 09:29:34 +02:00
Jörg Thalheim 3f7af64de1 Merge pull request #24885 from sigma/pr/cayley
cayley: init at 0.6.1
2017-04-14 08:59:37 +02:00
David Johnson 6f69681dad Add hardening, bump hash to HaLVM 2017-04-14 00:34:02 -05:00
Benjamin Staffin 77c8470e0a
latte-dock: 0.5.98 -> 0.6.0 2017-04-13 18:30:48 -04:00
Daiderd Jordan d77e29815c Merge pull request #24879 from kamilchm/vim-elixir
vim-elixir: 2017-03-29 -> 2017-04-13
2017-04-14 00:04:59 +02:00
Robert Helgesson de0f090353
josm: 11639 -> 11826 2017-04-13 23:44:03 +02:00
Robert Helgesson 034ea00b98
pythonPackages.PyICU: 1.9.5 -> 1.9.6 2017-04-13 20:45:41 +02:00
Daiderd Jordan 4a913ecfd3 Merge pull request #24797 from nixy/pass/coreutils-sb-patch
pass: fix clipboard functionality for darwin
2017-04-13 19:26:50 +02:00
Kamil Chmielewski 78635ce26b vim-elixir: 2017-03-29 -> 2017-04-13 2017-04-13 18:46:37 +02:00
Yann Hodique 798e358a02 cayley: init at 0.6.1 2017-04-13 08:35:25 -07:00
Tim Steinbach 26a4f891e6 Merge pull request #24874 from zimbatm/terraform-0.9.3
terraform: 0.9.2 -> 0.9.3
2017-04-13 11:13:58 -04:00
zimbatm d4fbb4779b terraform: 0.9.2 -> 0.9.3 2017-04-13 15:27:19 +01:00
Tuomas Tynkkynen 1f32d4b4eb make-bootstrap-tools.nix: Fix bzip2
Apparently our native bzip2 builds switched to using dynamic libraries at some point.
2017-04-13 17:22:55 +03:00
Daniel Peebles 09a9a472ee Merge pull request #24830 from mayflower/refactor/boolToString
treewide: use boolToString function
2017-04-13 09:45:31 -04:00
Thomas Tuegel c9ba39116c Merge pull request #24816 from benley/plasma-nm
plasma-nm: Fix cipher discovery by setting path to openvpn
2017-04-13 08:16:57 -05:00
Tim Steinbach 68513361f1 Merge pull request #24818 from dbrock/ethabi
ethabi: 0.2.1 -> 1.0.4
2017-04-13 08:52:17 -04:00
Tim Steinbach cf7a383b61 Merge pull request #24846 from ikervagyok/pepperflash
chromium: flashplayer: 25.0.0.127 -> 25.0.0.148
2017-04-13 08:51:34 -04:00
Tim Steinbach 568c09635a Merge pull request #24859 from sigma/pr/hugo
hugo: 0.18.1 -> 0.20
2017-04-13 08:51:20 -04:00
Tim Steinbach 3c29b8e7da Merge pull request #24864 from NeQuissimus/gradle_3_5
gradle: 3.4.1 -> 3.5
2017-04-13 08:50:49 -04:00
Tim Steinbach 9e212ebcf8 Merge pull request #24863 from NeQuissimus/atom_1_16_0
atom: 1.15.0 -> 1.16.0
2017-04-13 08:47:38 -04:00
Christoph-Simon Senjak dcbb2bf751
teamviewer: keep RTlib directory
Added the formerly deleted RTlib directory, included its
patchelf commands. Beforehand the client failed, because
TVGuiDelegate did not find all symbols.

fixes #24862
2017-04-13 14:46:59 +02:00
Jörg Thalheim 478e9cdae5 Merge pull request #24840 from matthiasbeyer/pr-23111-fixed
diamond: init at 0.8.36
2017-04-13 14:40:30 +02:00
Jörg Thalheim 9f2ba15647 Merge pull request #24668 from tosmi/davmail
davmail: 4.7.2 -> 4.8.0
2017-04-13 14:35:56 +02:00
Jörg Thalheim 20fea7f449
davmail: remove unrelated files from $out/bin 2017-04-13 14:34:45 +02:00
Marco Maggesi 1dee38f259 BLCR 0.8.5b4 *do* work with Linux 3.10. 2017-04-13 14:15:27 +02:00
Toni Schmidbauer d606717588 davmail: 4.7.2 -> 4.8.0 2017-04-13 14:08:18 +02:00
Michael Leandersson 15bb499df9
kakoune: 2017-02-09-> 2017-04-12
fixes #24847
fixes #24738
2017-04-13 14:04:56 +02:00
Jörg Thalheim 73c8797d16 gce/create-gce.sh: rewrite using nix-shell shebang and bash (#24869)
* google-cloud-sdk: 150.0.0 -> 151.0.0

- gce/create-gce.sh: rewrite using nix-shell shebang and bash
- allows to run the script without being the same directory
- nix-shell install google-cloud-sdk
- some shellcheck cleanups and scripting best practice
- gce/create-gce.sh: do not clobber NIX_PATH: this allows NIX_PATH to be overwritten to build a different release
- gce/create-gce.sh: remove legacy hydra option
2017-04-13 13:42:28 +02:00
Eelco Dolstra d3c737a080
gcc-snapshot: 7-20161211 -> 7-20170409 2017-04-13 13:07:45 +02:00