diff options
| author | Oleg Pykhalov <go.wigust@gmail.com> | 2020-11-04 22:00:49 +0300 |
|---|---|---|
| committer | Oleg Pykhalov <go.wigust@gmail.com> | 2020-11-04 22:00:49 +0300 |
| commit | 966d7546d132264b1a116ed8c2fe41b13e2397c7 (patch) | |
| tree | 2c0af7ca7ea89bac113171ac1f7c76a0ec383bb6 | |
| parent | gnu: Add emacs-elfeed-custom. (diff) | |
| download | guix-wigust-966d7546d132264b1a116ed8c2fe41b13e2397c7.tar.gz | |
Update packages.
| -rw-r--r-- | guix/wigust/packages/admin.scm | 51 | ||||
| -rw-r--r-- | guix/wigust/packages/databases.scm | 2 | ||||
| -rw-r--r-- | guix/wigust/packages/documentation.scm | 26 | ||||
| -rw-r--r-- | guix/wigust/packages/emacs.scm | 123 | ||||
| -rw-r--r-- | guix/wigust/packages/feh.scm | 2 | ||||
| -rw-r--r-- | guix/wigust/packages/lisp.scm | 8 | ||||
| -rw-r--r-- | guix/wigust/packages/pspg.scm | 2 | ||||
| -rw-r--r-- | guix/wigust/packages/pulseaudio.scm | 2 | ||||
| -rw-r--r-- | guix/wigust/packages/ruby.scm | 2 | ||||
| -rw-r--r-- | guix/wigust/packages/spectre-meltdown-checker.scm | 2 | ||||
| -rw-r--r-- | guix/wigust/packages/virtualization.scm | 2 | ||||
| -rw-r--r-- | guix/wigust/packages/xorg.scm | 2 | ||||
| -rw-r--r-- | guix/wigust/packages/zabbix.scm | 55 |
13 files changed, 262 insertions, 17 deletions
diff --git a/guix/wigust/packages/admin.scm b/guix/wigust/packages/admin.scm index b3bb958..2a70d39 100644 --- a/guix/wigust/packages/admin.scm +++ b/guix/wigust/packages/admin.scm @@ -26,11 +26,14 @@ #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages bash) + #:use-module (gnu packages firmware) #:use-module (gnu packages gawk) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages virtualization) #:use-module (gnu packages xorg)) (define-public pscircle @@ -222,3 +225,51 @@ with re-written history containing only those directories.") (synopsis "Bash script that works like tee command with Slack") (description "This package provides a ") (license license:asl2.0))) + +(define-public shepherd-patched + (package + (inherit shepherd) + (source (origin + (inherit (package-source shepherd)) + (patches (search-patches "shepherd-supplementary-groups.patch")))))) + +(define-public qemu-windows10 + (package + (name "qemu-windows10") + (version "0.0.1") + (source #f) + (build-system trivial-build-system) + (inputs ;TODO: Add VNC + `(("bash" ,bash-minimal) + ("ovmf" ,ovmf) + ("qemu" ,qemu))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (mkdir-p (string-append %output "/bin")) + (let ((script (string-append %output "/bin/qemu-windows10"))) + (with-output-to-file script + (lambda () + (display (string-append "#!" (assoc-ref %build-inputs "bash") "/bin/bash")) + (newline) + (display (string-join (list "exec -a \"$0\"" + (string-append (assoc-ref %build-inputs "qemu") "/bin/qemu-system-x86_64") + "-smp" "cores=4,threads=1" + "-m" "8G" + "-enable-kvm" + "-cpu" "host" + "-daemonize" + "-vnc" (format #f ":~s" "${QEMU_WINDOWS10_VNC_PORT:-12}") + "-drive" (format #f "file=~s,format=raw,media=disk" "${QEMU_WINDOWS10_DISK:-/dev/sda}") + "--bios" "ovmf_x64.bin" "-L" (string-append (assoc-ref %build-inputs "ovmf") + "/share/firmware")))) + (newline))) + (chmod script #o755)) + #t))) + (home-page "https://superuser.com/questions/342719/how-to-boot-a-physical-windows-partition-with-qemu/1204834") + (synopsis "Script to run Windows 10 on real hard-disk") + (description "This package provides a script to run Windows 10 installed +on a hard-disk.") + (license license:expat))) diff --git a/guix/wigust/packages/databases.scm b/guix/wigust/packages/databases.scm index 0cabfe1..f039db4 100644 --- a/guix/wigust/packages/databases.scm +++ b/guix/wigust/packages/databases.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/wigust/packages/documentation.scm b/guix/wigust/packages/documentation.scm index 45a27a0..7fe3ef4 100644 --- a/guix/wigust/packages/documentation.scm +++ b/guix/wigust/packages/documentation.scm @@ -1,3 +1,4 @@ + ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; @@ -148,3 +149,28 @@ to Bash advances usage.") (synopsis "superserver-3u-mnl-2197") (description "superserver-3u-mnl-2197") (license #f))) + +(define-public book-sicp + (package + (name "book-sicp") + (version "1996") + (source (origin + (method url-fetch) + (uri "https://web.mit.edu/alexmv/6.037/sicp.pdf") + (file-name (string-append name "-" version ".pdf")) + (sha256 + (base32 + "12yszs2pwpas9a6643j5f4z1a0b872jz9i19zpb130vxas3rlw08")))) + (build-system copy-build-system) + (arguments + `(#:install-plan + `((,(assoc-ref %build-inputs "source") + ,(let ((title (string-drop ,name (string-length "book-")))) + (string-append "/share/doc/" title "/" title ".pdf")))) + #:phases (modify-phases %standard-phases (delete 'unpack)))) + (home-page "https://mit.edu/") + (synopsis "Structure and Interpretation of Computer Programs, second edition") + (description "This package provides a PDF version of book Structure and +Interpretation of Computer Programs, second edition.") + (license #f))) + diff --git a/guix/wigust/packages/emacs.scm b/guix/wigust/packages/emacs.scm index b44eeee..a294218 100644 --- a/guix/wigust/packages/emacs.scm +++ b/guix/wigust/packages/emacs.scm @@ -86,6 +86,16 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) +(define-public emacs-with-patched-tramp + (package + (inherit emacs) + (source + (origin + (inherit (package-source emacs)) + (patches (fold cons* '() + (origin-patches (package-source emacs)) + (search-patches "emacs-tramp-sudo.patch"))))))) + (define-public emacs-athena ;; GTK+ could kill emacs --daemon, ;; see <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. @@ -1571,3 +1581,116 @@ with Git-based projects.") (description "This package provides functions for Org-mode to manage entries according to information received via Debbugs.") (license license:gpl3+))) + +(define-public emacs-elfeed-score + (package + (name "emacs-elfeed-score") + (version "0.4.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sp1ff/elfeed-score") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-elfeed" ,emacs-elfeed))) + (home-page "https://github.com/sp1ff/elfeed-score/") + (synopsis "Gnus-style scoring for Elfeed") + (description "@code{elfeed-score} is an add-on for @code{elfeed} which +brings @code{gnus} like scoring feeds.") + (license license:gpl3+))) + +(define-public emacs-org-tanglesync-1.1.0 + (let ((commit "af83a73ae542d5cb3c9d433cbf2ce1d4f4259117") + (revision "0")) + (package + (inherit emacs-org-tanglesync) + (version (git-version "1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mtekman/org-tanglesync.el") + (commit commit))) + (file-name (git-file-name (package-name emacs-org-tanglesync) version)) + (sha256 + (base32 "11rfn0byy0k0321w7fjgpa785ik1nrk1j6d0y4j0j4a8gys5hjr5")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "org-tanglesync.el" + (("\\(goto-char lmark\\)" line) + (string-append line " (org-end-of-line) (forward-char)"))))))))))) + +(define-public emacs-geiser-0.10 + (package + (inherit emacs-geiser) + (version "0.10") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/geiser/" version + "/geiser-" version ".tar.gz")) + (sha256 + (base32 + "0pj3l7p8d60c9b4vfprnv6g5l61d74pls4b5dvd84cn4ky9mzwjv")))))) + +(define-public emacs-treemacs-no-tests + (package + (inherit emacs-treemacs) + (arguments + (substitute-keyword-arguments (package-arguments emacs-treemacs) + ((#:phases phases) + `(modify-phases ,phases + (delete 'check))) + ((#:tests? tests?) #f))))) + +(define-public emacs-lsp-java-fix-treemacs + (package + (inherit emacs-lsp-java) + (propagated-inputs + `(("emacs-treemacs" ,emacs-treemacs-no-tests) + ,@(assoc-remove! (package-propagated-inputs emacs-lsp-java) + "emacs-treemacs"))))) + +(define-public emacs-slime-2.24 + (package + (inherit emacs-slime) + (name (package-name emacs-slime)) + (version "2.24") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slime/slime") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0js24x42m7b5iymb4rxz501dff19vav5pywnzv50b673rbkaaqvh")))))) + +(define-public emacs-tickscript-mode + (package + (name "emacs-tickscript-mode") + (version "0.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/msherry/tickscript-mode") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "173zk9nzjds0rkypmaq8xv5qianivgk16jpzgk0msdsn9kjbd8s9")))) + (build-system emacs-build-system) + (home-page "https://github.com/msherry/tickscript-mode/") + (synopsis "Major mode for Tickscript files") + (description "Provides Emacs font-lock, indentation, navigation, and +utility functions for working with TICKscript, a DSL for use with Kapacitor +and InfluxDB.") + (license license:gpl3+))) diff --git a/guix/wigust/packages/feh.scm b/guix/wigust/packages/feh.scm index fe15425..26edb53 100644 --- a/guix/wigust/packages/feh.scm +++ b/guix/wigust/packages/feh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/wigust/packages/lisp.scm b/guix/wigust/packages/lisp.scm index 137a99c..510cc68 100644 --- a/guix/wigust/packages/lisp.scm +++ b/guix/wigust/packages/lisp.scm @@ -81,19 +81,11 @@ ("sbcl-fiasco", sbcl-fiasco) ("dbus" ,dbus) ,@(package-inputs sbcl-stumpwm))) - (native-inputs `(("texinfo" ,texinfo))) - (outputs (append (package-outputs sbcl-stumpwm) '("doc"))) (arguments (substitute-keyword-arguments (package-arguments sbcl-stumpwm) ((#:phases phases) `(modify-phases ,phases - (add-after 'build-program 'build-documentation - (lambda* (#:key outputs #:allow-other-keys) - (invoke "makeinfo" "stumpwm.texi.in") - (install-file "stumpwm.info" - (string-append (assoc-ref outputs "doc") - "/share/info")))) (replace 'create-desktop-file (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) diff --git a/guix/wigust/packages/pspg.scm b/guix/wigust/packages/pspg.scm index 4676dff..eb695d5 100644 --- a/guix/wigust/packages/pspg.scm +++ b/guix/wigust/packages/pspg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/wigust/packages/pulseaudio.scm b/guix/wigust/packages/pulseaudio.scm index 8747c0a..6853801 100644 --- a/guix/wigust/packages/pulseaudio.scm +++ b/guix/wigust/packages/pulseaudio.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/wigust/packages/ruby.scm b/guix/wigust/packages/ruby.scm index 5f7acef..25d58e1 100644 --- a/guix/wigust/packages/ruby.scm +++ b/guix/wigust/packages/ruby.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2017, 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/wigust/packages/spectre-meltdown-checker.scm b/guix/wigust/packages/spectre-meltdown-checker.scm index 12f4674..bad488e 100644 --- a/guix/wigust/packages/spectre-meltdown-checker.scm +++ b/guix/wigust/packages/spectre-meltdown-checker.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/wigust/packages/virtualization.scm b/guix/wigust/packages/virtualization.scm index 200f6de..d016896 100644 --- a/guix/wigust/packages/virtualization.scm +++ b/guix/wigust/packages/virtualization.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/wigust/packages/xorg.scm b/guix/wigust/packages/xorg.scm index 9b6cd8b..c39a41e 100644 --- a/guix/wigust/packages/xorg.scm +++ b/guix/wigust/packages/xorg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/guix/wigust/packages/zabbix.scm b/guix/wigust/packages/zabbix.scm index 0f38562..d8f9b6a 100644 --- a/guix/wigust/packages/zabbix.scm +++ b/guix/wigust/packages/zabbix.scm @@ -1,12 +1,16 @@ + ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com> (define-module (wigust packages zabbix) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages admin) #:use-module (gnu packages bash) + #:use-module (gnu packages dns) #:use-module (gnu packages guile) + #:use-module (gnu packages monitoring) #:use-module (gnu packages package-management) + #:use-module (gnu packages python) #:use-module (guix build utils) #:use-module (guix build-system guile) #:use-module (guix build-system trivial) @@ -134,3 +138,52 @@ channels difference.") (synopsis "Monitor Guix in Zabbix") (license license:gpl3+)))) + +(define-public zabbix-dnscheck + (package + (name "zabbix-dnscheck") + (version "1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nobodysu/zabbix-dnscheck") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gbidg2g2wp29hffb82k4faqrbrgsrq6n9rg3l9asysmzq1dq7mx")))) + (build-system trivial-build-system) + (inputs + `(("bind" ,isc-bind "utils") + ("python" ,python) + ("zabbix-agentd" ,zabbix-agentd))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (copy-recursively (assoc-ref %build-inputs "source") ".") + (setenv "PATH" + (string-append + (assoc-ref %build-inputs "zabbix-agentd") "/bin/" ":" + (assoc-ref %build-inputs "python") "/bin" ":" + (assoc-ref %build-inputs "bind") "/bin")) + (substitute* "externalscripts/dnscheck-send.py" + (("#!/usr/bin/env python3") (string-append "#!" (which "python3"))) + (("'zabbix_sender'") (format #f "~s" (which "zabbix_sender"))) + (("192.0.2.2") "127.0.0.1")) + (substitute* "externalscripts/dnscheck-gather-lld.py" + (("#!/usr/bin/env python3") (string-append "#!" (which "python3"))) + (("'python3'") (format #f "~s" (which "python3"))) + (("'host'") (format #f "~s" (which "host"))) + (("'/usr/lib/zabbix/externalscripts/dnscheck-send.py'") + (format #f "~s" (string-append %output "/bin/dnscheck-send.py")))) + (for-each (lambda (file) + (install-file file (string-append %output "/bin"))) + '("externalscripts/dnscheck-send.py" + "externalscripts/dnscheck-gather-lld.py")) + #t))) + (home-page "https://github.com/nobodysu/zabbix-dnscheck") + (synopsis "DNS Check Discovery script") + (description "This package provides a DNS Check Discovery.") + (license license:unlicense))) |
