JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,370 Commits 1 Branch 0 Tags 12 GiB
0bfd77b0f1
Commit Graph

45 Commits

Author SHA1 Message Date
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Thomas Tuegel
8fb5401c5b add GFDL-1.2 license 2015-01-26 20:59:49 -06:00
Vladimír Čunát
309b956215 lib/licenses: add IJG (Independent JPEG...) 2015-01-13 16:55:11 +01:00
Daniel Bergey
4c064b5478 add LaTeX Project Public License v1.3c for Gyre 
use lib.maintainers
 2014-12-19 20:07:53 +00:00
Michael Raskin
cb0fa1d4f7 Fix spdx syntax for GPL1 2014-12-07 19:04:07 +03:00
Bart Brouns
9dff67eed7 lib/licenses: add gpl1 (close #5103) 
@vcunat changed format to spdx.
 2014-11-24 10:37:49 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style 
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
 2014-11-06 00:48:16 +00:00
Eelco Dolstra
4e7a5aca2b Provide more SPDX IDs 2014-11-05 15:33:11 +01:00
Eelco Dolstra
d43846a0d8 Make the license shortName attribute equal to the license attribute name 
I.e. lib.licenses.<foo>.shortName == "<foo>". The SPDX identifier (if
known) is kept in lib.licenses.<license>.spdxId.
 2014-11-05 15:26:45 +01:00
Eelco Dolstra
af0557cf82 Allow marking licenses as unfree 
This allows licenses like the Amazon Software License to be identified
properly while still preventing packages with those licenses from
being distributed in the Nixpkgs/NixOS channels.
 2014-11-05 15:15:00 +01:00
Eelco Dolstra
858cfbc993 licenses.publicDomain: Fix typo 2014-11-05 14:52:05 +01:00
Vladimir Kirillov
e10a8b7318 ec2-ami-tools -> 1.5.6, updated license & homepage 2014-11-05 15:28:52 +02:00
Jiri Marsik
b4b3368c8d Added the CECILL 2.0 license 2014-10-28 14:06:04 +01:00
Valérian Galliat
e55df0f4a3 Add the Unlicense 2014-10-22 18:43:34 +02:00
Vincent Laporte
f132f9c6c9 Adds the CC-BY-SA-3.0 license 2014-10-13 01:23:18 +01:00
Peter Simons
ae32accc47 lib/licenses.nix: cosmetic 2014-10-04 21:15:36 +02:00
Vincent Laporte
181139fe09 Adds license CeCILL-B 2014-09-28 14:03:14 +01:00
Mateusz Kowalczyk
fe86a03a1c libpng: use spdx licensing method 2014-09-21 18:53:20 +01:00
Vladimír Čunát
963b5e820c lib/licenses: add cc-by-40 (fixes #4035) 2014-09-11 20:03:03 +02:00
Aristid Breitkreuz
494ba98e65 fix typo in postgresql license definition 2014-09-04 20:40:03 +02:00
Aristid Breitkreuz
73e569bf01 add postgresql 9.4beta2 2014-09-04 20:36:43 +02:00
Vladimír Čunát
3f0ebe7e75 licenses: comment about two versions of MIT 
I decided to follow spdx.org and not to differentiate those two.
Packages would often have the wrong version anyway.
 2014-08-30 07:28:26 +02:00
Michael Raskin
f25709c48a List NCSA license properly 2014-08-29 01:14:10 +04:00
Rüdiger Sonderfeld
ae9afc4d31 licenses: Add CC0 license. 
A universal public domain license.

http://creativecommons.org/publicdomain/zero/1.0/
 2014-08-28 13:03:32 +02:00
Vladimír Čunát
5d8c8845ed licenses: add LPL-102 2014-08-15 00:11:09 +02:00
Vladimír Čunát
7133c791b5 licenses: fixup double isc definition 2014-08-14 21:04:24 +02:00
William A. Kennington III
ae48ab82ad license: Add isc 2014-08-13 15:10:04 -05:00
Vladimír Čunát
905b163b49 Revert "lib/licenses.nix: allow choosing license by its shortName" 
There's no consensus to adopt that (yet).
This reverts commit 229e5c41df.
 2014-08-12 19:05:54 +02:00
Vladimír Čunát
229e5c41df lib/licenses.nix: allow choosing license by its shortName 
Example: license = licenses."GPL-2.0+";
This comes with some performance cost during eval of licenses.nix,
but that's probably negligible.
 2014-07-30 19:22:09 +02:00
Vladimír Čunát
0f2101215d lib/licenses.nix: improve sortedness 2014-07-30 18:16:36 +02:00
Vladimír Čunát
32c237d782 lib/licenses.nix: convert to spdx.org shortnames 
Done where possible, replacing links to point to spdx.org (probably stabler).
Also make libtiff use its dedicated license.
 2014-07-30 18:16:09 +02:00
Michael Raskin
d001de0100 Merge pull request #3102 from auntieNeo/ipafont 
Added package for Japanese IPAFonts.
 2014-06-30 10:19:48 +04:00
Michael Raskin
d41a7bd9e2 Merge pull request #2871 from auntieNeo/kochi-substitute 
Added Kochi substitute Japanese font package
 2014-06-30 10:14:14 +04:00
Vladimír Čunát
c00f589ff2 licenses: add attribute "free" to fix eval of smlnjBootstrap 2014-06-27 09:48:42 +02:00
Jonathan Glines
339b347987 Added package for Japanese IPAFonts. 2014-06-15 10:02:41 -06:00
Jonathan Glines
b913409e0b Removed non-free kochi-substitute and added kochi from Debian package. 2014-06-11 22:08:14 -06:00
Ricky Elrod
139c6fb180 Add OFL as an actual license 2014-05-06 04:04:43 -04:00
Austin Seipp
145dcdc539 Add licenses for CompCert/Z3 
Both of these allow for binary redistribution.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 19:08:59 -05:00
Austin Seipp
6d52463bd3 nixpkgs: add alt-ergo 0.95.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 02:42:31 -05:00
Luca Bruno
b4096479fa gnome-user-docs: new package licensed under the new licenses.cc-by-30 
User and system administration help for the Gnome

https://help.gnome.org/users/gnome-help/3.10
 2014-04-14 09:58:02 +02:00
Austin Seipp
023464f13f licenses: add Sleepycat Public License 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-24 19:58:11 -05:00
Domen Kozar
059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
Jaka Hudoklin
2778c00bfe amdadl-sdk: set license to unfree (close #1647) 
We cannot auto build amdadl-sdk on hydra, so setting license to unfree disable
auto builds. I also remove amdadl license, because it's irrelevant.

vcunat changed string license to attribute.
 2014-01-31 18:39:21 +01:00
Michael Raskin
5bbb1f77b2 Adding SlimerJS — script-driven Gecko browser 2013-10-21 00:30:39 +04:00
Eelco Dolstra
5fef92c4a0 Move pkgs/lib/ to lib/ 2013-10-10 13:28:21 +02:00