Unverified Commit 57f2153b authored by Emily's avatar Emily Committed by GitHub
Browse files

Add licenses to moby and c-util (#351233)

parents 213114ad 51301ccb

pkgs/applications/virtualization/docker/default.nix

+16 −3
Original line number Diff line number Diff line
@@ -24,6 +24,16 @@ rec { 
      , knownVulnerabilities ? []

    }:

  let

    docker-meta = {

      license = lib.licenses.asl20;

      maintainers = with lib.maintainers; [

        offline

        vdemeester

        periklis

        teutat3s

      ];

    };



    docker-runc = runc.overrideAttrs {

      pname = "docker-runc";

      inherit version;
@@ -160,6 +170,11 @@ rec { 
        ++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs"

        ++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper"

        ++ lib.optional withSeccomp "seccomp";



      meta = docker-meta // {

          homepage = "https://mobyproject.org/";

          description = "A collaborative project for the container ecosystem to assemble container-based systems.";

        };

    });



    plugins = lib.optional buildxSupport docker-buildx
@@ -257,7 +272,7 @@ rec { 
      tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; };

    };



    meta = with lib; {

    meta = docker-meta // {

      homepage = "https://www.docker.com/";

      description = "Open source project to pack, ship and run any application as a lightweight container";

      longDescription = ''
@@ -265,8 +280,6 @@ rec { 


        To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`.

      '';

      license = licenses.asl20;

      maintainers = with maintainers; [ offline vdemeester periklis teutat3s ];

      mainProgram = "docker";

      inherit knownVulnerabilities;

    };

pkgs/os-specific/linux/dbus-broker/default.nix

+14 −4
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ 
}:



let

  meta = {

    maintainers = with lib.maintainers; [ peterhoeg ];

    platforms = lib.platforms.linux;

  };



  dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }:

    stdenv.mkDerivation {
@@ -22,6 +26,14 @@ let 
      };

      nativeBuildInputs = [ meson ninja pkg-config ];

      inherit buildInputs;

      meta = meta // {

        description = "The C-Util Project is a collection of utility libraries for the C11 language.";

        homepage = "https://c-util.github.io/";

        license = [

          lib.licenses.asl20

          lib.licenses.lgpl21Plus

        ];

      };

    };



  # These libraries are not used outside of dbus-broker.
@@ -89,11 +101,9 @@ stdenv.mkDerivation (finalAttrs: { 


  doCheck = true;



  meta = with lib; {

  meta = meta // {

    description = "Linux D-Bus Message Broker";

    homepage = "https://github.com/bus1/dbus-broker/wiki";

    license = licenses.asl20;

    maintainers = with maintainers; [ peterhoeg ];

    platforms = platforms.linux;

    license = lib.licenses.asl20;

  };

})