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
