4 Commits 926be6008f ... 5ec2d36fe4

Author SHA1 Message Date
  Oleg Pykhalov 5ec2d36fe4 apps: cluster1: workstation: guix: Update to 1cb58263. 1 month ago
  Oleg Pykhalov 1cb5826315 Makefile: guix-image-workstation: Use guix time-machine. 1 month ago
  Oleg Pykhalov 2de75e43f5 channels-current-local-file-pc0: Update. 1 month ago
  Oleg Pykhalov 4627d0e390 Makefile: guix-image-workstation: Update Guix. 1 month ago

+ 1 - 1
Makefile

@@ -322,7 +322,7 @@ container_registry=harbor.home.wugi.info
 guix-image-workstation:
 	set -o nounset -o errexit -o pipefail -o xtrace
 	commit_8=$$(git rev-parse HEAD | cut -c -8)
-	container=$$(~/src/git.savannah.gnu.org/git/guix-bb8a6f0a/pre-inst-env guix system image --substitute-urls='https://bordeaux.guix.gnu.org https://substitutes.nonguix.org http://ci.guix.trop.in' --load-path=/home/oleg/src/cgit.duckdns.org/guix/guix-wigust/guix --load-path=/home/oleg/src/gitlab.com/nonguix/nonguix --load-path=/home/oleg/.local/share/chezmoi/dotfiles/guixsd/modules --max-layers=100 -t docker --network ~/.local/share/chezmoi/dotfiles/guixsd/guix-image-workstation.scm)
+	container=$$(guix time-machine --channels=dotfiles/channels-current-local-file-pc0.scm -- system image --substitute-urls='https://bordeaux.guix.gnu.org https://substitutes.nonguix.org http://ci.guix.trop.in' --max-layers=100 -t docker --network ~/.local/share/chezmoi/dotfiles/guixsd/guix-image-workstation.scm)
 	skopeo copy docker-archive\:$$container docker://$(container_registry)/library/$@:$$commit_8
 	echo $(container_registry)/library/$@:$$commit_8
 

+ 1 - 1
apps/cluster1/workstation/kustomization.yaml

@@ -7,7 +7,7 @@ patchesStrategicMerge:
 - daemonset.yaml
 images:
 - name: harbor.home.wugi.info/library/guix-image-workstation
-  newTag: "16c73168"
+  newTag: "1cb58263"
 - name: harbor.home.wugi.info/library/nixos-systemd
   newTag: 096ce36c
 - name: harbor.home.wugi.info/library/archlinux-systemd

+ 2 - 2
dotfiles/channels-current-local-file-pc0.scm

@@ -3,7 +3,7 @@
         (url "https://cgit.wugi.info/git/guix/guix")
         (branch "master")
         (commit
-          "222fbcb37e13943b687e6b2e8cb0031077932a8a")
+          "ff4998fc38e1ef62f6392dddd3b5bae504ffe61a")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -20,7 +20,7 @@
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
         (commit
-          "ad966c3844385e8f7b60b0dc915f92a1eba47e09")
+          "720df79727769e4230706e891841ec6f0b8b3890")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"