Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-06-04 15:25:54 +02:00
461 changed files with 22534 additions and 21978 deletions

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libinstpatch";
version = "1.1.4";
version = "1.1.5";
src = fetchFromGitHub {
owner = "swami";
repo = pname;
rev = "v${version}";
sha256 = "1v7mv43xxwrzi3agrc60agcw46jaidr8ql9kkm1w4jxkf4c6z6dz";
sha256 = "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@@ -12,18 +12,18 @@ stdenv.mkDerivation rec {
owner = "c4dm";
repo = pname;
rev = "v${version}";
sha256 = "e1PtCIzp7zIz+KKRxEGlAXTNqZ35vPgQ4opJKHIPa+4=";
sha256 = "1vkb1xr2hjcaw88gig7rknlwsx01lm0w94d2z0rk5vz9ih4fslvv";
};
patches = [
# Make installable
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/qm-dsp/raw/6eb385e2f970c4150f9c8eba73b558318475ed15/f/qm-dsp-install.patch";
sha256 = "7JDg9yOECWG7Ql5lIoC4L++R1gUlKfztvED5Ey4YLxw=";
sha256 = "071g30p17ya0pknzqa950pb93vrgp2024ray8axn22c44gvy147c";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/qm-dsp/raw/6eb385e2f970c4150f9c8eba73b558318475ed15/f/qm-dsp-flags.patch";
sha256 = "2HRSbSFxC8DPXOgcflyBYeJI3NwO/1CFmyRdvYo09og=";
sha256 = "127n6j5bsp94kf2m1zqfvkf4iqk1h5f7w778bk7w02vi45nm4x6q";
postFetch = ''
sed -i 's~/Makefile~/build/linux/Makefile.linux32~g' "$out"
'';

View File

@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "vamp-plugin-sdk";
version = "2.9";
version = "2.10";
src = fetchFromGitHub {
owner = "c4dm";
repo = "vamp-plugin-sdk";
rev = "vamp-plugin-sdk-v${version}";
sha256 = "1ay12gjqp2wzysg9k2qha3gd8sj5rjlfy4hsl923csi4ssiapsh1";
sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6";
};
nativeBuildInputs = [ pkgconfig ];