alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
421668 commits 217 branches 121 tags 4.5 GiB
Commit graph

862 commits

Author SHA1 Message Date
R. Ryantm c908fca315 netbox: 3.3.0 -> 3.3.2 2022-09-08 12:09:44 +00:00
Jonas Heinrich bdd227c300
Merge pull request #184827 from onny/dokuwiki 
dokuwiki: 2020-07-29 -> 2022-07-31
 2022-09-04 19:08:45 +02:00
Aaron Andersen 5b62b0d2ce
Merge pull request #189635 from RaitoBezarius/nixos/dolibarr 
dolibarr: init at 15.0.3, nixos/dolibarr: init
 2022-09-04 07:55:34 -04:00
Aaron Andersen c2563fe476 nixos/dolibarr: init 
Co-authored: Ryan Lahfa <masterancpp@gmail.com>
 2022-09-04 05:28:22 +02:00
Aaron Andersen ac52fbb3ba dolibarr: init at 15.0.3 2022-09-04 05:28:22 +02:00
Finn Behrens bc8f00427a moodle: 3.11.6 -> 4.0.2 2022-09-02 18:03:27 +00:00
Brian Leung cbf8e91772 nixos/tests/lemmy: init 
Co-authored-by: Ctem <c@ctem.me>
Co-authored-by: cab <cab404@mailbox.org>
Co-authored-by: a-kenji <aks.kenji@protonmail.com>
Co-authored-by: Shahar Dawn Or <mightyiampresence@gmail.com>
Co-authored-by: Matthias Meschede <MMesch@users.noreply.github.com>
Co-authored-by: Ilan Joselevich <personal@ilanjoselevich.com>
 2022-09-02 05:55:11 -04:00
Ilan Joselevich 315f5d7602
searxng: unstable-2022-07-15 -> unstable-2022-09-01 (#189328) 2022-09-02 11:45:23 +02:00
Bobby Rong f0a3d43410
Merge pull request #188732 from r-ryantm/auto-update/snipe-it 
snipe-it: 6.0.9 -> 6.0.10
 2022-08-29 21:41:11 +08:00
R. Ryantm 7eac217de7 snipe-it: 6.0.9 -> 6.0.10 2022-08-29 00:39:20 +00:00
Jonas Heinrich 32c01a1d11
Merge pull request #184008 from r-ryantm/auto-update/galene 
galene: 0.4.4 -> 0.5.5
 2022-08-28 14:17:16 +02:00
Artturi 79c42aa06c
Merge pull request #186564 from Artturin/crossevalfixes 
Fixes for cross-compilation
 2022-08-27 17:49:00 +03:00
Maximilian Bosch 14e2055527
Merge pull request #187500 from r-ryantm/auto-update/wiki-js 
wiki-js: 2.5.285 -> 2.5.286
 2022-08-22 20:50:00 +02:00
Alexander Bantyev 629ec1b38a
Merge pull request #161805 from yrd/outline 
outline: init at 0.65.2
 2022-08-22 14:45:12 +04:00
Jonas Heinrich 1f8a7f2171
Merge pull request #183849 from r-ryantm/auto-update/shiori 
shiori: 1.5.2 -> 1.5.3
 2022-08-21 15:21:43 +02:00
Sebastián Mancilla 12b0f8840f
Merge pull request #187440 from r-ryantm/auto-update/netbox 
netbox: 3.2.8 -> 3.3.0
 2022-08-20 17:29:13 -04:00
R. Ryantm 8f0df21eb3 wiki-js: 2.5.285 -> 2.5.286 2022-08-19 20:11:04 +00:00
Emery Hemingway ff69a9ad9d discourse.plugins.discourse-oauth2-basic: init 2022-08-19 12:49:32 -05:00
R. Ryantm 404c549424 netbox: 3.2.8 -> 3.3.0 2022-08-19 12:27:06 +00:00
Yannik Rödel 9898e975af outline: init at 0.65.2 2022-08-17 16:30:16 +02:00
Kim Lindberger eed71ab5db
Merge pull request #185820 from talyz/discourse-2.9.0.beta8 
discourse: 2.9.0.beta4 -> 2.9.0.beta9
 2022-08-17 10:41:28 +02:00
Jonas Heinrich 2206b8ae9e
Merge pull request #186677 from r-ryantm/auto-update/netbox 
netbox: 3.2.7 -> 3.2.8
 2022-08-16 15:34:47 +02:00
Artturin c6568adb00 treewide: makeWrapper buildInputs to nativeBuildInputs 
most found with https://github.com/siraben/nix-lint
 2022-08-16 13:14:19 +03:00
Guillaume Girol db340f4f2c
Merge pull request #185785 from yayayayaka/snipe-it-6.0.9 
snipe-it: 6.0.8 -> 6.0.9
 2022-08-15 11:48:11 +00:00
R. Ryantm 41a517e7bb netbox: 3.2.7 -> 3.2.8 2022-08-14 15:31:34 +00:00
Ryan Mulligan 3d332125a4 discourse.plugins.discourse-bbcode-color: init 2022-08-12 13:04:12 -07:00
Simon Bruder a33c768df9
jitsi-meet: 1.0.6260 -> 1.0.6447 2022-08-12 15:15:53 +02:00
talyz a3cc1609cd
discourse: Update plugins 2022-08-12 12:21:11 +02:00
talyz f34bc06abc
discourse: Filter out :require_name option when creating the Gemfile 
:require_name is internal to Discourse and Bundler throws an error
when it's passed through to the Gemfile.
 2022-08-12 12:21:05 +02:00
talyz 7feea0d062
discourse: 2.9.0.beta4 -> 2.9.0.beta9 
Co-authored-by: Tobias Stenzel <ts@flyingcircus.io>
 2022-08-12 12:20:17 +02:00
Sandro 21726eb51e
Merge pull request #180768 from yayayayaka/snipe-it-mysqldump 2022-08-11 23:40:24 +02:00
M. A f6c77b183f snipe-it: Substitute path to mysqldump 
Snipe-IT has an internal command for backup creation
(i.e. `snipe-it snipeit:backup`) which relies on a hardcoded path to
the `mysqldump` binary.
 2022-08-09 14:49:46 +00:00
M. A 10a43777e0 snipe-it: 6.0.8 -> 6.0.9 
https://github.com/snipe/snipe-it/releases/tag/v6.0.9
 2022-08-09 12:47:43 +00:00
Vladimír Čunát 9f43cb3752
nifi: switch src to a working and stable URL 
The previous one apparently only works for the last release.
 2022-08-06 15:31:30 +02:00
Martin Weinelt e94c601c32
Merge pull request #184545 from r-ryantm/auto-update/python3.10-rjsmin 2022-08-06 00:27:52 +02:00
Martin Weinelt 33ee10c80e
python3Packages.django-compressor: rename from django_compressor 2022-08-06 00:21:16 +02:00
Martin Weinelt ec17affee2
Merge pull request #184755 from r-ryantm/auto-update/wallabag 2022-08-05 23:52:57 +02:00
Martin Weinelt 08480a84f8
Merge pull request #184741 from r-ryantm/auto-update/wordpress 2022-08-05 23:20:48 +02:00
Jan Tojnar 208b761972 vikunja-api: 0.18.1 → 0.19.0 
https://vikunja.io/blog/2022/08/whats-new-in-vikunja-0.19.0/
 2022-08-05 15:11:31 +02:00
Jan Tojnar cfe2bb7470 vikunja-frontend: 0.18.1 → 0.19.0 
https://vikunja.io/blog/2022/08/whats-new-in-vikunja-0.19.0/
 2022-08-05 15:11:31 +02:00
Franz Pletz eac2af98eb
Merge pull request #185001 from fpletz/pkgs/lyst-removal 
cutelyst,virtlyst: remove
 2022-08-05 13:47:25 +02:00
Franz Pletz c092a502df
treewide: remove myself as maintainer from some pkgs 
Only packages I'm not able to maintain anymore as of today. Mostly
because I'm haven't been using them in a while.
 2022-08-03 14:17:51 +02:00
Franz Pletz 72d98311e9
virtlyst: remove 2022-08-03 13:53:13 +02:00
Lassulus 1830dc8874
Merge pull request #183816 from r-ryantm/auto-update/rss-bridge 2022-08-03 07:33:41 +02:00
Jonas Heinrich 424911a03e dokuwiki: 2020-07-29 -> 2022-07-31 2022-08-02 15:37:48 +02:00
R. Ryantm 2ef718e01e wallabag: 2.5.0 -> 2.5.1 2022-08-02 06:53:48 +00:00
R. Ryantm 6cf054449b wordpress: 6.0 -> 6.0.1 2022-08-02 05:55:23 +00:00
Winter 39ea311c87
Merge pull request #184388 from r-ryantm/auto-update/nifi 2022-08-01 23:57:31 -04:00
Yaya 968334b43a snipe-it: 6.0.7 -> 6.0.8 
https://github.com/snipe/snipe-it/releases/tag/v6.0.8
 2022-08-01 16:30:55 +02:00
R. Ryantm 38b167bc31 nifi: 1.16.1 -> 1.16.3 2022-08-01 01:06:05 +00:00
R. Ryantm c1a8b32d9d galene: 0.4.4 -> 0.5.5 2022-07-30 16:54:06 +00:00
R. Ryantm 451da46031 shiori: 1.5.2 -> 1.5.3 2022-07-29 22:46:52 +00:00
R. Ryantm 6d77dfe185 rss-bridge: 2022-01-20 -> 2022-06-14 2022-07-29 21:19:59 +00:00
R. RyanTM 90e6bcda8c
netbox: 3.2.6 -> 3.2.7 (#182543) 2022-07-29 17:00:21 +02:00
Sandro Jäckel 8ba85eda8a
mediawiki: 1.38.1 -> 1.38.2 
Fixes CVE-2022-29248, CVE-2022-27776
 2022-07-28 11:54:08 +02:00
Robert Djubek 54f19d3ee7 matomo: 4.5.0 -> 4.10.1 
matomo-beta: 4.6.0 -> 4.11.0
 2022-07-26 04:52:08 +02:00
Sandro Jäckel 1653d2e3e2
hedgedoc: refactor to fix editor crashing, replace inactive maintainer with myself 2022-07-24 16:18:09 +02:00
Martin Weinelt 87cb1156a9
Merge pull request #181457 from r-ryantm/auto-update/netbox 2022-07-22 17:49:48 +02:00
Sandro 4eec7601d2
Merge pull request #178614 from SuperSandro2000/mediawiki 
mediawiki: 1.37.2 -> 1.38.1, adopt
 2022-07-22 14:29:42 +02:00
Bill Ewanick d99563cd78 Add oil to packages before invoking shell, 
this allows the oil shell to actually run
 2022-07-21 18:40:45 -04:00
Sandro 3f2b510ebd
Merge pull request #181868 from SuperSandro2000/searxng 
searxng: unstable-2022-06-29 -> unstable-2022-07-15
 2022-07-21 16:57:35 +02:00
Pol Dellaiera a174de16ed
hedgedoc: 1.9.0 -> 1.9.4 (#178129) 2022-07-21 11:54:17 +02:00
Bill Ewanick e5801de829 lemmy: 0.16.4 -> 0.16.6 2022-07-20 21:19:18 -04:00
ajs124 7bd91bca24 sogo: add optional (off by default) EAS/ActiveSync support 2022-07-18 15:28:55 +02:00
ajs124 18a5275c3d sogo: 5.5.0 -> 5.7.0 2022-07-18 15:25:40 +02:00
Sandro Jäckel 17bba9f16b
searxng: unstable-2022-06-29 -> unstable-2022-07-15 2022-07-17 19:09:30 +02:00
Luke Granger-Brown d5eb8cea61 netbox: build documentation as part of build 2022-07-17 15:01:17 +00:00
Luke Granger-Brown db93e37fa3 netbox: add new dependencies (bleach, sentry-sdk) 2022-07-17 15:01:08 +00:00
Sandro 2815ff97dd
Merge pull request #179621 from Kranzes/searxng 
searxng: init at unstable-2022-06-29
 2022-07-17 01:47:40 +02:00
Sandro Jäckel e637c304e6
mediawiki: 1.37.2 -> 1.38.1, adopt 2022-07-17 01:08:47 +02:00
Guillaume Girol 85338c3f59
Merge pull request #179811 from yayayayaka/snipe-it-6.0.6 
snipe-it: 6.0.5 -> 6.0.7
 2022-07-15 16:15:27 +00:00
R. Ryantm 035c191ae1 netbox: 3.2.3 -> 3.2.6 2022-07-14 09:17:54 +00:00
Lassulus 64bc1e49bd
Merge pull request #174454 from r-ryantm/auto-update/netbox 
netbox: 3.2.1 -> 3.2.3
 2022-07-13 14:01:29 +02:00
ajs124 2837f807c9
Merge pull request #180066 from helsinki-systems/rem/nodejs-12_x 
nodejs-12_x: remove
 2022-07-06 23:09:28 +02:00
Yaya 29946c6c21 snipe-it: 6.0.5 -> 6.0.7 
https://github.com/snipe/snipe-it/releases/tag/v6.0.6
https://github.com/snipe/snipe-it/releases/tag/v6.0.7
 2022-07-06 16:31:17 +00:00
ajs124 126bd386d8 cryptpad: remove 2022-07-04 15:33:59 +02:00
ajs124 c4b8828630 treewide: node*.nix remove references to nodejs-12_x 2022-07-04 15:33:57 +02:00
Nguyễn Gia Phong 4b0803ffb2
phylactery: 0.1.1 -> 0.1.2 2022-07-04 17:12:11 +09:00
Charlotte Van Petegem 589f060ab8
bookstack: fix unquoted URLs 2022-07-02 09:49:06 +02:00
Anderson Torres 7c4cd581df
Merge pull request #179679 from ymarkus/bookstack 
bookstack: 21.12 -> 22.06.2
 2022-07-01 01:10:57 -03:00
ckie a8c2879f43
Merge pull request #179425 from McSinyx/phylactery 
phylactery: init at 0.1.1
 2022-06-30 18:29:19 +03:00
Nguyễn Gia Phong ce910fca88
nixos/tests: add phlactery 2022-06-30 22:50:08 +09:00
Nguyễn Gia Phong 512670498f
phylactery: init at 0.1.1 2022-06-30 17:22:12 +09:00
Yannick Markus 89b90fe3d1
bookstack: 21.12 -> 22.06.2 2022-06-30 09:42:39 +02:00
Sandro a59be4f6c8
Merge pull request #175919 from phaer/phaer-healthchecks 
healthchecks: init at 2.2.1
 2022-06-29 23:15:35 +02:00
Ilan Joselevich 7ba0e47ff2 searxng: init at 2022-06-29 2022-06-29 23:47:05 +03:00
ajs124 15e41e3edf
Merge pull request #179358 from helsinki-systems/upd/jitsi 
jitsi: update
 2022-06-29 21:09:19 +02:00
ajs124 45ec5898cb maintainers: remove tstrobel 
was ts468 on github afaict and was actually a committer, but that account hasn't been active since early 2018
 2022-06-29 00:54:53 +02:00
ajs124 bf4912f399 jitsi-meet: 1.0.6155 -> 1.0.6260 2022-06-28 23:14:18 +02:00
phaer 12d45dc313 healthchecks: init at 2.2.1 2022-06-28 10:28:46 +02:00
Maximilian Bosch 137e9a6316
wiki-js: 2.5.284 -> 2.5.285 
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.285
 2022-06-26 20:41:38 +02:00
Bill Ewanick 5fb0d258ea lemmy: 0.15.1 -> 0.16.4 2022-06-26 03:30:54 -04:00
Mario Rodas 0104692af1
Merge pull request #178652 from yayayayaka/snipe-it-6.0.5 
snipe-it: 6.0.4 -> 6.0.5
 2022-06-24 00:36:09 -05:00
Mario Rodas 287dbab37a
Merge pull request #178116 from davidtwco/jirafeau-4.4.0 
jirafeau: 4.3.0 -> 4.4.0
 2022-06-22 21:53:19 -05:00
M. A 202aeba57c snipe-it: 6.0.4 -> 6.0.5 
https://github.com/snipe/snipe-it/releases/tag/v6.0.5
 2022-06-22 23:50:53 +00:00
Jonas Heinrich 7261506c31 wordpress: 5.9.3 -> 6.0 2022-06-21 02:54:30 -04:00
Maximilian Bosch cdbc6e64e4
treewide: reduce maintenance workload for ma27 
Note: I DO NOT resign from nixpkgs, not at all!

However, I like a clean notification inbox and I get a lot of stuff for
packages where I'm only an end-user or don't use them anymore and thus
can't help out that much.

So please consider it a measure to reduce the mental load for me when
going through my notifications ;-)
 2022-06-19 12:07:43 +02:00
David Wood 62ac6fddd5
jirafeau: 4.3.0 -> 4.4.0 
Signed-off-by: David Wood <david@davidtw.co>
 2022-06-18 09:14:43 +01:00
Yaya d705a5c8c6 snipe-it: 6.0.2 -> 6.0.4 2022-06-14 22:30:47 +00:00
Maximilian Bosch 186ba212b5
wiki-js: 2.5.283 -> 2.5.284 
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.284
 2022-06-12 21:45:27 +02:00
Elis Hirwing 7afff45088
Merge pull request #174555 from etu/php-drop-php74 
php: Drop PHP 7.4
 2022-06-10 10:43:31 +02:00
Mario Rodas 42550027d8 treewide: remove references to nodejs-10_x 
nodejs-10_x was dropped by https://github.com/NixOS/nixpkgs/pull/175637
 2022-06-09 04:20:00 +00:00
Elis Hirwing fa4acb7659
engelsystem: Upgrade to PHP 8.1 2022-06-08 18:09:52 +02:00
Leona Maroni 0eaa72390b maintainers: rename to leona 2022-06-06 22:20:31 +02:00
Yaya b485744783 snipe-it: 5.4.3 -> 6.0.2 
https://github.com/snipe/snipe-it/releases/tag/v6.0.2

Depends on PHP 8 since v6.0.0 and has been reflected by this PR.
 2022-06-06 07:52:13 +00:00
Maximilian Bosch 9b11851ccf
wiki-js: 2.5.282 -> 2.5.283 
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.283
 2022-05-28 00:26:28 +02:00
R. Ryantm af43752ff1 netbox: 3.2.1 -> 3.2.3 2022-05-25 09:36:02 +00:00
Martin Weinelt da56374a49
wallabag: 2.4.3 -> 2.5.0 
https://github.com/wallabag/wallabag/releases/tag/2.5.0
 2022-05-23 22:54:14 +02:00
Maximilian Bosch 2c0b81666d
wiki-js: 2.5.279 -> 2.5.282 
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.280
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.281
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.282
 2022-05-19 12:48:16 +02:00
K900 a4c0d2b344 netbox: fix build, drop overrides, update Django 2022-05-16 13:27:16 +03:00
Jan Tojnar 5af93e6908 Merge branch 'staging-next' into staging 2022-05-12 01:24:26 +02:00
Artturi 60b3e40b48
Merge pull request #172285 from r-ryantm/auto-update/jitsi-meet 
jitsi-meet: 1.0.6091 -> 1.0.6155
 2022-05-11 23:47:26 +03:00
github-actions[bot] 3a79190750
Merge staging-next into staging 2022-05-10 18:01:50 +00:00
Lara b9a74a1b67 snipe-it: init at 5.4.3 
Snipe-IT is a web-based open source asset management system.

https://snipeitapp.com/
 2022-05-10 16:57:21 +02:00
R. Ryantm 89120cda74 jitsi-meet: 1.0.6091 -> 1.0.6155 2022-05-10 05:32:30 +00:00
Sandro 7169abf52f
python310Packages.babel: 2.9.1 -> 2.10.1 (#171867) 2022-05-09 01:53:28 +02:00
Bernardo Meurer e6b94ad07e
Merge pull request #171602 from malob/treewide-mainProgram 
treewide: add meta.mainProgram to many packages
 2022-05-05 18:16:09 -07:00
Maximilian Bosch f3791540d0
Merge pull request #170994 from Ma27/bump-wiki-js 
wiki-js: 2.5.277 -> 2.5.279
 2022-05-05 20:53:54 +02:00
Malo Bourgon 16e15fa68f treewide: add meta.mainProgram to many packages 2022-05-04 18:08:19 -07:00
Artturi 0b64a2d69a
Merge pull request #167108 from aaronjheng/oath-toolkit 
oath-toolkit: Rename from oathToolkit to oath-toolkit
 2022-05-05 03:58:39 +03:00
Artturi e475fb95fb
Merge pull request #170624 from benneti/wallabag-longDesc 
wallabag: fix comment with usage instructions
 2022-05-04 05:55:25 +03:00
Martin Weinelt 9dce04dcfd
nifi: 1.16.0 -> 1.16.1 
https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.16.1

Fixes Improper Restriction of XML External Entity References in Multiple
Components.

https://nifi.apache.org/security.html#CVE-2022-29265

Fixes: CVE-2022-29265
 2022-04-30 13:11:02 +02:00
Maximilian Bosch e6acae6768
wiki-js: 2.5.277 -> 2.5.279 
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.278
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.279
 2022-04-30 09:59:33 +02:00
Benedikt Tissot b531bf477a wallabag: fix comment with usage instructions 2022-04-27 15:41:21 +02:00
Ryan Mulligan ac7a6d56de
Merge pull request #169526 from r-ryantm/auto-update/jitsi-meet 
jitsi-meet: 1.0.5913 -> 1.0.6091
 2022-04-21 19:54:36 -07:00
R. Ryantm ae42928b2a jitsi-meet: 1.0.5913 -> 1.0.6091 2022-04-21 04:59:36 +00:00
happysalada 76b68621e8 lemmy: fix update.sh script 2022-04-20 21:45:25 -04:00
Lassulus 1e49365c8e
Merge pull request #163295 from r-ryantm/auto-update/jitsi-meet 
jitsi-meet: 1.0.5818 -> 1.0.5913
 2022-04-20 13:52:03 +01:00
Ember 'n0emis' Keske 896c716d1b
netbox: 3.1.10 -> 3.2.1 2022-04-19 17:52:09 +02:00
github-actions[bot] c58a108aaa
Merge master into staging-next 2022-04-16 06:01:08 +00:00
Ryan Mulligan 8c33504431 discourse: 2.9.0.beta3 -> 2.9.0.beta4 2022-04-14 13:23:50 -07:00
Vladimír Čunát d5d94127fd
Merge branch 'staging-next' into staging 
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
 2022-04-14 09:53:21 +02:00
Kim Lindberger 9d12de1ab7
Merge pull request #165481 from talyz/discourse-2.9.0.beta3 
discourse: 2.9.0.beta1 -> 2.9.0.beta3
 2022-04-12 10:38:16 +02:00
Jonas Heinrich dad93dbbd3 invocieplane: Add patches for CVE-2021-29024, CVE-2021-29023 2022-04-11 20:36:54 -04:00
ajs124 af4a018878
Merge pull request #164726 from r-ryantm/auto-update/moodle 
moodle: 3.11.5 -> 3.11.6
 2022-04-11 21:59:23 +01:00
Lassulus ace8357011
Merge pull request #143878 from Izorkin/init-nifi 
nifi: init at 1.16.0
 2022-04-11 14:08:29 +01:00
Izorkin 63ef6aebef
nixos/tests: add nifi test 2022-04-10 20:48:43 +03:00
Izorkin 83c9b74834
nifi: init at 1.16.0 2022-04-10 20:41:59 +03:00
R. Ryantm 39050c8c66 wordpress: 5.9.2 -> 5.9.3 2022-04-10 05:11:17 +00:00
github-actions[bot] f303d4de3b
Merge staging-next into staging 2022-04-09 12:02:07 +00:00
Maximilian Bosch dfc0ddaa87
wiki-js: 2.5.276 -> 2.5.277 
ChangeLog: https://github.com/requarks/wiki/releases/tag/v2.5.277
 2022-04-08 18:44:16 +02:00
Maximilian Bosch 2e2aed7100
wiki-js: add update script 2022-04-08 18:44:02 +02:00
Martin Weinelt bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
Lassulus 5bae60beee
Merge pull request #158000 from iblech/patch-whitebophir1.17.0 
whitebophir: 1.16.0 -> 1.17.0
 2022-04-04 17:07:50 +01:00
ajs124 9ae3813cda
Merge pull request #167147 from iblech/patch-ethercalc-node14 
ethercalc: migrate from nodejs-12_x to nodejs-14_x
 2022-04-04 17:51:30 +02:00
Ingo Blechschmidt be8f812fca ethercalc: migrate from nodejs-12_x to nodejs-14_x 2022-04-04 10:03:00 +02:00
Aaron Jheng f0c470f5eb
oath-toolkit: Rename from oathToolkit to oath-toolkit 2022-04-04 01:11:06 +00:00
github-actions[bot] ffa96ab0c0
Merge staging-next into staging 2022-04-02 18:01:37 +00:00
Alyssa Ross 8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
 2022-04-02 16:45:48 +00:00
7c6f434c 8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry 
treewide: use lib.getLib for OpenSSL libraries
 2022-04-02 12:59:55 +00:00