From 9c7ee0752ba305bc18b8d38a5ba0e8daf81c9d9a Mon Sep 17 00:00:00 2001 From: Ethan Reece Date: Mon, 15 Jul 2024 08:01:09 -0500 Subject: [PATCH] Add channel lock mechanism for reproducability --- .guix/modules/resume-package.scm | 2 +- Justfile | 8 ++++++-- channels.scm | 2 -- channels.scm.lock | 11 +++++++++++ 4 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 channels.scm.lock diff --git a/.guix/modules/resume-package.scm b/.guix/modules/resume-package.scm index e07fb01..40a5343 100644 --- a/.guix/modules/resume-package.scm +++ b/.guix/modules/resume-package.scm @@ -26,4 +26,4 @@ (home-page "https://ethanreece.com") (license license:expat))) -resume +rust-typst-cli-0.11 diff --git a/Justfile b/Justfile index 399b091..3d9dcb9 100644 --- a/Justfile +++ b/Justfile @@ -1,5 +1,9 @@ default: - guix time-machine --channels=./channels.scm -- shell --container --manifest=./guix.scm -- typst compile main.typ + guix time-machine --channels=./channels.scm.lock -- shell --container --file=./guix.scm -- typst compile main.typ dev: - guix time-machine --channels=./channels.scm -- shell --manifest=./guix.scm + guix time-machine --channels=./channels.scm.lock -- shell --file=./guix.scm + +update: + guix time-machine --channels=./channels.scm -- shell --container guix bash -- bash -c "guix describe --format=channels > ./channels.scm.lock" +# guix shell --container --network --nesting guix bash -- bash -c "guix pull --channels=./channels.scm && guix describe --format=channels > ./channels.scm.lock" diff --git a/channels.scm b/channels.scm index 80c5766..9e31cd0 100644 --- a/channels.scm +++ b/channels.scm @@ -2,8 +2,6 @@ (name 'guix) (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") - (commit - "ddbbb78786e104a9a9e93cffe9f69b6c0f3bd4ed") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" diff --git a/channels.scm.lock b/channels.scm.lock new file mode 100644 index 0000000..ea1bd99 --- /dev/null +++ b/channels.scm.lock @@ -0,0 +1,11 @@ +(list (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (branch "master") + (commit + "1a34b9b725e731a6d5f602d104f09a1c68afa6a4") + (introduction + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" + (openpgp-fingerprint + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))