diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-07 00:02:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 00:02:06 +0000 |
| commit | e0fd83a6589ece4aba5d7be946606c1b8bec30e7 (patch) | |
| tree | b99618d70573838bec6875819ca1465eb826f453 /pkgs/data | |
| parent | 8a8a630460413b06ebb48a4ff69d649071c4a245 (diff) | |
| parent | f32e786e98f0dc9cbf46a47f8cf79a9c57f6b777 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/ubuntu-font-family/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/fonts/undefined-medium/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/fonts/vdrsymbols/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 331e34690a5e2..671ba8b4b48d9 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = "http://font.ubuntu.com/"; - license = licenses.free; + license = licenses.ufl; platforms = platforms.all; maintainers = [ maintainers.antono ]; }; diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index 3e3087c6abc8b..c1b22f7871173 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "undefined-medium"; - version = "1.1"; + version = "1.2"; src = fetchzip { - url = "https://github.com/andirueckel/undefined-medium/archive/v1.1.zip"; - hash = "sha256-iquxt7lo92y4AQZf23Ij5Qzg2U7buL3kGLksQSR6vac="; + url = "https://github.com/andirueckel/undefined-medium/archive/v1.2.zip"; + hash = "sha256-hgHwi25T+aM7ljzk5uR4x+CqoRJ3/IOyktdp/mDW46I="; }; installPhase = '' diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index 5df82b31cfe50..fd7aba9ec063f 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec { # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. # DejaVu changes are in public domain # See https://dejavu-fonts.github.io/License.html for details - license = licenses.free; + license = with licenses; [ bitstreamVera publicDomain ]; }; } |