diff options
author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /etc | |
parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
download | guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'etc')
-rw-r--r-- | etc/guix-daemon.cil.in | 7 | ||||
-rw-r--r-- | etc/news.scm | 35 |
2 files changed, 40 insertions, 2 deletions
diff --git a/etc/guix-daemon.cil.in b/etc/guix-daemon.cil.in index 4f52157354..c9f4e3186d 100644 --- a/etc/guix-daemon.cil.in +++ b/etc/guix-daemon.cil.in @@ -301,7 +301,7 @@ open read write))) (allow guix_daemon_t guix_daemon_conf_t - (lnk_file (create getattr rename unlink))) + (lnk_file (create getattr rename unlink read))) (allow guix_daemon_t net_conf_t (file (getattr open read))) (allow guix_daemon_t net_conf_t @@ -328,6 +328,9 @@ (allow guix_daemon_t cache_home_t (dir (search))) + (allow guix_daemon_t + cache_home_t + (lnk_file (getattr read))) ;; self upgrades (allow guix_daemon_t @@ -340,7 +343,7 @@ ;; Socket operations (allow guix_daemon_t guix_daemon_socket_t - (sock_file (unlink))) + (sock_file (unlink write))) (allow guix_daemon_t init_t (fd (use))) diff --git a/etc/news.scm b/etc/news.scm index 65d83061df..25bc0d40a2 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -14,6 +14,7 @@ ;; Copyright © 2021 Zhu Zihao <all_but_last@163.com> ;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> ;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> +;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -22,6 +23,40 @@ (channel-news (version 0) + (entry (commit "bdc298ecee15283451d3aa20a849dd7bb22c8538") + (title + (en "New @command{guix import egg} command") + (de "Neuer Befehl @command{guix import egg}") + (zh "新的 @command{guix import egg} 命令")) + (body + (en "The new @command{guix import egg} command allows packagers to +generate a package definition or a template thereof given the name of a +CHICKEN egg package, like so: + +@example +guix import egg sourcehut +@end example + +Run @command{info \"(guix) Invoking guix import\"} for more info.") + (de "Mit dem neuen Befehl @command{guix import egg} können +Paketautoren eine Paketdefinition oder eine Vorlage dafür anhand des Namens +eines „Egg“-Pakets für CHICKEN erzeugen, etwa so: + +@example +guix import egg sourcehut +@end example + +Führen Sie @command{info \"(guix.de) Aufruf von guix import\"} aus, um mehr +Informationen zu bekommen.") + (zh "新的 @command{guix import egg} 命令能让贡献者从一个CHICKEN egg生 +成一个包装或包装样板。 +x +@example +guix import egg sourcehut +@end example + +想了解更多可以运行 @command{info \"(guix) Invoking guix import\"}。"))) + (entry (commit "2161820ebbbab62a5ce76c9101ebaec54dc61586") (title (en "Risk of local privilege escalation during user account creation") |