Merge pull request 'Package meowy-webring with guix' (#10) from guix into main

Reviewed-on: #10

.dir-locals.el

@@ -0,0 +1,95 @@
+;;; SPDX-License-Identifier: GPL-3.0-or-later
+;; Per-directory local variables for GNU Emacs 23 and later.
+
+((nil
+  . ((fill-column . 78)
+     (tab-width   .  8)
+     (sentence-end-double-space . t)))
+ (c-mode          . ((c-file-style . "gnu")))
+ (scheme-mode
+  .
+  ((indent-tabs-mode . nil)
+   (eval . (put 'eval-when 'scheme-indent-function 1))
+   (eval . (put 'call-with-prompt 'scheme-indent-function 1))
+   (eval . (put 'test-assert 'scheme-indent-function 1))
+   (eval . (put 'test-assertm 'scheme-indent-function 1))
+   (eval . (put 'test-equalm 'scheme-indent-function 1))
+   (eval . (put 'test-equal 'scheme-indent-function 1))
+   (eval . (put 'test-eq 'scheme-indent-function 1))
+   (eval . (put 'call-with-input-string 'scheme-indent-function 1))
+   (eval . (put 'guard 'scheme-indent-function 1))
+   (eval . (put 'lambda* 'scheme-indent-function 1))
+   (eval . (put 'substitute* 'scheme-indent-function 1))
+   (eval . (put 'match-record 'scheme-indent-function 2))
+
+   ;; 'modify-phases' and its keywords.
+   (eval . (put 'modify-phases 'scheme-indent-function 1))
+   (eval . (put 'replace 'scheme-indent-function 1))
+   (eval . (put 'add-before 'scheme-indent-function 2))
+   (eval . (put 'add-after 'scheme-indent-function 2))
+
+   (eval . (put 'modify-services 'scheme-indent-function 1))
+   (eval . (put 'with-directory-excursion 'scheme-indent-function 1))
+   (eval . (put 'package 'scheme-indent-function 0))
+   (eval . (put 'origin 'scheme-indent-function 0))
+   (eval . (put 'build-system 'scheme-indent-function 0))
+   (eval . (put 'bag 'scheme-indent-function 0))
+   (eval . (put 'graft 'scheme-indent-function 0))
+   (eval . (put 'operating-system 'scheme-indent-function 0))
+   (eval . (put 'file-system 'scheme-indent-function 0))
+   (eval . (put 'manifest-entry 'scheme-indent-function 0))
+   (eval . (put 'manifest-pattern 'scheme-indent-function 0))
+   (eval . (put 'substitute-keyword-arguments 'scheme-indent-function 1))
+   (eval . (put 'with-store 'scheme-indent-function 1))
+   (eval . (put 'with-external-store 'scheme-indent-function 1))
+   (eval . (put 'with-error-handling 'scheme-indent-function 0))
+   (eval . (put 'with-mutex 'scheme-indent-function 1))
+   (eval . (put 'with-atomic-file-output 'scheme-indent-function 1))
+   (eval . (put 'call-with-compressed-output-port 'scheme-indent-function 2))
+   (eval . (put 'call-with-decompressed-port 'scheme-indent-function 2))
+   (eval . (put 'call-with-gzip-input-port 'scheme-indent-function 1))
+   (eval . (put 'call-with-gzip-output-port 'scheme-indent-function 1))
+   (eval . (put 'call-with-lzip-input-port 'scheme-indent-function 1))
+   (eval . (put 'call-with-lzip-output-port 'scheme-indent-function 1))
+   (eval . (put 'signature-case 'scheme-indent-function 1))
+   (eval . (put 'emacs-batch-eval 'scheme-indent-function 0))
+   (eval . (put 'emacs-batch-edit-file 'scheme-indent-function 1))
+   (eval . (put 'emacs-substitute-sexps 'scheme-indent-function 1))
+   (eval . (put 'emacs-substitute-variables 'scheme-indent-function 1))
+   (eval . (put 'with-derivation-narinfo 'scheme-indent-function 1))
+   (eval . (put 'with-derivation-substitute 'scheme-indent-function 2))
+   (eval . (put 'with-status-report 'scheme-indent-function 1))
+   (eval . (put 'with-status-verbosity 'scheme-indent-function 1))
+
+   (eval . (put 'mlambda 'scheme-indent-function 1))
+   (eval . (put 'mlambdaq 'scheme-indent-function 1))
+   (eval . (put 'syntax-parameterize 'scheme-indent-function 1))
+   (eval . (put 'with-monad 'scheme-indent-function 1))
+   (eval . (put 'mbegin 'scheme-indent-function 1))
+   (eval . (put 'mwhen 'scheme-indent-function 1))
+   (eval . (put 'munless 'scheme-indent-function 1))
+   (eval . (put 'mlet* 'scheme-indent-function 2))
+   (eval . (put 'mlet 'scheme-indent-function 2))
+   (eval . (put 'run-with-store 'scheme-indent-function 1))
+   (eval . (put 'run-with-state 'scheme-indent-function 1))
+   (eval . (put 'wrap-program 'scheme-indent-function 1))
+   (eval . (put 'with-imported-modules 'scheme-indent-function 1))
+   (eval . (put 'with-extensions 'scheme-indent-function 1))
+
+   (eval . (put 'with-database 'scheme-indent-function 2))
+   (eval . (put 'call-with-transaction 'scheme-indent-function 2))
+
+   (eval . (put 'call-with-container 'scheme-indent-function 1))
+   (eval . (put 'container-excursion 'scheme-indent-function 1))
+   (eval . (put 'eventually 'scheme-indent-function 1))
+
+   (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1))
+
+   ;; This notably allows '(' in Paredit to not insert a space when the
+   ;; preceding symbol is one of these.
+   (eval . (modify-syntax-entry ?~ "'"))
+   (eval . (modify-syntax-entry ?$ "'"))
+   (eval . (modify-syntax-entry ?+ "'"))))
+ (emacs-lisp-mode . ((indent-tabs-mode . nil)))
+ (texinfo-mode    . ((indent-tabs-mode . nil)
+                     (fill-column . 72))))

.guix-channel

@@ -0,0 +1,9 @@
+(channel
+  (version 0)
+  (directory ".guix/modules"))
+
+
+;;; Local Variables:
+;;; mode: scheme
+;;; End:
+

.guix/modules/meowy-webring.scm

@@ -0,0 +1,42 @@
+(load "crates-io.scm")
+(define-module (meowy-webring)
+  #:use-module (crates-io)
+  #:use-module (guix)
+  #:use-module (guix build-system cargo)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages crates-io)
+  #:use-module (srfi srfi-1))
+
+(define (keep-file? file stat)
+  (or (git-predicate  (current-source-directory))
+      (const #t)))
+
+(define-public meowy-webring
+  (package
+    (name "meowy-webring")
+    (version "0.1.0-git")
+    (source (local-file "../.." "meowy-webring-checkout"
+			#:recursive? #t
+			#:select? keep-file?))
+    (build-system cargo-build-system)
+    (arguments (list #:cargo-inputs `(("rust-askama-rocket" ,rust-askama-rocket-0.12)
+				      ("rust-askama" ,rust-askama-0.12)
+				      ("rust-directories" ,rust-directories-5)
+				      ("rust-embed" ,rust-embed-6)
+				      ("rust-hex" ,rust-hex-0.4)
+				      ("rust-notify" ,rust-notify-6)
+				      ("rust-rocket" ,rust-rocket-0.5)
+				      ("rust-serde" ,rust-serde-1)
+				      ("rust-serde-json" ,rust-serde-json-1)
+				      ("rust-simple-logger" ,rust-simple-logger-4))
+		     #:install-source? #f
+		     #:phases #~(modify-phases %standard-phases
+				  (delete 'package))))
+    (synopsis "")
+    (description "")
+    (home-page "")
+    (license license:cc0)))
+
+meowy-webring

Cargo.toml

@@ -13,7 +13,7 @@ lto = "thin"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies.rocket]
-version = "=0.5.0-rc.3"
+version = "0.5.0"
 default-features = false
 features = ["json"]
 

crates/meowy-assets/Cargo.toml

@@ -9,19 +9,16 @@ edition = "2021"
 hex = "0.4"
 
 [dependencies.rocket]
-version = "=0.5.0-rc.3"
+version = "=0.5.0"
 default-features = false
 
 [dependencies.askama_rocket]
-git = "https://github.com/djc/askama.git"
 package = "askama_rocket"
-rev = "b9e51601560398766eac445517fb17c35090a952"
+version = "0.12"
 default-features = false
 
 [dependencies.askama]
-git = "https://github.com/djc/askama.git"
 package = "askama"
-rev = "b9e51601560398766eac445517fb17c35090a952"
 version = "0.12"
 default-features = false
 

guix.scm

@@ -0,0 +1 @@
+.guix/modules/meowy-webring.scm

manifest.scm

@@ -0,0 +1,10 @@
+;; What follows is a "manifest" equivalent to the command line you gave.
+;; You can store it in a file that you may then pass to any 'guix' command
+;; that accepts a '--manifest' (or '-m') option.
+
+(specifications->manifest
+ (list "gcc-toolchain"
+       "git"
+       "git-lfs"
+       "rust-cargo"
+       "rust"))