Commit graph

654 commits

Author SHA1 Message Date
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
Artturi 83063f39b2
Merge pull request #166780 from Artturin/removedeadddir 2022-04-01 11:10:12 +03:00
Artturin 34fd00a5b8 pkgs: remove dead dir 2022-04-01 10:33:51 +03:00
Martin Weinelt 1e2c1b8372
mediawiki: 1.37.1 -> 1.37.2
https://lists.wikimedia.org/hyperkitty/list/mediawiki-announce@lists.wikimedia.org/message/YJNXKPV5Z56NSUQ4G3SXPDUIZG5EQ7UR/

Fixes: CVE-2022-28202, CVE-2022-22801, CVE-2022-28203, CVE-2022-28204
2022-04-01 00:03:42 +02:00
github-actions[bot] 9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Ember 'n0emis' Keske 313b1dc9d0
nixos/netbox: add nixos test 2022-03-30 22:24:34 +02:00
Ember 'n0emis' Keske ce84aa3051
netbox: init at 3.1.10 2022-03-30 22:24:31 +02:00
Alyssa Ross fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d.  One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries.  This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.

This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching.  The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.

I started by making the following global replacements:

    ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
    ${openssl.out}/lib -> ${lib.getLib openssl}/lib

Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.

Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.

Then I manually investigated and fixed the following packages:

 - pycurl
 - citrix-workspace
 - ppp
 - wraith
 - unbound
 - gambit
 - acl2

I'm reasonably confindent in my fixes for all of them.

For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all.  Removing it doesn't make a difference to the output size, the
file list, or the closure.

I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
Ben Siraphob ed863440b8
Merge pull request #163924 from OPNA2608/fix/autoPatchelfHook_isLinux 2022-03-26 16:01:56 -05:00