From f1b7c8e71bd28d58ade85e53fdab28442e9d788e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 16 Jan 2024 20:22:01 +0100 Subject: [PATCH 1/2] fix(reuse): custom license for website assets Changed some texts and added `--suppress-deprecation` argument --- .reuse/dep5 | 8 ++++++-- LICENSES/LicenseRef-MLabs.txt | 1 + checks/licenses.nix | 6 +++--- docs/mkdocs.yml | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 LICENSES/LicenseRef-MLabs.txt diff --git a/.reuse/dep5 b/.reuse/dep5 index 1277ae1..870765e 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,6 +3,10 @@ Upstream-Name: cardano.nix Upstream-Contact: Source: https://github.com/mlabs-haskell/cardano.nix -Copyright: 2023 MLabs ltd and cardano.nix contributors -License: Apache-2.0 Files: *.lock *.nix *.md docs/mkdocs.yml .envrc .gitignore +Copyright: © 2023 MLabs LTD +License: Apache-2.0 + +Files: docs/assets/favicon.png docs/assets/logo.svg +Copyright: © 2023 MLabs LTD +License: LicenseRef-MLabs diff --git a/LICENSES/LicenseRef-MLabs.txt b/LICENSES/LicenseRef-MLabs.txt new file mode 100644 index 0000000..6b93b10 --- /dev/null +++ b/LICENSES/LicenseRef-MLabs.txt @@ -0,0 +1 @@ +© 2023 MLabs LTD diff --git a/checks/licenses.nix b/checks/licenses.nix index c24a131..55ad124 100644 --- a/checks/licenses.nix +++ b/checks/licenses.nix @@ -1,12 +1,12 @@ -{ +{self, ...}: { perSystem = {pkgs, ...}: { checks = { reuse = pkgs.runCommandLocal "reuse-lint" { buildInputs = [pkgs.reuse]; } '' - cd ${../.} - reuse lint + cd ${self} + reuse --suppress-deprecation lint touch $out ''; }; diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 7e99537..78a60d8 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -77,4 +77,4 @@ extra: name: Cardano.nix on Github generator: false # hide the line "Made with Material for MkDocs" -copyright: Copyright © MLabs Ltd and Cardano.nix contributors +copyright: Copyright © MLabs Ltd From 61575dcc141123500fcbc4de1ae3d712f9da5aaf Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 16 Jan 2024 20:23:07 +0100 Subject: [PATCH 2/2] fix(envrc): `nix_direnv_watch_file` deprecated --- .envrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.envrc b/.envrc index 4898c86..36aa8ea 100644 --- a/.envrc +++ b/.envrc @@ -1,5 +1,5 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.2.0; then source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc=" fi -nix_direnv_watch_file ./shell/default.nix flake.lock -use flake -L +nix_direnv ./shell/default.nix flake.lock +use flake . -L