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

Merge pull request #220004 from Artturin/strictdepsenables 

pkgs/tools/wayland: enable strictDeps
parents 5d4e35ed 47ace7b0

pkgs/tools/nix/dnadd/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec { 
    sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r";

  };



  strictDeps = true;

  makeFlags = [ "PREFIX=$(out)" ];



  meta = with lib; {

pkgs/tools/nix/info/default.nix

+3 −1
Original line number Diff line number Diff line 
{ stdenv, lib, coreutils, findutils, gnugrep, darwin

{ stdenv, lib, coreutils, findutils, gnugrep, darwin, bash

# Avoid having GHC in the build-time closure of all NixOS configurations

, doCheck ? false, shellcheck

}:
@@ -26,7 +26,9 @@ stdenv.mkDerivation { 
  '';



  inherit doCheck;

  strictDeps = true;

  nativeCheckInputs = [ shellcheck ];

  buildInputs = [ bash ];



  checkPhase = ''

    shellcheck ./nix-info

pkgs/tools/nix/nix-script/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ stdenv.mkDerivation { 
    sha256 = "0yiqljamcj9x8z801bwj7r30sskrwv4rm6sdf39j83jqql1fyq7y";

  };



  buildInputs  = [

  strictDeps = true;

  nativeBuildInputs  = [

    (haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ]))

  ];

pkgs/tools/nix/nixos-generators/default.nix

+3 −1
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix  }:

{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix, bash }:



stdenv.mkDerivation rec {

  pname = "nixos-generators";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec { 
    rev = version;

    sha256 = "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ=";

  };

  strictDeps = true;

  nativeBuildInputs = [ makeWrapper ];

  buildInputs = [ bash ];

  installFlags = [ "PREFIX=$(out)" ];

  postFixup = ''

    wrapProgram $out/bin/nixos-generate \

pkgs/tools/nix/nixos-option/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
stdenv.mkDerivation rec {

  name = "nixos-option";

  src = ./.;

  strictDeps = true;

  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ boost nix ];

  meta = with lib; {