movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

llvmPackages: Remove dead code

Browse source 
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 4badff49fd

There are no uses of `@` therefore these changes are safe.
This commit is contained in:
Artturin 2023-11-21 02:05:15 +02:00
parent c1e1a583a0
commit b59fd202d7
24 changed files with 26 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/compilers/llvm/10/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake { lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
@ -20,7 +20,6 @@
let let
release_version = "10.0.1"; release_version = "10.0.1";
version = release_version; # differentiating these (variables) is important for RCs version = release_version; # differentiating these (variables) is important for RCs
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl { fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";

3
pkgs/development/compilers/llvm/10/libunwind/default.nix
View file

@ -1,5 +1,4 @@
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch { lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic
, enableShared ? !stdenv.hostPlatform.isStatic
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/development/compilers/llvm/11/clang/default.nix
View file

@ -1,4 +1,4 @@
{ 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 , buildLlvmTools
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? false , enableManpages ? false

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

@ -1,4 +1,4 @@
{ 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 , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD
}: }:

3
pkgs/development/compilers/llvm/11/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake { lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
@ -22,7 +22,6 @@ let
candidate = ""; # empty or "rcN" candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl { fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz"; url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";

3
pkgs/development/compilers/llvm/11/libunwind/default.nix
View file

@ -1,5 +1,4 @@
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch { lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic
, enableShared ? !stdenv.hostPlatform.isStatic
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

3
pkgs/development/compilers/llvm/12/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake { lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
@ -23,7 +23,6 @@ let
candidate = ""; # empty or "rcN" candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl { fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz"; url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";

2
pkgs/development/compilers/llvm/13/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake { lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross

2
pkgs/development/compilers/llvm/14/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake { lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross

2
pkgs/development/compilers/llvm/14/llvm/default.nix
View file

@ -25,7 +25,7 @@
# broken for the armv7l builder # broken for the armv7l builder
, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch , enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch
, enablePolly ? true , enablePolly ? true
} @args: }:
let let
inherit (lib) optional optionals optionalString; inherit (lib) optional optionals optionalString;

2
pkgs/development/compilers/llvm/15/compiler-rt/default.nix
View file

@ -9,7 +9,7 @@ let
useLLVM = stdenv.hostPlatform.useLLVM or false; useLLVM = stdenv.hostPlatform.useLLVM or false;
bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";
haveLibc = stdenv.cc.libc != null; haveLibc = stdenv.cc.libc != null;
inherit (stdenv.hostPlatform) isMusl isGnu; inherit (stdenv.hostPlatform) isMusl;
baseName = "compiler-rt"; baseName = "compiler-rt";

4
pkgs/development/compilers/llvm/15/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja { lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross

2
pkgs/development/compilers/llvm/15/llvm/default.nix
View file

@ -30,7 +30,7 @@
# broken for the armv7l builder # broken for the armv7l builder
&& !stdenv.hostPlatform.isAarch && !stdenv.hostPlatform.isAarch
, enablePolly ? true , enablePolly ? true
} @args: }:
let let
inherit (lib) optional optionals optionalString; inherit (lib) optional optionals optionalString;

2
pkgs/development/compilers/llvm/16/clang/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, llvm_meta { lib, stdenv, llvm_meta
, monorepoSrc, runCommand , monorepoSrc, runCommand
, substituteAll, cmake, ninja, libxml2, libllvm, version, python3 , cmake, ninja, libxml2, libllvm, version, python3
, buildLlvmTools , buildLlvmTools
, fixDarwinDylibNames , fixDarwinDylibNames
, enableManpages ? false , enableManpages ? false

2
pkgs/development/compilers/llvm/16/compiler-rt/default.nix
View file

@ -10,7 +10,7 @@ let
bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";
haveLibc = stdenv.cc.libc != null; haveLibc = stdenv.cc.libc != null;
isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic;
inherit (stdenv.hostPlatform) isMusl isGnu; inherit (stdenv.hostPlatform) isMusl;
baseName = "compiler-rt"; baseName = "compiler-rt";

4
pkgs/development/compilers/llvm/16/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja { lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross

3
pkgs/development/compilers/llvm/16/llvm/default.nix
View file

@ -2,7 +2,6 @@
, pkgsBuildBuild , pkgsBuildBuild
, monorepoSrc , monorepoSrc
, runCommand , runCommand
, fetchpatch
, cmake , cmake
, darwin , darwin
, ninja , ninja
@ -31,7 +30,7 @@
# broken for the armv7l builder # broken for the armv7l builder
&& !stdenv.hostPlatform.isAarch && !stdenv.hostPlatform.isAarch
, enablePolly ? true , enablePolly ? true
} @args: }:
let let
inherit (lib) optional optionals optionalString; inherit (lib) optional optionals optionalString;

4
pkgs/development/compilers/llvm/6/default.nix
View file

@ -1,5 +1,4 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs { lowPrio, newScope, pkgs, lib, stdenv, cmake, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
, targetLlvm , targetLlvm
@ -8,7 +7,6 @@
let let
release_version = "6.0.1"; release_version = "6.0.1";
version = release_version; # differentiating these is important for rc's version = release_version; # differentiating these is important for rc's
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl { fetch = name: sha256: fetchurl {
url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";

3
pkgs/development/compilers/llvm/7/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake { lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
@ -20,7 +20,6 @@
let let
release_version = "7.1.0"; release_version = "7.1.0";
version = release_version; # differentiating these is important for rc's version = release_version; # differentiating these is important for rc's
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl { fetch = name: sha256: fetchurl {
url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";

3
pkgs/development/compilers/llvm/8/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake { lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
@ -20,7 +20,6 @@
let let
release_version = "8.0.1"; release_version = "8.0.1";
version = release_version; # differentiating these is important for rc's version = release_version; # differentiating these is important for rc's
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl { fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";

3
pkgs/development/compilers/llvm/9/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake { lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross
@ -20,7 +20,6 @@
let let
release_version = "9.0.1"; release_version = "9.0.1";
version = release_version; # differentiating these is important for rc's version = release_version; # differentiating these is important for rc's
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl { fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";

3
pkgs/development/compilers/llvm/9/libunwind/default.nix
View file

@ -1,5 +1,4 @@
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch { lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic
, enableShared ? !stdenv.hostPlatform.isStatic
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/development/compilers/llvm/git/default.nix
View file

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja { lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja
, gccForLibs, preLibcCrossHeaders , preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross , buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross

2
pkgs/development/compilers/llvm/git/llvm/default.nix
View file

@ -29,7 +29,7 @@
# broken for the armv7l builder # broken for the armv7l builder
&& !stdenv.hostPlatform.isAarch && !stdenv.hostPlatform.isAarch
, enablePolly ? true , enablePolly ? true
} @args: }:
let let
inherit (lib) optional optionals optionalString; inherit (lib) optional optionals optionalString;