about summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2024-02-01 12:24:57 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2024-02-01 12:25:11 +0100
commit27fa02d0f19b46920eaf78f74c6b700e31086379 (patch)
tree715ce671c4de5ecc52d4d40aa40a0b16cfd2ba00 /pkgs/data
parenta7e73864b4d7a8dbd9df8e144e612ed1ed5577d4 (diff)
parent2c582510dbd6657db54222db0567e7c34bd9bb24 (diff)
downloadnixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar
nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.gz
nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.bz2
nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.lz
nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.xz
nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.tar.zst
nixlib-27fa02d0f19b46920eaf78f74c6b700e31086379.zip
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
-	pkgs/development/compilers/llvm/10/clang/default.nix
- pkgs/development/compilers/llvm/8/clang/default.nix
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/0xproto/default.nix4
-rw-r--r--pkgs/data/fonts/ibm-plex/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/fonts/0xproto/default.nix b/pkgs/data/fonts/0xproto/default.nix
index 46fc708bc33f..778c1ff79fa9 100644
--- a/pkgs/data/fonts/0xproto/default.nix
+++ b/pkgs/data/fonts/0xproto/default.nix
@@ -4,14 +4,14 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "0xproto";
-  version = "1.500";
+  version = "1.601";
 
   src = let
     underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
   in
     fetchzip {
       url = "https://github.com/0xType/0xProto/releases/download/${version}/0xProto_${underscoreVersion}.zip";
-      hash = "sha256-4yZtYjNLHDsF16brUADzwS4/Ha0g+g0mU+sl8Gb9Zm0=";
+      hash = "sha256-f/5YmyIF66+7w2Tb0V0UKRjwDYDdZ0BEqsEuyN0FaDQ=";
     };
 
   installPhase = ''
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index 21321d83af34..a6c7b4d29535 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "ibm-plex";
-  version = "6.2.0";
+  version = "6.4.0";
 
   src = fetchzip {
     url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
-    hash = "sha256-RvD/aeZrvltJiuAHqYMNaRsjLgTdcC1/5zqlcd4qKAA=";
+    hash = "sha256-/aR3bu03VxenSPed6EqrGoPjWCcKT//MVtb9OC8tSRs=";
   };
 
   installPhase = ''