Commit Graph

239 Commits

Author SHA1 Message Date
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Peder Bergebakken Sundt
527f81a7c2
dwarf-fortress-packages.themes: set license to unfree (#314372) 2024-09-17 01:05:01 +02:00
Felix Bühler
03c7f5b7a5
Merge pull request #323628 from Stunkymonkey/treewide-ls-remove
treewide: remove printed 'ls'
2024-07-18 00:47:45 +02:00
Morgan Jones
12789d6559
dfhack: 50.13-r2.1 -> 50.13-r3 2024-07-07 15:44:21 -07:00
Morgan Jones
37cd3a3f20
dwarf-fortress: remove unused dependencies 2024-07-07 15:39:31 -07:00
Morgan Jones
bcde7a9d68
dwarf-fortress: darwin libs 2024-07-07 15:39:30 -07:00
Morgan Jones
b0cf365258
dwarf-fortress: wrapper: fix Darwin compatibility 2024-07-07 15:39:30 -07:00
Morgan Jones
3b7edb3eed
dwarf-fortress: run postUnpack on darwin 2024-07-07 15:39:30 -07:00
Morgan Jones
880bea37bd
dwarf-fortress: fix eval on darwin 2024-07-07 15:39:30 -07:00
Morgan Jones
d2111b0cbb
dfhack: 50.13-r1.1 -> 50.13-r2.1 2024-07-07 15:39:26 -07:00
Felix Buehler
3a2073ec5b treewide: remove printed 'ls' 2024-07-03 23:08:14 +02:00
Paul Meyer
fbe8538aa1 treewide: remove jonringer as package maintainer
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
2024-06-25 09:16:56 +02:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
vieta
e40e703411 dwarf-fortress-packages.themes: set license to unfree 2024-05-24 22:31:32 +02:00
Morgan Jones
bbc4836a61
dwarf-therapist: remove texlive build-input 2024-05-05 23:43:16 -07:00
Morgan Jones
c2f77d2e09
dwarf-fortress: 50.12 -> 50.13
- dwarf-fortress: 50.12 -> 50.13
- dfhack: init 50.13-r1.1
- dwarf-therapist: 42.1.5 -> 42.1.6
2024-05-05 21:32:29 -07:00
Morgan Jones
e683c1658d
dwarf-fortress: dfhack: update to 50.12-r3 2024-04-11 20:09:06 -07:00
Morgan Jones
91899502a0
dwarf-fortress: address code review feedback 2024-04-11 20:05:50 -07:00
Morgan Jones
e73e690717
dwarf-fortress: update to 50 2024-04-11 20:05:50 -07:00
Morgan Jones
55b7756b7d
dwarf-fortress: df_permission: Renew permission from Tarn for v50
Get permission from Tarn to publish a v50 Dwarf Fortress in nixpkgs.
The last time we did this was in 2010. (moved to df_permission/2010)
2024-04-11 20:05:49 -07:00
Philip Taron
71488a1fb6 Avoid top-level with ...; in pkgs/games/dwarf-fortress/unfuck.nix 2024-03-31 00:42:56 +01:00
Philip Taron
7a546620b2 Avoid top-level with ...; in pkgs/games/dwarf-fortress/twbt/default.nix 2024-03-31 00:42:56 +01:00
Philip Taron
118bbb8bcc Avoid top-level with ...; in pkgs/games/dwarf-fortress/themes/default.nix 2024-03-31 00:42:56 +01:00
Philip Taron
1ed3d42bc1 Avoid top-level with ...; in pkgs/games/dwarf-fortress/lazy-pack.nix 2024-03-31 00:42:56 +01:00
Philip Taron
bb2713d671 Avoid top-level with ...; in pkgs/games/dwarf-fortress/game.nix 2024-03-31 00:42:56 +01:00
Philip Taron
751f1fc693 Avoid top-level with ...; in pkgs/games/dwarf-fortress/dfhack/default.nix 2024-03-31 00:42:56 +01:00
Philip Taron
8f49dedbcb Avoid top-level with ...; in pkgs/games/dwarf-fortress/default.nix 2024-03-31 00:42:56 +01:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +01:00
GetPsyched
ae6e632dcf
treewide: update meta.description to fit the guidelines 2024-01-12 21:38:16 +05:30
Adam Joseph
c7e0f6b905 treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries.  I reviewed all uses of
targetPlatform outside of pkgs/development/compilers and pkgs/stdenv
and replaced those which weren't involved in something which fits
these criteria.
2023-11-17 08:07:34 +00:00
Vincenzo Mantova
8ada8e2b25 dwarf-fortress: replace texlive.combine with texliveBasic.withPackages 2023-11-05 11:56:05 +00:00
Naïm Favier
c95192b996
jq: 1.6 -> 1.7
https://github.com/jqlang/jq/releases/tag/jq-1.7
2023-09-10 12:13:29 +02:00
Naïm Favier
2343d23c44
dwarf-fortress: unfuck unfuck 2023-02-22 13:03:53 +01:00
Naïm Favier
ac0d4f035f
dwarf-fortress: set PRINT_MODE:STANDARD on macOS
Fixes https://github.com/NixOS/nixpkgs/issues/204851
2023-01-24 13:55:01 +01:00
Naïm Favier
b33a7fa3fa
Merge pull request #201568 from ncfavier/df 2022-12-01 11:34:11 +01:00
Naïm Favier
34e0667b74
dwarf-fortress.dfhack: use CXXFLAGS instead of NIX_CFLAGS_COMPILE
See https://github.com/NixOS/nixpkgs/issues/79303.

Avoids warnings about -fpermissive not being a valid C flag.
2022-11-18 10:29:41 +01:00
Naïm Favier
a515239b52
dwarf-fortress,dwarf-fortress.dfhack: add ncfavier as maintainer 2022-11-17 09:50:53 +01:00
Naïm Favier
ab693c7592
dwarf-fortress.dfhack: drop broken versions
These versions don't build because their submodules use `git://` URLs,
which are no longer supported by GitHub.

I don't think there's a reasonable way to work around that since
`fetchgit` doesn't allow patching the source *before* fetching
submodules.
2022-11-17 09:50:53 +01:00
Naïm Favier
e786b3ec21
dwarf-fortress.dfhack: updates and fixes
Updates the release number for the latest two DF versions, and fixes some
older ones.

Notable change from 0.47.05-r7: dfhack.init was moved into
dfhack-config/init.

https://github.com/DFHack/dfhack/releases/tag/0.47.05-r7

https://github.com/DFHack/dfhack/releases/tag/0.47.04-r5
2022-11-17 09:50:52 +01:00
Naïm Favier
cff44486bc
dwarf-fortress: add settings
Adds a `settings` argument to the wrapper allowing to override settings
in `data/init/*.txt`.
2022-11-17 09:50:52 +01:00
Naïm Favier
839fdd101c
dwarf-fortress.dfhack: make overridable
Currently, it is quite hard to override anything about dfhack (for
example, to add plugins at build time), because

1. it is not exposed anywhere, so you have to do something like
   `dwarf-fortress.override (oldArgs: { dfhack = oldArgs.dfhack.override...; })`
2. the final `dfhack` derivation is a `buildEnv`, so `overrideAttrs`
   doesn't work as expected.

This fixes 1 by adding `dfhack` to the wrapper's `passthru`, and 2 by
moving `twbt.lib` (which is the only reason for the dfhack `buildEnv`)
into the wrapper.

Also adds an `extraPackages` argument to the wrapper, and copies `*.init`
files from the env to the DF directory so that we can easily add a
`dfhack.init`.

With these changes, I was able to build dfhack with the dfplex plugin.
2022-11-17 00:06:31 +01:00
Naïm Favier
22b96bfb35
dwarf-therapist: pass through meta 2022-11-16 12:21:34 +01:00
Naïm Favier
67aacbb937
dwarf-therapist: restrict platforms to x86
Avoid trying to build for aarch64 on Hydra. Dwarf Fortress only runs on x86.
2022-11-16 11:59:39 +01:00
Sandro Jäckel
bacd02c315
dwarf-fortress: misc cleanup 2022-10-27 18:57:12 +02:00
Sandro Jäckel
1d67cf2daf
dwarf-fortress-packages.dwarf-fortress: set meta for versioned packages 2022-10-27 18:56:34 +02:00
Sandro Jäckel
5b291004c5
dwarf-fortress: make meta.homepage independent from download page 2022-10-27 18:55:36 +02:00
Sandro Jäckel
cdfd73026a
dwarf-fortress-unfuck: don't overwrite to null on none linux platforms 2022-10-27 18:55:04 +02:00
Josef Kemetmüller
bcd7045998 treewide: Remove now-unneeded LD_LIBRARY_PATH in cmake derivations
Since the setting DCMAKE_SKIP_BUILD_RPATH was disabled, we can now run
the checkPhase of cmake derivations without having to tweak the
LD_LIBRARY_PATH anymore.
2022-07-04 03:49:01 +03:00
Robert Scott
3b6bc4b69c treewide: set sourceProvenance for packages containing downloaded jars
these are the easily identifiable cases and will not be comprehensive
2022-06-04 19:47:57 +01:00
Jonathan Ringer
075f25eb98 dwarf-fortress/dfhack: fix build with gcc 11 2022-04-30 11:00:41 -07:00