3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4857 commits

Author SHA1 Message Date
github-actions[bot] 2f5ea43e02
Merge master into staging-next 2021-09-07 00:01:32 +00:00
Artturi e3549ba06d
Merge pull request #136905 from Artturin/freecivqt 2021-09-07 00:22:51 +03:00
Artturin a9dacd437f freeciv: wrap gtkClient 2021-09-06 23:18:32 +03:00
Artturin 48082af9b8 freeciv: do not enable gtkClient always on linux
makes it possible to use the qtClient
2021-09-06 23:10:55 +03:00
github-actions[bot] 58c8736bdb
Merge master into staging-next 2021-09-06 12:01:09 +00:00
Pavol Rusnak 03637fe586
sdlpop: 1.21 -> 1.22
+ fix build on darwin
2021-09-05 22:31:05 +02:00
github-actions[bot] e3f1f8bba2
Merge master into staging-next 2021-09-04 00:01:34 +00:00
Luke Granger-Brown 651d7cdc19 factorio-experimental: 1.1.38 -> 1.1.39 2021-09-03 14:11:40 -07:00
Raphael Megzari ed412c297c
Merge branch 'master' into staging-next 2021-09-03 10:36:17 +09:00
Martin Weinelt 74ca5781d8
Merge pull request #136105 from chvp/bump-0ad
zeroad: 0.0.25 -> 0.0.25b
2021-09-03 02:47:26 +02:00
github-actions[bot] 0630061ef3
Merge master into staging-next 2021-09-02 18:01:20 +00:00
Andreas Rammhold f3e49a4ae5
Merge pull request #136192 from andir/xonotic
xonotic: support user statistics reporting
2021-09-02 17:03:17 +02:00
github-actions[bot] ba543de038
Merge master into staging-next 2021-09-02 06:01:01 +00:00
tomberek 7fa2a288f0
Merge pull request #136410 from chvp/bump-wesnoth
wesnoth: 1.4.16 -> 1.4.17
2021-09-02 01:21:56 -04:00
Charlotte Van Petegem 96f02afbe5
wesnoth: fix license information
source: https://github.com/wesnoth/wesnoth/blob/master/copyright
2021-09-01 21:49:06 +02:00
Charlotte Van Petegem bbf089dfb7
wesnoth: 1.4.16 -> 1.4.17 2021-09-01 21:44:21 +02:00
Alyssa Ross c13cf1e76f
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-01 07:47:01 +00:00
Dmitry Kalinkin 9013640211
Merge pull request #136085 from Atemu/update/anki-bin
anki-bin: 2.1.46 -> 2.1.47
2021-08-31 01:40:48 -04:00
Andreas Rammhold f5e95757f2
xonotic: support user statistics reporting
Xonotic supports (opt-in) tracking of user statistics. For staistics to
be trackable each player needs a unique identifier that is based on some
cryptographic identity. For that to work we need to build the "blind"
library and provide it do xonotic during runtime.

The official xonotic releases ship with the public key of some sort of
central trust authority and thus we must retain that file within our
data package as well.

Before this commit the crypto_* commands in the ingame console weren't
available. With this commit you should be able to execute "crypto_keys"
commands as show below.

  $ crypto_keys
  0: public key key_0.d0pk (fingerprint: Xon//KssdlzGkFKdnnN4sgg8H+koTbBn5JTi37BAW1Q=)
     private ID key_0.d0si (public key fingerprint: 9piqrk8ajAPRc3BnSbkac5GA+yL3dOwh53BhyrfmVlI=)

Once the above command works you have to configure your player profile
to allow tracking (if you want) via the Multiplayer -> Profile dialog.
In the top right-hand corner there will be checkboxes to control the
level of tracking that you are opting in to.
2021-08-30 17:13:00 +02:00
Martin Weinelt e2575c7de1
Merge branch 'master' into staging-next 2021-08-30 16:08:03 +02:00
Charlotte Van Petegem 740b698ea1
zeroad: 0.0.25 -> 0.0.25b 2021-08-29 17:47:04 +02:00
Atemu 75d580619d anki-bin: 2.1.46 -> 2.1.47 2021-08-29 10:11:47 +02:00
Atemu e8d2c73f6e anki-bin: passthru sources
It wasn't possible to access the actual source on linux or that of the other OS
2021-08-29 10:08:55 +02:00
Ryan Mulligan dc2d883d5c
Merge pull request #135988 from r-ryantm/auto-update/scid-vs-pc
scid-vs-pc: 4.21 -> 4.22
2021-08-28 08:46:00 -07:00
R. RyanTM 4ca57d8219 scid-vs-pc: 4.21 -> 4.22 2021-08-28 00:15:09 +00:00
github-actions[bot] b7f2a7d1ba
Merge master into staging-next 2021-08-28 00:01:34 +00:00
Sandro 1970994604
Merge pull request #135952 from Artturin/vintagestory
vintagestory: init at 1.15.5
2021-08-28 01:52:21 +02:00
Artturin 176705c295 vintagestory: init at 1.15.5 2021-08-27 23:13:13 +03:00
github-actions[bot] 10ce8bb753
Merge master into staging-next 2021-08-27 00:01:31 +00:00
R. RyanTM 551bcc0734 lgogdownloader: 3.7 -> 3.8 2021-08-26 08:28:23 +00:00
Jan Tojnar 4ff3577f25 Merge branch 'staging-next' into staging 2021-08-23 14:19:54 +02:00
Sandro 354afc6ecd
Merge pull request #135285 from Mic92/fix-homepages 2021-08-22 18:30:31 +02:00
Jörg Thalheim 6d65cb8569 bitsnbots: drop
- upstream is dead
- crashes on startup
2021-08-22 16:14:35 +02:00
Jörg Thalheim 7dfbfb6483 banner: fix homepage 2021-08-22 16:07:54 +02:00
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