From 2934033f67b78ea264ce90c20ee8ff02961261cd Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sun, 26 May 2019 13:54:01 -0500 Subject: Rename nonfree path to nongnu. * nonfree/packages/linux.scm: Move to... * nongnu/packages/linux.scm: ... here. * nonfree/packages/gog.scm: Move to... * nongnu/packages/gog.scm: ... here. --- nonfree/packages/gog.scm | 99 --------------------------------------- nonfree/packages/linux.scm | 113 --------------------------------------------- nongnu/packages/gog.scm | 99 +++++++++++++++++++++++++++++++++++++++ nongnu/packages/linux.scm | 113 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 212 insertions(+), 212 deletions(-) delete mode 100644 nonfree/packages/gog.scm delete mode 100644 nonfree/packages/linux.scm create mode 100644 nongnu/packages/gog.scm create mode 100644 nongnu/packages/linux.scm diff --git a/nonfree/packages/gog.scm b/nonfree/packages/gog.scm deleted file mode 100644 index a00b767..0000000 --- a/nonfree/packages/gog.scm +++ /dev/null @@ -1,99 +0,0 @@ -;;; Copyright © 2019 Alex Griffin -;;; -;;; This program is free software: you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation, either version 3 of the License, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . - -(define-module (nonfree packages gog) - #:use-module (gnu packages boost) - #:use-module (gnu packages compression) - #:use-module (gnu packages crypto) - #:use-module (gnu packages curl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages serialization) - #:use-module (gnu packages web) - #:use-module (gnu packages xml) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) - #:use-module ((guix licenses) #:prefix license:)) - -(define-public lgogdownloader - (package - (name "lgogdownloader") - (version "3.5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Sude-/lgogdownloader.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0a3rrkgqwdqxx3ghzw182jx88gzzw6ldp3jasmgnr4l7gpxkmwws")))) - (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; no tests - (inputs - `(("boost" ,boost) - ("curl" ,curl) - ("htmlcxx" ,htmlcxx) - ("jsoncpp" ,jsoncpp) - ("liboauth" ,liboauth) - ("rhash" ,rhash) - ("tinyxml2" ,tinyxml2) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://sites.google.com/site/gogdownloader/") - (synopsis "Downloader for GOG.com files") - (description "LGOGDownloader is a client for the GOG.com download API, -allowing simple downloads and updates of games and other files from GOG.com.") - (license license:wtfpl2))) - -(define-public htmlcxx - (package - (name "htmlcxx") - (version "0.87") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/htmlcxx/v" - version "/htmlcxx-" version ".tar.gz")) - (sha256 - (base32 "1j3mzjlczjrk4ahc43s6kzpvzypzjmqz4sillnca5yadrwwgjf2x")))) - (build-system gnu-build-system) - (home-page "http://htmlcxx.sourceforge.net/") - (synopsis "Simple non-validating CSS1 and HTML parser for C++") - (description "htmlcxx is a simple non-validating CSS1 and HTML parser for -C++. Although there are several other HTML parsers available, htmlcxx has some -characteristics that make it unique: -@itemize -@item STL like navigation of DOM tree, using excelent's tree.hh library from -Kasper Peeters -@item It is possible to reproduce exactly, character by character, the original -document from the parse tree -@item Bundled CSS parser -@item Optional parsing of attributes -@item C++ code that looks like C++ (not so true anymore) -@item Offsets of tags/elements in the original document are stored in the nodes -of the DOM tree -@end itemize -The parsing politics of htmlcxx were created trying to mimic Mozilla Firefox -(https://www.mozilla.org) behavior. So you should expect parse trees similar -to those create by Firefox. However, differently from Firefox, htmlcxx does -not insert non-existent stuff in your html. Therefore, serializing the DOM -tree gives exactly the same bytes contained in the original HTML document.") - (license (list license:lgpl2.0 - license:asl2.0)))) diff --git a/nonfree/packages/linux.scm b/nonfree/packages/linux.scm deleted file mode 100644 index 4d74080..0000000 --- a/nonfree/packages/linux.scm +++ /dev/null @@ -1,113 +0,0 @@ -;;; Copyright © 2019 Alex Griffin -;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès -;;; Copyright © 2013, 2014 Andreas Enge -;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2015 Federico Beffa -;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2017, 2018 Andy Wingo -;;; -;;; This program is free software: you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation, either version 3 of the License, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . - -(define-module (nonfree packages linux) - #:use-module (gnu packages linux) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system trivial) - #:use-module ((guix licenses) #:prefix license:)) - -(define (linux-urls version) - "Return a list of URLS for Linux VERSION." - (let ((major-version (string-take version 1))) - (list (string-append "https://www.kernel.org/pub/linux/kernel/v" - major-version ".x/linux-" version ".tar.xz")))) - -(define (corrupt-linux freedo version hash) - (package - (inherit freedo) - (name "linux") - (version version) - (source (origin - (method url-fetch) - (uri (linux-urls version)) - (sha256 (base32 hash)))) - (home-page "https://www.kernel.org/") - (synopsis "Linux kernel with nonfree binary blobs included") - (description - "The unmodified Linux kernel, including nonfree blobs, for running GuixSD -on hardware which requires nonfree software to function."))) - -(define-public linux - (corrupt-linux linux-libre "5.1.5" - "1nvdrzrqqx5whj8sfqrxn1xmxx64595j0iz2wkzgpglprbsr17yp")) - -(define-public linux-firmware - (let ((commit "92e17d0dd2437140fab044ae62baf69b35d7d1fa") - (revision "1")) - (package - (name "linux-firmware") - (version (string-append "20190502-" revision "." - (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url (string-append - "https://git.kernel.org/pub/scm/" - "linux/kernel/git/firmware/linux-firmware.git")) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1bsgp124jhs9bbjjq0fzmdsziwx1y5aivkgpj8v56ar0y2zmrw2d")))) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((source (assoc-ref %build-inputs "source")) - (fw-dir (string-append %output "/lib/firmware/"))) - (mkdir-p fw-dir) - (copy-recursively source fw-dir) - #t)))) - (home-page - "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git") - (synopsis "Non-free firmware blobs for Linux") - (description "Non-free firmware blobs for enabling support for various -hardware in the Linux kernel.") - (license - (license:non-copyleft - (string-append "https://git.kernel.org/pub/scm/linux/kernel/git/" - "firmware/linux-firmware.git/plain/WHENCE")))))) - -(define-public ath3k-firmware - (package - (inherit linux-firmware) - (name "ath3k-firmware") - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let ((source (assoc-ref %build-inputs "source")) - (fw-dir (string-append %output "/lib/firmware"))) - (mkdir-p fw-dir) - (copy-file (string-append source "/ath3k-1.fw") - (string-append fw-dir "/ath3k-1.fw")) - (copy-recursively (string-append source "/ar3k") - (string-append fw-dir "/ar3k")) - #t)))) - (synopsis "Non-free firmware blobs for the ath3k Bluetooth driver") - (description "Non-free firmware blobs for the ath3k Bluetooth driver. ath3k -is the Linux Bluetooth driver for Atheros AR3011/AR3012 Bluetooth chipsets."))) diff --git a/nongnu/packages/gog.scm b/nongnu/packages/gog.scm new file mode 100644 index 0000000..6087f36 --- /dev/null +++ b/nongnu/packages/gog.scm @@ -0,0 +1,99 @@ +;;; Copyright © 2019 Alex Griffin +;;; +;;; This program is free software: you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see . + +(define-module (nongnu packages gog) + #:use-module (gnu packages boost) + #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) + #:use-module (gnu packages curl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages serialization) + #:use-module (gnu packages web) + #:use-module (gnu packages xml) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public lgogdownloader + (package + (name "lgogdownloader") + (version "3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Sude-/lgogdownloader.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a3rrkgqwdqxx3ghzw182jx88gzzw6ldp3jasmgnr4l7gpxkmwws")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ; no tests + (inputs + `(("boost" ,boost) + ("curl" ,curl) + ("htmlcxx" ,htmlcxx) + ("jsoncpp" ,jsoncpp) + ("liboauth" ,liboauth) + ("rhash" ,rhash) + ("tinyxml2" ,tinyxml2) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://sites.google.com/site/gogdownloader/") + (synopsis "Downloader for GOG.com files") + (description "LGOGDownloader is a client for the GOG.com download API, +allowing simple downloads and updates of games and other files from GOG.com.") + (license license:wtfpl2))) + +(define-public htmlcxx + (package + (name "htmlcxx") + (version "0.87") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/htmlcxx/v" + version "/htmlcxx-" version ".tar.gz")) + (sha256 + (base32 "1j3mzjlczjrk4ahc43s6kzpvzypzjmqz4sillnca5yadrwwgjf2x")))) + (build-system gnu-build-system) + (home-page "http://htmlcxx.sourceforge.net/") + (synopsis "Simple non-validating CSS1 and HTML parser for C++") + (description "htmlcxx is a simple non-validating CSS1 and HTML parser for +C++. Although there are several other HTML parsers available, htmlcxx has some +characteristics that make it unique: +@itemize +@item STL like navigation of DOM tree, using excelent's tree.hh library from +Kasper Peeters +@item It is possible to reproduce exactly, character by character, the original +document from the parse tree +@item Bundled CSS parser +@item Optional parsing of attributes +@item C++ code that looks like C++ (not so true anymore) +@item Offsets of tags/elements in the original document are stored in the nodes +of the DOM tree +@end itemize +The parsing politics of htmlcxx were created trying to mimic Mozilla Firefox +(https://www.mozilla.org) behavior. So you should expect parse trees similar +to those create by Firefox. However, differently from Firefox, htmlcxx does +not insert non-existent stuff in your html. Therefore, serializing the DOM +tree gives exactly the same bytes contained in the original HTML document.") + (license (list license:lgpl2.0 + license:asl2.0)))) diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm new file mode 100644 index 0000000..679f9c5 --- /dev/null +++ b/nongnu/packages/linux.scm @@ -0,0 +1,113 @@ +;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2014 Andreas Enge +;;; Copyright © 2012 Nikita Karetnikov +;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2015 Federico Beffa +;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer +;;; Copyright © 2015, 2017, 2018 Andy Wingo +;;; +;;; This program is free software: you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see . + +(define-module (nongnu packages linux) + #:use-module (gnu packages linux) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system trivial) + #:use-module ((guix licenses) #:prefix license:)) + +(define (linux-urls version) + "Return a list of URLS for Linux VERSION." + (let ((major-version (string-take version 1))) + (list (string-append "https://www.kernel.org/pub/linux/kernel/v" + major-version ".x/linux-" version ".tar.xz")))) + +(define (corrupt-linux freedo version hash) + (package + (inherit freedo) + (name "linux") + (version version) + (source (origin + (method url-fetch) + (uri (linux-urls version)) + (sha256 (base32 hash)))) + (home-page "https://www.kernel.org/") + (synopsis "Linux kernel with nonfree binary blobs included") + (description + "The unmodified Linux kernel, including nonfree blobs, for running GuixSD +on hardware which requires nonfree software to function."))) + +(define-public linux + (corrupt-linux linux-libre "5.1.5" + "1nvdrzrqqx5whj8sfqrxn1xmxx64595j0iz2wkzgpglprbsr17yp")) + +(define-public linux-firmware + (let ((commit "92e17d0dd2437140fab044ae62baf69b35d7d1fa") + (revision "1")) + (package + (name "linux-firmware") + (version (string-append "20190502-" revision "." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append + "https://git.kernel.org/pub/scm/" + "linux/kernel/git/firmware/linux-firmware.git")) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bsgp124jhs9bbjjq0fzmdsziwx1y5aivkgpj8v56ar0y2zmrw2d")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source")) + (fw-dir (string-append %output "/lib/firmware/"))) + (mkdir-p fw-dir) + (copy-recursively source fw-dir) + #t)))) + (home-page + "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git") + (synopsis "Non-free firmware blobs for Linux") + (description "Non-free firmware blobs for enabling support for various +hardware in the Linux kernel.") + (license + (license:non-copyleft + (string-append "https://git.kernel.org/pub/scm/linux/kernel/git/" + "firmware/linux-firmware.git/plain/WHENCE")))))) + +(define-public ath3k-firmware + (package + (inherit linux-firmware) + (name "ath3k-firmware") + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let ((source (assoc-ref %build-inputs "source")) + (fw-dir (string-append %output "/lib/firmware"))) + (mkdir-p fw-dir) + (copy-file (string-append source "/ath3k-1.fw") + (string-append fw-dir "/ath3k-1.fw")) + (copy-recursively (string-append source "/ar3k") + (string-append fw-dir "/ar3k")) + #t)))) + (synopsis "Non-free firmware blobs for the ath3k Bluetooth driver") + (description "Non-free firmware blobs for the ath3k Bluetooth driver. ath3k +is the Linux Bluetooth driver for Atheros AR3011/AR3012 Bluetooth chipsets."))) -- cgit v1.2.3