summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-02 00:11:58 +0000
committerGitHub <noreply@github.com>2023-11-02 00:11:58 +0000
commit9d1ed665f7378480375dc1957e9d314b0feb61f4 (patch)
treea256c136f5dab6dfe751f917ee0d6694d1774a5e /pkgs/data
parenta9d6c649ddd6ef260894f8ed4a90c0c26e8a2a24 (diff)
parent2c732a9b5a5a60d91c685c92b87db5b8f5cf5812 (diff)
downloadnixpkgs-9d1ed665f7378480375dc1957e9d314b0feb61f4.tar
nixpkgs-9d1ed665f7378480375dc1957e9d314b0feb61f4.tar.gz
nixpkgs-9d1ed665f7378480375dc1957e9d314b0feb61f4.tar.bz2
nixpkgs-9d1ed665f7378480375dc1957e9d314b0feb61f4.tar.lz
nixpkgs-9d1ed665f7378480375dc1957e9d314b0feb61f4.tar.xz
nixpkgs-9d1ed665f7378480375dc1957e9d314b0feb61f4.tar.zst
nixpkgs-9d1ed665f7378480375dc1957e9d314b0feb61f4.zip
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/iwona/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix
index 0d3944b2da1..df5569f5379 100644
--- a/pkgs/data/fonts/iwona/default.nix
+++ b/pkgs/data/fonts/iwona/default.nix
@@ -1,10 +1,9 @@
 { lib, stdenvNoCC, texlive }:
 
-stdenvNoCC.mkDerivation {
-  pname = "iwona";
-  version = "0.995b";
+stdenvNoCC.mkDerivation rec {
+  inherit (src) pname version;
 
-  src = lib.head (builtins.filter (p: p.tlType == "run") texlive.iwona.pkgs);
+  src = texlive.pkgs.iwona;
 
   installPhase = ''
     runHook preInstall
@@ -20,7 +19,7 @@ stdenvNoCC.mkDerivation {
     # "[...] GUST Font License (GFL), which is a free license, legally
     # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or
     # later." - GUST website
-    license = licenses.lppl13c;
+    license = src.meta.license;
     maintainers = with maintainers; [ siddharthist ];
     platforms = platforms.all;
   };