Unverified Commit 8f8f0c05 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #333679 from adisbladis/fetchpypilegacy-tls-usernames 

fetchPypiLegacy: Pass cacert to enable TLS verification when username/password is used
parents f51bf910 bed19bdf

pkgs/build-support/fetchpypilegacy/default.nix

+49 −41
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
  runCommand,

  lib,

  python3,

}:

  cacert,

}@pkgs:

let

  inherit (lib)

    optionalAttrs
@@ -18,6 +19,7 @@ let 


  impureEnvVars = fetchers.proxyImpureEnvVars ++ optional inPureEvalMode "NETRC";

in

lib.makeOverridable (

  {

    # package name

    pname,
@@ -31,6 +33,8 @@ in 
    hash,

    # allow overriding the derivation name

    name ? null,

    # allow overriding cacert using src.override { cacert = cacert.override { extraCertificateFiles = [ ./path/to/cert.pem ]; }; }

    cacert ? pkgs.cacert,

  }:

  let

    urls' = urls ++ optional (url != null) url;
@@ -44,7 +48,10 @@ assert urls' != [ ]; 
  runCommand file

    (

      {

      nativeBuildInputs = [ python3 ];

        nativeBuildInputs = [

          python3

          cacert

        ];

        inherit impureEnvVars;

        outputHashMode = "flat";

        # if hash is empty select a default algo to let nix propose the actual hash.
@@ -60,3 +67,4 @@ runCommand file 
      } --pname ${pname} --filename ${file}

      mv ${file} $out

    ''

)