colin/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:
github-actions[bot] 2021-06-28 18:12:05 +00:00 committed by GitHub
commit 1bce4703aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 186 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-servers/nginx/vhost-options.nix
View File

@ -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/

2
nixos/tests/home-assistant.nix
View File

@ -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";

4
pkgs/applications/audio/chuck/default.nix
View File

@ -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 ];

6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -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 = {

157
pkgs/applications/virtualization/bochs/default.nix
View File

@ -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

4
pkgs/data/misc/wireless-regdb/default.nix
View File

@ -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;

12
pkgs/development/libraries/gupnp/default.nix
View File

@ -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

2
pkgs/development/python-modules/lmnotify/default.nix
View File

@ -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;

42
pkgs/development/python-modules/pysyncthru/default.nix Normal file
View File

@ -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 ];
};
}

5
pkgs/development/python-modules/trezor/default.nix
View File

@ -33,6 +33,11 @@ buildPythonPackage rec {
sha256 = "0r0j0y0ii62ppawc8qqjyaq0fkmmb0zk1xb3f9navxp556w2dljv";
};
postPatch = ''
substituteInPlace setup.py \
--replace 'click>=7,<8' 'click>=7,<9'
'';
nativeBuildInputs = [ installShellFiles ];
propagatedBuildInputs = [

6
pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
View File

@ -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;

8
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@ -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 ];

21
pkgs/os-specific/linux/kernel/linux-5.13.nix Normal file
View File

@ -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 { }))

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -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

1
pkgs/servers/home-assistant/default.nix
View File

@ -685,6 +685,7 @@ in with py.pkgs; buildPythonApplication rec {
"switch"
"switcher_kis"
"syncthing"
"syncthru"
"synology_dsm"
"system_health"
"system_log"

8
pkgs/top-level/all-packages.nix
View File

@ -20764,6 +20764,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
@ -21079,6 +21086,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

2
pkgs/top-level/python-packages.nix
View File

@ -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 { };