Commit Graph

631 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
github-actions[bot]
3b1652aad3
Merge master into staging-next 2024-09-08 18:04:04 +00:00
lassulus
895300b938
bundlerUpdateScript: make updates architecture agnostic (#328296) 2024-09-08 16:16:10 +01:00
github-actions[bot]
4420fe8b58
Merge staging-next into staging 2024-08-28 12:05:53 +00:00
Wolfgang Walther
050689db30
treewide: fix pg_config / postgresql headers moved to dev output
This was supposed to happen in #294504, but the commit was accidentally
left out when splitting off some libpq-related changes. Originated in
#179962, by Sandro.

Co-authored-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
2024-08-24 15:44:10 +02:00
Kimat Boven
60dad75a8d rubyPackages.standard: init at 1.40.0 2024-08-20 20:36:28 +02:00
Sigmanificient
63d05d989e pkgs/development: remove unused arguments 2024-08-03 17:18:20 +02:00
zimbatm
ec7188d73d bundix: move to by-name 2024-07-31 09:10:32 +02:00
Randy Eckenrode
3d7db28279
Merge pull request #330053 from reckenrode/ruby-package-fixes 2024-07-30 09:30:38 -04:00
Randy Eckenrode
1aa9412f3e
rubyPackages.libxml-ruby: fix build on Darwin
Darwin’s libiconv has separate outputs for the dylib and headers, so it needs to use `lib.getLib` and `lib.getDev`.
2024-07-25 22:08:31 -04:00
Randy Eckenrode
2536713f70
rubyPackages.iconv: fix build on Darwin
Darwin’s libiconv has separate outputs for the dylib and headers, so it needs to use `lib.getLib` and `lib.getDev`.
2024-07-25 22:08:31 -04:00
Randy Eckenrode
e1d14f12b1
rubyPackages.hpricot: fix build with clang 16 2024-07-25 22:08:30 -04:00
Randy Eckenrode
5a5fda7a90
rubyPackages.gtk3: fix build on Darwin and Linux
- Add missing Ruby dependency (cairo); and
- Add missing build input (lerc).
2024-07-25 22:08:30 -04:00
Randy Eckenrode
0164c884bf
rubyPackages.curses: fix build with clang 16 2024-07-25 22:08:29 -04:00
Anthony Roussel
c18dca3b4f
bundler: 2.5.15 -> 2.5.16
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.16
2024-07-20 12:32:20 +02:00
Randy Eckenrode
d5f637590e
tree-wide: enable LTO on Darwin 2024-07-20 03:19:54 -04:00
Robert James Hernandez
3acaae9509 bundlerUpdateScript: remove old gemset.nix and Gemfile.lock before updating 2024-07-19 00:02:50 +00:00
Robert James Hernandez
3b3cf8194c bundlerUpdateScript: force bundler to use ruby platform 2024-07-18 23:52:45 +00:00
Anthony Roussel
af6690a771
bundler: 2.5.11 -> 2.5.15
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.12
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.13
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.14
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.15
https://github.com/rubygems/rubygems/compare/bundler-v2.5.11...bundler-v2.5.15
2024-07-12 18:28:20 +02:00
Ivan Trubach
4dec9be42a
buildRubyGem: do not override fixupPhase (#323587)
Oops, looks like we were overriding stdenv’s fixupPhase that runs
fixupOutputHooks, including patchShebangsAuto.
2024-07-05 19:29:51 +02:00
Artturin
897e070df7
Merge pull request #270242 from tie/ruby-cross
ruby-modules: improve cross-compilation support
2024-06-26 01:37:12 +03:00
Winter
2de1fd60fc
Revert "rust: Write config.toml not config" 2024-06-23 12:32:29 -04:00
Manuel Mendez
3f7663c1d7 rust: Write to .cargo/config.toml instead of .cargo/config
Seeing the following new warnings pop up on stderr when cargo was bumped
to 1.78:

```
warning: `/build/.cargo/config` is deprecated in favor of `config.toml`
note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`
```

which happens to break commitmsgfmt builds in nix (#320294).

closes #320294
2024-06-19 14:56:51 -04:00
Artturin
c47aaa6439
Merge pull request #317076 from amarshall/bundlerenv-passthru
bundlerEnv: Fix passthru not being passed-through
2024-06-18 20:36:46 +03:00
Leona Maroni
c4cb6eb3c9
Merge pull request #315851 from LeSuisse/v8-mark-vulnerable
v8: mark vulnerable, move dependents to `nodejs.libv8`
2024-06-17 10:15:09 +02:00
Andrew Marshall
f299debaac bundlerEnv: Fix passthru not being passed-through
E.g. `pkgs.bundlerEnv { passthru = { ... }; ... }` previously would not
result in the `passthru` attrs not being concatenated onto the returned
derivation. Now it will be.
2024-06-03 23:41:29 -04:00
Ivan Trubach
aa8b17baf3 buildRubyGem: do not patch shebangs in non-existent directory 2024-06-03 21:14:44 +03:00
github-actions[bot]
f7de25c01e
Merge master into staging-next 2024-06-01 12:01:11 +00:00
Andrew Marshall
90f635947f
buildRubyGem: Include platform in suffix for non-Ruby platforms (#299909)
This adheres to how Bundler handles such gems. We must also adjust the
generated URL to use this full suffix.
2024-06-01 09:31:10 +02:00
Thomas Gerbet
826cc7fa1c rubyPackages.libv8: use nodejs.libv8 2024-05-30 11:53:55 +02:00
Anthony Roussel
cd2d05a399
bundler: 2.5.10 -> 2.5.11 2024-05-29 11:09:09 +02:00
Ivan Trubach
30971173ab ruby-modules: improve cross-compilation support 2024-05-28 21:07:20 +03:00
github-actions[bot]
a73d2d9b62
Merge staging-next into staging 2024-05-24 12:01:26 +00:00
Sigmanificient
203a48ad35 pkgs/development: remove unused fetchpatch arguments 2024-05-24 02:53:57 +02:00
Mario Rodas
0ad21db5a5
Merge pull request #308871 from anthonyroussel/update-bundler
bundler: 2.5.9 -> 2.5.10, ruby.rubygems: 3.5.9 -> 3.5.10
2024-05-16 00:30:38 -05:00
annalee
c3d54620fd
rubyPackages_3_{2,3}.nokogiri: add libxml2 to darwin buildInputs; unbreak
fix build failure on darwin:

```
checking for xmlParseDoc() in -lxml2... no
checking for xmlParseDoc() in -llibxml2... no
checking for libxml-2.0 using `pkg_config`... no
Please install either the `pkg-config` utility or the `pkg-config` rubygem.
checking for xmlParseDoc() in -lxml2... no
checking for xmlParseDoc() in -llibxml2... no
-----
extconf.rb:295:in `ensure_package_configuration'
extconf.rb:704:in `<main>'
xml2 is missing. Please locate mkmf.log to investigate how it is failing.
```
2024-05-13 12:09:08 +00:00
Anthony Roussel
0a0b584cde
bundler: 2.5.9 -> 2.5.10
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.10
2024-05-03 21:15:05 +02:00
Jan Tojnar
eb04659fc2 treewide: wrapGAppsHook → wrapGAppsHook3
This was achieved using the following command:

    sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')

And then manually reverted the following changes:

- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
2024-04-27 02:23:22 +02:00
Vladimír Čunát
d157c07324
Merge branch 'master' into staging-next 2024-04-25 20:43:34 +02:00
github-actions[bot]
d0efe40740
Merge master into staging-next 2024-04-25 06:01:20 +00:00
Kamilla Ova
8782f915ff
rubyPackages.seccomp-tools: init at 1.6.1 2024-04-24 17:09:16 +03:00
Mario Rodas
2becf6e837 maintainers: drop marsam 2024-04-24 04:20:00 +00:00
Anthony Roussel
b571ed6c5c
bundler: 2.5.7 -> 2.5.9
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.9
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.8
2024-04-12 19:00:23 +02:00
github-actions[bot]
bd2d42a4f8
Merge staging-next into staging 2024-03-26 06:01:43 +00:00
Philip Taron
73b8a831f9
Avoid top-level with ...; in pkgs/development/ruby-modules/bundled-common/default.nix 2024-03-25 18:12:29 -07:00
Anthony Roussel
55876e02de
bundler: 2.5.6 -> 2.5.7
https://github.com/rubygems/rubygems/releases/tag/bundler-v2.5.7
2024-03-24 21:51:40 +01:00
Yaya
135cf4f8f9 gitlab: 16.8.1 -> 16.9.2
https://gitlab.com/gitlab-org/gitlab/-/blob/v16.8.2-ee/CHANGELOG.md
https://gitlab.com/gitlab-org/gitlab/-/blob/v16.9.2-ee/CHANGELOG.md

Fixes CVE-2023-6386
Fixes CVE-2023-6840
Fixes CVE-2024-0199
Fixes CVE-2024-1066
Fixes CVE-2024-1250
Fixes CVE-2024-1299

Co-Authored-By: ajs124 <git@ajs124.de>
2024-03-19 13:47:55 +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
Sergei Trofimovich
70a827d91b rubyPackages.ovirt-engine-sdk: drop upstreamed patch
Without the change build fails on` master` as
https://hydra.nixos.org/build/249503515:

    Running phase: patchPhase
    applying patch /nix/store/9f30k5j6jdmdycfxxkir2vv4zqhfvpvd-b596b919bc7857fdc0fc1c61a8cb7eab32cfc2db.patch
    patching file ext/ovirtsdk4c/ov_http_request.c
    Reversed (or previously applied) patch detected!  Assume -R? [n]
    Apply anyway? [n]
    Skipping patch.
2024-02-25 12:01:56 +00:00
github-actions[bot]
40b6ee19fc
Merge staging-next into staging 2024-02-12 06:01:21 +00:00