K900
bff9ee8862
Merge remote-tracking branch 'origin/master' into staging-next
2024-01-09 13:03:34 +03:00
Weijia Wang
4e7fb1c5d4
Merge pull request #278761 from wegank/tuxpaint-bump
...
tuxpaint: 0.9.28 -> 0.9.31, refactor
2024-01-08 20:58:32 +01:00
Pol Dellaiera
91785be5f2
Merge pull request #279461 from Stunkymonkey/quake3e-desktop-icon
...
quake3e: add desktop-icon
2024-01-08 20:14:27 +01:00
Martin Weinelt
ef1898454c
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/aiohappyeyeballs/default.nix
2024-01-08 16:34:52 +01:00
K900
bcdfbb56e9
Merge branch 'master' into staging-next
2024-01-08 18:18:49 +03:00
Weijia Wang
a10aa50fc6
tuxpaint: 0.9.28 -> 0.9.31, refactor
2024-01-08 14:23:18 +01:00
K900
7b4e618602
Merge pull request #276671 from mahmoudk1000/master
...
anki-bin: 23.10.1 -> 23.12
2024-01-08 12:38:16 +03:00
Fabián Heredia Montiel
f246a6257b
Merge pull request #279452 from aidalgol/heroic-2.12
...
heroic: 2.11.0 -> 2.12.0
2024-01-08 00:39:09 -06:00
Felix Buehler
6f78b90a8c
quake3e: add desktop-icon
2024-01-07 22:45:45 +01:00
Aidan Gauland
427046dd87
heroic: 2.11.0 -> 2.12.0
2024-01-08 09:04:37 +13:00
Jan Tojnar
ff42d23313
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/development/python-modules/dbt-core/default.nix
pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
Still broken by pydantic 2 bump, though.
2024-01-07 16:14:41 +01:00
maxine
178d851ddb
Merge pull request #279224 from r-ryantm/auto-update/doomretro
...
doomretro: 5.1.3 -> 5.2
2024-01-07 14:54:51 +01:00
Martin Weinelt
0161570089
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/archspec/default.nix
2024-01-07 01:31:56 +01:00
7c6f434c
d1f67f730f
Merge pull request #278791 from r-ryantm/auto-update/sgt-puzzles
...
sgt-puzzles: 20231120.08365fb -> 20240103.7a93ae5
2024-01-06 23:58:45 +00:00
R. Ryantm
7dfb2c9a46
doomretro: 5.1.3 -> 5.2
2024-01-06 19:19:29 +00:00
R. Ryantm
9eada0a872
vcmi: 1.4.1 -> 1.4.2
2024-01-05 23:36:43 +00:00
github-actions[bot]
340cf4304d
Merge master into staging-next
2024-01-05 06:01:12 +00:00
Weijia Wang
7ac52aa03e
Merge pull request #277469 from r-ryantm/auto-update/augustus
...
augustus: 3.2.0 -> 4.0.0
2024-01-05 01:09:08 +01:00
github-actions[bot]
1e290d634f
Merge master into staging-next
2024-01-05 00:02:27 +00:00
R. Ryantm
1e9ee14fd7
sgt-puzzles: 20231120.08365fb -> 20240103.7a93ae5
2024-01-04 22:32:59 +00:00
Weijia Wang
513c5f168c
Merge pull request #274758 from r-ryantm/auto-update/maven
...
maven: 3.9.5 -> 3.9.6
2024-01-04 23:02:33 +01:00
Vladimír Čunát
8a839514de
Merge branch 'master' into staging-next
2024-01-04 15:07:44 +01:00
Weijia Wang
0a8855f4bc
treewide: update maven hash
2024-01-03 23:04:55 +01:00
seth
8d9f5847f0
prismlauncher: better document withWaylandGLFW
2024-01-03 15:59:39 -05:00
Weijia Wang
6977a6cacc
Merge pull request #276583 from r-ryantm/auto-update/vassal
...
vassal: 3.7.5 -> 3.7.6
2024-01-03 19:14:31 +01:00
Weijia Wang
38ce6560b7
Merge pull request #276538 from r-ryantm/auto-update/unciv
...
unciv: 4.9.6 -> 4.9.13
2024-01-03 19:10:59 +01:00
Weijia Wang
f330745be1
Merge pull request #276533 from r-ryantm/auto-update/ultrastardx
...
ultrastardx: 2023.11.0 -> 2023.12.0
2024-01-03 19:09:01 +01:00
github-actions[bot]
307002948d
Merge master into staging-next
2024-01-03 18:00:57 +00:00
Weijia Wang
a5f7571036
Merge pull request #276362 from r-ryantm/auto-update/enyo-launcher
...
enyo-launcher: 2.0.5 -> 2.0.6
2024-01-03 18:52:39 +01:00
Weijia Wang
d01e691bf7
Merge pull request #274966 from r-ryantm/auto-update/openttd-jgrpp
...
openttd-jgrpp: 0.56.0 -> 0.56.2
2024-01-03 18:04:27 +01:00
Weijia Wang
a5b20e6d12
Merge pull request #274648 from r-ryantm/auto-update/lbreakouthd
...
lbreakouthd: 1.1.4 -> 1.1.5
2024-01-03 17:42:50 +01:00
Weijia Wang
4308b528ca
Merge pull request #274158 from r-ryantm/auto-update/ckan
...
ckan: 1.33.2 -> 1.34.2
2024-01-03 16:53:23 +01:00
R. Ryantm
39af0fcb3e
openttd-jgrpp: 0.56.0 -> 0.56.2
2024-01-03 12:05:53 +00:00
github-actions[bot]
dc84f21849
Merge master into staging-next
2024-01-03 12:01:04 +00:00
Weijia Wang
15341611e8
Merge pull request #278350 from r-ryantm/auto-update/tintin
...
tintin: 2.02.31 -> 2.02.40
2024-01-03 11:24:46 +01:00
Weijia Wang
6794a0533f
Merge pull request #259122 from spikespaz/prismlauncher-glfw-wayland
...
prismlauncher: add withWaylandGLFW override
2024-01-03 11:21:12 +01:00
Weijia Wang
eb5334c27d
Merge branch 'master' into staging-next
2024-01-03 03:22:40 +01:00
Weijia Wang
10121e80d5
Merge pull request #274766 from devusb/chiaki4deck
...
chiaki4deck: 1.4.1 -> 1.5.1
2024-01-03 02:28:10 +01:00
R. Ryantm
684fa47648
tintin: 2.02.31 -> 2.02.40
2024-01-02 21:14:40 +00:00
Pierre Bourdon
fa0e03c177
Merge pull request #277342 from paveloom/anki
...
anki: 23.12 -> 23.12.1
2024-01-02 19:28:19 +01:00
Nick Cao
8f74fdfdd7
Merge pull request #278156 from r-ryantm/auto-update/minesweep-rs
...
minesweep-rs: 6.0.45 -> 6.0.47
2024-01-02 11:11:07 -05:00
github-actions[bot]
0c6502e983
Merge master into staging-next
2024-01-02 12:01:15 +00:00
markuskowa
4bf30f1fe8
Merge pull request #277286 from r-ryantm/auto-update/hyperrogue
...
hyperrogue: 12.1z -> 13.0
2024-01-02 12:36:23 +01:00
K900
887e96e875
Merge remote-tracking branch 'origin/master' into staging-next
2024-01-02 10:55:23 +03:00
R. Ryantm
9c15d3ed2d
minesweep-rs: 6.0.45 -> 6.0.47
2024-01-01 22:30:52 +00:00
Nick Cao
35aaf0d287
Merge pull request #277953 from TomaSajt/prismlauncher
...
prismlauncher: fix meta using lib.version instead of finalAttrs.version
2024-01-01 10:24:47 -05:00
TomaSajt
d996dfce09
prismlauncher: fix meta using lib.version instead of finalAttrs.version
2023-12-31 21:27:46 +01:00
github-actions[bot]
65cbf5e637
Merge master into staging-next
2023-12-31 18:01:09 +00:00
R. Ryantm
2a9afc2c75
rocksndiamonds: 4.3.8.0 -> 4.3.8.1
2023-12-31 07:37:30 +00:00
Jan Tojnar
80020c7db4
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/development/lua-modules/generated-packages.nix
; pkgs/development/lua-modules/overrides.nix
2023-12-31 02:31:32 +01:00
