Unverified Commit b6e03193 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #257358 from Artturin/bashunnecessaryexplici

parents 5b2aff1d 6c73dc67

pkgs/shells/bash/5.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, buildPackages

, fetchurl

, binutils

, bison

, util-linux
@@ -95,7 +94,7 @@ stdenv.mkDerivation rec { 
  depsBuildBuild = [ buildPackages.stdenv.cc ];

  nativeBuildInputs = [ bison ]

    ++ lib.optional withDocs texinfo

    ++ lib.optional stdenv.hostPlatform.isDarwin binutils;

    ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools;



  buildInputs = lib.optional interactive readline;

pkgs/top-level/all-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -15331,17 +15331,13 @@ with pkgs; 














  nix-your-shell = callPackage ../shells/nix-your-shell { };



























  bash = lowPrio (callPackage ../shells/bash/5.nix {













    binutils = stdenv.cc.bintools;













  });













  bash = lowPrio (callPackage ../shells/bash/5.nix { });















  # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed















  bashInteractive = callPackage ../shells/bash/5.nix {













    binutils = stdenv.cc.bintools;















    interactive = true;















    withDocs = true;















  };















  bashInteractiveFHS = callPackage ../shells/bash/5.nix {













    binutils = stdenv.cc.bintools;















    interactive = true;















    withDocs = true;















    forFHSEnv = true;