Commit b59fd202 authored by Artturin's avatar Artturin
Browse files

llvmPackages: Remove dead code 

for hygiene

Run `deadnix . --edit`

`gccForLibs` is an argument used by multi.nix but it's an argument to
cc-wrapper, not to llvmPackages.

`@args` in `llvm/default.nix` was accidentally added in 4badff49

There are no uses of `@` therefore these changes are safe.
parent c1e1a583

pkgs/development/compilers/llvm/10/default.nix

+1 −2
Original line number Diff line number Diff line 
{ lowPrio, newScope, pkgs, lib, stdenv, cmake

, gccForLibs, preLibcCrossHeaders

, preLibcCrossHeaders

, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -20,7 +20,6 @@ 
let

  release_version = "10.0.1";

  version = release_version; # differentiating these (variables) is important for RCs

  targetConfig = stdenv.targetPlatform.config;



  fetch = name: sha256: fetchurl {

    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";

pkgs/development/compilers/llvm/10/libunwind/default.nix

+1 −2
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch

, enableShared ? !stdenv.hostPlatform.isStatic

{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic

}:



stdenv.mkDerivation rec {

pkgs/development/compilers/llvm/11/clang/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, fetch, fetchpatch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3

{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3

, buildLlvmTools

, fixDarwinDylibNames

, enableManpages ? false

pkgs/development/compilers/llvm/11/compiler-rt/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt

{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libxcrypt

, doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD

}:

pkgs/development/compilers/llvm/11/default.nix

+1 −2
Original line number Diff line number Diff line 
{ lowPrio, newScope, pkgs, lib, stdenv, cmake

, gccForLibs, preLibcCrossHeaders

, preLibcCrossHeaders

, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross
@@ -22,7 +22,6 @@ let 
  candidate = ""; # empty or "rcN"

  dash-candidate = lib.optionalString (candidate != "") "-${candidate}";

  version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs

  targetConfig = stdenv.targetPlatform.config;



  fetch = name: sha256: fetchurl {

    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";