Merge pull request #46076 from oxij/tree/cleanups

trivial: treewide: random noop cleanups
This commit is contained in:
John Ericson 2018-09-05 15:14:12 -04:00 committed by GitHub
commit 32df8909e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 13 deletions

View file

@ -75,7 +75,7 @@ stdenv.mkDerivation {
preferLocalBuild = true;
inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin;
shell = getBin shell + stdenv.lib.optionalString (stdenv ? shellPath) stdenv.shellPath;
shell = getBin shell + shell.shellPath or "";
gnugrep_bin = if nativeTools then "" else gnugrep;
inherit targetPrefix infixSalt;

View file

@ -343,8 +343,8 @@ in
# Mainly avoid reference to bootstrap tools
allowedRequisites = with prevStage; with lib;
# Simple executable tools
concatMap (p: [ (getBin p) (getLib p) ])
[ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils
concatMap (p: [ (getBin p) (getLib p) ]) [
gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils
gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
]
# Library dependencies

View file

@ -81,6 +81,8 @@ mapAliases ({
dwarf_fortress = dwarf-fortress; # added 2016-01-23
emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
emacsMelpa = emacs25PackagesNg; # for backward compatibility
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18
enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25

View file

@ -6224,7 +6224,7 @@ with pkgs;
### SHELLS
runtimeShell = "${runtimeShellPackage}/bin/bash";
runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}";
runtimeShellPackage = bash;
bash = lowPrio (callPackage ../shells/bash/4.4.nix { });
@ -8498,7 +8498,7 @@ with pkgs;
gn = callPackage ../development/tools/build-managers/gn { };
nixbang = callPackage ../development/tools/misc/nixbang {
pythonPackages = python3Packages;
pythonPackages = python3Packages;
};
nexus = callPackage ../development/tools/repository-managers/nexus { };
@ -12829,8 +12829,8 @@ with pkgs;
rdf4store = callPackage ../servers/http/4store { };
apacheHttpd = pkgs.apacheHttpd_2_4;
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
apacheHttpd = pkgs.apacheHttpd_2_4;
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {
inherit apacheHttpd;
@ -12854,8 +12854,8 @@ with pkgs;
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
};
apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages;
apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
apacheHttpdPackages = apacheHttpdPackages_2_4;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
@ -16038,7 +16038,7 @@ with pkgs;
ImageCaptureCore GSS ImageIO;
};
emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec {
inherit emacs;
autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
@ -16181,10 +16181,10 @@ with pkgs;
cask = callPackage ../applications/editors/emacs-modes/cask { };
};
emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages;
emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages;
emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages;
emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages;
emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
inherit lib newScope stdenv;
inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch;
inherit emacs texinfo makeWrapper runCommand writeText;
@ -16206,9 +16206,9 @@ with pkgs;
};
};
emacs25PackagesNg = emacsPackagesNgGen emacs25;
emacs25PackagesNg = emacsPackagesNgFor emacs25;
emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
emacs26PackagesNg = emacsPackagesNgGen emacs26;
emacs26PackagesNg = emacsPackagesNgFor emacs26;
emacs26WithPackages = emacs26PackagesNg.emacsWithPackages;
emacsWithPackages = emacsPackagesNg.emacsWithPackages;