diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
| commit | f10921c5ade56534633eae0da94da6e81aacc2aa (patch) | |
| tree | 599d0256cc509f47a3e75ea1214d5374de51eee8 /tests | |
| parent | 0a83339bb1429332ee889e9a976aa214ae2ac0db (diff) | |
| parent | 9d0dfd9a9a7c43363a4e140c20d49f119fe6f2e3 (diff) | |
| download | guix-f10921c5ade56534633eae0da94da6e81aacc2aa.tar guix-f10921c5ade56534633eae0da94da6e81aacc2aa.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gem.scm | 4 | ||||
| -rw-r--r-- | tests/graph.scm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/gem.scm b/tests/gem.scm index 5158238d18..455fc15189 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -55,7 +55,7 @@ { \"name\": \"bundler\" }, ] }, - \"licenses\": [\"MIT\", \"Apache 2.0\"] + \"licenses\": null }") (define test-bundler-json @@ -138,7 +138,7 @@ ('synopsis "Another cool gem") ('description "Another cool gem") ('home-page "https://example.com") - ('license ('list 'license:expat 'license:asl2.0))) + ('license #f)) ;no licensing info ('package ('name "ruby-bundler") ('version "1.14.2") diff --git a/tests/graph.scm b/tests/graph.scm index b7732ec709..402847102f 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -195,7 +195,7 @@ edges." (let-values (((dune bap ocaml-base) (values (specification->package "dune") (specification->package "bap") - (specification->package "ocaml-base"))) + (specification->package "ocaml4.07-base"))) ((backend nodes+edges) (make-recording-backend))) (run-with-store %store (export-graph (list dune) 'port |