;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2014, 2015, 2016, 2018, 2019 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
-;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016, 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
+ #:use-module (guix build-system ruby)
#:use-module (guix build-system trivial)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (gnu packages elf)
#:use-module (gnu packages file)
#:use-module (gnu packages flex)
+ #:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages serialization)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages tcl)
#:use-module (gnu packages terminals)
(method git-fetch)
(uri
(git-reference
- (url "https://github.com/nomius/ktsuss.git")
+ (url "https://github.com/nomius/ktsuss")
(commit version)))
(sha256
(base32 "0q9931f9hp47v1n8scli4bdg2rkjpf5jf8v7jj2gdn83aia1r2hz"))
(define-public progress
(package
(name "progress")
- (version "0.14")
+ (version "0.15")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Xfennec/progress.git")
+ (url "https://github.com/Xfennec/progress")
(commit (string-append "v" version))))
(sha256
- (base32 "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl"))
+ (base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
`(("ncurses" ,ncurses)))
(arguments
`(#:tests? #f ; no test suite
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list ,(string-append "CC=" (cc-for-target))
+ (string-append "PKG_CONFIG="
+ (if target
+ (string-append target "-pkg-config")
+ "pkg-config"))
+ (string-append "PREFIX=" (assoc-ref %outputs "out"))))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
(define-public shepherd
(package
(name "shepherd")
- (version "0.8.0")
+ (version "0.8.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/shepherd/shepherd-"
version ".tar.gz"))
(sha256
(base32
- "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll"))))
+ "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--localstatedir=/var")))
(define-public cloud-utils
(package
(name "cloud-utils")
- (version "0.31")
+ (version "0.32")
(source
(origin
(method url-fetch)
version "/+download/cloud-utils-" version ".tar.gz"))
(sha256
(base32
- "07fl3dlqwdzw4xx7mcxhpkks6dnmaxha80zgs9f6wmibgzni8z0r"))))
+ "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags
graphs and can export its output to different formats.")
(license license:bsd-3)))
-(define-public htop
+(define-public facter
(package
- (name "htop")
- (version "2.2.0")
+ (name "facter")
+ (version "4.0.44")
(source (origin
- (method url-fetch)
- (uri (string-append "http://hisham.hm/htop/releases/"
- version "/htop-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/puppetlabs/facter")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"))))
+ "0cs4cr5xc3yvnln9k3gdhypnq6iw4zfrhqrhslvli11l9mwdbjwn"))))
+ (build-system ruby-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'delete-facter-ng-gemspec
+ (lambda _
+ ;; XXX: ruby-build-system incorrectly finds
+ ;; facter-ng.gemspec from this directory and tries to
+ ;; build that instead of the proper facter.gemspec.
+ ;; Just delete it as a workaround, as it appears to
+ ;; only exist for backwards-compatibility after the
+ ;; facter-ng->facter rename.
+ (delete-file "agent/facter-ng.gemspec")
+ #t))
+ (add-after 'unpack 'embed-absolute-references
+ ;; Refer to absolute executable file names to avoid propagation.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* (find-files "lib/facter/resolvers" "\\.rb$")
+ (("execute\\('(which |)([^ ']+)" _ _ name)
+ (string-append "execute('" (or (which name)
+ name))))
+ #t))
+ (delete 'check)
+ (add-after 'wrap 'check
+ (lambda* (#:key tests? outputs #:allow-other-keys)
+ ;; XXX: The test suite wants to run Bundler and
+ ;; complains that the gemspec is invalid. For now
+ ;; just make sure that we can run the wrapped
+ ;; executable directly.
+ (if tests?
+ (invoke (string-append (assoc-ref outputs "out")
+ "/bin/facter")
+ ;; Many facts depend on /sys, /etc/os-release,
+ ;; etc, so we only run a small sample.
+ "facterversion" "architecture"
+ "kernel" "kernelversion")
+ (format #t "tests disabled~%"))
+ #t)))))
+ (inputs
+ `(("ruby-hocon" ,ruby-hocon)
+ ("ruby-sys-filesystem" ,ruby-sys-filesystem)
+ ("ruby-thor" ,ruby-thor)
+
+ ;; For ‘embed-absolute-references’.
+ ("dmidecode" ,dmidecode)
+ ("inetutils" ,inetutils) ; for ‘hostname’
+ ("iproute" ,iproute)
+ ("pciutils" ,pciutils)
+ ("util-linux" ,util-linux)))
+ (synopsis "Collect and display system facts")
+ (description
+ "Facter is a tool that gathers basic facts about nodes (systems) such
+as hardware details, network settings, OS type and version, and more. These
+facts can be collected on the command line with the @command{facter} command
+or via the @code{facter} Ruby library.")
+ (home-page "https://github.com/puppetlabs/facter-ng")
+ (license license:expat)))
+
+(define-public htop
+ (package
+ (name "htop")
+ (version "3.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/htop-dev/htop")
+ (commit version)))
+ (sha256
+ (base32 "1qmqhbnc5yw4brd24yrp85k09770c1c00nl03mkv5pdz2bvqivk7"))
+ (file-name (git-file-name name version))))
(build-system gnu-build-system)
(inputs
`(("ncurses" ,ncurses)))
(native-inputs
- `(("python" ,python-wrapper))) ;for scripts/MakeHeader.py
- (home-page "https://hisham.hm/htop/")
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)))
+ (home-page "https://htop.dev")
(synopsis "Interactive process viewer")
(description
"This is htop, an interactive process viewer. It is a text-mode
application (for console or X terminals) and requires ncurses.")
(license license:gpl2)))
+(define-public bashtop
+ (package
+ (name "bashtop")
+ (version "0.9.25")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/aristocratos/bashtop")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07nlr6vmyb7yihaxj1fp424lmhwkdjl6mls92v90f6gsvikpa13v"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:make-flags (list (string-append "PREFIX=" %output))
+ #:tests? #f ; bats test fails with loading load.bash
+ #:phases (modify-phases %standard-phases (delete 'configure))))
+ (home-page "https://github.com/aristocratos/bashtop")
+ (synopsis "Linux/OSX/FreeBSD resource monitor")
+ (description "Resource monitor that shows usage and stats for processor,
+memory, disks, network and processes.")
+ (license license:asl2.0)))
+
(define-public pies
(package
(name "pies")
(define-public netcat-openbsd
(package
(name "netcat-openbsd")
- (version "1.206-1")
+ (version "1.217-2")
(source (origin
(method git-fetch)
(uri (git-reference
(file-name (git-file-name name version))
(sha256
(base32
- "08r3mmck3s5pbvwyq19wp5g8jqcxza3cm8nkc6jm7rqn4jdydc4z"))))
+ "19sr52ix14w344pv13ppb0c1wyg5dxhic1fw2q0s3qfmx57b9hhp"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no test suite
+ `(#:tests? #f ; no test suite
#:make-flags
- (list "CC=gcc"
- (string-append "CFLAGS=-I" (assoc-ref %build-inputs "libbsd") "/include")
- "LDFLAGS=-lbsd")
+ (list (string-append "CC=" ,(cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(define-public isc-dhcp
(let* ((bind-major-version "9")
(bind-minor-version "11")
- (bind-patch-version "18")
+ (bind-patch-version "22")
(bind-release-type "") ; for patch release, use "-P"
(bind-release-version "") ; for patch release, e.g. "6"
(bind-version (string-append bind-major-version
;; if finds all the programs it needs.
(let* ((out (assoc-ref outputs "out"))
(libexec (string-append out "/libexec"))
- (coreutils (assoc-ref inputs "coreutils"))
+ (coreutils (assoc-ref inputs "coreutils*"))
(inetutils (assoc-ref inputs "inetutils"))
(net-tools (assoc-ref inputs "net-tools"))
- (sed (assoc-ref inputs "sed")))
+ (sed (assoc-ref inputs "sed*")))
(substitute* "client/scripts/linux"
(("/sbin/ip")
(string-append (assoc-ref inputs "iproute")
"/bind-" bind-version ".tar.gz"))
(sha256
(base32
- "0vws0zzb39mkphj4hhjrgfj9dzw951lc4pfa6pqg5ll5ma51mbsr"))))
+ "1j9a4r83a77mp8k1y8z524c9rzdqgd8rzwczd6zwmw86a00xiimg"))))
- ;; When cross-compiling, we need the cross Coreutils and sed.
- ;; Otherwise just use those from %FINAL-INPUTS.
- ,@(if (%current-target-system)
- `(("coreutils" ,coreutils)
- ("sed" ,sed))
- '())))
+ ("coreutils*" ,coreutils)
+ ("sed*" ,sed)))
(home-page "https://www.isc.org/products/DHCP/")
(synopsis "Dynamic Host Configuration Protocol (DHCP) tools")
"packdir=\"/var/log\""))
#t))
(add-before 'install 'tweak-rc-weekly
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "rc/weekly"
(("/bin/kill")
- (which "kill"))
+ (string-append (assoc-ref inputs "coreutils*")
+ "/bin/kill"))
(("syslogd\\.pid")
;; The file is called 'syslog.pid' (no 'd').
"syslog.pid"))
(native-inputs `(("texinfo" ,texinfo)
("automake" ,automake)
("util-linux" ,util-linux))) ; for 'cal'
+ (inputs `(("coreutils*" ,coreutils)))
(home-page "https://www.gnu.org/software/rottlog/")
(synopsis "Log rotation and management")
(description
(define-public sudo
(package
(name "sudo")
- (version "1.9.0")
+ (version "1.9.3p1")
(source (origin
(method url-fetch)
(uri
version ".tar.gz")))
(sha256
(base32
- "0p7r3cl16pjwbc48ff1gbhjw51lngrghvwblxz5lxpyzqlwi88xb"))
+ "17mldsg5d08s23cskmjxfa81ibnqw3slgf3l4023j72ywi9xxffw"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "lib/zlib")
#t))))
(build-system gnu-build-system)
+ (outputs (list "out"))
(arguments
`(#:configure-flags
(list (string-append "--docdir=" (assoc-ref %outputs "out")
"/share/doc/" ,name "-" ,version)
- ;; XXX: Disable Python support when cross-compiling because
- ;; 'configure' tries to run 'python', which fails.
- ,(if (%current-target-system)
- "--disable-python"
- "--enable-python") ; for plug-ins written in ~
-
"--with-logpath=/var/log/sudo.log"
"--with-rundir=/var/run/sudo" ; must be cleaned up at boot time
"--with-vardir=/var/db/sudo"
;; the chroot's /etc/passwd doesn't have it. Turn off the tests.
#:tests? #f))
(native-inputs
- `(("groff" ,groff)))
+ ;; XXX TODO: Remove on next rebuild cycle.
+ (if (hurd-target?)
+ '()
+ `(("groff" ,groff))))
(inputs
`(("coreutils" ,coreutils)
("linux-pam" ,linux-pam)
- ,@(if (%current-target-system)
- '()
- `(("python" ,python)))
("zlib" ,zlib)))
(home-page "https://www.sudo.ws/")
(synopsis "Run commands as root")
;; See <http://www.sudo.ws/sudo/license.html>.
(license license:x11)))
+(define-public opendoas
+ (package
+ (name "opendoas")
+ (version "6.6.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Duncaen/OpenDoas")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ ;; The configure script doesn't accept most of the default flags.
+ (lambda* (#:key configure-flags #:allow-other-keys)
+ ;; The configure script can only be told which compiler to use
+ ;; through environment variables.
+ (setenv "CC" ,(cc-for-target))
+ (apply invoke "./configure" configure-flags)))
+ (add-before 'install 'fix-makefile
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "bsd.prog.mk"
+ (("^\tchown.*$") ""))
+ #t)))
+ #:configure-flags
+ (list (string-append "--prefix=" (assoc-ref %outputs "out"))
+ ;; Nothing is done with this value (yet?) but it's supported.
+ ;; (string-append "--target=" (or ,(%current-target-system) ""))
+ "--with-timestamp")
+ ;; Compiler choice is not carried over from the configure script.
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target)))
+ #:tests? #f)) ; no test suite
+ (native-inputs
+ `(("bison" ,bison)))
+ (home-page "https://github.com/Duncaen/OpenDoas")
+ (synopsis "Portable version of OpenBSD's doas command")
+ (description "Doas is a minimal replacement for the venerable sudo. It was
+initially written by Ted Unangst of the OpenBSD project to provide 95% of the
+features of sudo with a fraction of the codebase.")
+ (license (list license:bsd-3 ; libbsd/*
+ license:isc)))) ; everything else
+
(define-public wpa-supplicant-minimal
(package
(name "wpa-supplicant-minimal")
(define-public dmidecode
(package
(name "dmidecode")
- (version "3.2")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "mirror://savannah/dmidecode/dmidecode-"
- version ".tar.xz"))
- (sha256
- (base32
- "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"))))
+ (version "3.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://savannah/dmidecode/dmidecode-"
+ version ".tar.xz"))
+ (sha256
+ (base32 "0m8lzg9rf1qssasiix672bxk5qwms90561g8hfkkhk31h2kkgiw2"))))
(build-system gnu-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases (delete 'configure))
- #:tests? #f ; no 'check' target
- #:make-flags (list (string-append "prefix="
- (assoc-ref %outputs "out")))))
+ `(#:tests? #f ; no 'check' target
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target))
+ (string-append "prefix="
+ (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)))) ; no configure script
(home-page "https://www.nongnu.org/dmidecode/")
(synopsis "Read hardware information from the BIOS")
(description
(define-public acpica
(package
(name "acpica")
- (version "20200430")
+ (version "20200717")
(source (origin
(method url-fetch)
(uri (string-append
version ".tar.gz"))
(sha256
(base32
- "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc"))))
+ "0jyy71szjr40c8v40qqw6yh3gfk8d6sl3nay69zrn5d88i3r0jca"))))
(build-system gnu-build-system)
(native-inputs `(("flex" ,flex)
("bison" ,bison)))
(define-public s-tui
(package
(name "s-tui")
- (version "1.0.0")
+ (version "1.0.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "s-tui" version))
(sha256
- (base32 "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n"))))
+ (base32 "0xkfdaz5np21311ffdvhks58155qby8j8scbcixhvjd913pj66qx"))))
(build-system python-build-system)
(inputs
`(("python-psutil" ,python-psutil)
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dharple/detox.git")
+ (url "https://github.com/dharple/detox")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(define-public libcap-ng
(package
(name "libcap-ng")
- (version "0.7.10")
+ (version "0.8")
(source (origin
(method url-fetch)
(uri (string-append
version ".tar.gz"))
(sha256
(base32
- "1gzzy12agfa9ddipdf72h9y68zqqnvsjjylv4vnq6hj4w2safk58"))))
+ "08cy59iassiwbmfxa5v0kb374r80290vv32f5q1mnip11av26kgi"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(define-public fdupes
(package
(name "fdupes")
- (version "1.6.1")
+ (version "2.1.2")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/adrianlopezroche/fdupes.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (string-append "https://github.com/adrianlopezroche/fdupes/"
+ "releases/download/v" version "/"
+ "fdupes-" version ".tar.gz"))
(sha256
- (base32 "19b6vqblddaw8ccw4sn0qsqzbswlhrz8ia6n4m3hymvcxn8skpz9"))))
+ (base32 "1g9p50xhi2sp0hqxml4w2k0kq9jv988q2yxm347z5349dlxvap6d"))))
(build-system gnu-build-system)
- (arguments
- '(#:phases (modify-phases %standard-phases
- (delete 'configure))
- #:tests? #f ; no 'check' target
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX="
- (assoc-ref %outputs "out")))))
+ (inputs
+ `(("ncurses" ,ncurses)
+ ("pcre2" ,pcre2)))
(home-page "https://github.com/adrianlopezroche/fdupes")
(synopsis "Identify duplicate files")
(description
(define-public ansible
(package
(name "ansible")
- (version "2.9.6")
+ (version "2.9.11")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible" version))
(sha256
- (base32 "1jfbp1i3nl4yvqwd5ssy43dz3pq2x03mn875vb8r56gqh43kmksr"))))
+ (base32 "1c9ayh61qwasgncmlw7rjx5r4g5n2cpg1d5blgn53zg7xhrx1yc8"))))
(build-system python-build-system)
(native-inputs
`(("python-bcrypt" ,python-bcrypt)
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/opsengine/cpulimit.git")
+ (url "https://github.com/opsengine/cpulimit")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/wting/autojump.git")
+ (url "https://github.com/wting/autojump")
(commit (string-append "release-v" version))))
(file-name (git-file-name name version))
(sha256
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/clvv/fasd.git")
+ (url "https://github.com/clvv/fasd")
(commit version)))
(file-name (git-file-name name version))
(sha256
(define-public nmap
(package
(name "nmap")
- (version "7.80")
+ (version "7.91")
(source (origin
(method url-fetch)
(uri (string-append "https://nmap.org/dist/nmap-" version
".tar.bz2"))
(sha256
(base32
- "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"))
+ "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"))
(modules '((guix build utils)))
(snippet
'(begin
results (ndiff), and a packet generation and response analysis tool (nping).")
;; This package uses nmap's bundled versions of libdnet and liblinear, which
;; both use a 3-clause BSD license.
- (license (list license:nmap license:bsd-3))))
+ (license (list license:npsl license:bsd-3))))
(define-public dstat
(package
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/dagwieers/dstat.git")
+ (url "https://github.com/dstat-real/dstat")
(commit (string-append "v" version))))
(file-name (git-file-name "dstat" version))
(sha256
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no make check
- #:make-flags (let ((out (assoc-ref %outputs "out")))
- (list (string-append "DESTDIR=" out)
- "prefix=/"))
+ #:make-flags
+ (list (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-python3-DeprecationWarning
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/nvbn/thefuck.git")
+ (url "https://github.com/nvbn/thefuck")
(commit version)))
(file-name (git-file-name name version))
(sha256
(define-public di
(package
(name "di")
- (version "4.47.3")
+ (version "4.48")
(source
(origin
(method url-fetch)
(uri (string-append "https://gentoo.com/di/di-" version ".tar.gz"))
(sha256
- (base32 "0m4npba50sf5s61g5z3xd2r7937zwja941f2h3f081xi24c2hfck"))))
+ (base32 "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; obscure test failures
(delete 'configure) ; no configure script
(add-before 'build 'setup-environment
(lambda* (#:key outputs #:allow-other-keys)
- (setenv "CC" "gcc")
+ (setenv "CC" ,(cc-for-target))
(setenv "prefix" (assoc-ref outputs "out"))
#t)))
#:make-flags (list "--environment-overrides")))
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/valr/cbatticon.git")
+ (url "https://github.com/valr/cbatticon")
(commit version)))
(sha256
(base32 "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"))
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/TrilbyWhite/interrobang.git")
+ (url "https://github.com/TrilbyWhite/interrobang")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/linux-sunxi/sunxi-tools.git")
+ (url "https://github.com/linux-sunxi/sunxi-tools")
(commit (string-append "v" version))))
(sha256
(base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd"))
+ (patches
+ (search-patches "sunxi-tools-remove-sys-io.patch"))
(modules '((guix build utils)))
(snippet
;; Remove binaries contained in the tarball which are only for the
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/aureliojargas/sedsed.git")
+ (url "https://github.com/aureliojargas/sedsed")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(define-public neofetch
(package
(name "neofetch")
- (version "7.0.0")
+ (version "7.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
(file-name (git-file-name name version))
(sha256
(base32
- "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr"))))
+ "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; there are no tests
everyone's screenshots nowadays.")
(license license:gpl3)))
+(define-public ufetch
+ (let ((commit "98b622023e03fe24dbc137e9a68104dfe1fbd04a")
+ (revision "1"))
+ (package
+ (name "ufetch")
+ (version (git-version "0.2" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/jschx/ufetch.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "09c4zmikza16xpydinnqbi3hmcibfrrn10wij7j0j1wv1pj2sl2l"))))
+ (build-system trivial-build-system)
+ (inputs
+ `(("bash" ,bash)
+ ("tput" ,ncurses)))
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((source (assoc-ref %build-inputs "source"))
+ (output (assoc-ref %outputs "out"))
+ (bindir (string-append output "/bin"))
+ (docdir (string-append output "/share/doc/ufetch-" ,version))
+ (tput (string-append (assoc-ref %build-inputs "tput") "/bin/tput")))
+ (install-file (string-append source "/LICENSE") docdir)
+ (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin"))
+ (mkdir-p bindir)
+ (for-each (lambda (src)
+ (let ((dst (string-append bindir "/" (basename src))))
+ (copy-file src dst)
+ (patch-shebang dst)
+ (substitute* dst (("tput") tput))))
+ (find-files source "ufetch-[[:alpha:]]*$"))
+ ;; Note: the `ufetch` we create below will only work if run under
+ ;; the Guix System. I.e. a user trying to run `ufetch` on a
+ ;; foreign distro will not get great results. The `screenfetch`
+ ;; program does actual runtime detection of the operating system,
+ ;; and would be a better choice in such a situation.
+ (symlink "ufetch-guix" (string-append bindir "/ufetch"))))))
+ (home-page "https://gitlab.com/jschx/ufetch")
+ (synopsis "Tiny system info")
+ (description "This package provides a tiny system info utility.")
+ (license license:isc))))
+
+(define-public pfetch
+ (let ((commit "e18a0959ab98b963744755ec4687e59dc11db3c5")
+ (revision "0"))
+ (package
+ (name "pfetch")
+ (version (git-version "0.7.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dylanaraps/pfetch")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1md40av6i3xvvwig5jzhy4kf3s5sgxxk35r0vcyrjd8qyndk927l"))))
+ (build-system trivial-build-system)
+ (inputs `(("bash" ,bash)))
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((source (lambda (f)
+ (string-append (assoc-ref %build-inputs "source") "/" f)))
+ (output (assoc-ref %outputs "out"))
+ (docdir (string-append output "/share/doc/pfetch-" ,version)))
+ (install-file (source "LICENSE.md") docdir)
+ (install-file (source "README.md") docdir)
+ (install-file (source "pfetch") (string-append output "/bin"))
+ (patch-shebang
+ (string-append output "/bin/pfetch")
+ (list (string-append (assoc-ref %build-inputs "bash") "/bin")))
+ #t))))
+ (home-page "https://github.com/dylanaraps/pfetch")
+ (synopsis "System information tool")
+ (description "This package provides a simple, configurable system
+information tool.")
+ (license license:expat))))
+
(define-public nnn
(package
(name "nnn")
- (version "2.8.1")
+ (version "3.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/jarun/nnn/releases/download/v"
version "/nnn-v" version ".tar.gz"))
(sha256
- (base32 "1g47bndxld875d0xb3pgmlw223mz47p1xcvwym861y6l4zkgiyp0"))))
+ (base32 "189h950m1jjrnhvgcvzk6nj89l58rkxim7bxa0441ssajxpaw0vq"))))
(build-system gnu-build-system)
(inputs
`(("ncurses" ,ncurses)
(define-public thermald
(package
(name "thermald")
- (version "1.9.1")
+ (version "2.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/01org/thermal_daemon")
+ (url "https://github.com/intel/thermal_daemon")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0iagc3jqpnh6q2fa1gx4wx6r8qg0556j60xr159zqg95djr4dv99"))))
+ (base32 "1nrhv3bypyc48h9smj5cpq63rawm6vqyg3cwkhpz69rgjnf1283m"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(let ((out (assoc-ref %outputs "out")))
- (list (string-append "--sysconfdir="
- out "/etc")
- (string-append "--with-dbus-sys-dir="
+ (list (string-append "--with-dbus-sys-dir="
out "/etc/dbus-1/system.d")
"--localstatedir=/var"))))
(native-inputs
`(("autoconf" ,autoconf)
+ ("autoconf-archive" ,autoconf-archive)
("automake" ,automake)
("glib" ,glib "bin") ; for glib-genmarshal, etc.
("pkg-config" ,pkg-config)))
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/robertdavidgraham/masscan.git")
+ (url "https://github.com/robertdavidgraham/masscan")
(commit version)))
(file-name (git-file-name name version))
(sha256
;; We use git checkout to avoid github auto-generated tarballs
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hpc/Spindle.git")
+ (url "https://github.com/hpc/Spindle")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(let ((real-name "inxi"))
(package
(name "inxi-minimal")
- (version "3.0.38-1")
+ (version "3.1.08-1")
(source
(origin
(method git-fetch)
(commit version)))
(file-name (git-file-name real-name version))
(sha256
- (base32 "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm"))))
+ (base32 "15b0fn8kv09k7kzyzix1pr1wmjw5yinzgw01v8pf9p547m4a899a"))))
(build-system trivial-build-system)
(inputs
`(("bash" ,bash-minimal)
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/pwr/Solaar.git")
+ (url "https://github.com/pwr/Solaar")
(commit version)))
(file-name (git-file-name name version))
(sha256
(("'--prefix' in sys\\.argv")
"len([x.startswith('--prefix=') for x in sys.argv]) > 0"))
#t))
- (replace 'build
- (lambda _
- (invoke "python" "setup.py" "build")))
- (add-before 'check 'setenv-PATH
+ (add-before 'build 'setenv-PATH
(lambda _
(setenv "PYTHONPATH" (string-append "lib:" (getenv "PYTHONPATH")))
#t)))))
supports. It can also mount encrypted LUKS volumes using the password
supplied by the user when logging in.")
(license (list license:gpl2+ license:lgpl2.1+))))
+
+(define-public jc
+ (package
+ (name "jc")
+ (version "1.13.4")
+ (source
+ (origin
+ ;; The PyPI tarball lacks the test suite.
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kellyjonbrazil/jc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0rwvyyrdnw43pixp8h51rncq2inc9pbbj1j2191y5si00pjw34zr"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-pygments" ,python-pygments)
+ ("python-ruamel.yaml" ,python-ruamel.yaml)
+ ("python-xmltodict" ,python-xmltodict)))
+ (home-page "https://github.com/kellyjonbrazil/jc")
+ (synopsis "Convert the output of command-line tools to JSON")
+ (description "@code{jc} JSONifies the output of many CLI tools and
+file-types for easier parsing in scripts.")
+ (license license:expat)))
+
+(define-public jtbl
+ (package
+ (name "jtbl")
+ (version "1.1.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/kellyjonbrazil/jtbl")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1zzd7rd63xva50f22d1rfja4r302aizrafarhwm67vv181swvdya"))))
+ (build-system python-build-system)
+ (inputs
+ `(("python-tabulate" ,python-tabulate)))
+ (home-page "https://github.com/kellyjonbrazil/jtbl")
+ (synopsis "Command-line tool to print JSON data as a table in the terminal")
+ (description "@code{jtbl} accepts piped JSON data from stdin and outputs a
+text table representation to stdout.")
+ (license license:expat)))
+
+(define-public hosts
+ (package
+ (name "hosts")
+ (version "3.6.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/xwmx/hosts")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1ni4z89kxzgwm26hhx908g04f2h0fypy7lgfa0rvsz8d0wslgcsn"))))
+ (build-system trivial-build-system)
+ (inputs
+ `(("bats" ,bats) ;for test
+ ("awk" ,gawk)
+ ("bash" ,bash)
+ ("coreutils" ,coreutils)
+ ("diffutils" ,diffutils)
+ ("grep" ,grep)
+ ("ncurses" ,ncurses) ;tput
+ ("sed" ,sed)))
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ ;; copy source
+ (copy-recursively (assoc-ref %build-inputs "source") ".")
+ ;; patch-shebang phase
+ (setenv "PATH"
+ (string-append (assoc-ref %build-inputs "bash") "/bin"
+ ":" (assoc-ref %build-inputs "awk") "/bin"
+ ":" (assoc-ref %build-inputs "coreutils") "/bin"
+ ":" (assoc-ref %build-inputs "diffutils") "/bin"
+ ":" (assoc-ref %build-inputs "grep") "/bin"
+ ":" (assoc-ref %build-inputs "ncurses") "/bin"
+ ":" (assoc-ref %build-inputs "sed") "/bin"
+ ":" "/run/setuid-programs"
+ ":" (getenv "PATH")))
+ (substitute* "hosts"
+ (("#!/usr/bin/env bash")
+ (string-append "#!" (which "bash")
+ "\nPATH=" (getenv "PATH"))))
+ ;; check phase
+ (setenv "TERM" "linux") ;set to tty for test
+ (invoke (string-append (assoc-ref %build-inputs "bats") "/bin/bats")
+ "test")
+ ;; install phase
+ (install-file "hosts" (string-append %output "/bin"))
+ (let ((bash-completion
+ (string-append %output "/etc/bash_completion.d")))
+ (mkdir-p bash-completion)
+ (copy-file "etc/hosts-completion.bash"
+ (string-append bash-completion "/hosts")))
+ (let ((zsh-completion
+ (string-append %output "/share/zsh/site-functions")))
+ (mkdir-p zsh-completion)
+ (copy-file "etc/hosts-completion.zsh"
+ (string-append zsh-completion "/_hosts")))
+ (let ((doc (string-append %output "/share/doc/" ,name "-" ,version)))
+ (mkdir-p doc)
+ (install-file "LICENSE" doc)
+ (install-file "README.md" doc))
+ #t)))
+ (home-page "https://github.com/xwmx/hosts/")
+ (synopsis "Script for editing a foreign distro's @file{/etc/hosts} file")
+ (description "Hosts is a command line program for managing
+@file{/etc/hosts} entries. On Guix System, @file{/etc/hosts} is managed from
+the system configuration; hosts only works when using the Guix package manager
+on a foreign distro. @command{hosts} works with existing hosts files and
+entries, providing commands to add, remove, comment, and search.")
+ (license license:expat)))
+
+(define-public nmrpflash
+ (package
+ (name "nmrpflash")
+ (version "0.9.14")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/jclehner/nmrpflash.git")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "1fdjrxhjs96rdclbkld57xarf592slhkp79h46z833npxpn12ck1"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libnl" ,libnl)
+ ("libpcap" ,libpcap)))
+ (arguments
+ `(#:tests? #f ; None exist
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target))
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'install 'prepare-install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))
+ #t)))))
+ (home-page "https://github.com/jclehner/nmrpflash")
+ (synopsis "Netgear unbrick utility")
+ (description "This package provides a utility to flash a new firmware
+image to a Netgear device. It has been tested on Netgear EX2700, EX6120,
+EX6150v2, DNG3700v2, R6100, R6220, R7000, D7000, WNR3500, R6400, R6800,
+R8000, R8500, WNDR3800, but is likely to be compatible with many other
+Netgear devices.")
+ (license license:gpl3+)))
+
+(define-public atop
+ (package
+ (name "atop")
+ (version "2.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://www.atoptool.nl/download/atop-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0crzz4i2nabyh7d6xg7fvl65qls87nbca5ihidp3nijhrrbi14ab"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; no test suite
+ #:make-flags
+ (list (string-append "CC=" ,(cc-for-target))
+ ;; The installer requires a choice between systemd or SysV.
+ "systemdinstall"
+ (string-append "DESTDIR=" (assoc-ref %outputs "out"))
+ (string-append "BINPATH=/bin")
+ (string-append "SBINPATH=/sbin")
+ (string-append "SYSDPATH=/etc/systemd/system")
+ (string-append "PMPATHD=/etc/systemd/system-sleep")
+ (string-append "MAN1PATH=/share/man/man1")
+ (string-append "MAN5PATH=/share/man/man5")
+ (string-append "MAN8PATH=/share/man/man8")
+ ;; Or else it tries to create /var/log/atop...
+ (string-append "LOGPATH="))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure) ; No ./configure script
+ (add-before 'build 'patch-build
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "Makefile"
+ ;; We don't need to chown things in the build environment.
+ (("chown.*$") "")
+ ;; We can't toggle the setuid bit in the build environment.
+ (("chmod 04711") "chmod 0711")
+ ;; Otherwise, it creates a blank configuration file as a "default".
+ (("touch.*DEFPATH)/atop") "")
+ (("chmod.*DEFPATH)/atop") ""))
+ #t)))))
+ (inputs
+ `(("ncurses" ,ncurses)
+ ("python" ,python-wrapper) ; for `atopgpud`
+ ("zlib" ,zlib)))
+ (home-page "https://www.atoptool.nl/")
+ (synopsis "Linux performance monitoring console")
+ (description "Atop is an ASCII full-screen performance monitor for Linux
+that is capable of reporting the activity of all processes (even processes have
+finished during the monitoring interval), daily logging of system and process
+activity for long-term analysis, highlighting overloaded system resources by
+using colors, etc. At regular intervals, it shows system-level activity related
+to the CPU, memory, swap, disks (including LVM) and network layers, and for
+every process (and thread) it shows e.g. the CPU utilization, memory growth,
+disk utilization, priority, username, state, and exit code.")
+ (license license:gpl2+)))
HCoop / jackhill / guix / guix.git / blobdiff