Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add licenses to moby and c-util #351233

Merged
merged 2 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions pkgs/applications/virtualization/docker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -257,16 +272,14 @@ 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 = ''
Docker is a platform designed to help developers build, share, and run modern applications.

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;
};
Expand Down
18 changes: 14 additions & 4 deletions pkgs/os-specific/linux/dbus-broker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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.
Expand Down Expand Up @@ -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;
};
})