diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-07 00:02:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 00:02:20 +0000 |
| commit | fd7a8aedb05d043f27206beaf915d1f9397396cf (patch) | |
| tree | cca548b680db40c3197fb2d07363ac37bff21358 /pkgs/os-specific | |
| parent | e72d04004ef65961e8b14e3d9a4debb2c4ddde70 (diff) | |
| parent | 747224bf39576965deed4ec55b255e146815bcc2 (diff) | |
| download | nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.gz nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.bz2 nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.lz nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.xz nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.zst nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/lxc/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lxcfs/default.nix | 7 |
2 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 49f16db002f3..4192de0cfeab 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -6,7 +6,6 @@ , libcap ? null, systemd ? null }: -with lib; stdenv.mkDerivation rec { pname = "lxc"; version = "4.0.12"; @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { "--disable-api-docs" "--with-init-script=none" "--with-distro=nixos" # just to be sure it is "unknown" - ] ++ optional (libapparmor != null) "--enable-apparmor" - ++ optional (libselinux != null) "--enable-selinux" - ++ optional (libseccomp != null) "--enable-seccomp" - ++ optional (libcap != null) "--enable-capabilities" + ] ++ lib.optional (libapparmor != null) "--enable-apparmor" + ++ lib.optional (libselinux != null) "--enable-selinux" + ++ lib.optional (libseccomp != null) "--enable-seccomp" + ++ lib.optional (libcap != null) "--enable-capabilities" ++ [ "--disable-examples" "--enable-python" @@ -90,7 +89,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; longDescription = '' LXC is the userspace control package for Linux Containers, a @@ -100,7 +99,7 @@ stdenv.mkDerivation rec { mechanisms to Linux’s existing process management infrastructure. ''; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxc.members; }; } diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 96477c5f4426..28777d36e6be 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -2,7 +2,6 @@ , util-linux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: -with lib; stdenv.mkDerivation rec { pname = "lxcfs"; version = "4.0.12"; @@ -48,8 +47,8 @@ stdenv.mkDerivation rec { description = "FUSE filesystem for LXC"; homepage = "https://linuxcontainers.org/lxcfs"; changelog = "https://linuxcontainers.org/lxcfs/news/"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxc.members; }; } |