Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-07-18 12:01:50 +00:00 committed by GitHub
commit 09be4e7750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 1027 additions and 906 deletions

View file

@ -229,7 +229,7 @@ in
grafana = 196;
skydns = 197;
# ripple-rest = 198; # unused, removed 2017-08-12
nix-serve = 199;
# nix-serve = 199; # unused, removed 2020-12-12
tvheadend = 200;
uwsgi = 201;
gitit = 202;

View file

@ -25,10 +25,9 @@ in {
default = [];
example = "/run/keys/telegraf.env";
description = ''
File to load as environment file. Environment variables
from this file will be interpolated into the config file
using envsubst with this syntax:
<literal>$ENVIRONMENT ''${VARIABLE}</literal>
File to load as environment file. Environment variables from this file
will be interpolated into the config file using envsubst with this
syntax: <literal>$ENVIRONMENT</literal> or <literal>''${VARIABLE}</literal>.
This is useful to avoid putting secrets into the nix store.
'';
};
@ -73,6 +72,7 @@ in {
ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID";
RuntimeDirectory = "telegraf";
User = "telegraf";
Group = "telegraf";
Restart = "on-failure";
# for ping probes
AmbientCapabilities = [ "CAP_NET_RAW" ];
@ -81,7 +81,10 @@ in {
users.users.telegraf = {
uid = config.ids.uids.telegraf;
group = "telegraf";
description = "telegraf daemon user";
};
users.groups.telegraf = {};
};
}

View file

@ -69,13 +69,9 @@ in
ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
"--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
User = "nix-serve";
Group = "nogroup";
Group = "nix-serve";
DynamicUser = true;
};
};
users.users.nix-serve = {
description = "Nix-serve user";
uid = config.ids.uids.nix-serve;
};
};
}

View file

@ -296,6 +296,7 @@ in
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
nginx-sso = handleTest ./nginx-sso.nix {};
nginx-variants = handleTest ./nginx-variants.nix {};
nix-serve = handleTest ./nix-ssh-serve.nix {};
nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};
nixos-generate-config = handleTest ./nixos-generate-config.nix {};
nomad = handleTest ./nomad.nix {};

22
nixos/tests/nix-serve.nix Normal file
View file

@ -0,0 +1,22 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "nix-serve";
machine = { pkgs, ... }: {
services.nix-serve.enable = true;
environment.systemPackages = [
pkgs.hello
];
};
testScript = let
pkgHash = builtins.head (
builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello)
);
in ''
start_all()
machine.wait_for_unit("nix-serve.service")
machine.wait_for_open_port(5000)
machine.succeed(
"curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar"
)
'';
})

View file

@ -2,12 +2,12 @@
let
pname = "deltachat-electron";
version = "1.15.5";
version = "1.20.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
sha256 = "sha256-BTGwgC0zSr1tq/X4v/fS/12E7/mGVYQ0m+Bt6o7VL4o=";
sha256 = "sha256-u0YjaXb+6BOBWaZANPcaxp7maqlBWAtecSsCGbr67dk=";
};
appimageContents = appimageTools.extract { inherit name src; };

View file

@ -1,22 +1,23 @@
{ lib, stdenv, fetchgit, bison, flex }:
with lib;
{ lib, stdenv, fetchFromGitHub, bison, flex }:
stdenv.mkDerivation rec {
pname = "pcalc";
version = "20141224";
version = "20181202";
src = fetchgit {
url = "git://git.code.sf.net/p/pcalc/code";
rev = "181d60d3c880da4344fef7138065943eb3b9255f";
sha256 = "1hd5bh20j5xzvv6qa0fmzmv0h8sf38r7zgi7y0b6nk17pjq33v90";
src = fetchFromGitHub {
owner = "vapier";
repo = "pcalc";
rev = "d93be9e19ecc0b2674cf00ec91cbb79d32ccb01d";
sha256 = "sha256-m4xdsEJGKxLgp/d5ipxQ+cKG3z7rlvpPL6hELnDu6Hk=";
};
makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ];
buildInputs = [ bison flex ];
nativeBuildInputs = [ bison flex ];
meta = {
homepage = "http://pcalc.sourceforge.net/";
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://vapier.github.io/pcalc/";
description = "Programmer's calculator";
license = licenses.gpl2;
maintainers = with lib.maintainers; [ ftrvxmtrx ];

View file

@ -5,6 +5,7 @@
, libX11
, gtk2
, gtk3
, wrapGAppsHook
, withGtk3 ? true
}:
@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
intltool
wrapGAppsHook
];
buildInputs = [

View file

@ -14,6 +14,17 @@ let
'';
};
autoprefixer = super.autoprefixer.override {
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/autoprefixer" \
--prefix NODE_PATH : ${self.postcss}/lib/node_modules
'';
passthru.tests = {
simple-execution = pkgs.callPackage ./package-tests/autoprefixer.nix { inherit (self) autoprefixer; };
};
};
aws-azure-login = super.aws-azure-login.override {
meta.platforms = pkgs.lib.platforms.linux;
nativeBuildInputs = [ pkgs.makeWrapper ];
@ -262,7 +273,8 @@ let
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/postcss" \
--prefix NODE_PATH : ${self.postcss}/lib/node_modules
--prefix NODE_PATH : ${self.postcss}/lib/node_modules \
--prefix NODE_PATH : ${self.autoprefixer}/lib/node_modules
'';
meta.mainProgram = "postcss";
};

View file

@ -13,6 +13,7 @@
, "@webassemblyjs/wast-refmt"
, "alloy"
, "asar"
, "autoprefixer"
, "aws-azure-login"
, "balanceofsatoshis"
, "bash-language-server"

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,25 @@
{ runCommand, autoprefixer }:
let
inherit (autoprefixer) packageName version;
in
runCommand "${packageName}-tests" { meta.timeout = 60; }
''
# get version of installed program and compare with package version
claimed_version="$(${autoprefixer}/bin/autoprefixer --version | awk '{print $2}')"
if [[ "$claimed_version" != "${version}" ]]; then
echo "Error: program version does not match package version ($claimed_version != ${version})"
exit 1
fi
# run dummy commands
${autoprefixer}/bin/autoprefixer --help > /dev/null
${autoprefixer}/bin/autoprefixer --info > /dev/null
# Testing the actual functionality is done in the test for postcss
# because autoprefixer is a postcss plugin
# needed for Nix to register the command as successful
touch $out
''

View file

@ -60,7 +60,7 @@ buildPythonPackage rec {
--deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
--deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
${lib.optionalString stdenv.isDarwin
"--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"}
"--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block --deselect=cherrypy/test/test_config_server.py"}
'';
__darwinAllowLocalNetworking = true;

View file

@ -77,5 +77,6 @@ stdenv.mkDerivation rec {
description = "An implementation of the standard Unix documentation system accessed using the man command";
license = licenses.gpl2;
platforms = lib.platforms.unix;
mainProgram = "man";
};
}

View file

@ -1,5 +1,11 @@
{ lib, stdenv, fetchFromGitHub,
bzip2, nix, perl, makeWrapper,
{ lib
, stdenv
, fetchFromGitHub
, bzip2
, nix
, perl
, makeWrapper
, nixosTests
}:
with lib;
@ -30,6 +36,8 @@ stdenv.mkDerivation {
--add-flags $out/libexec/nix-serve/nix-serve.psgi
'';
passthru.tests.nix-serve = nixosTests.nix-serve;
meta = {
homepage = "https://github.com/edolstra/nix-serve";
description = "A utility for sharing a Nix store as a binary cache";

View file

@ -38,5 +38,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ peti Frostman ];
platforms = with platforms; linux ++ darwin;
mainProgram = "smartctl";
};
}