nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-19 04:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
362,066 Commits 186 Branches 125 Tags 7.5 GiB
3e7268af67
Commit Graph

5518 Commits

Author SHA1 Message Date
Aaron Andersen
137291eaa6
Merge pull request #158330 from McSinyx/flare-1.13 
flare: 1.12 -> 1.13
 2022-02-06 09:04:07 -05:00
Nguyễn Gia Phong
02c976001a
flare: 1.12 -> 1.13 
Also add myself as a maintainer.
 2022-02-06 14:44:03 +07:00
Dmitry Kalinkin
a9e24deb45
{minetestclient,minetestserver}_4: mark as broken on darwin 2022-02-06 00:40:02 -05:00
Colin
f0c78d8174
uchess: switch to go_1_17 
hash regenerated
 2022-02-05 16:58:43 +10:00
R. Ryantm
825deacec2 vintagestory: 1.16.1 -> 1.16.3 2022-02-04 18:38:08 -08:00
Jonathan Ringer
80833d9a2b steam-run: inherit /etc/profile fixes 2022-02-04 18:36:46 -08:00
Franz Pletz
267fad119f
minetest: remove unused patches 2022-02-04 16:21:28 +01:00
Franz Pletz
6e78755eaf
minetest: 5.4.1 -> 5.5.0 2022-02-04 16:16:04 +01:00
Franz Pletz
2bbe6d7b8a
minetest: remove version 4 2022-02-04 16:16:04 +01:00
1000101
7446e158d8 7kaa: init at 2.15.4p1 2022-02-03 16:46:27 +01:00
Joel
56076698c2
minecraft-servers: fix update.py 
Previously, running `nix-shell maintainers/scripts/update.nix --argstr package minecraft-server` caused `versions.json` to be placed in the repository root instead of `pkgs/games/minecraft-servers`.
 2022-02-02 11:36:09 +10:00
Berk Ozkutuk
38fa6d6041 anki: apply patch to replace deprecated method 2022-01-31 22:37:47 +03:00
R. Ryantm
03aabab071 openttd-nml: 0.5.3 -> 0.6.1 2022-01-31 10:00:46 -08:00
R. Ryantm
8ec1caf265 osu-lazer: 2021.1225.0 -> 2022.118.0 2022-01-31 10:00:19 -08:00
R. Ryantm
1245bc3819 vassal: 3.6.1 -> 3.6.4 2022-01-31 09:53:46 -08:00
Sandro
9e61c9c064
Merge pull request #157116 from muscaln/polymc 2022-01-28 12:00:21 +01:00
Mustafa Çalışkan
37df4305c6
polymc: 1.0.4 -> 1.0.6 2022-01-28 13:03:01 +03:00
Sandro
27cccd4e49
Merge pull request #151363 from Stunkymonkey/doc-updateWalker 2022-01-27 14:06:36 +01:00
Felix Buehler
ed7bf9452c treewide: remove *.upstream files from updateWalker 2022-01-26 21:46:07 +01:00
wackbyte
3d88b59e3e
tetrio-desktop: fix build and audio 
Changes the source to a direct download and adds libpulseaudio to the library path
 2022-01-25 20:39:59 -05:00
Martin Weinelt
48f17360d9 Merge remote-tracking branch 'origin/master' into staging-next 2022-01-25 15:53:19 +01:00
Franz Pletz
a6e45b0893
Merge pull request #156703 from fgaz/shattered-pixel-dungeon/1.1.2 2022-01-25 15:35:55 +01:00
Francesco Gazzetta
6beb585135 shattered-pixel-dungeon: 1.1.0 -> 1.1.2 2022-01-25 14:21:48 +01:00
Artturi
25dc5a5d2d
Merge pull request #156300 from r-ryantm/auto-update/vintagestory 2022-01-25 15:12:53 +02:00
github-actions[bot]
cfef27f7cf
Merge master into staging-next 2022-01-25 06:01:33 +00:00
legendofmiracles
379e0e806e
Merge pull request #156403 from r-ryantm/auto-update/legendary-gl 
legendary-gl: 0.20.24 -> 0.20.25
 2022-01-24 21:40:29 -06:00
github-actions[bot]
a45818989a
Merge master into staging-next 2022-01-24 18:01:03 +00:00
legendofmiracles
ba667597db
Merge pull request #156490 from r-ryantm/auto-update/xcowsay 
xcowsay: 1.5.1 -> 1.6
 2022-01-24 07:51:17 -06:00
legendofmiracles
b3e7261a0e
Merge pull request #155505 from IvarWithoutBones/init/supaplex 
opensupaplex: init at 7.1.2
 2022-01-24 07:12:23 -06:00
github-actions[bot]
6fee71d339
Merge master into staging-next 2022-01-24 12:01:16 +00:00
R. Ryantm
7c7e244719 xcowsay: 1.5.1 -> 1.6 2022-01-24 11:32:02 +00:00
Ivv
81a988f32d
Merge pull request #150225 from jyooru/init/purpur 
purpur: init at 1.17.1r1428
 2022-01-24 12:17:42 +01:00
Joel
e54ce2616e
purpur: init at 1.17.1r1428 
Update pkgs/games/purpur/default.nix

Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com>

Update pkgs/games/purpur/default.nix

Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com>

Update pkgs/games/purpur/default.nix

Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com>

Update pkgs/games/purpur/default.nix

Co-authored-by: Ivv <41924494+IvarWithoutBones@users.noreply.github.com>

fix trailing white space

purpur: 1.17.1r1428 -> 1.18.1r1522

add make wrapper
 2022-01-24 20:59:45 +10:00
github-actions[bot]
b261cac75a
Merge master into staging-next 2022-01-24 06:01:18 +00:00
Martin Weinelt
536e2bb238
Merge pull request #156277 from DarkKirb/factorio-1.1.53 2022-01-24 01:37:21 +01:00
R. Ryantm
ca0ebd5292 legendary-gl: 0.20.24 -> 0.20.25 2022-01-24 00:30:52 +00:00
Alexandra
27e10a3b92
snis: init at 20211017 (#142034) 2022-01-24 01:03:07 +01:00
github-actions[bot]
11cced7438
Merge master into staging-next 2022-01-24 00:01:45 +00:00
Sandro
7502596e70
Merge pull request #117437 from tgunnoe/master 2022-01-24 01:00:44 +01:00
tgunnoe
290b04c5a8 lzwolf: init at unstable-2022-01-04 2022-01-23 12:45:11 -05:00
R. Ryantm
759416392b vintagestory: 1.16.0 -> 1.16.1 2022-01-23 11:26:20 +00:00
Charlotte 🦝 Delenk
5cfcd0b5b2
factorio-*: 1.1.50->1.1.53 2022-01-23 09:28:31 +01:00
github-actions[bot]
591c66a4e3
Merge master into staging-next 2022-01-23 06:00:56 +00:00
Sandro
138bd39d46
Merge pull request #156155 from lheckemann/bump-supertux 2022-01-23 06:06:15 +01:00
github-actions[bot]
6922792376
Merge master into staging-next 2022-01-22 18:01:07 +00:00
Mario Rodas
492d9f0dc2
Merge pull request #155968 from r-ryantm/auto-update/r2mod_cli 
r2mod_cli: 1.2.0 -> 1.2.1
 2022-01-22 12:37:12 -05:00
Linus Heckemann
c7af30ec52 supertux: 0.6.2 -> 0.6.3 2022-01-22 11:32:42 +01:00
github-actions[bot]
1ca0ba653f
Merge master into staging-next 2022-01-22 00:01:46 +00:00
Anderson Torres
7a3e0dd775
Merge pull request #155501 from AndersonTorres/new-games 
npush: init at 0.7
 2022-01-21 16:48:36 -03:00
AndersonTorres
78c338cb10 npush: init at 0.7 
Also, adding a helper run-npush that takes care of preparing the game to run
with the official levelset.
 2022-01-21 16:47:48 -03:00
github-actions[bot]
fd5336b13e
Merge master into staging-next 2022-01-21 18:01:25 +00:00
Sandro
e25864311d
Merge pull request #146940 from wackbyte/tetrio-desktop 2022-01-21 19:00:21 +01:00
wackbyte
32623fcca0
tetrio-desktop: init at 8.0.0 2022-01-20 19:25:53 -05:00
github-actions[bot]
fc3ddb8979
Merge master into staging-next 2022-01-21 00:01:42 +00:00
R. Ryantm
58da28ff04 r2mod_cli: 1.2.0 -> 1.2.1 2022-01-20 22:31:09 +00:00
Ivv
73a9729353
Merge pull request #152623 from luxferresum/ottomatic 
otto-matic: init at 4.0.0
 2022-01-20 19:31:37 +01:00
github-actions[bot]
360ff20100
Merge master into staging-next 2022-01-20 06:01:09 +00:00
Sandro
4fe55cf233
Merge pull request #155584 from r-ryantm/auto-update/vintagestory 2022-01-20 02:39:12 +01:00
github-actions[bot]
28abf69ffd
Merge master into staging-next 2022-01-19 12:01:24 +00:00
Bobby Rong
e098427f75
Merge pull request #148899 from r-ryantm/auto-update/VASSAL 
vassal: 3.5.8 -> 3.6.1
 2022-01-19 19:47:57 +08:00
R. Ryantm
6c6c397b92 vintagestory: 1.15.10 -> 1.16.0 2022-01-19 09:12:35 +00:00
github-actions[bot]
1b54e5bb50
Merge master into staging-next 2022-01-19 06:01:24 +00:00
Jörg Thalheim
bae5930da8
Merge branch 'master' into love-cleanup 2022-01-19 05:53:49 +00:00
Bobby Rong
32927f19c1
Merge pull request #155413 from liclac/bump-among-sus 
among-sus: 2020-10-19 -> 2021-05-19
 2022-01-19 11:18:13 +08:00
github-actions[bot]
0fdca24272
Merge master into staging-next 2022-01-19 00:01:38 +00:00
Sandro Jäckel
1d1dc7798d
tlauncher: remove 
tlauncher has a shady past (https://github.com/NixOS/nixpkgs/pull/152744#issuecomment-1014125073)
offers torrents on their website with cracked games and the discussion in their reddit is primarly
around cracked Mincraft versions.

This reverts commit ed4ece3f44.
 2022-01-18 20:57:43 +01:00
Ivar Scholten
b20c4c3b9f opensupaplex: init at 7.1.2 2022-01-18 19:29:33 +01:00
github-actions[bot]
b456d67c98
Merge master into staging-next 2022-01-18 00:01:41 +00:00
embr
5b18955583 among-sus: 2020-10-19 -> 2021-05-19 2022-01-17 21:40:55 +01:00
Felix Buehler
4a403f9e33 treewide: rename name to pname&version 2022-01-17 19:09:37 +01:00
github-actions[bot]
0eee7ee8c8
Merge master into staging-next 2022-01-17 12:01:25 +00:00
Sandro
fd180ee549
Merge pull request #140265 from McSinyx/blackshades-2.4.0 2022-01-17 10:58:06 +01:00
Frederik Rietdijk
afef6d0e81
Merge pull request #154687 from dotlambda/python-alias 
python,pythonPackages: make aliases
 2022-01-17 09:37:49 +01:00
github-actions[bot]
f0a71fe6f3
Merge master into staging-next 2022-01-17 06:01:22 +00:00
legendofmiracles
0b7e81ec04
Merge pull request #154183 from Kranzes/legendary 
legendary-gl: 0.20.18 -> 0.20.24
 2022-01-16 18:34:14 -06:00
github-actions[bot]
a407424e1f
Merge master into staging-next 2022-01-17 00:01:45 +00:00
Felix Buehler
f60b7917bf n2048: refactor 2022-01-16 22:07:30 +01:00
Robert Schütz
d5cceedbd1 python,pythonPackages: make aliases 
Since aliases are disallowed in nixpkgs, this makes usage of Python 2
which is EOL more explicit.
 2022-01-16 18:39:59 +00:00
Robert Schütz
d4ebae1054 heroic: remove unused argument 2022-01-16 18:00:59 +00:00
Jörg Thalheim
d720494491 hawkthorne: drop 2022-01-16 07:15:14 +01:00
Jörg Thalheim
e52a956960 rimshot: drop 
crashes on startup:

[ALSOFT] (EE) Failed to set real-time priority for thread: Operation not permitted (1)
[ALSOFT] (EE) Failed to set real-time priority for thread: Operation not permitted (1)
Error: No available video device
stack traceback:
        [C]: ?
        [C]: in function 'require'
        [string "boot.lua"]:1: in function <[string "boot.lua"]:1>
        [C]: in function 'xpcall'
 2022-01-16 07:14:40 +01:00
Jörg Thalheim
89cabe5b05 nottetris2: drop 
crashes on startup:

[ALSOFT] (EE) Failed to set real-time priority for thread: Operation not permitted (1)
[ALSOFT] (EE) Failed to set real-time priority for thread: Operation not permitted (1)
Error: No available video device
stack traceback:
        [C]: ?
        [C]: in function 'require'
        [string "boot.lua"]:1: in function <[string "boot.lua"]:1>
        [C]: in function 'xpcall'
 2022-01-16 07:13:39 +01:00
Jörg Thalheim
6e6058400a vapor: drop package 2022-01-16 07:13:05 +01:00
github-actions[bot]
122cae786e
Merge master into staging-next 2022-01-16 06:01:16 +00:00
Joel
b254d2b1fe minecraftServers: init - move all minecraft-server versions into minecraftServers 2022-01-15 21:58:16 -05:00
Joel
e0843a80e2 minecraft-server: fix using latest jre for all minecraft server versions 2022-01-15 21:58:16 -05:00
Joel
63c488bf3b minecraft-server: add jyooru as maintainer 2022-01-15 21:58:16 -05:00
Joel
867b8e2188 minecraft-server: package major versions 2022-01-15 21:58:16 -05:00
github-actions[bot]
f8fb795136
Merge master into staging-next 2022-01-16 00:01:52 +00:00
Tristan Gosselin-Hane
f4ef264724 polymc: init at 1.0.4 2022-01-15 18:07:29 -05:00
Artturi
ec938613e0
Merge pull request #154912 from Shardion/master 2022-01-15 21:19:48 +02:00
github-actions[bot]
a6317e795d
Merge master into staging-next 2022-01-15 06:01:01 +00:00
Nguyễn Gia Phong
6a69cda1d5
blackshades: 1.3.1 -> 2.4.7 2022-01-15 11:09:24 +07:00
legendofmiracles
25a9a2d6cc
Merge pull request #154058 from cpu/cpu-blightmud-3.5.0 2022-01-14 20:41:53 -06:00
Daniel McCarney
ae1bee344a
blightmud: init at 3.5.0 
Blightmud is a terminal client for connecting to Multi User Dungeon
(MUD) games. It is written in Rust and supports TLS, GMCP, MSDP, MCCP2,
tab completion, text searching and a split view for scrolling. Blightmud
can be customized with Lua scripting for aliases, triggers, timers,
customized status bars, and more. Blightmud supports several
accessibility features including an optional built-in text-to-speech
engine and a screen reader friendly mode.

For nixpkgs it is largely a standard derivation for a rust project using
`rustPlatform.buildRustPackage`. There is some customization required
for the optional text-to-speech (TTS) engine support. In this case the
derivation must also set the `LIBCLANG_PATH` and customize
`BINDGEN_EXTRA_CLANG_ARGS` in order for a required crate to be able to
`rust-bindgen` the `libspeechd` dependency it wraps. Lastly the
derivation has to skip some integration-style tests that don't play
nicely with the nixpkgs build environment - the majority of unit tests
work so they are left running in the check phase.

Since the TTS support brings in heavy dependencies, but is a useful
accessibility feature, the Blightmud derivation is added to
`all-packages.nix` twice:

1. the `blightmud` attribute builds a configuration without TTS support.
2. the `blightmud-tts` attribute builds a configuration _with_ TTS
   support.

The new Blightmud derivation is placed in `pkgs/games/blightmud/`
following the precedent set by another packaged GUI-based MUD client,
`mudlet` with `pkgs/games/mudlet/`.
 2022-01-14 18:34:01 -05:00
Dmitry Kalinkin
a56da82f7a
Merge branch 'master' into staging-next 
Conflicts:
	pkgs/development/python-modules/restfly/default.nix
 2022-01-13 21:39:05 -05:00
Shardion
9f928fe969
grapejuice: 3.64.16 -> 4.10.2 2022-01-13 09:15:15 -08:00
Anderson Torres
d4c2294a73
Merge pull request #154830 from AndersonTorres/new-games 
ace-of-penguins: init at 1.4
 2022-01-13 10:07:35 -03:00
AndersonTorres
37aefe329d ace-of-penguins: init at 1.4 
Plus patches!
 2022-01-12 22:21:00 -03:00
github-actions[bot]
a8b75d6f2f
Merge master into staging-next 2022-01-13 00:01:59 +00:00
Pascal Bach
f708058fe3
Merge pull request #153295 from siddhantk232/master 
heroic: 1.10.3 -> 2.0.2
 2022-01-12 19:57:49 +01:00
github-actions[bot]
e81177a147
Merge staging-next into staging 2022-01-12 00:02:57 +00:00
Thiago Kenji Okada
3e6884fc19
Merge pull request #154627 from freepotion/remove-maintainer 
ivan, maintainers: maintainer removed
 2022-01-11 16:10:29 -03:00
github-actions[bot]
e8dc263ca3
Merge staging-next into staging 2022-01-11 18:01:57 +00:00
Free Potion
1e47c2055d
ivan: maintainer was removed 2022-01-11 20:52:10 +03:00
AndersonTorres
7432c431c7 the-legend-of-edgar: init at 1.35 2022-01-10 20:10:45 -03:00
AndersonTorres
fbcf8ffa10 blockattack: init at 2.7.0 2022-01-10 20:10:45 -03:00
Jan Tojnar
3dba2db347 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
 2022-01-10 19:27:28 +01:00
Renaud
cce443d30a
Merge pull request #153404 from j0hax/papermc-update 
papermc: 1.17.1r399 -> 1.18.1r132
 2022-01-10 16:28:27 +01:00
Ilan Joselevich
ca3bc92bc4 legendary-gl: 0.20.18 -> 0.20.24 2022-01-10 16:23:41 +02:00
Jan Tojnar
f7aa55946b 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/build-support/libredirect/default.nix
 2022-01-10 01:26:05 +01:00
Sandro
7ab557237c
Merge pull request #153334 from Stunkymonkey/andyetitmoves-phases 2022-01-08 18:21:58 +01:00
siddhantCodes
c2fc2a373d heroic: 1.10.3 -> 2.0.2 2022-01-08 10:19:35 +05:30
Jonathan Ringer
172bcecd6b
Merge remote-tracking branch 'origin/staging-next' into staging 2022-01-07 10:32:13 -08:00
Ben Siraphob
9334785442
crafty: remove 2022-01-07 16:45:55 +07:00
Ben Siraphob
c9339da1d1
banner: update homepage 2022-01-07 16:45:50 +07:00
github-actions[bot]
aed0ee64b8
Merge staging-next into staging 2022-01-07 06:02:04 +00:00
Ben Siraphob
e9e90a941b
treewide: replace http://web.archive.org with https://web.archive.org 2022-01-07 09:58:36 +07:00
github-actions[bot]
aad4d02c1e
Merge staging-next into staging 2022-01-06 06:02:14 +00:00
Bobby Rong
3342c9f8bf
Merge pull request #153370 from DeeUnderscore/widelands-boost-1.77 
widelands: fix building with boost 1.77
 2022-01-06 13:15:49 +08:00
Vladimír Čunát
2d3e6f73cb
Merge #146685: ncurses: 6.2 -> 6.3 (into staging) 2022-01-05 10:32:59 +01:00
github-actions[bot]
25662d01ae
Merge staging-next into staging 2022-01-04 00:02:40 +00:00
Johannes Arnold
b25107949d papermc: 1.17.1r399 -> 1.18.1r132 2022-01-03 23:24:46 +01:00
Thiago Kenji Okada
e93001da71
Merge pull request #152744 from lucasew/package/tlauncher 
tlauncher: init at 2.839
 2022-01-03 18:46:03 -03:00
Thiago Kenji Okada
102db75c91
Merge pull request #152260 from IvarWithoutBones/dotnetModule/osu 
osu-lazer: 2021.1113.0 -> 2021.1225.0 && use buildDotnetModule
 2022-01-03 17:22:34 -03:00
D Anzorge
0762a3f441 widelands: fix building with boost 1.77 2022-01-03 18:51:39 +01:00
Renaud
944a2dc835
Treewide: fix some permanent redirects on homepages 
(#153213)
Issue #60004
 2022-01-03 16:53:12 +01:00
R. RyanTM
75a86ab9f5
ivan: 058 -> 059 
(#152750)
 2022-01-03 15:10:57 +01:00
Felix Buehler
eb301258ef andyetitmoves: deprecate phases and refactor 2022-01-03 15:07:11 +01:00
Bobby Rong
a8a800ec30
Merge pull request #153282 from Stunkymonkey/treewide-github-3 
treewide: switch to fetchFromGitHub
 2022-01-03 19:25:09 +08:00
markuskowa
2cd70d1316
Merge pull request #153166 from r-ryantm/auto-update/pentobi 
pentobi: 19.0 -> 19.1
 2022-01-03 10:24:12 +01:00
Felix Buehler
d702c7ab8d nxengine-evo: switch to fetchFromGitHub 2022-01-03 00:31:00 +01:00
R. RyanTM
a10675f43d
liblcf, easyrpg-player: 0.6.2 -> 0.7.0 
* liblcf: 0.6.2 -> 0.7.0 (#144396)

* liblcf: build in parallel

* easyrpg-player: 0.6.2.3 -> 0.7.0

Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
 2022-01-02 19:54:30 +01:00
legendofmiracles
6da66eb59e
Merge pull request #153130 from legendofmiracles/colobot 
colobot: 0.1.12 -> 0.2.0; fixes build
 2022-01-02 08:12:27 -06:00
R. Ryantm
5250c11d62 pentobi: 19.0 -> 19.1 2022-01-02 06:09:21 +00:00
legendofmiracles
b199324b6d
Merge pull request #152946 from ElXreno/package-ddnet-15.8.1 
ddnet: 15.8 -> 15.8.1
 2022-01-01 18:15:41 -06:00
legendofmiracles
e4e06d547c
colobot: 0.1.12 -> 0.2.0; fixes build 2022-01-01 18:01:36 -06:00
lucasew
ed4ece3f44 tlauncher: init at 2.839 
Signed-off-by: lucasew <lucas59356@gmail.com>
 2022-01-01 14:10:46 -03:00
legendofmiracles
16fd7864cb
Merge pull request #151575 from drperceptron/tworld2 2022-01-01 08:29:02 -06:00
Bobby Rong
e9670f14ff
Merge pull request #149680 from OmnipotentEntity/katago-1.10.0 
katago: 1.9.1 -> 1.10.0
 2022-01-01 21:16:00 +08:00
Bobby Rong
b8b0c1535d
Merge pull request #153018 from r-ryantm/auto-update/terraria-server 
terraria-server: 1.4.2.3 -> 1.4.3.2
 2022-01-01 16:24:39 +08:00
Thiago Kenji Okada
3019a8375d
Merge pull request #153013 from hqurve/space-cadet-pinball 
space-cadet-pinball: unstable-2021-12-02 -> 2.0.1
 2021-12-31 23:13:40 -03:00
R. Ryantm
a50a23e119 terraria-server: 1.4.2.3 -> 1.4.3.2 2022-01-01 01:32:33 +00:00
hqurve
6e6cd3e0ba space-cadet-pinball: unstable-2021-12-02 -> 2.0.1 2021-12-31 20:47:37 -04:00
github-actions[bot]
38dc27dab2
Merge staging-next into staging 2022-01-01 00:02:16 +00:00
Sergei Trofimovich
5997908de5 fheroes2: add trivial updater script 2021-12-31 22:36:57 +00:00
Yana Timoshenko
719567e91f maintainers: update personal details 2021-12-31 21:48:55 +03:00
Jan Tojnar
d995596052 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
 2021-12-31 15:32:37 +01:00
ElXreno
3608ad2033
ddnet: 15.8 -> 15.8.1 2021-12-31 16:12:13 +03:00
Jörg Thalheim
755ae8c78a
Merge pull request #152883 from r-ryantm/auto-update/gcompris 
gcompris: 1.1 -> 2.0
 2021-12-31 07:34:43 +00:00