Unverified Commit 9a66fda7 authored by sternenseemann's avatar sternenseemann Committed by GitHub
Browse files

haskellPackages: remove pkgs.nix from wrapper scripts where unnecessary (#481003)

parents 2b36ce09 a6af5da7

pkgs/development/haskell-modules/configuration-common.nix

+4 −2
Original line number Diff line number Diff line
@@ -1854,7 +1854,6 @@ with haskellLib; 
      # PATH.

      deps = [

        pkgs.git

        pkgs.nix

        pkgs.nix-prefetch-git

      ];

    in
@@ -1868,7 +1867,9 @@ with haskellLib; 
          wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${lib.makeBinPath deps}"

        '';

      }))

      (addTestToolDepends deps)

      # pkgs.nix is not added to the wrapper since we can resonably expect it to be installed

      # and we don't know which implementation the eventual user prefers

      (addTestToolDepends (deps ++ [ pkgs.nix ]))

      # Patch for hnix compat.

      (appendPatches [

        (fetchpatch {
@@ -2038,6 +2039,7 @@ with haskellLib; 
  cli-git = addBuildTool pkgs.git super.cli-git;



  cli-nix = addBuildTools [

    # Required due to https://github.com/obsidiansystems/cli-nix/issues/11

    pkgs.nix

    pkgs.nix-prefetch-git

  ] super.cli-nix;

pkgs/development/haskell-modules/configuration-nix.nix

+1 −7
Original line number Diff line number Diff line
@@ -262,12 +262,7 @@ builtins.intersectAttrs super { 
  ghc-debug-brick = enableSeparateBinOutput super.ghc-debug-brick;

  nixfmt = enableSeparateBinOutput super.nixfmt;

  calligraphy = enableSeparateBinOutput super.calligraphy;

  niv = overrideCabal (drv: {

    buildTools = (drv.buildTools or [ ]) ++ [ pkgs.buildPackages.makeWrapper ];

    postInstall = ''

      wrapProgram ''${!outputBin}/bin/niv --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]}

    '';

  }) (enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv));

  niv = enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv);

  ghcid = enableSeparateBinOutput super.ghcid;

  ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (

    enableSeparateBinOutput super.ormolu
@@ -1596,7 +1591,6 @@ builtins.intersectAttrs super { 
          wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${

            pkgs.lib.makeBinPath [

              pkgs.nvchecker

              pkgs.nix # nix-prefetch-url

              pkgs.nix-prefetch-git

              pkgs.nix-prefetch-docker

            ]

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,6 @@ with pkgs; 
      wrapProgram $out/bin/cabal2nix \

        --prefix PATH ":" "${

          lib.makeBinPath [

            nix

            nix-prefetch-scripts

          ]

        }"