diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-03 19:52:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 19:52:05 +0000 |
| commit | b511c637c8f083581722e53326a6cb81f1619f53 (patch) | |
| tree | 619876a9a026ed4c80a8bbe989c1f87eb9c4d0ce /pkgs/data | |
| parent | 67897e581c4786e7e97f563b2446c0d7df2c22a2 (diff) | |
| parent | a9f286f5cf8be2b6c9565a91daf46c839f958fa5 (diff) | |
| download | nixpkgs-b511c637c8f083581722e53326a6cb81f1619f53.tar nixpkgs-b511c637c8f083581722e53326a6cb81f1619f53.tar.gz nixpkgs-b511c637c8f083581722e53326a6cb81f1619f53.tar.bz2 nixpkgs-b511c637c8f083581722e53326a6cb81f1619f53.tar.lz nixpkgs-b511c637c8f083581722e53326a6cb81f1619f53.tar.xz nixpkgs-b511c637c8f083581722e53326a6cb81f1619f53.tar.zst nixpkgs-b511c637c8f083581722e53326a6cb81f1619f53.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/tools.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/themes/matcha/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index c43ff3a313f..791aa6534d2 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -3,7 +3,7 @@ , 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 }: +, pillow, six, bash, setuptools-scm }: buildPythonPackage rec { pname = "nototools"; @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ afdko diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index bfede60c2f7..d060e20267e 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-05-20"; + version = "2021-06-02"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0jx55dn9j0395ws7507mj8px4yq4jlmms6xr9jlhp0qxnr4y1smd"; + sha256 = "0wx0dgfl71wx02nrmf794xn28cvjx81vcmbnzwyyzwcbb9pacdpp"; }; buildInputs = [ gdk-pixbuf librsvg ]; |