Commit Graph

64 Commits

Author SHA1 Message Date
Weijia Wang
9f5a6d72fa
Merge pull request #307738 from r-ryantm/auto-update/freeciv
freeciv: 3.1.0 -> 3.1.1
2024-05-05 17:40:58 +02:00
superherointj
c6e33d3756
freeciv: remove nested with from meta 2024-04-30 08:05:54 -03:00
R. Ryantm
f8e4bff4a9 freeciv: 3.1.0 -> 3.1.1 2024-04-29 11:39:14 +00:00
Jan Tojnar
eb04659fc2 treewide: wrapGAppsHook → wrapGAppsHook3
This was achieved using the following command:

    sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')

And then manually reverted the following changes:

- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
2024-04-27 02:23:22 +02:00
Weijia Wang
24f5164372 freeciv_qt: set qtver 2024-03-08 08:40:05 +01:00
R. Ryantm
e21d419d2f freeciv: 3.0.10 -> 3.1.0 2024-03-02 04:21:38 +00:00
R. Ryantm
ba70c921d5 freeciv: 3.0.9 -> 3.0.10 2024-02-11 05:19:05 +00:00
R. Ryantm
a88bfcc380 freeciv: 3.0.8 -> 3.0.9 2023-11-11 06:28:31 +00:00
Michael Livshin
85c49c09da freeciv: 3.0.4 -> 3.0.8 2023-07-25 12:11:45 +03:00
Jan Tojnar
457f28f6f8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/tools/codespell/default.nix

codespell 2.2.2 switched to pyproject & setuptools_scm:
https://github.com/codespell-project/codespell/pull/2523
2022-10-19 05:24:28 +02:00
R. Ryantm
993e453d72 freeciv: 3.0.3 -> 3.0.4 2022-10-14 17:49:54 +00:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
R. Ryantm
4dd8c421b9 freeciv: 3.0.2 -> 3.0.3 2022-08-10 13:30:28 +00:00
Greizgh
614ad1c1c0
freeciv: 3.0.1 -> 3.0.2 2022-06-23 18:35:25 +02:00
Michael Livshin
9ae248d5ba freeciv: 2.6.6 -> 3.0.1
* change the default client to gtk (because sdl2 is marked experimental)

* use sdl2 sound in all clients
2022-06-14 09:16:06 +03:00
R. Ryantm
a30e8a0cd2 freeciv: 2.6.5 -> 2.6.6 2021-12-30 22:21:55 -08: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
Sandro Jäckel
da88c1e9b6
freeciv: format, cleanup 2021-08-05 16:57:52 +02:00
davidak
677dc1b93b
Merge pull request #122134 from fricklerhandwerk/freeciv-gtk
freeciv: build with `gtk` with `gtkClient = true`
2021-08-03 08:10:12 +02:00
R. RyanTM
efed1ede1f freeciv: 2.6.4 -> 2.6.5 2021-07-01 13:32:11 -07:00
fricklerhandwerk
10f9d7d2e9 freeciv: build with gtk when gtkClient = true
the configure flag was missing, and now the `freeciv-gtk3` binary will
be produced.
2021-05-08 23:38:13 +02:00
R. RyanTM
77a270f871 freeciv: 2.6.3 -> 2.6.4 2021-04-29 00:29:02 -04:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02: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
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
Julien Moutinho
dbbdc2eb3e freeciv: fix Qt runtime 2021-01-26 12:33:59 +01:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
R. RyanTM
12f13bc8e8 freeciv: 2.6.2.1 -> 2.6.3 2021-01-21 23:43:46 +00:00
Ben Siraphob
bd42003f87 pkgs/games: pkg-config -> pkgconfig (2) 2021-01-16 23:49:59 -08:00
Ben Siraphob
2e34288f0d pkgs/games: stdenv.lib -> lib 2021-01-15 13:36:04 +07:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
R. RyanTM
76e79467b2 freeciv: 2.6.2 -> 2.6.2.1 2020-12-02 04:33:17 +00:00
Marek Mahut
15b6987ca8
Merge pull request #84209 from prusnak/freeciv
freeciv: 2.6.0 -> 2.6.2
2020-05-10 23:11:07 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Pavol Rusnak
c7c3f8780f
freeciv: 2.6.0 -> 2.6.2 2020-04-03 22:26:05 +02:00
Peter Hoeg
31c33e3420 freeciv_qt: init at 2.6.0 2019-06-25 14:56:57 +08:00
R. RyanTM
ef662bb5f7 freeciv: 2.5.11 -> 2.6.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/freeciv/versions.
2018-08-08 16:45:36 -07:00
Matthew Bauer
6127ec1665 treewide: disable sdl-config darwin time outs
sdl-config has an issue on hydra where it will hang when run on
Darwin. This is probably related to the headless mode that is set up &
the sdl-config program waiting for a graphical to finish.
2018-06-23 17:50:00 -04:00
Matthew Bauer
9eb0301eb2 freeciv: enable on darwin 2018-05-21 19:56:52 -05:00
Matthew Bauer
04bc0bd2b7 freeciv: cleanup overrides
This is how we do overrides elsewhere. The "name" suffix makes things
a little bit complicated IMO. Other input welcome.
2018-05-21 19:55:37 -05:00
Ryan Mulligan
1bc81e62c2 freeciv_gtk: 2.5.10 -> 2.5.11
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/freeciv-gtk/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server -h` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server --help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server -V` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server -v` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server --version` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server version` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server -h` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server --help` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-server help` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-gtk2 -h` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-gtk2 --help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-gtk2 -v` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-gtk2 --version` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-manual -h` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-manual --help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-manual -v` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-manual --version` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-mp-gtk2 -h` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-mp-gtk2 --help` got 0 exit code
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-mp-gtk2 -v` and found version 2.5.11
- ran `/nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11/bin/freeciv-mp-gtk2 --version` and found version 2.5.11
- found 2.5.11 with grep in /nix/store/h5yjw60axfcj1qiva25shmxdh0b4h6xy-freeciv-gtk-2.5.11
- directory tree listing: https://gist.github.com/02a6a0c73fce1c016f7e3dc7111c76b3
2018-03-30 21:16:58 +02:00
Franz Pletz
ba7be3488f
freeciv: 2.5.9 -> 2.5.10 2018-01-28 18:52:25 +01:00
Orivej Desh
aaf6b2b601 freeciv: enable parallel building 2017-11-26 07:42:18 +00:00
Evan Wallace
9bbb9b2e46 freeciv: 2.5.7 -> 2.5.9 2017-11-10 07:54:50 +00:00
Armijn Hemel
81319583bc freeciv: 2.5.6 -> 2.5.7 2017-05-23 17:21:33 +04:00
Nikolay Amiantov
d479639187 freeciv: build with shared (not static) libraries 2016-12-29 00:33:13 +03:00
Nikolay Amiantov
5d5e0c19f6 Merge commit 'refs/pull/21479/head' of git://github.com/NixOS/nixpkgs 2016-12-29 00:32:52 +03:00
Ricardo Ardissone
00c46ecd74 freeciv: add enable_sqlite 2016-12-28 18:35:09 -02:00