diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-04 18:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 18:01:07 +0000 |
| commit | 150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c (patch) | |
| tree | f65c0e5cce38cc348d5818df83c7a9ccab04dc34 /pkgs/data | |
| parent | 7bc9a371ec9a32b6e8e85c7c4e8fcf7bfa3f57f9 (diff) | |
| parent | b995290d0badfffb984baed5531b0f5875b0864a (diff) | |
| download | nixpkgs-150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c.tar nixpkgs-150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c.tar.gz nixpkgs-150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c.tar.bz2 nixpkgs-150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c.tar.lz nixpkgs-150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c.tar.xz nixpkgs-150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c.tar.zst nixpkgs-150dc67b3c7c5e2b4c67fd0193c98fc7bc13468c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/comfortaa/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/themes/materia-kde/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index 39c228d235b..fc7ce56f796 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub }: let - version = "3.101"; + version = "2021-07-29"; in fetchFromGitHub rec { name = "comfortaa-${version}"; owner = "googlefonts"; repo = "comfortaa"; - rev = version; + rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; postFetch = '' tar -xf $downloadedFile --strip=1 @@ -16,7 +16,7 @@ in fetchFromGitHub rec { cp FONTLOG.txt README.md $out/share/doc/comfortaa ''; - sha256 = "06jhdrfzl01ma085bp354g002ypmkbp6a51jn1lsj77zfj2mfmfc"; + sha256 = "12ad7qy11q49iv9h3l2d7x7y7kf0hxbqhclb92bzwig8dzly9n2k"; meta = with lib; { homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; diff --git a/pkgs/data/themes/materia-kde/default.nix b/pkgs/data/themes/materia-kde/default.nix index bf3b56ae666..a50cadb0676 100644 --- a/pkgs/data/themes/materia-kde/default.nix +++ b/pkgs/data/themes/materia-kde/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "materia-kde-theme"; - version = "20210624"; + version = "20210814"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "materia-kde"; rev = version; - sha256 = "jmUJAWoQ/GVPNQOjlyZBg4rIIo+rhzr5imnCFAWOtrA="; + sha256 = "KfC1nB5WUcYixqSy5XCP+6Uqhs07Y3p2F1H+5HB8wAg="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A port of the materia theme for Plasma"; homepage = "https://github.com/PapirusDevelopmentTeam/materia-kde"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.diffumist ]; platforms = platforms.all; }; |