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

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-08-02 18:03:06 +00:00 committed by GitHub
parent 18fd910d83 c7d12b8159
commit 79348ac652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/hardware/all-firmware.nix
View File

@ -50,6 +50,7 @@ in {
rtl8723bs-firmware rtl8723bs-firmware
rtl8761b-firmware rtl8761b-firmware
rtw88-firmware rtw88-firmware
rtw89-firmware
zd1211fw zd1211fw
alsa-firmware alsa-firmware
sof-firmware sof-firmware

4
pkgs/data/themes/sweet/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl, gtk-engine-murrine }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sweet"; pname = "sweet";
@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
}) })
]; ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
sourceRoot = "."; sourceRoot = ".";
installPhase = '' installPhase = ''

8
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin { stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
, addOpenGLRunpath , addOpenGLRunpath, fetchpatch
# Python deps # Python deps
, buildPythonPackage, pythonOlder, pythonAtLeast, python , buildPythonPackage, pythonOlder, pythonAtLeast, python
# Python libraries # Python libraries
@ -114,6 +114,12 @@ let
}; };
patches = [ patches = [
# included from 2.6.0 onwards
(fetchpatch {
name = "fix-numpy-1.20-notimplementederror.patch";
url = "https://github.com/tensorflow/tensorflow/commit/b258941525f496763d4277045b6513c815720e3a.patch";
sha256 = "19f9bzrcfsynk11s2hqvscin5c65zf7r6g3nb10jnimw79vafiry";
})
# Relax too strict Python packages versions dependencies. # Relax too strict Python packages versions dependencies.
./relax-dependencies.patch ./relax-dependencies.patch
# Add missing `io_bazel_rules_docker` dependency. # Add missing `io_bazel_rules_docker` dependency.

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

@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, cups }: { lib, stdenv, fetchurl, cups, busybox }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2"; pname = "epson-inkjet-printer-escpr2";
version = "1.1.34"; version = "1.1.38";
src = fetchurl { src = fetchurl {
# To find new versions, visit # To find new versions, visit
@ -11,15 +11,26 @@ stdenv.mkDerivation rec {
# version. # version.
# NOTE: Don't forget to update the webarchive link too! # NOTE: Don't forget to update the webarchive link too!
urls = [ urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/12/85/48/fd5de1ecd7270b0398399355e265c99dfd1dbafb/epson-inkjet-printer-escpr2-1.1.34.tar.gz" "https://download3.ebz.epson.net/dsc/f/03/00/12/91/84/6902a4d11864b195ddda45f6de968d8ec1ee9e3b/epson-inkjet-printer-escpr2-1.1.38-1lsb3.2.src.rpm"
"https://web.archive.org/web/20210627160654/https://download3.ebz.epson.net/dsc/f/03/00/12/85/48/fd5de1ecd7270b0398399355e265c99dfd1dbafb/epson-inkjet-printer-escpr2-1.1.34.tar.gz" "https://web.archive.org/web/20210731163511/https://download3.ebz.epson.net/dsc/f/03/00/12/91/84/6902a4d11864b195ddda45f6de968d8ec1ee9e3b/epson-inkjet-printer-escpr2-1.1.38-1lsb3.2.src.rpm"
]; ];
sha256 = "sha256-sHBGWbkZ+zolHehyXQR8U2AyKSrgDSPmrkrcfcx/bAs="; sha256 = "sha256-rQtmWREZKtu5MuqEn91/1+SfGol4f8jKzd1mQ0e3h1c=";
}; };
unpackPhase = ''
runHook preUnpack
rpm2cpio $src | cpio -idmv
tar xvf ${pname}-${version}-1lsb3.2.tar.gz
cd ${pname}-${version}
runHook postUnpack
'';
patches = [ ./cups-filter-ppd-dirs.patch ]; patches = [ ./cups-filter-ppd-dirs.patch ];
buildInputs = [ cups ]; buildInputs = [ cups ];
nativeBuildInputs = [ busybox ];
meta = with lib; { meta = with lib; {
homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; homepage = "http://download.ebz.epson.net/dsc/search/01/search/";

10
pkgs/os-specific/linux/kernel/linux-zen.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildLinux, ... } @ args: { lib, fetchFromGitHub, buildLinux, ... } @ args:
let let
version = "5.13.5"; version = "5.13.7";
suffix = "zen1"; suffix = "zen1";
in in
@ -14,11 +14,15 @@ buildLinux (args // {
owner = "zen-kernel"; owner = "zen-kernel";
repo = "zen-kernel"; repo = "zen-kernel";
rev = "v${version}-${suffix}"; rev = "v${version}-${suffix}";
sha256 = "sha256-3guG482lsdcWqAJ1kY757D4EeOEpTDvy95de0bHif98="; sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0=";
};
structuredExtraConfig = with lib.kernel; {
ZEN_INTERACTIVE = yes;
}; };
extraMeta = { extraMeta = {
branch = "5.12/master"; branch = "5.13";
maintainers = with lib.maintainers; [ atemu andresilva ]; maintainers = with lib.maintainers; [ atemu andresilva ];
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
}; };