From 1ee3c294bfdb32bdbe9a8f4c7ac3e462d6c344ce Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 18 Aug 2018 17:59:02 +0000 Subject: [PATCH 1/4] all-packages.nix: rename emacs functions Gen -> For This was introduced when it was unclear which suffix was better, but now it's clear that the "For" convention won. --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ae7137d3a6a4..c05f01ec839e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ff605bbd09..946b97121770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16022,7 +16022,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 { }; @@ -16165,10 +16165,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; @@ -16190,9 +16190,9 @@ with pkgs; }; }; - emacs25PackagesNg = emacsPackagesNgGen emacs25; + emacs25PackagesNg = emacsPackagesNgFor emacs25; emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; - emacs26PackagesNg = emacsPackagesNgGen emacs26; + emacs26PackagesNg = emacsPackagesNgFor emacs26; emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; From 033ed93da2c739842283068325f5c31bc5dacd40 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 18 Aug 2018 18:15:14 +0000 Subject: [PATCH 2/4] all-packages.nix: cleanup a bit --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 946b97121770..383c4838942e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8496,7 +8496,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 { }; @@ -12827,8 +12827,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; @@ -12852,8 +12852,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 { }; From 7931d455a469a3f5ac533f13f4f713ea8cb9c1cf Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 4 Sep 2018 22:03:51 +0000 Subject: [PATCH 3/4] stdenv: linux: cleanup a bit --- pkgs/stdenv/linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index de58178a34ba..b29a96314d2c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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 From 409270826112d035934a6b7a0969aa47dac0bf35 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 4 Sep 2018 21:13:00 +0000 Subject: [PATCH 4/4] treewide: cleanup some references to bash --- pkgs/build-support/cc-wrapper/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index a981ffea7081..301bc2694c4f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 383c4838942e..e67d038c1ca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6222,7 +6222,7 @@ with pkgs; ### SHELLS - runtimeShell = "${runtimeShellPackage}/bin/bash"; + runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; bash = lowPrio (callPackage ../shells/bash/4.4.nix { });