nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43860 from volth/unused2

Browse Source 
treewide: remove unused 'inherit' in let blocks
This commit is contained in:
Frederik Rietdijk 2018-07-21 11:13:36 +02:00 committed by GitHub
commit 251a0a9a86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 45 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/attrsets.nix
View File

@ -3,9 +3,9 @@
let
inherit (builtins) head tail length;
inherit (lib.trivial) and or;
inherit (lib.trivial) and;
inherit (lib.strings) concatStringsSep;
inherit (lib.lists) fold concatMap concatLists all deepSeqList;
inherit (lib.lists) fold concatMap concatLists;
in
rec {

2
lib/composable-derivation.nix
View File

@ -1,5 +1,5 @@
{lib, pkgs}:
let inherit (lib) nv nvs; in
let inherit (lib) nvs; in
{
# composableDerivation basically mixes these features:

5
lib/customisation.nix
View File

@ -1,9 +1,4 @@
{ lib }:
let
inherit (builtins) attrNames;
in
rec {

2
lib/types.nix
View File

@ -8,7 +8,7 @@ with lib.trivial;
with lib.strings;
let
inherit (lib.modules) mergeDefinitions filterOverrides;
inherit (lib.modules) mergeDefinitions;
outer_types =
rec {
isType = type: x: (x._type or "") == type;

2
nixos/modules/programs/tmux.nix
View File

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }:
let
inherit (lib) mkOption mkEnableOption mkIf mkMerge types;
inherit (lib) mkOption mkIf types;
cfg = config.programs.tmux;

2
nixos/modules/security/pam_usb.nix
View File

@ -4,8 +4,6 @@ with lib;
let
inherit (pkgs) pam_usb;
cfg = config.security.pam.usb;
anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services);

2
nixos/modules/services/hardware/udev.nix
View File

@ -4,8 +4,6 @@ with lib;
let
inherit (pkgs) stdenv writeText procps;
udev = config.systemd.package;
cfg = config.services.udev;

2
nixos/modules/services/monitoring/uptime.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
let
inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional;
inherit (lib) mkOption mkEnableOption mkIf mkMerge types optional;
cfg = config.services.uptime;

2
nixos/modules/services/network-filesystems/openafs/lib.nix
View File

@ -1,7 +1,7 @@
{ config, lib, pkgs, ...}:
let
inherit (lib) concatStringsSep getBin mkOption types;
inherit (lib) concatStringsSep mkOption types;
in rec {

2
nixos/modules/services/network-filesystems/openafs/server.nix
View File

@ -4,7 +4,7 @@
with import ./lib.nix { inherit config lib pkgs; };
let
inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types;
inherit (lib) concatStringsSep mkIf mkOption optionalString types;
bosConfig = pkgs.writeText "BosConfig" (''
restrictmode 1

2
nixos/modules/services/networking/chrony.nix
View File

@ -4,8 +4,6 @@ with lib;
let
inherit (pkgs) chrony;
stateDir = "/var/lib/chrony";
keyFile = "/etc/chrony.keys";

2
nixos/modules/services/system/kerberos.nix
View File

@ -2,7 +2,7 @@
let
inherit (lib) mkOption mkIf singleton;
inherit (lib) mkOption mkIf;
inherit (pkgs) heimdalFull;

2
nixos/modules/services/system/nscd.nix
View File

@ -7,8 +7,6 @@ let
nssModulesPath = config.system.nssModules.path;
cfg = config.services.nscd;
inherit (lib) singleton;
in
{

2
nixos/modules/services/ttys/kmscon.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
let
inherit (lib) mkOption types mkIf optionalString;
inherit (lib) mkOption types mkIf;
cfg = config.services.kmscon;

2
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -7,7 +7,7 @@ let
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.plasma5;
inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5;
in

2
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View File

@ -8,7 +8,7 @@ let
ldmcfg = dmcfg.lightdm;
cfg = ldmcfg.greeters.gtk;
inherit (pkgs) stdenv lightdm writeScript writeText;
inherit (pkgs) writeText;
theme = cfg.theme.package;
icons = cfg.iconTheme.package;

2
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -13,7 +13,7 @@ let
wmDefault = xcfg.windowManager.default;
hasDefaultUserSession = dmDefault != "none" || wmDefault != "none";
inherit (pkgs) stdenv lightdm writeScript writeText;
inherit (pkgs) lightdm writeScript writeText;
# lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup
xserverWrapper = writeScript "xserver-wrapper"

1
nixos/modules/services/x11/window-managers/openbox.nix
View File

@ -2,7 +2,6 @@
with lib;
let
inherit (lib) mkOption mkIf;
cfg = config.services.xserver.windowManager.openbox;
in

1
nixos/modules/services/x11/window-managers/wmii.nix
View File

@ -2,7 +2,6 @@
with lib;
let
inherit (lib) mkOption mkIf singleton;
cfg = config.services.xserver.windowManager.wmii;
wmii = pkgs.wmii_hg;
in

2
pkgs/applications/audio/sonata/default.nix
View File

@ -2,7 +2,7 @@
, python3Packages, gnome3, gtk3, gobjectIntrospection}:
let
inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2;
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
in buildPythonApplication rec {
pname = "sonata";
version = "1.7b1";

2
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -64,8 +64,6 @@ let
version = chromium.browser.version;
inherit (stdenv.lib) versionAtLeast;
in stdenv.mkDerivation {
name = "chromium${suffix}-${version}";
inherit version;

3
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -11,8 +11,7 @@
assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath
makeSearchPath optional optionalString;
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
version = "2.2.128200.0702";
srcs = {

2
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -15,7 +15,7 @@
, runCommand }:
let
inherit (pythonPackages) python pycrypto pync;
inherit (pythonPackages) python;
plugins = [
{ name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
{ name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }

3
pkgs/applications/science/logic/acgtk/default.nix
View File

@ -4,8 +4,7 @@
installExamples ? true,
installEmacsMode ? true }:
let inherit (stdenv.lib) versionAtLeast
optionals optionalString; in
let inherit (stdenv.lib) versionAtLeast optionalString; in
let inherit (ocamlPackages) ocaml camlp4; in

2
pkgs/applications/science/math/sage/default.nix
View File

@ -3,7 +3,7 @@
}:
let
inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x;
inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x;
# https://trac.sagemath.org/ticket/15980 for tracking of python3 support
python = nixpkgs.python2.override {

2
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
let
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
in buildPythonApplication rec {
name = "git-cola-${version}";
version = "3.1";

2
pkgs/build-support/build-maven.nix
View File

@ -17,7 +17,7 @@ infoFile: let
${lib.concatStrings (map (dep: let
inherit (dep)
url sha1 groupId artifactId version
authenticated metadata extension repository-id;
authenticated metadata repository-id;
versionDir = dep.unresolved-version or version;

2
pkgs/development/beam-modules/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, pkgs, erlang }:
let
inherit (stdenv.lib) getVersion versionAtLeast makeExtensible;
inherit (stdenv.lib) makeExtensible;
lib = pkgs.callPackage ./lib.nix {};

2
pkgs/development/beam-modules/lib.nix
View File

@ -49,7 +49,6 @@ rec {
*/
callElixir = drv: args:
let
inherit (stdenv.lib) versionAtLeast;
builder = callPackage ../interpreters/elixir/generic-builder.nix args;
in
callPackage drv {
@ -71,7 +70,6 @@ rec {
*/
callLFE = drv: args:
let
inherit (stdenv.lib) versionAtLeast;
builder = callPackage ../interpreters/lfe/generic-builder.nix args;
in
callPackage drv {

2
pkgs/development/compilers/go/1.10.nix
View File

@ -6,7 +6,7 @@
let
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv.lib) optionals optionalString;
clangHack = writeScriptBin "clang" ''
#!${stdenv.shell}

2
pkgs/development/compilers/go/1.9.nix
View File

@ -6,7 +6,7 @@
let
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv.lib) optionals optionalString;
clangHack = writeScriptBin "clang" ''
#!${stdenv.shell}

2
pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
View File

@ -2,7 +2,7 @@
let
useX11 = stdenv.isi686 || stdenv.isx86_64;
inherit (stdenv.lib) optionals optionalString;
inherit (stdenv.lib) optionals;
in
stdenv.mkDerivation rec {

3
pkgs/development/compilers/rust/binaryBuild.nix
View File

@ -6,8 +6,7 @@
}:
let
inherit (stdenv.lib) getLib optionalString;
inherit (darwin) libiconv;
inherit (stdenv.lib) optionalString;
inherit (darwin.apple_sdk.frameworks) Security;
bootstrapping = versionType == "bootstrap";

2
pkgs/development/haskell-modules/default.nix
View File

@ -11,7 +11,7 @@
let
inherit (lib) extends makeExtensible;
inherit (haskellLib) overrideCabal makePackageSet;
inherit (haskellLib) makePackageSet;
haskellPackages = pkgs.callPackage makePackageSet {
package-set = initialPackages;

1
pkgs/development/haskell-modules/hoogle.nix
View File

@ -28,7 +28,6 @@
}:
let
inherit (stdenv.lib) optional;
wrapper = ./hoogle-local-wrapper.sh;
isGhcjs = ghc.isGhcjs or false;
opts = lib.optionalString;

2
pkgs/development/libraries/blitz/default.nix
View File

@ -19,7 +19,7 @@
assert enableSerialization -> boost != null;
let
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation rec {

2
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -42,7 +42,7 @@
*/
let
inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32;
inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32;
inherit (stdenv.lib) optional optionals enableFeature;
cmpVer = builtins.compareVersions;

2
pkgs/development/libraries/freetype/default.nix
View File

@ -10,7 +10,7 @@
}:
let
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv.lib) optional optionalString;
in stdenv.mkDerivation rec {
name = "freetype-${version}";

2
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -12,7 +12,7 @@
assert gtkSupport -> gtk3 != null;
let
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation rec {
name = "gst-plugins-good-1.14.0";

2
pkgs/development/libraries/libav/default.nix
View File

@ -18,7 +18,7 @@
assert faacSupport -> enableUnfree;
let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in
let inherit (stdenv.lib) optional hasPrefix enableFeature; in
/* ToDo:
- more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools

2
pkgs/development/libraries/libgsf/default.nix
View File

@ -1,8 +1,6 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
, python, perl, gdk_pixbuf, libiconv, libintl }:
let inherit (stdenv.lib) optionals; in
stdenv.mkDerivation rec {
name = "libgsf-1.14.42";

2
pkgs/development/libraries/libvpx/default.nix
View File

@ -41,7 +41,7 @@
}:
let
inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
inherit (stdenv) is64bit isMips isDarwin isCygwin;
inherit (stdenv.lib) enableFeature optional optionals;
in

3
pkgs/development/libraries/opendbx/default.nix
View File

@ -1,8 +1,5 @@
{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
let
inherit (stdenv.lib) getDev getLib;
in
stdenv.mkDerivation rec {
name = "opendbx-1.4.6";

3
pkgs/development/libraries/science/math/liblapack/default.nix
View File

@ -11,8 +11,7 @@ let
atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
else null;
usedLibExtension = if shared then ".so" else ".a";
inherit (stdenv.lib) optional optionals concatStringsSep;
inherit (builtins) hasAttr attrNames;
inherit (stdenv.lib) optional optionals;
version = "3.8.0";
in

2
pkgs/development/python-modules/pandas/0.17.1.nix
View File

@ -23,7 +23,7 @@
}:
let
inherit (stdenv.lib) optional optionalString concatStringsSep;
inherit (stdenv.lib) optional optionalString;
inherit (stdenv) isDarwin;
in buildPythonPackage rec {
pname = "pandas";

2
pkgs/development/python-modules/pandas/default.nix
View File

@ -24,7 +24,7 @@
}:
let
inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv) isDarwin;
in buildPythonPackage rec {

2
pkgs/development/tools/misc/binutils/default.nix
View File

@ -10,7 +10,7 @@ let
# https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
version = "2.30";
basename = "binutils-${version}";
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv.lib) optionals optionalString;
# The targetPrefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable.
targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";

2
pkgs/development/tools/misc/gdbgui/requirements.nix
View File

@ -11,7 +11,7 @@
let
inherit (pkgs) makeWrapper;
inherit (pkgs.stdenv.lib) fix' extends inNixShell;
inherit (pkgs.stdenv.lib) fix' extends;
pythonPackages =
import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" {

2
pkgs/development/tools/xcbuild/wrapper.nix
View File

@ -7,8 +7,6 @@
let
inherit (lib) toLower;
toolchainName = "com.apple.dt.toolchain.XcodeDefault";
sdkName = "${xcodePlatform}${sdkVer}";

3
pkgs/misc/vim-plugins/default.nix
View File

@ -14,8 +14,7 @@ let
_skim = skim;
inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
buildVimPluginFrom2Nix vimHelpTags;
inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
# TL;DR

3
pkgs/misc/vscode-extensions/default.nix
View File

@ -1,8 +1,7 @@
{ stdenv, lib, fetchurl, callPackage, vscode-utils }:
let
inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension
extensionFromVscodeMarketplace;
inherit (vscode-utils) buildVscodeMarketplaceExtension;
in
#
# Unless there is a good reason not to, we attemp to use the same name as the

2
pkgs/servers/coturn/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchFromGitHub, openssl, libevent }:
let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "coturn-${version}";
version = "4.5.0.7";

2
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -8,7 +8,7 @@ let # un-indented, over the whole file
result = if extraFeatures then wrapped-full else unwrapped;
inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
inherit (stdenv.lib) optional concatStringsSep;
unwrapped = stdenv.mkDerivation rec {
name = "knot-resolver-${version}";

2
pkgs/stdenv/native/default.nix
View File

@ -5,7 +5,7 @@
assert crossSystem == null;
let
inherit (localSystem) system platform;
inherit (localSystem) system;
shell =
if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"

2
pkgs/tools/X11/xpra/default.nix
View File

@ -9,7 +9,7 @@
with lib;
let
inherit (python2Packages) python cython buildPythonApplication;
inherit (python2Packages) cython buildPythonApplication;
in buildPythonApplication rec {
name = "xpra-${version}";
version = "2.3.2";

4
pkgs/tools/filesystems/sshfs-fuse/default.nix
View File

@ -2,9 +2,7 @@
, docutils
}:
let
inherit (stdenv.lib) optional;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
version = "3.4.0";
name = "sshfs-fuse-${version}";

2
pkgs/tools/graphics/graphviz/base.nix
View File

@ -7,7 +7,7 @@
assert stdenv.isDarwin -> ApplicationServices != null;
let
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv.lib) optionals optionalString;
in
stdenv.mkDerivation rec {

2
pkgs/tools/misc/findutils/default.nix
View File

@ -3,8 +3,6 @@
, buildPlatform, hostPlatform
}:
let inherit (stdenv.lib) optionals; in
stdenv.mkDerivation rec {
name = "findutils-4.6.0";

2
pkgs/tools/networking/spoofer/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute
, withGUI ? false, qt5 }:
let inherit (stdenv.lib) optional optionalString;
let inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {

2
pkgs/tools/system/ddrescue/default.nix
View File

@ -3,8 +3,6 @@
, hostPlatform, buildPlatform
}:
let inherit (stdenv.lib) optionals; in
stdenv.mkDerivation rec {
name = "ddrescue-1.23";