mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
Merge branch 'master' into core-updates
This commit is contained in:
commit
f4a5faa9dc
116 changed files with 72776 additions and 3938 deletions
10
Makefile.am
10
Makefile.am
|
@ -201,6 +201,7 @@ MODULES = \
|
|||
guix/scripts/hash.scm \
|
||||
guix/scripts/pack.scm \
|
||||
guix/scripts/pull.scm \
|
||||
guix/scripts/processes.scm \
|
||||
guix/scripts/substitute.scm \
|
||||
guix/scripts/authenticate.scm \
|
||||
guix/scripts/refresh.scm \
|
||||
|
@ -279,10 +280,10 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
|||
# Auxiliary files for packages.
|
||||
AUX_FILES = \
|
||||
gnu/packages/aux-files/emacs/guix-emacs.el \
|
||||
gnu/packages/aux-files/linux-libre/4.18-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.18-arm64.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.18-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.18-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.19-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.19-arm64.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.19-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.19-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.14-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.14-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/4.14-x86_64.conf \
|
||||
|
@ -343,6 +344,7 @@ SCM_TESTS = \
|
|||
tests/ui.scm \
|
||||
tests/status.scm \
|
||||
tests/records.scm \
|
||||
tests/processes.scm \
|
||||
tests/upstream.scm \
|
||||
tests/combinators.scm \
|
||||
tests/discovery.scm \
|
||||
|
|
537
doc/contributing.de.texi
Normal file
537
doc/contributing.de.texi
Normal file
|
@ -0,0 +1,537 @@
|
|||
@node Mitwirken
|
||||
@chapter Mitwirken
|
||||
|
||||
Dieses Projekt basiert auf Kooperation, daher benötigen wir Ihre Hilfe, um
|
||||
es wachsen zu lassen! Bitte kontaktieren Sie uns auf
|
||||
@email{guix-devel@@gnu.org} und @code{#guix} im Freenode-IRC-Netzwerk. Wir
|
||||
freuen uns auf Ihre Ideen, Fehlerberichte, Patches und alles, was hilfreich
|
||||
für das Projekt ist. Besonders willkommen ist Hilfe bei der Erstellung von
|
||||
Paketen (@pxref{Paketrichtlinien}).
|
||||
|
||||
@cindex Verhaltensregeln, für Mitwirkende
|
||||
@cindex Verhaltenskodex für Mitwirkende
|
||||
Wir möchten eine angenehme, freundliche und von Belästigungen freie Umgebung
|
||||
bereitstellen, so dass jeder Beiträge nach seinen Fähigkeiten leisten
|
||||
kann. Zu diesem Zweck verwendet unser Projekt einen »Verhaltenskodex für
|
||||
Mitwirkende«, der von @url{http://contributor-covenant.org/} übernommen
|
||||
wurde. Eine übersetzte Fassung finden Sie auf
|
||||
@url{https://www.contributor-covenant.org/de/version/1/4/code-of-conduct}
|
||||
sowie eine mitgelieferte, englische Fassung in der Datei
|
||||
@file{CODE-OF-CONDUCT} im Quellbaum.
|
||||
|
||||
Von Mitwirkenden wird nicht erwartet, dass sie in Patches oder in der
|
||||
Online-Kommunikation ihre echten Namen preisgeben. Sie können einen
|
||||
beliebigen Namen oder ein Pseudonym ihrer Wahl verwenden.
|
||||
|
||||
@menu
|
||||
* Erstellung aus dem Git:: Das Neueste und Beste.
|
||||
* Guix vor der Installation ausführen:: Hacker-Tricks.
|
||||
* Perfekt eingerichtet:: Die richtigen Werkzeuge.
|
||||
* Code-Stil:: Wie Mitwirkende hygienisch arbeiten.
|
||||
* Einreichen von Patches:: Teilen Sie Ihre Arbeit.
|
||||
@end menu
|
||||
|
||||
@node Erstellung aus dem Git
|
||||
@section Erstellung aus dem Git
|
||||
|
||||
Wenn Sie an Guix selbst hacken wollen, ist es empfehlenswert, dass Sie die
|
||||
neueste Version aus dem Git-Softwarebestand verwenden:
|
||||
|
||||
@example
|
||||
git clone https://git.savannah.gnu.org/git/guix.git
|
||||
@end example
|
||||
|
||||
Wenn Sie Guix aus einem Checkout erstellen, sind außer den bereits in den
|
||||
Installationsanweisungen genannten Paketen weitere nötig
|
||||
(@pxref{Voraussetzungen}).
|
||||
|
||||
@itemize
|
||||
@item @url{http://gnu.org/software/autoconf/, GNU Autoconf};
|
||||
@item @url{http://gnu.org/software/automake/, GNU Automake};
|
||||
@item @url{http://gnu.org/software/gettext/, GNU Gettext};
|
||||
@item @url{http://gnu.org/software/texinfo/, GNU Texinfo};
|
||||
@item @url{http://www.graphviz.org/, Graphviz};
|
||||
@item @url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}.
|
||||
@end itemize
|
||||
|
||||
Der einfachste Weg, eine Entwicklungsumgebung für Guix einzurichten, ist
|
||||
natürlich, Guix zu benutzen! Der folgende Befehl startet eine neue Shell, in
|
||||
der alle Abhängigkeiten und Umgebungsvariablen bereits eingerichtet sind, um
|
||||
an Guix zu arbeiten:
|
||||
|
||||
@example
|
||||
guix environment guix
|
||||
@end example
|
||||
|
||||
In @xref{Aufruf von guix environment} finden Sie weitere Informationen zu
|
||||
diesem Befehl. Zusätzliche Abhängigkeiten können mit @option{--ad-hoc}
|
||||
hinzugefügt werden:
|
||||
|
||||
@example
|
||||
guix environment guix --ad-hoc help2man git strace
|
||||
@end example
|
||||
|
||||
Führen Sie @command{./bootstrap} aus, um die Infrastruktur des
|
||||
Erstellungssystems mit Autoconf und Automake zu erstellen. Möglicherweise
|
||||
erhalten Sie eine Fehlermeldung wie diese:
|
||||
|
||||
@example
|
||||
configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
Das bedeutet wahrscheinlich, dass Autoconf @file{pkg.m4} nicht finden
|
||||
konnte, welches von pkg-config bereitgestellt wird. Stellen Sie sicher, dass
|
||||
@file{pkg.m4} verfügbar ist. Gleiches gilt für den von Guile
|
||||
bereitgestellten Makrosatz @file{guile.m4}. Wenn Sie beispielsweise Automake
|
||||
in @file{/usr/local} installiert haben, würde in @file{/usr/share} nicht
|
||||
nach @file{.m4}-Dateien geschaut. In einem solchen Fall müssen Sie folgenden
|
||||
Befehl aufrufen:
|
||||
|
||||
@example
|
||||
export ACLOCAL_PATH=/usr/share/aclocal
|
||||
@end example
|
||||
|
||||
In @xref{Macro Search Path,,, automake, The GNU Automake Manual} finden Sie
|
||||
weitere Informationen.
|
||||
|
||||
Dann führen Sie wie gewohnt @command{./configure} aus. Achten Sie darauf,
|
||||
@code{--localstatedir=@var{Verzeichnis}} zu übergeben, wobei
|
||||
@var{Verzeichnis} der von Ihrer aktuellen Installation verwendete
|
||||
@code{localstatedir}-Wert ist (weitere Informationen auf @pxref{Der Store}).
|
||||
|
||||
Zum Schluss müssen Sie @code{make check} aufrufen, um die Tests auszuführen
|
||||
(@pxref{Die Testsuite laufen lassen}). Falls etwas fehlschlägt, werfen Sie einen
|
||||
Blick auf die Installationsanweisungen (@pxref{Installation}) oder senden
|
||||
Sie eine E-Mail an @email{guix-devel@@gnu.org, Mailingliste}.
|
||||
|
||||
|
||||
@node Guix vor der Installation ausführen
|
||||
@section Guix vor der Installation ausführen
|
||||
|
||||
Um eine gesunde Arbeitsumgebung zu behalten, ist es hilfreich, die im
|
||||
lokalen Quellbaum vorgenommenen Änderungen zunächst zu testen, ohne sie
|
||||
tatsächlich zu installieren. So können Sie zwischen Ihrem
|
||||
Endnutzer-»Straßenanzug« und Ihrem »Faschingskostüm« unterscheiden.
|
||||
|
||||
To that end, all the command-line tools can be used even if you have not run
|
||||
@code{make install}. To do that, you first need to have an environment with
|
||||
all the dependencies available (@pxref{Erstellung aus dem Git}), and then simply
|
||||
prefix each command with @command{./pre-inst-env} (the @file{pre-inst-env}
|
||||
script lives in the top build tree of Guix), as in@footnote{The @option{-E}
|
||||
flag to @command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly
|
||||
set such that @command{guix-daemon} and the tools it uses can find the Guile
|
||||
modules they need.}:
|
||||
|
||||
@example
|
||||
$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild
|
||||
$ ./pre-inst-env guix build hello
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
Entsprechend, um eine Guile-Sitzung zu öffnen, die die Guix-Module benutzt:
|
||||
|
||||
@example
|
||||
$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'
|
||||
|
||||
;;; ("x86_64-linux")
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
@cindex REPL
|
||||
@cindex Lese-Auswerten-Schreiben-Schleife
|
||||
@dots{} und auf einer REPL (@pxref{Using Guile Interactively,,, guile, Guile
|
||||
Reference Manual}):
|
||||
|
||||
@example
|
||||
$ ./pre-inst-env guile
|
||||
scheme@@(guile-user)> ,use(guix)
|
||||
scheme@@(guile-user)> ,use(gnu)
|
||||
scheme@@(guile-user)> (define snakes
|
||||
(fold-packages
|
||||
(lambda (package lst)
|
||||
(if (string-prefix? "python"
|
||||
(package-name package))
|
||||
(cons package lst)
|
||||
lst))
|
||||
'()))
|
||||
scheme@@(guile-user)> (length snakes)
|
||||
$1 = 361
|
||||
@end example
|
||||
|
||||
Das @command{pre-inst-env}-Skript richtet alle Umgebungsvariablen ein, die
|
||||
nötig sind, um dies zu ermöglichen, einschließlich @env{PATH} und
|
||||
@env{GUILE_LOAD_PATH}.
|
||||
|
||||
Beachten Sie, dass @command{./pre-inst-env guix pull} den lokalen Quellbaum
|
||||
@emph{nicht} aktualisiert; es aktualisiert lediglich die symbolische
|
||||
Verknüpfung @file{~/.config/guix/current} (@pxref{Aufruf von guix pull}). Um
|
||||
Ihren lokalen Quellbaum zu aktualisieren, müssen Sie stattdessen
|
||||
@command{git pull} benutzen.
|
||||
|
||||
|
||||
@node Perfekt eingerichtet
|
||||
@section Perfekt eingerichtet
|
||||
|
||||
Um perfekt für das Hacken an Guix eingerichtet zu sein, brauchen Sie an sich
|
||||
dasselbe wie um perfekt für das Hacken mit Guile (@pxref{Using Guile in
|
||||
Emacs,,, guile, Guile Reference Manual}). Zunächst brauchen Sie mehr als
|
||||
ein Textverarbeitungsprogramm, Sie brauchen
|
||||
@url{http://www.gnu.org/software/emacs, Emacs}, ermächtigt vom wunderbaren
|
||||
@url{http://nongnu.org/geiser/, Geiser}.
|
||||
|
||||
Geiser ermöglicht interaktive und inkrementelle Entwicklung aus Emacs
|
||||
heraus: Code kann in Puffern kompiliert und ausgewertet werden. Zugang zu
|
||||
Online-Dokumentation (Docstrings) steht ebenso zur Verfügung wie
|
||||
kontextabhängige Vervollständigung, @kbd{M-.} um zu einer Objektdefinition
|
||||
zu springen, eine REPL, um Ihren Code auszuprobieren, und mehr
|
||||
(@pxref{Einführung,,, geiser, Geiser User Manual}). Zur bequemen
|
||||
Guix-Entwicklung sollten Sie Guiles Ladepfad so ergänzen, dass die
|
||||
Quelldateien in Ihrem Checkout gefunden werden.
|
||||
|
||||
@lisp
|
||||
;; @r{Angenommen das Guix-Checkout ist in ~/src/guix.}
|
||||
(with-eval-after-load 'geiser-guile
|
||||
(add-to-list 'geiser-guile-load-path "~/src/guix"))
|
||||
@end lisp
|
||||
|
||||
Um den Code tatsächlich zu bearbeiten, bietet Emacs schon einen netten
|
||||
Scheme-Modus. Aber Sie dürfen auch
|
||||
@url{http://www.emacswiki.org/emacs/ParEdit, Paredit} nicht verpassen. Es
|
||||
bietet Hilfsmittel, um direkt mit dem Syntaxbaum zu arbeiten, und kann so
|
||||
zum Beispiel einen S-Ausdruck hochheben oder ihn umhüllen, ihn verschlucken
|
||||
oder den nachfolgenden S-Ausdruck verwerfen, etc.
|
||||
|
||||
@cindex Code-Schnipsel
|
||||
@cindex Vorlagen
|
||||
@cindex Tipparbeit sparen
|
||||
Wir bieten auch Vorlagen für häufige Git-Commit-Nachrichten und
|
||||
Paketdefinitionen im Verzeichnis @file{etc/snippets}. Diese Vorlagen können
|
||||
mit @url{http://joaotavora.github.io/yasnippet/, YASnippet} zusammen benutzt
|
||||
werden, um kurze Auslöse-Zeichenketten zu interaktiven Textschnipseln
|
||||
umzuschreiben. Vielleicht möchten Sie das Schnipselverzeichnis zu Ihrer
|
||||
@var{yas-snippet-dirs}-Variablen in Emacs hinzufügen.
|
||||
|
||||
@lisp
|
||||
;; @r{Angenommen das Guix-Checkout ist in ~/src/guix.}
|
||||
(with-eval-after-load 'yasnippet
|
||||
(add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets"))
|
||||
@end lisp
|
||||
|
||||
The commit message snippets depend on @url{https://magit.vc/, Magit} to
|
||||
display staged files. When editing a commit message type @code{add}
|
||||
followed by @kbd{TAB} to insert a commit message template for adding a
|
||||
package; type @code{update} followed by @kbd{TAB} to insert a template for
|
||||
updating a package; type @code{https} followed by @kbd{TAB} to insert a
|
||||
template for changing the home page URI of a package to HTTPS.
|
||||
|
||||
Das Hauptschnipsel für @code{scheme-mode} wird ausgelöst, indem Sie
|
||||
@code{package...} gefolgt von @kbd{TAB} eintippen. Dieses Snippet fügt auch
|
||||
die Auslöse-Zeichenkette @code{origin...} ein, die danach weiter
|
||||
umgeschrieben werden kann. Das @code{origin}-Schnipsel kann wiederum andere
|
||||
Auslöse-Zeichenketten einfügen, die alle auf @code{...} enden, was selbst
|
||||
wieder weiter umgeschrieben werden kann.
|
||||
|
||||
|
||||
@node Code-Stil
|
||||
@section Code-Stil
|
||||
|
||||
Im Allgemeinen folgt unser Code den GNU Coding Standards (@pxref{Top,,,
|
||||
standards, GNU Coding Standards}). Da diese aber nicht viel über Scheme zu
|
||||
sagen haben, folgen hier einige zusätzliche Regeln.
|
||||
|
||||
@menu
|
||||
* Programmierparadigmen:: Wie Sie Ihre Elemente zusammenstellen.
|
||||
* Module:: Wo Sie Ihren Code unterbringen.
|
||||
* Datentypen und Mustervergleich:: Implementierung von Datenstrukturen.
|
||||
* Formatierung von Code:: Schreibkonventionen.
|
||||
@end menu
|
||||
|
||||
@node Programmierparadigmen
|
||||
@subsection Programmierparadigmen
|
||||
|
||||
Scheme-Code wird in Guix auf rein funktionale Weise geschrieben. Eine
|
||||
Ausnahme ist Code, der mit Ein- und Ausgabe zu tun hat, und Prozeduren, die
|
||||
grundlegende Konzepte implementieren, wie zum Beispiel die Prozedur
|
||||
@code{memoize}.
|
||||
|
||||
@node Module
|
||||
@subsection Module
|
||||
|
||||
Guile-Module, die beim Erstellen nutzbar sein sollen, müssen im Namensraum
|
||||
@code{(guix build @dots{})} leben. Sie dürfen auf keine anderen Guix- oder
|
||||
GNU-Modules Bezug nehmen. Jedoch ist es in Ordnung, wenn ein »wirtsseitiges«
|
||||
Modul ein erstellungsseitiges Modul benutzt.
|
||||
|
||||
Module, die mit dem weiteren GNU-System zu tun haben, sollten im Namensraum
|
||||
@code{(gnu @dots{})} und nicht in @code{(guix @dots{})} stehen.
|
||||
|
||||
@node Datentypen und Mustervergleich
|
||||
@subsection Datentypen und Mustervergleich
|
||||
|
||||
Im klassischen Lisp gibt es die Tendenz, Listen zur Darstellung von allem zu
|
||||
benutzen, und diese dann »händisch« zu durchlaufen mit @code{car},
|
||||
@code{cdr}, @code{cadr} und so weiter. Dieser Stil ist aus verschiedenen
|
||||
Gründen problematisch, insbesondere wegen der Tatsache, dass er schwer zu
|
||||
lesen, schnell fehlerbehaftet und ein Hindernis beim Melden von Typfehlern
|
||||
ist.
|
||||
|
||||
Guix-Code sollte angemessene Datentypen definieren (zum Beispiel mit
|
||||
@code{define-record-type*}) statt Listen zu missbrauchen. Außerdem sollte er
|
||||
das @code{(ice-9 match)}-Modul von Guile zum Mustervergleich benutzen,
|
||||
besonders mit Listen.
|
||||
|
||||
@node Formatierung von Code
|
||||
@subsection Formatierung von Code
|
||||
|
||||
@cindex Formatierung von Code
|
||||
@cindex Code-Stil
|
||||
Beim Schreiben von Scheme-Code halten wir uns an die üblichen
|
||||
Gepflogenheiten unter Scheme-Programmierern. Im Allgemeinen bedeutet das,
|
||||
dass wir uns an @url{http://mumble.net/~campbell/scheme/style.txt,
|
||||
Riastradh's Lisp Style Rules} halten. Es hat sich ergeben, dass dieses
|
||||
Dokument auch die Konventionen beschreibt, die im Code von Guile
|
||||
hauptsächlich verwendet werden. Es ist gut durchdacht und schön geschrieben,
|
||||
also lesen Sie es bitte.
|
||||
|
||||
Ein paar in Guix eingeführte Sonderformen, wie zum Beispiel das
|
||||
@code{substitute*}-Makro, haben abweichende Regeln für die Einrückung. Diese
|
||||
sind in der Datei @file{.dir-locals.el} definiert, die Emacs automatisch
|
||||
benutzt. Beachten Sie auch, dass Emacs-Guix einen Modus namens
|
||||
@code{guix-devel-mode} bereitstellt, der Guix-Code richtig einrückt und
|
||||
hervorhebt (@pxref{Development,,, emacs-guix, The Emacs-Guix Reference
|
||||
Manual}).
|
||||
|
||||
@cindex Einrückung, Code-
|
||||
@cindex Formatierung, Code-
|
||||
Falls Sie nicht Emacs verwenden, sollten Sie sicherstellen, dass Ihr Editor
|
||||
diese Regeln kennt. Um eine Paketdefinition automatisch einzurücken, können
|
||||
Sie auch Folgendes ausführen:
|
||||
|
||||
@example
|
||||
./etc/indent-code.el gnu/packages/@var{Datei}.scm @var{Paket}
|
||||
@end example
|
||||
|
||||
@noindent
|
||||
Dadurch wird die Definition von @var{Paket} in
|
||||
@file{gnu/packages/@var{Datei}.scm} automatisch eingerückt, indem Emacs im
|
||||
Batch-Modus läuft. Um die Einrückung in einer gesamten Datei vorzunehmen,
|
||||
lassen Sie das zweite Argument weg:
|
||||
|
||||
@example
|
||||
./etc/indent-code.el gnu/services/@var{Datei}.scm
|
||||
@end example
|
||||
|
||||
@cindex Vim, zum Editieren von Scheme-Code
|
||||
Wenn Sie mit Code mit Vim bearbeiten, empfehlen wir, dass Sie @code{:set
|
||||
autoindent} ausführen, damit Ihr Code automatisch eingerückt wird, während
|
||||
Sie ihn schreiben. Außerdem könnte Ihnen
|
||||
@uref{https://www.vim.org/scripts/script.php?script_id=3998,
|
||||
@code{paredit.vim}} dabei helfen, mit all diesen Klammern fertigzuwerden.
|
||||
|
||||
Wir fordern von allen Prozeduren auf oberster Ebene, dass sie über einen
|
||||
Docstring verfügen. Diese Voraussetzung kann jedoch bei einfachen, privaten
|
||||
Prozeduren im Namensraum @code{(guix build @dots{})} aufgeweicht werden.
|
||||
|
||||
Prozeduren sollten nicht mehr als vier positionsbestimmte Parameter
|
||||
haben. Benutzen Sie Schlüsselwort-Parameter für Prozeduren, die mehr als
|
||||
vier Parameter entgegennehmen.
|
||||
|
||||
|
||||
@node Einreichen von Patches
|
||||
@section Einreichen von Patches
|
||||
|
||||
Die Entwicklung wird mit Hilfe des verteilten Versionskontrollsystems Git
|
||||
durchgeführt. Daher ist eine ständige Verbindung zum Repository nicht
|
||||
unbedingt erforderlich. Wir begrüßen Beiträge in Form von Patches, die
|
||||
mittels @code{git format-patch} erstellt und an die Mailingliste
|
||||
@email{guix-patches@@gnu.org} geschickt werden.
|
||||
|
||||
Diese Mailing-Liste setzt auf einer Debbugs-Instanz auf, die zugänglich ist
|
||||
unter @uref{https://bugs.gnu.org/guix-patches}, wodurch wir den Überblick
|
||||
über Eingereichtes behalten können. Jede an diese Mailing-Liste gesendete
|
||||
Nachricht bekommt eine neue Folgenummer zugewiesen, so dass man eine
|
||||
Folge-Email zur Einreichung an @code{@var{NNN}@@debbugs.gnu.org} senden
|
||||
kann, wobei @var{NNN} für die Folgenummer steht (@pxref{Senden einer Patch-Reihe}).
|
||||
|
||||
Bitte schreiben Sie Commit-Logs im ChangeLog-Format (@pxref{Change Logs,,,
|
||||
standards, GNU Coding Standards}); dazu finden Sie Beispiele unter den
|
||||
bisherigen Commits.
|
||||
|
||||
Bevor Sie einen Patch einreichen, der eine Paketdefinition hinzufügt oder
|
||||
verändert, gehen Sie bitte diese Prüfliste:
|
||||
|
||||
@enumerate
|
||||
@item
|
||||
Wenn die Autoren der verpackten Software eine kryptographische Signatur für
|
||||
den Tarball der Veröffentlichung anbieten, so machen Sie sich bitte die
|
||||
Mühe, die Echtheit des Archivs zu überprüfen. Für eine abgetrennte
|
||||
GPG-Signaturdatei würden Sie das mit dem Befehl @code{gpg --verify} tun.
|
||||
|
||||
@item
|
||||
Nehmen Sie sich die Zeit, eine passende Zusammenfassung und Beschreibung für
|
||||
das Paket zu verfassen. Unter @xref{Zusammenfassungen und Beschreibungen} finden Sie
|
||||
dazu einige Richtlinien.
|
||||
|
||||
@item
|
||||
Verwenden Sie @code{guix lint @var{Paket}}, wobei @var{Paket} das neue oder
|
||||
geänderte Paket bezeichnet, und beheben Sie alle gemeldeten Fehler
|
||||
(@pxref{Aufruf von guix lint}).
|
||||
|
||||
@item
|
||||
Stellen Sie sicher, dass das Paket auf Ihrer Plattform erstellt werden kann,
|
||||
indem Sie @code{guix build @var{Paket}} ausführen.
|
||||
|
||||
@item
|
||||
@cindex gebündelt
|
||||
Achten Sie darauf, dass im Paket keine Software gebündelt mitgeliefert wird,
|
||||
die bereits in separaten Paketen zur Verfügung steht.
|
||||
|
||||
Manchmal enthalten Pakete Kopien des Quellcodes ihrer Abhängigkeiten, um
|
||||
Nutzern die Installation zu erleichtern. Als eine Distribution wollen wir
|
||||
jedoch sicherstellen, dass für solche Pakete die schon in der Distribution
|
||||
verfügbare Fassung benutzen, sofern es eine gibt. Dadurch wird sowohl der
|
||||
Ressourcenverbrauch optimiert (die Abhängigkeit wird so nur einmal erstellt
|
||||
und gespeichert) als auch der Distribution die Möglichkeit gegeben,
|
||||
ergänzende Änderungen durchzuführen, um beispielsweise
|
||||
Sicherheitsaktualisierungen für ein bestimmtes Paket an nur einem Ort
|
||||
einzuspielen, die das gesamte System betreffen — gebündelt mitgelieferte
|
||||
Kopien würden dies verhindern.
|
||||
|
||||
@item
|
||||
Schauen Sie sich das von @command{guix size} ausgegebene Profil an
|
||||
(@pxref{Aufruf von guix size}). Dadurch können Sie Referenzen auf andere
|
||||
Pakete finden, die ungewollt vorhanden sind. Dies kann auch dabei helfen, zu
|
||||
entscheiden, ob das Paket aufgespalten werden sollte (@pxref{Pakete mit mehreren Ausgaben.}) und welche optionalen Abhängigkeiten verwendet werden
|
||||
sollten.
|
||||
|
||||
@item
|
||||
Achten Sie bei wichtigen Änderungen darauf, dass abhängige Pakete (falls
|
||||
vorhanden) nicht von der Änderung beeinträchtigt werden; @code{guix refresh
|
||||
--list-dependent @var{Paket}} hilft Ihnen dabei (@pxref{Aufruf von guix refresh}).
|
||||
|
||||
@c ===========================================================================
|
||||
@c
|
||||
@c This file was generated with po4a. Translate the source file.
|
||||
@c
|
||||
@c ===========================================================================
|
||||
@c See <https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html>.
|
||||
@cindex Branching-Strategie
|
||||
@cindex Neuerstellungs-Zeitplan
|
||||
Je nachdem, wieviele abhängige Pakete es gibt, und entsprechend wieviele
|
||||
Neuerstellungen dadurch nötig würden, finden Commits auf anderen Branches
|
||||
statt, nach ungefähr diesen Regeln:
|
||||
|
||||
@table @asis
|
||||
@item 300 abhängige Pakete oder weniger
|
||||
@code{master}-Branch (störfreie Änderungen).
|
||||
|
||||
@item zwischen 300 und 1200 abhängige Pakete
|
||||
@code{staging}-Branch (störfreie Änderungen). Dieser Branch wird circa alle
|
||||
3 Wochen in @code{master} gemerget. Themenbezogene Änderungen (z.B. eine
|
||||
Aktualisierung der GNOME-Plattform) können stattdessen auch auf einem
|
||||
eigenen Branch umgesetzt werden (wie @code{gnome-updates}).
|
||||
|
||||
@item mehr als 1200 abhängige Pakete
|
||||
@code{core-updates}-Branch (kann auch größere und womöglich andere Software
|
||||
beeinträchtigende Änderungen umfassen). Dieser Branch wird planmäßig in
|
||||
@code{master} alle 2,5 Monate oder so gemerget.
|
||||
@end table
|
||||
|
||||
All diese Branches werden kontinuierlich
|
||||
@uref{https://hydra.gnu.org/project/gnu, auf unserer Build-Farm} erstellt
|
||||
und in @code{master} gemerget, sobald alles erfolgreich erstellt worden
|
||||
ist. Dadurch können wir Probleme beheben, bevor sie bei Nutzern auftreten,
|
||||
und zudem das Zeitfenster, während dessen noch keine vorerstellten
|
||||
Binärdateien verfügbar sind, verkürzen.
|
||||
|
||||
@c TODO: It would be good with badges on the website that tracks these
|
||||
@c branches. Or maybe even a status page.
|
||||
Im Allgemeinen werden Branches außer @code{master} als @emph{unveränderlich}
|
||||
angesehen, wenn sie kürzlich ausgewertet wurden oder ein entsprechender
|
||||
@code{-next}-Branch existiert. Bitte fragen Sie auf der Mailing-Liste oder
|
||||
IRC, wenn Sie sich nicht sicher sind, wo ein Patch eingespielt werden
|
||||
sollte.
|
||||
|
||||
@item
|
||||
@cindex Determinismus, von Erstellungsprozessen
|
||||
@cindex Reproduzierbare Erstellungen, Überprüfung
|
||||
Überprüfen Sie, ob der Erstellungsprozess deterministisch ist. Dazu prüfen
|
||||
Sie typischerweise, ob eine unabhängige Erstellung des Pakets genau dasselbe
|
||||
Ergebnis wie Ihre Erstellung hat, Bit für Bit.
|
||||
|
||||
Dies können Sie leicht tun, indem Sie dasselbe Paket mehrere Male
|
||||
hintereinander auf Ihrer Maschine erstellen (@pxref{Aufruf von guix build}):
|
||||
|
||||
@example
|
||||
guix build --rounds=2 mein-paket
|
||||
@end example
|
||||
|
||||
Dies reicht aus, um eine ganze Klasse häufiger Ursachen von
|
||||
Nichtdeterminismus zu finden, wie zum Beispiel Zeitstempel oder
|
||||
zufallsgenerierte Ausgaben im Ergebnis der Erstellung.
|
||||
|
||||
Eine weitere Möglichkeit ist, @command{guix challenge} (@pxref{Aufruf von guix challenge}) zu benutzen. Sie können es ausführen, sobald ein Paket commitet
|
||||
und von @code{hydra.gnu.org} erstellt wurde, um zu sehen, ob dort dasselbe
|
||||
Ergebnis wie bei Ihnen geliefert wurde. Noch besser: Finden Sie eine andere
|
||||
Maschine, die das Paket erstellen kann, und führen Sie @command{guix
|
||||
publish} aus. Da sich die entfernte Erstellungsmaschine wahrscheinlich von
|
||||
Ihrer unterscheidet, können Sie auf diese Weise Probleme durch
|
||||
Nichtdeterminismus erkennen, die mit der Hardware zu tun haben — zum
|
||||
Beispiel die Nutzung anderer Befehlssatzerweiterungen — oder mit dem
|
||||
Betriebssystem-Kernel — zum Beispiel, indem @code{uname} oder
|
||||
@file{/proc}-Dateien verwendet werden.
|
||||
|
||||
@item
|
||||
Beim Schreiben von Dokumentation achten Sie bitte auf eine
|
||||
geschlechtsneutrale Wortwahl, wenn Sie sich auf Personen beziehen, wie
|
||||
@uref{https://en.wikipedia.org/wiki/Singular_they, »they«@comma{}
|
||||
»their«@comma{} »them« im Singular}, und so weiter.
|
||||
|
||||
@item
|
||||
Stelllen Sie sicher, dass Ihr Patch nur einen Satz zusammengehöriger
|
||||
Änderungen umfasst. Das Zusammenfassen nicht zusammengehöriger Änderungen
|
||||
erschwert und bremst das Durchsehen Ihres Patches.
|
||||
|
||||
Beispiele für nicht zusammengehörige Änderungen sind das Hinzufügen mehrerer
|
||||
Pakete auf einmal, oder das Aktualisieren eines Pakets auf eine neue Version
|
||||
zusammen mit Fehlerbehebungen für das Paket.
|
||||
|
||||
@item
|
||||
Bitte befolgen Sie unsere Richtlinien für die Code-Formatierung, womöglich
|
||||
wollen Sie dies automatisch tun lassen durch das Skript
|
||||
@command{etc/indent-code.el} (@pxref{Formatierung von Code}).
|
||||
|
||||
@item
|
||||
When possible, use mirrors in the source URL (@pxref{Aufruf von guix download}). Use reliable URLs, not generated ones. For instance, GitHub
|
||||
archives are not necessarily identical from one generation to the next, so
|
||||
in this case it's often better to clone the repository. Don't use the
|
||||
@command{name} field in the URL: it is not very useful and if the name
|
||||
changes, the URL will probably be wrong.
|
||||
|
||||
@end enumerate
|
||||
|
||||
Bitte benutzen Sie @samp{[PATCH] @dots{}} als Betreff, wenn Sie einen Patch
|
||||
an die Mailing-Liste schicken. Sie können dazu Ihr E-mail-Programm oder den
|
||||
Befehl @command{git send-email} benutzen (@pxref{Senden einer Patch-Reihe}). Wir bevorzugen es, Patches als reine Textnachrichten zu erhalten,
|
||||
entweder eingebettet (inline) oder als MIME-Anhänge. Sie sind dazu
|
||||
angehalten, zu überprüfen, ob Ihr Mail-Programm solche Dinge wie
|
||||
Zeilenumbrüche oder die Einrückung verändert, wodurch die Patches womöglich
|
||||
nicht mehr funktionieren.
|
||||
|
||||
Wenn dadurch ein Fehler behoben wurde, schließen Sie bitte den Thread, indem
|
||||
Sie eine E-mail an @email{@var{NNN}-done@@debbugs.gnu.org} senden.
|
||||
|
||||
@unnumberedsubsec Senden einer Patch-Reihe
|
||||
@anchor{Senden einer Patch-Reihe}
|
||||
@cindex Patch-Reihe
|
||||
@cindex @code{git send-email}
|
||||
@cindex @code{git-send-email}
|
||||
|
||||
@c Debbugs bug: https://debbugs.gnu.org/db/15/15361.html
|
||||
Wenn Sie eine Patch-Reihe senden (z.B. mit @code{git send-email}), schicken
|
||||
Sie bitte als Erstes eine Nachricht an @email{guix-patches@@gnu.org} und
|
||||
dann nachfolgende Patches an @email{@var{NNN}@@debbugs.gnu.org}, um
|
||||
sicherzustellen, dass sie zusammen bearbeitet werden. Siehe
|
||||
@uref{https://debbugs.gnu.org/Advanced.html, die Debbugs-Dokumentation} für
|
||||
weitere Informationen.
|
23978
doc/guix.de.texi
Normal file
23978
doc/guix.de.texi
Normal file
File diff suppressed because it is too large
Load diff
120
doc/guix.texi
120
doc/guix.texi
|
@ -50,6 +50,7 @@ Copyright @copyright{} 2018 Oleg Pykhalov@*
|
|||
Copyright @copyright{} 2018 Mike Gerwitz@*
|
||||
Copyright @copyright{} 2018 Pierre-Antoine Rouby@*
|
||||
Copyright @copyright{} 2018 Gábor Boskovits@*
|
||||
Copyright @copyright{} 2018 Florian Pelz@*
|
||||
|
||||
Permission is granted to copy, distribute and/or modify this document
|
||||
under the terms of the GNU Free Documentation License, Version 1.3 or
|
||||
|
@ -101,8 +102,9 @@ package management tool written for the GNU system.
|
|||
@c how to join your own translation team and how to report issues with the
|
||||
@c translation.
|
||||
This manual is also available in French (@pxref{Top,,, guix.fr, Manuel de
|
||||
référence de GNU Guix}). If you would like to translate it in your native
|
||||
language, consider joining the
|
||||
référence de GNU Guix}) and German (@pxref{Top,,, guix.de, Referenzhandbuch
|
||||
zu GNU Guix}). If you would like to translate it in your native language,
|
||||
consider joining the
|
||||
@uref{https://translationproject.org/domain/guix-manual.html, Translation
|
||||
Project}.
|
||||
|
||||
|
@ -193,6 +195,7 @@ Utilities
|
|||
* Invoking guix copy:: Copying to and from a remote store.
|
||||
* Invoking guix container:: Process isolation.
|
||||
* Invoking guix weather:: Assessing substitute availability.
|
||||
* Invoking guix processes:: Listing client processes.
|
||||
|
||||
Invoking @command{guix build}
|
||||
|
||||
|
@ -1227,17 +1230,20 @@ etc. This helps achieve reproducible builds (@pxref{Features}).
|
|||
|
||||
When the daemon performs a build on behalf of the user, it creates a
|
||||
build directory under @file{/tmp} or under the directory specified by
|
||||
its @code{TMPDIR} environment variable; this directory is shared with
|
||||
the container for the duration of the build. Be aware that using a
|
||||
directory other than @file{/tmp} can affect build results---for example,
|
||||
with a longer directory name, a build process that uses Unix-domain
|
||||
sockets might hit the name length limitation for @code{sun_path}, which
|
||||
it would otherwise not hit.
|
||||
its @code{TMPDIR} environment variable. This directory is shared with
|
||||
the container for the duration of the build, though within the container,
|
||||
the build tree is always called @file{/tmp/guix-build-@var{name}.drv-0}.
|
||||
|
||||
The build directory is automatically deleted upon completion, unless the
|
||||
build failed and the client specified @option{--keep-failed}
|
||||
(@pxref{Invoking guix build, @option{--keep-failed}}).
|
||||
|
||||
The daemon listens for connections and spawns one sub-process for each session
|
||||
started by a client (one of the @command{guix} sub-commands.) The
|
||||
@command{guix processes} command allows you to get an overview of the activity
|
||||
on your system by viewing each of the active sessions and clients.
|
||||
@xref{Invoking guix processes}, for more information.
|
||||
|
||||
The following command-line options are supported:
|
||||
|
||||
@table @code
|
||||
|
@ -6051,6 +6057,7 @@ the Scheme programming interface of Guix in a convenient way.
|
|||
* Invoking guix copy:: Copying to and from a remote store.
|
||||
* Invoking guix container:: Process isolation.
|
||||
* Invoking guix weather:: Assessing substitute availability.
|
||||
* Invoking guix processes:: Listing client processes.
|
||||
@end menu
|
||||
|
||||
@node Invoking guix build
|
||||
|
@ -8751,6 +8758,61 @@ with the @code{-m} option of @command{guix package} (@pxref{Invoking
|
|||
guix package}).
|
||||
@end table
|
||||
|
||||
@node Invoking guix processes
|
||||
@section Invoking @command{guix processes}
|
||||
|
||||
The @command{guix processes} command can be useful to developers and system
|
||||
administrators, especially on multi-user machines and on build farms: it lists
|
||||
the current sessions (connections to the daemon), as well as information about
|
||||
the processes involved@footnote{Remote sessions, when @command{guix-daemon} is
|
||||
started with @option{--listen} specifying a TCP endpoint, are @emph{not}
|
||||
listed.}. Here's an example of the information it returns:
|
||||
|
||||
@example
|
||||
$ sudo guix processes
|
||||
SessionPID: 19002
|
||||
ClientPID: 19090
|
||||
ClientCommand: guix environment --ad-hoc python
|
||||
|
||||
SessionPID: 19402
|
||||
ClientPID: 19367
|
||||
ClientCommand: guix publish -u guix-publish -p 3000 -C 9 @dots{}
|
||||
|
||||
SessionPID: 19444
|
||||
ClientPID: 19419
|
||||
ClientCommand: cuirass --cache-directory /var/cache/cuirass @dots{}
|
||||
LockHeld: /gnu/store/@dots{}-perl-ipc-cmd-0.96.lock
|
||||
LockHeld: /gnu/store/@dots{}-python-six-bootstrap-1.11.0.lock
|
||||
LockHeld: /gnu/store/@dots{}-libjpeg-turbo-2.0.0.lock
|
||||
ChildProcess: 20495: guix offload x86_64-linux 7200 1 28800
|
||||
ChildProcess: 27733: guix offload x86_64-linux 7200 1 28800
|
||||
ChildProcess: 27793: guix offload x86_64-linux 7200 1 28800
|
||||
@end example
|
||||
|
||||
In this example we see that @command{guix-daemon} has three clients:
|
||||
@command{guix environment}, @command{guix publish}, and the Cuirass continuous
|
||||
integration tool; their process identifier (PID) is given by the
|
||||
@code{ClientPID} field. The @code{SessionPID} field gives the PID of the
|
||||
@command{guix-daemon} sub-process of this particular session.
|
||||
|
||||
The @code{LockHeld} fields show which store items are currently locked by this
|
||||
session, which corresponds to store items being built or substituted (the
|
||||
@code{LockHeld} field is not displayed when @command{guix processes} is not
|
||||
running as root.) Last, by looking at the @code{ChildProcess} field, we
|
||||
understand that these three builds are being offloaded (@pxref{Daemon Offload
|
||||
Setup}).
|
||||
|
||||
The output is in Recutils format so we can use the handy @command{recsel}
|
||||
command to select sessions of interest (@pxref{Selection Expressions,,,
|
||||
recutils, GNU recutils manual}). As an example, the command shows the command
|
||||
line and PID of the client that triggered the build of a Perl package:
|
||||
|
||||
@example
|
||||
$ sudo guix processes | \
|
||||
recsel -p ClientPID,ClientCommand -e 'LockHeld ~ "perl"'
|
||||
ClientPID: 19419
|
||||
ClientCommand: cuirass --cache-directory /var/cache/cuirass @dots{}
|
||||
@end example
|
||||
|
||||
@c *********************************************************************
|
||||
@node GNU Distribution
|
||||
|
@ -13895,7 +13957,7 @@ Users need to be in the @code{lp} group to access the D-Bus service.
|
|||
@cindex PulseAudio, sound support
|
||||
|
||||
The @code{(gnu services sound)} module provides a service to configure the
|
||||
Advanced Linux Sound Architecture (ALSA) system, which making PulseAudio the
|
||||
Advanced Linux Sound Architecture (ALSA) system, which makes PulseAudio the
|
||||
preferred ALSA output driver.
|
||||
|
||||
@deffn {Scheme Variable} alsa-service-type
|
||||
|
@ -16104,10 +16166,10 @@ before switching over to opus audio codec.
|
|||
How deep channels can be nested at maximum.
|
||||
|
||||
@item @code{channelname-regex} (default: @code{#f})
|
||||
A string in from of a Qt regular expression that channel names must conform to.
|
||||
A string in form of a Qt regular expression that channel names must conform to.
|
||||
|
||||
@item @code{username-regex} (default: @code{#f})
|
||||
A string in from of a Qt regular expression that user names must conform to.
|
||||
A string in form of a Qt regular expression that user names must conform to.
|
||||
|
||||
@item @code{text-message-length} (default: @code{5000})
|
||||
Maximum size in bytes that a user can send in one text chat message.
|
||||
|
@ -16119,7 +16181,7 @@ Maximum size in bytes that a user can send in one image message.
|
|||
If it is set to @code{#t} clients that use weak password authentification
|
||||
will not be accepted. Users must have completed the certificate wizard to join.
|
||||
|
||||
@item @code{remember-channel?} (defualt @code{#f})
|
||||
@item @code{remember-channel?} (default: @code{#f})
|
||||
Should murmur remember the last channel each user was in when they disconnected
|
||||
and put them into the remembered channel when they rejoin.
|
||||
|
||||
|
@ -16144,7 +16206,7 @@ Murmur also stores logs in the database, which are accessible via RPC.
|
|||
The default is 31 days of months, but you can set this setting to 0 to keep logs forever,
|
||||
or -1 to disable logging to the database.
|
||||
|
||||
@item @code{obfuscate-ips?} (default @code{#t})
|
||||
@item @code{obfuscate-ips?} (default: @code{#t})
|
||||
Should logged ips be obfuscated to protect the privacy of users.
|
||||
|
||||
@item @code{ssl-cert} (default: @code{#f})
|
||||
|
@ -16546,7 +16608,7 @@ the nginx web server, and also a fastcgi wrapper daemon.
|
|||
@deffn {Scheme Variable} httpd-service-type
|
||||
Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server
|
||||
(@dfn{httpd}). The value for this service type is a
|
||||
@code{https-configuration} record.
|
||||
@code{httpd-configuration} record.
|
||||
|
||||
A simple example configuration is given below.
|
||||
|
||||
|
@ -16612,6 +16674,10 @@ within the store, for example @code{(file-append mod-wsgi
|
|||
@end table
|
||||
@end deffn
|
||||
|
||||
@defvr {Scheme Variable} %default-httpd-modules
|
||||
A default list of @code{httpd-module} objects.
|
||||
@end defvr
|
||||
|
||||
@deffn {Data Type} httpd-config-file
|
||||
This data type represents a configuration file for the httpd service.
|
||||
|
||||
|
@ -16620,6 +16686,32 @@ This data type represents a configuration file for the httpd service.
|
|||
The modules to load. Additional modules can be added here, or loaded by
|
||||
additional configuration.
|
||||
|
||||
For example, in order to handle requests for PHP files, you can use Apache’s
|
||||
@code{mod_proxy_fcgi} module along with @code{php-fpm-service-type}:
|
||||
|
||||
@example
|
||||
(service httpd-service-type
|
||||
(httpd-configuration
|
||||
(config
|
||||
(httpd-config-file
|
||||
(modules (cons*
|
||||
(httpd-module
|
||||
(name "proxy_module")
|
||||
(file "modules/mod_proxy.so"))
|
||||
(httpd-module
|
||||
(name "proxy_fcgi_module")
|
||||
(file "modules/mod_proxy_fcgi.so"))
|
||||
%default-httpd-modules))
|
||||
(extra-config (list "\
|
||||
<FilesMatch \\.php$>
|
||||
SetHandler \"proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/\"
|
||||
</FilesMatch>"))))))
|
||||
(service php-fpm-service-type
|
||||
(php-fpm-configuration
|
||||
(socket "/var/run/php-fpm.sock")
|
||||
(socket-group "httpd")))
|
||||
@end example
|
||||
|
||||
@item @code{server-root} (default: @code{httpd})
|
||||
The @code{ServerRoot} in the configuration file, defaults to the httpd
|
||||
package. Directives including @code{Include} and @code{LoadModule} are
|
||||
|
|
|
@ -22,7 +22,8 @@
|
|||
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
info_TEXINFOS = %D%/guix.texi \
|
||||
%D%/guix.fr.texi
|
||||
%D%/guix.fr.texi \
|
||||
%D%/guix.de.texi
|
||||
|
||||
%C%_guix_TEXINFOS = \
|
||||
%D%/contributing.texi \
|
||||
|
@ -54,7 +55,9 @@ OS_CONFIG_EXAMPLES_TEXI = \
|
|||
%D%/os-config-lightweight-desktop.texi
|
||||
|
||||
TRANSLATED_INFO = \
|
||||
%D%/guix.de.texi \
|
||||
%D%/guix.fr.texi \
|
||||
%D%/contributing.de.texi \
|
||||
%D%/contributing.fr.texi
|
||||
|
||||
# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014, 2015, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -33,7 +33,7 @@ (define %artwork-repository
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "git://git.savannah.gnu.org/guix/guix-artwork.git")
|
||||
(url "https://git.savannah.gnu.org/git/guix/guix-artwork.git")
|
||||
(commit commit)))
|
||||
(file-name (string-append "guix-artwork-" (string-take commit 7)
|
||||
"-checkout"))
|
||||
|
|
|
@ -160,6 +160,7 @@ (define* (register-closure prefix closure
|
|||
|
||||
(define* (populate-single-profile-directory directory
|
||||
#:key profile closure
|
||||
(profile-name "guix-profile")
|
||||
deduplicate?
|
||||
register? schema)
|
||||
"Populate DIRECTORY with a store containing PROFILE, whose closure is given
|
||||
|
@ -169,6 +170,9 @@ (define* (populate-single-profile-directory directory
|
|||
contents of the store; DEDUPLICATE? determines whether to deduplicate files in
|
||||
the store.
|
||||
|
||||
PROFILE-NAME is the name of the profile being created under
|
||||
/var/guix/profiles, typically either \"guix-profile\" or \"current-guix\".
|
||||
|
||||
This is used to create the self-contained tarballs with 'guix pack'."
|
||||
(define (scope file)
|
||||
(string-append directory "/" file))
|
||||
|
@ -198,12 +202,20 @@ (define (symlink* old new)
|
|||
;; Make root's profile, which makes it a GC root.
|
||||
(mkdir-p* %root-profile)
|
||||
(symlink* profile
|
||||
(string-append %root-profile "/guix-profile-1-link"))
|
||||
(symlink* "guix-profile-1-link"
|
||||
(string-append %root-profile "/guix-profile"))
|
||||
(string-append %root-profile "/" profile-name "-1-link"))
|
||||
(symlink* (string-append profile-name "-1-link")
|
||||
(string-append %root-profile "/" profile-name))
|
||||
|
||||
(mkdir-p* "/root")
|
||||
(symlink* (string-append %root-profile "/guix-profile")
|
||||
"/root/.guix-profile"))
|
||||
(match profile-name
|
||||
("guix-profile"
|
||||
(mkdir-p* "/root")
|
||||
(symlink* (string-append %root-profile "/guix-profile")
|
||||
"/root/.guix-profile"))
|
||||
("current-guix"
|
||||
(mkdir-p* "/root/.config/guix")
|
||||
(symlink* (string-append %root-profile "/current-guix")
|
||||
"/root/.config/guix/current"))
|
||||
(_
|
||||
#t)))
|
||||
|
||||
;;; install.scm ends here
|
||||
|
|
|
@ -234,6 +234,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/imagemagick.scm \
|
||||
%D%/packages/inklingreader.scm \
|
||||
%D%/packages/inkscape.scm \
|
||||
%D%/packages/ipfs.scm \
|
||||
%D%/packages/irc.scm \
|
||||
%D%/packages/iso-codes.scm \
|
||||
%D%/packages/java.scm \
|
||||
|
@ -940,7 +941,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/lvm2-static-link.patch \
|
||||
%D%/packages/patches/lxsession-use-gapplication.patch \
|
||||
%D%/packages/patches/lyx-2.2.3-fix-test.patch \
|
||||
%D%/packages/patches/mailutils-uninitialized-memory.patch \
|
||||
%D%/packages/patches/make-glibc-compat.patch \
|
||||
%D%/packages/patches/make-impure-dirs.patch \
|
||||
%D%/packages/patches/mariadb-client-test-32bit.patch \
|
||||
|
@ -953,6 +953,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mcrypt-CVE-2012-4409.patch \
|
||||
%D%/packages/patches/mcrypt-CVE-2012-4426.patch \
|
||||
%D%/packages/patches/mcrypt-CVE-2012-4527.patch \
|
||||
%D%/packages/patches/meandmyshadow-define-paths-earlier.patch \
|
||||
%D%/packages/patches/mesa-skip-disk-cache-test.patch \
|
||||
%D%/packages/patches/meson-for-build-rpath.patch \
|
||||
%D%/packages/patches/metabat-fix-compilation.patch \
|
||||
|
@ -974,7 +975,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
|
||||
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
|
||||
%D%/packages/patches/mutt-store-references.patch \
|
||||
%D%/packages/patches/myrepos-CVE-2018-7032.patch \
|
||||
%D%/packages/patches/m4-gnulib-libio.patch \
|
||||
%D%/packages/patches/net-tools-bitrot.patch \
|
||||
%D%/packages/patches/netcdf-date-time.patch \
|
||||
|
@ -1129,6 +1129,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
|
||||
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
|
||||
%D%/packages/patches/rust-coresimd-doctest.patch \
|
||||
%D%/packages/patches/rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch \
|
||||
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \
|
||||
%D%/packages/patches/scheme48-tests.patch \
|
||||
%D%/packages/patches/scotch-test-threading.patch \
|
||||
|
@ -1167,6 +1168,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/teeworlds-use-latest-wavpack.patch \
|
||||
%D%/packages/patches/texinfo-perl-compat.patch \
|
||||
%D%/packages/patches/texinfo-5-perl-compat.patch \
|
||||
%D%/packages/patches/telegram-purple-adjust-test.patch \
|
||||
%D%/packages/patches/texi2html-document-encoding.patch \
|
||||
%D%/packages/patches/texi2html-i18n.patch \
|
||||
%D%/packages/patches/thefuck-test-environ.patch \
|
||||
|
@ -1231,7 +1233,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/wpa-supplicant-krack-followups.patch \
|
||||
%D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch \
|
||||
%D%/packages/patches/x265-detect512-all-arches.patch \
|
||||
%D%/packages/patches/xapian-revert-5489fb2f8.patch \
|
||||
%D%/packages/patches/xboing-CVE-2004-0149.patch \
|
||||
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
|
||||
%D%/packages/patches/xf86-video-geode-glibc-2.20.patch \
|
||||
|
@ -1247,7 +1248,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/xinetd-fix-fd-leak.patch \
|
||||
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
|
||||
%D%/packages/patches/xmodmap-asprintf.patch \
|
||||
%D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \
|
||||
%D%/packages/patches/zathura-plugindir-environment-variable.patch
|
||||
|
||||
MISC_DISTRO_FILES = \
|
||||
|
|
|
@ -3108,7 +3108,7 @@ (define-public dcadec
|
|||
(define-public bs1770gain
|
||||
(package
|
||||
(name "bs1770gain")
|
||||
(version "0.5.0")
|
||||
(version "0.5.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3116,7 +3116,7 @@ (define-public bs1770gain
|
|||
version "/bs1770gain-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii"))))
|
||||
"0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("ffmpeg" ,ffmpeg)
|
||||
("sox" ,sox)))
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -363,13 +363,13 @@ (define-public r-multtest
|
|||
(define-public r-graph
|
||||
(package
|
||||
(name "r-graph")
|
||||
(version "1.58.0")
|
||||
(version "1.58.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "graph" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1zx445lk36g1s6i5dbhhf00nzzazyklfjxxjfax6q8hnhvgm9759"))))
|
||||
"07smbb3c30pr5r425g181xsg0rs5jx6x2q6xpwb5dqgicxrz30ga"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-biocgenerics" ,r-biocgenerics)))
|
||||
|
|
|
@ -6292,14 +6292,14 @@ (define-public r-centipede
|
|||
(define-public r-vegan
|
||||
(package
|
||||
(name "r-vegan")
|
||||
(version "2.5-2")
|
||||
(version "2.5-3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "vegan" version))
|
||||
(sha256
|
||||
(base32
|
||||
"13pyqvlpz64qibi8k5d109v7q09j06mbv6ndix3n4cn21mjx391c"))))
|
||||
"023xznh0iy0496icpchadmp7a3rk3nj9s48fvwlvp3dssw58yp3c"))))
|
||||
(build-system r-build-system)
|
||||
(native-inputs
|
||||
`(("gfortran" ,gfortran)))
|
||||
|
@ -7309,13 +7309,13 @@ (define-public r-seqinr
|
|||
(define-public r-iranges
|
||||
(package
|
||||
(name "r-iranges")
|
||||
(version "2.14.11")
|
||||
(version "2.14.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "IRanges" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0wz63hysspyjihqadg91dbvllc5a61zzjrsz0b9498lihqc6m1la"))))
|
||||
"1ar8sqqgjdy00dbgrxnacqy6gwir5xax76yf0vjxi2vj2skqb0kn"))))
|
||||
(properties
|
||||
`((upstream-name . "IRanges")))
|
||||
(build-system r-build-system)
|
||||
|
@ -7338,7 +7338,7 @@ (define-public r-iranges
|
|||
(define-public r-genomeinfodbdata
|
||||
(package
|
||||
(name "r-genomeinfodbdata")
|
||||
(version "0.99.1")
|
||||
(version "1.1.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; We cannot use bioconductor-uri here because this tarball is
|
||||
|
@ -7348,7 +7348,7 @@ (define-public r-genomeinfodbdata
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hipipvyvrh75n68hsjg35sxbcfzrghzxv547vnkk2f8ya99g01r"))))
|
||||
"0k1hsjx6n2i1sf14hyrgdhxqxm5mxk0bgnivhiax944whcicmzbf"))))
|
||||
(properties
|
||||
`((upstream-name . "GenomeInfoDbData")))
|
||||
(build-system r-build-system)
|
||||
|
@ -7389,13 +7389,13 @@ (define-public r-genomeinfodb
|
|||
(define-public r-edger
|
||||
(package
|
||||
(name "r-edger")
|
||||
(version "3.22.3")
|
||||
(version "3.22.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "edgeR" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0w3jv29n0kkaiig8dbbdqy2dkng8xfaihch82mj9ci5hphrx3nng"))))
|
||||
"0pkcdkh8mwdaca6xa8a7vwdfh46r03rkxwkrf17pwwd4557j7lj7"))))
|
||||
(properties `((upstream-name . "edgeR")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -7455,13 +7455,13 @@ (define-public r-variantannotation
|
|||
(define-public r-limma
|
||||
(package
|
||||
(name "r-limma")
|
||||
(version "3.36.3")
|
||||
(version "3.36.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "limma" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0iiifszr6hcqih6kszdsbkx3gacfg3d7v8hdx0lbjqnjqgqz7pwk"))))
|
||||
"0d13w95si7l6fqfsdf6k50v4l573hhfva6mvd94v26iba24p2f6x"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "http://bioinf.wehi.edu.au/limma")
|
||||
(synopsis "Package for linear models for microarray and RNA-seq data")
|
||||
|
@ -7510,13 +7510,13 @@ (define-public r-xvector
|
|||
(define-public r-genomicranges
|
||||
(package
|
||||
(name "r-genomicranges")
|
||||
(version "1.32.6")
|
||||
(version "1.32.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "GenomicRanges" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0p58yk2i5gqvjlkx548mnrr49wvs0xfcl06l9rqj2hi6hkkbvnp3"))))
|
||||
"1lh54asabrmk982636avpp1kcfzakwxi31cbj3jc8mkhar1mkyrx"))))
|
||||
(properties
|
||||
`((upstream-name . "GenomicRanges")))
|
||||
(build-system r-build-system)
|
||||
|
@ -7716,13 +7716,13 @@ (define-public r-rsamtools
|
|||
(define-public r-delayedarray
|
||||
(package
|
||||
(name "r-delayedarray")
|
||||
(version "0.6.5")
|
||||
(version "0.6.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "DelayedArray" version))
|
||||
(sha256
|
||||
(base32
|
||||
"10b03zrnvz5isfh4z55hasya2m71lrfx10l5lm2sdmqs0gwkanrd"))))
|
||||
"0rkp0mfsq3wfnib389dh3i44ab0wiz8skkjcv4596dwgq50jqpf2"))))
|
||||
(properties
|
||||
`((upstream-name . "DelayedArray")))
|
||||
(build-system r-build-system)
|
||||
|
@ -7858,13 +7858,13 @@ (define-public r-rtracklayer
|
|||
(define-public r-genomicfeatures
|
||||
(package
|
||||
(name "r-genomicfeatures")
|
||||
(version "1.32.2")
|
||||
(version "1.32.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "GenomicFeatures" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0kfyyg1ib8fkq2hxraal10z4bx3rg8figdskw4yhn1mbh6l42q5f"))))
|
||||
"06prj5iih3ywsgq00lgfl29p3f8j23a0kqqhzhqcgjrrwsp94588"))))
|
||||
(properties
|
||||
`((upstream-name . "GenomicFeatures")))
|
||||
(build-system r-build-system)
|
||||
|
@ -7899,7 +7899,7 @@ (define-public r-genomicfeatures
|
|||
(define-public r-go-db
|
||||
(package
|
||||
(name "r-go-db")
|
||||
(version "3.5.0")
|
||||
(version "3.6.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.bioconductor.org/packages/"
|
||||
|
@ -7907,7 +7907,7 @@ (define-public r-go-db
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02d1mn1al3q7qvhx1ylrr3ar4w4iw0qyi5d89v2336rzwk9maq35"))))
|
||||
"0fi2qywr9apg5lwfqfq9qq6bgrnv4rdhxx25656qn4bsy62i838j"))))
|
||||
(properties
|
||||
`((upstream-name . "GO.db")))
|
||||
(build-system r-build-system)
|
||||
|
@ -8777,14 +8777,14 @@ (define-public r-mutationalpatterns
|
|||
(define-public r-wgcna
|
||||
(package
|
||||
(name "r-wgcna")
|
||||
(version "1.63")
|
||||
(version "1.66")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "WGCNA" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1225dqm68bynkmklnsxdqdd3zqrpzbvqwyly8ibxmk75z33xz309"))))
|
||||
"0rhnyhzfn93yp24jz9v6dzrmyizwzdw070a7idm0k33w1cm8sjqv"))))
|
||||
(properties `((upstream-name . "WGCNA")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -9359,13 +9359,13 @@ (define-public r-copywriter
|
|||
(define-public r-methylkit
|
||||
(package
|
||||
(name "r-methylkit")
|
||||
(version "1.6.1")
|
||||
(version "1.6.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "methylKit" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hr2czi5ybdf7hdmqsv39d17f3mvmw94wa38bc14zzm9mgy9gfy7"))))
|
||||
"1nla74d2sjs51yyvvxf038a03mhw9appvjzj60vr2vd3p5lhqn9k"))))
|
||||
(properties `((upstream-name . "methylKit")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -9733,14 +9733,14 @@ (define-public r-pcamethods
|
|||
(define-public r-msnbase
|
||||
(package
|
||||
(name "r-msnbase")
|
||||
(version "2.6.3")
|
||||
(version "2.6.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "MSnbase" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15jhqg02ypmznc0wxksw56yij02csy678vqy531fdv86fsmypwa0"))))
|
||||
"1civd8b1rd5n6ys52dazw5m1yy2wq7049dbbyhzv7pjpa1m2x1rm"))))
|
||||
(properties `((upstream-name . "MSnbase")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -10063,14 +10063,14 @@ (define-public r-fastseg
|
|||
(define-public r-keggrest
|
||||
(package
|
||||
(name "r-keggrest")
|
||||
(version "1.20.1")
|
||||
(version "1.20.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (bioconductor-uri "KEGGREST" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ss0xd5570x570v01r6lp64rr1apjrzp0j62520pvm3g8knjhfvs"))))
|
||||
"0whmmbkq8bmc3ll20l4cv6hhxjgzbkrs97japljzg07ncn1fffsa"))))
|
||||
(properties `((upstream-name . "KEGGREST")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -10378,14 +10378,14 @@ (define-public r-ggbio
|
|||
(define-public r-gprofiler
|
||||
(package
|
||||
(name "r-gprofiler")
|
||||
(version "0.6.6")
|
||||
(version "0.6.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "gProfileR" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1n6cj12j102b4x9vhyl4dljp1i0r43p23cnhqbx4als2xfxdlqgi"))))
|
||||
"12nwidbnqmnfy5dnqga26byslvdnkrpz2fi19qfcby6xx0wbndk7"))))
|
||||
(properties `((upstream-name . "gProfileR")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
|
|
@ -178,15 +178,15 @@ (define-public pcc
|
|||
(define-public libbytesize
|
||||
(package
|
||||
(name "libbytesize")
|
||||
(version "1.3")
|
||||
(version "1.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/storaged-project/libbytesize/releases/download/1.3/libbytesize-"
|
||||
version ".tar.gz"))
|
||||
"https://github.com/storaged-project/libbytesize/releases/"
|
||||
"download/" version "/libbytesize-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1l7mxm2vq2h6137fyfa46v9r4lydp9dvmsixkd64xr3ylqk1g6fi"))))
|
||||
"0bbqzln1nhjxl71aydq9k4jg3hvki9lqsb4w10s1i27jgibxqkdv"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
|
|
@ -34,7 +34,7 @@ (define-public calcurse
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://calcurse.org/files/calcurse-"
|
||||
(uri (string-append "https://calcurse.org/files/calcurse-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -57,7 +57,7 @@ (define-public calcurse
|
|||
(setenv "TZDIR" ;for test/ical-007.sh
|
||||
(string-append (assoc-ref inputs "tzdata")
|
||||
"/share/zoneinfo")))))))
|
||||
(home-page "http://www.calcurse.org")
|
||||
(home-page "https://www.calcurse.org")
|
||||
(synopsis "Text-based calendar and scheduling")
|
||||
(description
|
||||
"Calcurse is a text-based calendar and scheduling application. It helps
|
||||
|
|
|
@ -293,13 +293,13 @@ (define-public cmocka
|
|||
(define-public cppcheck
|
||||
(package
|
||||
(name "cppcheck")
|
||||
(version "1.84")
|
||||
(version "1.85")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/danmar/cppcheck/archive/"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1ibz07dgs1dpfb8bmjh3qsma37wl5p6s6b4qlv5ccpshj4yjk9ma"))
|
||||
(base32 "18qlddf1i9bk5nnvy1v2nfxjd46y8wvp3rqz2hrfxjxsyvrfq5yw"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "http://cppcheck.sourceforge.net")
|
||||
|
|
|
@ -211,16 +211,16 @@ (define ref
|
|||
(define-public cloc
|
||||
(package
|
||||
(name "cloc")
|
||||
(version "1.78")
|
||||
(version "1.80")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/AlDanial/cloc/releases/download/" version
|
||||
"https://github.com/AlDanial/cloc/releases/download/v" version
|
||||
"/cloc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1j9lwy9xf43kpv1csqdxzch6y1hnsv881ddqd357f8v58dhr4s68"))))
|
||||
"0rqxnaskg5b736asyzfda1113zvpkajyqjf49vl9wgzf1r9m6bq8"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("coreutils" ,coreutils)
|
||||
|
@ -231,8 +231,8 @@ (define-public cloc
|
|||
("perl-regexp-common" ,perl-regexp-common)))
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(delete 'configure) ; nothing to configure
|
||||
(delete 'build) ; nothing to build
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
|
|
|
@ -694,13 +694,13 @@ (define-public libmspack
|
|||
(package
|
||||
(name "libmspack")
|
||||
(home-page "https://cabextract.org.uk/libmspack/")
|
||||
(version "0.7.1")
|
||||
(version "0.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append home-page name "-" version "alpha.tar.gz"))
|
||||
(sha256
|
||||
(base32 "0zn4vwzk5ankgd0l88cipan19pzbzv0sm3fba17lvqwka3dp1acp"))))
|
||||
(base32 "1byx98jajv927f0a7np0hvs8lxzccny6pj8vrrgmldv1jlp7jcq5"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-static")))
|
||||
|
@ -1752,14 +1752,14 @@ (define-public unshield
|
|||
(define-public zstd
|
||||
(package
|
||||
(name "zstd")
|
||||
(version "1.3.6")
|
||||
(version "1.3.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/facebook/zstd/releases/download/"
|
||||
"v" version "/zstd-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1525b31jmbiczjj1n58nckdzky4cdnbwcsil3zgy4cx03v0a0cp8"))))
|
||||
(base32 "0gapsdzqfsfqqddzv22592iwa0008xjyi15f06pfv9hcvwvg4xrj"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -382,14 +382,14 @@ (define-public cups
|
|||
(define-public hplip
|
||||
(package
|
||||
(name "hplip")
|
||||
(version "3.18.6")
|
||||
(version "3.18.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
|
||||
"/hplip-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zbv6cp9n3xypf2fg4j6fpz8zkvl0z08lyc1vq1gd04ln1l3xkqf"))
|
||||
"0g3q5mm2crjyc1z4z6gv4lam6sc5d3diz704djrnpqadk4q3h290"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Fix type mismatch.
|
||||
|
@ -398,7 +398,7 @@ (define-public hplip
|
|||
(("boolean") "bool"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://hplipopensource.com/")
|
||||
(home-page "https://developers.hp.com/hp-linux-imaging-and-printing")
|
||||
(synopsis "HP printer drivers")
|
||||
(description
|
||||
"Hewlett-Packard printer drivers and PostScript Printer Descriptions
|
||||
|
@ -414,6 +414,8 @@ (define-public hplip
|
|||
`("--disable-network-build"
|
||||
,(string-append "--prefix=" (assoc-ref %outputs "out"))
|
||||
,(string-append "--sysconfdir=" (assoc-ref %outputs "out") "/etc")
|
||||
,(string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib")
|
||||
;; Disable until mime.types merging works (FIXME).
|
||||
"--disable-fax-build"
|
||||
"--enable-hpcups-install"
|
||||
|
|
|
@ -51,6 +51,7 @@ (define-public curl
|
|||
(package
|
||||
(name "curl")
|
||||
(version "7.61.1")
|
||||
(replacement curl-7.62.0)
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
|
@ -141,6 +142,19 @@ (define-public curl
|
|||
"See COPYING in the distribution."))
|
||||
(home-page "https://curl.haxx.se/")))
|
||||
|
||||
(define-public curl-7.62.0
|
||||
(package
|
||||
(inherit curl)
|
||||
(version "7.62.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hbm29r3pirhn4gkcnd94ylc4jzgn3v3v7qbay9awxg7bwx69dfs"))))))
|
||||
|
||||
(define-public kurly
|
||||
(package
|
||||
(name "kurly")
|
||||
|
|
|
@ -503,10 +503,9 @@ (define-public mongodb
|
|||
#t))
|
||||
(replace 'build
|
||||
(lambda _
|
||||
(zero? (apply system*
|
||||
`("scons"
|
||||
(apply invoke `("scons"
|
||||
,@common-options
|
||||
"mongod" "mongo" "mongos")))))
|
||||
"mongod" "mongo" "mongos"))))
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? inputs #:allow-other-keys)
|
||||
(setenv "TZDIR"
|
||||
|
@ -1227,6 +1226,18 @@ (define-public sqlite-with-fts5
|
|||
((#:configure-flags flags)
|
||||
`(cons "--enable-fts5" ,flags))))))
|
||||
|
||||
;; This is used by Qt.
|
||||
(define-public sqlite-with-column-metadata
|
||||
(package (inherit sqlite)
|
||||
(name "sqlite-with-column-metadata")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments sqlite)
|
||||
((#:configure-flags flags)
|
||||
`(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
|
||||
"-DSQLITE_ENABLE_UNLOCK_NOTIFY "
|
||||
"-DSQLITE_ENABLE_DBSTAT_VTAB "
|
||||
"-DSQLITE_ENABLE_COLUMN_METADATA")))))))
|
||||
|
||||
(define-public tdb
|
||||
(package
|
||||
(name "tdb")
|
||||
|
|
|
@ -33,15 +33,17 @@ (define-module (gnu packages debian)
|
|||
(define-public debian-archive-keyring
|
||||
(package
|
||||
(name "debian-archive-keyring")
|
||||
(version "2017.7")
|
||||
(version "2018.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://debian/pool/main/d/" name "/"
|
||||
name "_" version ".tar.xz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://salsa.debian.org/release-team/debian-archive-keyring.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pdwgipfi0y4svhxlw8arhq792f1g3vlmw4raphizy7sa65vd4ca"))))
|
||||
"136vr5dj7w0dz563qdghsndcfcqm2m8d4j1dyiq9dzx5vd0rcpcw"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:test-target "verify-results"
|
||||
|
@ -116,7 +118,7 @@ (define-public ubuntu-keyring
|
|||
(define-public debootstrap
|
||||
(package
|
||||
(name "debootstrap")
|
||||
(version "1.0.106")
|
||||
(version "1.0.109")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -126,7 +128,7 @@ (define-public debootstrap
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fm5bgllcwgwizrqi4sn8p4fpbzhbzgwprrfppfq9hqdzbmlfmnv"))))
|
||||
"0bjqlyg605lnsjcn3wjplc6jl75nx7c6miyac2qsahi484rylg5g"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -222,7 +222,7 @@ (define-public grammalecte
|
|||
(base32
|
||||
"11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://www.dicollecte.org")
|
||||
(home-page "https://grammalecte.net")
|
||||
(synopsis "French spelling and grammar checker")
|
||||
(description "Grammalecte is a grammar checker dedicated to the French
|
||||
language, derived from Lightproof.
|
||||
|
|
|
@ -65,7 +65,7 @@ (define-module (gnu packages dns)
|
|||
(define-public dnsmasq
|
||||
(package
|
||||
(name "dnsmasq")
|
||||
(version "2.79")
|
||||
(version "2.80")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -73,7 +73,7 @@ (define-public dnsmasq
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq"))))
|
||||
"1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -363,7 +363,7 @@ (define-public nsd
|
|||
(define-public unbound
|
||||
(package
|
||||
(name "unbound")
|
||||
(version "1.8.0")
|
||||
(version "1.8.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -371,7 +371,7 @@ (define-public unbound
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gxqc4ynd2g1a5dwaazqh9n8injh49a7dz0l9bbxqgv47dnrvxvq"))))
|
||||
"0p9w6spar5dfi7fplxjcq4394wldabaws0ns30cqq6sxqfwv6qn3"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "python"))
|
||||
(native-inputs
|
||||
|
|
|
@ -123,7 +123,7 @@ (define-public sigrok-firmware-fx2lafw
|
|||
(define-public libsigrok
|
||||
(package
|
||||
(name "libsigrok")
|
||||
(version "0.5.0")
|
||||
(version "0.5.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -131,19 +131,17 @@ (define-public libsigrok
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c"))))
|
||||
"171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"))))
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
`(#:tests? #f ; tests need usb access
|
||||
`(#:tests? #f ; tests need USB access
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'change-udev-group
|
||||
(lambda _
|
||||
(let ((file "contrib/z60_libsigrok.rules"))
|
||||
(substitute* file
|
||||
(("plugdev") "dialout"))
|
||||
(rename-file file "contrib/60-libsigrok.rules")
|
||||
#t)))
|
||||
(substitute* (find-files "contrib" "\\.rules$")
|
||||
(("plugdev") "dialout"))
|
||||
#t))
|
||||
(add-after 'build 'build-doc
|
||||
(lambda _
|
||||
(invoke "doxygen")))
|
||||
|
@ -155,11 +153,12 @@ (define-public libsigrok
|
|||
#t))
|
||||
(add-after 'install-doc 'install-udev-rules
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(install-file "contrib/60-libsigrok.rules"
|
||||
(string-append
|
||||
(assoc-ref outputs "out")
|
||||
"/lib/udev/rules.d/"))
|
||||
#t))
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(rules (string-append out "/lib/udev/rules.d/")))
|
||||
(for-each (lambda (file)
|
||||
(install-file file rules))
|
||||
(find-files "contrib" "\\.rules$"))
|
||||
#t)))
|
||||
(add-after 'install-udev-rules 'install-fw
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((fx2lafw (assoc-ref inputs "sigrok-firmware-fx2lafw"))
|
||||
|
@ -167,7 +166,6 @@ (define-public libsigrok
|
|||
(dir-suffix "/share/sigrok-firmware/")
|
||||
(input-dir (string-append fx2lafw dir-suffix))
|
||||
(output-dir (string-append out dir-suffix)))
|
||||
(mkdir-p output-dir)
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(install-file file output-dir))
|
||||
|
@ -204,7 +202,7 @@ (define-public libsigrok
|
|||
(define-public sigrok-cli
|
||||
(package
|
||||
(name "sigrok-cli")
|
||||
(version "0.7.0")
|
||||
(version "0.7.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -212,7 +210,7 @@ (define-public sigrok-cli
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan"))))
|
||||
"15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
|
@ -228,7 +226,7 @@ (define-public sigrok-cli
|
|||
(define-public pulseview
|
||||
(package
|
||||
(name "pulseview")
|
||||
(version "0.4.0")
|
||||
(version "0.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -236,9 +234,20 @@ (define-public pulseview
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q"))))
|
||||
"0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-DCMAKE_CXX_FLAGS=-fext-numeric-literals")))
|
||||
`(#:configure-flags '("-DENABLE_TESTS=y")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'remove-empty-doc-directory
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(with-directory-excursion (string-append out "/share")
|
||||
;; Use RMDIR to never risk silently deleting files.
|
||||
(rmdir "doc/pulseview")
|
||||
(rmdir "doc"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
|
@ -249,7 +258,6 @@ (define-public pulseview
|
|||
("libsigrokdecode" ,libsigrokdecode)
|
||||
("qtbase" ,qtbase)
|
||||
("qtsvg" ,qtsvg)))
|
||||
(build-system cmake-build-system)
|
||||
(home-page "https://www.sigrok.org/wiki/PulseView")
|
||||
(synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")
|
||||
(description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI
|
||||
|
|
|
@ -956,14 +956,14 @@ (define-public emacs-wget
|
|||
(define-public emacs-emms
|
||||
(package
|
||||
(name "emacs-emms")
|
||||
(version "5.0")
|
||||
(version "5.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/emms/emms-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08f9lj77jlk96grqgjsv63s2i8ywvp4wvnmgmhnslwyx2lsdxza3"))
|
||||
"149ddczyx6x10zn4mn8g0rll1rwf4yciv8x6j0qdnlbwszblx2x6"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -2630,14 +2630,14 @@ (define-public emacs-ob-ipython
|
|||
(define-public emacs-debbugs
|
||||
(package
|
||||
(name "emacs-debbugs")
|
||||
(version "0.15")
|
||||
(version "0.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://elpa.gnu.org/packages/debbugs-"
|
||||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x7jw2ldgkknyxg7x9fhnqkary691icnysmi3xw0g2fjrvllzhqw"))))
|
||||
"0y3bq803c7820h15g66d1648skxfhlfa2v6vincj6xk5ssp44s9p"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$")))
|
||||
(propagated-inputs
|
||||
|
@ -8200,7 +8200,7 @@ (define-public emacs-esxml
|
|||
(define-public emacs-nov-el
|
||||
(package
|
||||
(name "emacs-nov-el")
|
||||
(version "0.2.2")
|
||||
(version "0.2.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -8209,7 +8209,7 @@ (define-public emacs-nov-el
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"03s0qjvwk1f7y3i4wh2p5y3z4hdv00adgz8za3vphzc0q8i1kjzb"))))
|
||||
"188h5gzn1zf443g0b7q5bpmvvpr6ds5h8aci8vxc92py56rhyrvc"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -11746,10 +11746,10 @@ (define-public emacs-wgrep-helm
|
|||
(deprecated-package "emacs-wgrep-helm" emacs-wgrep))
|
||||
|
||||
(define-public emacs-mu4e-conversation
|
||||
(let ((commit "223cc66e99c7665326e3d991d6d383cb0d7512bb"))
|
||||
(let ((commit "54368a009474276247bdf39683e25ea68ae1f943"))
|
||||
(package
|
||||
(name "emacs-mu4e-conversation")
|
||||
(version (git-version "20180722" "2" commit))
|
||||
(version (git-version "20181105" "3" commit))
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -11760,7 +11760,7 @@ (define-public emacs-mu4e-conversation
|
|||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ivy7pihhma465hi25p1y45dyi8h52nsm2m0cvizj5sw36jw0n81"))))
|
||||
"1zqnp1d3cxyvzsd76d5iw40lkif19k9svlbhqy6dvqiaqm0jbd15"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("mu" ,mu)))
|
||||
|
@ -12012,7 +12012,7 @@ (define-public emacs-helm-org-contacts
|
|||
(define-public emacs-dired-du
|
||||
(package
|
||||
(name "emacs-dired-du")
|
||||
(version "0.5")
|
||||
(version "0.5.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -12021,7 +12021,7 @@ (define-public emacs-dired-du
|
|||
version ".tar"))
|
||||
(sha256
|
||||
(base32
|
||||
"09yj37p2fa5f81fqrzwghjkyy2ydsf4rbkfwpn2yyvzd5nd97bpl"))))
|
||||
"1091scnrjh0a4gja4z6jxic6ghy1yryv46qk9c76pmh50cpw6766"))))
|
||||
(build-system emacs-build-system)
|
||||
(home-page "http://elpa.gnu.org/packages/dired-du.html")
|
||||
(synopsis "Dired with recursive directory sizes")
|
||||
|
@ -12433,3 +12433,33 @@ (define-public emacs-slime-repl-ansi-color
|
|||
(synopsis "Color ANSI codes in the REPL of SLIME")
|
||||
(description "Color ANSI codes in the REPL of SLIME")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public emacs-helm-slime
|
||||
(let ((commit "9980925f3e5f6ac5a30369d2a544e82006a79c76"))
|
||||
(package
|
||||
(name "emacs-helm-slime")
|
||||
(version (git-version "0.0.0" "1" commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/emacs-helm/helm-slime")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0xa07gpfkzwn522x9573mq5mfxvbawdgd0m93gqj6w5a14wk8zzh"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs
|
||||
`(("emacs-helm" ,emacs-helm)
|
||||
("emacs-slime" ,emacs-slime)))
|
||||
(home-page "https://github.com/emacs-helm/helm-slime")
|
||||
(synopsis "Helm for SLIME, the Superior Lisp Interaction Mode for Emacs")
|
||||
(description "Helm-SLIME defines a few new commands:
|
||||
|
||||
@itemize
|
||||
@item helm-slime-complete: Select a symbol from the SLIME completion systems.
|
||||
@item helm-slime-list-connections: Yet another slime-list-connections with Helm.
|
||||
@item: helm-slime-apropos: Yet another slime-apropos with Helm.
|
||||
@item helm-slime-repl-history: Select an input from the SLIME REPL history and insert it.
|
||||
@end itemize\n")
|
||||
(license license:gpl3+))))
|
||||
|
|
|
@ -117,8 +117,8 @@ (define-public desmume
|
|||
|
||||
;; Building from recent Git because the official 5.0 release no longer builds.
|
||||
(define-public dolphin-emu
|
||||
(let ((commit "5f0d825f40b8aabe13eaef32d44ab667ff8e8c28")
|
||||
(revision "3"))
|
||||
(let ((commit "22ddd11573fd8d3e43a879804e7a64e50928435d")
|
||||
(revision "4"))
|
||||
(package
|
||||
(name "dolphin-emu")
|
||||
(version (git-version "5.0" revision commit))
|
||||
|
@ -144,7 +144,7 @@ (define-public dolphin-emu
|
|||
#t))
|
||||
(sha256
|
||||
(base32
|
||||
"0dh7mih16aif9ynbgcsn7n10f89g8d232i86xqfp2rijsdggcmzl"))))
|
||||
"01l6r8spaslqc73m3y7hfb2jx5a4848vdkman6x6w2arpb8bywzl"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f
|
||||
|
@ -153,7 +153,8 @@ (define-public dolphin-emu
|
|||
(add-before 'configure 'fixgcc7
|
||||
(lambda _
|
||||
(unsetenv "C_INCLUDE_PATH")
|
||||
(unsetenv "CPLUS_INCLUDE_PATH")))
|
||||
(unsetenv "CPLUS_INCLUDE_PATH")
|
||||
#t))
|
||||
(add-before 'configure 'generate-fonts&hardcore-libvulkan-path
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((fontfile
|
||||
|
@ -195,7 +196,7 @@ (define-public dolphin-emu
|
|||
("bluez" ,bluez)
|
||||
("curl" ,curl)
|
||||
("eudev" ,eudev)
|
||||
("ffmpeg" ,ffmpeg-3.4)
|
||||
("ffmpeg" ,ffmpeg)
|
||||
("font-wqy-microhei" ,font-wqy-microhei)
|
||||
("freetype" ,freetype)
|
||||
("glew" ,glew)
|
||||
|
@ -1185,7 +1186,7 @@ (define-public scummvm
|
|||
(define-public mame
|
||||
(package
|
||||
(name "mame")
|
||||
(version "0.202")
|
||||
(version "0.203")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1195,7 +1196,7 @@ (define-public mame
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1v9gm124p65nbj678gfkcvwphp9qc15ky2p12ca6g3rllma94di5"))
|
||||
"19ccqc00024fbjyk0k5d9xljhwq7wsrp7phwm2jmn0h77mgdj844"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
|
|
|
@ -107,7 +107,7 @@ (define-public httpfs2
|
|||
(define-public disorderfs
|
||||
(package
|
||||
(name "disorderfs")
|
||||
(version "0.5.4")
|
||||
(version "0.5.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -117,7 +117,7 @@ (define-public disorderfs
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mw4ix9h17ikki8p2rxdvzp87rcm1c7by5lvfn5gxlxr7hlj9f8g"))))
|
||||
"18c32qcdzbxrzg7srnqnw1ls9yqqxyk9b996yxr6w2znw6x6n8v4"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -126,7 +126,7 @@ (define-public disorderfs
|
|||
("attr" ,attr)))
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))
|
||||
(delete 'configure)) ; no configure script
|
||||
#:make-flags (let ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "PREFIX=" out)))
|
||||
#:test-target "test"
|
||||
|
|
|
@ -121,14 +121,15 @@ (define-public yosys
|
|||
(name "yosys")
|
||||
(version "0.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://github.com/cliffordwolf/yosys/archive/"
|
||||
name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/cliffordwolf/yosys.git")
|
||||
(commit (string-append "yosys-" version))
|
||||
(recursive? #t))) ; for the ‘iverilog’ submodule
|
||||
(sha256
|
||||
(base32
|
||||
"0vkfdn4phvkjqlnpqlr6q5f97bgjc3312vj5jf0vf85zqv88dy9x"))
|
||||
(file-name (string-append name "-" version "-checkout.tar.gz"))
|
||||
"1ssrpgw0j9qlm52g1hsbb9fsww4vnwi0l7zvvky7a8w7wamddky0"))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
@ -440,18 +440,19 @@ (define-public tiled
|
|||
(define-public sfml
|
||||
(package
|
||||
(name "sfml")
|
||||
(version "2.5.0")
|
||||
(version "2.5.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(method git-fetch)
|
||||
;; Do not fetch the archives from
|
||||
;; http://mirror0.sfml-dev.org/files/ because files there seem
|
||||
;; to be changed in place.
|
||||
(uri (string-append "https://github.com/SFML/SFML/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(uri (git-reference
|
||||
(url "https://github.com/SFML/SFML.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab"))
|
||||
"0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
@ -572,7 +572,7 @@ (define-public golly
|
|||
(define-public meandmyshadow
|
||||
(package
|
||||
(name "meandmyshadow")
|
||||
(version "0.4.1")
|
||||
(version "0.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/meandmyshadow/"
|
||||
|
@ -580,38 +580,24 @@ (define-public meandmyshadow
|
|||
"-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wl5dc75qy001s6043cx0vr2l5y2qfv1cldqnwill9sfygqj9p95"))))
|
||||
"1b6qf83vdfv8jwn2jq9ywmda2qn2f5914i7mwfy04m17wx593m3m"))
|
||||
(patches (search-patches
|
||||
;; This will not be needed in the next release.
|
||||
"meandmyshadow-define-paths-earlier.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; there are no tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'set-sdl'paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "cmake/Modules/FindSDL_gfx.cmake"
|
||||
(("/usr/local/include/SDL")
|
||||
(string-append (assoc-ref inputs "sdl")
|
||||
"/include/SDL")))
|
||||
;; Because SDL provides lib/libX11.so.6 we need to explicitly
|
||||
;; link with libX11, even though we're using the GL backend.
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("\\$\\{X11_LIBRARIES\\}") "-lX11"))
|
||||
#t)))))
|
||||
`(#:tests? #f)) ; there are no tests
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("sdl" ,(sdl-union (list sdl
|
||||
sdl-image
|
||||
sdl-gfx
|
||||
sdl-mixer
|
||||
sdl-ttf)))
|
||||
("libx11" ,libx11) ; needed by sdl's libX11
|
||||
`(("curl" ,curl)
|
||||
("libarchive" ,libarchive)
|
||||
("openssl" ,openssl)
|
||||
("mesa" ,mesa)
|
||||
("glu" ,glu)
|
||||
("curl" ,curl)))
|
||||
(home-page "http://meandmyshadow.sourceforge.net/")
|
||||
("lua" ,lua)
|
||||
("sdl" ,(sdl-union (list sdl2
|
||||
sdl2-image
|
||||
sdl2-mixer
|
||||
sdl2-ttf)))))
|
||||
(home-page "https://acmepjz.github.io/meandmyshadow/")
|
||||
(synopsis "Puzzle/platform game")
|
||||
(description "Me and My Shadow is a puzzle/platform game in which you try
|
||||
to reach the exit by solving puzzles. Spikes, moving blocks, fragile blocks
|
||||
|
@ -3658,18 +3644,18 @@ (define-public mrrescue
|
|||
(define-public hyperrogue
|
||||
(package
|
||||
(name "hyperrogue")
|
||||
(version "10.4t")
|
||||
(version "10.4x")
|
||||
;; When updating this package, be sure to update the "hyperrogue-data"
|
||||
;; origin in native-inputs.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://www.roguetemple.com/z/hyper/"
|
||||
"https://www.roguetemple.com/z/hyper/"
|
||||
name (string-join (string-split version #\.) "")
|
||||
"-src.tgz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0phqhmnzmc16a23qb4fkil0flzb86kibdckf1r35nc3l0k4193nn"))))
|
||||
"0khk7xqdw4aiw1wnf1xrhmd7fklnzmpdavd7ix4mkm510dr5wklm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
@ -3741,12 +3727,12 @@ (define-public hyperrogue
|
|||
(method url-fetch)
|
||||
(uri
|
||||
(string-append
|
||||
"http://www.roguetemple.com/z/hyper/" name
|
||||
"https://www.roguetemple.com/z/hyper/" name
|
||||
(string-join (string-split version #\.) "")
|
||||
"-win.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xd9v8zzgi8m5ar8g4gy1xx5zqwidz3gn1knz0lwib3kbxx4drpg"))))
|
||||
"1dv3kdv1n5imh3n9900b55rf0wwbjj7243lhsbk7lcjqsqxia39q"))))
|
||||
("unzip" ,unzip)))
|
||||
(inputs
|
||||
`(("font-dejavu" ,font-dejavu)
|
||||
|
@ -3756,7 +3742,7 @@ (define-public hyperrogue
|
|||
sdl-gfx
|
||||
sdl-mixer
|
||||
sdl-ttf)))))
|
||||
(home-page "http://www.roguetemple.com/z/hyper/")
|
||||
(home-page "https://www.roguetemple.com/z/hyper/")
|
||||
(synopsis "Non-euclidean graphical rogue-like game")
|
||||
(description
|
||||
"HyperRogue is a game in which the player collects treasures and fights
|
||||
|
@ -4018,7 +4004,7 @@ (define-public freegish
|
|||
(define-public cdogs-sdl
|
||||
(package
|
||||
(name "cdogs-sdl")
|
||||
(version "0.6.7")
|
||||
(version "0.6.8")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -4027,7 +4013,7 @@ (define-public cdogs-sdl
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1frafzsj3f83xkmn4llr7g728c82lcqi424ini1hv3gv5zjgpa15"))))
|
||||
"1v0adxm4xsix6r6j9hs7vmss7pxrb37azwfazr54p1dmfz4s6rp8"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -5553,7 +5539,8 @@ (define-public xonotic
|
|||
Comment=Xonotic glx~@
|
||||
Exec=~a/bin/xonotic-glx~@
|
||||
TryExec=~@*~a/bin/xonotic-glx~@
|
||||
Icon=~@
|
||||
Icon=xonotic~@
|
||||
Categories=Game~@
|
||||
Type=Application~%"
|
||||
output)))
|
||||
(with-output-to-file
|
||||
|
@ -5565,7 +5552,8 @@ (define-public xonotic
|
|||
Comment=Xonotic sdl~@
|
||||
Exec=~a/bin/xonotic-sdl~@
|
||||
TryExec=~@*~a/bin/xonotic-sdl~@
|
||||
Icon=~@
|
||||
Icon=xonotic~@
|
||||
Categories=Game~@
|
||||
Type=Application~%"
|
||||
output)))
|
||||
(with-output-to-file
|
||||
|
@ -5577,7 +5565,8 @@ (define-public xonotic
|
|||
Comment=Xonotic~@
|
||||
Exec=~a/bin/xonotic-glx~@
|
||||
TryExec=~@*~a/bin/xonotic~@
|
||||
Icon=~@
|
||||
Icon=xonotic~@
|
||||
Categories=Game~@
|
||||
Type=Application~%"
|
||||
output)))
|
||||
#t)))
|
||||
|
|
|
@ -2465,7 +2465,7 @@ (define-public rest
|
|||
(define-public libsoup
|
||||
(package
|
||||
(name "libsoup")
|
||||
(version "2.64.0")
|
||||
(version "2.64.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/libsoup/"
|
||||
|
@ -2473,7 +2473,7 @@ (define-public libsoup
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"09z7g3spww3f84y8jmicdd6lqp360mbggpg5h1fq1v4p5ihcjnyr"))))
|
||||
"1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
@ -3631,7 +3631,7 @@ (define-public grilo-plugins
|
|||
(define-public totem
|
||||
(package
|
||||
(name "totem")
|
||||
(version "3.26.1")
|
||||
(version "3.26.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3640,7 +3640,7 @@ (define-public totem
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"10n302fdp3lhkzbij5sbzmsnln738029xil6cnng2d4dxv4n1099"))
|
||||
"1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g"))
|
||||
(patches (search-patches "totem-meson-easy-codec.patch"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs
|
||||
|
|
|
@ -510,15 +510,55 @@ (define-public icecat
|
|||
(mozilla-patch "icecat-bug-1478685.patch" "098585dc86fc" "1b0x4qdh6isvffmibvc8ad8z62m3iky9q6jq0z6gyvn8q252cqal")
|
||||
(mozilla-patch "icecat-bug-1486080.patch" "3f8d57d936ea" "0pz2c18wcgj44v0j8my9xbm90m4bsjcvzmavj569fi8bh6s6zz8p")
|
||||
(mozilla-patch "icecat-bug-1423278.patch" "878ceaee5634" "0i47s5nvrx9vqbnj6s9y9f4ffww20p8nviqa6frg676y1188xlyl")
|
||||
(mozilla-patch "icecat-bug-1442010.patch" "87be1b98ec9a" "15f4l18c7hz9aqn89gg3dwmdidfwgn10dywgpzydm8mps45amx7j")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt01.patch" "87be1b98ec9a" "15f4l18c7hz9aqn89gg3dwmdidfwgn10dywgpzydm8mps45amx7j")
|
||||
(mozilla-patch "icecat-bug-1484559.patch" "99e58b5307ce" "02fdgbliwzi2r2376wg6k1rky1isfka0smac4ii2cll01jhpfrn6")
|
||||
(mozilla-patch "icecat-bug-1487098.patch" "f25ce451a492" "18nzg39iyxza1686180qk9cc88l5j2hf1h35d62lrqmdgd9vcj33")
|
||||
(mozilla-patch "icecat-bug-1484905.patch" "35c26bc231df" "0qh8d4z6y03h5xh7djci26a01l6zq667lg2k11f6zzg7z2j0h67x")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt02.patch" "f25ce451a492" "18nzg39iyxza1686180qk9cc88l5j2hf1h35d62lrqmdgd9vcj33")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt03.patch" "35c26bc231df" "0qh8d4z6y03h5xh7djci26a01l6zq667lg2k11f6zzg7z2j0h67x")
|
||||
(mozilla-patch "icecat-bug-1488061.patch" "050d0cfa8e3d" "05ql798ynbyz5pvyri4b95j4ixmgnny3zl7sd2ckfrrbm9mxh627")
|
||||
(mozilla-patch "icecat-bug-1434963-pt1.patch" "1e6dad87efed" "1v00a6cmgswjk54041jyv1ib129fxshpzwk6mn6lr0v5hylk3bx9")
|
||||
(mozilla-patch "icecat-bug-1434963-pt2.patch" "6558c46df9ea" "0vdy9dm9w5k1flhcfxwvvff0aa415b5mgmmq5r37i83686768xfb")
|
||||
(mozilla-patch "icecat-bug-1434963-pt3.patch" "686fcfa8abd6" "0ihqr11aq4b0y7mx7bwn8yzn25mv3k2gdphm951mj1g85qg35ann")
|
||||
(mozilla-patch "icecat-bug-1491132.patch" "14120e0c74d6" "188c5fbhqqhmlk88p70l6d97skh7xy4jhqdby1ri3h9ix967515j")))
|
||||
(mozilla-patch "icecat-bug-1491132.patch" "14120e0c74d6" "188c5fbhqqhmlk88p70l6d97skh7xy4jhqdby1ri3h9ix967515j")
|
||||
(mozilla-patch "icecat-bug-1492065.patch" "ec4b5969c6ae" "18gfwn15kh0826vlg6lhrx3q4gv82i7v1k3y5jp72mvrjq154gy0")
|
||||
(mozilla-patch "icecat-bug-1492064.patch" "528cabdd9665" "0rdwpkfma24hn8namfb9saw4rgi9yyyj4af5h2ijrvadw6r8lyyn")
|
||||
(mozilla-patch "icecat-bug-1489757.patch" "46f19852aaa6" "0dga7mw847klm8x6il2fyzpjxqxxgx1q5cya658f1w66kxms1f29")
|
||||
(mozilla-patch "icecat-bug-1492897.patch" "c3a48066f383" "09n6sdck4jzzmznzrq0iixg5nsgrc5ibpdfsh3i7ppwad3fsy2m3")
|
||||
(mozilla-patch "icecat-bug-1492915.patch" "2d280e557331" "11x2n61pw5way9cg8lbrfl3lqvgfnbmcs1fwm78i06kmfwj0msk3")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt04.patch" "b80f94262165" "1hw43h4sgf77x323745rixyp6cci3fb6d3fnp33q82m4ssdb5623")
|
||||
(mozilla-patch "icecat-bug-1492484.patch" "1b3e6759cf3a" "1yn2cd2227ncg90c88ymdi5fyfs4hk335bd16vkkgljs0924yy0m")
|
||||
(mozilla-patch "icecat-bug-1493590.patch" "d9fe3b2025fc" "06783hj1aqms2f9a3mp18bk8hgijk3pz70bpccn173v4w0zlbbd4")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt05.patch" "20c59797e994" "1vxnhpirjsj040hrq9xmq2xhkpq4l5mnnzqy0nda92dfh47zvidj")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt06.patch" "1749661dfd28" "0g0sj2fgp3asj0yvxksnhrc59yxncn35bz5nzlvkpgdf7h06gscd")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt07.patch" "a511a9242406" "1hhfrvdmkccnhs4skbi06174x37rmvf4ic86xawyyzr67yga73b2")
|
||||
(mozilla-patch "icecat-bug-1495404.patch" "3232bb3b622f" "1pnaxf8r9h0wldjc4qgl7z3rk34fpz9h1vd3zmhswa6mvyln5jhg")
|
||||
(mozilla-patch "icecat-bug-1465388.patch" "a9577451dcc2" "0v29s0v3vv9vblkcachhh46qvwjcrmv2bkcdb7sj2asc503l0lqv")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt08.patch" "e965f6f6ed75" "0hh091854xj5j0x1r8pg46xmn00fqi5n212xhzbdpgyf96rsf513")
|
||||
(mozilla-patch "icecat-bug-1445528.patch" "8a503e022a29" "1y2ll3h0yz8sfdddjmk90qjfxcr1ffhw7a9ww3yw26gyhnbpg404")
|
||||
(mozilla-patch "icecat-bug-1409570.patch" "8d326641d1c0" "0w29s6dixi7b7q3nicshrp29n9sj5awssdln00yx664m8a8a8ihs")
|
||||
(mozilla-patch "icecat-bug-1496094.patch" "6cdd6d88eca9" "1ssqa4fy2xpbr63ph3av3hkpl92g4yszx402fq9d2xn9482q43dp")
|
||||
(mozilla-patch "icecat-CVE-2018-12391.patch" "0fa07c704ca4" "055xdyb3g2l4rj188235i579qnr50v19q36jjpliws9nik129iqy")
|
||||
(mozilla-patch "icecat-bug-1462162.patch" "739e898cb7c8" "17m9y0pskmqx15dkgkw4k93njph14mpsf37wb1azwkq3xx7s0fhx")
|
||||
(mozilla-patch "icecat-bug-1492764.patch" "16310ab35452" "1kq5r3w9i4n6q9msmw2qsqa0jd4qw1mjlyyz8aq14fwlbkhvv199")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt09.patch" "9b669d047d55" "063ig49gx9468nvc9w8259j819qfdjvq0sbbz8n4kj5r6hcxjc5l")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt10.patch" "9d51e65c797a" "0m23cq9zl22w80dvx5rlgpbam1l3d6v56h7g9wzamzl21bwxq9fv")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt11.patch" "efc0596dd381" "1alvbb6wvawxxh6isisk9c40vhdiv59fy0af0n10yn1dgy8ffv5i")
|
||||
(mozilla-patch "icecat-CVE-2018-12393.patch" "c4fb48bb5d28" "09izww9dsg9n8cish8f3y7phxibsnd12bfkcxd7rzcdhg10nr4pl")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt12.patch" "b3359becd7b1" "188byxmbgrvrid2fcz34w5xdvaw571frxx1c6nqaa9k03iljdzjr")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt13.patch" "791c8ecf252d" "02h37594aba0pklxm3g7w1wv8vz9xmcf30fd0az8pfaccsklmx74")
|
||||
(mozilla-patch "icecat-bug-1494328.patch" "333276fac37c" "0qyq42jl0al63m6pwj9gva7nj82l76szzbj7sklsygx0a9mqs13z")
|
||||
(mozilla-patch "icecat-CVE-2018-12397.patch" "cb73374a0e4e" "0x2s1nwgwdag9df5hkwzvjj0qznp5c3d6w6y63rn2y287jn9m3vl")
|
||||
(mozilla-patch "icecat-CVE-2018-12392.patch" "f6bb138ad0ab" "0f0z9dsyw2a11p4p31mdyic571153jpfgy2q04i4v6dmmcz76pm3")
|
||||
(mozilla-patch "icecat-CVE-2018-12396.patch" "f27145bd5502" "0vznmlm1fbl3ynax2zpi6xxzr9qp9b83afr3mv90jgrhlgpzdbcz")
|
||||
(mozilla-patch "icecat-CVE-2018-12395-pt1.patch" "133a99a8f3ca" "0im7m4jmc273mg9kih0i70hxsgzy04j6ydm9zmaz2933hkhdf4iw")
|
||||
(mozilla-patch "icecat-CVE-2018-12395-pt2.patch" "82176a4a9b14" "0g3yqx4854d4mx5a0ghb7p7saj6y5d5bm2lfhabvkwybcd477zmc")
|
||||
(mozilla-patch "icecat-bug-1474265.patch" "e8abd9a8ce6e" "1q2sv5h081rvnhsx6g1y8a43hwv6hsg0cr6zdcij58mkgzf6hyvd")
|
||||
(mozilla-patch "icecat-bug-1492737-pt1.patch" "eeb9060379dc" "1d2mf0x4rni7anvi0sgra4dg87fmc6g7zhizzl9jv2x8va27ycbp")
|
||||
(mozilla-patch "icecat-bug-1492737-pt2.patch" "99eae0d15092" "0f9j6cvhrbrrxa95p4pkcn285r9wmi9yj13nwj5x0gkglwx6idbk")
|
||||
(mozilla-patch "icecat-CVE-2018-12389-pt1.patch" "23b23e12c548" "0nsdycggki5rhh59yvmh41nf1ahjmgii89fx38jryprhspy3wg62")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt14.patch" "023133ff02ec" "1g22qxnmgiy8bgrn2nv6har6vpz4p2h5pdas8ib1yyz7p2ic8652")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt15.patch" "9461988ff462" "0yq2cr5grqskr0kz4nxcwmnywy9g0xyv6k6q44i490jcj8x2y1vw")
|
||||
(mozilla-patch "icecat-CVE-2018-12390-pt16.patch" "09939be135d8" "1546xlk368v4hnjd3hf4w868i6m8r4wfd34qxz4wg1cdpr4m5mik")
|
||||
(mozilla-patch "icecat-CVE-2018-12389-pt2.patch" "ea9412b18ca8" "0fmdncrylbmjh0bcb6dmw1rq7zww8a0v9v9p1pxqfz0vbc6v9l5d")))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -147,7 +147,7 @@ (define-public gpscorrelate
|
|||
(define-public gama
|
||||
(package
|
||||
(name "gama")
|
||||
(version "2.00")
|
||||
(version "2.01")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -155,7 +155,7 @@ (define-public gama
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p51jlzr6qqqvzx0sq8j7fxqfij62c3pjcsb53vgx0jx0qdqyjba"))))
|
||||
"1z3n5p69qglxq15l9g13cg78kyb0l6v8mbzqgc1fqkfbdk1mis0k"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments '(#:parallel-tests? #f)) ; race condition
|
||||
(native-inputs
|
||||
|
|
|
@ -22,11 +22,13 @@ (define-module (gnu packages hardware)
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages))
|
||||
|
||||
|
@ -232,3 +234,45 @@ (define-public msr-tools
|
|||
MSR addresses differ (greatly) between processors, and any such modification can
|
||||
be dangerous and may void your CPU or system board's warranty.")
|
||||
(license license:gpl2))) ; cpuid.c is gpl2, {rd,wr}msr.c are gpl2+
|
||||
|
||||
(define-public wavemon
|
||||
(package
|
||||
(name "wavemon")
|
||||
(version "0.8.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/uoaerg/wavemon.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list "CC=gcc"
|
||||
;; Makefile.in (ab)uses $(datadir) as $(docdir). Set it to Guix's
|
||||
;; standard --docdir since it's only used as such.
|
||||
(string-append "datadir=" (assoc-ref %outputs "out")
|
||||
"/share/doc/" ,name "-" ,version))
|
||||
#:tests? #f)) ; no tests
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libcap" ,libcap)
|
||||
("libnl" ,libnl)
|
||||
("ncurses" ,ncurses)))
|
||||
(home-page "https://github.com/uoaerg/wavemon")
|
||||
(synopsis "Wireless network device monitor")
|
||||
(description
|
||||
"Wavemon is a wireless device monitor with an interactive ncurses terminal
|
||||
interface. It can display and plot signal and noise levels in real time. It
|
||||
also reports packet statistics, device configuration, network parameters, and
|
||||
access points and other wireless clients of your wireless network hardware.
|
||||
|
||||
Wavemon should work (with varying levels of detail and features) with any device
|
||||
supported by the Linux kernel.")
|
||||
;; Source file headers still say GPL2+, but the authorial intent
|
||||
;; (from COPYING and the F9 'about' screen) is clearly GPL3+.
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -60,7 +60,7 @@ (define-module (gnu packages image-viewers)
|
|||
(define-public feh
|
||||
(package
|
||||
(name "feh")
|
||||
(version "2.28")
|
||||
(version "2.28.1")
|
||||
(home-page "https://feh.finalrewind.org/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -68,7 +68,7 @@ (define-public feh
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk"))))
|
||||
"0wian0gnx0yfxf8x9b8wr57fjd6rnmi3y3xj83ni6x0xqrjnf1lp"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases (delete 'configure))
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
|
||||
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -43,6 +44,7 @@ (define-module (gnu packages image)
|
|||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages fontutils)
|
||||
|
@ -1476,3 +1478,30 @@ (define-public gifsicle
|
|||
lightweight animated-GIF viewer, and @command{gifdiff} compares two GIFs for
|
||||
identical visual appearance.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public jp2a
|
||||
(package
|
||||
(name "jp2a")
|
||||
(version "1.0.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/cslarsen/jp2a/archive/v"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nahpjvrahixcfqqrjj2k4fscc8qs4hqnmj2qgjzsjj3z6xxh2g5"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg)
|
||||
("curl" ,curl)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://csl.name/jp2a/")
|
||||
(synopsis "Convert JPEG images to ASCII")
|
||||
(description
|
||||
"Jp2a is a small utility that converts JPEG images to ASCII.")
|
||||
(license license:gpl2)))
|
||||
|
|
212
gnu/packages/ipfs.scm
Normal file
212
gnu/packages/ipfs.scm
Normal file
|
@ -0,0 +1,212 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix 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.
|
||||
;;;
|
||||
;;; GNU Guix 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 GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages ipfs)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (gnu packages golang))
|
||||
|
||||
(define-public go-github-com-ipfs-go-ipfs-cmdkit-files
|
||||
(let ((commit
|
||||
"386fcf8f18a185ec121676665fe2d9574496048d")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-ipfs-go-ipfs-cmdkit-files")
|
||||
(version (git-version "1.1.3" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ipfs/go-ipfs-cmdkit.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qk6fshgdmhp8dip2ksm13j6nywi41m9mn0czkvmw6b697z85l2r"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:unpack-path "github.com/ipfs/go-ipfs-cmdkit"
|
||||
#:import-path "github.com/ipfs/go-ipfs-cmdkit/files"))
|
||||
(home-page "https://github.com/ipfs/go-ipfs-cmdkit")
|
||||
(synopsis "Shared types, functions and values for go-ipfs")
|
||||
(description "@command{cmdkit} offers some types, functions and values
|
||||
that are shared between @command{go-ipfs/commands} and its rewrite
|
||||
@command{go-ipfs-cmds}.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github-com-ipfs-go-ipfs-api
|
||||
(let ((commit
|
||||
"dafc2a13a4389ac1a6c2786e34ab70a4f26d3a3f")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-ipfs-go-ipfs-api")
|
||||
(version (git-version "1.3.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ipfs/go-ipfs-api.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"06kibnwb037sqynk99j07wm8alvxwx3bari9gdax4jv93396kycj"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/ipfs/go-ipfs-api"
|
||||
;; TODO: Tests fail, might need network access.
|
||||
#:tests? #f))
|
||||
(native-inputs
|
||||
`(("go-github-com-ipfs-go-ipfs-cmdkit-files" ,go-github-com-ipfs-go-ipfs-cmdkit-files)
|
||||
("go-github-com-libp2p-go-libp2p-metrics" ,go-github-com-libp2p-go-libp2p-metrics)
|
||||
("go-github-com-libp2p-go-flow-metrics" ,go-github-com-libp2p-go-flow-metrics)
|
||||
("go-github-com-libp2p-go-libp2p-peer" ,go-github-com-libp2p-go-libp2p-peer)
|
||||
("go-github-com-libp2p-go-libp2p-protocol" ,go-github-com-libp2p-go-libp2p-protocol)
|
||||
("go-github-com-libp2p-go-libp2p-crypto" ,go-github-com-libp2p-go-libp2p-crypto)
|
||||
("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir)
|
||||
("go-github-com-multiformats-go-multiaddr" ,go-github-com-multiformats-go-multiaddr)
|
||||
("go-github-com-multiformats-go-multiaddr-net" ,go-github-com-multiformats-go-multiaddr-net)
|
||||
("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec)
|
||||
("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto)
|
||||
("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd)
|
||||
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
|
||||
("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58)
|
||||
("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash)
|
||||
("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union))
|
||||
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
|
||||
("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg)
|
||||
("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils)
|
||||
("go-github-com-cheekybits-is" ,go-github-com-cheekybits-is)))
|
||||
(home-page "https://github.com/ipfs/go-ipfs-api")
|
||||
(synopsis "Unofficial Go interface to IPFS's HTTP API")
|
||||
(description "An unofficial Go interface to IPFS's HTTP API")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public gx
|
||||
(let ((commit
|
||||
"89338e509426d2895f20086685cf4c77d64cc5df")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "gx")
|
||||
(version (git-version "0.14.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/whyrusleeping/gx.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"08gh04jln8rxpq0j4fm4chjap162wp8cjwj9szbvj9c7123s42rd"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/whyrusleeping/gx"))
|
||||
(native-inputs
|
||||
`(("go-github-com-blang-semver" ,go-github-com-blang-semver)
|
||||
("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg)
|
||||
("go-github-com-ipfs-go-ipfs-api" ,go-github-com-ipfs-go-ipfs-api)
|
||||
("go-github-com-ipfs-go-ipfs-cmdkit-files" ,go-github-com-ipfs-go-ipfs-cmdkit-files)
|
||||
("go-github-com-libp2p-go-flow-metrics" ,go-github-com-libp2p-go-flow-metrics)
|
||||
("go-github-com-libp2p-go-libp2p-crypto" ,go-github-com-libp2p-go-libp2p-crypto)
|
||||
("go-github-com-libp2p-go-libp2p-metrics" ,go-github-com-libp2p-go-libp2p-metrics)
|
||||
("go-github-com-libp2p-go-libp2p-peer" ,go-github-com-libp2p-go-libp2p-peer)
|
||||
("go-github-com-libp2p-go-libp2p-protocol" ,go-github-com-libp2p-go-libp2p-protocol)
|
||||
("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd)
|
||||
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
|
||||
("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir)
|
||||
("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58)
|
||||
("go-github-com-multiformats-go-multiaddr" ,go-github-com-multiformats-go-multiaddr)
|
||||
("go-github-com-multiformats-go-multiaddr-net" ,go-github-com-multiformats-go-multiaddr-net)
|
||||
("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash)
|
||||
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
|
||||
("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils)
|
||||
("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union))
|
||||
("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec)
|
||||
("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto)
|
||||
("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore)
|
||||
("go-github-com-urfave-cli" ,go-github-com-urfave-cli)
|
||||
("go-github-com-whyrusleeping-json-filter" ,go-github-com-whyrusleeping-json-filter)
|
||||
("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter)
|
||||
("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump)))
|
||||
(home-page "https://github.com/whyrusleeping/gx")
|
||||
(synopsis "Package management tool using IPFS")
|
||||
(description "@command{gx} is a packaging tool built around the
|
||||
distributed, content addressed filesystem IPFS. It aims to be flexible,
|
||||
powerful and simple.")
|
||||
(license license:expat))))
|
||||
|
||||
(define-public go-github-com-whyrusleeping-gx-util
|
||||
(package
|
||||
(inherit gx)
|
||||
(name "go-github-com-whyrusleeping-gx-util")
|
||||
(arguments
|
||||
'(#:unpack-path "github.com/whyrusleeping/gx"
|
||||
#:import-path "github.com/whyrusleeping/gx/gxutil"))))
|
||||
|
||||
(define-public gx-go
|
||||
(package
|
||||
(name "gx-go")
|
||||
(version "1.9.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/whyrusleeping/gx-go")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fdy4b3ymqw6hzvvjwq37mfrdmizc8lxm53axw93n3x6118na9jc"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/whyrusleeping/gx-go"))
|
||||
(native-inputs
|
||||
`(("go-github-com-whyrusleeping-gx-util" ,go-github-com-whyrusleeping-gx-util)
|
||||
("go-github-com-kr-fs" ,go-github-com-kr-fs)
|
||||
("go-github-com-gxed-hashland-keccakpg" ,go-github-com-gxed-hashland-keccakpg)
|
||||
("go-github-com-ipfs-go-ipfs-api" ,go-github-com-ipfs-go-ipfs-api)
|
||||
("go-github-com-ipfs-go-ipfs-cmdkit-files" ,go-github-com-ipfs-go-ipfs-cmdkit-files)
|
||||
("go-github-com-libp2p-go-flow-metrics" ,go-github-com-libp2p-go-flow-metrics)
|
||||
("go-github-com-libp2p-go-libp2p-crypto" ,go-github-com-libp2p-go-libp2p-crypto)
|
||||
("go-github-com-libp2p-go-libp2p-metrics" ,go-github-com-libp2p-go-libp2p-metrics)
|
||||
("go-github-com-libp2p-go-libp2p-peer" ,go-github-com-libp2p-go-libp2p-peer)
|
||||
("go-github-com-libp2p-go-libp2p-protocol" ,go-github-com-libp2p-go-libp2p-protocol)
|
||||
("go-github-com-minio-blake2b-simd" ,go-github-com-minio-blake2b-simd)
|
||||
("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd)
|
||||
("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir)
|
||||
("go-github-com-mr-tron-base58" ,go-github-com-mr-tron-base58)
|
||||
("go-github-com-multiformats-go-multiaddr" ,go-github-com-multiformats-go-multiaddr)
|
||||
("go-github-com-multiformats-go-multiaddr-net" ,go-github-com-multiformats-go-multiaddr-net)
|
||||
("go-github-com-multiformats-go-multihash" ,go-github-com-multiformats-go-multihash)
|
||||
("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3)
|
||||
("go-github-com-whyrusleeping-tar-utils" ,go-github-com-whyrusleeping-tar-utils)
|
||||
("go-golang-org-x-crypto-union" ,(go-golang-org-x-crypto-union))
|
||||
("go-github-com-btcsuite-btcd-btcec" ,go-github-com-btcsuite-btcd-btcec)
|
||||
("go-github-com-gogo-protobuf-proto" ,go-github-com-gogo-protobuf-proto)
|
||||
("go-github-com-sabhiram-go-gitignore" ,go-github-com-sabhiram-go-gitignore)
|
||||
("go-github-com-urfave-cli" ,go-github-com-urfave-cli)
|
||||
("go-github-com-whyrusleeping-progmeter" ,go-github-com-whyrusleeping-progmeter)
|
||||
("go-github-com-whyrusleeping-stump" ,go-github-com-whyrusleeping-stump)))
|
||||
(home-page "https://github.com/whyrusleeping/gx-go")
|
||||
(synopsis "Golang subtool for the @command{gx} package manager")
|
||||
(description "A subtool for the @command{gx} package manager for packages
|
||||
written in Go.")
|
||||
(license license:expat)))
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -413,7 +413,7 @@ (define-public js-filesaver
|
|||
(define-public mujs
|
||||
(package
|
||||
(name "mujs")
|
||||
(version "1.0.4")
|
||||
(version "1.0.5")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -422,11 +422,17 @@ (define-public mujs
|
|||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ly0yybs66nk63517kg4dmdc7dbikhqqqf2r2kvccgzzvv6k0vs8"))))
|
||||
"0pkv26jxwgv5ax0ylfmi4h96h79hj4gvr95218ns8wngnmgr1ny6"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)) ; no configure
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure
|
||||
(add-after 'install 'install-shared-library
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(install-file "build/release/libmujs.so"
|
||||
(string-append out "/lib"))))))
|
||||
#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))
|
||||
(string-append "CC=gcc"))
|
||||
#:tests? #f)) ; no tests
|
||||
|
|
|
@ -357,10 +357,10 @@ (define-public julia
|
|||
(method url-fetch)
|
||||
;; No versioned URL, see <https://www.agner.org/optimize/> for updates.
|
||||
(uri "https://www.agner.org/optimize/objconv.zip")
|
||||
(file-name "objconv-2018-08-15.zip")
|
||||
(file-name "objconv-2018-10-07.zip")
|
||||
(sha256
|
||||
(base32
|
||||
"09y4pwxfs6fl47cyingbf95i2rxx74wmycl9fd4ldcgvpx9bzdrx"))))
|
||||
"0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"))))
|
||||
("dsfmt"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
|
|
|
@ -36,6 +36,7 @@ (define-module (gnu packages kde)
|
|||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages gl)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages graphics)
|
||||
#:use-module (gnu packages image)
|
||||
|
@ -479,6 +480,45 @@ (define-public libkomparediff2
|
|||
;; source archive
|
||||
(license (list license:gpl2+ license:lgpl2.0+ license:bsd-3))))
|
||||
|
||||
(define-public libkscreen
|
||||
(package
|
||||
(name "libkscreen")
|
||||
(version "5.13.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/plasma/" version "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
;; For testing.
|
||||
("dbus" ,dbus)))
|
||||
(inputs
|
||||
`(("kwayland" ,kwayland)
|
||||
("libxrandr" ,libxrandr)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)))
|
||||
(arguments
|
||||
'(#:tests? #f ; FIXME: 55% tests passed, 5 tests failed out of 11
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; For the missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
;; Run the tests offscreen.
|
||||
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||
#t)))))
|
||||
(home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
|
||||
(synopsis "KDE's screen management software")
|
||||
(description "KScreen is the new screen management software for KDE Plasma
|
||||
Workspaces which tries to be as magic and automatic as possible for users with
|
||||
basic needs and easy to configure for those who want special setups.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public libksysguard
|
||||
(package
|
||||
(name "libksysguard")
|
||||
|
|
|
@ -740,6 +740,9 @@ (define-public libzmf
|
|||
(sha256 (base32
|
||||
"08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; A harmless 'sign-compare' error pops up on i686 so disable '-Werror'.
|
||||
'(#:configure-flags '("--disable-werror")))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("icu4c" ,icu4c)
|
||||
|
@ -1102,6 +1105,8 @@ (define (install-appdata app)
|
|||
(list
|
||||
"--enable-release-build"
|
||||
"--enable-verbose"
|
||||
;; Avoid using all cpu cores by default
|
||||
(format #f "--with-parallelism=~d" (parallel-job-count))
|
||||
"--disable-fetch-external" ; disable downloads
|
||||
"--with-system-libs" ; enable all --with-system-* flags
|
||||
(string-append "--with-boost-libdir="
|
||||
|
|
|
@ -303,14 +303,14 @@ (define-public python2-pyusb
|
|||
(define-public libmtp
|
||||
(package
|
||||
(name "libmtp")
|
||||
(version "1.1.15")
|
||||
(version "1.1.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/libmtp/libmtp/" version
|
||||
"/libmtp-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"089h79nkz7wcr3lbqi7025l8p75hbp0aigxk3wdk2zkm8q5r0h6h"))))
|
||||
"185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -400,10 +400,10 @@ (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux" "a
|
|||
;; supports qemu "virt" machine and possibly a large number of ARM boards.
|
||||
;; See : https://wiki.debian.org/DebianKernel/ARMMP.
|
||||
|
||||
(define %linux-libre-version "4.18.16")
|
||||
(define %linux-libre-hash "15apfgswp2lrwjpi3vwnanlkdw3q6rkvwrbgrb71rjsy9gazlz62")
|
||||
(define %linux-libre-version "4.19.1")
|
||||
(define %linux-libre-hash "12mrrgg2ih4jiylpy45q5nsd8afj3nya0klr543s0mcga88v9527")
|
||||
|
||||
(define %linux-libre-4.18-patches
|
||||
(define %linux-libre-4.19-patches
|
||||
(list %boot-logo-patch
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -414,25 +414,17 @@ (define %linux-libre-4.18-patches
|
|||
"arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch"))
|
||||
(file-name "linux-libre-4.18-arm-export-__sync_icache_dcache.patch")
|
||||
(sha256
|
||||
(base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f")))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git"
|
||||
"/patch/?id=c5157101e7793b42a56e07368c7f4cb73fb58008"))
|
||||
(file-name "linux-libre-4.18-arm64-export-__sync_icache_dcache.patch")
|
||||
(sha256
|
||||
(base32 "0q13arsi8al3l3yq6d76z4h8n45wlpkjyxlrgn1sqbx5xjksycyz")))))
|
||||
(base32 "1ifnfhpakzffn4b8n7x7w5cps9mzjxlkcfz9zqak2vaw8nzvl39f")))))
|
||||
|
||||
(define-public linux-libre
|
||||
(make-linux-libre %linux-libre-version
|
||||
%linux-libre-hash
|
||||
%linux-compatible-systems
|
||||
#:patches %linux-libre-4.18-patches
|
||||
#:patches %linux-libre-4.19-patches
|
||||
#:configuration-file kernel-config))
|
||||
|
||||
(define %linux-libre-4.14-version "4.14.78")
|
||||
(define %linux-libre-4.14-hash "07dhhw6zdnqn2dznpmkniz58hfkdx89yx7csm9vbx45blnyhjw5z")
|
||||
(define %linux-libre-4.14-version "4.14.79")
|
||||
(define %linux-libre-4.14-hash "000rd4h2yk6k68wjg37v53hqnqw1mgwhdxbcvy8iywy8za9r12c8")
|
||||
|
||||
(define-public linux-libre-4.14
|
||||
(make-linux-libre %linux-libre-4.14-version
|
||||
|
@ -456,7 +448,7 @@ (define-public linux-libre-arm-generic
|
|||
(make-linux-libre %linux-libre-version
|
||||
%linux-libre-hash
|
||||
'("armhf-linux")
|
||||
#:patches %linux-libre-4.18-patches
|
||||
#:patches %linux-libre-4.19-patches
|
||||
#:defconfig "multi_v7_defconfig"
|
||||
#:extra-version "arm-generic"))
|
||||
|
||||
|
@ -471,7 +463,7 @@ (define-public linux-libre-arm-omap2plus
|
|||
(make-linux-libre %linux-libre-version
|
||||
%linux-libre-hash
|
||||
'("armhf-linux")
|
||||
#:patches %linux-libre-4.18-patches
|
||||
#:patches %linux-libre-4.19-patches
|
||||
#:defconfig "omap2plus_defconfig"
|
||||
#:extra-version "arm-omap2plus"))
|
||||
|
||||
|
@ -945,7 +937,7 @@ (define-public zerofree
|
|||
(define-public strace
|
||||
(package
|
||||
(name "strace")
|
||||
(version "4.24")
|
||||
(version "4.25")
|
||||
(home-page "https://strace.io")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -953,7 +945,7 @@ (define-public strace
|
|||
"/strace-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0d061cdzk6a1822ds4wpqxg10ny27mi4i9zjmnsbz8nz3vy5jkhz"))))
|
||||
"00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
@ -1231,7 +1223,7 @@ (define-public ebtables
|
|||
(define-public iproute
|
||||
(package
|
||||
(name "iproute2")
|
||||
(version "4.18.0")
|
||||
(version "4.19.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1239,7 +1231,7 @@ (define-public iproute
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ida5njr9nacg6ym3rjvl3cc9czw0hn4akhzbqf8f4zmjl6cgrm9"))))
|
||||
"114rlb3bvrf7q6yr03mn1rj6gl7mrg0psvm2dx0qb2kxyjhmrv6r"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no test suite
|
||||
|
|
|
@ -2382,19 +2382,17 @@ (define-public sbcl-lift
|
|||
(sha256
|
||||
(base32
|
||||
"127v5avpz1i4m0lkaxqrq8hrl69rdazqaxf6s8awf0nd7wj2g4dp"))
|
||||
(file-name (git-file-name "lift" version))))
|
||||
(file-name (git-file-name "lift" version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Don't keep the bundled website
|
||||
`(begin
|
||||
(delete-file-recursively "website")
|
||||
#t))))
|
||||
(build-system asdf-build-system/sbcl)
|
||||
(arguments
|
||||
;; The tests require a debugger, but we run with the debugger disabled.
|
||||
'(#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; Do this to ensure the 'reset-gzip-timestamps phase works.
|
||||
(add-after 'unpack 'make-gzips-writeable
|
||||
(lambda _
|
||||
(for-each (lambda (file)
|
||||
(chmod file #o755))
|
||||
(find-files "." "\\.gz$")))))))
|
||||
'(#:tests? #f))
|
||||
(synopsis "LIsp Framework for Testing")
|
||||
(description
|
||||
"The LIsp Framework for Testing (LIFT) is a unit and system test tool for LISP.
|
||||
|
@ -2403,7 +2401,7 @@ (define-public sbcl-lift
|
|||
its own fixture. When run, a testcase can succeed, fail, or error. LIFT
|
||||
supports randomized testing, benchmarking, profiling, and reporting.")
|
||||
(home-page "https://github.com/gwkkwg/lift")
|
||||
(license license:x11-style))))
|
||||
(license license:expat))))
|
||||
|
||||
(define-public cl-lift
|
||||
(sbcl-package->cl-source-package sbcl-lift))
|
||||
|
@ -2663,7 +2661,6 @@ (define-public sbcl-parse-float
|
|||
"This package exports the following function to parse floating-point
|
||||
values from a string in Common Lisp.")
|
||||
(home-page "https://github.com/soemraws/parse-float")
|
||||
;; TODO: Missing license?
|
||||
(license license:public-domain))))
|
||||
|
||||
(define-public cl-parse-float
|
||||
|
|
|
@ -408,6 +408,9 @@ (define (make-lua-lpeg name lua)
|
|||
(define-public lua-lpeg
|
||||
(make-lua-lpeg "lua-lpeg" lua))
|
||||
|
||||
(define-public lua5.1-lpeg
|
||||
(make-lua-lpeg "lua5.1-lpeg" lua-5.1))
|
||||
|
||||
(define-public lua5.2-lpeg
|
||||
(make-lua-lpeg "lua5.2-lpeg" lua-5.2))
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
|
||||
|
@ -126,24 +126,14 @@ (define-module (gnu packages mail)
|
|||
(define-public mailutils
|
||||
(package
|
||||
(name "mailutils")
|
||||
(version "3.4")
|
||||
(version "3.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/mailutils/mailutils-"
|
||||
version ".tar.bz2"))
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dn71p85wlyisnwsb485sk3q5v393k3dizsa9fmimskdwjwgk3ch"))
|
||||
(patches
|
||||
(search-patches "mailutils-uninitialized-memory.patch"))
|
||||
(snippet
|
||||
;; For a rebuild of the Flex/Bison byproducts touched by the
|
||||
;; patch above.
|
||||
'(begin
|
||||
(for-each delete-file
|
||||
'("mh/mh_alias_lex.c"
|
||||
"libmailutils/cfg/parser.c"))
|
||||
#t))))
|
||||
"1wx275w38fwni2abc8g7g3irbk332vr34byxd72zqfdiznsqgims"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
@ -194,19 +184,22 @@ (define-public mailutils
|
|||
|
||||
#t)))
|
||||
;; TODO: Add `--with-sql'.
|
||||
#:configure-flags '("--sysconfdir=/etc")
|
||||
#:configure-flags (list "--sysconfdir=/etc"
|
||||
|
||||
;; Add "/2.2" to the installation directory.
|
||||
(string-append "--with-guile-site-dir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/guile/site/2.2"))
|
||||
|
||||
#:parallel-tests? #f))
|
||||
(native-inputs
|
||||
;; Note: Bison and Flex needed due to
|
||||
;; 'mailutils-uninitialized-memory.patch'.
|
||||
`(("bison" ,bison)
|
||||
("flex" ,flex)
|
||||
("perl" ,perl))) ;for 'gylwrap'
|
||||
`(("perl" ,perl))) ;for 'gylwrap'
|
||||
(inputs
|
||||
`(("dejagnu" ,dejagnu)
|
||||
("m4" ,m4)
|
||||
("texinfo" ,texinfo)
|
||||
("guile" ,guile-2.0)
|
||||
("guile" ,guile-2.2)
|
||||
("gsasl" ,gsasl)
|
||||
("gnutls" ,gnutls)
|
||||
("ncurses" ,ncurses)
|
||||
("readline" ,readline)
|
||||
|
@ -1857,7 +1850,7 @@ (define-public mb2md
|
|||
(define-public mpop
|
||||
(package
|
||||
(name "mpop")
|
||||
(version "1.2.8")
|
||||
(version "1.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1865,7 +1858,7 @@ (define-public mpop
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1skrda7lbks5h0v03ab8bhpg6ma1b63if8x9x3kb2fv70x2pkhqn"))))
|
||||
"14xsvpm5bc1wycisq882gqrnamnyi1q4rlk6anlw8ihzvwgm4h2j"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gnutls" ,gnutls)
|
||||
|
@ -2621,3 +2614,29 @@ (define-public urlscan
|
|||
Web browser. Alternatively, it send a list of all URLs to stdout. It is a
|
||||
replacement for the @code{urlview} program.")
|
||||
(license gpl2)))
|
||||
|
||||
(define-public tnef
|
||||
(package
|
||||
(name "tnef")
|
||||
(version "1.4.17")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/verdammelt/tnef.git")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"0cq2xh5wd74qn6k2nnw5rayxgqhjl3jbzf4zlc4babcwxrv32ldh"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)))
|
||||
(arguments `(#:parallel-tests? #f)) ;tests are side-effect'y
|
||||
(home-page "https://github.com/verdammelt/tnef")
|
||||
(synopsis "Unpack @code{application/ms-tnef} attachments")
|
||||
(description
|
||||
"TNEF is a tar-like program that unpacks MIME attachments of type
|
||||
@code{application/ms-tnef}.")
|
||||
(license gpl2+)))
|
||||
|
|
|
@ -286,13 +286,13 @@ (define-public python2-cvxopt
|
|||
(define-public units
|
||||
(package
|
||||
(name "units")
|
||||
(version "2.17")
|
||||
(version "2.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/units/units-" version
|
||||
".tar.gz"))
|
||||
(sha256 (base32
|
||||
"1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz"))))
|
||||
"0y26kj349i048y4z3xrk90bvciw2j6ds3rka7r7yn3183hirr5b4"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("readline" ,readline)
|
||||
|
@ -2110,16 +2110,14 @@ (define-public r-quadprog
|
|||
(define-public r-pracma
|
||||
(package
|
||||
(name "r-pracma")
|
||||
(version "2.1.5")
|
||||
(version "2.1.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "pracma" version))
|
||||
(sha256
|
||||
(base32 "18cv7c2gvagbmggfbsy2xk9bpn47izd0qrmqnc3q7afvj6pr6nf9"))))
|
||||
(base32 "0m8ladhrfyxwybblkcdgg4xv1mk5kibmwarpj2k0c2y34zzcix4z"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-quadprog" ,r-quadprog)))
|
||||
(home-page "https://cran.r-project.org/web/packages/pracma")
|
||||
(home-page "https://cran.r-project.org/web/packages/pracma/")
|
||||
(synopsis "Practical numerical math functions")
|
||||
(description "This package provides functions for numerical analysis and
|
||||
linear algebra, numerical optimization, differential equations, plus some
|
||||
|
@ -3294,7 +3292,7 @@ (define-public atlas
|
|||
(define-public glm
|
||||
(package
|
||||
(name "glm")
|
||||
(version "0.9.9.2")
|
||||
(version "0.9.9.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3302,7 +3300,7 @@ (define-public glm
|
|||
version "/glm-" version ".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1m2gws1d7l6h4mdn0ap74pfnm3vva3kk8rybdqd5x4lksd1mk6r0"))))
|
||||
"0yqk5r3qh60d4r2iab5q7wq0fryn8p3pz6s28y1i7amqj1aqavj9"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("unzip" ,unzip)))
|
||||
|
|
|
@ -32,71 +32,72 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages messaging)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages aidc)
|
||||
#:use-module (gnu packages aspell)
|
||||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages avahi)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages cyrus-sasl)
|
||||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages enchant)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages libcanberra)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (gnu packages libidn)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages less)
|
||||
#:use-module (gnu packages libcanberra)
|
||||
#:use-module (gnu packages libidn)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages networking)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages photo)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages icu4c)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages video)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages fontutils)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages less)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages photo)
|
||||
#:use-module (gnu packages texinfo))
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils))
|
||||
|
||||
(define-public libotr
|
||||
(package
|
||||
|
@ -1647,7 +1648,7 @@ (define-public toxic
|
|||
(define-public libqmatrixclient
|
||||
(package
|
||||
(name "libqmatrixclient")
|
||||
(version "0.3.0.2")
|
||||
(version "0.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1657,7 +1658,7 @@ (define-public libqmatrixclient
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5"))))
|
||||
"1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)))
|
||||
|
@ -1675,7 +1676,7 @@ (define-public libqmatrixclient
|
|||
(define-public quaternion
|
||||
(package
|
||||
(name "quaternion")
|
||||
(version "0.0.9.2")
|
||||
(version "0.0.9.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1685,31 +1686,31 @@ (define-public quaternion
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib"))))
|
||||
"1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("libqmatrixclient" ,libqmatrixclient)
|
||||
("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
("qtquickcontrols" ,qtquickcontrols)
|
||||
("qtsvg" ,qtsvg)
|
||||
("qttools" ,qttools)))
|
||||
(arguments
|
||||
`(#:tests? #f ; No tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-libqmatrixclient-dynamic-linking
|
||||
;; Upstream recommends statically linking with
|
||||
;; libqmatrixclient. Patch the source so that we can dynamically
|
||||
;; link instead. In a future release, when upstream moves to
|
||||
;; dynamic linking, remove this phase.
|
||||
(lambda _
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("^add_subdirectory\\(lib\\)" all)
|
||||
(string-append "#" all)))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(substitute* file
|
||||
(("#include \"lib/([^\"]*)\"" all header)
|
||||
(string-append "#include <" header ">"))))
|
||||
(find-files "client" "\\.(cpp|h)$"))
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(wrap-program (string-append (assoc-ref outputs "out")
|
||||
"/bin/quaternion")
|
||||
`("QT_PLUGIN_PATH" ":" prefix
|
||||
(,(string-append (assoc-ref inputs "qtsvg")
|
||||
"/lib/qt5/plugins")))
|
||||
`("QML2_IMPORT_PATH" ":" prefix
|
||||
,(map (lambda (label)
|
||||
(string-append (assoc-ref inputs label)
|
||||
"/lib/qt5/qml"))
|
||||
'("qtdeclarative" "qtquickcontrols"))))
|
||||
#t)))))
|
||||
(home-page "https://matrix.org/docs/projects/client/quaternion.html")
|
||||
(synopsis "Graphical client for the Matrix instant messaging protocol")
|
||||
|
@ -1720,4 +1721,128 @@ (define-public quaternion
|
|||
(license (list license:gpl3+ ; all source code
|
||||
license:lgpl3+)))) ; icons/breeze
|
||||
|
||||
(define-public hangups
|
||||
(package
|
||||
(name "hangups")
|
||||
(version "0.4.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "hangups" version))
|
||||
(sha256
|
||||
(base32 "0mvpfd5dc3zgcvwfidcd2qyn59xl5biv728mxifw0ls5rzkc9chs"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'relax-dependencies
|
||||
;; Relax overly strict package version specifications.
|
||||
(lambda _
|
||||
(substitute* "setup.py"
|
||||
(("==") ">="))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("python-aiohttp" ,python-aiohttp)
|
||||
("python-appdirs" ,python-appdirs)
|
||||
("python-async-timeout" ,python-async-timeout)
|
||||
("python-configargparse" ,python-configargparse)
|
||||
("python-mechanicalsoup" ,python-mechanicalsoup)
|
||||
("python-protobuf" ,python-protobuf)
|
||||
("python-readlike" ,python-readlike)
|
||||
("python-reparser" ,python-reparser)
|
||||
("python-requests" ,python-requests)
|
||||
("python-urwid" ,python-urwid)))
|
||||
(home-page "https://hangups.readthedocs.io/")
|
||||
(synopsis "Instant messaging client for Google Hangouts")
|
||||
(description
|
||||
"Hangups is an instant messaging client for Google Hangouts. It includes
|
||||
both a Python library and a reference client with a text-based user interface.
|
||||
|
||||
Hangups is implements a reverse-engineered version of Hangouts' proprietary,
|
||||
non-interoperable protocol, which allows it to support features like group
|
||||
messaging that aren’t available to clients that connect over XMPP.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public telegram-purple
|
||||
(package
|
||||
(name "telegram-purple")
|
||||
(version "1.3.1")
|
||||
(home-page "https://github.com/majn/telegram-purple")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url home-page)
|
||||
(commit (string-append "v" version))
|
||||
(recursive? #t)))
|
||||
(sha256
|
||||
(base32
|
||||
"0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(substitute* "Makefile.in"
|
||||
;; By default these two directories point to Pidgin's own
|
||||
;; prefix.
|
||||
(("^PLUGIN_DIR_PURPLE=.*")
|
||||
(string-append
|
||||
"exec_prefix := @exec_prefix@\n"
|
||||
"PLUGIN_DIR_PURPLE := @libdir@/purple-2\n"))
|
||||
(("^DATA_ROOT_DIR_PURPLE=.*")
|
||||
"DATA_ROOT_DIR_PURPLE := @datarootdir@\n")
|
||||
|
||||
;; Honor sysconfdir instead of trying to write to /etc.
|
||||
(("DESTDIR\\)/etc/telegram-purple")
|
||||
"DESTDIR)@sysconfdir@/telegram-purple"))
|
||||
#t))
|
||||
(patches (search-patches "telegram-purple-adjust-test.patch"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("which" ,which)))
|
||||
(inputs
|
||||
`(("pidgin" ,pidgin)
|
||||
("libgcrypt" ,libgcrypt)
|
||||
("libwebp" ,libwebp)
|
||||
("glib" ,glib)
|
||||
("gettext" ,gnu-gettext)
|
||||
("gtk+" ,gtk+-2)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
;; We're using release tag for repository checkout - let's prepare
|
||||
;; header defining GIT_COMMIT manually instead of running git to
|
||||
;; identify version which is being compiled. Git repository
|
||||
;; is removed anyway and only source code is kept.
|
||||
(add-after 'unpack 'prepare-commit.h
|
||||
(lambda _
|
||||
(with-output-to-file "./commit.h"
|
||||
(lambda ()
|
||||
(display
|
||||
(string-append "//generated by guix, use version instead of "
|
||||
"commit\n"
|
||||
"#ifndef GIT_COMMIT\n"
|
||||
"# define GIT_COMMIT \"v"
|
||||
,version "\"\n"
|
||||
"#endif\n"))))
|
||||
#t))
|
||||
(add-before 'configure 'set-SHELL-variables
|
||||
;; Set these environment variables so that 'tgl/configure' uses the
|
||||
;; right shell and not /bin/sh.
|
||||
(lambda _
|
||||
(let ((bash (which "bash")))
|
||||
(setenv "SHELL" bash)
|
||||
(setenv "CONFIG_SHELL" bash)
|
||||
#t))))))
|
||||
(synopsis "Telegram messaging support for Pidgin")
|
||||
(description
|
||||
"Telegram-purple is a plugin for Libpurple, the communication library
|
||||
used by the Pidgin instant messaging client, that adds support for the
|
||||
Telegram messenger.")
|
||||
|
||||
;; Code under tgl/ (the Telegram library) is LGPLv2.1+, but the plugin
|
||||
;; itself is GPLv2+.
|
||||
(license license:gpl2+)))
|
||||
|
||||
;;; messaging.scm ends here
|
||||
|
|
|
@ -32,6 +32,7 @@ (define-module (gnu packages monitoring)
|
|||
#:use-module (guix build-system go)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages check)
|
||||
|
@ -39,6 +40,7 @@ (define-module (gnu packages monitoring)
|
|||
#:use-module (gnu packages databases)
|
||||
#:use-module (gnu packages django)
|
||||
#:use-module (gnu packages gd)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages mail)
|
||||
#:use-module (gnu packages networking)
|
||||
|
@ -403,3 +405,27 @@ (define-public go-github-com-prometheus-node-exporter
|
|||
written in Go with pluggable metric collectors.")
|
||||
(home-page "https://github.com/prometheus/node_exporter")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public fswatch
|
||||
(package
|
||||
(name "fswatch")
|
||||
(version "1.13.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/emcrisostomo/fswatch.git")
|
||||
(commit version)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0r9m3rysqa1kdgghv2i6sv4zrd0v8idsbrp627ys642dl39svir3"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("gettext" ,gettext-minimal)
|
||||
("libtool" ,libtool)))
|
||||
(synopsis "File system monitor")
|
||||
(description "This package provides a file system monitor.")
|
||||
(home-page "https://github.com/emcrisostomo/fswatch")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -105,5 +105,5 @@ (define-public mono
|
|||
(description "Mono is a compiler, vm, debugger and set of libraries for
|
||||
C#, a C-style programming language from Microsoft that is very similar to
|
||||
Java.")
|
||||
(home-page "http://mono-project.com/")
|
||||
(home-page "https://www.mono-project.com/")
|
||||
(license license:x11)))
|
||||
|
|
|
@ -90,7 +90,7 @@ (define-public libmpdclient
|
|||
(define-public mpd
|
||||
(package
|
||||
(name "mpd")
|
||||
(version "0.20.21")
|
||||
(version "0.20.23")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -99,7 +99,7 @@ (define-public mpd
|
|||
"/mpd-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p2qrhdb1gzfv3y5dvvbc9s2wwmhg3azvzf8r02hzhk5q96pc8l3"))))
|
||||
"1smg6hab4kwrzsw1k7vlpya3ampdk8psnmkrzxlgb43j4fgmygjh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -165,7 +165,7 @@ (define-public mpd
|
|||
(define-public mpd-mpc
|
||||
(package
|
||||
(name "mpd-mpc")
|
||||
(version "0.30")
|
||||
(version "0.31")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -174,10 +174,12 @@ (define-public mpd-mpc
|
|||
"/mpc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kkzhrypkp0v6xv4d6db415pd0h6jqki29kfpsnfkvrhhh55pz35"))))
|
||||
"0b9bsn4sl26xc6wdcms51x9yxznkxkppaycn8gnv4rd1m21kwdv2"))))
|
||||
(build-system meson-build-system)
|
||||
(inputs `(("libmpdclient" ,libmpdclient)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("python-sphinx" ,python-sphinx)))
|
||||
(synopsis "Music Player Daemon client")
|
||||
(description "MPC is a minimalist command line interface to MPD, the music
|
||||
player daemon.")
|
||||
|
|
|
@ -538,7 +538,7 @@ (define-public iodine
|
|||
(define-public whois
|
||||
(package
|
||||
(name "whois")
|
||||
(version "5.3.2")
|
||||
(version "5.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -546,7 +546,7 @@ (define-public whois
|
|||
name "_" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0m3352d5b0ragygbqjbaimghrbx4va2rixa34j5a1g3jj6l4nwbr"))))
|
||||
"0y73b3z1akni620s1hlrijwdrk95ca1c8csjds48vpd6z86awx9p"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no test suite
|
||||
|
|
|
@ -568,13 +568,13 @@ (define-public rpm
|
|||
(define-public diffoscope
|
||||
(package
|
||||
(name "diffoscope")
|
||||
(version "102")
|
||||
(version "104")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0v2z98xx7n4viw12yq83flpb9ir5ahy1gn44pic0i3dam18xhcm6"))))
|
||||
"0vnfhnvqvdwgh1sh2lmwad8jk2vjvq76p5xm3pfgxdik2yblmvqd"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
@ -48,7 +48,7 @@ (define-module (gnu packages parallel)
|
|||
(define-public parallel
|
||||
(package
|
||||
(name "parallel")
|
||||
(version "20180922")
|
||||
(version "20181022")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -56,7 +56,7 @@ (define-public parallel
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"07q7lzway2qf8mx6fb4q45jmirsc8pw6rgv03ifrp32jw3q8w1za"))))
|
||||
"1v6vrfnn6acjjlp8xiizvcrb3zzs94av5xcl6xm8zfvcapixx11f"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -735,15 +735,15 @@ (define-public hashcat
|
|||
(define-public hashcat-utils
|
||||
(package
|
||||
(name "hashcat-utils")
|
||||
(version "1.8")
|
||||
(version "1.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/hashcat/hashcat-utils/releases/download/v"
|
||||
version "/hashcat-utils-1.8.7z"))
|
||||
(uri (string-append "https://github.com/hashcat/hashcat-utils/releases/"
|
||||
"download/v" version "/"
|
||||
"hashcat-utils-" version ".7z"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x80rngjz7gkhwplhw1iqr0wzb6hjkrjfld2kz9kmgp5dr9nys1p"))))
|
||||
(base32 "0kq555kb338691qd7zjmi8vhq4km3apnsl2w63zh0igwzcjx6lx1"))))
|
||||
(native-inputs
|
||||
`(("p7zip" ,p7zip)))
|
||||
(inputs
|
||||
|
@ -767,12 +767,16 @@ (define-public hashcat-utils
|
|||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (string-append (assoc-ref outputs "out") "/bin")))
|
||||
(mkdir-p out)
|
||||
(for-each (lambda (file)
|
||||
(copy-file file (string-append out "/" (basename file ".bin"))))
|
||||
(find-files "." "\\.bin$"))
|
||||
(for-each (lambda (file)
|
||||
(copy-file file (string-append out "/" (basename file ".pl"))))
|
||||
(find-files "../bin" "\\.pl$"))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(copy-file file (string-append out "/"
|
||||
(basename file ".bin"))))
|
||||
(find-files "." "\\.bin$"))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(copy-file file (string-append out "/"
|
||||
(basename file ".pl"))))
|
||||
(find-files "../bin" "\\.pl$"))
|
||||
#t))))))
|
||||
(home-page "https://github.com/hashcat/hashcat-utils/")
|
||||
(synopsis "Small utilities that are useful in advanced password cracking")
|
||||
|
|
|
@ -1,87 +0,0 @@
|
|||
Without this patch, the MH test suite would fail when building with
|
||||
glibc 2.26, with 'ali' segfaulting like this:
|
||||
|
||||
Core was generated by `/tmp/guix-build-mailutils-3.4.drv-0/mailutils-3.4/mh/.libs/ali -a ./Mail/mh_ali'.
|
||||
Program terminated with signal SIGSEGV, Segmentation fault.
|
||||
#0 0x00007f8eac263a14 in hash (
|
||||
name=0x72642e342e332d73 <error: Cannot access memory at address 0x72642e342e332d73>, hash_num=0) at assoc.c:102
|
||||
102 for (i = 0; *name; name++)
|
||||
(gdb) bt
|
||||
#0 0x00007f8eac263a14 in hash (
|
||||
name=0x72642e342e332d73 <error: Cannot access memory at address 0x72642e342e332d73>, hash_num=0) at assoc.c:102
|
||||
#1 0x00007f8eac263e6b in assoc_find_slot (assoc=0xaa59e0,
|
||||
name=0x72642e342e332d73 <error: Cannot access memory at address 0x72642e342e332d73>, install=0x0, slot=0x7ffcddcbf2b8) at assoc.c:219
|
||||
#2 0x00007f8eac264124 in mu_assoc_lookup (assoc=0xaa59e0,
|
||||
name=0x72642e342e332d73 <error: Cannot access memory at address 0x72642e342e332d73>, dataptr=0x7ffcddcbf2e0) at assoc.c:308
|
||||
#3 0x00007f8eac29e8ac in mu_ident_deref (
|
||||
name=0x72642e342e332d73 <error: Cannot access memory at address 0x72642e342e332d73>) at ident.c:98
|
||||
#4 0x00007f8eac29f8a6 in mu_locus_point_deinit (pt=0xaa5718) at locus.c:48
|
||||
#5 0x00007f8eac29fa1b in mu_locus_range_deinit (lr=0xaa5718) at locus.c:99
|
||||
#6 0x00007f8eac29f9db in mu_locus_range_copy (dest=0xaa5718,
|
||||
src=0x622be0 <ali_yylloc>) at locus.c:89
|
||||
#7 0x0000000000408a2a in push_source (name=0xaa74bc "mh_aliases2", fail=1)
|
||||
at mh_alias_lex.l:170
|
||||
|
||||
commit b330af9008e4c9168b379867b854f5900a539ad7
|
||||
Author: Sergey Poznyakoff <gray@gnu.org>
|
||||
Date: Sat Nov 18 10:15:48 2017 +0200
|
||||
|
||||
Fix the use of uninitialized memory
|
||||
|
||||
* mh/mh_alias_lex.l (push_source): Initialize locus range prior to copying
|
||||
to it.
|
||||
* libmailutils/cfg/parser.y (mu_cfg_tree_create_node): Likewise.
|
||||
* libmu_sieve/util.c: (mu_sieve_value_create): Likewise.
|
||||
|
||||
diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y
|
||||
index 4503c7781..3436b8d90 100644
|
||||
--- a/libmailutils/cfg/parser.y
|
||||
+++ b/libmailutils/cfg/parser.y
|
||||
@@ -1134,10 +1134,9 @@ mu_cfg_tree_create_node (struct mu_cfg_tree *tree,
|
||||
|
||||
np = mu_alloc (size);
|
||||
np->type = type;
|
||||
+ mu_locus_range_init (&np->locus);
|
||||
if (loc)
|
||||
mu_locus_range_copy (&np->locus, loc);
|
||||
- else
|
||||
- memset (&np->locus, 0, sizeof np->locus);
|
||||
p = (char*) (np + 1);
|
||||
np->tag = p;
|
||||
strcpy (p, tag);
|
||||
diff --git a/libmu_sieve/sieve-lex.l b/libmu_sieve/sieve-lex.l
|
||||
index fd145bfe1..f14e80194 100644
|
||||
--- a/libmu_sieve/sieve-lex.l
|
||||
+++ b/libmu_sieve/sieve-lex.l
|
||||
@@ -190,6 +190,7 @@ push_source (const char *name)
|
||||
{
|
||||
ctx = mu_sieve_malloc (mu_sieve_machine, sizeof (*ctx));
|
||||
ctx->trk = trk;
|
||||
+ mu_locus_range_init (&ctx->incl_range);
|
||||
mu_locus_range_copy (&ctx->incl_range, &yylloc);
|
||||
ctx->i_node = sieve_source_inode;
|
||||
ctx->input = input_stream;
|
||||
diff --git a/libmu_sieve/util.c b/libmu_sieve/util.c
|
||||
index 8d62a60c2..7d71b5509 100644
|
||||
--- a/libmu_sieve/util.c
|
||||
+++ b/libmu_sieve/util.c
|
||||
@@ -55,6 +55,7 @@ mu_sieve_value_create (mu_sieve_machine_t mach, mu_sieve_data_type type,
|
||||
val->locus.end.mu_line = locus->end.mu_line;
|
||||
val->locus.end.mu_col = locus->end.mu_col;
|
||||
|
||||
+ mu_locus_range_init (&val->locus);
|
||||
mu_locus_range_copy (&val->locus, locus);
|
||||
switch (type)
|
||||
{
|
||||
diff --git a/mh/mh_alias_lex.l b/mh/mh_alias_lex.l
|
||||
index 371353ed3..b97264b38 100644
|
||||
--- a/mh/mh_alias_lex.l
|
||||
+++ b/mh/mh_alias_lex.l
|
||||
@@ -167,6 +167,7 @@ push_source (const char *name, int fail)
|
||||
{
|
||||
ctx = mu_alloc (sizeof (*ctx));
|
||||
ctx->trk = trk;
|
||||
+ mu_locus_range_init (&ctx->incl_range);
|
||||
mu_locus_range_copy (&ctx->incl_range, &yylloc);
|
||||
ctx->exec_p = exec_p;
|
||||
ctx->i_node = ali_source_inode;
|
|
@ -0,0 +1,50 @@
|
|||
From: Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
Date: Wed, 31 Oct 2018 02:24:26 +0100
|
||||
Subject: [PATCH] gnu: meandmyshadow: Define paths earlier.
|
||||
|
||||
The following patch was taken verbatim from the upstream repository[0]
|
||||
and will be included in the next release.
|
||||
|
||||
[0]: https://github.com/acmepjz/meandmyshadow/pull/29
|
||||
---
|
||||
From 4847e6b5755258a1e0534f2d4b91dce2ce3b459e Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
|
||||
Date: Wed, 24 Oct 2018 23:31:19 +0300
|
||||
Subject: [PATCH] Define paths earlier in CMakeLists.txt
|
||||
|
||||
At the very least, paths should be defined before Configure_File(), otherwise empty DATAROOTDIR is substituted in config.h
|
||||
---
|
||||
CMakeLists.txt | 13 +++++++------
|
||||
1 file changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e79639a..6321d9d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2,6 +2,13 @@ Project (meandmyshadow)
|
||||
CMake_Minimum_Required (VERSION 3.1)
|
||||
Set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
||||
|
||||
+#Path options
|
||||
+Set (BINDIR "bin" CACHE STRING "Where to install binaries")
|
||||
+Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
|
||||
+Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.")
|
||||
+Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.")
|
||||
+
|
||||
+#Options
|
||||
Option (DEBUG_MODE "Compile the game with debug mode enabled" OFF)
|
||||
Option (DISABLED_DEBUG_STUFF "Enable this you'll see a lot of annoying script debug messages which will lag the game." OFF)
|
||||
|
||||
@@ -164,12 +171,6 @@ Target_Link_Libraries (
|
||||
${LUA_LIBRARIES}
|
||||
)
|
||||
|
||||
-#Path options
|
||||
-Set (BINDIR "bin" CACHE STRING "Where to install binaries")
|
||||
-Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
|
||||
-Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.")
|
||||
-Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.")
|
||||
-
|
||||
#Install locations
|
||||
Install (DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${DATAROOTDIR}/meandmyshadow/)
|
||||
Install (FILES AUTHORS DESTINATION ${DATAROOTDIR}/meandmyshadow/)
|
|
@ -1,69 +0,0 @@
|
|||
http://source.myrepos.branchable.com/?p=source.git;a=patch;h=40a3df21c73f1bb1b6915cc6fa503f50814664c8
|
||||
This can be removed with the next release. It was modified slightly to apply
|
||||
|
||||
From 40a3df21c73f1bb1b6915cc6fa503f50814664c8 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Wise <pabs3@bonedaddy.net>
|
||||
Date: Sun, 11 Feb 2018 21:57:49 +0800
|
||||
Subject: [PATCH] Mitigate vulnerabilities caused by some git remotes being
|
||||
able to execute code
|
||||
|
||||
Set GIT_PROTOCOL_FROM_USER=0 with git versions newer than 2.12.
|
||||
|
||||
Prevent remote websites from causing cloning of local repositories.
|
||||
|
||||
Manually whitelist known-safe protocols (http, https, git, ssh)
|
||||
when using git versions older than 2.12.
|
||||
|
||||
Fixes: CVE-2018-7032
|
||||
Fixes: https://bugs.debian.org/840014
|
||||
Suggestions-by: Jakub Wilk <jwilk@jwilk.net>
|
||||
Reported-by: Jakub Wilk <jwilk@jwilk.net>
|
||||
---
|
||||
webcheckout | 22 +++++++++++++++++++++-
|
||||
1 file changed, 21 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/webcheckout b/webcheckout
|
||||
index e98da5c..de497ba 100755
|
||||
--- a/webcheckout
|
||||
+++ b/webcheckout
|
||||
@@ -71,6 +71,16 @@ use Getopt::Long;
|
||||
use warnings;
|
||||
use strict;
|
||||
|
||||
+# Mitigate some git remote types being dangerous
|
||||
+my $git_unsafe = 1;
|
||||
+my $git_version = `git --version`;
|
||||
+$git_version =~ s{^git version }{};
|
||||
+my ($major, $minor) = split(/\./, $git_version);
|
||||
+if (int($major) >= 2 && int($minor) >= 12) {
|
||||
+ $ENV{GIT_PROTOCOL_FROM_USER} = 0;
|
||||
+ $git_unsafe = 0;
|
||||
+}
|
||||
+
|
||||
# What to download.
|
||||
my $url;
|
||||
|
||||
@@ -89,7 +99,17 @@ my $destdir;
|
||||
|
||||
# how to perform checkouts
|
||||
my %handlers=(
|
||||
- git => sub { doit("git", "clone", shift, $destdir) },
|
||||
- svn => sub { doit("svn", "checkout", shift, $destdir) },
|
||||
- bzr => sub { doit("bzr", "branch", shift, $destdir) },
|
||||
+ git => sub {
|
||||
+ my $git_url = shift;
|
||||
+ # Reject unsafe URLs with older versions of git
|
||||
+ # that do not already check the URL safety.
|
||||
+ if ($git_unsafe && $git_url !~ m{^(?:(?:https?|git|ssh):[^:]|(?:[-_.A-Za-z0-9]+@)?[-_.A-Za-z0-9]+:(?!:|//))}) {
|
||||
+ print STDERR "potentially unsafe git URL, may fail, touch local files or execute arbitrary code\n";
|
||||
+ return 1;
|
||||
+ }
|
||||
+ # Reject cloning local directories too, webcheckout is for remote repos
|
||||
+ doit(qw(git -c protocol.file.allow=user clone --), $git_url, $destdir)
|
||||
+ },
|
||||
+ svn => sub { doit(qw(svn checkout --), shift, $destdir) },
|
||||
+ bzr => sub { doit(qw(bzr branch --), shift, $destdir) },
|
||||
);
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
GDB responds with some overly detailed lines - which makes the tests fail.
|
||||
Patch rust to accept those instead.
|
||||
See <https://github.com/rust-lang/rust/issues/54178>.
|
||||
diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs
|
||||
--- orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:24:33.775565159 +0200
|
||||
+++ rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:25:56.322513658 +0200
|
||||
|
@ -92,3 +93,19 @@ diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs ru
|
|||
|
||||
// gdb-command:print univariant
|
||||
// gdbg-check:$4 = {{__0 = -1}}
|
||||
--- orig/rustc-1.25.0-src/src/test/debuginfo/nil-enum.rs 2018-09-13 10:24:33.783565071 +0200
|
||||
+++ rustc-1.25.0-src/src/test/debuginfo/nil-enum.rs 2018-10-26 18:19:20.404564587 +0200
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
// gdb-command:print first
|
||||
// gdbg-check:$1 = {<No data fields>}
|
||||
-// gdbr-check:$1 = <error reading variable>
|
||||
+// gdbr-check:$1 = nil_enum::ANilEnum
|
||||
|
||||
// gdb-command:print second
|
||||
// gdbg-check:$2 = {<No data fields>}
|
||||
-// gdbr-check:$2 = <error reading variable>
|
||||
+// gdbr-check:$2 = nil_enum::AnotherNilEnum
|
||||
|
||||
#![allow(unused_variables)]
|
||||
#![feature(omit_gdb_pretty_printer_section)]
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
From b9ca108fcae2b738ca3f0c88c84ae5dc5a6f843f Mon Sep 17 00:00:00 2001
|
||||
From: Tim Ryan <id@timryan.org>
|
||||
Date: Mon, 14 May 2018 06:22:21 -0400
|
||||
Subject: [PATCH] Support reproducible builds by forcing window.search to use
|
||||
stable key ordering. (#692)
|
||||
See <https://github.com/rust-lang-nursery/mdBook/pull/692>
|
||||
---
|
||||
src/vendor/mdbook/src/renderer/html_handlebars/search.rs | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs
|
||||
index d49772f8b..1ee66a511 100644
|
||||
--- a/src/vendor/mdbook/src/renderer/html_handlebars/search.rs
|
||||
+++ b/src/vendor/mdbook/src/renderer/html_handlebars/search.rs
|
||||
@@ -205,6 +205,10 @@ fn write_to_js(index: Index, search_config: &Search) -> Result<String> {
|
||||
searchoptions,
|
||||
index,
|
||||
};
|
||||
+
|
||||
+ // By converting to serde_json::Value as an intermediary, we use a
|
||||
+ // BTreeMap internally and can force a stable ordering of map keys.
|
||||
+ let json_contents = serde_json::to_value(&json_contents)?;
|
||||
let json_contents = serde_json::to_string(&json_contents)?;
|
||||
|
||||
Ok(format!("window.search = {};", json_contents))
|
14
gnu/packages/patches/telegram-purple-adjust-test.patch
Normal file
14
gnu/packages/patches/telegram-purple-adjust-test.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
This test incorrectly expects the libpurple search path to initially
|
||||
contain exactly one element. Remove this incorrect assertion.
|
||||
|
||||
--- telegram-purple-1.3.1-checkout/test/loadtest.c 2018-10-27 16:25:06.258459600 +0200
|
||||
+++ telegram-purple-1.3.1-checkout/test/loadtest.c 2018-10-27 16:25:11.830434770 +0200
|
||||
@@ -156,7 +156,7 @@ static void tdf_inject_plugin (void) {
|
||||
printf ("Injecting our module into purple_plugins_* ...\n");
|
||||
purple_plugins_init ();
|
||||
GList *search_paths = purple_plugins_get_search_paths ();
|
||||
- assert (!search_paths->prev && !search_paths->next && search_paths->data);
|
||||
+ assert (!search_paths->prev && search_paths->data);
|
||||
GList *new_paths = g_list_append (search_paths, g_strdup ("bin/"));
|
||||
assert (new_paths == search_paths);
|
||||
// Load "my" path before the default.
|
|
@ -1,23 +0,0 @@
|
|||
Revert this upstream commit which breaks a test case in "notmuch":
|
||||
|
||||
https://git.xapian.org/?p=xapian;a=commitdiff;h=5489fb2f838c0f0b0a593b4c17df282a93a1fe5a
|
||||
|
||||
See the notmuch FAQ entry:
|
||||
|
||||
https://notmuchmail.org/faq/#index12h2
|
||||
|
||||
This should be fixed for later releases.
|
||||
|
||||
diff --git a/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc
|
||||
index 80e578b85..a47f14a68 100644
|
||||
--- a/backends/glass/glass_postlist.cc
|
||||
+++ b/backends/glass/glass_postlist.cc
|
||||
@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_,
|
||||
(void)need_pos;
|
||||
if (term_.empty())
|
||||
RETURN(NULL);
|
||||
- if (!this_db.get() || this_db->postlist_table.is_modified())
|
||||
+ if (!this_db.get() || this_db->postlist_table.is_writable())
|
||||
RETURN(NULL);
|
||||
RETURN(new GlassPostList(this_db, term_, cursor->clone()));
|
||||
}
|
|
@ -1,55 +0,0 @@
|
|||
From: Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
Date: Mon, 18 Jun 2018 02:37:41 +0200
|
||||
Subject: zathura-pdf-mupdf: Link to JPEG libraries.
|
||||
|
||||
As of version 0.3.3, zathura-pdf-mupdf no longer links to some required
|
||||
JPEG libraries, leading to such errors as:
|
||||
|
||||
$ zathura foo.pdf
|
||||
error: Could not load plugin '/gnu/store/...-profile/lib/zathura/libpdf-mupdf.so' (/gnu/store/...-profile/lib/zathura/libpdf-mupdf.so: undefined symbol: jpeg_resync_to_restart).
|
||||
|
||||
The patch below, copied verbatim from Arch[0], fixes that.
|
||||
Its description happens to match our reality, too.
|
||||
|
||||
[0]: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/zathura-pdf-mupdf
|
||||
---
|
||||
From 3fb0ff750373d45d4f5172ce1d41b74183cd07e8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
|
||||
Date: Sat, 24 Mar 2018 14:31:18 +0100
|
||||
Subject: [PATCH] Explicitly link against jbig2dec, openjp2, and jpeg
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Normally these are statically linked into libmupdfthird, but we delete
|
||||
those to make mupdf use the system libraries. Previously
|
||||
zathura-pdf-mupdf explicitly linked against them, but this is
|
||||
technically incorrect since they are supposed to be in libmupdfthird so
|
||||
that was removed. This commit essentially reverts that in the new build
|
||||
system.
|
||||
|
||||
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
|
||||
---
|
||||
meson.build | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 3b0d7b7..ae2fc9c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -22,7 +22,11 @@ cairo = dependency('cairo')
|
||||
mupdf = cc.find_library('mupdf')
|
||||
mupdfthird = cc.find_library('mupdfthird')
|
||||
|
||||
-build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird]
|
||||
+jbig2dec = cc.find_library('jbig2dec')
|
||||
+openjp2 = cc.find_library('openjp2')
|
||||
+jpeg = cc.find_library('jpeg')
|
||||
+
|
||||
+build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird, jbig2dec, openjp2, jpeg]
|
||||
|
||||
# defines
|
||||
defines = [
|
||||
--
|
||||
2.16.3
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2015, 2016 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2014, 2015, 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
|
||||
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2016 Nils Gillmann <ng0@n0.is>
|
||||
|
@ -34,6 +34,7 @@ (define-module (gnu packages pdf)
|
|||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cmake)
|
||||
|
@ -58,6 +59,7 @@ (define-module (gnu packages pdf)
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages gstreamer)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages imagemagick)
|
||||
|
@ -417,17 +419,15 @@ (define-public zathura-djvu
|
|||
(define-public zathura-pdf-mupdf
|
||||
(package
|
||||
(name "zathura-pdf-mupdf")
|
||||
(version "0.3.3")
|
||||
(version "0.3.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://pwmt.org/projects/zathura-pdf-mupdf"
|
||||
"/download/zathura-pdf-mupdf-" version ".tar.xz"))
|
||||
(patches
|
||||
(search-patches "zathura-pdf-mupdf-link-to-jpeg-libraries.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zbdqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j"))))
|
||||
"166d5nz47ixzwj4pixsd5fd9qvjf5v34cdqi3p72vr23pswk2hyn"))))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("jbig2dec" ,jbig2dec)
|
||||
|
@ -439,17 +439,9 @@ (define-public zathura-pdf-mupdf
|
|||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; package does not contain tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-plugin-directory
|
||||
;; Something of a regression in 0.3.3: the new Meson build system
|
||||
;; now hard-codes an incorrect plugin directory. Fix it.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "meson.build"
|
||||
(("(install_dir:).*" _ key)
|
||||
(string-append key
|
||||
"'" (assoc-ref outputs "out") "/lib/zathura'\n")))
|
||||
#t)))))
|
||||
#:configure-flags (list (string-append "-Dplugindir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/zathura"))))
|
||||
(home-page "https://pwmt.org/projects/zathura-pdf-mupdf/")
|
||||
(synopsis "PDF support for zathura (mupdf backend)")
|
||||
(description "The zathura-pdf-mupdf plugin adds PDF support to zathura
|
||||
|
@ -598,7 +590,7 @@ (define-public podofo
|
|||
(define-public mupdf
|
||||
(package
|
||||
(name "mupdf")
|
||||
(version "1.13.0")
|
||||
(version "1.14.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -606,9 +598,17 @@ (define-public mupdf
|
|||
name "-" version "-source.tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0129k92bav692l6lyw10ryldx7h2f9khjpgnp3f3n4fdsph9hrkl"))
|
||||
"1psnz02w5p7wc1s1ma7vvjmkjfy641xvsh9ykaqzkk84dflnjgk0"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(begin (delete-file-recursively "thirdparty") #t))))
|
||||
(snippet
|
||||
;; We keep lcms2 since it is different than our lcms.
|
||||
'(begin
|
||||
(for-each
|
||||
(lambda (dir)
|
||||
(delete-file-recursively (string-append "thirdparty/" dir)))
|
||||
'("curl" "freeglut" "freetype" "harfbuzz" "jbig2dec"
|
||||
"libjpeg" "mujs" "openjpeg" "zlib"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
|
@ -629,6 +629,8 @@ (define-public mupdf
|
|||
'(#:tests? #f ; no check target
|
||||
#:make-flags (list "CC=gcc"
|
||||
"XCFLAGS=-fpic"
|
||||
"USE_SYSTEM_LIBS=yes"
|
||||
"USE_SYSTEM_MUJS=yes"
|
||||
(string-append "prefix=" (assoc-ref %outputs "out")))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
|
@ -643,7 +645,11 @@ (define-public mupdf
|
|||
The library ships with a rudimentary X11 viewer, and a set of command
|
||||
line tools for batch rendering @command{pdfdraw}, rewriting files
|
||||
@command{pdfclean}, and examining the file structure @command{pdfshow}.")
|
||||
(license license:agpl3+)))
|
||||
(license (list license:agpl3+
|
||||
license:bsd-3 ; resources/cmaps
|
||||
license:x11 ; thirdparty/lcms2
|
||||
license:silofl1.1 ; resources/fonts/{han,noto,sil,urw}
|
||||
license:asl2.0)))) ; resources/fonts/droid
|
||||
|
||||
(define-public qpdf
|
||||
(package
|
||||
|
@ -1012,3 +1018,41 @@ (define-public pdfgrep
|
|||
optional case insensitivity, count occurrences, color highlights and search in
|
||||
multiple files.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public pdfpc
|
||||
(package
|
||||
(name "pdfpc")
|
||||
(version "4.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/pdfpc/pdfpc.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments '(#:tests? #f)) ; no test target
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
("gtk+" ,gtk+)
|
||||
("gstreamer" ,gstreamer)
|
||||
("gst-plugins-base" ,gst-plugins-base)
|
||||
("libgee" ,libgee)
|
||||
("poppler" ,poppler)
|
||||
("pango" ,pango)
|
||||
("vala" ,vala)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://pdfpc.github.io/")
|
||||
(synopsis "Presenter console with multi-monitor support for PDF files")
|
||||
(description
|
||||
"pdfpc is a presentation viewer application which uses multi-monitor
|
||||
output to provide meta information to the speaker during the presentation. It
|
||||
is able to show a normal presentation window on one screen, while showing a
|
||||
more sophisticated overview on the other one providing information like a
|
||||
picture of the next slide, as well as the left over time till the end of the
|
||||
presentation. The input files processed by pdfpc are PDF documents.")
|
||||
(license license:gpl2+)))
|
||||
|
|
|
@ -131,14 +131,14 @@ (define-public libexif
|
|||
(define-public libgphoto2
|
||||
(package
|
||||
(name "libgphoto2")
|
||||
(version "2.5.19")
|
||||
(version "2.5.20")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/gphoto/libgphoto/"
|
||||
version "/libgphoto2-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qrcc6kajbfb237paxrl904vvwl7hd8mnqvjw00j6m5qwd93wlk2"))))
|
||||
"03wbwsb4v7yay8g5ni7pzmkbrh7qnqx977bddjpxsp9f1qag03z1"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
|
@ -206,7 +206,7 @@ (define-public gphoto2
|
|||
(define-public perl-image-exiftool
|
||||
(package
|
||||
(name "perl-image-exiftool")
|
||||
(version "11.01")
|
||||
(version "11.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -214,7 +214,7 @@ (define-public perl-image-exiftool
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"175w34n73mypdpbaqj2vgqsfp59yvfrn8k7zmx4cawnp895bypvh"))))
|
||||
"1szg1k82nz88pp5n7lg71ja7q3hh5i5f9bcbb7m482dwrmsywkp6"))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
@ -244,7 +244,7 @@ (define-public source-highlight
|
|||
(define-public highlight
|
||||
(package
|
||||
(name "highlight")
|
||||
(version "3.42")
|
||||
(version "3.47")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -252,7 +252,7 @@ (define-public highlight
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"07iihzy8ckzdrxqd6bzbij4hy4mmlixibjnjviqfihd0hh1q30m5"))))
|
||||
"0xidf8755lnx55x6p4ajgg4l145akjqswny41483fvg5lpa41i6f"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
|
|
@ -637,7 +637,7 @@ (define-public python2-asn1crypto
|
|||
(define-public python-pynacl
|
||||
(package
|
||||
(name "python-pynacl")
|
||||
(version "1.2.1")
|
||||
(version "1.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -648,7 +648,7 @@ (define-public python-pynacl
|
|||
#t))
|
||||
(sha256
|
||||
(base32
|
||||
"1ada3qr83cliap6dk897vnvjkynij1kjqbwizdbgarazlyh8zlz0"))))
|
||||
"0330wyvggm19xhmwmz9rrr97lzbv3siwfy50gmax3vvgs7nh0q8c"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -60,6 +60,7 @@ (define-module (gnu packages python-web)
|
|||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages time)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
@ -255,6 +256,43 @@ (define-public python-httplib2
|
|||
(define-public python2-httplib2
|
||||
(package-with-python2 python-httplib2))
|
||||
|
||||
(define-public python-mechanicalsoup
|
||||
(package
|
||||
(name "python-mechanicalsoup")
|
||||
(version "0.11.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "MechanicalSoup" version))
|
||||
(sha256
|
||||
(base32 "0k59wwk75q7nz6i6gynvzhagy02ql0bv7py3qqcwgjw7607yq4i7"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
;; TODO: Enable tests when python-flake8@3.5 hits master.
|
||||
`(#:tests? #f))
|
||||
(propagated-inputs
|
||||
`(("python-beautifulsoup4" ,python-beautifulsoup4)
|
||||
("python-lxml" ,python-lxml)
|
||||
("python-requests" ,python-requests)
|
||||
("python-six" ,python-six)))
|
||||
;; (native-inputs
|
||||
;; ;; For tests.
|
||||
;; `(("python-pytest-flake8" ,python-pytest-flake8)
|
||||
;; ("python-pytest-httpbin" ,python-pytest-httpbin)
|
||||
;; ("python-pytest-mock" ,python-pytest-mock)
|
||||
;; ("python-pytest-runner" ,python-pytest-runner)
|
||||
;; ("python-requests-mock" ,python-requests-mock)))
|
||||
(home-page "https://mechanicalsoup.readthedocs.io/")
|
||||
(synopsis "Python library for automating website interaction")
|
||||
(description
|
||||
"MechanicalSoup is a Python library for automating interaction with
|
||||
websites. It automatically stores and sends cookies, follows redirects, and can
|
||||
follow links and submit forms. It doesn’t do JavaScript.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python2-mechanicalsoup
|
||||
(package-with-python2 python-mechanicalsoup))
|
||||
|
||||
(define-public python-sockjs-tornado
|
||||
(package
|
||||
(name "python-sockjs-tornado")
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
|
||||
;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2016, 2017 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2016, 2017, 2018 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
|
||||
|
@ -2798,14 +2798,14 @@ (define-public python2-blinker
|
|||
(define-public pelican
|
||||
(package
|
||||
(name "pelican")
|
||||
(version "3.6.3")
|
||||
(version "3.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pelican" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1hn94rb4q3zmcq16in055xikal4dba5hfx3zznq7warllcgc9f8k"))))
|
||||
"12spygavv9b6xpb5pgp7f0p3z0mms60nx6zrpx1yfkj68zz4flra"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-feedgenerator" ,python-feedgenerator)
|
||||
|
@ -2818,7 +2818,7 @@ (define-public pelican
|
|||
("python-six" ,python-six)
|
||||
("python-dateutil" ,python-dateutil)
|
||||
("python-markdown" ,python-markdown)))
|
||||
(home-page "http://getpelican.com/")
|
||||
(home-page "https://getpelican.com/")
|
||||
(arguments
|
||||
`(;; XXX Requires a lot more packages to do unit tests :P
|
||||
#:tests? #f
|
||||
|
@ -12374,14 +12374,14 @@ (define-public python2-swagger-spec-validator
|
|||
(define-public python-apache-libcloud
|
||||
(package
|
||||
(name "python-apache-libcloud")
|
||||
(version "2.0.0")
|
||||
(version "2.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "apache-libcloud" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1a71z02ckcxld72k4qgmdnkjan52c4wczncs3p2mp5yafh7dsan7"))))
|
||||
"15xg79ad4g2xrk081ylvj41k5hmg9hl1xvbmb5hd0fqn08wfwbhf"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -12410,6 +12410,11 @@ (define-public python-apache-libcloud
|
|||
(("'.xf0.x90.x8d.x88'") "b'\\xF0\\x90\\x8D\\x88'")
|
||||
(("'.xF0', '.x90', '.x8D', '.x88'")
|
||||
"b'\\xF0', b'\\x90', b'\\x8D', b'\\x88'"))
|
||||
#t))
|
||||
(add-before 'check 'copy-secret
|
||||
(lambda _
|
||||
(copy-file "libcloud/test/secrets.py-dist"
|
||||
"libcloud/test/secrets.py")
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("openssh" ,openssh)))
|
||||
|
@ -12419,6 +12424,8 @@ (define-public python-apache-libcloud
|
|||
(native-inputs
|
||||
`(("python-lockfile" ,python-lockfile)
|
||||
("python-mock" ,python-mock)
|
||||
("python-pytest" ,python-pytest)
|
||||
("python-pytest-runner" ,python-pytest-runner)
|
||||
("python-requests-mock" ,python-requests-mock)))
|
||||
(home-page "https://libcloud.apache.org/")
|
||||
(synopsis "Unified Cloud API")
|
||||
|
@ -12830,15 +12837,17 @@ (define-public python2-dukpy
|
|||
(define-public python-jsonrpclib-pelix
|
||||
(package
|
||||
(name "python-jsonrpclib-pelix")
|
||||
(version "0.3.1")
|
||||
(version "0.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "jsonrpclib-pelix" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl"))))
|
||||
"0f83z5zi7w32vprhk1dyc94ir1bh4hdd57bjdbwkq9ykng8qilhl"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no tests in PyPI tarball
|
||||
(home-page "https://github.com/tcalmant/jsonrpclib/")
|
||||
(synopsis "JSON-RPC 2.0 client library for Python")
|
||||
(description
|
||||
|
@ -14453,14 +14462,14 @@ (define-public python-blosc
|
|||
(define-public python-partd
|
||||
(package
|
||||
(name "python-partd")
|
||||
(version "0.3.8")
|
||||
(version "0.3.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "partd" version))
|
||||
(sha256
|
||||
(base32
|
||||
"03s0i5qfgkx6y24bmfgyd5hnsjznkbbfafwb2khf7k9790f1yab7"))))
|
||||
"0sz6rwlnl4fqq220pyz863cnv0gjdxl4m7lscl71ishl5z0xkmhz"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-blosc" ,python-blosc)
|
||||
|
@ -14523,14 +14532,14 @@ (define-public python-dask
|
|||
(define-public python-ilinkedlist
|
||||
(package
|
||||
(name "python-ilinkedlist")
|
||||
(version "0.1.0")
|
||||
(version "0.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ilinkedlist" version))
|
||||
(sha256
|
||||
(base32
|
||||
"063c2gm4jkgkv0nsg7mrc8y0w82ms98l4xchmbrvr68cscglhk69"))))
|
||||
"0klb846q5vs62d8f89my7wan1sji4yjj6pjhjch9dha3p8vlncd2"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs `(("python-pytest" ,python-pytest)))
|
||||
(inputs `(("python" ,python)))
|
||||
|
@ -14544,3 +14553,56 @@ (define-public python-ilinkedlist
|
|||
LISP. It is possible to create an improper list by creating a @code{Pair}
|
||||
with a non-list @code{cdr}.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public python-readlike
|
||||
(package
|
||||
(name "python-readlike")
|
||||
(version "0.1.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "readlike" version))
|
||||
(sha256
|
||||
(base32 "027w8fvi50ksl57q0a7kb5zvmq8jxaawnviib1jdqw0p3igvm1j4"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/jangler/readlike")
|
||||
(synopsis "GNU Readline-like line editing module")
|
||||
(description
|
||||
"This Python module provides line editing functions similar to the default
|
||||
Emacs-style ones of GNU Readline. Unlike the Python standard library's
|
||||
@code{readline} package, this one allows access to those capabilties in settings
|
||||
outside of a standard command-line interface. It is especially well-suited to
|
||||
interfacing with Urwid, due to a shared syntax for describing key inputs.
|
||||
|
||||
Currently, all stateless Readline commands are implemented. Yanking and history
|
||||
are not supported.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python2-readlike
|
||||
(package-with-python2 python-readlike))
|
||||
|
||||
(define-public python-reparser
|
||||
(package
|
||||
(name "python-reparser")
|
||||
(version "1.4.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ReParser" version))
|
||||
(sha256
|
||||
(base32 "0nniqb69xr0fv7ydlmrr877wyyjb61nlayka7xr08vlxl9caz776"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/xmikos/reparser")
|
||||
(synopsis "Simple lexer/parser for inline markup based on regular expressions")
|
||||
(description
|
||||
"This Python library provides a simple lexer/parser for inline markup based
|
||||
on regular expressions.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python2-reparser
|
||||
(let ((reparser (package-with-python2
|
||||
(strip-python2-variant python-reparser))))
|
||||
(package (inherit reparser)
|
||||
(propagated-inputs
|
||||
`(("python2-enum34" ,python2-enum34)
|
||||
,@(package-propagated-inputs reparser))))))
|
||||
|
|
|
@ -64,9 +64,11 @@ (define-module (gnu packages qt)
|
|||
#:use-module (gnu packages ruby)
|
||||
#:use-module (gnu packages sdl)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages vulkan)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages xml))
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public grantlee
|
||||
(package
|
||||
|
@ -105,7 +107,7 @@ (define-public grantlee
|
|||
(define-public qt
|
||||
(package
|
||||
(name "qt")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(outputs '("out" "examples"))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -118,7 +120,7 @@ (define-public qt
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0azva1wx298jh0xskymz8jic83yhxs1xfxf321wqd5lwiyq2qq1r"))
|
||||
"10faac59jvz6dxxljdkaknlxazpnaxgvqdcszabfbbkc1f24n466"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -135,7 +137,7 @@ (define-public qt
|
|||
(lambda (dir)
|
||||
(delete-file-recursively (string-append "qtbase/src/3rdparty/" dir)))
|
||||
(list "double-conversion" "freetype" "harfbuzz-ng"
|
||||
"libpng" "libjpeg" "pcre2" "xcb"
|
||||
"libpng" "libjpeg" "pcre2" "sqlite" "xcb"
|
||||
"xkbcommon" "zlib"))
|
||||
(for-each
|
||||
(lambda (dir)
|
||||
|
@ -206,7 +208,7 @@ (define-public qt
|
|||
("postgresql" ,postgresql)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
("pcre2" ,pcre2)
|
||||
;("sqlite" ,sqlite)
|
||||
("sqlite" ,sqlite-with-column-metadata)
|
||||
("udev" ,eudev)
|
||||
("unixodbc" ,unixodbc)
|
||||
("wayland" ,wayland)
|
||||
|
@ -224,6 +226,7 @@ (define-public qt
|
|||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)
|
||||
("ruby" ,ruby)
|
||||
("vulkan-headers" ,vulkan-headers)
|
||||
("which" ,(@ (gnu packages base) which))))
|
||||
(arguments
|
||||
`(#:parallel-build? #f ; Triggers race condition in qtbase module on Hydra.
|
||||
|
@ -246,51 +249,51 @@ (define-public qt
|
|||
(("/bin/ls") (which "ls")))
|
||||
;; do not pass "--enable-fast-install", which makes the
|
||||
;; configure process fail
|
||||
(zero? (system*
|
||||
"./configure"
|
||||
"-verbose"
|
||||
"-prefix" out
|
||||
"-docdir" (string-append out "/share/doc/qt5")
|
||||
"-headerdir" (string-append out "/include/qt5")
|
||||
"-archdatadir" (string-append out "/lib/qt5")
|
||||
"-datadir" (string-append out "/share/qt5")
|
||||
"-examplesdir" (string-append
|
||||
examples "/share/doc/qt5/examples") ; 151MiB
|
||||
"-opensource"
|
||||
"-confirm-license"
|
||||
(invoke
|
||||
"./configure"
|
||||
"-verbose"
|
||||
"-prefix" out
|
||||
"-docdir" (string-append out "/share/doc/qt5")
|
||||
"-headerdir" (string-append out "/include/qt5")
|
||||
"-archdatadir" (string-append out "/lib/qt5")
|
||||
"-datadir" (string-append out "/share/qt5")
|
||||
"-examplesdir" (string-append
|
||||
examples "/share/doc/qt5/examples") ; 151MiB
|
||||
"-opensource"
|
||||
"-confirm-license"
|
||||
|
||||
;; These features require higher versions of Linux than the
|
||||
;; minimum version of the glibc. See
|
||||
;; src/corelib/global/minimum-linux_p.h. By disabling these
|
||||
;; features Qt5 applications can be used on the oldest
|
||||
;; kernels that the glibc supports, including the RHEL6
|
||||
;; (2.6.32) and RHEL7 (3.10) kernels.
|
||||
"-no-feature-getentropy" ; requires Linux 3.17
|
||||
"-no-feature-renameat2" ; requires Linux 3.16
|
||||
;; These features require higher versions of Linux than the
|
||||
;; minimum version of the glibc. See
|
||||
;; src/corelib/global/minimum-linux_p.h. By disabling these
|
||||
;; features Qt5 applications can be used on the oldest
|
||||
;; kernels that the glibc supports, including the RHEL6
|
||||
;; (2.6.32) and RHEL7 (3.10) kernels.
|
||||
"-no-feature-getentropy" ; requires Linux 3.17
|
||||
"-no-feature-renameat2" ; requires Linux 3.16
|
||||
|
||||
;; Do not build examples; for the time being, we
|
||||
;; prefer to save the space and build time.
|
||||
"-no-compile-examples"
|
||||
;; Most "-system-..." are automatic, but some use
|
||||
;; the bundled copy by default.
|
||||
;"-system-sqlite"
|
||||
"-system-harfbuzz"
|
||||
"-system-pcre"
|
||||
;; explicitly link with openssl instead of dlopening it
|
||||
"-openssl-linked"
|
||||
;; explicitly link with dbus instead of dlopening it
|
||||
"-dbus-linked"
|
||||
;; don't use the precompiled headers
|
||||
"-no-pch"
|
||||
;; drop special machine instructions not supported
|
||||
;; on all instances of the target
|
||||
,@(if (string-prefix? "x86_64"
|
||||
(or (%current-target-system)
|
||||
(%current-system)))
|
||||
'()
|
||||
'("-no-sse2"))
|
||||
"-no-mips_dsp"
|
||||
"-no-mips_dspr2")))))
|
||||
;; Do not build examples; for the time being, we
|
||||
;; prefer to save the space and build time.
|
||||
"-no-compile-examples"
|
||||
;; Most "-system-..." are automatic, but some use
|
||||
;; the bundled copy by default.
|
||||
"-system-sqlite"
|
||||
"-system-harfbuzz"
|
||||
"-system-pcre"
|
||||
;; explicitly link with openssl instead of dlopening it
|
||||
"-openssl-linked"
|
||||
;; explicitly link with dbus instead of dlopening it
|
||||
"-dbus-linked"
|
||||
;; don't use the precompiled headers
|
||||
"-no-pch"
|
||||
;; drop special machine instructions not supported
|
||||
;; on all instances of the target
|
||||
,@(if (string-prefix? "x86_64"
|
||||
(or (%current-target-system)
|
||||
(%current-system)))
|
||||
'()
|
||||
'("-no-sse2"))
|
||||
"-no-mips_dsp"
|
||||
"-no-mips_dspr2"))))
|
||||
(add-after 'install 'patch-mkspecs
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
@ -401,10 +404,16 @@ (define-public qt-4
|
|||
;; Remove webkit module, which is not built.
|
||||
'(begin (delete-file-recursively "src/3rdparty/webkit")
|
||||
#t))))
|
||||
(inputs `(,@(alist-delete "harfbuzz"
|
||||
(alist-delete "libjpeg" (package-inputs qt)))
|
||||
("libjepg" ,libjpeg-8)
|
||||
("libsm" ,libsm)))
|
||||
(inputs
|
||||
`(,@(fold alist-delete
|
||||
(package-inputs qt)
|
||||
'("harfbuzz" "libjpeg"))
|
||||
("libjpeg" ,libjpeg-8)
|
||||
("libsm" ,libsm)))
|
||||
(native-inputs
|
||||
`(,@(fold alist-delete
|
||||
(package-native-inputs qt)
|
||||
'("vulkan-headers"))))
|
||||
|
||||
;; Note: there are 37 MiB of examples and a '-exampledir' configure flags,
|
||||
;; but we can't make them a separate output because "out" and "examples"
|
||||
|
@ -421,48 +430,53 @@ (define-public qt-4
|
|||
(doc (assoc-ref outputs "doc")))
|
||||
(substitute* '("configure")
|
||||
(("/bin/pwd") (which "pwd")))
|
||||
(substitute* "src/corelib/global/global.pri"
|
||||
(("/bin/ls") (which "ls")))
|
||||
|
||||
(zero? (system*
|
||||
"./configure"
|
||||
"-verbose"
|
||||
"-prefix" out
|
||||
;; Note: Don't pass '-docdir' since 'qmake' and
|
||||
;; libQtCore would record its value, thereby defeating
|
||||
;; the whole point of having a separate output.
|
||||
"-datadir" (string-append out "/share/qt-" ,version
|
||||
"/data")
|
||||
"-importdir" (string-append out "/lib/qt-4"
|
||||
"/imports")
|
||||
"-plugindir" (string-append out "/lib/qt-4"
|
||||
"/plugins")
|
||||
"-translationdir" (string-append out "/share/qt-" ,version
|
||||
"/translations")
|
||||
"-demosdir" (string-append out "/share/qt-" ,version
|
||||
"/demos")
|
||||
"-examplesdir" (string-append out "/share/qt-" ,version
|
||||
"/examples")
|
||||
"-opensource"
|
||||
"-confirm-license"
|
||||
;; explicitly link with dbus instead of dlopening it
|
||||
"-dbus-linked"
|
||||
;; Skip the webkit module; it fails to build on armhf
|
||||
;; and, apart from that, may pose security risks.
|
||||
"-no-webkit"
|
||||
;; drop special machine instructions not supported
|
||||
;; on all instances of the target
|
||||
,@(if (string-prefix? "x86_64"
|
||||
(or (%current-target-system)
|
||||
(%current-system)))
|
||||
'()
|
||||
'("-no-mmx"
|
||||
"-no-3dnow"
|
||||
"-no-sse"
|
||||
"-no-sse2"))
|
||||
"-no-sse3"
|
||||
"-no-ssse3"
|
||||
"-no-sse4.1"
|
||||
"-no-sse4.2"
|
||||
"-no-avx")))))
|
||||
(invoke
|
||||
"./configure"
|
||||
"-verbose"
|
||||
"-prefix" out
|
||||
"-nomake" "examples demos"
|
||||
;; Note: Don't pass '-docdir' since 'qmake' and
|
||||
;; libQtCore would record its value, thereby defeating
|
||||
;; the whole point of having a separate output.
|
||||
"-datadir" (string-append out "/share/qt-" ,version
|
||||
"/data")
|
||||
"-importdir" (string-append out "/lib/qt-4"
|
||||
"/imports")
|
||||
"-plugindir" (string-append out "/lib/qt-4"
|
||||
"/plugins")
|
||||
"-translationdir" (string-append out "/share/qt-" ,version
|
||||
"/translations")
|
||||
"-demosdir" (string-append out "/share/qt-" ,version
|
||||
"/demos")
|
||||
"-examplesdir" (string-append out "/share/qt-" ,version
|
||||
"/examples")
|
||||
"-opensource"
|
||||
"-confirm-license"
|
||||
;; explicitly link with dbus instead of dlopening it
|
||||
"-dbus-linked"
|
||||
;; Skip the webkit module; it fails to build on armhf
|
||||
;; and, apart from that, may pose security risks.
|
||||
"-no-webkit"
|
||||
;; don't use the precompiled headers
|
||||
"-no-pch"
|
||||
;; drop special machine instructions not supported
|
||||
;; on all instances of the target
|
||||
,@(if (string-prefix? "x86_64"
|
||||
(or (%current-target-system)
|
||||
(%current-system)))
|
||||
'()
|
||||
'("-no-mmx"
|
||||
"-no-3dnow"
|
||||
"-no-sse"
|
||||
"-no-sse2"))
|
||||
"-no-sse3"
|
||||
"-no-ssse3"
|
||||
"-no-sse4.1"
|
||||
"-no-sse4.2"
|
||||
"-no-avx"))))
|
||||
(add-after
|
||||
'install 'move-doc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
@ -483,7 +497,7 @@ (define-public qt-4
|
|||
(define-public qtbase
|
||||
(package
|
||||
(name "qtbase")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -492,7 +506,7 @@ (define-public qtbase
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"))
|
||||
"01q1rn5rp9biq3z38953z2hgm4nirvp2jfv8wg7isnld8v1yg0b3"))
|
||||
;; Use TZDIR to avoid depending on package "tzdata".
|
||||
(patches (search-patches "qtbase-use-TZDIR.patch"
|
||||
"qtbase-glibc-compat.patch"))
|
||||
|
@ -504,7 +518,7 @@ (define-public qtbase
|
|||
(lambda (dir)
|
||||
(delete-file-recursively (string-append "src/3rdparty/" dir)))
|
||||
(list "double-conversion" "freetype" "harfbuzz-ng"
|
||||
"libpng" "libjpeg" "pcre2" "xcb"
|
||||
"libpng" "libjpeg" "pcre2" "sqlite" "xcb"
|
||||
"xkbcommon" "zlib"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
|
@ -546,7 +560,7 @@ (define-public qtbase
|
|||
("pcre2" ,pcre2)
|
||||
("postgresql" ,postgresql)
|
||||
("pulseaudio" ,pulseaudio)
|
||||
;("sqlite" ,sqlite)
|
||||
("sqlite" ,sqlite-with-column-metadata)
|
||||
("unixodbc" ,unixodbc)
|
||||
("xcb-util" ,xcb-util)
|
||||
("xcb-util-image" ,xcb-util-image)
|
||||
|
@ -561,6 +575,7 @@ (define-public qtbase
|
|||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python-2)
|
||||
("vulkan-headers" ,vulkan-headers)
|
||||
("ruby" ,ruby)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -616,10 +631,7 @@ (define-public qtbase
|
|||
"-no-compile-examples"
|
||||
;; Most "-system-..." are automatic, but some use
|
||||
;; the bundled copy by default.
|
||||
;; System sqlite fails on 5.10+
|
||||
;;.obj/qsql_sqlite.o: In function `QSQLiteResultPrivate::initColumns(bool)':
|
||||
;;qsql_sqlite.cpp:(.text+0x190c): undefined reference to `sqlite3_column_table_name16'
|
||||
;"-system-sqlite"
|
||||
"-system-sqlite"
|
||||
"-system-harfbuzz"
|
||||
"-system-pcre"
|
||||
;; explicitly link with openssl instead of dlopening it
|
||||
|
@ -726,7 +738,7 @@ (define-public qtbase
|
|||
(define-public qtsvg
|
||||
(package (inherit qtbase)
|
||||
(name "qtsvg")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -735,7 +747,7 @@ (define-public qtsvg
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx"))))
|
||||
"0rni3cdcli91v7k8ra9s9phpznvkza8qqvcrv9yyfrmlapwbn5mw"))))
|
||||
(propagated-inputs `())
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs
|
||||
|
@ -801,7 +813,7 @@ (define-public qtsvg
|
|||
(define-public qtimageformats
|
||||
(package (inherit qtsvg)
|
||||
(name "qtimageformats")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -810,7 +822,7 @@ (define-public qtimageformats
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b"))
|
||||
"0s1s33k0wrnf9fi1wlm1kaq9hs1fx89597nhk53vzdfha42x3r97"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -832,7 +844,7 @@ (define-public qtimageformats
|
|||
(define-public qtx11extras
|
||||
(package (inherit qtsvg)
|
||||
(name "qtx11extras")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -841,7 +853,7 @@ (define-public qtx11extras
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw"))))
|
||||
"12cha7pd3cjx7zr0l7rbi1j2pfwmfpdwc7w3dsqbyi1d0mhwl1zl"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -856,7 +868,7 @@ (define-public qtx11extras
|
|||
(define-public qtxmlpatterns
|
||||
(package (inherit qtsvg)
|
||||
(name "qtxmlpatterns")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -865,7 +877,7 @@ (define-public qtxmlpatterns
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n5gacpni019i2872m4b1p5qaqibhszsdl3xhw3xsckvr0hf25v1"))))
|
||||
"0ik7m1a0shjsyzs8n9hfx8m9hy1p3wg505slcs0xznj0pa0gdmaz"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:phases phases)
|
||||
|
@ -885,7 +897,7 @@ (define-public qtxmlpatterns
|
|||
(define-public qtdeclarative
|
||||
(package (inherit qtsvg)
|
||||
(name "qtdeclarative")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -894,7 +906,7 @@ (define-public qtdeclarative
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fjg9ii64mhx2ww70rj44cy65rwwkwyjxcm435kwp3v1pzv5xkwy"))))
|
||||
"1kgj6q53rk573yi47j32mn1mfk5ag98zvhv9qgrlb78y0gw8c392"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -917,7 +929,7 @@ (define-public qtdeclarative
|
|||
(define-public qtconnectivity
|
||||
(package (inherit qtsvg)
|
||||
(name "qtconnectivity")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -926,7 +938,7 @@ (define-public qtconnectivity
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mz6mbf069yqdvi6mcvp6izskcn9wzig4s3dzmygwd430pmx93kk"))))
|
||||
"1ia21llw610wd7licdm81p8zpkrkvkc5yc7y4wplgg6k2jyip42q"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
|
@ -941,7 +953,7 @@ (define-public qtconnectivity
|
|||
(define-public qtwebsockets
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebsockets")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -950,7 +962,7 @@ (define-public qtwebsockets
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bj82y3f1nd2adnj3ljfr4vlx4bkgdlm3zvhlsas2lz837vi5aks"))))
|
||||
"13cbr2pffv1hwvm8d8kzask0pyc2j3brgq23vi5i1i70kihrfqdf"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -968,7 +980,7 @@ (define-public qtwebsockets
|
|||
(define-public qtsensors
|
||||
(package (inherit qtsvg)
|
||||
(name "qtsensors")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -977,7 +989,7 @@ (define-public qtsensors
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yn065l6kzs3fn74950pkxxglqi55lzk7alf15klsd1wnxc0zsfb"))))
|
||||
"1iv3gmk121myqdr64d9lf2m816ypxrb526gn0ssxx8gp4j4c69qf"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:parallel-tests? _ #f) #f) ; can lead to race condition
|
||||
|
@ -1001,7 +1013,7 @@ (define-public qtsensors
|
|||
(define-public qtmultimedia
|
||||
(package (inherit qtsvg)
|
||||
(name "qtmultimedia")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1010,7 +1022,7 @@ (define-public qtmultimedia
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0369b0mh7sr718l119b07grb1v8xqlq6l4damyd6lrmlj1wbb2zj"))
|
||||
"0vbjrxsdahgbgpc2zcvgg3mpijzd5kknz5clfcw2cq3310yqyq15"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -1052,7 +1064,7 @@ (define-public qtmultimedia
|
|||
(define-public qtwayland
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwayland")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1061,7 +1073,7 @@ (define-public qtwayland
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1sj4lsza48xji1qhmi1wqpx07jgm1mpa95gmd2w1kxw240hbr6p0"))
|
||||
"0wdpxjr3zfmgcfg14zlwd8mjbc191pvlchj1xxd0lj30ldfy2daf"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; The examples try to build and cause the build to fail
|
||||
|
@ -1104,7 +1116,7 @@ (define-public qtwayland
|
|||
(define-public qtserialport
|
||||
(package (inherit qtsvg)
|
||||
(name "qtserialport")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1113,7 +1125,7 @@ (define-public qtserialport
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18v4pbq7bnmrl81m8s11ksbjlvzbb4kw5py6ji2dhmnm44w9k9sn"))))
|
||||
"0vkgvicm67vds2iqmhnjsqwnx1f8zhbzc31w6q198i0x8b76j6xh"))))
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
|
@ -1138,7 +1150,7 @@ (define-public qtserialport
|
|||
(define-public qtserialbus
|
||||
(package (inherit qtsvg)
|
||||
(name "qtserialbus")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1147,7 +1159,7 @@ (define-public qtserialbus
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jjmdd6vkvs5izqazp1rsrad0b1fzk6knrbdjl37lvcsawyfxfyk"))))
|
||||
"07k4g5qfh657das2f5i6ph0hl4bva13yzlmxnay7qpzqcb0w4x0p"))))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtserialport" ,qtserialport)))
|
||||
|
@ -1159,7 +1171,7 @@ (define-public qtserialbus
|
|||
(define-public qtwebchannel
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebchannel")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1168,7 +1180,7 @@ (define-public qtwebchannel
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"11rfjkb4h8dzxfmk889x7kkc73cbk26smc7h62lnh35f2nppd95r"))))
|
||||
"1z02dhrd1h2rpdhww9py9dnhss80xwf45n568y7gr3gay7ldlpwl"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
|
@ -1183,7 +1195,7 @@ (define-public qtwebchannel
|
|||
(define-public qtwebglplugin
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebglplugin")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1192,7 +1204,7 @@ (define-public qtwebglplugin
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"108yhi3sj6d1ysmlpka69ivb20mx9h6jpra6yq099i3jw4gc753x"))))
|
||||
"0vazz9yr1qgpcq7p77vg9mrjxy6hjabvwj9irw5l5w7fmsk2ns0n"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:phases phases)
|
||||
|
@ -1218,7 +1230,7 @@ (define-public qtwebglplugin
|
|||
(define-public qtwebview
|
||||
(package (inherit qtsvg)
|
||||
(name "qtwebview")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1227,7 +1239,7 @@ (define-public qtwebview
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"18da6a13wpb23vb6mbg9v75gphdf5mjmch7q3v1qjrv2sdwbpjbp"))))
|
||||
"1r30n9vjcgh2cd2iycfwwwpmbz7grrd3iqrc0afwnri3vylnfqil"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)))
|
||||
(inputs
|
||||
|
@ -1241,7 +1253,7 @@ (define-public qtwebview
|
|||
(define-public qtlocation
|
||||
(package (inherit qtsvg)
|
||||
(name "qtlocation")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1250,7 +1262,7 @@ (define-public qtlocation
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03vrbymwbn4nqsypcmr4ccqv20nvwdfs9gb01pi3jxr6x0wrlb0p"))))
|
||||
"0kh2c2ahg8xkpvqsva13i35ndsc0x0ypnmd6vix5pm5jvwg9366n"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1271,7 +1283,7 @@ (define-public qtlocation
|
|||
(define-public qttools
|
||||
(package (inherit qtsvg)
|
||||
(name "qttools")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1280,13 +1292,14 @@ (define-public qttools
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zhl8p29mbabf07rhaks13qcm45zdckzymvz9qn95nxfj9piiyxp"))))
|
||||
"1f1iqvksrlgkxdbagb6vvjib3argbv9l7iis6ymb8n0rfwn37s7h"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
("qtdeclarative" ,qtdeclarative)
|
||||
("vulkan-headers" ,vulkan-headers)))
|
||||
(inputs
|
||||
`(("mesa" ,mesa)
|
||||
("qtbase" ,qtbase)))
|
||||
|
@ -1298,7 +1311,7 @@ (define-public qttools
|
|||
(define-public qtscript
|
||||
(package (inherit qtsvg)
|
||||
(name "qtscript")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1307,7 +1320,7 @@ (define-public qtscript
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0z6sb4b9ds5lwkr0sxrnx6nim3aq2qx4a8illjy5vclfdv80yhqw"))
|
||||
"0xprhd1brn30dqf5vy4inqgzpq48i8nlc428x9rr8fk5hdm4dhmj"))
|
||||
(patches (search-patches "qtscript-disable-tests.patch"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
|
@ -1322,7 +1335,7 @@ (define-public qtscript
|
|||
(define-public qtquickcontrols
|
||||
(package (inherit qtsvg)
|
||||
(name "qtquickcontrols")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1331,7 +1344,7 @@ (define-public qtquickcontrols
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mn662j0gkpama7zlrsn4h27sjrk49kpbha1h0zxxyiza5cpzsms"))))
|
||||
"1q11nr85436xzrf4mbrbav306hrz0s2qaclqhhb0g88vzcq2wxww"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1346,7 +1359,7 @@ (define-public qtquickcontrols
|
|||
(define-public qtquickcontrols2
|
||||
(package (inherit qtsvg)
|
||||
(name "qtquickcontrols2")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1355,7 +1368,7 @@ (define-public qtquickcontrols2
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hn4kvrkz5ivwrp9p6yzwlw7cn4j72kcpm2nqyi3dbai1px6dc5x"))))
|
||||
"116b5nhmsx898626s37r446yci7kxd3k7xap1dh9spqklkwlj1da"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1371,7 +1384,7 @@ (define-public qtquickcontrols2
|
|||
(define-public qtgraphicaleffects
|
||||
(package (inherit qtsvg)
|
||||
(name "qtgraphicaleffects")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1380,7 +1393,7 @@ (define-public qtgraphicaleffects
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ws8aj7bq3rxpzjs370dcyqk8a5v1y6fwvrdhf70j8b2d4v75lnr"))))
|
||||
"1zd9wjh2hhd6lby0z3ak0ff6zkbv73hh0drrg9qp2yrgjfismp59"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1426,7 +1439,7 @@ (define-public qtdeclarative-render2d
|
|||
(define-public qtgamepad
|
||||
(package (inherit qtsvg)
|
||||
(name "qtgamepad")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1435,7 +1448,7 @@ (define-public qtgamepad
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1n97w9rcbg8mzkvjgn3i8jbfmplp7w0p80ykdchpml47gxk1kwma"))))
|
||||
"076874iyadj7pkprlk24h257nb8i4sni9c6kbixm5zrr2y73fbxf"))))
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)))
|
||||
|
@ -1456,7 +1469,7 @@ (define-public qtgamepad
|
|||
(define-public qtscxml
|
||||
(package (inherit qtsvg)
|
||||
(name "qtscxml")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1465,7 +1478,7 @@ (define-public qtscxml
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0f1k4fnk2aydagxqvkb636pcsi17sbq2zj2fn0ad50dvq013yiph"))
|
||||
"197p5x1dadgjb39pd2vw60r63lvz68i0pm5i8xbyzgzm94hwn9fn"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -1487,7 +1500,7 @@ (define-public qtscxml
|
|||
(define-public qtpurchasing
|
||||
(package (inherit qtsvg)
|
||||
(name "qtpurchasing")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1496,7 +1509,7 @@ (define-public qtpurchasing
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0crm39fy9aqns10mjlbxvkkna9xklic49zfp3f7v7cwl66wap6dc"))))
|
||||
"1xld1yx085mhnqdipy29g2yy5af67hfm0wy4mvj7pl6y5qj8jw9d"))))
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
|
@ -1507,7 +1520,7 @@ (define-public qtpurchasing
|
|||
(define-public qtcanvas3d
|
||||
(package (inherit qtsvg)
|
||||
(name "qtcanvas3d")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1516,7 +1529,7 @@ (define-public qtcanvas3d
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pif3m1f44jrly2nh0hzid6dmdxqiy5qgx645hz6g5fmpl113d8g"))
|
||||
"0h7arss7wr0jwl87kiwgbf0nlcgpbriyf7cnv9j4h7g8d09a777x"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -1546,7 +1559,7 @@ (define-public qtcanvas3d
|
|||
(define-public qtcharts
|
||||
(package (inherit qtsvg)
|
||||
(name "qtcharts")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1555,7 +1568,7 @@ (define-public qtcharts
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0avscsni84zrzydilkkp456sbaypyzhkn42qygjdq7wcn045zxk2"))))
|
||||
"0551qfqnsfiy8kb1ng2v0yn7s6ggy7ghcmis983sbzxzjv2i58zn"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1573,7 +1586,7 @@ (define-public qtcharts
|
|||
(define-public qtdatavis3d
|
||||
(package (inherit qtsvg)
|
||||
(name "qtdatavis3d")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1582,7 +1595,7 @@ (define-public qtdatavis3d
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gay0dsz05xfrlx190y95hp9wipzb988h02fqbqvyn00ds3s178w"))))
|
||||
"05pzvrhvxhxjlav4axrhwlnxjzlr7mi8k3f06g59ryrwmb99kd37"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -1600,7 +1613,7 @@ (define-public qtdatavis3d
|
|||
(define-public qtnetworkauth
|
||||
(package (inherit qtsvg)
|
||||
(name "qtnetworkauth")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1609,7 +1622,7 @@ (define-public qtnetworkauth
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05p4pvfp3k5612d54anvpj39bgc7v572x6kgk3fy69xgn7lhbd02"))))
|
||||
"1zmpvkhf2kmnr8vsa6jq675d5cpnmsg3f8yds6g91yq1g3prqdvr"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:phases phases)
|
||||
|
@ -1629,7 +1642,7 @@ (define-public qtnetworkauth
|
|||
(define-public qtremoteobjects
|
||||
(package (inherit qtsvg)
|
||||
(name "qtremoteobjects")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1638,7 +1651,7 @@ (define-public qtremoteobjects
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yv9f2329nv4viiyqmq7ciz51574wd11grj8s88qm0ndcb36jbgb"))))
|
||||
"06awsaf15rch1y9p2q9kdlmlaa8g28whbzf04b10zfflyijnvg7j"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:phases phases)
|
||||
|
@ -1662,7 +1675,7 @@ (define-public qtremoteobjects
|
|||
(define-public qtspeech
|
||||
(package (inherit qtsvg)
|
||||
(name "qtspeech")
|
||||
(version "5.11.1")
|
||||
(version "5.11.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.qt.io/official_releases/qt/"
|
||||
|
@ -1671,7 +1684,7 @@ (define-public qtspeech
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nwvbaijg35i98yaiqgnyn5vv0cn4v3wrxhwi1s0hfv9sv3q5iyw"))))
|
||||
"110xr2y174sayi9f6swzp1wx7mx4sw9rifcdx2bkbsnbfab6zg8a"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments qtsvg)
|
||||
((#:tests? _ #f) #f))) ; TODO: Enable the tests
|
||||
|
@ -2186,7 +2199,7 @@ (define-public dotherside
|
|||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
("qtdeclarative" ,qtdeclarative)))
|
||||
(home-page "https://github.com/frankosterfeld/qtkeychain")
|
||||
(home-page "https://filcuc.github.io/DOtherSide/index.html")
|
||||
(synopsis "C language library for creating bindings for the Qt QML language")
|
||||
(description
|
||||
"DOtherSide is a C language library for creating bindings for the
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
||||
;;;
|
||||
|
@ -110,7 +110,7 @@ (define-public ruby
|
|||
(define-public ruby-2.3
|
||||
(package
|
||||
(inherit ruby)
|
||||
(version "2.3.7")
|
||||
(version "2.3.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -119,7 +119,7 @@ (define-public ruby-2.3
|
|||
"/ruby-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1nwfaifq5624p1ml56qq5dy5w38z37x22r0qgrbgbzrzklmqy7y6"))
|
||||
"1zhxbjff08pvbnxvn58krns6q0p6g4977q6ykfn823gxhifn63wi"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet `(begin
|
||||
;; Remove bundled libffi
|
||||
|
@ -3481,7 +3481,7 @@ (define-public ruby-nokogiri-diff
|
|||
(define-public ruby-rack
|
||||
(package
|
||||
(name "ruby-rack")
|
||||
(version "2.0.5")
|
||||
(version "2.0.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3493,7 +3493,7 @@ (define-public ruby-rack
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1k1k4wk10l6bxx46pw58j2p3nmyzjqnr65hbjjqydd6517fmxgib"))
|
||||
"0pb3g5ymvbf07xaxcn51dpqv3djlxavckp3qkxsjdxiqznb0d9p1"))
|
||||
;; Ignore test which fails inside the build environment but works
|
||||
;; outside.
|
||||
(patches (search-patches "ruby-rack-ignore-failing-test.patch"))))
|
||||
|
|
|
@ -69,88 +69,6 @@ (define* (nix-system->gnu-triplet-for-rust
|
|||
("mips64el-linux" "mips64el-unknown-linux-gnuabi64")
|
||||
(_ (nix-system->gnu-triplet system))))
|
||||
|
||||
(define rust-bootstrap
|
||||
(package
|
||||
(name "rust-bootstrap")
|
||||
(version "1.22.1")
|
||||
(source #f)
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("patchelf" ,patchelf)))
|
||||
(inputs
|
||||
`(("gcc" ,(canonical-package gcc))
|
||||
("gcc:lib" ,(canonical-package gcc) "lib")
|
||||
("zlib" ,zlib)
|
||||
("source"
|
||||
,(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://static.rust-lang.org/dist/"
|
||||
"rust-" version "-" (nix-system->gnu-triplet-for-rust)
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
(match (nix-system->gnu-triplet-for-rust)
|
||||
("i686-unknown-linux-gnu"
|
||||
"15zqbx86nm13d5vq2gm69b7av4vg479f74b5by64hs3bcwwm08pr")
|
||||
("x86_64-unknown-linux-gnu"
|
||||
"1yll78x6b3abnvgjf2b66gvp6mmcb9y9jdiqcwhmgc0z0i0fix4c")
|
||||
("armv7-unknown-linux-gnueabihf"
|
||||
"138a8l528kzp5wyk1mgjaxs304ac5ms8vlpq0ggjaznm6bn2j7a5")
|
||||
("aarch64-unknown-linux-gnu"
|
||||
"0z6m9m1rx4d96nvybbfmpscq4dv616m615ijy16d5wh2vx0p4na8")
|
||||
("mips64el-unknown-linux-gnuabi64"
|
||||
"07k4pcv7jvfa48cscdj8752lby7m7xdl88v3a6na1vs675lhgja2")
|
||||
(_ ""))))))))
|
||||
(outputs '("out" "cargo"))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:strip-binaries? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(delete 'build)
|
||||
(replace 'install
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(cargo-out (assoc-ref outputs "cargo"))
|
||||
(gcc:lib (assoc-ref inputs "gcc:lib"))
|
||||
(libc (assoc-ref inputs "libc"))
|
||||
(zlib (assoc-ref inputs "zlib"))
|
||||
(ld-so (string-append libc ,(glibc-dynamic-linker)))
|
||||
(rpath (string-append out "/lib:" zlib "/lib:"
|
||||
libc "/lib:" gcc:lib "/lib"))
|
||||
(cargo-rpath (string-append cargo-out "/lib:" libc "/lib:"
|
||||
gcc:lib "/lib"))
|
||||
(rustc (string-append out "/bin/rustc"))
|
||||
(rustdoc (string-append out "/bin/rustdoc"))
|
||||
(cargo (string-append cargo-out "/bin/cargo"))
|
||||
(gcc (assoc-ref inputs "gcc")))
|
||||
;; Install rustc/rustdoc.
|
||||
(invoke "bash" "install.sh"
|
||||
(string-append "--prefix=" out)
|
||||
(string-append "--components=rustc,"
|
||||
"rust-std-"
|
||||
,(nix-system->gnu-triplet-for-rust)))
|
||||
;; Install cargo.
|
||||
(invoke "bash" "install.sh"
|
||||
(string-append "--prefix=" cargo-out)
|
||||
(string-append "--components=cargo"))
|
||||
(for-each (lambda (file)
|
||||
(invoke "patchelf" "--set-rpath" rpath file))
|
||||
(cons* rustc rustdoc (find-files out "\\.so$")))
|
||||
(invoke "patchelf" "--set-rpath" cargo-rpath cargo)
|
||||
(for-each (lambda (file)
|
||||
(invoke "patchelf" "--set-interpreter" ld-so file))
|
||||
(list rustc rustdoc cargo))
|
||||
#t))))))
|
||||
(home-page "https://www.rust-lang.org")
|
||||
(synopsis "Prebuilt rust compiler and cargo package manager")
|
||||
(description "This package provides a pre-built @command{rustc} compiler
|
||||
and a pre-built @command{cargo} package manager, which can
|
||||
in turn be used to build the final Rust.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
|
||||
(define* (rust-source version hash #:key (patches '()))
|
||||
(origin
|
||||
|
@ -480,7 +398,8 @@ (define rust-1.19
|
|||
`(("jemalloc" ,jemalloc-4.5.0)
|
||||
("llvm" ,llvm-3.9.1)
|
||||
("openssl" ,openssl)
|
||||
("libcurl" ,curl))) ; For "cargo"
|
||||
("libssh2" ,libssh2) ; For "cargo"
|
||||
("libcurl" ,curl))) ; For "cargo"
|
||||
|
||||
;; rustc invokes gcc, so we need to set its search paths accordingly.
|
||||
;; Note: duplicate its value here to cope with circular dependencies among
|
||||
|
@ -636,42 +555,42 @@ (define-public rust-1.20
|
|||
#t))))))))))
|
||||
|
||||
(define-public rust-1.21
|
||||
(rust-bootstrapped-package rust-1.20 "1.21.0"
|
||||
"1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp"))
|
||||
(let ((base-rust (rust-bootstrapped-package rust-1.20 "1.21.0"
|
||||
"1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp")))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'configure 'remove-ar
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Remove because toml complains about "unknown field".
|
||||
(substitute* "config.toml"
|
||||
(("^ar =.*") "\n"))
|
||||
#t)))))))))
|
||||
|
||||
(define-public rust-1.22
|
||||
(rust-bootstrapped-package rust-1.21 "1.22.1"
|
||||
"1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb"))
|
||||
|
||||
(define-public rust-1.23
|
||||
(package
|
||||
(inherit rust-1.20)
|
||||
(name "rust")
|
||||
(version "1.23.0")
|
||||
(source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l"))
|
||||
(native-inputs
|
||||
`(("bison" ,bison) ; For the tests
|
||||
("cmake" ,cmake)
|
||||
("flex" ,flex) ; For the tests
|
||||
("gdb" ,gdb) ; For the tests
|
||||
("git" ,git)
|
||||
("procps" ,procps) ; For the tests
|
||||
("python-2" ,python-2)
|
||||
("rustc-bootstrap" ,rust-bootstrap)
|
||||
("cargo-bootstrap" ,rust-bootstrap "cargo")
|
||||
("pkg-config" ,pkg-config) ; For "cargo"
|
||||
("which" ,which)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments rust-1.20)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'configure-archiver)
|
||||
(add-after 'unpack 'dont-build-native
|
||||
(lambda _
|
||||
;; XXX: Revisit this when we use gcc 6.
|
||||
(substitute* "src/binaryen/CMakeLists.txt"
|
||||
(("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") ""))
|
||||
#t))))))))
|
||||
(let ((base-rust (rust-bootstrapped-package rust-1.22 "1.23.0"
|
||||
"14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(delete 'configure-archiver)
|
||||
(delete 'remove-ar)
|
||||
(add-after 'unpack 'dont-build-native
|
||||
(lambda _
|
||||
;; XXX: Revisit this when we use gcc 6.
|
||||
(substitute* "src/binaryen/CMakeLists.txt"
|
||||
(("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") ""))
|
||||
#t)))))))))
|
||||
|
||||
(define-public rust-1.24
|
||||
(let ((base-rust
|
||||
|
@ -692,6 +611,9 @@ (define-public rust-1.24
|
|||
(("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine"))
|
||||
#t)))))))))
|
||||
|
||||
;;; Rust 1.25 release support work with llvm 6--but build with llvm 6 is
|
||||
;;; not determenistic due to <https://github.com/rust-lang/rust/issues/50556>.
|
||||
;;; Keep using llvm 3.9.1 until builds become determenistic
|
||||
(define-public rust-1.25
|
||||
(let ((base-rust
|
||||
(rust-bootstrapped-package rust-1.24 "1.25.0"
|
||||
|
@ -699,10 +621,6 @@ (define-public rust-1.25
|
|||
#:patches '("rust-1.25-accept-more-detailed-gdb-lines.patch"))))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(inputs
|
||||
;; Use LLVM 6.0
|
||||
(alist-replace "llvm" (list llvm)
|
||||
(package-inputs base-rust)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
|
@ -713,18 +631,6 @@ (define-public rust-1.25
|
|||
;; This test wants to update the crate index.
|
||||
(("fn no_index_update") "#[ignore]\nfn no_index_update"))
|
||||
#t))
|
||||
(add-after 'configure 'enable-codegen-tests
|
||||
(lambda _
|
||||
(substitute* "config.toml"
|
||||
(("codegen-tests = false") ""))
|
||||
#t))
|
||||
;; FIXME: Re-enable this test if it's indeed supposed to work.
|
||||
;; See <https://github.com/rust-lang/rust/issues/54178>.
|
||||
(add-after 'enable-codegen-tests 'disable-nil-enum-test
|
||||
(lambda _
|
||||
(substitute* "src/test/debuginfo/nil-enum.rs"
|
||||
(("ignore-lldb") "ignore-gdb"))
|
||||
#t))
|
||||
(replace 'patch-aarch64-test
|
||||
(lambda _
|
||||
(substitute* "src/librustc_metadata/dynamic_lib.rs"
|
||||
|
@ -788,14 +694,15 @@ (define-public rust-1.26
|
|||
(("fn no_index_update") "#[ignore]\nfn no_index_update"))
|
||||
#t)))))))))
|
||||
|
||||
(define-public rust
|
||||
(define-public rust-1.27
|
||||
(let ((base-rust
|
||||
(rust-bootstrapped-package rust-1.26 "1.27.2"
|
||||
"0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs"
|
||||
#:patches
|
||||
'("rust-coresimd-doctest.patch"
|
||||
"rust-bootstrap-stage0-test.patch"
|
||||
"rust-1.25-accept-more-detailed-gdb-lines.patch"))))
|
||||
"rust-1.25-accept-more-detailed-gdb-lines.patch"
|
||||
"rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch"))))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(arguments
|
||||
|
@ -808,4 +715,44 @@ (define-public rust
|
|||
;; `prefix' directory should exist before `install' call
|
||||
(mkdir-p (assoc-ref outputs "out"))
|
||||
(mkdir-p (assoc-ref outputs "cargo"))
|
||||
#t))
|
||||
(add-after 'patch-cargo-tests 'disable-thinlto-test
|
||||
(lambda* _
|
||||
;; thinlto required llvm 6.0 for work
|
||||
(substitute* "src/tools/cargo/tests/testsuite/path.rs"
|
||||
(("fn thin_lto_works") "#[ignore]\nfn thin_lto_works"))
|
||||
#t)))))))))
|
||||
|
||||
(define-public rust
|
||||
(let ((base-rust
|
||||
(rust-bootstrapped-package rust-1.27 "1.28.0"
|
||||
"11k4rn77bca2rikykkk9fmprrgjswd4x4kaq7fia08vgkir82nhx"
|
||||
#:patches
|
||||
'("rust-coresimd-doctest.patch"
|
||||
"rust-bootstrap-stage0-test.patch"
|
||||
"rust-1.25-accept-more-detailed-gdb-lines.patch"
|
||||
"rust-mdbook-support-reproducible-builds-by-forcing-window.search.patch"))))
|
||||
(package
|
||||
(inherit base-rust)
|
||||
(inputs
|
||||
;; Use LLVM 6.0
|
||||
(alist-replace "llvm" (list llvm)
|
||||
(package-inputs base-rust)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base-rust)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'configure 'enable-codegen-tests
|
||||
;; Codegen tests should pass with llvm 6, so enable them.
|
||||
(lambda* _
|
||||
(substitute* "config.toml"
|
||||
(("codegen-tests = false") ""))
|
||||
#t))
|
||||
(add-after 'patch-tests 'disable-amd64-avx-test
|
||||
;; That test would fail on x86_64 machines without avx.
|
||||
(lambda* _
|
||||
(substitute* "src/test/run-pass/issue-44056.rs"
|
||||
(("only-x86_64") "ignore-test"))
|
||||
#t))
|
||||
;; The thinlto test should pass with llvm 6.
|
||||
(delete 'disable-thinlto-test))))))))
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2015, 2017 Sou Bunnbu <iyzsong@member.fsf.org>
|
||||
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
|
@ -102,7 +102,7 @@ (define-public sdl
|
|||
(define-public sdl2
|
||||
(package (inherit sdl)
|
||||
(name "sdl2")
|
||||
(version "2.0.8")
|
||||
(version "2.0.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -110,7 +110,7 @@ (define-public sdl2
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd"))))
|
||||
"1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments sdl)
|
||||
((#:configure-flags flags)
|
||||
|
@ -486,7 +486,7 @@ (define-public guile-sdl
|
|||
(define-public guile-sdl2
|
||||
(package
|
||||
(name "guile-sdl2")
|
||||
(version "0.3.0")
|
||||
(version "0.3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -494,7 +494,7 @@ (define-public guile-sdl2
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0iq6fw213qw292fxhrsg40al7hqyqyh4qpgl0x9rh08y949h2w97"))))
|
||||
"0bw7x2lx90k4banc5k7yfkn3as93y25gr1xdr225ll7lmij21k64"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
|
||||
|
|
|
@ -46,15 +46,14 @@ (define-module (gnu packages search)
|
|||
(define-public xapian
|
||||
(package
|
||||
(name "xapian")
|
||||
(version "1.4.7")
|
||||
(version "1.4.9")
|
||||
;; Note: When updating Xapian, remember to update xapian-bindings below.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://oligarchy.co.uk/xapian/" version
|
||||
"/xapian-core-" version ".tar.xz"))
|
||||
(patches (search-patches "xapian-revert-5489fb2f8.patch"))
|
||||
(sha256
|
||||
(base32 "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k"))))
|
||||
(base32 "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("zlib" ,zlib)
|
||||
("util-linux" ,util-linux)))
|
||||
|
@ -92,7 +91,7 @@ (define-public python-xapian-bindings
|
|||
"/xapian-bindings-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sjf9ck3a6p7xnd84w09l6s0xn2g03k9a9417f4mjnywfq9pa6a5"))))
|
||||
"0ll3z3418r7bzxs4kyini2cbci5xl8i5scl3wyx88s2v4ak56bcz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-python3")
|
||||
|
|
|
@ -160,7 +160,7 @@ (define-public libyubikey
|
|||
(define-public pcsc-lite
|
||||
(package
|
||||
(name "pcsc-lite")
|
||||
(version "1.8.23")
|
||||
(version "1.8.24")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -168,7 +168,7 @@ (define-public pcsc-lite
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"))))
|
||||
"0s3mv6csbi9303vvis0hilm71xsmi6cqkbh2kiipdisydbx6865q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-usbdropdir=/var/lib/pcsc/drivers"
|
||||
|
|
|
@ -225,6 +225,26 @@ (define-public lua-libmpack
|
|||
(home-page "https://github.com/libmpack/libmpack-lua")
|
||||
(synopsis "Lua bindings for the libmpack binary serialization library")))
|
||||
|
||||
(define-public lua5.1-libmpack
|
||||
(package (inherit lua-libmpack)
|
||||
(name "lua5.1-libmpack")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments lua-libmpack)
|
||||
((#:make-flags flags)
|
||||
`(let* ((lua-version ,(package-version lua-5.1))
|
||||
(lua-major+minor ,(version-major+minor (package-version lua-5.1))))
|
||||
(list "CC=gcc"
|
||||
"USE_SYSTEM_LUA=yes"
|
||||
(string-append "MPACK_LUA_VERSION=" lua-version)
|
||||
(string-append "MPACK_LUA_VERSION_NOPATCH=" lua-major+minor)
|
||||
(string-append "PREFIX="
|
||||
(assoc-ref %outputs "out"))
|
||||
(string-append "LUA_CMOD_INSTALLDIR="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/lua/" lua-major+minor))))))
|
||||
(inputs
|
||||
`(("lua" ,lua-5.1)))))
|
||||
|
||||
(define-public lua5.2-libmpack
|
||||
(package (inherit lua-libmpack)
|
||||
(name "lua5.2-libmpack")
|
||||
|
@ -418,7 +438,7 @@ (define-public python-cbor
|
|||
(define-public flatbuffers
|
||||
(package
|
||||
(name "flatbuffers")
|
||||
(version "1.9.0")
|
||||
(version "1.10.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -426,7 +446,7 @@ (define-public flatbuffers
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qs7sa9q4q6hs12yp875lvrv6393178qcmqs1ziwmjk088g4k9aw"))))
|
||||
"0z4swldxs0s31hnkqdhsbfmc8vx3p7zsvmqaw4l31r2iikdy651p"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:build-type "Release"
|
||||
|
@ -435,7 +455,7 @@ (define-public flatbuffers
|
|||
(assoc-ref %outputs "out") "/lib"))))
|
||||
(home-page "https://google.github.io/flatbuffers/")
|
||||
(synopsis "Memory-efficient serialization library")
|
||||
(description "FlatBuffers is a cross platform serialization library for C++,
|
||||
(description "FlatBuffers is a cross-platform serialization library for C++,
|
||||
C#, C, Go, Java, JavaScript, PHP, and Python. It was originally created for
|
||||
game development and other performance-critical applications.")
|
||||
(license license:asl2.0)))
|
||||
|
|
|
@ -569,30 +569,30 @@ (define-public oksh
|
|||
(define-public loksh
|
||||
(package
|
||||
(name "loksh")
|
||||
(version "6.3")
|
||||
(version "6.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/dimkr/loksh/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/dimkr/loksh.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0i1b60g1p19s5cnzz0nmjzjnxywm9szzyp1rcwfcx3gmzvrwr2sc"))))
|
||||
(base32 "1d92cf5iadj1vwg0wwksaq1691zaxjrd2y4qygj4sdd25zsahj6p"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libbsd" ,libbsd)))
|
||||
`(("libbsd" ,libbsd)
|
||||
("ncurses" ,ncurses)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(arguments
|
||||
`(#:tests? #f ;No tests included
|
||||
`(#:tests? #f ; no tests included
|
||||
#:make-flags (list "CC=gcc" "HAVE_LIBBSD=1"
|
||||
(string-append "DESTDIR="
|
||||
(assoc-ref %outputs "out"))
|
||||
"PREFIX=")
|
||||
(string-append "PREFIX="
|
||||
(assoc-ref %outputs "out")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)))) ;No configure script
|
||||
(delete 'configure)))) ; no configure script
|
||||
(home-page "https://github.com/dimkr/loksh")
|
||||
(synopsis "Korn Shell from OpenBSD")
|
||||
(description
|
||||
|
|
|
@ -28,6 +28,7 @@ (define-module (gnu packages shellutils)
|
|||
#:use-module (guix licenses)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages readline)
|
||||
|
@ -133,16 +134,17 @@ (define-public direnv
|
|||
(define-public fzy
|
||||
(package
|
||||
(name "fzy")
|
||||
(version "0.9")
|
||||
(version "1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/jhawthorn/fzy/archive/"
|
||||
version ".tar.gz"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jhawthorn/fzy.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xfgxqbkcpi2n4381kj3fq4026qs6by7xhl5gn0fgp3dh232c63j"))))
|
||||
"1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:make-flags (list "CC=gcc"
|
||||
|
|
|
@ -67,16 +67,22 @@ (define-module (gnu packages ssh)
|
|||
(define-public libssh
|
||||
(package
|
||||
(name "libssh")
|
||||
(version "0.7.6")
|
||||
(version "0.7.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.libssh.org/projects/libssh.git")
|
||||
(commit (string-append "libssh-" version))))
|
||||
;; git.libssh.org does not support the fast "smart" HTTP
|
||||
;; Git protocol. The "dumb" HTTP Git protocol is extremely
|
||||
;; slow, and does not support shallow clones, so we use the
|
||||
;; plain Git protocol despite its flaws. This offers an
|
||||
;; incredible speedup and reduces the size of the the
|
||||
;; source by more than half.
|
||||
(url "git://git.libssh.org/projects/libssh.git")
|
||||
(commit (string-append "libssh-" version))))
|
||||
(patches (search-patches "libssh-hostname-parser-bug.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0slwqa36mhyb6brdv2jvb9fxp7rvsv3ziv67kaxx615jxn52l5pa"))
|
||||
"07adxvhmnaq2l7sq7sn4sjlikbm1zdicq8lavq5yfila6jbx9z1y"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system cmake-build-system)
|
||||
(outputs '("out" "debug"))
|
||||
|
|
|
@ -339,14 +339,14 @@ (define-public r-boot
|
|||
(define-public r-mass
|
||||
(package
|
||||
(name "r-mass")
|
||||
(version "7.3-50")
|
||||
(version "7.3-51")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "MASS" version))
|
||||
(sha256
|
||||
(base32
|
||||
"16hasv9k4n773jsyzvh8s3gbga49hwdj8n5hxij6zqisy4i0kxq6"))))
|
||||
"0yp5ssfm9mahrp30y1hkqgjg70mzs6w065ba8h7j5ky1z6msdsdy"))))
|
||||
(properties `((upstream-name . "MASS")))
|
||||
(build-system r-build-system)
|
||||
(home-page "http://www.stats.ox.ac.uk/pub/MASS4/")
|
||||
|
@ -532,14 +532,14 @@ (define-public r-nlme
|
|||
(define-public r-mgcv
|
||||
(package
|
||||
(name "r-mgcv")
|
||||
(version "1.8-24")
|
||||
(version "1.8-25")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mgcv" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15b76m1f0hz8dbmj9shqvslihdx5b7c48vck9grj5xs1z2y45r9c"))))
|
||||
"1y2rq6v45pr2wcxihhgmingcdvcsilim2cvskrlb7k2n00qg6v2q"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-matrix" ,r-matrix)
|
||||
|
@ -725,13 +725,13 @@ (define-public r-dichromat
|
|||
(define-public r-digest
|
||||
(package
|
||||
(name "r-digest")
|
||||
(version "0.6.16")
|
||||
(version "0.6.18")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "digest" version))
|
||||
(sha256
|
||||
(base32 "1lhs59pdjhpb63jyy98pi1shk9shw044k6vl0mvw0f40v08326ar"))))
|
||||
(base32 "0k3iv0r8wy8w7zchmgrnrqv3bc149075j4817kf0q521vi4f6vbj"))))
|
||||
(build-system r-build-system)
|
||||
;; Vignettes require r-knitr, which requires r-digest, so we have to
|
||||
;; disable them and the tests.
|
||||
|
@ -1059,13 +1059,13 @@ (define-public r-scales
|
|||
(define-public r-ggplot2
|
||||
(package
|
||||
(name "r-ggplot2")
|
||||
(version "3.0.0")
|
||||
(version "3.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "ggplot2" version))
|
||||
(sha256
|
||||
(base32 "0kb977hizsvk3b1k3zr717q78bpmbabhl8cj9a3w717nkq1zas67"))))
|
||||
(base32 "1msy36r21nlmnpyaw2m9k0ykmnd19b9il01b65w457pfw75prrs9"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-digest" ,r-digest)
|
||||
|
@ -1249,16 +1249,14 @@ (define-public r-bh
|
|||
(define-public r-evaluate
|
||||
(package
|
||||
(name "r-evaluate")
|
||||
(version "0.11")
|
||||
(version "0.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "evaluate" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1k8vcd4vsgg0hf7kdz8rlqp1dx4ygvg35aj4n3ay50kdnpzhaj5h"))))
|
||||
"11rpn40153kcvqqrfhg2ldqfs68frg6yzsl0k3rxnlnv4c0v008g"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-stringr" ,r-stringr)))
|
||||
(home-page "https://github.com/hadley/evaluate")
|
||||
(synopsis "Parsing and evaluation tools for R")
|
||||
(description
|
||||
|
@ -1310,13 +1308,13 @@ (define-public r-highr
|
|||
(define-public r-mime
|
||||
(package
|
||||
(name "r-mime")
|
||||
(version "0.5")
|
||||
(version "0.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "mime" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0i91m3ivaja1k33jwcvz16pfjypkci27awm8glil7sxhmwaj3izw"))))
|
||||
"00f4gw4sg1kn03s67gficxgb7a7fb6pwhlvrxrml05q1mc2vcxa7"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/yihui/mime")
|
||||
(synopsis "R package to map filenames to MIME types")
|
||||
|
@ -1423,13 +1421,13 @@ (define-public r-knitrbootstrap
|
|||
(define-public r-microbenchmark
|
||||
(package
|
||||
(name "r-microbenchmark")
|
||||
(version "1.4-4")
|
||||
(version "1.4-6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "microbenchmark" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c"))))
|
||||
"1sn1fxgzakm5iqbgc35g3k4yi0iqrkmwz33cvdrphrzh1lxnmi3s"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/microbenchmark/")
|
||||
(synopsis "Accurate timing functions for R")
|
||||
|
@ -1526,13 +1524,13 @@ (define-public r-praise
|
|||
(define-public r-testthat
|
||||
(package
|
||||
(name "r-testthat")
|
||||
(version "2.0.0")
|
||||
(version "2.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "testthat" version))
|
||||
(sha256
|
||||
(base32
|
||||
"155l53kb69jga5d8c5nvdwqlvlgfmk4vzyyl4d0108j53jnlgh1v"))))
|
||||
"1cafy5xsjx6m08s45456mjsal7mfxzwpbrds0p4z3gwam948gpzy"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-cli" ,r-cli)
|
||||
|
@ -1553,13 +1551,13 @@ (define-public r-testthat
|
|||
(define-public r-r6
|
||||
(package
|
||||
(name "r-r6")
|
||||
(version "2.2.2")
|
||||
(version "2.3.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "R6" version))
|
||||
(sha256
|
||||
(base32
|
||||
"13xfdr19ca7ymisidsanm6w7hsk3qmy5l8c0mlz3nk48f7s5cxq8"))))
|
||||
"1jgshp0x8a65rwyvk31slnfp7l153dk5826y2rxcd5lpclby3d85"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/wch/R6/")
|
||||
(synopsis "Classes with reference semantics in R")
|
||||
|
@ -1575,13 +1573,13 @@ (define-public r-r6
|
|||
(define-public r-rlang
|
||||
(package
|
||||
(name "r-rlang")
|
||||
(version "0.2.2")
|
||||
(version "0.3.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rlang" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0cqd894wzi53rs53prg0j7i75h0yzgi0127fzjqbdbhczwh984f9"))))
|
||||
"0j7kp6h25wbkvpzr7dpc0zgdpjiwsjjlgprj3mv7bgfalfq1si99"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "http://rlang.tidyverse.org")
|
||||
(synopsis "Functions for base types, core R and Tidyverse features")
|
||||
|
@ -1617,13 +1615,13 @@ (define-public r-tibble
|
|||
(define-public r-dplyr
|
||||
(package
|
||||
(name "r-dplyr")
|
||||
(version "0.7.6")
|
||||
(version "0.7.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "dplyr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0c43h13s5mr0fklikbbm89gs6z5n66rkjzdv6w3w6kl5af5wr2fl"))))
|
||||
"196lwck3i3m25jnn1f1nrda9svnjqqi89s0is79gbrphamddnlq5"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-assertthat" ,r-assertthat)
|
||||
|
@ -1767,13 +1765,13 @@ (define-public r-chron
|
|||
(define-public r-data-table
|
||||
(package
|
||||
(name "r-data-table")
|
||||
(version "1.11.4")
|
||||
(version "1.11.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "data.table" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mc1drqj5i5ar2za3nkh5j70y37s7z7xwqri2r2b72zkqggg3k7x"))))
|
||||
"1nb6wngrk1a30m984524gf26fa1nwgyf4y4an94dibcwb5jp8hnw"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://github.com/Rdatatable/data.table/wiki")
|
||||
(synopsis "Enhanced version of data.frame R object")
|
||||
|
@ -1913,13 +1911,13 @@ (define-public python2-statsmodels
|
|||
(define-public r-coda
|
||||
(package
|
||||
(name "r-coda")
|
||||
(version "0.19-1")
|
||||
(version "0.19-2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "coda" version))
|
||||
(sha256
|
||||
(base32
|
||||
"14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"))))
|
||||
"03fs3sdrrym3is92dgpa6ydk3m63gaihwy7bva4k0wm2hxm7x2k7"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-lattice" ,r-lattice)))
|
||||
|
@ -2212,14 +2210,14 @@ (define-public r-desc
|
|||
(define-public r-commonmark
|
||||
(package
|
||||
(name "r-commonmark")
|
||||
(version "1.5")
|
||||
(version "1.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "commonmark" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1jwx5rgm0ypd9a3v4jd9za4a644rdzhk1n4dvmgkj9hdpwsida3z"))))
|
||||
"1xymqncf8byqxzpx64zlp6vbx7gry572jkr2ax0zlavr8bli861x"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/commonmark")
|
||||
(synopsis "CommonMark and Github Markdown Rendering in R")
|
||||
|
@ -2350,13 +2348,13 @@ (define-public r-git2r
|
|||
(define-public r-rstudioapi
|
||||
(package
|
||||
(name "r-rstudioapi")
|
||||
(version "0.7")
|
||||
(version "0.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "rstudioapi" version))
|
||||
(sha256
|
||||
(base32
|
||||
"133s75q2hr6jg28m1wvs96qrbc9c4vw87migwhkjqb88xxvbqhd5"))))
|
||||
"0d6r0in13k0rcyr6asanwy0a9dv4lizq6l2w913rr222pq6vrrck"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/rstudioapi")
|
||||
(synopsis "Safely access the RStudio API")
|
||||
|
@ -2368,22 +2366,29 @@ (define-public r-rstudioapi
|
|||
(define-public r-devtools
|
||||
(package
|
||||
(name "r-devtools")
|
||||
(version "1.13.6")
|
||||
(version "2.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "devtools" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1d9n49djydywfyp9w3njgxs5lag4ac7719wmxy1lkgcmn3l9sx5r"))))
|
||||
"1nyspqicn9zd1rgq3k07b3179i8w5ys6jbd65g9q8qczrb7z3x8f"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-digest" ,r-digest)
|
||||
`(("r-callr" ,r-callr)
|
||||
("r-cli" ,r-cli)
|
||||
("r-digest" ,r-digest)
|
||||
("r-git2r" ,r-git2r)
|
||||
("r-httr" ,r-httr)
|
||||
("r-jsonlite" ,r-jsonlite)
|
||||
("r-memoise" ,r-memoise)
|
||||
("r-pkgbuild" ,r-pkgbuild)
|
||||
("r-pkgload" ,r-pkgload)
|
||||
("r-rcmdcheck" ,r-rcmdcheck)
|
||||
("r-remotes" ,r-remotes)
|
||||
("r-rstudioapi" ,r-rstudioapi)
|
||||
("r-whisker" ,r-whisker)
|
||||
("r-sessioninfo" ,r-sessioninfo)
|
||||
("r-usethis" ,r-usethis)
|
||||
("r-withr" ,r-withr)))
|
||||
(home-page "https://github.com/hadley/devtools")
|
||||
(synopsis "Tools to make developing R packages easier")
|
||||
|
@ -2459,13 +2464,13 @@ (define-public r-readr
|
|||
(define-public r-plotrix
|
||||
(package
|
||||
(name "r-plotrix")
|
||||
(version "3.7-3")
|
||||
(version "3.7-4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "plotrix" version))
|
||||
(sha256
|
||||
(base32
|
||||
"18702y1gbyis56mh219z5ww0nrkh6qx7bgqv3khyn80g2giwk7cf"))))
|
||||
"1hs0zwaqs34559girinvysjfbvznyn8znp9cwvkqx6k2cqvcjinj"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/plotrix")
|
||||
(synopsis "Various plotting functions")
|
||||
|
@ -2942,13 +2947,13 @@ (define-public r-segmented
|
|||
(define-public r-snow
|
||||
(package
|
||||
(name "r-snow")
|
||||
(version "0.4-2")
|
||||
(version "0.4-3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "snow" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mxbrkpnmq32x4wd0194d541661yvfrrjlr3lsf7qq53ms3h21zf"))))
|
||||
"1n3n8pva9s34fvlw32yng0x416lmbv7q1fsd0ywa4kikmxym64l5"))))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://cran.r-project.org/web/packages/snow")
|
||||
(synopsis "Support for simple parallel computing in R")
|
||||
|
@ -3034,14 +3039,14 @@ (define-public r-foreach
|
|||
(define-public r-doparallel
|
||||
(package
|
||||
(name "r-doparallel")
|
||||
(version "1.0.11")
|
||||
(version "1.0.14")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "doParallel" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0sppgxk3d8mfsrb3cjdyn0mv0s4i7pcy8g8c3cjzbr6k8vmx5jsc"))))
|
||||
"01qjs4iw9f1kgymcypj0m2s4pvgqhxaycpli0fb8lq3dc0vpzfyb"))))
|
||||
(properties `((upstream-name . "doParallel")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
|
@ -3634,14 +3639,14 @@ (define-public r-viridislite
|
|||
(define-public r-tidyselect
|
||||
(package
|
||||
(name "r-tidyselect")
|
||||
(version "0.2.4")
|
||||
(version "0.2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "tidyselect" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1592dbzawhd1hpsp9919l4sifyiaaj6xr7lnhsbwa6jwmmb0xcsw"))))
|
||||
"0x3cp36byhfjajikr1lwffjm85ayw3bcs7d7kb0cydgs61ifiqjw"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-glue" ,r-glue)
|
||||
|
@ -4231,13 +4236,13 @@ (define-public r-rocr
|
|||
(define-public r-zoo
|
||||
(package
|
||||
(name "r-zoo")
|
||||
(version "1.8-3")
|
||||
(version "1.8-4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "zoo" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15jmkgwvq2mm9f09vijgx7sff8pszh90fndcwhk2vw9i0p183di0"))))
|
||||
"1pywcp86kqijdrvl42qwdy75szrag9pzj0p88zbrj2r1klb8rn5i"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-lattice" ,r-lattice)))
|
||||
|
@ -4735,14 +4740,14 @@ (define-public r-deoptimr
|
|||
(define-public r-robustbase
|
||||
(package
|
||||
(name "r-robustbase")
|
||||
(version "0.93-2")
|
||||
(version "0.93-3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "robustbase" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1632p73iv9iqqm0v3k9rfv9way0him3fl35si1nly9wi5kpq5ci7"))))
|
||||
"1nqh1qg1qd1qrxl1w585dqx7ql55qzjny1r4f9hqxpwd7lml07cc"))))
|
||||
(build-system r-build-system)
|
||||
(inputs
|
||||
`(("gfortran" ,gfortran)))
|
||||
|
@ -5084,17 +5089,19 @@ (define-public r-quantreg
|
|||
(define-public r-nloptr
|
||||
(package
|
||||
(name "r-nloptr")
|
||||
(version "1.0.4")
|
||||
(version "1.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "nloptr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1sz1xj3785x4vsm4nd6in298bk32hs2jk5nsxma7ivxi7jcmn8l4"))))
|
||||
"15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz"))))
|
||||
(build-system r-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
`(("r-knitr" ,r-knitr) ; for building vignettes
|
||||
("pkg-config" ,pkg-config)
|
||||
("gfortran" ,gfortran)))
|
||||
(inputs
|
||||
`(("nlopt" ,nlopt)))
|
||||
(home-page "https://cran.r-project.org/web/packages/nloptr")
|
||||
|
@ -5165,14 +5172,14 @@ (define-public r-pbkrtest
|
|||
(define-public r-cardata
|
||||
(package
|
||||
(name "r-cardata")
|
||||
(version "3.0-1")
|
||||
(version "3.0-2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "carData" version))
|
||||
(sha256
|
||||
(base32
|
||||
"193pdwgw6gk19v7swk1kwphg3vqdmpsgi555g9nyz93sa39j7r8j"))))
|
||||
"152lfgaspgx6x2wzdb5p3zv6r87a0d2pg10h6fjmdr613kzlwp1v"))))
|
||||
(properties `((upstream-name . "carData")))
|
||||
(build-system r-build-system)
|
||||
(home-page "https://r-forge.r-project.org/projects/car/")
|
||||
|
|
|
@ -298,100 +298,6 @@ (define-public go-github-com-gobwas-glob
|
|||
(home-page "https://github.com/gobwas/glob")
|
||||
(license expat))))
|
||||
|
||||
(define* (go-github-com-gogo-protobuf-union
|
||||
#:optional (packages (list go-github-com-gogo-protobuf
|
||||
go-github-com-gogo-protobuf-protoc-gen-gogo)))
|
||||
(package
|
||||
(name "go-github-com-gogo-protobuf-union")
|
||||
(version (package-version go-github-com-gogo-protobuf))
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
'(#:modules ((guix build union))
|
||||
#:builder (begin
|
||||
(use-modules (ice-9 match)
|
||||
(guix build union))
|
||||
(match %build-inputs
|
||||
(((names . directories) ...)
|
||||
(union-build (assoc-ref %outputs "out")
|
||||
directories)
|
||||
#t)))))
|
||||
(inputs (map (lambda (package)
|
||||
(list (package-name package) package))
|
||||
packages))
|
||||
(synopsis "Union of Go protobuf libraries")
|
||||
(description "This is a union of Go protobuf libraries")
|
||||
(home-page (package-home-page go-github-com-gogo-protobuf))
|
||||
(license (package-license go-github-com-gogo-protobuf))))
|
||||
|
||||
(define-public go-github-com-gogo-protobuf
|
||||
(let ((commit "160de10b2537169b5ae3e7e221d28269ef40d311")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "go-github-com-gogo-protobuf")
|
||||
(version (git-version "0.5" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/gogo/protobuf")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0hxq28sgxym04rv0q40gpwkh4ni359q21hq3g78wwxwx4qfd4zwm"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "github.com/gogo/protobuf/proto"
|
||||
#:unpack-path "github.com/gogo/protobuf"))
|
||||
(propagated-inputs
|
||||
`(("go-github-com-gogo-protobuf-protoc-gen-gogo"
|
||||
,go-github-com-gogo-protobuf-protoc-gen-gogo)))
|
||||
(synopsis "Protocol Buffers for Go with Gadgets")
|
||||
(description "Gogoprotobuf is a fork of golang/protobuf with extra code
|
||||
generation features. This code generation is used to achieve:
|
||||
@itemize
|
||||
@item fast marshalling and unmarshalling
|
||||
@item more canonical Go structures
|
||||
@item goprotobuf compatibility
|
||||
@item less typing by optionally generating extra helper code
|
||||
@item peace of mind by optionally generating test and benchmark code
|
||||
@item other serialization formats
|
||||
@end itemize")
|
||||
(home-page "https://github.com/gogo/protobuf")
|
||||
(license bsd-3))))
|
||||
|
||||
(define-public go-github-com-gogo-protobuf-protoc-gen-gogo
|
||||
(let ((commit "efccd33a0c20aa078705571d5ddbfa14c8395a63")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "go-github-com-gogo-protobuf-protoc-gen-gogo")
|
||||
(version (git-version "0.2" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/gogo/protobuf")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"09kfa3aqmhh7p0rc6wd4fw5cjccidsk9vgcy13albv0g8vnbmmgw"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "github.com/gogo/protobuf/protoc-gen-gogo"
|
||||
#:unpack-path "github.com/gogo/protobuf"))
|
||||
(synopsis "Protocol Buffers for Go with Gadgets")
|
||||
(description "Gogoprotobuf is a fork of golang/protobuf with extra code
|
||||
generation features. This code generation is used to achieve:
|
||||
@itemize
|
||||
@item fast marshalling and unmarshalling
|
||||
@item more canonical Go structures
|
||||
@item goprotobuf compatibility
|
||||
@item less typing by optionally generating extra helper code
|
||||
@item peace of mind by optionally generating test and benchmark code
|
||||
@item other serialization formats
|
||||
@end itemize")
|
||||
(home-page "https://github.com/gogo/protobuf")
|
||||
(license bsd-3))))
|
||||
|
||||
(define-public go-github-com-golang-groupcache-lru
|
||||
(let ((commit "84a468cf14b4376def5d68c722b139b881c450a4")
|
||||
|
@ -822,44 +728,6 @@ (define-public go-github-com-vitrun-qart-qr
|
|||
(home-page "https://github.com/vitrun/qart")
|
||||
(license bsd-3))))
|
||||
|
||||
;; Go searches for library modules by looking in the GOPATH environment
|
||||
;; variable. This variable is a list of paths. However, Go does not
|
||||
;; keep searching on GOPATH if it tries and fails to import a module.
|
||||
;; So, we use a union for packages sharing a namespace.
|
||||
(define* (go-golang-org-x-crypto-union #:optional
|
||||
(packages (list go-golang-org-x-crypto-blowfish
|
||||
go-golang-org-x-crypto-bcrypt
|
||||
go-golang-org-x-crypto-tea
|
||||
go-golang-org-x-crypto-xtea
|
||||
go-golang-org-x-crypto-pbkdf2
|
||||
go-golang-org-x-crypto-twofish
|
||||
go-golang-org-x-crypto-cast5
|
||||
go-golang-org-x-crypto-salsa20)))
|
||||
(package
|
||||
(name "go-golang-org-x-crypto")
|
||||
(version (package-version go-golang-org-x-crypto-bcrypt))
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
'(#:modules ((guix build union))
|
||||
#:builder (begin
|
||||
(use-modules (ice-9 match)
|
||||
(guix build union))
|
||||
(match %build-inputs
|
||||
(((names . directories) ...)
|
||||
(union-build (assoc-ref %outputs "out")
|
||||
directories)
|
||||
#t)))))
|
||||
(inputs (map (lambda (package)
|
||||
(list (package-name package) package))
|
||||
packages))
|
||||
(synopsis "Union of the Go x crypto libraries")
|
||||
(description "A union of the Golang cryptographic libraries. A
|
||||
union is required because `go build` assumes that all of the headers and
|
||||
libraries are in the same directory.")
|
||||
(home-page (package-home-page go-golang-org-x-crypto-bcrypt))
|
||||
(license (package-license go-golang-org-x-crypto-bcrypt))))
|
||||
|
||||
(define* (go-golang-org-x-net-union #:optional
|
||||
(packages (list go-golang-org-x-net-ipv4
|
||||
go-golang-org-x-net-bpf
|
||||
|
|
|
@ -338,7 +338,7 @@ (define-public pfff
|
|||
(define-public oniguruma
|
||||
(package
|
||||
(name "oniguruma")
|
||||
(version "6.8.2")
|
||||
(version "6.9.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/kkos/"
|
||||
|
@ -346,7 +346,7 @@ (define-public oniguruma
|
|||
"/onig-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"00s9gjgb3srn5sbmx4x9bssn52mi04d868ghizssdhjlddgxmsmd"))))
|
||||
"1jg76i2ksf3s4bz4h3g2f9ac19q31lzxs11j900w7qqc0mgb5gwi"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://github.com/kkos/oniguruma")
|
||||
(synopsis "Regular expression library")
|
||||
|
|
|
@ -47,14 +47,14 @@ (define-module (gnu packages tor)
|
|||
(define-public tor
|
||||
(package
|
||||
(name "tor")
|
||||
(version "0.3.4.8")
|
||||
(version "0.3.4.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dist.torproject.org/tor-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2"))))
|
||||
"0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "--enable-gcc-hardening"
|
||||
|
|
|
@ -166,7 +166,11 @@ (define-public git
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vn6pi9yvw7rnb9dvi1yjrvv39fqd1m9mwbaffqwizs3gaf91br7"))))))
|
||||
"1vn6pi9yvw7rnb9dvi1yjrvv39fqd1m9mwbaffqwizs3gaf91br7"))))
|
||||
;; For subtree documentation.
|
||||
("asciidoc" ,asciidoc)
|
||||
("docbook-xsl" ,docbook-xsl)
|
||||
("xmlto" ,xmlto)))
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
("expat" ,expat)
|
||||
|
@ -198,6 +202,7 @@ (define-public git
|
|||
"send-email" ; for git-send-email
|
||||
"svn" ; git-svn
|
||||
"credential-netrc" ; git-credential-netrc
|
||||
"subtree" ; git-subtree
|
||||
"gui")) ; gitk, git gui
|
||||
(arguments
|
||||
`(#:make-flags `("V=1" ;more verbose compilation
|
||||
|
@ -256,6 +261,26 @@ (define-public git
|
|||
;; Add the "PM.stamp" to avoid "no rule to make target".
|
||||
(call-with-output-file "perl/PM.stamp" (const #t))
|
||||
#t))
|
||||
(add-after 'build 'build-subtree
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(with-directory-excursion "contrib/subtree"
|
||||
(substitute* "Makefile"
|
||||
;; Apparently `xmlto' does not bother to looks up the stylesheets
|
||||
;; specified in the XML, unlike the above substitution. Instead it
|
||||
;; uses a hard-coded URL. Work around it here, but if this is
|
||||
;; common perhaps we should hardcode this path in xmlto itself.
|
||||
(("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\) man")
|
||||
(string-append "$(XMLTO) -x "
|
||||
(string-append (assoc-ref inputs "docbook-xsl")
|
||||
"/xml/xsl/docbook-xsl-"
|
||||
,(package-version docbook-xsl))
|
||||
"/manpages/docbook.xsl -m $(MANPAGE_XSL) man")))
|
||||
(invoke "make")
|
||||
(invoke "make" "install")
|
||||
(invoke "make" "install-doc")
|
||||
(substitute* "git-subtree"
|
||||
(("/bin/sh") (which "sh"))))
|
||||
#t))
|
||||
(add-before 'check 'patch-tests
|
||||
(lambda _
|
||||
(let ((store-directory (%store-directory)))
|
||||
|
@ -317,6 +342,14 @@ (define-public git
|
|||
`("PERL5LIB" ":" prefix
|
||||
(,(string-append (assoc-ref outputs "out") "/share/perl5"))))
|
||||
#t)))
|
||||
(add-after 'install 'install-subtree
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((subtree (assoc-ref outputs "subtree")))
|
||||
(install-file "contrib/subtree/git-subtree"
|
||||
(string-append subtree "/bin"))
|
||||
(install-file "contrib/subtree/git-subtree.1"
|
||||
(string-append subtree "/share/man/man1"))
|
||||
#t)))
|
||||
(add-after 'install 'split
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Split the binaries to the various outputs.
|
||||
|
@ -427,7 +460,7 @@ (define-public git
|
|||
(define-public libgit2
|
||||
(package
|
||||
(name "libgit2")
|
||||
(version "0.26.7")
|
||||
(version "0.26.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/libgit2/libgit2/"
|
||||
|
@ -435,7 +468,7 @@ (define-public libgit2
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vy4dnbvhcq3pw8n8zz6clnsv2xnkrichl8k96w3lb6yyk0lln35"))
|
||||
"15kp4sq72kh762bm7dgspyrk0a6siarvll3k7nrhs0xy77idf80g"))
|
||||
(patches (search-patches "libgit2-mtime-0.patch"))
|
||||
|
||||
;; Remove bundled software.
|
||||
|
@ -1119,14 +1152,14 @@ (define-public gitolite
|
|||
(define-public mercurial
|
||||
(package
|
||||
(name "mercurial")
|
||||
(version "4.6.2")
|
||||
(version "4.7.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.mercurial-scm.org/"
|
||||
"release/mercurial-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bv6wgcdx8glihjjfg22khhc52mclsn4kwfqvzbzlg0b42h4xl0w"))))
|
||||
"1yq9r8s9jzj8hk2yizjk25s4w16yx9b8mbdj6wp8ld7j2r15kw4p"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(;; Restrict to Python 2, as Python 3 would require
|
||||
|
@ -1697,7 +1730,7 @@ (define-public findnewest
|
|||
(define-public myrepos
|
||||
(package
|
||||
(name "myrepos")
|
||||
(version "1.20171231")
|
||||
(version "1.20180726")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1706,15 +1739,34 @@ (define-public myrepos
|
|||
(commit version)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32 "10q7lpx152xnkk701fscn4dq99q9znnmv3bc2482khhjg7z8rps0"))
|
||||
(patches (search-patches "myrepos-CVE-2018-7032.patch"))))
|
||||
(base32 "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("perl" ,perl)))
|
||||
(arguments
|
||||
'(#:test-target "test"
|
||||
#:phases (modify-phases %standard-phases (delete 'configure))
|
||||
#:make-flags (list (string-append "PREFIX=" %output))))
|
||||
#:make-flags (list (string-append "PREFIX=" %output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'install 'wrap-webcheckout
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(wrap-program (string-append out "/bin/webcheckout")
|
||||
`("PERL5LIB" ":" prefix
|
||||
,(map (lambda (i) (string-append (assoc-ref inputs i)
|
||||
"/lib/perl5/site_perl"))
|
||||
'("perl-encode-locale" "perl-http-date"
|
||||
"perl-http-message" "perl-html-parser" "perl-libwww"
|
||||
"perl-uri" "perl-try-tiny"))))
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("perl" ,perl)
|
||||
("perl-encode-locale" ,perl-encode-locale)
|
||||
("perl-html-parser" ,perl-html-parser)
|
||||
("perl-http-date" ,perl-http-date)
|
||||
("perl-http-message" ,perl-http-message)
|
||||
("perl-libwww" ,perl-libwww)
|
||||
("perl-try-tiny" ,perl-try-tiny)
|
||||
("perl-uri" ,perl-uri)))
|
||||
(home-page "https://myrepos.branchable.com/")
|
||||
(synopsis "Multiple repository management tool")
|
||||
(description
|
||||
|
|
|
@ -67,6 +67,7 @@ (define-module (gnu packages video)
|
|||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages assembly)
|
||||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages avahi)
|
||||
|
@ -96,6 +97,7 @@ (define-module (gnu packages video)
|
|||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages gnunet)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages gstreamer)
|
||||
#:use-module (gnu packages gtk)
|
||||
|
@ -139,8 +141,7 @@ (define-module (gnu packages video)
|
|||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xiph)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg)
|
||||
#:use-module (gnu packages assembly))
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public aalib
|
||||
(package
|
||||
|
@ -613,14 +614,14 @@ (define-public libva
|
|||
(define-public ffmpeg
|
||||
(package
|
||||
(name "ffmpeg")
|
||||
(version "4.0.2")
|
||||
(version "4.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59"))))
|
||||
"1vg229mxcrm415cq6q1nfm891hm4x56mb5p4cqjnlqnky7ikfg15"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("fontconfig" ,fontconfig)
|
||||
|
@ -789,14 +790,14 @@ (define-public ffmpeg
|
|||
(define-public ffmpeg-3.4
|
||||
(package
|
||||
(inherit ffmpeg)
|
||||
(version "3.4.4")
|
||||
(version "3.4.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1iizgnhjbhar9y1ykqlj1czqanlv24knkfq5vvfnppv5x00pcvrq"))))))
|
||||
"0b59qk5wpc5ksiha76jbhb859g5gxa4w0k6afh3kgvgajiivs73l"))))))
|
||||
|
||||
(define-public ffmpeg-2.8
|
||||
(package
|
||||
|
@ -2911,25 +2912,27 @@ (define-public frei0r-plugins
|
|||
(define-public motion
|
||||
(package
|
||||
(name "motion")
|
||||
(version "4.1.1")
|
||||
(version "4.2")
|
||||
(home-page "https://motion-project.github.io/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/Motion-Project/motion/archive/"
|
||||
"release-" version ".tar.gz"))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Motion-Project/motion.git")
|
||||
(commit (string-append "release-" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"1qm4i8zrqafl60sv2frhixvkd0wh0r5jfcrj5i6gha7yplsvjx10"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
"0c0q6dl4v561m5y8bp0c0h4p3s52fjgcdnsrrf5ygdi288d3rfxv"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf-wrapper)
|
||||
("automake" ,automake)
|
||||
("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libjpeg" ,libjpeg)
|
||||
("ffmpeg" ,ffmpeg-3.4)
|
||||
("libmicrohttpd" ,libmicrohttpd)
|
||||
("sqlite" ,sqlite)))
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
|
|
|
@ -48,27 +48,17 @@ (define-module (gnu packages vpn)
|
|||
(define-public gvpe
|
||||
(package
|
||||
(name "gvpe")
|
||||
(version "3.0")
|
||||
(version "3.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gvpe/gvpe-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove the outdated bundled copy of glibc's getopt, which
|
||||
;; provides a 'getopt' declaration that conflicts with that
|
||||
;; of glibc 2.26.
|
||||
(substitute* "lib/Makefile.in"
|
||||
(("getopt1?\\.(c|h|\\$\\(OBJEXT\\))") ""))
|
||||
(for-each delete-file
|
||||
'("lib/getopt.h" "lib/getopt.c"))
|
||||
#t))))
|
||||
"1cz8n75ksl0l908zc5l3rnfm1hv7130s2w8710799fr5sxrdbszi"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://software.schmorp.de/pkg/gvpe.html")
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("openssl" ,openssl)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Secure VPN among multiple nodes over an untrusted network")
|
||||
|
@ -312,14 +302,14 @@ (define-public openvpn
|
|||
(define-public tinc
|
||||
(package
|
||||
(name "tinc")
|
||||
(version "1.0.33")
|
||||
(version "1.0.35")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://tinc-vpn.org/packages/"
|
||||
(uri (string-append "https://tinc-vpn.org/packages/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x0hpfz13vn4pl6dcpnls6xq3rfcbdsg90awcfn53ijb8k35svvz"))))
|
||||
"0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
|
@ -328,7 +318,7 @@ (define-public tinc
|
|||
(inputs `(("zlib" ,zlib)
|
||||
("lzo" ,lzo)
|
||||
("openssl" ,openssl)))
|
||||
(home-page "http://tinc-vpn.org")
|
||||
(home-page "https://tinc-vpn.org")
|
||||
(synopsis "Virtual Private Network (VPN) daemon")
|
||||
(description
|
||||
"Tinc is a VPN that uses tunnelling and encryption to create a secure
|
||||
|
|
|
@ -3697,7 +3697,7 @@ (define-public perl-www-curl
|
|||
(define-public perl-www-mechanize
|
||||
(package
|
||||
(name "perl-www-mechanize")
|
||||
(version "1.88")
|
||||
(version "1.89")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3705,7 +3705,7 @@ (define-public perl-www-mechanize
|
|||
"WWW-Mechanize-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0yd8a1zsfpbv5wr79x3iqmik9gvcd10iam9dfrdan4dri9vpxn9n"))))
|
||||
"1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs ;only for tests
|
||||
`(("perl-cgi" ,perl-cgi)
|
||||
|
@ -3874,13 +3874,13 @@ (define-public r-jsonlite
|
|||
(define-public r-servr
|
||||
(package
|
||||
(name "r-servr")
|
||||
(version "0.10")
|
||||
(version "0.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "servr" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0yz3igqsiyqnjj1ngh199zicg3spx4kbmvl0wc8i8xahk6l9g06v"))))
|
||||
"0yj3p1risf269n25dd56lqv82dsxv6a0aq4bcc1ddn9wv7h2xdfi"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-httpuv" ,r-httpuv)
|
||||
|
@ -3932,13 +3932,13 @@ (define-public r-htmltools
|
|||
(define-public r-htmlwidgets
|
||||
(package
|
||||
(name "r-htmlwidgets")
|
||||
(version "1.2")
|
||||
(version "1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "htmlwidgets" version))
|
||||
(sha256
|
||||
(base32
|
||||
"04c4d0mfcy3dkdlbxnaccpdgxvyxfdwfmmh5djim6v9hyg0j2z8s"))))
|
||||
"04jsdh14l2zifbjpbbh23w7bxz1wpsas0zb2gy2zwv4yqamzzr7i"))))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-htmltools" ,r-htmltools)
|
||||
|
@ -5607,13 +5607,13 @@ (define-public r-shiny
|
|||
(define-public r-shinydashboard
|
||||
(package
|
||||
(name "r-shinydashboard")
|
||||
(version "0.7.0")
|
||||
(version "0.7.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "shinydashboard" version))
|
||||
(sha256
|
||||
(base32
|
||||
"10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb"))))
|
||||
"0khac8b27q3swdw07kl609hm0fjfjsjv591b388q99mqqr2rk92i"))))
|
||||
(build-system r-build-system)
|
||||
;; The directory inst/AdminLTE/ contains a minified JavaScript file.
|
||||
;; Regenerate it from the included sources.
|
||||
|
@ -5633,6 +5633,7 @@ (define-public r-shinydashboard
|
|||
(dump-port minified port))))))))))
|
||||
(propagated-inputs
|
||||
`(("r-htmltools" ,r-htmltools)
|
||||
("r-promises" ,r-promises)
|
||||
("r-shiny" ,r-shiny)))
|
||||
(native-inputs
|
||||
`(("uglify-js" ,uglify-js)))
|
||||
|
@ -5645,6 +5646,35 @@ (define-public r-shinydashboard
|
|||
;; later.
|
||||
(license l:gpl2+)))
|
||||
|
||||
(define-public r-shinyfiles
|
||||
(package
|
||||
(name "r-shinyfiles")
|
||||
(version "0.7.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (cran-uri "shinyFiles" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1cbg09l7w2zbgxb4qjm9p873p0lzrihlzsk5xxi3cpxdckn6zsrm"))))
|
||||
(properties `((upstream-name . "shinyFiles")))
|
||||
(build-system r-build-system)
|
||||
(propagated-inputs
|
||||
`(("r-fs" ,r-fs)
|
||||
("r-htmltools" ,r-htmltools)
|
||||
("r-jsonlite" ,r-jsonlite)
|
||||
("r-shiny" ,r-shiny)
|
||||
("r-tibble" ,r-tibble)))
|
||||
(home-page "https://github.com/thomasp85/shinyFiles")
|
||||
(synopsis "Server-side file system viewer for Shiny")
|
||||
(description
|
||||
"This package provides functionality for client-side navigation of the
|
||||
server side file system in shiny apps. In case the app is running locally
|
||||
this gives the user direct access to the file system without the need to
|
||||
\"download\" files to a temporary location. Both file and folder selection as
|
||||
well as file saving is available.")
|
||||
(license l:gpl2+)))
|
||||
|
||||
(define-public r-crosstalk
|
||||
(package
|
||||
(name "r-crosstalk")
|
||||
|
|
|
@ -143,14 +143,14 @@ (define-public webkitgtk
|
|||
(define-public webkitgtk-2.22
|
||||
(package/inherit webkitgtk
|
||||
(name "webkitgtk")
|
||||
(version "2.22.2")
|
||||
(version "2.22.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.webkitgtk.org/releases/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l"))))
|
||||
"0wnddhm2bihmmkmi919lyxskvjk2wrzx6azkiypyjfwm08lm9zcx"))))
|
||||
(native-inputs
|
||||
`(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer
|
||||
,@(package-native-inputs webkitgtk)))
|
||||
|
|
|
@ -225,7 +225,7 @@ (define-public wine64
|
|||
(define-public wine-staging-patchset-data
|
||||
(package
|
||||
(name "wine-staging-patchset-data")
|
||||
(version "3.18")
|
||||
(version "3.19")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -235,7 +235,7 @@ (define-public wine-staging-patchset-data
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18g1lmqzkc7ngppynimfvza1gkdhqlnjbvnckmaws847ns4i0kzp"))))
|
||||
"0nmlhc6jamz0zb4b1w165l8j1a1b0j5ad1sv06aasc9jy8s12b22"))))
|
||||
(build-system trivial-build-system)
|
||||
(native-inputs
|
||||
`(("bash" ,bash)
|
||||
|
@ -281,7 +281,7 @@ (define-public wine-staging
|
|||
(file-name (string-append name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xqs76hxcym8nb95r7l72xx0msbscp7fhkr1wrv4r0923d5x9s4v"))))
|
||||
"0slwgbxclx2dx0glj8az3mv0bqxmx119v9s0jvg1b5zhmqkcc8gg"))))
|
||||
(inputs `(("autoconf" ,autoconf) ; for autoreconf
|
||||
("gtk+" ,gtk+)
|
||||
("libva" ,libva)
|
||||
|
|
|
@ -180,14 +180,14 @@ (define-public i3status
|
|||
(define-public i3-wm
|
||||
(package
|
||||
(name "i3-wm")
|
||||
(version "4.15")
|
||||
(version "4.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://i3wm.org/downloads/i3-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91"))))
|
||||
"1d2mnryn7m9c6d69awd7lwzadliapd0ahi5n8d0ppqy533ssaq6c"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
|
|
@ -1521,3 +1521,37 @@ (define-public numlockx
|
|||
the numlock key in X11. It can be called from the user's initialization files
|
||||
to automatically turn it on on login.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public xrandr-invert-colors
|
||||
(package
|
||||
(name "xrandr-invert-colors")
|
||||
(version "0.01")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/zoltanp/xrandr-invert-colors.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1br3x9vr6xm4ika06n8cfxx1b3wdchdqvyzjl4y1chmivrml8x9h"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags (list "CC=gcc")
|
||||
#:tests? #f ; there are none
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin")))
|
||||
(install-file "xrandr-invert-colors.bin" bin)
|
||||
#t))))))
|
||||
(inputs
|
||||
`(("libxrandr" ,libxrandr)))
|
||||
(home-page "https://github.com/zoltanp/xrandr-invert-colors")
|
||||
(synopsis "Invert display colors")
|
||||
(description "This package provides a small utility for inverting the
|
||||
colors on all monitors attached to an XRandR-capable X11 display server.")
|
||||
(license license:gpl3+)))
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -60,7 +61,7 @@ (define libogg
|
|||
(version "1.3.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/ogg/libogg-"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/ogg/libogg-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -83,7 +84,7 @@ (define libvorbis
|
|||
(version "1.3.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/vorbis/"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/vorbis/"
|
||||
"libvorbis-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -109,7 +110,7 @@ (define libtheora
|
|||
(version "1.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/theora/"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/theora/"
|
||||
"libtheora-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -134,7 +135,7 @@ (define speex
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/speex/speex-"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/speex/speex-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -162,7 +163,7 @@ (define speexdsp
|
|||
(version "1.2rc3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/speex/"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/speex/"
|
||||
"speexdsp-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -188,7 +189,7 @@ (define ao
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/ao/libao-"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/ao/libao-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -237,7 +238,7 @@ (define flac
|
|||
(version "1.3.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/flac/flac-"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/flac/flac-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -261,7 +262,7 @@ (define libkate
|
|||
(version "0.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/kate/"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/kate/"
|
||||
"libkate-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -297,7 +298,7 @@ (define vorbis-tools
|
|||
(version "1.4.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://downloads.xiph.org/releases/vorbis/"
|
||||
(uri (string-append "https://downloads.xiph.org/releases/vorbis/"
|
||||
"vorbis-tools-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -332,14 +333,14 @@ (define vorbis-tools
|
|||
(define opus
|
||||
(package
|
||||
(name "opus")
|
||||
(version "1.2.1")
|
||||
(version "1.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://archive.mozilla.org/pub/opus/opus-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ch7yzgg4bn1g36bpjsfrgs4n19c84d7wpdida6yzifrrhwx7byg"))))
|
||||
"0l651n19h0vhc0sn6w2c95hgqks1i8m4b3j04ncaznzjznp6jgag"))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Versatile audio codec")
|
||||
(description
|
||||
|
@ -354,15 +355,15 @@ (define opus
|
|||
(define opus-tools
|
||||
(package
|
||||
(name "opus-tools")
|
||||
(version "0.1.10")
|
||||
(version "0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://downloads.xiph.org/releases/opus/opus-tools-"
|
||||
"https://downloads.xiph.org/releases/opus/opus-tools-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"135jfb9ny3xvd27idsxj7j5ns90lslbyrq70cq3bfwcls4r7add2"))))
|
||||
"11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; The package developers misuse pkg-config such that it doesn't work
|
||||
|
@ -373,9 +374,12 @@ (define opus-tools
|
|||
"/include -I"
|
||||
(assoc-ref %build-inputs "opus")
|
||||
"/include/opus"))))
|
||||
(inputs `(("libogg" ,libogg)
|
||||
("opus" ,opus)
|
||||
("flac" ,flac)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libopusenc" ,libopusenc)
|
||||
("opusfile" ,opusfile)
|
||||
("flac" ,flac)))
|
||||
(synopsis
|
||||
"Command line utilities to encode, inspect, and decode .opus files")
|
||||
(description "Opus is a royalty-free, highly versatile audio codec.
|
||||
|
@ -391,19 +395,19 @@ (define opusfile
|
|||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://downloads.xiph.org/releases/opus/opusfile-" version
|
||||
"https://downloads.xiph.org/releases/opus/opusfile-" version
|
||||
".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1gq3aszzl5glgbajw5p1f5a1kdyf23w5vjdmwwrk246syin9pkkl"))))
|
||||
(build-system gnu-build-system)
|
||||
;; Required by opusfile.pc and opusurl.pc.
|
||||
(propagated-inputs
|
||||
`(("opus" ,opus)))
|
||||
`(("libogg" ,libogg)
|
||||
("openssl" ,openssl)
|
||||
("opus" ,opus)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libogg" ,libogg)
|
||||
("openssl" ,openssl)))
|
||||
(synopsis "Versatile audio codec")
|
||||
(description
|
||||
"The opusfile library provides seeking, decode, and playback of Opus
|
||||
|
@ -412,18 +416,40 @@ (define opusfile
|
|||
(license license:bsd-3)
|
||||
(home-page "https://www.opus-codec.org")))
|
||||
|
||||
(define-public libopusenc
|
||||
(package
|
||||
(name "libopusenc")
|
||||
(version "0.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://archive.mozilla.org/pub/opus/"
|
||||
"libopusenc-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(propagated-inputs
|
||||
`(("opus" ,opus)))
|
||||
(synopsis "Library for encoding Opus audio files and streams ")
|
||||
(description "The libopusenc libraries provide a high-level API for
|
||||
encoding Opus files and streams.")
|
||||
(home-page "https://www.opus-codec.org/")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public icecast
|
||||
(package
|
||||
(name "icecast")
|
||||
(version "2.4.3")
|
||||
(version "2.4.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://downloads.xiph.org/releases/icecast/icecast-"
|
||||
"https://downloads.xiph.org/releases/icecast/icecast-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14n5vm2xnyn8y7kl46lnnlgv6v5fjykhc57ffdsh0qaxfs6a8p68"))))
|
||||
"0i2d9rhav0x6js2qhjf5iy6j2a7f0d11ail0lfv40hb1kygrgda9"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -451,7 +477,7 @@ (define-public libshout
|
|||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://downloads.xiph.org/releases/libshout/"
|
||||
"https://downloads.xiph.org/releases/libshout/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
|
@ -464,7 +490,7 @@ (define-public libshout
|
|||
`(("libtheora" ,libtheora)
|
||||
("libvorbis" ,libvorbis)
|
||||
("speex" ,speex)))
|
||||
(home-page "http://www.icecast.org/")
|
||||
(home-page "https://icecast.org/")
|
||||
(synopsis "Audio streaming library for icecast encoders")
|
||||
(description
|
||||
"Libshout is a library for communicating with and sending data to an
|
||||
|
|
|
@ -825,14 +825,14 @@ (define-public perl-xml-feed
|
|||
(define-public perl-xml-xpath
|
||||
(package
|
||||
(name "perl-xml-xpath")
|
||||
(version "1.42")
|
||||
(version "1.44")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://cpan/authors/id/M/MA/MANWAR/"
|
||||
"XML-XPath-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"04mm91kxav598ax7nlg81dhnvanwvg6bkf30l0cgkmga5iyccsly"))))
|
||||
"03yxj7w5a43ibbpiqsvb3lswj2b71dydsx4rs2fw0p8n0l3i3j8w"))))
|
||||
(build-system perl-build-system)
|
||||
(native-inputs
|
||||
`(("perl-path-tiny" ,perl-path-tiny)))
|
||||
|
@ -936,16 +936,16 @@ (define-public xmlto
|
|||
(define-public xmlsec
|
||||
(package
|
||||
(name "xmlsec")
|
||||
(version "1.2.26")
|
||||
(version "1.2.27")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.aleksey.com/xmlsec/download/"
|
||||
name "1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.aleksey.com/xmlsec/download/"
|
||||
"xmlsec1-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1dlf263mvxj9n4lnhhjawc2hv45agrwjf8kxk7k8h9g9v2x5dmwp"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs ; according to xmlsec1.pc
|
||||
(propagated-inputs ; according to xmlsec1.pc
|
||||
`(("libxml2" ,libxml2)
|
||||
("libxslt" ,libxslt)))
|
||||
(inputs
|
||||
|
@ -968,6 +968,10 @@ (define-public xmlsec-nss
|
|||
(package
|
||||
(inherit xmlsec)
|
||||
(name "xmlsec-nss")
|
||||
(native-inputs
|
||||
;; For tests.
|
||||
`(("nss:bin" ,nss "bin") ; for certutil
|
||||
,@(package-native-inputs xmlsec)))
|
||||
(inputs
|
||||
`(("nss" ,nss)
|
||||
("libltdl" ,libltdl)))
|
||||
|
@ -976,7 +980,7 @@ (define-public xmlsec-nss
|
|||
(define-public minixml
|
||||
(package
|
||||
(name "minixml")
|
||||
(version "2.11")
|
||||
(version "2.12")
|
||||
(source (origin
|
||||
(method url-fetch/tarbomb)
|
||||
(uri (string-append "https://github.com/michaelrsweet/mxml/"
|
||||
|
@ -984,10 +988,13 @@ (define-public minixml
|
|||
"/mxml-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13xsw8vvkxd10vca42ccdyl9rs64lcvhbfz57aknpl3xcfn8mxma"))))
|
||||
"1z8nqxa4pqdic8wpixkkgg1m2pak9wjikjjxnk3j5i0d29dbgmmg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
`(#:configure-flags
|
||||
(list (string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out") "/lib"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-permissions
|
||||
;; FIXME: url-fetch/tarbomb resets all permissions to 555/444.
|
||||
|
|
|
@ -2905,8 +2905,8 @@ (define-public xf86-video-i128
|
|||
|
||||
|
||||
(define-public xf86-video-intel
|
||||
(let ((commit "d7dfab62a9853b44bbcd67dac08391d8e5114c97")
|
||||
(revision "10"))
|
||||
(let ((commit "0932a6b37ba6d5c9e916a1cb6ab89c3205b81a0c")
|
||||
(revision "11"))
|
||||
(package
|
||||
(name "xf86-video-intel")
|
||||
(version (git-version "2.99.917" revision commit))
|
||||
|
@ -2919,7 +2919,7 @@ (define-public xf86-video-intel
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1vcfal4xr9q6016p28lnlyg709da6d305dysyyrj3fjp9fj48sva"))
|
||||
"10pqxp7n53ddiypd3l1i9gkbgzdpi6rz9vksbd16biq7pbijc2xf"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("mesa" ,mesa)
|
||||
|
@ -5065,7 +5065,7 @@ (define-public libxcb
|
|||
(define-public xorg-server
|
||||
(package
|
||||
(name "xorg-server")
|
||||
(version "1.20.2")
|
||||
(version "1.20.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -5074,7 +5074,7 @@ (define-public xorg-server
|
|||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qnf7jdygdgbgjfm5mfr691dl8d56mpssa82mvhm8bzj92yggm8f"))
|
||||
"1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v"))
|
||||
(patches
|
||||
(list
|
||||
;; See:
|
||||
|
@ -5752,7 +5752,7 @@ (define-public xterm
|
|||
(define-public perl-x11-xcb
|
||||
(package
|
||||
(name "perl-x11-xcb")
|
||||
(version "0.17")
|
||||
(version "0.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -5760,7 +5760,7 @@ (define-public perl-x11-xcb
|
|||
"X11-XCB-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12qyf98s5hbybmh0mblpz50c00i68srq73w5rw31m2dhclj8n96q"))))
|
||||
"1cjpghw7cnackw20lbd7yzm222kz5bnrwz52f8ay24d1f4pwrnxf"))))
|
||||
(build-system perl-build-system)
|
||||
(arguments
|
||||
'(;; Disable parallel build to prevent a race condition.
|
||||
|
@ -5910,7 +5910,7 @@ (define-public xcompmgr
|
|||
(define-public xpra
|
||||
(package
|
||||
(name "xpra")
|
||||
(version "2.4")
|
||||
(version "2.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -5918,7 +5918,7 @@ (define-public xpra
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0blzx231sr1ri1zwzpwzf611sq9104bv3ccvnap9pbvfrc05sfwx"))))
|
||||
"1bhk6vydsrhlngvrv5w55arqf69cr3yw84xscnnl7km2g1iswkrs"))))
|
||||
(build-system python-build-system)
|
||||
(inputs `(("ffmpeg" ,ffmpeg)
|
||||
("flac" ,flac)
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue