Skip to content

Commit

Permalink
Merge pull request #91883 from markuskowa/fix-lics2
Browse files Browse the repository at this point in the history
Add licenses
  • Loading branch information
markuskowa committed Jun 30, 2020
2 parents 2321476 + 56f4aa7 commit fd46a12
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 20 deletions.
1 change: 1 addition & 0 deletions pkgs/misc/emulators/openmsx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
homepage = "https://openmsx.org";
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
license = with licenses; [ bsd2 boost gpl2 ];
};
}
2 changes: 2 additions & 0 deletions pkgs/misc/emulators/resim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ stdenv.mkDerivation {
cp -v libresim/libarmsim.so $out/lib/libarmsim.so
cp -v vc4emul/vc4emul $out/bin/vc4emul
'';

meta.license = stdenv.lib.licenses.mit;
}
3 changes: 2 additions & 1 deletion pkgs/os-specific/linux/device-tree/raspberrypi.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ stdenvNoCC.mkDerivation {
overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays";
};
meta = with stdenvNoCC.lib; {
platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
inherit (raspberrypifw.meta) platforms homepage license;
description = "DTBs for the Raspberry Pi";
};
}
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/iptstate/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ trevorj ];
downloadPage = "https://github.com/jaymzh/iptstate/releases";
license = licenses.zlib;
};

installPhase = ''
Expand Down
5 changes: 3 additions & 2 deletions pkgs/os-specific/linux/kernel/gpio-utils.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ stdenv.mkDerivation {

meta = {
description = "Linux tools to inspect the gpiochip interface";
maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ];
platforms = stdenv.lib.platforms.linux;
maintainers = with maintainers; [ kwohlfahrt ];
platforms = platforms.linux;
license = licenses.gpl2;
};
}
4 changes: 1 addition & 3 deletions pkgs/os-specific/linux/klibc/shrunk.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ stdenv.mkDerivation {
''; # */
allowedReferences = ["out"];

meta = {
platforms = stdenv.lib.platforms.linux;
};
inherit (klibc) meta;
}
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ in stdenv.mkDerivation {
homepage = "https://packages.ubuntu.com/source/zesty/kmod";
description = "Linux kernel module blacklists from Ubuntu";
platforms = platforms.linux;
license = with licenses; [ gpl2Plus lgpl21Plus ];
};
}
7 changes: 4 additions & 3 deletions pkgs/os-specific/linux/kmod-debian-aliases/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ stdenv.mkDerivation rec {
cp aliases.conf $out
'';

meta = {
meta = with lib; {
homepage = "https://packages.debian.org/source/sid/kmod";
description = "Linux configuration file for modprobe";
maintainers = with lib.maintainers; [ mathnerd314 ];
platforms = with lib.platforms; linux;
maintainers = with maintainers; [ mathnerd314 ];
platforms = with platforms; linux;
license = with licenses; [ gpl2Plus lgpl21Plus ];
};
}
9 changes: 5 additions & 4 deletions pkgs/os-specific/linux/libvolume_id/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{stdenv, fetchurl}:

stdenv.mkDerivation {
name = "libvolume_id-0.81.1";

src = fetchurl {
url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2";
sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5";
Expand All @@ -18,7 +18,8 @@ stdenv.mkDerivation {
cp -f libvolume_id.so.0 $out/lib/
";

meta = {
platforms = stdenv.lib.platforms.linux;
meta = with stdenv.lib; {
platforms = platforms.linux;
license = licenses.gpl2;
};
}
5 changes: 3 additions & 2 deletions pkgs/os-specific/linux/rfkill/udev.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ in stdenv.mkDerivation {
cp ${rfkillHook} "$out/bin/rfkill-hook.sh"
'';

meta = {
meta = with stdenv.lib; {
homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill";
description = "Rules+hook for udev to catch rfkill state changes";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
license = licenses.mit;
};
}
5 changes: 3 additions & 2 deletions pkgs/os-specific/linux/sysklogd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ stdenv.mkDerivation {

preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin";

meta = {
meta = with stdenv.lib; {
description = "A system logging daemon";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
license = licenses.gpl2;
};
}
7 changes: 4 additions & 3 deletions pkgs/os-specific/linux/xf86-video-nested/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ stdenv.mkDerivation {

CFLAGS = "-I${pixman}/include/pixman-1";

meta = {
meta = with stdenv.lib; {
homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested";
description = "A driver to run Xorg on top of Xorg or something else";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
platforms = stdenv.lib.platforms.linux;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
license = licenses.mit;
};
}
1 change: 1 addition & 0 deletions pkgs/servers/adguardhome/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
description = "Network-wide ads & trackers blocking DNS server";
platforms = platforms.linux;
maintainers = with maintainers; [ numkem ];
license = licenses.gpl3;
};
}
1 change: 1 addition & 0 deletions pkgs/servers/fcgiwrap/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
description = "Simple server for running CGI applications over FastCGI";
maintainers = with maintainers; [ lethalman ];
platforms = with platforms; linux;
license = licenses.mit;
};
}
1 change: 1 addition & 0 deletions pkgs/servers/hashi-ui/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
description = "A modern user interface for hashicorp Consul & Nomad";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ numkem ];
license = licenses.mit;
};
}

0 comments on commit fd46a12

Please sign in to comment.