From 7514f00733cbdb8f61bec5e189d449c61c801de8 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Mon, 9 Nov 2020 19:50:36 +0100 Subject: [PATCH 01/22] nixos/k3s: Update service to match upstream Fixes race between k3s and network. --- nixos/modules/services/cluster/k3s/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 2e8bf20a68f..fe9f43f6426 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -78,7 +78,8 @@ in systemd.services.k3s = { description = "k3s service"; - after = mkIf cfg.docker [ "docker.service" ]; + after = if cfg.docker then "docker.service" else "network-online.service"; + wants = "network-online.service"; wantedBy = [ "multi-user.target" ]; serviceConfig = { # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 @@ -87,6 +88,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}" From acb845dd1137228eee76f9486796aebda832c3b5 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Mon, 9 Nov 2020 22:17:39 +0100 Subject: [PATCH 02/22] nixos/k3s: Add dependency on firewall.service --- nixos/modules/services/cluster/k3s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index fe9f43f6426..23cd0169031 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -78,8 +78,8 @@ in systemd.services.k3s = { description = "k3s service"; - after = if cfg.docker then "docker.service" else "network-online.service"; - wants = "network-online.service"; + after = [ "network-online.service" "firewall.service" ] ++ (if cfg.docker then [ "docker.service" ] else []); + wants = [ "network-online.service" "firewall.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 From 4db9d279c4d76309b080e6f4731cc1c480845e82 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Fri, 20 Nov 2020 00:26:03 +0100 Subject: [PATCH 03/22] nixos/k3s: Use `optional` for more idiomatic code --- nixos/modules/services/cluster/k3s/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 23cd0169031..28805fd3004 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -78,7 +78,7 @@ in systemd.services.k3s = { description = "k3s service"; - after = [ "network-online.service" "firewall.service" ] ++ (if cfg.docker then [ "docker.service" ] else []); + after = [ "network-online.service" "firewall.service" ] ++ (optional cfg.docker "docker.service"); wants = [ "network-online.service" "firewall.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { From 0b7c8b92f4a3051b618eb4e0149e519132bb8b78 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Tue, 13 Apr 2021 13:37:41 +0200 Subject: [PATCH 04/22] nixos/k3s: Change dependency to `network.service` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- nixos/modules/services/cluster/k3s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 28805fd3004..c5692372ae2 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -78,8 +78,8 @@ in systemd.services.k3s = { description = "k3s service"; - after = [ "network-online.service" "firewall.service" ] ++ (optional cfg.docker "docker.service"); - wants = [ "network-online.service" "firewall.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 From f3ee98f68c2e95b45ae7be2af0ce60f66bf98931 Mon Sep 17 00:00:00 2001 From: Ken Micklas Date: Tue, 13 Apr 2021 20:04:40 -0400 Subject: [PATCH 05/22] mpvacious: 0.12 -> 0.14 --- pkgs/applications/video/mpv/scripts/mpvacious.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 5bfcd2ac32c..0995d976e60 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -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 = '' From 66fc4b01339a74cfa26a7499555ab4144560316d Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Tue, 13 Apr 2021 17:38:29 -0700 Subject: [PATCH 06/22] jetbrains.rider: 2021.1 -> 2021.1.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index fb653518530..e940609c6cf 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -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"; From 14518675e90fbcc701e0824db54dd0b003e699ed Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 14 Apr 2021 10:52:08 +0800 Subject: [PATCH 07/22] mdbook-mermaid: init at 0.8.1 --- pkgs/tools/text/mdbook-mermaid/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/text/mdbook-mermaid/default.nix diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix new file mode 100644 index 00000000000..b29fbbd6e0d --- /dev/null +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a4c799ebe..c438e63ebdd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6034,6 +6034,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; From e495cfac73cc225f1128d748e8fac8382479281b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 14 Apr 2021 09:47:12 +0200 Subject: [PATCH 08/22] postfix: 3.5.9 -> 3.5.10 http://www.postfix.org/announcements/postfix-3.5.10.html --- pkgs/servers/mail/postfix/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 6862507c629..579ce383319 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -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 ]; }; - } From b3d70196ea1b4586414122ae1aadff5c37ef9611 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 24 Mar 2021 14:30:41 +0100 Subject: [PATCH 09/22] cri-o: 1.20.1 -> 1.21.0 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index d3a440fefc5..28e52a639ee 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -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; From de76aa03a5fec4a47cddc3acf245e9d510981423 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 31 Mar 2021 14:37:41 +0800 Subject: [PATCH 10/22] perlPackages.Mojolicious: 9.10 -> 9.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 00d5342d62e..3b324f212e8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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"; From 6a8afedd8341ea2fa6ac3e1d7572a36a2da97352 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 31 Mar 2021 14:38:22 +0800 Subject: [PATCH 11/22] perlPackages.MojoliciousPluginStatus: 1.12 -> 1.17 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3b324f212e8..0d0c7cde015 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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"; From ce19511cb90bcf60c0367baed38ee12fcdf9d37b Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 31 Mar 2021 14:39:04 +0800 Subject: [PATCH 12/22] convos: 6.06 -> 6.11 --- pkgs/applications/networking/irc/convos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 4bbc1589ed2..ba1837ee96f 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -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 ] From 7ec8888dac2ffce20d90acfaf9fbabd546b7e21d Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 31 Mar 2021 14:39:39 +0800 Subject: [PATCH 13/22] perlPackages.JSONValidator: 4.14 -> 4.16 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d0c7cde015..0fa61ca4fbf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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 ]; From 412163787e71713bfccd1beaedbe53b0a016a626 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 31 Mar 2021 14:40:01 +0800 Subject: [PATCH 14/22] perlPackages.LinkEmbedder: 1.17 -> 1.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0fa61ca4fbf..59f5da88810 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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 ]; From 8d7d4bc5b537e8520b89d6e6f132fe6fdf1368ed Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 31 Mar 2021 14:40:21 +0800 Subject: [PATCH 15/22] perlPackages.MojoliciousPluginOpenAPI: 4.00 -> 4.02 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59f5da88810..1a3961ff7a1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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 = { From 19d761b7cfde706af4e6a2046653fe0b360e52c2 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 31 Mar 2021 14:40:45 +0800 Subject: [PATCH 16/22] perlPackages.MojoliciousPluginTextExceptions: 0.01 -> 0.02 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1a3961ff7a1..a3123546607 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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 = { From 5429cc1af4f8621daeee62e782566d44a6602d59 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 13 Apr 2021 23:37:45 +0200 Subject: [PATCH 17/22] rl-2105: Document /etc/systemd-mutable/system is gone from the defaults, point to boot.extraSystemdUnitPaths --- nixos/doc/manual/release-notes/rl-2105.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index e493d03fbaa..ace1bdccdc6 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -941,6 +941,13 @@ environment.systemPackages = [ option. + + + Prior to this release, systemd would also read system units from an undocumented /etc/systemd-mutable/system path. + This path has been dropped from the defaults. That path (or others) can be re-enabled by adding it to the + boot.extraSystemdUnitPaths list. + + From 7fc935db120dd1d88e95f5de127478a469b99eb3 Mon Sep 17 00:00:00 2001 From: Lars Rasmusson Date: Wed, 14 Apr 2021 10:57:51 +0200 Subject: [PATCH 18/22] =?UTF-8?q?coqPackages.equations:=201.2.3=20?= =?UTF-8?q?=E2=86=92=201.2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/equations/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 352222e8aa6..d19d3826c74 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -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"; From 38c34b4304af4cab45e32835debda5af02e33c2a Mon Sep 17 00:00:00 2001 From: Lars Rasmusson Date: Wed, 14 Apr 2021 09:37:21 +0200 Subject: [PATCH 19/22] coqPackages.coq-ext-lib: add Coq 8.13 --- pkgs/development/coq-modules/coq-ext-lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 8acb0643781..6ba798ac328 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -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"; } From cba27708935a46ada142b493489840403d7ca8ae Mon Sep 17 00:00:00 2001 From: Lars Rasmusson Date: Wed, 14 Apr 2021 09:38:36 +0200 Subject: [PATCH 20/22] coqPackages.simple-io: enable for Coq 8.13 --- pkgs/development/coq-modules/simple-io/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index 42d4f782f1c..3631bdd54bf 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -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 ]; From 79d6e2a2b7c41e82490243d83826738c61c1f2fa Mon Sep 17 00:00:00 2001 From: Lars Rasmusson Date: Wed, 14 Apr 2021 09:41:04 +0200 Subject: [PATCH 21/22] maintainers: add larsr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cbb7ef09dfb..c64c1ecde82 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; From 7e73508a5fe1302ddde9389df0b41cf0f3ca58a1 Mon Sep 17 00:00:00 2001 From: Lars Rasmusson Date: Wed, 14 Apr 2021 10:33:05 +0200 Subject: [PATCH 22/22] ITree: init at 4.0.0 --- pkgs/development/coq-modules/ITree/default.nix | 17 +++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/coq-modules/ITree/default.nix diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix new file mode 100644 index 00000000000..31fea99cb84 --- /dev/null +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 44d7301c7b9..e533d5aace1 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -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 {};