diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-05 00:44:16 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-10-05 00:44:16 +0200 |
| commit | 253ca4957d2e59a4d44ea47705c42629b2e133dd (patch) | |
| tree | 6c345b7d7c7f392a6bfad262235371c81631d76e /pkgs/data | |
| parent | 48177fb6ea88f89f0bac48aeb2f5bca826ae1dec (diff) | |
| parent | af4fc0bf1cb83a126d16bece462ad8d186d6ce73 (diff) | |
| download | nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.gz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.bz2 nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.lz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.xz nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.tar.zst nixpkgs-253ca4957d2e59a4d44ea47705c42629b2e133dd.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/data/fonts/noto-fonts/tools.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/icons/nordzy-icon-theme/default.nix | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 45366a8e505..019ed1f371c 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -128,7 +128,7 @@ in }; noto-fonts-emoji = let - version = "2.034"; + version = "2.038"; emojiPythonEnv = buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); in stdenvNoCC.mkDerivation { @@ -139,7 +139,7 @@ in owner = "googlefonts"; repo = "noto-emoji"; rev = "v${version}"; - sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; + sha256 = "1rgmcc6nqq805iqr8kvxxlk5cf50q714xaxk3ld6rjrd69kb8ix9"; }; depsBuildBuild = [ @@ -171,8 +171,10 @@ in enableParallelBuilding = true; installPhase = '' + runHook preInstall mkdir -p $out/share/fonts/noto - cp NotoColorEmoji.ttf fonts/NotoEmoji-Regular.ttf $out/share/fonts/noto + cp NotoColorEmoji.ttf $out/share/fonts/noto + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index e829e98bee0..82b56b9efff 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.16"; + version = "0.2.17"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "14rrdamkmhrykff8ln07fq9cm8zwj3k113lzwjcy0lgz23g51jyl"; + sha256 = "0jxydivqzggirc31jv7b4mrsjkg646zmra5m4h0pk4amgy65rvyp"; }; postPatch = '' diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index 28da45f4c34..23bb6564d45 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-icon-theme"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-icon"; rev = version; - sha256 = "sha256-syiJL5i7JJXiSedUtaaoCnAv/6NgRtB3um7A5Sp+Pek="; + sha256 = "sha256-pyWEHP7tqg7Cca38a7cGTCx/PCQ+OqG2koxQB6PSzkA="; }; # In the post patch phase we should first make sure to patch shebangs. |