From c965a308719b7140588dad064a0ff7f4032437d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 29 Sep 2021 01:42:34 +0200 Subject: [PATCH 001/108] nixos/nginx: allow paths in fastcgiParams Useful for pointing `SCRIPT_FILENAME` at a derivation. --- nixos/modules/services/web-servers/nginx/location-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index d8c976f202fd..46a664c078bc 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -102,7 +102,7 @@ with lib; }; fastcgiParams = mkOption { - type = types.attrsOf types.str; + type = types.attrsOf (types.either types.str types.path); default = {}; description = '' FastCGI parameters to override. Unlike in the Nginx From d6ebd537e5d212995984152d57e16029b3726de5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 31 Oct 2021 19:10:13 +0100 Subject: [PATCH 002/108] lib/modules: Short-circuit unmatchedDefns when configs is empty --- lib/modules.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 46ae3f136310..b2ae51c8e618 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -430,10 +430,16 @@ rec { # an attrset 'name' => list of unmatched definitions for 'name' unmatchedDefnsByName = - # Propagate all unmatched definitions from nested option sets - mapAttrs (n: v: v.unmatchedDefns) resultsByName - # Plus the definitions for the current prefix that don't have a matching option - // removeAttrs defnsByName' (attrNames matchedOptions); + if configs == [] + then + # When no config values exist, there can be no unmatched config, so + # we short circuit and avoid evaluating more _options_ than necessary. + {} + else + # Propagate all unmatched definitions from nested option sets + mapAttrs (n: v: v.unmatchedDefns) resultsByName + # Plus the definitions for the current prefix that don't have a matching option + // removeAttrs defnsByName' (attrNames matchedOptions); in { inherit matchedOptions; From bfaa9426c0e70b387f58bce6248b454b556018c2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 3 Nov 2021 19:05:26 +0100 Subject: [PATCH 003/108] lib/modules: Short-circuit unmatchedDefns earlier --- lib/modules.nix | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index b2ae51c8e618..4bbf2947bc4e 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -430,26 +430,27 @@ rec { # an attrset 'name' => list of unmatched definitions for 'name' unmatchedDefnsByName = - if configs == [] - then - # When no config values exist, there can be no unmatched config, so - # we short circuit and avoid evaluating more _options_ than necessary. - {} - else - # Propagate all unmatched definitions from nested option sets - mapAttrs (n: v: v.unmatchedDefns) resultsByName - # Plus the definitions for the current prefix that don't have a matching option - // removeAttrs defnsByName' (attrNames matchedOptions); + # Propagate all unmatched definitions from nested option sets + mapAttrs (n: v: v.unmatchedDefns) resultsByName + # Plus the definitions for the current prefix that don't have a matching option + // removeAttrs defnsByName' (attrNames matchedOptions); in { inherit matchedOptions; # Transforms unmatchedDefnsByName into a list of definitions - unmatchedDefns = concatLists (mapAttrsToList (name: defs: - map (def: def // { - # Set this so we know when the definition first left unmatched territory - prefix = [name] ++ (def.prefix or []); - }) defs - ) unmatchedDefnsByName); + unmatchedDefns = + if configs == [] + then + # When no config values exist, there can be no unmatched config, so + # we short circuit and avoid evaluating more _options_ than necessary. + [] + else + concatLists (mapAttrsToList (name: defs: + map (def: def // { + # Set this so we know when the definition first left unmatched territory + prefix = [name] ++ (def.prefix or []); + }) defs + ) unmatchedDefnsByName); }; /* Merge multiple option declarations into a single declaration. In From e8d61a25fcb5e11da8af0792da27a896bf87ba65 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 3 Nov 2021 19:19:41 +0100 Subject: [PATCH 004/108] lib/tests/modules: Test non-strictness some more Doesn't seem to have been a problem actually, but now it won't regress. --- lib/tests/modules/declare-attrsOf.nix | 9 ++++++++- lib/tests/modules/freeform-nested.nix | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/tests/modules/declare-attrsOf.nix b/lib/tests/modules/declare-attrsOf.nix index b3999de7e5fb..d19964064b21 100644 --- a/lib/tests/modules/declare-attrsOf.nix +++ b/lib/tests/modules/declare-attrsOf.nix @@ -1,6 +1,13 @@ -{ lib, ... }: { +{ lib, ... }: +let + deathtrapArgs = lib.mapAttrs + (k: _: throw "The module system is too strict, accessing an unused option's ${k} mkOption-attribute.") + (lib.functionArgs lib.mkOption); +in +{ options.value = lib.mkOption { type = lib.types.attrsOf lib.types.str; default = {}; }; + options.testing-laziness-so-don't-read-me = lib.mkOption deathtrapArgs; } diff --git a/lib/tests/modules/freeform-nested.nix b/lib/tests/modules/freeform-nested.nix index 5da27f5a8b4f..b81fa7f0d222 100644 --- a/lib/tests/modules/freeform-nested.nix +++ b/lib/tests/modules/freeform-nested.nix @@ -1,7 +1,14 @@ -{ lib, ... }: { +{ lib, ... }: +let + deathtrapArgs = lib.mapAttrs + (k: _: throw "The module system is too strict, accessing an unused option's ${k} mkOption-attribute.") + (lib.functionArgs lib.mkOption); +in +{ options.nest.foo = lib.mkOption { type = lib.types.bool; default = false; }; + options.nest.unused = lib.mkOption deathtrapArgs; config.nest.bar = "bar"; } From 8b584158a5cf3f00ee87297030874dbe35373037 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 3 Nov 2021 19:34:27 +0100 Subject: [PATCH 005/108] lib/modules: Remove a lib.flip In hot code, the overhead (envs, applies) can matter. --- lib/modules.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 4bbf2947bc4e..fd90c51b9425 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -13,7 +13,6 @@ let elem filter findFirst - flip foldl foldl' getAttrFromPath @@ -403,7 +402,7 @@ rec { [{ inherit (module) file; inherit value; }] ) configs; - resultsByName = flip mapAttrs declsByName (name: decls: + resultsByName = mapAttrs (name: decls: # We're descending into attribute ‘name’. let loc = prefix ++ [name]; @@ -424,7 +423,7 @@ rec { in throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'." else - mergeModules' loc decls defns); + mergeModules' loc decls defns) declsByName; matchedOptions = mapAttrs (n: v: v.matchedOptions) resultsByName; From 541ce53a3bfa9c769ce4aa755d1c452cb3bdc2dd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 3 Nov 2021 19:39:31 +0100 Subject: [PATCH 006/108] lib/modules: Fix import* comments Very confusing otherwise. --- lib/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index fd90c51b9425..99f51d22dcd1 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -947,7 +947,7 @@ rec { /* Use this function to import a JSON file as NixOS configuration. - importJSON -> path -> attrs + modules.importJSON :: path -> attrs */ importJSON = file: { _file = file; @@ -956,7 +956,7 @@ rec { /* Use this function to import a TOML file as NixOS configuration. - importTOML -> path -> attrs + modules.importTOML :: path -> attrs */ importTOML = file: { _file = file; From 844a9e746f92ac7278ece51c2b7819d0e6c5c05d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 3 Nov 2021 19:45:06 +0100 Subject: [PATCH 007/108] lib/modules: Use strict fold' as recursiveUpdate is also strict recursiveUpdate does not produce an attrset until it has evaluated both its arguments to weak head normal form. nix-repl> lib.recursiveUpdate (throw "a") (throw "b") error: b nix-repl> lib.recursiveUpdate (throw "a") {} error: a --- lib/modules.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 99f51d22dcd1..e3abf846625d 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -13,7 +13,6 @@ let elem filter findFirst - foldl foldl' getAttrFromPath head @@ -863,7 +862,7 @@ rec { mkMergedOptionModule = from: to: mergeFn: { config, options, ... }: { - options = foldl recursiveUpdate {} (map (path: setAttrByPath path (mkOption { + options = foldl' recursiveUpdate {} (map (path: setAttrByPath path (mkOption { visible = false; # To use the value in mergeFn without triggering errors default = "_mkMergedOptionModule"; From b84beda44c25280736be85157bd9f267657a30bc Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 25 Nov 2021 03:43:30 +0100 Subject: [PATCH 008/108] nixos/transmission: disable downloadDirPermissions by default --- .../modules/services/torrent/transmission.nix | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index a6ff467914a1..95c0b7c53e44 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -167,13 +167,15 @@ in }; downloadDirPermissions = mkOption { - type = types.str; - default = "770"; - example = "775"; + type = with types; nullOr str; + default = null; + example = "770"; description = '' - The permissions set by systemd.activationScripts.transmission-daemon - on the directories - and . + If not null, is used as the permissions + set by systemd.activationScripts.transmission-daemon + on the directories , + . + and . Note that you may also want to change . ''; @@ -246,15 +248,17 @@ in # when /home/foo is not owned by cfg.user. # Note also that using an ExecStartPre= wouldn't work either # because BindPaths= needs these directories before. - system.activationScripts.transmission-daemon = '' - install -d -m 700 '${cfg.home}/${settingsDir}' - chown -R '${cfg.user}:${cfg.group}' ${cfg.home}/${settingsDir} - install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}' - '' + optionalString cfg.settings.incomplete-dir-enabled '' - install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}' - '' + optionalString cfg.settings.watch-dir-enabled '' - install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}' - ''; + system.activationScripts = mkIf (cfg.downloadDirPermissions != null) + { transmission-daemon = '' + install -d -m 700 '${cfg.home}/${settingsDir}' + chown -R '${cfg.user}:${cfg.group}' ${cfg.home}/${settingsDir} + install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}' + '' + optionalString cfg.settings.incomplete-dir-enabled '' + install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}' + '' + optionalString cfg.settings.watch-dir-enabled '' + install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.watch-dir}' + ''; + }; systemd.services.transmission = { description = "Transmission BitTorrent Service"; @@ -313,6 +317,14 @@ in cfg.settings.script-torrent-done-filename ++ optional (cfg.settings.watch-dir-enabled && !cfg.settings.trash-original-torrent-files) cfg.settings.watch-dir; + StateDirectory = [ + "transmission" + "transmission/.config/transmission-daemon" + "transmission/.incomplete" + "transmission/Downloads" + "transmission/watch-dir" + ]; + StateDirectoryMode = mkDefault 750; # The following options are only for optimizing: # systemd-analyze security transmission AmbientCapabilities = ""; From 60950f739e0fd046e94c5ef86c146b311d39a2a5 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Mon, 11 Oct 2021 07:08:40 +0800 Subject: [PATCH 009/108] lib/meta: add getLicenseFromSpdxId function Move function spdxLicense, internally used in yarn2nix to lib/meta.nix, and rename to getLicenseFromSpdxId A similar function is implemented in poetry2nix, but the one originally in yarn2nix seems beter. since it falls back to an license-like attrset for mismatched case instead of a plain string --- lib/default.nix | 2 +- lib/meta.nix | 27 +++++++++++++++++++ .../yarn2nix-moretea/yarn2nix/default.nix | 25 +++++++++-------- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 68d73220fa9a..626a751cb10a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -105,7 +105,7 @@ let makeScope makeScopeWithSplicing; inherit (self.meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio - hiPrioSet; + hiPrioSet getLicenseFromSpdxId; inherit (self.sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext diff --git a/lib/meta.nix b/lib/meta.nix index bc04394dcf0b..bc3387646f26 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -99,4 +99,31 @@ rec { availableOn = platform: pkg: lib.any (platformMatch platform) pkg.meta.platforms && lib.all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []); + + /* Get the corresponding attribute in lib.licenses + from the SPDX ID. + For SPDX IDs, see + https://spdx.org/licenses + + Type: + getLicenseFromSpdxId :: str -> AttrSet + + Example: + lib.getLicenseFromSpdxId "MIT" == lib.licenses.mit + => true + lib.getLicenseFromSpdxId "mIt" == lib.licenses.mit + => true + lib.getLicenseFromSpdxId "MY LICENSE" + => trace: warning: getLicenseFromSpdxId: No license matches the given SPDX ID: MY LICENSE + => { shortName = "MY LICENSE"; } + */ + getLicenseFromSpdxId = + let + spdxLicenses = lib.mapAttrs (id: ls: assert lib.length ls == 1; builtins.head ls) + (lib.groupBy (l: lib.toLower l.spdxId) (lib.filter (l: l ? spdxId) (lib.attrValues lib.licenses))); + in licstr: + spdxLicenses.${ lib.toLower licstr } or ( + lib.warn "getLicenseFromSpdxId: No license matches the given SPDX ID: ${licstr}" + { shortName = licstr; } + ); } diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index eadb34062f3e..b0bf715e66e8 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -1,6 +1,7 @@ { pkgs ? import {} , nodejs ? pkgs.nodejs , yarn ? pkgs.yarn +, allowAliases ? pkgs.config.allowAliases or true }: let @@ -9,6 +10,14 @@ let compose = f: g: x: f (g x); id = x: x; composeAll = builtins.foldl' compose id; + + # https://docs.npmjs.com/files/package.json#license + # TODO: support expression syntax (OR, AND, etc) + getLicenseFromSpdxId = licstr: + if licstr == "UNLICENSED" then + lib.licenses.unfree + else + lib.getLicenseFromSpdxId licstr; in rec { # Export yarn again to make it easier to find out which yarn was used. inherit yarn; @@ -30,16 +39,7 @@ in rec { non-null = builtins.filter (x: x != null) parts; in builtins.concatStringsSep "-" non-null; - # https://docs.npmjs.com/files/package.json#license - # TODO: support expression syntax (OR, AND, etc) - spdxLicense = licstr: - if licstr == "UNLICENSED" then - lib.licenses.unfree - else - lib.findFirst - (l: l ? spdxId && l.spdxId == licstr) - { shortName = licstr; } - (builtins.attrValues lib.licenses); + inherit getLicenseFromSpdxId; # Generates the yarn.nix from the yarn.lock file mkYarnNix = { yarnLock, flags ? [] }: @@ -369,7 +369,7 @@ in rec { description = packageJSON.description or ""; homepage = packageJSON.homepage or ""; version = packageJSON.version or ""; - license = if packageJSON ? license then spdxLicense packageJSON.license else ""; + license = if packageJSON ? license then getLicenseFromSpdxId packageJSON.license else ""; } // (attrs.meta or {}); }); @@ -437,4 +437,7 @@ in rec { patchShebangs $out ''; +} // lib.optionalAttrs allowAliases { + # Aliases + spdxLicense = getLicenseFromSpdxId; # added 2021-12-01 } From b37f099ae7fa01e263530754b8e23bcc8730f221 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 2 Dec 2021 17:45:48 +0000 Subject: [PATCH 010/108] lib/modules: Pass legacy args argument along through extendModules --- lib/modules.nix | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 2468b6fbdd22..b9f1b6359753 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -101,9 +101,26 @@ rec { check ? true }: let + legacyModules = + optional (evalModulesArgs?args) { + config = { + _module.args = args; + }; + } + ++ optional (evalModulesArgs?check) { + config = { + _module.check = mkDefault check; + }; + }; + regularModules = modules ++ legacyModules; + # This internal module declare internal options under the `_module' # attribute. These options are fragile, as they are used by the # module system to change the interpretation of modules. + # + # When extended with extendModules or moduleType, a fresh instance of + # this module is used, to avoid conflicts and allow chaining of + # extendModules. internalModule = rec { _file = ./modules.nix; @@ -125,7 +142,7 @@ rec { _module.check = mkOption { type = types.bool; internal = true; - default = check; + default = true; description = "Whether to check whether all option definitions have matching declarations."; }; @@ -151,14 +168,14 @@ rec { _module.args = { inherit extendModules; moduleType = type; - } // args; + }; }; }; merged = let collected = collectModules (specialArgs.modulesPath or "") - (modules ++ [ internalModule ]) + (regularModules ++ [ internalModule ]) ({ inherit lib options config specialArgs; } // specialArgs); in mergeModules prefix (reverseList collected); @@ -222,7 +239,7 @@ rec { prefix ? [], }: evalModules (evalModulesArgs // { - modules = evalModulesArgs.modules ++ modules; + modules = regularModules ++ modules; specialArgs = evalModulesArgs.specialArgs or {} // specialArgs; prefix = extendArgs.prefix or evalModulesArgs.prefix; }); From 59c4a35aabbb69233a252638a63ae8f3dff3401c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 2 Dec 2021 18:07:39 +0000 Subject: [PATCH 011/108] nixos/eval-config: Avoid evalModules args and check parameters --- nixos/lib/eval-config.nix | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 74b52daa3c8e..0297ca4bd9d9 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -8,6 +8,7 @@ # as subcomponents (e.g. the container feature, or nixops if network # expressions are ever made modular at the top level) can just use # types.submodule instead of using eval-config.nix +evalConfigArgs@ { # !!! system can be set modularly, would be nice to remove system ? builtins.currentSystem , # !!! is this argument needed any more? The pkgs argument can @@ -28,7 +29,7 @@ in if e == "" then [] else [(import e)] }: -let extraArgs_ = extraArgs; pkgs_ = pkgs; +let pkgs_ = pkgs; in let @@ -51,25 +52,40 @@ let }; }; - noUserModules = lib.evalModules { - inherit prefix check; - modules = baseModules ++ extraModules ++ [ pkgsModule ]; - args = extraArgs; + legacyModules = + lib.optional (evalConfigArgs?args) { + config = { + _module.args = extraArgs; + }; + } + ++ lib.optional (evalConfigArgs?check) { + config = { + _module.check = lib.mkDefault check; + }; + }; + allUserModules = modules ++ legacyModules; + + noUserModules = lib.evalModules ({ + inherit prefix; + modules = baseModules ++ extraModules ++ [ pkgsModule modulesModule ]; specialArgs = { modulesPath = builtins.toString ../modules; } // specialArgs; - }; + }); - # These are the extra arguments passed to every module. In - # particular, Nixpkgs is passed through the "pkgs" argument. - extraArgs = extraArgs_ // { - inherit noUserModules baseModules extraModules modules; + # Extra arguments that are useful for constructing a similar configuration. + modulesModule = { + config = { + _module.args = { + inherit noUserModules baseModules extraModules modules; + }; + }; }; in rec { # Merge the option definitions in all modules, forming the full # system configuration. - inherit (noUserModules.extendModules { inherit modules; }) + inherit (noUserModules.extendModules { modules = allUserModules; }) config options _module type; inherit extraArgs; From 0b5aea2b2779ca5aa26dbe454af327828fb1683e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 2 Dec 2021 18:11:20 +0000 Subject: [PATCH 012/108] nixos/eval-config: Remove a rec --- nixos/lib/eval-config.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 0297ca4bd9d9..07653c22fb5c 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -81,14 +81,15 @@ let }; }; -in rec { + nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; + +in { # Merge the option definitions in all modules, forming the full # system configuration. - inherit (noUserModules.extendModules { modules = allUserModules; }) - config options _module type; + inherit (nixosWithUserModules) config options _module type; inherit extraArgs; - inherit (_module.args) pkgs; + inherit (nixosWithUserModules._module.args) pkgs; } From 1a223857ab679d6f0baf116e6b1c0f80b06cb818 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 2 Dec 2021 18:19:56 +0000 Subject: [PATCH 013/108] nixos/documentation: Use new extendModules instead of legacy args --- nixos/modules/misc/documentation.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 1f837f9efa22..64b1c15086fc 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, baseModules, extraModules, modules, modulesPath, ... }: +{ config, lib, pkgs, extendModules, noUserModules, ... }: with lib; @@ -6,11 +6,8 @@ let cfg = config.documentation; - manualModules = - baseModules - # Modules for which to show options even when not imported - ++ [ ../virtualisation/qemu-vm.nix ] - ++ optionals cfg.nixos.includeAllModules (extraModules ++ modules); + /* Modules for which to show options even when not imported. */ + extraDocModules = [ ../virtualisation/qemu-vm.nix ]; /* For the purpose of generating docs, evaluate options with each derivation in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}". @@ -24,13 +21,10 @@ let extraSources = cfg.nixos.extraModuleSources; options = let - scrubbedEval = evalModules { - modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ manualModules; - args = (config._module.args) // { modules = [ ]; }; - specialArgs = { - pkgs = scrubDerivations "pkgs" pkgs; - inherit modulesPath; - }; + extendNixOS = if cfg.nixos.includeAllModules then extendModules else noUserModules.extendModules; + scrubbedEval = extendNixOS { + modules = extraDocModules; + specialArgs.pkgs = scrubDerivations "pkgs" pkgs; }; scrubDerivations = namePrefix: pkgSet: mapAttrs (name: value: From 78ada833615d241ed76463aa5a024b614150eb4d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 2 Dec 2021 18:15:08 +0000 Subject: [PATCH 014/108] nixos/eval-config: Deprecate extraArgs and check parameters --- nixos/lib/eval-config.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 07653c22fb5c..d4567409f401 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -52,6 +52,11 @@ let }; }; + withWarnings = x: + lib.warnIf (evalConfigArgs?args) "The extraArgs argument to eval-config.nix is deprecated. Please set config._module.args instead." + lib.warnIf (evalConfigArgs?check) "The check argument to eval-config.nix is deprecated. Please set config._module.check instead." + x; + legacyModules = lib.optional (evalConfigArgs?args) { config = { @@ -83,7 +88,7 @@ let nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; -in { +in withWarnings { # Merge the option definitions in all modules, forming the full # system configuration. From 260b941dd0e7e72cf9b87f36f92b7e60f38d661f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 2 Dec 2021 17:47:17 +0000 Subject: [PATCH 015/108] lib/modules: Deprecate args and check --- lib/modules.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/modules.nix b/lib/modules.nix index b9f1b6359753..ee1aa16dbb04 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -101,6 +101,11 @@ rec { check ? true }: let + withWarnings = x: + lib.warnIf (evalModulesArgs?args) "The args argument to evalModules is deprecated. Please set config._module.args instead." + lib.warnIf (evalModulesArgs?check) "The check argument to evalModules is deprecated. Please set config._module.check instead." + x; + legacyModules = optional (evalModulesArgs?args) { config = { @@ -248,7 +253,7 @@ rec { inherit modules specialArgs; }; - result = { + result = withWarnings { options = checked options; config = checked (removeAttrs config [ "_module" ]); _module = checked (config._module); From b32487deda660d91e00b9fd9911b582fc6161d32 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 4 Dec 2021 23:45:05 +0000 Subject: [PATCH 016/108] pure-ftpd: 1.0.49 -> 1.0.50 --- pkgs/servers/ftp/pure-ftpd/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index b88d926e1db6..d2e04eb372b8 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -2,26 +2,13 @@ stdenv.mkDerivation rec { pname = "pure-ftpd"; - version = "1.0.49"; + version = "1.0.50"; src = fetchurl { url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz"; - sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn"; + sha256 = "08zas1kg5pnckl28gs7q29952pjfyj8rj59bq96hscqbni7gkqmb"; }; - patches = [ - (fetchpatch { - name = "CVE-2020-9274.patch"; - url = "https://github.com/jedisct1/pure-ftpd/commit/8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa.patch"; - sha256 = "1yd84p6bd4rf21hg3kqpi2a02cac6dz5ag4xx3c2dl5vbzhr5a8k"; - }) - (fetchpatch { - name = "CVE-2020-9365.patch"; - url = "https://github.com/jedisct1/pure-ftpd/commit/bf6fcd4935e95128cf22af5924cdc8fe5c0579da.patch"; - sha256 = "003klx7j82qf92qr1dxg32v5r2bhhywplynd3xil1lbcd3s3mqhi"; - }) - ]; - buildInputs = [ openssl ]; configureFlags = [ "--with-tls" ]; From 7ed01d754e81b3fec92c223291a1fc94fe95de2a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 5 Dec 2021 12:32:39 +0000 Subject: [PATCH 017/108] pure-ftpd: enable for darwin --- pkgs/servers/ftp/pure-ftpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index d2e04eb372b8..80bcc361a8b0 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, fetchpatch }: +{ lib, stdenv, fetchurl, openssl, pam, fetchpatch }: stdenv.mkDerivation rec { pname = "pure-ftpd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08zas1kg5pnckl28gs7q29952pjfyj8rj59bq96hscqbni7gkqmb"; }; - buildInputs = [ openssl ]; + buildInputs = [ openssl pam ]; configureFlags = [ "--with-tls" ]; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://www.pureftpd.org"; license = licenses.isc; # with some parts covered by BSD3(?) maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From d4552152cd9c81ce0d56203293aa1b4a46f0cfee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 01:32:16 +0000 Subject: [PATCH 018/108] amdvlk: 2021.Q3.7 -> 2021.Q4.1 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index de3c2bc4a072..b5323464630f 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q3.7"; + version = "2021.Q4.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "sha256-0Q6c10lQSxgqOB6X6F8LyeF2aoyicmp0tZlknuZjQHE="; + sha256 = "sha256-yvpHLreBNhiSxnZis5+XcTOSZPRLq5K8YNJsjpYqD6s="; }; buildInputs = [ From fe2b07f6dc37f2573d7aa85edc4d4b556bee2996 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 01:51:39 +0000 Subject: [PATCH 019/108] assign-lb-ip: 2.2.0 -> 2.3.0 --- pkgs/applications/networking/cluster/assign-lb-ip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/assign-lb-ip/default.nix b/pkgs/applications/networking/cluster/assign-lb-ip/default.nix index f0c06fa181ac..b699f4410c63 100644 --- a/pkgs/applications/networking/cluster/assign-lb-ip/default.nix +++ b/pkgs/applications/networking/cluster/assign-lb-ip/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "assign-lb-ip"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Nordix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PkMXjFP2brULCnD6mGz9wCufMpiwsmulDpINiwmkeys="; + sha256 = "sha256-VaxzU8HC+LQTyhL9pxvjiPa6T5v77RT2B7A0IuU/CUg="; }; vendorSha256 = "sha256-j9SweQq45sYk0lH6zkFrmWRlVhhMO8rLJGQxS6smAVw="; From 6c59438788727d6ecb5c0f3f58bd2c47f1c54340 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 03:39:16 +0000 Subject: [PATCH 020/108] bash_unit: 1.7.2 -> 1.8.0 --- pkgs/tools/misc/bash_unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index 9f574da85a51..e77bf22d826c 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+hEgag5H7PaBwZSBp3D17q3TZRO2SVBe5M1Ep/jeg1w="; + sha256 = "sha256-QWZnzliiqUfg6kXq1VGTNczupxNCgz1gFURrB/K2b4A="; }; installPhase = '' From e62a334eaeffc1accb32b1fdabe5f417d039f438 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 04:23:31 +0000 Subject: [PATCH 021/108] bazel-buildtools: 4.2.3 -> 4.2.4 --- .../tools/build-managers/bazel/buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 5a71a40cfc7b..97105b2fece4 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "sha256-FRT8t7bBE98ya5P50UJWhq02XuDGBZCNd3wBOpnDWmo="; + sha256 = "sha256-Tt1inAViAFaV+o2A2yquPXEv5EiC2eJgNUnr7jBYq7w="; }; vendorSha256 = "sha256-buMkRxVLlS2LBJGaGWeR41BsmE/0vgDS8s1VcRYN0fA="; From 7366bbb3c55cd41d1a92c7849cfdfc627ebe613b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 04:37:00 +0000 Subject: [PATCH 022/108] bazel-remote: 2.2.0 -> 2.3.0 --- .../tools/build-managers/bazel/bazel-remote/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index db3c3d053da0..7211543c22af 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zRZlpZWGZpBHc5DtqxeVc4xmJDKTem54/Fx/41i57c4="; + sha256 = "sha256-ILD7uGVzRgFugHYkhvxy0rbWarXgGZXi/SLRSQb8nl4="; }; - vendorSha256 = "sha256-N0UfC/M6EBbnpBpOTNkGgFEJpTA3VQ2jg9M7kxQQQc8="; + vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo="; doCheck = false; From 4bdf9ac16d1cf03cca15130d061bd388980db8ec Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Mon, 6 Dec 2021 11:26:11 +0530 Subject: [PATCH 023/108] hubble: 0.8.2 -> 0.9.0 --- pkgs/applications/networking/cluster/hubble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index ebb0abfcbd28..172f866c48ab 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "1n1930hlaflx7kzqbz7vvnxw9hrps84kqibaf2ixnjp998kqkl6d"; + sha256 = "sha256-L8sRvIA89RiXjrG0WcH72iYKlNTFvmQrveA9k5EBRKo="; }; vendorSha256 = null; From d4139b0d06e0972c1781e4bd23070655e7b979a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 11:41:57 +0000 Subject: [PATCH 024/108] terragrunt: 0.35.5 -> 0.35.13 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f2ae9a9490aa..8de710b17876 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.35.5"; + version = "0.35.13"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VUB1zZwRZ+TUFDcq/lBB9eAeM7d5zWhFy7nxzH5S6oc="; + sha256 = "sha256-B+HdxnTm/LfGvabQiKhZVRIaMpg4zgCVYP8MkKiiSok="; }; - vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; + vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; doCheck = false; From 7969395721a98b8e3913057fddae3631c0dbeb69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 12:04:22 +0000 Subject: [PATCH 025/108] python38Packages.pytest-snapshot: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/pytest-snapshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index e5f8ce159f1f..3b7a9f389ebd 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-snapshot"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "427b5ab088b25a1c8b63ce99725040664c840ff1f5a3891252723cce972897f9"; + sha256 = "cf84c88c3e0b4ae08ae797d9ccdc32715b64dd68b2da40f575db56956ed23326"; }; nativeBuildInputs = [ setuptools-scm ]; From 862bd36d868fbfa491b48e79780df20254ba52e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 12:48:16 +0000 Subject: [PATCH 026/108] python38Packages.google-cloud-spanner: 3.11.1 -> 3.12.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 50560585b4ee..b08f8fb31ff9 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.11.1"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "b993b4c68f11dd6fe0f66e0c437a71f9bed8d77f6bf1ddc4aad422ce3b330ecb"; + sha256 = "8f1390c3776fcfce71e1ef024d9ccde52c16d1cd728bc587c24065d6e4d21933"; }; propagatedBuildInputs = [ From 364df914c0bf9238cba532af4c883afb5c770c35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 13:31:18 +0000 Subject: [PATCH 027/108] dnscontrol: 3.12.0 -> 3.13.0 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index ef956c4f8b89..bf0b6c722573 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g3Yb0LAa9Ukp32p0OoXxjmw9RQwyVpi0KXQBIpKunbU="; + sha256 = "sha256-XBpdNQHG90rJWGfXpJgXsj5AR2VhK/3+1U7Zl8XDlsw="; }; - vendorSha256 = "sha256-RBe9XzvdgE5XWBTUhvAokElNwARgwVhkMwPmdKUroC0="; + vendorSha256 = "sha256-Ob4ZPtP14TsNOnGVfR5lFAKpJsjoJDKmiE++DqY32QA="; subPackages = [ "." ]; From c3a9fc66d69811bf16a293abbb94e6184f2cad65 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 6 Dec 2021 09:39:55 -0500 Subject: [PATCH 028/108] kopia: 0.9.6 -> 0.9.7 --- pkgs/tools/backup/kopia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 9ae4ad37a143..34df5982f2a7 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lfzlYpkAGGY7fs9PYPSg2XYgW92WV1/zh2oRz4Qw7vs="; + sha256 = "sha256-nHMsh+2Wpca2SJSy1XRMWwHHcdjpnb1u9JS6wM4E65Y="; }; - vendorSha256 = "sha256-xa6B3gGgJc7E8VCfpRXlE8Jw3ylNnfynK+QEiqy2yF4="; + vendorSha256 = "sha256-SJKsTZMppu6eit4ssMSwJOkeaheEYUwWRDPyPjirNHM="; doCheck = false; From e8042f560fb4d10f3057c95f2474428a2e5e1604 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 15:17:09 +0000 Subject: [PATCH 029/108] plexRaw: 1.24.5.5173-8dcc73a59 -> 1.25.0.5282-2edd3c44d --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index fae6366994ee..b5c45c3403c9 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.24.5.5173-8dcc73a59"; + version = "1.25.0.5282-2edd3c44d"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0yjnqvy2maym7dmfabj0zjd1gwjnnjwqxzk7j24a1vhwyy0dmjcf"; + sha256 = "0yjy6gdgrimd82qk7n36rqa9lc8giff4p96zzxpb0lblq5b3dxzb"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1k2plcqlklch2k8akj8m411i3cm0jvzj02f5x43yhjgjpmwww95z"; + sha256 = "1jlq76h3wiaf1d91x0l6cxv44k7l47xdy86qkqvxvwnsv1kc0r86"; }; outputs = [ "out" "basedb" ]; From 56535be2b63764081b7208c5818f124b9b2d1652 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 15:48:49 +0000 Subject: [PATCH 030/108] droidcam: 1.8.0 -> 1.8.1 --- pkgs/applications/video/droidcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index 4284d6dbf9f6..066c17f10690 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-A8FHTAeDFaSDp5Bnfv5NmCC7xIFAw3IcHSD4hZp4vwU="; + sha256 = "sha256-3iA7GDTiCx5vHawj8ZBFAK0BIfmxEFuQrVfL7Gi6FhM="; }; nativeBuildInputs = [ From 24c1dd62fb092caf8ad0d2893350d9fd598c75ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 18:11:49 +0000 Subject: [PATCH 031/108] tendermint: 0.34.14 -> 0.35.0 --- pkgs/tools/networking/tendermint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 4c154df6ebf5..12eb1a7f0a64 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.14"; + version = "0.35.0"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/FYkwHamJTty/h80KaNAmyNg0wCqiOAA3o2whouAOZc="; + sha256 = "sha256-fSDmwZNKAHXcMtNZlqJmUFkuFdZLkDbnn+ZrNtnszgU="; }; - vendorSha256 = "sha256-9wjiL8/fhWLuGglFkS8OH026zwbrmuadB3goBqFqnvc="; + vendorSha256 = "sha256-DktuZ0NUyg8LbYklxde2ZZJ8/WOyBq50E9yEHtS+Hqw="; subPackages = [ "cmd/tendermint" ]; From 2a2377f40e0ff7e5df995b7aeb7ac611298c572d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 6 Dec 2021 19:38:34 +0100 Subject: [PATCH 032/108] libunwind: use native `true` executable for build --- pkgs/development/libraries/libunwind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 643752da1dc5..1f47338c2a69 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, coreutils }: +{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # Without latex2man, no man pages are installed despite being # prebuilt in the source tarball. - configureFlags = [ "LATEX2MAN=${coreutils}/bin/true" ]; + configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ]; propagatedBuildInputs = [ xz ]; From cc2abedb5bf529b9806ff24d533bb01338478fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 6 Dec 2021 19:40:56 +0100 Subject: [PATCH 033/108] pkgsLLVM.libunwind: fix build --- pkgs/development/libraries/libunwind/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 1f47338c2a69..0a931821837e 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' + postPatch = if stdenv.cc.isClang then '' + substituteInPlace configure.ac --replace "-lgcc_s" "" + '' else lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh" ''; From af9863fd4475860b3d1b87bd0efe290ab3b3377b Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 6 Dec 2021 14:02:23 -0500 Subject: [PATCH 034/108] statix: fix darwin build --- pkgs/tools/nix/statix/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index 4de3aa35677e..fd219935aeeb 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, withJson ? true }: +{ lib, rustPlatform, fetchFromGitHub, withJson ? true, stdenv }: rustPlatform.buildRustPackage rec { pname = "statix"; @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional withJson "json"; + # tests are failing on darwin + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Lints and suggestions for the nix programming language"; homepage = "https://github.com/nerdypepper/statix"; From 0e2c517db819a58a20b12511e403e93615ad347c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 19:13:23 +0000 Subject: [PATCH 035/108] step-ca: 0.17.6 -> 0.18.0 --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 219f1c74e5a9..d403d7283171 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.17.6"; + version = "0.18.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-hZdsxSEfb+DwnVOnnp9cT6diQWkFVPSa/T8YDsGlg3k="; + sha256 = "sha256-f9sp5sAWysOOoIdCiCJxTWRhyt0wfpO5p4pxW6jj0xc="; }; - vendorSha256 = "sha256-OcnqMEotc18rX6BYs3oj8+83MRf7iJJNwjjXUQ5xfp4="; + vendorSha256 = "sha256-iDfPCRU91cuZsKqNOjkLGYmWf8i5FO4NmDsfD5Xqip0="; ldflags = [ "-buildid=" ]; From 9190eca2cf9b2dfa75f33161704d376c70ed8cb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 21:48:09 +0000 Subject: [PATCH 036/108] python38Packages.dbutils: 2.0.2 -> 3.0.0 --- pkgs/development/python-modules/dbutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index fef630e86831..14f046385f3a 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "3.0.0"; pname = "dbutils"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "1cc8zyd4lapzf9ny6c2jf1vysphlhr19m8miyvw5spbyq4pxpnsf"; + sha256 = "549d472197b3eef27e7bb2dd2246b28e880ac0ae9fdf63aadfd3b7def153db0c"; }; checkInputs = [ pytestCheckHook ]; From b5e709ac080c567498eb311f1a2c69784452f3e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 22:07:34 +0000 Subject: [PATCH 037/108] fits-cloudctl: 0.10.3 -> 0.10.4 --- pkgs/tools/admin/fits-cloudctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 92a77b461b20..d5d3124038f4 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-FbKULHBzx4HcOFhIRdy7DiewOQzBdac3B+N34M/Kbzk="; + sha256 = "sha256-D5LICE7CAwCqvaHIYfRWC8Te4W0tGhKAETmus2qa0UM="; }; vendorSha256 = "sha256-ImKN3rNotgUkQaKzoetAEG6Q/zlfH8FTK4HTIO0xn4s="; From dade4f3b6374a68e0a9c824bc6a37a9515950343 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 23:43:27 +0000 Subject: [PATCH 038/108] ft2-clone: 1.47 -> 1.48 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5155a91e725e..b357fc07d09f 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.47"; + version = "1.48"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-KLHJROOtRPtGHBYEMByY7LG6FY4vES6WndCiz7okan8="; + sha256 = "sha256-ZE9uid/srHHuTRqzgbtHcfmM0VkVsdrK1CJ3Qwbvtao="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) From 1030f5772d4b9af7ee6e164bad539d70a9b56da9 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Mon, 6 Dec 2021 19:37:42 -0500 Subject: [PATCH 039/108] julia: switch from python2 to python3 Julia does not actually require python2; it just requires any version of python [that is equal to or greater than 2.7](https://github.com/JuliaLang/julia/blob/master/doc/src/devdocs/build/build.md#required-build-tools-and-external-libraries). This changes the python dependency from python2 to python3. I have verified that julia-1.0 builds with this change. julia-1.5 is marked as broken in nixpkgs, so I have not tested it (but I would be very surprised if this change broke it further). Motivated by #148779 --- pkgs/development/compilers/julia/1.0.nix | 4 ++-- pkgs/development/compilers/julia/1.5.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 4f05329f595a..28500815639a 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchpatch, fetchurl, fetchzip # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, gfortran, m4, makeWrapper, patchelf, perl, which, python3 , cmake # libjulia dependencies , libunwind, readline, utf8proc, zlib @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { sha256 = src_sha256; }; - nativeBuildInputs = [ cmake curl gfortran m4 makeWrapper patchelf perl python2 which ]; + nativeBuildInputs = [ cmake curl gfortran m4 makeWrapper patchelf perl python3 which ]; # cmake is only used to build the bundled deps dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/julia/1.5.nix b/pkgs/development/compilers/julia/1.5.nix index 06c0e2a30e8c..3421af681a25 100644 --- a/pkgs/development/compilers/julia/1.5.nix +++ b/pkgs/development/compilers/julia/1.5.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip # build tools -, gfortran, m4, makeWrapper, patchelf, perl, which, python2, cmake +, gfortran, m4, makeWrapper, patchelf, perl, which, python3, cmake # libjulia dependencies , libunwind, readline, utf8proc, zlib # standard library dependencies @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ]; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python3 which cmake ]; makeFlags = let From b96c4748182dde6bc29a3d84725cf46783593f9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 03:30:40 +0000 Subject: [PATCH 040/108] remind: 03.03.09 -> 03.03.10 --- pkgs/tools/misc/remind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 59ddc84465b6..df98ede4f9ff 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.03.09"; + version = "03.03.10"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-yQh6jGkRNkQvPoguRmd6025pCEsvO7w8W3YNO2vztvM="; + sha256 = "sha256-BqFt3f4+hfz4njzOI1mkrUJhR7zOqzT/TNWS+sk2XEc="; }; propagatedBuildInputs = tclLibraries; From 8feff1e9f7db98804666af8b0fe7a55b578c22ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 03:48:08 +0000 Subject: [PATCH 041/108] htop: 3.1.1 -> 3.1.2 --- pkgs/tools/system/htop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 8a3664b85477..26d10d1278da 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -11,13 +11,13 @@ assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "JnpuBa09U086wWp0OtsDnStF4aLjhvtEj371u5XFtqc="; + sha256 = "sha256-RKYS8UYZTVKMR/3DG31eqkG4knPRl8WXsZU/XGmGmAg="; }; nativeBuildInputs = [ autoreconfHook ]; From 985886565b29687bc17f0283c3f03fb3b28570a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 04:24:48 +0000 Subject: [PATCH 042/108] hydroxide: 0.2.20 -> 0.2.21 --- pkgs/applications/networking/hydroxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 451449420bdf..e8299a8899ab 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VTUpiuSsI795XDSxJJvLQlVNPLiekHyKcCazRBky9nU="; + sha256 = "sha256-fF+pQnqAWBktc4NdQFTHeB/sEg5bPTxXtdL1x5JuXU8="; }; - vendorSha256 = "sha256-AuZnHpJ1Xel/L9dG3ATdXnoTeUxtieah/ea+0svw3oA="; + vendorSha256 = "sha256-M5QlhF2Cj1jn5NNiKj1Roh9+sNCWxQEb4vbtsDfapWY="; doCheck = false; From 7a336e07f89ba93e8e90925f1fac39bbc57cde82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 06:04:01 +0000 Subject: [PATCH 043/108] python38Packages.memory-allocator: 0.1.0 -> 0.1.2 --- pkgs/development/python-modules/memory-allocator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/memory-allocator/default.nix b/pkgs/development/python-modules/memory-allocator/default.nix index cbb521ea985a..bee35f94f6e9 100644 --- a/pkgs/development/python-modules/memory-allocator/default.nix +++ b/pkgs/development/python-modules/memory-allocator/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "memory-allocator"; - version = "0.1.0"; + version = "0.1.2"; src = fetchPypi { inherit version; pname = "memory_allocator"; - sha256 = "sha256-UUcR71e3eAQIQpmWM+AVQxVtgHvrNjaIlHo5pURUln0="; + sha256 = "ddf42a2dcc678062f30c63c868335204d46a4ecdf4db0dc43ed4529f1d0ffab9"; }; propagatedBuildInputs = [ cython ]; From 5127905e5860421e0ec1da536e790884e479c884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 5 Dec 2021 20:37:36 +0100 Subject: [PATCH 044/108] luaformatter: fix for darwin apple silicon --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74ef1eb14072..547f0b7016e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14870,7 +14870,7 @@ with pkgs; lttv = callPackage ../development/tools/misc/lttv { }; luaformatter = callPackage ../development/tools/luaformatter - (lib.optionalAttrs stdenv.isDarwin { + (lib.optionalAttrs (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "9") { stdenv = overrideCC stdenv llvmPackages_9.clang; }); From 9d7ce57da5729ca67d5b3778706b37bb70a88ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?= Date: Tue, 7 Dec 2021 08:51:57 +0100 Subject: [PATCH 045/108] freeradius: fix radius user We now must choose either system or normal user when creating a user --- nixos/modules/services/networking/freeradius.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index f3fdd576b65c..7fa3a8fa17fa 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -28,6 +28,7 @@ let ProtectHome = "on"; Restart = "on-failure"; RestartSec = 2; + LogsDirectory = "radius"; }; }; @@ -73,6 +74,7 @@ in users.radius = { /*uid = config.ids.uids.radius;*/ description = "Radius daemon user"; + isSystemUser = true; }; }; From 2bfff26e8db68d63665b48af851bb2563ddac7f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 08:10:20 +0000 Subject: [PATCH 046/108] konstraint: 0.15.0 -> 0.15.1 --- pkgs/development/tools/konstraint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index a59b452b0a4a..341df436e294 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lnbci3SUVp/vyArrfRF1dgv0KnqcmGIalhsZjDOhpSg="; + sha256 = "sha256-vt8/hYsThBoAxMglF8pjdVphmkbHXsuzaHFJhnGXdU4="; }; - vendorSha256 = "sha256-hfnpZgGIEpfHjM5J93D/aljN6j5XHGknpYXWeRV4Y4Q="; + vendorSha256 = "sha256-3m+mN90Edb/yMgVmkokRQrDM2EdB7cb2opL0QZJ8L+U="; # Exclude go within .github folder excludedPackages = ".github"; From 79277541615bb7480c712b0a8769af6294ae8da0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 08:30:41 +0000 Subject: [PATCH 047/108] ktlint: 0.43.1 -> 0.43.2 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 81bb656bdc57..21ab6ddf188f 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.43.1"; + version = "0.43.2"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "1qcalpimgsm5s3xhssrnanryra4dp2if9y4647aimydwvfhi05df"; + sha256 = "sha256-HXTkYwN6U8xyxgFnj69nLSpbDCqWUWeSuqlZbquRD6o="; }; nativeBuildInputs = [ makeWrapper ]; From 0e53e3a53cb8fb8e201b1f41be552f1c68a1cc34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 08:43:44 +0000 Subject: [PATCH 048/108] kubedb-cli: 0.22.0 -> 0.24.0 --- pkgs/applications/networking/cluster/kubedb-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index cbf14f43d260..ee6a241a2304 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.22.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-pAvaScbwGJMW3iFS26D71nImWsXcEVx7ONUP82f6QDQ="; + sha256 = "sha256-b5LbA2qEsEA7J0djEMhDeBY9iV1cvGVtxTlmneQGKYY="; }; vendorSha256 = null; From 793ec32a2ce4be73b21ea3349b25d28472b7fbcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 08:51:00 +0000 Subject: [PATCH 049/108] kubeone: 1.3.0 -> 1.3.2 --- pkgs/applications/networking/cluster/kubeone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 917059370ca6..2a507f414303 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-B/ga5MpjXoLe5H/JosmrS/Wuj1elzQHPsnz/qOm7Hrg="; + sha256 = "sha256-Y0IlTOAfwEp8WkFpXSS02vEhCM4+juAY+Nx/e9Vv0F0="; }; vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48="; From 535c1e5a72e1bf15b71ed1a59de84a9ae7a0eb91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 09:10:08 +0000 Subject: [PATCH 050/108] kubernetes: 1.22.3 -> 1.22.4 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index c974b830344b..7adeed5ae126 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.22.3"; + version = "1.22.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-yXis1nq36MO/RnYLxOYBs6xnaTf9lk+VJBzSamrHcEU="; + sha256 = "sha256-6ivBecOttzbX85+WCttaU5nXjaiEiKU8xRhnCPkjLXg="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; From f8dff82111c58189efaecce4f7f696a5fe8c251f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 09:38:19 +0000 Subject: [PATCH 051/108] lazygit: 0.31.3 -> 0.31.4 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index fa95b2c2b4e8..2e06ed3829a8 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.31.3"; + version = "0.31.4"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CgWN7xfWX0aSwNAPt2UDftyD0CbQQSUY6SMlyP9TSjc="; + sha256 = "sha256-yze4UaSEbyHwHSyj0mM7uCzaDED+p4O3HVVlHJi/FKU="; }; vendorSha256 = null; From 7fded235eb7bd7dc9c1efcaf066255718f221005 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 09:54:44 +0000 Subject: [PATCH 052/108] lfs: 1.2.1 -> 1.3.0 --- pkgs/tools/filesystems/lfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/tools/filesystems/lfs/default.nix index 65e446fc42f9..cae39cc471fd 100644 --- a/pkgs/tools/filesystems/lfs/default.nix +++ b/pkgs/tools/filesystems/lfs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "lfs"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cf9W0LnlvMm0XZe6lvx8hQejcwyfxBC6VKltAAfRD5I="; + sha256 = "sha256-nRJ73j3l3xaFImhrHEGmfqESEEjVKhIwdNZNc/RqOcU="; }; - cargoSha256 = "sha256-skP9VJuRMCyA06YjGbyNIt/DljP3fQQOIQDy6k10zGI="; + cargoSha256 = "sha256-iAz2s92hWkLCXoQ09mKCyI0yHvH55WaTSl+a5gz44bU="; meta = with lib; { description = "Get information on your mounted disks"; From 91bc99e964843ecfb03ff9636bef8ca6deaba279 Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 7 Dec 2021 10:58:17 +0100 Subject: [PATCH 053/108] tmate-ssh-server: mark as insecure --- pkgs/servers/tmate-ssh-server/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index ea564e6791da..472bf1f12b9a 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ ]; + knownVulnerabilities = [ "CVE-2021-44513" "CVE-2021-44512" ]; }; } From 96f5b351b2ffec1c50f750287697833a006bb7c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Dec 2021 11:28:48 +0100 Subject: [PATCH 054/108] iw: 5.9 -> 5.16 --- pkgs/os-specific/linux/iw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 7d526db53e93..ac8efbb7969f 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iw"; - version = "5.9"; + version = "5.16"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1wp1ky1v353qqy5fnrk67apgzsap53jkr7pmghk3czpbk880ffi9"; + sha256 = "sha256-TETkJ2L5A/kJS6WlmJmMgAqXpir9b9MeweCnmeMIZZw="; }; nativeBuildInputs = [ pkg-config ]; From 9fa33b6c8c1828065bfafc6f8721ab20b71b8cdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 10:45:02 +0000 Subject: [PATCH 055/108] python38Packages.pyathena: 2.3.0 -> 2.3.2 --- pkgs/development/python-modules/pyathena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 6bfd68286b7e..a16e77308602 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.3.0"; + version = "2.3.2"; src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "08fl653yayvqi991zvcai5ifcxwy9ip6xh0cr3lbimggjnjgwsl5"; + sha256 = "20a473c52e76a211c427d2f711af0a04804a70fc036ab884780e42e0dc2025f7"; }; # Nearly all tests depend on a working AWS Athena instance, From d0913cf400c80d2e4b503bf27a1b5cdcfe2f4263 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 7 Dec 2021 10:57:12 +0000 Subject: [PATCH 056/108] dovecot: 2.3.17 -> 2.3.17.1 --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 1fe61eb6bb67..45300a8073f9 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.17"; + version = "2.3.17.1"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "1y9dpn4jgzrfjibp5zrc11bdk0q843d998kxhpxkyfm2fz6i4i12"; + sha256 = "1f525bvpjvi4rnwqjsqaqrbdii08sqmc1v8xq03m19w1vk6cqrqw"; }; enableParallelBuilding = true; From 0475ca4a3a4fd8b02f742c7c247f2486936ae425 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 7 Dec 2021 10:57:30 +0000 Subject: [PATCH 057/108] dovecot_pigeonhole: 0.5.17 -> 0.5.17.1 --- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 6665abe96934..e209487a502c 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -3,11 +3,11 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.17"; + version = "0.5.17.1"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; - sha256 = "0j6ng173hh5iiqxdkxfb5v9djpn39gxdrv5ki7i22cf5cqwq47h3"; + sha256 = "04j5z3y8yyci4ni9j9i7cy0zg1qj2sm9zfarmjcvs9vydpga7i1w"; }; buildInputs = [ dovecot openssl ]; From 8547b9ee9947bf35ac76325c0e7e857f65119c8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Dec 2021 12:04:48 +0100 Subject: [PATCH 058/108] checkov: 2.0.628 -> 2.0.632 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index d28de00af089..071843772708 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -46,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.628"; + version = "2.0.632"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-/plAzSkvcQ1pEd62/ZyFMew1c81FTIyCTynxVAPjqAE="; + sha256 = "sha256-SDMp+QOZy2Ml5V8RHLvmTl/3/KB8iYaW0muakE8PnhA="; }; nativeBuildInputs = with py.pkgs; [ From d758d7a4744007a40bb114696f6992c8ef60638d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 11:25:53 +0000 Subject: [PATCH 059/108] libqb: 2.0.3 -> 2.0.4 --- pkgs/development/libraries/libqb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index bb3f568b1cf8..fa448fa09695 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a9CnqfrQUL0DdPPOJjfh9tQ0O8iRHPP3iBmy3MKvt/0="; + sha256 = "sha256-s6b2/bCVNzr3IBqiSAjiJ/DHCqkRwR1aA+J4uBP5mO4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 70c15bb6540b75f2d22568978ac58ada1b2547aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 11:34:48 +0000 Subject: [PATCH 060/108] libspng: 0.7.0 -> 0.7.1 --- pkgs/development/libraries/libspng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/development/libraries/libspng/default.nix index c778ae485bd6..99a243733cf8 100644 --- a/pkgs/development/libraries/libspng/default.nix +++ b/pkgs/development/libraries/libspng/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libspng"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "randy408"; repo = pname; rev = "v${version}"; - sha256 = "0zk0w09is4g7gysax4h0f4xj5f40vm6ipc1wi98ymzban89cjjnz"; + sha256 = "sha256-JBNFYmmd1UnoIfV6iWeDIw/kgvl8AArxfHK+TKjZ9rk="; }; doCheck = true; From 965baa629fad45aecf3bd464b9b72755b361e67a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 11:52:19 +0000 Subject: [PATCH 061/108] libtpms: 0.9.0 -> 0.9.1 --- pkgs/tools/security/libtpms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 9877aaad7e98..b49ce7305deb 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-9u5Yq9PXMADvyWZo5aFa0GNzqVsbyN25o/cYQdbrUO0="; + sha256 = "sha256-30P/YggrPEVpsh2qo751aW6RtrpIVe1XQWyYZm8P4yA="; }; nativeBuildInputs = [ From 817561795ffb8b236e7ba07b3e1ea3db4c4f800b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 12:21:37 +0000 Subject: [PATCH 062/108] logisim-evolution: 3.7.1 -> 3.7.2 --- pkgs/applications/science/logic/logisim-evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index cf7470b5475b..6ab0921f66fe 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logisim-evolution"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "04q9bzhnzpi8cgv3ly4ii88qvmlw9n09c4p1qmg8dhxqkskdqj6h"; + sha256 = "sha256-RI+ioOHj13UAGuPzseAAy3oQBQYkja/ucjj4QMeRZhw="; }; dontUnpack = true; From 49f2fabd1d2ea86637da8208c245bc144f29371b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 12:30:30 +0000 Subject: [PATCH 063/108] luna-icons: 1.6 -> 1.7 --- pkgs/data/icons/luna-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 3a40ef978e3a..70cacaf7fa67 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1iw9wqfs8s3l5k5ngyjmvvxbsxcsya3a6h1xwl6d603swv7h1s02"; + sha256 = "sha256-L8bkO2zGEXfwqoWZRDCm/PdBxwedkx57kduwlMoyAME="; }; nativeBuildInputs = [ From 858d86dc37e8a47427c6228dcbafb8fa50d8fbe1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 12:37:46 +0000 Subject: [PATCH 064/108] macchina: 5.0.2 -> 5.0.5 --- pkgs/tools/misc/macchina/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index ad6dc1e55dd3..2dc6ba9f89e4 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "5.0.2"; + version = "5.0.5"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9T1baNmgzB3RBlFaaIQ47Yc9gJAgtS42NNEY1Tk/hBs="; + sha256 = "sha256-si+5LvRUIWp48vsD1WxGWl2O/2bpaBX+ArkZPbBqtME="; }; - cargoSha256 = "sha256-A5C/B9R58p/DR6cONIRTSkmtXEOobtYHGBHxjdwagRA="; + cargoSha256 = "sha256-CN7PxPUkfyDGxVaf879Sp6w0UbqwL/is15xcfH2fm1w="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; From 6a2136fda30c80c6f8500936b63e73c5f451ca9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 08:48:35 +0000 Subject: [PATCH 065/108] qgnomeplatform: 0.8.0 -> 0.8.3 --- pkgs/development/libraries/qgnomeplatform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index bfb1859ba655..b8115331be77 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "qgnomeplatform"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "QGnomePlatform"; rev = version; - sha256 = "C/n8i5j0UWfxhP10c4j89U+LrpPozXnam4fIPYMXZAA="; + sha256 = "sha256-950VEcxhJeBPSQToC8KpBx/KSneARN6Y8X7CAuFyRjo="; }; patches = [ From d28a5d5abd16e8dfaf9dc99a32625ba1ed55a7ae Mon Sep 17 00:00:00 2001 From: Nicolas M Date: Tue, 7 Dec 2021 10:29:09 +0100 Subject: [PATCH 066/108] charm: 0.8.6 -> 0.9.0 --- pkgs/applications/misc/charm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 224336dffabf..581c86b6ade1 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "0mjq0yy60czsw40h5n515qmi6bbvhrddll4sn5r2q1nf9pvviqr6"; + sha256 = "1q5c2qka4srqj82f50iwmcj2j0yw2msz5dmrx2avqppp3fyi9jz3"; }; - vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax"; + vendorSha256 = "1xycgzx706kyz37z3517p98129iy7py7zdizz34k38fvfpila5q5"; doCheck = false; From a7483c5a9a5c58039352927ffc76a09fc094a801 Mon Sep 17 00:00:00 2001 From: Felix Scheinost Date: Tue, 7 Dec 2021 14:13:50 +0100 Subject: [PATCH 067/108] selenium-server-standalone: fix useChrome = false Previously when useChrome was set to false the command would be something like ``` makeWrapper [...] \ --add-flags "-cp [...]" \ --add-flags \ --add-flags "org.openqa.grid.selenium.GridLauncherV3" ``` The problem was that only the arguments to `--add-flags` was optional while for this to be parsed correctly the flag and argument has to be optional. --- pkgs/development/tools/selenium/server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index c4f8653794fe..61959b98b4cc 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ - --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ + ${optionalString chromeSupport "--add-flags -Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; From e37aab2130e4a42660bef203592069cb05d3fe3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Fri, 26 Nov 2021 13:58:40 +0100 Subject: [PATCH 068/108] nixos/acme: Allow disabling bash tracing This is horrible if you want to debug failures that happened during system switches but your 30-ish acme clients spam the log with the same messages over and over again. --- nixos/modules/security/acme.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 2815e2593b23..12ebc746f520 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -325,7 +325,8 @@ let # Working directory will be /tmp script = '' - set -euxo pipefail + ${optionalString data.enableDebugLogs "set -x"} + set -euo pipefail # This reimplements the expiration date check, but without querying # the acme server first. By doing this offline, we avoid errors @@ -438,6 +439,8 @@ let default = "_mkMergedOptionModule"; }; + enableDebugLogs = mkEnableOption "debug logging for this certificate" // { default = cfg.enableDebugLogs; }; + webroot = mkOption { type = types.nullOr types.str; default = null; @@ -616,6 +619,8 @@ in { options = { security.acme = { + enableDebugLogs = mkEnableOption "debug logging for all certificates by default" // { default = true; }; + validMinDays = mkOption { type = types.int; default = 30; From 6ddef89afcf72ebf020ccfb58e7e19f0df8c5625 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 13:18:40 +0000 Subject: [PATCH 069/108] mcfly: 0.5.9 -> 0.5.10 --- pkgs/tools/misc/mcfly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index e613e4bb3ea1..4d55e6405ac1 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r"; + sha256 = "sha256-auIerSfEKBK47mIhfmjREJohnhCmtzruobRXaoz5fqA="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629"; + cargoSha256 = "sha256-f9kpD295syRCntwvyjZ9AeAUV61RMbfRRMgNxKAJL8g="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; From 6a9fa160e32314a8c8899eaaa1b36661d2b23519 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 14:00:43 +0000 Subject: [PATCH 070/108] mdcat: 0.24.1 -> 0.24.2 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index ceea69808022..ea02fdde0c48 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "sha256-fAbiPzyPaHy0KQb/twCovjgqIRzib7JZslb9FdVlQEg="; + sha256 = "sha256-9XVKLe1Kyq5SpJFpXg/GD/V+uiieljk7UoDzJ1MZBlA="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-UgCFlzihBvZywDNir/92lub9R6yYPJSK8S4mlMk2sMk="; + cargoSha256 = "sha256-cgX/jPmOU3o5gAwbneGeQLU2hIrGdrAvOaA/TOXSZgg="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From c9e5c715089f28ed4b17f3e2da4adf1f2875c52d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 14:51:56 +0000 Subject: [PATCH 071/108] miller: 5.10.2 -> 5.10.3 --- pkgs/tools/text/miller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 670c0612b391..f64f195db951 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.10.2"; + version = "5.10.3"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "sha256-NI57U3FpUfQ6ouBEYrzzG+9kpL58BD4HoAuRAFJMO9k="; + sha256 = "sha256-Mag7bIfZNdp+sM54yKp8HdH3kWjwWRfyPBGthej2jd8="; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; From 365fde6b11d20ab00e1bed8ceeca29bc6659fc4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 14:59:55 +0000 Subject: [PATCH 072/108] minikube: 1.23.2 -> 1.24.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index f3cb598d246b..e06f486ddf67 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.23.2"; + version = "1.24.0"; - vendorSha256 = "sha256-Q6DadAmx/8TM+MrdaKgAjn0sVrKqTYoWdsmnN77yfKA="; + vendorSha256 = "sha256-I23T1eWPTU9QiIVI4qi5mkaS6CkeGbOHKTHwjCnKTIM="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-PIgzGikVIno2Gd+kSjF4kLHuUKgPrPHoIJxAGblI8RQ="; + sha256 = "sha256-WW5VVjm7cq/3/RGiIE2nn8O+VK0RHCtKkrlboIzhqC4="; }; nativeBuildInputs = [ installShellFiles pkg-config which ]; From f4f9fc8d96683e1278b9329bcca5dea2f6252796 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 15:09:52 +0000 Subject: [PATCH 073/108] minio: 2021-10-27T16-29-42Z -> 2021-11-24T23-19-33Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 693d5fc280fc..5d26fd1200ff 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-10-27T16-29-42Z"; + version = "2021-11-24T23-19-33Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-U/1NuWyNX0OUrtysV3ShvbyxiSiYzMFNK3lmAVs6D3Y="; + sha256 = "sha256-cYoeCjkCLnlp5BVp3BOj7okA1yX+rDp0Rbwcn+ji+Ak="; }; - vendorSha256 = "sha256-GLooogUglKxEk7X9UI4VZvj+mJ9LXLZEjFsxCpzm61I="; + vendorSha256 = "sha256-DdsLQ87tvh8gbiLh6uLCXiGmnkcE+LcLwvdgDJxXbc8="; doCheck = false; From 4e3fcf6816966e8563731edeb0c53b3a8b6ac383 Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Tue, 7 Dec 2021 16:31:22 +0100 Subject: [PATCH 074/108] katai-struct-compiler: init at 0.9 --- .../kaitai-struct-compiler/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/compilers/kaitai-struct-compiler/default.nix diff --git a/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/pkgs/development/compilers/kaitai-struct-compiler/default.nix new file mode 100644 index 000000000000..8561e7eae77e --- /dev/null +++ b/pkgs/development/compilers/kaitai-struct-compiler/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchzip +, openjdk8 +, makeWrapper +}: + + +stdenv.mkDerivation rec { + pname = "kaitai-struct-compiler"; + version = "0.9"; + + src = fetchzip { + url = "https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/${version}/kaitai-struct-compiler-${version}.zip"; + sha256 = "sha256-2HSasigpJDuWNejNVklnpQwaA4MC030S9taF/7YvzgY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -D $src/bin/kaitai-struct-compiler $out/bin/kaitai-struct-compiler + ln -s $out/bin/kaitai-struct-compiler $out/bin/ksc + cp -R $src/lib $out/lib + wrapProgram $out/bin/kaitai-struct-compiler --prefix PATH : ${lib.makeBinPath [ openjdk8 ] } + ''; + + meta = with lib; { + homepage = "https://github.com/kaitai-io/kaitai_struct_compiler"; + description = + "Compiler to generate binary data parsers in C++ / C# / Go / Java / JavaScript / Lua / Perl / PHP / Python / Ruby "; + license = licenses.gpl3Only; + maintainers = with maintainers; [ luis ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a226e7cc346..82f4ebc4333c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22270,6 +22270,8 @@ with pkgs; lsiutil = callPackage ../os-specific/linux/lsiutil { }; + kaitai-struct-compiler = callPackage ../development/compilers/kaitai-struct-compiler { }; + kmod = callPackage ../os-specific/linux/kmod { }; kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { }; From 9549ceaa15f443949f39d036e6daf514e3dba353 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 15:33:37 +0000 Subject: [PATCH 075/108] minio-client: 2021-10-07T04-19-58Z -> 2021-11-16T20-37-36Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index b448c6d35940..8f0798aa95aa 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-10-07T04-19-58Z"; + version = "2021-11-16T20-37-36Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-FF4blsNzr2M/ZZ2epTBhFkoj6s9Iw5GGXY65mKftojk="; + sha256 = "sha256-nNsvHVsVyJNm5ZUU58cymeJCO7uhvVKGpgxaQWCEYvI="; }; - vendorSha256 = "sha256-GFxB5Gxnc6m91EjF2z108J1WmggCQrUhxwEA+Sih+94="; + vendorSha256 = "sha256-DBRqWgqBv2x/KRATrQ2olDhhWwlSgzckWkRIqmW5+js="; subPackages = [ "." ]; From 3bfcf873de8a922b35e10ddb08f4b856c65e7c8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 15:39:12 +0000 Subject: [PATCH 076/108] minitube: 3.9.1 -> 3.9.2 --- pkgs/applications/video/minitube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 62e7e21cbbb3..4e8373383a8e 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -6,10 +6,10 @@ mkDerivation rec { pname = "minitube"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { - sha256 = "sha256-1BVHxB7WtXCAJqP+uADszdVPc+T3ctCCzfoJPCb5ZTE="; + sha256 = "sha256-MIzfo17eAvpWO2HNq9z+D9XiOKTRiUHvaOdxI1EK1f0="; rev = version; repo = "minitube"; owner = "flaviotordini"; From 73a4a80dcc52054ba6a8259b5fa238f4fb7cb955 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Tue, 7 Dec 2021 15:46:49 +0000 Subject: [PATCH 077/108] exploitdb: 2021-12-04 -> 2021-12-07 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 6ee3aeda4416..97181371690f 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-12-04"; + version = "2021-12-07"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-3MP6lmh/eQ1cIxiCw0Y2TtCXXQTUij5Q8FDFVWOG/IM="; + sha256 = "sha256-6rc3c4i1X6b6CgsJPUx/pMT6sE6jc/Sy8Ffw5mVVgEU="; }; nativeBuildInputs = [ makeWrapper ]; From 15c946fadafdd50746f223f6a87e42869b49c760 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 15:49:32 +0000 Subject: [PATCH 078/108] mob: 2.0.0 -> 2.1.0 --- pkgs/applications/misc/mob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index f558e520da86..eaa20b5e7e26 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "2.0.0"; + version = "2.1.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-sSeXL+eHroxDr+91rwmUJ+WwDgefZgJBRTxy4wo6DDM="; + sha256 = "sha256-K8ID8cetzCaMc/PVRNMyIhrshtEUiD6U/jI4e0TcOO4="; }; meta = with lib; { From 8805ef1fb7e159a5a7095c579adb82044cd83246 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 16:23:42 +0000 Subject: [PATCH 079/108] muparserx: 4.0.8 -> 4.0.11 --- pkgs/development/libraries/muparserx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index 4d3036d4cfbb..bdc558dc1029 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "muparserx"; - version = "4.0.8"; + version = "4.0.11"; src = fetchFromGitHub { owner = "beltoforion"; repo = "muparserx"; rev = "v${version}"; - sha256 = "097pkdffv0phr0345hy06mjm5pfy259z13plsvbxvcmds80wl48v"; + sha256 = "sha256-BWzHlz1mQYsvWa53EtO05Rb4rRHJBSRguJTHLtgqpPw="; }; nativeBuildInputs = [ cmake ]; From 64ed431483d384a50ebb0f515669a6d77d6f2672 Mon Sep 17 00:00:00 2001 From: "Yestin L. Harrison" Date: Thu, 25 Nov 2021 20:06:25 -0800 Subject: [PATCH 080/108] camlp4: add new versions --- pkgs/development/tools/ocaml/camlp4/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index fffa426ba4c9..acf1730af1bc 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, which, ocaml, ocamlbuild }: -if lib.versionAtLeast ocaml.version "4.09" +if lib.versionAtLeast ocaml.version "4.14" then throw "camlp4 is not available for OCaml ${ocaml.version}" else @@ -26,6 +26,21 @@ let param = { "4.08" = { version = "4.08+1"; sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; }; + "4.09" = { + version = "4.09+1"; + sha256 = "1gr33x6xs1rs0bpyq4vzyfxd6vn47jfkg8imi81db2r0cbs0kxx1"; }; + "4.10" = { + version = "4.10+1"; + sha256 = "093bc1c28wid5li0jwglnd4p3csxw09fmbs9ffybq2z41a5mgay6"; }; + "4.11" = { + version = "4.11+1"; + sha256 = "0sn7f6im940qh0ixmx1k738xrwwdvy9g7r19bv5218jb6mh0g068"; }; + "4.12" = { + version = "4.12+1"; + sha256 = "1cfk5ppnd511vzsr9gc0grxbafmh0m3m897aij198rppzxps5kyz"; }; + "4.13" = { + version = "4.13+1"; + sha256 = "0fzxa1zdhk74mlxpin7p90flks6sp4gkc0mfclmj9zak15rii55n"; }; }.${ocaml.meta.branch}; in From 673ad7eb36ddbc2e2e150aae1d3b7d7778090e92 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Tue, 7 Dec 2021 17:32:55 +0100 Subject: [PATCH 081/108] nixos/pleroma: create cookie if not existing (#149368) --- nixos/modules/services/networking/pleroma.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index 2f32faf387ca..9b8382392c0a 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -100,6 +100,7 @@ in { after = [ "network-online.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; + environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -116,8 +117,14 @@ in { # has not been updated. But the no-op process is pretty fast. # Better be safe than sorry migration-wise. ExecStartPre = - let preScript = pkgs.writers.writeBashBin "pleromaStartPre" - "${cfg.package}/bin/pleroma_ctl migrate"; + let preScript = pkgs.writers.writeBashBin "pleromaStartPre" '' + if [ ! -f /var/lib/pleroma/.cookie ] + then + echo "Creating cookie file" + dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie + fi + ${cfg.package}/bin/pleroma_ctl migrate + ''; in "${preScript}/bin/pleromaStartPre"; ExecStart = "${cfg.package}/bin/pleroma start"; From 3755a376e7d80208215ad609f2288fc53f258472 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 16:56:37 +0000 Subject: [PATCH 082/108] nerdctl: 0.13.0 -> 0.14.0 --- pkgs/applications/networking/cluster/nerdctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 874a6fdecc4f..fdd4a7fccf0d 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uyLY2yH/6J0rtra0brBATadPqrNyyuCcaGfOrng9h4Y="; + sha256 = "sha256-Esj1LFf884m9iTJjqqGCMhbgBNSGpYAfi2stPYSNgRA="; }; - vendorSha256 = "sha256-r7xzvntTIJocdYMQpFXunI2XV65eRG+piEEzS5N2xsY="; + vendorSha256 = "sha256-cfxHx4oyIfUX9bGjwZ9Hu3VieIXOB0VGHjaQWm4kYOk="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From bb8900960cb01bd15c472bbf25ee34a4b0c0c7c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 16:35:08 +0000 Subject: [PATCH 083/108] python38Packages.rq: 1.10 -> 1.10.1 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 731204b78e62..24001f176ae2 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rq"; - version = "1.10"; + version = "1.10.1"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "16k5qz5k3v232dzv99bxxw52jr2hb5ra08b6dkhqya98wjviq8l5"; + sha256 = "1f4fi1rvn97d2b524q45k6s10b007pr23k0mf44q7hy8q4vnjmh5"; }; # test require a running redis rerver, which is something we can't do yet From 558d3c9bbb6ef673262a880c4758bf12de3e6cd9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 7 Dec 2021 11:32:05 -0600 Subject: [PATCH 084/108] all-packages: rename unused bindings to _ --- pkgs/top-level/all-packages.nix | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a57a684905bc..16ec758ba3c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2366,7 +2366,7 @@ with pkgs; ''; }; - stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: { + stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (_: { executableToolDepends = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/stack2nix \ @@ -4206,7 +4206,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { stdenv = clangStdenv; - protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (_: { stdenv = clangStdenv; }); }; rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; @@ -5144,7 +5144,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; - protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf3_8.overrideDerivation (_: { stdenv = clangStdenv; }); }; table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { }; @@ -6068,7 +6068,7 @@ with pkgs; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { # update breaks grub2 - gnulib = pkgs.gnulib.overrideAttrs (oldAttrs: rec { + gnulib = pkgs.gnulib.overrideAttrs (_: rec { version = "20200223"; src = fetchgit { url = "https://git.savannah.gnu.org/r/gnulib.git"; @@ -6468,7 +6468,7 @@ with pkgs; jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]); - packages = config.ihaskell.packages or (self: []); + packages = config.ihaskell.packages or (_: []); }; ijq = callPackage ../development/tools/ijq { }; @@ -10896,7 +10896,7 @@ with pkgs; wget2 = callPackage ../tools/networking/wget2 { # update breaks grub2 - gnulib = pkgs.gnulib.overrideAttrs (oldAttrs: rec { + gnulib = pkgs.gnulib.overrideAttrs (_: rec { version = "20210208"; src = fetchgit { url = "https://git.savannah.gnu.org/r/gnulib.git"; @@ -16423,7 +16423,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec { + libgit2_0_27 = libgit2.overrideAttrs (_: rec { version = "0.27.10"; src = fetchFromGitHub { owner = "libgit2"; @@ -16437,7 +16437,7 @@ with pkgs; ]; }); - libgit2_1_1 = libgit2.overrideAttrs (oldAttrs: rec { + libgit2_1_1 = libgit2.overrideAttrs (_: rec { version = "1.1.1"; src = fetchFromGitHub { owner = "libgit2"; @@ -19138,7 +19138,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon; }; - portaudio2014 = portaudio.overrideAttrs (oldAttrs: { + portaudio2014 = portaudio.overrideAttrs (_: { src = fetchurl { url = "http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz"; sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; @@ -19438,7 +19438,7 @@ with pkgs; rocksdb_lite = rocksdb.override { enableLite = true; }; - rocksdb_6_23 = rocksdb.overrideAttrs (old: rec { + rocksdb_6_23 = rocksdb.overrideAttrs (_: rec { pname = "rocksdb"; version = "6.23.3"; src = fetchFromGitHub { @@ -20523,11 +20523,11 @@ with pkgs; sqitchMysql = (callPackage ../development/tools/misc/sqitch { mysqlSupport = true; - }).overrideAttrs (oldAttrs: { pname = "sqitch-mysql"; }); + }).overrideAttrs (_: { pname = "sqitch-mysql"; }); sqitchPg = (callPackage ../development/tools/misc/sqitch { postgresqlSupport = true; - }).overrideAttrs (oldAttrs: { pname = "sqitch-pg"; }); + }).overrideAttrs (_: { pname = "sqitch-pg"; }); ### DEVELOPMENT / R MODULES @@ -20561,7 +20561,7 @@ with pkgs; }; rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules { - overrides = (config.rPackageOverrides or (p: {})) pkgs; + overrides = (config.rPackageOverrides or (_: {})) pkgs; }); ### SERVERS @@ -28907,7 +28907,7 @@ with pkgs; darwin = true; }; }; - }).overrideAttrs (oldAttrs: rec { + }).overrideAttrs (_: rec { pname = "vim-darwin"; meta = { platforms = lib.platforms.darwin; @@ -29460,7 +29460,7 @@ with pkgs; xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { inherit (haskellPackages) ghcWithPackages; - packages = self: [ haskellPackages.xmonad-contrib ]; + packages = _: [ haskellPackages.xmonad-contrib ]; }; xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { @@ -31641,7 +31641,7 @@ with pkgs; }; cvc3 = callPackage ../applications/science/logic/cvc3 { - gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); + gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; }); stdenv = gccStdenv; }; cvc4 = callPackage ../applications/science/logic/cvc4 { @@ -31685,7 +31685,7 @@ with pkgs; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = lib.overrideDerivation polyml (attrs: { + polyml = lib.overrideDerivation polyml (_: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); From 19057428f94082703e442e5476b9f827a856a321 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 19 Nov 2021 15:31:39 -0800 Subject: [PATCH 085/108] spicetify-cli: 2.7.1 -> 2.8.2 --- pkgs/applications/misc/spicetify-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 7bbe65811548..5e4b0017da9b 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.7.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fWh345J2fD9uoGrDiVZyEBiOlMy8giEGKHGMujT0mjo="; + sha256 = "sha256-YMVB9nKsHYy65McYs1w/ETy+1b8GkjuWFk6PZs4HFko="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; From b207a9d87d02aa04463fd0967a681b893ff406bf Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 7 Dec 2021 18:52:51 +0100 Subject: [PATCH 086/108] grafana: 8.3.0 -> 8.3.1 Fixes CVE-2021-43798. https://grafana.com/docs/grafana/latest/release-notes/release-notes-8-3-1/ --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 97c92fe0ec33..31ba83b20f8a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGo117Module rec { pname = "grafana"; - version = "8.3.0"; + version = "8.3.1"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGo117Module rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-I+jfWHkTm11qIm6CdDFOFHs/qR9pswbjAdfejkxZnrQ="; + sha256 = "sha256-KnTk14//uC8T6gqU6IvSQ28fL/h0THVAA6smTspZiVs="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-o8uw9VRuK93IbZgcZmFmZ2zbgKdryGbeaPAlQr8wJXw="; + sha256 = "sha256-CX2F6yymmCvs6o7MtyhVrBGr9D6JSvakbWS7x3kiM5s="; }; vendorSha256 = "sha256-aS9yz0JODZtichaIkiBJLiMjbjGY93eSYwuactbRqOY="; From 46a774d3764843ccee0ca5b1f93088ce12ecad6c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 7 Dec 2021 19:03:14 +0100 Subject: [PATCH 087/108] bpytop: unbreak on aarch64-darwin --- pkgs/tools/system/bpytop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index f552ede91b5e..1c24537b0221 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux ++ freebsd ++ darwin; # https://github.com/NixOS/nixpkgs/pull/94625#issuecomment-668509399 - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && stdenv.isx86_64; }; } From 76afc07fadef14fa5ba2397fb064709f226079c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 18:14:40 +0000 Subject: [PATCH 088/108] python38Packages.spacy-transformers: 1.1.2 -> 1.1.3 --- .../development/python-modules/spacy-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 9d930e58fa13..757c945f3f05 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.2"; + version = "1.1.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b84c195dc21a28582579dea3f76c90222e29ee0d99b6adf38ade75646ed2746e"; + sha256 = "f4f553d3d2a065147a8c1292b5d9adf050c0f78dd15bb05c9614341cf88c5574"; }; postPatch = '' From 8eb814e964bb89e7f996258803626d5d1aa54726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 7 Dec 2021 10:15:34 +0100 Subject: [PATCH 089/108] Revert "nixos/ddclient: fix permission for ddclient.conf (#148179)" This reverts commit 6af3d13bec9b13e8fa8e19594ffbcbe085387bdd. Reported by @arcnmx (https://github.com/NixOS/nixpkgs/pull/148179#issuecomment-987197656): Does this not completely break the service? It doesn't change the owner to the same as the ddclient server (which is somewhat difficult due to it being a DynamicUser), so this now makes the service completely unusable because the config is only readable by its owner, root: ddclient[871397]: WARNING: file /run/ddclient/ddclient.conf: Cannot open file '/run/ddclient/ddclient.conf'. (Permission denied) Given that the RuntimeDirectory was only readable by the ddclient service, the warning this PR fixes was spurious and not indicative of an actual information leak. I'm not sure of what a quick fix would be due to DynamicUser, but would at least request a revert of this so the service can work again? --- nixos/modules/services/networking/ddclient.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 021b28d5c34f..8a2c0fc7080c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -29,7 +29,7 @@ let configFile = if (cfg.configFile != null) then cfg.configFile else configFile'; preStart = '' - install --mode=0400 ${configFile} /run/${RuntimeDirectory}/ddclient.conf + install ${configFile} /run/${RuntimeDirectory}/ddclient.conf ${lib.optionalString (cfg.configFile == null) (if (cfg.passwordFile != null) then '' password=$(printf "%q" "$(head -n 1 "${cfg.passwordFile}")") sed -i "s|^password=$|password=$password|" /run/${RuntimeDirectory}/ddclient.conf From b79db91640e8c9ebb0179890bba0175baed94135 Mon Sep 17 00:00:00 2001 From: Nicolas M Date: Tue, 7 Dec 2021 11:16:10 +0100 Subject: [PATCH 090/108] skate: init at 0.1.0 --- pkgs/applications/misc/skate/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/skate/default.nix diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix new file mode 100644 index 000000000000..1c35c06ec171 --- /dev/null +++ b/pkgs/applications/misc/skate/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "skate"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = "skate"; + rev = "v${version}"; + sha256 = "01brxckjz8vlgaq9917l45xf48078d4465qn9l0lyll6hic6p06c"; + }; + + vendorSha256 = "0mvx4rzs0mvb1dyxj105mh2awfy0bmp716x7hpfdwhwz3p11fc7k"; + + doCheck = false; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + meta = with lib; { + description = "A personal multi-machine syncable key value store"; + homepage = "https://github.com/charmbracelet/skate"; + license = licenses.mit; + maintainers = with maintainers; [ penguwin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a57a684905bc..c08d6ca566d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25891,6 +25891,8 @@ with pkgs; shepherd = nodePackages."@nerdwallet/shepherd"; + skate = callPackage ../applications/misc/skate { }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-cli = callPackage ../tools/networking/slack-cli { }; From 68dc74333ec3c760a37ab200b91811933ff3f32f Mon Sep 17 00:00:00 2001 From: Nicolas M Date: Tue, 7 Dec 2021 11:01:26 +0100 Subject: [PATCH 091/108] soft-serve: init at 0.1.0 Apply suggestions from code review Co-authored-by: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> --- pkgs/servers/soft-serve/default.nix | 33 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/soft-serve/default.nix diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix new file mode 100644 index 000000000000..fce9544f4813 --- /dev/null +++ b/pkgs/servers/soft-serve/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, git }: + +buildGoModule rec { + pname = "soft-serve"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = "soft-serve"; + rev = "v${version}"; + sha256 = "0z88699q34a9cbhcz12y2qs2qrspfd8yx4ay0r8jzvkgax9ylrlk"; + }; + + vendorSha256 = "1g2iznfh08l23i81x7g2bhc7l8cppshzlyynxik4jshswlpv80sr"; + + doCheck = false; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/soft \ + --prefix PATH : "${lib.makeBinPath [ git ]}" + ''; + + meta = with lib; { + description = "A tasty, self-hosted Git server for the command line"; + homepage = "https://github.com/charmbracelet/soft-serve"; + license = licenses.mit; + maintainers = with maintainers; [ penguwin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c08d6ca566d7..521dd5fb129a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21129,6 +21129,8 @@ with pkgs; quark = callPackage ../servers/http/quark { }; + soft-serve = callPackage ../servers/soft-serve { }; + sympa = callPackage ../servers/mail/sympa { }; system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); From 92b17cf5da2bee1eda1389e7d9b12bb98b11e0eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 19:23:48 +0000 Subject: [PATCH 092/108] open-policy-agent: 0.34.0 -> 0.35.0 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 824b9dc44d6e..ec394630fdb1 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-T8eFCFzDU0GTd7n141XKT34lRXoU2LOrl0Rlh1WLsmo="; + sha256 = "sha256-IiYEDvTHb25xolE/IfpFgcJArxU6c89P5oNgt1T2VXA="; }; vendorSha256 = null; From bab515f768757770c50c6304de237db7d516288b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 7 Dec 2021 20:44:52 +0100 Subject: [PATCH 093/108] chromiumBeta: 97.0.4692.20 -> 97.0.4692.36 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2a105527c102..c58910300faa 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "97.0.4692.20", - "sha256": "1njgfz3kz1pyyaaskqc47ldy2gzc3c9a8mjib81nalzrqbmd3372", - "sha256bin64": "0nsaf46a9pl8cxw5v2zsfp2ynja4m55qi1m4mhwhmyr50138655f", + "version": "97.0.4692.36", + "sha256": "0p0f19svnymql8skx6alb6zy4fmc5115dc2avs8h2mca1q8n5r0s", + "sha256bin64": "08p0rwn4jglrzma1vf4jnyqaffnk0c8xwc7jkgfpkasm43d72zim", "deps": { "gn": { "version": "2021-11-03", From 4939140e0ff8015857005d759ab749ea615d85b3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 7 Dec 2021 20:44:52 +0100 Subject: [PATCH 094/108] chromium: 96.0.4664.45 -> 96.0.4664.93 https://chromereleases.googleblog.com/2021/12/stable-channel-update-for-desktop.html This update includes 22 security fixes. CVEs: CVE-2021-4052 CVE-2021-4053 CVE-2021-4079 CVE-2021-4054 CVE-2021-4078 CVE-2021-4055 CVE-2021-4056 CVE-2021-4057 CVE-2021-4058 CVE-2021-4059 CVE-2021-4061 CVE-2021-4062 CVE-2021-4063 CVE-2021-4064 CVE-2021-4065 CVE-2021-4066 CVE-2021-4067 CVE-2021-4068 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2a105527c102..e69d8cbf6021 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "96.0.4664.45", - "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328", - "sha256bin64": "0546i4yd1jahv088hjxpq0jc393pscvl5ap3s2qw5jrybliyfd2g", + "version": "96.0.4664.93", + "sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw", + "sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb", "deps": { "gn": { "version": "2021-09-24", @@ -12,9 +12,9 @@ } }, "chromedriver": { - "version": "96.0.4664.35", - "sha256_linux": "0iq129a4mj4sjs08s68n82wd8563sw8196xda27wk3pfpprr23db", - "sha256_darwin": "1prc7zbgnljqz2d89clpk5c0y48r79zmb9in4vinf3j6p2rxn0vy" + "version": "96.0.4664.45", + "sha256_linux": "15wybxlh38sw7f2bzalf9ivfp8262cpcvhq08nw9d2cj3j39f13m", + "sha256_darwin": "0r3b8wgbd8xjb09f4vc402gp77y2aqjk9hpqvvr6xgdr7nqym20f" } }, "beta": { From c84ac918fc8b712ad98fec017f7b36fd09cb8f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 7 Dec 2021 20:44:45 +0100 Subject: [PATCH 095/108] pcsx2: 2021-10-28 -> 1.7.2105 --- pkgs/misc/emulators/pcsx2/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 4246240463ee..a71ae784c18c 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -6,6 +6,7 @@ , glib , gtk3 , harfbuzz +, lib , libaio , libpcap , libpng @@ -17,23 +18,23 @@ , portaudio , SDL2 , soundtouch -, lib, stdenv +, stdenv , udev , wrapGAppsHook , wxGTK , zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pcsx2"; - version = "unstable-2021-10-28"; + version = "1.7.2105"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; - rev = "52eab493591137d830b45337e04c75ff525a31f9"; - sha256 = "RhAo5Fob8G16jzb9MOAS43vwTkFzf5XupymN0dzeGJU="; + rev = "v${version}"; + hash = "sha256-/A8u7oDIVs0Zmne0ebaXxOeIQbM9pr62KEH6FJR2umk="; }; cmakeFlags = [ @@ -68,7 +69,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Playstation 2 emulator"; - longDescription= '' + longDescription = '' PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose is to emulate the PS2 hardware, using a combination of MIPS CPU Interpreters, Recompilers and a Virtual Machine which manages hardware From 81441f72a603c391d610afce86553669f9a8d9fe Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 7 Dec 2021 20:27:08 +0100 Subject: [PATCH 096/108] prisma-mode: init at 2021-12-07 --- .../emacs/elisp-packages/manual-packages.nix | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 3f5dd795ccb9..c9eda3a548a0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -196,6 +196,35 @@ power-mode = callPackage ./power-mode { }; + prisma-mode = let + rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4"; + in melpaBuild { + pname = "prisma-mode"; + version = "20211207.0"; + + commit = rev; + + packageRequires = [ js2-mode ]; + + src = pkgs.fetchFromGitHub { + owner = "pimeys"; + repo = "emacs-prisma-mode"; + inherit rev; + sha256 = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; + }; + + recipe = pkgs.writeText "recipe" '' + (prisma-mode + :repo "pimeys/emacs-prisma-mode" + :fetcher github) + ''; + + meta = { + description = "Major mode for Prisma Schema Language"; + license = gpl2Only; + }; + }; + railgun = callPackage ./railgun { }; structured-haskell-mode = self.shm; From c9529528b72fa20739a8097e2b1067a3e5d74355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 18:17:47 +0000 Subject: [PATCH 097/108] nomad-autoscaler: 0.3.3 -> 0.3.4 --- .../networking/cluster/nomad-autoscaler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index 702bf19d5795..cfa86ea2dcaf 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -3,7 +3,7 @@ let package = buildGoModule rec { pname = "nomad-autoscaler"; - version = "0.3.3"; + version = "0.3.4"; outputs = [ "out" @@ -25,10 +25,10 @@ let owner = "hashicorp"; repo = "nomad-autoscaler"; rev = "v${version}"; - sha256 = "sha256-bN/U6aCf33B88ouQwTGG8CqARzWmIvXNr5JPr3l8cVI="; + sha256 = "sha256-SmlcQH+K/axl6Gj+bX0Quk6K/usP0c1hWnIdFjS1dn8="; }; - vendorSha256 = "sha256-Ls8gkfLyxfQD8krvxjAPnZhf1r1s2MhtQfMMfp8hJII="; + vendorSha256 = "sha256-tO8vi9jBV6rVcGk/OoaXzpnQi4yPdozYZZwAMFCz2+c="; subPackages = [ "." ]; From 00a904f61bd9880bc388edf4ef1aa13b02767256 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Dec 2021 21:32:23 +0100 Subject: [PATCH 098/108] foot: 1.10.1 -> 1.10.2 https://codeberg.org/dnkl/foot/releases/tag/1.10.2 --- pkgs/applications/terminal-emulators/foot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 389408377c61..9290f8ce6144 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.10.1"; + version = "1.10.2"; # 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 = "12n1v9by519fg40xvjf4v0g2phi08lcg0clz7rxs2i2xwlizz7nc"; + sha256 = "00096c2m8pn4gpafvmg9lhyprwgnsis62bq4qmagnbb49bj5kr9v"; }; depsBuildBuild = [ From 2dd0edd99ac9220c4ad82e3e87a24ae354877704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Tue, 7 Dec 2021 20:46:56 +0100 Subject: [PATCH 099/108] pcsx2: build with wayland support --- pkgs/misc/emulators/pcsx2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index a71ae784c18c..2e22e7d9053a 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -23,6 +23,7 @@ , wrapGAppsHook , wxGTK , zlib +, wayland }: stdenv.mkDerivation rec { @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { "-DDISABLE_ADVANCE_SIMD=TRUE" "-DDISABLE_PCSX2_WRAPPER=TRUE" "-DPACKAGE_MODE=TRUE" + "-DWAYLAND_API=TRUE" "-DXDG_STD=TRUE" ]; @@ -63,6 +65,7 @@ stdenv.mkDerivation rec { SDL2 soundtouch udev + wayland wxGTK zlib ]; From a080a769efda56e6b8fc92cc814bae6f45265bb1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Dec 2021 06:23:52 +1000 Subject: [PATCH 100/108] editorconfig-checker: 2.3.5 -> 2.4.0 https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/2.4.0 --- .../development/tools/misc/editorconfig-checker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 37f455e91bed..13377334cce4 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.3.5"; + version = "2.4.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - sha256 = "sha256-t1qvmTs6hOrAnq5hjU2Qjt33vdW9MuSOvWCCY82db+g="; + sha256 = "sha256-uP+AgQO1k9fic7r0pOKqO5lUHKEf7Pwaw2U2a6ghzz0="; }; - vendorSha256 = "sha256-Rs7u/ZepnMNg5EZ/HWqSdO428KOkxpSbo7rl0treqUY="; + vendorSha256 = "sha256-SrBrYyExeDHXhezvtfGLtm8NM1eX4/8kzwUICQLZDjo="; doCheck = false; From ecd88f91a0aa5a25e2cd44a1a09e404bea53d458 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 10 Sep 2021 13:08:58 +0200 Subject: [PATCH 101/108] nixos/maddy: Add module for maddy Co-authored-by: Patrick Hilhorst --- .../from_md/release-notes/rl-2111.section.xml | 7 + .../manual/release-notes/rl-2111.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/maddy.nix | 247 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/maddy.nix | 58 ++++ pkgs/servers/maddy/default.nix | 4 +- 7 files changed, 319 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/mail/maddy.nix create mode 100644 nixos/tests/maddy.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 6b706e4aeaa1..e2bda7604e48 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -273,6 +273,13 @@ services.peertube. + + + maddy, a + composable all-in-one mail server. Available as + services.maddy. + + sourcehut, a diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 48adc4ad33cb..2520d176096a 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -74,6 +74,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [PeerTube](https://joinpeertube.org/), developed by Framasoft, is the free and decentralized alternative to video platforms. Available at [services.peertube](options.html#opt-services.peertube.enable). +- [maddy](https://maddy.email), a composable all-in-one mail server. Available as [services.maddy](options.html#opt-services.maddy.enable). + - [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable). - [ucarp](https://download.pureftpd.org/pub/ucarp/README), an userspace implementation of the Common Address Redundancy Protocol (CARP). Available as [networking.ucarp](options.html#opt-networking.ucarp.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f36e7dd67eae..8cb7c39005c5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -467,6 +467,7 @@ ./services/mail/dovecot.nix ./services/mail/dspam.nix ./services/mail/exim.nix + ./services/mail/maddy.nix ./services/mail/mail.nix ./services/mail/mailcatcher.nix ./services/mail/mailhog.nix diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix new file mode 100644 index 000000000000..44cfa3c2908d --- /dev/null +++ b/nixos/modules/services/mail/maddy.nix @@ -0,0 +1,247 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + name = "maddy"; + cfg = config.services.maddy; + defaultConfig = '' + tls off + + auth.pass_table local_authdb { + table sql_table { + driver sqlite3 + dsn credentials.db + table_name passwords + } + } + + storage.imapsql local_mailboxes { + driver sqlite3 + dsn imapsql.db + } + + table.chain local_rewrites { + optional_step regexp "(.+)\+(.+)@(.+)" "$1@$3" + optional_step static { + entry postmaster postmaster@$(primary_domain) + } + optional_step file /etc/maddy/aliases + } + msgpipeline local_routing { + destination postmaster $(local_domains) { + modify { + replace_rcpt &local_rewrites + } + deliver_to &local_mailboxes + } + default_destination { + reject 550 5.1.1 "User doesn't exist" + } + } + + smtp tcp://0.0.0.0:25 { + limits { + all rate 20 1s + all concurrency 10 + } + dmarc yes + check { + require_mx_record + dkim + spf + } + source $(local_domains) { + reject 501 5.1.8 "Use Submission for outgoing SMTP" + } + default_source { + destination postmaster $(local_domains) { + deliver_to &local_routing + } + default_destination { + reject 550 5.1.1 "User doesn't exist" + } + } + } + + submission tcp://0.0.0.0:587 { + limits { + all rate 50 1s + } + auth &local_authdb + source $(local_domains) { + check { + authorize_sender { + prepare_email &local_rewrites + user_to_email identity + } + } + destination postmaster $(local_domains) { + deliver_to &local_routing + } + default_destination { + modify { + dkim $(primary_domain) $(local_domains) default + } + deliver_to &remote_queue + } + } + default_source { + reject 501 5.1.8 "Non-local sender domain" + } + } + + target.remote outbound_delivery { + limits { + destination rate 20 1s + destination concurrency 10 + } + mx_auth { + dane + mtasts { + cache fs + fs_dir mtasts_cache/ + } + local_policy { + min_tls_level encrypted + min_mx_level none + } + } + } + + target.queue remote_queue { + target &outbound_delivery + autogenerated_msg_domain $(primary_domain) + bounce { + destination postmaster $(local_domains) { + deliver_to &local_routing + } + default_destination { + reject 550 5.0.0 "Refusing to send DSNs to non-local addresses" + } + } + } + + imap tcp://0.0.0.0:143 { + auth &local_authdb + storage &local_mailboxes + } + ''; + +in { + options = { + services.maddy = { + enable = mkEnableOption "Maddy, a free an open source mail server"; + + user = mkOption { + default = "maddy"; + type = with types; uniq string; + description = '' + Name of the user under which maddy will run. If not specified, a + default user will be created. + ''; + }; + group = mkOption { + default = "maddy"; + type = with types; uniq string; + description = '' + Name of the group under which maddy will run. If not specified, a + default group will be created. + ''; + }; + + hostname = mkOption { + default = "localhost"; + type = with types; uniq string; + example = ''example.com''; + description = '' + Hostname to use. It should be FQDN. + ''; + }; + primaryDomain = mkOption { + default = "localhost"; + type = with types; uniq string; + example = ''mail.example.com''; + description = '' + Primary MX domain to use. It should be FQDN. + ''; + }; + localDomains = mkOption { + type = with types; listOf str; + default = ["$(primary_domain)"]; + example = [ + "$(primary_domain)" + "example.com" + "other.example.com" + ]; + description = '' + Define list of allowed domains. + ''; + }; + config = mkOption { + type = with types; nullOr lines; + default = defaultConfig; + description = '' + Server configuration. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open the configured incoming and outgoing mail server ports. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + systemd = { + packages = [ pkgs.maddy ]; + services.maddy = { + serviceConfig = { + User = "${cfg.user}"; + Group = "${cfg.group}"; + }; + wantedBy = [ "multi-user.target" ]; + }; + }; + + environment.etc."maddy/maddy.conf" = { + text = '' + $(hostname) = ${cfg.hostname} + $(primary_domain) = ${cfg.primaryDomain} + $(local_domains) = ${toString cfg.localDomains} + hostname ${cfg.hostname} + ${cfg.config} + ''; + }; + + users.users = optionalAttrs (cfg.user == "maddy") { + maddy = { + description = "Maddy service user"; + group = cfg.group; + home = "/var/lib/maddy"; + createHome = true; + isSystemUser = true; + }; + }; + + users.groups = mkIf (cfg.group == "maddy") { + maddy = pkgs.lib.mkForce { + name = cfg.group; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 25 143 587 ]; + }; + + environment.systemPackages = [ + pkgs.maddy + ]; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index bee2935b84fb..63be67892017 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -247,6 +247,7 @@ in lxd-image-server = handleTest ./lxd-image-server.nix {}; #logstash = handleTest ./logstash.nix {}; lorri = handleTest ./lorri/default.nix {}; + maddy = handleTest ./maddy.nix {}; magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {}; magnetico = handleTest ./magnetico.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; diff --git a/nixos/tests/maddy.nix b/nixos/tests/maddy.nix new file mode 100644 index 000000000000..581748c1fa59 --- /dev/null +++ b/nixos/tests/maddy.nix @@ -0,0 +1,58 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "maddy"; + meta = with pkgs.lib.maintainers; { maintainers = [ onny ]; }; + + nodes = { + server = { ... }: { + services.maddy = { + enable = true; + hostname = "server"; + primaryDomain = "server"; + openFirewall = true; + }; + }; + + client = { ... }: { + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "send-testmail" { } '' + import smtplib + from email.mime.text import MIMEText + + msg = MIMEText("Hello World") + msg['Subject'] = 'Test' + msg['From'] = "postmaster@server" + msg['To'] = "postmaster@server" + with smtplib.SMTP('server', 587) as smtp: + smtp.login('postmaster@server', 'test') + smtp.sendmail('postmaster@server', 'postmaster@server', msg.as_string()) + '') + (pkgs.writers.writePython3Bin "test-imap" { } '' + import imaplib + + with imaplib.IMAP4('server') as imap: + imap.login('postmaster@server', 'test') + imap.select() + status, refs = imap.search(None, 'ALL') + assert status == 'OK' + assert len(refs) == 1 + status, msg = imap.fetch(refs[0], 'BODY[TEXT]') + assert status == 'OK' + assert msg[0][1].strip() == b"Hello World" + '') + ]; + }; + }; + + testScript = '' + start_all() + server.wait_for_unit("maddy.service") + server.wait_for_open_port(143) + server.wait_for_open_port(587) + + server.succeed("echo test | maddyctl creds create postmaster@server") + server.succeed("maddyctl imap-acct create postmaster@server") + + client.succeed("send-testmail") + client.succeed("test-imap") + ''; +}) diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 3381b7858beb..b4ddb80c1653 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, coreutils, installShellFiles, scdoc }: +{ lib, buildGoModule, fetchFromGitHub, coreutils, installShellFiles, scdoc, nixosTests }: buildGoModule rec { pname = "maddy"; @@ -37,6 +37,8 @@ buildGoModule rec { --replace "/bin/kill" "${coreutils}/bin/kill" ''; + passthru.tests.nixos = nixosTests.maddy; + meta = with lib; { description = "Composable all-in-one mail server"; homepage = "https://maddy.email"; From e102ec2c5de24a437a0b70f39c5cdf4e39bdcb84 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sun, 5 Dec 2021 18:02:29 -0800 Subject: [PATCH 102/108] datefmt: init at 0.2.1 datefmt is a simple C program that formats unix timestamps in text streams Signed-off-by: William Casarin Link: https://lists.sr.ht/~andir/nixpkgs-dev/%3C20211206021054.2252306-1-jb55@jb55.com%3E --- pkgs/tools/misc/datefmt/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/datefmt/default.nix diff --git a/pkgs/tools/misc/datefmt/default.nix b/pkgs/tools/misc/datefmt/default.nix new file mode 100644 index 000000000000..01927fedc28d --- /dev/null +++ b/pkgs/tools/misc/datefmt/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchurl, datefmt, testVersion }: + +stdenv.mkDerivation rec { + pname = "datefmt"; + version = "0.2.1"; + + src = fetchurl { + url = "http://cdn.jb55.com/tarballs/datefmt/datefmt-${version}.tar.gz"; + sha256 = "5d5e765380afe39eb39d48f752aed748b57dfd843a4947b2a6d18ab9b5e68092"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + passthru.tests.version = testVersion { package = datefmt; }; + + meta = with lib; { + homepage = "https://jb55.com/datefmt"; + description = "A tool that formats timestamps in text streams"; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jb55 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 297236b8f8e5..878c581ff921 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2678,6 +2678,8 @@ with pkgs; howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { }; + datefmt = callPackage ../tools/misc/datefmt { }; + datefudge = callPackage ../tools/system/datefudge { }; dateutils = callPackage ../tools/misc/dateutils { }; From 629e241bed0ef4a6d0cf161cf40e9a1f86501fbe Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 7 Dec 2021 22:25:56 +0100 Subject: [PATCH 103/108] cloc: fix src hash for Darwin Also span `buildInputs` over multiple lines. --- pkgs/tools/misc/cloc/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 1825c1b767ed..662a72f9e7a0 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "sha256-tFARxNGXzWw+EN2qwBOhJEj7zwYfC9tVP0sAHqeGwcM="; + sha256 = if stdenv.isDarwin then + "1hy1hskiw02b7xaxn2qz0v7znj14l49w1anx20z6rkcps7212l5l" + else + "sha256-tFARxNGXzWw+EN2qwBOhJEj7zwYfC9tVP0sAHqeGwcM="; }; setSourceRoot = '' @@ -16,7 +19,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeWrapper ]; - buildInputs = (with perlPackages; [ perl AlgorithmDiff ParallelForkManager RegexpCommon ]); + buildInputs = with perlPackages; [ + perl + AlgorithmDiff + ParallelForkManager + RegexpCommon + ]; makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ]; From fd913080a997fdc9ac404090e2ea6dc415fc938d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Dec 2021 06:26:45 +1000 Subject: [PATCH 104/108] clusterctl: 1.0.1 -> 1.0.2 https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.0.2 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 752c9b3c6172..fdd0e4967a76 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-EkBZZUkr1u0u75WDDFAdLLpS01+3+eyXpu4HRg2Q780="; + sha256 = "sha256-esSpCNvgYhuz9i22AU4ZowU5A5ZOPZ15+XHB4OOfTa4="; }; vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU="; From 309554ecae894b5dd7cc5dcdfc15f91e6e7a9b25 Mon Sep 17 00:00:00 2001 From: Michael Zappa Date: Fri, 3 Dec 2021 09:42:04 -0500 Subject: [PATCH 105/108] maintainers: add michzappa --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a79bc3f210a0..e9b7df1801b7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7675,6 +7675,12 @@ githubId = 21156022; name = "Michal Minář"; }; + michzappa = { + email = "me@michzappa.com"; + github = "michzappa"; + githubId = 59343378; + name = "Michael Zappa"; + }; mickours = { email = "mickours@gmail.com<"; github = "mickours"; From 4d07862ea6ed637ee85f868d1bf8a833878bc05e Mon Sep 17 00:00:00 2001 From: Thomas Wu <61684794+ixnij@users.noreply.github.com> Date: Wed, 8 Dec 2021 07:15:49 +0800 Subject: [PATCH 106/108] atuin: set broken for aarch64-darwin (#148544) Co-authored-by: Sandro --- pkgs/tools/misc/atuin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 3157fc51b58a..ae7a17e721cd 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ellie/atuin"; license = licenses.mit; maintainers = [ maintainers.onsails ]; + broken = stdenv.isDarwin && stdenv.isAarch64; }; } From 20aea0a8239183ad66853071ed88398e952b8a03 Mon Sep 17 00:00:00 2001 From: Michael Zappa Date: Sun, 5 Dec 2021 10:46:00 -0500 Subject: [PATCH 107/108] f1viewer: init at 2.4.0 --- pkgs/applications/video/f1viewer/default.nix | 23 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/video/f1viewer/default.nix diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/applications/video/f1viewer/default.nix new file mode 100644 index 000000000000..b00d2d8275be --- /dev/null +++ b/pkgs/applications/video/f1viewer/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "f1viewer"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "SoMuchForSubtlety"; + repo = pname; + rev = "v${version}"; + sha256 = "7eXRUG74l9+9nU7EmDvNcHc+2pg5+/amjqtrzT60f94="; + }; + + vendorSha256 = "4pQ8NT0mh3w7naHEHh2w6Csop0uitlWClZ95VlYaPW0="; + + meta = with lib; { + description = + "A TUI to view Formula 1 footage using VLC or another media player"; + homepage = "https://github.com/SoMuchForSubtlety/f1viewer"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ michzappa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3108255aaf53..b5090d491357 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24940,6 +24940,8 @@ with pkgs; exrtools = callPackage ../applications/graphics/exrtools { }; + f1viewer = callPackage ../applications/video/f1viewer {}; + fasttext = callPackage ../applications/science/machine-learning/fasttext { }; fbmenugen = callPackage ../applications/misc/fbmenugen { }; From feb86343bd4227403b5793de5ed76015ff1bc341 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 3 Dec 2021 13:43:20 -0800 Subject: [PATCH 108/108] qemu: Add patch for socket_sockaddr_to_address_unix assertion errors See also: - http://bugs.debian.org/993145 - https://bugs.archlinux.org/task/72115 --- pkgs/applications/virtualization/qemu/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 5c22b1649239..352c0c442d98 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -119,6 +119,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch"; sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8="; }) + # Fixes socket_sockaddr_to_address_unix assertion errors in some setups. Remove with next release. + (fetchpatch { + name = "fix-unix-socket-path-copy-again.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/118d527f2e4baec5fe8060b22a6212468b8e4d3f.patch"; + sha256 = "sha256-ox+JSpc0pqd3bMi5Ot7ljQyk70SX8g+BLufR06mZPps="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ ./sigrtminmax.patch