Commit Graph

104 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
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03: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
Yueh-Shun Li
385d523a8e treewide: handle preInstallPhases __structuredAttrs-agnostically
Always specify the preInstallPhases attribute as a list instead of a
string.

Append elements to the preInstallPhases Bash variable using appendToVar
instead of string or Bash array concatenation.
2024-09-03 05:33:59 +08:00
R. Ryantm
2180848756 gnustep.gorm: 1.3.1 -> 1.4.0 2024-08-05 06:02:57 +00:00
Vladimír Čunát
64c6a981fe
Merge branch 'master' into staging-next 2024-07-27 09:18:58 +02:00
Randy Eckenrode
5eb1cba085
gnustep.libobjc2: 2.1 -> 2.2.1
https://github.com/gnustep/libobjc2/releases/tag/v2.2
https://github.com/gnustep/libobjc2/releases/tag/v2.2.1
2024-07-26 08:11:00 -04:00
Marco Rebhan
6a4a325e33
gnustep.back: 0.30.0 -> 0.31.0 2024-06-19 21:45:56 +02:00
R. Ryantm
d20d33daac
gnustep.gui: 0.30.0 -> 0.31.1 2024-06-19 21:45:56 +02:00
Alexis Hildebrandt
f8c4a98e8e treewide: Remove the definite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"([Tt]he)? ' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Tt]he (.)/\1\U\2/'
2024-06-09 23:08:46 +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
R. Ryantm
cbf30c16c9 gnustep.make: 2.9.1 -> 2.9.2 2024-05-31 11:35:47 +00: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
Marco Rebhan
4d3910b480
gnustep: replace custom builder with hooks 2024-03-03 20:15:34 +01:00
R. Ryantm
2e07f636f2 gnustep.gui: 0.29.0 -> 0.30.0 2023-11-22 18:59:13 +00:00
Weijia Wang
7dbcb7ebdb gnustep.gui: fix build 2023-11-20 18:24:51 +01:00
Weijia Wang
9627659c22 Merge branch 'master' into staging-next 2023-11-04 17:27:09 +01:00
R. Ryantm
c0a5910229 gnustep.make: 2.9.0 -> 2.9.1 2023-11-04 09:16:30 -07:00
R. Ryantm
32bda178aa gnustep.back: 0.29.0 -> 0.30.0 2023-11-04 09:05:58 -07:00
K900
7ad8b0552a gnustep.base: 1.28.0 -> 1.29.0
Fixes build on staging-next.
2023-11-03 07:10:01 +03:00
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into

    builtins.derivation {
      builder = stdenv.shell;
      args = [ "-e" builder ];
    }

This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].

Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:

* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
  Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
  (see previous commit for more context), so prefer the environment
  variable if possible.

* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
  can happen.

* If neither applies, it can be assumed that `__structuredAttrs` is
  turned off and thus nothing needs to be done.

[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
    it can point to a wrong location on older Nix versions with a bug in
    `__structuredAttrs`.
2023-10-04 18:36:57 +02:00
Vladimír Čunát
2fda37fb1a
gnustep.base: patch build after libxml2 update
https://hydra.nixos.org/build/228323615/nixlog/1/tail
2023-07-20 11:21:54 +02:00
Felix Buehler
6672dde558 treewide: use optionalAttrs instead of 'else {}' 2023-06-25 11:01:34 -03:00
R. Ryantm
1d2fe316ae gnustep.gorm: 1.2.28 -> 1.3.1 2023-05-20 08:51:20 +00:00
Weijia Wang
fea3fca22f
Merge pull request #222886 from wegank/gnustep-builder
gnustep: allow overriding preConfigure in gsmakeDerivation
2023-03-24 16:15:23 +02:00
Weijia Wang
462484d4a7 gnustep.projectcenter: 0.6.2 -> 0.7.0 2023-03-24 15:07:56 +02:00
Weijia Wang
4c7c8a68a0 gnustep.make: allow overriding preConfigure in gsmakeDerivation 2023-03-24 13:55:26 +02:00
Sergei Trofimovich
092d57c076 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
    pkgs/development/tools/language-servers/ansible-language-server/default.nix
2022-12-28 09:35:37 +00:00
Artturin
d78711a3e1 gnustep.base: use multiple outputs and support multiple outputs in hook
had to move the installFlagsArray in preInstallPhases so that ${!outputX} work because they're set by the multiple-output hook

unar before:
closure size 1.4G

unar after:
closure size 138.9M
2022-12-25 21:10:43 +02:00
Artturin
c01f509e44 treewide: source .attrs in builders
if theres a source $stdenv then this is needed

for structuredAttrs
2022-12-08 21:09:02 +02:00
Sergei Trofimovich
50ae212cb4 gnustep.back: use xorg.* packages directly instead of xlibsWrapper indirection
Validated as no change in `out` output with `diffoscope`.
2022-12-03 20:21:25 +00:00
ajs124
2bde19199e gnustep.libobjc: 1.9 -> 2.1
the problems that we saw with sogo and 2.0 seem fixed with 2.1
2022-10-13 21:55:13 +02:00
Artturin
7db9cda1b5 gnustep.make: fix cross 2022-07-14 22:08:56 +03:00
Artturin
6a249036fb gnustep.gsmakeDerivation: fix cross eval
error: attribute 'runtimeShell' missing
2022-07-14 22:08:56 +03:00
Zhu Zihao
21c2e9d069
gnustep.base: Remove duplicated giflib input 2022-06-01 10:24:15 +08:00
Rick van Schijndel
7a68548822
treewide: pkgs/desktops: mark broken for darwin 2022-05-30 13:42:58 +02:00
R. Ryantm
8d0a25ddb0 gnustep.gworkspace: 0.9.4 -> 1.0.0 2022-02-12 20:58:16 -08:00
ajs124
c2ed098285 gnustep.base: fix issue with UTF-8 BOM 2022-01-03 19:33:35 +01:00
Victor Engmark
57b496ea98 misc: Replace tab indentation with spaces
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
R. RyanTM
76c78e82b7 gnustep.back: 0.28.0 -> 0.29.0 2021-07-19 08:30:45 +00:00
R. RyanTM
4ceb485837 gnustep.gorm: 1.2.26 -> 1.2.28 2021-07-05 18:52:47 +02:00
ajs124
2db931fb49 gnustep.gorm: align with other packages 2021-07-05 18:52:28 +02:00
ajs124
3fe546a5d2 gnustep.back: 0.28.0 -> 0.29.0
https://github.com/gnustep/libs-back/releases/tag/back-0_29_0
2021-07-05 18:52:27 +02:00
ajs124
91c28faa93 gnustep.gui: 0.28.0 -> 0.29.0
https://github.com/gnustep/libs-gui/releases/tag/gui-0_29_0
2021-07-05 18:52:26 +02:00
ajs124
35ef05ce92 gnustep.base: 1.27.0 -> 1.28.0
https://github.com/gnustep/libs-base/releases/tag/base-1_28_0
2021-07-05 18:52:25 +02:00
R. RyanTM
99509cff29 gnustep.make: 2.8.0 -> 2.9.0
https://github.com/gnustep/tools-make/releases/tag/make-2_9_0
2021-07-05 18:52:25 +02:00
R. RyanTM
dd60bd3422 gnustep.make: 2.8.0 -> 2.9.0 2021-05-17 14:01:02 -07:00
Alyssa Ross
f8db5c60f3 giflib_4_1: remove
Everything still using this builds fine without it.
2021-04-16 14:06:10 +00:00
Alyssa Ross
6e3b5fd046 libungif: remove in favour of giflib
libungif was merged into giflib in 2006, and hasn't been updated
since.  All non-broken packages still using it build fine with giflib.

See <http://giflib.sourceforge.net/history.html>.
2021-04-16 14:06:10 +00:00
ajs124
f179f7c25c gnustep.gui: fix icu 68 compatibility 2021-03-01 14:28:20 +01:00