github-actions[bot]
d9d6f71e43
Merge master into staging-next
2021-06-05 18:30:28 +00:00
Mustafa Çalışkan
22e0fe2f29
lunar-client: 2.6.0 -> 2.7.3
2021-06-05 21:09:53 +03:00
github-actions[bot]
ad63c3d31f
Merge master into staging-next
2021-06-04 19:40:59 +00:00
Karol Chmist
e1b8ef38ea
fheroes2: init at 0.9.4
2021-06-04 20:44:07 +02:00
Antoine Fontaine
758c87007c
unvanquished: init at 0.52.0
2021-06-04 17:48:46 +02:00
oxalica
24c6e52af8
osu-lazer: 2021.515.0 -> 2021.602.0
2021-06-04 20:01:22 +08:00
github-actions[bot]
a9f286f5cf
Merge master into staging-next
2021-06-03 19:52:02 +00:00
polygon
388bc58b7f
liquidwar: fix build ( #125480 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-06-03 16:36:26 +02:00
github-actions[bot]
a12e0d5bff
Merge master into staging-next
2021-06-03 12:49:11 +00:00
Sandro Jäckel
89d5f4b3d0
treewide: setuptools_scm -> setuptools-scm
2021-06-03 12:44:33 +02:00
Sandro
9a5a639608
Merge pull request #125006 from astro/frogatto
2021-06-03 12:03:00 +02:00
github-actions[bot]
1fe3553272
Merge master into staging-next
2021-06-03 02:08:32 +00:00
Luke Granger-Brown
7876162722
factorio-demo: 1.1.32 -> 1.1.34
2021-06-02 18:32:28 +00:00
Luke Granger-Brown
266fa7f015
factorio-experimental: 1.1.33 -> 1.1.34
2021-06-02 18:31:23 +00:00
Luke Granger-Brown
e5173c8481
factorio: 1.1.32 -> 1.1.34
2021-06-02 18:30:25 +00:00
Astro
39a9499774
frogatto: unstable-2021-05-24 -> unstable-2018-12-18, unbreak
2021-06-02 19:21:38 +02:00
github-actions[bot]
1176851146
Merge master into staging-next
2021-06-02 07:51:53 +00:00
Ryan Mulligan
1848d4270a
Merge pull request #125023 from r-ryantm/auto-update/ckan
...
ckan: 1.30.2 -> 1.30.4
2021-06-01 20:37:17 -07:00
github-actions[bot]
42b70ad7f1
Merge master into staging-next
2021-06-01 20:30:45 +00:00
Sandro
c7aece5a48
Merge pull request #125245 from rnhmjoj/warzone
...
warzone2100: fix build
2021-06-01 20:15:18 +02:00
rnhmjoj
302d6b1b8b
warzone2100: fix build
...
I'm not sure how the build broke[1] or how it worked before, but
the problem is zip is being used in place of p7zip, which obviously
fail as the flags have different meanings.
[1]: https://hydra.nixos.org/build/143354937
2021-06-01 17:54:10 +02:00
github-actions[bot]
7f14676873
Merge master into staging-next
2021-05-31 19:44:13 +00:00
R. RyanTM
fe414b367d
cbonsai: 1.1.1 -> 1.2.0
2021-05-31 10:58:03 +00:00
R. RyanTM
a57fcabd33
ckan: 1.30.2 -> 1.30.4
2021-05-31 01:49:11 +00:00
github-actions[bot]
2867d5301f
Merge master into staging-next
2021-05-30 19:15:10 +00:00
Sandro
58a2737645
Merge pull request #124981 from legendofmiracles/rpg
...
rpg-cli: unstable-2021-05-27 -> 0.3.0
2021-05-30 19:57:52 +02:00
legendofmiracles
e546f97664
rpg-cli: unstable-2021-05-27 -> 0.3.0
2021-05-30 11:13:15 -06:00
github-actions[bot]
4fd76aacd3
Merge master into staging-next
2021-05-30 01:54:11 +00:00
Karl Meakin
6ee94fc354
runelite: 2.0.0 -> 2.1.5
2021-05-29 16:11:41 -07:00
github-actions[bot]
4cfefea5b2
Merge master into staging-next
2021-05-29 01:43:58 +00:00
Sandro
c95522aac2
Merge pull request #124685 from greaka/patch-1
...
terraria-server: 1.4.2.2 -> 1.4.2.3
2021-05-29 02:57:53 +02:00
Sandro
3e69f71e77
Merge pull request #124539 from legendofmiracles/rpg
...
rpg-cli: init at 0.2.0
2021-05-29 02:29:27 +02:00
Sandro
5730083206
Merge pull request #124195 from atopuzov/augustus-3.0.1
2021-05-29 02:09:03 +02:00
R. RyanTM
262658cca8
cbonsai: 1.0.4 -> 1.1.1
2021-05-28 10:51:27 +00:00
github-actions[bot]
a743ebe846
Merge master into staging-next
2021-05-27 18:58:59 +00:00
greaka
4e9bd87f5a
terraria-server: 1.4.2.2 -> 1.4.2.3
2021-05-27 19:34:05 +02:00
Ryan Mulligan
ea595a2013
Merge pull request #124021 from r-ryantm/auto-update/cdogs
...
cdogs-sdl: 0.11.1 -> 0.12.0
2021-05-27 06:05:31 -07:00
github-actions[bot]
f385b431a7
Merge master into staging-next
2021-05-27 06:45:59 +00:00
legendofmiracles
bfcd6bd009
rpg-cli: init at 0.2.0
2021-05-27 00:40:07 -06:00
Stéphan Kochen
2353879e8d
toppler: fix darwin build
2021-05-26 18:17:40 +02:00
Aleksandar Topuzović
b5a50d1486
augustus: 2.0.1 -> 3.0.1
2021-05-23 21:22:29 +01:00
github-actions[bot]
2aa5735c09
Merge master into staging-next
2021-05-23 18:33:25 +00:00
Sandro
ebd5042606
Merge pull request #124041 from fgaz/shattered-pixel-dungeon/0.9.2b
2021-05-23 17:03:28 +02:00
Jonathan Ringer
b9b9cdb87c
Merge remote-tracking branch 'origin/staging' into staging-next
2021-05-22 19:23:14 -07:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Francesco Gazzetta
fc8eefe2fe
shattered-pixel-dungeon: 0.9.2 -> 0.9.2b
2021-05-22 18:13:12 +02:00
Kira Bruneau
cd4780fab4
maintainers: rename metadark -> kira-bruneau ( #124035 )
2021-05-22 16:47:40 +02:00
Sandro
b182609952
Merge pull request #114692 from r-ryantm/auto-update/chessx
...
chessx: 1.5.0 -> 1.5.6
2021-05-22 15:20:31 +02:00
R. RyanTM
51f861a25c
cdogs-sdl: 0.11.1 -> 0.12.0
2021-05-22 11:50:52 +00:00
github-actions[bot]
d5714df652
Merge staging-next into staging
2021-05-22 06:21:58 +00:00
Jonathan Ringer
7507aed4e1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/tools/rust/cargo-expand/default.nix
pkgs/tools/misc/blflash/default.nix
2021-05-21 19:49:05 -07:00
R. RyanTM
c7be0f932d
ckan: 1.30.0 -> 1.30.2
2021-05-21 19:43:41 -07:00
Andrew Brooks
a49a274abf
Revert "xconq: Simplify package with tcl.tclPackageHook"
...
This reverts commit 113826a892512eb2e19985310fd7d4a39db4d75e, which
ended up breaking the Tk import at runtime.
2021-05-21 15:18:25 -05:00
Andrew Brooks
17a561e1cf
scid: Correct typo in maintainers
2021-05-21 15:18:24 -05:00
Andrew Brooks
c677478b0b
scid-vs-pc: Simplify package with tcl.mkTclDerivation
2021-05-21 15:18:13 -05:00
Andrew Brooks
9979565b0c
scid: Simplify package with tcl.mkTclDerivation
2021-05-21 15:18:12 -05:00
Andrew Brooks
a4f54890d5
xconq: Simplify package with tcl.tclPackageHook
2021-05-21 15:18:11 -05:00
Andrew Brooks
f17ca3f517
tcl2048: Simplify package with tcl.mkTclDerivation
2021-05-21 15:18:11 -05:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/shells/ion/default.nix
pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
Martin Weinelt
dfe77a81af
Merge pull request #123180 from zeri42/zod-version-bump
2021-05-20 22:19:11 +02:00
github-actions[bot]
34a05e29f1
Merge master into staging-next
2021-05-20 18:36:00 +00:00
Profpatsch
c8c7d0c448
ultrastardx: really don’t use ffmpeg_3
...
Due to a merge error, usdx didn’t actually switch to ffmpeg 4.
This fixes that
2021-05-20 19:38:54 +02:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
zeri42
a75e32a0d0
zod: add scaling factor
...
- add patch that allows to resize the zod_launcher window at compile
time with `scalingFactor` option
2021-05-20 12:44:02 +02:00
zeri42
1d58c8b095
zod: 2011-03-18 -> 2011-09-06
...
- cleanup Derivation
- add map_editor and zod_launcher
- game is playable now (appears broken/orphaned in current version)
- fix comment about version
- add enableParallelBuilding=true;
- change source url to use mirror://
2021-05-20 12:44:02 +02:00
Peter Hoeg
7fe78d4f9e
openmw-tes3mp: unstable-2019-11-19 -> unstable-2020-08-07
2021-05-20 09:06:25 +08:00
Peter Hoeg
5c87334112
openmw: ffmpeg_3 -> ffmpeg
2021-05-20 09:06:25 +08:00
Reed
029d53dbf9
r2mod_cli: 1.0.7 -> 1.2.0
2021-05-19 12:39:26 -07:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/graphics/emulsion/default.nix
pkgs/development/tools/misc/texlab/default.nix
pkgs/development/tools/rust/bindgen/default.nix
pkgs/development/tools/rust/cargo-udeps/default.nix
pkgs/misc/emulators/ruffle/default.nix
pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Vladimír Čunát
e3088f6793
Merge #123483 : privateer: drop, broken for years
2021-05-18 12:13:20 +02:00
Robert Schütz
0b7ebd1b51
privateer: drop
...
It was marked as broken in August 2015.
2021-05-18 11:59:54 +02:00
Sandro
32fd19653c
Merge pull request #123468 from Atemu/update/anki-bin
...
anki-bin: 2.1.43 -> 2.1.44
2021-05-18 11:49:58 +02:00
Profpatsch
d7cfce0e47
ultrastardx: 2020.4.0 -> 2021-04-03
...
Not a lot has changed since last update, a few fixes were pushed to
the master tree.
We take the liberty to update to master for now.
This updates the ffmpeg version from 2.x to 4.x, which seems to be
supported upstream when we bend the minor version restriction a
little.
A simple karaoke song played just fine in my test.
2021-05-18 09:04:32 +02:00
Martin Weinelt
707234bf0d
steam: add json-glib to fhsenv
...
Fixes the Paradox Launcher for Stellaris.
Fixes : #123447
2021-05-17 23:19:33 -07:00
OPNA2608
fc2e0709f0
openxray: 784-october-preview -> 822-december-preview
2021-05-17 20:21:04 -07:00
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
...
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Sandro
65e349506f
Merge pull request #122837 from cyberdront/patch-1
...
terraria-server: 1.4.1.2 -> 1.4.2.2
2021-05-17 02:27:57 +02:00
Sandro
622c2c2382
Merge pull request #122994 from mweinelt/remove-inactive-maintainer/nand0p
...
treewide: remove nand0p as maintainer
2021-05-17 02:18:03 +02:00
Sandro
b2cd6ba7f5
Merge pull request #123275 from oxalica/osu
...
osu-lazer: 2021.502.0 -> 2021.515.0
2021-05-17 02:06:17 +02:00
Martin Weinelt
7bd65d54f7
treewide: remove nand0p as maintainer
...
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.
- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
maintainer-list, which they didn't reply to.
2021-05-17 01:50:49 +02:00
Michael Raskin
5e9437ef57
Merge pull request #123289 from OPNA2608/fix/supertuxkart-darwin/21.05
...
superTuxKart: Build on Darwin
2021-05-16 22:59:10 +00:00
sophrosyne97
1372b429cc
cataclysm-dda-git: 2019-11-22 -> 2020-12-09
2021-05-16 15:44:54 -07:00
OPNA2608
f2a29c1ee9
superTuxKart: Make Darwin-compatible
2021-05-16 22:24:34 +02:00
oxalica
cf1db5812d
osu-lazer: 2021.502.0 -> 2021.515.0
2021-05-17 02:57:46 +08:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging
2021-05-16 01:01:01 +00:00
Stéphan Kochen
5ed1f1f2a6
frotz: fix darwin build
2021-05-15 14:18:41 +02:00
Marat
ad96c7eb13
terraria-server: 1.4.1.2 -> 1.4.2.2
2021-05-14 13:25:29 +04:00
Atemu
e2b86ad1e7
anki-bin: 2.1.43 -> 2.1.44
2021-05-13 17:31:54 +02:00
Jan Tojnar
0313c77b55
Merge branch 'staging-next' into staging
2021-05-13 11:42:36 +02:00
Sandro
b3186b9860
Merge pull request #122657 from malob/0verkill-darwin-fix
...
0verkill: fix darwin build
2021-05-12 23:13:12 +02:00
Sandro
88df2cb177
Merge pull request #122765 from legendofmiracles/steam-tui
...
steam-tui: adds missing runtime dependencies correctly
2021-05-12 22:59:33 +02:00
legendofmiracles
65380bc338
steam-tui: adds missing runtime dependencies
2021-05-12 14:30:50 -06:00
github-actions[bot]
b057978bb2
Merge staging-next into staging
2021-05-12 18:32:29 +00:00
Malo Bourgon
9b03a74fb5
0verkill: fix darwin build
2021-05-12 10:01:12 -07:00
Sandro
d2d634c6ca
Merge pull request #122699 from legendofmiracles/steam-tui
...
steam-tui: init at 0.1.0
2021-05-12 17:29:00 +02:00
legendofmiracles
7dd35786f3
steam-tui: init at 0.1.0
2021-05-12 05:53:36 -06:00
github-actions[bot]
e2cf474986
Merge staging-next into staging
2021-05-12 06:21:36 +00:00
Peter Hoeg
e1ce68683f
freeorion: 0.4.9 -> 0.4.10.1
2021-05-12 09:38:58 +08:00