JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-02-06 12:03:11 +00:00 committed by GitHub
commit 7b084b3ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 1003 additions and 588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -310,6 +310,13 @@
<literal>writers.writePyPy2</literal> needs to be used.
</para>
</listitem>
<listitem>
<para>
The <literal>gnome-passwordsafe</literal> package updated to
<link xlink:href="https://gitlab.gnome.org/World/secrets/-/tags/6.0">version
6.x</link> and renamed to <literal>gnome-secrets</literal>.
</para>
</listitem>
<listitem>
<para>
If you previously used

2
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -102,6 +102,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
- The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`.
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
- The backward compatibility in `services.wordpress` to configure sites with

4
nixos/modules/config/users-groups.nix
View File

@ -635,9 +635,9 @@ in {
|| cfg.passwordFile != null
|| cfg.openssh.authorizedKeys.keys != []
|| cfg.openssh.authorizedKeys.keyFiles != [])
) cfg.users) ++ [
) cfg.users ++ [
config.security.googleOsLogin.enable
];
]);
message = ''
Neither the root account nor any wheel user has a password or SSH authorized key.
You must set one to prevent being locked out of your system.

9
nixos/modules/security/google_oslogin.nix
View File

@ -5,7 +5,7 @@ with lib;
let
cfg = config.security.googleOsLogin;
package = pkgs.google-compute-engine-oslogin;
package = pkgs.google-guest-oslogin;
in
@ -17,7 +17,7 @@ in
type = types.bool;
default = false;
description = ''
Whether to enable Google OS Login
Whether to enable Google OS Login.
The OS Login package enables the following components:
AuthorizedKeysCommand to query valid SSH keys from the user's OS Login
@ -36,7 +36,7 @@ in
security.pam.services.sshd = {
makeHomeDir = true;
googleOsLoginAccountVerification = true;
# disabled for now: googleOsLoginAuthentication = true;
googleOsLoginAuthentication = true;
};
security.sudo.extraConfig = ''
@ -47,6 +47,9 @@ in
"d /var/google-users.d 750 root root -"
];
systemd.packages = [ package ];
systemd.timers.google-oslogin-cache.wantedBy = [ "timers.target" ];
# enable the nss module, so user lookups etc. work
system.nssModules = [ package ];
system.nssDatabases.passwd = [ "cache_oslogin" "oslogin" ];

12
nixos/modules/security/pam.nix
View File

@ -444,15 +444,15 @@ let
account sufficient ${pam_krb5}/lib/security/pam_krb5.so
'' +
optionalString cfg.googleOsLoginAccountVerification ''
account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so
account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so
account [success=ok ignore=ignore default=die] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so
account [success=ok default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so
'' +
''
# Authentication management.
'' +
optionalString cfg.googleOsLoginAuthentication ''
auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so
auth [success=done perm_denied=die default=ignore] ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so
'' +
optionalString cfg.rootOK ''
auth sufficient pam_rootok.so
@ -1091,11 +1091,11 @@ in
mr ${pam_ccreds}/lib/security/pam_ccreds.so,
'' +
optionalString (isEnabled (cfg: cfg.googleOsLoginAccountVerification)) ''
mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so,
mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so,
mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so,
mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_admin.so,
'' +
optionalString (isEnabled (cfg: cfg.googleOsLoginAuthentication)) ''
mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so,
mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so,
'' +
optionalString (config.security.pam.enableSSHAgentAuth
&& isEnabled (cfg: cfg.sshAgentAuth)) ''

1
nixos/modules/services/networking/yggdrasil.xml
View File

@ -84,7 +84,6 @@ in {
interface eth0
{
AdvSendAdvert on;
AdvDefaultLifetime 0;
prefix ${prefix}::/64 {
AdvOnLink on;
AdvAutonomous on;

36
nixos/modules/virtualisation/fetch-instance-ssh-keys.bash
View File

@ -1,36 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
WGET() {
wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google' "$@"
}
# When dealing with cryptographic keys, we want to keep things private.
umask 077
mkdir -p /root/.ssh
echo "Fetching authorized keys..."
WGET -O /tmp/auth_keys http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys
# Read keys one by one, split in case Google decided
# to append metadata (it does sometimes) and add to
# authorized_keys if not already present.
touch /root/.ssh/authorized_keys
while IFS='' read -r line || [[ -n "$line" ]]; do
keyLine=$(echo -n "$line" | cut -d ':' -f2)
IFS=' ' read -r -a array <<<"$keyLine"
if [[ ${#array[@]} -ge 3 ]]; then
echo "${array[@]:0:3}" >>/tmp/new_keys
echo "Added ${array[*]:2} to authorized_keys"
fi
done </tmp/auth_keys
mv /tmp/new_keys /root/.ssh/authorized_keys
chmod 600 /root/.ssh/authorized_keys
echo "Fetching host keys..."
WGET -O /tmp/ssh_host_ed25519_key http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key
WGET -O /tmp/ssh_host_ed25519_key.pub http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key_pub
mv -f /tmp/ssh_host_ed25519_key* /etc/ssh/
chmod 600 /etc/ssh/ssh_host_ed25519_key
chmod 644 /etc/ssh/ssh_host_ed25519_key.pub

137
nixos/modules/virtualisation/google-compute-config.nix
View File

@ -1,8 +1,5 @@
{ config, lib, pkgs, ... }:
with lib;
let
gce = pkgs.google-compute-engine;
in
{
imports = [
../profiles/headless.nix
@ -40,7 +37,8 @@ in
security.googleOsLogin.enable = true;
# Use GCE udev rules for dynamic disk volumes
services.udev.packages = [ gce ];
services.udev.packages = [ pkgs.google-guest-configs ];
services.udev.path = [ pkgs.google-guest-configs ];
# Force getting the hostname from Google Compute.
networking.hostName = mkDefault "";
@ -48,12 +46,6 @@ in
# Always include cryptsetup so that NixOps can use it.
environment.systemPackages = [ pkgs.cryptsetup ];
# Make sure GCE image does not replace host key that NixOps sets
environment.etc."default/instance_configs.cfg".text = lib.mkDefault ''
[InstanceSetup]
set_host_keys = false
'';
# Rely on GCP's firewall instead
networking.firewall.enable = mkDefault false;
@ -69,105 +61,42 @@ in
# GC has 1460 MTU
networking.interfaces.eth0.mtu = 1460;
# Used by NixOps
systemd.services.fetch-instance-ssh-keys = {
description = "Fetch host keys and authorized_keys for root user";
wantedBy = [ "sshd.service" ];
before = [ "sshd.service" ];
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
path = [ pkgs.wget ];
serviceConfig = {
Type = "oneshot";
ExecStart = pkgs.runCommand "fetch-instance-ssh-keys" { } ''
cp ${./fetch-instance-ssh-keys.bash} $out
chmod +x $out
${pkgs.shfmt}/bin/shfmt -i 4 -d $out
${pkgs.shellcheck}/bin/shellcheck $out
patchShebangs $out
'';
PrivateTmp = true;
StandardError = "journal+console";
StandardOutput = "journal+console";
};
};
systemd.services.google-instance-setup = {
description = "Google Compute Engine Instance Setup";
after = [ "network-online.target" "network.target" "rsyslog.service" ];
before = [ "sshd.service" ];
path = with pkgs; [ coreutils ethtool openssh ];
serviceConfig = {
ExecStart = "${gce}/bin/google_instance_setup";
StandardOutput="journal+console";
Type = "oneshot";
};
wantedBy = [ "sshd.service" "multi-user.target" ];
};
systemd.services.google-network-daemon = {
description = "Google Compute Engine Network Daemon";
after = [ "network-online.target" "network.target" "google-instance-setup.service" ];
path = with pkgs; [ iproute2 ];
serviceConfig = {
ExecStart = "${gce}/bin/google_network_daemon";
StandardOutput="journal+console";
Type="simple";
};
systemd.packages = [ pkgs.google-guest-agent ];
systemd.services.google-guest-agent = {
wantedBy = [ "multi-user.target" ];
restartTriggers = [ config.environment.etc."default/instance_configs.cfg".source ];
path = lib.optional config.users.mutableUsers pkgs.shadow;
};
systemd.services.google-startup-scripts.wantedBy = [ "multi-user.target" ];
systemd.services.google-shutdown-scripts.wantedBy = [ "multi-user.target" ];
systemd.services.google-clock-skew-daemon = {
description = "Google Compute Engine Clock Skew Daemon";
after = [ "network.target" "google-instance-setup.service" "google-network-daemon.service" ];
serviceConfig = {
ExecStart = "${gce}/bin/google_clock_skew_daemon";
StandardOutput="journal+console";
Type = "simple";
};
wantedBy = ["multi-user.target"];
};
security.sudo.extraRules = mkIf config.users.mutableUsers [
{ groups = [ "google-sudoers" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; }
];
users.groups.google-sudoers = mkIf config.users.mutableUsers { };
systemd.services.google-shutdown-scripts = {
description = "Google Compute Engine Shutdown Scripts";
after = [
"network-online.target"
"network.target"
"rsyslog.service"
"google-instance-setup.service"
"google-network-daemon.service"
];
serviceConfig = {
ExecStart = "${pkgs.coreutils}/bin/true";
ExecStop = "${gce}/bin/google_metadata_script_runner --script-type shutdown";
RemainAfterExit = true;
StandardOutput="journal+console";
TimeoutStopSec = "0";
Type = "oneshot";
};
wantedBy = [ "multi-user.target" ];
};
boot.extraModprobeConfig = lib.readFile "${pkgs.google-guest-configs}/etc/modprobe.d/gce-blacklist.conf";
systemd.services.google-startup-scripts = {
description = "Google Compute Engine Startup Scripts";
after = [
"network-online.target"
"network.target"
"rsyslog.service"
"google-instance-setup.service"
"google-network-daemon.service"
];
serviceConfig = {
ExecStart = "${gce}/bin/google_metadata_script_runner --script-type startup";
KillMode = "process";
StandardOutput = "journal+console";
Type = "oneshot";
};
wantedBy = [ "multi-user.target" ];
};
environment.etc."sysctl.d/60-gce-network-security.conf".source = "${pkgs.google-guest-configs}/etc/sysctl.d/60-gce-network-security.conf";
environment.etc."sysctl.d/11-gce-network-security.conf".source = "${gce}/sysctl.d/11-gce-network-security.conf";
environment.etc."default/instance_configs.cfg".text = ''
[Accounts]
useradd_cmd = useradd -m -s /run/current-system/sw/bin/bash -p * {user}
[Daemons]
accounts_daemon = ${boolToString config.users.mutableUsers}
[InstanceSetup]
# Make sure GCE image does not replace host key that NixOps sets.
set_host_keys = false
[MetadataScripts]
default_shell = ${pkgs.stdenv.shell}
[NetworkInterfaces]
dhclient_script = ${pkgs.google-guest-configs}/bin/google-dhclient-script
# We set up network interfaces declaratively.
setup = false
'';
}

4
nixos/tests/google-oslogin/default.nix
View File

@ -31,10 +31,10 @@ in {
# mockserver should return a non-expired ssh key for both mockuser and mockadmin
server.succeed(
f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"'
f'${pkgs.google-guest-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"'
)
server.succeed(
f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"'
f'${pkgs.google-guest-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"'
)
# install snakeoil ssh key on the client, and provision .ssh/config file

4
nixos/tests/google-oslogin/server.nix
View File

@ -23,7 +23,5 @@ in {
security.googleOsLogin.enable = true;
# Mock google service
networking.extraHosts = ''
127.0.0.1 metadata.google.internal
'';
networking.interfaces.lo.ipv4.addresses = [ { address = "169.254.169.254"; prefixLength = 32; } ];
}

0
nixos/tests/google-oslogin/server.py Normal file → Executable file
View File

2
nixos/tests/ssh-keys.nix
View File

@ -10,6 +10,6 @@ pkgs:
snakeOilPublicKey = pkgs.lib.concatStrings [
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
"yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
"9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil"
"9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"
];
}

4
pkgs/applications/misc/fnott/default.nix
View File

@ -19,14 +19,14 @@
stdenv.mkDerivation rec {
pname = "fnott";
version = "1.1.2";
version = "1.2.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fnott";
rev = version;
sha256 = "sha256-+x3uN7Uj0fqO0kpHlOVnsshgEJA1z/6ZElKSTyLzfG4=";
sha256 = "1qmxzpv2xy79aznzzr9fay61mzf1pdzv85ah3w3q2kl2i7pskfxb";
};
nativeBuildInputs = [

4
pkgs/applications/misc/fuzzel/default.nix
View File

@ -23,14 +23,14 @@
stdenv.mkDerivation rec {
pname = "fuzzel";
version = "1.6.5";
version = "1.7.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fuzzel";
rev = version;
sha256 = "SWt46YSXI6Dsv0ed3H4sN8kbEzQDL4U6jxFSbMyspJ0=";
sha256 = "1261gwxiky37pvzmmbrpml1psa22kkglb141ybj1fbnwg6j7jvlf";
};
nativeBuildInputs = [

32
pkgs/applications/misc/gnome-passwordsafe/default.nix → pkgs/applications/misc/gnome-secrets/default.nix
View File

@ -5,19 +5,19 @@
, gettext
, fetchFromGitLab
, python3Packages
, libhandy
, libpwquality
, wrapGAppsHook
, gtk3
, wrapGAppsHook4
, gtk4
, glib
, gdk-pixbuf
, gobject-introspection
, desktop-file-utils
, appstream-glib }:
, appstream-glib
, libadwaita }:
python3Packages.buildPythonApplication rec {
pname = "gnome-passwordsafe";
version = "5.1";
pname = "gnome-secrets";
version = "6.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = "secrets";
rev = version;
sha256 = "sha256-RgpkLoqhwCdaPZxC1Qe0MpLtYLevNCOxbvwEEI0cpE0=";
sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8=";
};
nativeBuildInputs = [
@ -34,27 +34,39 @@ python3Packages.buildPythonApplication rec {
ninja
gettext
pkg-config
wrapGAppsHook
wrapGAppsHook4
desktop-file-utils
appstream-glib
gobject-introspection
];
buildInputs = [
gtk3
gtk4
glib
gdk-pixbuf
libhandy
libadwaita
];
propagatedBuildInputs = with python3Packages; [
pygobject3
construct
pykeepass
pyotp
] ++ [
libpwquality # using the python bindings
];
postPatch = ''
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache";
'';
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
broken = stdenv.hostPlatform.isStatic; # libpwquality doesn't provide bindings when static
description = "Password manager for GNOME which makes use of the KeePass v.4 format";

4
pkgs/applications/misc/hello/default.nix
View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "hello";
version = "2.12";
version = "2.10";
src = fetchurl {
url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
};
doCheck = true;

6
pkgs/applications/misc/pueue/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "pueue";
version = "1.0.4";
version = "1.0.6";
src = fetchFromGitHub {
owner = "Nukesor";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tNTKX++LrWwuVGdmAjvBStNYp4p1ai12JwJmozo1GV0=";
sha256 = "sha256-xEbmCVZ28CHVvI6tGCQWzMFrmVyCQ2Xmzh2Lz3tGU14=";
};
cargoSha256 = "sha256-t1d8K0v7kHPjH78lYCRCa4pyPCvyQT1kaQtVpoROZIE=";
cargoSha256 = "sha256-8g/dNCm5I5/qCAPOGQ9a453DND8LoeSpX9Nb8LwUme4=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/misc/yambar/default.nix
View File

@ -31,14 +31,14 @@ let
in
stdenv.mkDerivation rec {
pname = "yambar";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "yambar";
rev = version;
sha256 = "sha256-NzJrlPOkzstMbw37yBTah/uFYezlPB/1hrxCiXduSmc=";
sha256 = "0d8n9hvmxj7759pfqssqcl9wvb986qsph8bnjsjm9bf97mflhy6d";
};
nativeBuildInputs = [

6
pkgs/applications/networking/cluster/tanka/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tanka";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM=";
sha256 = "sha256-Wtfn9ffUNKuwByRbeCYq27xvr2DuzxSSQMH9Sv5a7rU=";
};
vendorSha256 = "sha256-1zdXc+Osqy17APcG5ou/UL/3Hcalmb1OZ2kZnWLSVIg=";
vendorSha256 = "sha256-ed6rC+wrZHDViGfJrSBl5VUqX/o6RKytXbTKqxb3ZtU=";
doCheck = false;

4
pkgs/applications/networking/flexget/default.nix
View File

@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.2.16";
version = "3.2.18";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
sha256 = "sha256-4CMAkLMVvahKwwBo9epHiVnOtTK3T6Q8pHXAHSEbxvk=";
sha256 = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg=";
};
postPatch = ''

6
pkgs/applications/networking/mailreaders/himalaya/default.nix
View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "himalaya";
version = "0.5.1";
version = "0.5.4";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BmV4kekl0QDbX/ueSrWM5jRvqr6WQeZIs7hiXhiHBSI=";
sha256 = "sha256-giEcVyhreD36SgW5rQsKRjgHHAE022Lffmo0QGy/EkI=";
};
cargoSha256 = "sha256-lu5xVuAw9yTeQr3gpiW5g5bdm7Alf0YXmlbSkPaXhk0=";
cargoSha256 = "sha256-Sf4Ze9T8A6n/iuFtQAfW+ORIw2atMt8MgEmpDllnZp8=";
nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];

4
pkgs/applications/science/misc/cwltool/default.nix
View File

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
version = "3.1.20220202173120";
version = "3.1.20220204090313";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = version;
sha256 = "sha256-TC0jSnjQTQ7HkEky8BZYJlqNn5uuPOnjGRxALcvumao=";
sha256 = "sha256-2+2xTUBzQFaS99Xd3jwWuMrg2pNKCb6ZsMKKdOBRo74=";
};
postPatch = ''

5
pkgs/applications/terminal-emulators/foot/default.nix
View File

@ -27,7 +27,7 @@
}:
let
version = "1.10.3";
version = "1.11.0";
# build stimuli file for PGO build and the script to generate it
# independently of the foot's build, so we can cache the result
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
owner = "dnkl";
repo = pname;
rev = version;
sha256 = "13v6xqaw3xn1x84dn4gnkiimcsllb19mrbvcdj2fnm8klnrys3gs";
sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn";
};
depsBuildBuild = [
@ -163,6 +163,7 @@ stdenv.mkDerivation rec {
# make sure there is _some_ profiling data on all binaries
./footclient --version
./foot --version
./tests/test-config
# generate pgo data of wayland independent code
./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile}
meson configure -Db_pgo=use

41
pkgs/applications/terminal-emulators/kermit-terminal/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, gtk3
, pcre
, pkg-config
, vte
}:
stdenv.mkDerivation rec {
pname = "kermit";
version = "3.7";
src = fetchFromGitHub {
name = "${pname}-${version}-src";
owner = "orhun";
repo = pname;
rev = version;
hash = "sha256-O5jpiQ+aaOTPst4/Z+H5e7ylA8CNBevqNoH50p4uEA4=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
gtk3
pcre
vte
];
meta = with lib; {
homepage = "https://github.com/orhun/kermit";
description = "A VTE-based, simple and froggy terminal emulator";
license = licenses.gpl3Only;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

4
pkgs/applications/virtualization/x11docker/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:
stdenv.mkDerivation rec {
pname = "x11docker";
version = "6.10.0";
version = "7.0.1";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
sha256 = "sha256-cPCtxfLzg1RDh3vKFfxAkcCMytu0mDsGp9CLJQmXATA=";
sha256 = "sha256-ojKloMFbpBsr8fykMbLIBAzrlVaJDv+4BL0lozXsgC4=";
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/data/icons/phinger-cursors/default.nix
View File

@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
cp -r ./ $out/share/icons
cp -r ./phinger-cursors* $out/share/icons
runHook postInstall
'';

4
pkgs/data/misc/v2ray-domain-list-community/default.nix
View File

@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20220114024213";
version = "20220201175515";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
sha256 = "sha256-sF9WvXhyfMUvSXmFjkfGq4cZE/MiAnOKbkpv2CHSV3Q=";
sha256 = "sha256-vgw6i8djBQDV+fmkVe5CuKMwES/PXGoVe8cTgB5tflo=";
};
vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78=";
meta = with lib; {

4
pkgs/development/libraries/fcft/default.nix
View File

@ -20,14 +20,14 @@ in
stdenv.mkDerivation rec {
pname = "fcft";
version = "2.5.1";
version = "3.0.1";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "dnkl";
repo = "fcft";
rev = version;
sha256 = "0dn0ic2ddi5qz6nqscsn7nlih67ad8vpclppbqwas6xavdfq6va2";
sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx";
};
depsBuildBuild = [ pkg-config ];

2
pkgs/development/ocaml-modules/bigarray-compat/default.nix
View File

@ -6,7 +6,7 @@ buildDunePackage rec {
useDune2 = true;
minimalOCamlVersion = "4.03";
minimalOCamlVersion = "4.02";
src = fetchFromGitHub {
owner = "mirage";

4
pkgs/development/python-modules/adax-local/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "adax-local";
version = "0.1.3";
version = "0.1.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyAdaxLocal";
rev = version;
hash = "sha256-SGVXzSjtYNRVJN5fUjjskko55/e0L3P8aB90G4HuBOE=";
hash = "sha256-pzhaBRCn02asT0ZLt1EmnaX2g5wr/CoiItWJ/ZYe0Ok=";
};
propagatedBuildInputs = [

26
pkgs/development/python-modules/advantage-air/default.nix
View File

@ -1,21 +1,33 @@
{ aiohttp, buildPythonPackage, fetchPypi, lib, pythonOlder }:
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "advantage_air";
version = "0.2.5";
pname = "advantage-air";
version = "0.2.6";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit version pname;
sha256 = "sha256-38csg1Cvpz4dkRCwlNc8+af7aJ5xDrZO1D8cCaBlePA=";
pname = "advantage_air";
inherit version;
hash = "sha256-n7Vl5fLEpkAEi4NrsoJlwwdaGcxnXURLdGN0etHgmOE=";
};
propagatedBuildInputs = [ aiohttp ];
propagatedBuildInputs = [
aiohttp
];
# No tests
doCheck = false;
pythonImportsCheck = [ "advantage_air" ];
pythonImportsCheck = [
"advantage_air"
];
meta = with lib; {
description = "API helper for Advantage Air's MyAir and e-zone API";

4
pkgs/development/python-modules/aioshelly/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aioshelly";
version = "1.0.8";
version = "1.0.9";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = version;
sha256 = "0l6qhgpzg082zk9134w2psnzkzf5zr0jyvrkxnhhz5lx9q5k94pc";
hash = "sha256-XGmhLc64efQ1eIgCYN1Wkp4sPXvYXlR7/9WF5cWZyys=";
};
propagatedBuildInputs = [

8
pkgs/development/python-modules/ansible/core.nix
View File

@ -23,17 +23,17 @@
let
ansible-collections = callPackage ./collections.nix {
version = "5.0.1";
sha256 = "sha256:0xn3lpinmflkxwak7zb36wjs9w2y1k5s295apn3v77xnpc2cfz5l";
version = "5.2.0";
sha256 = "sha256:1jwraha3s15s692d47kgcr7jy1ngbg6ipmkb0ak7fjnb57r4im66";
};
in
buildPythonPackage rec {
pname = "ansible-core";
version = "2.12.1";
version = "2.12.2";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pFCHByYr4Ru03ZigBvGxSBeHmgVea2xGrZ/KiJT7MHM=";
sha256 = "sha256:1hz7j8gsgxbfjdf9562cbyxia3c4crdv50fm0p0wp4js79rf2ydw";
};
# ansible_connection is already wrapped, so don't pass it through

60
pkgs/development/python-modules/apprise/default.nix
View File

@ -1,39 +1,75 @@
{ lib, buildPythonPackage, fetchPypi, installShellFiles
, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography
, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp
{ lib
, Babel
, buildPythonPackage
, click
, cryptography
, fetchPypi
, gntp
, installShellFiles
, markdown
, mock
, paho-mqtt
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, requests_oauthlib
, six
, slixmpp
}:
buildPythonPackage rec {
pname = "apprise";
version = "0.9.6";
version = "0.9.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Fe0GIIGXydKP2DzWnnJ7SCgIeaTGEa/Wta6l0N7zl/g=";
hash = "sha256-BOMeSvwmGiZvA95+e2bceCGXRwowU5+zJAl7Sn4wKqM=";
};
nativeBuildInputs = [ Babel installShellFiles ];
nativeBuildInputs = [
Babel
installShellFiles
];
propagatedBuildInputs = [
cryptography requests requests_oauthlib six click markdown pyyaml
click
cryptography
markdown
pyyaml
requests
requests_oauthlib
six
];
checkInputs = [
pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp
gntp
mock
paho-mqtt
pytestCheckHook
slixmpp
];
disabledTests = [ "test_apprise_cli_nux_env" ];
disabledTests = [
"test_apprise_cli_nux_env"
"test_plugin_mqtt_general"
];
postInstall = ''
installManPage packaging/man/apprise.1
'';
pythonImportsCheck = [ "apprise" ];
pythonImportsCheck = [
"apprise"
];
meta = with lib; {
description = "Push Notifications that work with just about every platform";
homepage = "https://github.com/caronc/apprise";
description = "Push Notifications that work with just about every platform!";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
maintainers = with maintainers; [ marsam ];
};
}

25
pkgs/development/python-modules/jaxlib/bin.nix
View File

@ -16,19 +16,23 @@
{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config
, fetchurl, isPy39, lib, stdenv
# propagatedBuildInputs
, absl-py, flatbuffers, scipy, cudatoolkit_11
, absl-py, flatbuffers, scipy, cudatoolkit_11, cudnn
# Options:
, cudaSupport ? config.cudaSupport or false
}:
# Note that these values are tied to the specific version of the GPU wheel that
# we fetch. When updating, try to go for the latest possible versions that are
# still compatible with the cudatoolkit and cudnn versions available in nixpkgs.
assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1";
assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5";
let
device = if cudaSupport then "gpu" else "cpu";
in
buildPythonPackage rec {
pname = "jaxlib";
version = "0.1.71";
version = "0.1.75";
format = "wheel";
# At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting
@ -36,14 +40,23 @@ buildPythonPackage rec {
# version.
disabled = !isPy39;
# Find new releases at https://storage.googleapis.com/jax-releases.
src = {
cpu = fetchurl {
url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl";
sha256 = "sha256:0rqhs6qabydizlv5d3rb20dbv6612rr7dqfniy9r6h4kazdinsn6";
sha256 = "1davmx9dvai8dq3h5ac82634gjhv6l46kq6baajrxjqczbp0w7m6";
};
gpu = fetchurl {
url = "https://storage.googleapis.com/jax-releases/cuda111/jaxlib-${version}+cuda111-cp39-none-manylinux2010_x86_64.whl";
sha256 = "sha256:065kyzjsk9m84d138p99iymdiiicm1qz8a3iwxz8rspl43rwrw89";
# Note that there's also a release targeting cuDNN 8.2, but unfortunately
# we don't yet have that packaged at the time of writing (02/03/2022).
# Check pkgs/development/libraries/science/math/cudnn/default.nix for more
# details.
url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl";
sha256 = "1mk618lq1q5x0dc3xbid8bim59l9j6l47xq232gdbn401ykrid7r";
# This is what the cuDNN 8.2 download looks like for future reference:
# url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl";
# sha256 = "000mnm2masm3sx3haddcmgw43j4gxa3m4fcm14p9nb8dnncjkgpb";
};
}.${device};
@ -71,7 +84,7 @@ buildPythonPackage rec {
rpath=$(patchelf --print-rpath $file)
# For some reason `makeLibraryPath` on `cudatoolkit_11` maps to
# <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib.
patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file
patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib cudnn ]}" $file
done
'';

4
pkgs/development/python-modules/limnoria/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "limnoria";
version = "2022.1.29";
version = "2022.2.3";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-fBIWmFo3uTswLfxmSaYixALeJ89HCpLcooldw1UZwCw=";
hash = "sha256-Jc11hS+WrRnjgYOUpc+GdkRoNV/DUJhQK6rI2lUkEIA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/lupupy/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "lupupy";
version = "0.1.3";
version = "0.1.9";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-oKc2x0T8KSSv9OB6U79QacBbvATDPecZFFKhFeBG39E=";
sha256 = "sha256-UclKPuWcIa1nNFKqPIEnqlnJh0aXP50k2nMbHhT1aFs=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pip-tools/default.nix
View File

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pip-tools";
version = "6.4.0";
version = "6.5.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b";
sha256 = "sha256-0U6k/CwRjbKmr2WkNFqLmzVeeSrtrWv2TdPrl8X8X+4=";
};
checkInputs = [

4
pkgs/development/python-modules/pontos/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pontos";
version = "22.2.0";
version = "22.2.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "v${version}";
hash = "sha256-DDAYpAIpcOziUxv2mLuHQ+MTI5aqlS5GNyGQgtWu6Ug=";
hash = "sha256-VMfvlqpmA2Mg/llVNcY3Enuuq3mwV0G1GYrpbvzo8pU=";
};
nativeBuildInputs = [

23
pkgs/development/python-modules/pyaussiebb/default.nix
View File

@ -2,33 +2,42 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, loguru
, poetry-core
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pyaussiebb";
version = "0.0.9";
format = "setuptools";
version = "0.0.11";
format = "pyproject";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "yaleman";
repo = "aussiebb";
rev = "v${version}";
hash = "sha256-DMU29dTqDaPLQS20iuHIph6mhBdj6ni3+MA9KkRMtzg=";
hash = "sha256-aL+n2ut7n6UUyymMEHoFMhRvK9iFRRunYE9ZirKFXhc=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
requests
loguru
];
# Tests require network access
# https://github.com/yaleman/aussiebb/issues/6
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'requests = "^2.27.1"' 'requests = "*"'
'';
# Tests require credentials and requests-testing
doCheck = false;
pythonImportsCheck = [

14
pkgs/development/python-modules/pyfritzhome/default.nix
View File

@ -9,17 +9,21 @@
buildPythonPackage rec {
pname = "pyfritzhome";
version = "0.6.2";
version = "0.6.4";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "hthiery";
repo = "python-fritzhome";
rev = version;
sha256 = "1hwxq9w5qmiky8gpp623nabmydr3yv6hvgzk24fdbmkglfp6ja1v";
sha256 = "sha256-JCaB3E8KCfncwnTKIb0shB2qYpsKwBkrPZdC5lAJ1KQ=";
};
propagatedBuildInputs = [ requests ];
propagatedBuildInputs = [
requests
];
checkInputs = [
mock
@ -30,7 +34,9 @@ buildPythonPackage rec {
nosetests
'';
pythonImportsCheck = [ "pyfritzhome" ];
pythonImportsCheck = [
"pyfritzhome"
];
meta = with lib; {
description = "Python Library to access AVM FRITZ!Box homeautomation";

4
pkgs/development/python-modules/pygit2/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pygit2";
version = "1.7.2";
version = "1.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "70a4536a35452c31f823b59b6fdb665aa3778a43b73ccda3a4f79fa9962ad2bb";
sha256 = "sha256-bixc/1qh5D9DEDSAdhFS9cXWvvQPXB9QyHWKbonmbLY=";
};
preConfigure = lib.optionalString stdenv.isDarwin ''

4
pkgs/development/python-modules/simplisafe-python/default.nix
View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "simplisafe-python";
version = "2022.01.0";
version = "2022.02.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-dU7zyLSqUX4AM1MLaF9zHbbc2EfsJDtzIwmzy/xiLu8=";
sha256 = "sha256-f3kRBqBQQwo74fDFVLE5pZArsmc8iFgU/onifKy2vNQ=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/soco/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "soco";
version = "0.26.0";
version = "0.26.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
sha256 = "sha256-rOJiO8BBbkp3dzy9hk3LV0hqQDLRgrA1kqnhvrseU0o=";
sha256 = "sha256-h9mgL98+MPY9K5sKuRQthQoP8nVL1tIHGslh5ojgLfc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/softlayer/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "softlayer";
version = "5.9.8";
version = "5.9.9";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = pname;
repo = "softlayer-python";
rev = "v${version}";
sha256 = "087kyl2yacvh12i4x3357659mgq4xycv8a4y9rl3rj57kp5jc6ah";
sha256 = "sha256-LskPz5KXOi7olb3+DUP9uEFESQeo6ec/ZLx9B/w6Ni0=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/sqlite-utils/default.nix
View File

@ -14,12 +14,12 @@
buildPythonPackage rec {
pname = "sqlite-utils";
version = "3.22.1";
version = "3.23";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "35ebb4f7e2b09f1818b36e7da6dc62f1ca57e2c0d99a9cbc8151e634d75a7906";
sha256 = "sha256-BNlOP/gWDERh4Rzth5zjeghHr7ozyAGeRJxoeE6baWY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/systembridge/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "systembridge";
version = "2.2.3";
version = "2.3.1";
src = fetchFromGitHub {
owner = "timmo001";
repo = "system-bridge-connector-py";
rev = "v${version}";
sha256 = "sha256-AVMZBhf15eZM9oMUFyiHYs866P1v5z1pbTvX2Qpjzfc=";
sha256 = "sha256-Ts8zPRK6S5iLnl19Y/Uz0YAh6hDeVRNBY6HsvLwdUFw=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/textfsm/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "textfsm";
version = "1.1.2";
version = "1.1.3";
format = "setuptools";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm";
sha256 = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -22,13 +22,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.787";
version = "2.0.793";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-fnLnVr5WYpEG0qGjKm4JuQCHi3fbv9lu8jWNv/Z+3wM=";
hash = "sha256-puOP0gXPtX67ZT2bANkjJpi4pCBOhK199ukfU2BsnRM=";
};
nativeBuildInputs = with py.pkgs; [

4
pkgs/development/tools/ocaml/dune/2.nix
View File

@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "2.9.2";
version = "2.9.3";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-site-${version}.tbz";
sha256 = "sha256-uOfMUH+5eLRfb9yDnysyAdLB5hHkqOlyyMjP2FIudEc=";
sha256 = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y";
};
nativeBuildInputs = [ ocaml findlib ];

2
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
View File

@ -7,7 +7,7 @@ buildDunePackage {
inherit (js_of_ocaml-compiler) version src meta useDune2;
minimalOCamlVersion = "4.03";
minimalOCamlVersion = "4.02";
propagatedBuildInputs = [ ocamlbuild ];
}

8
pkgs/misc/emulators/wine/base.nix
View File

@ -43,16 +43,11 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:
[ pkgs.freetype pkgs.perl ]
++ lib.optional stdenv.isLinux pkgs.libcap
++ lib.optional pngSupport pkgs.libpng
++ lib.optional jpegSupport pkgs.libjpeg
++ lib.optional cupsSupport pkgs.cups
++ lib.optional colorManagementSupport pkgs.lcms2
++ lib.optional gettextSupport pkgs.gettext
++ lib.optional dbusSupport pkgs.dbus
++ lib.optional mpg123Support pkgs.mpg123
++ lib.optional openalSupport pkgs.openal
++ lib.optional cairoSupport pkgs.cairo
++ lib.optional tiffSupport pkgs.libtiff
++ lib.optional odbcSupport pkgs.unixODBC
++ lib.optional netapiSupport pkgs.samba4
++ lib.optional cursesSupport pkgs.ncurses
@ -60,7 +55,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional pcapSupport pkgs.libpcap
++ lib.optional v4lSupport pkgs.libv4l
++ lib.optional saneSupport pkgs.sane-backends
++ lib.optional gsmSupport pkgs.gsm
++ lib.optional gphoto2Support pkgs.libgphoto2
++ lib.optional ldapSupport pkgs.openldap
++ lib.optional fontconfigSupport pkgs.fontconfig
@ -70,14 +64,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional udevSupport pkgs.udev
++ lib.optional vulkanSupport pkgs.vulkan-loader
++ lib.optional sdlSupport pkgs.SDL2
++ lib.optional faudioSupport pkgs.faudio
++ vkd3dArches
++ lib.optionals gstreamerSupport (with pkgs.gst_all_1;
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav
(gst-plugins-bad.override { enableZbar = false; }) ])
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [

22
pkgs/misc/emulators/wine/default.nix
View File

@ -9,9 +9,6 @@
{ lib, stdenv, callPackage,
wineRelease ? "stable",
wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32",
pngSupport ? false,
jpegSupport ? false,
tiffSupport ? false,
gettextSupport ? false,
fontconfigSupport ? false,
alsaSupport ? false,
@ -20,9 +17,7 @@
tlsSupport ? false,
gstreamerSupport ? false,
cupsSupport ? false,
colorManagementSupport ? false,
dbusSupport ? false,
mpg123Support ? false,
openalSupport ? false,
openclSupport ? false,
cairoSupport ? false,
@ -33,16 +28,13 @@
pcapSupport ? false,
v4lSupport ? false,
saneSupport ? false,
gsmSupport ? false,
gphoto2Support ? false,
ldapSupport ? false,
pulseaudioSupport ? false,
udevSupport ? false,
xineramaSupport ? false,
xmlSupport ? false,
vulkanSupport ? false,
sdlSupport ? false,
faudioSupport ? false,
vkd3dSupport ? false,
mingwSupport ? wineRelease != "stable",
waylandSupport ? wineRelease == "wayland",
@ -53,13 +45,13 @@ let wine-build = build: release:
lib.getAttr build (callPackage ./packages.nix {
wineRelease = release;
supportFlags = {
inherit pngSupport jpegSupport cupsSupport colorManagementSupport gettextSupport
dbusSupport mpg123Support openalSupport cairoSupport tiffSupport odbcSupport
netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport
vkd3dSupport mingwSupport waylandSupport embedInstallers;
inherit
cupsSupport gettextSupport dbusSupport openalSupport cairoSupport
odbcSupport netapiSupport cursesSupport vaSupport pcapSupport
v4lSupport saneSupport gphoto2Support ldapSupport fontconfigSupport
alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport
tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport
sdlSupport vkd3dSupport mingwSupport waylandSupport embedInstallers;
};
});

13
pkgs/os-specific/solo5/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }:
{ lib, stdenv, fetchurl, dosfstools, libseccomp, makeWrapper, mtools, parted
, pkg-config, qemu, syslinux, util-linux }:
let
version = "0.6.9";
@ -15,7 +16,7 @@ in stdenv.mkDerivation {
pname = "solo5";
inherit version;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = lib.optional (stdenv.hostPlatform.isLinux) libseccomp;
src = fetchurl {
@ -47,6 +48,14 @@ in stdenv.mkDerivation {
[ -n "$CONFIG_${lib.toUpper bind}" ] && make install-opam-${bind}
'') targets}
substituteInPlace $out/bin/solo5-virtio-mkimage \
--replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \
--replace "/usr/share/syslinux" "${syslinux}/share/syslinux" \
--replace "cp " "cp --no-preserve=mode "
wrapProgram $out/bin/solo5-virtio-mkimage \
--prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]}
runHook postInstall
'';

4
pkgs/servers/heisenbridge/default.nix
View File

@ -1,13 +1,13 @@
{ lib, fetchFromGitHub, fetchpatch, python3 }:
python3.pkgs.buildPythonApplication rec {
pname = "heisenbridge";
version = "1.10.0";
version = "1.10.1";
src = fetchFromGitHub {
owner = "hifi";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rQBmg1CBourj/dDJ7P108gGMRdXWp6nwvHIBiQbJLQ0=";
sha256 = "sha256-c+YP4pEGvLi7wZsDXrkoqR/isuYfXQmTwQp9gN5jHkQ=";
};
postPatch = ''

8
pkgs/servers/mx-puppet-discord/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, pkgs, lib, nodejs, nodePackages, pkg-config, libjpeg
{ stdenv, fetchFromGitHub, pkgs, lib, nodejs-14_x, nodePackages, pkg-config, libjpeg
, pixman, cairo, pango }:
let
nodejs = nodejs-14_x;
# No official version ever released
src = fetchFromGitHub {
owner = "matrix-discord";
repo = "mx-puppet-discord";
rev = "c17384a6a12a42a528e0b1259f8073e8db89b8f4";
sha256 = "1yczhfpa4qzvijcpgc2pr10s009qb6jwlfwpcbb17g2wsx6zj0c2";
rev = "bb6438a504182a7a64048b992179427587ccfded";
sha256 = "0g2p5xwxxgvlnq0fg0x4q9x4asqyppdv6b5z6bvncm62kc70z6xk";
};
myNodePackages = import ./node-composition.nix {
@ -17,6 +18,7 @@ let
in myNodePackages.package.override {
pname = "mx-puppet-discord";
version = "2021-08-01";
inherit src;

7
pkgs/servers/mx-puppet-discord/generate.sh
View File

@ -2,14 +2,15 @@
#! nix-shell -i bash -p nodePackages.node2nix
# No official release
rev=c17384a6a12a42a528e0b1259f8073e8db89b8f4
rev=bb6438a504182a7a64048b992179427587ccfded
u=https://raw.githubusercontent.com/matrix-discord/mx-puppet-discord/$rev
# Download package.json and package-lock.json
curl -O $u/package.json
curl -O $u/package-lock.json
curl $u/package-lock.json |
sed -e 's|git+ssh://git@|git+https://|g' > package-lock.json
node2nix \
--nodejs-12 \
--nodejs-14 \
--node-env ../../development/node-packages/node-env.nix \
--input package.json \
--lock package-lock.json \

2
pkgs/servers/mx-puppet-discord/node-composition.nix
View File

@ -2,7 +2,7 @@
{pkgs ? import ../../.. {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {

473
pkgs/servers/mx-puppet-discord/node-packages.nix generated
View File

@ -58,13 +58,13 @@ let
sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ==";
};
};
"@sorunome/matrix-bot-sdk-0.5.8" = {
"@sorunome/matrix-bot-sdk-0.5.13" = {
name = "_at_sorunome_slash_matrix-bot-sdk";
packageName = "@sorunome/matrix-bot-sdk";
version = "0.5.8";
version = "0.5.13";
src = fetchurl {
url = "https://registry.npmjs.org/@sorunome/matrix-bot-sdk/-/matrix-bot-sdk-0.5.8.tgz";
sha512 = "Uifu8saeD1fPrj6F8ZdYiCeADCluySbdi/nVKJy0NQOi6cA5p68ZaeydlCyl+YuFJoCjsDWBe+Szq9CgFd/SpA==";
url = "https://registry.npmjs.org/@sorunome/matrix-bot-sdk/-/matrix-bot-sdk-0.5.13.tgz";
sha512 = "WEeuei8/QS9FO76n71nT17TBZ3tRW2POjOpN7YIvsy5tA0WD0tMUKWZDcTo1A+xKOvzgjRTy9v88rKSLIr4wHA==";
};
};
"@szmarczak/http-timer-4.0.5" = {
@ -76,13 +76,13 @@ let
sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==";
};
};
"@types/body-parser-1.19.0" = {
"@types/body-parser-1.19.1" = {
name = "_at_types_slash_body-parser";
packageName = "@types/body-parser";
version = "1.19.0";
version = "1.19.1";
src = fetchurl {
url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz";
sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz";
sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==";
};
};
"@types/cacheable-request-6.0.1" = {
@ -94,31 +94,31 @@ let
sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==";
};
};
"@types/connect-3.4.34" = {
"@types/connect-3.4.35" = {
name = "_at_types_slash_connect";
packageName = "@types/connect";
version = "3.4.34";
version = "3.4.35";
src = fetchurl {
url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz";
sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==";
url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz";
sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==";
};
};
"@types/express-4.17.11" = {
"@types/express-4.17.13" = {
name = "_at_types_slash_express";
packageName = "@types/express";
version = "4.17.11";
version = "4.17.13";
src = fetchurl {
url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz";
sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==";
url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz";
sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==";
};
};
"@types/express-serve-static-core-4.17.18" = {
"@types/express-serve-static-core-4.17.24" = {
name = "_at_types_slash_express-serve-static-core";
packageName = "@types/express-serve-static-core";
version = "4.17.18";
version = "4.17.24";
src = fetchurl {
url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz";
sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA==";
url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz";
sha512 = "3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==";
};
};
"@types/http-cache-semantics-4.0.0" = {
@ -166,22 +166,22 @@ let
sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==";
};
};
"@types/qs-6.9.5" = {
"@types/qs-6.9.7" = {
name = "_at_types_slash_qs";
packageName = "@types/qs";
version = "6.9.5";
version = "6.9.7";
src = fetchurl {
url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz";
sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==";
url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz";
sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==";
};
};
"@types/range-parser-1.2.3" = {
"@types/range-parser-1.2.4" = {
name = "_at_types_slash_range-parser";
packageName = "@types/range-parser";
version = "1.2.3";
version = "1.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz";
sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz";
sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==";
};
};
"@types/react-17.0.0" = {
@ -202,13 +202,13 @@ let
sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==";
};
};
"@types/serve-static-1.13.9" = {
"@types/serve-static-1.13.10" = {
name = "_at_types_slash_serve-static";
packageName = "@types/serve-static";
version = "1.13.9";
version = "1.13.10";
src = fetchurl {
url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz";
sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==";
url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz";
sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==";
};
};
"abbrev-1.1.1" = {
@ -383,13 +383,13 @@ let
sha256 = "ab87453cc9db05b3bc691f27e92c5a4a6a14a528c98c7d313d6dd42f1741124a";
};
};
"better-sqlite3-6.0.1" = {
"better-sqlite3-7.4.3" = {
name = "better-sqlite3";
packageName = "better-sqlite3";
version = "6.0.1";
version = "7.4.3";
src = fetchurl {
url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-6.0.1.tgz";
sha512 = "4aV1zEknM9g1a6B0mVBx1oIlmYioEJ8gSS3J6EpN1b1bKYEE+N5lmpmXHKNKTi0qjHziSd7XrXwHl1kpqvEcHQ==";
url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.4.3.tgz";
sha512 = "07bKjClZg/f4KMVRkzWtoIvazVPcF1gsvVKVIXlxwleC2DxuIhnra3KCMlUT1rFeRYXXckot2a46UciF2d9KLw==";
};
};
"bindings-1.5.0" = {
@ -410,13 +410,13 @@ let
sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524";
};
};
"bl-4.0.3" = {
"bl-4.1.0" = {
name = "bl";
packageName = "bl";
version = "4.0.3";
version = "4.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz";
sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==";
url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz";
sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==";
};
};
"blurhash-1.1.3" = {
@ -518,13 +518,13 @@ let
sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
};
};
"chalk-4.1.0" = {
"chalk-4.1.1" = {
name = "chalk";
packageName = "chalk";
version = "4.1.0";
version = "4.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz";
sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==";
url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz";
sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==";
};
};
"chownr-1.1.4" = {
@ -536,6 +536,15 @@ let
sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
};
};
"chownr-2.0.0" = {
name = "chownr";
packageName = "chownr";
version = "2.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz";
sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==";
};
};
"clone-response-1.0.2" = {
name = "clone-response";
packageName = "clone-response";
@ -608,6 +617,15 @@ let
sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==";
};
};
"colorette-1.2.2" = {
name = "colorette";
packageName = "colorette";
version = "1.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz";
sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==";
};
};
"colors-1.4.0" = {
name = "colors";
packageName = "colors";
@ -788,6 +806,15 @@ let
sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
};
};
"deepmerge-4.2.2" = {
name = "deepmerge";
packageName = "deepmerge";
version = "4.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz";
sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==";
};
};
"defer-to-connect-2.0.0" = {
name = "defer-to-connect";
packageName = "defer-to-connect";
@ -860,32 +887,32 @@ let
sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==";
};
};
"discord-markdown-git://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" = {
"discord-markdown-git+https://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" = {
name = "discord-markdown";
packageName = "discord-markdown";
version = "2.3.1";
src = fetchgit {
url = "git://github.com/Sorunome/discord-markdown.git";
url = "https://github.com/Sorunome/discord-markdown.git";
rev = "0f38420fdd41340d6eadd38cd5b71784ca954085";
sha256 = "61a5ffd248b6d2784665fa710bfe4c39f241c75be07dbe53f5f48575a4df229c";
};
};
"dom-serializer-1.2.0" = {
"dom-serializer-1.3.2" = {
name = "dom-serializer";
packageName = "dom-serializer";
version = "1.2.0";
version = "1.3.2";
src = fetchurl {
url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz";
sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==";
url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz";
sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==";
};
};
"domelementtype-2.1.0" = {
"domelementtype-2.2.0" = {
name = "domelementtype";
packageName = "domelementtype";
version = "2.1.0";
version = "2.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz";
sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==";
url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz";
sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==";
};
};
"domhandler-3.3.0" = {
@ -897,22 +924,22 @@ let
sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==";
};
};
"domhandler-4.0.0" = {
"domhandler-4.2.0" = {
name = "domhandler";
packageName = "domhandler";
version = "4.0.0";
version = "4.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz";
sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==";
url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz";
sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==";
};
};
"domutils-2.4.4" = {
"domutils-2.7.0" = {
name = "domutils";
packageName = "domutils";
version = "2.4.4";
version = "2.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz";
sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==";
url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz";
sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==";
};
};
"ee-first-1.1.1" = {
@ -960,13 +987,13 @@ let
sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==";
};
};
"entities-2.1.0" = {
"entities-2.2.0" = {
name = "entities";
packageName = "entities";
version = "2.1.0";
version = "2.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz";
sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz";
sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==";
};
};
"escape-html-1.0.3" = {
@ -987,6 +1014,15 @@ let
sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
};
};
"escape-string-regexp-4.0.0" = {
name = "escape-string-regexp";
packageName = "escape-string-regexp";
version = "4.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz";
sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
};
};
"esprima-4.0.1" = {
name = "esprima";
packageName = "esprima";
@ -1158,13 +1194,13 @@ let
sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
};
};
"forwarded-0.1.2" = {
"forwarded-0.2.0" = {
name = "forwarded";
packageName = "forwarded";
version = "0.1.2";
version = "0.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz";
sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz";
sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==";
};
};
"fresh-0.5.2" = {
@ -1194,6 +1230,15 @@ let
sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
};
};
"fs-minipass-2.1.0" = {
name = "fs-minipass";
packageName = "fs-minipass";
version = "2.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz";
sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==";
};
};
"fs.realpath-1.0.0" = {
name = "fs.realpath";
packageName = "fs.realpath";
@ -1257,13 +1302,13 @@ let
sha512 = "ErhWb4IUjQzJ3vGs3+RR12NWlBDDkRciFpAkQ1LPUxi6OnwhGj07gQxjPsyIk69s7qMihwKrKquV6VQq7JNYLA==";
};
};
"graceful-fs-4.2.4" = {
"graceful-fs-4.2.6" = {
name = "graceful-fs";
packageName = "graceful-fs";
version = "4.2.4";
version = "4.2.6";
src = fetchurl {
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz";
sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==";
};
};
"has-flag-3.0.0" = {
@ -1329,6 +1374,15 @@ let
sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==";
};
};
"html-to-text-6.0.0" = {
name = "html-to-text";
packageName = "html-to-text";
version = "6.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/html-to-text/-/html-to-text-6.0.0.tgz";
sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA==";
};
};
"htmlencode-0.0.4" = {
name = "htmlencode";
packageName = "htmlencode";
@ -1347,6 +1401,15 @@ let
sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==";
};
};
"htmlparser2-6.1.0" = {
name = "htmlparser2";
packageName = "htmlparser2";
version = "6.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz";
sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==";
};
};
"http-cache-semantics-4.1.0" = {
name = "http-cache-semantics";
packageName = "http-cache-semantics";
@ -1437,15 +1500,6 @@ let
sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
};
};
"integer-3.0.1" = {
name = "integer";
packageName = "integer";
version = "3.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/integer/-/integer-3.0.1.tgz";
sha512 = "OqtER6W2GIJTIcnT5o2B/pWGgvurnVOYs4OZCgay40QEIbMTnNq4R0KSaIw1TZyFtPWjm5aNM+pBBMTfc3exmw==";
};
};
"ipaddr.js-1.9.1" = {
name = "ipaddr.js";
packageName = "ipaddr.js";
@ -1482,6 +1536,15 @@ let
sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
};
};
"is-plain-object-5.0.0" = {
name = "is-plain-object";
packageName = "is-plain-object";
version = "5.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz";
sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==";
};
};
"is-promise-2.2.2" = {
name = "is-promise";
packageName = "is-promise";
@ -1545,6 +1608,15 @@ let
sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw==";
};
};
"klona-2.0.4" = {
name = "klona";
packageName = "klona";
version = "2.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz";
sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==";
};
};
"kuler-2.0.0" = {
name = "kuler";
packageName = "kuler";
@ -1563,13 +1635,13 @@ let
sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==";
};
};
"lodash-4.17.20" = {
"lodash-4.17.21" = {
name = "lodash";
packageName = "lodash";
version = "4.17.20";
version = "4.17.21";
src = fetchurl {
url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz";
sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
};
};
"lodash.camelcase-4.3.0" = {
@ -1797,6 +1869,15 @@ let
sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
};
};
"minipass-3.1.3" = {
name = "minipass";
packageName = "minipass";
version = "3.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz";
sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==";
};
};
"minizlib-1.3.3" = {
name = "minizlib";
packageName = "minizlib";
@ -1806,6 +1887,15 @@ let
sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
};
};
"minizlib-2.1.2" = {
name = "minizlib";
packageName = "minizlib";
version = "2.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz";
sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==";
};
};
"mkdirp-0.5.5" = {
name = "mkdirp";
packageName = "mkdirp";
@ -1878,13 +1968,13 @@ let
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
};
};
"mx-puppet-bridge-0.1.4" = {
"mx-puppet-bridge-0.1.6" = {
name = "mx-puppet-bridge";
packageName = "mx-puppet-bridge";
version = "0.1.4";
version = "0.1.6";
src = fetchurl {
url = "https://registry.npmjs.org/mx-puppet-bridge/-/mx-puppet-bridge-0.1.4.tgz";
sha512 = "Jg4hszVqQv1n35Mvb5HcfK4VafjB0LaCEay8ylgiu/M2oIPE0fadFNdQpkwssXmShDzSeth/xga3HgP8G6O5Fg==";
url = "https://registry.npmjs.org/mx-puppet-bridge/-/mx-puppet-bridge-0.1.6.tgz";
sha512 = "q8XtOcmn25NkdBPM1LWYGAlgZZi+mI7+Dp7F5a1zQD0JM9cMcpW9FIO/JqAer+s3Y8CgTim3JZ2AyrUjfLRKsg==";
};
};
"nan-2.14.2" = {
@ -1896,6 +1986,15 @@ let
sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
};
};
"nanoid-3.1.23" = {
name = "nanoid";
packageName = "nanoid";
version = "3.1.23";
src = fetchurl {
url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz";
sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==";
};
};
"napi-build-utils-1.0.2" = {
name = "napi-build-utils";
packageName = "napi-build-utils";
@ -1923,13 +2022,13 @@ let
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
};
};
"node-abi-2.19.3" = {
"node-abi-2.30.0" = {
name = "node-abi";
packageName = "node-abi";
version = "2.19.3";
version = "2.30.0";
src = fetchurl {
url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz";
sha512 = "9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==";
url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz";
sha512 = "g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==";
};
};
"node-emoji-1.10.0" = {
@ -1968,15 +2067,6 @@ let
sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==";
};
};
"noop-logger-0.1.1" = {
name = "noop-logger";
packageName = "noop-logger";
version = "0.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz";
sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2";
};
};
"nopt-4.0.3" = {
name = "nopt";
packageName = "nopt";
@ -1986,13 +2076,13 @@ let
sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
};
};
"normalize-url-4.5.0" = {
"normalize-url-4.5.1" = {
name = "normalize-url";
packageName = "normalize-url";
version = "4.5.0";
version = "4.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz";
sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==";
url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz";
sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==";
};
};
"normalize-version-1.0.5" = {
@ -2292,13 +2382,13 @@ let
sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
};
};
"postcss-7.0.35" = {
"postcss-8.3.6" = {
name = "postcss";
packageName = "postcss";
version = "7.0.35";
version = "8.3.6";
src = fetchurl {
url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz";
sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==";
url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz";
sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==";
};
};
"postgres-array-2.0.0" = {
@ -2337,13 +2427,13 @@ let
sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==";
};
};
"prebuild-install-5.3.6" = {
"prebuild-install-6.1.3" = {
name = "prebuild-install";
packageName = "prebuild-install";
version = "5.3.6";
version = "6.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz";
sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==";
url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz";
sha512 = "iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q==";
};
};
"prism-media-1.2.3" = {
@ -2382,13 +2472,13 @@ let
sha512 = "M7ZNjIO6x+2R/vjSD13yjJPjpoZA8eEwH2Bp2Re0/PvzozD7azikv+SaBtZes4Q1ca/xHjZ4RSCuTag3YZLg1A==";
};
};
"proxy-addr-2.0.6" = {
"proxy-addr-2.0.7" = {
name = "proxy-addr";
packageName = "proxy-addr";
version = "2.0.6";
version = "2.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz";
sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==";
};
};
"pump-3.0.0" = {
@ -2526,13 +2616,13 @@ let
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
};
};
"sanitize-html-1.27.5" = {
"sanitize-html-2.4.0" = {
name = "sanitize-html";
packageName = "sanitize-html";
version = "1.27.5";
version = "2.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz";
sha512 = "M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A==";
url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.4.0.tgz";
sha512 = "Y1OgkUiTPMqwZNRLPERSEi39iOebn2XJLbeiGOBhaJD/yLqtLGu6GE5w7evx177LeGgSE+4p4e107LMiydOf6A==";
};
};
"sax-1.2.4" = {
@ -2661,13 +2751,13 @@ let
sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
};
};
"source-map-0.6.1" = {
name = "source-map";
packageName = "source-map";
version = "0.6.1";
"source-map-js-0.6.2" = {
name = "source-map-js";
packageName = "source-map-js";
version = "0.6.2";
src = fetchurl {
url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz";
sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==";
};
};
"spex-3.2.0" = {
@ -2769,15 +2859,6 @@ let
sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
};
};
"supports-color-6.1.0" = {
name = "supports-color";
packageName = "supports-color";
version = "6.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz";
sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==";
};
};
"supports-color-7.2.0" = {
name = "supports-color";
packageName = "supports-color";
@ -2805,6 +2886,15 @@ let
sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
};
};
"tar-6.1.0" = {
name = "tar";
packageName = "tar";
version = "6.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz";
sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==";
};
};
"tar-fs-2.1.1" = {
name = "tar-fs";
packageName = "tar-fs";
@ -3039,15 +3129,6 @@ let
sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
};
};
"which-pm-runs-1.0.0" = {
name = "which-pm-runs";
packageName = "which-pm-runs";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz";
sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb";
};
};
"wide-align-1.1.3" = {
name = "wide-align";
packageName = "wide-align";
@ -3111,13 +3192,13 @@ let
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
};
};
"ws-7.4.1" = {
"ws-7.5.3" = {
name = "ws";
packageName = "ws";
version = "7.4.1";
version = "7.5.3";
src = fetchurl {
url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz";
sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==";
url = "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz";
sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==";
};
};
"xtend-4.0.2" = {
@ -3160,10 +3241,10 @@ let
sources."@discordjs/collection-0.1.6"
sources."@discordjs/form-data-3.0.1"
sources."@sindresorhus/is-3.1.2"
(sources."@sorunome/matrix-bot-sdk-0.5.8" // {
(sources."@sorunome/matrix-bot-sdk-0.5.13" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
sources."chalk-4.1.1"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."has-flag-4.0.0"
@ -3172,20 +3253,20 @@ let
];
})
sources."@szmarczak/http-timer-4.0.5"
sources."@types/body-parser-1.19.0"
sources."@types/body-parser-1.19.1"
sources."@types/cacheable-request-6.0.1"
sources."@types/connect-3.4.34"
sources."@types/express-4.17.11"
sources."@types/express-serve-static-core-4.17.18"
sources."@types/connect-3.4.35"
sources."@types/express-4.17.13"
sources."@types/express-serve-static-core-4.17.24"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
sources."@types/node-14.6.3"
sources."@types/prop-types-15.7.3"
sources."@types/qs-6.9.5"
sources."@types/range-parser-1.2.3"
sources."@types/qs-6.9.7"
sources."@types/range-parser-1.2.4"
sources."@types/react-17.0.0"
sources."@types/responselike-1.0.0"
(sources."@types/serve-static-1.13.9" // {
(sources."@types/serve-static-1.13.10" // {
dependencies = [
sources."@types/mime-1.3.2"
];
@ -3207,10 +3288,19 @@ let
sources."base64-js-1.5.1"
sources."basic-auth-2.0.1"
sources."better-discord.js-git+https://github.com/Sorunome/better-discord.js.git#5e58e1e7510cf2192f3503ca146dd61a56a75c72"
sources."better-sqlite3-6.0.1"
(sources."better-sqlite3-7.4.3" // {
dependencies = [
sources."chownr-2.0.0"
sources."fs-minipass-2.1.0"
sources."minipass-3.1.3"
sources."minizlib-2.1.2"
sources."mkdirp-1.0.4"
sources."tar-6.1.0"
];
})
sources."bindings-1.5.0"
sources."bintrees-1.0.1"
(sources."bl-4.0.3" // {
(sources."bl-4.1.0" // {
dependencies = [
sources."inherits-2.0.4"
sources."readable-stream-3.6.0"
@ -3234,6 +3324,7 @@ let
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."color-string-1.5.4"
sources."colorette-1.2.2"
sources."colors-1.4.0"
sources."colorspace-1.1.2"
sources."combined-stream-1.0.8"
@ -3261,6 +3352,7 @@ let
];
})
sources."deep-extend-0.6.0"
sources."deepmerge-4.2.2"
sources."defer-to-connect-2.0.0"
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
@ -3268,24 +3360,24 @@ let
sources."destroy-1.0.4"
sources."detect-libc-1.0.3"
sources."diff-3.5.0"
sources."discord-markdown-git://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085"
(sources."dom-serializer-1.2.0" // {
sources."discord-markdown-git+https://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085"
(sources."dom-serializer-1.3.2" // {
dependencies = [
sources."domhandler-4.0.0"
sources."domhandler-4.2.0"
];
})
sources."domelementtype-2.1.0"
sources."domelementtype-2.2.0"
sources."domhandler-3.3.0"
(sources."domutils-2.4.4" // {
(sources."domutils-2.7.0" // {
dependencies = [
sources."domhandler-4.0.0"
sources."domhandler-4.2.0"
];
})
sources."ee-first-1.1.1"
sources."enabled-2.0.0"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
sources."entities-2.1.0"
sources."entities-2.2.0"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
sources."esprima-4.0.1"
@ -3305,7 +3397,7 @@ let
sources."finalhandler-1.1.2"
sources."find-replace-3.0.0"
sources."fn.name-1.1.0"
sources."forwarded-0.1.2"
sources."forwarded-0.2.0"
sources."fresh-0.5.2"
sources."fs-constants-1.0.0"
sources."fs-minipass-1.2.7"
@ -3316,13 +3408,14 @@ let
sources."glob-7.1.4"
sources."glob-to-regexp-0.4.1"
sources."got-11.6.0"
sources."graceful-fs-4.2.4"
sources."graceful-fs-4.2.6"
sources."has-flag-3.0.0"
sources."has-unicode-2.0.1"
sources."hash.js-1.1.7"
sources."hasha-5.2.2"
sources."he-1.2.0"
sources."highlight.js-10.4.1"
sources."html-to-text-6.0.0"
sources."htmlencode-0.0.4"
sources."htmlparser2-4.1.0"
sources."http-cache-semantics-4.1.0"
@ -3334,11 +3427,11 @@ let
sources."inflight-1.0.6"
sources."inherits-2.0.3"
sources."ini-1.3.8"
sources."integer-3.0.1"
sources."ipaddr.js-1.9.1"
sources."is-arrayish-0.3.2"
sources."is-extendable-0.1.1"
sources."is-fullwidth-code-point-1.0.0"
sources."is-plain-object-5.0.0"
sources."is-promise-2.2.2"
sources."is-stream-2.0.0"
sources."isarray-1.0.0"
@ -3346,9 +3439,10 @@ let
sources."js-yaml-3.13.1"
sources."json-buffer-3.0.1"
sources."keyv-4.0.1"
sources."klona-2.0.4"
sources."kuler-2.0.0"
sources."linkify-it-2.2.0"
sources."lodash-4.17.20"
sources."lodash-4.17.21"
sources."lodash.camelcase-4.3.0"
sources."lodash.padend-4.6.1"
sources."lodash.toarray-4.4.0"
@ -3392,12 +3486,13 @@ let
];
})
sources."ms-2.0.0"
(sources."mx-puppet-bridge-0.1.4" // {
(sources."mx-puppet-bridge-0.1.6" // {
dependencies = [
sources."events-3.2.0"
];
})
sources."nan-2.14.2"
sources."nanoid-3.1.23"
sources."napi-build-utils-1.0.2"
(sources."needle-2.6.0" // {
dependencies = [
@ -3406,14 +3501,13 @@ let
];
})
sources."negotiator-0.6.2"
sources."node-abi-2.19.3"
sources."node-abi-2.30.0"
sources."node-emoji-1.10.0"
sources."node-fetch-2.6.1"
sources."node-html-parser-1.4.9"
sources."node-pre-gyp-0.11.0"
sources."noop-logger-0.1.1"
sources."nopt-4.0.3"
sources."normalize-url-4.5.0"
sources."normalize-url-4.5.1"
sources."normalize-version-1.0.5"
sources."npm-bundled-1.1.1"
sources."npm-normalize-package-bin-1.0.1"
@ -3447,21 +3541,17 @@ let
sources."pg-types-2.2.0"
sources."pgpass-1.0.4"
sources."pify-3.0.0"
(sources."postcss-7.0.35" // {
dependencies = [
sources."supports-color-6.1.0"
];
})
sources."postcss-8.3.6"
sources."postgres-array-2.0.0"
sources."postgres-bytea-1.0.0"
sources."postgres-date-1.0.7"
sources."postgres-interval-1.2.0"
sources."prebuild-install-5.3.6"
sources."prebuild-install-6.1.3"
sources."prism-media-1.2.3"
sources."process-0.11.10"
sources."process-nextick-args-2.0.1"
sources."prom-client-13.0.0"
sources."proxy-addr-2.0.6"
sources."proxy-addr-2.0.7"
sources."pump-3.0.0"
sources."qs-6.7.0"
sources."quick-lru-5.1.1"
@ -3476,7 +3566,13 @@ let
sources."rimraf-2.7.1"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sanitize-html-1.27.5"
(sources."sanitize-html-2.4.0" // {
dependencies = [
sources."domhandler-4.2.0"
sources."escape-string-regexp-4.0.0"
sources."htmlparser2-6.1.0"
];
})
sources."sax-1.2.4"
sources."semver-5.7.0"
sources."semver-closest-0.1.2"
@ -3500,7 +3596,7 @@ let
})
sources."simple-markdown-0.7.2"
sources."simple-swizzle-0.2.2"
sources."source-map-0.6.1"
sources."source-map-js-0.6.2"
sources."spex-3.2.0"
(sources."split2-3.2.2" // {
dependencies = [
@ -3556,7 +3652,6 @@ let
sources."utils-merge-1.0.1"
sources."uuid-3.4.0"
sources."vary-1.1.2"
sources."which-pm-runs-1.0.0"
sources."wide-align-1.1.3"
(sources."winston-3.3.3" // {
dependencies = [
@ -3582,7 +3677,7 @@ let
];
})
sources."wrappy-1.0.2"
sources."ws-7.4.1"
sources."ws-7.5.3"
sources."xtend-4.0.2"
sources."yallist-4.0.0"
];

2
pkgs/servers/plex/default.nix
View File

@ -65,6 +65,7 @@ buildFHSUserEnv {
# First, remove all of the symlinks in the plugins directory.
while IFS= read -r -d $'\0' f; do
echo "Removing plugin symlink: $f"
rm "$f"
done < <(find "$pluginDir" -type l -print0)
echo "Symlinking plugins"
@ -94,6 +95,7 @@ buildFHSUserEnv {
echo "Removing old symlinks"
while IFS= read -r -d $'\0' f; do
echo "Removing scanner symlink: $f"
rm "$f"
done < <(find "$scannerDir" -type l -print0)
echo "Symlinking scanners"

8
pkgs/servers/unpackerr/default.nix
View File

@ -2,19 +2,21 @@
buildGoModule rec {
pname = "unpackerr";
version = "0.9.8";
version = "0.9.9";
src = fetchFromGitHub {
owner = "davidnewhall";
repo = "unpackerr";
rev = "v${version}";
sha256 = "08xcxs4qh25qsjaf6wivhpszl61zdp59hlkd57igf9fv4lywb41q";
sha256 = "sha256-lQqa1YtMLsCEfiC3Ld+lw4SvAD8wctSGi2YdXt9lrTA=";
};
vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z";
vendorSha256 = "sha256-W9lTIjntaNZSJVt6Jow8uSew+zCaGWU9qzseClNiVUI=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];
ldflags = [ "-s" "-w" "-X golift.io/version.Version=${version}" ];
meta = with lib; {
description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import";
homepage = "https://github.com/davidnewhall/unpackerr";

4
pkgs/tools/admin/stripe-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "stripe-cli";
version = "1.7.10";
version = "1.7.11";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-F1+goZURc0f1dWV/PGxSVtqHkuePACq4+UzfMTEVJ0M=";
sha256 = "sha256-a2GoTdt6l6Yayaz1n1VdKxwrziNuFk/MO/6PvjqRxVM=";
};
vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk=";

27
pkgs/tools/backup/gh2md/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib
, python3Packages
}:
python3Packages.buildPythonApplication rec {
pname = "gh2md";
version = "2.0.0";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "7a277939d4781f4ca741eccb74fc70f0aa85811185da52219878129cba7f1d77";
};
propagatedBuildInputs = with python3Packages; [ six requests python-dateutil ];
# uses network
doCheck = false;
pythonImportsCheck = [ "gh2md" ];
meta = with lib; {
description = "Export Github repository issues to markdown files";
homepage = "https://github.com/mattduck/gh2md";
license = licenses.mit;
maintainers = with maintainers; [ artturin ];
};
}

1
pkgs/tools/misc/lottieconverter/default.nix
View File

@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
platforms = platforms.all;
maintainers = with maintainers; [ CRTified ];
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/lottieconverter.x86_64-darwin
};
}

4
pkgs/tools/networking/networkmanager/l2tp/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config
, file, findutils
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, libnma }:
, withGnome ? true, libnma, glib }:
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
})
];
buildInputs = [ networkmanager ppp ]
buildInputs = [ networkmanager ppp glib ]
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ];

4
pkgs/tools/networking/networkmanager/openvpn/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret
, gtk3, withGnome ? true, gnome, kmod, libnma }:
, glib, gtk3, withGnome ? true, gnome, kmod, libnma }:
let
pname = "NetworkManager-openvpn";
@ -19,7 +19,7 @@ in stdenv.mkDerivation {
})
];
buildInputs = [ openvpn networkmanager ]
buildInputs = [ openvpn networkmanager glib ]
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ intltool pkg-config file libxml2 ];

53
pkgs/tools/virtualization/google-guest-agent/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ buildGoModule, fetchFromGitHub, fetchpatch, lib, coreutils, makeWrapper
, google-guest-configs, google-guest-oslogin, iproute2, dhcp, procps
}:
buildGoModule rec {
pname = "guest-agent";
version = "20220104.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = pname;
rev = version;
sha256 = "sha256-BC2qpnGJU/D0z8jlmAEwvmFwBk1n0ZvqPBB6Zon9N/U=";
};
vendorSha256 = "sha256-YcWKSiN715Z9lmNAQx+sHEgxWnhFhenCNXBS7gdMV4M=";
patches = [ ./disable-etc-mutation.patch ];
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substitute ${./fix-paths.patch} fix-paths.patch \
--subst-var out \
--subst-var-by true "${coreutils}/bin/true"
patch -p1 < ./fix-paths.patch
'';
# We don't add `shadow` here; it's added to PATH if `mutableUsers` is enabled.
binPath = lib.makeBinPath [ google-guest-configs google-guest-oslogin iproute2 dhcp procps ];
# Skip tests which require networking.
preCheck = ''
rm google_guest_agent/wsfc_test.go
'';
postInstall = ''
mkdir -p $out/etc/systemd/system
cp *.service $out/etc/systemd/system
install -Dm644 instance_configs.cfg $out/etc/default/instance_configs.cfg
wrapProgram $out/bin/google_guest_agent \
--prefix PATH ":" "$binPath"
'';
meta = with lib; {
homepage = "https://github.com/GoogleCloudPlatform/guest-agent";
description = "Guest Agent for Google Compute Engine";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}

54
pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch Normal file
View File

@ -0,0 +1,54 @@
From 2e8060f9ade13ba18ae5930c0781227bfcce11a5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 10 Jan 2022 22:16:38 +0300
Subject: [PATCH] Disable accounts setup phase and oslogin
On NixOS we set up necessary groups and sudoers rules declaratively,
and have most of `/etc` directory read-only. This creates (harmless)
error messages when trying to create google-sudoers file.
"oslogin" daemon sets up configuration necessary for OS Login to
work, including PAM, NSS and sudoers. On NixOS we perform all this
configuration declaratively and have most of /etc mounted read-only.
This creates (harmless) error messages when running the daemon.
---
google_guest_agent/non_windows_accounts.go | 9 ---------
google_guest_agent/oslogin.go | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/google_guest_agent/non_windows_accounts.go b/google_guest_agent/non_windows_accounts.go
index 81013e3..05b830f 100644
--- a/google_guest_agent/non_windows_accounts.go
+++ b/google_guest_agent/non_windows_accounts.go
@@ -104,15 +104,6 @@ func (a *accountsMgr) set() error {
sshKeys = make(map[string][]string)
}
- logger.Debugf("create sudoers file if needed")
- if err := createSudoersFile(); err != nil {
- logger.Errorf("Error creating google-sudoers file: %v.", err)
- }
- logger.Debugf("create sudoers group if needed")
- if err := createSudoersGroup(); err != nil {
- logger.Errorf("Error creating google-sudoers group: %v.", err)
- }
-
mdkeys := newMetadata.Instance.Attributes.SSHKeys
if !newMetadata.Instance.Attributes.BlockProjectKeys {
mdkeys = append(mdkeys, newMetadata.Project.Attributes.SSHKeys...)
diff --git a/google_guest_agent/oslogin.go b/google_guest_agent/oslogin.go
index d05f733..980e84c 100644
--- a/google_guest_agent/oslogin.go
+++ b/google_guest_agent/oslogin.go
@@ -76,7 +76,7 @@ func (o *osloginMgr) timeout() bool {
}
func (o *osloginMgr) disabled(os string) bool {
- return os == "windows"
+ return true
}
func (o *osloginMgr) set() error {
--
2.34.1

43
pkgs/tools/virtualization/google-guest-agent/fix-paths.patch Normal file
View File

@ -0,0 +1,43 @@
diff --git a/google-guest-agent.service b/google-guest-agent.service
index 79b8e39..a39097b 100644
--- a/google-guest-agent.service
+++ b/google-guest-agent.service
@@ -14,7 +14,7 @@ PartOf=network.service networking.service NetworkManager.service systemd-network
[Service]
Type=notify
-ExecStart=/usr/bin/google_guest_agent
+ExecStart=@out@/bin/google_guest_agent
OOMScoreAdjust=-999
Restart=always
diff --git a/google-shutdown-scripts.service b/google-shutdown-scripts.service
index 16bb9c2..ae02067 100644
--- a/google-shutdown-scripts.service
+++ b/google-shutdown-scripts.service
@@ -5,10 +5,10 @@ After=network-online.target rsyslog.service
[Service]
Type=oneshot
-ExecStart=/bin/true
+ExecStart=@true@
RemainAfterExit=true
# This service does nothing on start, and runs shutdown scripts on stop.
-ExecStop=/usr/bin/google_metadata_script_runner shutdown
+ExecStop=@out@/bin/google_metadata_script_runner shutdown
TimeoutStopSec=0
KillMode=process
diff --git a/google-startup-scripts.service b/google-startup-scripts.service
index dfc9838..2465265 100644
--- a/google-startup-scripts.service
+++ b/google-startup-scripts.service
@@ -6,7 +6,7 @@ Before=apt-daily.service
[Service]
Type=oneshot
-ExecStart=/usr/bin/google_metadata_script_runner startup
+ExecStart=@out@/bin/google_metadata_script_runner startup
#TimeoutStartSec is ignored for Type=oneshot service units.
KillMode=process

52
pkgs/tools/virtualization/google-guest-configs/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, substituteAll
, ipcalc, iproute2, util-linux, coreutils, ethtool, gnugrep, gnused, nvme-cli }:
stdenv.mkDerivation rec {
pname = "google-guest-configs";
version = "20211116.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "guest-configs";
rev = version;
sha256 = "sha256-0SRu6p/DsHNNI20mkXJitt/Ee5S2ooiy5hNmD+ndecM=";
};
binDeps = lib.makeBinPath [ coreutils util-linux gnugrep gnused ethtool ipcalc iproute2 ];
nativeBuildInputs = [ makeWrapper ];
dontConfigure = true;
dontBuild = true;
postPatch = ''
substitute ${./fix-paths.patch} fix-paths.patch \
--subst-var out \
--subst-var-by nvme "${nvme-cli}/bin/nvme" \
--subst-var-by sh "${stdenv.shell}" \
--subst-var-by umount "${util-linux}/bin/umount" \
--subst-var-by logger "${util-linux}/bin/logger"
patch -p1 < ./fix-paths.patch
'';
installPhase = ''
mkdir -p $out/{bin,etc,lib}
cp -r src/etc/{modprobe.d,sysctl.d} $out/etc
cp -r src/lib/udev $out/lib
cp -r src/sbin/* $out/bin
cp -r src/usr/bin/* $out/bin
for i in $out/bin/* $out/lib/udev/google_nvme_id; do
wrapProgram "$i" \
--prefix "PATH" ":" "$binDeps"
done
'';
meta = with lib; {
homepage = "https://github.com/GoogleCloudPlatform/guest-configs";
description = "Linux Guest Environment for Google Compute Engine";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}

61
pkgs/tools/virtualization/google-guest-configs/fix-paths.patch Normal file
View File

@ -0,0 +1,61 @@
diff -ru3 source.old/src/lib/udev/google_nvme_id source.new/src/lib/udev/google_nvme_id
--- source.old/src/lib/udev/google_nvme_id 1970-01-01 03:00:01.000000000 +0300
+++ source.new/src/lib/udev/google_nvme_id 2022-02-05 13:30:00.986242869 +0300
@@ -17,7 +17,7 @@
# the metadata server
# Locations of the script's dependencies
-readonly nvme_cli_bin=/usr/sbin/nvme
+readonly nvme_cli_bin=@nvme@
# Bash regex to parse device paths and controller identification
readonly NAMESPACE_NUMBER_REGEX="/dev/nvme[[:digit:]]+n([[:digit:]]+).*"
diff -ru3 source.old/src/lib/udev/rules.d/64-gce-disk-removal.rules source.new/src/lib/udev/rules.d/64-gce-disk-removal.rules
--- source.old/src/lib/udev/rules.d/64-gce-disk-removal.rules 1970-01-01 03:00:01.000000000 +0300
+++ source.new/src/lib/udev/rules.d/64-gce-disk-removal.rules 2022-02-05 13:27:42.635300567 +0300
@@ -14,4 +14,4 @@
#
# When a disk is removed, unmount any remaining attached volumes.
-ACTION=="remove", SUBSYSTEM=="block", KERNEL=="sd*|vd*|nvme*", RUN+="/bin/sh -c '/bin/umount -fl /dev/$name && /usr/bin/logger -p daemon.warn -s WARNING: hot-removed /dev/$name that was still mounted, data may have been corrupted'"
+ACTION=="remove", SUBSYSTEM=="block", KERNEL=="sd*|vd*|nvme*", RUN+="@sh@ -c '@umount@ -fl /dev/$name && @logger@ -p daemon.warn -s WARNING: hot-removed /dev/$name that was still mounted, data may have been corrupted'"
diff -ru3 source.old/src/lib/udev/rules.d/65-gce-disk-naming.rules source.new/src/lib/udev/rules.d/65-gce-disk-naming.rules
--- source.old/src/lib/udev/rules.d/65-gce-disk-naming.rules 1970-01-01 03:00:01.000000000 +0300
+++ source.new/src/lib/udev/rules.d/65-gce-disk-naming.rules 2022-02-05 13:27:05.053107964 +0300
@@ -21,11 +21,11 @@
KERNEL=="sd*|vd*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode"
# NVME Local SSD naming
-KERNEL=="nvme*n*", ATTRS{model}=="nvme_card", PROGRAM="/bin/sh -c 'nsid=$$(echo %k|sed -re s/nvme[0-9]+n\([0-9]+\).\*/\\1/); echo $$((nsid-1))'", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-%c"
+KERNEL=="nvme*n*", ATTRS{model}=="nvme_card", PROGRAM="@sh@ -c 'nsid=$$(echo %k|sed -re s/nvme[0-9]+n\([0-9]+\).\*/\\1/); echo $$((nsid-1))'", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-%c"
KERNEL=="nvme*", ATTRS{model}=="nvme_card", ENV{ID_SERIAL}="Google_EphemeralDisk_$env{ID_SERIAL_SHORT}"
# NVME Persistent Disk Naming
-KERNEL=="nvme*n*", ATTRS{model}=="nvme_card-pd", IMPORT{program}="google_nvme_id -d $tempnode"
+KERNEL=="nvme*n*", ATTRS{model}=="nvme_card-pd", IMPORT{program}="@out@/lib/udev/google_nvme_id -d $tempnode"
# Symlinks
KERNEL=="sd*|vd*|nvme*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}"
diff -ru3 source.old/src/sbin/google-dhclient-script source.new/src/sbin/google-dhclient-script
--- source.old/src/sbin/google-dhclient-script 1970-01-01 03:00:01.000000000 +0300
+++ source.new/src/sbin/google-dhclient-script 2022-02-05 13:29:37.430058984 +0300
@@ -31,7 +31,6 @@
# This script is found in EL 7 and used to fix local routing in EL 6.
# ----------
-PATH=/bin:/usr/bin:/sbin
# scripts in dhclient.d/ use $SAVEDIR (#833054)
SAVEDIR=/var/lib/dhclient
@@ -58,9 +57,9 @@
if need_hostname; then
status=1
if [ -n "${new_ip_address}" ]; then
- eval $(/bin/ipcalc --silent --hostname ${new_ip_address} ; echo "status=$?")
+ eval $(ipcalc --silent --hostname ${new_ip_address} ; echo "status=$?")
elif [ -n "${new_ip6_address}" ]; then
- eval $(/bin/ipcalc --silent --hostname ${new_ip6_address} ; echo "status=$?")
+ eval $(ipcalc --silent --hostname ${new_ip6_address} ; echo "status=$?")
fi
if [ ${status} -eq 0 ]; then

28
pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix → pkgs/tools/virtualization/google-guest-oslogin/default.nix
View File

@ -9,38 +9,39 @@
}:
stdenv.mkDerivation rec {
pname = "google-compute-engine-oslogin";
version = "20210429.00";
pname = "google-guest-oslogin";
version = "20211213.00";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "guest-oslogin";
rev = version;
sha256 = "eHAg9K5oxcygEzqaac81jSFHF+zsW6uB7q2Kfo9hSrA=";
sha256 = "sha256-8RuLYdWfk8zPfoF06r5E/6eHQ7tziZbgGhZlLCUW600=";
};
postPatch = ''
# change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)
substituteInPlace src/pam/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d
# fix "User foo not allowed because shell /bin/bash does not exist"
substituteInPlace src/include/compat.h --replace /bin/bash ${bashInteractive}/bin/bash
substituteInPlace src/include/compat.h --replace /bin/bash /run/current-system/sw/bin/bash
'';
buildInputs = [ curl.dev pam ];
buildInputs = [ curl.dev pam json_c ];
NIX_CFLAGS_COMPILE = "-I${json_c.dev}/include/json-c";
NIX_CFLAGS_LINK = "-L${json_c}/lib";
NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" ];
makeFlags = [
"VERSION=${version}"
"DESTDIR=${placeholder "out"}"
"PREFIX=/"
"BINDIR=/bin"
"LIBDIR=/lib"
"PAMDIR=/lib"
"MANDIR=/share/man"
"PREFIX=$(out)"
"MANDIR=$(out)/share/man"
"SYSTEMDDIR=$(out)/etc/systemd/system"
"PRESETDIR=$(out)/etc/systemd/system-preset"
];
postInstall = ''
sed -i "s,/usr/bin/,$out/bin/,g" $out/etc/systemd/system/google-oslogin-cache.service
'';
enableParallelBuilding = true;
passthru.tests = {
@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages";
description = "OS Login Guest Environment for Google Compute Engine";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ flokli ];
};
}

1
pkgs/top-level/aliases.nix
View File

@ -378,6 +378,7 @@ mapAliases ({
gmailieer = lieer; # Added 2020-04-19
gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07
gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08
gnome-passwordsafe = gnome-secrets; # added 2022-01-30
gnome-mpv = celluloid; # Added 2019-08-22
gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15
gnome-themes-standard = gnome-themes-extra; # Added 2018-03-14

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

@ -1111,6 +1111,10 @@ with pkgs;
stdenv = clangStdenv;
};
archi = callPackage ../tools/misc/archi { };
breitbandmessung = callPackage ../applications/networking/breitbandmessung { };
### APPLICATIONS/TERMINAL-EMULATORS
alacritty = callPackage ../applications/terminal-emulators/alacritty {
@ -1118,10 +1122,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
archi = callPackage ../tools/misc/archi { };
breitbandmessung = callPackage ../applications/networking/breitbandmessung { };
contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { };
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
@ -1142,21 +1142,15 @@ with pkgs;
hyper = callPackage ../applications/terminal-emulators/hyper { };
iqueue = callPackage ../development/libraries/iqueue {};
iterm2 = callPackage ../applications/terminal-emulators/iterm2 { };
iterm2 = callPackage ../applications/terminal-emulators/iterm2 {};
kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { };
kitty = callPackage ../applications/terminal-emulators/kitty {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
};
lifecycled = callPackage ../tools/misc/lifecycled { };
lilo = callPackage ../tools/misc/lilo { };
logseq = callPackage ../applications/misc/logseq { };
lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
microcom = callPackage ../applications/terminal-emulators/microcom { };
@ -1169,16 +1163,8 @@ with pkgs;
mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
natls = callPackage ../tools/misc/natls { };
nimmm = callPackage ../applications/terminal-emulators/nimmm { };
notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { };
pikchr = callPackage ../tools/graphics/pikchr { };
popsicle = callPackage ../tools/misc/popsicle { };
roxterm = callPackage ../applications/terminal-emulators/roxterm { };
rxvt = callPackage ../applications/terminal-emulators/rxvt { };
@ -1201,16 +1187,12 @@ with pkgs;
mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { };
siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { };
snowflake = callPackage ../tools/networking/snowflake { };
stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
gtk = gtk3;
};
terminator = callPackage ../applications/terminal-emulators/terminator { };
terminal-colors = callPackage ../applications/misc/terminal-colors { };
termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix {
termite = termite-unwrapped;
};
@ -1220,36 +1202,54 @@ with pkgs;
termonad = termonad-with-packages;
termsyn = callPackage ../data/fonts/termsyn { };
tilda = callPackage ../applications/terminal-emulators/tilda {
gtk = gtk3;
};
tilix = callPackage ../applications/terminal-emulators/tilix { };
timedoctor = callPackage ../applications/office/timedoctor { };
tvnamer = callPackage ../tools/misc/tvnamer { };
twine = with python3Packages; toPythonApplication twine;
wayst = callPackage ../applications/terminal-emulators/wayst { };
wezterm = callPackage ../applications/terminal-emulators/wezterm {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation;
};
writefreely = callPackage ../applications/misc/writefreely { };
x3270 = callPackage ../applications/terminal-emulators/x3270 { };
xterm = callPackage ../applications/terminal-emulators/xterm { };
xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {};
xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { };
yaft = callPackage ../applications/terminal-emulators/yaft { };
writefreely = callPackage ../applications/misc/writefreely { };
iqueue = callPackage ../development/libraries/iqueue { };
lifecycled = callPackage ../tools/misc/lifecycled { };
lilo = callPackage ../tools/misc/lilo { };
logseq = callPackage ../applications/misc/logseq { };
natls = callPackage ../tools/misc/natls { };
notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { };
pikchr = callPackage ../tools/graphics/pikchr { };
popsicle = callPackage ../tools/misc/popsicle { };
terminal-colors = callPackage ../applications/misc/terminal-colors { };
termsyn = callPackage ../data/fonts/termsyn { };
timedoctor = callPackage ../applications/office/timedoctor { };
tvnamer = callPackage ../tools/misc/tvnamer { };
twine = with python3Packages; toPythonApplication twine;
aldo = callPackage ../applications/radio/aldo { };
almanah = callPackage ../applications/misc/almanah { };
@ -3188,6 +3188,8 @@ with pkgs;
ghidra-bin = callPackage ../tools/security/ghidra { };
gh2md = callPackage ../tools/backup/gh2md { };
gif-for-cli = callPackage ../tools/misc/gif-for-cli { };
giph = callPackage ../applications/video/giph { };
@ -5079,6 +5081,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
};
snowflake = callPackage ../tools/networking/snowflake { };
wsl-open = callPackage ../tools/misc/wsl-open { };
xkcdpass = with python3Packages; toPythonApplication xkcdpass;
@ -6004,7 +6008,7 @@ with pkgs;
gnome-keysign = callPackage ../tools/security/gnome-keysign { };
gnome-passwordsafe = callPackage ../applications/misc/gnome-passwordsafe { };
gnome-secrets = callPackage ../applications/misc/gnome-secrets { };
gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
@ -6119,12 +6123,16 @@ with pkgs;
google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine;
google-compute-engine-oslogin = callPackage ../tools/virtualization/google-compute-engine-oslogin { };
google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { };
google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { };
google-java-format = callPackage ../development/tools/google-java-format { };
google-guest-agent = callPackage ../tools/virtualization/google-guest-agent { };
google-guest-configs = callPackage ../tools/virtualization/google-guest-configs { };
gdown = with python3Packages; toPythonApplication gdown;
gopro = callPackage ../tools/video/gopro { };

22
pkgs/top-level/nixpkgs-basic-release-checks.nix
View File

@ -30,12 +30,22 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; }
# Relies on impure eval
export NIX_ABORT_ON_WARN=true
nix-env -f $src \
--show-trace --argstr system "$platform" \
--arg config '{ allowAliases = false; }' \
--option experimental-features 'no-url-literals' \
-qa --drv-path --system-filter \* --system \
"''${opts[@]}" 2> eval-warnings.log > packages1
set +e
(
set -x
nix-env -f $src \
--show-trace --argstr system "$platform" \
--arg config '{ allowAliases = false; }' \
--option experimental-features 'no-url-literals' \
-qa --drv-path --system-filter \* --system \
"''${opts[@]}" 2> eval-warnings.log > packages1
)
rc=$?
set -e
if [ "$rc" != "0" ]; then
cat eval-warnings.log
exit $rc
fi
s1=$(sha1sum packages1 | cut -c1-40)
echo $s1

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

@ -4135,7 +4135,11 @@ in {
jax = callPackage ../development/python-modules/jax { };
jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { };
jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
cudatoolkit_11 = tensorflow_compat_cudatoolkit;
cudnn = tensorflow_compat_cudnn;
};
jaxlib-build = callPackage ../development/python-modules/jaxlib {
# Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.

22
pkgs/top-level/release-small.nix
View File

@ -40,12 +40,10 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
diffutils = all;
e2fsprogs = linux;
emacs = linux;
enscript = all;
file = all;
findutils = all;
flex = all;
gcc = all;
gcj = linux;
glibc = linux;
glibcLocales = linux;
gnugrep = all;
@ -59,7 +57,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
gnutls = linux;
grub = linux;
grub2 = linux;
gsl = linux;
guile = linux; # tests fail on Cygwin
gzip = all;
hddtemp = linux;
@ -71,10 +68,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
idutils = all;
inetutils = linux;
iputils = linux;
jnettop = linux;
jwhois = linux;
kbd = linux;
keen4 = ["i686-linux"];
kvm = linux;
qemu = linux;
qemu_kvm = linux;
@ -95,16 +88,11 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
man = linux;
man-pages = linux;
mc = all;
mcabber = linux;
mcron = linux;
mdadm = linux;
mesa = mesaPlatforms;
midori = linux;
mingetty = linux;
mktemp = all;
mono = linux;
monotone = linux;
mpg321 = linux;
mutt = linux;
mysql = linux;
# netcat broken on darwin
@ -119,24 +107,20 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
openssh = linux;
openssl = all;
pan = linux;
par2cmdline = all;
pciutils = linux;
pdf2xml = all;
perl = all;
pkg-config = all;
pmccabe = linux;
procps = linux;
python = unix; # Cygwin builds fail
python3 = unix; # Cygwin builds fail
readline = all;
rlwrap = all;
rpm = linux;
rpcbind = linux;
rsync = linux;
screen = linux ++ darwin;
scrot = linux;
sdparm = linux;
sharutils = all;
sloccount = unix; # Cygwin builds fail
smartmontools = all;
sqlite = unix; # Cygwin builds fail
squid = linux;
@ -147,8 +131,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
sudo = linux;
sysklogd = linux;
syslinux = ["i686-linux"];
sysvinit = linux;
sysvtools = linux;
tcl = linux;
tcpdump = linux;
texinfo = all;
@ -163,12 +145,10 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
webkitgtk = linux;
wget = all;
which = all;
wireshark = linux;
wirelesstools = linux;
wpa_supplicant = linux;
xfsprogs = linux;
xkeyboard_config = linux;
zile = linux;
zip = all;
} ))

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

@ -8,9 +8,6 @@ rec {
};
base = minimal.override {
pngSupport = true;
jpegSupport = true;
tiffSupport = true;
gettextSupport = true;
fontconfigSupport = true;
alsaSupport = true;
@ -25,7 +22,6 @@ rec {
pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
udevSupport = true;
xineramaSupport = true;
xmlSupport = true;
sdlSupport = true;
mingwSupport = true;
};
@ -33,8 +29,6 @@ rec {
full = base.override {
gtkSupport = true;
gstreamerSupport = true;
colorManagementSupport = true;
mpg123Support = true;
openalSupport = true;
openclSupport = true;
odbcSupport = true;
@ -42,10 +36,8 @@ rec {
vaSupport = true;
pcapSupport = true;
v4lSupport = true;
gsmSupport = true;
gphoto2Support = true;
ldapSupport = true;
faudioSupport = true;
vkd3dSupport = true;
embedInstallers = true;
};