mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-03-26 00:02:23 +00:00 committed by GitHub
parent c6dd9fd65d 4bbf1a90c4
commit 880c50a133
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 179 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
maintainers/scripts/remove-old-aliases.py
View file

@ -57,7 +57,7 @@ def get_date_lists(
except ValueError:
continue
if my_date is None or my_date > cutoffdate:
if my_date is None or my_date > cutoffdate or "preserve, reason:" in line.lower():
continue
if "=" not in line:

10
nixos/lib/systemd-lib.nix
View file

@ -23,8 +23,9 @@ in rec {
inherit (unit) text;
}
''
mkdir -p $out
echo -n "$text" > $out/${shellEscape name}
name=${shellEscape name}
mkdir -p "$out/$(dirname "$name")"
echo -n "$text" > "$out/$name"
''
else
pkgs.runCommand "unit-${mkPathSafeName name}-disabled"
@ -32,8 +33,9 @@ in rec {
allowSubstitutes = false;
}
''
mkdir -p $out
ln -s /dev/null $out/${shellEscape name}
name=${shellEscape name}
mkdir -p "$out/$(dirname "$name")"
ln -s /dev/null "$out/$name"
'';
boolValues = [true false "yes" "no"];

53
nixos/modules/installer/cd-dvd/iso-image.nix
View file

@ -91,29 +91,9 @@ let
SERIAL 0 115200
TIMEOUT ${builtins.toString syslinuxTimeout}
UI vesamenu.c32
MENU TITLE NixOS
MENU BACKGROUND /isolinux/background.png
MENU RESOLUTION 800 600
MENU CLEAR
MENU ROWS 6
MENU CMDLINEROW -4
MENU TIMEOUTROW -3
MENU TABMSGROW -2
MENU HELPMSGROW -1
MENU HELPMSGENDROW -1
MENU MARGIN 0
# FG:AARRGGBB BG:AARRGGBB shadow
MENU COLOR BORDER 30;44 #00000000 #00000000 none
MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none
MENU COLOR TABMSG 31;40 #80000000 #00000000 none
MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none
MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none
MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none
MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none
MENU COLOR TITLE 1;36;44 #00000000 #00000000 none
MENU COLOR UNSEL 37;44 #FF000000 #00000000 none
MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std
${config.isoImage.syslinuxTheme}
DEFAULT boot
@ -601,6 +581,37 @@ in
'';
};
isoImage.syslinuxTheme = mkOption {
default = ''
MENU TITLE NixOS
MENU RESOLUTION 800 600
MENU CLEAR
MENU ROWS 6
MENU CMDLINEROW -4
MENU TIMEOUTROW -3
MENU TABMSGROW -2
MENU HELPMSGROW -1
MENU HELPMSGENDROW -1
MENU MARGIN 0
# FG:AARRGGBB BG:AARRGGBB shadow
MENU COLOR BORDER 30;44 #00000000 #00000000 none
MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none
MENU COLOR TABMSG 31;40 #80000000 #00000000 none
MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none
MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none
MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none
MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none
MENU COLOR TITLE 1;36;44 #00000000 #00000000 none
MENU COLOR UNSEL 37;44 #FF000000 #00000000 none
MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std
'';
type = types.str;
description = ''
The syslinux theme used for BIOS boot.
'';
};
isoImage.appendToMenuLabel = mkOption {
default = " Installer";
example = " Live System";

1
nixos/modules/module-list.nix
View file

@ -118,6 +118,7 @@
./misc/version.nix
./misc/wordlist.nix
./misc/nixops-autoluks.nix
./programs/_1password-gui.nix
./programs/adb.nix
./programs/appgate-sdp.nix
./programs/atop.nix

69
nixos/modules/programs/_1password-gui.nix Normal file
View file

@ -0,0 +1,69 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.programs._1password-gui;
in {
options = {
programs._1password-gui = {
enable = mkEnableOption "The 1Password Desktop application with browser integration";
groupId = mkOption {
type = types.int;
example = literalExpression "5000";
description = ''
The GroupID to assign to the onepassword group, which is needed for browser integration. The group ID must be 1000 or greater.
'';
};
polkitPolicyOwners = mkOption {
type = types.listOf types.str;
default = [];
example = literalExpression "[\"user1\" \"user2\" \"user3\"]";
description = ''
A list of users who should be able to integrate 1Password with polkit-based authentication mechanisms. By default, no users will have such access.
'';
};
package = mkOption {
type = types.package;
default = pkgs._1password-gui;
defaultText = literalExpression "pkgs._1password-gui";
example = literalExpression "pkgs._1password-gui";
description = ''
The 1Password derivation to use. This can be used to upgrade from the stable release that we keep in nixpkgs to the betas.
'';
};
};
};
config = let
package = cfg.package.override {
polkitPolicyOwners = cfg.polkitPolicyOwners;
};
in mkIf cfg.enable {
environment.systemPackages = [ package ];
users.groups.onepassword.gid = cfg.groupId;
security.wrappers = {
"1Password-BrowserSupport" =
{ source = "${cfg.package}/share/1password/1Password-BrowserSupport";
owner = "root";
group = "onepassword";
setuid = false;
setgid = true;
};
"1Password-KeyringHelper" =
{ source = "${cfg.package}/share/1password/1Password-KeyringHelper";
owner = "root";
group = "onepassword";
setuid = true;
setgid = true;
};
};
};
}

2
nixos/tests/all-tests.nix
View file

@ -519,7 +519,7 @@ in
systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
systemd-nspawn = handleTest ./systemd-nspawn.nix {};
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
systemd-unit-path = handleTest ./systemd-unit-path.nix {};
systemd-misc = handleTest ./systemd-misc.nix {};
taskserver = handleTest ./taskserver.nix {};
teeworlds = handleTest ./teeworlds.nix {};
telegraf = handleTest ./telegraf.nix {};

17
nixos/tests/systemd-unit-path.nix → nixos/tests/systemd-misc.nix
View file

@ -29,10 +29,23 @@ let
};
in
{
name = "systemd-unit-path";
name = "systemd-misc";
machine = { pkgs, lib, ... }: {
boot.extraSystemdUnitPaths = [ "/etc/systemd-rw/system" ];
users.users.limited = {
isNormalUser = true;
uid = 1000;
};
systemd.units."user-1000.slice.d/limits.conf" = {
text = ''
[Slice]
TasksAccounting=yes
TasksMax=100
'';
};
};
testScript = ''
@ -43,5 +56,7 @@ in
)
machine.succeed("systemctl start example.service")
machine.succeed("systemctl status example.service | grep 'Active: active'")
machine.succeed("systemctl show --property TasksMax --value user-1000.slice | grep 100")
'';
})

1
pkgs/applications/misc/1password-gui/default.nix
View file

@ -101,6 +101,7 @@ in stdenv.mkDerivation rec {
mkdir -p $out/share/polkit-1/actions
substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}"
'') + ''
# Icons
cp -a resources/icons $out/share

6
pkgs/applications/networking/cluster/nerdctl/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.17.1";
version = "0.18.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fWev5KgJEuL2pDm17kxdqRKo7t3+dDt5UD5iTHneJSY=";
sha256 = "sha256-gkfy/tKzh6EO+nyjuiU3InSErKvGcJp/X7oqYk0Msr0=";
};
vendorSha256 = "sha256-7L5xA/2uQnu10QGZn49K3oJf4HBEvt8q/sOR6BRXlo0=";
vendorSha256 = "sha256-hjhZYNpqt9yFNrDVpFlguESUAAqU+AhpUQTCvyMadPk=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

4
pkgs/development/python-modules/affine/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "affine";
version = "2.3.0";
version = "2.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "00jil4q3b17qml6azim7s7zar6qb1vhsf0g888y637m23bpms11f";
sha256 = "sha256-1nbeZhV61q+Z/9lOD1Tonfw1sPtyUurS7QrS3KQxvdA=";
};
checkInputs = [ pytest ];

15
pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
View file

@ -6,17 +6,20 @@
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
version = "17.0.0";
version = "18.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8=";
sha256 = "sha256-b4AwcnSp6JOtG8VaBbUN7d/NIhHN2TPnyjzCUVhMOzg=";
};
propagatedBuildInputs = [
@ -24,14 +27,14 @@ buildPythonPackage rec {
msrestazure
azure-common
azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.containerservice" ];
pythonImportsCheck = [
"azure.mgmt.containerservice"
];
meta = with lib; {
description = "This is the Microsoft Azure Container Service Management Client Library";

4
pkgs/development/python-modules/capstone/default.nix
View file

@ -18,6 +18,10 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace manylinux1 manylinux2014
'';
# aarch64 only available from MacOS SDK 11 onwards, so fix the version tag.
# otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense.
setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--plat-name" "macosx_11_0" ];
propagatedBuildInputs = [ setuptools ];
checkPhase = ''

4
pkgs/development/python-modules/diff-cover/default.nix
View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "diff-cover";
version = "6.4.4";
version = "6.4.5";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "diff_cover";
inherit version;
sha256 = "b1d782c1ce53ad4b2c5545f8b7aa799eb61a0b12a62b376a18e2313c6f2d77f1";
sha256 = "sha256-qUuMHBfcJEmJF/con+ODtFfYrU7yo//KgKiSpByLWKY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/mkdocs-material/default.nix
View file

@ -9,13 +9,13 @@
buildPythonApplication rec {
pname = "mkdocs-material";
version = "8.2.6";
version = "8.2.7";
src = fetchFromGitHub {
owner = "squidfunk";
repo = pname;
rev = version;
sha256 = "sha256-4t9LBZc73V8eAIUO+BAZPgak+AX3o2YKZJWug+b6TBY=";
sha256 = "sha256-Jh0FmtBCYCEk6mYFLOKb1HQXQ4Wc9Z6JCHFVu420IBk=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/unicorn/default.nix
View file

@ -20,7 +20,10 @@ buildPythonPackage rec {
'';
# needed on non-x86 linux
setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ];
setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]
# aarch64 only available from MacOS SDK 11 onwards, so fix the version tag.
# otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense.
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--plat-name" "macosx_11_0" ];
propagatedBuildInputs = [
setuptools

7
pkgs/development/web/insomnia/default.nix
View file

@ -2,7 +2,7 @@
, fontconfig, freetype, gdk-pixbuf, glib, pango, mesa, nspr, nss, gtk3
, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, nghttp2
, libudev0-shim, glibc, curl, openssl, autoPatchelfHook }:
let
@ -15,12 +15,12 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
version = "2021.7.2";
version = "2022.1.1";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
sha256 = "sha256-HkQWW4h2+XT5Xi4oiIiMPnrRKw+GIyjGMQ5B1NrBARU=";
sha256 = "sha256-AaRiXGdKCzcsY4GEgLr5PO+f7STsR+p7ybGISdJlCVk=";
};
nativeBuildInputs =
@ -53,6 +53,7 @@ in stdenv.mkDerivation rec {
libXrender
libXtst
libxcb
libxshmfence
mesa # for libgbm
nspr
nss

6
pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
View file

@ -1,9 +1,9 @@
{ lib
, fetchpatch
, kernel
, date ? "2022-03-09"
, commit ? "2280551cebc1735f74eef75d650dd5e175461657"
, diffHash ? "1mrrydidbapdq0fs0vpqhs88k6ghdrvmjpk2zi7xlwj7j32h0nwp"
, date ? "2022-03-21"
, commit ? "c38b7167aa5f3b1b91dcc93ade57f30e95064590"
, diffHash ? "04lgwnng7p2rlz9sxn74n22750kh524xwfws3agqs12pcrvfsm0j"
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
, argsOverride ? {}
, ...

4
pkgs/servers/dict/wiktionary/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "dict-db-wiktionary";
version = "20210920";
version = "20220301";
src = fetchurl {
url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2";
sha256 = "UeufbpSpRL+JrU3SkhxzWJncEsrM1es88grRmFwGABk=";
sha256 = "Gobilm9Rlb7qtZU+hlsYOl1/BAjj/MtNp5z2GQx8NN8=";
};
# script in nixpkgs does not support python2

4
pkgs/shells/fish/default.nix
View file

@ -134,7 +134,7 @@ let
fish = stdenv.mkDerivation rec {
pname = "fish";
version = "3.4.0";
version = "3.4.1";
src = fetchurl {
# There are differences between the release tarball and the tarball GitHub
@ -144,7 +144,7 @@ let
# --version`), as well as the local documentation for all builtins (and
# maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-tbSKuEhrGe9xajL39GuIuepTVhVfDpZ+6Z9Ak2RUE8U=";
sha256 = "sha256-tvI7OEOwTbawqQ/qH28NDkDMAntKcyCYIAhj8oZKlOo=";
};
# Fix FHS paths in tests

6
pkgs/tools/filesystems/bcachefs-tools/default.nix
View file

@ -22,13 +22,13 @@
stdenv.mkDerivation {
pname = "bcachefs-tools";
version = "unstable-2022-03-09";
version = "unstable-2022-03-22";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
rev = "3e2e3d468eed1d5ebbb4c6309d2eaebd081912c5";
sha256 = "1sb0dj2whlp3dxgf642z7yx7s8va5ah82zi6r4qni7l64qy1n554";
rev = "f3cdace86c8b60a4efaced23b2d31c16dc610da9";
sha256 = "1hg4cjrs4yr0mx3mmm1jls93w1skpq5wzp2dzx9rq4w5il2xmx19";
};
postPatch = ''

4
pkgs/tools/networking/godns/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "godns";
version = "2.7";
version = "2.7.1";
src = fetchFromGitHub {
owner = "TimothyYe";
repo = "godns";
rev = "v${version}";
sha256 = "sha256-PD/3WIxNPtC7s4+2ogWG5DEm717rYQLMx9XA06Q6ebo=";
sha256 = "sha256-4PkG8u0wYHHFWR9s4s08tkeBbXdxTUv48HRZsSraNak=";
};
vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850=";

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-03-22";
version = "2022-03-24";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-2V6levydKfYtpctgcyBuLES0OujWi8eqlB3x/YoOyHY=";
sha256 = "sha256-G2KFDNNM4NJ7DgQu1+uNjgixzyLFnF0G0YQ29PgYZ/0=";
};

9
pkgs/top-level/aliases.nix
View file

@ -38,9 +38,14 @@ in
# A script to convert old aliases to throws and remove old
# throws can be found in './maintainers/scripts/remove-old-aliases.py'.
# Add 'preserve, reason: reason why' after the date if the alias should not be removed.
# Try to keep them to a minimum.
# valid examples of what to preserve:
# distro aliases such as:
# debian-package-name -> nixos-package-name
mapAliases ({
# forceSystem should not be used directly in Nixpkgs.
# Added 2018-07-16
# Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
forceSystem = system: _:
(import self.path { localSystem = { inherit system; }; });

2
pkgs/top-level/linux-kernels.nix
View file

@ -186,7 +186,7 @@ in {
else testing;
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
kernel = linux_5_15;
kernel = linux_5_16;
kernelPatches = kernel.kernelPatches;
};