Ben Siraphob
ca7f39f987
pkgs/data, pkgs/games: [sS]tdenv.*lib -> lib
2021-01-17 20:59:16 +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
Ben Siraphob
3ae5e6ce03
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 18:37:40 +07:00
Mario Rodas
7c7ee58775
Merge pull request #98229 from bbigras/df
...
dwarf-fortress: update themes.json
2020-09-20 19:42:18 -05:00
Gabriel Ebner
cdcdeb63b2
dwarf-fortress: use jdk8
2020-09-19 14:06:15 +02:00
Bruno Bigras
5427e43b08
dwarf-fortress: update themes.json
2020-09-18 13:44:06 -04:00
Cole Helbling
e2b09f42ba
dwarf-fortress: TWBT: use fork for dfhack 0.47.04 support
...
The original mifki TWBT hasn't been updated since April 2019, while
thurin's fork has added support for dfhack 0.47.04-r2. Thus, switch to
thurin's fork when Dwarf Fortress 0.47.04 is used (and ever-so-slightly
special case the url attribute).
2020-08-21 14:45:53 -07:00
Cole Helbling
50bf68669a
dfhack: fix ruby plugin
...
dfhack expects an unversioned libruby.so to be present in the hack
subdirectory for ruby plugins to function. The glob is necessary,
because the ruby package's library names are formatted as
ruby-${version}.so for whatever reason. The glob makes it possible for
ruby to update without manual intervention being needed here.
2020-08-21 14:45:53 -07:00
Cole Helbling
5db4a65384
dfhack: 0.47.04-alpha0 -> 0.47.04-r2
...
As of
56e43a0dde
,
dfhack gets its goodies from the directory above the Dwarf_Fortress
executable, which leads to stock Dwarf Fortress and not the built
environment where all the dfhack resources are symlinked to (typically
~/.local/share/df_linux). This causes errors like `tweak is not a
recognized command` to be reported and dfhack to lose some of its
functionality.
2020-08-21 14:45:53 -07:00
Matthew Piziak
879778c583
add enableSound
parameter to dwarf-fortress
derivation
...
try hardcoding
add back whitespace
2020-05-17 22:18:39 -04:00
Jörg Thalheim
887295fd2d
treewide: remove the-kenny from maintainers
...
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
2020-05-09 10:28:57 +01:00
Pavol Rusnak
7b0167204d
treewide: use https for nixos.org and hydra.nixos.org
...
tarballs.nixos.org is omitted from the change because urls from there
are always hashed and checked
2020-05-03 22:14:21 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
Jonathan Ringer
c9f216d5d5
dwarf-fortress: 0.47.02 -> 0.47.04
2020-03-13 14:46:55 -07:00
Jonathan Ringer
29f7f3037e
dwarf-therapist: 41.1.3 -> 41.1.5
2020-03-13 14:46:55 -07:00
Jonathan Ringer
d2b745d617
dwarf-fortress: 0.44.12 -> 0.47.02
2020-02-14 12:50:12 -08:00
Jonathan Ringer
381e86a782
dwarf-fortress.dfhack: add 0.47.02-alpha0 release
2020-02-14 12:50:12 -08:00
Jonathan Ringer
71af0ea361
dwarf-fortress.twbt: add 6.61 release
...
This is just the latest release, there hasn't been
a release for a few months.
2020-02-14 12:50:12 -08:00
Jonathan Ringer
016dcfe514
dwarf-therapist: 41.1.2 -> 41.1.3
2020-02-14 12:50:12 -08:00
Andrey Petrov
be32c3caac
dwarf-fortress-packages.unfuck: 0.47.01 -> 0.47.02 release
...
Temporarily using 0.47.01 release for 0.47.02, since there's no
corresponding unfuck release yet and it seems to work.
2020-02-09 17:46:19 -08:00
Andrey Petrov
d51838db20
dwarf-fortress: fix update.sh script for games.json
2020-02-09 17:46:19 -08:00
Andrey Petrov
b865fb3573
dwarf-fortress-packages.dwarf-fortress_0_47_02: init
2020-02-09 17:46:19 -08:00
Andrey Petrov
0a4265c077
dwarf-fortress: update themes.json
2020-02-09 17:46:19 -08:00
Andrey Petrov
1a0f594981
dwarf-fortress: Update themes.json
2020-02-03 00:57:53 -08:00
Andrey Petrov
662589574b
dwarf-fortress: Add update script for themes
2020-02-03 00:57:53 -08:00
Jonathan Ringer
e293cf9117
dwarf-fortress-packages.dwarf-therapist: 41.0.2 -> 41.1.2
2020-02-02 16:04:30 -08:00
Jonathan Ringer
349bf18212
dwarf-fortress-packages.unfuck: add 0.47.0.1 release
2020-02-02 16:04:30 -08:00
Jonathan Ringer
fc82682d3a
dwarf-fortress-packages.dwarf-fortress_0_47_01: init
2020-02-02 16:04:30 -08:00
Anders Kaseorg
3cd8ce3bce
treewide: Fix unsafe concatenation of $LD_LIBRARY_PATH
...
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted. (See #67234 , for
example.) Fix this throughout the tree.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2020-01-15 09:47:03 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined
2019-11-18 20:10:43 +00:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
...
Quoting from the splitString docstring:
NOTE: this function is not performant and should never be used.
This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
volth
7bb6b373ab
treewide: name -> pname ( #67513 )
2019-08-31 07:41:22 -04:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
volth
c814d72b51
treewide: name -> pname
2019-08-17 10:54:38 +00:00
volth
46420bbaa3
treewide: name -> pname (easy cases) ( #66585 )
...
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
2019-08-15 13:41:18 +01:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Nikolay Amiantov
ccbb08ed88
dwarf-fortress-packages.dwarf-therapist-original: expose to package set
...
Needed for it to be built on Hydra.
2019-06-10 18:52:52 +03:00
TrevtheForthDev
3fcd66cce8
Added EnableTextMode Dwarf Fortress for playing CLI
2019-05-08 04:07:21 +09:00
lassulus
0cd1e6732d
dwarf-fortress: fix theme override
2018-11-08 01:59:56 +01:00
lassulus
290dd06d14
dwarf-fortress: fix most of customization options
...
see #49779
close #49803
2018-11-06 01:00:17 +01:00
lassulus
0d57159eca
dwarf-fortress: fix build error
2018-10-08 22:21:09 +02:00
Morgan Jones
213b5457fc
Inline JSON files
2018-09-09 07:15:59 +00:00
Morgan Jones
2cd2571edd
Update twbt to 6.54
2018-09-09 07:03:59 +00:00
Morgan Jones
5f1013d875
Use stdenv.mkDerivation for Therapist wrapper
2018-09-09 06:59:58 +00:00
Morgan Jones
870f05c975
Fix dangling DFHack "Git:" version text
2018-09-09 06:59:58 +00:00
Morgan Jones
fe847fcc92
Therapist needs to depend on the DF version, since it uses its MD5
2018-09-09 06:59:58 +00:00
Morgan Jones
7a5521537a
Let the user override dfVersion in dwarf-fortress-full
2018-09-09 06:59:58 +00:00
Morgan Jones
f14d3b4795
Fix dfhack's Dwarf Fortress MD5 in the correct environment
2018-09-09 06:59:41 +00:00
Morgan Jones
4ada74e293
dwarf-fortress: Support multiple unfuck/dfhack/TWBT versions
2018-09-09 06:59:41 +00:00
John Ericson
2c2f1e37d4
reewide: Purge all uses stdenv.system
and top-level system
...
It is deprecated and will be removed after 18.09.
2018-08-30 17:20:32 -04:00
Herwig Hochleitner
da9da8defd
dwarf-fortess: make 0.44.12 the default version
...
all necessary support packages seem to have caught up
cc @matthewbauer @Baughn @volth
2018-08-17 12:48:59 +02:00
volth
52f53c69ce
pkgs/*: remove unreferenced function arguments
2018-07-21 02:48:04 +00:00
volth
87f5930c3f
[bot]: remove unreferenced code
2018-07-20 18:48:37 +00:00
Herwig Hochleitner
5c2ccd13a3
dwarf-fortress: re-include stonesense fix
...
This partially reverts commit dfc4744afd
.
cc @matthewbauer
2018-07-14 14:24:35 +02:00
Herwig Hochleitner
9125e448df
dwarf-fortress.dwarf-therapist: restore DwarfTherapist program
2018-07-14 14:24:35 +02:00
Matthew Bauer
3108f1eeaf
Merge remote-tracking branch 'Baughn/nix-df' into dwarf-fortress
2018-07-09 16:24:21 -04:00
Matthew Bauer
812b0ec62e
dwarf-fortress: recurse into themes
...
Now the output of “nix-env” should be:
$ nix-env -qa -f . -A dwarf-fortress-packages
afro-graphics-44.10
autoreiv-44.03
cla-44.xx-v25
dwarf-fortress-0.43.05
dwarf-fortress-0.44.05
dwarf-fortress-0.44.09
dwarf-fortress-0.44.10
dwarf-fortress-0.44.11
dwarf-fortress-0.44.12
dwarf-therapist-40.1.0
gemset-44.10a
ironhand-44.10
jolly-bastion-44.10
legends-browser-1.17.1
mayday-44.10
obsidian-44.10
phoebus-44.10
rally-ho-44.10
soundsense-2016-1_196
spacefox-44.10a
taffer-44.10a
tergel-44.03
wanderlust-44.10
2018-07-09 16:18:17 -04:00
Matthew Bauer
530427c7ab
dwarf-fortress: refactors
...
This will make it easier for people to access old versions.
You can now access attributes like:
- dwarf-fortress_0_44_11
- dwarf-fortress_0_43_05
- etc.
2018-07-09 16:13:52 -04:00
Matthew Bauer
cdd0ac7e54
dwarf-fortress: support older versions as well
...
game.json now contains a dictionary of old game hashes. I have added
them for the last 3 releases.
- add script to generate hashes
Makes it much easier to update game.json file.
- add updateScript meta
This adds some info on the ./update.sh updateScript now available.
- cleanup updateScript
- Add some more systems
- Correctly detect source extensions (.zip or .tar.bz2)
- Proper bash quoting
- fix update.sh
- correctly detect latest df version
- append to game.json instead of overwriting it
- update hashes for 44.12
2018-07-09 16:13:53 -04:00
Matthew Bauer
aba6a3d7f4
dwarf-fortress: use fetchFromGitHub directly
...
This avoids creating a second derivation to copy things from the
original. The new themes are now fixed output.
2018-07-05 17:25:07 -04:00
Svein Ove Aas
b0c7245ee5
dwarf-fortress: Add "lazy pack", config flags and some comments.
2018-07-05 20:48:52 +01:00
Svein Ove Aas
5012ce727a
dwarf-fortress: Init TWBT at 6.46
2018-07-05 20:21:59 +01:00
Matthew Bauer
a4c9492217
Merge pull request #43057 from Baughn/nix-df
...
dwarf-fortress: Run legends-browser with a suitable working directory
2018-07-05 00:10:13 -04:00
Svein Ove Aas
472d8dcb91
dwarf-fortress: Run legends-browser with a suitable working directory
2018-07-05 00:39:28 +01:00
Matthew Bauer
ea6b31b496
Merge pull request #43043 from Baughn/nix-df
...
dwarf-fortress: Fix themes & package Legends Browser
2018-07-04 17:41:06 -04:00
Svein Ove Aas
c8095af0cd
dwarf-fortress: Init Legends Browser at 1.17.1
2018-07-04 22:26:23 +01:00
Svein Ove Aas
8c7461a348
dwarf-fortress: Don't check for dfVersion compatability on themes, which lack them.
2018-07-04 20:19:24 +01:00
Matthew Bauer
dcea211084
dwarf-fortress: cleanup
2018-07-02 11:59:36 -04:00
Morgan Jones
8d5b5fa68e
Patch dwarf-fortress-unfuck to build in debug (pending upstream fix)
2018-07-01 20:28:59 +00:00
Morgan Jones
9a2898c6d1
bump dwarf-therapist and dfhack versions; fix theme issue
2018-06-30 23:29:29 +00:00
Morgan Jones
24f4711705
dwarf-fortress: 0.44.10 -> 0.44.11
...
Update everything but dfhack and dwarf-therapist, which
have not been updated yet.
2018-06-30 23:25:27 +00:00
Matthew Bauer
97e8bcc925
dwarf-therapist: supports darwin
2018-06-10 19:23:11 -04:00
Matthew Bauer
7170ab8433
dfhack: add SDL to buildInputs
2018-06-10 19:23:11 -04:00
Matthew Bauer
8f89f81b62
dfhack: add submodules
2018-06-10 19:23:11 -04:00
Orivej Desh
24786e1249
dwarf-therapist: fix build
...
Update for dfc4744afd
.
2018-06-07 09:09:25 +00:00
Matthew Bauer
dfc4744afd
dwarf-fortress: 44.09 → 44.10
2018-06-06 19:19:29 -04:00
Matthew Bauer
91184d159d
dwarf-fortress: move themes to .json file
...
This will make it easier to automate.
2018-06-06 19:19:29 -04:00
Matthew Bauer
2dc8831591
dwarf-fortress: revert to 44.09
...
Was at 44.10 but i have no way to test it on linux (and unsure how to
update dwarf-fortress-unfucked).
2018-05-11 00:00:40 -05:00
Matthew Bauer
236b89afeb
dwarf-fortress: supports darwin
2018-05-10 23:58:12 -05:00
Herwig Hochleitner
23aaf1cf97
dwarf-fortress: 0.44.05 -> 0.44.09
2018-04-21 14:57:44 +02:00
Nikolay Amiantov
2dfbef2764
dfhack: fix checksum
...
Fixes #36819 .
2018-03-13 01:06:47 +03:00
Nikolay Amiantov
986ea06036
dwarf-fortress-packages.dwarf-therapist: disable on AArch64
...
The game works only on x86 anyway.
2018-03-09 16:35:10 +03:00
Vladimír Čunát
565bd805e6
Merge branch 'master'
2018-03-05 14:53:27 +01:00
Nikolay Amiantov
c0f79b44ee
dwarf-fortress-packages.dwarf-therapist: 39.2.0 -> 39.2.1
2018-02-25 22:24:09 +03:00
Nikolay Amiantov
00ad7c0c7b
dwarf-fortress-packages.dfhack: 0.44.05-alpha1 -> 0.44.05-r2
2018-02-25 22:24:09 +03:00
Alexander V. Nikolaev
0acec7e984
treewide: transition mesa to libGLU_combined
2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev
8f2a22935c
treewide: transition from mesa_noglu to libGL
2018-02-24 17:03:46 +02:00
Herwig Hochleitner
8924e84daa
dwarf-fortress: 0.44.03 -> 0.44.05
2018-01-22 02:16:47 +01:00
Herwig Hochleitner
c36ebca240
dwarf-fortress: 0.44.02 -> 0.44.03
2017-12-30 14:52:50 +01:00
Herwig Hochleitner
d29cee773c
dwarf-fortress: 0.43.05 -> 0.44.02
...
dwarf-therapist: 37.0.0-Hello71 -> 39.0.0
dfhack: 0.43.05-r1 -> 0.44.02-alpha1
cla-theme: 43.05-v23 -> 44.01-v24
phoebus-theme: 43.05c -> 44.02a
There is a new maintained repository for
dwarf-therapist: http://www.bay12forums.com/smf/index.php?topic=168411
dfhack is still in alpha, so make backups, if you use it.
cc @the-kenny @abbradar
2017-12-11 20:41:38 +01:00
Herwig Hochleitner
bccd410e78
dwarf-fortress-packages.stoneSense: remove vestigial package
...
To use stonesense, build dwarf-fortress with `enableDFHack=true` and
`enableStoneSense=true`, then type `ssense` into the dfhack console.
This partially reverts commit 85056ee698
2017-12-03 12:22:13 +01:00
Herwig Hochleitner
85056ee698
dwarf-fortress-packages.dfhack: add stoneSense support
2017-10-28 14:55:25 +02:00
Herwig Hochleitner
24ea093806
dwarf-fortress-packages.soundSense: init 2016-1_196
2017-10-28 14:55:20 +02:00
Herwig Hochleitner
d6ee81e912
dwarf-fortress-packages.dwarf-therapist: update for df 43.05
...
Similar to the LNP, we use Hello71's fork, which features support for
the (first 64bit) version 43.05 of Dwarf Fortress.
http://dffd.bay12games.com/file.php?id=12762
2017-10-28 14:55:16 +02:00
Silvan Mosberger
f5fa5fa4d6
pkgs: refactor needless quoting of homepage meta attribute ( #27809 )
...
* pkgs: refactor needless quoting of homepage meta attribute
A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.
* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit
* Fixed some instances
2017-08-01 22:03:30 +02:00
Nikolay Amiantov
342b987b19
dwarf-fortress-packages.dfhack: 0.43.05-r1 -> 0.43.05-r2
2017-07-27 17:07:44 +03:00
Nick Hu
24156c64b4
dfhack: 0.43.05-alpha4 -> 0.43.05-r1
2017-06-26 10:18:55 +01:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake
2017-06-18 08:41:57 -05:00
Nikolay Amiantov
1809cb56e1
dwarf-fortress-packages.dfhack: 0.43.05-alpha2 -> 0.43.05-alpha4
2017-01-31 03:27:10 +03:00