Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-02-24 06:01:49 +00:00 committed by GitHub
commit 54a50a082c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 69 additions and 21 deletions

View file

@ -0,0 +1,23 @@
{ lib, fetchzip }:
let version = "1.210"; in
fetchzip {
name = "lxgw-wenkai-${version}";
url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
'';
sha256 = "n8vnkoOJuUO4Gh+GUInZ/HJK5t4pD7MrPPaxDyH+0Qw=";
meta = with lib; {
homepage = "https://lxgw.github.io/";
description = "An open-source Chinese font derived from Fontworks' Klee One";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ elliot ];
};
}

View file

@ -1,14 +1,14 @@
{ lib, fetchurl, libarchive }:
let
version = "0.35.8";
version = "0.35.9";
in fetchurl {
name = "sarasa-gothic-${version}";
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
sha256 = "sha256-22q+FdTh9Dex+tEo/HCBK14ZlJFtFM7SrE6K1/iVBY0=";
sha256 = "sha256-zG1VVI7QRQMC4MBA3otD26LUvnkUxaxt6UkiweY0l1w=";
recursiveHash = true;
downloadToTemp = true;

View file

@ -0,0 +1,23 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "ydp-grand";
version = "unstable-2016-08-04";
src = fetchurl {
url = "https://freepats.zenvoid.org/Piano/YDP-GrandPiano/YDP-GrandPiano-SF2-20160804.tar.bz2";
sha256 = "sha256-0kPcPhgqYN8qFukoKMGCHPPrV0i0Xi4r3Pqc968FYCY=";
};
installPhase = ''
install -Dm644 YDP-GrandPiano-*.sf2 $out/share/soundfonts/YDP-GrandPiano.sf2
'';
meta = with lib; {
description = "Acoustic grand piano soundfont";
homepage = "https://freepats.zenvoid.org/Piano/acoustic-grand-piano.html";
license = licenses.cc-by-30;
platforms = platforms.all;
maintainers = with maintainers; [ ckie ];
};
}

View file

@ -29,7 +29,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "MoltenVK";
version = "1.1.7";
version = "1.1.8";
buildInputs = [
AppKit
@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "2742e959347ae2fac58acd0d022c92a0ff1f24bf";
rev = "90d4bd05cd77ef5782a6779a0fe3d084440dc80d";
hash = "sha256-Q0sk4bPj/skPat1n4GJyuXAlZqpfEn4Td8Bm2IBNUqE=";
};
})).override {
@ -102,7 +102,7 @@ stdenvNoCC.mkDerivation rec {
owner = "KhronosGroup";
repo = "MoltenVK";
rev = "v${version}";
hash = "sha256-I9QcjyE09qclWPCLAVfKEaifP89q1ftLh9cXWy9m7kw=";
hash = "sha256-IfTBtA2fM7YN4qaSDUTfsiCXzn+omSV6oroL1ivKiVA=";
};
patches = [

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitLab, fetchpatch, makeWrapper, autoreconfHook
{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook
, pkg-config, which
, flex, bison
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
@ -21,7 +21,7 @@
}:
let
apparmor-version = "3.0.4";
apparmor-version = "3.0.3";
apparmor-meta = component: with lib; {
homepage = "https://apparmor.net/";
@ -31,11 +31,9 @@ let
platforms = platforms.linux;
};
apparmor-sources = fetchFromGitLab {
owner = "apparmor";
repo = "apparmor";
rev = "v${apparmor-version}";
sha256 = "1a217j28rgfq4lsmpn0wv1xgmdr9ba8iysv9i6q477kj6z77zrb9";
apparmor-sources = fetchurl {
url = "https://launchpad.net/apparmor/${lib.versions.majorMinor apparmor-version}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
sha256 = "0nasq8pdmzkrf856yg1v8z5hcs0nn6gw2qr60ab0a7j9ixfv0g8m";
};
aa-teardown = writeShellScript "aa-teardown" ''
@ -50,9 +48,8 @@ let
substituteInPlace ./common/Make.rules \
--replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" \
--replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html" \
--replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" \
--replace "/usr/share/man" "share/man"
substituteInPlace ./utils/Makefile \
--replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h"
'';
patches = lib.optionals stdenv.hostPlatform.isMusl [
@ -63,8 +60,6 @@ let
})
];
python = python3.withPackages (ps: with ps; [ setuptools ]);
# Set to `true` after the next FIXME gets fixed or this gets some
# common derivation infra. Too much copy-paste to fix one by one.
doCheck = false;
@ -91,16 +86,19 @@ let
ncurses
which
perl
] ++ lib.optional withPython python;
] ++ lib.optional withPython python3;
buildInputs = lib.optional withPerl perl
++ lib.optional withPython python;
++ lib.optional withPython python3;
# required to build apparmor-parser
dontDisableStatic = true;
prePatch = prePatchCommon + ''
substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site
substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site
substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h"
substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h"
'';
inherit patches;
@ -134,12 +132,12 @@ let
strictDeps = true;
nativeBuildInputs = [ makeWrapper which python ];
nativeBuildInputs = [ makeWrapper which python3 ];
buildInputs = [
bash
perl
python
python3
libapparmor
libapparmor.python
];
@ -161,7 +159,7 @@ let
postInstall = ''
sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d"
for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do
wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python3.libPrefix}/site-packages:$PYTHONPATH"
done
substituteInPlace $out/bin/aa-notify \

View file

@ -23790,6 +23790,8 @@ with pkgs;
inherit (plasma5Packages) breeze-icons;
};
lxgw-wenkai = callPackage ../data/fonts/lxgw-wenkai { };
maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { };
mailcap = callPackage ../data/misc/mailcap { };
@ -24075,6 +24077,8 @@ with pkgs;
soundfont-fluid = callPackage ../data/soundfonts/fluid { };
soundfont-ydp-grand = callPackage ../data/soundfonts/ydp-grand { };
spdx-license-list-data = callPackage ../data/misc/spdx-license-list-data { };
stdmanpages = callPackage ../data/documentation/std-man-pages { };