Commit Graph

4142 Commits

Author SHA1 Message Date
Sandro
8f241849c5
Merge pull request #112716 from khumba/frozen-bubble-desktop-file
frozen-bubble: add desktop file
2021-02-12 15:00:17 +01:00
Bryan Gardiner
976ac59e41
frozen-bubble: add desktop file 2021-02-11 19:11:40 -08:00
github-actions[bot]
a480c1ebb1
Merge staging-next into staging 2021-02-11 18:16:52 +00:00
github-actions[bot]
402b752521
Merge master into staging-next 2021-02-11 18:16:48 +00:00
Thomas Tuegel
7a5b84cfa0
Merge pull request #111957 from ttuegel/kde-applications-20.12.1
KDE Applications 20.12.1
2021-02-11 10:02:26 -06:00
Emery Hemingway
32f63b8193 alephone.makeWrapper: accept extra arguments
This fixes the alephone-rubicon-x unpackPhase.
2021-02-11 16:36:14 +01:00
github-actions[bot]
3f38ab888e
Merge master into staging-next 2021-02-11 06:16:35 +00:00
Ryan Mulligan
f64e2b60a8
Merge pull request #112541 from r-ryantm/auto-update/unciv
unciv: 3.12.12 -> 3.12.13-patch1
2021-02-10 17:11:36 -08:00
github-actions[bot]
5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
Sandro
41d270c2aa
Merge pull request #110857 from SuperSandro2000/fix-collection6 2021-02-11 01:32:55 +01:00
github-actions[bot]
7d94bb26bb
Merge master into staging-next 2021-02-10 18:16:36 +00:00
Ryan Mulligan
efd5a5b293
Merge pull request #112549 from r-ryantm/auto-update/vitetris
vitetris: 0.58.0 -> 0.59.1
2021-02-10 06:53:18 -08:00
github-actions[bot]
bb5521a62c
Merge master into staging-next 2021-02-10 12:20:06 +00:00
ajs124
f56f5cc78b widelands: 20 -> 21 2021-02-09 20:47:04 +01:00
R. RyanTM
a6af4637f2 vitetris: 0.58.0 -> 0.59.1 2021-02-09 18:24:36 +00:00
github-actions[bot]
8064cff79c
Merge master into staging-next 2021-02-09 18:16:33 +00:00
R. RyanTM
72bd905ea7 unciv: 3.12.12 -> 3.12.13-patch1 2021-02-09 17:44:15 +00:00
Milan
9252a96805
mindustry, mindustry-server: 123.1 -> 124.1 (#112392) 2021-02-09 13:55:38 +01:00
github-actions[bot]
30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Martin Weinelt
175bdeb4f5
Merge pull request #112088 from rmcgibbo/super-tux-kart
supertuxkart: fix build
2021-02-09 02:45:58 +01:00
Bernardo Meurer
ce6ac77971
Merge pull request #112447 from jpas/factorio-1.1.21
factorio: update all versions to 1.1.21
2021-02-09 01:36:30 +00:00
Mario Rodas
d7b22660db
Merge pull request #112115 from r-ryantm/auto-update/crawl
crawl: 0.26.0 -> 0.26.1
2021-02-08 20:33:03 -05:00
Mario Rodas
6edcc3fb2d
Merge pull request #112240 from r-ryantm/auto-update/unciv
unciv: 3.12.8 -> 3.12.12
2021-02-08 20:09:26 -05:00
Jarrod Pas
347c7fb266 factorio: change help message to output "$HOME"
Since $HOME was not escaped the user was shown a path inside /homeless-shelter
which could be confusing for inexperienced users.
2021-02-08 18:37:24 -06:00
Jarrod Pas
21bce9b36b factorio: 1.1.19 -> 1.1.21 2021-02-08 17:57:08 -06:00
github-actions[bot]
bef005163c
Merge master into staging-next 2021-02-08 12:19:33 +00:00
Robert Schütz
9a200f6091
Merge pull request #111330 from dotlambda/libav-insecure
libav: mark as insecure
2021-02-08 12:18:05 +01:00
Ingo Blechschmidt
d2e0fb3122 abuse: init at 0.8 2021-02-08 09:50:26 +01:00
AndersonTorres
70bcde4329 0verkill: init at 2011-01-13 2021-02-08 09:38:48 +01:00
R. RyanTM
4036f1d3e2 pioneer: 20200203 -> 20210203 2021-02-08 09:29:12 +01:00
github-actions[bot]
f6ef5ce473
Merge master into staging-next 2021-02-08 06:16:44 +00:00
Martin Weinelt
ba6080a9cf
Merge pull request #110417 from r-ryantm/auto-update/freeciv
freeciv: 2.6.2.1 -> 2.6.3
2021-02-08 03:26:12 +01:00
github-actions[bot]
2226996f6c
Merge master into staging-next 2021-02-07 18:16:08 +00:00
R. RyanTM
8cce78f067 unciv: 3.12.8 -> 3.12.12 2021-02-06 23:28:23 +00:00
R. RyanTM
cc77f910fc osu-lazer: 2021.129.0 -> 2021.205.1 2021-02-06 16:22:28 +00:00
R. RyanTM
f5bac9f2e9 crawl: 0.26.0 -> 0.26.1 2021-02-06 09:46:08 +00:00
Robert T. McGibbon
507d7154fb supertuxkart: fix build 2021-02-05 19:22:38 -05:00
Thomas Tuegel
446405ccd2
black-hole-solver: init at 1.10.1 2021-02-05 05:27:00 -06:00
github-actions[bot]
3c4d8b38c4
Merge staging-next into staging 2021-02-05 00:36:22 +00:00
Sandro
9847d1368d
Merge pull request #111793 from oxalica/osu
osu-lazer: 2020.1225.0 -> 2021.129.0
2021-02-04 23:45:09 +01:00
Robert Schütz
83e82c1caf steam-run-native: use ffmpeg instead of libav 2021-02-04 15:19:23 +01:00
oxalica
50707b3130
osu-lazer: 2020.1225.0 -> 2021.129.0 2021-02-04 20:27:29 +08:00
github-actions[bot]
8ab0b85ead
Merge staging-next into staging 2021-02-03 12:22:13 +00:00
Sandro
2f79819ce2
Merge pull request #111273 from numinit/armagetronad 2021-02-03 11:45:48 +01:00
Morgan Jones
f3e8b9c6bf armagetronad: 0.2.8.3.5 -> 0.2.9.1.0 2021-02-03 00:22:55 -07:00
Robert Schütz
872b763710 performous: use ffmpeg instead of libav 2021-02-02 17:26:36 +01:00
github-actions[bot]
4c1eae9176
Merge staging-next into staging 2021-02-02 00:42:42 +00:00
Tim Steinbach
2dc9fe1ea5
minecraft: 2.2.1262 → 2.2.1441 2021-02-01 15:22:16 -05:00
github-actions[bot]
7044cd0c9d
Merge staging-next into staging 2021-02-01 18:31:04 +00:00
Sage Raflik
23de1f4ae6 papermc: add neonfuz as maintainer 2021-02-01 11:47:47 -06:00
Sage Raflik
63b9189151 papermc: 1.16.4r296 -> 1.16.5r457 2021-02-01 11:40:37 -06:00
Jan Tojnar
54f4529aec
Merge pull request #111519 from siraben/xdg-utils-naming 2021-02-01 17:18:57 +01:00
github-actions[bot]
d2bf5aea5a
Merge staging-next into staging 2021-02-01 12:24:36 +00:00
Sandro
120a7279e5
Merge pull request #111416 from bb2020/gimx 2021-02-01 13:16:58 +01:00
bb2020
9fcc211220 gimx: init at 8.0 2021-02-01 12:28:48 +03:00
Ben Siraphob
a6ac3eedbd treewide: xdg_utils -> xdg-utils 2021-02-01 15:05:09 +07:00
github-actions[bot]
104c56e909
Merge staging-next into staging 2021-02-01 00:47:02 +00:00
wchresta
b682b0fc16 legendary-gl: Remove wchresta from maintainers
I created this derivation due to because it was requested in #88963. I
do not use legendary-gl myself. Now that we have another maintainer,
there is no good reason for me to stay maintainer of this.
2021-01-31 14:08:40 -05:00
Eduardo Quirós
66bf902d59
legendary-gl: 0.20.1 -> 0.20.6 (#110823)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-31 20:00:23 +01:00
github-actions[bot]
f92395cf3c
Merge staging-next into staging 2021-01-31 06:19:43 +00:00
Sandro
1fd35ff65b
Merge pull request #111311 from lorenzleutgeb/gradle-6.8.1 2021-01-31 04:10:01 +01:00
github-actions[bot]
c72ffa864a
Merge staging-next into staging 2021-01-30 18:27:30 +00:00
Guillaume Girol
e58ed984d6
Merge pull request #110661 from delroth/chiaki-update
chiaki: 2.0.1 -> 2.1.0 (+ licensing fix)
2021-01-30 18:22:28 +00:00
Lorenz Leutgeb
54bf37a957 mindustry: Use Gradle 6.8 2021-01-30 14:43:44 +01:00
github-actions[bot]
3ac0ccda7a
Merge staging-next into staging 2021-01-29 00:43:57 +00:00
Lassulus
c056196983
Merge pull request #111043 from Profpatsch/gzdoom-4.5.0
gzdoom: 4.4.2 -> 4.5.0
2021-01-28 22:49:16 +01:00
Profpatsch
0d2fc6ba91 gzdoom: 4.4.2 -> 4.5.0
Also updates the zmusic dependency to 1.1.3.
2021-01-28 21:13:12 +01:00
github-actions[bot]
798f7b136c
Merge staging-next into staging 2021-01-28 18:30:08 +00:00
Sandro
8d2a780501
Merge pull request #110433 from iblech/patch-freedroid 2021-01-28 15:31:01 +01:00
github-actions[bot]
2e78c8c736
Merge staging-next into staging 2021-01-28 12:23:55 +00:00
Sandro
883040943a
Merge pull request #110994 from siraben/trackballs-license
trackballs: clarify license
2021-01-28 09:04:57 +01:00
Ben Siraphob
b2ed5d775b trackballs: clarify license 2021-01-28 12:10:33 +07:00
Ingo Blechschmidt
85007d94fb freedroid: init at 1.2.1 2021-01-27 19:07:27 +01:00
github-actions[bot]
1b5da764a7
Merge staging-next into staging 2021-01-27 12:24:09 +00:00
Sandro
e8d60e277c
Merge pull request #110909 from jpas/factorio 2021-01-27 11:27:06 +01:00
Sandro
ad97ca4e51
Merge pull request #110912 from siraben/stdenv-lib-inherit
treewide: remove inherited stdenv.lib
2021-01-27 10:28:55 +01:00
Ben Siraphob
3bbad8b041 treewide: remove inherited stdenv.lib 2021-01-27 12:44:43 +07:00
Jarrod Pas
a5fa85129b factorio, factorio-demo, factorio-headless: 1.0.0 -> 1.1.19 2021-01-26 20:49:28 -06:00
Jarrod Pas
27de17f45a factorio-experimental, factorio-demo-experimental, factorio-headless-experimental: 1.1.16 -> 1.1.19 2021-01-26 20:48:56 -06:00
github-actions[bot]
0f779d50b1
Merge staging-next into staging 2021-01-27 00:43:23 +00:00
Aaron Andersen
71a9046715
Merge pull request #109847 from kampka/wesnoth
Wesnoth: 1.14.14 -> 1.14.15
2021-01-26 18:32:15 -05:00
Thomas Tuegel
0e418a1a18
Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
Sandro Jäckel
25e7d3949c
openmw: Add comment that commit does not exist on any branch on target repository 2021-01-26 15:19:01 +01:00
Sandro Jäckel
24e36fdd82
openra.mods: Add comment that commit does not exist on any branch on target repository 2021-01-26 15:18:59 +01:00
Sandro Jäckel
5d4a0aeee5
snipes: replace commit which doesn't belong to any branch with parent commit and recreate patch 2021-01-26 15:18:57 +01:00
Julien Moutinho
dbbdc2eb3e freeciv: fix Qt runtime 2021-01-26 12:33:59 +01:00
Jonathan Strickland
eb6b3ab09f
hhexen: init at 1.6.3 (#110792)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-26 01:30:05 +01:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
Sandro
ecb607ded2
Merge pull request #110804 from priegger/factorio
factorio-headless-experimental, factorio-experimental: 1.1.12 -> 1.1.16
2021-01-25 21:46:02 +01:00
Francesco Gazzetta
9ce1caa63c
mindustry,mindustry-server: 122.1 -> 123.1 (#110793) 2021-01-25 19:39:38 +01:00
Philipp Riegger
51bc6bdf8c factorio-headless-experimental, factorio-experimental: 1.1.12 -> 1.1.16 2021-01-25 19:05:30 +01:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Sandro
2c0b4ecab1
Merge pull request #110761 from fgaz/warzone2100/3.4.1 2021-01-25 17:11:14 +01:00
Francesco Gazzetta
321f70a603 warzone2100: 3.3.0 -> 3.4.1 2021-01-25 13:07:03 +01:00
Francesco Gazzetta
7db3b75d21 warzone2100: add fgaz to maintainers 2021-01-25 13:06:19 +01:00
Sandro
81e3b9d15b
Merge pull request #110670 from siraben/double-quotes-fix
treewide: fix double quoted strings in one-liners
2021-01-24 16:17:14 +01:00
aszlig
2f30e32121
uqm: Fix evaluation of 3DO video package
Regression introduced by 2e34288f0d.

The commit in question just used the "lib" attribute, but it wasn't in
scope. In addition to bringeng the lib attribute into scope, I also
removed the "with lib;", which should make sure that we get an error
when just parsing (nix-instantiate --parse) the Nix expression.

Signed-off-by: aszlig <aszlig@nix.build>
2021-01-24 15:35:33 +01:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Pierre Bourdon
54293e70b5
chiaki: 2.0.1 -> 2.1.0 2021-01-24 07:51:54 +01:00
Pierre Bourdon
4c45543736
chiaki: fix license information (GPLv3+ -> AGPLv3)
This was changed by upstream in the 2.0 release and missed when we
update the nixpkgs package.
2021-01-24 07:48:12 +01:00