nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-06 05:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-21.11 into staging-next-21.11

Browse Source
This commit is contained in:
github-actions[bot]
2022-01-20 00:10:42 +00:00
committed by GitHub
parent 7a4a3f2a73 73dd4dd334
commit fc303c5776
9 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@@ -11412,6 +11412,12 @@
githubId = 2389333;
name = "Andy Tockman";
};
techknowlogick = {
email = "techknowlogick@gitea.io";
github = "techknowlogick";
githubId = 164197;
name = "techknowlogick";
};
Technical27 = {
email = "38222826+Technical27@users.noreply.github.com";
github = "Technical27";

4
nixos/modules/installer/netboot/netboot.nix
View File

@@ -94,7 +94,9 @@ with lib;
system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
#!ipxe
kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams}
# Use the cmdline variable to allow the user to specify custom kernel params
# when chainloading this script from other iPXE scripts like netboot.xyz
kernel ${pkgs.stdenv.hostPlatform.linux-kernel.target} init=${config.system.build.toplevel}/init initrd=initrd ${toString config.boot.kernelParams} ''${cmdline}
initrd initrd
boot
'';

13
nixos/modules/services/networking/mosquitto.nix
View File

@@ -136,7 +136,7 @@ let
+ concatStringsSep "\n"
(plainLines
++ optional (plainLines != []) ''
${pkgs.mosquitto}/bin/mosquitto_passwd -U "$file"
${cfg.package}/bin/mosquitto_passwd -U "$file"
''
++ hashedLines));
@@ -444,6 +444,15 @@ let
globalOptions = with types; {
enable = mkEnableOption "the MQTT Mosquitto broker";
package = mkOption {
type = package;
default = pkgs.mosquitto;
defaultText = literalExpression "pkgs.mosquitto";
description = ''
Mosquitto package to use.
'';
};
bridges = mkOption {
type = attrsOf bridgeOptions;
default = {};
@@ -565,7 +574,7 @@ in
RuntimeDirectory = "mosquitto";
WorkingDirectory = cfg.dataDir;
Restart = "on-failure";
ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${configFile}";
ExecStart = "${cfg.package}/bin/mosquitto -c ${configFile}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
# Hardening

6
pkgs/applications/blockchains/alfis/default.nix
View File

@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "alfis";
version = "0.6.9";
version = "0.6.10";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Alfis";
rev = "v${version}";
sha256 = "1nnzy46hp1q9kcxzjx24d60frjhn3x46nksbqvdfcfrfn5pqrabh";
sha256 = "sha256-JJTU3wZ3cG5TmgHYShWJaNAZBA4z3qZXPfb7WUX6/80=";
};
cargoSha256 = "02liz8sqnqla77bqxfa8hj93qfj2x482q2bijz66rmazfig3b045";
cargoSha256 = "sha256-BsFe1Fp+Q5Gqa1w4xov0tVLDKV7S+6b5fKBl09ggLB0=";
checkFlags = [
# these want internet access, disable them

35
pkgs/applications/graphics/renderdoc/default.nix
View File

@@ -1,8 +1,25 @@
{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation
, qtbase, qtx11extras, qtsvg, makeWrapper
, vulkan-loader, libglvnd, xorg, python3, python3Packages
, bison, pcre, automake, autoconf, addOpenGLRunpath
, waylandSupport ? false, wayland
{ lib
, fetchFromGitHub
, nix-update-script
, cmake
, pkg-config
, mkDerivation
, qtbase
, qtx11extras
, qtsvg
, makeWrapper
, vulkan-loader
, libglvnd
, xorg
, python3
, python3Packages
, bison
, pcre
, automake
, autoconf
, addOpenGLRunpath
, waylandSupport ? false
, wayland
}:
let
custom_swig = fetchFromGitHub {
@@ -15,13 +32,13 @@ let
in
mkDerivation rec {
pname = "renderdoc";
version = "1.16";
version = "1.17";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
sha256 = "150d1qzjs420clqr48gickiw5ymjx4md6iyjbxmxsdml0pyxpwwn";
sha256 = "sha256-Zr7Av49mK48B4N+Ca2vPIgKuVNP4YLVEs4EQepukSs8=";
};
buildInputs = [
@@ -64,6 +81,10 @@ mkDerivation rec {
addOpenGLRunpath $out/lib/librenderdoc.so
'';
passthru.updateScript = nix-update-script {
attrPath = pname;
};
meta = with lib; {
description = "A single-frame graphics debugger";
homepage = "https://renderdoc.org/";

9
pkgs/applications/misc/waybar/default.nix
View File

@@ -15,6 +15,7 @@
, gtk-layer-shell
, howard-hinnant-date
, libxkbcommon
, runTests ? true, catch2
, traySupport ? true, libdbusmenu-gtk3
, pulseSupport ? true, libpulseaudio
, sndioSupport ? true, sndio
@@ -29,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "waybar";
version = "0.9.8";
version = "0.9.9";
src = fetchFromGitHub {
owner = "Alexays";
repo = "Waybar";
rev = version;
sha256 = "sha256-XOguhbvlO3iUyk5gWOvimipXV8yqnia0LKoSA1wiKoE=";
sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4=";
};
nativeBuildInputs = [
@@ -60,6 +61,9 @@ stdenv.mkDerivation rec {
++ optional swaySupport sway
++ optional mpdSupport libmpdclient;
checkInputs = [ catch2 ];
doCheck = runTests;
mesonFlags = (lib.mapAttrsToList
(option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
{
@@ -70,6 +74,7 @@ stdenv.mkDerivation rec {
libudev = udevSupport;
mpd = mpdSupport;
rfkill = rfkillSupport;
tests = runTests;
}
) ++ [
"-Dsystemd=disabled"

6
pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
View File

@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-workspace";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "orf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA=";
sha256 = "sha256-uP1sex4Hx57ZsqVG4b3809FzFB10Un48+vbwaWZ7HSg=";
};
cargoSha256 = "sha256-X0jRwDUVzS1s2tG6N2RDaFqwUUAT+mPMEft11VkJy5A=";
cargoSha256 = "sha256-mkrC8uzfNpL0MQUMjcNaJf5c1wSdlBVg8AMgc/zxM6A=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]

6
pkgs/applications/version-management/gitea/default.nix
View File

@@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.15.9";
version = "1.15.10";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "sha256-DzPgAy7Curypc/66c1NqYSHFgtovpY5qEq/Le+0VYk4=";
sha256 = "1rrxkpahgzxgs4mckdsrss19mdjdicjgskw689hvhc063slb9vlx";
};
unpackPhase = ''
@@ -77,6 +77,6 @@ buildGoPackage rec {
description = "Git with a cup of tea";
homepage = "https://gitea.io";
license = licenses.mit;
maintainers = with maintainers; [ disassembler kolaente ma27 ];
maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ];
};
}

6
pkgs/servers/mautrix-whatsapp/default.nix
View File

@@ -2,18 +2,18 @@
buildGo117Module rec {
pname = "mautrix-whatsapp";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "mautrix";
repo = "whatsapp";
rev = "v${version}";
sha256 = "sha256-W+5DtCp7P/0azfusv+Nt3G9VcWKPUxVJmNwSfPjxjbw=";
sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8=";
};
buildInputs = [ olm ];
vendorSha256 = "sha256-Fr7yVTl8PIdr+SxXhUKG9DS18762HqL9ap6sUM3ziCQ=";
vendorSha256 = "sha256-aX2dWoctVjx13eAu/5DWku5GFxFBuP/RRBs1+7CStDU=";
doCheck = false;