4 files changed, 32 insertions(+), 72 deletions(-)

D .builds/debian-stable.yml
A .builds/guix.yml
D .builds/ubuntu-lts.yml
M guix.scm

@@ 1,37 0,0 @@
-image: debian/buster
-sources:
-- https://git.singpolyma.net/cheogram
-- https://git.singpolyma.net/jingle-xmpp
-- https://github.com/int-e/hstatsd#6415e484a2680eef41a8986dc3197b6dae377ba4
-packages:
-- ghc
-- cabal-install
-- c2hs
-- pkg-config
-- libgnutls28-dev
-- libgsasl7-dev
-- libpcre3-dev
-- libssl-dev
-- libtokyocabinet-dev
-- libxml2-dev
-- zlib1g-dev
-- hlint
-environment:
-  LANG: C.UTF-8
-artifacts:
-- cheogram/dist/build/cheogram/cheogram
-tasks:
-- cabal_update: |
-    cabal update
-- dependencies: |
-    cd jingle-xmpp
-    cabal install --constraint="random <= 1.1" --constraint="attoparsec < 0.14" --constraint="memory < 0.16" --constraint="transformers-compat < 0.7" --constraint="aeson < 1.6" --constraint="hashable < 1.4"
-    cd ..
-    cd hstatsd
-    cabal install
-    cd ..
-    cd cheogram
-    cabal install --enable-tests --only-dependencies
-- test: |
-    cd cheogram
-    make

@@ 0,0 1,30 @@
+image: guix
+packages:
+- plzip
+sources:
+- https://git.singpolyma.net/cheogram
+secrets:
+- 9ded4157-4cf9-42ae-b7d0-55eb6e52ea37
+- fd52c9ce-04e8-4684-af6c-1ab78d2e124a
+artifacts:
+- cheogram.scm
+- cheogram.nar.lz
+tasks:
+- bake: |
+    printf "(define-module (cheogram))\n" >> cheogram.scm
+    sed '/^;;;;$/q' cheogram/guix.scm >> cheogram.scm
+    printf "(define-public cheogram\n\t" >> cheogram.scm
+    cd cheogram
+    printf '(load "%s/guix.scm")\n(write cheogram-baked)\n' "$(pwd)" | guix repl /dev/stdin >> ../cheogram.scm
+    cd -
+    printf ")\n" >> cheogram.scm
+    rm -rf cheogram
+- build: |
+    guix build --no-grafts -L. cheogram
+- archive: |
+    sudo mv signing-key.pub /etc/guix/
+    sudo mv signing-key.sec /etc/guix/
+    sudo chown root:root /etc/guix/signing-key.sec
+    sudo chmod 0400 /etc/guix/signing-key.sec
+    guix archive --export -r --no-grafts -L. cheogram > cheogram.nar
+    plzip cheogram.nar

@@ 1,33 0,0 @@
-image: ubuntu/lts
-sources:
-- https://git.singpolyma.net/cheogram
-- https://git.singpolyma.net/jingle-xmpp
-packages:
-- ghc
-- cabal-install
-- c2hs
-- pkg-config
-- libgnutls28-dev
-- libgsasl7-dev
-- libpcre3-dev
-- libssl-dev
-- libtokyocabinet-dev
-- libxml2-dev
-- zlib1g-dev
-- hlint
-environment:
-  LANG: C.UTF-8
-artifacts:
-- cheogram/dist/build/cheogram/cheogram
-tasks:
-- cabal_update: |
-    cabal update
-- dependencies: |
-    cd jingle-xmpp
-    cabal install --constraint="random <= 1.1" --constraint="attoparsec < 0.14" --constraint="memory < 0.16" --constraint="transformers-compat < 0.7" --constraint="hashable < 1.4"
-    cd ..
-    cd cheogram
-    cabal install --enable-tests --only-dependencies
-- test: |
-    cd cheogram
-    make

@@ 648,7 648,7 @@
        (sha256
         (base32
          ,(read-line (open-pipe* OPEN_READ "guix" "hash" "-rx" %source-dir))))))
-    (build-system haskell-build-system)
+    (build-system 'haskell-build-system)
     (inputs
       '(list
         dhall


@@ 684,7 684,7 @@
     (home-page "https://git.singpolyma.net/cheogram")
     (synopsis "")
     (description "")
-    (license license:agpl3)))
+    (license 'license:agpl3)))
 
 ; Baked version of jmp-pay-template with leaves eval'd
 (define-public cheogram-baked