diff options
Diffstat (limited to 'etc')
-rw-r--r-- | etc/completion/bash/guix | 8 | ||||
-rwxr-xr-x | etc/guix-install.sh | 12 | ||||
-rw-r--r-- | etc/historical-authorizations | 179 | ||||
-rw-r--r-- | etc/news.scm | 47 | ||||
-rw-r--r-- | etc/substitutes/berlin.guix.gnu.org.pub (renamed from etc/substitutes/berlin.guixsd.org.pub) | 0 | ||||
l--------- | etc/substitutes/ci.guix.gnu.org.pub | 2 | ||||
l--------- | etc/substitutes/ci.guix.info.pub | 2 |
7 files changed, 245 insertions, 5 deletions
diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index df35919eb2..5aebd074e9 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -222,6 +222,14 @@ _guix_complete () else _guix_complete_available_package "$word_at_point" fi + elif _guix_is_command "environment" + then + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_available_package "$word_at_point" + fi elif _guix_is_command "download" then _guix_complete_file diff --git a/etc/guix-install.sh b/etc/guix-install.sh index bf15aede21..72dc3839e8 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -111,7 +111,7 @@ chk_gpg_keyring() # systems where gpg has never been used, causing errors and confusion. gpg --dry-run --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || ( _err "${ERR}Missing OpenPGP public key. Fetch it with this command:" - echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -" + echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | sudo -i gpg --import -" exit 1 ) } @@ -350,6 +350,8 @@ sys_enable_guix_daemon() cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \ /etc/systemd/system/; chmod 664 /etc/systemd/system/gnu-store.mount; + systemctl daemon-reload && + systemctl enable gnu-store.mount; fi cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \ @@ -367,8 +369,8 @@ sys_enable_guix_daemon() fi; systemctl daemon-reload && - systemctl start gnu-store.mount guix-daemon && - systemctl enable gnu-store.mount guix-daemon; } && + systemctl enable guix-daemon && + systemctl start guix-daemon; } && _msg "${PAS}enabled Guix daemon via systemd" ;; sysv-init) @@ -416,6 +418,7 @@ sys_authorize_build_farms() sys_create_init_profile() { # Create /etc/profile.d/guix.sh for better desktop integration + # This will not take effect until the next shell or desktop session! [ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case cat <<"EOF" > /etc/profile.d/guix.sh # _GUIX_PROFILE: `guix pull` profile @@ -505,6 +508,9 @@ main() _msg "${PAS}Guix has successfully been installed!" _msg "${INF}Run 'info guix' to read the manual." + + # Required to source /etc/profile in desktop environments. + _msg "${INF}Please log out and back in to complete the installation." } main "$@" diff --git a/etc/historical-authorizations b/etc/historical-authorizations new file mode 100644 index 0000000000..429054c9a5 --- /dev/null +++ b/etc/historical-authorizations @@ -0,0 +1,179 @@ +;; List of "historical" committers---people once authorized committers before +;; the '.guix-authorizations' file was created. +;; +;; This file is provided for historical and auditing purposes. It is known +;; good starting at least at 'v1.0.0'. +;; +;; The format is the same as for '.guix-authorizations'. User names are those +;; found on <https://savannah.gnu.org/project/memberlist.php?group=guix> along +;; with the fingerprint of the signing (sub)key. + +(authorizations + (version 0) + + (("AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3" + (name "andreas")) + ("2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5" + (name "ajgrf")) + ("306F CB8F 2C01 C25D 29D3 0556 61EF 502E F602 52F2" + (name "alexvong1995")) + ("4FB9 9F49 2B12 A365 7997 E664 8246 0C08 2A0E E98F" + (name "alezost")) + ("50F3 3E2E 5B0C 3D90 0424 ABE8 9BDC F497 A4BB CC7F" + (name "ambrevar")) + ("27D5 86A4 F890 0854 329F F09F 1260 E464 82E6 3562" + (name "apteryx")) + ("7F73 0343 F2F0 9F3C 77BF 79D3 2E25 EE8B 6180 2BB3" + (name "arunisaac")) + (;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" + "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00" + (name "atheia")) + (;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" + "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2" + (name "bandali")) + (;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" + "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566" + (name "bavier")) + ("3774 8024 880F D3FF DCA2 C9AB 5893 6E0E 2F1B 5A4C" + (name "beffa")) + ("BCF8 F737 2CED 080A 67EB 592D 2A6A D9F4 AAC2 0DF6" + (name "benwoodcroft")) + ("45CC 63B8 5258 C9D5 5F34 B239 D37D 0EA7 CECC 3912" + (name "biscuolo")) + ("7988 3B9F 7D6A 4DBF 3719 0367 2506 A96C CF63 0B21" + (name "boskovits")) + ("DFC0 C7F7 9EE6 0CA7 AE55 5E19 6722 43C4 A03F 0EEE" + (name "brettgilio")) + (;; primary: "0401 7A2A 6D9A 0CCD C81D 8EC2 96AB 007F 1A7E D999" + "09CD D25B 5244 A376 78F6 EEA8 0CC5 2153 1979 91A5" + (name "carl")) + ("3E89 EEE7 458E 720D 9754 E0B2 5E28 A33B 0B84 F577" + (name "cbaines")) + ("3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5" + (name "civodul")) + ("510A 8628 E2A7 7678 8F8C 709C 4BC0 2592 5FF8 F4D3" + (name "cwebber")) + (;; primary: "295A F991 6F46 F8A1 34B0 29DA 8086 3842 F0FE D83B" + "76CE C6B1 7274 B465 C02D B3D9 E71A 3554 2C30 BAA5" + (name "dannym")) + ("B3C0 DB4D AD73 BA5D 285E 19AE 5143 0234 CEFD 87C3" + (name "davexunit")) + ( ;FIXME: to be confirmed! + "8CCB A7F5 52B9 CBEA E1FB 2915 8328 C747 0FF1 D807" + (name "davexunit (2nd)")) + ("53C4 1E6E 41AA FE55 335A CA5E 446A 2ED4 D940 BF14" + (name "daviwil")) + ("6909 6DFD D702 8BED ACC5 884B C5E0 51C7 9C0B ECDB" + (name "dvc")) + ("5F43 B681 0437 2F4B A898 A64B 33B9 E9FD E28D 2C23" + (name "dvc (old)")) + ("A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351" + (name "efraim")) + ("9157 41FE B22F A4E3 3B6E 8F8D F4C1 D391 7EAC EE93" + (name "efraim (old)")) + (;; primary: "2453 02B1 BAB1 F867 FDCA 96BC 8F3F 861F 82EB 7A9A" + "CBC5 9C66 EC27 B971 7940 6B3E 6BE8 208A DF21 FE3F" + (name "glv")) + ("2219 43F4 9E9F 276F 9499 3382 BF28 6CB6 593E 5FFD" + (name "hoebjo")) + ("B943 509D 633E 80DD 27FC 4EED 634A 8DFF D3F6 31DF" + (name "htgoebel")) + ("7440 26BA 7CA3 C668 E940 1D53 0B43 1E98 3705 6942" + (name "ipetkov")) + (;; primary: "66A5 6D9C 9A98 BE7F 719A B401 2652 5665 AE72 7D37" + "0325 78A6 8298 94E7 2AA2 66F5 D415 BF25 3B51 5976" + (name "iyzsong")) + + ;; https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00229.html + ("DB34 CB51 D25C 9408 156F CDD6 A12F 8797 8D70 1B99" + (name "janneke (old)")) + ("1A85 8392 E331 EAFD B8C2 7FFB F3C1 A0D9 C1D6 5273" + (name "janneke")) + + (;; primary: "1BA4 08C5 8BF2 0EA7 3179 635A 865D C0A3 DED9 B5D0" + "E31D 9DDE EBA5 4A14 8A20 4550 DA45 97F9 47B4 1025" + (name "jlicht")) + ("8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3" + (name "jmd")) + ("83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D" + (name "kkebreau")) + ("45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9" + (name "leungbk")) + (;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0" + "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08" + (name "lfam")) + ("2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC" + (name "lsl88")) + ("CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D" + (name "marusich")) + ("BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" + (name "mbakke")) + ("D919 0965 CE03 199E AF28 B3BE 7CEF 2984 7562 C516" + (name "mhw")) + ("4008 6A7E 0252 9B60 31FB 8607 8354 7635 3176 9CA6" + (name "mothacehe")) + ("F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37" + (name "mthl")) + (;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B" + "F5DA 2032 4B87 3D0B 7A38 7672 0DB0 FF88 4F55 6D79" + (name "nckx")) + (;; primary: "F5BC 5534 C36F 0087 B39D 36EF 1C9D C4FE B9DB 7C4B" + "7E8F AED0 0944 78EF 72E6 4D16 D889 B0F0 18C5 493C" + (name "nckx (revoked; not compromised)")) + ("E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564" + (name "niedzejkob")) + ("ED0E F1C8 E126 BA83 1B48 5FE9 DA00 B4F0 48E9 2F2D" + (name "ngz")) + ("CEF4 CB91 4856 BA38 0A20 A7E2 3008 88CB 39C6 3817" + (name "pelzflorian")) + (;; primary: "B68B DF22 73F9 DA0E 63C1 8A32 515B F416 9242 D600" + "C699 ED09 E51B CE89 FD1D A078 AAC7 E891 896B 568A" + (name "pgarlick")) + ("3A86 380E 58A8 B942 8D39 60E1 327C 1EF3 8DF5 4C32" + (name "phant0mas")) + ("74D6 A930 F44B 9B84 9EA5 5606 C166 AA49 5F7F 189C" + (name "reepca")) + ("BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC" + (name "rekado")) + ("0154 E1B9 1CC9 D9EF 7764 8DE7 F3A7 27DB 44FC CA36" + (name "rhelling")) + ("17CB 2812 EB63 3DFF 2C7F 0452 C3EC 1DCA 8430 72E1" + (name "roelj (old)")) + (;; From commit cc51c03ff867d4633505354819c6d88af88bf919 (March 2020). + ;; See <https://lists.gnu.org/archive/html/guix-devel/2020-03/msg00070.html>. + "F556 FD94 FB8F 8B87 79E3 6832 CBD0 CD51 38C1 9AFC" + (name "roelj")) + ("B5FA E628 5B41 3728 B2A0 FAED 4311 1F45 2008 6A0C" + (name "roptat (old)")) + (;; From commit 2cbede5935eb6a40173bbdf30a9ad22bf7574c22 (Jan. 2020). See + ;; <https://lists.gnu.org/archive/html/guix-devel/2020-01/msg00499.html>. + "1EFB 0909 1F17 D28C CBF9 B13A 53D4 57B2 D636 EE82" + (name "roptat")) + (;; primary: "D6B0 C593 DA8C 5EDC A44C 7A58 C336 91F7 1188 B004" + "A02C 2D82 0EF4 B25B A6B5 1D90 2AC6 A5EC 1C35 7C59" + (name "samplet")) + ("77DD AD2D 97F5 31BB C0F3 C7FD DFB5 EB09 AA62 5423" + (name "sleep_walker")) + ("F494 72F4 7A59 00D5 C235 F212 89F9 6D48 08F3 59C7" + (name "snape")) + ("4E26 CCE9 578E 0828 9855 BDD4 1C79 95D2 D5A3 8336" + (name "steap")) + ("9ADE 9ECF 2B19 C180 9C99 5CEA A1F4 CFCC 5283 6BAC" + (name "taylanub")) + + ;; https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00826.html + (;; primary: "1DD1 681F E285 E07F 11DC 0C59 2E15 A6BC D77D 54FD" + "3D2C DA58 819C 08C2 A649 D43D 5C3B 064C 724A 5726" + (name "thomasd")) + ("A5C5 92EA 606E 7106 A6A3 BC08 98B2 1575 91E1 2B08" + (name "thomasd (old)")) + + ("D712 1D73 A40A 7264 9E43 ED7D F284 6B1A 0D32 C442" + (name "toothbrush")) + ("6580 7361 3BFC C5C7 E2E4 5D45 DC51 8FC8 7F97 16AA" + (name "vagrantc")) + (;; primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" + "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C" + (name "wigust")) + ("FF47 8FB2 64DE 32EC 2967 25A3 DDC0 F535 8812 F8F2" + (name "wingo")))) diff --git a/etc/news.scm b/etc/news.scm index 62ec68bab2..1ef238ca2d 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -13,6 +13,53 @@ (channel-news (version 0) + (entry (commit "a98712785e0b042a290420fd74e5a4a5da4fc68f") + (title (en "New @command{guix git authenticate} command") + (de "Neuer Befehl @command{guix git authenticate}") + (fr "Nouvelle commande @command{guix git authenticate}")) + (body + (en "The new @command{guix git authenticate} command authenticates a +Git repository by verifying commit signatures and ensuring they all come from +authorized parties, exactly like @command{guix pull} now does. + +This command is primarily useful to developers of channels. It allows them to +ensure, before pushing, that the channel only contains commits signed with +authorized keys. But this command is also useful anytime you use Git and want +to allow people to authenticate code fetched from your repository. + +Run @command{info \"(guix) Invoking guix git authenticate\"} for more info, +and see @uref{https://guix.gnu.org/blog/2020/securing-updates/} for details on +these mechanisms.") + (de "Mit dem neuen Befehl @command{guix git authenticate} können Sie +ein Git-Repository authentifizieren. Dazu werden alle Commit-Signaturen +verifiziert und geprüft, dass jede von einer autorisierten Quelle kommt, genau +wie es @command{guix pull} nun tut. + +Dieser Befehl hilft in erster Linie den Entwicklern von Kanälen. Mit ihm kann +vor einem Push sichergestellt werden, dass der Kanal nur Commits enthält, die +mit autorisierten Schlüsseln signiert worden sind. Aber der Befehl kann auch +helfen, wann immer Sie Git verwenden und ermöglichen wollen, dass Nutzer von +Ihrem Repository geladenen Code authentifizieren können. + +Führen Sie @command{info \"(guix) Invoking guix git authenticate\"} aus, um +mehr Informationen zu erhalten, und lesen Sie +@uref{https://guix.gnu.org/blog/2020/securing-updates/} für die Details dieser +Mechanismen.") + (fr "La nouvelle commande @command{guix git authenticate} authentifie +un dépôt Git en vérifiant les signatures sur les changements (@i{commits}) et +en s'assurant qu'elles sont autorisées, exactement comme @command{guix pull} +le fait désormais. + +Cette commande est avant tout utile aux personnes développant un canal. Elle +leur permet de s'assurer, avant de pousser des changements, que le canal ne +contient que des changements signés par des clefs autorisées. Mais cette +commande peut aussi s'avérer utile dès que tu veux utiliser Git et permettre +aux autres d'authentifier le code récupéré depuis ton dépôt. + +Lance @command{info \"(guix.fr) Invoking guix git authenticate\"} pour plus +d'informations. Voir @uref{https://guix.gnu.org/blog/2020/securing-updates/} +pour en savoir plus sur ces mécanismes."))) + (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") (title (en "@command{guix pull} authenticates channels") (de "@command{guix pull} authentifiziert Kanäle") diff --git a/etc/substitutes/berlin.guixsd.org.pub b/etc/substitutes/berlin.guix.gnu.org.pub index f156a37b08..f156a37b08 100644 --- a/etc/substitutes/berlin.guixsd.org.pub +++ b/etc/substitutes/berlin.guix.gnu.org.pub diff --git a/etc/substitutes/ci.guix.gnu.org.pub b/etc/substitutes/ci.guix.gnu.org.pub index b1d1e4d763..0574f6dfab 120000 --- a/etc/substitutes/ci.guix.gnu.org.pub +++ b/etc/substitutes/ci.guix.gnu.org.pub @@ -1 +1 @@ -berlin.guixsd.org.pub \ No newline at end of file +berlin.guix.gnu.org.pub \ No newline at end of file diff --git a/etc/substitutes/ci.guix.info.pub b/etc/substitutes/ci.guix.info.pub index b1d1e4d763..0574f6dfab 120000 --- a/etc/substitutes/ci.guix.info.pub +++ b/etc/substitutes/ci.guix.info.pub @@ -1 +1 @@ -berlin.guixsd.org.pub \ No newline at end of file +berlin.guix.gnu.org.pub \ No newline at end of file |