Commit Graph

94 Commits

Author SHA1 Message Date
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
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
caryoscelus
83851c6b24
cataclysm-dda-git: remove incompatible patches, bump git. 2024-07-29 23:33:45 +00:00
Sigmanificient
512e8afdb9 treewide: remove unused occurence of stdenv (and other) arguments
format (will squash)
2024-07-14 04:32: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
Vladimír Čunát
ddc361cfca
Merge #287594: glibc: 2.38-44 -> 2.39-5
...into staging
2024-03-24 06:41:49 +01:00
Maximilian Bosch
91d85fb0e6
cataclysm-dda: fix build w/ glibc-2.39
Failing Hydra build: https://hydra.nixos.org/build/252068803
2024-03-22 22:55:27 +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
detroyejr
19efe422f0 cataclysm-dda: Patch cataclysm-dda and cataclysm-dda-git.
Release 0.G needs 3 patches to build successfully with gcc 13. These can
be removed after the next release.

[patch] disable dangling reference warning
[patch] fix build with gcc 13
[patch] cleanup autogenerated prefix.h
2024-01-28 21:13:53 -05:00
Mika Feiler
a8f393e6c1 cataclysmDDA: update mods: mirror github user
SomeDeadGuy/UndeadPeopleTileset disappeared from GitHub, replaced with jmz-b/UndeadPeopleTileset who mirrored it
2023-11-26 16:48:42 +02:00
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
Francesco Gazzetta
db7401360a maintainers: remove skeidel
* Has been inactive for over 3 years
  https://github.com/svenkeidel?tab=overview&from=2020-12-01&to=2020-12-31&org=NixOS
* Is not responsive
  https://github.com/NixOS/nixpkgs/pull/249917
2023-11-11 19:28:45 +00:00
Artturin
780669daf5 treewide: don't hardcode /nix/store (no rebuilds changes)
improve experience for other store locations
2023-03-24 20:11:33 +02:00
Felix Buehler
d10e69c86b treewide: deprecate isNull
https://nixos.org/manual/nix/stable/language/builtins.html#builtins-isNull
2023-03-06 22:40:04 +01:00
D Anzorge
7eccc156c1 cataclysm-dda: 0.F-3 -> 0.G
Release announcement: https://cataclysmdda.org/releases/#0g-gaiman
Changelog: https://github.com/CleverRaven/Cataclysm-DDA/blob/0.G/data/changelog.txt
2023-03-01 21:27:45 +01:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d treewide: use toString on list NIX_CFLAGS_COMPILE
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
Fabián Heredia Montiel
0cf5d85f0c treewide: add gcc12 flags 2023-01-27 21:20:52 -06:00
Raphael Robatsch
69c8907545 cataclysm-dda: fix build 2022-09-13 19:55:22 +02:00
Sally Gordon
ad8041c08c
cataclysm-dda-git: 2021-07-03 -> 2022-08-20 (#187209)
Co-authored-by: Have a good time <i@niconiconi.xyz>
2022-08-21 02:31:45 +02:00
D Anzorge
b9b7c80f7a cataclysm-dda: update locale path patch 2022-08-17 01:10:37 +02:00
Rick van Schijndel
941458e0b9 cataclysm-dda-git: mark broken on x86_64-darwin 2022-05-29 10:56:04 +02:00
Jonathan Ringer
3af9faf36d
Merge pull request #133431 from Ma27/glibc-2.34
glibc: 2.33-108 -> 2.34-115
2022-02-27 18:07:11 -08:00
Maximilian Bosch
82580b1518
cataclysm-dda: fix eval
No idea why this breaks now, but let's see if that's sufficient to make
ofborg happy.
2022-02-27 20:02:04 +01:00
Maximilian Bosch
6320b7240f
cataclysm-dda: fix build w/glibc-2.34
* Enable parallel building to speed up the build-time.
* Disable tests as vendored catch2 doesn't compile against glibc 2.34
  and I couldn't get the tests to run in the sandbox.

Failing Hydra build: https://hydra.nixos.org/build/163952121
2022-02-27 10:27:01 +01:00
André-Patrick Bubel
eec72b56d7
cataclysm-dda: enable parallel building (#161957) 2022-02-27 08:43:56 +02:00
D Anzorge
973c3e8411 cataclysm-dda: 0.F-2 -> 0.F-3 2021-11-29 22:04:42 +01:00
D Anzorge
7d8d6e8e40 cataclysm-dda: 0.F-1 -> 0.F-2 2021-08-31 18:41:34 +02:00
D Anzorge
98af443596 cataclysm-dda: 0.F -> 0.F-1 2021-08-19 01:06:38 +02:00
D Anzorge
27b3e0ab56 cataclysm-dda-git: 2020-12-09 -> 2021-07-03 2021-07-04 18:50:58 +02:00
D Anzorge
5f298b119a cataclysm-dda: 0.E-3 -> 0.F 2021-07-04 18:50:58 +02:00
sophrosyne97
1372b429cc cataclysm-dda-git: 2019-11-22 -> 2020-12-09 2021-05-16 15:44:54 -07:00
Sandro
e355946df1
Merge pull request #103546 from mnacamura/cdda-small-fix 2021-04-12 16:31:01 +02: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
freezeboy
e8cc6535cc cataclysm-dda: 0.E-2 -> 0.E-3 2020-12-27 21:41:39 +01:00
Mitsuhiro Nakamura
0c02a5599c cataclysmDDA: add utility function attachPkgs 2020-11-12 11:54:42 +09:00
Mitsuhiro Nakamura
19deef39c7 cataclysmDDA: refactoring 2020-11-12 10:13:19 +09:00
Mitsuhiro Nakamura
109adedd62 cataclysmDDA: filter out things that do not have for{Tiles,Curses} attrs 2020-11-12 10:12:30 +09:00
Mitsuhiro Nakamura
f2b2347b29 doc: add section for cataclysm-dda 2020-07-18 14:23:25 +09:00
Mitsuhiro Nakamura
cf0e2d51ac cataclysmDDA: update mods 2020-07-18 14:23:25 +09:00
Mitsuhiro Nakamura
fbf4b4f5ed cataclysmDDA: update README
Add description about `useXdgDir` flag
2020-07-18 14:23:24 +09:00
Mitsuhiro Nakamura
bbe7b86eea cataclysmDDA: launch the wrapped program 2020-07-18 14:23:24 +09:00
Mitsuhiro Nakamura
d472eed4b5 cataclysmDDA: add README 2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura
633f211113 cataclysm-dda-git: make it overridable with git revision
'cataclysm-dda-git.overrideAttrs (_: { version = ...; src = fetchFromGitHub { ... }; })'
did not update VERSION make flag correctly.

With this change, one can override 'cataclysm-dda-git' correctly and
more easily:

cataclysm-dda-git.override { version = ...; rev = ...; sha256 = ...; }
2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura
ecf7b57e12 cataclysm-dda{,-git}: support build with USE_XDG_DIR flag 2020-07-18 14:23:23 +09:00
Mitsuhiro Nakamura
de56294e57 cataclysm-dda{,-git}: clean up 2020-07-18 14:23:22 +09:00
Mitsuhiro Nakamura
90c265275f cataclysmDDA: make pkgs extensible
Example:

let
  customMods = self: super: lib.recursiveUpdate super {
    soundpack.AwesomeSounds = cataclysmDDA.buildSoundPack { ... };
  };
in
cataclysm-dda.withMods (mods: with mods.extend customMods; [
  tileset.UndeadPeople
  soundpack.AwesomeSounds
])
2020-07-18 14:23:22 +09:00
Mitsuhiro Nakamura
bc88844e68 cataclysmDDA: add UndeadPeople tileset 2020-07-18 14:23:22 +09:00