Commit Graph

450 Commits

Author SHA1 Message Date
piegames
ae207af82b treewide: More string indentation fixes
Follow-up on #350296 with the packages that cause big rebuilds and need
to go through staging.
2024-10-23 21:52:18 +02: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
R. Ryantm
8ebecaab83 bazel-buildtools: 7.1.2 -> 7.3.1 2024-08-28 00:25:12 +00:00
Sigmanificient
63d05d989e pkgs/development: remove unused arguments 2024-08-03 17:18:20 +02:00
Randy Eckenrode
f9b7f4ec09
tree-wide: use top-level cctools 2024-07-17 22:36:19 -04: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
Malte Poll
c429fa2ffa
bazel_7: 7.1.0 -> 7.1.2 (#314279)
* bazel_7: 7.1.0 -> 7.1.2

* bazel_7: update lockfiles

* bazel_7: upgrade lockfile format for versions > 3

The new lockfile format 6 drops the "name" attribute of each repoSpec.
See also: https://github.com/bazelbuild/bazel/pull/21026
This prevents the builder from effectively the deps using
requiredDepNamePredicate.
Instead, we now generate names from other metadata.
2024-06-03 13:34:49 +02:00
isabel
63aceac766 treewide: remove unused occurence of fetchFromGitHub argument 2024-05-30 05:56:07 +00:00
Uri Baghin
9e4fb3d71c
Merge pull request #313684 from r-ryantm/auto-update/bazel-remote
bazel-remote: 2.4.3 -> 2.4.4
2024-05-25 18:50:16 +08:00
Sigmanificient
203a48ad35 pkgs/development: remove unused fetchpatch arguments 2024-05-24 02:53:57 +02:00
R. Ryantm
3b70ff975d bazel-buildtools: 7.1.1 -> 7.1.2 2024-05-23 15:55:06 +00:00
R. Ryantm
51ab666cef bazel-remote: 2.4.3 -> 2.4.4 2024-05-22 13:30:17 +00:00
Mario Rodas
2becf6e837 maintainers: drop marsam 2024-04-24 04:20:00 +00:00
Mario Rodas
d97629acad
Merge pull request #295615 from Strum355/bazel-7.1.0
bazel: 7.0.2 -> 7.1.0
2024-04-24 22:54:42 -05:00
Mario Rodas
05d79f2aee
Merge pull request #283480 from avdv/bazel_6.5.0
bazel_6: 6.4.0 -> 6.5.0
2024-04-24 22:23:22 -05:00
R. Ryantm
582312a14d bazel-buildtools: 7.1.0 -> 7.1.1 2024-04-17 23:40:21 +00:00
Claudio Bley
78f4d9fb5c DBG: change name of tests so it is clear if hacks are enabled 2024-04-09 09:35:30 +02:00
Claudio
4f857cd1de bazel_6: Enable local networking for tests on Darwin 2024-04-08 16:40:32 +02:00
Claudio Bley
a75d0a734f bazel_6: Add sigtool and set up codesign allocate appropriately 2024-04-08 16:40:31 +02:00
Claudio
bb8574ddb8 bazel_6: Add patch for system sleep on Darwin
This re-uses the same patch as bazel_7 which indeed is also necessary here, since
otherwise building bazel_6 failed with

```
FATAL: CHECK failed: (success) == (0):
```

at d839db66ee/src/main/native/darwin/sleep_prevention_jni.cc (L39)
2024-04-08 16:40:31 +02:00
Claudio Bley
bccdc6751f bazel_6: Skip building the execlog parser on darwin
This currently fails with:
```
       > ERROR: /private/var/tmp/_bazel__nixbld1/e8e960336b6dc72b41250252f59936ca/external/remote_java_tools/java_tools/zlib/BUILD.bazel:18:11: Compiling java_tools/zlib/uncompr.c [for tool] failed: The include path '/nix/store/z0nnwdh4p692yvf3qgwgj3bn78w99q6y-python3-3.11.6/include' references a path outside of the execution root.
       > ERROR: /private/var/tmp/_bazel__nixbld1/e8e960336b6dc72b41250252f59936ca/external/remote_java_tools/java_tools/zlib/BUILD.bazel:18:11: Compiling java_tools/zlib/zutil.c [for tool] failed: The include path '/nix/store/z0nnwdh4p692yvf3qgwgj3bn78w99q6y-python3-3.11.6/include' references a path outside of the execution root.
       > Target //src/tools/execlog:parser_deploy.jar failed to build
```
2024-04-08 16:40:31 +02:00
Claudio Bley
6528de1a4f bazel_6: Add check to assert GSON serialization works
See https://github.com/NixOS/nixpkgs/issues/273500
2024-04-08 16:40:31 +02:00
Claudio Bley
7cb1b52dbf bazel_6: 6.4.0 -> 6.5.0 2024-04-08 16:40:31 +02:00
R. Ryantm
7c5c656be6 bazel-buildtools: 6.4.0 -> 7.1.0 2024-03-27 01:23:45 +00:00
Martin Weinelt
3321e63b12
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/sphinx-autobuild/default.nix
2024-03-19 04:00:32 +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
Noah Santschi-Cooney
1e01835f07
bazel: 7.0.2 -> 7.1.0 2024-03-13 16:35:36 +00:00
github-actions[bot]
339816cfdf
Merge staging-next into staging 2024-03-11 12:01:42 +00:00
a-n-n-a-l-e-e
ce789e7e35
llvmPackages_{12,13,14,15,16,17,git}.{libcxx,libcxxabi}: merge libcxxabi into libcxx (#292043)
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git.
- remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required.
- fixes https://github.com/NixOS/nixpkgs/issues/166205
- provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640
- pkgsCross.x86_64-freebsd builds work again

This change can be represented in 3 stages
1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi}
2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin}
3. remove all references to libcxxabi outside of llvm (about 58 packages modified)

### merging libcxxabi into libcxx
- take the union of the libcxxabi and libcxx cmake flags
- eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency
- libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx.
- darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient.
- linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient.
- libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+)
- git/libcxx/defaul.nix  does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway.

### stdenv changes
- darwin bootstrap, remove references to libcxxabi and cxxabi
- cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12)
- adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx

### 58 package updates
- remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed
- swift, nodejs_v8 remove libcxxabi references in the clang override

https://github.com/NixOS/nixpkgs/pull/292043
2024-03-11 03:53:37 -07:00
Weijia Wang
b2fc260cab bazel_4: drop 2024-03-10 23:48:37 +01:00
Noah Santschi-Cooney
ef302f8c2a
bazel: 7.0.0 -> 7.0.2 2024-02-01 14:15:34 +00:00
Uri Baghin
8c7c922cc7
Merge pull request #231839 from divanorama/bazel_watcher-0.23.1
bazel-watcher: 0.21.2 -> 0.23.1
2024-01-04 12:20:28 +08:00
Guillaume Maudoux
7916e168a8 fixup! bazel_7: Check-in the main lockfile 2023-12-31 15:19:12 +01:00
Guillaume Maudoux
e8e45bc82e bazel_7: Check-in the main lockfile 2023-12-31 14:04:38 +01:00
Guillaume Maudoux
87716d0622 bazel_7: fix remaining tests 2023-12-31 13:56:13 +01:00
Guillaume Maudoux
166e47c58b bazel_7: improve lockfile parsing 2023-12-31 12:27:55 +01:00
Guillaume Maudoux
bc3cba3845 bazel_7: Cleanup tests a bit 2023-12-28 15:00:40 +01:00
Guillaume Maudoux
bfbc35e0d0 fixup! bazel_7: backport bazel_6 bash fixes for remote execution 2023-12-18 21:00:20 +01:00
Guillaume Maudoux
2a4700c48b bazel_7: Add regression test for empty lockfiles 2023-12-18 20:09:34 +01:00
Guillaume Maudoux
eaa9b99502 fixup! bazel_7: backport bazel_6 bash fixes for remote execution 2023-12-18 20:09:07 +01:00
Guillaume Maudoux
1795976a32 bazel_7: Unse runJDK for runtime 2023-12-18 17:33:28 +01:00
Guillaume Maudoux
f35225d3d6 bazel_7: backport bazel_6 bash fixes for remote execution 2023-12-18 17:32:07 +01:00
Guillaume Maudoux
459e800b04 bazel_7: fix protobuf test on darwin 2023-12-14 13:11:19 +01:00
Guillaume Maudoux
a30a2c9f40 bazel_7: fix cpp-test with bzlmod, for linux 2023-12-14 12:25:19 +01:00
Guillaume Maudoux
0d222a3580 bazel_7: re-enable arc in xcode_locator command 2023-12-14 09:00:36 +01:00
Guillaume Maudoux
6d93cdd566 bazel_7: restore xcode_locator no-arc fix, still needed 2023-12-13 23:16:33 +01:00
Guillaume Maudoux
5fc2602a32 bazel_7: restore xcode_locator patch from no-arc patch 2023-12-13 22:55:00 +01:00
Guillaume Maudoux
f8eaea18b0 bazel_7: address most review comments 2023-12-13 22:48:28 +01:00
Guillaume Maudoux
2a92a2304a bazel_7: 7.0.0rc7 -> 7.0.0 2023-12-13 22:48:28 +01:00
Dmitry Ivankov
306e8eaf53 bazel_7: fix darwin compilation with CLang 16 & recent nixpkgs/master
Workaround for #166205 similar to
51451ac406

And warning fix similar to `bazel_6` fix for
```
external/upb~0.0.0-20220923-a547704/upb/mini_table.c:634:14: error: defining a type within '__builtin_offsetof' is a Clang extension [-Werror,-Wgnu-offsetof-extensions]
  UPB_ASSERT(UPB_ALIGN_OF(upb_StringView) ==
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
2023-12-13 22:48:28 +01:00