diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-13 00:13:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-13 00:13:22 +0000 |
| commit | b68d8e3f473f658105289d803e4052070d44e687 (patch) | |
| tree | ec084432f8dffa9b4ba543511b62016e19347b72 /pkgs/data | |
| parent | a738911124aac19232b0839342f970e97da0b7da (diff) | |
| parent | 787381926a95dc75d9f86127bbabdbfb0acf6b38 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/openmoji/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index 3a9b91deb28ff..c9722f60f2042 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -63,6 +63,12 @@ in stdenv.mkDerivation rec { nodePackages.lodash ]; + postPatch = '' + # this is API change in glob >9 + substituteInPlace helpers/generate-font-glyphs.js \ + --replace "require('glob').sync" "require('glob').globSync" + ''; + buildPhase = '' runHook preBuild diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 4df61f1f4120f..adbbbb201e3e8 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230227064844"; + version = "20230311145412"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-popSTy1BXKUhWtYePlERVqui+wiltyTaYk7071z08i8="; + hash = "sha256-dHXfj1f/wnv7W8e1jTclt7qaag5OzP4zCZflN8p0v3M="; }; vendorHash = "sha256-wqOpZ5MSWN3L+rVKdA2E/Zbwqb/KHwMKoGlSIPBKgv0="; meta = with lib; { |