Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-02-17 00:02:21 +00:00 committed by GitHub
commit c72570c5b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
186 changed files with 430 additions and 265 deletions

View file

@ -6338,6 +6338,12 @@
githubId = 209729;
name = "Kevin Griffin";
};
kevink = {
email = "kevin@kevink.dev";
github = "Unkn0wnCat";
githubId = 8211181;
name = "Kevin Kandlbinder";
};
kfollesdal = {
email = "kfollesdal@gmail.com";
github = "kfollesdal";

View file

@ -7,11 +7,11 @@
<para>
These instructions assume that you have an existing PXE or iPXE
infrastructure and simply want to add the NixOS installer as another
option. To build the necessary files from a recent version of
option. To build the necessary files from your current version of
nixpkgs, you can run:
</para>
<programlisting>
nix-build -A netboot.x86_64-linux nixos/release.nix
nix-build -A netboot.x86_64-linux '&lt;nixpkgs/nixos/release.nix&gt;'
</programlisting>
<para>
This will create a <literal>result</literal> directory containing: *

View file

@ -5,11 +5,11 @@ setup.
These instructions assume that you have an existing PXE or iPXE
infrastructure and simply want to add the NixOS installer as another
option. To build the necessary files from a recent version of nixpkgs,
option. To build the necessary files from your current version of nixpkgs,
you can run:
```ShellSession
nix-build -A netboot.x86_64-linux nixos/release.nix
nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>'
```
This will create a `result` directory containing: \* `bzImage` -- the

View file

@ -81,7 +81,9 @@ let
http_access deny all
# Squid normally listens to port 3128
http_port ${toString cfg.proxyPort}
http_port ${
optionalString (cfg.proxyAddress != null) "${cfg.proxyAddress}:"
}${toString cfg.proxyPort}
# Leave coredumps in the first cache dir
coredump_dir /var/cache/squid
@ -109,6 +111,12 @@ in
description = "Whether to run squid web proxy.";
};
proxyAddress = mkOption {
type = types.nullOr types.str;
default = null;
description = "IP address on which squid will listen.";
};
proxyPort = mkOption {
type = types.int;
default = 3128;

View file

@ -192,6 +192,7 @@ in {
# Copy config folder
chmod g+s "${dataDir}"
cp -r "${cfg.package}/share/config" "${dataDir}/"
mkdir -p "${dataDir}/misc"
chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
# check whether user setup has already been done

View file

@ -9,16 +9,16 @@ let
in buildGoModule rec {
pname = "go-ethereum";
version = "1.10.15";
version = "1.10.16";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "0f6n9rg42ph47mvykc9f0lf99yzwqy4jm7mlzyks4l6i6fl1g3q1";
sha256 = "sha256-l+hxAUw55d9MYLIUdF6qSEIelJQYRCvHyw1yuossmyA=";
};
vendorSha256 = "1s5yfpk2yn7f3zwjl2fdrh6c63ki2b8rlmnlss27yxibsidaj0yd";
vendorSha256 = "sha256-keeox2d2WEzY9ynEcovPaU95YzVQlbTu1i7PLpjkjZU=";
doCheck = false;

View file

@ -18,13 +18,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "setzer";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "cvfosammmm";
repo = "Setzer";
rev = "v${version}";
sha256 = "sha256-uh6mXXJP/EpfvHTXL7PH+Yd1F5Q+6B01ns4vRr/2Xqo=";
hash = "sha256-rfk/csJJATXI1JvAHn2K/+fVLsqmkKxIbNWlcu1EhYY=";
};
format = "other";

View file

@ -1,4 +1,10 @@
{ lib, stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, libelf
, libpcap
}:
stdenv.mkDerivation rec {
pname = "dynamips";
@ -8,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "GNS3";
repo = pname;
rev = "v${version}";
sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5";
hash = "sha256-JQJa3NZ9mQqqvuTzU7XmAr1WRB4zuLIwBx18OY3GbV8=";
};
nativeBuildInputs = [ cmake ];
@ -17,12 +23,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ];
meta = with lib; {
inherit (src.meta) homepage;
description = "A Cisco router emulator";
longDescription = ''
Dynamips is an emulator computer program that was written to emulate Cisco
routers.
'';
inherit (src.meta) homepage;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];

View file

@ -1,4 +1,7 @@
{ lib, stdenv, fetchurl }:
{ lib
, stdenv
, fetchurl
}:
stdenv.mkDerivation rec {
pname = "hercules";
@ -10,8 +13,14 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
description = "IBM mainframe emulator";
homepage = "http://www.hercules-390.eu";
description = "IBM mainframe emulator";
longDescription = ''
Hercules is an open source software implementation of the mainframe
System/370 and ESA/390 architectures, in addition to the latest 64-bit
z/Architecture. Hercules runs under Linux, Windows, Solaris, FreeBSD, and
Mac OS X.
'';
license = licenses.qpl;
maintainers = [ maintainers.anna328p ];
};

Some files were not shown because too many files have changed in this diff Show more