Commit Graph

14211 Commits

Author SHA1 Message Date
Alyssa Ross
ed209e6279 clang_15: mark hardeningUnsupportedFlags fortify3
Port of 74ea4fe24f ("llvm*Packages.clang: mark
hardeningUnsupportedFlags fortify3").
2023-02-28 10:53:33 +00:00
github-actions[bot]
51c18e4be1
Merge staging-next into staging 2023-02-28 06:01:38 +00:00
Robert Hensing
359a46e751 llvm*: Remove outputSpecified workaround where possible
The effect of `.out // { outputSpecified = false; }` in these cases
is to select the default output explicitly, but then make the
selection implicit until `overrideAttrs` is called. Previously
`overrideAttrs` would not preserve output selection, masking the
apparently unnecessary behavior of this workaround.

For `libllvm-polly`, this logic does not apply, as it does not
select the default output.

The `outputSpecified` workaround was introduced in
https://github.com/NixOS/nixpkgs/pull/122554

and was perhaps rushed because of a release deadline, and expected
delays from mass rebuilds.

The change in `overrideAttrs` behavior was added in
5b2f597b11 / https://github.com/NixOS/nixpkgs/pull/211685

and the problem was discovered in https://github.com/NixOS/nixpkgs/pull/218537,
which may contain further information.
2023-02-28 00:34:00 +00:00
github-actions[bot]
387a5e220d
Merge staging-next into staging 2023-02-28 00:03:08 +00:00
Weijia Wang
647a7f0eea
Merge pull request #218684 from wegank/orc-gcc12
orc: fix build with gcc12 on aarch64-linux
2023-02-28 00:37:35 +02:00
Weijia Wang
e825a158dc orc: fix build with gcc12 on aarch64-linux 2023-02-27 23:47:08 +02:00
figsoda
70f0b88566
Merge pull request #218372 from figsoda/scryer
scryer-prolog: replace patch with environment variable, clean up
2023-02-27 13:38:45 -05:00
Alyssa Ross
60a2f64123 llvmPackages_git: switch to using ninja
Port of 912056c71e ("llvmPackages_15: switch to using `ninja`").
2023-02-27 16:11:48 +00:00
Alyssa Ross
fe1c338510 llvmPackages_git: expand the NIX_BUILD_CORES arg passed to lit at configure time
Port of 4d3857d6ed ("llvmPackages_15: expand the `NIX_BUILD_CORES`
arg passed to lit at configure time").
2023-02-27 16:11:48 +00:00
Alyssa Ross
4040a6d131 llvmPackages_git.compiler-rt: fix Glibc build
Copied from LLVM 15.
2023-02-27 10:56:20 +00:00
Alyssa Ross
e731fba414 llvmPackages_git.compiler-rt: fix armv7l patch
Use the same patch as compiler-rt 15.
2023-02-27 10:56:20 +00:00
github-actions[bot]
288c9d7892
Merge staging-next into staging 2023-02-27 06:01:44 +00:00
Robert Scott
9157b0d978
Merge pull request #218207 from LeSuisse/mruby-3.2.0
mruby: 3.1.0 -> 3.2.0
2023-02-27 00:52:29 +00:00
Alyssa Ross
1e26d33371 clang_15: add nostdlibinc flag
Port of 44165d3657 ("llvmPackages_{14, git}.clang: add nostdlibinc flag")
to Clang 15.  It was originally thought this wasn't needed[1], but it is,
to fix expressions like the following:

	with import ./. {};

	llvmPackages_15.libcxxStdenv.mkDerivation {
	  name = "libcxx-stdenv-c++-test";

	  dontUnpack = true;

	  input = ''
	    #include <cstdlib>

	    int main() {
	        std::abort();
	        return 0;
	    }
	  '';
	  passAsFile = [ "input" ];

	  installPhase = ''
	    $CXX -c -o $out -x c++ $inputPath
	   '';
	}

[1]: https://github.com/NixOS/nixpkgs/pull/194634#issue-1398202534
2023-02-26 13:40:24 +00:00
Alyssa Ross
eb2eafd2af clang_13,clang_14,clang_git: deduplicate patch
The same patch applies to all Clang versions using it.
2023-02-26 13:40:24 +00:00
github-actions[bot]
de3f71e277
Merge staging-next into staging 2023-02-26 06:02:30 +00:00
github-actions[bot]
399e2c78d4
Merge master into staging-next 2023-02-26 06:01:09 +00:00
Winter
3d0de0e8c8 gcc12: fix building foreign toolchain on aarch64-darwin
It seems that the patchset we apply to get some fixes for aarch64-darwin
support [0] breaks in unexpected ways when compiling a foreign toolchain [1].
Luckily, according to the branch's author, the patchset isn't required
for merely using aarch64-darwin as the build system [2], so let's only apply
it when hostPlatform == aarch64-darwin to fix cross.

[0]: https://github.com/iains/gcc-12-branch
[1]: https://github.com/iains/gcc-12-branch/issues/18
[2]: https://github.com/iains/gcc-12-branch/issues/18#issuecomment-1435792834
2023-02-26 00:48:03 -05:00
figsoda
515b3009c1 scryer-prolog: replace patch with environment variable, clean up
https://github.com/NixOS/nixpkgs/pull/217084 plans to migrate Rust packages to use `importCargoLock`, but the migration script cannot handle `cargoPatches`: https://github.com/NixOS/nixpkgs/pull/217084#discussion_r1111253151
2023-02-25 23:41:51 -05:00
Jan Tojnar
9bb986284f Merge branch 'staging-next' into staging
# Conflicts:
#	pkgs/development/python-modules/mdp/default.nix
#	pkgs/top-level/python-aliases.nix
2023-02-26 01:13:37 +01:00
github-actions[bot]
348549a031
Merge master into staging-next 2023-02-26 00:02:44 +00:00
Winter
d5dc3d17f3 rustc: re-enable parallel building
We previously disabled this based on a now-closed issue from 2015 [0].
I think enough time has passed that we can give it a shot again, given
that the in the worst case scenario we revert, and in the best case
scenario we get a performance boost.

[0]: https://github.com/rust-lang/rust/issues/30181
2023-02-26 09:09:35 +10:00
Norbert Melzer
d6f93d07b4
Merge pull request #210627 from wizeman/u/fix-fstar 2023-02-25 22:03:46 +01:00
github-actions[bot]
52a11b56f9
Merge master into staging-next 2023-02-25 18:01:03 +00:00
Benjamin Asbach
546f356db6 remove myself as maintainer for now as I switched to another distro 2023-02-25 18:56:02 +01:00
Thomas Gerbet
dfacfebe23 mruby: 3.1.0 -> 3.2.0
https://github.com/mruby/mruby/blob/3.2.0/NEWS

Fixes:
- CVE-2022-0080
- CVE-2022-0240
- CVE-2022-0326
- CVE-2022-0631
- CVE-2022-0481
- CVE-2022-0525
- CVE-2022-0570
- CVE-2022-0614
- CVE-2022-0623
- CVE-2022-0630
- CVE-2022-0631
- CVE-2022-0632
- CVE-2022-0717
- CVE-2022-0890
- CVE-2022-1106
- CVE-2022-1212
- CVE-2022-1276
- CVE-2022-1286
- CVE-2022-1934
2023-02-25 11:33:48 +01:00
Sergei Trofimovich
504c4fdc34
Merge pull request #217977 from amjoseph-nixpkgs/pr/gcc/fix-plugin-order-assertion
gcc: fix implication order in assertion
2023-02-25 08:40:28 +00:00
Jan Tojnar
a8122ef792
Merge pull request #217733 from jtojnar/vala
vala: 0.56.3 → 0.56.4
2023-02-25 01:56:07 +01:00
github-actions[bot]
78fc07ec20
Merge master into staging-next 2023-02-25 00:02:47 +00:00
Samuel Ainsworth
d24dde7f6c
Merge pull request #217367 from ConnorBaker/feat/cudaFlags-arch-rewrite
cudaFlags: rewrite to capture all architectures and fix NixOS#215436
2023-02-24 17:31:11 -05:00
Weijia Wang
4333d4f1e6
Merge pull request #215338 from r-ryantm/auto-update/llvmPackages_rocm.llvm
llvmPackages_rocm.llvm: 5.4.2 -> 5.4.3
2023-02-24 20:46:43 +02:00
github-actions[bot]
13fb68e8cf
Merge staging-next into staging 2023-02-24 12:01:52 +00:00
github-actions[bot]
2384cd723b
Merge master into staging-next 2023-02-24 12:01:20 +00:00
Adam Joseph
86a0e46ed4 gcc: fix implication order in assertion
In 6812dd98c4 I mistakenly had the
implication order reversed.  This commit corrects that mistake.

The original assertion (which is correct) was the following, which
asserts that if you enable the GDB plugin, you must enable plugins
generally (there is shared infrastructure):

```
assert enableGdbPlugin -> enablePlugin;
```

When the option name was changed to `disableGdbPlugin`, I
incorrectly wrote:

```
assert disableGdbPlugin -> enablePlugin;
```

And then again incorrectly wrote:

```
assert disableGdbPlugin -> !enablePlugin;
```

This commit uses the correct equivalent for the first statement,
which is the contrapositive:

```
assert !enablePlugin -> disableGdbPlugin;
```
2023-02-23 22:54:49 -08:00
Ryan Mulligan
7e91be2022 scala: fix updatescript evaluation 2023-02-23 21:27:01 -08:00
github-actions[bot]
6a1e9345c0
Merge staging-next into staging 2023-02-24 05:07:48 +00:00
github-actions[bot]
baa8a3d30c
Merge master into staging-next 2023-02-24 05:07:16 +00:00
Alyssa Ross
f9afd57302 Revert "llvmPackages_15: update licenses"
This reverts commit 386aba3115.

As I understand it from reading
<https://llvm.org/docs/DeveloperPolicy.html#copyright-license-and-patents>,
the structure of LLVM licensing is as follows:

 - They're in the process of relicensing to Apache-2.0 WITH LLVM-exception,
   but they haven't got permission to relicense all the code yet.
   This means that some of the code can be used under the new license,
   but not all of it, and it's difficult to know which is which.  This
   license is therefore probably not useful yet, until the relicensing
   effort is commit.

 - While the relicensing effort is ongoing, code being contributed to
   LLVM has to have permission to be used under the old and new
   licensing schemes.  Since the new licensing scheme can't be used
   for all code yet, it only makes sense to use LLVM's code under the
   old licensing scheme at the moment.

 - The old licensing scheme is that code for the LLVM components we
   care about is all available under the NCSA license, and some
   components are optionally available under a different license,
   usually the MIT license, instead.

So I think we should go back to just listing NCSA, or NCSA/MIT, and
forget about the new license until it actually becomes useful,
i.e. LLVM's relicensing effort is complete.
2023-02-24 00:06:46 +00:00
Connor Baker
dddc103fdb cudaFlags: rewrite to capture all architechtures and fix #215436 2023-02-23 16:34:12 -05:00
github-actions[bot]
3cdd771820
Merge staging-next into staging 2023-02-23 18:01:49 +00:00
github-actions[bot]
4688cd53b6
Merge master into staging-next 2023-02-23 18:01:15 +00:00
Alyssa Ross
7ce8e7c4cf lib.licenses.asl20-llvm: replace llvm-exception
LLVM-exception only makes sense when used with the Apache 2.0 license,
so let's combine them, so it's not possible to forget one of them like
happened with llvm_15.
2023-02-23 17:42:15 +00:00
Alyssa Ross
52c286ee5b
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/libraries/pmdk/default.nix
2023-02-23 13:51:34 +00:00
Alyssa Ross
af0078a3dd llvmPackages_git.bintools: fix eval
Was probably missed because llvmPackages_git is only evaluated as an
alias.

Fixes: cdb39a86e0 ("treewide: use optionalString")
2023-02-23 13:14:08 +01:00
Bernardo Meurer
42008a14a4
Merge pull request #217206 from Artturin/stdenvimprovements1 2023-02-23 12:07:47 +00:00
Sergei Trofimovich
6812dd98c4
Merge pull request #216237 from amjoseph-nixpkgs/pr/gcc/enableGdbPlugin
gcc/common: add disableGdbPlugin option
2023-02-23 07:35:57 +00:00
github-actions[bot]
36f198081c
Merge staging-next into staging 2023-02-23 06:01:36 +00:00
github-actions[bot]
010946fcbd
Merge master into staging-next 2023-02-23 06:01:03 +00:00
Samuel Ainsworth
dc3ac9dc42
Merge pull request #217322 from ConnorBaker/cudatoolkit-prune-broken-symlinks
cudatoolkit: prune broken symlinks in `postFixup`
2023-02-22 22:42:42 -05:00
Adam Joseph
24b07fc9e5 gcc/common: add disableGdbPlugin option
This commit adds an option `disableGdbPlugin` which controls whether
or not the plugin *for* GDB will be built.  This plugin contains a
copy of `gcc`.

The configure flag that this option controls is called
`--disable-libcc1`.  This flag name is slightly confusing: it is
used only by GDB (and apparently unmaintained), yet the flag name
does not mention GDB.  This is why the option name is different from
the configure flag name.

The primary motivation for this commit is to allow the following PR
(which is not yet merged) to pass `--disable-libcc1` when building
the final native (build=host=target) compiler as part of the stdenv
bootstrap:

  https://github.com/NixOS/nixpkgs/pull/209870

We need to `--disable-libcc1` in this scenario because gcc's build
machinery links `libcc1` against the `libstdc++` that is part of the
*compiler used to compile gcc*, rather than against the `libstdc++`
that is built *by* gcc.  In an FHS distribution this distinction is
not terribly important because dynamically linked libraries are
late-bound (ld.so resolution).  However in nixpkgs this causes a
reference back to the bootstrapFiles to leak all the way through to
the final stdenv.

More details can be found in the comment in
`pkgs/stdenv/linux/default.nix` of the PR linked above.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-02-22 19:30:34 -08:00