Jan Tojnar
7a04c2ad68
Merge branch 'staging-next' into staging
...
- boost 171 removed on staging-next
- re-generated node-packages.nix
; Conflicts:
; pkgs/development/java-modules/m2install.nix
; pkgs/development/node-packages/node-packages.nix
; pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Sandro
ef9b54f47e
Merge pull request #135011 from zeri42/springfix
2021-08-21 15:02:38 +02:00
Luke Granger-Brown
611aede968
Merge pull request #135021 from lukegb/factorio
...
factorio: 1.1.37 -> 1.1.38
2021-08-21 02:36:43 +01:00
Sandro
3fa9700cd0
Merge pull request #134363 from fgaz/warzone2100/4.1.3
...
warzone2100: 4.1.1 -> 4.1.3
2021-08-21 02:20:24 +02:00
Luke Granger-Brown
b0c792ec41
factorio-demo: 1.1.37 -> 1.1.38
2021-08-20 23:45:58 +00:00
Luke Granger-Brown
682021ce3f
factorio-experimental: 1.1.37 -> 1.1.38
2021-08-20 23:45:06 +00:00
Luke Granger-Brown
745542a016
factorio: 1.1.37 -> 1.1.38
2021-08-20 23:44:21 +00:00
zeri42
ec17a78912
spring: 104.0.1 -> 105.0.1
2021-08-21 00:26:06 +02:00
Michael Raskin
be86a2b10d
Merge pull request #134975 from r-ryantm/auto-update/atanks
...
atanks: 6.5 -> 6.6
2021-08-20 18:23:15 +00:00
R. RyanTM
a1de036c33
atanks: 6.5 -> 6.6
2021-08-20 17:32:06 +00:00
Sandro
47790d05f4
Merge pull request #134951 from marius851000/fixpioneer
...
pioneer: fix model compilation
2021-08-20 16:22:18 +02:00
marius david
77eb4bc533
pioneer: fix execution
2021-08-20 15:03:00 +02:00
Sandro
6cbfbcda92
Merge pull request #134537 from fgaz/shattered-pixel-dungeon/1.0.0
...
shattered-pixel-dungeon: 0.9.3 -> 1.0.0
2021-08-19 21:37:45 +02:00
Sandro
ed2fdff713
Merge pull request #134742 from DeeUnderscore/cataclysm-dda-0.F-1
2021-08-19 20:08:15 +02:00
github-actions[bot]
2970c28349
Merge staging-next into staging
2021-08-19 06:01:34 +00:00
davidak
698d7e277b
Merge pull request #134490 from r-ryantm/auto-update/vkquake
...
vkquake: 1.05.2 -> 1.05.3
2021-08-19 02:28:56 +02:00
D Anzorge
98af443596
cataclysm-dda: 0.F -> 0.F-1
2021-08-19 01:06:38 +02:00
github-actions[bot]
cadf0193dd
Merge staging-next into staging
2021-08-18 18:01:40 +00:00
Ryan Mulligan
d66e050644
Merge pull request #134422 from r-ryantm/auto-update/osu-lazer
...
osu-lazer: 2021.720.0 -> 2021.815.0
2021-08-18 09:53:29 -07:00
github-actions[bot]
b6a825a9c7
Merge staging-next into staging
2021-08-18 06:02:10 +00:00
Ben Siraphob
e81da64d2c
Merge pull request #134397 from r-ryantm/auto-update/freeorion
...
freeorion: 0.4.10.1 -> 0.4.10.2
2021-08-17 19:17:03 -05:00
github-actions[bot]
2341511023
Merge staging-next into staging
2021-08-18 00:01:59 +00:00
Ben Siraphob
f0a97d26f9
Merge pull request #134520 from r-ryantm/auto-update/ultimate-stunts
...
ultimatestunts: 0.7.6.1 -> 0.7.7.1
2021-08-17 17:47:35 -05:00
Francesco Gazzetta
ea300d1e2d
shattered-pixel-dungeon: 0.9.3 -> 1.0.0
2021-08-17 22:40:48 +02:00
R. RyanTM
17a8902c2f
ultimatestunts: 0.7.6.1 -> 0.7.7.1
2021-08-17 19:28:13 +00:00
Artturi
d100199818
Merge pull request #134061 from r-ryantm/auto-update/VASSAL
...
vassal: 3.5.3 -> 3.5.8
2021-08-17 22:02:38 +03:00
R. RyanTM
90f7da71f8
vkquake: 1.05.2 -> 1.05.3
2021-08-17 17:00:37 +00:00
Jan Tojnar
e286e1cfa0
Merge branch 'staging-next' into staging
...
- boost 167 removed on staging-next (7915d1e03f93f3072ab397448830d028202e5d3d) × boost attributes are inherited on staging (d20aa4955d4c31d8393753ddf088e1ee82c5d12e)
- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507977ac67fd5e8547af2d1071c5e0891) × hardened kernels are versioned on staging (a5341beb789c66ed24a11396dda28f2a1303768e) + removed linux_5_12 (e55554491df6e7b789d7f3d6a3b354df3575e1c6)
- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
2021-08-17 18:52:37 +02:00
R. RyanTM
3e81d05bbb
osu-lazer: 2021.720.0 -> 2021.815.0
2021-08-17 10:50:34 +00:00
R. RyanTM
682c2f2006
freeorion: 0.4.10.1 -> 0.4.10.2
2021-08-17 05:02:22 +00:00
Francesco Gazzetta
4b5f0bfa39
warzone2100: 4.1.1 -> 4.1.3
2021-08-16 23:03:25 +02:00
Luke Granger-Brown
c6dc09c9e9
Merge pull request #133877 from nbraud/factorio/1.1.37
...
factorio: 1.1.36 → 1.1.37
2021-08-16 19:22:50 +01:00
Sandro
6327a87b56
Merge pull request #133792 from j0hax/ballerburg
...
ballerburg: include desktop file and icon
2021-08-16 15:16:22 +02:00
github-actions[bot]
9b3f32c547
Merge staging-next into staging
2021-08-16 06:01:39 +00:00
davidak
6978917102
oh-my-git: clearify dependency
...
the actual dependency is libudev
2021-08-16 12:36:28 +09:00
r-burns
58abd73367
oh-my-git: fix strict eval ( #134281 )
...
libudev is an alias to udev
2021-08-15 23:18:23 -04:00
davidak
71ab3c29f9
Merge pull request #134275 from Kranzes/omg-udev
...
oh-my-git: Add libudev
2021-08-16 02:27:37 +02:00
Ilan Joselevich
a13f8aa9be
oh-my-git: Add libudev
2021-08-16 02:37:18 +03:00
github-actions[bot]
4dfde9ac8e
Merge staging-next into staging
2021-08-15 18:01:33 +00:00
Robert Hensing
fbafeb7ad5
treewide: runCommandNoCC -> runCommand
...
This has been synonymous for ~5y.
2021-08-15 17:36:41 +02:00
Johannes Arnold
b40971db7f
ballerburg: include desktop file and icon
2021-08-15 15:25:17 +02:00
Jörg Thalheim
52657498f7
Merge pull request #133588 from zhaofengli/nuget-to-nix
...
nuget-to-nix: init
2021-08-15 07:02:43 +01:00
R. RyanTM
5c91293cdf
vassal: 3.5.3 -> 3.5.8
2021-08-14 17:10:41 +00:00
Jan Tojnar
cdb1d29692
Merge branch 'staging-next' into staging
2021-08-14 14:43:16 +02:00
Zhaofeng Li
4d327d1e3f
osu-lazer: Use nuget-to-nix in updater script
2021-08-13 22:50:20 -07:00
nicoo
d7ae8cf1fe
factorio: 1.1.36 → 1.1.37
2021-08-14 07:02:43 +02:00
Michael Raskin
f9380d3783
Merge pull request #133619 from angustrau/liberation-circuit
...
liberation-circuit: init at 1.3
2021-08-13 10:53:06 +00:00
Angus Trau
005f28eca8
liberation-circuit: init at 1.3
2021-08-13 19:24:36 +10:00
Felix Buehler
75959982e5
games: replace name with pname&version
2021-08-12 22:28:38 +02:00
github-actions[bot]
7ae0b00541
Merge staging-next into staging
2021-08-11 18:01:46 +00:00
