Corrected license file and updated cabal file

Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
This commit is contained in:
Collin J. Doering 2014-09-03 03:13:29 -04:00 committed by Collin J. Doering
parent db32e6d156
commit 696fcd2759
2 changed files with 46 additions and 4 deletions

42
LICENSE
View File

@ -1,3 +1,44 @@
Terms of Use
This site is Copyright 2013 © - Collin Doering and is distributed under
the following terms.
1. All rights reserved on the "#! λ Slang" name, as well as on the
banner image (/images/logo-banner.svg), favicons(/images/favicon.ico,
/images/favicon.png) and any other image/artwork that embodies the
likeness of "#! λ Slang"
2. Not withstanding (1), all images and artwork are licensed under the
Creative Commons BY-NC-ND License
3. Unless otherwise noted, all "_content_" on "#! λ Slang" is licenced
under the Creative Commons BY-NC-SA License
4. Any "content" "delimited as source-code" is licensed under the GPLv3
unless otherwise specified
5. Not withstanding (1), (2), or (3), the Hakyll configuration and all
files required to build this site are available under the GPLv3
Definitions
1. "_Content_" is any html accesible from "#! λ Slang", as well as
all the "_markdown sources_" used to produces said html.
2. "_Markdown sources_" refers to all files that are written in the
Markdown Language (http://daringfireball.net/projects/markdown/)
including those that use Pandoc Extensions
(http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown)
3. Content is "_delimited as source-code_" when the item (text) in
question is:
1. Contained within a html element with class sourceCode (html)
2. Contained within a code block (markdown) or fenced code block
(pandoc markdown extension)
------------------------------------------------------------------------
Creative Commons BY-NC-ND:
http://creativecommons.org/licenses/by-nc-nd/4.0/legalcode
Creative Commons BY-NC-SA:
http://creativecommons.org/licenses/by-nc-sa/4.0/legalcode
------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
@ -673,3 +714,4 @@ the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
------------------------------------------------------------------------

View File

@ -22,7 +22,7 @@ synopsis: The source for my Hakyll powered blog at http://blog.rekahs
homepage: http://blog.rekahsoft.ca
-- The license under which the package is released.
license: GPL-3
license: OtherLicense
-- The file containing the license text.
license-file: LICENSE
@ -61,9 +61,9 @@ executable blog-rekahsoft-ca
-- other-extensions:
-- Other library packages from which modules are imported.
build-depends: base >=4.6 && <4.7,
hakyll >=4.4,
pandoc >= 1.12,
build-depends: base >=4.7 && <4.8,
hakyll >=4.5,
pandoc >= 1.13,
parsec >= 3.1,
filepath >= 1.3,
random >= 1.0,