Skip to content

Commit

Permalink
Add licenses to moby and c-util (#351233)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilazy authored Oct 29, 2024
2 parents 213114a + 51301cc commit 57f2153
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 7 deletions.
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;
};
})

0 comments on commit 57f2153

Please sign in to comment.