Merge pull request #45336 from Mic92/licenses

Add licenses
NixOS · Aug 23, 2018 · 74d1acd · 74d1acd
2 parents 9985ed6 + 229a233
commit 74d1acd
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     homepage    = "http://www.libsdl.org/projects/SDL_image/";
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
+    license     = licenses.zlib;
   };
 }
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     homepage    = http://www.libsdl.org/projects/SDL_mixer/;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
+    license     = licenses.zlib;
   };
 }
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
@@ -1,17 +1,20 @@
-{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
+{ stdenv, fetchurl
+, imake, gccmakedep, bison, flex, pkgconfig
+, xlibsWrapper, libXmu, libXpm, libXp }:
 
 stdenv.mkDerivation {
   name = "Xaw3d-1.6.3";
   src = fetchurl {
     url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
     sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
   };
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [imake gccmakedep libXpm libXp bison flex];
-  propagatedBuildInputs = [xlibsWrapper libXmu];
+  nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
+  buildInputs = [ libXpm libXp ];
+  propagatedBuildInputs = [ xlibsWrapper libXmu ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "3D widget set based on the Athena Widget set";
     platforms = stdenv.lib.platforms.unix;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix
@@ -38,9 +38,10 @@ stdenv.mkDerivation {
     install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://forum.doom9.org/showthread.php?t=123311;
     description = "A library and program to retrieve decryption keys for HD discs";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.publicDomain;
   };
 }
diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "915resolution-0.5.3";
-  
+
   src = fetchurl {
     url = "http://915resolution.mango-lang.org/${name}.tar.gz";
     sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n";
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     homepage = http://915resolution.mango-lang.org/;
     description = "A tool to modify Intel 800/900 video BIOS";
     platforms = [ "i686-linux" "x86_64-linux" ];
+    license = licenses.publicDomain;
   };
 }
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist
+    homepage = https://github.com/mischief/9pfs;
     description = "FUSE-based client of the 9P network filesystem protocol";
     maintainers = [ lib.maintainers.eelco ];
     platforms = lib.platforms.linux;
+    license = with lib.licenses; [ lpl-102 bsd2 ];
   };
 }
diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl, fuse }:
-  
+
 stdenv.mkDerivation rec {
   name = "aefs-0.4pre259-8843b7c";
-  
+
   src = fetchurl {
     url = "http://tarballs.nixos.org/${name}.tar.bz2";
     sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq";
   };
 
   buildInputs = [ fuse ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.st.ewi.tudelft.nl/~dolstra/aefs/;
     description = "A cryptographic filesystem implemented in userspace using FUSE";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -2446,6 +2446,11 @@ in {
     doCheck = (!isPyPy);  # https://github.com/fabric/fabric/issues/11891
     propagatedBuildInputs = with self; [ paramiko pycrypto ];
     buildInputs = with self; [ fudge_9 nose ];
+    meta = {
+      description = "Pythonic remote execution";
+      homepage    = https://www.fabfile.org/;
+      license     = licenses.bsd2;
+    };
   };
 
   faulthandler = if ! isPy3k