From 38a141da1c94c4022a07741cd2ed8d96fc63326a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Jun 2021 05:39:58 +0300 Subject: [PATCH 1/6] sweet: add gtk-engine-murrine (cherry picked from commit 3ff86ab57602d71361b011f2bc5b4cfe01d926ef) --- pkgs/data/themes/sweet/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix index 8a62735d2e5..bd1df3277c9 100644 --- a/pkgs/data/themes/sweet/default.nix +++ b/pkgs/data/themes/sweet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "sweet"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { }) ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + sourceRoot = "."; installPhase = '' From ca81552645adec7b62a073f11ae46aaed10c9d5b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 30 Jul 2021 20:17:46 +0100 Subject: [PATCH 2/6] python3Packages.tensorflow: add patch fixing NotImplementedError with numpy 1.20 see upstream pr https://github.com/tensorflow/tensorflow/pull/47957 (cherry picked from commit 42bfc113569c242947b7a0f6edf94031fbb8bac5) --- pkgs/development/python-modules/tensorflow/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 0216c05eeac..45dec96f1e3 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,5 +1,5 @@ { stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin -, addOpenGLRunpath +, addOpenGLRunpath, fetchpatch # Python deps , buildPythonPackage, pythonOlder, pythonAtLeast, python # Python libraries @@ -114,6 +114,12 @@ let }; 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-dependencies.patch # Add missing `io_bazel_rules_docker` dependency. From cb52ea70428bbdf0cd72b8350684783be6796fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 31 Jul 2021 21:46:16 +0200 Subject: [PATCH 3/6] linux_zen: 5.13.5 -> 5.13.7 (cherry picked from commit 6e9195f6687d05d4225521a34d1702dd9c0a4444) --- pkgs/os-specific/linux/kernel/linux-zen.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 3955b1851d3..7cbeedda726 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.13.5"; + version = "5.13.7"; suffix = "zen1"; in @@ -14,11 +14,11 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-3guG482lsdcWqAJ1kY757D4EeOEpTDvy95de0bHif98="; + sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0="; }; extraMeta = { - branch = "5.12/master"; + branch = "5.13"; maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; From c0e25740a583ab87980c3583029275d9e4e85090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 31 Jul 2021 22:59:41 +0200 Subject: [PATCH 4/6] linux_zen: actually enable patchset (cherry picked from commit 604d0dd0d68daf696a9ba5494b63500e9db36874) --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 7cbeedda726..2b91a259232 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -17,6 +17,10 @@ buildLinux (args // { sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0="; }; + structuredExtraConfig = with lib.kernel; { + ZEN_INTERACTIVE = yes; + }; + extraMeta = { branch = "5.13"; maintainers = with lib.maintainers; [ atemu andresilva ]; From 260df793d82338b88a3a720f5b60da51da242722 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 31 Jul 2021 18:38:29 +0200 Subject: [PATCH 5/6] epson-escpr2: 1.1.34 -> 1.1.38 (cherry picked from commit 738f92f2baf8652c5c81d43067acba801c6ee89b) --- pkgs/misc/drivers/epson-escpr2/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 130be517bb8..bcb56ac0051 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, cups }: +{ lib, stdenv, fetchurl, cups, busybox }: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.34"; + version = "1.1.38"; src = fetchurl { # To find new versions, visit @@ -11,15 +11,26 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "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/20210627160654/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/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 ]; buildInputs = [ cups ]; + nativeBuildInputs = [ busybox ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; From 07255eea7b0bd9df8d11cbbc404801160c49e972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 2 Aug 2021 17:23:54 +0200 Subject: [PATCH 6/6] enableRedistributableFirmware: add rtw89-firmware (cherry picked from commit 749620cd4f8001d1509c6af150814515003f3e72) --- nixos/modules/hardware/all-firmware.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 3e88a4c20ad..d788480b014 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -50,6 +50,7 @@ in { rtl8723bs-firmware rtl8761b-firmware rtw88-firmware + rtw89-firmware zd1211fw alsa-firmware sof-firmware