Unverified Commit bb25595f authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

treewide: remove remaining 'with [a-zA-Z]*lib;' from pkgs (#473062)

parents 109b972a c539fa85

pkgs/applications/networking/cluster/hadoop/default.nix

+19 −21
Original line number Diff line number Diff line
@@ -146,9 +146,7 @@ let 


      # The recursiveUpdate below breaks default meta.position, so manually override it.

      pos = __curPos;

      meta =

        with lib;

        recursiveUpdate {

      meta = lib.recursiveUpdate {

        homepage = "https://hadoop.apache.org/";

        description = "Framework for distributed processing of large data sets across clusters of computers";

        license = lib.licenses.asl20;
@@ -166,8 +164,8 @@ let 
          computers, each of which may be prone to failures.

        '';

        maintainers = with lib.maintainers; [ illustris ];

          platforms = attrNames platformAttrs;

        } (attrByPath [ stdenv.system "meta" ] { } platformAttrs);

        platforms = lib.attrNames platformAttrs;

      } (lib.attrByPath [ stdenv.system "meta" ] { } platformAttrs);

    });

in

{

pkgs/applications/networking/mullvad/openvpn.nix

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ openvpn.overrideAttrs ( 
    meta = oldAttrs.meta or { } // {

      description = "OpenVPN with Mullvad-specific patches applied";

      homepage = "https://github.com/mullvad/openvpn";

      maintainers = with lib; [ maintainers.cole-h ];

      maintainers = with lib.maintainers; [ cole-h ];

    };

  }

)

pkgs/by-name/ca/caprine-bin/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 
let

  pname = "caprine";

  version = "2.59.1";

  metaCommon = with lib; {

  metaCommon = {

    description = "Elegant Facebook Messenger desktop app";

    homepage = "https://sindresorhus.com/caprine";

    license = licenses.mit;

    maintainers = with maintainers; [ ShamrockLee ];

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ ShamrockLee ];

    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

  };

  x86_64-appimage = callPackage ./build-from-appimage.nix {

    inherit pname version metaCommon;

pkgs/by-name/de/deskflow/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -120,10 +120,10 @@ stdenv.mkDerivation (finalAttrs: { 
    description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux";

    mainProgram = "deskflow";

    maintainers = with lib.maintainers; [ flacks ];

    license = with lib; [

      licenses.gpl2Plus

      licenses.openssl

      licenses.mit # share/applications/org.deskflow.deskflow.desktop

    license = with lib.licenses; [

      gpl2Plus

      openssl

      mit # share/applications/org.deskflow.deskflow.desktop

    ];

    platforms = lib.platforms.linux;

  };

pkgs/by-name/ev/evcc/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ let 


  vendorHash = "sha256-VG1/6KadRC4jLBIOL39M6l8ZED1KLb+wKGHNQowAV1g=";



  commonMeta = with lib; {

    license = licenses.mit;

    maintainers = with maintainers; [ hexa ];

  commonMeta = {

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ hexa ];

  };



  decorate = buildGo125Module {