diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 08:14:07 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-14 08:14:26 +0100 |
| commit | 6b67186fe9a8c05ba3dca00cd7f3434e97c5c0f3 (patch) | |
| tree | c40727f67b4ac1f249ee61aee61db419b1b27341 /pkgs/data | |
| parent | 08d2b1131869e00946d351050f1b92f259f25cff (diff) | |
| parent | db8d5902ad3666208236a685c82e50bc8bc47706 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/crownstone-cloud/default.nix - pkgs/development/python-modules/exrex/default.nix - pkgs/development/python-modules/mkdocs-minify/default.nix - pkgs/development/python-modules/myjwt/default.nix - pkgs/development/tools/analysis/checkov/default.nix
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/mononoki/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/misc/clash-geoip/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index 7f7c2876694fc..1b9ce45a05efa 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -2,19 +2,19 @@ stdenvNoCC.mkDerivation rec { pname = "mononoki"; - version = "1.3"; + version = "1.5"; src = fetchzip { url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; stripRoot = false; - hash = "sha256-bZYBRdmbQVs4i6UzMIHwJnoLWggX4CW8ZogNFYiX/9w="; + hash = "sha256-H5Iu7nSrB5UGlCSjTM3SLu+IjaAffk9TCm5OoOleKvw="; }; installPhase = '' runHook preInstall mkdir -p $out/share/fonts/mononoki - cp webfont/* $out/share/fonts/mononoki + cp * $out/share/fonts/mononoki runHook postInstall ''; diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 7c28c82e86467..e6d6cccf20c08 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230212"; + version = "20230312"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-Tnma6tpET4Vrm5G8KmLpsVnpD2JIKts56kZQsBIbRZ8="; + sha256 = "sha256-Y/glz6HUfjox9Mn+gPzA8+tUHqV/KkIInUn4SyajUiE="; }; dontUnpack = true; |