Commit Graph

35612 Commits

Author SHA1 Message Date
TredwellGit 35b4a78d9a lz4: patch CVE-2021-3520 and null pointer dereference
(cherry picked from commit 2acd087dca93a3b589721b3ec32d13d9150684bb)
2021-05-30 16:06:32 +00:00
Vladimír Čunát ddc60bec55
Merge #123133: curlftpfs: fix sandboxed builds on darwin
(cherry picked from commit 29f57e475266edbb57d995c044aba3adf7f71298)
2021-05-23 08:19:50 +02:00
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Martin Weinelt 84f649f693
Merge pull request #121626 from mweinelt/botamusique 2021-05-23 02:02:09 +02:00
Robert Scott 117a632169
Merge pull request #123987 from LeSuisse/htmldoc-1.9.12
htmldoc: 1.9.11 -> 1.9.12
2021-05-23 00:49:23 +01:00
Martin Weinelt f05a2c22cf
botamusique: unstable-2021-03-13 -> unstable-2021-05-19 2021-05-23 01:01:52 +02:00
Martin Weinelt f79c1d1c3e
botamusique: add passthru test 2021-05-23 01:01:52 +02:00
Maximilian Bosch 9d6f7c1080
Merge pull request #122000 from r-ryantm/auto-update/ceph
ceph: 16.2.1 -> 16.2.3
2021-05-22 23:42:57 +02:00
Sandro 832d804bbc
Merge pull request #123710 from JamieMagee/wslu
wslu: init at 3.2.3
2021-05-22 17:26:33 +02:00
Sandro 8f0f1926a9
Merge pull request #123123 from trobert/remove-openconnect_pa
openconnect_pa: remove, integrated in openconnect upstream
2021-05-22 17:02:53 +02:00
Sandro 49eaf7eead
Merge pull request #124034 from remedialchaos/xh 2021-05-22 16:50:26 +02:00
Kira Bruneau cd4780fab4
maintainers: rename metadark -> kira-bruneau (#124035) 2021-05-22 16:47:40 +02:00
Sandro 62c7925218
Merge pull request #123977 from fortuneteller2k/bfetch 2021-05-22 16:42:52 +02:00
Sandro f8818b9aed
Merge pull request #123983 from LeSuisse/vault-1.7.2
vault: 1.7.1 -> 1.7.2
2021-05-22 16:41:37 +02:00
Payas Relekar 741f33da13 xh: 0.9.2 -> 0.10.0 2021-05-22 20:00:26 +05:30
Sandro 1fc45b3925
Merge pull request #123982 from zowoq/fzf 2021-05-22 16:07:11 +02:00
Sandro 55aa5e870c
Merge pull request #123226 from pacien/ldgallery-fix-darwin-build 2021-05-22 15:51:52 +02:00
Charlotte Van Petegem f29969988d
eid-mw: 4.4.27 -> 5.0.21 (#122247) 2021-05-22 15:47:53 +02:00
Sandro cc26a61f37
Merge pull request #123901 from mvnetbiz/update-xpra 2021-05-22 15:41:39 +02:00
pacien eb01e51938 ldgallery: fix darwin build
This adds a missing build dependency for building on Darwin.

GitHub: fixes #122681
2021-05-22 15:27:17 +02:00
Matt Votava 3147a7104d xpra: 4.1.3 -> 4.2
Add librsvg for icon resizing
2021-05-22 05:37:13 -07:00
github-actions[bot] 563389a7fd
Merge master into staging-next 2021-05-22 12:27:09 +00:00
fortuneteller2k 290fa04d05 fetchutils: init at unstable-2021-03-16 2021-05-22 16:40:31 +08:00
Thomas Gerbet 4c960a0284 htmldoc: 1.9.11 -> 1.9.12
Fixes CVE-2021-20308.

https://github.com/michaelrsweet/htmldoc/releases/tag/v1.9.12
2021-05-22 09:56:56 +02:00
Thomas Gerbet 4a51f49781 vault: 1.7.1 -> 1.7.2
Fixes CVE-2021-32923.
2021-05-22 09:03:22 +02:00
zowoq 60dfaef8e1 fzf: 0.27.0 -> 0.27.1
https://github.com/junegunn/fzf/releases/tag/0.27.1
2021-05-22 16:38:22 +10:00
Jörg Thalheim bd62071220
Merge pull request #123968 from Lassulus/nixos-generators
nixos-generators: 1.2.0 -> 1.3.0
2021-05-22 07:29:18 +01:00
github-actions[bot] cc35c7fc85
Merge master into staging-next 2021-05-22 06:21:55 +00:00
fortuneteller2k 76c2b90825 bfetch: init at unstable-2021-05-21 2021-05-22 13:59:44 +08:00
lassulus af60121cf5 nixos-generators: 1.2.0 -> 1.3.0 2021-05-22 07:05:27 +02:00
Martin Weinelt 2ac25ed56e ajour: 1.1.0 -> 1.2.0 2021-05-21 21:22:06 -07:00
Jonathan Ringer 7507aed4e1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
2021-05-21 19:49:05 -07:00
R. RyanTM dac51dfb1f blflash: 0.3.2 -> 0.3.3 2021-05-21 19:43:10 -07:00
R. RyanTM 24fda1e03f burpsuite: 2021.4.2 -> 2021.5.1 2021-05-21 19:39:46 -07:00
Jonathan Ringer 3f32731630 gpt2tc: 2020-12-30 -> 2021-04-24, fix build 2021-05-21 18:13:24 -07:00
github-actions[bot] 901fb5e64e
Merge master into staging-next 2021-05-22 00:56:03 +00:00
davidak 3ff0ef5666
Merge pull request #121809 from rvolosatovs/init/stt
Deprecate deepspeech in favor of stt
2021-05-21 23:19:29 +02:00
Fabian Affolter 77be0fbd81 ipinfo: 1.1.4 -> 1.1.5 2021-05-21 21:59:46 +02:00
Thibaut Robert 908017d33b openconnect_pa: remove, integrated in openconnect upstream
Support for GlobalProtect VPN is now available in the official OpenConnect since v8.00, making this package unnecessary
2021-05-21 21:00:16 +02:00
Sandro fc52705512
Merge pull request #123700 from humancalico/tremor-bump 2021-05-21 19:49:53 +02:00
Jonathan Ringer 5cd5b9b97f
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/development/tools/kubie/default.nix
2021-05-21 10:39:34 -07:00
Akshat Agarwal a7de6d3c89 tremor-rs: 0.11.1 -> 0.11.2 2021-05-21 16:08:22 +00:00
Eelco Dolstra 62ee635d53
Replace nixFlakes -> nixUnstable 2021-05-21 15:23:52 +02:00
Eelco Dolstra 49c22083b9
nixFlakes: Turn into an alias 2021-05-21 15:21:31 +02:00
Eelco Dolstra 21bfd3bbce
Revert nixFlake / nixExperimental (#120141)
Usage of the nixFlakes attribute obscures the fact that it's an
experimental feature. Providing a nixExperimental attribute (which
people will inevitably start using on their production machines) makes
it too easy to enable all experimental features, when you should
explicitly opt in to the features that you want to try out.

Also, upstream Nix doesn't provide an "enable all experimental
features" patch so neither should Nixpkgs.
2021-05-21 15:16:35 +02:00
Jonathan Ringer 6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
Mario Rodas 6bad8a5633
Merge pull request #123707 from leotaku/update-netdata
netdata: 1.30.1 -> 1.31.0
2021-05-20 19:45:10 -05:00
Fabian Affolter 0f8ef5f82f metasploit: 6.0.44 -> 6.0.45 2021-05-20 17:24:25 -07:00
Michael Raskin 92e5ef2735
Merge pull request #123844 from lsix/freeipmi-1.6.8
freeipmi: 1.6.7 -> 1.6.8
2021-05-21 00:10:07 +00:00
R. RyanTM aaa5b24921 agi: 1.1.0-dev-20210514 -> 1.1.0-dev-20210517 2021-05-20 14:47:44 -07:00