diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-10 00:02:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 00:02:27 +0000 |
| commit | 020ea91183e3266d35554adcea3d9cfa0070061c (patch) | |
| tree | a67544cba3a4aa4d8653526ed4cdc5d33496bcff /pkgs/data | |
| parent | 6bd5a8cfd36fc4f1d723b0cdf1c1ee86c0ddad82 (diff) | |
| parent | 054a983e10c59ad7341181b70ede8cf8779bdc2e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/documentation/std-man-pages/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/fonts/victor-mono/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index c9ce9c2bf7646..1fd83700f85a0 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GCC C++ STD manual pages"; homepage = "https://gcc.gnu.org/"; - license = with licenses; [ fdl12Plus ]; + license = with licenses; [ fdl13Plus ]; platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index e351cea9fdb41..f34baa8a83144 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -22,7 +22,7 @@ fetchzip { mv $out/OTF $out/share/fonts/opentype mv $out/TTF $out/share/fonts/truetype - rm -r $out/{EOT,WOFF,WOFF2} + rm -r $out/{EOT,WOFF,WOFF2,LICENSE.txt} ''; sha256 = "sha256-1si0d2lpuXaDcSc3giVMMMbZc/eKbHKU3wmwfYHZ8o0="; |