Unverified Commit a0df4882 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

treewide: more accurate pandoc availability check #404599

parents c98eabc2 14a2f96a

pkgs/build-support/trivial-builders/default.nix

+3 −6
Original line number Diff line number Diff line
@@ -367,17 +367,14 @@ rec { 
        '';



      checkPhase =

        # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v)

        # but we still want to use writeShellApplication on those platforms

        let

          shellcheckSupported =

            lib.meta.availableOn stdenv.buildPlatform shellcheck-minimal.compiler

            && (builtins.tryEval shellcheck-minimal.compiler.outPath).success;

          excludeFlags = lib.optionals (excludeShellChecks != [ ]) [

            "--exclude"

            (lib.concatStringsSep "," excludeShellChecks)

          ];

          shellcheckCommand = lib.optionalString shellcheckSupported ''

          # GHC (=> shellcheck) isn't supported on some platforms (such as risc-v)

          # but we still want to use writeShellApplication on those platforms

          shellcheckCommand = lib.optionalString shellcheck-minimal.compiler.bootstrapAvailable ''

            # use shellcheck which does not include docs

            # pandoc takes long to build and documentation isn't needed for just running the cli

            ${lib.getExe shellcheck-minimal} ${

pkgs/by-name/fl/flac/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
  lib,

  libogg,

  nix-update-script,

  pandoc,

  buildPackages,

  pkg-config,

  stdenv,

  versionCheckHook,

  enableManpages ? !stdenv.buildPlatform.isRiscV64 && !stdenv.buildPlatform.isLoongArch64,

  enableManpages ? buildPackages.pandoc.compiler.bootstrapAvailable,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "flac";
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { 
    doxygen

    graphviz

    pkg-config

  ] ++ lib.optional enableManpages pandoc;

  ] ++ lib.optional enableManpages buildPackages.pandoc;



  buildInputs = [ libogg ];

pkgs/by-name/ni/nixos-firewall-tool/package.nix

+3 −6
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  lib,

  bash,

  installShellFiles,

  shellcheck-minimal,

  buildPackages,

}:



stdenvNoCC.mkDerivation {
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation { 
  strictDeps = true;

  buildInputs = [ bash ];

  nativeBuildInputs = [ installShellFiles ];

  nativeCheckInputs = [ shellcheck-minimal ];

  nativeCheckInputs = [ buildPackages.shellcheck-minimal ];



  postPatch = ''

    patchShebangs --host nixos-firewall-tool
@@ -26,10 +26,7 @@ stdenvNoCC.mkDerivation { 
    installShellCompletion nixos-firewall-tool.{bash,fish}

  '';



  # Skip shellcheck if GHC is not available, see writeShellApplication.

  doCheck =

    lib.meta.availableOn stdenvNoCC.buildPlatform shellcheck-minimal.compiler

    && (builtins.tryEval shellcheck-minimal.compiler.outPath).success;

  doCheck = buildPackages.shellcheck-minimal.compiler.bootstrapAvailable;

  checkPhase = ''

    shellcheck nixos-firewall-tool

  '';

pkgs/development/compilers/ghc/8.10.7.nix

+2 −0
Original line number Diff line number Diff line
@@ -640,6 +640,8 @@ stdenv.mkDerivation ( 


      # Our Cabal compiler name

      haskellCompilerName = "ghc-${version}";



      bootstrapAvailable = lib.meta.availableOn stdenv.buildPlatform bootPkgs.ghc;

    };



    meta = {

pkgs/development/compilers/ghc/common-hadrian.nix

+2 −0
Original line number Diff line number Diff line
@@ -839,6 +839,8 @@ stdenv.mkDerivation ( 
      # TODO(@sternenseemann): there's no stage0:exe:haddock target by default,

      # so haddock isn't available for GHC cross-compilers. Can we fix that?

      hasHaddock = stdenv.hostPlatform == stdenv.targetPlatform;



      bootstrapAvailable = lib.meta.availableOn stdenv.buildPlatform bootPkgs.ghc;

    };



    meta = {