3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1749 commits

Author SHA1 Message Date
John Ericson cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Justin Bauer b45ef79b74
Merge pull request #39907 from matthewbauer/work
Miscellaneous cleanups
2018-05-03 13:33:42 -05:00
Matthew Bauer 143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Christian Kauhaus 46aa5200f4 vulnix: 1.6.1 -> 1.6.3 2018-05-03 11:00:48 +02:00
Lancelot SIX 130aee566d
gnupg: 2.2.6 -> 2.2.7
See http://lists.gnu.org/archive/html/info-gnu/2018-05/msg00004.html for
release informations.
2018-05-03 10:34:35 +02:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
R. RyanTM f431e20549 sudo: 1.8.22 -> 1.8.23
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sudo/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/cvtsudoers -h’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/cvtsudoers --help’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/sudoreplay -h’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/sudoreplay --help’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/sudoreplay -V’ and found version 1.8.23
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/sudoreplay --version’ and found version 1.8.23
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/visudo -h’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/visudo --help’ got 0 exit code
- found 1.8.23 with grep in /nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23
- directory tree listing: https://gist.github.com/4d6cfc75cde31a340e8a41bf3d969564
2018-05-02 21:36:39 +02:00
Robert Schütz 166282e826
Merge pull request #39815 from jluttine/pytest-flake8-1.0.1
pythonPackages.pytest-flake8: 1.0.0 -> 1.0.1
2018-05-02 15:17:09 +02:00
Robert Schütz 11a244afdb vulnix: drop obsolete patch 2018-05-02 15:09:39 +02:00
Matthew Justin Bauer 5e6f1abfd3
Merge pull request #39790 from matthewbauer/gnu-on-darwin
GNUs on Darwin
2018-05-01 13:56:54 -05:00
Ryan Mulligan 038a0c9a60 treewide: http to https 2018-04-30 21:39:20 -07:00
Matthew Bauer 426a9acf1e dirmngr: supports darwin 2018-04-30 22:54:42 -05:00
Will Dietz 4b7b083bcb treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux
Include all linux platforms.
2018-04-30 18:12:10 -05:00
Will Dietz 855e0463ab tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux
"platforms.gnu" has been linux-only since at least 17.03:

$ nix eval -f channel:nixos-17.03 lib.platforms.gnu
[ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]

Unlike platforms.linux, platforms.gnu indicates "must use glibc"
which for the most part is not intended.

Replacing platforms.gnu with platforms.linux would be the same "today"
but let's err on preserving existing behavior and be optimistic
about platforms these packages work on.
2018-04-30 18:08:48 -05:00
Stefan Wiehler 480da10f30 open-ecard: init at 1.2.4 2018-04-30 14:30:11 +02:00
Stefan Wiehler 2cc9da33af pcsc-scm-scl011: clean up unpack phase 2018-04-30 14:29:06 +02:00
xeji 69d4bdc557
Merge pull request #39684 from Ma27/fix-notary
notary: fix build
2018-04-30 10:47:33 +02:00
Maximilian Bosch 6a32965e17
notary: fix build
The package is broken on master for some time now:
https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.notary.x86_64-linux/all

The main reason for the breackage is that the `Makefile` script attempts
to retrieve the latest git commit by using `git rev-parse` which breaks
as `git` is not in the build environment. This could be fixed by using
`?=` rather than `:=` for the `GITCOMMIT` variable in the `make` script
to easily override `GITCOMMIT` in the `buildPhase`.

See the Hydra logs for reference:
https://nix-cache.s3.amazonaws.com/log/ib4qp8h4r8d830ra4fah38l7ybb82gp7-notary-0.6.0.drv

Furthermore some refactoring was applied:

* Activated the test suite for `cmd/notary` to confirm the basic
  functionality when building for NixOS.

* Added {pre,post} hooks for `{build,install}Phase`

* Added myself as maintainer to have more people available in case of
  further breakage.
2018-04-30 10:20:38 +02:00
xeji 5e06ec7ab8
Merge pull request #35361 from sconybeare/master
monkeysphere: wrap the monkeysphere executable with the necessary crypto libraries …
2018-04-29 22:14:32 +02:00
Matthew Justin Bauer a4a2626cd9
Merge pull request #35280 from markus1189/logkeys
Logkeys: Update and add `device` option to service
2018-04-25 14:48:29 -05:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Jörg Thalheim c0eaaaef33
Merge pull request #39236 from ckauhaus/vulnix-update-1.6
vulnix: 1.4.0 -> 1.6.1
2018-04-21 12:08:25 +01:00
Francesco Gazzetta 780558a7ea bash-supergenpass: 2012-11-02 -> 2018-04-18 2018-04-20 17:59:56 -05:00
Christian Kauhaus 7808216f7b vulnix: 1.4.0 -> 1.6.1
Update to current vulnix which features greatly improved whitelist
handling among others.

- Temporarly disable flake8 until #39206 is solved.
- Split docs into own output.
2018-04-20 17:42:04 +02:00
Robert Schütz 6dd9819df0 spectre-meltdown-checker: 0.36 -> 0.37 2018-04-19 08:21:08 +02:00
Matthew Bauer 1592e03aba treewide: rename bad filenames
Most of these can easily be moved to subdirectories of other
directories. This helps reduce clutter in the main trees.
2018-04-17 15:42:25 -05:00
Matthew Justin Bauer 0247e7e47f
Merge pull request #38734 from r-ryantm/auto-update/fail2ban
fail2ban: 0.10.2 -> 0.10.3.1
2018-04-17 12:02:53 -05:00
Vladimír Čunát db071c4d1d
Merge #38702: Mark packages as broken (ZHF) 2018-04-17 13:36:20 +02:00
Jörg Thalheim 6bad8ddc82
Merge pull request #39009 from etu/browserpass-fix
browserpass: fix gnupg dependency issue
2018-04-16 22:14:34 +01:00
Elis Hirwing be660b8f51
browserpass: fix gnupg dependency issue 2018-04-16 16:49:01 +02:00
Lancelot SIX ecc5a2bc15
gnupg: 2.2.5 -> 2.2.6
See http://lists.gnu.org/archive/html/info-gnu/2018-04/msg00005.html for
release information
2018-04-16 12:17:24 +02:00
volth ecf8095e91 scallion: init at 2.1 (#38817) 2018-04-14 16:55:39 +00:00
Daiderd Jordan 32c70a07fa
pinentry_mac: enable xcbuild 2018-04-13 00:11:32 +02:00
xeji 0defae41cf gencfsm: mark as broken 2018-04-12 23:04:00 +02:00
Matthew Justin Bauer 29bc523733
Merge pull request #38865 from matthewbauer/darwin-security-fixes
[darwin] Security fixes
2018-04-12 14:27:00 -05:00
R. RyanTM 7fc3e0e0cf fail2ban: 0.10.2 -> 0.10.3.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/fail2ban/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-python -h’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-python --help’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-client-wrapped -h’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-client-wrapped --help’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-client -h’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-client --help’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-regex-wrapped -h’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-regex-wrapped --help’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-regex -h’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-regex --help’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-server-wrapped -h’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/.fail2ban-server-wrapped --help’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-server -h’ got 0 exit code
- ran ‘/nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1/bin/fail2ban-server --help’ got 0 exit code
- found 0.10.3.1 with grep in /nix/store/iwbizr0g8f6wb5243l5730sdgb3nbjqk-fail2ban-0.10.3.1
- directory tree listing: https://gist.github.com/3b1b92178d21ce7b05d59b7e88a6620c
2018-04-11 00:16:27 -07:00
Frederik Rietdijk 6023849ba1 Merge master into staging 2018-04-10 19:23:42 +02:00
Michishige Kaito cda51a8a05 gopass: Install shell completion scripts
Shell completion needs to be generated by the `gopass` binary, and moved
into place for each of the supported shells.
2018-04-10 11:16:56 +01:00
Matthew Bauer 65562e4cdd treewide: change install references for xcbuild
now build directory is "Products/Release/"
2018-04-09 18:35:35 -05:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
sephalon 33eb77bad1 pcsc-scm-scl011: init at 2.09 (#37732) 2018-04-08 23:01:55 -05:00
Matthew Justin Bauer 54cb6affbd
Merge pull request #38056 from ryantm/auto-update/radamsa
radamsa: 0.4 -> 0.5
2018-04-08 21:52:42 -05:00
Frederik Rietdijk d775b0350a python: diceware: 0.9.4 -> 0.9.5 2018-04-08 11:36:07 +02:00
Frederik Rietdijk a9f37d1c25 Merge master into staging 2018-04-05 19:25:05 +02:00
Andrew Childs b206311c80 apg: Widen meta.platforms from linux to unix 2018-04-05 22:35:09 +09:00
Andrew Childs 7d55577852 apg: Fix build on case insensitive filesystems 2018-04-05 22:35:09 +09:00
Frederik Rietdijk 23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Matthew Bauer 92a9f735e0 Revert "qdigidoc: remove certs.patch"
This reverts commit 36a460462f.

Doh
2018-04-03 22:45:06 -05:00
Matthew Bauer 36a460462f qdigidoc: remove certs.patch
Patch is too big and looks to be uneeded.
2018-04-03 22:33:01 -05:00
Yannik Sander 0c95dee8cb
krunner-pass: init at version 1.3.0 2018-04-03 19:01:58 +08:00
Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
Markus Ankenbrand c82a648d33 bettercap: 1.6.2 -> 2.4.0
bettercap 2 is a complete reimplementation using go instead of ruby
See: https://www.evilsocket.net/2018/02/27/All-hail-bettercap-2-0-one-tool-to-rule-them-all/
2018-04-01 22:22:39 +02:00
Eric Bailey c6ae547c9c
browserpass: 2.0.17 -> 2.0.18 2018-03-31 00:19:26 -05:00
John Wiegley 80e730c9a4 Allow some packages to build on darwin as well 2018-03-30 15:39:25 -07:00
Frederik Rietdijk 9d2ff98571 Merge remote-tracking branch 'upstream/master' into HEAD 2018-03-30 08:14:35 +02:00
Ryan Mulligan 5c7c6fd5eb radamsa: 0.4 -> 0.5
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/radamsa/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/vjls4rpfr18a844phj56y6zkgjhkk44n-radamsa-0.5/bin/radamsa -h` got 0 exit code
- ran `/nix/store/vjls4rpfr18a844phj56y6zkgjhkk44n-radamsa-0.5/bin/radamsa --help` got 0 exit code
- ran `/nix/store/vjls4rpfr18a844phj56y6zkgjhkk44n-radamsa-0.5/bin/radamsa -V` and found version 0.5
- ran `/nix/store/vjls4rpfr18a844phj56y6zkgjhkk44n-radamsa-0.5/bin/radamsa --version` and found version 0.5
- found 0.5 with grep in /nix/store/vjls4rpfr18a844phj56y6zkgjhkk44n-radamsa-0.5
- directory tree listing: https://gist.github.com/fc1b475926e3a86b55b9d18567458bd4
2018-03-29 10:29:44 -07:00
Ryan Mulligan a96132f715 spectre-meltdown-checker: 0.35 -> 0.36
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/spectre-meltdown-checker/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/7lrw74lhzrxf9qlykxbq0z4zqick818s-spectre-meltdown-checker-0.36/bin/spectre-meltdown-checker -h` got 0 exit code
- ran `/nix/store/7lrw74lhzrxf9qlykxbq0z4zqick818s-spectre-meltdown-checker-0.36/bin/spectre-meltdown-checker --help` got 0 exit code
- ran `/nix/store/7lrw74lhzrxf9qlykxbq0z4zqick818s-spectre-meltdown-checker-0.36/bin/spectre-meltdown-checker --version` and found version 0.36
- ran `/nix/store/7lrw74lhzrxf9qlykxbq0z4zqick818s-spectre-meltdown-checker-0.36/bin/spectre-meltdown-checker -h` and found version 0.36
- ran `/nix/store/7lrw74lhzrxf9qlykxbq0z4zqick818s-spectre-meltdown-checker-0.36/bin/spectre-meltdown-checker --help` and found version 0.36
- found 0.36 with grep in /nix/store/7lrw74lhzrxf9qlykxbq0z4zqick818s-spectre-meltdown-checker-0.36
- directory tree listing: https://gist.github.com/ecf768a2a6ae0c7389c9248d2e0b98dc
2018-03-29 08:38:55 -07:00
Shea Levy 05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Matthew Justin Bauer 75616ceb49
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
2018-03-27 18:43:03 -05:00
Matthew Bauer ce8ce600ae unix-tools: introduce unix-tools.nix
unix-tools.nix has a collection of tools that are commonly installed
by default in Unix derivatives. This is intended to provide
compatibility between macOS and Linux users. Three Linux-only
derivations are provided for compatbility:

- procps
- utillinux
- nettools

More tools are also provided.

Also: treewide: use unixtools

Non-comprehensive replace of Linux-only procps and util-linux with
'unixtools'.
2018-03-26 17:40:55 -05:00
Pascal Wittmann 1f60fd9bc0
Merge pull request #37767 from NixOS/fix-28145
fail2ban: install docs to $out/share/doc
2018-03-26 09:07:31 +02:00
Ryan Mulligan 46e7e5c898 rofi-pass: 1.5.3 -> 2.0.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/rofi-pass/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -h` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -V` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -v` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --version` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped version` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped -h` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped --help` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/.rofi-pass-wrapped help` and found version 2.0.1
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass -h` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass --help` got 0 exit code
- ran `/nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1/bin/rofi-pass help` got 0 exit code
- found 2.0.1 with grep in /nix/store/wzb6gvnk6sxf2kda842p8bsy9hrf9ccw-rofi-pass-2.0.1
- directory tree listing: https://gist.github.com/b535484b83f99920256e8f30a2b337f6
2018-03-26 08:06:07 +02:00
Pascal Wittmann f3ca47561c
fail2ban: install docs to $out/share/doc
fixes issue #28145
2018-03-25 16:14:48 +02:00
Ryan Mulligan a48d58ff73 pius: 2.2.4 -> 2.2.6
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.2.6 with grep in /nix/store/q9ca3k22liz3dsaipnlnw8fmggpqx1n1-pius-2.2.6
- directory tree listing: https://gist.github.com/0d14ff30c172f091a342653aae676f55
2018-03-25 01:44:40 -05:00
Jon Banafato 8ac272f98d keybase-gui: Enable desktop notifications (#37711)
Add `libnotify` as a build input to make message notifications work.
2018-03-24 19:28:13 +00:00
Franz Pletz 8df9cf585a
browserpass: 2.0.13 -> 2.0.17 2018-03-24 17:09:49 +01:00
Shea Levy 0f854cd2d1
Merge branch 'master' into staging 2018-03-24 01:34:53 -04:00
Matthew Justin Bauer 460dde91cc
Merge pull request #37065 from ryantm/auto-update/lynis
lynis: 2.6.2 -> 2.6.3
2018-03-23 14:42:44 -05:00
Justin Humm ebe1cc211e
neopg: Init at 0.0.4 2018-03-23 16:12:29 +01:00
Matthew Bauer ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Tuomas Tynkkynen 809b0d26bd Merge remote-tracking branch 'upstream/master' into staging 2018-03-22 09:54:10 +02:00
Franz Pletz f2fea9042e
nmap: 7.60 -> 7.70 2018-03-22 01:05:31 +01:00
Franz Pletz 5050d05656
clamav: 0.99.3 -> 0.99.4 for multiple CVEs
Fixes CVE-2012-6706, CVE-2017-6419, CVE-2017-11423, CVE-2018-0202,
CVE-2018-1000085.
2018-03-22 01:05:29 +01:00
Ryan Mulligan 3783316b6a lastpass-cli: 1.2.2 -> 1.3.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass -V` and found version 1.3.0
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass -v` and found version 1.3.0
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass --version` and found version 1.3.0
- found 1.3.0 with grep in /nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0
- directory tree listing: https://gist.github.com/67aab5e731ed5d963e433d03c1a27870
2018-03-21 22:52:38 +00:00
Tuomas Tynkkynen 74720a36c7 Merge remote-tracking branch 'upstream/master' into staging 2018-03-21 23:51:55 +02:00
Daiderd Jordan 38323015e2
masscan: fix build 2018-03-21 21:50:56 +01:00
Shea Levy 4250dd5de4
Merge branch 'master' into staging 2018-03-20 08:38:28 -04:00
Joel Thompson d6d140f159 hologram: 2017-01-30 -> 2018-03-19 2018-03-20 07:36:13 +00:00
Matthew Justin Bauer 35ebf5bfd9
Merge pull request #34982 from tadfisher/pinentry-emacs
pinentry: add option to enable pinentry-emacs
2018-03-19 15:41:56 -05:00
Tad Fisher 82f2c19d98 browserpass: 2.0.11 -> 2.0.13 2018-03-19 12:01:08 -07:00
Peter Hoeg 517589f1ff sedutil: init at 1.15.1 2018-03-19 12:10:24 +08:00
Jörg Thalheim 01014713bf sshuttle: upstream fixed tests 2018-03-16 09:59:24 +00:00
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
Rushmore Mushambi 86c07a3bab
Merge pull request #37138 from ryantm/auto-update/vault
vault: 0.9.4 -> 0.9.5
2018-03-15 22:09:38 +02:00
Ryan Mulligan 732be7d572 vault: 0.9.4 -> 0.9.5
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault -h` got 0 exit code
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault --help` got 0 exit code
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault -v` and found version 0.9.5
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault --version` and found version 0.9.5
- ran `/nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5/bin/vault version` and found version 0.9.5
- found 0.9.5 with grep in /nix/store/8w89f27dfrsksnm1xs4pyplbvi6y3sfa-vault-0.9.5
2018-03-15 11:52:45 -07:00
Ryan Mulligan 0bb522652f lynis: 2.6.2 -> 2.6.3
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3/bin/lynis -V` and found version 2.6.3
- ran `/nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3/bin/lynis --version` and found version 2.6.3
- ran `/nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3/bin/.lynis-wrapped -V` and found version 2.6.3
- ran `/nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3/bin/.lynis-wrapped --version` and found version 2.6.3
- found 2.6.3 with grep in /nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3
- found 2.6.3 in filename of file in /nix/store/krpqgnp9b7j1f5wwfdkmsym5h03xak60-lynis-2.6.3
2018-03-14 21:22:55 -07:00
Joachim F 7136d3a831
Merge pull request #36692 from ryantm/auto-update/softhsm
softhsm: 2.3.0 -> 2.4.0
2018-03-14 21:15:32 +00:00
Joachim F b60cd4be09
Merge pull request #35586 from ryantm/auto-update/certstrap-1.0.1-to-1.1.1
certstrap: 1.0.1 -> 1.1.1
2018-03-14 19:23:50 +00:00
Jörg Thalheim 97c60ab34a
Merge pull request #36971 from volth/no-pandoc-on-i686
sshuttle: fix build on i686-linux
2018-03-14 09:34:08 +00:00
Jörg Thalheim ca1921eb5b shuttle: disable buggy test on darwin 2018-03-14 09:32:17 +00:00
lewo a12ad22c2c
Merge pull request #36804 from vdemeester/update-notary-060
notary: 0.5.1 -> 0.6.0
2018-03-14 10:19:47 +01:00
volth f161fe06b8 sshuttle: fix build on i686-linux 2018-03-14 09:14:16 +00:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Daiderd Jordan 0fdbf3edeb
sslscan: fix clang build
/cc ZHF #36454
2018-03-12 21:12:20 +01:00
Vincent Demeester ef4790cfd4
notary: 0.5.1 -> 0.6.0
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-03-11 15:16:24 +01:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Ryan Mulligan b6cba53df3 softhsm: 2.3.0 -> 2.4.0
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -h` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv --help` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -V` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv -v` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-keyconv --version` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -h` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util --help` got 0 exit code
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -V` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util -v` and found version 2.4.0
- ran `/nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0/bin/softhsm2-util --version` and found version 2.4.0
- found 2.4.0 with grep in /nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0
- found 2.4.0 in filename of file in /nix/store/cs5ycqjsa2lklgx5slaja3gshxf2g7r5-softhsm-2.4.0
2018-03-09 12:42:42 -08:00
Yegor Timoshenko 5e378bcf36
Merge pull request #35710 from ryantm/auto-update/fprintd-0.7.0-to-0.8.0
fprintd: 0.7.0 -> 0.8.0
2018-03-07 15:43:51 +00:00
Lancelot SIX 0b455cec93 gnupg: 2.2.4 -> 2.2.5
See http://lists.gnu.org/archive/html/info-gnu/2018-02/msg00005.html
for release information
2018-03-05 15:12:52 +01:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00