public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-07-02 17:14:53 +02:00
parent 798c2d8bc1 3ee5811269
commit c33ca7c5ce
528 changed files with 12690 additions and 8690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/misc/drivers/epson-escpr2/default.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.12";
version = "1.1.13";
src = fetchurl {
# To find new versions, visit
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
# some printer like for instance "WF-7210" to get to the most recent
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm"
"https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm"
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm"
"https://web.archive.org/web/20200629154055if_/https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm"
];
sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv";
sha256 = "07g62vndn2wh9bablvdl2cxn9wq3hzn16mqji27j20h33cwqmzj1";
};
patches = [ ./cups-filter-ppd-dirs.patch ];

18
pkgs/misc/drivers/xow/default.nix
View File

@@ -1,14 +1,19 @@
{ stdenv, fetchFromGitHub, libusb1 }:
{ stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }:
stdenv.mkDerivation rec {
pname = "xow";
version = "0.4";
version = "0.5";
src = fetchFromGitHub {
owner = "medusalix";
repo = "xow";
rev = "v${version}";
sha256 = "1xkwcx2gqip9v2h3zjmrn7sgcck3midl5alhsmr3zivgdipamynv";
sha256 = "071r2kx44k1sc49cad3i607xg618mf34ki1ykr5lnfx9y6qyz075";
};
firmware = fetchurl {
url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab";
sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5";
};
makeFlags = [
@@ -20,7 +25,14 @@ stdenv.mkDerivation rec {
"MODPDIR=${placeholder ''out''}/lib/modprobe.d"
"SYSDDIR=${placeholder ''out''}/lib/systemd/system"
];
postUnpack = ''
cabextract -F FW_ACC_00U.bin ${firmware}
mv FW_ACC_00U.bin source/firmware.bin
'';
enableParallelBuilding = true;
nativeBuildInputs = [ cabextract ];
buildInputs = [ libusb1 ];
meta = with stdenv.lib; {

4
pkgs/misc/emulators/mame/default.nix
View File

@@ -7,7 +7,7 @@ with stdenv;
let
majorVersion = "0";
minorVersion = "221";
minorVersion = "222";
desktopItem = makeDesktopItem {
name = "MAME";
@@ -26,7 +26,7 @@ in mkDerivation {
owner = "mamedev";
repo = "mame";
rev = "mame${majorVersion}${minorVersion}";
sha256 = "1pqwa5qcrk0wgbyns6fkv7j3pn7byf216cixc3phhhgvfidgr8ww";
sha256 = "1ij08h7cflr76qzyhhj21948275lqkpzi9r4pbc7h2avrlpsijx4";
};
hardeningDisable = [ "fortify" ];

4
pkgs/misc/emulators/mgba/default.nix
View File

@@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "mgba";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "mgba-emu";
repo = "mgba";
rev = version;
sha256 = "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429";
sha256 = "0dlwhn3hrpaqnl5hjs53y8j2i16idxrg3gy688gcwrc9z1a6bkn2";
};
enableParallelBuilding = true;

1
pkgs/misc/emulators/openmsx/default.nix
View File

@@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
homepage = "https://openmsx.org";
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
license = with licenses; [ bsd2 boost gpl2 ];
};
}

2
pkgs/misc/emulators/resim/default.nix
View File

@@ -15,4 +15,6 @@ stdenv.mkDerivation {
cp -v libresim/libarmsim.so $out/lib/libarmsim.so
cp -v vc4emul/vc4emul $out/bin/vc4emul
'';
meta.license = stdenv.lib.licenses.mit;
}

8
pkgs/misc/emulators/rpcs3/default.nix
View File

@@ -1,5 +1,6 @@
{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git
, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg_3, libevdev, python3
, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng
, ffmpeg, libevdev, python3
, pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland
, alsaSupport ? true, alsaLib
@@ -15,7 +16,7 @@ mkDerivation {
src = fetchgit {
url = "https://github.com/RPCS3/rpcs3";
rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd";
rev = "v${majorVersion}";
sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1";
};
@@ -36,7 +37,8 @@ mkDerivation {
nativeBuildInputs = [ cmake pkgconfig git ];
buildInputs = [
qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg_3 libevdev python3
qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg
libevdev python3
] ++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional alsaSupport alsaLib
++ lib.optional waylandSupport wayland;

6
pkgs/misc/emulators/wine/sources.nix
View File

@@ -39,16 +39,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "5.10";
version = "5.11";
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
sha256 = "0g9k094biyjc0ng3vnncdr1psf0ykn36nqirrqdzc5y82s9a1alv";
sha256 = "1q0sh89xnn6cq3kpqrrq9h316qyzpslj2w6m6vq7pq4y4p727nxk";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "1nnj52g0kp7i38qw85sp5qsf7gph1hh3ywibrdfpjmjpyj30v7sw";
sha256 = "050npck8mdck8m2rs9xn6mszzj2fv9ql80g08j2ahinf792svrid";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";