diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-06 10:16:39 +0100 |
| commit | 0518ccf5af90017df31c445f52badaff45b6b7cd (patch) | |
| tree | f60c912ecd598722d76947f6bd5230955210eb66 /pkgs/development/libraries/slib | |
| parent | c96407720010658b44dcd2a8801b05879105b9ff (diff) | |
| parent | 782a12e450a58b815cd702c65da75855124d1572 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/development/libraries/slib')
| -rw-r--r-- | pkgs/development/libraries/slib/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 4c615b81552f..02e7dc24159f 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; # Public domain + permissive (non-copyleft) licensing of some files. - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; homepage = http://people.csail.mit.edu/jaffer/SLIB; |