From db961ec5bc59b6ae7531d4c59cf4322307bed2d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jun 2021 05:12:00 +0000
Subject: [PATCH 01/15] bazel-remote: 2.1.0 -> 2.1.1
---
.../tools/build-managers/bazel/bazel-remote/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index cbc2ceb21abc..314a1a8b0572 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "bazel-remote";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "buchgr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-GpbweI/grJNIRg/7lFd4tMhr9E2SPX+YUrzPJs0Gsik=";
+ sha256 = "sha256-tPjjYudUI+LlmdnEvHh+kUpAbmhiNPYhjf8fMglrzIM=";
};
- vendorSha256 = "sha256-dXBGWTgUaVJCwf2LB1QdmSPP3BlKqZ28HUnq1oervNg=";
+ vendorSha256 = "sha256-JNVzy4WbpwH9ZfO78AHQM8pak/ZVQqapxxs9QraMhDo=";
doCheck = false;
From 82bd7089e91473897d77f28319f78a4253c0505a Mon Sep 17 00:00:00 2001
From: Max Wittig <max.wittig@siemens.com>
Date: Thu, 24 Jun 2021 23:31:56 +0200
Subject: [PATCH 02/15] gitlab-runner: 14.0.0 -> 14.0.1
---
.../continuous-integration/gitlab-runner/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index d154adbdc1be..e89c784df747 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "14.0.0";
+ version = "14.0.1";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64";
- sha256 = "156dm6kg154fyn3axgw7kcpq9xz8mxdyhch8snp0vxzh941sc74w";
+ sha256 = "1i1fddsz7cr0kg4bxqisx29cwyd07zqfbpmh5mhvi5zqy0gfmcn8";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm";
- sha256 = "0cnjbcc3bdiahff3iyxwppj9gwaj7r7x80hk2cv2q4hkdpsji655";
+ sha256 = "1d2ywc3cikffiwpql2kp5zg21vjinz51f76c6wdn0v35wl705fz4";
};
in
buildGoPackage rec {
@@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "14g78m5h5d02k04lc07jc8yp7sqmfkjif589rb8wkb9jmbh7glmi";
+ sha256 = "1prvmppq5w897bd9ch5z0h6h8mndy6myv8al24cr0bjc27c6wyn7";
};
patches = [ ./fix-shell-path.patch ];
From 9216c9f195dd24501072ae59e61db3961433b74b Mon Sep 17 00:00:00 2001
From: Maxine Aubrey <maxeaubrey@gmail.com>
Date: Sun, 27 Jun 2021 19:33:17 +0200
Subject: [PATCH 03/15] gupnp: 1.2.4 -> 1.2.7
---
pkgs/development/libraries/gupnp/default.nix | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index c91d25123f61..eaec28d88e09 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -20,23 +20,15 @@
stdenv.mkDerivation rec {
pname = "gupnp";
- version = "1.2.4";
+ version = "1.2.7";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-96AwfqUfXkTRuDL0k92QRURKOk4hHvhd/Zql3W6up9E=";
+ sha256 = "sha256-hEEnbxr9AXbm9ZUCajpQfu0YCav6BAJrrT8hYis1I+w=";
};
- patches = [
- (fetchpatch {
- name = "CVE-2021-33516.patch";
- url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/ca6ec9dcb26fd7a2a630eb6a68118659b589afac.patch";
- sha256 = "sha256-G7e/xNQB7Kp2fPzqVeD/cH3h1co9hZXh55QOUBnAnvU=";
- })
- ];
-
nativeBuildInputs = [
meson
ninja
From 31487e434b317195d22e2e9b4810a46285df0782 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 28 Jun 2021 01:03:36 -0300
Subject: [PATCH 04/15] bochs: refactor and prepare it for next release
---
.../virtualization/bochs/default.nix | 157 ++++++++++--------
1 file changed, 87 insertions(+), 70 deletions(-)
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 3a8e9dc0bee7..e614b3da2b0c 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -1,23 +1,24 @@
-{ lib, stdenv, fetchurl
-, pkg-config, libtool
-, gtk2, libGLU, libGL, readline, libX11, libXpm
-, docbook_xml_dtd_45, docbook_xsl
-, sdlSupport ? true, SDL2 ? null
-, termSupport ? true, ncurses ? null
-, wxSupport ? true, wxGTK ? null
-, wgetSupport ? false, wget ? null
-, curlSupport ? false, curl ? null
+{ lib
+, stdenv
+, fetchurl
+, SDL2
+, curl
+, docbook_xml_dtd_45
+, docbook_xsl
+, gtk2
+, libGL
+, libGLU
+, libX11
+, libXpm
+, libtool
+, ncurses
+, pkg-config
+, readline
+, wget
+, wxGTK
}:
-assert sdlSupport -> (SDL2 != null);
-assert termSupport -> (ncurses != null);
-assert wxSupport -> (gtk2 != null && wxGTK != null);
-assert wgetSupport -> (wget != null);
-assert curlSupport -> (curl != null);
-
-with lib;
stdenv.mkDerivation rec {
-
pname = "bochs";
version = "2.6.11";
@@ -27,18 +28,33 @@ stdenv.mkDerivation rec {
};
patches = [
+ # A flip between two lines of code, in order to compile with GLIBC 2.26
./bochs-2.6.11-glibc-2.26.patch
- ./fix-build-smp.patch
+ # Fix compilation for MSYS2 GCC 10; remove it when the next version arrives
./bochs_fix_narrowing_conv_warning.patch
+ # SMP-enabled configs; remove it when the next version arrives
+ ./fix-build-smp.patch
];
- buildInputs =
- [ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
- ++ optionals termSupport [ ncurses ]
- ++ optionals sdlSupport [ SDL2 ]
- ++ optionals wxSupport [ wxGTK ]
- ++ optionals wgetSupport [ wget ]
- ++ optionals curlSupport [ curl ];
+ nativeBuildInputs = [
+ docbook_xml_dtd_45
+ docbook_xsl
+ pkg-config
+ ];
+ buildInputs = [
+ SDL2
+ curl
+ gtk2
+ libGL
+ libtool
+ libGLU
+ libX11
+ libXpm
+ ncurses
+ readline
+ wget
+ wxGTK
+ ];
configureFlags = [
"--with-x=yes"
@@ -64,49 +80,51 @@ stdenv.mkDerivation rec {
# Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation
"--enable-3dnow=no"
"--enable-monitor-mwait=no"
- "--enable-raw-serial=no" ]
- # Boolean flags
- ++ optionals termSupport [ "--with-term" ]
- ++ optionals sdlSupport [ "--with-sdl2" ]
- ++ optionals wxSupport [ "--with-wx" ]
+ "--enable-raw-serial=no"
+
# These are completely configurable, and they don't depend of external tools
- ++ [ "--enable-cpu-level=6" # from 3 to 6
- "--enable-largefile"
- "--enable-idle-hack"
- "--enable-plugins=no" # Plugins are a bit buggy in Bochs
- "--enable-a20-pin"
- "--enable-x86-64"
- "--enable-smp"
- "--enable-large-ramfile"
- "--enable-repeat-speedups"
- "--enable-handlers-chaining"
- "--enable-trace-linking"
- "--enable-configurable-msrs"
- "--enable-show-ips"
- "--enable-debugger" #conflicts with gdb-stub option
- "--enable-disasm"
- "--enable-debugger-gui"
- "--enable-gdb-stub=no" # conflicts with debugger option
- "--enable-iodebug"
- "--enable-fpu"
- "--enable-svm"
- "--enable-avx"
- "--enable-evex"
- "--enable-x86-debugger"
- "--enable-pci"
- "--enable-usb"
- "--enable-usb-ohci"
- "--enable-usb-ehci"
- "--enable-usb-xhci"
- "--enable-ne2000"
- "--enable-pnic"
- "--enable-e1000"
- "--enable-clgd54xx"
- "--enable-voodoo"
- "--enable-cdrom"
- "--enable-sb16"
- "--enable-es1370"
- "--enable-busmouse" ];
+ "--enable-a20-pin"
+ "--enable-avx"
+ "--enable-busmouse"
+ "--enable-cdrom"
+ "--enable-clgd54xx"
+ "--enable-configurable-msrs"
+ "--enable-cpu-level=6" # from 3 to 6
+ "--enable-debugger" #conflicts with gdb-stub option
+ "--enable-debugger-gui"
+ "--enable-disasm"
+ "--enable-e1000"
+ "--enable-es1370"
+ "--enable-evex"
+ "--enable-fpu"
+ "--enable-gdb-stub=no" # conflicts with debugger option
+ "--enable-handlers-chaining"
+ "--enable-idle-hack"
+ "--enable-iodebug"
+ "--enable-large-ramfile"
+ "--enable-largefile"
+ "--enable-ne2000"
+ "--enable-pci"
+ "--enable-plugins=no" # Plugins are a bit buggy in Bochs
+ "--enable-pnic"
+ "--enable-repeat-speedups"
+ "--enable-sb16"
+ "--enable-show-ips"
+ "--enable-smp"
+ "--enable-svm"
+ "--enable-trace-linking"
+ "--enable-usb"
+ "--enable-usb-ehci"
+ "--enable-usb-ohci"
+ "--enable-usb-xhci"
+ "--enable-voodoo"
+ "--enable-x86-64"
+ "--enable-x86-debugger"
+ ]
+ # Boolean flags
+ ++ lib.optionals (SDL2 != null) [ "--with-sdl2" ]
+ ++ lib.optionals (ncurses != null) [ "--with-term" ]
+ ++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ];
NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/";
NIX_LDFLAGS="-L${libtool.lib}/lib";
@@ -115,19 +133,18 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with lib; {
+ homepage = "http://bochs.sourceforge.io/";
description = "An open-source IA-32 (x86) PC emulator";
longDescription = ''
Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written
in C++, that runs on most popular platforms. It includes emulation of the
Intel x86 CPU, common I/O devices, and a custom BIOS.
'';
- homepage = "http://bochs.sourceforge.net/";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
# TODO: plugins
-# TODO: svga support - the Bochs sources explicitly cite /usr/include/vga.h
# TODO: a better way to organize the options
From 5ca20c29fa5c7311e0467a6783229474febb0685 Mon Sep 17 00:00:00 2001
From: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
Date: Mon, 28 Jun 2021 10:43:40 +0200
Subject: [PATCH 05/15] wireless-regdb: 2020.04.29 -> 2021.04.21
---
pkgs/data/misc/wireless-regdb/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index fc238fbe149b..ca57640e4abe 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wireless-regdb";
- version = "2020.04.29";
+ version = "2021.04.21";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0yicda474ygahv8da18h1p4yf42s6x2f208mlwcw4xsrxld07zc9";
+ sha256 = "sha256-nkwCsqlxDfTb2zJ8OWEujLuuZJWYev7drrqyjB6j2Po=";
};
dontBuild = true;
From c15d6f570cefd259976b0ffa66cc835393c7a089 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Mon, 28 Jun 2021 13:58:55 +0200
Subject: [PATCH 06/15] python3Packages.lmnotify: update description
---
pkgs/development/python-modules/lmnotify/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/lmnotify/default.nix b/pkgs/development/python-modules/lmnotify/default.nix
index 653527ee422b..340e8386a0ea 100644
--- a/pkgs/development/python-modules/lmnotify/default.nix
+++ b/pkgs/development/python-modules/lmnotify/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "lmnotify" ];
meta = with lib; {
- description = "lmnotify is a package for sending notifications to LaMetric Time.";
+ description = "Python package for sending notifications to LaMetric Time";
homepage = "https://github.com/keans/lmnotify";
maintainers = with maintainers; [ rhoriguchi ];
license = licenses.mit;
From 5698f71177f280b549693d237d7c70f77c9a1f77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 28 Jun 2021 14:22:39 +0200
Subject: [PATCH 07/15] python3Packages.pysyncthru: init at 0.7.3
---
.../python-modules/pysyncthru/default.nix | 42 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 2 +
2 files changed, 44 insertions(+)
create mode 100644 pkgs/development/python-modules/pysyncthru/default.nix
diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix
new file mode 100644
index 000000000000..d3fed5dc4b58
--- /dev/null
+++ b/pkgs/development/python-modules/pysyncthru/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, isPy27
+, buildPythonPackage
+, fetchPypi
+, aiohttp
+, demjson
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "pysyncthru";
+ version = "0.7.3";
+
+ disabled = isPy27;
+
+ src = fetchPypi {
+ pname = "PySyncThru";
+ inherit version;
+ sha256 = "13564018a7de4fe013e195e19d7bae92aa224e0f3a32373576682722d3dbee52";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ demjson
+ ];
+
+ checkPhase = ''
+ ${python.interpreter} -m unittest
+ '';
+
+ # no tests on PyPI, no tags on GitHub
+ doCheck = false;
+
+ pythonImportsCheck = [ "pysyncthru" ];
+
+ meta = with lib; {
+ description = "Automated JSON API based communication with Samsung SyncThru Web Service";
+ homepage = "https://github.com/nielstron/pysyncthru";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4225ab4e0a7e..ec1b8aaad6f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5347,6 +5347,8 @@ in {
pysiaalarm = callPackage ../development/python-modules/pysiaalarm { };
+ pysyncthru = callPackage ../development/python-modules/pysyncthru { };
+
pytest-subprocess = callPackage ../development/python-modules/pytest-subprocess { };
python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
From 45c5ead53c38ad358d05992aa0edc7a1a150609a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 28 Jun 2021 14:23:03 +0200
Subject: [PATCH 08/15] home-assistant: update component-packages.nix
---
pkgs/servers/home-assistant/component-packages.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c99121c05d3d..d83bb5fa2a87 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -826,7 +826,7 @@
"switcher_kis" = ps: with ps; [ aioswitcher ];
"switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
"syncthing" = ps: with ps; [ aiosyncthing ];
- "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru
+ "syncthru" = ps: with ps; [ pysyncthru url-normalize ];
"synology_chat" = ps: with ps; [ ];
"synology_dsm" = ps: with ps; [ synologydsm-api ];
"synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
From 49d0347312af5e1cdccac6f9fa13c6db35fb09ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 28 Jun 2021 14:25:23 +0200
Subject: [PATCH 09/15] home-assistant: test syncthru component
---
pkgs/servers/home-assistant/default.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 3b20b48c4b0d..3de4b2d22b0b 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -685,6 +685,7 @@ in with py.pkgs; buildPythonApplication rec {
"switch"
"switcher_kis"
"syncthing"
+ "syncthru"
"synology_dsm"
"system_health"
"system_log"
From a3d043387fa335a6a723dc31188e99c5230ce0c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Mon, 28 Jun 2021 14:32:39 +0200
Subject: [PATCH 10/15] nixos/tests/home-assistant: don't test package
The modules overrides extraComponents which leads to a costly rebuild of
the home-assistant package with all tests. Make it less costly by not
running the tests, as does the default for the package option. The
package's tests are already run by ofborg on every pull request as well
as by Hydra when building home-assistant.
---
nixos/tests/home-assistant.nix | 2 --
1 file changed, 2 deletions(-)
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index f8f8e9fd183f..699be8fd7dc6 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -23,8 +23,6 @@ in {
services.home-assistant = {
inherit configDir;
enable = true;
- # includes the package with all tests enabled
- package = pkgs.home-assistant;
config = {
homeassistant = {
name = "Home";
From 4502f74f29e4daaaae5fc61a52818b3bc6f86b94 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jun 2021 21:38:40 +0000
Subject: [PATCH 11/15] chuck: 1.4.0.1 -> 1.4.1.0
---
pkgs/applications/audio/chuck/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index e051d8585b5c..a6509256881b 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
- version = "1.4.0.1";
+ version = "1.4.1.0";
pname = "chuck";
src = fetchurl {
url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
- sha256 = "1m0fhndbqaf0lii1asyc50c66bv55ib6mbnm8fzk5qc5ncs0r8hi";
+ sha256 = "sha256-dL+ZrVFeMRPFW4MxUpNvrQKjzwBqVBBf8Rd3xHMZSSg=";
};
nativeBuildInputs = [ flex bison which ];
From 3a30f526761528bc7b4dd609709e71b643a929ba Mon Sep 17 00:00:00 2001
From: Johannes Arnold <johannes.arnold@stud.uni-hannover.de>
Date: Mon, 28 Jun 2021 18:08:31 +0200
Subject: [PATCH 12/15] nixos/nginx: fix typo
---
nixos/modules/services/web-servers/nginx/vhost-options.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 1c7d40244797..bc18bcaa7b34 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -169,7 +169,7 @@ with lib;
description = ''
Whether to enable HTTP 3.
This requires using <literal>pkgs.nginxQuic</literal> package
- which can be achived by setting <literal>services.nginx.package = pkgs.nginxQuic;</literal>.
+ which can be achieved by setting <literal>services.nginx.package = pkgs.nginxQuic;</literal>.
Note that HTTP 3 support is experimental and
*not* yet recommended for production.
Read more at https://quic.nginx.org/
From 6edeec2b73dd744b4eda7ef8247a427bec9068e5 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Mon, 28 Jun 2021 10:00:55 -0700
Subject: [PATCH 13/15] python3Packages.trezor: patch for updated dep
---
pkgs/development/python-modules/trezor/default.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index bb85ca6b6f3c..546989ef349d 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -33,6 +33,11 @@ buildPythonPackage rec {
sha256 = "0r0j0y0ii62ppawc8qqjyaq0fkmmb0zk1xb3f9navxp556w2dljv";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'click>=7,<8' 'click>=7,<9'
+ '';
+
nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = [
From 3864c36b790f253e5109f833a788ece7e2dfbaa4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 28 Jun 2021 13:29:37 +0200
Subject: [PATCH 14/15] tdesktop: 2.8.1 -> 2.8.3
---
.../instant-messengers/telegram/tdesktop/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 16f2c52e6446..76d149048a3a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -23,7 +23,8 @@ let
tg_owt = callPackage ./tg_owt.nix {};
in mkDerivation rec {
pname = "telegram-desktop";
- version = "2.8.1";
+ version = "2.8.3";
+ # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
src = fetchFromGitHub {
@@ -31,7 +32,7 @@ in mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "1wf9806al6mzyd8nr37cdk6q2r354acixdqyjchi4r58drm99yv0";
+ sha256 = "1ywxsy3a99sdibipriblbzskmkqbnxwrz3lavfdr134wq8w8rjf7";
};
postPatch = ''
@@ -97,6 +98,7 @@ in mkDerivation rec {
passthru = {
inherit tg_owt;
+ updateScript = ./update.py;
};
meta = {
From 367a53a82b0a3ffe6c1ea4261c22764129994669 Mon Sep 17 00:00:00 2001
From: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
Date: Mon, 28 Jun 2021 14:35:35 +0200
Subject: [PATCH 15/15] linux_5_13: init at 5.13
---
pkgs/os-specific/linux/kernel/linux-5.13.nix | 21 ++++++++++++++++++++
pkgs/top-level/all-packages.nix | 8 ++++++++
2 files changed, 29 insertions(+)
create mode 100644 pkgs/os-specific/linux/kernel/linux-5.13.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix
new file mode 100644
index 000000000000..eb01fb6289c9
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix
@@ -0,0 +1,21 @@
+{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
+
+with lib;
+
+buildLinux (args // rec {
+ version = "5.13";
+
+ # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+ modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
+
+ # branchVersion needs to be x.y
+ extraMeta.branch = versions.majorMinor version;
+
+ src = fetchurl {
+ url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
+ sha256 = "sha256-P2uql/N1GEOfUd8uTz1lqCLKX/AWqo5g0sxTuVpsidk=";
+ };
+
+ kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
+} // (args.argsOverride or { }))
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e3d3178ea0b..a2952e8a7c89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20768,6 +20768,13 @@ in
];
};
+ linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix {
+ kernelPatches = [
+ kernelPatches.bridge_stp_helper
+ kernelPatches.request_key_helper
+ ];
+ };
+
linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -21083,6 +21090,7 @@ in
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12);
+ linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13);
# When adding to the list above:
# - Update linuxPackages_latest to the latest version