nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-01 10:34:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
400,181 Commits 183 Branches 125 Tags 10 GiB
f97c3252e8
Commit Graph

1448 Commits

Author SHA1 Message Date
Armeen Mahdian
ca079e3074 phantomjs2: remove 2022-05-04 16:36:21 -05:00
Mario Rodas
66466528e7
Merge pull request #171407 from r-ryantm/auto-update/nodejs-18_x 
nodejs-18_x: 18.0.0 -> 18.1.0
 2022-05-04 07:11:22 -05:00
ajs124
1333a3807e
Merge pull request #167110 from mweinelt/nodejs-12-eol 
nodejs: mark versions older than 14 as vulnerable
 2022-05-04 10:18:35 +01:00
Mario Rodas
c0bb20e08e nodejs-18_x: fix completion generation 
Since Node.js 18.0.0 the completion generation requires the environment
variable HOME to be set.
 2022-05-04 04:20:00 +00:00
Mario Rodas
70f212bb5b nodejs-14_x: 14.19.1 -> 14.19.2 
https://github.com/nodejs/node/releases/tag/v14.19.2
 2022-05-04 04:20:00 +00:00
R. Ryantm
1e1ac4e2c6 nodejs-18_x: 18.0.0 -> 18.1.0 2022-05-03 14:47:08 +00:00
R. Ryantm
cab99527a7 deno: 1.21.0 -> 1.21.1 2022-04-29 02:17:42 +00:00
Mario Rodas
c1da6fc4ce nodejs-16_x: 16.14.2 -> 16.15.0 
https://github.com/nodejs/node/releases/tag/v16.15.0
 2022-04-27 04:20:00 +00:00
R. Ryantm
4d12f939d4 cypress: 9.5.4 -> 9.6.0 2022-04-26 01:53:07 +00:00
R. Ryantm
d11118ecfb flyctl: 0.0.320 -> 0.0.323 2022-04-25 08:25:05 +00:00
Mario Rodas
943c2eb1b2 nodejs-18_x: init at 18.0.0 
https://github.com/nodejs/node/releases/tag/v18.0.0
 2022-04-23 04:20:00 +00:00
06kellyjac
3788e27a24 deno: 1.20.5 -> 1.21.0 2022-04-22 19:38:27 +01:00
Sandro
dec5eaede9
Merge pull request #169062 from superherointj/package-minify-2.11.1 
minify: 2.10.0 -> 2.11.1
 2022-04-20 19:16:41 +02:00
Sandro
e22337c870
Merge pull request #169064 from superherointj/package-flyctl-0.0.320 
flyctl: 0.0.316 -> 0.0.320
 2022-04-19 15:59:11 +02:00
Thiago Kenji Okada
e00c10bf0d
Merge pull request #168442 from r-ryantm/auto-update/cypress 
cypress: 9.5.3 -> 9.5.4
 2022-04-18 13:00:05 +01:00
superherointj
9481fdcdfc flyctl: 0.0.316 -> 0.0.320 2022-04-17 12:37:19 -03:00
superherointj
165b53247f minify: 2.10.0 -> 2.11.1 
* Enable tests
 2022-04-17 12:18:05 -03:00
Martin Weinelt
a7fc5aaa76 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-15 13:30:48 +02:00
Lassulus
92734ac395
Merge pull request #166865 from malob/treewide-mainProgram 
treewide: add meta.mainProgram to many packages
 2022-04-15 09:28:00 +01:00
github-actions[bot]
795332a20e
Merge staging-next into staging 2022-04-14 18:01:48 +00:00
Malo Bourgon
0e802eafad treewide: add meta.mainProgram to many packages 2022-04-14 10:24:01 -07:00
Mario Rodas
eb6b58cb4f
Merge pull request #168251 from r-ryantm/auto-update/flyctl 
flyctl: 0.0.314 -> 0.0.316
 2022-04-14 09:35:35 -05:00
github-actions[bot]
999a16ca63
Merge staging-next into staging 2022-04-14 12:02:14 +00:00
Mario Rodas
e4be8477d2
Merge pull request #167500 from 06kellyjac/deno 
deno: 1.19.1 -> 1.20.5
 2022-04-14 05:56:39 -05:00
R. Ryantm
3689c01213 cypress: 9.5.3 -> 9.5.4 2022-04-13 03:54:50 +00:00
R. Ryantm
d49d06eecd flyctl: 0.0.314 -> 0.0.316 2022-04-11 08:52:41 +00:00
github-actions[bot]
01b0aa0bc6
Merge staging-next into staging 2022-04-09 06:01:47 +00:00
Mario Rodas
af5b994d79
Merge pull request #167761 from r-ryantm/auto-update/flyctl 
flyctl: 0.0.310 -> 0.0.314
 2022-04-08 20:43:41 -05:00
github-actions[bot]
e15ff925b0
Merge staging-next into staging 2022-04-09 00:02:40 +00:00
Mario Rodas
0e1d918c06
Merge pull request #165074 from NickCao/nodejs-cross 
nodejs: fix cross compilation

Fixes https://github.com/NixOS/nixpkgs/issues/142651
 2022-04-08 16:28:31 -05:00
R. Ryantm
96b04c9895 nodejs-17_x: 17.8.0 -> 17.9.0 2022-04-08 15:00:45 +00:00
06kellyjac
703cea5f47 deno: 1.19.1 -> 1.20.5 2022-04-08 13:23:21 +01:00
R. Ryantm
09c71b6c61 flyctl: 0.0.310 -> 0.0.314 2022-04-07 19:14:04 +00:00
R. Ryantm
0e6945185b nodejs-12_x: 12.22.11 -> 12.22.12 2022-04-05 14:09:34 +00:00
Martin Weinelt
18dbdee6e1
nodejs: mark versions older than 14 as vulnerable 
NodeJS 12 will reach EOL on 2022/04/30.
 2022-04-04 03:49:28 +02:00
R. Ryantm
4d628da3d7 grails: 5.1.4 -> 5.1.6 2022-04-02 15:25:38 +02:00
R. Ryantm
060c73abb9 flyctl: 0.0.308 -> 0.0.310 2022-04-01 18:43:56 +00:00
tricktron
43b5a5ec59
postman: add darwin packages (#164697) 2022-03-30 16:01:39 +02:00
R. Ryantm
b5dbfba122 cypress: 9.5.2 -> 9.5.3 2022-03-29 19:14:03 +00:00
Sandro
7327ef873a
Merge pull request #165862 from r-ryantm/auto-update/flyctl 2022-03-27 17:10:27 +02:00
Sandro
898fd29e73
Merge pull request #165356 from r-ryantm/auto-update/cypress 2022-03-27 12:11:03 +02:00
R. Ryantm
3b9915ca3f flyctl: 0.0.306 -> 0.0.308 2022-03-26 18:03:12 +00:00
Thiago Kenji Okada
4bf4d0a3e4
Merge pull request #164186 from mtrsk/insomnia/update-to-2022.1.1 
insomnia: 2021.7.2 -> 2022.1.1
 2022-03-25 18:10:47 +00:00
Pascal Bach
08e1edba22
Merge pull request #165456 from r-ryantm/auto-update/nodejs-17_x 
nodejs-17_x: 17.7.2 -> 17.8.0
 2022-03-25 13:26:49 +01:00
Pascal Bach
4a9175555c
Merge pull request #165578 from r-ryantm/auto-update/kore 
kore: 4.1.0 -> 4.2.1
 2022-03-24 21:36:59 +01:00
R. Ryantm
956a93b87f kore: 4.1.0 -> 4.2.1 2022-03-24 08:22:14 +00:00
R. Ryantm
f770dd0627 grails: 5.1.3 -> 5.1.4 2022-03-23 19:32:40 +01:00
R. Ryantm
43453d562a nodejs-17_x: 17.7.2 -> 17.8.0 2022-03-23 07:12:22 +00:00
Sandro
2cd3fd0927
Merge pull request #164969 from r-ryantm/auto-update/flyctl 2022-03-23 07:38:07 +01:00
R. Ryantm
406f083b3c cypress: 9.5.1 -> 9.5.2 2022-03-23 02:02:15 +00:00
Ryan Mulligan
17692eb19f
Merge pull request #163728 from r-ryantm/auto-update/cypress 
cypress: 9.4.1 -> 9.5.1
 2022-03-22 17:00:31 -07:00
Nick Cao
13d37eab6c
nodejs: fix cross compilation 2022-03-22 09:15:49 +08:00
R. Ryantm
a605bd758c flyctl: 0.0.302 -> 0.0.306 2022-03-20 12:34:30 +00:00
Mario Rodas
4265aaa6a0 nodejs-17_x: 17.5.0 -> 17.7.2 
- https://github.com/nodejs/node/releases/tag/v17.6.0
- https://github.com/nodejs/node/releases/tag/v17.7.0
- https://github.com/nodejs/node/releases/tag/v17.7.1
- https://github.com/nodejs/node/releases/tag/v17.7.2
 2022-03-19 04:20:00 +00:00
Mario Rodas
9516465000 nodejs-16_x: 16.14.0 -> 16.14.2 
- https://github.com/nodejs/node/releases/tag/v16.14.1
- https://github.com/nodejs/node/releases/tag/v16.14.2
 2022-03-19 04:20:00 +00:00
Mario Rodas
53f4763fd1 nodejs-14_x: 14.19.0 -> 14.19.1 
https://github.com/nodejs/node/releases/tag/v14.19.1
 2022-03-19 04:20:00 +00:00
Mario Rodas
527afbfeed nodejs-12_x: 12.22.10 -> 12.22.11 
https://github.com/nodejs/node/releases/tag/v12.22.11
 2022-03-19 04:20:00 +00:00
Jonas Heinrich
90fdf944bd shopify-cli: init at 2.14.0 2022-03-19 08:21:12 -04:00
Sandro
8c62bd7487
Merge pull request #162580 from r-ryantm/auto-update/flyctl 2022-03-18 15:42:09 +01:00
Silvan Mosberger
eb2f6e6de9
Merge pull request #163694 from Infinisil/addNodePath-quoting 
nodejs: Fix setup-hook addNodePath quoting
 2022-03-16 02:24:35 +01:00
Marcos Benevides
662414d8a8
insomnia: 2021.7.2 -> 2022.1.1 2022-03-14 22:43:03 -03:00
Bobby Rong
4fd04a19f1
Revert "deno: 1.19.1 -> 1.19.3" 2022-03-13 16:53:10 +08:00
Sandro
d31e17cfeb
Merge pull request #163670 from kidonng/deno 2022-03-12 22:19:04 +01:00
R. Ryantm
26fe586d53 grails: 5.1.2 -> 5.1.3 2022-03-12 14:44:00 +01:00
R. Ryantm
43c49dc7b4 cypress: 9.4.1 -> 9.5.1 2022-03-12 02:00:47 +00:00
Silvan Mosberger
e975c56501 nodejs: Fix setup-hook addNodePath quoting 
The argument to addNodePath previously wasn't being quoted, leading to
problems when the argument contains characters interpreted specially by
bash
 2022-03-11 20:00:00 +01:00
Kid
040cdccee9 deno: 1.19.1 -> 1.19.3 2022-03-11 13:40:18 +00:00
Renaud
999ddb2143
Merge pull request #162071 from r-ryantm/auto-update/postman 
postman: 9.13.0 -> 9.14.0
 2022-03-10 23:23:16 +01:00
R. Ryantm
afb3e01958 grails: 4.1.0.M1 -> 5.1.2 2022-03-06 15:29:42 +01:00
R. Ryantm
7f9a18fe07 flyctl: 0.0.301 -> 0.0.302 2022-03-03 05:57:16 +00:00
R. Ryantm
4cf4214c7a flyctl: 0.0.300 -> 0.0.301 2022-02-28 05:37:11 +00:00
R. Ryantm
3d72a0fc55 postman: 9.13.0 -> 9.14.0 2022-02-27 12:02:04 +00:00
K900
cb2cfba6f7 treewide: switch all desktop file generators to new API 
Notably:
- remove explicit arguments that match the defaults
- convert everything to the right Nix types
 2022-02-25 13:40:38 -08:00
Maximilian Bosch
85c772eecf
Merge pull request #161782 from r-ryantm/auto-update/deno 
deno: 1.19.0 -> 1.19.1
 2022-02-25 12:12:16 +01:00
R. Ryantm
dc30367f38 deno: 1.19.0 -> 1.19.1 2022-02-25 05:21:27 +00:00
R. Ryantm
275e9a3b2d flyctl: 0.0.298 -> 0.0.300 2022-02-24 08:33:34 +00:00
R. Ryantm
87fddd120e flyctl: 0.0.297 -> 0.0.298 2022-02-23 05:18:33 +00:00
Mario Rodas
16b66b6944
Merge pull request #160563 from r-ryantm/auto-update/deno 
deno: 1.18.2 -> 1.19.0
 2022-02-19 14:42:53 -05:00
R. Ryantm
59180921b4 deno: 1.18.2 -> 1.19.0 2022-02-18 05:13:34 +00:00
Peter Hoeg
cfbf9c9d58
lucky: 0.26.0 -> 0.29.0 (#160127) 
* lucky: 0.26.0 -> 0.29.0

* add homepage
 2022-02-18 09:19:56 +08:00
Sandro
cacc35350a
Merge pull request #160136 from ivankovnatsky/patch-26 2022-02-16 17:14:11 +01:00
Jan Tojnar
6a972fb8bb
Merge pull request #159252 from FliegendeWurst/gnome2-gconf 
various packages: remove gconf dependency
 2022-02-15 13:11:02 +01:00
Ivan Kovnatsky
776725509d
bloomrpc: Add fix when opening a file browser 
```
(bloomrpc:2): GLib-GIO-ERROR **: 12:51:02.584: No GSettings schemas are installed on the system
```
 2022-02-15 13:04:48 +02:00
Mario Rodas
f014c724c3
Merge pull request #159884 from r-ryantm/auto-update/flyctl 
flyctl: 0.0.296 -> 0.0.297
 2022-02-13 18:47:57 -05:00
R. Ryantm
20c318ac02 flyctl: 0.0.296 -> 0.0.297 2022-02-13 19:30:51 +00:00
R. Ryantm
8ea199eb8c postman: 9.7.1 -> 9.13.0 
fix: add libxshmfence dependency
 2022-02-13 15:16:39 +02:00
Mario Rodas
ec4b194eef nodejs-17_x: 17.4.0 -> 17.5.0 
https://github.com/nodejs/node/releases/tag/v17.5.0
 2022-02-12 04:20:00 +00:00
Mario Rodas
28e31514a7 nodejs-16_x: 16.13.2 -> 16.14.0 
https://github.com/nodejs/node/releases/tag/v16.14.0
 2022-02-12 04:20:00 +00:00
Mario Rodas
680824ed2e nodejs-14_x: 14.18.3 -> 14.19.0 
https://github.com/nodejs/node/releases/tag/v14.19.0
 2022-02-12 04:20:00 +00:00
Mario Rodas
8620427158 nodejs-12_x: 12.22.9 -> 12.22.10 
https://github.com/nodejs/node/releases/tag/v12.22.10
 2022-02-12 04:20:00 +00:00
Mario Rodas
e8d0ffa08c
Merge pull request #159572 from r-ryantm/auto-update/minify 
minify: 2.9.29 -> 2.10.0
 2022-02-12 16:26:33 -05:00
R. Ryantm
0a93580572 minify: 2.9.29 -> 2.10.0 2022-02-12 15:27:58 +00:00
Mario Rodas
72a235f1e1
Merge pull request #158869 from r-ryantm/auto-update/deno 
deno: 1.18.1 -> 1.18.2
 2022-02-12 08:42:51 -05:00
R. Ryantm
8f35bcc5bd flyctl: 0.0.260 -> 0.0.296 2022-02-11 14:52:57 +00:00
FliegendeWurst
db4690e97a insomnia: remove gconf dependency 2022-02-11 15:08:36 +01:00
FliegendeWurst
8430d38bec cypress: remove gconf dependency 2022-02-11 15:08:24 +01:00
R. Ryantm
94dccda23f cypress: 9.3.1 -> 9.4.1 2022-02-10 11:40:19 -08:00
R. Ryantm
f9cc9dd7a0 deno: 1.18.1 -> 1.18.2 2022-02-10 03:03:02 +00:00
github-actions[bot]
9cdb39f965
Merge master into staging-next 2022-02-07 18:01:27 +00:00
Zoey de Souza Pessanha
21e7625d68
bloomrpc: init at 1.5.3 (#120292) 
Co-authored-by: Matheus de Souza Pessanha <matheus_pessanha2001@outlook.com>
 2022-02-07 16:56:03 +01:00
github-actions[bot]
87efa4e516
Merge staging-next into staging 2022-01-31 12:01:50 +00:00
kolaente
cf69a86feb
cypress: 9.2.0 -> 9.3.1 2022-01-30 16:33:00 +01:00
github-actions[bot]
3656f37a2e
Merge staging-next into staging 2022-01-29 06:01:48 +00:00
06kellyjac
d6fba22f2a deno: 1.18.0 -> 1.18.1 2022-01-28 12:26:26 +00:00
Dmitry Kalinkin
0693fd77f7
Merge branch 'staging-next' into staging 
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
	nixos/doc/manual/release-notes/rl-2205.section.md
	pkgs/development/python-modules/aioesphomeapi/default.nix
	pkgs/development/python-modules/mat2/default.nix
	pkgs/development/python-modules/pydevccu/default.nix
	pkgs/development/python-modules/pywlroots/default.nix
	pkgs/development/python-modules/rokuecp/default.nix
 2022-01-27 00:54:10 -05:00
legendofmiracles
f304633689
Merge pull request #156589 from r-ryantm/auto-update/minify 
minify: 2.9.24 -> 2.9.29
 2022-01-26 08:08:25 -06:00
Joshua Sierles
eb98ee1e8b
maintainers: add jsierles 
Also add jsierles as a maintainer for the flyctl package.
 2022-01-26 11:36:56 +08:00
R. Ryantm
8cd010bd5d minify: 2.9.24 -> 2.9.29 2022-01-24 19:24:16 +00:00
Felix Buehler
598b973406 nodejs: rename name to pname&version 2022-01-23 13:53:27 +01:00
06kellyjac
9c982ef93e deno: 1.17.3 -> 1.18.0 2022-01-20 21:04:21 +00:00
R. Ryantm
ffec833eb1 nodejs-17_x: 17.3.1 -> 17.4.0 2022-01-19 06:06:13 +00:00
06kellyjac
1e75a13d8e deno: 1.17.2 -> 1.17.3 2022-01-17 09:29:14 +00:00
Martin Weinelt
69ef2ab05a
Merge pull request #154474 from mohe2015/security/nodejs 2022-01-12 03:02:19 +01:00
R. RyanTM
5072e7ead6
minify: 2.9.22 -> 2.9.24 
(#152805)
 2022-01-11 23:07:17 +01:00
Moritz Hedtke
d1de6589a4
nodejs-12_x: 12.22.8 -> 12.22.9 2022-01-11 13:56:54 +01:00
Moritz Hedtke
2cfe7ecbc9
nodejs-14_x: 14.18.2 -> 14.18.3 2022-01-11 13:56:50 +01:00
Moritz Hedtke
2ac55cedc9
nodejs-16_x: 16.13.1 -> 16.13.2 2022-01-11 13:56:44 +01:00
Moritz Hedtke
4bfeab40d6
nodejs-17_x: 17.3.0 -> 17.3.1 2022-01-11 13:56:33 +01:00
github-actions[bot]
b48a41c77c
Merge master into staging-next 2022-01-07 06:01:27 +00:00
06kellyjac
cdfbc23f2d deno: 1.17.1 -> 1.17.2 2022-01-06 12:20:11 +00:00
Martin Weinelt
11a0b61783 Merge remote-tracking branch 'origin/master' into staging-next 2022-01-03 23:21:08 +01:00
R. RyanTM
fffeab2a05
postman: 9.6.1 -> 9.7.1 
(#153107)
 2022-01-03 14:25:40 +01:00
github-actions[bot]
77da198145
Merge master into staging-next 2021-12-31 12:01:24 +00:00
R. Ryantm
c6f9590b23 deno: 1.17.0 -> 1.17.1 2021-12-30 22:26:30 -08:00
Jan Tojnar
380c030740 Merge branch 'master' into staging-next 
; Conflicts:
;	pkgs/development/python-modules/aiohttp-socks/default.nix
;	pkgs/development/python-modules/emv/default.nix
;	pkgs/development/python-modules/mocket/default.nix
;	pkgs/development/python-modules/types-protobuf/default.nix
 2021-12-31 07:26:03 +01:00
R. Ryantm
33b2f99d05 cypress: 9.1.1 -> 9.2.0 2021-12-30 22:20:17 -08:00
github-actions[bot]
c4d18cf442
Merge master into staging-next 2021-12-29 18:01:08 +00:00
Martin Weinelt
9d6fd49ad6
Merge pull request #148992 from mweinelt/nodejs-10 2021-12-29 14:57:31 +01:00
Dmitry Kalinkin
2ddda43924
Merge branch 'staging' into staging-next 
Conflicts:
	pkgs/os-specific/linux/kernel/common-config.nix
 2021-12-25 17:16:26 -05:00
Thiago Kenji Okada
294b993762
Merge pull request #151893 from r-ryantm/auto-update/postman 
postman: 9.3.1 -> 9.6.1
 2021-12-23 15:19:14 -03:00
Jonathan Ringer
182e07f0d9
Merge remote-tracking branch 'origin/staging-next' into staging 
Conflicts:
	pkgs/development/libraries/webkitgtk/default.nix
	pkgs/development/python-modules/pylast/default.nix
	pkgs/development/python-modules/pymavlink/default.nix
 2021-12-23 10:16:42 -08:00
R. Ryantm
6d8ea9552b postman: 9.3.1 -> 9.6.1 2021-12-23 16:08:06 +00:00
Bobby Rong
92c7f4ad2e
Merge pull request #151489 from r-ryantm/auto-update/insomnia 
insomnia: 2021.6.0 -> 2021.7.2
 2021-12-22 11:57:24 +08:00
R. Ryantm
c162fd00eb insomnia: 2021.6.0 -> 2021.7.2 2021-12-21 01:15:56 +00:00
Max Hausch
9ff45260ea
insomnia: Drop unused buildInputs 2021-12-20 13:12:52 +01:00
github-actions[bot]
c1c6899d0a
Merge staging-next into staging 2021-12-18 18:01:36 +00:00
Mario Rodas
33c6911bbe
Merge pull request #151209 from r-ryantm/auto-update/nodejs-17_x 
nodejs-17_x: 17.2.0 -> 17.3.0
 2021-12-18 12:10:21 -05:00
Mario Rodas
f69b20f6a9
Merge pull request #151040 from r-ryantm/auto-update/nodejs-12_x 
nodejs-12_x: 12.22.7 -> 12.22.8
 2021-12-18 11:16:55 -05:00
Dmitry Kalinkin
0cf94e8de4
Merge branch 'staging-next' into staging 2021-12-18 10:19:31 -05:00
R. Ryantm
38cf64eac0 nodejs-17_x: 17.2.0 -> 17.3.0 2021-12-18 15:02:11 +00:00
Mark Vainomaa
f8fa489193
deno: fix sharedLibrary value usage 
stdenv.hostPlatform.extensions.sharedLibrary value always contains a
dot, which means find command was trying to match
libswc_common..(so|dylib)
 2021-12-18 15:09:27 +02:00
github-actions[bot]
d1e6365b21
Merge staging-next into staging 2021-12-18 00:02:05 +00:00
Mark Vainomaa
387783a333
deno: remove unused library file 2021-12-17 18:51:35 +02:00
Mark Vainomaa
59c2be70e0
deno: 1.16.4 -> 1.17.0 2021-12-17 13:16:10 +02:00
github-actions[bot]
17388f356f
Merge staging-next into staging 2021-12-17 06:02:06 +00:00
Alyssa Ross
e07182012b
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/development/python-modules/pint/default.nix
 2021-12-17 05:50:06 +00:00
Bobby Rong
fad5696586
Merge pull request #150275 from r-ryantm/auto-update/bootstrap 
twitterBootstrap: 5.1.0 -> 5.1.3
 2021-12-17 11:33:10 +08:00
R. Ryantm
17e198d9d6 nodejs-12_x: 12.22.7 -> 12.22.8 2021-12-17 00:55:18 +00:00
R. RyanTM
08adacb68f
cypress: 8.3.1 -> 9.1.1 (#148826) 2021-12-16 18:34:26 +01:00
Dmitry Kalinkin
07a8ae0c5a
Merge branch 'staging-next' into staging 
Conflicts:
	pkgs/development/libraries/log4cplus/default.nix
 2021-12-11 14:01:19 -05:00