From 26921810759f37c94c636d4dc41aa89591f3bb54 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Thu, 7 Dec 2023 09:18:41 +0100 Subject: [PATCH] . --- gnu/packages/chicken.scm | 304 +++++++++++++++++++++++++++++++-------- gnu/packages/mozilla.scm | 38 +++++ 2 files changed, 281 insertions(+), 61 deletions(-) create mode 100644 gnu/packages/mozilla.scm diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm index 0d2b738..3d8fef1 100644 --- a/gnu/packages/chicken.scm +++ b/gnu/packages/chicken.scm @@ -30,6 +30,7 @@ #:use-module ((guix licenses) #:prefix license:)) + (define-public chicken (package (name "chicken") @@ -95,6 +96,89 @@ language standard, and includes many enhancements and extensions.") source code and load it into the running process.") (license license:bsd-3))) +(define-public chicken-agrep + (package + (name "chicken-agrep") + (version "1.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/iraikov/chicken-agrep") + (commit version))) + (file-name (string-append "chicken-agrep-" version "-checkout")) + (sha256 + (base32 + "0z05x7f154n9bgmainrsmncf5i6dil43r9ymr3rdgwbg4wnxmz4s")))) + ;; TODO do we really have to make these propagated? + ;; I don't know Chicken's module system well enough to tell + (propagated-inputs + (list chicken-datatype chicken-srfi-1 chicken-srfi-14)) + (native-inputs + (list chicken-test)) + (build-system chicken-build-system) + (arguments '(#:egg-name "agrep")) + (synopsis "Approximate string matching library") + (home-page "https://wiki.call-cc.org/eggref/5/agrep") + (description + "This library implements the Wu-Manber algorithm for approximate string +searching with errors, popularized by the agrep Unix command and the glimpse +file indexing tool.") + (license license:gpl3+))) + +(define-public chicken-check-errors + (package + (name "chicken-check-errors") + (version "3.6.0") + (source + (origin + (method url-fetch) + (uri (egg-uri "check-errors" version)) + (sha256 + (base32 + "0ddzhsx2g95b62mafk2kvfq64178fmhgqvm4ifqbdl20zmlgzzkx")))) + (native-inputs + (list chicken-test chicken-test-utils)) + (build-system chicken-build-system) + (arguments '(#:egg-name "check-errors")) + (synopsis "Argument checks & errors.") + (home-page "https://wiki.call-cc.org/eggref/5/check-errors") + (description + "Argument checks & errors.") + (license license:bsd-2))) + +(define-public chicken-crypto-tools + (package + (name "chicken-crypto-tools") + (version "1.4") + (source (origin + (method url-fetch) + (uri (egg-uri "crypto-tools" version)) + (sha256 + (base32 + "0ajf0qfnhp99f4x1dll2fhlxrsxamgrrwyksc7rrym77xmv8f1pd")))) + (build-system chicken-build-system) + (arguments '(#:egg-name "crypto-tools")) + (home-page "https://wiki.call-cc.org/egg/crypto-tools") + (synopsis "Useful cryptographic primitives") + (description "The crypto-tools egg implements useful cryptographic +primitives. More specifically, provided are: + +@itemize +@item binary blobs +@itemize +@item marshallers to and from hex strings +@item blob xor +@item blob padding using either PKCS#5 or ISO7816-4 +@end itemize +@item Block cipher modes of operation +@itemize +@item CBC with or without incorporated encrypted IV in the ciphertext +@item CTR with or without incorporated IV in the ciphertext +@end itemize +@end itemize") + (license license:bsd-3))) + (define-public chicken-srfi-1 (package (name "chicken-srfi-1") @@ -116,7 +200,7 @@ source code and load it into the running process.") "02940zsjrmn7c34rnp1rllm2nahh9jvszlzrw8ak4pf31q09cmq1")))) (build-system chicken-build-system) (arguments '(#:egg-name "srfi-1")) - (inputs + (propagated-inputs (list chicken-test)) (home-page "https://wiki.call-cc.org/eggref/5/srfi-1") (synopsis "SRFI-1 list library") @@ -227,36 +311,6 @@ CHICKEN Scheme, along with @uref{https://srfi.schemers.org/srfi-90/srfi-90.html, SRFI-90} extensions.") (license license:bsd-3))) -(define-public chicken-agrep - (package - (name "chicken-agrep") - (version "1.7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/iraikov/chicken-agrep") - (commit version))) - (file-name (string-append "chicken-agrep-" version "-checkout")) - (sha256 - (base32 - "0z05x7f154n9bgmainrsmncf5i6dil43r9ymr3rdgwbg4wnxmz4s")))) - ;; TODO do we really have to make these propagated? - ;; I don't know Chicken's module system well enough to tell - (propagated-inputs - (list chicken-datatype chicken-srfi-1 chicken-srfi-14)) - (inputs - (list chicken-test)) - (build-system chicken-build-system) - (arguments '(#:egg-name "agrep")) - (synopsis "Approximate string matching library") - (home-page "https://wiki.call-cc.org/eggref/5/agrep") - (description - "This library implements the Wu-Manber algorithm for approximate string -searching with errors, popularized by the agrep Unix command and the glimpse -file indexing tool.") - (license license:gpl3+))) - (define-public chicken-datatype (package (name "chicken-datatype") @@ -276,7 +330,7 @@ file indexing tool.") "1a58q8ypjkjz6wdv25247wixds4179239d36nnvsfn6gp70s9jfq")))) (build-system chicken-build-system) (arguments '(#:egg-name "datatype")) - (inputs + (propagated-inputs (list chicken-srfi-1 chicken-test)) (home-page "https://wiki.call-cc.org/eggref/5/datatype") (synopsis "Facility for creating and using variant records") @@ -303,7 +357,7 @@ Languages} by Friedman, Wand, and Haynes.") (sha256 (base32 "0gz50n5i561n5sk9prry0lrxz6bfrq9if5bclaq6a0f7lzinhnzb")))) - (inputs + (propagated-inputs (list chicken-test)) (build-system chicken-build-system) (arguments '(#:egg-name "iset")) @@ -315,6 +369,72 @@ Bit-vectors provide an abstract interface to bitwise operations typically done with integers.") (license license:bsd-3))) +(define-public chicken-miscmacros + (package + (name "chicken-miscmacros") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (egg-uri "miscmacros" version)) + (sha256 + (base32 + "0xs8ksnbpxm0a1s2bcqybliaqpr5agin4ksn3hyjwniqhzx4qzg8")))) + (propagated-inputs + (list )) + (native-inputs + (list )) + (build-system chicken-build-system) + (arguments '(#:egg-name "miscmacros")) + (synopsis "Various useful little macros.") + (home-page "https://wiki.call-cc.org/eggref/5/miscmacros") + (description "Various useful little macros.") + (license license:bsd-2))) + +(define-public chicken-string-utils + (package + (name "chicken-string-utils") + (version "2.7.1") + (source + (origin + (method url-fetch) + (uri (egg-uri "string-utils" version)) + (sha256 + (base32 + "1xaidw3mlch8pcxdxs5jsb3fpma61n5jg9cda9hrc2v6y978i41f")))) + (propagated-inputs + (list chicken-check-errors chicken-miscmacros chicken-srfi-1 chicken-srfi-13 chicken-srfi-69 chicken-utf8)) + (native-inputs + (list chicken-test chicken-test-utils)) + (build-system chicken-build-system) + (arguments '(#:egg-name "string-utils")) + (synopsis "String utilities.") + (home-page "https://wiki.call-cc.org/eggref/5/string-utils") + (description "String utilities.") + (license license:bsd-2))) + +(define-public chicken-symbol-utils + (package + (name "chicken-symbol-utils") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (egg-uri "symbol-utils" version)) + (sha256 + (base32 + "0mxcdlf1i0xn70h9l5grgx1yvkbgq9rcvil02gdp9by5qqcqmklh")))) + (propagated-inputs + (list chicken-utf8)) + (native-inputs + (list chicken-test)) + (build-system chicken-build-system) + (arguments '(#:egg-name "symbol-utils")) + (synopsis "Symbol utilities.") + (home-page "https://wiki.call-cc.org/eggref/5/symbol-utils") + (description "Symbol utilities.") + (license license:bsd-2))) + (define-public chicken-test (package (name "chicken-test") @@ -340,34 +460,96 @@ with integers.") "This package provides a simple testing utility for CHICKEN Scheme.") (license license:bsd-3))) -(define-public chicken-crypto-tools +(define-public chicken-test-utils (package - (name "chicken-crypto-tools") - (version "1.4") - (source (origin - (method url-fetch) - (uri (egg-uri "crypto-tools" version)) - (sha256 - (base32 - "0ajf0qfnhp99f4x1dll2fhlxrsxamgrrwyksc7rrym77xmv8f1pd")))) + (name "chicken-test-utils") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (egg-uri "test-utils" version)) + (sha256 + (base32 + "0c4zj3i4g1iq38ifdgzhrl5lz0v97qzphsyg1d2a6ps6zr7jwgbf")))) + (native-inputs + (list chicken-test)) (build-system chicken-build-system) - (arguments '(#:egg-name "crypto-tools")) - (home-page "https://wiki.call-cc.org/egg/crypto-tools") - (synopsis "Useful cryptographic primitives") - (description "The crypto-tools egg implements useful cryptographic -primitives. More specifically, provided are: + (arguments '(#:egg-name "test-utils")) + (synopsis "Gloss & Runner for CHICKEN Scheme test egg.") + (home-page "https://wiki.call-cc.org/eggref/5/test-utils") + (description + "Gloss & Runner for CHICKEN Scheme test egg.") + (license license:bsd-2))) -@itemize -@item binary blobs -@itemize -@item marshallers to and from hex strings -@item blob xor -@item blob padding using either PKCS#5 or ISO7816-4 -@end itemize -@item Block cipher modes of operation -@itemize -@item CBC with or without incorporated encrypted IV in the ciphertext -@item CTR with or without incorporated IV in the ciphertext -@end itemize -@end itemize") - (license license:bsd-3))) +(define-public chicken-regex + (package + (name "chicken-regex") + (version "2.0") + (source + (origin + (method url-fetch) + (uri (egg-uri "regex" version)) + (sha256 + (base32 + "1hxkva5jvk08wnj3x4lnyxhhyr5vkbs7q99qzpnwmfphbrzmmqzr")))) + (inputs + (list)) + (native-inputs + (list)) + (build-system chicken-build-system) + (arguments '(#:egg-name "regex")) + (synopsis "A thin wrapper around irregex.") + (home-page "https://wiki.call-cc.org/eggref/5/regex") + (description "A thin wrapper around irregex to keep old code working.") + (license license:bsd-2))) + +(define-public chicken-utf8 + (package + (name "chicken-utf8") + (version "3.5.0") + (source + (origin + (method url-fetch) + (uri (egg-uri "utf8" version)) + (sha256 + (base32 + "0k06bck0g5j6s10k0j4k8hy8c4qzxyzxk3mgynqvpvhmpc09iyad")))) + ;; TODO do we really have to make these propagated? + ;; I don't know Chicken's module system well enough to tell + (propagated-inputs + (list chicken-iset)) + (native-inputs + (list chicken-srfi-69 chicken-regex)) + (build-system chicken-build-system) + (arguments '(#:egg-name "utf8")) + (synopsis "Unicode support") + (home-page "https://wiki.call-cc.org/eggref/5/apropos") + (description + "Unicode support") + (license license:bsd-2))) + +(define-public chicken-apropos + (package + (name "chicken-apropos") + (version "3.8.3") + (source + (origin + (method url-fetch) + (uri (egg-uri "apropos" version)) + (sha256 + (base32 + "01zdifhqc0jfm810106sh87w0fmpchf4dph0k8v1lyjzbj1ivmi4")))) + ;; TODO do we really have to make these propagated? + ;; I don't know Chicken's module system well enough to tell + (propagated-inputs + (list chicken-srfi-1 chicken-utf8 chicken-check-errors chicken-symbol-utils + chicken-string-utils)) + (native-inputs + (list chicken-test)) + (build-system chicken-build-system) + (arguments '(#:egg-name "apropos")) + (synopsis "An apropos facility for CHICKEN Scheme.") + (home-page "https://wiki.call-cc.org/eggref/5/apropos") + (description + "An apropos facility for CHICKEN Scheme.") + (license license:bsd-2))) diff --git a/gnu/packages/mozilla.scm b/gnu/packages/mozilla.scm new file mode 100644 index 0000000..9799347 --- /dev/null +++ b/gnu/packages/mozilla.scm @@ -0,0 +1,38 @@ +(define-module (gnu packages mozilla) + #:use-module (guix) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix build-system cmake) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (gnu packages gtk) + #:use-module (gnu packages glib) + #:use-module (gnu packages gstreamer) + #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) + #:use-module (gnu packages wm)) + +(define-public mozilla-vpn-client + (package + (name "mozilla-vpn-client") + (version "2.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mozilla-mobile/mozilla-vpn-client.git") + (commit (string-append "v" version)))) + (sha256 (base32 "0khcdmvdz98cac794znsc7yjwd4w1p9y82nbrl2a8jwp1712a557")))) + (inputs + (list qtdeclarative + qtwebsockets + qtscxml)) + (build-system cmake-build-system) + (home-page "https://vpn.mozilla.org") + (synopsis "A VPN service hosted by Mozilla.") + (description "A VPN service hosted by Mozilla.") + (license license:expat)))