Commit Graph

237 Commits

Author SHA1 Message Date
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
Jörg Thalheim
7d751654ec
Merge branch 'master' into staging-next 2024-09-22 15:51:19 +02:00
Aleksana
7a4b840dd4
treewide: fix nixd warnings (#343155) 2024-09-22 21:26:45 +08:00
LuoChen
3af6010640
gimpPlugins.farbfeld: tidy up to fix nixd warnings 2024-09-20 10:03:11 +08:00
github-actions[bot]
73cf025711
Merge staging-next into staging 2024-09-17 12:05:50 +00:00
Sefa Eyeoglu
496c416b66 gimp: Fix AVIF/HEIC support
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-09-15 21:50:49 +01:00
Mathias Sven
f5cb564fa1 gimp: add libxslt for rebuilding menus XML files 2024-09-15 21:49:58 +01:00
Philip Taron
572baa788b
gcc: gcc_13 → gcc_14 (#340612)
@emilazy is co-responsible for choosing the merge this.
2024-09-12 15:21:00 -07:00
Fabián Heredia Montiel
a4145a81d1 treewide: add -Wno-error= due to compilation error with gcc_14 2024-09-11 01:44:17 -06:00
Yueh-Shun Li
21c0129841 treewide: handle prePhases __structuredAttrs-agnostically
Always specify the prePhases attribute as a list instead of a string.

Append elements to the prePhases Bash variable using appendToVar
instead of string or Bash array concatenation.
2024-09-03 05:33:59 +08:00
Jörg Thalheim
5356420466 treewide: remove unused with statements from maintainer lists
$ find -type f -name '*.nix' -print0 | xargs -P "$(nproc)" -0 sed -i \
  -e 's!with lib.maintainers; \[ *\];![ ];!' \
  -e 's!with maintainers; \[ *\];![ ];!'
2024-07-29 10:06:20 +08:00
Sigmanificient
2ee703dccb pkgs/applications: remove unused arguments 2024-07-26 11:36:49 +02:00
Jan Tojnar
e3a06d65ff gnome-themes-extra: Move from gnome scope to top-level
Upstream archived.
2024-07-01 08:26:49 +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
R. Ryantm
2fe3fbbfbf gimp: 2.10.36 -> 2.10.38 2024-05-03 13:01:38 +00:00
Sefa Eyeoglu
26013573a7
gimpPlugins.gap: patch ffmpeg to avoid asm error
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-04-13 20:55:22 +02:00
Sefa Eyeoglu
6814bef1ed
gimpPlugins.gap: 2.6.0 -> 2.6.0-unstable-2023-05-20
Fixes https://github.com/NixOS/nixpkgs/issues/294707

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-03-10 12:57:45 +01:00
Peder Bergebakken Sundt
f41aba3739 treewide: remove unreferenced patch files
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`
2023-12-01 06:11:20 +01:00
R. Ryantm
544c090c88 gimp: 2.10.34 -> 2.10.36 2023-11-18 11:50:19 +01:00
Marco Rebhan
6bc29b9931
gimp: Add desktopToDarwinBundle to generate bundle files 2023-04-25 22:47:24 +02:00
Jan Tojnar
4b023832f8 gimpPlugins.resynthesizer: Mark as broken for GIMP without Python 2 support 2023-03-17 15:22:12 +01:00
Jan Tojnar
69e4b68ae9 gimp: Expose Python 2 support 2023-03-17 15:22:12 +01:00
Jan Tojnar
ed923bb61d gimp: Use env attribute for environment variables
This is in preparation for __structuredAttrs.
2023-03-17 15:22:12 +01:00
Jan Tojnar
29638c4a7e gimp-with-plugins: Use consistent GIMP version
In case `gimp` attribute from `gimpPlugins` scope is overridden to something different than the top-level one.
2023-03-17 15:04:32 +01:00
Jan Tojnar
94f5d6e5c2 gimp: Switch to finalAttrs
This will keep the attributes consistent with overrides.
2023-03-17 14:50:47 +01:00
Jan Tojnar
c1a55b8249 gimp: 2.10.32 → 2.10.34
https://www.gimp.org/news/2023/02/27/gimp-2-10-34-released/
https://gitlab.gnome.org/GNOME/gimp/-/compare/GIMP_2_10_32...GIMP_2_10_34
2023-03-01 11:09:49 +01:00
Artturin
226e149145 treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional
env values must be strings
2023-02-22 21:23:05 +02: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
Felix Buehler
db348eb0d6 inormalize/minc-widgets/gimp-plugins: use pname & version 2023-02-12 22:21:44 +01:00
Sandro Jäckel
248a982a86
gimp: remove ? null from inputs 2022-11-30 14:40:05 +01:00
Fabián Heredia Montiel
d3b71d535c gimp: condition python2 behind new withPython argument 2022-11-29 19:38:59 -06:00
Jan Tojnar
8dd255b886 gimp: 2.10.30 → 2.10.32
https://www.gimp.org/news/2022/06/14/gimp-2-10-32-released/
2022-06-17 16:57:00 +02:00
Sergei Trofimovich
39f0317f03
Merge pull request #176940 from trofi/workaround-fno-common-for-gimpPlugins.waveletSharpen
gimpPlugins.waveletSharpen: add -fcommon workaround
2022-06-15 06:51:50 +00:00
Sergei Trofimovich
6fd94e9932 gimpPlugins.waveletSharpen: add -fcommon workaround
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here
2022-06-08 20:02:03 +01:00
Sergei Trofimovich
ac8d9e9e01 gimpPlugins.lqrPlugin: pull upstream fix for -fno-common toolchains
Without the change build fails on upstream gcc-10 as:

    ld: interface_aux.o:src/interface_aux.c:55: multiple definition of
      `dlg'; interface.o:src/interface.c💯 first defined here
2022-06-08 19:56:43 +01:00
Ilya Fedin
db228fed78 gimp: add pygtk dev output to build inputs 2022-06-02 15:09:47 +04:00
Samuel Gräfenstein
0c890f5866
treewide: remove samuelgrf from maintainers 2022-04-22 23:21:58 +02:00
Lassulus
91771f3b50
Merge pull request #163031 from samuelgrf/gimpPlugins.bimp-init-at-2.6
gimpPlugins.bimp: init at 2.6
2022-04-18 22:03:50 +01:00
Samuel Gräfenstein
10cdd65259 gimp-with-plugins: add meta.mainProgram 2022-03-18 15:18:26 +01:00
Samuel Gräfenstein
75669c90ab
gimpPlugins.bimp: init at 2.6
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2022-03-13 08:40:39 +01:00
Jan Tojnar
e6c3e3d394 gimp: 2.10.28 → 2.10.30
https://www.gimp.org/news/2021/12/21/gimp-2-10-30-released/
2021-12-26 15:21:20 +01:00
Sandro
48e11eb977
Merge pull request #148430 from jtojnar/gimp-texturize 2021-12-05 02:01:51 +01:00
Robert Scott
0abc16608d
Merge pull request #146778 from risicle/ris-gimp-darwin
gimp: re-enable tests on darwin
2021-12-03 19:10:32 +00:00
Jan Tojnar
ce494f547f gimpPlugins.texturize: 2.2.2017-07-28 → 2.2+unstable=2021-12-03
No longer broken, switched to Meson.
2021-12-03 13:49:03 +01:00
Robert Scott
a66592d763 gimpPlugins.fourier: fix build on clang 2021-11-20 16:58:04 -05:00
Robert Scott
ae4ab6a1b7 gimp: re-enable tests on darwin
pass for me on macos 10.15
2021-11-20 17:57:04 +00:00
Robert Scott
67c0df93ea gimp: fix build on darwin
despite us currently having a gtk2 without `GDK_OSX_BIGSUR` defined,
gimp have gone and spelt it `GDK_OSX_BIG_SUR` so define this
manually anyway
2021-11-20 16:48:52 +00:00
Jan Tojnar
8e2a0342dc gimp: 2.10.24 → 2.10.28
https://www.gimp.org/news/2021/09/18/gimp-2-10-28-released/
473b05ea3a/NEWS (L11)
2021-09-18 12:55:42 +02:00
Felix Buehler
148221d906 gimp-plugins: deprecate phases 2021-08-12 22:21:53 +02:00