3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

16801 commits

Author SHA1 Message Date
Jörg Thalheim a2c6dbe370
Merge pull request #44137 from dtzWill/update/grv-0.2.0
grv: 0.1.2 -> 0.2.0
2018-07-29 12:50:33 +01:00
Jörg Thalheim 08254f2462
Merge pull request #44188 from Ekleog/redsocks-maintain
redsocks: add self as maintainer
2018-07-29 12:23:48 +01:00
Jörg Thalheim bdfba1a954
Merge branch 'master' into update/grv-0.2.0 2018-07-29 12:18:18 +01:00
Frederik Rietdijk e46e7f44c2
Merge staging-next into master 2018-07-29 09:13:54 +02:00
Frederik Rietdijk 2226b7de07
Merge pull request #44177 from LnL7/nix-tempdir
nix: don't use /tmp for the tests on darwin
2018-07-29 09:12:41 +02:00
Léo Gaspard 6622dffb1d
redsocks: add self as maintainer 2018-07-29 15:58:50 +09:00
Will Dietz 0eb13162f1 Revert "Merge pull request #43983 from viric/coreutils_ssl_master"
coreutils is part of stdenv, which doesn't allow openssl currently.

It's unclear that adding openssl to stdenv was intended,
but if it was it was not discussed or mentioned.

To unbreak "all the things", reverting until this
has been discussed and a proper fix has been put together.

This reverts commit df9f76c62d, reversing
changes made to 585ded7329.
2018-07-28 19:20:26 -05:00
Lluís Batlle i Rossell 8f5bfc6901 coreutils: fix unwanted change in prev merge
I didn't mean to change the enableParallelBuilding.
2018-07-29 00:20:18 +02:00
viric df9f76c62d
Merge pull request #43983 from viric/coreutils_ssl_master
Openssl in coreutils makes *sum programs much faster (RFC)
2018-07-29 00:17:44 +02:00
Jörg Thalheim 585ded7329
Merge pull request #44179 from gnidorah/maintainers
twilight, kde2-decoration: add myself to maintainers
2018-07-28 23:17:29 +01:00
Lluís Batlle i Rossell 322b2043f9 Remove default for openssl
Suggested by matthewbauer review.
2018-07-28 19:30:54 +02:00
Lluís Batlle i Rossell f54b387b63 Merge remote-tracking branch 'central/master' into viric_clean 2018-07-28 19:25:14 +02:00
gnidorah b6d92b89e3 twilight, kde2-decoration: add myself to maintainers 2018-07-28 17:45:45 +03:00
Frederik Rietdijk eb04afe1b5 awscli: 1.15.58 -> 1.15.66 2018-07-28 16:39:42 +02:00
Daiderd Jordan 77a9745d7a
nix: don't use /tmp for the tests on darwin
Unlike on linux these are not namespaced per user so this will cause
build failures if /tmp/nix-test was not removed by a previous build if
the nixbld user id doesn't match by accident. Nix already creates a
unique tempdir for builds so we can use that instead.

Fixes #44172
2018-07-28 16:03:17 +02:00
Frederik Rietdijk 8db716d9f3 Merge master into staging-next 2018-07-28 12:31:35 +02:00
Silvan Mosberger f460703211
Merge pull request #44154 from sh4r3m4n/fzf-fix-2
fzf: fix invalid symlink on vim-plugins
2018-07-28 05:27:48 +02:00
Dominik Xaver Hörl 6613fea80e android-file-transfer: init at 3.4 2018-07-27 20:20:41 -07:00
Matthew Bauer 53bf234c85 fortune: remove gcc from closure
Fixup is only run on $out/bin not $out/games. Luckily fortune is
relocatable so just moving it to $out/bin works & reduces closure size.
2018-07-27 19:39:33 -04:00
Bas van Dijk ebcdb822f8 elk: 6.2.4 -> 6.3.2
* The ELK stack is upgraded to 6.3.2.

* `elasticsearch6`, `logstash6` and `kibana6` now come with X-Pack which is
  a suite of additional features. These are however licensed under the unfree
  "Elastic License".

* Fortunately they also provide OSS versions which are now packaged
  under: `elasticsearch6-oss`, `logstash6-oss` and `kibana6-oss`.
  Note that the naming of the attributes is consistent with upstream.

* The test `nix-build nixos/tests/elk.nix -A ELK-6` will test the OSS
  version by default. You can also run the test on the unfree ELK using:
  `NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true`
2018-07-28 00:01:31 +02:00
Profpatsch abcc849c9e s6-networking: add ssl support (libressl by default)
For now there’s only support for libressl, but it is built in a way that makes
adding support for e.g. bearssl trivial.
2018-07-27 17:48:32 +02:00
Profpatsch 9a95c136d8 execline: 2.3.0.3 -> 2.5.0.0 2018-07-27 17:48:32 +02:00
Profpatsch 9b55ab7674 s6-rc: 0.3.0.0 -> 0.4.0.1 2018-07-27 17:48:32 +02:00
Profpatsch b4cda2e4ff s6: 2.6.1.1 -> 2.7.1.1 2018-07-27 17:48:32 +02:00
Profpatsch 5ea846a656 s6-dns: 2.2.0.1 -> 2.3.0.0 2018-07-27 17:48:32 +02:00
Matías Lang fcb4e32e9a fzf: fix invalid symlink on vim-plugins
The fzf vim plugin wasn't working because it was making a symlink to a
directory with the full source code. This directory isn't present
anymore since the commit e95f17e272 wich
removes it because it isn't so useful for the go packages.

I fixed it by manually copying the plugin/ directory into the out
derivation, which is the only part of the source that contains the vim
plugin.
2018-07-27 12:27:42 -03:00
Jörg Thalheim 84c75d5a50 blsd: bump libgit 2018-07-27 13:34:35 +01:00
Frederik Rietdijk f59e6f4037 Merge master into staging 2018-07-26 16:18:53 +02:00
Frederik Rietdijk 38ac3b3437
Merge pull request #43972 from NixOS/python-unstable
Python packages: major updates
2018-07-26 16:16:10 +02:00
Robert Schütz 72934aa94e beets: use python3Packages 2018-07-26 12:43:18 +02:00
Johan Thomsen 75e71ad216 cfssl: 20170527 -> 1.3.2 2018-07-26 11:20:36 +02:00
Matthew Bauer 060f53e0d4
Merge pull request #44109 from NixOS/ryantrinkle/remove-empty-file
azure-cli: delete empty nix file
2018-07-25 17:28:17 -04:00
Ryan Trinkle 7ca34b2bdd azure-cli: delete empty nix file 2018-07-25 16:27:12 -04:00
Matthew Bauer 7b7396271c
Merge pull request #44071 from eqyiel/eot_utilities-darwin
eot_utilities: change platforms to unix
2018-07-25 15:32:06 -04:00
Daiderd Jordan 7cc5624b3c
Merge pull request #43993 from carlosdagos/cntlm-macos
cntlm: add support for darwin
2018-07-25 21:19:26 +02:00
Matthew Bauer 444857b15c
Merge pull request #43048 from Nadrieril/passff-host
passff-host: init at 1.0.2
2018-07-25 13:27:02 -04:00
Matthew Bauer 0aa2a93d12
Merge pull request #43810 from yesbox/bfs
bfs: enable the test_fstype test
2018-07-25 13:22:46 -04:00
Sage 49ae194b23 yaxg: init at 2018-07-20
* yaxg: init at 2018-07-20

* yaxg: replaced makeWrapper with wrapProgram

* yaxg: Fixed version number and some formatting
2018-07-25 07:14:14 -07:00
Tuomas Tynkkynen cd5095c0ee simg2img: Init at 1.1.3 2018-07-25 15:55:23 +03:00
Wael M. Nasreddine fec22d4ff4 amazon-ecr-credential-helper: init at 0.1.0 2018-07-24 20:26:41 -07:00
Ruben Maher 0438900c7a eot_utilities: change platforms to unix
This works on Darwin too.
2018-07-25 11:36:25 +09:30
Carlos D 8b306bab12 cntlm: add support for darwin 2018-07-25 11:35:02 +10:00
John Ericson 0859696d06 sharutils: Remove crossAttrs
The patch is no longer needed, at least on aarch64-linux
2018-07-24 18:36:59 -04:00
John Ericson c99de14e60 curl: Get rid of crossAttrs 2018-07-24 18:36:59 -04:00
Profpatsch 4295da8af4 skarnet software: add Profpatsch as maintainer 2018-07-25 00:06:31 +02:00
Profpatsch 710f0f8c10 skarnet software: rename attributes and split outputs
Change the attribute names of camelCased utils to kebab-case to improve
consistency.
Split every package into multiple outputs where possible.
2018-07-25 00:06:31 +02:00
Silvan Mosberger 1f1eb6fdc7
Merge pull request #44051 from Enzime/fix/minicom-on-darwin
minicom: Add macOS support
2018-07-24 23:19:58 +02:00
Frederik Rietdijk 6275a31f33
Merge pull request #43859 from Hodapp87/appleseed_190b_fix_python
appleseed: Fix non-executable items and Python bindings
2018-07-24 21:54:02 +02:00
Frederik Rietdijk 010ebe1276
Merge pull request #43996 from samueldr/update/refind-0.11.3
refind: 0.11.2 -> 0.11.3
2018-07-24 20:50:44 +02:00
Frederik Rietdijk 099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00