Unverified Commit ac7a109d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #212812 from Shawn8901/remove_with_lib_3

treewide: remove global with lib; statements in pkgs/development
parents 56404183 a59dda94
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@
, ...
}@attrs:

with lib;

let
  debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info";

@@ -107,4 +105,4 @@ let
    };
  });
in
fix pkg
lib.fix pkg
+1 −3
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@
, hexPkg ? name
, ... }@attrs:

with lib;

let
  pkg = self: builder (attrs // {

@@ -17,4 +15,4 @@ let
    };
  });
in
  fix pkg
  lib.fix pkg
+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@
, ...
}@attrs:

with lib;
let
  shell = drv: stdenv.mkDerivation {
    name = "interactive-shell-${drv.name}";
@@ -90,5 +89,5 @@ let
    };
  });
in
fix pkg
lib.fix pkg
+3 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@
, ...
}@attrs:

with lib;

let
  debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";

@@ -30,7 +28,7 @@ let
    buildInputs = [ drv ];
  };

  customPhases = filterAttrs
  customPhases = lib.filterAttrs
    (_: v: v != null)
    { inherit setupHook configurePhase buildPhase installPhase; };

@@ -40,7 +38,7 @@ let
    inherit version;

    buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
    propagatedBuildInputs = unique beamDeps;
    propagatedBuildInputs = lib.unique beamDeps;

    inherit src;

@@ -85,4 +83,4 @@ let
    };
  } // customPhases);
in
fix pkg
lib.fix pkg
+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@
, meta ? { }
}:

with lib;

stdenv.mkDerivation ({
  pname = "hex-source-${pkg}";
  inherit version;
Loading