diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
| commit | 6d1958ad2dda67aa4f667d2283781949c8d18303 (patch) | |
| tree | 56cb000fe8a66aaa690a61dae410a86bebde2b56 /pkgs/data | |
| parent | 9f7ce23482602164afe4f0a339f20879bf7df6cc (diff) | |
| parent | a992d6867108fa317f461becc92a7f36a59bac61 (diff) | |
| download | nixlib-6d1958ad2dda67aa4f667d2283781949c8d18303.tar nixlib-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.gz nixlib-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.bz2 nixlib-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.lz nixlib-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.xz nixlib-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.zst nixlib-6d1958ad2dda67aa4f667d2283781949c8d18303.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/icons/papirus-icon-theme/default.nix | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index d93e58854014..530cfca74249 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fetchurl , fetchzip -, optipng , cairo , python3 , pkg-config diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index f5bd6335dfbb..c43ff3a313f2 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, buildPythonPackage, pythonOlder , afdko, appdirs, attrs, black, booleanoperations, brotlipy, click -, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml +, defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli , pillow, six, bash, setuptools_scm }: diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b18354910e44..1d4c3866b4e3 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210201"; + version = "20210302"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-TQEpNFmsloq1jIg6QsuY8kllINpmwJCY+Anwker6Z5M="; + sha256 = "0h1cja8qqlnddm92hkyhkyj5rqfj494v0pss2mg95qqkjijpcgd0"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Papirus icon theme"; homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; - license = licenses.lgpl3; + license = licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; |