Browse Source

Bump guixsystem to 1.3.0

pull/2/head
jgart 6 months ago
committed by j3s
parent
commit
e3d0193eba
  1. 10
      guixsystem/1.2.0/channels.scm
  2. 0
      guixsystem/1.3.0/capsul-init
  3. 0
      guixsystem/1.3.0/config-1.scm
  4. 36
      guixsystem/1.3.0/config-2.scm
  5. 17
      guixsystem/1.3.0/packer.json
  6. 0
      guixsystem/1.3.0/post-install.sh

10
guixsystem/1.2.0/channels.scm

@ -1,10 +0,0 @@
(list (channel
(name 'guix)
(url "git://git.savannah.gnu.org/guix.git")
(branch "version-1.2.0")
(introduction
;; from guix/channels.scm
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))

0
guixsystem/1.2.0/capsul-init → guixsystem/1.3.0/capsul-init

0
guixsystem/1.2.0/config-1.scm → guixsystem/1.3.0/config-1.scm

36
guixsystem/1.2.0/config-2.scm → guixsystem/1.3.0/config-2.scm

@ -1,7 +1,10 @@
;; This is an operating system configuration template
;; for a "bare bones" setup, with no X11 display server.
(use-modules (gnu))
(use-modules (gnu)
((gnu packages curl) #:select (curl))
((gnu packages base) #:select (glibc-utf8-locales)))
(use-service-modules networking ssh mcron)
(use-package-modules ssh)
@ -11,6 +14,15 @@
#~(job "* * * * *"
"/root/capsul-init || true"))
(define-macro (define-tools group-name . group-package-names)
;; macro for adding and grouping packages without boilerplate
`(define-public ,group-name
(map (compose list specification->package+output)
',group-package-names)))
(define-tools capsul-packages "curl" "glibc-utf8-locales")
(operating-system
(host-name "guixsystem")
(timezone "Etc/UTC")
@ -38,12 +50,16 @@
root ALL=(ALL) ALL
cyberian ALL=(ALL) NOPASSWD: ALL\n"))
(services (append (list
(service dhcp-client-service-type)
(service mcron-service-type ;; delete these lines
(mcron-configuration ;; if you would
(jobs (list %capsul-init-job)))) ;; like ^(;,;)^
(service openssh-service-type
(openssh-configuration
(openssh openssh-sans-x))))
%base-services)))
(packages
(append capsul-packages %base-packages))
(services
(cons*
(service dhcp-client-service-type)
(service mcron-service-type ; delete these lines
(mcron-configuration ; if you would
(jobs (list %capsul-init-job)))) ; like ^(;,;)^
(service openssh-service-type
(openssh-configuration
(openssh openssh-sans-x)))
%base-services)))

17
guixsystem/1.2.0/packer.json → guixsystem/1.3.0/packer.json

@ -1,8 +1,8 @@
{
"variables": {
"iso_url": "https://ftp.gnu.org/gnu/guix/guix-system-install-1.2.0.x86_64-linux.iso.xz",
"iso_checksum": "a6ecc45084e6f3f93c1ed5fc5c6d2b8b3338f3c1875ed6d89e996df62aa40455",
"qcow2_image": "guixsystem-1.2.0-x86_64"
"iso_url": "https://ftp.gnu.org/gnu/guix/guix-system-install-1.3.0.x86_64-linux.iso",
"iso_checksum": "f2b30458fa1736eeee3b82f34aab1d72f3964bef0477329bb75281d2b7bb6d4b",
"qcow2_image": "guixsystem-1.3.0-x86_64"
},
"provisioners": [
{
@ -25,11 +25,6 @@
"inline": ["reboot"],
"expect_disconnect": true
},
{
"type": "file",
"source": "channels.scm",
"destination": "/tmp/channels.scm"
},
{
"type": "file",
"source": "capsul-init",
@ -44,7 +39,6 @@
"type": "shell",
"inline": [
"mkdir -p ~/.config/guix",
"mv /tmp/channels.scm /etc/guix/channels.scm",
"guix pull",
"guix system reconfigure /etc/config.scm",
"mv /tmp/capsul-init /root/capsul-init",
@ -73,16 +67,15 @@
"disk_compression": true,
"disk_cache": "unsafe",
"http_directory": ".",
"boot_wait": "120s",
"boot_wait": "70s",
"boot_command": [
"<enter><end><up><up><enter><down><enter><enter>",
"passwd root<enter>password<enter>password<enter>",
"guix package -i openssh<enter>",
"herd start ssh-daemon<enter>"
],
"ssh_username": "root",
"ssh_password": "password",
"ssh_wait_timeout": "10m",
"ssh_wait_timeout": "20m",
"shutdown_command": "shutdown"
}
]

0
guixsystem/1.2.0/post-install.sh → guixsystem/1.3.0/post-install.sh

Loading…
Cancel
Save