nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-26 10:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-21.11 into staging-21.11

Browse Source
This commit is contained in:
github-actions[bot]
2021-12-05 00:10:57 +00:00
committed by GitHub
parent 19701f3fae 05dce6121b
commit 4ad06d5a3e
19 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/lib/test-driver/test-driver.py
View File

@@ -904,6 +904,7 @@ class Machine:
def send_key(self, key: str) -> None:
key = CHAR_TO_KEY.get(key, key)
self.send_monitor_command("sendkey {}".format(key))
time.sleep(0.01)
def start(self) -> None:
if self.booted:

6
nixos/modules/services/misc/mx-puppet-discord.nix
View File

@@ -39,7 +39,7 @@ in {
#defaults to sqlite but can be configured to use postgresql with
#connstring
database.filename = "${dataDir}/mx-puppet-discord/database.db";
database.filename = "${dataDir}/database.db";
logging = {
console = "info";
lineDateFormat = "MMM-D HH:mm:ss.SSS";
@@ -110,7 +110,9 @@ in {
UMask = 0027;
ExecStart = ''
${pkgs.mx-puppet-discord}/bin/mx-puppet-discord -c ${settingsFile}
${pkgs.mx-puppet-discord}/bin/mx-puppet-discord \
-c ${settingsFile} \
-f ${registrationFile}
'';
};
};

3
nixos/modules/services/networking/lxd-image-server.nix
View File

@@ -55,9 +55,8 @@ in
path = "/var/log/lxd-image-server/lxd-image-server.log";
frequency = "daily";
keep = 21;
user = "lxd-image-server";
group = cfg.group;
extraConfig = ''
create 755 lxd-image-server ${cfg.group}
missingok
compress
delaycompress

14
nixos/modules/services/networking/nix-serve.nix
View File

@@ -37,8 +37,6 @@ in
nix-store --generate-binary-cache-key key-name secret-key-file public-key-file
```
Make sure user `nix-serve` has read access to the private key file.
For more details see <citerefentry><refentrytitle>nix-store</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
'';
};
@@ -61,16 +59,22 @@ in
path = [ config.nix.package.out pkgs.bzip2.bin ];
environment.NIX_REMOTE = "daemon";
environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
script = ''
${lib.optionalString (cfg.secretKeyFile != null) ''
export NIX_SECRET_KEY_FILE="$CREDENTIALS_DIRECTORY/NIX_SECRET_KEY_FILE"
''}
exec ${pkgs.nix-serve}/bin/nix-serve --listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}
'';
serviceConfig = {
Restart = "always";
RestartSec = "5s";
ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
"--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
User = "nix-serve";
Group = "nix-serve";
DynamicUser = true;
LoadCredential = lib.optionalString (cfg.secretKeyFile != null)
"NIX_SECRET_KEY_FILE:${cfg.secretKeyFile}";
};
};
};

2
nixos/modules/services/web-apps/nextcloud.nix
View File

@@ -153,7 +153,7 @@ in {
package = mkOption {
type = types.package;
description = "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud21" "nextcloud22" ];
relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ];
};
phpPackage = mkOption {
type = types.package;

4
nixos/modules/services/web-apps/nextcloud.xml
View File

@@ -11,8 +11,8 @@
desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
</para>
<para>
The current default by NixOS is <package>nextcloud22</package> which is also the latest
major version available.
The current default by NixOS is <package>nextcloud22</package>, the latest version available
is <package>nextcloud23</package>.
</para>
<section xml:id="module-services-nextcloud-basic-usage">
<title>Basic usage</title>

4
nixos/modules/tasks/snapraid.nix
View File

@@ -193,7 +193,6 @@ in
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateTmp = true;
ProtectClock = true;
ProtectControlGroups = true;
@@ -208,7 +207,8 @@ in
SystemCallArchitectures = "native";
SystemCallFilter = "@system-service";
SystemCallErrorNumber = "EPERM";
CapabilityBoundingSet = "CAP_DAC_OVERRIDE";
CapabilityBoundingSet = "CAP_DAC_OVERRIDE" ++
lib.optionalString cfg.touchBeforeSync " CAP_FOWNER";
ProtectSystem = "strict";
ProtectHome = "read-only";

4
nixos/tests/all-tests.nix
View File

@@ -315,8 +315,8 @@ in
nginx-sso = handleTest ./nginx-sso.nix {};
nginx-variants = handleTest ./nginx-variants.nix {};
nitter = handleTest ./nitter.nix {};
nix-serve = handleTest ./nix-ssh-serve.nix {};
nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};
nix-serve = handleTest ./nix-serve.nix {};
nix-serve-ssh = handleTest ./nix-serve-ssh.nix {};
nixops = handleTest ./nixops/default.nix {};
nixos-generate-config = handleTest ./nixos-generate-config.nix {};
node-red = handleTest ./node-red.nix {};

2
nixos/tests/nextcloud/default.nix
View File

@@ -18,4 +18,4 @@ foldl
};
})
{}
[ 21 22 ]
[ 21 22 23 ]

0
nixos/tests/nix-ssh-serve.nix → nixos/tests/nix-serve-ssh.nix
View File

14
pkgs/applications/science/math/geogebra/geogebra6.nix
View File

@@ -1,7 +1,7 @@
{ lib, stdenv, unzip, fetchurl, electron_6, makeWrapper, geogebra }:
{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }:
let
pname = "geogebra";
version = "6-0-644-0";
version = "6-0-676-0";
srcIcon = geogebra.srcIcon;
desktopItem = geogebra.desktopItem;
@@ -18,9 +18,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
"https://web.archive.org/web/20210604132845/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
"https://web.archive.org/web/20211123222708/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip"
];
sha256 = "bbe9e1a35abacfd560c0b7aa1ab975853e6adac08608bb70cd80261179e3f922";
sha256 = "0wn90n2nd476rkf83gk9vvcpbjflkrvyri50pnmv52j76n023hmm";
};
dontConfigure = true;
@@ -38,7 +38,7 @@ let
installPhase = ''
mkdir -p $out/libexec/geogebra/ $out/bin
cp -r GeoGebra-linux-x64/{resources,locales} "$out/"
makeWrapper ${lib.getBin electron_6}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app"
makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app"
install -Dm644 "${desktopItem}/share/applications/"* \
-t $out/share/applications/
@@ -53,9 +53,9 @@ let
src = fetchurl {
urls = [
"https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20210406084052/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
"https://web.archive.org/web/20211124143625/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip"
];
sha256 = "0fa680yyz4nry1xvb9v6qqh1mib6grff5d3p7d90nyjlv101p262";
sha256 = "1dwv2f94a1c2y10lmy0i66cafynalp7dkqgnpk4f0mk6pir2fdgj";
};
dontUnpack = true;

10
pkgs/desktops/gnome/extensions/extensionOverrides.nix
View File

@@ -2,6 +2,7 @@
, ddcutil
, gjs
, xprop
, touchegg
}:
let
# Helper method to reduce redundancy
@@ -47,4 +48,13 @@ super: lib.trivial.pipe super [
meta.maintainers = with lib.maintainers; [ rhoriguchi ];
}))
(patchExtension "x11gestures@joseexposito.github.io" (old: {
# Extension can't find Touchegg
# https://github.com/NixOS/nixpkgs/issues/137621
postPatch = ''
substituteInPlace "src/touchegg/ToucheggConfig.js" \
--replace "GLib.build_filenamev([GLib.DIR_SEPARATOR_S, 'usr', 'share', 'touchegg', 'touchegg.conf'])" "'${touchegg}/share/touchegg/touchegg.conf'"
'';
}))
]

7
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@@ -112,7 +112,7 @@ let
self = stdenv.mkDerivation rec {
pname = "fwupd";
version = "1.7.1";
version = "1.7.2";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -121,7 +121,7 @@ let
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
sha256 = "sha256-rlbOtEt4byH1TRM6xwvF2cuM1L2gFnM5xmmiKNpn+jw=";
sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ=";
};
patches = [
@@ -142,6 +142,9 @@ let
# Tests detect fwupd is installed when prefix is /usr.
./fix-install-detection.patch
# EFI capsule is located in fwupd-efi now.
./efi-app-path.patch
];
nativeBuildInputs = [

13
pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/meson.build b/meson.build
index 4330512e..e53b70ab 100644
--- a/meson.build
+++ b/meson.build
@@ -403,7 +403,7 @@ endif
if build_standalone and get_option('plugin_uefi_capsule')
efiboot = dependency('efiboot')
- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
+ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi')
conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
if host_cpu == 'x86'

5
pkgs/servers/nextcloud/default.nix
View File

@@ -54,6 +54,11 @@ in {
version = "22.2.3";
sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo=";
};
nextcloud23 = generic {
version = "23.0.0";
sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw=";
};
# tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
}

4
pkgs/tools/misc/etcher/default.nix
View File

@@ -5,7 +5,7 @@
, util-linux
, bash
, makeWrapper
, electron_12
, electron
}:
let
@@ -23,8 +23,6 @@ let
"i686-linux" = "i386";
}."${system}" or throwSystem;
electron = electron_12;
in
stdenv.mkDerivation rec {

5
pkgs/tools/package-management/nix-serve/default.nix
View File

@@ -37,7 +37,10 @@ stdenv.mkDerivation {
--add-flags $out/libexec/nix-serve/nix-serve.psgi
'';
passthru.tests.nix-serve = nixosTests.nix-serve;
passthru.tests = {
nix-serve = nixosTests.nix-serve;
nix-serve-ssh = nixosTests.nix-serve-ssh;
};
meta = {
homepage = "https://github.com/edolstra/nix-serve";

1
pkgs/tools/system/plan9port/default.nix
View File

@@ -59,6 +59,7 @@ stdenv.mkDerivation {
IOKit
Metal
QuartzCore
darwin.DarwinTools
]);
builder = ./builder.sh;

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

@@ -1476,7 +1476,7 @@ with pkgs;
bic = callPackage ../development/interpreters/bic { };
binance = callPackage ../applications/misc/binance {
electron = electron_12;
electron = electron_13;
};
bit = callPackage ../applications/version-management/git-and-tools/bit { };
@@ -3462,7 +3462,7 @@ with pkgs;
pn = callPackage ../tools/text/pn { };
pocket-casts = callPackage ../applications/audio/pocket-casts {
electron = electron_12;
electron = electron_14;
};
poweralertd = callPackage ../tools/misc/poweralertd { };
@@ -4992,7 +4992,9 @@ with pkgs;
escrotum = callPackage ../tools/graphics/escrotum { };
etcher = callPackage ../tools/misc/etcher { };
etcher = callPackage ../tools/misc/etcher {
electron = electron_14;
};
ethtool = callPackage ../tools/misc/ethtool { };
@@ -7868,7 +7870,7 @@ with pkgs;
grocy = callPackage ../servers/grocy { };
inherit (callPackage ../servers/nextcloud {})
nextcloud20 nextcloud21 nextcloud22;
nextcloud20 nextcloud21 nextcloud22 nextcloud23;
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
@@ -9961,7 +9963,7 @@ with pkgs;
thc-ipv6 = callPackage ../tools/security/thc-ipv6 { };
thedesk = callPackage ../applications/misc/thedesk {
electron = electron_12;
electron = electron_14;
};
theharvester = callPackage ../tools/security/theharvester { };
@@ -29088,7 +29090,7 @@ with pkgs;
weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
whalebird = callPackage ../applications/misc/whalebird {
electron = electron_12;
electron = electron_14;
};
wio = callPackage ../applications/window-managers/wio { };
@@ -31813,7 +31815,9 @@ with pkgs;
gap-full = lowPrio (gap.override { packageSet = "full"; });
geogebra = callPackage ../applications/science/math/geogebra { };
geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { };
geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix {
electron = electron_14;
};
maxima = callPackage ../applications/science/math/maxima {
ecl = null;