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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-14 12:06:11 +00:00 committed by GitHub
commit 963ba38ad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 106 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -5391,6 +5391,12 @@
githubId = 55911173;
name = "Gwendolyn Quasebarth";
};
larsr = {
email = "Lars.Rasmusson@gmail.com";
github = "larsr";
githubId = 182024;
name = "Lars Rasmusson";
};
lasandell = {
email = "lasandell@gmail.com";
github = "lasandell";

7
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -941,6 +941,13 @@ environment.systemPackages = [
option.
</para>
</listitem>
<listitem>
<para>
Prior to this release, systemd would also read system units from an undocumented <literal>/etc/systemd-mutable/system</literal> path.
This path has been dropped from the defaults. That path (or others) can be re-enabled by adding it to the
<link linkend="opt-boot.extraSystemdUnitPaths">boot.extraSystemdUnitPaths</link> list.
</para>
</listitem>
</itemizedlist>
</section>
</section>

7
nixos/modules/services/cluster/k3s/default.nix
View File

@ -83,7 +83,8 @@ in
systemd.services.k3s = {
description = "k3s service";
after = mkIf cfg.docker [ "docker.service" ];
after = [ "network.service" "firewall.service" ] ++ (optional cfg.docker "docker.service");
wants = [ "network.service" "firewall.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
# See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197
@ -92,6 +93,10 @@ in
Delegate = "yes";
Restart = "always";
RestartSec = "5s";
LimitNOFILE = 1048576;
LimitNPROC = "infinity";
LimitCORE = "infinity";
TasksMax = "infinity";
ExecStart = concatStringsSep " \\\n " (
[
"${cfg.package}/bin/k3s ${cfg.role}"

4
pkgs/applications/editors/jetbrains/default.nix
View File

@ -386,12 +386,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
version = "2021.1"; /* updated by script */
version = "2021.1.1"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
sha256 = "089j52sig2ac21v6zl9mvb7x4sr9c428nn930b41y3qd6bg52xxx"; /* updated by script */
sha256 = "00kdbsjw9hmq7x94pjscslv0b412g8l0jbvyi7jiyay8xc6wiaaj"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";

4
pkgs/applications/networking/irc/convos/default.nix
View File

@ -6,13 +6,13 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
version = "6.06";
version = "6.11";
src = fetchFromGitHub {
owner = "convos-chat";
repo = pname;
rev = "v${version}";
sha256 = "0b3c8hj9cjmpzy9k949vdv1y3v7b94nh0mq15rcv3ax0sj3gd0qr";
sha256 = "19nzm7f3glvj34nj9pvnp0h9xx6baq58c11ddkqfmq7w3sci49hi";
};
nativeBuildInputs = [ makeWrapper ]

4
pkgs/applications/video/mpv/scripts/mpvacious.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mpvacious";
version = "0.12";
version = "0.14";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "mpvacious";
rev = "v${version}";
sha256 = "1xz4qh2ibfv03m3pfdasim9byvlm78wigx1linmih19vgg99vky2";
sha256 = "0r031hh3hpim9dli15m9q4cwka4ljvwg0hdgyp36r1n097q44r5f";
};
postPatch = ''

4
pkgs/applications/virtualization/cri-o/default.nix
View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.20.1";
version = "1.21.0";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-cli/ipWxZgAeDMBUMuOU3l2mKv4POvOhi7ctbVdU6jc=";
sha256 = "sha256-qhS1RLkM7xDsH3qDVL+ORXmwULYz8UK1oJM29oRqJ0M=";
};
vendorSha256 = null;

17
pkgs/development/coq-modules/ITree/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }:
with lib; mkCoqDerivation rec {
pname = "ITree";
owner = "DeepSpec";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.10" "8.13"; out = "4.0.0"; }
] null;
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
releaseRev = v: "${v}";
propagatedBuildInputs = [ coq-ext-lib paco ];
meta = {
description = "A Library for Representing Recursive and Impure Programs in Coq";
maintainers = with maintainers; [ larsr ];
};
}

2
pkgs/development/coq-modules/coq-ext-lib/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
owner = "coq-ext-lib";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = range "8.8" "8.12"; out = "0.11.3"; }
{ case = range "8.8" "8.13"; out = "0.11.3"; }
{ case = "8.7"; out = "0.9.7"; }
{ case = "8.6"; out = "0.9.5"; }
{ case = "8.5"; out = "0.9.4"; }

11
pkgs/development/coq-modules/equations/default.nix
View File

@ -6,8 +6,9 @@ with lib; mkCoqDerivation {
repo = "Coq-Equations";
inherit version;
defaultVersion = switch coq.coq-version [
{ case = "8.12"; out = "1.2.3+coq8.12"; }
{ case = "8.11"; out = "1.2.3+coq8.11"; }
{ case = "8.13"; out = "1.2.4+coq8.13"; }
{ case = "8.12"; out = "1.2.4+coq8.12"; }
{ case = "8.11"; out = "1.2.4+coq8.11"; }
{ case = "8.10"; out = "1.2.1+coq8.10-2"; }
{ case = "8.9"; out = "1.2.1+coq8.9"; }
{ case = "8.8"; out = "1.2+coq8.8"; }
@ -36,6 +37,12 @@ with lib; mkCoqDerivation {
release."1.2.3+coq8.12".version = "1.2.3";
release."1.2.3+coq8.12".rev = "v1.2.3-8.12";
release."1.2.3+coq8.12".sha256 = "1y0jkvzyz5ssv5vby41p1i8zs7nsdc8g3pzyq73ih9jz8h252643";
release."1.2.4+coq8.11".rev = "v1.2.4-8.11";
release."1.2.4+coq8.11".sha256 = "01fihyav8jbjinycgjc16adpa0zy5hcav5mlkf4s9zvqxka21i52";
release."1.2.4+coq8.12".rev = "v1.2.4-8.12";
release."1.2.4+coq8.12".sha256 = "1n0w8is464qcq8mk2mv7amaf0khbjz5mpc9phf0rhpjm0lb22cb3";
release."1.2.4+coq8.13".rev = "v1.2.4-8.13";
release."1.2.4+coq8.13".sha256 = "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q";
mlPlugin = true;
preBuild = "coq_makefile -f _CoqProject -o Makefile";

2
pkgs/development/coq-modules/simple-io/default.nix
View File

@ -5,7 +5,7 @@ with lib; mkCoqDerivation {
owner = "Lysxia";
repo = "coq-simple-io";
inherit version;
defaultVersion = if versions.range "8.7" "8.12" coq.coq-version then "1.3.0" else null;
defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.3.0" else null;
release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
extraBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
propagatedBuildInputs = [ coq-ext-lib ];

7
pkgs/servers/mail/postfix/default.nix
View File

@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
pname = "postfix";
version = "3.5.9";
version = "3.5.10";
src = fetchurl {
url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
sha256 = "0avn00drmk9c9mjynfvcmir72ss9s3mckdhjm3mmnhas2sixbkji";
sha256 = "sha256-W7TX1y11ErWPOjFCbcvTlP01TgpD3iHaiUZrBXoCKPg=";
};
nativeBuildInputs = [ makeWrapper m4 ];
@ -103,7 +103,6 @@ in stdenv.mkDerivation rec {
description = "A fast, easy to administer, and secure mail server";
license = with licenses; [ ipl10 epl20 ];
platforms = platforms.linux;
maintainers = with maintainers; [ globin ];
maintainers = with maintainers; [ globin dotlambda ];
};
}

24
pkgs/tools/text/mdbook-mermaid/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "mdbook-mermaid";
version = "0.8.1";
src = fetchFromGitHub {
owner = "badboy";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UMYWRQeSQwWVJla/+RPlAXPMuFVnxqDtYDxLKmbMw4g=";
};
cargoSha256 = "sha256-nhJS2QZUyGeNRMS9D+P+QPMDHK2PqVK/H2AKaP7EECw=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
description = "A preprocessor for mdbook to add mermaid.js support";
homepage = "https://github.com/badboy/mdbook-mermaid";
license = [ licenses.mpl20 ];
maintainers = with maintainers; [ xrelkd ];
};
}

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

@ -6036,6 +6036,10 @@ in
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdcat = callPackage ../tools/text/mdcat {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (python3Packages) ansi2html;

1
pkgs/top-level/coq-packages.nix
View File

@ -42,6 +42,7 @@ let
interval = callPackage ../development/coq-modules/interval {};
InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {};
iris = callPackage ../development/coq-modules/iris {};
ITree = callPackage ../development/coq-modules/ITree { };
ltac2 = callPackage ../development/coq-modules/ltac2 {};
math-classes = callPackage ../development/coq-modules/math-classes { };
mathcomp = callPackage ../development/coq-modules/mathcomp {};

38
pkgs/top-level/perl-packages.nix
View File

@ -10884,10 +10884,10 @@ let
JSONValidator = buildPerlPackage {
pname = "JSON-Validator";
version = "4.14";
version = "4.16";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.14.tar.gz";
sha256 = "16zaaw7p94nz7yclz30b9xph0riy5ailqg5rjkvi1yps2hr9ba7z";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.16.tar.gz";
sha256 = "0mhdczx2pxzi4lrrzkxl2a3r0s2b79ffsrar6g2l01idfpri6gi2";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ];
@ -11259,10 +11259,10 @@ let
LinkEmbedder = buildPerlPackage {
pname = "LinkEmbedder";
version = "1.17";
version = "1.18";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.17.tar.gz";
sha256 = "10r1q2xfba59w818li5xaj6jlph9qla7vb99ir1ampq5n8g0s5i6";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.18.tar.gz";
sha256 = "17gnixbawzr0r1k37dry7axb7ry6sj2xiahki28m8qbk1l69dfjz";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ Mojolicious ];
@ -13524,10 +13524,10 @@ let
Mojolicious = buildPerlPackage {
pname = "Mojolicious";
version = "9.10";
version = "9.17";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.10.tar.gz";
sha256 = "0y4ccy85vh7nily2y1c457f687qc8rwi4mnx13619hslkagw4rqw";
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.17.tar.gz";
sha256 = "13dxjhr03dhh1f5bbxbb3jiwdv7jby96qqb97l3arf5x043yd9hd";
};
meta = {
homepage = "https://mojolicious.org";
@ -13586,10 +13586,10 @@ let
MojoliciousPluginOpenAPI = buildPerlPackage {
pname = "Mojolicious-Plugin-OpenAPI";
version = "4.00";
version = "4.02";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-4.00.tar.gz";
sha256 = "1npnbygs12d683m5i6cgvdmw6glvppnv75f4qpp908fdz8lwcb2z";
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-4.02.tar.gz";
sha256 = "0rkkkcd3y3gjj0kis0hrab6mz8rk1qd57nz4npy39bag6h1kpyfv";
};
propagatedBuildInputs = [ JSONValidator ];
meta = {
@ -13602,12 +13602,12 @@ let
MojoliciousPluginStatus = buildPerlPackage {
pname = "Mojolicious-Plugin-Status";
version = "1.12";
version = "1.17";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.12.tar.gz";
sha256 = "1hn333220ba3hxl9aks0ywx933zv6klyi3a0iw571q76z5a8r2jn";
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.17.tar.gz";
sha256 = "1d475ch43vbfn3h4lsmr3n6rhgxgz670xqj4rcdjd4g1wfpiyasc";
};
propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap Mojolicious ];
propagatedBuildInputs = [ BSDResource CpanelJSONXS FileMap Mojolicious Sereal ];
meta = {
homepage = "https://github.com/mojolicious/mojo-status";
description = "Mojolicious server status plugin";
@ -13618,10 +13618,10 @@ let
MojoliciousPluginTextExceptions = buildPerlPackage {
pname = "Mojolicious-Plugin-TextExceptions";
version = "0.01";
version = "0.02";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Mojolicious-Plugin-TextExceptions-0.01.tar.gz";
sha256 = "070daf284c5d3832b7fde42120eaf747aea4cc75de8ff807f77accc84fe4f22e";
url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Mojolicious-Plugin-TextExceptions-0.02.tar.gz";
sha256 = "0x7qkd9nmarzb7kvk4dvhka4s44mfcd026zz3ikfwk3qql2p86rs";
};
propagatedBuildInputs = [ Mojolicious ];
meta = {