diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-30 23:47:49 +0200 |
commit | 8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e (patch) | |
tree | 6fa0f8ba32b83a996625bc188903ccebfb7e7c2c /tests/crate.scm | |
parent | 5d9e2187929ed7e8d46ec3cb3174fd78c1846360 (diff) | |
parent | 229f4fa9522fb56b014ee9c0d8111e8fb6da764d (diff) | |
download | guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar guix-patches-8bf8cd9b85c85be387565f6c8ca9f6c72196fb8e.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/backup.scm
gnu/packages/emacs-xyz.scm
gnu/packages/guile.scm
gnu/packages/lisp.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
Diffstat (limited to 'tests/crate.scm')
-rw-r--r-- | tests/crate.scm | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/crate.scm b/tests/crate.scm index aa51faebf9..61a04f986b 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -55,7 +55,7 @@ \"dependencies\": [ { \"crate_id\": \"bar\", - \"kind\": \"normal\", + \"kind\": \"normal\" } ] }") @@ -87,20 +87,20 @@ \"dependencies\": [ { \"crate_id\": \"intermediate-1\", - \"kind\": \"normal\", + \"kind\": \"normal\" }, { \"crate_id\": \"intermediate-2\", - \"kind\": \"normal\", + \"kind\": \"normal\" } { \"crate_id\": \"leaf-alice\", - \"kind\": \"normal\", + \"kind\": \"normal\" }, { \"crate_id\": \"leaf-bob\", - \"kind\": \"normal\", - }, + \"kind\": \"normal\" + } ] }") @@ -131,15 +131,15 @@ \"dependencies\": [ { \"crate_id\": \"intermediate-2\", - \"kind\": \"normal\", + \"kind\": \"normal\" }, { \"crate_id\": \"leaf-alice\", - \"kind\": \"normal\", + \"kind\": \"normal\" }, { \"crate_id\": \"leaf-bob\", - \"kind\": \"normal\", + \"kind\": \"normal\" } ] }") @@ -171,8 +171,8 @@ \"dependencies\": [ { \"crate_id\": \"leaf-bob\", - \"kind\": \"normal\", - }, + \"kind\": \"normal\" + } ] }") @@ -233,6 +233,7 @@ (define test-source-hash "") + (test-begin "crate") (test-equal "guix-package->crate-name" |