From f5746f9c0b86a4cf197d4d6bd834940db865351a Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 25 Nov 2019 11:49:33 +0200 Subject: [PATCH 001/241] nixosTests.riak: port to python --- nixos/tests/riak.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix index 68a9b7315b3..01baf656d14 100644 --- a/nixos/tests/riak.nix +++ b/nixos/tests/riak.nix @@ -1,21 +1,15 @@ -import ./make-test.nix { +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "riak"; - nodes = { - master = - { pkgs, ... }: - - { - services.riak.enable = true; - services.riak.package = pkgs.riak; - }; + machine = { + services.riak.enable = true; + services.riak.package = pkgs.riak; }; testScript = '' - startAll; + machine.start() - $master->waitForUnit("riak"); - $master->sleep(20); # Hopefully this is long enough!! - $master->succeed("riak ping 2>&1"); + machine.wait_for_unit("riak") + machine.wait_until_succeeds("riak ping 2>&1") ''; -} +}) From 3b0a0ad3b1de68795a6ee076c54972f2f9787a91 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 25 Nov 2019 11:51:39 +0200 Subject: [PATCH 002/241] nixosTests.riak: add filalex77 as a maintainer --- nixos/tests/riak.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix index 01baf656d14..6915779e7e9 100644 --- a/nixos/tests/riak.nix +++ b/nixos/tests/riak.nix @@ -1,5 +1,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "riak"; + meta = with lib.maintainers; { + maintainers = [ filalex77 ]; + }; machine = { services.riak.enable = true; From 60f2c59471b29dc45803a02071a965cdea06a5b1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Nov 2019 12:50:51 +0100 Subject: [PATCH 003/241] nixos/networkd: mark `units` option as internal The options at `systemd.network` (`links`, `netdevs` and `networks`) are directly mapped to the three different unit types of `systemd-networkd(8)`. However there's also the option `systemd.network.units` which is basically used as a container for generated unit-configs that are linked to `/etc/systemd/networkd`[1]. This should not be exposed to the user as it's unclear whether or not it should be used directly which can be pretty confusing which is why I decided to declare this option as internal (including all sub-options as `internal` doesn't seem to be propagated to submodules). [1] https://github.com/NixOS/nixpkgs/blob/9db75ed88fd87e17ec448ad7a43b62acb4842854/nixos/modules/system/boot/networkd.nix#L933-L937 --- nixos/modules/system/boot/networkd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 226769f1059..71668fdfccc 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -911,9 +911,10 @@ in systemd.network.units = mkOption { description = "Definition of networkd units."; default = {}; + internal = true; type = with types; attrsOf (submodule ( { name, config, ... }: - { options = concreteUnitOptions; + { options = mapAttrs (_: x: x // { internal = true; }) concreteUnitOptions; config = { unit = mkDefault (makeUnit name config); }; From e0780c5cffa7516ad85b885cae7d0c85aed90267 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 10 Dec 2019 14:31:52 +0100 Subject: [PATCH 004/241] nixos/nixos-option: fix evaluator to render a full submodule entry When running e.g. `nixos-option users.users.ma27`, the evaluation breaks since `ma27` is the attribute name in `attrsOf (submodule {})`, but not a part of the option tree and therefore breaks with the following errors: ``` error: At 'ma27' in path 'users.users.ma27': Attribute not found An error occurred while looking for attribute names. Are you sure that 'users.users.ma27' exists? ``` This happens since the option evaluator expects that either the option exists or the option is a submodule and the "next" token in the attribute path points to an option (e.g. `users.users.ma27.createHome`). This patch checks in the `Attribute not found` condition if the attribute-path actually exists in the config tree. If that's true, a dummy-attrset is created which contains `{_type = "__nixos-option-submodule-attr";}`, in that case, the entire entry of the submodule will be displayed. --- .../tools/nixos-option/nixos-option.cc | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/nixos/modules/installer/tools/nixos-option/nixos-option.cc index 9b92dc829cd..89f9c88be96 100644 --- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc +++ b/nixos/modules/installer/tools/nixos-option/nixos-option.cc @@ -106,13 +106,14 @@ struct Context { Context(EvalState & state, Bindings & autoArgs, Value optionsRoot, Value configRoot) : state(state), autoArgs(autoArgs), optionsRoot(optionsRoot), configRoot(configRoot), - underscoreType(state.symbols.create("_type")) + underscoreType(state.symbols.create("_type")), submoduleAttr(state.symbols.create("__nixos-option-submodule-attr")) {} EvalState & state; Bindings & autoArgs; Value optionsRoot; Value configRoot; Symbol underscoreType; + Symbol submoduleAttr; }; Value evaluateValue(Context & ctx, Value & v) @@ -126,26 +127,31 @@ Value evaluateValue(Context & ctx, Value & v) return called; } -bool isOption(Context & ctx, const Value & v) +bool isType(Context & ctx, const Value & v, const std::string & type) { if (v.type != tAttrs) { return false; } - const auto & atualType = v.attrs->find(ctx.underscoreType); - if (atualType == v.attrs->end()) { + const auto & actualType = v.attrs->find(ctx.underscoreType); + if (actualType == v.attrs->end()) { return false; } try { - Value evaluatedType = evaluateValue(ctx, *atualType->value); + Value evaluatedType = evaluateValue(ctx, *actualType->value); if (evaluatedType.type != tString) { return false; } - return static_cast(evaluatedType.string.s) == "option"; + return static_cast(evaluatedType.string.s) == type; } catch (Error &) { return false; } } +bool isOption(Context & ctx, const Value & v) +{ + return isType(ctx, v, "option"); +} + // Add quotes to a component of a path. // These are needed for paths like: // fileSystems."/".fsType @@ -519,11 +525,24 @@ Value findAlongOptionPath(Context & ctx, const std::string & path) } else if (v.type != tAttrs) { throw OptionPathError("Value is %s while a set was expected", showType(v)); } else { - const auto & next = v.attrs->find(ctx.state.symbols.create(attr)); + auto symbol = ctx.state.symbols.create(attr); + const auto & next = v.attrs->find(symbol); if (next == v.attrs->end()) { + try { + const auto & value = findAlongAttrPath(ctx.state, path, ctx.autoArgs, ctx.configRoot); + Value &dummyOpt = *ctx.state.allocValue(); + ctx.state.mkAttrs(dummyOpt, 1); + Value *type = ctx.state.allocAttr(dummyOpt, ctx.state.symbols.create("_type")); + nix::mkString(*type, ctx.submoduleAttr); + v = dummyOpt; + break; + } catch (Error & e) { + // do nothing + } throw OptionPathError("Attribute not found", attr, path); + } else { + v = *next->value; } - v = *next->value; } } catch (OptionPathError & e) { throw OptionPathError("At '%s' in path '%s': %s", attr, path, e.msg()); @@ -537,7 +556,9 @@ void printOne(Context & ctx, Out & out, const std::string & path) try { Value option = findAlongOptionPath(ctx, path); option = evaluateValue(ctx, option); - if (isOption(ctx, option)) { + if (isType(ctx, option, ctx.submoduleAttr)) { + printAttr(ctx, out, path, ctx.configRoot); + } else if (isOption(ctx, option)) { printOption(ctx, out, path, option); } else { printListing(out, option); From 09ac7cb55ff97dcef07d9ddd37ccb08be2a8dad1 Mon Sep 17 00:00:00 2001 From: Chuck Date: Thu, 12 Dec 2019 09:39:09 -0800 Subject: [PATCH 005/241] nixos/nixos-option: Show values inside aggregate options uniformly 1. This makes aggregates of submodules (including the very important "nixos-option users.users." case) behave the same way as any other you-need-to-keep-typing-to-get-to-an-option-leaf (eg: "nixos-option environment"). Before e0780c5: $ nixos-option users.users.root error: At 'root' in path 'users.users.root': Attribute not found An error occurred while looking for attribute names. Are you sure that 'users.users.root' exists? After e0780c5 but before this change, this query just printed out a raw thing, which is behavior that belongs in "nix eval", "nix-instantiate --eval", or "nix repl <<<": $ nixos-option users.users.root { _module = { args = { name = "root"; }; check = true; }; createHome = false; cryptHomeLuks = null; description = "System administrator"; ... After this change: $ nixos-option users.users.root This attribute set contains: createHome cryptHomeLuks description extraGroups group hashedPassword ... 2. For aggregates of other types (not submodules), print out the option that contains them rather than printing an error message. Before: $ nixos-option environment.shellAliases.l error: At 'l' in path 'environment.shellAliases.l': Attribute not found An error occurred while looking for attribute names. Are you sure that 'environment.shellAliases.l' exists? After: $ nixos-option environment.shellAliases.l Note: showing environment.shellAliases instead of environment.shellAliases.l Value: { l = "ls -alh"; ll = "ls -l"; ls = "ls --color=tty"; } ... --- .../tools/nixos-option/nixos-option.cc | 68 +++++++++---------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/nixos/modules/installer/tools/nixos-option/nixos-option.cc index 89f9c88be96..5aa3c766d10 100644 --- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc +++ b/nixos/modules/installer/tools/nixos-option/nixos-option.cc @@ -106,14 +106,13 @@ struct Context { Context(EvalState & state, Bindings & autoArgs, Value optionsRoot, Value configRoot) : state(state), autoArgs(autoArgs), optionsRoot(optionsRoot), configRoot(configRoot), - underscoreType(state.symbols.create("_type")), submoduleAttr(state.symbols.create("__nixos-option-submodule-attr")) + underscoreType(state.symbols.create("_type")) {} EvalState & state; Bindings & autoArgs; Value optionsRoot; Value configRoot; Symbol underscoreType; - Symbol submoduleAttr; }; Value evaluateValue(Context & ctx, Value & v) @@ -127,7 +126,7 @@ Value evaluateValue(Context & ctx, Value & v) return called; } -bool isType(Context & ctx, const Value & v, const std::string & type) +bool isOption(Context & ctx, const Value & v) { if (v.type != tAttrs) { return false; @@ -141,17 +140,12 @@ bool isType(Context & ctx, const Value & v, const std::string & type) if (evaluatedType.type != tString) { return false; } - return static_cast(evaluatedType.string.s) == type; + return static_cast(evaluatedType.string.s) == "option"; } catch (Error &) { return false; } } -bool isOption(Context & ctx, const Value & v) -{ - return isType(ctx, v, "option"); -} - // Add quotes to a component of a path. // These are needed for paths like: // fileSystems."/".fsType @@ -300,9 +294,11 @@ void printAttrs(Context & ctx, Out & out, Value & v, const std::string & path) Out attrsOut(out, "{", "}", v.attrs->size()); for (const auto & a : v.attrs->lexicographicOrder()) { std::string name = a->name; - attrsOut << name << " = "; - printValue(ctx, attrsOut, *a->value, appendPath(path, name)); - attrsOut << ";" << Out::sep; + if (!forbiddenRecursionName(name)) { + attrsOut << name << " = "; + printValue(ctx, attrsOut, *a->value, appendPath(path, name)); + attrsOut << ";" << Out::sep; + } } } @@ -503,10 +499,16 @@ Value getSubOptions(Context & ctx, Value & option) // Carefully walk an option path, looking for sub-options when a path walks past // an option value. -Value findAlongOptionPath(Context & ctx, const std::string & path) +struct FindAlongOptionPathRet +{ + Value option; + std::string path; +}; +FindAlongOptionPathRet findAlongOptionPath(Context & ctx, const std::string & path) { Strings tokens = parseAttrPath(path); Value v = ctx.optionsRoot; + std::string processedPath; for (auto i = tokens.begin(); i != tokens.end(); i++) { const auto & attr = *i; try { @@ -518,48 +520,42 @@ Value findAlongOptionPath(Context & ctx, const std::string & path) if (isOption(ctx, v) && optionTypeIs(ctx, v, "submodule")) { v = getSubOptions(ctx, v); } - if (isOption(ctx, v) && isAggregateOptionType(ctx, v) && !lastAttribute) { - v = getSubOptions(ctx, v); + if (isOption(ctx, v) && isAggregateOptionType(ctx, v)) { + auto subOptions = getSubOptions(ctx, v); + if (lastAttribute && subOptions.attrs->empty()) { + break; + } + v = subOptions; // Note that we've consumed attr, but didn't actually use it. This is the path component that's looked // up in the list or attribute set that doesn't name an option -- the "root" in "users.users.root.name". } else if (v.type != tAttrs) { throw OptionPathError("Value is %s while a set was expected", showType(v)); } else { - auto symbol = ctx.state.symbols.create(attr); - const auto & next = v.attrs->find(symbol); + const auto & next = v.attrs->find(ctx.state.symbols.create(attr)); if (next == v.attrs->end()) { - try { - const auto & value = findAlongAttrPath(ctx.state, path, ctx.autoArgs, ctx.configRoot); - Value &dummyOpt = *ctx.state.allocValue(); - ctx.state.mkAttrs(dummyOpt, 1); - Value *type = ctx.state.allocAttr(dummyOpt, ctx.state.symbols.create("_type")); - nix::mkString(*type, ctx.submoduleAttr); - v = dummyOpt; - break; - } catch (Error & e) { - // do nothing - } throw OptionPathError("Attribute not found", attr, path); - } else { - v = *next->value; } + v = *next->value; } + processedPath = appendPath(processedPath, attr); } catch (OptionPathError & e) { throw OptionPathError("At '%s' in path '%s': %s", attr, path, e.msg()); } } - return v; + return {v, processedPath}; } void printOne(Context & ctx, Out & out, const std::string & path) { try { - Value option = findAlongOptionPath(ctx, path); + auto result = findAlongOptionPath(ctx, path); + Value & option = result.option; option = evaluateValue(ctx, option); - if (isType(ctx, option, ctx.submoduleAttr)) { - printAttr(ctx, out, path, ctx.configRoot); - } else if (isOption(ctx, option)) { - printOption(ctx, out, path, option); + if (path != result.path) { + out << "Note: showing " << result.path << " instead of " << path << "\n"; + } + if (isOption(ctx, option)) { + printOption(ctx, out, result.path, option); } else { printListing(out, option); } From 9dd23e87430bb77023d32dcfd374e6b68b0de56c Mon Sep 17 00:00:00 2001 From: Chuck Date: Tue, 17 Dec 2019 11:08:24 -0800 Subject: [PATCH 006/241] nixos/nixos-option: Refactor: Move functions around --- .../tools/nixos-option/nixos-option.cc | 186 +++++++++--------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/nixos/modules/installer/tools/nixos-option/nixos-option.cc index 5aa3c766d10..a5c0b65baeb 100644 --- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc +++ b/nixos/modules/installer/tools/nixos-option/nixos-option.cc @@ -197,6 +197,99 @@ void recurse(const std::functionfind(ctx.state.sType); + if (typeLookup == v.attrs->end()) { + return false; + } + Value type = evaluateValue(ctx, *typeLookup->value); + if (type.type != tAttrs) { + return false; + } + const auto & nameLookup = type.attrs->find(ctx.state.sName); + if (nameLookup == type.attrs->end()) { + return false; + } + Value name = evaluateValue(ctx, *nameLookup->value); + if (name.type != tString) { + return false; + } + return name.string.s == soughtType; + } catch (Error &) { + return false; + } +} + +bool isAggregateOptionType(Context & ctx, Value & v) +{ + return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf") || optionTypeIs(ctx, v, "loaOf"); +} + +MakeError(OptionPathError, EvalError); + +Value getSubOptions(Context & ctx, Value & option) +{ + Value getSubOptions = evaluateValue(ctx, *findAlongAttrPath(ctx.state, "type.getSubOptions", ctx.autoArgs, option)); + if (getSubOptions.type != tLambda) { + throw OptionPathError("Option's type.getSubOptions isn't a function"); + } + Value emptyString{}; + nix::mkString(emptyString, ""); + Value v; + ctx.state.callFunction(getSubOptions, emptyString, v, nix::Pos{}); + return v; +} + +// Carefully walk an option path, looking for sub-options when a path walks past +// an option value. +struct FindAlongOptionPathRet +{ + Value option; + std::string path; +}; +FindAlongOptionPathRet findAlongOptionPath(Context & ctx, const std::string & path) +{ + Strings tokens = parseAttrPath(path); + Value v = ctx.optionsRoot; + std::string processedPath; + for (auto i = tokens.begin(); i != tokens.end(); i++) { + const auto & attr = *i; + try { + bool lastAttribute = std::next(i) == tokens.end(); + v = evaluateValue(ctx, v); + if (attr.empty()) { + throw OptionPathError("empty attribute name"); + } + if (isOption(ctx, v) && optionTypeIs(ctx, v, "submodule")) { + v = getSubOptions(ctx, v); + } + if (isOption(ctx, v) && isAggregateOptionType(ctx, v)) { + auto subOptions = getSubOptions(ctx, v); + if (lastAttribute && subOptions.attrs->empty()) { + break; + } + v = subOptions; + // Note that we've consumed attr, but didn't actually use it. This is the path component that's looked + // up in the list or attribute set that doesn't name an option -- the "root" in "users.users.root.name". + } else if (v.type != tAttrs) { + throw OptionPathError("Value is %s while a set was expected", showType(v)); + } else { + const auto & next = v.attrs->find(ctx.state.symbols.create(attr)); + if (next == v.attrs->end()) { + throw OptionPathError("Attribute not found", attr, path); + } + v = *next->value; + } + processedPath = appendPath(processedPath, attr); + } catch (OptionPathError & e) { + throw OptionPathError("At '%s' in path '%s': %s", attr, path, e.msg()); + } + } + return {v, processedPath}; +} + // Calls f on all the option names void mapOptions(const std::function & f, Context & ctx, Value root) { @@ -452,99 +545,6 @@ void printListing(Out & out, Value & v) } } -bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType) -{ - try { - const auto & typeLookup = v.attrs->find(ctx.state.sType); - if (typeLookup == v.attrs->end()) { - return false; - } - Value type = evaluateValue(ctx, *typeLookup->value); - if (type.type != tAttrs) { - return false; - } - const auto & nameLookup = type.attrs->find(ctx.state.sName); - if (nameLookup == type.attrs->end()) { - return false; - } - Value name = evaluateValue(ctx, *nameLookup->value); - if (name.type != tString) { - return false; - } - return name.string.s == soughtType; - } catch (Error &) { - return false; - } -} - -bool isAggregateOptionType(Context & ctx, Value & v) -{ - return optionTypeIs(ctx, v, "attrsOf") || optionTypeIs(ctx, v, "listOf") || optionTypeIs(ctx, v, "loaOf"); -} - -MakeError(OptionPathError, EvalError); - -Value getSubOptions(Context & ctx, Value & option) -{ - Value getSubOptions = evaluateValue(ctx, *findAlongAttrPath(ctx.state, "type.getSubOptions", ctx.autoArgs, option)); - if (getSubOptions.type != tLambda) { - throw OptionPathError("Option's type.getSubOptions isn't a function"); - } - Value emptyString{}; - nix::mkString(emptyString, ""); - Value v; - ctx.state.callFunction(getSubOptions, emptyString, v, nix::Pos{}); - return v; -} - -// Carefully walk an option path, looking for sub-options when a path walks past -// an option value. -struct FindAlongOptionPathRet -{ - Value option; - std::string path; -}; -FindAlongOptionPathRet findAlongOptionPath(Context & ctx, const std::string & path) -{ - Strings tokens = parseAttrPath(path); - Value v = ctx.optionsRoot; - std::string processedPath; - for (auto i = tokens.begin(); i != tokens.end(); i++) { - const auto & attr = *i; - try { - bool lastAttribute = std::next(i) == tokens.end(); - v = evaluateValue(ctx, v); - if (attr.empty()) { - throw OptionPathError("empty attribute name"); - } - if (isOption(ctx, v) && optionTypeIs(ctx, v, "submodule")) { - v = getSubOptions(ctx, v); - } - if (isOption(ctx, v) && isAggregateOptionType(ctx, v)) { - auto subOptions = getSubOptions(ctx, v); - if (lastAttribute && subOptions.attrs->empty()) { - break; - } - v = subOptions; - // Note that we've consumed attr, but didn't actually use it. This is the path component that's looked - // up in the list or attribute set that doesn't name an option -- the "root" in "users.users.root.name". - } else if (v.type != tAttrs) { - throw OptionPathError("Value is %s while a set was expected", showType(v)); - } else { - const auto & next = v.attrs->find(ctx.state.symbols.create(attr)); - if (next == v.attrs->end()) { - throw OptionPathError("Attribute not found", attr, path); - } - v = *next->value; - } - processedPath = appendPath(processedPath, attr); - } catch (OptionPathError & e) { - throw OptionPathError("At '%s' in path '%s': %s", attr, path, e.msg()); - } - } - return {v, processedPath}; -} - void printOne(Context & ctx, Out & out, const std::string & path) { try { From ed51fd0033b5d5e2ad40cca02cc9864db845b586 Mon Sep 17 00:00:00 2001 From: Chuck Date: Tue, 17 Dec 2019 12:08:07 -0800 Subject: [PATCH 007/241] nixos/nixos-option: Convert --all into -r --- nixos/doc/manual/man-nixos-option.xml | 27 +++++----- nixos/doc/manual/release-notes/rl-2003.xml | 2 +- .../tools/nixos-option/nixos-option.cc | 54 +++++++++++-------- 3 files changed, 47 insertions(+), 36 deletions(-) diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index beabf020c92..0c6a6950a05 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -14,12 +14,16 @@ nixos-option + - path + + + + - + path @@ -45,6 +49,15 @@ This command accepts the following options: + + + + + + Print all the values at or below the specified path recursively. + + + path @@ -56,16 +69,6 @@ - - - - - - - Print the values of all options. - - - diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index b8af15f59c9..417b8524ab8 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -52,7 +52,7 @@ nixos-option has been rewritten in C++, speeding it up, improving correctness, - and adding a option which prints all options and their values. + and adding a option which prints all options and their values recursively. diff --git a/nixos/modules/installer/tools/nixos-option/nixos-option.cc b/nixos/modules/installer/tools/nixos-option/nixos-option.cc index a5c0b65baeb..1a7b07a74f8 100644 --- a/nixos/modules/installer/tools/nixos-option/nixos-option.cc +++ b/nixos/modules/installer/tools/nixos-option/nixos-option.cc @@ -290,9 +290,14 @@ FindAlongOptionPathRet findAlongOptionPath(Context & ctx, const std::string & pa return {v, processedPath}; } -// Calls f on all the option names -void mapOptions(const std::function & f, Context & ctx, Value root) +// Calls f on all the option names at or below the option described by `path`. +// Note that "the option described by `path`" is not trivial -- if path describes a value inside an aggregate +// option (such as users.users.root), the *option* described by that path is one path component shorter +// (eg: users.users), which results in f being called on sibling-paths (eg: users.users.nixbld1). If f +// doesn't want these, it must do its own filtering. +void mapOptions(const std::function & f, Context & ctx, const std::string & path) { + auto root = findAlongOptionPath(ctx, path); recurse( [f, &ctx](const std::string & path, std::variant v) { bool isOpt = std::holds_alternative(v) || isOption(ctx, std::get(v)); @@ -301,7 +306,7 @@ void mapOptions(const std::function & f, Context } return !isOpt; }, - ctx, root, ""); + ctx, root.option, root.path); } // Calls f on all the config values inside one option. @@ -475,17 +480,26 @@ void printConfigValue(Context & ctx, Out & out, const std::string & path, std::v out << ";\n"; } -void printAll(Context & ctx, Out & out) +// Replace with std::starts_with when C++20 is available +bool starts_with(const std::string & s, const std::string & prefix) +{ + return s.size() >= prefix.size() && + std::equal(s.begin(), std::next(s.begin(), prefix.size()), prefix.begin(), prefix.end()); +} + +void printRecursive(Context & ctx, Out & out, const std::string & path) { mapOptions( - [&ctx, &out](const std::string & optionPath) { + [&ctx, &out, &path](const std::string & optionPath) { mapConfigValuesInOption( - [&ctx, &out](const std::string & configPath, std::variant v) { - printConfigValue(ctx, out, configPath, v); + [&ctx, &out, &path](const std::string & configPath, std::variant v) { + if (starts_with(configPath, path)) { + printConfigValue(ctx, out, configPath, v); + } }, optionPath, ctx); }, - ctx, ctx.optionsRoot); + ctx, path); } void printAttr(Context & ctx, Out & out, const std::string & path, Value & root) @@ -569,7 +583,7 @@ void printOne(Context & ctx, Out & out, const std::string & path) int main(int argc, char ** argv) { - bool all = false; + bool recursive = false; std::string path = "."; std::string optionsExpr = "(import {}).options"; std::string configExpr = "(import {}).config"; @@ -585,8 +599,8 @@ int main(int argc, char ** argv) nix::showManPage("nixos-option"); } else if (*arg == "--version") { nix::printVersion("nixos-option"); - } else if (*arg == "--all") { - all = true; + } else if (*arg == "-r" || *arg == "--recursive") { + recursive = true; } else if (*arg == "--path") { path = nix::getArg(*arg, arg, end); } else if (*arg == "--options_expr") { @@ -615,18 +629,12 @@ int main(int argc, char ** argv) Context ctx{*state, *myArgs.getAutoArgs(*state), optionsRoot, configRoot}; Out out(std::cout); - if (all) { - if (!args.empty()) { - throw UsageError("--all cannot be used with arguments"); - } - printAll(ctx, out); - } else { - if (args.empty()) { - printOne(ctx, out, ""); - } - for (const auto & arg : args) { - printOne(ctx, out, arg); - } + auto print = recursive ? printRecursive : printOne; + if (args.empty()) { + print(ctx, out, ""); + } + for (const auto & arg : args) { + print(ctx, out, arg); } ctx.state.printStats(); From ad339ad44552fe42b4b3e6178f5103259ca4424a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 27 Dec 2019 01:23:45 +0100 Subject: [PATCH 008/241] nixosTests.graphite: port to python. The test did not succeed for me before this commit because the dependencies fail their tests (see added comment). --- nixos/tests/graphite.nix | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 27a87bdbb9f..ba3c73bb878 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -1,6 +1,11 @@ -import ./make-test.nix ({ pkgs, ... } : +import ./make-test-python.nix ({ pkgs, ... } : { name = "graphite"; + meta = { + # Fails on dependency `python-2.7-Twisted`'s test suite + # complaining `ImportError: No module named zope.interface`. + broken = true; + }; nodes = { one = { ... }: { @@ -22,20 +27,20 @@ import ./make-test.nix ({ pkgs, ... } : }; testScript = '' - startAll; - $one->waitForUnit("default.target"); - $one->waitForUnit("graphiteWeb.service"); - $one->waitForUnit("graphiteApi.service"); - $one->waitForUnit("graphitePager.service"); - $one->waitForUnit("graphite-beacon.service"); - $one->waitForUnit("carbonCache.service"); - $one->waitForUnit("seyren.service"); + start_all() + one.wait_for_unit("default.target") + one.wait_for_unit("graphiteWeb.service") + one.wait_for_unit("graphiteApi.service") + one.wait_for_unit("graphitePager.service") + one.wait_for_unit("graphite-beacon.service") + one.wait_for_unit("carbonCache.service") + one.wait_for_unit("seyren.service") # The services above are of type "simple". systemd considers them active immediately # even if they're still in preStart (which takes quite long for graphiteWeb). # Wait for ports to open so we're sure the services are up and listening. - $one->waitForOpenPort(8080); - $one->waitForOpenPort(2003); - $one->succeed("echo \"foo 1 `date +%s`\" | nc -N localhost 2003"); - $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"); + one.wait_for_open_port(8080) + one.wait_for_open_port(2003) + one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003') + one.wait_until_succeeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2") ''; }) From 562facfb81267f012bfa3301238bfdd970e6d233 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Fri, 27 Dec 2019 21:49:32 +0100 Subject: [PATCH 009/241] squeezelite: Fix codec libraries loading by using a wrapper Fix args declaration --- pkgs/applications/audio/squeezelite/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 3184f89ced9..4648c9b5ab3 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }: +{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, makeWrapper, mpg123 }: -stdenv.mkDerivation { +let + runtimeDeps = [ faad2 flac libmad libvorbis mpg123 ]; + rpath = stdenv.lib.makeLibraryPath runtimeDeps; +in stdenv.mkDerivation { name = "squeezelite-git-2018-08-14"; src = fetchFromGitHub { @@ -10,7 +13,8 @@ stdenv.mkDerivation { sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh"; }; - buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ]; + buildInputs = [ alsaLib ] ++ runtimeDeps; + nativeBuildInputs = [ makeWrapper ]; enableParallelBuilding = true; @@ -20,6 +24,7 @@ stdenv.mkDerivation { install -Dm755 -t $out/bin squeezelite install -Dm644 -t $out/share/doc/squeezelite *.txt *.md + wrapProgram $out/bin/squeezelite --set LD_LIBRARY_PATH $RPATH runHook postInstall ''; @@ -29,4 +34,5 @@ stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.linux; }; + RPATH = rpath; } From f5728ad5e7542f382b008b1b3eec331d5d7471ee Mon Sep 17 00:00:00 2001 From: jakobrs Date: Thu, 2 Jan 2020 21:48:06 +0100 Subject: [PATCH 010/241] os-prober: add missing lvm2 dependency Otherwise, os-prober may fail to see LVM partitions. --- pkgs/tools/misc/os-prober/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index d68ed9c5cd3..3b5d4934dab 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -5,7 +5,8 @@ grub2, # grub-mount and grub-probe cryptsetup, # cryptsetup libuuid, # blkid and blockdev udev, # udevadm udevinfo -ntfs3g # ntfs3g +ntfs3g, # ntfs3g +lvm2 # lvs }: stdenv.mkDerivation rec { @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g ]} \ + --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; From 4de6c4dac7e39646e6a7c0da7866c64573af1f8a Mon Sep 17 00:00:00 2001 From: jakobrs Date: Fri, 3 Jan 2020 07:31:43 +0100 Subject: [PATCH 011/241] os-prober: add missing dmraid dependency If this is not done, dmraid is likely to not find OSes on RAID. --- pkgs/tools/misc/os-prober/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 3b5d4934dab..c776144a40d 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -6,6 +6,7 @@ cryptsetup, # cryptsetup libuuid, # blkid and blockdev udev, # udevadm udevinfo ntfs3g, # ntfs3g +dmraid, # dmraid lvm2 # lvs }: @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 ]} \ + --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; From 619d52a37ef190017a71b26469ec434f1861c20e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 15 Jan 2020 18:57:27 +0000 Subject: [PATCH 012/241] oraclejdk8: 8u211 -> 8u241 --- .../compilers/oraclejdk/jdk-linux-base.nix | 44 +++++++++---------- .../compilers/oraclejdk/jdk8-linux.nix | 10 +++++ .../compilers/oraclejdk/jdk8cpu-linux.nix | 14 ------ .../compilers/oraclejdk/jdk8psu-linux.nix | 14 ------ pkgs/top-level/all-packages.nix | 12 +---- 5 files changed, 31 insertions(+), 63 deletions(-) create mode 100644 pkgs/development/compilers/oraclejdk/jdk8-linux.nix delete mode 100644 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix delete mode 100644 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index a96e703b28c..bbf1efcf523 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -1,15 +1,13 @@ { productVersion , patchVersion -, buildVersion , sha256 , jceName -, releaseToken , sha256JCE }: { swingSupport ? true , stdenv -, fetchurl +, requireFile , makeWrapper , unzip , file @@ -55,14 +53,14 @@ let x86_64-linux = "amd64"; armv7l-linux = "arm"; aarch64-linux = "aarch64"; - }.${stdenv.hostPlatform.system}; + }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); jce = if installjce then - fetchurl { - url = "http://download.oracle.com/otn-pub/java/jce/${productVersion}/${jceName}"; + requireFile { + name = jceName; + url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"; sha256 = sha256JCE; - curlOpts = "-b oraclelicense=a"; } else ""; @@ -76,25 +74,23 @@ let in -assert sha256 ? ${stdenv.hostPlatform.system}; - let result = stdenv.mkDerivation rec { - name = - if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}"; + pname = if installjdk then "oraclejdk" else "oraclejre"; + version = "${productVersion}u${patchVersion}"; - src = let - platformName = { - i686-linux = "linux-i586"; - x86_64-linux = "linux-x64"; - armv7l-linux = "linux-arm32-vfp-hflt"; - aarch64-linux = "linux-arm64-vfp-hflt"; - }.${stdenv.hostPlatform.system}; - javadlPlatformName = "linux-i586"; - in fetchurl { - url = "http://javadl.oracle.com/webapps/download/GetFile/1.${productVersion}.0_${patchVersion}-b${buildVersion}/${releaseToken}/${javadlPlatformName}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; - curlOpts = "-b oraclelicense=a"; - sha256 = sha256.${stdenv.hostPlatform.system}; - }; + src = + let + platformName = { + i686-linux = "linux-i586"; + x86_64-linux = "linux-x64"; + armv7l-linux = "linux-arm32-vfp-hflt"; + aarch64-linux = "linux-arm64-vfp-hflt"; + }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + in requireFile { + name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; + url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"; + sha256 = sha256.${stdenv.hostPlatform.system}; + }; nativeBuildInputs = [ file ] ++ stdenv.lib.optional installjce unzip; diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix new file mode 100644 index 00000000000..ed313a9d00e --- /dev/null +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -0,0 +1,10 @@ +import ./jdk-linux-base.nix { + productVersion = "8"; + patchVersion = "241"; + sha256.i686-linux = "1niiwifby8zqvsh0ccdf3n21vlqfvvms223dc3kw2c2rksch3yg4"; + sha256.x86_64-linux = "1jz8d6663jspxgw8yxxx5ca6jaa3g67dbbi5d83pdxjmg1kk57a1"; + sha256.armv7l-linux = "1pjzyi1qd4nzfwvh0z5fpwga7j8mksiv5h8wzirv2ccdyy4wqw24"; + sha256.aarch64-linux = "1zliv4a0ygrsdpq36b89yl7jf7kidmxqbnp1sk2661y471x02p9l"; + jceName = "jce_policy-8.zip"; + sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; +} diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix deleted file mode 100644 index d9ee5010f7c..00000000000 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ /dev/null @@ -1,14 +0,0 @@ -# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; -# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; -import ./jdk-linux-base.nix { - productVersion = "8"; - patchVersion = "211"; - buildVersion = "12"; - sha256.i686-linux = "0mdrljs0rw9s4pvaa3sn791nqgdrp8749z3qn80y7hhad74kvsnp"; - sha256.x86_64-linux = "13b6qk4sn8jdhxa22na9d2aazm4yjh6yxrlxr189gxy3619y9dy0"; - sha256.armv7l-linux = "1ij1x925k7lyp5f98gy8r0xfr41qhczf2rb74plwwmrccc1k00p5"; - sha256.aarch64-linux = "041r615qj9qy34a9gxm8968qlmf060ba2as5w97v86mbik4rca05"; - releaseToken = "478a62b7d4e34b78b671c754eaaf38ab"; - jceName = "jce_policy-8.zip"; - sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; -} diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix deleted file mode 100644 index 9fab02ab536..00000000000 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ /dev/null @@ -1,14 +0,0 @@ -# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; -# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; -import ./jdk-linux-base.nix { - productVersion = "8"; - patchVersion = "212"; - buildVersion = "10"; - sha256.i686-linux = "03dj9q0bi3ib731f4zl9hylkrgw417h6qlg2wi7nw71b0fqhijn1"; - sha256.x86_64-linux = "1yzddxzfh6h14bpzis1abp52x4jjljg8a3zyqz483q6qm05caq1i"; - sha256.armv7l-linux = "0x333alkqdx8mmiirair7g5iiwif5v9ka4j3qr0f42ilvmk8csnx"; - sha256.aarch64-linux = "0vcbdvcsl8rm47i07s93jmrrs5laibf937d8vacjqqgh9bbhsr2c"; - releaseToken = "59066701cf1a433da9770636fbc4c9aa"; - jceName = "jce_policy-8.zip"; - sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 245abf731dd..587a1ec3d7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8398,14 +8398,10 @@ in oraclejdk8 = pkgs.oraclejdk8distro true false; - oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; - oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); - oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); - jrePlugin = jre8Plugin; jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); @@ -8414,13 +8410,7 @@ in oraclejdk8distro = installjdk: pluginSupport: (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { - inherit installjdk pluginSupport; - }); - - oraclejdk8psu_distro = installjdk: pluginSupport: - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk pluginSupport; }); From 2bd296a7e9551fcc74330460d6bf47810a8f9555 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 18 Apr 2019 19:35:51 +0000 Subject: [PATCH 013/241] runInLinuxVM, test-driver: pass host's cpu type to guest vm 'kvm64' is the most generic CPU, which does not support SSE4.2, AVX and other ISA extentions. --- nixos/lib/qemu-flags.nix | 4 ++-- nixos/tests/installer.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index 774f66b4804..859d9e975fe 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -17,9 +17,9 @@ in else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu host"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; - x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu kvm64"; + x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu host"; }.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm"; } diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index eb1f4f192dd..024445b01b6 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -74,7 +74,7 @@ let # FIXME don't duplicate the -enable-kvm etc. flags here yet again! qemuFlags = (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + - (optionalString (system == "x86_64-linux") "-cpu kvm64 ") + + (optionalString (system == "x86_64-linux") "-cpu host ") + (optionalString (system == "aarch64-linux") "-enable-kvm -machine virt,gic-version=host -cpu host "); hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", '' From b2a7d4739e7be3c553c5bc7c9b51b6b974a8918b Mon Sep 17 00:00:00 2001 From: Jason Heard Date: Wed, 15 Jan 2020 17:06:59 -0700 Subject: [PATCH 014/241] quodlibet: fix tests - Add XDG_ICONS_DIRS to XDG_DATA_DIRS so tests can see icons. - Skip quality tests and remove their dependencies. - Add gdk-pixbuf to checkInputs to fix a test that uses SVGs. --- pkgs/applications/audio/quodlibet/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 573dca518e3..4dfa3c0e654 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext ]; - checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; + checkInputs = [ gdk-pixbuf ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]); buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; @@ -35,11 +35,11 @@ python3.pkgs.buildPythonApplication rec { checkPhase = '' runHook preCheck - env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \ + env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" \ HOME=$(mktemp -d) \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - py.test${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"} + py.test ${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"} --ignore=tests/quality runHook postCheck ''; @@ -65,6 +65,5 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; - broken = true; }; } From a185bb25831aea3102b0257094978e2cc57a1287 Mon Sep 17 00:00:00 2001 From: Jason Heard Date: Fri, 17 Jan 2020 16:33:37 -0700 Subject: [PATCH 015/241] quodlibet: exclude test - Excluded test_operon.py as it fails on ArchLinux for @sauyon. --- pkgs/applications/audio/quodlibet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 4dfa3c0e654..533c4b2f50f 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { HOME=$(mktemp -d) \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - py.test ${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"} --ignore=tests/quality + py.test ${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"} --ignore=tests/quality --ignore=tests/test_operon.py runHook postCheck ''; From 00a8de028e93ffc3a2b4bab0c90da3a9d1c62669 Mon Sep 17 00:00:00 2001 From: Jason Heard Date: Sat, 18 Jan 2020 10:35:11 -0700 Subject: [PATCH 016/241] quodlibet: improve formatting and add comments --- pkgs/applications/audio/quodlibet/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 533c4b2f50f..597cf68f4d0 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -33,13 +33,23 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; + pytestFlags = stdenv.lib.optionals (xineBackend || !withGstPlugins) [ + "--ignore=tests/plugin/test_replaygain.py" + ] ++ [ + # upstream does actually not enforce source code linting + "--ignore=tests/quality" + # build failure on Arch Linux + # https://github.com/NixOS/nixpkgs/pull/77796#issuecomment-575841355 + "--ignore=tests/test_operon.py" + ]; + checkPhase = '' runHook preCheck env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" \ HOME=$(mktemp -d) \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - py.test ${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"} --ignore=tests/quality --ignore=tests/test_operon.py + py.test $pytestFlags runHook postCheck ''; From b6a9211bf4287aa6fdd505784a1cacc51cae0da5 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 17 Jan 2020 20:03:03 +0100 Subject: [PATCH 017/241] dockerTools.*: Assertion against building for darwin Building a docker image with darwin binaries just yields a confusing error when ran: standard_init_linux.go:211: exec user process caused "exec format error" This change prevents people from building such images in the first place --- pkgs/build-support/docker/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 3fcae13e20d..c9457800ad2 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -589,6 +589,8 @@ rec { if tag == null then lib.head (lib.splitString "-" (lib.last (lib.splitString "/" result))) else lib.toLower tag; + # Docker can't be made to run darwin binaries + meta.badPlatforms = lib.platforms.darwin; } '' ${if (tag == null) then '' outName="$(basename "$out")" @@ -719,6 +721,8 @@ rec { layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; passthru.layer = layer; + # Docker can't be made to run darwin binaries + meta.badPlatforms = lib.platforms.darwin; } '' ${lib.optionalString (tag == null) '' outName="$(basename "$out")" From 28a287887ab6eb5bfc8f6bd574a24806db3e3221 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Mon, 20 Jan 2020 20:02:14 +0100 Subject: [PATCH 018/241] pdfpc: Fix gstreamer video playback issue #73321 --- pkgs/applications/misc/pdfpc/default.nix | 13 ++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index a44cccf9a9d..fa500989cac 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection, wrapGAppsHook }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -19,8 +19,15 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook ]; - buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler - libpthreadstubs librsvg pcre ]; + + buildInputs = [ + gtk3 libgee poppler + libpthreadstubs librsvg pcre + gstreamer + gst-plugins-base + (gst-plugins-good.override { gtkSupport = true; }) + gst-libav + ]; cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee74eb17f31..e8e735e4d73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20790,7 +20790,7 @@ in pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; peek = callPackage ../applications/video/peek { }; From 8dbe99686094495c08924f93a10e695c62c2abc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 22 Jan 2020 03:12:23 +0000 Subject: [PATCH 019/241] mercurial: 5.2.1 -> 5.2.2 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 792e647324a..6b9ada0ebb0 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q"; + sha256 = "0fy00q0k4f0q64jjlnb7cl6m0sglivq9jgdddsp5sywc913zzigz"; }; format = "other"; From 2bf75af84a3c28f5f363b6e1b1702b49f782f249 Mon Sep 17 00:00:00 2001 From: Robert Iannucci Date: Wed, 22 Jan 2020 17:14:52 -0800 Subject: [PATCH 020/241] pyenchant: Fix for darwin/macOS This allows pyenchant to be installable on macOS again, which, in turn, will allow pylint to also be installable. * Switches dependencies to enchant-2 (enchant-1 is not building on macOS). The existing $src (2.0.0) already has compatibility with enchant-2. * Improves patch hack by hijacking the $PYENCHANT_LIBRARY_PATH envvar lookup to explicitly specify the correct library path. --- .../python-modules/pyenchant/default.nix | 23 +++++++++++-------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index cd645a8d89b..f144cf55552 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pkgs +, enchant2 }: buildPythonPackage rec { @@ -13,15 +13,21 @@ buildPythonPackage rec { sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; }; - propagatedBuildInputs = [ pkgs.enchant1 ]; + propagatedBuildInputs = [ enchant2 ]; - patchPhase = let - path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant1}/lib/' + e_path)|"; + postPatch = let + libext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - sed -i "${path_hack_script}" enchant/_enchant.py - - # They hardcode a bad path for Darwin in their library search code - substituteInPlace enchant/_enchant.py --replace '/opt/local/lib/' "" + # Use the $PYENCHANT_LIBRARY_PATH envvar lookup line to hard-code the + # location of the nix enchant-2 library into _enchant.py. + # + # Also, they hardcode a bad path for Darwin in their library search code; + # This code should never be hit, but in case it does, we don't want to have + # it "accidentally" work by pulling something from /opt. + substituteInPlace enchant/_enchant.py \ + --replace 'os.environ.get("PYENCHANT_LIBRARY_PATH")' \ + "'${enchant2}/lib/libenchant-2${libext}'" \ + --replace '/opt/local/lib/' "" ''; # dictionaries needed for tests @@ -31,7 +37,6 @@ buildPythonPackage rec { description = "pyenchant: Python bindings for the Enchant spellchecker"; homepage = https://github.com/pyenchant/pyenchant; license = licenses.lgpl21; - badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f854138ba1..7210810071a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4834,7 +4834,7 @@ in { pyelftools = callPackage ../development/python-modules/pyelftools { }; - pyenchant = callPackage ../development/python-modules/pyenchant { }; + pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; From 93dc12a6d89ed57cf5b88085f4a9e6bd14f57a10 Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Fri, 24 Jan 2020 13:01:43 +0300 Subject: [PATCH 021/241] pythonPackages.glances: fix darwin build --- .../python-modules/glances/default.nix | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix index f248dffb4ff..0a0864e52b6 100644 --- a/pkgs/development/python-modules/glances/default.nix +++ b/pkgs/development/python-modules/glances/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib , psutil, setuptools, bottle, batinfo, pysnmp , hddtemp, future # Optional dependencies: @@ -20,19 +20,38 @@ buildPythonPackage rec { }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): - patches = lib.optional doCheck ./skip-failing-tests.patch - ++ [ (fetchpatch { - # Correct unitest - url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch"; - sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1"; - }) ]; + patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch + ++ [ + (fetchpatch { + # Correct unitest + url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch"; + sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1"; + }) + + (fetchpatch { + # Fix IP plugin initialization issue + url = "https://github.com/nicolargo/glances/commit/48cb5ef8053d823302e7e53490fb22cec2fabb0f.patch"; + sha256 = "1590qgcr8w3d9ddpgd9mk5j6q6aq29341vr8bi202yjwwiv2bia9"; + }) + ]; + + # On Darwin this package segfaults due to mismatch of pure and impure + # CoreFoundation. This issues was solved for binaries but for interpreted + # scripts a workaround below is still required. + # Relevant: https://github.com/NixOS/nixpkgs/issues/24693 + makeWrapperArgs = lib.optionals stdenv.isDarwin [ + "--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks" + ]; doCheck = true; checkInputs = [ unittest2 ]; + preCheck = lib.optional stdenv.isDarwin '' + export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks + ''; - propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp hddtemp future + propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp future netifaces - ]; + ] ++ lib.optional stdenv.isLinux hddtemp; preConfigure = '' sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py; @@ -43,5 +62,6 @@ buildPythonPackage rec { description = "Cross-platform curses-based monitoring tool"; license = licenses.lgpl3; maintainers = with maintainers; [ primeos koral ]; + platforms = platforms.linux ++ platforms.darwin; }; } From bc130855a7d683618157362cb83fdf42caa5cb1a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Jan 2020 16:46:39 +0100 Subject: [PATCH 022/241] nixos/networkd: add `vrfConfig` option to netdevs --- nixos/modules/system/boot/networkd.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 56a9d6b1138..a684238a2ad 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -55,6 +55,11 @@ let (assertMacAddress "MACAddress") ]; + checkVRF = checkUnitConfig "VRF" [ + (assertOnlyFields [ "Table" ]) + (assertMinimum "Table" 0) + ]; + # NOTE The PrivateKey directive is missing on purpose here, please # do not add it to this list. The nix store is world-readable let's # refrain ourselves from providing a footgun. @@ -349,6 +354,21 @@ let ''; }; + vrfConfig = mkOption { + default = {}; + example = { Table = 2342; }; + type = types.addCheck (types.attrsOf unitOption) checkVRF; + description = '' + Each attribute in this set specifies an option in the + [VRF] section of the unit. See + systemd.netdev + 5 for details. + A detailed explanation about how VRFs work can be found in the + kernel + docs. + ''; + }; + wireguardConfig = mkOption { default = {}; example = { @@ -844,6 +864,11 @@ let [Xfrm] ${attrsToSection def.xfrmConfig} + ''} + ${optionalString (def.vrfConfig != { }) '' + [VRF] + ${attrsToSection def.vrfConfig} + ''} ${optionalString (def.wireguardConfig != { }) '' [WireGuard] From a0fd819a4a4a2284bb976ea1b3319d8d1b97132b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Jan 2020 16:46:55 +0100 Subject: [PATCH 023/241] nixos/networkd: add test for VRF configurations --- nixos/tests/all-tests.nix | 1 + nixos/tests/systemd-networkd-vrf.nix | 221 +++++++++++++++++++++++++++ 2 files changed, 222 insertions(+) create mode 100644 nixos/tests/systemd-networkd-vrf.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8c11464f9d6..3a0caf83c8c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -275,6 +275,7 @@ in systemd-analyze = handleTest ./systemd-analyze.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; + systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-networkd-wireguard = handleTest ./systemd-networkd-wireguard.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix new file mode 100644 index 00000000000..5bc824531e8 --- /dev/null +++ b/nixos/tests/systemd-networkd-vrf.nix @@ -0,0 +1,221 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: let + inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; +in { + name = "systemd-networkd-vrf"; + meta.maintainers = with lib.maintainers; [ ma27 ]; + + nodes = { + client = { pkgs, ... }: { + virtualisation.vlans = [ 1 2 ]; + + networking = { + useDHCP = false; + useNetworkd = true; + firewall.checkReversePath = "loose"; + }; + + systemd.network = { + enable = true; + + netdevs."10-vrf1" = { + netdevConfig = { + Kind = "vrf"; + Name = "vrf1"; + MTUBytes = "1300"; + }; + vrfConfig.Table = 23; + }; + netdevs."10-vrf2" = { + netdevConfig = { + Kind = "vrf"; + Name = "vrf2"; + MTUBytes = "1300"; + }; + vrfConfig.Table = 42; + }; + + networks."10-vrf1" = { + matchConfig.Name = "vrf1"; + networkConfig.IPForward = "yes"; + routes = [ + { routeConfig = { Destination = "192.168.1.2"; Metric = "100"; }; } + ]; + }; + networks."10-vrf2" = { + matchConfig.Name = "vrf2"; + networkConfig.IPForward = "yes"; + routes = [ + { routeConfig = { Destination = "192.168.2.3"; Metric = "100"; }; } + ]; + }; + + networks."10-eth1" = { + matchConfig.Name = "eth1"; + linkConfig.RequiredForOnline = "no"; + networkConfig = { + VRF = "vrf1"; + Address = "192.168.1.1"; + IPForward = "yes"; + }; + }; + networks."10-eth2" = { + matchConfig.Name = "eth2"; + linkConfig.RequiredForOnline = "no"; + networkConfig = { + VRF = "vrf2"; + Address = "192.168.2.1"; + IPForward = "yes"; + }; + }; + }; + }; + + node1 = { pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + networking = { + useDHCP = false; + useNetworkd = true; + }; + + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; + + systemd.network = { + enable = true; + + networks."10-eth1" = { + matchConfig.Name = "eth1"; + linkConfig.RequiredForOnline = "no"; + networkConfig = { + Address = "192.168.1.2"; + IPForward = "yes"; + }; + }; + }; + }; + + node2 = { pkgs, ... }: { + virtualisation.vlans = [ 2 ]; + networking = { + useDHCP = false; + useNetworkd = true; + }; + + systemd.network = { + enable = true; + + networks."10-eth2" = { + matchConfig.Name = "eth2"; + linkConfig.RequiredForOnline = "no"; + networkConfig = { + Address = "192.168.2.3"; + IPForward = "yes"; + }; + }; + }; + }; + + node3 = { pkgs, ... }: { + virtualisation.vlans = [ 2 ]; + networking = { + useDHCP = false; + useNetworkd = true; + }; + + systemd.network = { + enable = true; + + networks."10-eth2" = { + matchConfig.Name = "eth2"; + linkConfig.RequiredForOnline = "no"; + networkConfig = { + Address = "192.168.2.4"; + IPForward = "yes"; + }; + }; + }; + }; + }; + + testScript = '' + def compare_tables(expected, actual): + assert ( + expected == actual + ), """ + Routing tables don't match! + Expected: + {} + Actual: + {} + """.format( + expected, actual + ) + + + start_all() + + client.wait_for_unit("network.target") + node1.wait_for_unit("network.target") + node2.wait_for_unit("network.target") + node3.wait_for_unit("network.target") + + client_ipv4_table = """ + 192.168.1.2 dev vrf1 proto static metric 100 + 192.168.2.3 dev vrf2 proto static metric 100 + """.strip() + vrf1_table = """ + broadcast 192.168.1.0 dev eth1 proto kernel scope link src 192.168.1.1 + 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1 + local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1 + broadcast 192.168.1.255 dev eth1 proto kernel scope link src 192.168.1.1 + """.strip() + vrf2_table = """ + broadcast 192.168.2.0 dev eth2 proto kernel scope link src 192.168.2.1 + 192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1 + local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1 + broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1 + """.strip() + + # Check that networkd properly configures the main routing table + # and the routing tables for the VRF. + with subtest("check vrf routing tables"): + compare_tables( + client_ipv4_table, client.succeed("ip -4 route list | head -n2").strip() + ) + compare_tables( + vrf1_table, client.succeed("ip -4 route list table 23 | head -n4").strip() + ) + compare_tables( + vrf2_table, client.succeed("ip -4 route list table 42 | head -n4").strip() + ) + + # Ensure that other nodes are reachable via ICMP through the VRF. + with subtest("icmp through vrf works"): + client.succeed("ping -c5 192.168.1.2") + client.succeed("ping -c5 192.168.2.3") + + # Test whether SSH through a VRF IP is possible. + # (Note: this seems to be an issue on Linux 5.x, so I decided to add this to + # ensure that we catch this when updating the default kernel). + with subtest("tcp traffic through vrf works"): + node1.wait_for_open_port(22) + client.succeed( + "cat ${snakeOilPrivateKey} > privkey.snakeoil" + ) + client.succeed("chmod 600 privkey.snakeoil") + client.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.1.2 true" + ) + + # Only configured routes through the VRF from the main routing table should + # work. Additional IPs are only reachable when binding to the vrf interface. + with subtest("only routes from main routing table work by default"): + client.fail("ping -c5 192.168.2.4") + client.succeed("ping -I vrf2 -c5 192.168.2.4") + + client.shutdown() + node1.shutdown() + node2.shutdown() + node3.shutdown() + ''; +}) From beb493a387039422f7e8633fd07684e412a7e2c7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Jan 2020 04:36:28 +0000 Subject: [PATCH 024/241] ethash: 0.4.2 -> 0.4.4 --- pkgs/development/libraries/ethash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index da2fd13465f..5db6c3808e1 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "0qiixvxbpl2gz7jh1qs8lmyk7wzv6ffnl7kckqgrpgm547nnn8zy"; + sha256 = "1gfs8s4nv2ikkn3rhzifr0dx5m0c1kpnhmzf8x6zlwhw3qwlc98w"; }; nativeBuildInputs = [ From 2ada48002e9f6b17a32ab2b6ef15bf2285271aa8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Jan 2020 08:07:13 +1000 Subject: [PATCH 025/241] skopeo: 0.1.39 -> 0.1.40 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index e36f34bb10c..e283c3bd02f 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let - version = "0.1.39"; + version = "0.1.40"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi"; + sha256 = "1bagirzdzjhicn5dr691092ac3q6lhz3xngjzgqiqkxnvpz7p6cn"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; From ea9bdc6bb7013f941bd5be74ab67d91ec03fc661 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 27 Jan 2020 19:19:40 -0800 Subject: [PATCH 026/241] arcanist: 20190905 -> 20200127 --- pkgs/development/tools/misc/arcanist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 3df5794e387..5eeae0ece5c 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -4,19 +4,19 @@ let libphutil = fetchFromGitHub { owner = "phacility"; repo = "libphutil"; - rev = "39ed96cd818aae761ec92613a9ba0800824d0ab0"; - sha256 = "1w55avn056kwa4gr25h09b7xhvyp397myrfzlmd1ggx7vj87vw1q"; + rev = "cc2a3dbf590389400da55563cb6993f321ec6d73"; + sha256 = "1k7sr3racwz845i7r5kdwvgqrz8gldz07pxj3yw77s58rqbix3ad"; }; arcanist = fetchFromGitHub { owner = "phacility"; repo = "arcanist"; - rev = "3cdfe1fff806d2b54a2df631cf90193e518f42b7"; - sha256 = "1dngq8p4y4hln87hhgdm6hv68ld626j57lifw0821rvpnnmspw6j"; + rev = "21a1828ea06cf031e93082db8664d73efc88290a"; + sha256 = "05rq9l9z7446ks270viay57r5ibx702b5bnlf4ck529zc4abympx"; }; in stdenv.mkDerivation { pname = "arcanist"; - version = "20190905"; + version = "20200127"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; From 3aa308a680d8d30893d036d1ef84958048d03879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 28 Jan 2020 16:29:11 +0100 Subject: [PATCH 027/241] linuxPackages: 4.19 -> 5.4 It's a longterm version that has been out for quite some time: 5.4.15 and 5.5 are current. I've been using it, so far I'm not aware of any issues with it. Feature freeze for the next NixOS release is in two weeks, so now seems to be high time to decide the default kernel version. https://discourse.nixos.org/t/nixos-20-03-feature-freeze/5655 --- 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 a5565731123..1d1f6c97293 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16659,7 +16659,7 @@ in }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_4_19; + linuxPackages = linuxPackages_5_4; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! From 55d3b6b1b1e60c1708b4a69bc1e477f4171a0c85 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 28 Jan 2020 23:18:19 +0100 Subject: [PATCH 028/241] xpra: 2.5.3 -> 3.0.5 Closes #78707. --- pkgs/tools/X11/xpra/default.nix | 4 ++-- pkgs/tools/X11/xpra/fix-paths.patch | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index da7bfb445a9..e6d1d7c6424 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "2.5.3"; + version = "3.0.5"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "1ys35lj28903alccks9p055psy1fsk1nxi8ncchvw8bfxkkkvbys"; + sha256 = "1zy4q8sq0j00ybxw3v8ylaj2aj10x2gb0a05aqbcnrwp3hf983vz"; }; patches = [ diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index eb982682586..a934e5e4cc3 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -2,18 +2,20 @@ gdiff --git a/setup.py b/setup.py index 8d3df15..6156206 100755 --- a/setup.py +++ b/setup.py -@@ -2359,10 +2359,7 @@ if v4l2_ENABLED: - v4l2_pkgconfig = pkgconfig() - #fuly warning: cython makes this difficult, - #we have to figure out if "device_caps" exists in the headers: -- ENABLE_DEVICE_CAPS = False -- if os.path.exists("/usr/include/linux/videodev2.h"): -- hdata = open("/usr/include/linux/videodev2.h").read() -- ENABLE_DEVICE_CAPS = hdata.find("device_caps")>=0 -+ ENABLE_DEVICE_CAPS = True - kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS} - make_constants("xpra", "codecs", "v4l2", "constants", **kwargs) + -2322,11 +2322,7 @@ if v4l2_ENABLED: + videodev2_h = "/usr/include/linux/videodev2.h" + constants_pxi = "xpra/codecs/v4l2/constants.pxi" + if not os.path.exists(videodev2_h) or should_rebuild(videodev2_h, constants_pxi): +- ENABLE_DEVICE_CAPS = 0 +- if os.path.exists(videodev2_h): +- with open(videodev2_h) as f: +- hdata = f.read() +- ENABLE_DEVICE_CAPS = int(hdata.find("device_caps")>=0) ++ ENABLE_DEVICE_CAPS = 1 + with open(constants_pxi, "wb") as f: + f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS) cython_add(Extension("xpra.codecs.v4l2.pusher", + diff --git a/xpra/x11/bindings/keyboard_bindings.pyx b/xpra/x11/bindings/keyboard_bindings.pyx index bd7023d..064c6b5 100644 --- a/xpra/x11/bindings/keyboard_bindings.pyx From 0cc1f3e697f2f2571143da51aca2400e3f496bbc Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Wed, 29 Jan 2020 10:29:56 +0100 Subject: [PATCH 029/241] chrome-token-signing: 1.0.7 -> 1.1.0 --- pkgs/tools/security/chrome-token-signing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 76c845e7a99..cfb223c1812 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "chrome-token-signing"; - version = "1.0.7"; + version = "1.1.0"; src = fetchFromGitHub { owner = "open-eid"; repo = "chrome-token-signing"; rev = "v${version}"; - sha256 = "1icbr5gyf7qqk1qjgcrf6921ws84j5h8zrpzw5mirq4582l5gsav"; + sha256 = "1bksh7xrgqfmyrl04l0fri4ldigb1vkzff32n89bnl44nd42bgcr"; }; buildInputs = [ qmake pcsclite pkgconfig ]; From 4b1097dd994f60fd8a0bed1b291b9a0d1497d661 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Wed, 29 Jan 2020 10:33:58 +0100 Subject: [PATCH 030/241] chrome-token-signing: adding meta --- pkgs/tools/security/chrome-token-signing/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index cfb223c1812..9e87c47ef39 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: mkDerivation rec { pname = "chrome-token-signing"; @@ -27,4 +27,12 @@ mkDerivation rec { install -D -t $out/etc/chromium/native-messaging-hosts host-linux/ee.ria.esteid.json install -D -t $out/lib/mozilla/native-messaging-hosts host-linux/ff/ee.ria.esteid.json ''; + + meta = with stdenv.lib; { + description = "Chrome and Firefox extension for signing with your eID on the web"; + homepage = "https://github.com/open-eid/chrome-token-signing/wiki"; + license = licenses.lgpl21; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.linux; + }; } From e8aa909fa7536862d7636f4035a777e0f3ef8f33 Mon Sep 17 00:00:00 2001 From: Raphael Das Gupta Date: Tue, 28 Jan 2020 19:09:01 +0100 Subject: [PATCH 031/241] gdal: 3.0.1 -> 3.0.3 GDAL/OGR 3.0.3 contains bugfixes to be shipped with QGIS 3.10.2 (https://github.com/NixOS/nixpkgs/issues/78755) See https://lists.osgeo.org/pipermail/qgis-developer/2020-January/060056.html and https://blog.qgis.org/2020/01/24/public-service-announcement-update-to-the-latest-point-release-now/ --- .../libraries/gdal/001.3_0_1.darwin.patch | 29 ------------------- pkgs/development/libraries/gdal/default.nix | 14 ++------- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/libraries/gdal/001.3_0_1.darwin.patch diff --git a/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch b/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch deleted file mode 100644 index 3d34f689120..00000000000 --- a/pkgs/development/libraries/gdal/001.3_0_1.darwin.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff a/swig/python/setup.py b/swig/python/setup.py ---- a/swig/python/setup.py -+++ b/swig/python/setup.py -@@ -268,17 +268,17 @@ class gdal_ext(build_ext): - if ext.name != 'osgeo._gdalconst': - ext.extra_compile_args += [cxx11_flag] - -- # Adding arch flags here if OS X and compiler is clang -- if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]: -- # since MacOS X 10.9, clang no longer accepts -mno-fused-madd -- # extra_compile_args.append('-Qunused-arguments') -- clang_flag = '-Wno-error=unused-command-line-argument-hard-error-in-future' -- if has_flag(self.compiler, clang_flag): -- ext.extra_compile_args += [clang_flag] -- else: -- clang_flag = '-Wno-error=unused-command-line-argument' -- if has_flag(self.compiler, clang_flag): -- ext.extra_compile_args += [clang_flag] -+ # Adding arch flags here if OS X and compiler is clang -+ if sys.platform == 'darwin' and [int(x) for x in os.uname()[2].split('.')] >= [11, 0, 0]: -+ # since MacOS X 10.9, clang no longer accepts -mno-fused-madd -+ # extra_compile_args.append('-Qunused-arguments') -+ clang_flag = '-Wno-error=unused-command-line-argument-hard-error-in-future' -+ if has_flag(self.compiler, clang_flag): -+ ext.extra_compile_args += [clang_flag] -+ else: -+ clang_flag = '-Wno-error=unused-command-line-argument' -+ if has_flag(self.compiler, clang_flag): -+ ext.extra_compile_args += [clang_flag] diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 922877f6f46..7a00a5aa94e 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -9,27 +9,17 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.0.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "04rraqhygv8b8fy87qvdhkgx87whby9n98p3gxqr7kdrfymwnh8l"; + sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa"; }; sourceRoot = "source/gdal"; - patches = [ - ./001.3_0_1.darwin.patch - (fetchpatch { - name = "CVE-2019-17545.patch"; - url = "https://github.com/OSGeo/gdal/commit/148115fcc40f1651a5d15fa34c9a8c528e7147bb.patch"; - stripLen = 1; - sha256 = "0hai59hhvrci9xwjw4lp3wc1brn00imngmqrbbs8v9yr3b0fzbgs"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite From 15b0ae615685d1843ff6d594318e6bfa7d0d1b71 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 2 Sep 2019 10:47:03 +0300 Subject: [PATCH 032/241] fail2ban: 0.10.5 -> 0.11.1 --- pkgs/tools/security/fail2ban/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 4ec84353e4e..39017d09886 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3, gamin }: -let version = "0.10.5"; in +let version = "0.11.1"; in python3.pkgs.buildPythonApplication { pname = "fail2ban"; @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "1s8g46vkwhqnagj69v4wvcasypzkmq7awhfbxahffrypcpad5ach"; + sha256 = "0kqvkxpb72y3kgmxf6g36w67499c6gcd2a9yyblagwx12y05f1sh"; }; pythonPath = with python3.pkgs; @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = http://www.fail2ban.org/; + homepage = https://www.fail2ban.org/; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lovek323 fpletz ]; From 68d601d65c793caa429578fff3d1d6800d0be809 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 2 Sep 2019 12:14:58 +0300 Subject: [PATCH 033/241] nixos/fail2ban: clean-up configuration --- nixos/modules/services/security/fail2ban.nix | 172 +++++++++++-------- 1 file changed, 96 insertions(+), 76 deletions(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 716ae7a2d2f..d933ae02e42 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -6,15 +6,32 @@ let cfg = config.services.fail2ban; - fail2banConf = pkgs.writeText "fail2ban.conf" cfg.daemonConfig; + fail2banConf = pkgs.writeText "fail2ban.local" cfg.daemonConfig; - jailConf = pkgs.writeText "jail.conf" - (concatStringsSep "\n" (attrValues (flip mapAttrs cfg.jails (name: def: + jailConf = pkgs.writeText "jail.local" '' + [INCLUDES] + + before = paths-nixos.conf + + ${concatStringsSep "\n" (attrValues (flip mapAttrs cfg.jails (name: def: optionalString (def != "") '' [${name}] ${def} - '')))); + '')))} + ''; + + pathsConf = pkgs.writeText "paths-nixos.conf" '' + # NixOS + + [INCLUDES] + + before = paths-common.conf + + after = paths-overrides.local + + [DEFAULT] + ''; in @@ -31,21 +48,26 @@ in description = "Whether to enable the fail2ban service."; }; + package = mkOption { + default = pkgs.fail2ban; + type = types.package; + example = "pkgs.fail2ban_0_11"; + description = "The fail2ban package to use for running the fail2ban service."; + }; + daemonConfig = mkOption { - default = - '' - [Definition] - loglevel = INFO - logtarget = SYSLOG - socket = /run/fail2ban/fail2ban.sock - pidfile = /run/fail2ban/fail2ban.pid - ''; + default = '' + [Definition] + logtarget = SYSLOG + socket = /run/fail2ban/fail2ban.sock + pidfile = /run/fail2ban/fail2ban.pid + dbfile = /var/lib/fail2ban/fail2ban.sqlite3 + ''; type = types.lines; - description = - '' - The contents of Fail2ban's main configuration file. It's - generally not necessary to change it. - ''; + description = '' + The contents of Fail2ban's main configuration file. It's + generally not necessary to change it. + ''; }; jails = mkOption { @@ -65,17 +87,16 @@ in } ''; type = types.attrsOf types.lines; - description = - '' - The configuration of each Fail2ban “jail”. A jail - consists of an action (such as blocking a port using - iptables) that is triggered when a - filter applied to a log file triggers more than a certain - number of times in a certain time period. Actions are - defined in /etc/fail2ban/action.d, - while filters are defined in - /etc/fail2ban/filter.d. - ''; + description = '' + The configuration of each Fail2ban “jail”. A jail + consists of an action (such as blocking a port using + iptables) that is triggered when a + filter applied to a log file triggers more than a certain + number of times in a certain time period. Actions are + defined in /etc/fail2ban/action.d, + while filters are defined in + /etc/fail2ban/filter.d. + ''; }; }; @@ -87,66 +108,65 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.fail2ban ]; + environment.systemPackages = [ cfg.package ]; - environment.etc."fail2ban/fail2ban.conf".source = fail2banConf; - environment.etc."fail2ban/jail.conf".source = jailConf; - environment.etc."fail2ban/action.d".source = "${pkgs.fail2ban}/etc/fail2ban/action.d/*.conf"; - environment.etc."fail2ban/filter.d".source = "${pkgs.fail2ban}/etc/fail2ban/filter.d/*.conf"; + environment.etc = { + "fail2ban/fail2ban.local".source = fail2banConf; + "fail2ban/jail.local".source = jailConf; + "fail2ban/fail2ban.conf".source = "${cfg.package}/etc/fail2ban/fail2ban.conf"; + "fail2ban/jail.conf".source = "${cfg.package}/etc/fail2ban/jail.conf"; + "fail2ban/paths-common.conf".source = "${cfg.package}/etc/fail2ban/paths-common.conf"; + "fail2ban/paths-nixos.conf".source = pathsConf; + "fail2ban/action.d".source = "${cfg.package}/etc/fail2ban/action.d/*.conf"; + "fail2ban/filter.d".source = "${cfg.package}/etc/fail2ban/filter.d/*.conf"; + }; - systemd.services.fail2ban = - { description = "Fail2ban Intrusion Prevention System"; + systemd.services.fail2ban = { + description = "Fail2ban Intrusion Prevention System"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - partOf = optional config.networking.firewall.enable "firewall.service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + partOf = optional config.networking.firewall.enable "firewall.service"; - restartTriggers = [ fail2banConf jailConf ]; - path = [ pkgs.fail2ban pkgs.iptables pkgs.iproute ]; + restartTriggers = [ fail2banConf jailConf pathsConf ]; + reloadIfChanged = true; - preStart = - '' - mkdir -p /var/lib/fail2ban - ''; + path = [ cfg.package pkgs.iptables pkgs.iproute ]; - unitConfig.Documentation = "man:fail2ban(1)"; + preStart = '' + mkdir -p /var/lib/fail2ban + ''; - serviceConfig = - { Type = "forking"; - ExecStart = "${pkgs.fail2ban}/bin/fail2ban-client -x start"; - ExecStop = "${pkgs.fail2ban}/bin/fail2ban-client stop"; - ExecReload = "${pkgs.fail2ban}/bin/fail2ban-client reload"; - PIDFile = "/run/fail2ban/fail2ban.pid"; - Restart = "always"; + unitConfig.Documentation = "man:fail2ban(1)"; - ReadOnlyDirectories = "/"; - ReadWriteDirectories = "/run/fail2ban /var/tmp /var/lib"; - PrivateTmp = "true"; - RuntimeDirectory = "fail2ban"; - CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW"; - }; + serviceConfig = { + Type = "forking"; + ExecStart = "${cfg.package}/bin/fail2ban-server -xf start"; + ExecStop = "${cfg.package}/bin/fail2ban-server stop"; + ExecReload = "${cfg.package}/bin/fail2ban-server reload"; + PIDFile = "/run/fail2ban/fail2ban.pid"; + Restart = "always"; + + ReadOnlyDirectories = "/"; + ReadWriteDirectories = "/run/fail2ban /var/tmp /var/lib"; + PrivateTmp = "true"; + RuntimeDirectory = "fail2ban"; + CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW"; }; + }; # Add some reasonable default jails. The special "DEFAULT" jail # sets default values for all other jails. - services.fail2ban.jails.DEFAULT = - '' - ignoreip = 127.0.0.1/8 - bantime = 600 - findtime = 600 - maxretry = 3 - backend = systemd - enabled = true - ''; - + services.fail2ban.jails.DEFAULT = '' + # Miscellaneous options + ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} + maxretry = 3 + backend = systemd + ''; # Block SSH if there are too many failing connection attempts. - services.fail2ban.jails.ssh-iptables = - '' - filter = sshd - action = iptables-multiport[name=SSH, port="${concatMapStringsSep "," (p: toString p) config.services.openssh.ports}", protocol=tcp] - maxretry = 5 - ''; - + services.fail2ban.jails.sshd = mkDefault '' + enabled = true + port = ${concatMapStringsSep "," (p: toString p) config.services.openssh.ports} + ''; }; - } From 182012ef4367bede2531e56c2190353ebe539f23 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 3 Sep 2019 21:57:25 +0300 Subject: [PATCH 034/241] nixos/fail2ban: add options to enable work service with iptables-compat --- nixos/modules/services/security/fail2ban.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index d933ae02e42..eb4a4f2eb51 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -55,6 +55,13 @@ in description = "The fail2ban package to use for running the fail2ban service."; }; + packageFirewall = mkOption { + default = pkgs.iptables; + type = types.package; + example = "pkgs.nftables"; + description = "The firewall package used by fail2ban service."; + }; + daemonConfig = mkOption { default = '' [Definition] @@ -103,7 +110,6 @@ in }; - ###### implementation config = mkIf cfg.enable { @@ -131,7 +137,7 @@ in restartTriggers = [ fail2banConf jailConf pathsConf ]; reloadIfChanged = true; - path = [ cfg.package pkgs.iptables pkgs.iproute ]; + path = [ cfg.package cfg.packageFirewall pkgs.iproute ]; preStart = '' mkdir -p /var/lib/fail2ban From a55be8d794d448a10a07c26e20397107192a58d9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 2 Dec 2019 16:25:18 +0300 Subject: [PATCH 035/241] nixos/fail2ban: update serviceConfig --- nixos/modules/services/security/fail2ban.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index eb4a4f2eb51..13619eda8e7 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -139,19 +139,15 @@ in path = [ cfg.package cfg.packageFirewall pkgs.iproute ]; - preStart = '' - mkdir -p /var/lib/fail2ban - ''; - unitConfig.Documentation = "man:fail2ban(1)"; serviceConfig = { - Type = "forking"; ExecStart = "${cfg.package}/bin/fail2ban-server -xf start"; ExecStop = "${cfg.package}/bin/fail2ban-server stop"; ExecReload = "${cfg.package}/bin/fail2ban-server reload"; + Type = "simple"; + Restart = "on-failure"; PIDFile = "/run/fail2ban/fail2ban.pid"; - Restart = "always"; ReadOnlyDirectories = "/"; ReadWriteDirectories = "/run/fail2ban /var/tmp /var/lib"; From f1d7dfe29f091639d935358f2d3a4ee94973d30a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 2 Dec 2019 20:19:16 +0300 Subject: [PATCH 036/241] nixos/fail2ban: add custom options --- nixos/modules/services/security/fail2ban.nix | 116 ++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index 13619eda8e7..ba1a23f05d2 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -62,6 +62,108 @@ in description = "The firewall package used by fail2ban service."; }; + banaction = mkOption { + default = "iptables-multiport"; + type = types.str; + example = "nftables-multiport"; + description = '' + Default banning action (e.g. iptables, iptables-new, iptables-multiport, + shorewall, etc) It is used to define action_* variables. Can be overridden + globally or per section within jail.local file + ''; + }; + + banaction-allports = mkOption { + default = "iptables-allport"; + type = types.str; + example = "nftables-allport"; + description = '' + Default banning action (e.g. iptables, iptables-new, iptables-multiport, + shorewall, etc) It is used to define action_* variables. Can be overridden + globally or per section within jail.local file + ''; + }; + + bantime-increment.enable = mkOption { + default = false; + type = types.bool; + description = '' + Allows to use database for searching of previously banned ip's to increase + a default ban time using special formula, default it is banTime * 1, 2, 4, 8, 16, 32... + ''; + }; + + bantime-increment.rndtime = mkOption { + default = "4m"; + type = types.str; + example = "8m"; + description = '' + "bantime-increment.rndtime" is the max number of seconds using for mixing with random time + to prevent "clever" botnets calculate exact time IP can be unbanned again + ''; + }; + + bantime-increment.maxtime = mkOption { + default = "10h"; + type = types.str; + example = "48h"; + description = '' + "bantime-increment.maxtime" is the max number of seconds using the ban time can reach (don't grows further) + ''; + }; + + bantime-increment.factor = mkOption { + default = "1"; + type = types.str; + example = "4"; + description = '' + "bantime-increment.factor" is a coefficient to calculate exponent growing of the formula or common multiplier, + default value of factor is 1 and with default value of formula, the ban time grows by 1, 2, 4, 8, 16 ... + ''; + }; + + bantime-increment.formula = mkOption { + default = "ban.Time * (1<<(ban.Count if ban.Count<20 else 20)) * banFactor"; + type = types.str; + example = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; + description = '' + "bantime-increment.formula" used by default to calculate next value of ban time, default value bellow, + the same ban time growing will be reached by multipliers 1, 2, 4, 8, 16, 32... + ''; + }; + + bantime-increment.multipliers = mkOption { + default = "1 2 4 8 16 32 64"; + type = types.str; + example = "2 4 16 128"; + description = '' + "bantime-increment.multipliers" used to calculate next value of ban time instead of formula, coresponding + previously ban count and given "bantime.factor" (for multipliers default is 1); + following example grows ban time by 1, 2, 4, 8, 16 ... and if last ban count greater as multipliers count, + always used last multiplier (64 in example), for factor '1' and original ban time 600 - 10.6 hours + ''; + }; + + bantime-increment.overalljails = mkOption { + default = false; + type = types.bool; + example = true; + description = '' + "bantime-increment.overalljails" (if true) specifies the search of IP in the database will be executed + cross over all jails, if false (dafault), only current jail of the ban IP will be searched + ''; + }; + + ignoreIP = mkOption { + default = [ ]; + type = types.listOf types.str; + example = [ "192.168.0.0/16" "2001:DB8::42" ]; + description = '' + "ignoreIP" can be a list of IP addresses, CIDR masks or DNS hosts. Fail2ban will not ban a host which + matches an address in this list. Several addresses can be defined using space (and/or comma) separator. + ''; + }; + daemonConfig = mkOption { default = '' [Definition] @@ -160,10 +262,22 @@ in # Add some reasonable default jails. The special "DEFAULT" jail # sets default values for all other jails. services.fail2ban.jails.DEFAULT = '' + ${optionalString cfg.bantime-increment.enable '' + # Bantime incremental + bantime.increment = ${if cfg.bantime-increment.enable then "true" else "false"} + bantime.maxtime = ${cfg.bantime-increment.maxtime} + bantime.factor = ${cfg.bantime-increment.factor} + bantime.formula = ${cfg.bantime-increment.formula} + bantime.multipliers = ${cfg.bantime-increment.multipliers} + bantime.overalljails = ${if cfg.bantime-increment.overalljails then "true" else "false"} + ''} # Miscellaneous options - ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} + ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP} maxretry = 3 backend = systemd + # Actions + banaction = ${cfg.banaction} + banaction_allports = ${cfg.banaction-allports} ''; # Block SSH if there are too many failing connection attempts. services.fail2ban.jails.sshd = mkDefault '' From 96e2669114ce92be090b5348ba3e1f2d0d58366f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 23 Dec 2019 14:58:02 +0300 Subject: [PATCH 037/241] nixos/fail2ban: enable sandboxing --- nixos/modules/services/security/fail2ban.nix | 24 ++++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index ba1a23f05d2..cb748c93d24 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -250,12 +250,26 @@ in Type = "simple"; Restart = "on-failure"; PIDFile = "/run/fail2ban/fail2ban.pid"; - - ReadOnlyDirectories = "/"; - ReadWriteDirectories = "/run/fail2ban /var/tmp /var/lib"; - PrivateTmp = "true"; + # Capabilities + CapabilityBoundingSet = [ "CAP_AUDIT_READ" "CAP_DAC_READ_SEARCH" "CAP_NET_ADMIN" "CAP_NET_RAW" ]; + # Security + NoNewPrivileges = true; + # Directory RuntimeDirectory = "fail2ban"; - CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW"; + RuntimeDirectoryMode = "0750"; + StateDirectory = "fail2ban"; + StateDirectoryMode = "0750"; + LogsDirectory = "fail2ban"; + LogsDirectoryMode = "0750"; + # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; }; }; From 48e4e1a12ac2081141c34ad18a0de5247e110e60 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Thu, 30 Jan 2020 01:11:58 +0100 Subject: [PATCH 038/241] netbeans: 11.1 -> 11.2 --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 38b92151b29..0fddddbaacf 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.1"; + version = "11.2"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "bb061b9258d524b7b53b3b5ee9aa95111f7a391a5e2c5c0bc949164166af9a03d0cebbde2b47a8853fb765307b4c93ce8389a9c87bef26c92c08cdf446314e4d"; + sha512 = "d589481808832c4f0391ee1ecb8e18202cebeee8bd844cb4bdbf6125113b41f9138a34c4c2ef1fdf228294ef8c24b242ffec9ba5fdc4f1d288db4a3f19ba1509"; }; buildCommand = '' From 776ad2f1339e7a423cdfaf30834064daf8e6d92b Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Wed, 29 Jan 2020 19:28:24 -0500 Subject: [PATCH 039/241] silicon: init at 0.3.0 --- pkgs/tools/misc/silicon/default.nix | 46 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/misc/silicon/default.nix diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix new file mode 100644 index 00000000000..e25b6cfa2df --- /dev/null +++ b/pkgs/tools/misc/silicon/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkgconfig +, cmake +, llvmPackages +, expat +, freetype +, libxcb +, python3 +, AppKit +, CoreText +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "silicon"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "Aloxaf"; + repo = "silicon"; + rev = "v${version}"; + sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy"; + }; + + cargoSha256 = "11b9i1aa36wc7mg2lsvmkiisl23mjkg02xcvlb7zdangwzbv13sq"; + + buildInputs = [ llvmPackages.libclang expat freetype ] + ++ lib.optionals stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit CoreText Security ]; + + nativeBuildInputs = [ cmake pkgconfig ] + ++ lib.optionals stdenv.isLinux [ python3 ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + meta = with lib; { + description = "Create beautiful image of your source code."; + homepage = "https://github.com/Aloxaf/silicon"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ evanjs ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bfeaf0acf2..3c8fe84c0b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10562,6 +10562,10 @@ in sigrok-cli = callPackage ../development/tools/sigrok-cli { }; + silicon = callPackage ../tools/misc/silicon { + inherit (darwin.apple_sdk.frameworks) AppKit CoreText Security; + }; + simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; slimerjs = callPackage ../development/tools/slimerjs {}; From 187eefb7d88486a001865ccf70be002d3525dc59 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 29 Jan 2020 19:42:48 -0600 Subject: [PATCH 040/241] scc: 2.10.1 -> 2.11.0 --- pkgs/development/tools/misc/scc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 47a91482327..7a6a060464e 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "scc"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - sha256 = "1g55aahr8j93jc1k2zgpnyxgp7ddn5137vjf8dafsmqp4m2qjq6g"; + sha256 = "1wk6s9ga9rkywgqys960s6fz4agwzh3ac2l6cpcr7kca4379s28k"; }; goPackagePath = "github.com/boyter/scc"; From 9234e42951e3b791ebe6c0b58b91b48f14001118 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Wed, 29 Jan 2020 21:40:49 -0500 Subject: [PATCH 041/241] cargo-geiger: 0.9.0 -> 0.9.1 - add cargo-lock.patch - add update-cargo-lock.sh - update src owner and homepage to reflect new main repository --- .../tools/rust/cargo-geiger/cargo-lock.patch | 318 ++++++++++++++++++ .../tools/rust/cargo-geiger/default.nix | 11 +- .../rust/cargo-geiger/update-cargo-lock.sh | 19 ++ 3 files changed, 343 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/tools/rust/cargo-geiger/cargo-lock.patch create mode 100755 pkgs/development/tools/rust/cargo-geiger/update-cargo-lock.sh diff --git a/pkgs/development/tools/rust/cargo-geiger/cargo-lock.patch b/pkgs/development/tools/rust/cargo-geiger/cargo-lock.patch new file mode 100644 index 00000000000..85c7a73c14a --- /dev/null +++ b/pkgs/development/tools/rust/cargo-geiger/cargo-lock.patch @@ -0,0 +1,318 @@ +diff --git a/Cargo.lock b/Cargo.lock +index b354f9b..5a17ec2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -7,7 +7,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "aho-corasick" +-version = "0.7.6" ++version = "0.7.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -55,7 +55,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "backtrace" +-version = "0.3.42" ++version = "0.3.43" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -78,8 +78,8 @@ name = "better-panic" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)", +- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -170,17 +170,17 @@ dependencies = [ + + [[package]] + name = "cargo-geiger" +-version = "0.9.0" ++version = "0.9.1" + dependencies = [ + "assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "better-panic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cargo 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cargo-platform 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "geiger 0.4.3", +- "insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "insta 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -262,7 +262,7 @@ dependencies = [ + + [[package]] + name = "console" +-version = "0.9.1" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -345,7 +345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -357,7 +357,7 @@ dependencies = [ + "curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -372,7 +372,7 @@ dependencies = [ + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libnghttp2-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -390,7 +390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "dtoa" +-version = "0.4.4" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] +@@ -426,7 +426,7 @@ name = "failure" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -533,7 +533,7 @@ dependencies = [ + "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -558,7 +558,7 @@ name = "globset" + version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", + "bstr 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -646,16 +646,15 @@ dependencies = [ + + [[package]] + name = "insta" +-version = "0.13.0" ++version = "0.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", + "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -695,7 +694,7 @@ dependencies = [ + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -716,7 +715,7 @@ dependencies = [ + "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] +@@ -791,7 +790,7 @@ dependencies = [ + + [[package]] + name = "openssl" +-version = "0.10.26" ++version = "0.10.27" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -799,7 +798,7 @@ dependencies = [ + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -809,10 +808,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "openssl-sys" +-version = "0.9.53" ++version = "0.9.54" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -939,7 +938,7 @@ name = "regex" + version = "1.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1076,7 +1075,7 @@ name = "serde_yaml" + version = "0.8.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1097,7 +1096,7 @@ dependencies = [ + + [[package]] + name = "smallvec" +-version = "1.1.0" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] +@@ -1231,7 +1230,7 @@ name = "unicode-normalization" + version = "0.1.12" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -1259,15 +1258,6 @@ name = "utf8parse" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + +-[[package]] +-name = "uuid" +-version = "0.8.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- + [[package]] + name = "vcpkg" + version = "0.2.8" +@@ -1338,13 +1328,13 @@ dependencies = [ + + [metadata] + "checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" ++"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744" + "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" + "checksum assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6283bac8dd7226470d491bc4737816fea4ca1fba7a2847f2e9097fd6bfb4624c" + "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +-"checksum backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b4b1549d804b6c73f4817df2ba073709e96e426f12987127c48e6745568c350b" ++"checksum backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)" = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f" + "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" + "checksum better-panic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d12a680cc74d8c4a44ee08be4a00dedf671b089c2440b2e3fdaa776cd468476" + "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +@@ -1360,7 +1350,7 @@ dependencies = [ + "checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d" + "checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" + "checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" +-"checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" ++"checksum console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" + "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" + "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + "checksum crates-io 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54a5db4b026e2d3bad49a9775b01722035ebc6976b95ec556716852d640f3ad5" +@@ -1373,7 +1363,7 @@ dependencies = [ + "checksum curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "0c38ca47d60b86d0cc9d42caa90a0885669c2abc9791f871c81f58cdf39e979b" + "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + "checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" +-"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" ++"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" + "checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + "checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" + "checksum escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d" +@@ -1401,7 +1391,7 @@ dependencies = [ + "checksum ignore 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "522daefc3b69036f80c7d2990b28ff9e0471c683bad05ca258e0a01dd22c5a1e" + "checksum im-rc 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0197597d095c0d11107975d3175173f810ee572c2501ff4de64f4f3f119806" + "checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc" +-"checksum insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d07d2003a61f1eae49feeb2aea003d0da6c80587c20ac505d695805c744d4847" ++"checksum insta 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8df742abee84dbf27d20869c9adf77b0d8f7ea3eead13c2c9e3998d136a97058" + "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" + "checksum jobserver 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "67b06c1b455f1cf4269a8cfc320ab930a810e2375a42af5075eb8a8b36405ce0" + "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +@@ -1419,9 +1409,9 @@ dependencies = [ + "checksum miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" + "checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" + "checksum opener 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae" +-"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" ++"checksum openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)" = "e176a45fedd4c990e26580847a525e39e16ec32ac78957dbf62ded31b3abfd6f" + "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +-"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" ++"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" + "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + "checksum petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29c127eea4a29ec6c85d153c59dc1213f33ec74cead30fe4730aecc88cc1fd92" + "checksum pico-args 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc" +@@ -1458,7 +1448,7 @@ dependencies = [ + "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" + "checksum shell-escape 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "170a13e64f2a51b77a45702ba77287f5c6829375b04a69cf2222acd17d0cfab9" + "checksum sized-chunks 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f01db57d7ee89c8e053245deb77040a6cc8508311f381c88749c33d4b9b78785" +-"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" ++"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" + "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" + "checksum strip-ansi-escapes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee" + "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +@@ -1479,7 +1469,6 @@ dependencies = [ + "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" + "checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" + "checksum utf8parse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" +-"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" + "checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" + "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" + "checksum vte 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf" diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 1edeaeb9b46..4437f6fb5a0 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -6,16 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { - owner = "anderejd"; + owner = "rust-secure-code"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0yn4m94bklxyg0cxzhqm1m976z66rbi58ri1phffvqz457mxj3hk"; + sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0"; }; - cargoSha256 = "0608wvbdw4i9pp3x6dgny186if6bzlbivkvfd5lfp1x1f53534za"; + cargoSha256 = "0aykhhxk416p237safmqh5dhwjgrhvgc6zikkmxi9rq567ypp914"; + cargoPatches = [ ./cargo-lock.patch ]; # Multiple tests require internet connectivity, so they are disabled here. # If we ever get cargo-insta (https://crates.io/crates/insta) in tree, @@ -40,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Detects usage of unsafe Rust in a Rust crate and its dependencies."; - homepage = https://github.com/anderejd/cargo-geiger; + homepage = https://github.com/rust-secure-code/cargo-geiger; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ evanjs ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-geiger/update-cargo-lock.sh b/pkgs/development/tools/rust/cargo-geiger/update-cargo-lock.sh new file mode 100755 index 00000000000..6e077c6733f --- /dev/null +++ b/pkgs/development/tools/rust/cargo-geiger/update-cargo-lock.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +# This updates cargo-lock.patch for the diesel version listed in default.nix. + +set -eu -o verbose + +here=$PWD +version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2) +checkout=$(mktemp -d) +git clone -b "cargo-geiger-$version" --depth=1 https://github.com/rust-secure-code/cargo-geiger "$checkout" +cd "$checkout" + +rm -f rust-toolchain +cargo generate-lockfile +git add -f Cargo.lock +git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch + +cd "$here" +rm -rf "$checkout" From a56d7151938aae7c5061fdedc8c513e3e69f824e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 07:45:32 +0000 Subject: [PATCH 042/241] scid-vs-pc: 4.20 -> 4.21 --- pkgs/games/scid-vs-pc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 345ce33fca0..c0438153052 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "scid-vs-pc"; - version = "4.20"; + version = "4.21"; src = fetchurl { url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz"; - sha256 = "1mpardcxp5hsmhyla1cjqf4aalacs3v6xkf1zyjz16g1m3gh05lm"; + sha256 = "1lsm5s2hlhqbmwm6f38jlg2kc4j6lwp86lg6z3w6nc3jibzgvsay"; }; nativeBuildInputs = [ makeWrapper ]; From 27dfbd55f82d0bfd4ed73fcae5557ef0f6fdbe07 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 08:31:58 +0000 Subject: [PATCH 043/241] rsyslog: 8.1911.0 -> 8.2001.0 --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 9d3cbbf79eb..83f9eaff977 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.1911.0"; + version = "8.2001.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "01713vwz3w5fx9b97286h1rx9hxhjsdah96nyhh75bb23impgx71"; + sha256 = "1nm83s9abknli46sknjs50cmdhhqzkznbsjspjbdg96likshdgsq"; }; #patches = [ ./fix-gnutls-detection.patch ]; From 48c96b2b255f9f96dd1568e99f8b8dc68c2219fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 08:39:02 +0000 Subject: [PATCH 044/241] rhythmbox: 3.4.3 -> 3.4.4 --- pkgs/applications/audio/rhythmbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 24b342a26a9..b6bff79fa03 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -17,13 +17,13 @@ }: let pname = "rhythmbox"; - version = "3.4.3"; + version = "3.4.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yx3n7p9vmv23jsv98fxwq95n78awdxqm8idhyhxx2d6vk4w1hgx"; + sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; }; nativeBuildInputs = [ From 15945d835a4af62046caed0cbdd7abaa8d03b7f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 08:53:22 +0000 Subject: [PATCH 045/241] rshell: 0.0.25 -> 0.0.26 --- pkgs/development/tools/rshell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index 421aeb9ad91..b209b09eec7 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.25"; + version = "0.0.26"; src = fetchPypi { inherit pname version; - sha256 = "f6857cdc3c53c8ce9ba7a560c2759c10b988f3d9fafde912d3fa4deecb4d4664"; + sha256 = "05nvfaykzwj1y86fcckrnvmrva7849lkbmpxsy2hb9akk0y7li6c"; }; propagatedBuildInputs = [ pyserial pyudev ]; From d9724283550272395fbc92232fd6782e13e650d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 08:56:28 +0000 Subject: [PATCH 046/241] sunvox: 1.9.4c -> 1.9.5 --- pkgs/applications/audio/sunvox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 1a3d1a96c85..738b876026a 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "SunVox"; - version = "1.9.4c"; + version = "1.9.5"; src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "19c1a4e28459e31e1a19986f219d4caa4eb2cb5bc9f6aa994abdbb2ebf6ac4ac"; + sha256 = "011cyagbqqkvnrxxq196zsvcyn3gksjfsaas02xl8ncjwfj084di"; }; buildInputs = [ unzip ]; From c2d7587758435b90f080ddc20b4f9bd2f60dcad0 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Wed, 29 Jan 2020 16:19:22 +0100 Subject: [PATCH 047/241] acsccid: 1.1.6 -> 1.1.8 --- pkgs/tools/security/acsccid/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index 5a771917311..80fa0e2dc47 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb, libiconv }: stdenv.mkDerivation rec { - version = "1.1.6"; + version = "1.1.8"; pname = "acsccid"; src = fetchFromGitHub { owner = "acshk"; - repo = "acsccid"; - rev = "26bc84c738d12701e6a7289ed578671d71cbf3cb"; - sha256 = "09k7hvcay092wkyf0hjsvimg1h4qzss1nk7m5yanlib4ldhw5g5c"; + repo = pname; + rev = "v${version}"; + sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3"; }; doCheck = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ]; + buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; postPatch = '' sed -e s_/bin/echo_echo_g -i src/Makefile.am From a94c66bc882971dfd3224f860964cd38e9a16e89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 09:44:26 +0000 Subject: [PATCH 048/241] snakemake: 5.8.1 -> 5.9.1 --- pkgs/applications/science/misc/snakemake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 13eae15ce7f..c82a89e739c 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.8.1"; + version = "5.9.1"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1r1qi14klmxmmw7vcivp45jrjka5rcwlcfggj5npnfb378fx3hb0"; + sha256 = "0s3y5pz9vqxpj5bx8y7ymh3zmsiyrk7sp8zwqwpva3mli7ky81pz"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json From dd229f425efb6999e4c2dca0208e390fec66afc4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 05:36:14 -0500 Subject: [PATCH 049/241] nixos/doc/xfce: drop polkit mention We install a polkit agent automatically no --- nixos/doc/manual/configuration/xfce.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 7d2862f8b31..6090d883197 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -40,15 +40,6 @@ into your configuration.nix. - - Polkit Authentication Agent - - There is no authentication agent automatically installed alongside Xfce. To - allow mounting of local (non-removable) filesystems, you will need to - install one. Installing polkit_gnome, a rebuild, logout - and login did the trick. - - Troubleshooting From c5108e541dd67de2f8769e181b5ebc1b9532a9ef Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 05:36:51 -0500 Subject: [PATCH 050/241] nixos/doc/xfce: remove thunar volume mention This doesn't even make sense. --- nixos/doc/manual/configuration/xfce.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 6090d883197..d1366a358fc 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -30,16 +30,6 @@ (system wide), put them into your . - - Thunar Volume Support - - To enable Thunar volume support, put - - = true; - - into your configuration.nix. - - Troubleshooting From 251f0eb90aa0783b1a44df22de17280fc2620f50 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 05:43:14 -0500 Subject: [PATCH 051/241] nixos/doc/xfce: mention thunar plugins --- nixos/doc/manual/configuration/xfce.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index d1366a358fc..295a515ea83 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -30,6 +30,14 @@ (system wide), put them into your . + + Thunar Plugins + + If you'd like to add extra plugins to Thunar, add them to + . + You shouldn't just add them to . + + Troubleshooting From 1687c355e729b9adef5dcd4c10968104521353d1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 05:44:02 -0500 Subject: [PATCH 052/241] nixos/doc/xfce: claiify where xfce packages are --- nixos/doc/manual/configuration/xfce.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index 295a515ea83..a81a327c09b 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -28,7 +28,7 @@ Some Xfce programs are not installed automatically. To install them manually (system wide), put them into your - . + from pkgs.xfce. Thunar Plugins From cef09ab0bb159a760667feb35fdba577eac34376 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 11:03:45 +0000 Subject: [PATCH 053/241] supercollider: 3.10.3 -> 3.10.4 --- pkgs/development/interpreters/supercollider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index b4ed9232452..67a7f8975f1 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in mkDerivation rec { pname = "supercollider"; - version = "3.10.3"; + version = "3.10.4"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; - sha256 = "1wvsrr4qcqmpxpn57wwrnwbnf3pflr3n4wkj9j6b9cdisp34kv5d"; + sha256 = "168r0c0axgajsdzc1caklydrnagy4flv7i7jcyqwpc9agsqy0nnf"; }; hardeningDisable = [ "stackprotector" ]; From 17748d37cd924a60e6c632e64192991316be46f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 11:09:03 +0000 Subject: [PATCH 054/241] stress-ng: 0.10.14 -> 0.10.16 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 7d3e62d7beb..911b1ef662c 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.10.14"; + version = "0.10.16"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0lazjxrlqzhxd6fg3y1vh38h66v8swkd9q2say4m6sglzkfqdfnq"; + sha256 = "0173lys5i7bnw8zdpkrr8chh1b84q9b08a41a5v6fgpmzk7zzgza"; }; postPatch = '' From e8e47ce9455e1efdaf222a44c71532a6be927e9a Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Wed, 29 Jan 2020 23:03:54 +0300 Subject: [PATCH 055/241] nushell: 0.8.0 -> 0.9.0 --- pkgs/shells/nushell/default.nix | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index de8502618c6..00a27d1d7e3 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , rustPlatform , openssl @@ -9,36 +10,46 @@ , AppKit , Security , withStableFeatures ? true +, withTestBinaries ? true }: rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1hw9fazf5m80p39wgjqjcxafkfjxh0rkjmiznn2p66gccjnkddm6"; + sha256 = "0p1aykhkz5rixj6x0rskg77q31xw11mirvjhzp7n4nmbx3rfkagc"; }; - cargoSha256 = "17hx02g9m3l2kgxba0n6wmixdbd9g8443h085v8shd70c6vln2v8"; + cargoSha256 = "0143mm9cdswd1azpzzpbfc5x7dy3ryywvq44mwkd6h1027n5idap"; nativeBuildInputs = [ pkg-config ] - ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; + ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ] - ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ stdenv.lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ] + ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ]; - cargoBuildFlags = stdenv.lib.optional withStableFeatures "--features=stable"; + cargoBuildFlags = lib.optional withStableFeatures "--features stable"; + + cargoTestFlags = lib.optional withTestBinaries "--features test-bins"; preCheck = '' export HOME=$TMPDIR ''; - meta = with stdenv.lib; { + checkPhase = '' + runHook preCheck + echo "Running cargo cargo test ${lib.strings.concatStringsSep " " cargoTestFlags} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + cargo test ${lib.strings.concatStringsSep " " cargoTestFlags} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + runHook postCheck + ''; + + meta = with lib; { description = "A modern shell written in Rust"; homepage = "https://www.nushell.sh/"; license = licenses.mit; From 862c0a8c46d2d513e8656dfefe0bf02d4d417bc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 12:42:02 +0000 Subject: [PATCH 056/241] tome4: 1.6.5 -> 1.6.6 --- pkgs/games/tome4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index b31b53922ff..81bc7f4a13c 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0ifi057idid8xq7af8ybs99b6939hyfif1ml1ihjpx02vinmd419"; + sha256 = "1amx0y49scy9hq71wjvkdzvgclwa2g54vkv4bf40mxyp4pl0bq7m"; }; prePatch = '' From 53706054ba3ca27a25cbcceb8aa6bce2e39092f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 12:47:50 +0000 Subject: [PATCH 057/241] tetgen: 1.5.0 -> 1.5.1 --- pkgs/applications/science/geometry/tetgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 7be0103304a..0d3a7cc2bc2 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl}: -let version = "1.5.0"; in +let version = "1.5.1"; in stdenv.mkDerivation { pname = "tetgen"; inherit version; src = fetchurl { url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; - sha256 = "1www3x2r6r7pck43ismlwy82x0j6xj2qiwvfs2pn687gsmhlh4ad"; + sha256 = "0l5q066crs4cjj7qr0r2gnz8ajkgighngwglr1201h77lcs48sp4"; }; installPhase = '' From e9f50d20acec191b2a96b22386e4ad3cc3ded703 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 30 Jan 2020 14:54:30 +0100 Subject: [PATCH 058/241] dat: remove and link to nodePackages.dat --- pkgs/applications/networking/dat/default.nix | 92 -------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 pkgs/applications/networking/dat/default.nix diff --git a/pkgs/applications/networking/dat/default.nix b/pkgs/applications/networking/dat/default.nix deleted file mode 100644 index 2e0f8005bdb..00000000000 --- a/pkgs/applications/networking/dat/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv -, fetchurl -, unzip -}: - -stdenv.mkDerivation rec { - pname = "dat"; - version = "13.13.1"; - - suffix = { - x86_64-darwin = "macos-x64"; - x86_64-linux = "linux-x64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://github.com/datproject/dat/releases/download/v${version}/${pname}-${version}-${suffix}.zip"; - sha256 = { - x86_64-darwin = "1qj38zn33hhr2v39jw14k2af091bafh5yvhs91h5dnjb2r8yxnaq"; - x86_64-linux = "0vgn57kf3j1pbfxlhj4sl1sm2gfd2gcvhk4wz5yf5mzq1vj9ivpv"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - buildInputs = [ unzip ]; - - dontConfigure = true; - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - - installPhase = '' - mkdir -p $out/bin - mv dat $out/bin - ''; - - # dat is a node program packaged using zeit/pkg. - # thus, it contains hardcoded offsets. - # patchelf shifts these locations when it expands headers. - - # this could probably be generalised into allowing any program packaged - # with zeit/pkg to be run on nixos. - - preFixup = let - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc]; - in stdenv.lib.optionalString (!stdenv.isDarwin) '' - orig_size=$(stat --printf=%s $out/bin/dat) - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/dat - patchelf --set-rpath ${libPath} $out/bin/dat - chmod +x $out/bin/dat - - new_size=$(stat --printf=%s $out/bin/dat) - - ###### zeit-pkg fixing starts here. - # we're replacing plaintext js code that looks like - # PAYLOAD_POSITION = '1234 ' | 0 - # [...] - # PRELUDE_POSITION = '1234 ' | 0 - # ^-----20-chars-----^^------22-chars------^ - # ^-- grep points here - # - # var_* are as described above - # shift_by seems to be safe so long as all patchelf adjustments occur - # before any locations pointed to by hardcoded offsets - - var_skip=20 - var_select=22 - shift_by=$(expr $new_size - $orig_size) - - function fix_offset { - # $1 = name of variable to adjust - location=$(grep -obUam1 "$1" $out/bin/dat | cut -d: -f1) - location=$(expr $location + $var_skip) - - value=$(dd if=$out/bin/dat iflag=count_bytes,skip_bytes skip=$location \ - bs=1 count=$var_select status=none) - value=$(expr $shift_by + $value) - - echo -n $value | dd of=$out/bin/dat bs=1 seek=$location conv=notrunc - } - - fix_offset PAYLOAD_POSITION - fix_offset PRELUDE_POSITION - ''; - - meta = with stdenv.lib; { - description = "Peer-to-peer sharing and live synchronization of files"; - homepage = "https://dat.foundation/"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ prusnak ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b6f410493a..6b15194fd0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25926,5 +25926,5 @@ in quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - dat = callPackage ../applications/networking/dat { }; + dat = nodePackages.dat; } From 47a68b3ca7169e8757e292c00d0d91ea56d30a51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 14:44:53 +0000 Subject: [PATCH 059/241] worker: 4.1.0 -> 4.2.0 --- pkgs/applications/misc/worker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index d4b34e2bb7f..6bc118897b0 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "19v4g34sk4fkagk0s60rbixyrrgg22qy1xwffm8b5ffq36r7yfch"; + sha256 = "17b845x09q0cfk12hd3f7y08diqrflrr2aj2nwf4szy4f52jk5gz"; }; buildInputs = [ libX11 ]; From 6a043cacab1d6492a5e663062097536b0168a6fa Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 30 Jan 2020 16:13:03 +0100 Subject: [PATCH 060/241] yubikey-manager-qt: 1.1.3 -> 1.1.4 --- pkgs/tools/misc/yubikey-manager-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 810c2f49a5e..7fa0e70cd2e 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -20,11 +20,11 @@ let inherit (stdenv) lib; in stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "087ms9i0n3rm8a0hvc4a2dk3rffbm6rmgz0m8gbjk6g37iml6nb7"; + sha256 = "0rbr72741q7fqkr9qmvgj2mi6192ayz7bl935q2bsnqils4wsa3f"; }; nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; From 0cff355f27369426477714ba2b5a9419926b097d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 16:47:47 +0000 Subject: [PATCH 061/241] tintin: 2.01.92 -> 2.02.01 --- pkgs/games/tintin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index 9b58725a392..62fda890e84 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -6,11 +6,11 @@ assert tlsSupport -> gnutls != null; stdenv.mkDerivation rec { - name = "tintin-2.01.92"; + name = "tintin-2.02.01"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "0id8rd2yhh6ccjnlwyixflsay1rq3sw6pwlhz1ic3nzj22cd91ik"; + sha256 = "15ajs6d0rb3xchd46gyziciz9vv0ks75schk1s4hs7pr30yr7k6y"; }; nativeBuildInputs = lib.optional tlsSupport gnutls.dev; From 44b9f9b55ec1212fbde905221a7733c4d7f9b21c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 17:32:57 +0000 Subject: [PATCH 062/241] vnstat: 2.4 -> 2.6 --- pkgs/applications/networking/vnstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index acda73b0f09..44b8a955817 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.4"; + version = "2.6"; src = fetchurl { - sha256 = "1amb8l97y6acp9j1xs2da3mdk6hykg6drzsps9im8vfmmfcmk5d0"; + sha256 = "1xvzkxkq1sq33r2s4f1967f4gnca4xw411sbapdkx541f856w9w9"; url = "https://humdi.net/${pname}/${pname}-${version}.tar.gz"; }; From 6d799c394c0760633d974a7bd017c1275ac7838a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Jan 2020 19:02:04 +0100 Subject: [PATCH 063/241] speechd: clean up --- .../development/libraries/speechd/default.nix | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 43360d781cd..20bab968513 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,6 +1,15 @@ -{ stdenv, pkgconfig, fetchurl, python3Packages -, intltool, itstool, libtool, texinfo, autoreconfHook -, glib, dotconf, libsndfile +{ stdenv +, pkgconfig +, fetchurl +, python3Packages +, intltool +, itstool +, libtool +, texinfo +, autoreconfHook +, glib +, dotconf +, libsndfile , withLibao ? true, libao , withPulse ? false, libpulseaudio , withAlsa ? false, alsaLib @@ -35,11 +44,29 @@ in stdenv.mkDerivation rec { sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook intltool libtool itstool texinfo wrapPython ]; + nativeBuildInputs = [ + pkgconfig + autoreconfHook + intltool + libtool + itstool + texinfo + wrapPython + ]; - buildInputs = [ glib dotconf libsndfile libao libpulseaudio alsaLib python ] - ++ optionals withEspeak [ espeak sonic pcaudiolib ] - ++ optional withFlite flite + buildInputs = [ + glib + dotconf + libsndfile + libao + libpulseaudio + alsaLib + python + ] ++ optionals withEspeak [ + espeak + sonic + pcaudiolib + ] ++ optional withFlite flite ++ optional withPico svox # TODO: add flint/festival support with festival-freebsoft-utils package # ++ optional withFestival festival-freebsoft-utils @@ -73,7 +100,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common interface to speech synthesis"; - homepage = https://devel.freebsoft.org/speechd; + homepage = "https://devel.freebsoft.org/speechd"; license = licenses.gpl2Plus; maintainers = with maintainers; [ berce ]; platforms = platforms.linux; From 28c815e34b90337e699432fffed2efc1b31fc6d0 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 30 Jan 2020 14:16:17 -0500 Subject: [PATCH 064/241] nixos/duosec: fix configuration issue with "groups" option --- nixos/modules/security/duosec.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 78a82b7154e..c686a6861d0 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -12,7 +12,7 @@ let ikey=${cfg.ikey} skey=${cfg.skey} host=${cfg.host} - ${optionalString (cfg.group != "") ("group="+cfg.group)} + ${optionalString (cfg.groups != "") ("groups="+cfg.groups)} failmode=${cfg.failmode} pushinfo=${boolToStr cfg.pushinfo} autopush=${boolToStr cfg.autopush} @@ -42,6 +42,10 @@ let }; in { + imports = [ + (mkRenamedOptionModule [ "security" "duosec" "group" ] [ "security" "duosec" "groups" ]) + ]; + options = { security.duosec = { ssh.enable = mkOption { @@ -71,10 +75,16 @@ in description = "Duo API hostname."; }; - group = mkOption { + groups = mkOption { type = types.str; default = ""; - description = "Use Duo authentication for users only in this group."; + example = "users,!wheel,!*admin guests"; + description = '' + If specified, Duo authentication is required only for users + whose primary group or supplementary group list matches one + of the space-separated pattern lists. Refer to + for details. + ''; }; failmode = mkOption { From fb112ee97f04f26ac73ae2413a31b3b5a023bf6a Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 29 Jan 2020 12:40:44 -0500 Subject: [PATCH 065/241] add maintainer: drewrisinger University of Maryland PhD Student. Quantum Computing. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0da9e6df171..36ba653c878 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1905,6 +1905,12 @@ email = "burkett.andrew@gmail.com"; name = "Andrew Burkett"; }; + drewrisinger = { + email = "drisinger+nixpkgs@gmail.com"; + github = "drewrisinger"; + gitHubId = 10198051; + name = "Drew Risinger"; + }; dsferruzza = { email = "david.sferruzza@gmail.com"; github = "dsferruzza"; From 8d510b34244b5715bf8406762ad7fab921738607 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 20:22:35 +0000 Subject: [PATCH 066/241] axel: 2.17.6 -> 2.17.7 --- pkgs/tools/networking/axel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index a9ddd9a8b68..161148f4627 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.6"; + version = "2.17.7"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "011cpkf6hpia5b5wfhy84fxfqpishdkvrg0kpbfprymq9bxjp0yl"; + sha256 = "0z20d2fkf69v35d4pkba95vnk7yq7393kwikmb64y7cjyz4m2ngk"; }; nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; From b2122bd2bb143e9392f0676c99047c8ae9843355 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 20:38:30 +0000 Subject: [PATCH 067/241] blugon: 1.11.4 -> 1.12.0 --- pkgs/applications/misc/blugon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blugon/default.nix b/pkgs/applications/misc/blugon/default.nix index e6f956cc091..cdb317749ef 100644 --- a/pkgs/applications/misc/blugon/default.nix +++ b/pkgs/applications/misc/blugon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "blugon"; - version = "1.11.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "jumper149"; repo = pname; rev = version; - sha256 = "0x320w2h5nlcgha4345i8ns15akb4kmrdgkh710s4r1n1by4x11r"; + sha256 = "0vdhq8v011awhpkccbcmigj9c46widyzh0m5knafapanai3kv7ii"; }; buildInputs = [ python3 libX11 libXrandr ]; From 410a80381cfba68b217a3c69c756a8d8a4cbe994 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 31 Jan 2020 00:13:53 +0300 Subject: [PATCH 068/241] gpxlab: enable on darwin --- pkgs/applications/misc/gpxlab/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index b4778f9f4f8..3b432ff66b1 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }: mkDerivation rec { pname = "gpxlab"; @@ -18,6 +18,12 @@ mkDerivation rec { lrelease GPXLab/locale/*.ts ''; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv GPXLab/GPXLab.app $out/Applications + wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab + ''; + enableParallelBuilding = true; meta = with lib; { @@ -29,6 +35,6 @@ mkDerivation rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } From 85fcf3d7a8a49fa9bbf64e1f80896a5b6b832cec Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 18:14:14 -0500 Subject: [PATCH 069/241] nixosTests.blivet: remove These have been broken since 2017-07-24, and the package is hopelessly out of date as well. --- nixos/tests/all-tests.nix | 1 - nixos/tests/blivet.nix | 87 ------------------- .../python-modules/blivet/default.nix | 1 - 3 files changed, 89 deletions(-) delete mode 100644 nixos/tests/blivet.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8c11464f9d6..fdbae204bd2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -32,7 +32,6 @@ in bees = handleTest ./bees.nix {}; bind = handleTest ./bind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; - #blivet = handleTest ./blivet.nix {}; # broken since 2017-07024 buildkite-agent = handleTest ./buildkite-agent.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 boot-stage1 = handleTest ./boot-stage1.nix {}; diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix deleted file mode 100644 index 2adc2ee1eee..00000000000 --- a/nixos/tests/blivet.nix +++ /dev/null @@ -1,87 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: with pkgs.python2Packages; rec { - name = "blivet"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig ]; - }; - - machine = { - environment.systemPackages = [ pkgs.python blivet mock ]; - boot.supportedFilesystems = [ "btrfs" "jfs" "reiserfs" "xfs" ]; - virtualisation.memorySize = 768; - }; - - debugBlivet = false; - debugProgramCalls = false; - - pythonTestRunner = pkgs.writeText "run-blivet-tests.py" '' - import sys - import logging - - from unittest import TestLoader - from unittest.runner import TextTestRunner - - ${pkgs.lib.optionalString debugProgramCalls '' - blivet_program_log = logging.getLogger("program") - blivet_program_log.setLevel(logging.DEBUG) - blivet_program_log.addHandler(logging.StreamHandler(sys.stderr)) - ''} - - ${pkgs.lib.optionalString debugBlivet '' - blivet_log = logging.getLogger("blivet") - blivet_log.setLevel(logging.DEBUG) - blivet_log.addHandler(logging.StreamHandler(sys.stderr)) - ''} - - runner = TextTestRunner(verbosity=2, failfast=False, buffer=False) - result = runner.run(TestLoader().discover('tests/', pattern='*_test.py')) - sys.exit(not result.wasSuccessful()) - ''; - - blivetTest = pkgs.writeScript "blivet-test.sh" '' - #!${pkgs.stdenv.shell} -e - - # Use the hosts temporary directory, because we have a tmpfs within the VM - # and we don't want to increase the memory size of the VM for no reason. - mkdir -p /tmp/xchg/bigtmp - TMPDIR=/tmp/xchg/bigtmp - export TMPDIR - - cp -Rd "${blivet.src}/tests" . - - # Skip SELinux tests - rm -f tests/formats_test/selinux_test.py - - # Race conditions in growing/shrinking during resync - rm -f tests/devicelibs_test/mdraid_* - - # Deactivate small BTRFS device test, because it fails with newer btrfsprogs - sed -i -e '/^class *BTRFSAsRootTestCase3(/,/^[^ ]/ { - /^class *BTRFSAsRootTestCase3(/d - /^$/d - /^ /d - }' tests/devicelibs_test/btrfs_test.py - - # How on earth can these tests ever work even upstream? O_o - sed -i -e '/def testDiskChunk[12]/,/^ *[^ ]/{n; s/^ */&return # /}' \ - tests/partitioning_test.py - - # fix hardcoded temporary directory - sed -i \ - -e '1i import tempfile' \ - -e 's|_STORE_FILE_PATH = .*|_STORE_FILE_PATH = tempfile.gettempdir()|' \ - -e 's|DEFAULT_STORE_SIZE = .*|DEFAULT_STORE_SIZE = 409600|' \ - tests/loopbackedtestcase.py - - PYTHONPATH=".:$(< "${pkgs.stdenv.mkDerivation { - name = "blivet-pythonpath"; - buildInputs = [ blivet mock ]; - buildCommand = "echo \"$PYTHONPATH\" > \"$out\""; - }}")" python "${pythonTestRunner}" - ''; - - testScript = '' - $machine->waitForUnit("multi-user.target"); - $machine->succeed("${blivetTest}"); - $machine->execute("rm -rf /tmp/xchg/bigtmp"); - ''; -}) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 9bf93fe8c38..4b96e86193d 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -34,7 +34,6 @@ in buildPythonPackage rec { six ]; - # Tests are in nixos/tests/blivet.nix. doCheck = false; meta = with stdenv.lib; { From 1ebc042878132a31f80b76938c47c0bee2932487 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 10:26:55 +0000 Subject: [PATCH 070/241] dale: 20170519 -> 20181024 --- pkgs/development/compilers/dale/default.nix | 12 +++++------- pkgs/development/compilers/dale/link-llvm.patch | 10 ---------- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/compilers/dale/link-llvm.patch diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 128c245d277..9c70e96a9c0 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -3,12 +3,12 @@ , cmake , pkgconfig , libffi -, llvm_35 +, llvm_6 , doCheck ? false , perl }: -let version = "20170519"; +let version = "20181024"; in stdenv.mkDerivation { pname = "dale"; @@ -17,16 +17,14 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "tomhrr"; repo = "dale"; - rev = "39e16d8e89fa070de65a673d4462e783d530f95a"; - sha256 = "0dc5cjahv7lzlp92hidlh83rwgrpgb6xz2pnba2pm5xrv2pnsskl"; + rev = "f5db8b486f4e7c423fc25941a8315f1209bc0e54"; + sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libffi llvm_35 ] + buildInputs = [ cmake libffi llvm_6 ] ++ stdenv.lib.optional doCheck perl; - patches = [ ./link-llvm.patch ]; - inherit doCheck; checkTarget = "tests"; diff --git a/pkgs/development/compilers/dale/link-llvm.patch b/pkgs/development/compilers/dale/link-llvm.patch deleted file mode 100644 index 3facec91874..00000000000 --- a/pkgs/development/compilers/dale/link-llvm.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dale-39e16d8e89fa070de65a673d4462e783d530f95a-src.org/CMakeLists.txt 2017-06-22 08:01:05.839531242 +0100 -+++ dale-39e16d8e89fa070de65a673d4462e783d530f95a-src/CMakeLists.txt 2017-06-22 07:59:11.777566801 +0100 -@@ -78,6 +78,7 @@ - execute_process (COMMAND ${LLVM_CONFIG} --libs - OUTPUT_VARIABLE LLVM_LIBS - OUTPUT_STRIP_TRAILING_WHITESPACE) -+STRING(REGEX REPLACE " " ";" LLVM_LIBS "${LLVM_LIBS}") - if (${D_LLVM_VERSION_MINOR} GREATER 4) - execute_process (COMMAND ${LLVM_CONFIG} --system-libs - OUTPUT_VARIABLE LLVM_SYSTEM_LIBS From 4fa34c2283c859be60da2a054efd87cf91514373 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 14:55:19 +0000 Subject: [PATCH 071/241] llvm-general: remove --- .../haskell-modules/configuration-nix.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9a293de7712..b2c65b7f03a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -282,20 +282,6 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-general = - # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 - let base = super.llvm-general.override { llvm-config = pkgs.llvm_35; }; - in if !pkgs.stdenv.isDarwin then base else overrideCabal base ( - drv: { - preConfigure = '' - sed -i llvm-general.cabal \ - -e 's,extra-libraries: stdc++,extra-libraries: c++,' - ''; - configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; - librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; - } - ); - llvm-hs = let llvmHsWithLlvm8 = super.llvm-hs.override { llvm-config = pkgs.llvm_8; }; in From cba2e83255bde37efae3000cfbc1876a4fab2f1a Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 15:19:56 +0000 Subject: [PATCH 072/241] lightspark: 0.8.1 -> 0.8.2 --- pkgs/misc/lightspark/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index 5e3f1bb7981..a821d430f6c 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg, glew, pcre , rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm -, llvm_39, glibmm +, llvm, glibmm }: stdenv.mkDerivation rec { pname = "lightspark"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "lightspark"; repo = "lightspark"; rev = version; - sha256 = "0chydd516wfi73n8dvivk6nwxb9kjimdfghyv9sffmqmza0mv13s"; + sha256 = "04wn6d6gmpf848x0yghw26m9syv0hm6q5dwqiw3fxhs155jjqfgv"; }; patchPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg - gnome2.pango lzma nasm llvm_39 glibmm + gnome2.pango lzma nasm llvm glibmm ]; enableParallelBuilding = true; From f6160bc6eb3ef586091aeba077ae4aaabd0a09a8 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 17:54:57 +0000 Subject: [PATCH 073/241] haskell.compiler.ghc822Binary: use default llvm version on aarch64 --- pkgs/development/compilers/ghc/8.2.2-binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index d68bf7e24b5..1f24b9a1ff2 100644 --- a/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll -, fetchurl, perl, gcc, llvm_39 +, fetchurl, perl, gcc, llvm , ncurses5, gmp, glibc, libiconv }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; + buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ From b57464448b41068d7bc667010ac594e292e554d5 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 17:56:06 +0000 Subject: [PATCH 074/241] haskell.compiler.ghc863Binary: remove llvm from buildInput Aarch64 binary is not used. --- pkgs/development/compilers/ghc/8.6.3-binary.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.3-binary.nix index 152bd5e4874..fe576186b0e 100644 --- a/pkgs/development/compilers/ghc/8.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.3-binary.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl, perl, gcc, llvm_39 +, fetchurl, perl, gcc , ncurses5, gmp, glibc, libiconv }: @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ From ae2a5a91ddf1923e6717ace65b5b8b92b4fd7ec4 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 18:05:48 +0000 Subject: [PATCH 075/241] pure: mark as broken --- pkgs/development/interpreters/pure/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 764ee241aff..19e6c93378f 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; license = lib.licenses.gpl3Plus; + broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92d90410ee1..cba820531a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9325,7 +9325,7 @@ in polyml57 = callPackage ../development/compilers/polyml/5.7.nix { }; pure = callPackage ../development/interpreters/pure { - llvm = llvm_35; + /*llvm = llvm_35;*/ }; purePackages = recurseIntoAttrs (callPackage ./pure-packages.nix {}); From fd614a8e8fd557ff629457894a26c1454e4337aa Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 18:10:34 +0000 Subject: [PATCH 076/241] saw-tools: use default llvm --- pkgs/applications/science/logic/saw-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index c4041281054..71b26f8023a 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp4, ncurses, zlib, clang_35 }: +{ stdenv, fetchurl, gmp4, ncurses, zlib, clang }: let libPath = stdenv.lib.makeLibraryPath @@ -38,7 +38,7 @@ stdenv.mkDerivation { ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0 # Add a clang symlink for easy building with a suitable compiler. - ln -s ${clang_35}/bin/clang $out/bin/saw-clang + ln -s ${clang}/bin/clang $out/bin/saw-clang ''; fixupPhase = '' From 8acbff31fb2d64cf3314a2fca24383e5f4971af4 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 18:12:03 +0000 Subject: [PATCH 077/241] ue4: use default llvm --- pkgs/games/ue4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index a32da556cc9..5eb97e99189 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, fetchurl, requireFile, unzip, clang_35, mono, which, +{ stdenv, writeScript, fetchurl, requireFile, unzip, clang, mono, which, xorg, xdg-user-dirs }: let @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { cp -r . "$sharedir" ''; - buildInputs = [ clang_35 mono which xdg-user-dirs ]; + buildInputs = [ clang mono which xdg-user-dirs ]; meta = { description = "A suite of integrated tools for game developers to design and build games, simulations, and visualizations"; From 3a12a7cde83ec7e599d59d86509c08ef43de0f86 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 18:18:18 +0000 Subject: [PATCH 078/241] llvm_35: remove --- .../compilers/llvm/3.5/clang-purity.patch | 22 ----- .../llvm/3.5/clang-separate-build.patch | 8 -- pkgs/development/compilers/llvm/3.5/clang.nix | 59 ----------- .../compilers/llvm/3.5/default.nix | 43 -------- .../compilers/llvm/3.5/dragonegg.nix | 27 ------ .../compilers/llvm/3.5/fix-15974.patch | 15 --- .../compilers/llvm/3.5/libc++/darwin.patch | 30 ------ .../compilers/llvm/3.5/libc++/default.nix | 54 ----------- .../compilers/llvm/3.5/libc++/setup-hook.sh | 6 -- .../llvm/3.5/libc++/xlocale-glibc-2.26.patch | 17 ---- .../compilers/llvm/3.5/libc++abi/default.nix | 60 ------------ pkgs/development/compilers/llvm/3.5/lld.nix | 30 ------ pkgs/development/compilers/llvm/3.5/lldb.nix | 45 --------- .../llvm/3.5/llvm-separate-build.patch | 12 --- pkgs/development/compilers/llvm/3.5/llvm.nix | 97 ------------------- .../llvm/3.5/polly-separate-build.patch | 12 --- pkgs/development/compilers/llvm/3.5/polly.nix | 26 ----- .../compilers/llvm/fix-llvm-config.patch | 13 --- pkgs/top-level/all-packages.nix | 8 -- 19 files changed, 584 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/3.5/clang-purity.patch delete mode 100644 pkgs/development/compilers/llvm/3.5/clang-separate-build.patch delete mode 100644 pkgs/development/compilers/llvm/3.5/clang.nix delete mode 100644 pkgs/development/compilers/llvm/3.5/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.5/dragonegg.nix delete mode 100644 pkgs/development/compilers/llvm/3.5/fix-15974.patch delete mode 100644 pkgs/development/compilers/llvm/3.5/libc++/darwin.patch delete mode 100644 pkgs/development/compilers/llvm/3.5/libc++/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch delete mode 100644 pkgs/development/compilers/llvm/3.5/libc++abi/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.5/lld.nix delete mode 100644 pkgs/development/compilers/llvm/3.5/lldb.nix delete mode 100644 pkgs/development/compilers/llvm/3.5/llvm-separate-build.patch delete mode 100644 pkgs/development/compilers/llvm/3.5/llvm.nix delete mode 100644 pkgs/development/compilers/llvm/3.5/polly-separate-build.patch delete mode 100644 pkgs/development/compilers/llvm/3.5/polly.nix delete mode 100644 pkgs/development/compilers/llvm/fix-llvm-config.patch diff --git a/pkgs/development/compilers/llvm/3.5/clang-purity.patch b/pkgs/development/compilers/llvm/3.5/clang-purity.patch deleted file mode 100644 index dc3b54e304f..00000000000 --- a/pkgs/development/compilers/llvm/3.5/clang-purity.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp -index 198e82e..810d006 100644 ---- a/lib/Driver/Tools.cpp -+++ b/lib/Driver/Tools.cpp -@@ -7355,17 +7355,6 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, - CmdArgs.push_back("-shared"); - } - -- if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::armeb || -- ToolChain.getArch() == llvm::Triple::thumb || -- ToolChain.getArch() == llvm::Triple::thumbeb || -- (!Args.hasArg(options::OPT_static) && -- !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString( -- D.DyldPrefix + getLinuxDynamicLinker(Args, ToolChain))); -- } -- - CmdArgs.push_back("-o"); - CmdArgs.push_back(Output.getFilename()); - diff --git a/pkgs/development/compilers/llvm/3.5/clang-separate-build.patch b/pkgs/development/compilers/llvm/3.5/clang-separate-build.patch deleted file mode 100644 index 5fb67f169f4..00000000000 --- a/pkgs/development/compilers/llvm/3.5/clang-separate-build.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -Naur clang-3.4-orig/tools/extra/CMakeLists.txt clang-3.4/tools/extra/CMakeLists.txt ---- clang-3.4-orig/tools/extra/CMakeLists.txt 2013-11-07 19:08:23.000000000 -0500 -+++ clang-3.4/tools/extra/CMakeLists.txt 2014-01-20 11:47:22.678435223 -0500 -@@ -1,3 +1,4 @@ -+include(CheckLibraryExists) - check_library_exists(edit el_init "" HAVE_LIBEDIT) - - add_subdirectory(clang-apply-replacements) diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix deleted file mode 100644 index 9a602c62777..00000000000 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }: -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; -in stdenv.mkDerivation { - pname = "clang"; - inherit version; - - src = fetch "cfe" "0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - buildInputs = [ cmake libxml2 llvm ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ - # Maybe with compiler-rt this won't be needed? - (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - - patches = [ ./clang-purity.patch ]; - - postPatch = '' - sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp - ''; - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ln -sv $out/bin/clang $out/bin/cpp - ''; - - enableParallelBuilding = true; - - passthru = { - isClang = true; - } // stdenv.lib.optionalAttrs stdenv.isLinux { - inherit gcc; - }; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.5/default.nix b/pkgs/development/compilers/llvm/3.5/default.nix deleted file mode 100644 index b87fa747f14..00000000000 --- a/pkgs/development/compilers/llvm/3.5/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ pkgs, newScope, stdenv, isl, fetchurl }: -let - callPackage = newScope (self // { inherit stdenv isl version fetch; }); - - version = "3.5.2"; - - fetch = fetch_v version; - fetch_v = ver: name: sha256: fetchurl { - url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "1hsdnzzdr5kglz6fnv3lcsjs222zjsy14y8ax9dy6zqysanplbal"; - clang-tools-extra_src = fetch "clang-tools-extra" "01607w6hdf1pjgaapn9fy6smk22i3d4ncqjlhk4xi55ifi6kf6pj"; - - self = { - llvm = callPackage ./llvm.nix rec { - version = "3.5.2"; - fetch = fetch_v version; - inherit compiler-rt_src; - }; - - clang = callPackage ./clang.nix rec { - version = "3.5.2"; - fetch = fetch_v version; - inherit clang-tools-extra_src; - }; - - lld = callPackage ./lld.nix {}; - - lldb = callPackage ./lldb.nix {}; - - polly = callPackage ./polly.nix {}; - - dragonegg = callPackage ./dragonegg.nix {}; - - libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; }; - - libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; }; - - #openmp = callPackage ./openmp {}; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix deleted file mode 100644 index e327fa79c6f..00000000000 --- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}: - -stdenv.mkDerivation rec { - pname = "dragonegg"; - inherit version; - - src = fetch "dragonegg" "1va4wv2b1dj0dpzsksnpnd0jic52q7pqj79w3m9jwdb58h7104dw"; - - # The gcc the plugin will be built for (the same used building dragonegg) - GCC = "gcc"; - - buildInputs = [ llvm gmp mpfr libmpc ncurses zlib ]; - - installPhase = '' - mkdir -p $out/lib $out/share/doc/${pname}-${version} - cp -d dragonegg.so $out/lib - cp README COPYING $out/share/doc/${pname}-${version} - ''; - - meta = { - homepage = http://dragonegg.llvm.org/; - description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/development/compilers/llvm/3.5/fix-15974.patch b/pkgs/development/compilers/llvm/3.5/fix-15974.patch deleted file mode 100644 index 446004cd998..00000000000 --- a/pkgs/development/compilers/llvm/3.5/fix-15974.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h -index f9df378..9d860ec 100644 ---- a/include/llvm/ADT/IntrusiveRefCntPtr.h -+++ b/include/llvm/ADT/IntrusiveRefCntPtr.h -@@ -134,9 +134,9 @@ public: - //===----------------------------------------------------------------------===// - template - class IntrusiveRefCntPtr { -+ public: - T* Obj; - -- public: - typedef T element_type; - - explicit IntrusiveRefCntPtr() : Obj(nullptr) {} diff --git a/pkgs/development/compilers/llvm/3.5/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.5/libc++/darwin.patch deleted file mode 100644 index bf83f169cfc..00000000000 --- a/pkgs/development/compilers/llvm/3.5/libc++/darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru -x '*~' libcxx-3.4.2.src-orig/lib/CMakeLists.txt libcxx-3.4.2.src/lib/CMakeLists.txt ---- libcxx-3.4.2.src-orig/lib/CMakeLists.txt 2013-11-15 18:18:57.000000000 +0100 -+++ libcxx-3.4.2.src/lib/CMakeLists.txt 2014-09-24 14:04:01.000000000 +0200 -@@ -56,7 +56,7 @@ - "-compatibility_version 1" - "-current_version ${LIBCXX_VERSION}" - "-install_name /usr/lib/libc++.1.dylib" -- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" -+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "/usr/lib/libSystem.B.dylib") - else() -@@ -64,14 +64,14 @@ - list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) - if (OSX_HAS_ARMV7) - set(OSX_RE_EXPORT_LINE -- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" -+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") - else() - set(OSX_RE_EXPORT_LINE -- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") -+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") - endif() - else() -- set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") -+ set (OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") - endif() - - list(APPEND link_flags diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix deleted file mode 100644 index 44610a1b11d..00000000000 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, libcxxabi, fixDarwinDylibNames }: - -let version = "3.5.2"; in - -stdenv.mkDerivation { - pname = "libc++"; - inherit version; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.xz"; - sha256 = "0irnl54fwzh2hzn9x4jfvnfyq5kd0zn0iwbzdivgwhqzw6fjdwdv"; - }; - - # instead of allowing libc++ to link with /usr/lib/libc++abi.dylib, - # force it to link with our copy - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace lib/CMakeLists.txt \ - --replace 'OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib' \ - 'OSX_RE_EXPORT_LINE "${libcxxabi}/lib/libc++abi.dylib' \ - --replace '"''${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"' \ - '"${libcxxabi}/lib/libc++abi.dylib"' - ''; - - patches = [ - ./darwin.patch - # glibc 2.26 fix - ./xlocale-glibc-2.26.patch - ]; - - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; - - enableParallelBuilding = true; - - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; - - meta = { - homepage = http://libcxx.llvm.org/; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh deleted file mode 100644 index 6611259165a..00000000000 --- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch b/pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch deleted file mode 100644 index 250bb49fc23..00000000000 --- a/pkgs/development/compilers/llvm/3.5/libc++/xlocale-glibc-2.26.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/include/__locale b/include/__locale -index 3daa1f1..cb8e151 100644 ---- a/include/__locale -+++ b/include/__locale -@@ -29,10 +29,10 @@ - # if __ANDROID_API__ <= 20 - # include - # endif --#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ -+#elif (defined(__APPLE__) || defined(__FreeBSD__) \ - || defined(__sun__) || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) - # include --#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ -+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ - - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) - #pragma GCC system_header diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix deleted file mode 100644 index d295ddbf8a4..00000000000 --- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, cmake, fetchurl, libcxx, libunwind, llvm }: - -let - version = "3.5.2"; - cmakeLists = fetchurl { - name = "CMakeLists.txt"; - url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk/CMakeLists.txt?p=217324"; - sha256 = "10idgcbs4pcx6mjsbq1vjm8hzqqdk2p7k86cw9f473jmfyfwgf5j"; - }; -in stdenv.mkDerivation { - pname = "libc++abi"; - inherit version; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/libcxxabi-${version}.src.tar.xz"; - sha256 = "1c6rv0zx0na1w4hdmdfq2f6nj7limb7d1krrknwajxxkcn4yws92"; - }; - - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - echo cp ${cmakeLists} libcxxabi-*/CMakeLists.txt - cp ${cmakeLists} libcxxabi-*/CMakeLists.txt - export NIX_CFLAGS_COMPILE+=" -I$PWD/include" - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - ''; - - installPhase = if stdenv.isDarwin - then '' - for file in lib/*; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/cxxabi.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 $src/include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; - - meta = { - homepage = http://libcxxabi.llvm.org/; - description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix deleted file mode 100644 index 8fe4dd6f1d5..00000000000 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }: - -stdenv.mkDerivation { - pname = "lld"; - inherit version; - - src = fetch "lld" "1hpqawg1sc8mdqxqaxqmlzbrn69w1pkj8rxhjgqgmwra6c0xky89"; - - preUnpack = '' - # !!! Hopefully won't be needed for 3.5 - unpackFile ${llvm.src} - export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*` - ''; - - buildInputs = [ cmake ncurses zlib python ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLD_PATH_TO_LLVM_BUILD=${llvm}" - ]; - - enableParallelBuilding = true; - - meta = { - description = "A set of modular code for creating linker tools"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix deleted file mode 100644 index b4823e9d8c2..00000000000 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, llvm -, clang -, python -, version -}: - -stdenv.mkDerivation { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "0ffi9jn4k3yd0hvxs1v4n710x8siq21lb49v3351d7j5qinrpgi7"; - - patchPhase = '' - sed -i 's|/usr/bin/env||' \ - scripts/Python/finish-swig-Python-LLDB.sh \ - scripts/Python/build-swig-Python.sh - ''; - - buildInputs = [ cmake python which swig ncurses zlib libedit ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" - "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" - "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 - ]; - - enableParallelBuilding = true; - - meta = { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - broken = true; - }; -} diff --git a/pkgs/development/compilers/llvm/3.5/llvm-separate-build.patch b/pkgs/development/compilers/llvm/3.5/llvm-separate-build.patch deleted file mode 100644 index abfc11513cd..00000000000 --- a/pkgs/development/compilers/llvm/3.5/llvm-separate-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur llvm-3.4-orig/cmake/modules/TableGen.cmake llvm-3.4/cmake/modules/TableGen.cmake ---- llvm-3.4-orig/cmake/modules/TableGen.cmake 2013-10-06 21:00:07.000000000 -0400 -+++ llvm-3.4/cmake/modules/TableGen.cmake 2014-01-20 13:06:55.273022149 -0500 -@@ -78,8 +78,6 @@ - endif() - - macro(add_tablegen target project) -- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR}) -- - set(${target}_OLD_LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS}) - set(LLVM_LINK_COMPONENTS ${LLVM_LINK_COMPONENTS} TableGen) - add_llvm_utility(${target} ${ARGN}) diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix deleted file mode 100644 index fc53ad266a6..00000000000 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ stdenv -, fetch -, fetchpatch -, perl -, groff -, cmake -, python -, libffi -, libbfd -, libxml2 -, valgrind -, ncurses -, version -, zlib -, compiler-rt_src -, debugVersion ? false -, enableSharedLibraries ? !stdenv.isDarwin -}: - -stdenv.mkDerivation { - pname = "llvm"; - inherit version; - - src = fetch "llvm" "0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}.src llvm - sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt - ''; - - buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind; - - propagatedBuildInputs = [ ncurses zlib ]; - - prePatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ - --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" - ''; - - postPatch = stdenv.lib.optionalString (stdenv ? glibc) '' - ( - cd projects/compiler-rt - patch -p1 < ${ - fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - } - } - - sed -i "s,#include ,&\n#include ,g" \ - lib/asan/asan_linux.cc - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_REQUIRES_RTTI=1" - ] ++ stdenv.lib.optional enableSharedLibraries - "-DBUILD_SHARED_LIBS=ON" - ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals ( isDarwin) [ - "-DCMAKE_CXX_FLAGS=-stdlib=libc++" - "-DCAN_TARGET_i386=false" - ]; - - patches = [ ./fix-15974.patch ] ++ - stdenv.lib.optionals (!stdenv.isDarwin) [../fix-llvm-config.patch ]; - - postBuild = '' - rm -fR $out - ''; - - enableParallelBuilding = true; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; - }; -} - diff --git a/pkgs/development/compilers/llvm/3.5/polly-separate-build.patch b/pkgs/development/compilers/llvm/3.5/polly-separate-build.patch deleted file mode 100644 index 618dd4dc3b1..00000000000 --- a/pkgs/development/compilers/llvm/3.5/polly-separate-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur polly-3.4-orig/CMakeLists.txt polly-3.4/CMakeLists.txt ---- polly-3.4-orig/CMakeLists.txt 2013-11-21 06:51:46.000000000 -0500 -+++ polly-3.4/CMakeLists.txt 2014-01-20 18:49:34.907919933 -0500 -@@ -53,7 +53,7 @@ - execute_process(COMMAND "${LLVM_INSTALL_ROOT}/bin/llvm-config" --cxxflags - OUTPUT_VARIABLE LLVM_CXX_FLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) -- set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_CXX_FLAGS}") - endif(NOT DEFINED LLVM_MAIN_SRC_DIR) - - set(POLLY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix deleted file mode 100644 index 06bc7490c7b..00000000000 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetch, cmake, isl, python, gmp, llvm, version }: - -stdenv.mkDerivation { - pname = "polly"; - inherit version; - - src = fetch "polly" "1s6v54czmgq626an4yk2k34lrzkwmz1bjrbiafh7j23yc2w4nalx"; - - patches = [ ./polly-separate-build.patch ]; - - buildInputs = [ cmake isl python gmp ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLVM_INSTALL_ROOT=${llvm}" - ]; - - enableParallelBuilding = true; - - meta = { - description = "A polyhedral optimizer for llvm"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/fix-llvm-config.patch b/pkgs/development/compilers/llvm/fix-llvm-config.patch deleted file mode 100644 index 772c4960927..00000000000 --- a/pkgs/development/compilers/llvm/fix-llvm-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py -index eacefdf60bf..40d25f5cef8 100644 ---- a/utils/llvm-build/llvmbuild/main.py -+++ b/utils/llvm-build/llvmbuild/main.py -@@ -412,7 +412,7 @@ subdirectories = %s - if library_name is None: - library_name_as_cstr = '0' - else: -- library_name_as_cstr = '"lib%s.a"' % library_name -+ library_name_as_cstr = '"lib%s.so"' % library_name - f.write(' { "%s", %s, %d, { %s } },\n' % ( - name, library_name_as_cstr, is_installed, - ', '.join('"%s"' % dep diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cba820531a6..72d8f3d767b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7828,7 +7828,6 @@ in clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; - clang_35 = wrapCC llvmPackages_35.clang; clang-tools = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_latest; @@ -8548,16 +8547,9 @@ in llvm_5 = llvmPackages_5.llvm; llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; - llvm_35 = llvmPackages_35.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; - llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ - isl = isl_0_14; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; - }); - llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_39.tools; From 668b3e7de49a6e57440e855c6ea37692c37d1638 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 18:40:12 +0000 Subject: [PATCH 079/241] configuration-ghc-8.2.x: use default llvmPackages --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 8e796aa3f1f..045c5dc1e5b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -5,7 +5,7 @@ with haskellLib; self: super: { # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages_39; + llvmPackages = pkgs.llvmPackages; # Disable GHC 8.2.x core libraries. array = null; From 2d8d2c3fb8f472ea1ea0e9d259f79c5f62f56a1e Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 18:55:51 +0000 Subject: [PATCH 080/241] rdedup: use default clang version --- pkgs/tools/backup/rdedup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index bd5c10ea122..29204417b22 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium -, llvmPackages, clang_39, lzma +, llvmPackages, clang, lzma , Security }: rustPlatform.buildRustPackage rec { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { ./v3.1.1-fix-Cargo.lock.patch ]; - nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang_39 ]; + nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang ]; buildInputs = [ openssl libsodium lzma ] ++ (stdenv.lib.optional stdenv.isDarwin Security); From c206bf12abb5464d5c7ce74c67d7190c66589358 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 19:13:10 +0000 Subject: [PATCH 081/241] stdenv, darwin: fix setupHook location --- pkgs/stdenv/darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f73fca48b7a..874b26ba89e 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -165,7 +165,7 @@ in rec { ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh; + setupHook = ../../development/compilers/llvm/7/libc++/setup-hook.sh; }; libcxxabi = stdenv.mkDerivation { From 0eafee83285b2287d5ddcd1598f2405667b7d09f Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 19:00:21 +0000 Subject: [PATCH 082/241] llvm_39: remove --- .../clang/0001-Fix-compilation-w-gcc9.patch | 63 ------- .../compilers/llvm/3.9/clang/default.nix | 85 --------- .../compilers/llvm/3.9/clang/purity.patch | 16 -- .../compilers/llvm/3.9/default.nix | 59 ------ .../compilers/llvm/3.9/libc++/darwin.patch | 39 ---- .../compilers/llvm/3.9/libc++/default.nix | 52 ------ .../compilers/llvm/3.9/libc++/setup-hook.sh | 6 - .../llvm/3.9/libc++/xlocale-glibc-2.26.patch | 19 -- .../compilers/llvm/3.9/libc++abi.nix | 52 ------ pkgs/development/compilers/llvm/3.9/lldb.nix | 57 ------ .../compilers/llvm/3.9/llvm-outputs.patch | 26 --- pkgs/development/compilers/llvm/3.9/llvm.nix | 174 ------------------ pkgs/test/default.nix | 2 - pkgs/top-level/all-packages.nix | 10 - pkgs/top-level/release.nix | 6 - 15 files changed, 666 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch delete mode 100644 pkgs/development/compilers/llvm/3.9/clang/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.9/clang/purity.patch delete mode 100644 pkgs/development/compilers/llvm/3.9/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.9/libc++/darwin.patch delete mode 100644 pkgs/development/compilers/llvm/3.9/libc++/default.nix delete mode 100644 pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch delete mode 100644 pkgs/development/compilers/llvm/3.9/libc++abi.nix delete mode 100644 pkgs/development/compilers/llvm/3.9/lldb.nix delete mode 100644 pkgs/development/compilers/llvm/3.9/llvm-outputs.patch delete mode 100644 pkgs/development/compilers/llvm/3.9/llvm.nix diff --git a/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch b/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch deleted file mode 100644 index 1058cd03176..00000000000 --- a/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 7225c7754cc3431d05df367c60f309f27586f188 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Mon, 30 Dec 2019 01:42:52 +0100 -Subject: [PATCH] Fix compilation w/gcc9 - -Build broken with the following errors: - -``` -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6078:55: error: lambda parameter 'CGF' previously declared as a capture -clang> 6078 | &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { -clang> | ~~~~~~~~~~~~~~~~~^~~ -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6126:53: error: lambda parameter 'CGF' previously declared as a capture -clang> 6126 | &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { -clang> | ~~~~~~~~~~~~~~~~~^~~ -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6191:56: error: lambda parameter 'CGF' previously declared as a capture -clang> 6191 | auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { -clang> | ~~~~~~~~~~~~~~~~~^~~ -``` - -This was due to a bug about name-collisions fixed in GCC 9.0[1]. - -[1] http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2211 ---- - lib/CodeGen/CGOpenMPRuntime.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp -index 6a0edbe..96c281c 100644 ---- a/lib/CodeGen/CGOpenMPRuntime.cpp -+++ b/lib/CodeGen/CGOpenMPRuntime.cpp -@@ -6073,7 +6073,7 @@ void CGOpenMPRuntime::emitTargetDataCalls(CodeGenFunction &CGF, - // Generate the code for the opening of the data environment. Capture all the - // arguments of the runtime call by reference because they are used in the - // closing of the region. -- auto &&BeginThenGen = [&D, &CGF, &BasePointersArray, &PointersArray, -+ auto &&BeginThenGen = [&D, &BasePointersArray, &PointersArray, - &SizesArray, &MapTypesArray, Device, - &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { - // Fill up the arrays with all the mapped variables. -@@ -6121,7 +6121,7 @@ void CGOpenMPRuntime::emitTargetDataCalls(CodeGenFunction &CGF, - }; - - // Generate code for the closing of the data region. -- auto &&EndThenGen = [&CGF, &BasePointersArray, &PointersArray, &SizesArray, -+ auto &&EndThenGen = [&BasePointersArray, &PointersArray, &SizesArray, - &MapTypesArray, Device, - &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { - assert(BasePointersArray && PointersArray && SizesArray && MapTypesArray && -@@ -6188,7 +6188,7 @@ void CGOpenMPRuntime::emitTargetDataStandAloneCall( - "Expecting either target enter, exit data, or update directives."); - - // Generate the code for the opening of the data environment. -- auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { -+ auto &&ThenGen = [&D, Device](CodeGenFunction &CGF, PrePostActionTy &) { - // Fill up the arrays with all the mapped variables. - MappableExprsHandler::MapValuesArrayTy BasePointers; - MappableExprsHandler::MapValuesArrayTy Pointers; --- -2.23.1 - diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix deleted file mode 100644 index 1666b3d842d..00000000000 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }: - -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation { - pname = "clang"; - inherit version; - - src = fetch "cfe" "0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}.src clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libxml2 llvm python ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ - # Maybe with compiler-rt this won't be needed? - (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ - (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - - patches = [ - ./purity.patch - ./0001-Fix-compilation-w-gcc9.patch - ]; - - postPatch = '' - sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp - ''; - - outputs = [ "out" "lib" "python" ]; - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - - mkdir -p $python/bin $python/share/clang/ - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - - rm $out/bin/c-index-test - ''; - - enableParallelBuilding = true; - - passthru = { - isClang = true; - inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.isLinux { - inherit gcc; - }; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; - }; -in self diff --git a/pkgs/development/compilers/llvm/3.9/clang/purity.patch b/pkgs/development/compilers/llvm/3.9/clang/purity.patch deleted file mode 100644 index f5fb4c73af4..00000000000 --- a/pkgs/development/compilers/llvm/3.9/clang/purity.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/lib/Driver/Tools.cpp 2016-08-25 15:48:05.187553443 +0200 -+++ b/lib/Driver/Tools.cpp 2016-08-25 15:48:47.534468882 +0200 -@@ -9420,13 +9420,6 @@ - if (!Args.hasArg(options::OPT_static)) { - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); -- -- if (!Args.hasArg(options::OPT_shared)) { -- const std::string Loader = -- D.DyldPrefix + ToolChain.getDynamicLinker(Args); -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Loader)); -- } - } - - CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix deleted file mode 100644 index 752790cdd85..00000000000 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -}: - -let - version = "3.9.1"; - - fetch = fetch_v version; - fetch_v = ver: name: sha256: fetchurl { - url = "https://releases.llvm.org/${version}/${name}-${ver}.src.tar.xz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk"; - clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999"; - - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv isl version fetch; }); - in { - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src; - }; - - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src; - }; - - libclang = tools.clang-unwrapped.lib; - - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; - - libstdcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ libstdcxxHook ]; - }; - - libcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; - }; - - lldb = callPackage ./lldb.nix {}; - }); - - libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); - in { - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libc++ {}; - - libcxxabi = callPackage ./libc++abi.nix {}; - }); - -in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.9/libc++/darwin.patch b/pkgs/development/compilers/llvm/3.9/libc++/darwin.patch deleted file mode 100644 index 6dd756f01cc..00000000000 --- a/pkgs/development/compilers/llvm/3.9/libc++/darwin.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- libcxx-3.8.0.src.org/lib/CMakeLists.txt 2015-12-16 15:41:05.000000000 -0800 -+++ libcxx-3.8.0.src/lib/CMakeLists.txt 2016-06-17 19:40:00.293394500 -0700 -@@ -94,30 +94,30 @@ - add_definitions(-D__STRICT_ANSI__) - add_link_flags( - "-compatibility_version 1" - "-current_version 1" -- "-install_name /usr/lib/libc++.1.dylib" -- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" -+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib" -+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "/usr/lib/libSystem.B.dylib") - else() - if ( ${CMAKE_OSX_SYSROOT} ) - list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) - if (OSX_HAS_ARMV7) - set(OSX_RE_EXPORT_LINE -- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" -+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" - "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") - else() - set(OSX_RE_EXPORT_LINE -- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") -+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") - endif() - else() -- set(OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") -+ set(OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") - endif() - - add_link_flags( - "-compatibility_version 1" -- "-install_name /usr/lib/libc++.1.dylib" -+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib" - "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" - "${OSX_RE_EXPORT_LINE}" - "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp" - "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp") diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix deleted file mode 100644 index 9d82aa23035..00000000000 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: - -stdenv.mkDerivation { - pname = "libc++"; - inherit version; - - src = fetch "libcxx" "0qbl3afl2p2h87p977lsqr5kykl6cgjpkzczs0g6a3pn53j1bri5"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include") - ''; - - patches = [ - # glibc 2.26 fix - ./xlocale-glibc-2.26.patch - ] - ++ lib.optional stdenv.isDarwin ./darwin.patch - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ../../libcxx-max_align_t.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; - - enableParallelBuilding = true; - - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; - - meta = { - homepage = http://libcxx.llvm.org/; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh deleted file mode 100644 index 6611259165a..00000000000 --- a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch b/pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch deleted file mode 100644 index 4cc042554c8..00000000000 --- a/pkgs/development/compilers/llvm/3.9/libc++/xlocale-glibc-2.26.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/include/__locale b/include/__locale -index 7bc701d..ea75c86 100644 ---- a/include/__locale -+++ b/include/__locale -@@ -34,12 +34,12 @@ - # include - #elif defined(_NEWLIB_VERSION) - # include --#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ -+#elif (defined(__APPLE__) || defined(__FreeBSD__) \ - || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) - # include - #elif defined(_LIBCPP_HAS_MUSL_LIBC) - # include --#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ -+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ - - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) - #pragma GCC system_header diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix deleted file mode 100644 index f799199d449..00000000000 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: - -stdenv.mkDerivation { - pname = "libc++abi"; - inherit version; - - src = fetch "libcxxabi" "1qi9q06zanqm8awzq83810avmvi52air6gr9zfip8mbg5viqn3cj"; - - nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export NIX_CFLAGS_COMPILE+=" -I$PWD/include" - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} - ''; - - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 ../include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; - - meta = { - homepage = http://libcxxabi.llvm.org/; - description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix deleted file mode 100644 index 1a7c9aeead8..00000000000 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, llvm -, clang-unwrapped -, python -, version -}: - -stdenv.mkDerivation { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "1z30ljmcpp261bjng1i5k3bb9jkrs1cr97z04qs4s3zql6r12cvy"; - - postUnpack = '' - # Hack around broken standalone build as of 3.8 - unpackFile ${llvm.src} - srcDir="$(ls -d lldb-*.src)" - mkdir -p "$srcDir/tools/lib/Support" - cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/" - - # Fix up various paths that assume llvm and clang are installed in the same place - substituteInPlace $srcDir/cmake/modules/LLDBStandalone.cmake \ - --replace CheckAtomic $(readlink -f llvm-*.src)/cmake/modules/CheckAtomic.cmake - sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ - $srcDir/cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ - $srcDir/cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ - $srcDir/cmake/modules/LLDBStandalone.cmake - ''; - - buildInputs = [ cmake python which swig ncurses zlib libedit llvm ]; - - CXXFLAGS = "-fno-rtti"; - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" - "-DLLDB_DISABLE_LIBEDIT=1" # https://llvm.org/bugs/show_bug.cgi?id=28898 - ]; - - enableParallelBuilding = true; - - meta = { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch b/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch deleted file mode 100644 index 40096fa3497..00000000000 --- a/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 94d426b..37f7794 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -333,6 +333,21 @@ int main(int argc, char **argv) { - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared -+ if (!IsInDevelopmentTree) { -+ bool WantShared = true; -+ for (int i = 1; i < argc; ++i) { -+ StringRef Arg = argv[i]; -+ if (Arg == "--link-shared") -+ WantShared = true; -+ else if (Arg == "--link-static") -+ WantShared = false; // the last one wins -+ } -+ -+ if (WantShared) -+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; -+ } -+ - /// We only use `shared library` mode in cases where the static library form - /// of the components provided are not available; note however that this is - /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix deleted file mode 100644 index 474cfcde9c0..00000000000 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ /dev/null @@ -1,174 +0,0 @@ -{ stdenv -, fetch -, fetchpatch -, perl -, groff -, cmake -, python -, libffi -, libbfd -, libxml2 -, ncurses -, version -, zlib -, compiler-rt_src -, debugVersion ? false -, enableSharedLibraries ? (stdenv.buildPlatform == stdenv.hostPlatform) -, buildPackages -}: - -assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries; - -let - # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with stdenv.lib; - let parts = splitVersion version; in - imap (i: _: concatStringsSep "." (take i parts)) parts; -in - -stdenv.mkDerivation { - pname = "llvm"; - inherit version; - - src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}.src llvm - sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt - ''; - - outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; - - nativeBuildInputs = [ - perl - cmake - python - ]; - - buildInputs = [ - groff - libxml2 - libffi - ]; - - propagatedBuildInputs = [ ncurses zlib ]; - - patches = [ - # fix output of llvm-config (fixed in llvm 4.0) - (fetchpatch { - url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch; - sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl"; - }) - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - ../TLI-musl.patch - ../dynamiclibrary-musl.patch - ]; - - postPatch = "" - + '' - patch -p1 --reverse < ${fetchpatch { - name = "fix-red-icons.diff"; # https://bugs.freedesktop.org/show_bug.cgi?id=99078 - url = https://github.com/llvm-mirror/llvm/commit/c280d74837d8.diff; - sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf"; - }} - '' - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. I realize that this LLVM isn't used in the stdenv but I want to - # keep it consistent with 4.0. We really shouldn't be copying and pasting all this code around... - + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - - substituteInPlace CMakeLists.txt \ - --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$lib/lib")" \ - --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" - '' - # Patch llvm-config to return correct library path based on --link-{shared,static}. - + stdenv.lib.optionalString (enableSharedLibraries) '' - substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib - patch -p1 < ./llvm-outputs.patch - '' - + '' - ( - cd projects/compiler-rt - patch -p1 < ${ - fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - } - } - substituteInPlace lib/esan/esan_sideline_linux.cpp \ - --replace 'struct sigaltstack' 'stack_t' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_ENABLE_RTTI=ON" - "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code - - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optional enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ] ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals (isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - # Not yet supported - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - - ]; - - postBuild = '' - rm -fR $out - ''; - - postInstall = "" - + stdenv.lib.optionalString (enableSharedLibraries) '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" - '' - + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - ${stdenv.lib.concatMapStringsSep "\n" (v: '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib - '') versionSuffixes} - ''; - - enableParallelBuilding = true; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index f62d208d22d..da4c7bc5548 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -10,8 +10,6 @@ with pkgs; cc-wrapper-gcc9 = callPackage ./cc-wrapper { stdenv = gcc9Stdenv; }; cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; }; cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; - cc-wrapper-clang-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.stdenv; }; - cc-wrapper-libcxx-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; }; cc-wrapper-clang-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.stdenv; }; cc-wrapper-libcxx-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; }; cc-wrapper-clang-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.stdenv; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72d8f3d767b..c779d1f22db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7827,7 +7827,6 @@ in clang_6 = llvmPackages_6.clang; clang_5 = llvmPackages_5.clang; clang_4 = llvmPackages_4.clang; - clang_39 = llvmPackages_39.clang; clang-tools = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_latest; @@ -8546,18 +8545,9 @@ in llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; llvm_4 = llvmPackages_4.llvm; - llvm_39 = llvmPackages_39.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; - llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_39.tools; - targetLlvmLibraries = targetPackages.llvmPackages_39.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; - }); - llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_4.tools; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 6ada2ca6d18..eceff2c53a4 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -76,8 +76,6 @@ let jobs.tests.cc-wrapper.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-darwin - jobs.tests.cc-wrapper-clang-39.x86_64-darwin - jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin jobs.tests.patch-shebangs.x86_64-darwin @@ -116,8 +114,6 @@ let jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-libcxx.x86_64-linux - jobs.tests.cc-wrapper-clang-39.x86_64-linux - jobs.tests.cc-wrapper-libcxx-39.x86_64-linux jobs.tests.cc-wrapper-clang-4.x86_64-linux jobs.tests.cc-wrapper-libcxx-4.x86_64-linux jobs.tests.cc-wrapper-clang-5.x86_64-linux @@ -149,8 +145,6 @@ let # jobs.tests.cc-wrapper-gcc8.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-darwin - jobs.tests.cc-wrapper-clang-39.x86_64-darwin - jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin jobs.tests.cc-wrapper-clang-4.x86_64-darwin jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin jobs.tests.cc-wrapper-clang-5.x86_64-darwin From 241236bc9e3293ecb94711a9feaaa7a397bb933f Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 19:30:00 +0000 Subject: [PATCH 083/241] mozart: build with llvmPackages_5 --- pkgs/development/compilers/mozart/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index 97634bca8ef..b8951c8c800 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -6,7 +6,7 @@ , makeWrapper , boost , llvmPackages -, llvmPackages_4 +, llvmPackages_5 , gmp , emacs , emacs25-nox @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" "-DBoost_USE_STATIC_LIBS=OFF" "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" - "-DCMAKE_PROGRAM_PATH=${llvmPackages_4.clang}/bin" + "-DCMAKE_PROGRAM_PATH=${llvmPackages_5.clang}/bin" # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to # infer that it is not a linking call, and stop trashing the command line # with linker flags. @@ -69,9 +69,9 @@ in stdenv.mkDerivation rec { buildInputs = [ boost - llvmPackages_4.llvm - llvmPackages_4.clang - llvmPackages_4.clang-unwrapped + llvmPackages_5.llvm + llvmPackages_5.clang + llvmPackages_5.clang-unwrapped gmp emacs25-nox jre_headless From c7078be190923ab8d6a9a351c605a39f8597a8a3 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Jan 2020 22:42:51 +0000 Subject: [PATCH 084/241] lutris: use default llvm in chrootenv --- pkgs/applications/misc/lutris/chrootenv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 08612850886..5b9bb925a4e 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -69,7 +69,7 @@ in buildFHSUserEnv { flac # rpcs3 // TODO: "error while loading shared libraries: libz.so.1..." - llvm_4 + llvm # ScummVM nasm sndio From 23a5b45104260429f8cb4748c1d2a950579bd96e Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sun, 19 Jan 2020 09:56:45 +0000 Subject: [PATCH 085/241] far2l: build with default llvm --- 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 c779d1f22db..8857951e143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11267,7 +11267,7 @@ in }; far2l = callPackage ../applications/misc/far2l { - stdenv = if stdenv.cc.isClang then llvmPackages_4.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; farbfeld = callPackage ../development/libraries/farbfeld { }; From 0fc62807153bd91bc8245aa103010f05a26546fc Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sun, 19 Jan 2020 10:02:03 +0000 Subject: [PATCH 086/241] llvm_4: remove --- .../4/clang/0001-Fix-compilation-w-gcc9.patch | 59 --- .../compilers/llvm/4/clang/default.nix | 116 ------ .../compilers/llvm/4/clang/purity.patch | 16 - .../compilers/llvm/4/cmdline-help.patch | 39 -- pkgs/development/compilers/llvm/4/default.nix | 74 ---- .../compilers/llvm/4/fix-gcc9.patch | 33 -- .../compilers/llvm/4/libc++/default.nix | 59 --- .../4/libc++/pthread_mach_thread_np.patch | 41 -- .../compilers/llvm/4/libc++/setup-hook.sh | 6 - .../llvm/4/libc++/xlocale-glibc-2.26.patch | 19 - .../compilers/llvm/4/libc++abi.nix | 52 --- pkgs/development/compilers/llvm/4/lld.nix | 33 -- .../compilers/llvm/4/lldb-libedit.patch | 30 -- pkgs/development/compilers/llvm/4/lldb.nix | 63 --- .../compilers/llvm/4/llvm-outputs.patch | 26 -- pkgs/development/compilers/llvm/4/llvm.nix | 194 --------- pkgs/development/compilers/llvm/4/openmp.nix | 26 -- .../compilers/llvm/4/sanitizers-nongnu.patch | 368 ------------------ .../compilers/llvm/dynamiclibrary-musl.patch | 33 -- .../compilers/llvm/libcxx-max_align_t.patch | 54 --- pkgs/test/default.nix | 2 - pkgs/top-level/all-packages.nix | 12 - pkgs/top-level/release.nix | 4 - 23 files changed, 1359 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch delete mode 100644 pkgs/development/compilers/llvm/4/clang/default.nix delete mode 100644 pkgs/development/compilers/llvm/4/clang/purity.patch delete mode 100644 pkgs/development/compilers/llvm/4/cmdline-help.patch delete mode 100644 pkgs/development/compilers/llvm/4/default.nix delete mode 100644 pkgs/development/compilers/llvm/4/fix-gcc9.patch delete mode 100644 pkgs/development/compilers/llvm/4/libc++/default.nix delete mode 100644 pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch delete mode 100644 pkgs/development/compilers/llvm/4/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch delete mode 100644 pkgs/development/compilers/llvm/4/libc++abi.nix delete mode 100644 pkgs/development/compilers/llvm/4/lld.nix delete mode 100644 pkgs/development/compilers/llvm/4/lldb-libedit.patch delete mode 100644 pkgs/development/compilers/llvm/4/lldb.nix delete mode 100644 pkgs/development/compilers/llvm/4/llvm-outputs.patch delete mode 100644 pkgs/development/compilers/llvm/4/llvm.nix delete mode 100644 pkgs/development/compilers/llvm/4/openmp.nix delete mode 100644 pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch delete mode 100644 pkgs/development/compilers/llvm/dynamiclibrary-musl.patch delete mode 100644 pkgs/development/compilers/llvm/libcxx-max_align_t.patch diff --git a/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch b/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch deleted file mode 100644 index ea934257408..00000000000 --- a/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a2af0b02eba35d0670e3e442ff7c61b3e2304edd Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Mon, 30 Dec 2019 02:11:35 +0100 -Subject: [PATCH] Fix compilation w/gcc9 - -Build broken with the following errors: - -``` -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6275:24: error: lambda parameter 'CGF' previously declared as a capture -clang> 6275 | CodeGenFunction &CGF, PrePostActionTy &) { -clang> | ~~~~~~~~~~~~~~~~~^~~ -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6321:62: error: lambda parameter 'CGF' previously declared as a capture -clang> 6321 | auto &&EndThenGen = [&CGF, Device, &Info](CodeGenFunction &CGF, -clang> | ~~~~~~~~~~~~~~~~~^~~ -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: -clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6400:56: error: lambda parameter 'CGF' previously declared as a capture -clang> 6400 | auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { -clang> | ~~~~~~~~~~~~~~~~~^~~ -``` ---- - lib/CodeGen/CGOpenMPRuntime.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp -index 4025217..40a73ef 100644 ---- a/lib/CodeGen/CGOpenMPRuntime.cpp -+++ b/lib/CodeGen/CGOpenMPRuntime.cpp -@@ -6271,7 +6271,7 @@ void CGOpenMPRuntime::emitTargetDataCalls( - // Generate the code for the opening of the data environment. Capture all the - // arguments of the runtime call by reference because they are used in the - // closing of the region. -- auto &&BeginThenGen = [&D, &CGF, Device, &Info, &CodeGen, &NoPrivAction]( -+ auto &&BeginThenGen = [&D, Device, &Info, &CodeGen, &NoPrivAction]( - CodeGenFunction &CGF, PrePostActionTy &) { - // Fill up the arrays with all the mapped variables. - MappableExprsHandler::MapBaseValuesArrayTy BasePointers; -@@ -6318,7 +6318,7 @@ void CGOpenMPRuntime::emitTargetDataCalls( - }; - - // Generate code for the closing of the data region. -- auto &&EndThenGen = [&CGF, Device, &Info](CodeGenFunction &CGF, -+ auto &&EndThenGen = [Device, &Info](CodeGenFunction &CGF, - PrePostActionTy &) { - assert(Info.isValid() && "Invalid data environment closing arguments."); - -@@ -6397,7 +6397,7 @@ void CGOpenMPRuntime::emitTargetDataStandAloneCall( - "Expecting either target enter, exit data, or update directives."); - - // Generate the code for the opening of the data environment. -- auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { -+ auto &&ThenGen = [&D, Device](CodeGenFunction &CGF, PrePostActionTy &) { - // Fill up the arrays with all the mapped variables. - MappableExprsHandler::MapBaseValuesArrayTy BasePointers; - MappableExprsHandler::MapValuesArrayTy Pointers; --- -2.23.1 - diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix deleted file mode 100644 index 5bdd3731207..00000000000 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python3 -, fixDarwinDylibNames -, enableManpages ? false -}: - -let - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; - self = stdenv.mkDerivation ({ - pname = "clang"; - inherit version; - - src = fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}* clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - - buildInputs = [ libxml2 llvm ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - ] ++ stdenv.lib.optionals enableManpages [ - "-DCLANG_INCLUDE_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - # Maybe with compiler-rt this won't be needed? - ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; - - patches = [ - ./purity.patch - ./0001-Fix-compilation-w-gcc9.patch - ]; - - postPatch = '' - sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp - - # Patch for standalone doc building - sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp - ''; - - outputs = [ "out" "lib" "python" ]; - - # Clang expects to find LLVMgold in its own prefix - # Clang expects to find sanitizer libraries in its own prefix - postInstall = '' - if [ -e ${llvm}/lib/LLVMgold.so ]; then - ln -sv ${llvm}/lib/LLVMgold.so $out/lib - fi - - ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/ - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - - mkdir -p $python/bin $python/share/clang/ - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - rm $out/bin/c-index-test - ''; - - enableParallelBuilding = true; - - passthru = { - isClang = true; - inherit llvm; - } // stdenv.lib.optionalAttrs stdenv.isLinux { - inherit gcc; - }; - - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - }; - } // stdenv.lib.optionalAttrs enableManpages { - pname = "clang-manpages"; - - buildPhase = '' - make docs-clang-man - ''; - - installPhase = '' - mkdir -p $out/share/man/man1 - # Manually install clang manpage - cp docs/man/*.1 $out/share/man/man1/ - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta.description = "man page for Clang ${version}"; - }); -in self diff --git a/pkgs/development/compilers/llvm/4/clang/purity.patch b/pkgs/development/compilers/llvm/4/clang/purity.patch deleted file mode 100644 index f5fb4c73af4..00000000000 --- a/pkgs/development/compilers/llvm/4/clang/purity.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/lib/Driver/Tools.cpp 2016-08-25 15:48:05.187553443 +0200 -+++ b/lib/Driver/Tools.cpp 2016-08-25 15:48:47.534468882 +0200 -@@ -9420,13 +9420,6 @@ - if (!Args.hasArg(options::OPT_static)) { - if (Args.hasArg(options::OPT_rdynamic)) - CmdArgs.push_back("-export-dynamic"); -- -- if (!Args.hasArg(options::OPT_shared)) { -- const std::string Loader = -- D.DyldPrefix + ToolChain.getDynamicLinker(Args); -- CmdArgs.push_back("-dynamic-linker"); -- CmdArgs.push_back(Args.MakeArgString(Loader)); -- } - } - - CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/4/cmdline-help.patch b/pkgs/development/compilers/llvm/4/cmdline-help.patch deleted file mode 100644 index a693719c2cf..00000000000 --- a/pkgs/development/compilers/llvm/4/cmdline-help.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c7a9aa3a697c81432786a5583bf973771c7be15e Mon Sep 17 00:00:00 2001 -From: Don Hinton -Date: Wed, 12 Jul 2017 01:15:46 +0000 -Subject: [PATCH] Fix minor typo introduced in r276404 - -Summary: -A space was added between '-' and 'help' when emitting help output. - -See https://reviews.llvm.org/D22621 for details. - -Reviewers: MaggieYi, vsk - -Reviewed By: vsk - -Subscribers: llvm-commits - -Differential Revision: https://reviews.llvm.org/D35283 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307745 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Support/CommandLine.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp -index 3889902eea5..79defa5c36c 100644 ---- a/lib/Support/CommandLine.cpp -+++ b/lib/Support/CommandLine.cpp -@@ -1236,7 +1236,7 @@ bool CommandLineParser::ParseCommandLineOptions(int argc, - << ": Not enough positional command line arguments specified!\n" - << "Must specify at least " << NumPositionalRequired - << " positional argument" << (NumPositionalRequired > 1 ? "s" : "") -- << ": See: " << argv[0] << " - help\n"; -+ << ": See: " << argv[0] << " -help\n"; - } - - ErrorParsing = true; --- -2.14.0 - diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix deleted file mode 100644 index 2f457880db1..00000000000 --- a/pkgs/development/compilers/llvm/4/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -}: - -let - release_version = "4.0.1"; - version = release_version; # differentiating these is important for rc's - - fetch = name: sha256: fetchurl { - url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; - inherit sha256; - }; - - compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53"; - clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m"; - - tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - in { - - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src; - }; - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src; - }; - - llvm-manpages = lowPrio (tools.llvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.clang-unwrapped.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - libclang = tools.clang-unwrapped.lib; - - clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; - - libstdcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ libstdcxxHook ]; - }; - - libcxxClang = wrapCCWith { - cc = tools.clang-unwrapped; - extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ]; - }; - - lld = callPackage ./lld.nix {}; - - lldb = callPackage ./lldb.nix {}; - }); - - libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - in { - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libc++ {}; - - libcxxabi = callPackage ./libc++abi.nix {}; - - openmp = callPackage ./openmp.nix {}; - }); - -in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/4/fix-gcc9.patch b/pkgs/development/compilers/llvm/4/fix-gcc9.patch deleted file mode 100644 index 8ea5ca97085..00000000000 --- a/pkgs/development/compilers/llvm/4/fix-gcc9.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/Target/Mips/MipsFastISel.cpp b/lib/Target/Mips/MipsFastISel.cpp -index f79cb0e6..c6279046 100644 ---- a/lib/Target/Mips/MipsFastISel.cpp -+++ b/lib/Target/Mips/MipsFastISel.cpp -@@ -32,6 +32,7 @@ - #include "llvm/MC/MCSymbol.h" - #include "llvm/Target/TargetInstrInfo.h" - #include "llvm/Support/Debug.h" -+#include - - #define DEBUG_TYPE "mips-fastisel" - -@@ -1268,13 +1269,13 @@ bool MipsFastISel::fastLowerArguments() { - return false; - } - -- const ArrayRef GPR32ArgRegs = {Mips::A0, Mips::A1, Mips::A2, -- Mips::A3}; -- const ArrayRef FGR32ArgRegs = {Mips::F12, Mips::F14}; -- const ArrayRef AFGR64ArgRegs = {Mips::D6, Mips::D7}; -- ArrayRef::iterator NextGPR32 = GPR32ArgRegs.begin(); -- ArrayRef::iterator NextFGR32 = FGR32ArgRegs.begin(); -- ArrayRef::iterator NextAFGR64 = AFGR64ArgRegs.begin(); -+ std::array GPR32ArgRegs = {{Mips::A0, Mips::A1, Mips::A2, -+ Mips::A3}}; -+ std::array FGR32ArgRegs = {{Mips::F12, Mips::F14}}; -+ std::array AFGR64ArgRegs = {{Mips::D6, Mips::D7}}; -+ auto NextGPR32 = GPR32ArgRegs.begin(); -+ auto NextFGR32 = FGR32ArgRegs.begin(); -+ auto NextAFGR64 = AFGR64ArgRegs.begin(); - - struct AllocatedReg { - const TargetRegisterClass *RC; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix deleted file mode 100644 index 264342701ae..00000000000 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: - -stdenv.mkDerivation { - pname = "libc++"; - inherit version; - - src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" - ''; - - patches = [ - # https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc - ./pthread_mach_thread_np.patch - # glibc 2.26 fix - ./xlocale-glibc-2.26.patch - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ../../libcxx-max_align_t.patch - ]; - - prePatch = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patchShebangs utils/cat_files.py - ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; - - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; - - enableParallelBuilding = true; - - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; - - meta = { - homepage = http://libcxx.llvm.org/; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch deleted file mode 100644 index 8c71f1b815d..00000000000 --- a/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bcc92d75df0274b9593ebd097fcae60494e3bffc Mon Sep 17 00:00:00 2001 -From: Asiri Rathnayake -Date: Thu, 26 Jan 2017 10:40:17 +0000 -Subject: [PATCH] Fix chromium build (libcxx) - -Remove the reference to pthread_mach_thread_np() in libcxx headers. - -git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@293167 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - include/__threading_support | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/include/__threading_support b/include/__threading_support -index 13ab769..dfe7fe1 100644 ---- a/include/__threading_support -+++ b/include/__threading_support -@@ -149,11 +149,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag, - void (*init_routine)(void)); - - // Thread id --#if defined(__APPLE__) && !defined(__arm__) --_LIBCPP_THREAD_ABI_VISIBILITY --mach_port_t __libcpp_thread_get_port(); --#endif -- - _LIBCPP_THREAD_ABI_VISIBILITY - bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2); - -@@ -297,12 +292,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag, - } - - // Thread id --#if defined(__APPLE__) && !defined(__arm__) --mach_port_t __libcpp_thread_get_port() { -- return pthread_mach_thread_np(pthread_self()); --} --#endif -- - // Returns non-zero if the thread ids are equal, otherwise 0 - bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2) - { diff --git a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh deleted file mode 100644 index 6611259165a..00000000000 --- a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch b/pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch deleted file mode 100644 index e411d85066b..00000000000 --- a/pkgs/development/compilers/llvm/4/libc++/xlocale-glibc-2.26.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/include/__locale b/include/__locale -index f4882de..29443b4 100644 ---- a/include/__locale -+++ b/include/__locale -@@ -34,12 +34,12 @@ - # include - #elif defined(_NEWLIB_VERSION) - # include --#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ -+#elif (defined(__APPLE__) || defined(__FreeBSD__) \ - || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) - # include - #elif defined(_LIBCPP_HAS_MUSL_LIBC) - # include --#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ -+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__ - - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) - #pragma GCC system_header diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix deleted file mode 100644 index 8e36c5ad53a..00000000000 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: - -stdenv.mkDerivation { - pname = "libc++abi"; - inherit version; - - src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g"; - - nativeBuildInputs = [ cmake ]; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} - ''; - - installPhase = if stdenv.isDarwin - then '' - for file in lib/*.dylib; do - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling - install_name_tool -id $out/$file $file - done - make install - install -d 755 $out/include - install -m 644 ../include/*.h $out/include - '' - else '' - install -d -m 755 $out/include $out/lib - install -m 644 lib/libc++abi.a $out/lib - install -m 644 lib/libc++abi.so.1.0 $out/lib - install -m 644 ../include/cxxabi.h $out/include - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so - ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 - ''; - - meta = { - homepage = http://libcxxabi.llvm.org/; - description = "A new implementation of low level support for a standard C++ library"; - license = with stdenv.lib.licenses; [ ncsa mit ]; - maintainers = with stdenv.lib.maintainers; [ vlstill ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix deleted file mode 100644 index 3ab56677d72..00000000000 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv -, fetch -, cmake -, llvm -, version -}: - -stdenv.mkDerivation { - pname = "lld"; - inherit version; - - src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ llvm ]; - - outputs = [ "out" "dev" ]; - - enableParallelBuilding = true; - - postInstall = '' - moveToOutput include "$dev" - moveToOutput lib "$dev" - ''; - - meta = { - description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; - license = stdenv.lib.licenses.ncsa; - platforms = stdenv.lib.platforms.all; - badPlatforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/compilers/llvm/4/lldb-libedit.patch b/pkgs/development/compilers/llvm/4/lldb-libedit.patch deleted file mode 100644 index 73459ce6c86..00000000000 --- a/pkgs/development/compilers/llvm/4/lldb-libedit.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 94764369222a8e6c65420a6981d7f179a18a5417 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Thu, 25 May 2017 15:03:42 -0500 -Subject: [PATCH] EditLine.h: libedit supports wide chars on NixOS - ---- - include/lldb/Host/Editline.h | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h -index faed373bc..b248cdee1 100644 ---- a/include/lldb/Host/Editline.h -+++ b/include/lldb/Host/Editline.h -@@ -43,12 +43,9 @@ - // will only be - // used in cases where this is true. This is a compile time dependecy, for now - // selected per target Platform --#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) -+// (libedit on NixOS is always wide-char capable) - #define LLDB_EDITLINE_USE_WCHAR 1 - #include --#else --#define LLDB_EDITLINE_USE_WCHAR 0 --#endif - - #include "lldb/Host/ConnectionFileDescriptor.h" - #include "lldb/lldb-private.h" --- -2.13.0 - diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix deleted file mode 100644 index 7f6231278e6..00000000000 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, llvm -, clang-unwrapped -, python3 -, version -, darwin -}: - -stdenv.mkDerivation { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4"; - - patches = [ ./lldb-libedit.patch ]; - postPatch = '' - # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \ - cmake/modules/LLDBStandalone.cmake - ''; - - nativeBuildInputs = [ cmake python3 which swig ]; - buildInputs = [ ncurses zlib libedit libxml2 llvm ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; - - CXXFLAGS = "-fno-rtti"; - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ]; - - # Add missing include to fix error when using std::bind - prePatch = '' - sed -i -e '30i#include ' include/lldb/Utility/TaskPool.h - ''; - - enableParallelBuilding = true; - - postInstall = '' - mkdir -p $out/share/man/man1 - cp ../docs/lldb.1 $out/share/man/man1/ - ''; - - meta = with stdenv.lib; { - description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; - license = licenses.ncsa; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/4/llvm-outputs.patch b/pkgs/development/compilers/llvm/4/llvm-outputs.patch deleted file mode 100644 index 40096fa3497..00000000000 --- a/pkgs/development/compilers/llvm/4/llvm-outputs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 94d426b..37f7794 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -333,6 +333,21 @@ int main(int argc, char **argv) { - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -+ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared -+ if (!IsInDevelopmentTree) { -+ bool WantShared = true; -+ for (int i = 1; i < argc; ++i) { -+ StringRef Arg = argv[i]; -+ if (Arg == "--link-shared") -+ WantShared = true; -+ else if (Arg == "--link-static") -+ WantShared = false; // the last one wins -+ } -+ -+ if (WantShared) -+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; -+ } -+ - /// We only use `shared library` mode in cases where the static library form - /// of the components provided are not available; note however that this is - /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix deleted file mode 100644 index 0d3ce1614de..00000000000 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ /dev/null @@ -1,194 +0,0 @@ -{ stdenv -, fetch -, fetchpatch -, cmake -, python3 -, libffi -, libbfd -, libxml2 -, ncurses -, version -, release_version -, zlib -, compiler-rt_src -, debugVersion ? false -, enableManpages ? false -, enableSharedLibraries ? !enableManpages -}: - -let - # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with stdenv.lib; - let parts = splitVersion release_version; in - imap (i: _: concatStringsSep "." (take i parts)) parts; -in - -stdenv.mkDerivation ({ - pname = "llvm"; - inherit version; - - src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}* llvm - sourceRoot=$PWD/llvm - unpackFile ${compiler-rt_src} - mv compiler-rt-* $sourceRoot/projects/compiler-rt - ''; - - outputs = [ "out" ] - ++ stdenv.lib.optional enableSharedLibraries "lib"; - - nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; - - buildInputs = [ libxml2 libffi ]; - - propagatedBuildInputs = [ ncurses zlib ]; - - patches = [ - (fetchpatch { - name = "0001-Fix-return-type-in-ORC-readMem-client-interface.patch"; - url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; - sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; - }) - ./fix-gcc9.patch - (fetchpatch { - name = "llvm4-avoid-undefined-behavior-in-unittest.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/D32089-Avoid-undefined-behavior-in-unittest.patch?h=llvm40&id=f459b0bad8aa3b94bc2733d79d176071a32846a6"; - sha256 = "0x5q6a8lk6xg4ns4qh75fxvvmfnifwvyrq17ck85q8c0753i1irf"; - extraPrefix = ""; - }) - ]; - - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" - '' - # Patch llvm-config to return correct library path based on --link-{shared,static}. - + stdenv.lib.optionalString (enableSharedLibraries) '' - substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib - patch -p1 < ./llvm-outputs.patch - '' - + '' - ( - cd projects/compiler-rt - patch -p1 < ${ - fetchpatch { - name = "sigaltstack.patch"; # for glibc-2.26 - url = https://github.com/llvm-mirror/compiler-rt/commit/8a5e425a68d.diff; - sha256 = "0h4y5vl74qaa7dl54b1fcyqalvlpd8zban2d1jxfkxpzyi7m8ifi"; - } - } - substituteInPlace lib/esan/esan_sideline_linux.cpp \ - --replace 'struct sigaltstack' 'stack_t' - ) - '' + # Fix extra space printed in commandline help sometimes, "- help" - '' - patch -p1 -i ${./cmdline-help.patch} - '' + stdenv.lib.optionalString stdenv.isAarch64 '' - patch -p0 < ${../aarch64.patch} - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../TLI-musl.patch} - patch -p1 -i ${../dynamiclibrary-musl.patch} - patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeFlags = with stdenv; [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=ON" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_ENABLE_RTTI=ON" - "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code - - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" - ] - ++ stdenv.lib.optional enableSharedLibraries - "-DLLVM_LINK_LLVM_DYLIB=ON" - ++ stdenv.lib.optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - ++ stdenv.lib.optional (!isDarwin) - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals (isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = stdenv.lib.optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" - '' - + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - ${stdenv.lib.concatMapStringsSep "\n" (v: '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib - '') versionSuffixes} - ''; - - doCheck = stdenv.isLinux && (!stdenv.isi686); - - checkTarget = "check-all"; - - enableParallelBuilding = true; - - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; - license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; - platforms = stdenv.lib.platforms.all; - }; -} // stdenv.lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = [ ]; - - installPhase = '' - make -C docs install - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta.description = "man pages for LLVM ${version}"; -}) diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix deleted file mode 100644 index a69fe286ecc..00000000000 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv -, fetch -, cmake -, llvm -, perl -, version -}: - -stdenv.mkDerivation { - pname = "openmp"; - inherit version; - - src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc"; - - nativeBuildInputs = [ cmake perl ]; - buildInputs = [ llvm ]; - - enableParallelBuilding = true; - - meta = { - description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch deleted file mode 100644 index 5bd858f8ae7..00000000000 --- a/pkgs/development/compilers/llvm/4/sanitizers-nongnu.patch +++ /dev/null @@ -1,368 +0,0 @@ -From dac4d3912378069b44340204e5fc6237aa1baf94 Mon Sep 17 00:00:00 2001 -From: Matthias Maier -Date: Fri, 5 May 2017 17:47:39 +0000 -Subject: [PATCH] Musl patches - -Ported to compiler-rt-sanitizers-4.0.0. Taken from - - https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch ---- - lib/asan/asan_linux.cc | 4 +-- - lib/interception/interception_linux.cc | 2 +- - lib/interception/interception_linux.h | 2 +- - lib/msan/msan_linux.cc | 2 +- - .../sanitizer_common_interceptors_ioctl.inc | 4 +-- - lib/sanitizer_common/sanitizer_common_syscalls.inc | 2 +- - lib/sanitizer_common/sanitizer_linux_libcdep.cc | 12 +++---- - lib/sanitizer_common/sanitizer_platform.h | 7 ++++ - .../sanitizer_platform_interceptors.h | 2 +- - .../sanitizer_platform_limits_posix.cc | 39 +++++++++++++--------- - lib/tsan/rtl/tsan_platform_linux.cc | 2 +- - 11 files changed, 46 insertions(+), 32 deletions(-) - -diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc -index c051573dd..e295f6004 100644 ---- a/lib/asan/asan_linux.cc -+++ b/lib/asan/asan_linux.cc -@@ -39,7 +39,7 @@ - #include - #endif - --#if SANITIZER_ANDROID || SANITIZER_FREEBSD -+#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_NONGNU - #include - extern "C" void* _DYNAMIC; - #else -@@ -80,7 +80,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { - UNIMPLEMENTED(); - } - --#if SANITIZER_ANDROID -+#if SANITIZER_ANDROID || SANITIZER_NONGNU - // FIXME: should we do anything for Android? - void AsanCheckDynamicRTPrereqs() {} - void AsanCheckIncompatibleRT() {} -diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc -index 6e908ac01..8f23d9adc 100644 ---- a/lib/interception/interception_linux.cc -+++ b/lib/interception/interception_linux.cc -@@ -24,7 +24,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, - return real == wrapper; - } - --#if !defined(__ANDROID__) // android does not have dlvsym -+#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym - void *GetFuncAddrVer(const char *func_name, const char *ver) { - return dlvsym(RTLD_NEXT, func_name, ver); - } -diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h -index 27a66c882..3b559a303 100644 ---- a/lib/interception/interception_linux.h -+++ b/lib/interception/interception_linux.h -@@ -34,7 +34,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); - (::__interception::uptr) & (func), \ - (::__interception::uptr) & WRAP(func)) - --#if !defined(__ANDROID__) // android does not have dlvsym -+#if !defined(__ANDROID__) && !SANITIZER_NONGNU // android does not have dlvsym - #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ - (::__interception::real_##func = (func##_f)( \ - unsigned long)::__interception::GetFuncAddrVer(#func, symver)) -diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc -index 0a687f620..0852d97d7 100644 ---- a/lib/msan/msan_linux.cc -+++ b/lib/msan/msan_linux.cc -@@ -13,7 +13,7 @@ - //===----------------------------------------------------------------------===// - - #include "sanitizer_common/sanitizer_platform.h" --#if SANITIZER_FREEBSD || SANITIZER_LINUX -+#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU - - #include "msan.h" - #include "msan_thread.h" -diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -index 4ed9afedf..64f584e93 100644 ---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -100,7 +100,7 @@ static void ioctl_table_fill() { - _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); - #endif - --#if SANITIZER_LINUX -+#if SANITIZER_LINUX && !SANITIZER_NONGNU - // Conflicting request ids. - // _(CDROMAUDIOBUFSIZ, NONE, 0); - // _(SNDCTL_TMR_CONTINUE, NONE, 0); -@@ -361,7 +361,7 @@ static void ioctl_table_fill() { - _(VT_WAITACTIVE, NONE, 0); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE - _(CYGETDEFTHRESH, WRITE, sizeof(int)); - _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc -index 469c8eb7e..24f87867d 100644 ---- a/lib/sanitizer_common/sanitizer_common_syscalls.inc -+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc -@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { - } - } - --#if !SANITIZER_ANDROID -+#if !SANITIZER_ANDROID && !SANITIZER_NONGNU - PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, - void *old_rlim) { - if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); -diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc -index f99f0b594..3a773a94e 100644 ---- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc -+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc -@@ -152,7 +152,7 @@ bool SanitizerGetThreadName(char *name, int max_len) { - #endif - } - --#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO -+#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU - static uptr g_tls_size; - - #ifdef __i386__ -@@ -180,11 +180,11 @@ void InitTlsSize() { - } - #else - void InitTlsSize() { } --#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO -+#endif // !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && !SANITIZER_NONGNU - - #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \ - || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__)) \ -- && SANITIZER_LINUX && !SANITIZER_ANDROID -+ && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - // sizeof(struct pthread) from glibc. - static atomic_uintptr_t kThreadDescriptorSize; - -@@ -338,7 +338,7 @@ uptr ThreadSelf() { - - #if !SANITIZER_GO - static void GetTls(uptr *addr, uptr *size) { --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) - *addr = ThreadSelf(); - *size = GetTlsSize(); -@@ -364,7 +364,7 @@ static void GetTls(uptr *addr, uptr *size) { - *addr = (uptr) dtv[2]; - *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]); - } --#elif SANITIZER_ANDROID -+#elif SANITIZER_ANDROID || SANITIZER_NONGNU - *addr = 0; - *size = 0; - #else -@@ -375,7 +375,7 @@ static void GetTls(uptr *addr, uptr *size) { - - #if !SANITIZER_GO - uptr GetTlsSize() { --#if SANITIZER_FREEBSD || SANITIZER_ANDROID -+#if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NONGNU - uptr addr, size; - GetTls(&addr, &size); - return size; -diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h -index d9a8e8df1..fe01c5744 100644 ---- a/lib/sanitizer_common/sanitizer_platform.h -+++ b/lib/sanitizer_common/sanitizer_platform.h -@@ -162,6 +162,13 @@ - # define SANITIZER_PPC64V2 0 - #endif - -+ -+#if defined(__linux__) && !defined(__GLIBC__) -+# define SANITIZER_NONGNU 1 -+#else -+# define SANITIZER_NONGNU 0 -+#endif -+ - // By default we allow to use SizeClassAllocator64 on 64-bit platform. - // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 - // does not work well and we need to fallback to SizeClassAllocator32. -diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h -index 62875d11a..212e6e882 100644 ---- a/lib/sanitizer_common/sanitizer_platform_interceptors.h -+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h -@@ -23,7 +23,7 @@ - # define SI_NOT_WINDOWS 0 - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - # define SI_LINUX_NOT_ANDROID 1 - #else - # define SI_LINUX_NOT_ANDROID 0 -diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index 683f019d7..fd4880962 100644 ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -14,6 +14,8 @@ - - #include "sanitizer_platform.h" - -+#define _LINUX_SYSINFO_H -+ - #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC - // Tests in this file assume that off_t-dependent data structures match the - // libc ABI. For example, struct dirent here is what readdir() function (as -@@ -139,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - #include --#include -+# if !SANITIZER_NONGNU -+# include -+# endif - #include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - #if HAVE_RPC_XDR_H - # include - #elif HAVE_TIRPC_RPC_XDR_H -@@ -160,7 +164,8 @@ typedef struct user_fpregs elf_fpregset_t; - # include - #endif - #include --#include -+// #include -+#include - #include - #include - #include -@@ -252,7 +257,7 @@ namespace __sanitizer { - unsigned struct_itimerspec_sz = sizeof(struct itimerspec); - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - unsigned struct_ustat_sz = sizeof(struct ustat); - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); -@@ -310,7 +315,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); - unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif - --#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU - int glob_nomatch = GLOB_NOMATCH; - int glob_altdirfunc = GLOB_ALTDIRFUNC; - #endif -@@ -404,7 +409,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned struct_termios_sz = sizeof(struct termios); - unsigned struct_winsize_sz = sizeof(struct winsize); - --#if SANITIZER_LINUX -+#if SANITIZER_LINUX && !SANITIZER_NONGNU - unsigned struct_arpreq_sz = sizeof(struct arpreq); - unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); - unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); -@@ -454,7 +459,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned struct_vt_mode_sz = sizeof(struct vt_mode); - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); - unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) -@@ -822,7 +827,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; - unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; - unsigned IOCTL_CYGETMON = CYGETMON; -@@ -985,7 +990,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); - CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU - CHECK_TYPE_SIZE(glob_t); - CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); - CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); -@@ -1019,6 +1024,7 @@ CHECK_TYPE_SIZE(iovec); - CHECK_SIZE_AND_OFFSET(iovec, iov_base); - CHECK_SIZE_AND_OFFSET(iovec, iov_len); - -+#if !SANITIZER_NONGNU - CHECK_TYPE_SIZE(msghdr); - CHECK_SIZE_AND_OFFSET(msghdr, msg_name); - CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); -@@ -1032,6 +1038,7 @@ CHECK_TYPE_SIZE(cmsghdr); - CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); - CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); - CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); -+#endif - - COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); - CHECK_SIZE_AND_OFFSET(dirent, d_ino); -@@ -1134,7 +1141,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); - - CHECK_TYPE_SIZE(ether_addr); - --#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU - CHECK_TYPE_SIZE(ipc_perm); - # if SANITIZER_FREEBSD - CHECK_SIZE_AND_OFFSET(ipc_perm, key); -@@ -1195,7 +1202,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); - CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); - #endif - --#if SANITIZER_LINUX -+#if SANITIZER_LINUX && !SANITIZER_NONGNU - COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); - #endif - -@@ -1245,7 +1252,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); - COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); - CHECK_SIZE_AND_OFFSET(FILE, _flags); - CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); -@@ -1264,7 +1271,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); - CHECK_SIZE_AND_OFFSET(FILE, _fileno); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); - CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); - CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); -diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc -index 3313288a7..103c7b6b9 100644 ---- a/lib/tsan/rtl/tsan_platform_linux.cc -+++ b/lib/tsan/rtl/tsan_platform_linux.cc -@@ -287,7 +287,7 @@ void InitializePlatform() { - // This is required to properly "close" the fds, because we do not see internal - // closes within glibc. The code is a pure hack. - int ExtractResolvFDs(void *state, int *fds, int nfd) { --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU - int cnt = 0; - __res_state *statp = (__res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { --- -2.16.2 - diff --git a/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch b/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch deleted file mode 100644 index d5d7f07b5e1..00000000000 --- a/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d12ecb83d01dcb580dd94f4d57828f33d3eb4c35 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Thu, 18 Feb 2016 15:33:21 +0100 -Subject: [PATCH 3/3] Fix DynamicLibrary to build with musl libc - -stdin/out/err is part of the libc and not the kernel so we check for the -specific libc that does the unexpected instead of linux. - -This is needed for making it build with musl libc. ---- - lib/Support/DynamicLibrary.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp -index 9a7aeb5..0c1c8f8 100644 ---- a/lib/Support/DynamicLibrary.cpp -+++ b/lib/Support/DynamicLibrary.cpp -@@ -140,10 +140,10 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { - #define EXPLICIT_SYMBOL(SYM) \ - if (!strcmp(symbolName, #SYM)) return &SYM - --// On linux we have a weird situation. The stderr/out/in symbols are both -+// On GNU libc we have a weird situation. The stderr/out/in symbols are both - // macros and global variables because of standards requirements. So, we - // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first. --#if defined(__linux__) and !defined(__ANDROID__) -+#if defined(__GLIBC__) - { - EXPLICIT_SYMBOL(stderr); - EXPLICIT_SYMBOL(stdout); --- -2.7.3 - diff --git a/pkgs/development/compilers/llvm/libcxx-max_align_t.patch b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch deleted file mode 100644 index 060be5b23de..00000000000 --- a/pkgs/development/compilers/llvm/libcxx-max_align_t.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 917331c88bd2afce0cf0fdbcab55a64541b5bcf0 Mon Sep 17 00:00:00 2001 -From: "David L. Jones" -Date: Fri, 10 Feb 2017 01:27:42 +0000 -Subject: [PATCH] Check for musl-libc's max_align_t in addition to other - variants. - -Summary: -Libcxx will define its own max_align_t when it is not available. However, the -availability checks today only check for Clang's definition and GCC's -definition. In particular, it does not check for musl's definition, which is the -same as GCC's but guarded with a different macro. - -Reviewers: mclow.lists, EricWF - -Reviewed By: EricWF - -Subscribers: chandlerc, cfe-commits - -Differential Revision: https://reviews.llvm.org/D28478 - -git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294683 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - include/cstddef | 3 ++- - include/stddef.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/include/cstddef b/include/cstddef -index edd106c00..103898b7d 100644 ---- a/include/cstddef -+++ b/include/cstddef -@@ -48,7 +48,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD - using ::ptrdiff_t; - using ::size_t; - --#if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T) -+#if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T) || \ -+ defined(__DEFINED_max_align_t) - // Re-use the compiler's max_align_t where possible. - using ::max_align_t; - #else -diff --git a/include/stddef.h b/include/stddef.h -index 8841bbea2..faf8552d8 100644 ---- a/include/stddef.h -+++ b/include/stddef.h -@@ -53,7 +53,8 @@ using std::nullptr_t; - } - - // Re-use the compiler's max_align_t where possible. --#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) -+#if !defined(__CLANG_MAX_ALIGN_T_DEFINED) && !defined(_GCC_MAX_ALIGN_T) && \ -+ !defined(__DEFINED_max_align_t) - typedef long double max_align_t; - #endif - diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index da4c7bc5548..c248eebaec3 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -10,8 +10,6 @@ with pkgs; cc-wrapper-gcc9 = callPackage ./cc-wrapper { stdenv = gcc9Stdenv; }; cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; }; cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; - cc-wrapper-clang-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.stdenv; }; - cc-wrapper-libcxx-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; }; cc-wrapper-clang-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.stdenv; }; cc-wrapper-libcxx-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; }; cc-wrapper-clang-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.stdenv; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8857951e143..1564c9e5dc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7826,7 +7826,6 @@ in clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; clang_5 = llvmPackages_5.clang; - clang_4 = llvmPackages_4.clang; clang-tools = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_latest; @@ -8521,7 +8520,6 @@ in lizardfs = callPackage ../tools/filesystems/lizardfs { }; lld = llvmPackages.lld; - lld_4 = llvmPackages_4.lld; lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; lld_7 = llvmPackages_7.lld; @@ -8529,7 +8527,6 @@ in lld_9 = llvmPackages_9.lld; lldb = llvmPackages.lldb; - lldb_4 = llvmPackages_4.lldb; lldb_5 = llvmPackages_5.lldb; lldb_6 = llvmPackages_6.lldb; lldb_7 = llvmPackages_7.lldb; @@ -8544,18 +8541,9 @@ in llvm_7 = llvmPackages_7.llvm; llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; - llvm_4 = llvmPackages_4.llvm; llvmPackages = recurseIntoAttrs llvmPackages_7; - llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_4.tools; - targetLlvmLibraries = targetPackages.llvmPackages_4.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { - stdenv = gcc6Stdenv; - }); - llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index eceff2c53a4..b8ce1fcbce5 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -114,8 +114,6 @@ let jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-libcxx.x86_64-linux - jobs.tests.cc-wrapper-clang-4.x86_64-linux - jobs.tests.cc-wrapper-libcxx-4.x86_64-linux jobs.tests.cc-wrapper-clang-5.x86_64-linux jobs.tests.cc-wrapper-libcxx-5.x86_64-linux jobs.tests.cc-wrapper-clang-6.x86_64-linux @@ -145,8 +143,6 @@ let # jobs.tests.cc-wrapper-gcc8.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-darwin - jobs.tests.cc-wrapper-clang-4.x86_64-darwin - jobs.tests.cc-wrapper-libcxx-4.x86_64-darwin jobs.tests.cc-wrapper-clang-5.x86_64-darwin jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin jobs.tests.cc-wrapper-clang-6.x86_64-darwin From f73d7259677b508efa5723a64ffbe0ea45634692 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 Jan 2020 20:19:45 +0100 Subject: [PATCH 087/241] llvm_{3,4}: re-add attributes with an error message about their removal With this change, expressions relying on those old LLVM versions will fail with a meaningful error message. --- nixos/doc/manual/release-notes/rl-2003.xml | 3 +++ pkgs/top-level/aliases.nix | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 41cf9d5eb15..13981c0853d 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -536,6 +536,9 @@ auth required pam_succeed_if.so uid >= 1000 quiet + + The LLVM versions 3.5, 3.9 and 4 (including the corresponding CLang versions) have been dropped. + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 771e39f5635..c543af2405c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -540,4 +540,21 @@ mapAliases ({ tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10 tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; + + /* Cleanup before 20.09 */ + llvm_4 = throw '' + The LLVM versions 3.5, 3.9 and 4.0 have been removed in NixOS 20.03 + due to a lack of compatibility with glibc 2.30! + ''; + llvm_39 = llvm_4; + llvm_35 = llvm_4; + lld_4 = llvm_4; + + llvmPackages_4 = llvm_4; + llvmPackages_39 = llvm_4; + llvmPackages_35 = llvm_4; + + clang_39 = llvm_4; + clang_35 = llvm_4; + clang_4 = llvm_4; }) From 36d1141acd2e057d2fd5236466c024d38b49f834 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Tue, 21 Jan 2020 21:29:43 -0800 Subject: [PATCH 088/241] nixosTests.networkingProxy: port to Python --- nixos/tests/networking-proxy.nix | 100 +++++++++++++++++++------------ 1 file changed, 62 insertions(+), 38 deletions(-) diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix index ab908c96e5e..bae9c66ed61 100644 --- a/nixos/tests/networking-proxy.nix +++ b/nixos/tests/networking-proxy.nix @@ -10,7 +10,7 @@ let default-config = { virtualisation.memorySize = 128; }; -in import ./make-test.nix ({ pkgs, ...} : { +in import ./make-test-python.nix ({ pkgs, ...} : { name = "networking-proxy"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ]; @@ -66,46 +66,70 @@ in import ./make-test.nix ({ pkgs, ...} : { testScript = '' - startAll; + from typing import Dict, Optional - # no proxy at all - print $machine->execute("env | grep -i proxy"); - print $machine->execute("su - alice -c 'env | grep -i proxy'"); - $machine->mustFail("env | grep -i proxy"); - $machine->mustFail("su - alice -c 'env | grep -i proxy'"); - # Use a default proxy option - print $machine2->execute("env | grep -i proxy"); - print $machine2->execute("su - alice -c 'env | grep -i proxy'"); - $machine2->mustSucceed("env | grep -i proxy"); - $machine2->mustSucceed("su - alice -c 'env | grep -i proxy'"); + def get_machine_env(machine: Machine, user: Optional[str] = None) -> Dict[str, str]: + """ + Gets the environment from a given machine, and returns it as a + dictionary in the form: + {"lowercase_var_name": "value"} - # explicitly set each proxy option - print $machine3->execute("env | grep -i proxy"); - print $machine3->execute("su - alice -c 'env | grep -i proxy'"); - $machine3->mustSucceed("env | grep -i http_proxy | grep 123"); - $machine3->mustSucceed("env | grep -i https_proxy | grep 456"); - $machine3->mustSucceed("env | grep -i rsync_proxy | grep 789"); - $machine3->mustSucceed("env | grep -i ftp_proxy | grep 101112"); - $machine3->mustSucceed("env | grep -i no_proxy | grep 131415"); - $machine3->mustSucceed("su - alice -c 'env | grep -i http_proxy | grep 123'"); - $machine3->mustSucceed("su - alice -c 'env | grep -i https_proxy | grep 456'"); - $machine3->mustSucceed("su - alice -c 'env | grep -i rsync_proxy | grep 789'"); - $machine3->mustSucceed("su - alice -c 'env | grep -i ftp_proxy | grep 101112'"); - $machine3->mustSucceed("su - alice -c 'env | grep -i no_proxy | grep 131415'"); + Duplicate environment variables with the same name + (e.g. "foo" and "FOO") are handled in an undefined manner. + """ + if user is not None: + env = machine.succeed("su - {} -c 'env -0'".format(user)) + else: + env = machine.succeed("env -0") + ret = {} + for line in env.split("\0"): + if "=" not in line: + continue - # set default proxy option + some other specifics - print $machine4->execute("env | grep -i proxy"); - print $machine4->execute("su - alice -c 'env | grep -i proxy'"); - $machine4->mustSucceed("env | grep -i http_proxy | grep 000"); - $machine4->mustSucceed("env | grep -i https_proxy | grep 000"); - $machine4->mustSucceed("env | grep -i rsync_proxy | grep 123"); - $machine4->mustSucceed("env | grep -i ftp_proxy | grep 000"); - $machine4->mustSucceed("env | grep -i no_proxy | grep 131415"); - $machine4->mustSucceed("su - alice -c 'env | grep -i http_proxy | grep 000'"); - $machine4->mustSucceed("su - alice -c 'env | grep -i https_proxy | grep 000'"); - $machine4->mustSucceed("su - alice -c 'env | grep -i rsync_proxy | grep 123'"); - $machine4->mustSucceed("su - alice -c 'env | grep -i ftp_proxy | grep 000'"); - $machine4->mustSucceed("su - alice -c 'env | grep -i no_proxy | grep 131415'"); + key, val = line.split("=", 1) + ret[key.lower()] = val + return ret + + + start_all() + + with subtest("no proxy"): + assert "proxy" not in machine.succeed("env").lower() + assert "proxy" not in machine.succeed("su - alice -c env").lower() + + with subtest("default proxy"): + assert "proxy" in machine2.succeed("env").lower() + assert "proxy" in machine2.succeed("su - alice -c env").lower() + + with subtest("explicitly-set proxy"): + env = get_machine_env(machine3) + assert "123" in env["http_proxy"] + assert "456" in env["https_proxy"] + assert "789" in env["rsync_proxy"] + assert "101112" in env["ftp_proxy"] + assert "131415" in env["no_proxy"] + + env = get_machine_env(machine3, "alice") + assert "123" in env["http_proxy"] + assert "456" in env["https_proxy"] + assert "789" in env["rsync_proxy"] + assert "101112" in env["ftp_proxy"] + assert "131415" in env["no_proxy"] + + with subtest("default proxy + some other specifics"): + env = get_machine_env(machine4) + assert "000" in env["http_proxy"] + assert "000" in env["https_proxy"] + assert "123" in env["rsync_proxy"] + assert "000" in env["ftp_proxy"] + assert "131415" in env["no_proxy"] + + env = get_machine_env(machine4, "alice") + assert "000" in env["http_proxy"] + assert "000" in env["https_proxy"] + assert "123" in env["rsync_proxy"] + assert "000" in env["ftp_proxy"] + assert "131415" in env["no_proxy"] ''; }) From 9d886869cba7346bc030db614e0f412da86151d1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Jan 2020 19:12:36 +0100 Subject: [PATCH 089/241] =?UTF-8?q?speechd:=200.8.8=20=E2=86=92=200.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0.9.0: https://lists.nongnu.org/archive/html/speechd-discuss/2019-01/msg00058.html 0.9.1: https://lists.nongnu.org/archive/html/speechd-discuss/2019-05/msg00000.html --- .../development/libraries/speechd/default.nix | 22 ++++++++++++++----- .../libraries/speechd/fix-paths.patch | 11 ++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/speechd/fix-paths.patch diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 20bab968513..6b8e42a7c19 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -1,11 +1,13 @@ { stdenv +, substituteAll , pkgconfig , fetchurl , python3Packages -, intltool +, gettext , itstool , libtool , texinfo +, utillinux , autoreconfHook , glib , dotconf @@ -37,17 +39,24 @@ let throw "You need to enable at least one output module."; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.8.8"; + version = "0.9.1"; src = fetchurl { - url = "http://www.freebsoft.org/pub/projects/speechd/${pname}-${version}.tar.gz"; - sha256 = "1wvck00w9ixildaq6hlhnf6wa576y02ac96lp6932h3k1n08jaiw"; + url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; + hash = "sha256:16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p"; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit utillinux; + }) + ]; + nativeBuildInputs = [ pkgconfig autoreconfHook - intltool + gettext libtool itstool texinfo @@ -79,6 +88,7 @@ in stdenv.mkDerivation rec { configureFlags = [ # Audio method falls back from left to right. "--with-default-audio-method=\"libao,pulse,alsa,oss\"" + "--with-systemdsystemunitdir=${placeholder ''out''}/lib/systemd/system" ] ++ optional withPulse "--with-pulse" ++ optional withAlsa "--with-alsa" ++ optional withLibao "--with-libao" @@ -98,6 +108,8 @@ in stdenv.mkDerivation rec { wrapPythonPrograms ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Common interface to speech synthesis"; homepage = "https://devel.freebsoft.org/speechd"; diff --git a/pkgs/development/libraries/speechd/fix-paths.patch b/pkgs/development/libraries/speechd/fix-paths.patch new file mode 100644 index 00000000000..acf7e5e08f4 --- /dev/null +++ b/pkgs/development/libraries/speechd/fix-paths.patch @@ -0,0 +1,11 @@ +--- a/speech-dispatcherd.service.in ++++ b/speech-dispatcherd.service.in +@@ -19,7 +19,7 @@ + [Service] + Type=forking + ExecStart=@bindir@/speech-dispatcher -d +-ExecReload=/bin/kill -HUP $MAINPID ++ExecReload=@utillinux@/bin/kill -HUP $MAINPID + + [Install] + WantedBy=multi-user.target From 3c5f6dca9f85978cf40a329ea84c4664c7c3358b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=A4=D0=B5=D0=B4=D0=B8=D0=BD?= Date: Sun, 8 Dec 2019 18:26:28 +0400 Subject: [PATCH 090/241] maintainers: add ilya-fedin --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0da9e6df171..43668ab4318 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3028,6 +3028,12 @@ githubId = 4401220; name = "Michael Eden"; }; + ilya-fedin = { + email = "fedin-ilja2010@ya.ru"; + github = "ilya-fedin"; + githubId = 17829319; + name = "Ilya Fedin"; + }; ilya-kolpakov = { email = "ilya.kolpakov@gmail.com"; github = "ilya-kolpakov"; From 7eb5376127af335d7eb44679c716886e77ed7f15 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 25 Jan 2020 01:57:01 +0400 Subject: [PATCH 091/241] libtgvoip: init at unstable-2020-01-21 --- .../libraries/libtgvoip/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/libtgvoip/default.nix diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix new file mode 100644 index 00000000000..80c6e7e204e --- /dev/null +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, pkg-config, autoreconfHook +, openssl, libopus, alsaLib, libpulseaudio +}: + +with lib; + +stdenv.mkDerivation rec { + pname = "libtgvoip"; + version = "unstable-2020-01-21"; + + src = fetchFromGitHub { + owner = "telegramdesktop"; + repo = "libtgvoip"; + rev = "ade4434f1c6efabecc3b548ca1f692f8d103d22a"; + sha256 = "1bhnx3sknadx7a4qk9flh356kffb02xx32grj7cj7ik4rarccgp0"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ openssl libopus alsaLib libpulseaudio ]; + enableParallelBuilding = true; + + meta = { + description = "VoIP library for Telegram clients"; + license = licenses.unlicense; + platforms = platforms.linux; + homepage = https://github.com/telegramdesktop/libtgvoip; + maintainers = with maintainers; [ ilya-fedin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6abbca2153d..2bf409b209a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13045,6 +13045,8 @@ in libtap = callPackage ../development/libraries/libtap { }; + libtgvoip = callPackage ../development/libraries/libtgvoip { }; + libtsm = callPackage ../development/libraries/libtsm { }; libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { }; From 34890e42af03f4df1083a6c7e402843276244b6f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 25 Jan 2020 01:58:58 +0400 Subject: [PATCH 092/241] kotatogram-desktop: init at 1.1.5 --- .../telegram/kotatogram-desktop/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix new file mode 100644 index 00000000000..862659fde8d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -0,0 +1,54 @@ +{ mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja +, qtbase, qtimageformats, enchant, xdg_utils, ffmpeg, openalSoft, lzma +, lz4, xxHash, zlib, minizip, openssl, libtgvoip, range-v3 +}: + +with lib; + +mkDerivation rec { + pname = "kotatogram-desktop"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "kotatogram"; + repo = "kotatogram-desktop"; + rev = "k${version}"; + sha256 = "1j5wn3k1mr2c39szmyzm0pf720jmbllcaj40p2ydx0p3lir1s760"; + fetchSubmodules = true; + }; + + postPatch = '' + substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ + --replace '"libenchant-2.so.2"' '"${enchant}/lib/libenchant-2.so.2"' + ''; + + nativeBuildInputs = [ pkg-config python3 cmake ninja ]; + + buildInputs = [ + qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash + zlib minizip openssl enchant libtgvoip range-v3 + ]; + + qtWrapperArgs = [ + "--prefix PATH : ${xdg_utils}/bin" + ]; + + cmakeFlags = [ + "-DTDESKTOP_API_TEST=ON" + "-DTDESKTOP_DISABLE_GTK_INTEGRATION=ON" + "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" + ]; + + meta = { + description = "Kotatogram – experimental Telegram Desktop fork"; + longDescription = '' + Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. + + It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes + ''; + license = licenses.gpl3; + platforms = platforms.linux; + homepage = https://kotatogram.github.io; + maintainers = with maintainers; [ ilya-fedin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bf409b209a..f79c8c6e87d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19914,6 +19914,8 @@ in konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; + kotatogram-desktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; + krita = libsForQt5.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; }; From dc57bd84b0447493b59e6dca025d4fe43b5e2c86 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 13 Jan 2020 15:46:33 -0500 Subject: [PATCH 093/241] yoda: provide python3Packages.yoda --- .../libraries/physics/yoda/default.nix | 18 +++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- pkgs/top-level/python-packages.nix | 4 ++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index c6c6f742d0b..8ed0a2c4ae3 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }: +{ stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }: stdenv.mkDerivation rec { pname = "yoda"; @@ -9,14 +9,26 @@ stdenv.mkDerivation rec { sha256 = "1ki88rscnym0vjxpfgql8m1lrc7vm1jb9w4jhw9lvv3rk84lpdng"; }; - pythonPath = []; # python wrapper support + patches = [ + # fixes "TypeError: expected bytes, str found" in writeYODA() + (fetchpatch { + url = "https://gitlab.com/hepcedar/yoda/commit/d2bbbe92912457f8a29b440cbfa0b39daf28ec34.diff"; + sha256 = "1x60piswpxwak61r2sdclsc8pzi1fshpkjnxlyflsa1iap77vkq8"; + }) + ]; - buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ] + nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; + buildInputs = [ python ] + ++ (with python.pkgs; [ numpy matplotlib ]) ++ stdenv.lib.optional withRootSupport root; propagatedBuildInputs = [ zlib ]; enableParallelBuilding = true; + postPatch = '' + touch pyext/yoda/*.{pyx,pxd} + ''; + postInstall = '' for prog in "$out"/bin/*; do wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f79c8c6e87d..6b5f63e857a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24626,7 +24626,9 @@ in thepeg = callPackage ../development/libraries/physics/thepeg { }; - yoda = callPackage ../development/libraries/physics/yoda { }; + yoda = callPackage ../development/libraries/physics/yoda { + python = python2; + }; yoda-with-root = lowPrio (yoda.override { withRootSupport = true; }); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 596c397505f..955cd768c4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5693,6 +5693,10 @@ in { xxhash = callPackage ../development/python-modules/xxhash { }; + yoda = toPythonModule (pkgs.yoda.override { + inherit python; + }); + youtube-dl = callPackage ../tools/misc/youtube-dl {}; youtube-dl-light = callPackage ../tools/misc/youtube-dl { From 013806409213bb5869bd93425007668f62aec790 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 20:58:24 -0500 Subject: [PATCH 094/241] fondo: 1.3.2 -> 1.3.8 https://github.com/calo001/fondo/releases/tag/1.3.8 --- pkgs/applications/graphics/fondo/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 3df7ba493c0..7b186312301 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , pantheon , vala , pkgconfig @@ -15,26 +14,28 @@ , glib-networking , libsoup , libunity +, desktop-file-utils , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "fondo"; - version = "1.3.2"; + version = "1.3.8"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "0w7qai261l9m7ckzxc2gj3ywa55wm6p5br1xdk7607ql44lfpgba"; + sha256 = "126diirhmm2igxdpgfv1l20wnz5q8hadgq53d0j83ka72mfd3qg6"; }; nativeBuildInputs = [ + desktop-file-utils meson ninja - vala pkgconfig python3 + vala wrapGAppsHook ]; @@ -50,14 +51,6 @@ stdenv.mkDerivation rec { pantheon.granite ]; - patches = [ - # Fix hardcoded FHS gsettings path - (fetchpatch { - url = "https://github.com/calo001/fondo/commit/98afdd834201321a3242f0b53bfba4b2ffa04a4c.patch"; - sha256 = "0vvgbgjja6vyrk6in3sgv8jbl4bwxkm6fhllgjzq7r65gkj4jg79"; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py From 4f1c6789baa477a02db61d56f24bd779179c2c68 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 20:59:17 -0500 Subject: [PATCH 095/241] aesop: 1.1.3 -> 1.2.3 --- pkgs/applications/office/aesop/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 5b166711693..d5a10f43c55 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -3,24 +3,15 @@ stdenv.mkDerivation rec { pname = "aesop"; - version = "1.1.3"; + version = "1.2.3"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1hnwhxaz0zx4fswrxjzyv5s77v5fimn87yid9sd1qgfv2g1ck0jc"; + sha256 = "1aa1kp1rndi2dj1d9sf8zhssn5dw183yx1fm2xccdy9zjf9wi4jk"; }; - patches = [ - # Fix build - # https://github.com/lainsce/aesop/pull/33 - (fetchpatch { - url = "https://github.com/lainsce/aesop/commit/850ec86bbfef5168e537a5af7e0d73d96db56330.patch"; - sha256 = "14b251wp11rypqw4fafwjbsqy92mxzr8mmaxlv7n4whvwxrzqirh"; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson From 93ca7d4b8b36d27ad415763f267e9c8af127e00f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jan 2020 00:48:19 +0000 Subject: [PATCH 096/241] kubeseal: 0.9.6 -> 0.9.7 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 3a2463447a2..db71b9b7e30 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "09ds5qn13l6l8kl2i01hgy6pqr30z1rm447ax32lf79zp8hca3r3"; + sha256 = "01skvf8jsianyk9xq7lhcnpn3anhi4lma9bn66ngv279av147h9c"; }; modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd"; From ecb2967b84513684399d84b5c3cdc675b2f2eebd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jan 2020 00:27:18 +0000 Subject: [PATCH 097/241] jump: 0.23.0 -> 0.30.0 --- pkgs/tools/system/jump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index 697fc77d090..b11177b348c 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jump"; - version = "0.23.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "gsamokovarov"; repo = pname; rev = "v${version}"; - sha256 = "1acpvg3adcjnxnz9vx7q99cvnkkvkxfdjkbh2rb6iwakx7ksaakv"; + sha256 = "1pp3d9xkdaqrcbzwnnask8786capdxvgq6wbpwkzkfni978vv2l4"; }; modSha256 = "1fzsm85c31vkdw80kijxmjhk8jyhjz8b21npgks2qrnizhm6iaf8"; From 768154aaed1d3d240a21bc41f61a4f7722b91e7e Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 30 Jan 2020 16:54:50 -0500 Subject: [PATCH 098/241] zabbix: 4.0.16 -> 4.0.17 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 0a61ba489eb..7b98ef93074 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -5,8 +5,8 @@ generic: { }; v40 = generic { - version = "4.0.16"; - sha256 = "0hjdvi0cwr9qczmkvnmmd22828hv5c587xcszp9pnap6621f3mx8"; + version = "4.0.17"; + sha256 = "0h699awyw3rhjkm1b84ld0sh7bbpvy4bplmcik36q1303sfrkw21"; }; v30 = generic { From 609699bc95c0c9a76b809d6e095637e24663a872 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 30 Jan 2020 16:57:11 -0500 Subject: [PATCH 099/241] zabbix: 4.4.4 -> 4.4.5 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 7b98ef93074..aa27b6b18ea 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v44 = generic { - version = "4.4.4"; - sha256 = "0pw66zd89w0i9365zkwn6vihx9bdzsmg7f91hd7zzm42s7kyvxvv"; + version = "4.4.5"; + sha256 = "1snhpqj5p16giplbxa6xfrsairnf0m1qdh378yrifbh6bf19ga4l"; }; v40 = generic { From 7267908f844efd14a3aac3e3479bc8fd722d65fb Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 31 Jan 2020 00:55:26 +0300 Subject: [PATCH 100/241] mkgmap: 4289 -> 4432 --- pkgs/applications/misc/mkgmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index debcea78f55..471ec1d4a76 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -17,12 +17,12 @@ in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4289"; + version = "4432"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "1sm1pw71q7z0jrxm8bcgm6xjl2mcidyibcf0a3m8fv2andidxrb4"; + sha256 = "1z1ppf9v1b9clnx20v15xkmdrfw6q4h7i15drzxsdh2wl6bafzvx"; }; # This patch removes from the build process From 28a590897ec0988d4488f7ec579d24d08200039c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 30 Jan 2020 20:41:54 +0000 Subject: [PATCH 101/241] hivemind: Patch /bin/sh to runtimeShell --- pkgs/applications/misc/hivemind/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index e452ec0511e..b3fb84340f2 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -1,10 +1,14 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, runtimeShell }: buildGoPackage rec { pname = "hivemind"; version = "1.0.6"; goPackagePath = "github.com/DarthSim/hivemind"; + postPatch = '' + substituteInPlace process.go --replace \"/bin/sh\" \"${runtimeShell}\" + ''; + src = fetchFromGitHub { owner = "DarthSim"; repo = "hivemind"; From 55dcf5dbbde6480c38ea855753b5b4ad2c288035 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 19:36:01 +0000 Subject: [PATCH 102/241] you-get: 0.4.1355 -> 0.4.1388 --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index eb599caa702..223fb4883ae 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1355"; + version = "0.4.1388"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "06y9q336az8dzkxc13rzhl0m6l298saaida75wsd9fjm8pych6fx"; + sha256 = "1afnyb5srs0prqm73pz5qbfk5j4lb5g70nqg41r4igh753p2yi13"; }; meta = with stdenv.lib; { From 00355c593a62114a8541e9c7535c20e9b6a00f46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 19:48:37 +0000 Subject: [PATCH 103/241] yaru-theme: 19.10.4 -> 19.10.5 --- pkgs/data/themes/yaru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index f83dbc3ebcc..2c3686f63d0 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "19.10.4"; + version = "19.10.5"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "1dj6awlz13787783ds9mdid75rd4vvgpg52h6x19pxdga3k17s9b"; + sha256 = "0d53flfkb01kycchdhv72ga0qh8947bxvm5njfrrbk6rqfg0zc1v"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From 6ef537249fa70239631e78d7c0cb5b49ab7a3b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Thu, 30 Jan 2020 22:09:54 +0100 Subject: [PATCH 104/241] skaffold: 1.0.1 -> 1.2.0 --- pkgs/development/tools/skaffold/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 498de0edecf..d485ac19996 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.0.1"; - # rev is the 1.0.1 commit, mainly for skaffold version command output - rev = "934dd5ad304bef89cb3619b5b2ef53eb8cf04715"; + version = "1.2.0"; + # rev is the 1.2.0 commit, mainly for skaffold version command output + rev = "80f82f42fe271aea1058f4a37776d52ab5a7c441"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0pvidf8m6v56qa3dlqls55jcmjqb54spkx7xxynvhj3590pjw4qx"; + sha256 = "17gdxifv3n2kcmz1pvs2ni2llq30zw6dwxgy5crs97h7hjdk29fw"; }; meta = { From 81b87785072da86f1bcf6d2d4ad39840f083b50a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 18:21:54 +0000 Subject: [PATCH 105/241] zim: 0.72.0 -> 0.72.1 --- pkgs/applications/office/zim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index a9b0f526852..075552b1ec4 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python3Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.72.0"; + version = "0.72.1"; src = fetchurl { url = "https://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "1n3gmg7g86s8iwcx0i7rvvfdfs1fzmc9awr9qzjd2rckw4bkxad1"; + sha256 = "0a9h97rmp7if74p3i028cllzf9p9468psbqwcvm9009ga253dr1l"; }; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome3.adwaita-icon-theme ]; From 2ff21bdc23d7efdc680cd411473f9c5566670884 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 18:13:54 +0000 Subject: [PATCH 106/241] zotero: 5.0.80 -> 5.0.82 --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 42c5488bd5e..f24cc014cdd 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.80"; + version = "5.0.82"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "0a5xjliml6rwxvi450l42iw6m9mk3aahnp90sr22jyijz9qii2al"; + sha256 = "02a9dlsdd7dh56dwvsjskr899bqi8ijcvzc71xcjwaik6rp8xw88"; }; buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme dconf ]; From 1f5a5debc28910a0d516c355c313c10fa6ec6923 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jan 2020 01:26:47 +0000 Subject: [PATCH 107/241] limesuite: 19.04.0 -> 20.01.0 --- pkgs/applications/radio/limesuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 4e69b11efbf..aae062a87c7 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -4,7 +4,7 @@ } : let - version = "19.04.0"; + version = "20.01.0"; in stdenv.mkDerivation { pname = "limesuite"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "1lrjrli0ny25qwg8bw1bvbdb18hf7ffqj4ziibkgzscv3w5v0s45"; + sha256 = "01z4idcby2lm34bbnpbp400ski7p61jjiir6sy6dalnvsl52m7vx"; }; enableParallelBuilding = true; From c47914016a88f297cc55432ab82bdee3b502f316 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 17:43:20 +0000 Subject: [PATCH 108/241] wiggle: 1.1 -> 1.2 --- pkgs/development/tools/wiggle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index df32d68767f..f1edd52eca2 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "wiggle-1.1"; + name = "wiggle-1.2"; src = fetchurl { - url = "https://github.com/neilbrown/wiggle/archive/v1.1.tar.gz"; - sha256 = "0gg1c0zcrd5fgawvjccmdscm3fka8h1qz4v807kvy1b2y1cf9c4w"; + url = "https://github.com/neilbrown/wiggle/archive/v1.2.tar.gz"; + sha256 = "1gckj0zv2xznzg7i70p9dfmkhdpdg3953msi4gg5h6mpmmiiiwrw"; }; buildInputs = [ ncurses groff ]; From 8bcad60b8f7342170e06ee3fecef0e73b04dcbce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 18:18:29 +0000 Subject: [PATCH 109/241] yodl: 4.02.01 -> 4.02.02 --- pkgs/development/tools/misc/yodl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 5520a4a30be..38a92bc5482 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "yodl"; - version = "4.02.01"; + version = "4.02.02"; nativeBuildInputs = [ icmake ]; buildInputs = [ perl ]; src = fetchFromGitLab { - sha256 = "0m8idd8m3z27rix55avchm21sd2spcxgrdf63w65zpvnywq0ydax"; + sha256 = "1kf4h99p9i35fgas8z5wdy2qpd7gqfd645b5z7mfssjzsfdrv745"; rev = version; repo = "yodl"; owner = "fbb-git"; From 0750561e00fb3222091d7d16997e622c5fb5745e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 30 Jan 2020 22:16:55 -0800 Subject: [PATCH 110/241] tzupdate: 1.5.0 -> 2.0.0, use python3 --- pkgs/applications/misc/tzupdate/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index ae418544132..5c2b1312faf 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -1,22 +1,22 @@ -{ stdenv, python }: +{ stdenv, python3 }: let - inherit (python.pkgs) buildPythonApplication fetchPypi requests; + inherit (python3.pkgs) buildPythonApplication fetchPypi requests; in buildPythonApplication rec { pname = "tzupdate"; - version = "1.5.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "13np40h64bgkcj10qw6f4nb51p47bb20fd6pzxq8xbr645a4d34m"; + sha256 = "12jvyza9pfhazkzq94nizacknnp32lf7kalrjmpz1z2bqqxhx0fm"; }; propagatedBuildInputs = [ requests ]; meta = with stdenv.lib; { - description = "Update timezone information based on geoip."; - homepage = https://github.com/cdown/tzupdate; + description = "Update timezone information based on geoip"; + homepage = "https://github.com/cdown/tzupdate"; maintainers = [ maintainers.michaelpj ]; license = licenses.unlicense; }; From f64307a00dfa4e5b8e54733aff28468efd77875c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 30 Jan 2020 17:29:23 +0000 Subject: [PATCH 111/241] tryton: 5.4.1 -> 5.4.2 --- pkgs/applications/office/tryton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 4867fec514b..b9f1465af17 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -20,13 +20,13 @@ with stdenv.lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "5.4.1"; + version = "5.4.2"; disabled = !python3Packages.isPy3k; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0lk47qv944yc2b1ifhinp07af839r408w83rj8zzy8b43cwkpsxd"; + sha256 = "1rca19krvmycdhmi1vb4ixwq0cagmrkhbqry4f19b725nlp8cv0q"; }; nativeBuildInputs = [ From 4024c84f049066da50c01211608857ab414cbada Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jan 2020 08:26:57 +0000 Subject: [PATCH 112/241] krohnkite: 0.5 -> 0.6 --- pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix index 7a7c88b6bcf..c568aa8b870 100644 --- a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix +++ b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "krohnkite"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "esjeon"; repo = "krohnkite"; rev = "v${version}"; - sha256 = "0i0xr5aj565dzr72zjg7wmyca2gwg9izhnri63pab5y5gp5zjqn2"; + sha256 = "0gib39vvnpdynyfqfrkzri67dhr4lf3zpk3njw4zzkz97c8k6psq"; }; buildInputs = [ From 008eb7cb75b8a424fd48244be4f6a205648b8941 Mon Sep 17 00:00:00 2001 From: kjuvi Date: Tue, 28 Jan 2020 19:59:03 +0100 Subject: [PATCH 113/241] agenda: init at 1.0.12 --- pkgs/applications/office/agenda/default.nix | 54 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/office/agenda/default.nix diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix new file mode 100644 index 00000000000..23efbf9c9b5 --- /dev/null +++ b/pkgs/applications/office/agenda/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchFromGitHub +, pantheon +, cmake +, pkg-config +, vala +, gettext +, glib +, gtk3 +, libgee +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "agenda"; + version = "1.0.12"; + + src = fetchFromGitHub { + owner = "dahenson"; + repo = pname; + rev = version; + sha256 = "128c9p2jkc90imlq25xg5alqlam8q4i3gd5p1kcggf7s4amv8l8w"; + }; + + nativeBuildInputs = [ + cmake + gettext + vala + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libgee + pantheon.granite + ]; + + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; + homepage = https://github.com/dahenson/agenda; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aedba5c21b7..334a66f8418 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18100,6 +18100,8 @@ in agedu = callPackage ../tools/misc/agedu { }; + agenda = callPackage ../applications/office/agenda { }; + ahoviewer = callPackage ../applications/graphics/ahoviewer { }; airwave = callPackage ../applications/audio/airwave { }; From bc5f6ff8192232917e7fb0b3d722f7a9d20755ed Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jan 2020 04:20:00 -0500 Subject: [PATCH 114/241] broot: 0.12.0 -> 0.12.2 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 7f8a9dbde57..d555d031896 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0z31yizjczr59z6vxgjc3lqlcr3m21bi5ly8pxp3s3w7nbfr369q"; + sha256 = "1y2da4xcdsvvss4plbp77pqhi8fqjlnsgpcwq8fkc0vx049ijhcm"; }; - cargoSha256 = "0cwj63907xwy1ali9p2wnzhlcb80c6nhf684fbbsg7awiyqgdak3"; + cargoSha256 = "1h9jpyxvk76h06jgy3bwbr3ymhqypsyq05m99clkkrlwp8dnsgqq"; verifyCargoDeps = true; nativeBuildInputs = [ installShellFiles ]; From 0cac9631f12b3ff3f24670e18bbd6e2e51502ade Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jan 2020 04:20:00 -0500 Subject: [PATCH 115/241] spotify-tui: 0.12.0 -> 0.13.0 Changelog: https://github.com/Rigellute/spotify-tui/releases/tag/v0.13.0 --- pkgs/applications/audio/spotify-tui/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 6f8fc541ad7..fc630e78078 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "18ja0a7s6lhz6y8fmpmabv95zkcfazj0qc0dsd9dblfzzjhvmw39"; + sha256 = "0gp7xb63icraqg7f0j91q474acph3ligzak2k8qqr9cqbgg509f4"; }; cargoSha256 = "1364z9jz3mnba3pii5h7imqlwlvbp146pcd5q8w61lsmdr2iyha2"; @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Spotify for the terminal written in Rust"; homepage = https://github.com/Rigellute/spotify-tui; + changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jwijenbergh ]; platforms = platforms.all; From 5f192ddcf68f5311458e2b6e395d1af2c42874ae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jan 2020 04:20:00 -0500 Subject: [PATCH 116/241] tflint: 0.13.3 -> 0.14.0 Changelog: https://github.com/terraform-linters/tflint/releases/tag/v0.14.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 79dedb3afba..05237d0080c 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "13azczm5lg9v5mvf1jx165qy2nj2941qlr9vvxa7q3gqmhxcg271"; + sha256 = "0awb8mjdqdwg4g6lpl6g4vavkhy1hby6gsv6mqsycm1a6z1n7q4k"; }; - modSha256 = "0xckzyfc144bc212amw1n63jkmdljbmj0rq0midr37h6bg5a10q3"; + modSha256 = "0ihfrlpi45q4acwfqxkk5ha8x76qk0z4ly3ipdck3a525mfdmk23"; subPackages = [ "." ]; From 77f2d9bf1c1b4c7d7108ab463df53b17ff11bfc5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jan 2020 04:20:00 -0500 Subject: [PATCH 117/241] procs: 0.9.2 -> 0.9.5 --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index b1faa129f34..10f327fd23d 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.9.2"; + version = "0.9.5"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "09n22vyqhqkk9qq91q44l8fi0ks0xyyhsxfsp9pdlnpng9s7hcdg"; + sha256 = "1c2faw88np5dsbnd915m9a2fkx3a7xy9ii0xvacxkrv3z2zab3fc"; }; - cargoSha256 = "135h7aikwy26p30g4734w08bfab73n49bhljssw516wd62xbdk64"; + cargoSha256 = "11wv02nn6gp32zzcd6kmsh6ky0dzyk1qqhb5vxvmq2nxhxjlddwv"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From e85996d3eb28f2117d7c00ab750937de1513f892 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jan 2020 04:20:00 -0500 Subject: [PATCH 118/241] chezmoi: 1.7.10 -> 1.7.12 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 637f7a17695..c0d915d1f82 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.7.10"; + version = "1.7.12"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1miki6p611s0m3s0q5qsc9cks0akm59ks3x1gzi9wvhzf6k9h0dn"; + sha256 = "0ab35dfapm38g92lagsv3nsp8aamrvrpxglhcxrnnajs7h8w3kjh"; }; - modSha256 = "0rzwslpikadhqw8rcbg4hbasfcgjcc850ccfnprdxva4g1bb5rqc"; + modSha256 = "07fglc3k3a5y70slly4ri3izwnyk4nwghmvkjwgc8lbw8m1zx0r8"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" From 8698e55e1f3d2654507153087a7155c181dab388 Mon Sep 17 00:00:00 2001 From: kjuvi Date: Fri, 31 Jan 2020 10:27:44 +0100 Subject: [PATCH 119/241] ephemeral: 6.1.1 -> 6.2.0 --- pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index ce0617b8d3f..c25e41de5db 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.1.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1i77chbjjg8zda5bnn1wj4h00a88awfls5b3i3dqwgsi356hv4wb"; + sha256 = "1y0n1p14kg24qnybi201181q7j6vm20ka4xwmgggjll9v6qflvaz"; }; nativeBuildInputs = [ From dd5b64a61ab6c39d9775e0f101cc3ea22dbab7d3 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Fri, 31 Jan 2020 10:00:50 +0100 Subject: [PATCH 120/241] vegeta: init at 12.7.0 --- pkgs/tools/networking/vegeta/default.nix | 25 +++ pkgs/tools/networking/vegeta/deps.nix | 246 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 273 insertions(+) create mode 100644 pkgs/tools/networking/vegeta/default.nix create mode 100644 pkgs/tools/networking/vegeta/deps.nix diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/tools/networking/vegeta/default.nix new file mode 100644 index 00000000000..cb7cbd67743 --- /dev/null +++ b/pkgs/tools/networking/vegeta/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + pname = "vegeta"; + version = "12.7.0"; + + src = fetchFromGitHub { + owner = "tsenart"; + repo = pname; + rev = "v${version}"; + sha256 = "1wzx9588hjzxq65fxi1zz9xpsw33qq41hpl0j2f077g4m8yxahv5"; + }; + + goPackagePath = "github.com/tsenart/${pname}"; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Versatile HTTP load testing tool"; + license = licenses.mit; + homepage = "https://github.com/tsenart/vegeta/"; + maintainers = [ maintainers.mmahut ]; + }; +} + diff --git a/pkgs/tools/networking/vegeta/deps.nix b/pkgs/tools/networking/vegeta/deps.nix new file mode 100644 index 00000000000..d0637dbeaef --- /dev/null +++ b/pkgs/tools/networking/vegeta/deps.nix @@ -0,0 +1,246 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/alecthomas/jsonschema"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/jsonschema"; + rev = "f2c93856175a"; + sha256 = "145w6zg453mbspfyixs71xfjwi3djq20lij1rcgrdcn5gmwj2cal"; + }; + } + { + goPackagePath = "github.com/bmizerany/perks"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/perks"; + rev = "d9a9656a3a4b"; + sha256 = "0f39b3zfm1zd6xcvlm6szgss026qs84n2j9y5bnb3zxzdkxb9w9n"; + }; + } + { + goPackagePath = "github.com/c2h5oh/datasize"; + fetch = { + type = "git"; + url = "https://github.com/c2h5oh/datasize"; + rev = "4eba002a5eae"; + sha256 = "02sxd659q7m7axfywiqfxk5rh6djh2m5240bin1makldj1nj16j3"; + }; + } + { + goPackagePath = "github.com/dgryski/go-gk"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-gk"; + rev = "201884a44051"; + sha256 = "17csmdlqibg5g2pjybh4522dis6nklyhjvly55pawy0vprd17agz"; + }; + } + { + goPackagePath = "github.com/dgryski/go-lttb"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-lttb"; + rev = "318fcdf10a77"; + sha256 = "0cs2rr2j6fbbpgmfxkq39pir4bibfzkfwxvd2cvw30q97cmfpiz3"; + }; + } + { + goPackagePath = "github.com/gonum/blas"; + fetch = { + type = "git"; + url = "https://github.com/gonum/blas"; + rev = "f22b278b28ac"; + sha256 = "0dh73akv4gazyhva9xbm9xbq786vij8iisivp3p65p6ahf502fs6"; + }; + } + { + goPackagePath = "github.com/gonum/diff"; + fetch = { + type = "git"; + url = "https://github.com/gonum/diff"; + rev = "500114f11e71"; + sha256 = "1bg4k3bxqb44nz1nmyigr5bx55859n55vvi45w2rq4y5djvpral8"; + }; + } + { + goPackagePath = "github.com/gonum/floats"; + fetch = { + type = "git"; + url = "https://github.com/gonum/floats"; + rev = "c233463c7e82"; + sha256 = "12m7pa64mk3am2i10agg6c1aqdfgx9i3f4bgf3w7wra8bnnjncp6"; + }; + } + { + goPackagePath = "github.com/gonum/integrate"; + fetch = { + type = "git"; + url = "https://github.com/gonum/integrate"; + rev = "a422b5c0fdf2"; + sha256 = "01wfav882h3bcp137cd2bsr91hkmmi4d6qwhdm0xv1p2z2qzs7iq"; + }; + } + { + goPackagePath = "github.com/gonum/internal"; + fetch = { + type = "git"; + url = "https://github.com/gonum/internal"; + rev = "f884aa714029"; + sha256 = "038w8pc82vxq773qg0mw472f3p8h5vkh3ggcdn09qd3s6myp2zq7"; + }; + } + { + goPackagePath = "github.com/gonum/lapack"; + fetch = { + type = "git"; + url = "https://github.com/gonum/lapack"; + rev = "e4cdc5a0bff9"; + sha256 = "046fffskysg0bmha16s5582bimpis0m6qd7c7k1n65a0qhrslli1"; + }; + } + { + goPackagePath = "github.com/gonum/mathext"; + fetch = { + type = "git"; + url = "https://github.com/gonum/mathext"; + rev = "8a4bf007ea55"; + sha256 = "044xy32mgcjc5948na6f6fgqqq17canw3z6sppidmj52s17p0k7i"; + }; + } + { + goPackagePath = "github.com/gonum/matrix"; + fetch = { + type = "git"; + url = "https://github.com/gonum/matrix"; + rev = "c518dec07be9"; + sha256 = "0i6pyxxhcy2s9as77g90dsj9xya48775dl5fxgvqal665cxc4l4i"; + }; + } + { + goPackagePath = "github.com/gonum/stat"; + fetch = { + type = "git"; + url = "https://github.com/gonum/stat"; + rev = "41a0da705a5b"; + sha256 = "0r9mqiy3ma0c15p57bz4xq2vf105s9g1lqysb7ff0nip4050cpvn"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/influxdata/tdigest"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/tdigest"; + rev = "a7d76c6f093a"; + sha256 = "02jxrb2d1n6zflwa7jhgid5344l6zj4gxg4kis20v7xa6iqrj1ni"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "v0.7.0"; + sha256 = "13zv5fvjp3nr65lhqhiw6i6mlmqvyls882rlmcas0ab35alsxni8"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "v1.1.17"; + sha256 = "0x0375n7n1qmgyn7yvpr65z4ll4l39q2xagyfafw09h3kkrkpka8"; + }; + } + { + goPackagePath = "github.com/streadway/quantile"; + fetch = { + type = "git"; + url = "https://github.com/streadway/quantile"; + rev = "b0c588724d25"; + sha256 = "1y27nrg7wkyrvw07a5s7wl4lpwxshwyvhzc6i0rzn20dajah2vkh"; + }; + } + { + goPackagePath = "github.com/tsenart/go-tsz"; + fetch = { + type = "git"; + url = "https://github.com/tsenart/go-tsz"; + rev = "cdeb9e1e981e"; + sha256 = "1lgnllx810ly0203jn9vkimcwqv3302mnh9d7mip1yyq4cmvlj3b"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "9756ffdc2472"; + sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ba9fcec4b297"; + sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "749cb33beabd"; + sha256 = "0dm3257q3rv2kyn5lmqqim2fqg634v6rhrqq4glvbk4wx4l3v337"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "2ca718005c18"; + sha256 = "1nl4cw8vrfigab0hij86vl2mmhfmyim69r7vy5qk2v60g8frvgxg"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bfeaf0acf2..dc9f90018a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17971,6 +17971,8 @@ in vegur = callPackage ../data/fonts/vegur { }; + vegeta = callPackage ../tools/networking/vegeta { }; + victor-mono = callPackage ../data/fonts/victor-mono { }; vistafonts = callPackage ../data/fonts/vista-fonts { }; From a21c2fa3ea2b88e698db6fc151d9c7259ae14d96 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 31 Jan 2020 01:48:37 -0800 Subject: [PATCH 121/241] ocamlformat: 0.12 -> 0.13.0 (#78942) --- pkgs/development/tools/ocaml/ocamlformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index d599fb7ade1..b70fcc4fbf9 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -2,13 +2,13 @@ with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.12"; + version = "0.13.0"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; + sha256 = "09y6sfkqfrgxbmphz5q8w7mdlj8fjsrkiapcx86f94dnwz6j3ajf"; }; buildInputs = [ From c508408268ef2083c39664b7753640fdf3472b70 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 31 Jan 2020 20:29:24 +1000 Subject: [PATCH 122/241] kompose: 1.18.0 -> 1.20.0 https://github.com/kubernetes/kompose/blob/v1.20.0/CHANGELOG.md#v1200-2019-12-23 --- .../networking/cluster/kompose/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 1a14e1ed273..6b19cb8c43c 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kompose"; - version = "1.18.0"; + version = "1.20.0"; goPackagePath = "github.com/kubernetes/kompose"; @@ -10,9 +10,16 @@ buildGoPackage rec { rev = "v${version}"; owner = "kubernetes"; repo = "kompose"; - sha256 = "1hb4bs710n9fghphhfakwg42wjscf136dcr05zwwfg7iyqx2cipc"; + sha256 = "1zgxm3zcxapav4jxh1r597rmxmlxcgns1l8w632ch7d90x5ihvll"; }; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + $bin/bin/kompose completion bash > kompose.bash + $bin/bin/kompose completion zsh > kompose.zsh + installShellCompletion kompose.{bash,zsh} + ''; + meta = with stdenv.lib; { description = "A tool to help users who are familiar with docker-compose move to Kubernetes"; homepage = https://github.com/kubernetes/kompose; From 3f4d3dbc5f3fe910abfad6e9d396fbb25bba5c99 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 31 Jan 2020 12:25:11 +0100 Subject: [PATCH 123/241] gitlab-shell: 10.3.0 -> 11.0.0 --- .../version-management/gitlab/gitlab-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 53dd1bb7ffb..38cb8767e78 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "gitlab-shell-go"; - version = "10.3.0"; + version = "11.0.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0kxbw2n5kabh0876xqn1dcjbxyrp82ms566rw065nqrb32g8c2hk"; + sha256 = "1ca4yil8gp1cm7w939irp1x2y907z2mkdqiap8ik8mqp8svv1m44"; }; buildInputs = [ ruby ]; From d2e149584f713418075fce359c98403d696996da Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 31 Jan 2020 12:25:24 +0100 Subject: [PATCH 124/241] gitlab-workhorse: 8.18.0 -> 8.20.0 --- .../version-management/gitlab/gitlab-workhorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 0e10cdc882d..9506a9a86c3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.18.0"; + version = "8.20.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0qsbz8gv9r9wfvxsh9mpspgs2gyyidxdz5n9n7ibfy7z129mx4ak"; + sha256 = "0a64qrbyxvpqgf5ksczn3kisbhyx6fcw58g5nlag4jnjj6w5i0wr"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; From 968f7c28902416a1ce801080006f021f8e6f542a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 31 Jan 2020 12:25:55 +0100 Subject: [PATCH 125/241] gitaly: 1.77.1 -> 1.83.0 --- .../version-management/gitlab/gitaly/Gemfile | 2 +- .../gitlab/gitaly/Gemfile.lock | 21 +- .../gitlab/gitaly/default.nix | 4 +- .../version-management/gitlab/gitaly/deps.nix | 415 +++++++++++++++++- .../gitlab/gitaly/gemset.nix | 42 +- 5 files changed, 435 insertions(+), 49 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 841f6bfdefc..81a8d9f69c8 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -34,7 +34,7 @@ group :development, :test do # gitlab-shell spec gems gem 'listen', '~> 0.5.0' - gem 'simplecov', '~> 0.9.0', require: false + gem 'simplecov', '~> 0.17.1', require: false gem 'vcr', '~> 4.0.0' gem 'webmock', '~> 3.4.0' end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 9d28a073096..c095ad39f51 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -36,9 +36,9 @@ GEM concurrent-ruby (1.1.5) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) diff-lcs (1.3) - docile (1.1.5) + docile (1.3.2) equalizer (0.0.11) erubi (1.8.0) escape_utils (1.2.1) @@ -99,7 +99,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.3.1) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -112,9 +112,8 @@ GEM mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.3.1) - multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.10.5) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -184,11 +183,11 @@ GEM nokogumbo (~> 1.4) sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) - simplecov (0.9.2) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) stringex (2.8.5) thread_safe (0.3.6) thrift (0.11.0.0) @@ -235,7 +234,7 @@ DEPENDENCIES rubocop (~> 0.69) rugged (~> 0.28) sentry-raven (~> 2.9.0) - simplecov (~> 0.9.0) + simplecov (~> 0.17.1) timecop vcr (~> 4.0.0) webmock (~> 3.4.0) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index a4b4540e87a..831fdb398d6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,14 +17,14 @@ let }; }; in buildGoPackage rec { - version = "1.77.1"; + version = "1.83.0"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "08xc9lxlvga36yq1wdvb1h4zk70c36qspyd7azhkw84kzwfrif1c"; + sha256 = "1vwa38mhnxyncrrvp45d8s6fg94xaq8c71d7qh9ip77db0ak45kh"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 31210f2d606..f710523103f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -72,6 +72,24 @@ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; }; } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "7fddfc383310"; + sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; + }; + } { goPackagePath = "github.com/aymerick/raymond"; fetch = { @@ -90,6 +108,15 @@ sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; }; } + { + goPackagePath = "github.com/bgentry/speakeasy"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/speakeasy"; + rev = "v0.1.0"; + sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; + }; + } { goPackagePath = "github.com/certifi/gocertifi"; fetch = { @@ -144,6 +171,42 @@ sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; }; } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v1.0.10"; + sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; + }; + } { goPackagePath = "github.com/davecgh/go-spew"; fetch = { @@ -153,6 +216,15 @@ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } + { + goPackagePath = "github.com/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "cfbb681360f0"; + sha256 = "0mr4y9vppiyl7mvad74k3zk4sc1jdkmc0lcd6lhm70iziw2xpncs"; + }; + } { goPackagePath = "github.com/dgrijalva/jwt-go"; fetch = { @@ -171,6 +243,15 @@ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } { goPackagePath = "github.com/fatih/structs"; fetch = { @@ -288,6 +369,15 @@ sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; }; } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.4.1"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; + }; + } { goPackagePath = "github.com/go-stack/stack"; fetch = { @@ -297,6 +387,42 @@ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; }; } + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "v1.7.1"; + sha256 = "1s1f05cgpkhgcs2qfh04ixxm1ggk8ms3fpwsxhb0mx7nfrcm106d"; + }; + } + { + goPackagePath = "github.com/gobuffalo/logger"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/logger"; + rev = "v1.0.1"; + sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packd"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packd"; + rev = "v0.3.0"; + sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packr"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packr"; + rev = "v2.7.1"; + sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; + }; + } { goPackagePath = "github.com/gogo/protobuf"; fetch = { @@ -306,6 +432,15 @@ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; }; } + { + goPackagePath = "github.com/golang-sql/civil"; + fetch = { + type = "git"; + url = "https://github.com/golang-sql/civil"; + rev = "cb61b32ac6fe"; + sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; + }; + } { goPackagePath = "github.com/golang/glog"; fetch = { @@ -405,6 +540,33 @@ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; }; } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "v1.0.0"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "v1.0.0"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } { goPackagePath = "github.com/hpcloud/tail"; fetch = { @@ -423,6 +585,15 @@ sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; }; } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } { goPackagePath = "github.com/iris-contrib/blackfriday"; fetch = { @@ -459,6 +630,15 @@ sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c"; }; } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } { goPackagePath = "github.com/json-iterator/go"; fetch = { @@ -675,6 +855,15 @@ sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; }; } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } { goPackagePath = "github.com/mattn/go-colorable"; fetch = { @@ -693,6 +882,24 @@ sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; }; } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.12.0"; + sha256 = "0di8zy6202sbs0p9kx8lpii77ir5jwjhg6z0796y3nfvw87wk9iv"; + }; + } { goPackagePath = "github.com/mattn/goveralls"; fetch = { @@ -720,6 +927,33 @@ sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; }; } + { + goPackagePath = "github.com/mitchellh/cli"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/cli"; + rev = "v1.0.0"; + sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } { goPackagePath = "github.com/modern-go/concurrent"; fetch = { @@ -756,6 +990,15 @@ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; }; } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "v0.0.2"; + sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { @@ -783,6 +1026,15 @@ sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; }; } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } { goPackagePath = "github.com/philhofer/fwd"; fetch = { @@ -819,6 +1071,15 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } + { + goPackagePath = "github.com/posener/complete"; + fetch = { + type = "git"; + url = "https://github.com/posener/complete"; + rev = "v1.1.1"; + sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; + }; + } { goPackagePath = "github.com/prometheus/client_golang"; fetch = { @@ -855,6 +1116,33 @@ sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; }; } + { + goPackagePath = "github.com/rogpeppe/go-internal"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/go-internal"; + rev = "v1.4.0"; + sha256 = "17wisy8bapx5ki0gpissm8dvv7x0lmdnrl1fka75g05kpbyv6g2n"; + }; + } + { + goPackagePath = "github.com/rubenv/sql-migrate"; + fetch = { + type = "git"; + url = "https://github.com/rubenv/sql-migrate"; + rev = "06338513c237"; + sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v1.5.2"; + sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; + }; + } { goPackagePath = "github.com/ryanuber/columnize"; fetch = { @@ -896,8 +1184,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.3.0"; - sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; }; } { @@ -918,6 +1206,60 @@ sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; }; } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.5"; + sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.2"; + sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; + }; + } { goPackagePath = "github.com/stretchr/objx"; fetch = { @@ -977,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; }; } { @@ -1053,6 +1395,15 @@ sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg"; }; } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } { goPackagePath = "github.com/yalp/jsonpath"; fetch = { @@ -1089,6 +1440,15 @@ sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; }; } + { + goPackagePath = "github.com/ziutek/mymysql"; + fetch = { + type = "git"; + url = "https://github.com/ziutek/mymysql"; + rev = "v1.5.4"; + sha256 = "172s7sv5bgc40x81k18hypf9c4n8hn9v5w5zwyr4mi5prbavqcci"; + }; + } { goPackagePath = "gitlab.com/gitlab-org/labkit"; fetch = { @@ -1130,8 +1490,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "d28f0bde5980"; - sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; + rev = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; }; } { @@ -1148,8 +1508,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; }; } { @@ -1175,8 +1535,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "2c0ae7006135"; - sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; + rev = "72853e10c5a3"; + sha256 = "06v42k857lcivcar3fq8yjc782hny0m5yf20sb7ij5jva0gab026"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; }; } { @@ -1184,8 +1553,8 @@ fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "v1.1.0"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + rev = "v1.6.5"; + sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; }; } { @@ -1233,6 +1602,15 @@ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } + { + goPackagePath = "gopkg.in/errgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v2"; + rev = "v2.1.0"; + sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; + }; + } { goPackagePath = "gopkg.in/fsnotify.v1"; fetch = { @@ -1260,6 +1638,15 @@ sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; }; } + { + goPackagePath = "gopkg.in/gorp.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/gorp.v1"; + rev = "v1.7.2"; + sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; + }; + } { goPackagePath = "gopkg.in/mgo.v2"; fetch = { @@ -1283,8 +1670,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + rev = "v2.2.5"; + sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 638f6512c1a..3b4e4e5faa6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -133,12 +133,14 @@ version = "0.4.3"; }; crass = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; diff-lcs = { source = { @@ -149,12 +151,14 @@ version = "1.3"; }; docile = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; type = "gem"; }; - version = "1.1.5"; + version = "1.3.2"; }; equalizer = { source = { @@ -418,10 +422,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd"; + sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -495,14 +499,6 @@ }; version = "1.3.1"; }; - multi_json = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; - type = "gem"; - }; - version = "1.13.1"; - }; multipart-post = { source = { remotes = ["https://rubygems.org"]; @@ -517,10 +513,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; + sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; type = "gem"; }; - version = "1.10.5"; + version = "1.10.7"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -827,21 +823,25 @@ version = "2.9.0"; }; simplecov = { - dependencies = ["docile" "multi_json" "simplecov-html"]; + dependencies = ["docile" "json" "simplecov-html"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; + sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw"; type = "gem"; }; - version = "0.9.2"; + version = "0.17.1"; }; simplecov-html = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; + sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.2"; }; stringex = { groups = ["default"]; From cb02372211636fe7be1d0c525c795c747f70536e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 31 Jan 2020 12:26:33 +0100 Subject: [PATCH 126/241] gitlab: 12.6.4 -> 12.7.4 - CVE-2020-7966 - CVE-2020-8114 - CVE-2020-7973 - CVE-2020-6833 - CVE-2020-7971 - CVE-2020-7967 - CVE-2020-7972 - CVE-2020-7968 - CVE-2020-7979 - CVE-2020-7969 - CVE-2020-7978 - CVE-2020-7974 - CVE-2020-7977 - CVE-2020-7976 - CVE-2019-16779 - CVE-2019-18978 - CVE-2019-16892 --- .../version-management/gitlab/data.json | 12 +- .../version-management/gitlab/rubyEnv/Gemfile | 50 ++-- .../gitlab/rubyEnv/Gemfile.lock | 178 ++++++------ .../gitlab/rubyEnv/gemset.nix | 259 +++++++++++------- .../version-management/gitlab/yarnPkgs.nix | 216 ++++++++------- 5 files changed, 415 insertions(+), 300 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 3f1aef360ba..814a94f2e4b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.6.4", - "repo_hash": "0jsww785bxvjdrp1wsz6zkvx9zr69j24bway6nfyjkz8a7vbl9ls", + "version": "12.7.4", + "repo_hash": "02n1paz1m8dq8kmill1bwgkzai5yx7zzqa0rc3cz50pdyfq9lp5c", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.6.4-ee", + "rev": "v12.7.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.77.1", + "GITALY_SERVER_VERSION": "1.83.0", "GITLAB_PAGES_VERSION": "1.12.0", - "GITLAB_SHELL_VERSION": "10.3.0", - "GITLAB_WORKHORSE_VERSION": "8.18.0" + "GITLAB_SHELL_VERSION": "11.0.0", + "GITLAB_WORKHORSE_VERSION": "8.20.0" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 2c4a5f2e816..0c3974ceeba 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -19,7 +19,7 @@ gem 'default_value_for', '~> 3.3.0' gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.1' +gem 'grape-path-helpers', '~> 1.2' gem 'faraday', '~> 0.12' gem 'marginalia', '~> 1.8.0' @@ -65,7 +65,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' -gem 'rubyzip', '~> 1.3.0', require: 'zip' +gem 'rubyzip', '~> 2.0.0', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0.2' @@ -129,26 +129,27 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.7' # Search -gem 'elasticsearch-model', '~> 0.1.9' -gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation' -gem 'elasticsearch-api', '5.0.3' -gem 'aws-sdk' -gem 'faraday_middleware-aws-signers-v4' +gem 'elasticsearch-model', '~> 6.1' +gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' +gem 'elasticsearch-api', '~> 6.8' +gem 'aws-sdk-core', '~> 3' +gem 'aws-sdk-cloudformation', '~> 1' +gem 'faraday_middleware-aws-sigv4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.12' -gem 'deckar01-task_list', '2.2.1' +gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.20' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.0' +gem 'rdoc', '~> 6.1.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false -gem 'asciidoctor-plantuml', '0.0.9' +gem 'asciidoctor-plantuml', '0.0.10' gem 'rouge', '~> 3.11.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' @@ -249,7 +250,7 @@ gem 'asana', '~> 0.9' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.4.0' +gem 'kubeclient', '~> 4.6.0' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -283,7 +284,7 @@ gem 'rack-proxy', '~> 0.6.0' gem 'sassc-rails', '~> 2.1.0' gem 'uglifier', '~> 2.7.2' -gem 'addressable', '~> 2.5.2' +gem 'addressable', '~> 2.7' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' @@ -301,7 +302,7 @@ gem 'sentry-raven', '~> 2.9' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.5' +gem 'gitlab-labkit', '0.8.0' # I18n gem 'ruby_parser', '~> 3.8', require: false @@ -366,11 +367,11 @@ group :development, :test do gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 2.7', require: false + gem 'gitlab-styles', '~> 3.1.0', require: false # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.69.0' - gem 'rubocop-performance', '~> 1.1.0' - gem 'rubocop-rspec', '~> 1.22.1' + gem 'rubocop', '~> 0.74.0' + gem 'rubocop-performance', '~> 1.4.1' + gem 'rubocop-rspec', '~> 1.37.0' gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.34.0', require: false @@ -386,6 +387,10 @@ group :development, :test do gem 'simple_po_parser', '~> 1.1.2', require: false gem 'timecop', '~> 0.8.0' + + gem 'png_quantizator', '~> 0.2.1', require: false + + gem 'parallel', '~> 1.19', require: false end # Gems required in omnibus-gitlab pipeline @@ -415,7 +420,7 @@ group :test do gem 'guard-rspec' end -gem 'octokit', '~> 4.9' +gem 'octokit', '~> 4.15' gem 'mail_room', '~> 0.10.0' @@ -452,13 +457,13 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 1.73.0' +gem 'gitaly', '~> 1.81.0' gem 'grpc', '~> 1.24.0' gem 'google-protobuf', '~> 3.8.0' -gem 'toml-rb', '~> 1.0.0', require: false +gem 'toml-rb', '~> 1.0.0' # Feature toggles gem 'flipper', '~> 0.17.1' @@ -477,3 +482,8 @@ gem 'gitlab-net-dns', '~> 0.9.1' gem 'countries', '~> 3.0' gem 'retriable', '~> 3.1.2' + +gem 'liquid', '~> 4.0' + +# LRU cache +gem 'lru_redux' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 57e428ca955..d4dd0a37570 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -55,8 +55,8 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.0.1) akismet (3.0.0) apollo_upload_server (2.0.0.beta.3) @@ -71,7 +71,7 @@ GEM asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-plantuml (0.0.9) + asciidoctor-plantuml (0.0.10) asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) atlassian-jwt (0.2.0) @@ -81,13 +81,15 @@ GEM attr_required (1.0.1) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-sdk (2.11.374) - aws-sdk-resources (= 2.11.374) - aws-sdk-core (2.11.374) - aws-sigv4 (~> 1.0) + aws-partitions (1.263.0) + aws-sdk-cloudformation (1.29.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.88.0) + aws-eventstream (~> 1.0, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-resources (2.11.374) - aws-sdk-core (= 2.11.374) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) axiom-types (0.1.1) @@ -117,7 +119,7 @@ GEM activemodel (>= 5.0) brakeman (4.2.1) browser (2.5.3) - builder (3.2.3) + builder (3.2.4) bullet (6.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) @@ -192,7 +194,7 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.2.1) + deckar01-task_list (2.3.1) html-pipeline declarative (0.0.10) declarative-option (0.1.0) @@ -235,17 +237,17 @@ GEM doorkeeper (~> 4.3) json-jwt (~> 1.6) ed25519 (1.2.4) - elasticsearch (5.0.3) - elasticsearch-api (= 5.0.3) - elasticsearch-transport (= 5.0.3) - elasticsearch-api (5.0.3) + elasticsearch (6.8.0) + elasticsearch-api (= 6.8.0) + elasticsearch-transport (= 6.8.0) + elasticsearch-api (6.8.0) multi_json - elasticsearch-model (0.1.9) + elasticsearch-model (6.1.0) activesupport (> 3) - elasticsearch (> 0.4) + elasticsearch (> 1) hashie - elasticsearch-rails (0.1.9) - elasticsearch-transport (5.0.3) + elasticsearch-rails (6.1.0) + elasticsearch-transport (6.8.0) faraday multi_json email_reply_trimmer (0.1.6) @@ -260,7 +262,7 @@ GEM et-orbi (1.2.1) tzinfo eventmachine (1.2.7) - excon (0.62.0) + excon (0.71.1) execjs (2.6.0) expression_parser (0.9.0) extended-markdown-filter (0.6.0) @@ -270,15 +272,15 @@ GEM factory_bot_rails (5.1.0) factory_bot (~> 5.1.0) railties (>= 4.2.0) - faraday (0.12.2) + faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - faraday_middleware-aws-signers-v4 (0.1.7) - aws-sdk-resources (~> 2) - faraday (~> 0.9) + faraday_middleware-aws-sigv4 (0.3.0) + aws-sigv4 (~> 1.0) + faraday (>= 0.15) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json @@ -286,6 +288,9 @@ GEM fast_gettext (1.6.0) ffaker (2.10.0) ffi (1.11.3) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake flipper (0.17.1) flipper-active_record (0.17.1) activerecord (>= 4.2, < 7) @@ -357,12 +362,12 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (1.73.0) + gitaly (1.81.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-labkit (0.7.0) + gitlab-labkit (0.8.0) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) @@ -379,11 +384,12 @@ GEM gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (2.8.0) - rubocop (~> 0.69.0) + gitlab-styles (3.1.0) + rubocop (~> 0.74.0) rubocop-gitlab-security (~> 0.1.0) - rubocop-performance (~> 1.1.0) - rubocop-rspec (~> 1.19) + rubocop-performance (~> 1.4.1) + rubocop-rails (~> 2.0) + rubocop-rspec (~> 1.36) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.1.1) @@ -426,7 +432,7 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.1.0) + grape-path-helpers (1.2.0) activesupport grape (~> 1.0) rake (~> 12) @@ -477,7 +483,7 @@ GEM tilt hangouts-chat (0.0.5) hashdiff (0.3.8) - hashie (3.5.7) + hashie (3.6.0) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) @@ -492,20 +498,21 @@ GEM html2text (0.2.0) nokogiri (~> 1.6) htmlentities (4.3.4) - http (3.3.0) + http (4.2.0) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (2.1.1) - http_parser.rb (0.6.0) + http-parser (1.2.1) + ffi-compiler (>= 1.0, < 2.0) httparty (0.16.4) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.7.0) + i18n (1.7.1) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -519,7 +526,7 @@ GEM jaeger-client (0.10.0) opentracing (~> 0.3) thrift - jaro_winkler (1.5.3) + jaro_winkler (1.5.4) jira-ruby (1.7.1) activesupport atlassian-jwt @@ -556,8 +563,8 @@ GEM kramdown (2.1.0) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - kubeclient (4.4.0) - http (~> 3.0) + kubeclient (4.6.0) + http (>= 3.0, < 5.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) launchy (2.4.3) @@ -577,6 +584,7 @@ GEM xml-simple licensee (8.9.2) rugged (~> 0.24) + liquid (4.0.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -587,9 +595,10 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.3.1) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) + lru_redux (1.1.0) lumberjack (1.0.13) mail (2.7.1) mini_mime (>= 0.1.1) @@ -613,9 +622,9 @@ GEM mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.3.1) - multi_json (1.13.1) + multi_json (1.14.1) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.1) murmurhash3 (0.1.6) mustermann (1.0.3) mustermann-grape (1.0.0) @@ -623,13 +632,13 @@ GEM nakayoshi_fork (0.0.4) nap (1.1.0) nenv (0.3.0) - net-ldap (0.16.0) + net-ldap (0.16.2) net-ntp (2.1.3) net-ssh (5.2.0) netrc (0.11.0) nio4r (2.5.2) no_proxy_fix (0.1.2) - nokogiri (1.10.5) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -644,7 +653,8 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.9.0) + octokit (4.15.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) @@ -725,13 +735,14 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.0.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.19.1) + parser (2.6.5.0) ast (~> 2.4.0) parslet (1.8.2) peek (1.1.0) railties (>= 4.0.0) pg (1.1.4) + png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) premailer (1.11.1) @@ -755,7 +766,7 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.1.1) + public_suffix (4.0.3) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) rack (2.0.7) @@ -763,7 +774,8 @@ GEM rack (>= 0.4) rack-attack (6.2.0) rack (>= 1.0, < 3) - rack-cors (1.0.2) + rack-cors (1.0.6) + rack (>= 1.6.0) rack-oauth2 (1.9.3) activesupport attr_required @@ -820,7 +832,7 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rdoc (6.0.4) + rdoc (6.1.2) re2 (1.1.1) recaptcha (4.13.1) json @@ -903,7 +915,7 @@ GEM pg rails sqlite3 - rubocop (0.69.0) + rubocop (0.74.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -912,10 +924,13 @@ GEM unicode-display_width (>= 1.4.0, < 1.7) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-performance (1.1.0) - rubocop (>= 0.67.0) - rubocop-rspec (1.22.2) - rubocop (>= 0.52.1) + rubocop-performance (1.4.1) + rubocop (>= 0.71.0) + rubocop-rails (2.4.0) + rack (>= 1.1) + rubocop (>= 0.72.0) + rubocop-rspec (1.37.0) + rubocop (>= 0.68.1) ruby-enum (0.7.2) i18n ruby-fogbugz (0.2.1) @@ -929,7 +944,7 @@ GEM sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (1.3.0) + rubyzip (2.0.0) rugged (0.28.4.1) safe_yaml (1.0.4) sanitize (4.6.6) @@ -950,9 +965,9 @@ GEM sprockets (> 3.0) sprockets-rails tilt - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) scss_lint (0.56.0) rake (>= 0.9, < 13) sass (~> 3.5.3) @@ -1042,7 +1057,7 @@ GEM truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -1119,17 +1134,18 @@ DEPENDENCIES acme-client (~> 2.0.2) activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 6.0) - addressable (~> 2.5.2) + addressable (~> 2.7) akismet (~> 3.0) apollo_upload_server (~> 2.0.0.beta3) asana (~> 0.9) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) - asciidoctor-plantuml (= 0.0.9) + asciidoctor-plantuml (= 0.0.10) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print - aws-sdk + aws-sdk-cloudformation (~> 1) + aws-sdk-core (~> 3) babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.4.0) @@ -1155,7 +1171,7 @@ DEPENDENCIES creole (~> 0.5.0) danger (~> 6.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.2.1) + deckar01-task_list (= 2.3.1) default_value_for (~> 3.3.0) derailed_benchmarks device_detector @@ -1167,15 +1183,15 @@ DEPENDENCIES doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) ed25519 (~> 1.2) - elasticsearch-api (= 5.0.3) - elasticsearch-model (~> 0.1.9) - elasticsearch-rails (~> 0.1.9) + elasticsearch-api (~> 6.8) + elasticsearch-model (~> 6.1) + elasticsearch-rails (~> 6.1) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) escape_utils (~> 1.1) factory_bot_rails (~> 5.1.0) faraday (~> 0.12) - faraday_middleware-aws-signers-v4 + faraday_middleware-aws-sigv4 fast_blank ffaker (~> 2.10) flipper (~> 0.17.1) @@ -1196,17 +1212,17 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 1.73.0) + gitaly (~> 1.81.0) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-labkit (~> 0.5) + gitlab-labkit (= 0.8.0) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) gitlab-net-dns (~> 0.9.1) gitlab-puma (~> 4.3.1.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 2.7) + gitlab-styles (~> 3.1.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) @@ -1215,7 +1231,7 @@ DEPENDENCIES gpgme (~> 2.0.19) grape (~> 1.1.0) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.1) + grape-path-helpers (~> 1.2) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphql (~> 1.9.11) @@ -1241,12 +1257,14 @@ DEPENDENCIES jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.4.0) + kubeclient (~> 4.6.0) letter_opener_web (~> 1.3.4) license_finder (~> 5.4) licensee (~> 8.9) + liquid (~> 4.0) lograge (~> 0.5) loofah (~> 2.2) + lru_redux mail_room (~> 0.10.0) marginalia (~> 1.8.0) memory_profiler (~> 0.9) @@ -1260,7 +1278,7 @@ DEPENDENCIES net-ssh (~> 5.2) nokogiri (~> 1.10.5) oauth2 (~> 1.4) - octokit (~> 4.9) + octokit (~> 4.15) omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) @@ -1280,8 +1298,10 @@ DEPENDENCIES omniauth_crowd (~> 2.2.0) omniauth_openid_connect (~> 0.3.3) org-ruby (~> 0.9.12) + parallel (~> 1.19) peek (~> 1.1) pg (~> 1.1) + png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.10.0) pry-byebug (~> 3.5.1) @@ -1299,7 +1319,7 @@ DEPENDENCIES raindrops (~> 0.18) rblineprof (~> 0.3.6) rbtrace (~> 0.4) - rdoc (~> 6.0) + rdoc (~> 6.1.2) re2 (~> 1.1.1) recaptcha (~> 4.11) redis (~> 4.0) @@ -1316,14 +1336,14 @@ DEPENDENCIES rspec-set (~> 0.1.3) rspec_junit_formatter rspec_profiling (~> 0.0.5) - rubocop (~> 0.69.0) - rubocop-performance (~> 1.1.0) - rubocop-rspec (~> 1.22.1) + rubocop (~> 0.74.0) + rubocop-performance (~> 1.4.1) + rubocop-rspec (~> 1.37.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 1.0.0) ruby-progressbar ruby_parser (~> 3.8) - rubyzip (~> 1.3.0) + rubyzip (~> 2.0.0) rugged (~> 0.28) sanitize (~> 4.6) sassc-rails (~> 2.1.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 854178ffbe3..f1c2f04e260 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -168,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "2.5.2"; + version = "2.7.0"; }; aes_key_wrap = { groups = ["default"]; @@ -252,10 +252,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb"; + sha256 = "1bnrz4ywaq7vaw66fy3kkbwf07fvyqwngm3vb83s9h5zvr4n593b"; type = "gem"; }; - version = "0.0.9"; + version = "0.0.10"; }; ast = { groups = ["default" "development" "test"]; @@ -319,38 +319,37 @@ }; version = "1.0.3"; }; - aws-sdk = { - dependencies = ["aws-sdk-resources"]; + aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0"; + sha256 = "0mr3f9bdh9lxqy4c999sk99avy46fygx4hf3i86adpvrj6axmygs"; type = "gem"; }; - version = "2.11.374"; + version = "1.263.0"; + }; + aws-sdk-cloudformation = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11fhscz4y6lq9c8p0ikq5608qbv4bhi6sq7bxn6vnsgx9m45kvq1"; + type = "gem"; + }; + version = "1.29.0"; }; aws-sdk-core = { - dependencies = ["aws-sigv4" "jmespath"]; + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9"; + sha256 = "1yl3aw8q7ddm5x2wrqdry038gnkw0ys5il2qhlifqyc0qk8yhlfz"; type = "gem"; }; - version = "2.11.374"; - }; - aws-sdk-resources = { - dependencies = ["aws-sdk-core"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4"; - type = "gem"; - }; - version = "2.11.374"; + version = "3.88.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -534,10 +533,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.4"; }; bullet = { dependencies = ["activesupport" "uniform_notifier"]; @@ -901,10 +900,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k7rlxsl7pd5kn3wyswgqi0hhbmlj40b66l4mf8v9mqf3c7v0yk"; + sha256 = "18bwkvxjr7khxj95xrg1vj7va522vbm2li9wsiiw01cg5b10hni0"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.1"; }; declarative = { groups = ["default"]; @@ -1091,10 +1090,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fik4nrxyi28zy1xwi4rygn0pf1sm1gskcrvbsnmqfrsdd6l4ga4"; + sha256 = "1jp7amblk18dag3w0yrzdzkhkbfap2d6xpbyv9314parxw98mgq0"; type = "gem"; }; - version = "5.0.3"; + version = "6.8.0"; }; elasticsearch-api = { dependencies = ["multi_json"]; @@ -1102,10 +1101,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aal128hq59l5kscl2ag2cv24g1sp5ysdb4jxkqmj0b1l9rv16mw"; + sha256 = "0kq6ljssd5nd2fjaznbnyf4bhkk5q17ava5rq3bjfvjh1wyzagca"; type = "gem"; }; - version = "5.0.3"; + version = "6.8.0"; }; elasticsearch-model = { dependencies = ["activesupport" "elasticsearch" "hashie"]; @@ -1113,20 +1112,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10kbsdxd192g8x60fhaxs4gqpgwag68d53flcw8rwvdm0i8smyzf"; + sha256 = "0ifm8vh8nr9r1wnpnfa6kjm7v54jwsgvpg060r08haydqcv5lbsy"; type = "gem"; }; - version = "0.1.9"; + version = "6.1.0"; }; elasticsearch-rails = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "081hm2dc3l6kky027wm3s8k6lmiygg0hnrggnidchbl94nlalw2z"; + sha256 = "0zxqj7pgb0b32qda84jlg6kay4b9qbpjlfk2b0m23hxnkbbmf1bd"; type = "gem"; }; - version = "0.1.9"; + version = "6.1.0"; }; elasticsearch-transport = { dependencies = ["faraday" "multi_json"]; @@ -1134,10 +1133,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a7fak70ajdqw1ahd2gmgijka52pjjfr3chaakkxa5fk3rwwna26"; + sha256 = "0c1scz8l4z84x7g3iwf9kmvrpgjjq0gaxaswviiy9zg3csn720mc"; type = "gem"; }; - version = "5.0.3"; + version = "6.8.0"; }; email_reply_trimmer = { groups = ["default"]; @@ -1226,10 +1225,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + sha256 = "0nn8wk7j22ly4lzdp5pnm7qsrjxbgspiyxkw70g1qf9bn6pslmxr"; type = "gem"; }; - version = "0.62.0"; + version = "0.71.1"; }; execjs = { groups = ["default"]; @@ -1290,10 +1289,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2"; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; type = "gem"; }; - version = "0.12.2"; + version = "0.15.4"; }; faraday-http-cache = { dependencies = ["faraday"]; @@ -1317,16 +1316,16 @@ }; version = "0.12.2"; }; - faraday_middleware-aws-signers-v4 = { - dependencies = ["aws-sdk-resources" "faraday"]; + faraday_middleware-aws-sigv4 = { + dependencies = ["aws-sigv4" "faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp"; + sha256 = "1gk2qakcvvbgfvvfd8cgf13sligv5mp816ykmra9llqmbfym8ikl"; type = "gem"; }; - version = "0.1.7"; + version = "0.3.0"; }; faraday_middleware-multi_json = { dependencies = ["faraday_middleware" "multi_json"]; @@ -1379,6 +1378,17 @@ }; version = "1.11.3"; }; + ffi-compiler = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; flipper = { groups = ["default"]; platforms = []; @@ -1644,10 +1654,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bls6aywjkvq1jw324criphzbzl710rx1nab4y22bvyi98qvdi38"; + sha256 = "048s8p93srl3fvaj4l38qhrqzndzgiv32dvrr3s5k65pcxm0vb5i"; type = "gem"; }; - version = "1.73.0"; + version = "1.81.0"; }; github-markup = { groups = ["default"]; @@ -1676,10 +1686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r2zkxkj2l78c6qgr6k9lgcp7w6x7r703259rbsbrg7cfnjm43b7"; + sha256 = "1q3qd8jriafyblivqd5fzb95x9mzm8hgizg5401m3m5i957957z9"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; gitlab-license = { groups = ["default"]; @@ -1745,15 +1755,15 @@ version = "0.5.2"; }; gitlab-styles = { - dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"]; + dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kxn5j4gk2bidxfi3lnx8sl58kwh0fp89p75pbwwz3cd88d4vgsq"; + sha256 = "07qh80nxwxgk76bhwrxw0a0jjcfvyxzmcd773k6axwklp5wvas7x"; type = "gem"; }; - version = "2.8.0"; + version = "3.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -1881,10 +1891,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16l6lrv4h4ls0lrpj35pc00431q2rx6r9n47337qyvprxs3v0a01"; + sha256 = "170aw6yvr8l5srlfjz1yqpxr7klr8jypr4i0gj41gn6v4iamyl79"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; grape_logging = { dependencies = ["grape"]; @@ -2041,10 +2051,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb"; + sha256 = "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh"; type = "gem"; }; - version = "3.5.7"; + version = "3.6.0"; }; hashie-forbidden_attributes = { dependencies = ["hashie"]; @@ -2122,15 +2132,15 @@ version = "4.3.4"; }; http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; + dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jlm5prw437wqpfxcigh88lfap3m7g8mnmj5as7qw6dzqnvrxwmc"; + sha256 = "1gsn0jmri7cavw1pv3pbynq6nldsff0r5dr6pa0mxz0rkpjsgjwl"; type = "gem"; }; - version = "3.3.0"; + version = "4.2.0"; }; http-cookie = { dependencies = ["domain_name"]; @@ -2153,15 +2163,16 @@ }; version = "2.1.1"; }; - "http_parser.rb" = { + http-parser = { + dependencies = ["ffi-compiler"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + sha256 = "10wz818i7dq5zkcll0yf7pbjz1zqvs7mgh3xg3x6www2f2ccwxqj"; type = "gem"; }; - version = "0.6.0"; + version = "1.2.1"; }; httparty = { dependencies = ["mime-types" "multi_xml"]; @@ -2190,10 +2201,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl"; + sha256 = "11ss256hnild52qg5kxisidf1fn0n6gm8hq65y9fnqnq0wq7daw9"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; i18n_data = { groups = ["default"]; @@ -2273,10 +2284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf"; + sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; jira-ruby = { dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"]; @@ -2443,10 +2454,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gj6z90p3nm43bafbp97b78zi764gy88590g2y4lm8zcgk8k586r"; + sha256 = "1djf4zll2alrwv7wg4wk9v504wbri717wqaq773i1azg7cbisbw6"; type = "gem"; }; - version = "4.4.0"; + version = "4.6.0"; }; launchy = { dependencies = ["addressable"]; @@ -2503,6 +2514,16 @@ }; version = "8.9.2"; }; + liquid = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; + type = "gem"; + }; + version = "4.0.3"; + }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; groups = ["default" "test"]; @@ -2541,10 +2562,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd"; + sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; + }; + lru_redux = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf"; + type = "gem"; + }; + version = "1.1.0"; }; lumberjack = { groups = ["default" "test"]; @@ -2730,10 +2761,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; type = "gem"; }; - version = "1.13.1"; + version = "1.14.1"; }; multi_xml = { groups = ["default"]; @@ -2750,10 +2781,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; murmurhash3 = { groups = ["default"]; @@ -2821,10 +2852,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fh4l8zfsrvghanpnjxk944k7yl093qpw4759xs6f1v9kb73ihfq"; + sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; type = "gem"; }; - version = "0.16.0"; + version = "0.16.2"; }; net-ntp = { groups = ["default"]; @@ -2882,10 +2913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; + sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; type = "gem"; }; - version = "1.10.5"; + version = "1.10.7"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2941,15 +2972,15 @@ version = "1.4.1"; }; octokit = { - dependencies = ["sawyer"]; + dependencies = ["faraday" "sawyer"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298"; + sha256 = "0yg6dhd028j74sm8hpw9w7bwfwlkml9wiis7nq20ivfsbcz4g8ac"; type = "gem"; }; - version = "4.9.0"; + version = "4.15.0"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -3255,14 +3286,14 @@ version = "1.0.0"; }; parallel = { - groups = ["default" "development" "test"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; + sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; type = "gem"; }; - version = "1.17.0"; + version = "1.19.1"; }; parser = { dependencies = ["ast"]; @@ -3270,10 +3301,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; + sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; type = "gem"; }; - version = "2.6.3.0"; + version = "2.6.5.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3306,6 +3337,16 @@ }; version = "1.1.4"; }; + png_quantizator = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sqhydp5g9ly1kgfiya1fc6srmhf6avrb74j09z3lp0jck8d88v0"; + type = "gem"; + }; + version = "0.2.1"; + }; po_to_json = { dependencies = ["json"]; groups = ["default"]; @@ -3416,10 +3457,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; + sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; type = "gem"; }; - version = "3.1.1"; + version = "4.0.3"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -3474,14 +3515,15 @@ version = "6.2.0"; }; rack-cors = { + dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013"; + sha256 = "07dppmm1ah1gs31sb5byrkkady9vqzwjmpd92c8425nc6yzwknik"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.6"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -3685,10 +3727,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7"; + sha256 = "0zh39dpsqlhhi4aba1sbrk504d88p38djk8cansjq0fwndq7w4zb"; type = "gem"; }; - version = "6.0.4"; + version = "6.1.2"; }; re2 = { groups = ["default"]; @@ -4057,10 +4099,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i"; + sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk"; type = "gem"; }; - version = "0.69.0"; + version = "0.74.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4079,10 +4121,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azzgj62w24wa4hza1qn7i9b9crxdh907kydlzcvhismx41h3lzk"; + sha256 = "1ssizdnyai2hxdp6nd4b9hqyrc4gwhjlznhrdliz8wj4p8cvas44"; type = "gem"; }; - version = "1.1.0"; + version = "1.4.1"; + }; + rubocop-rails = { + dependencies = ["rack" "rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vvrwcxzbqiqdjxakxmjg4c3dcrlpb00i1d3i0s1gdk0ch79byag"; + type = "gem"; + }; + version = "2.4.0"; }; rubocop-rspec = { dependencies = ["rubocop"]; @@ -4090,10 +4143,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla"; + sha256 = "1dypzxzrm8lh1gip9pn93p1nwamzkqsljy6mcv2ngw9zqsial233"; type = "gem"; }; - version = "1.22.2"; + version = "1.37.0"; }; ruby-enum = { dependencies = ["i18n"]; @@ -4194,10 +4247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; + sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz"; type = "gem"; }; - version = "1.3.0"; + version = "2.0.0"; }; rugged = { groups = ["default"]; @@ -4280,10 +4333,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; scss_lint = { dependencies = ["rake" "sass"]; @@ -4754,10 +4807,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.6"; }; u2f = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index e77f18aff85..67b08d2c234 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -666,19 +666,19 @@ }; } { - name = "_gitlab_svgs___svgs_1.88.0.tgz"; + name = "_gitlab_svgs___svgs_1.89.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.88.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.88.0.tgz"; - sha1 = "0a9b72e9591264fcac592ebf9944665c70f48de2"; + name = "_gitlab_svgs___svgs_1.89.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.89.0.tgz"; + sha1 = "5bdaff1b0af1cc07ed34e89c21c34c7c6a3e1caa"; }; } { - name = "_gitlab_ui___ui_8.8.0.tgz"; + name = "_gitlab_ui___ui_8.17.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_8.8.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.8.0.tgz"; - sha1 = "c22b4dece89d224c525b3510970f3c61321a6765"; + name = "_gitlab_ui___ui_8.17.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.17.0.tgz"; + sha1 = "674baa9b5c05fa6ecb23b233c5b308ff82ba5660"; }; } { @@ -850,11 +850,11 @@ }; } { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.14.tgz"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.18.tgz"; path = fetchurl { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.14.tgz"; - url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.14.tgz"; - sha1 = "e12b08371dc37bf4a468450b008c6e167705e1a8"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.18.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.18.tgz"; + sha1 = "814467cdbc94bbfee5768193acf89fdf404ca949"; }; } { @@ -961,14 +961,6 @@ sha1 = "9ae2106efc443d7c1e26570aa8247828c9c80f11"; }; } - { - name = "_types_semver___semver_5.5.0.tgz"; - path = fetchurl { - name = "_types_semver___semver_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz"; - sha1 = "146c2a29ee7d3bae4bf2fcb274636e264c813c45"; - }; - } { name = "_types_stack_utils___stack_utils_1.0.1.tgz"; path = fetchurl { @@ -1058,11 +1050,11 @@ }; } { - name = "_vue_test_utils___test_utils_1.0.0_beta.25.tgz"; + name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; path = fetchurl { - name = "_vue_test_utils___test_utils_1.0.0_beta.25.tgz"; - url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.25.tgz"; - sha1 = "4703076de3076bac42cdd242cd53e6fb8752ed8c"; + name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; + url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz"; + sha1 = "d5f26d1e2411fdb7fa7fdedb61b4b4ea4194c49d"; }; } { @@ -2929,6 +2921,14 @@ sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; }; } + { + name = "condense_newlines___condense_newlines_0.2.1.tgz"; + path = fetchurl { + name = "condense_newlines___condense_newlines_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz"; + sha1 = "3de985553139475d32502c83b02f60684d24c55f"; + }; + } { name = "config_chain___config_chain_1.1.12.tgz"; path = fetchurl { @@ -3634,27 +3634,27 @@ }; } { - name = "d3___d3_5.12.0.tgz"; + name = "d3___d3_5.15.0.tgz"; path = fetchurl { - name = "d3___d3_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/d3/-/d3-5.12.0.tgz"; - sha1 = "0ddeac879c28c882317cd439b495290acd59ab61"; + name = "d3___d3_5.15.0.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz"; + sha1 = "ffd44958e6a3cb8a59a84429c45429b8bca5677a"; }; } { - name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"; + name = "dagre_d3___dagre_d3_0.6.4.tgz"; path = fetchurl { - name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"; - url = "https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"; - sha1 = "7400df3f5fe80538fde43d0201e1570e1d689004"; + name = "dagre_d3___dagre_d3_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/dagre-d3/-/dagre-d3-0.6.4.tgz"; + sha1 = "0728d5ce7f177ca2337df141ceb60fbe6eeb7b29"; }; } { - name = "dagre___dagre_0.8.4.tgz"; + name = "dagre___dagre_0.8.5.tgz"; path = fetchurl { - name = "dagre___dagre_0.8.4.tgz"; - url = "https://registry.yarnpkg.com/dagre/-/dagre-0.8.4.tgz"; - sha1 = "26b9fb8f7bdc60c6110a0458c375261836786061"; + name = "dagre___dagre_0.8.5.tgz"; + url = "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz"; + sha1 = "ba30b0055dac12b6c1fcc247817442777d06afee"; }; } { @@ -3754,11 +3754,11 @@ }; } { - name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz"; + name = "deckar01_task_list___deckar01_task_list_2.3.1.tgz"; path = fetchurl { - name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.1.tgz"; - sha1 = "e1e8a16c4fd6e153e51fd9258fdbee067ebcd86b"; + name = "deckar01_task_list___deckar01_task_list_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.3.1.tgz"; + sha1 = "f3ffd5319d7b9e27c596dc8d823b13f617ed7db7"; }; } { @@ -4049,6 +4049,14 @@ sha1 = "dad8cb7be38e04ee3f56842e6cf81af46c1249ba"; }; } + { + name = "dom_event_types___dom_event_types_1.0.0.tgz"; + path = fetchurl { + name = "dom_event_types___dom_event_types_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/dom-event-types/-/dom-event-types-1.0.0.tgz"; + sha1 = "5830a0a29e1bf837fe50a70cd80a597232813cae"; + }; + } { name = "dom_serialize___dom_serialize_2.2.1.tgz"; path = fetchurl { @@ -4178,11 +4186,11 @@ }; } { - name = "editorconfig___editorconfig_0.15.2.tgz"; + name = "editorconfig___editorconfig_0.15.3.tgz"; path = fetchurl { - name = "editorconfig___editorconfig_0.15.2.tgz"; - url = "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.2.tgz"; - sha1 = "047be983abb9ab3c2eefe5199cb2b7c5689f0702"; + name = "editorconfig___editorconfig_0.15.3.tgz"; + url = "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz"; + sha1 = "bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"; }; } { @@ -5514,11 +5522,11 @@ }; } { - name = "graphlib___graphlib_2.1.7.tgz"; + name = "graphlib___graphlib_2.1.8.tgz"; path = fetchurl { - name = "graphlib___graphlib_2.1.7.tgz"; - url = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz"; - sha1 = "b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc"; + name = "graphlib___graphlib_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz"; + sha1 = "5761d414737870084c92ec7b5dbcb0592c9d35da"; }; } { @@ -5945,6 +5953,14 @@ sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; }; } + { + name = "immer___immer_5.2.1.tgz"; + path = fetchurl { + name = "immer___immer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/immer/-/immer-5.2.1.tgz"; + sha1 = "7d4f74c242178e87151d595f48db1b5c51580485"; + }; + } { name = "import_fresh___import_fresh_2.0.0.tgz"; path = fetchurl { @@ -6601,6 +6617,14 @@ sha1 = "ede53b4c6f6fb3874533751ec9280d01928d03ed"; }; } + { + name = "is_whitespace___is_whitespace_0.3.0.tgz"; + path = fetchurl { + name = "is_whitespace___is_whitespace_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz"; + sha1 = "1639ecb1be036aec69a54cbb401cfbed7114ab7f"; + }; + } { name = "is_windows___is_windows_1.0.2.tgz"; path = fetchurl { @@ -7082,11 +7106,11 @@ }; } { - name = "js_beautify___js_beautify_1.8.9.tgz"; + name = "js_beautify___js_beautify_1.10.2.tgz"; path = fetchurl { - name = "js_beautify___js_beautify_1.8.9.tgz"; - url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.8.9.tgz"; - sha1 = "08e3c05ead3ecfbd4f512c3895b1cda76c87d523"; + name = "js_beautify___js_beautify_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.2.tgz"; + sha1 = "88c9099cd6559402b124cfab18754936f8a7b178"; }; } { @@ -8042,11 +8066,11 @@ }; } { - name = "mermaid___mermaid_8.4.2.tgz"; + name = "mermaid___mermaid_8.4.5.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.4.2.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.2.tgz"; - sha1 = "91d3d8e9541e72eed7a78d0e882db11564fab3bb"; + name = "mermaid___mermaid_8.4.5.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.5.tgz"; + sha1 = "48d5722cbc72be2ad01002795835d7ca1b48e000"; }; } { @@ -8258,11 +8282,11 @@ }; } { - name = "monaco_editor___monaco_editor_0.15.6.tgz"; + name = "monaco_editor___monaco_editor_0.18.1.tgz"; path = fetchurl { - name = "monaco_editor___monaco_editor_0.15.6.tgz"; - url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.15.6.tgz"; - sha1 = "d63b3b06f86f803464f003b252627c3eb4a09483"; + name = "monaco_editor___monaco_editor_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.18.1.tgz"; + sha1 = "ced7c305a23109875feeaf395a504b91f6358cfc"; }; } { @@ -9346,11 +9370,11 @@ }; } { - name = "portal_vue___portal_vue_2.1.5.tgz"; + name = "portal_vue___portal_vue_2.1.7.tgz"; path = fetchurl { - name = "portal_vue___portal_vue_2.1.5.tgz"; - url = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.5.tgz"; - sha1 = "ecd0997cb32958205151cb72f40fd4f38d175e5c"; + name = "portal_vue___portal_vue_2.1.7.tgz"; + url = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz"; + sha1 = "ea08069b25b640ca08a5b86f67c612f15f4e4ad4"; }; } { @@ -9585,6 +9609,14 @@ sha1 = "8dae7044f58db7cb8be245383b565a963e3c27f2"; }; } + { + name = "pretty___pretty_2.0.0.tgz"; + path = fetchurl { + name = "pretty___pretty_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pretty/-/pretty-2.0.0.tgz"; + sha1 = "adbc7960b7bbfe289a557dc5f737619a220d06a5"; + }; + } { name = "prismjs___prismjs_1.6.0.tgz"; path = fetchurl { @@ -10721,6 +10753,14 @@ sha1 = "d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"; }; } + { + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; + }; + } { name = "serve_index___serve_index_1.9.1.tgz"; path = fetchurl { @@ -10746,19 +10786,11 @@ }; } { - name = "set_value___set_value_0.4.3.tgz"; + name = "set_value___set_value_2.0.1.tgz"; path = fetchurl { - name = "set_value___set_value_0.4.3.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz"; - sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; - }; - } - { - name = "set_value___set_value_2.0.0.tgz"; - path = fetchurl { - name = "set_value___set_value_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz"; - sha1 = "71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"; + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; }; } { @@ -11586,11 +11618,11 @@ }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; - sha1 = "61b18e40eaee5be97e771cdbb10ed1280888c2b4"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; }; } { @@ -12154,11 +12186,11 @@ }; } { - name = "union_value___union_value_1.0.0.tgz"; + name = "union_value___union_value_1.0.1.tgz"; path = fetchurl { - name = "union_value___union_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz"; - sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; }; } { @@ -12594,11 +12626,11 @@ }; } { - name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.3.1.tgz"; + name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.4.tgz"; path = fetchurl { - name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.3.1.tgz"; - sha1 = "efcb83d3a3dcc69cd886fa4de1130a65493e8f76"; + name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.4.4.tgz"; + sha1 = "5fca7a13f785899bbfb70471ec4fe222437d8495"; }; } { @@ -12730,11 +12762,11 @@ }; } { - name = "webpack___webpack_4.40.2.tgz"; + name = "webpack___webpack_4.41.5.tgz"; path = fetchurl { - name = "webpack___webpack_4.40.2.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.40.2.tgz"; - sha1 = "d21433d250f900bf0facbabe8f50d585b2dc30a7"; + name = "webpack___webpack_4.41.5.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz"; + sha1 = "3210f1886bce5310e62bb97204d18c263341b77c"; }; } { From c7bca0896019323b35b480b44db2beb205c6ad4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jan 2020 12:34:09 +0000 Subject: [PATCH 127/241] simplenote: 1.12.0 -> 1.14.0 --- pkgs/applications/misc/simplenote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index b3ad833e3f2..b98b0eee2aa 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.12.0"; + version = "1.14.0"; sha256 = { - x86_64-linux = "0y9b4haaj7qxr92wnwacziljqrkf4vlyqq3rvis8ribq6zr5b24w"; + x86_64-linux = "1l61xf1i80fd8ymmnrb3plqn70jsxd8wyg0n6f69bz3k8s5g8cxi"; }.${system} or throwSystem; meta = with stdenv.lib; { From 38149ff88d05b2bbd30d43e8859237041998f050 Mon Sep 17 00:00:00 2001 From: Keito Kajitani Date: Fri, 31 Jan 2020 21:47:07 +0900 Subject: [PATCH 128/241] haskellPackages.dhall-json_1_6_1: prettyprinter_1_6_0 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 64a15e39689..53b053fcb05 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1063,10 +1063,10 @@ self: super: { dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; }; dhall-json_1_6_1 = super.dhall-json_1_6_1.override { dhall = self.dhall_1_29_0; - prettyprinter = self.prettyprinter_1_5_1; + prettyprinter = self.prettyprinter_1_6_0; prettyprinter-ansi-terminal = self.prettyprinter-ansi-terminal.override { - prettyprinter = self.prettyprinter_1_5_1; + prettyprinter = self.prettyprinter_1_6_0; }; }; From fa709922f3b49bf0c7985129fda8222166a99edf Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Jan 2020 10:24:30 +0100 Subject: [PATCH 129/241] coqPackages.tlc: disable for Coq > 8.10 --- pkgs/development/coq-modules/tlc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 119261f412b..8a10dc388db 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.6" "8.7" "8.8" "8.9" "8.10" ]; }; } From 659a7ae963d4f8316b72efb76edcb3ae498bc6a7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Jan 2020 09:42:52 +0100 Subject: [PATCH 130/241] =?UTF-8?q?coq:=20disable=20CoqIDE=20on=20Darwin?= =?UTF-8?q?=20for=20Coq=20=E2=89=A5=208.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index ac001540e09..665a2336cad 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -7,7 +7,7 @@ { stdenv, fetchFromGitHub, writeText, pkgconfig , ocamlPackages, ncurses -, buildIde ? true +, buildIde ? !(stdenv.isDarwin && stdenv.lib.versionAtLeast version "8.10") , glib, gnome3, wrapGAppsHook , darwin , csdp ? null From 13dd5844fdf4be744c359f8559f8727011cb7bf1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Jan 2020 10:03:19 +0100 Subject: [PATCH 131/241] =?UTF-8?q?coqPackages=5F8=5F11.coq:=208.11+=CE=B2?= =?UTF-8?q?1=20=E2=86=92=208.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 2 +- pkgs/top-level/coq-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 665a2336cad..85c5d23ffca 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -32,7 +32,7 @@ let "8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg"; "8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4"; "8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz"; - "8.11+beta1" = "06dlxj6v7gd51dh6ir121z7lgqdagkq717xxxrc8bdqhz7d2z7qj"; + "8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 3fa3d30aa94..4faaf86040d 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -131,7 +131,7 @@ in rec { version = "8.10.2"; }; coq_8_11 = callPackage ../applications/science/logic/coq { - version = "8.11+beta1"; + version = "8.11.0"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; From 5d2a7238df8c9658e92e816b715fa1c10f71603f Mon Sep 17 00:00:00 2001 From: Benjamin Date: Fri, 31 Jan 2020 16:30:02 +0200 Subject: [PATCH 132/241] nixos/jupyter: Fix documentation example for `jupyter.kernels` (#56415) * Fix documentation example for `jupyter.kernels` The environment variable loading fails when using the example for `kernels` config, due to incorrect syntax. The error being something along the lines of `path not found`. Thanks to @Infinisil and @layus for suggestions. --- nixos/modules/services/development/jupyter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index f20860af6e1..e598b018645 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -118,15 +118,15 @@ in { in { displayName = "Python 3 for machine learning"; argv = [ - "$ {env.interpreter}" + "''${env.interpreter}" "-m" "ipykernel_launcher" "-f" "{connection_file}" ]; language = "python"; - logo32 = "$ {env.sitePackages}/ipykernel/resources/logo-32x32.png"; - logo64 = "$ {env.sitePackages}/ipykernel/resources/logo-64x64.png"; + logo32 = "''${env.sitePackages}/ipykernel/resources/logo-32x32.png"; + logo64 = "''${env.sitePackages}/ipykernel/resources/logo-64x64.png"; }; } ''; From 032fddf103e2e00db21751d54000303f20d20b1c Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Fri, 31 Jan 2020 15:43:37 +0100 Subject: [PATCH 133/241] drone-cli: 1.2.0 -> 1.2.1 --- .../tools/continuous-integration/drone-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 1a3105a2269..a3df81d2605 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, buildGoModule }: -let version = "1.2.0"; +let version = "1.2.1"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; goPackagePath = "github.com/drone/drone-cli"; - modSha256 = "0jvhnrvqi1axypyzgjzbv44s7w1j53y6wak6xlkxdm64qw6pf1hc"; + modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; preBuild = '' buildFlagsArray+=("-ldflags" "-X main.version=${version}") @@ -17,7 +17,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "1b1c3mih760z3hx5xws9h4m1xhlx1pm4qhm3sm31cyim9p8rmi4s"; + sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j"; }; meta = with stdenv.lib; { From bba954f34e2fbfbc0c166eb31ad92264d4231f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 31 Jan 2020 15:58:46 +0100 Subject: [PATCH 134/241] nixos release notes: document linuxPackages update --- nixos/doc/manual/release-notes/rl-2003.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index e9a1d57050c..1567070d1b8 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -23,6 +23,13 @@ Support is planned until the end of October 2020, handing over to 20.09. + + + Linux kernel is updated to branch 5.4 by default (from 4.19). + Users of Intel GPUs may prefer to explicitly set branch to 4.19 to avoid some regressions. + boot.kernelPackages = pkgs.linuxPackages_4_19; + + Postgresql for NixOS service now defaults to v11. From 05620d62dcd80b51bd7e4dbdd338f08fde45e392 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 16:24:49 +0100 Subject: [PATCH 135/241] maude: update from version 2.7.1 to 3.0 (including full-maude) --- .../interpreters/maude/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index e44209799a3..721cfe38865 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, unzip, makeWrapper , flex, bison, ncurses, buddy, tecla -, libsigsegv, gmpxx, cln +{ stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla +, libsigsegv, gmpxx, cln, yices }: let - version = "2.7.1"; + version = "3.0"; fullMaude = fetchurl { - url = "http://maude.cs.illinois.edu/w/images/c/ca/Full-Maude-${version}.zip"; - sha256 = "0y4gn7n8vh24r24vckhpkd46hb5hqsbrm4w9zr6dz4paafq12fjc"; + url = "http://maude.cs.illinois.edu/w/images/0/04/Full-Maude-${version}.zip"; + sha256 = "0gf36wlkkl343vlxgryqdhxmgyn8z0cc2zayccd7ac3inmj1iayw"; }; in @@ -18,12 +18,12 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://maude.cs.illinois.edu/w/images/d/d8/Maude-${version}.tar.gz"; - sha256 = "0jskn5dm8vvbd3mlryjxdb6wfpkvyx174wk7ci9a31aylxzpr25i"; + url = "http://maude.cs.illinois.edu/w/images/9/92/Maude-${version}.tar.gz"; + sha256 = "0vhn3lsck6ji9skrgm67hqrn3k4f6y442q73jbw65qqznm321k5a"; }; buildInputs = [ - flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cln + flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cln yices ]; hardeningDisable = [ "stackprotector" ] ++ @@ -35,7 +35,6 @@ stdenv.mkDerivation { TECLA_LIBS="-ltecla -lncursesw" LIBS="-lcln" CFLAGS="-O3" CXXFLAGS="-O3" - --without-cvc4 # Our version is too new for Maude to cope. ) ''; @@ -44,7 +43,7 @@ stdenv.mkDerivation { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done unzip ${fullMaude} - install -D -m 444 full-maude.maude $out/share/maude/full-maude.maude + install -D -m 444 full-maude3.maude $out/share/maude/full-maude.maude ''; # bison -dv surface.yy -o surface.c @@ -55,7 +54,7 @@ stdenv.mkDerivation { meta = { homepage = http://maude.cs.illinois.edu/; description = "High-level specification language"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Maude is a high-performance reflective language and system From ac1b7a252889359b593237e9ff78a8bff9eb47bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jan 2020 16:55:09 +0000 Subject: [PATCH 136/241] ansifilter: 2.15 -> 2.16 --- pkgs/tools/text/ansifilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index bc265c5a5ae..8ebb5cfd059 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ansifilter"; - version = "2.15"; + version = "2.16"; src = fetchurl { url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2"; - sha256 = "07x1lha6xkfn5sr2f45ynk1fxmzc3qr4axxm0hip4adqygx2zsky"; + sha256 = "1wmszcykhaipxa7kxj4ml0lkmd5z7i9ryaachg9jpkhbaaijzkbz"; }; nativeBuildInputs = [ pkgconfig ]; From ce1ad7654b61652f0dc9a4bd6900a402a9fceb94 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 31 Jan 2020 12:00:00 -0500 Subject: [PATCH 137/241] endlessh: 1.0 -> 1.1 https://github.com/skeeto/endlessh/releases/tag/1.1 --- pkgs/servers/endlessh/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/servers/endlessh/default.nix index 0e424d1d122..216318380fc 100644 --- a/pkgs/servers/endlessh/default.nix +++ b/pkgs/servers/endlessh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "endlessh"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "skeeto"; repo = pname; rev = version; - sha256 = "186d7hf5p8yc46lmbrh0kxyfi1nrrx9n3w0jd9kh46vfwifjazra"; + sha256 = "0ziwr8j1frsp3dajr8h5glkm1dn5cci404kazz5w1jfrp0736x68"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SSH tarpit that slowly sends an endless banner"; homepage = "https://github.com/skeeto/endlessh"; + changelog = "https://github.com/skeeto/endlessh/releases/tag/${version}"; license = licenses.unlicense; maintainers = [ maintainers.marsam ]; platforms = platforms.unix; From b8a86eb5cb52569dd8e1e15708cc102a498af60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jan 2020 14:51:27 -0300 Subject: [PATCH 138/241] canta-theme: init at 2020-01-31 --- pkgs/data/themes/canta/default.nix | 33 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/themes/canta/default.nix diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix new file mode 100644 index 00000000000..f1c8ad15559 --- /dev/null +++ b/pkgs/data/themes/canta/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "canta-theme"; + version = "2020-01-31"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "070lhbhh3n7nd6rkwm52v1x4v8spyb932w6qmgs2r19g0whyn55w"; + }; + + buildInputs = [ gdk-pixbuf librsvg ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + patchShebangs . + mkdir -p $out/share/themes + name= ./install.sh -d $out/share/themes + install -D -t $out/share/backgrounds wallpaper/canta-wallpaper.svg + rm $out/share/themes/*/{AUTHORS,COPYING} + ''; + + meta = with stdenv.lib; { + description = "Flat Design theme for GTK based desktop environments"; + homepage = "https://github.com/vinceliuice/Canta-theme"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c8fe84c0b6..cf46cf6b7b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17318,6 +17318,8 @@ in caladea = callPackage ../data/fonts/caladea {}; + canta-theme = callPackage ../data/themes/canta { }; + cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { }; capitaine-cursors = callPackage ../data/icons/capitaine-cursors { }; From 9a205f8ab64ab887834df6b9cb99ea4e2af431e2 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sat, 11 Jan 2020 13:48:36 +0000 Subject: [PATCH 139/241] mynewt-newt: 1.3.0 -> 1.7.0, use buildGoModule --- .../mynewt-newt/default.nix | 15 ++- .../package-management/mynewt-newt/deps.nix | 101 ------------------ 2 files changed, 7 insertions(+), 109 deletions(-) delete mode 100644 pkgs/tools/package-management/mynewt-newt/deps.nix diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 3f307d38f02..9b99493575e 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,19 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "mynewt-newt"; - version = "1.3.0"; - - goPackagePath = "mynewt.apache.org/newt"; - goDeps = ./deps.nix; + version = "1.7.0"; src = fetchFromGitHub { owner = "apache"; - repo = "incubator-mynewt-newt"; + repo = "mynewt-newt"; rev = "mynewt_${builtins.replaceStrings ["."] ["_"] version}_tag"; - sha256 = "0ia6q1wf3ki2yw8ngw5gnbdrb7268qwi078j05f8gs1sppb3g563"; + sha256 = "0rwn4ghh7kal8csxlh0w1p29b5m1nam9lkrxla5wdfhnzbsg8hfa"; }; + modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; + meta = with stdenv.lib; { homepage = https://mynewt.apache.org/; description = "Build and package management tool for embedded development."; diff --git a/pkgs/tools/package-management/mynewt-newt/deps.nix b/pkgs/tools/package-management/mynewt-newt/deps.nix deleted file mode 100644 index ea3d97ca67e..00000000000 --- a/pkgs/tools/package-management/mynewt-newt/deps.nix +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus.git"; - rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f"; - sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap.git"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty.git"; - rev = "cfb55aafdaf3ec08f0db22699ab822c50091b1c4"; - sha256 = "0441yi9ah9892hxdslv2h35bkfr75g7ajma0q45lqks84pawrdkg"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text.git"; - rev = "7cafcd837844e784b526369c9bce262804aebc60"; - sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure.git"; - rev = "f3009df150dadf309fdee4a54ed65c124afad715"; - sha256 = "1i08zzlsn1bwicjn8cvakv2h5wwicw8ijx0i0cipk49yfmd6ab4i"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast.git"; - rev = "24b6558033ffe202bf42f0f3b870dcc798dd2ba8"; - sha256 = "10g8vzvffkd55ivkbaqcjj50z3iiqffl2p902rmbriz14znqyywl"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra.git"; - rev = "9495bc009a56819bdb0ddbc1a373e29c140bc674"; - sha256 = "0hphdnhpcmy2mngah81c700s2y43f5g9jckwgmh6xyb4f1zjj9nm"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman.git"; - rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; - sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag.git"; - rev = "5ccb023bc27df288a957c5e994cd44fd19619465"; - sha256 = "1r65j8sw15pz0iacwnf303p6s51vkv0k6qc5cyb2kybfraqd7f7z"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify.git"; - rev = "629574ca2a5df945712d3079857300b5e4da0236"; - sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; - }; - } - { - goPackagePath = "golang.org/x/sys/unix"; - fetch = { - type = "git"; - url = "https://github.com/golang/sys.git"; - rev = "b699b7032584f0953262cb2788a0ca19bb494703"; - sha256 = "172sw1bm581qwal9pbf9qj1sgivr74nabbj8qq4q4fhgpzams9ix"; - }; - } -] From eb0c48b1c20205f981c70462464dd11bd0668ac2 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sun, 12 Jan 2020 12:40:00 +0000 Subject: [PATCH 140/241] mynewt-newt: patch to fix failure running upgrade on mcuboot --- .../package-management/mynewt-newt/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 9b99493575e..b40257d42f4 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "mynewt-newt"; @@ -11,6 +11,17 @@ buildGoModule rec { sha256 = "0rwn4ghh7kal8csxlh0w1p29b5m1nam9lkrxla5wdfhnzbsg8hfa"; }; + patches = [ + (fetchpatch { + url = https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch; + sha256 = "186yha60jzcjq8r04w12rqqh3cin2w974l77hz2ixhmjzyr56wqv"; + }) + (fetchpatch { + url = https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch; + sha256 = "01scmq58bfr4c9icqzm79q7a55izflsb3mlx9xn0dv92m3mbprx7"; + }) + ]; + modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; meta = with stdenv.lib; { From 1a1e5f7be56e97f1d3a3b5c551aecdc9b789e158 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 31 Jan 2020 20:40:48 +0100 Subject: [PATCH 141/241] nsd: use types.lines where appropriate --- nixos/modules/services/networking/nsd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 344396638a6..429580e5c6c 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -244,7 +244,7 @@ let }; data = mkOption { - type = types.str; + type = types.lines; default = ""; example = ""; description = '' @@ -484,7 +484,7 @@ in }; extraConfig = mkOption { - type = types.str; + type = types.lines; default = ""; description = '' Extra nsd config. From 3b5f3d1cb181cd91a5a1ce1d220fef6ffd998c6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Jan 2020 14:43:54 +0100 Subject: [PATCH 142/241] LTS Haskell 14.22 --- .../configuration-hackage2nix.yaml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5eddabd8934..8dd90abea0a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -69,7 +69,7 @@ core-packages: default-package-overrides: # pandoc-2.9 does not accept the 0.3 version yet - doclayout < 0.3 - # LTS Haskell 14.21 + # LTS Haskell 14.22 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -132,7 +132,7 @@ default-package-overrides: - arrow-extras ==0.1.0.1 - asciidiagram ==1.3.3.3 - ascii-progress ==0.3.3.0 - - asif ==6.0.3 + - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.3 @@ -326,7 +326,7 @@ default-package-overrides: - Chart ==1.9.3 - Chart-diagrams ==1.9.3 - chaselev-deque ==0.5.0.5 - - cheapskate ==0.1.1.1 + - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 @@ -423,8 +423,8 @@ default-package-overrides: - control-monad-omega ==0.3.2 - convertible ==1.1.1.0 - cookie ==0.4.5 - - core-data ==0.2.1.4 - - core-text ==0.2.2.6 + - core-data ==0.2.1.5 + - core-text ==0.2.3.3 - countable ==1.0 - country ==0.1.6 - courier ==0.1.1.5 @@ -587,7 +587,7 @@ default-package-overrides: - download ==0.3.2.7 - drinkery ==0.4 - dsp ==0.2.5 - - dual ==0.1.0.3 + - dual ==0.1.1.1 - dual-tree ==0.2.2.1 - dublincore-xml-conduit ==0.1.0.2 - dunai ==0.5.1 @@ -669,7 +669,7 @@ default-package-overrides: - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - fail ==4.9.0.0 - - failable ==1.2.2.0 + - failable ==1.2.4.0 - fakedata ==0.2.2 - farmhash ==0.1.0.5 - fast-builder ==0.1.2.0 @@ -900,7 +900,7 @@ default-package-overrides: - haskey-btree ==0.3.0.1 - haskintex ==0.8.0.0 - haskoin-core ==0.9.8 - - hasql ==1.4.0.1 + - hasql ==1.4.1 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 - hasql-transaction ==0.7.2 @@ -983,7 +983,7 @@ default-package-overrides: - HSet ==0.0.1 - hset ==2.2.0 - hsexif ==0.6.1.6 - - hs-functors ==0.1.5.0 + - hs-functors ==0.1.6.0 - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.2 @@ -1037,13 +1037,13 @@ default-package-overrides: - http-common ==0.8.2.0 - http-conduit ==2.3.7.3 - http-date ==0.0.8 - - http-directory ==0.1.5 + - http-directory ==0.1.7 - http-download ==0.1.0.1 - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.6.1 + - http-streams ==0.8.7.1 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.0.0 @@ -1059,7 +1059,7 @@ default-package-overrides: - hw-dsv ==0.3.5 - hweblib ==0.6.3 - hw-eliasfano ==0.1.1.0 - - hw-excess ==0.2.2.1 + - hw-excess ==0.2.2.2 - hw-fingertree ==0.1.1.1 - hw-fingertree-strict ==0.1.1.3 - hw-hedgehog ==0.1.0.5 @@ -1300,13 +1300,13 @@ default-package-overrides: - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - - managed ==1.0.6 + - managed ==1.0.7 - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.4.4.0 + - massiv ==0.4.5.0 - massiv-io ==0.1.9.0 - - massiv-test ==0.1.1 + - massiv-test ==0.1.2 - mathexpr ==0.3.0.0 - math-functions ==0.3.3.0 - matplotlib ==0.7.5 @@ -1452,7 +1452,7 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-attoparsec ==0.12.2 - network-bsd ==2.8.0.0 - - network-byte-order ==0.1.2.0 + - network-byte-order ==0.1.3.0 - network-conduit-tls ==1.3.2 - network-house ==0.1.0.2 - network-info ==0.2.0.10 @@ -1496,7 +1496,7 @@ default-package-overrides: - ObjectName ==1.1.0.1 - oblivious-transfer ==0.1.0 - odbc ==0.2.2 - - oeis ==0.3.9 + - oeis ==0.3.10 - oeis2 ==1.0.3 - ofx ==0.4.4.0 - old-locale ==1.0.0.7 @@ -1742,7 +1742,7 @@ default-package-overrides: - Ranged-sets ==0.4.0 - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.0 - - rank2classes ==1.3.1.2 + - rank2classes ==1.3.2.1 - Rasterific ==0.7.5 - rasterific-svg ==0.3.3.2 - ratel ==1.0.9 @@ -1900,13 +1900,13 @@ default-package-overrides: - servant-elm ==0.6.1 - servant-foreign ==0.15 - servant-http-streams ==0.16.0.1 - - servant-js ==0.9.4 + - servant-js ==0.9.4.1 - servant-JuicyPixels ==0.3.0.5 - servant-kotlin ==0.1.1.9 - servant-lucid ==0.9 - servant-machines ==0.15 - servant-mock ==0.8.5 - - servant-multipart ==0.11.4 + - servant-multipart ==0.11.5 - servant-pipes ==0.15.1 - servant-rawm ==0.3.2.0 - servant-ruby ==0.9.0.0 @@ -2187,7 +2187,7 @@ default-package-overrides: - timer-wheel ==0.2.0.1 - timezone-olson ==0.1.9 - timezone-series ==0.1.9 - - tintin ==1.10.0 + - tintin ==1.10.1 - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.4.0.2 @@ -2229,7 +2229,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.15 + - turtle ==1.5.16 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - type-errors ==0.2.0.0 @@ -2242,7 +2242,7 @@ default-package-overrides: - typelits-witnesses ==0.4.0.0 - type-map ==0.1.6.0 - typenums ==0.1.2.1 - - type-of-html ==1.5.0.0 + - type-of-html ==1.5.1.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - typerep-map ==0.3.2 @@ -2383,7 +2383,7 @@ default-package-overrides: - websockets ==0.12.7.0 - websockets-snap ==0.10.3.1 - weigh ==0.0.16 - - wide-word ==0.1.0.9 + - wide-word ==0.1.1.0 - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.5 - wild-bind-x11 ==0.2.0.9 From 78d58f61c54fd048ab095c5754a8adb461275791 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 13:26:09 +0100 Subject: [PATCH 143/241] hackage2nix: update list of broken packages --- .../haskell-modules/configuration-hackage2nix.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8dd90abea0a..c19c1b2792a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3012,6 +3012,7 @@ broken-packages: - archlinux - archlinux-web - archnews + - arduino-copilot - arena - arff - arghwxhaskell @@ -4929,6 +4930,7 @@ broken-packages: - fused-effects-lens - fused-effects-random - fused-effects-resumable + - fused-effects-squeal - fusion - futhark - futun @@ -5099,6 +5101,7 @@ broken-packages: - git-remote-ipfs - git-repair - git-sanity + - git-vogue - gitdo - github-backup - github-data @@ -7761,6 +7764,7 @@ broken-packages: - opensoundcontrol-ht - openssh-github-keys - openssh-protocol + - opentelemetry-lightstep - opentheory-char - opentok - opentype @@ -9383,6 +9387,7 @@ broken-packages: - structures - stt - stunts + - stylish-haskell - stylist - stylized - suavemente From 8e8b8a5b6cb45e8c755f562d1b46a9257a599535 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Jan 2020 02:30:34 +0100 Subject: [PATCH 144/241] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5556d14668c7862e17805acae8b1b9ba5ad7e246. --- .../haskell-modules/hackage-packages.nix | 2624 +++++++++++------ 1 file changed, 1680 insertions(+), 944 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dd8d563e42e..3acf66968e3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2960,6 +2960,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart-fltkhs" = callPackage + ({ mkDerivation, base, Cabal, Chart, colour, data-default-class + , filepath, fltkhs, operational, text, vector + }: + mkDerivation { + pname = "Chart-fltkhs"; + version = "0.1.0.4"; + sha256 = "0g7ghbs480ab484s3ad1hkkfjd30cl6h98a1cshbfhk4djinpl82"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + base Chart colour data-default-class fltkhs operational text vector + ]; + description = "A backend for the Chart library for FLTKHS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Chart-gtk" = callPackage ({ mkDerivation, array, base, cairo, Chart, Chart-cairo, colour , data-default-class, gtk, mtl, old-locale, time @@ -13888,16 +13906,16 @@ self: { }) {}; "NTRU" = callPackage - ({ mkDerivation, arithmoi, base, bytestring, containers, crypto-api - , polynomial, random, SHA, split + ({ mkDerivation, base, bytestring, containers, crypto-api + , integer-gmp, poly, random, SHA, split }: mkDerivation { pname = "NTRU"; - version = "1.0.0.1"; - sha256 = "1h9cn015wpcygs6s3kaddmhn28fps93iimd2frl1mq2r8jfmjfa6"; + version = "1.1.0.0"; + sha256 = "0hslzmkhinv3yjzbp2l8d2gbjispikj1mbgjpy2f6qx4k8dgq8f5"; libraryHaskellDepends = [ - arithmoi base bytestring containers crypto-api polynomial random - SHA split + base bytestring containers crypto-api integer-gmp poly random SHA + split ]; description = "NTRU Cryptography"; license = "GPL"; @@ -16777,6 +16795,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Rasterific_0_7_5_1" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity + , free, JuicyPixels, mtl, primitive, transformers, vector + , vector-algorithms + }: + mkDerivation { + pname = "Rasterific"; + version = "0.7.5.1"; + sha256 = "0n2kamiymfnh93yc8zn3bjjnxlz1q2yyc33f9h2ahyn4wzfw64n6"; + libraryHaskellDepends = [ + base bytestring containers dlist FontyFruity free JuicyPixels mtl + primitive transformers vector vector-algorithms + ]; + description = "A pure haskell drawing engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -19838,8 +19874,8 @@ self: { }: mkDerivation { pname = "Unique"; - version = "0.4.7.6"; - sha256 = "19388lmnld4z1vgnj9cfwhm51xn0m0rwsq76w5752sy9nzcpck91"; + version = "0.4.7.7"; + sha256 = "05klzscyvqd67rcyhkbx046i860vpxlfzp52yalfqrlvyyfgg3m2"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -25032,8 +25068,8 @@ self: { pname = "algebra"; version = "4.3.1"; sha256 = "090jaipyx5pcav2wqcqzds51fwx49l4c9cpp9nnk16bgkf92z615"; - revision = "1"; - editedCabalFile = "1lxxbbibsf1lkm6fv0svfvfbr0dg16jwcm18hcmfgwypzxqdrbdz"; + revision = "2"; + editedCabalFile = "1yrqg6p9p7vfzv8gjbcvln5gd221kslg6zvn5d1722wfa06g4g1j"; libraryHaskellDepends = [ adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void @@ -29596,6 +29632,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs_0_8_3" = callPackage + ({ mkDerivation, array, base, containers, criterion, linear, mtl + , QuickCheck, template-haskell, vector + }: + mkDerivation { + pname = "apecs"; + version = "0.8.3"; + sha256 = "1g9fvyhsbriz0c5l3xyaba7yds2iqwkrrrlfvihdr8mr1cx5mw3n"; + libraryHaskellDepends = [ + array base containers mtl template-haskell vector + ]; + testHaskellDepends = [ base containers linear QuickCheck vector ]; + benchmarkHaskellDepends = [ base criterion linear ]; + description = "Fast Entity-Component-System library for game programming"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apecs-gloss" = callPackage ({ mkDerivation, apecs, apecs-physics, base, containers, gloss , linear @@ -31060,6 +31114,25 @@ self: { broken = true; }) {}; + "arduino-copilot" = callPackage + ({ mkDerivation, base, containers, copilot, copilot-c99 + , copilot-language, directory, filepath, mtl, optparse-applicative + , unix + }: + mkDerivation { + pname = "arduino-copilot"; + version = "1.3.0"; + sha256 = "0524xga8r55zpf6fw4vg7al2d6i9q4qinsx3zlqq0825qq8pp5nr"; + libraryHaskellDepends = [ + base containers copilot copilot-c99 copilot-language directory + filepath mtl optparse-applicative unix + ]; + description = "Arduino programming in haskell using the Copilot stream DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "arena" = callPackage ({ mkDerivation, base, bytes, bytestring, containers, criterion , digest, directory, filepath, mtl, persistent-vector, safe @@ -32114,47 +32187,6 @@ self: { }) {}; "asif" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, conduit - , conduit-combinators, conduit-extra, containers, cpu, directory - , either, exceptions, foldl, generic-lens, hedgehog, hspec - , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-ip, lens, network - , old-locale, optparse-applicative, profunctors, resourcet - , temporary-resourcet, text, thyme, transformers, vector - }: - mkDerivation { - pname = "asif"; - version = "6.0.3"; - sha256 = "14c77hvghh6116ca29xzj1l7j95557mcfx0j9s73wxc82hl14wjg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu either exceptions foldl generic-lens - hw-bits hw-ip lens network old-locale profunctors resourcet - temporary-resourcet text thyme transformers vector - ]; - executableHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu directory either exceptions foldl - generic-lens hw-bits hw-ip lens network old-locale - optparse-applicative profunctors resourcet temporary-resourcet text - thyme transformers vector - ]; - testHaskellDepends = [ - attoparsec base binary bytestring conduit conduit-combinators - conduit-extra containers cpu either exceptions foldl generic-lens - hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip lens network - old-locale profunctors resourcet temporary-resourcet text thyme - transformers vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Library for creating and querying segmented feeds"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "asif_6_0_4" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , doctest, doctest-discover, either, exceptions, foldl @@ -32490,6 +32522,45 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "assumpta" = callPackage + ({ mkDerivation, assumpta-core, base, bytestring, connection + , data-default, exceptions, hspec, mime-mail, mtl, network + , QuickCheck, quickcheck-io, text, transformers + }: + mkDerivation { + pname = "assumpta"; + version = "0.1.0.0"; + sha256 = "1rk0nx8wx4ypvm4bscd6zj9l99hffp9946kszvpramrf8nqdkkvc"; + libraryHaskellDepends = [ + assumpta-core base bytestring connection data-default exceptions + mime-mail mtl text transformers + ]; + testHaskellDepends = [ + assumpta-core base bytestring hspec network QuickCheck + quickcheck-io + ]; + description = "An SMTP client library"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "assumpta-core" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring + , constraints, cryptonite, exceptions, hspec, memory, mtl + , QuickCheck, text, transformers + }: + mkDerivation { + pname = "assumpta-core"; + version = "0.1.0.2"; + sha256 = "06k8rb3fz597k97hasfzvjcs0psvy2jzj3v5yxibqm7yp66f2zhq"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring bytestring constraints cryptonite + exceptions memory mtl text transformers + ]; + testHaskellDepends = [ base bytestring hspec mtl QuickCheck text ]; + description = "Core functionality for an SMTP client"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "ast-monad" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33833,14 +33904,14 @@ self: { broken = true; }) {}; - "aur_6_3_0" = callPackage + "aur_6_3_1" = callPackage ({ mkDerivation, aeson, base, http-client, http-client-tls, servant , servant-client, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "6.3.0"; - sha256 = "0q8sirx52hm6yh09383r1li5l4jra8vscnzs7nz44q8nd89rq22i"; + version = "6.3.1"; + sha256 = "049n21n8b2qllig40fqrc72ah16d4r2ajhxxj851nkyi44fvz0ba"; libraryHaskellDepends = [ aeson base http-client servant servant-client text ]; @@ -33884,8 +33955,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "2.0.2"; - sha256 = "1r11dzyy7z759ch664cml6lywh7033s6qrv56mkn41kn91jrl3qy"; + version = "2.0.3"; + sha256 = "1i4ayl6vw9ffcx97j092nh8wls603k7agj8apabhacxnbxx7vl6a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36184,12 +36255,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "base-compat_0_11_0" = callPackage + "base-compat_0_11_1" = callPackage ({ mkDerivation, base, unix }: mkDerivation { pname = "base-compat"; - version = "0.11.0"; - sha256 = "0svswi3nby9cabai2l9mkcx0c9zqw9y8js50sh09cms1s2jjly26"; + version = "0.11.1"; + sha256 = "0dkdmyxg8hfjn1zyrp4mahkr90g4y672mlvkj0m1krwkxi11avrm"; libraryHaskellDepends = [ base unix ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; @@ -36213,14 +36284,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "base-compat-batteries_0_11_0" = callPackage + "base-compat-batteries_0_11_1" = callPackage ({ mkDerivation, base, base-compat, hspec, hspec-discover , QuickCheck }: mkDerivation { pname = "base-compat-batteries"; - version = "0.11.0"; - sha256 = "0r9p14ks2fspbhj61b2gi4ixipkhhkzpcx0y35nf4yypcqv5262h"; + version = "0.11.1"; + sha256 = "1n5fyv5ih2jdw0fbxf46999fhx3h7b4iib9cd4vh8fqa7knnzxna"; libraryHaskellDepends = [ base base-compat ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -36341,6 +36412,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_8_2" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.8.2"; + sha256 = "00gbp4v4nxgp8gb3pyg23yy5f59rp5r2r8i8hi0ywpaxbqw6501a"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -36513,19 +36599,20 @@ self: { }) {}; "base64" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, criterion - , deepseq, memory, random-bytestring, tasty, tasty-hunit, text + ({ mkDerivation, base, base64-bytestring, bytestring, deepseq + , gauge, memory, random-bytestring, tasty, tasty-hunit, text }: mkDerivation { pname = "base64"; - version = "0.3.1.1"; - sha256 = "0g812lfql9agbdmrqvwc42sb91sibdd6w50mw3kvfz0fflskkiip"; - libraryHaskellDepends = [ base bytestring deepseq text ]; + version = "0.4.0"; + sha256 = "0mq9pnlcmjxalkq6i9shp6652l34qqp6gsahma9pi2rvk1klk7vv"; + libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ - base base64-bytestring random-bytestring tasty tasty-hunit text + base base64-bytestring bytestring random-bytestring tasty + tasty-hunit text ]; benchmarkHaskellDepends = [ - base base64-bytestring bytestring criterion deepseq memory + base base64-bytestring bytestring deepseq gauge memory random-bytestring text ]; description = "RFC 4648-compliant padded and unpadded base64 and base64url encodings"; @@ -36603,8 +36690,8 @@ self: { }: mkDerivation { pname = "base64-lens"; - version = "0.1.0.3"; - sha256 = "1qc0hqk647liw13l65r8pk86m9g12xwvdf7imk54idxy2xp1rp77"; + version = "0.2.0"; + sha256 = "0d4lri7wpaxx7hgd7slxj5jl2qkgfairzsga4vajl05g49amyk80"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring lens text ]; testHaskellDepends = [ base doctest lens ]; @@ -37447,13 +37534,15 @@ self: { }) {}; "bearriver" = callPackage - ({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }: + ({ mkDerivation, base, dunai, MonadRandom, mtl, simple-affine-space + , transformers + }: mkDerivation { pname = "bearriver"; - version = "0.13.1"; - sha256 = "1mkvn05gdazg8inc61vzswwcm53m6xpv7ly4gs5ms6bfqh406xm5"; + version = "0.13.1.1"; + sha256 = "0gqlwj30rghlqsik1i7w2yrccpf7h4pm3adnq6v7dprnhfcz1pkw"; libraryHaskellDepends = [ - base dunai MonadRandom mtl transformers + base dunai MonadRandom mtl simple-affine-space transformers ]; description = "A replacement of Yampa based on Monadic Stream Functions"; license = stdenv.lib.licenses.bsd3; @@ -38140,6 +38229,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bifunctors_5_5_7" = callPackage + ({ mkDerivation, base, base-orphans, comonad, containers, hspec + , hspec-discover, QuickCheck, tagged, template-haskell + , th-abstraction, transformers, transformers-compat + }: + mkDerivation { + pname = "bifunctors"; + version = "5.5.7"; + sha256 = "0cimvd64jzd6dyxjw2kx8wqhd1x0z89pj0ppmsikj4afa3aa5cw8"; + libraryHaskellDepends = [ + base base-orphans comonad containers tagged template-haskell + th-abstraction transformers + ]; + testHaskellDepends = [ + base hspec QuickCheck template-haskell transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bighugethesaurus" = callPackage ({ mkDerivation, base, HTTP, split }: mkDerivation { @@ -38618,8 +38730,8 @@ self: { pname = "binary-orphans"; version = "1.0.1"; sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; - revision = "2"; - editedCabalFile = "0b4fafgwhrp4i7vxcynzk5678kn6jvraanmbmf14mxlkipl2fff3"; + revision = "3"; + editedCabalFile = "1s3bk63x2rxwk611jbvpvvgrq1k7k0gd9q105cqxcbcih396ac0s"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary QuickCheck quickcheck-instances tagged tasty @@ -41177,16 +41289,14 @@ self: { "blank-canvas" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries , base64-bytestring, bytestring, colour, containers - , data-default-class, directory, fail, http-types, kansas-comet - , mime-types, process, scotty, semigroups, shake, stm, text - , text-show, time, transformers, unix, vector, wai, wai-extra, warp + , data-default-class, fail, http-types, kansas-comet, mime-types + , scotty, semigroups, stm, text, text-show, transformers, vector + , wai, wai-extra, warp }: mkDerivation { pname = "blank-canvas"; - version = "0.7"; - sha256 = "11blkr9yhag4l8lyg5gyi2wzcnapkgihkh01mp9lm28f3bb1v1z7"; - revision = "1"; - editedCabalFile = "11jqhxcr8vynlknpw73s0nmg1a7n9rsbyifyhaxi3aq7hzvb0qai"; + version = "0.7.1"; + sha256 = "02w428jpb49yaqzw93121lf1m4pjxi8wniqhnrvqh2zh63gsfws1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -41194,10 +41304,6 @@ self: { mime-types scotty semigroups stm text text-show transformers vector wai wai-extra warp ]; - testHaskellDepends = [ - base base-compat-batteries containers directory process shake stm - text time unix vector - ]; description = "HTML5 Canvas Graphics Library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -43045,8 +43151,8 @@ self: { }: mkDerivation { pname = "box"; - version = "0.1.0"; - sha256 = "1q03sgz4qzm61rs5chkvk0h9qj7idxxzmyr29awkxigv18nab18h"; + version = "0.2.0"; + sha256 = "0100vq8fb2lihnas6cqrigrrndzj48icsl56kdyi6vvkr9aclzm2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44940,6 +45046,8 @@ self: { pname = "bytes"; version = "0.16"; sha256 = "1m8nkviq4ckqi9v1w1fxzicdzmvb3wfxcmqmppjrrmkwawn4c6i9"; + revision = "1"; + editedCabalFile = "080sdihajl7fbcyp2j4mbq3zlh8jl6dsn51gk89h1r5nl3zzh3gz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable @@ -45525,15 +45633,20 @@ self: { }) {}; "bz2" = callPackage - ({ mkDerivation, base, bytestring, c2hs }: + ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty + , tasty-golden, tasty-hunit + }: mkDerivation { pname = "bz2"; - version = "0.1.0.1"; - sha256 = "07ry2y8xlm6m54qqriwmrcw2m9dal5mr728y3gzsfy104f1w80bf"; - revision = "1"; - editedCabalFile = "0wbhhcmi7wjyjp82sj0ifi3i5hblzdda66jyzcb66rdwi2547jd2"; + version = "0.1.1.1"; + sha256 = "17ckzljzl62bfmhbahxafq5v8xhwpalhxl5x2s83lp2jwc5gal52"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-golden tasty-hunit + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Bindings to libbz2"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45542,8 +45655,8 @@ self: { ({ mkDerivation, base, bytestring, composition-prelude }: mkDerivation { pname = "bzip-signature"; - version = "0.1.1.0"; - sha256 = "154birx50dzgpiz3x34lmd2flmwv41y5b6kvx6imskzqf3nwmcv2"; + version = "0.1.1.1"; + sha256 = "10xd38zgfkp1jngw45hkbi3am04zy3dciwly1pralbf8drf2sn8b"; libraryHaskellDepends = [ base bytestring composition-prelude ]; description = "Backpack signature for BZip compression"; license = stdenv.lib.licenses.bsd3; @@ -45932,8 +46045,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.1.3"; - sha256 = "03x5p2yz6vdrhl8dnmgc7phbsmrg7x51syg41i2hjcw9bm2js8wg"; + version = "1.0.1.5"; + sha256 = "0bzxpr1lalj3i4qickxpch3ky5d686k1rdba2aymhcr8g89l4m0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46105,6 +46218,8 @@ self: { pname = "cabal-doctest"; version = "1.0.8"; sha256 = "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0"; + revision = "1"; + editedCabalFile = "0z0r7h2y5six2zgfylcwr9g4j78qph35zqglk9lz4za1klvgdprl"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; @@ -46924,8 +47039,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.4.1"; - sha256 = "14p53cg8x3d6ja5n1qf9f1hzxb7dvlscwwwhk5l8k531jmlhpqkb"; + version = "2.5"; + sha256 = "1z6sxjgsbp0gz6rv9camkbmnazj3gn5j4wsxmmwpchv0n6vmcmzw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -50547,27 +50662,6 @@ self: { }) {}; "cheapskate" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize - }: - mkDerivation { - pname = "cheapskate"; - version = "0.1.1.1"; - sha256 = "0qnyd8bni2rby6b02ff4bvfdhm1hwc8vzpmnms84jgrlg1lly3fm"; - revision = "1"; - editedCabalFile = "0mf6qdpgh56n0ynyy272vhkk2bjrdhppks2vrw79gk0kzn29fggh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html containers data-default deepseq mtl syb text - uniplate xss-sanitize - ]; - executableHaskellDepends = [ base blaze-html bytestring text ]; - description = "Experimental markdown processor"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cheapskate_0_1_1_2" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , data-default, deepseq, mtl, syb, text, uniplate, xss-sanitize }: @@ -50584,7 +50678,6 @@ self: { executableHaskellDepends = [ base blaze-html bytestring text ]; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate-highlight" = callPackage @@ -52149,8 +52242,8 @@ self: { }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.5"; - sha256 = "0s84q6qdym02xvva3iq559kmhwzb08slip69h4cvvc6a7lqmaj37"; + version = "0.2.0.6"; + sha256 = "0s7aqx2wchs834r47kj826kp6fdk3h9gl88s50b1992xhnqxv619"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal inline-c process ]; @@ -54054,19 +54147,20 @@ self: { }) {}; "cmt" = callPackage - ({ mkDerivation, attoparsec, base, classy-prelude, containers - , directory, file-embed, filepath, process, tasty, tasty-discover - , tasty-expected-failure, tasty-hunit, terminal-size, text + ({ mkDerivation, ansi-terminal, attoparsec, base, classy-prelude + , containers, directory, file-embed, filepath, process, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit + , terminal-size, text }: mkDerivation { pname = "cmt"; - version = "0.5.0.0"; - sha256 = "0wnnqzcqxk976q0zy35gi9l46w2fdjvqnx2nxijmfsxj3f221ggx"; + version = "0.7.1.0"; + sha256 = "16nlsfah6gqx529nixjai6l1g6c02mjimz9n1xf7fr0vayp4a4dj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base classy-prelude containers directory filepath - process terminal-size text + ansi-terminal attoparsec base classy-prelude containers directory + file-embed filepath process terminal-size text ]; executableHaskellDepends = [ base classy-prelude ]; testHaskellDepends = [ @@ -56176,16 +56270,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "compensated_0_8" = callPackage + "compensated_0_8_1" = callPackage ({ mkDerivation, base, bifunctors, binary, bytes, Cabal - , cabal-doctest, cereal, comonad, deepseq, distributive, doctest - , generic-deriving, hashable, lens, log-domain, safecopy + , cabal-doctest, cereal, comonad, criterion, deepseq, distributive + , doctest, generic-deriving, hashable, lens, log-domain, safecopy , semigroupoids, semigroups, simple-reflect, vector }: mkDerivation { pname = "compensated"; - version = "0.8"; - sha256 = "1jvvsa1dqsds6ri6f746y47flwrlfxnc7jsgic2m6kvf1b700qr9"; + version = "0.8.1"; + sha256 = "1qr5nsg6fb6ib2wp29c1y05zdbydsng0sfg2k75qsh0avb2cgw7z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive @@ -56194,6 +56288,7 @@ self: { testHaskellDepends = [ base doctest generic-deriving semigroups simple-reflect ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Compensated floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58015,6 +58110,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-hedis" = callPackage + ({ mkDerivation, base, conferer, hedis, hspec, text }: + mkDerivation { + pname = "conferer-hedis"; + version = "0.2.0.0"; + sha256 = "0h09lzjg8lhhql6zmr0c7mz8rlaskvkadmcl1xwj76cm1kg3hlwx"; + libraryHaskellDepends = [ base conferer hedis text ]; + testHaskellDepends = [ base conferer hedis hspec text ]; + description = "conferer's FromConfig instances for hedis settings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "conferer-hspec" = callPackage ({ mkDerivation, base, conferer, hspec, hspec-core, text }: mkDerivation { @@ -58182,6 +58289,8 @@ self: { pname = "config-ini"; version = "0.2.4.0"; sha256 = "0dfm4xb1sd713rcqzplzdgw68fyhj24i6lj8j3q8kldpmkl98lbf"; + revision = "1"; + editedCabalFile = "15ryq15851m9hzljamw5spr6hzr6picgf6s3xzkn7nviidcq78mz"; libraryHaskellDepends = [ base containers megaparsec text transformers unordered-containers ]; @@ -58367,6 +58476,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "configuration-tools_0_4_2" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base-unicode-symbols, base64-bytestring, bytestring, Cabal + , case-insensitive, connection, data-default, deepseq, directory + , dlist, enclosed-exceptions, filepath, http-client + , http-client-tls, http-types, monad-control, mtl, network-uri + , optparse-applicative, process, profunctors, semigroupoids + , semigroups, text, tls, transformers, unordered-containers, wai + , warp, warp-tls, x509, x509-system, x509-validation, yaml + }: + mkDerivation { + pname = "configuration-tools"; + version = "0.4.2"; + sha256 = "08wzgd38adlrgp9s8330hsp3h1jmhnlaj3fyvkxgljlmyyzlw70q"; + setupHaskellDepends = [ + base bytestring Cabal directory filepath process + ]; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base-unicode-symbols + base64-bytestring bytestring Cabal case-insensitive connection + data-default deepseq directory dlist enclosed-exceptions filepath + http-client http-client-tls http-types monad-control mtl + network-uri optparse-applicative process profunctors semigroupoids + semigroups text tls transformers unordered-containers x509 + x509-system x509-validation yaml + ]; + testHaskellDepends = [ + base base-unicode-symbols bytestring Cabal enclosed-exceptions + http-types monad-control mtl text transformers unordered-containers + wai warp warp-tls yaml + ]; + description = "Tools for specifying and parsing configurations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "configurator" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , hashable, HUnit, test-framework, test-framework-hunit, text @@ -59002,8 +59147,8 @@ self: { }: mkDerivation { pname = "construct"; - version = "0.1"; - sha256 = "0gwpks2nrw4hmvw0m9bs23djjcv7ijjrvp14bdi13lv195c3f3af"; + version = "0.2"; + sha256 = "18ww9yij81js122gkp03kajkakqvkn370lcz03kfcmmc5inw0vzj"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -60179,24 +60324,6 @@ self: { }) {}; "core-data" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, core-text - , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific - , text, unordered-containers, vector - }: - mkDerivation { - pname = "core-data"; - version = "0.2.1.4"; - sha256 = "1arrw5xbzxpwqzpxcyw13lv4sazn5pzv448crw54284kyi798hc3"; - libraryHaskellDepends = [ - aeson base bytestring containers core-text hashable prettyprinter - prettyprinter-ansi-terminal scientific text unordered-containers - vector - ]; - description = "Convenience wrappers around common data structures and encodings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "core-data_0_2_1_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, core-text , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific , text, unordered-containers, vector @@ -60212,7 +60339,6 @@ self: { ]; description = "Convenience wrappers around common data structures and encodings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -60256,23 +60382,6 @@ self: { }) {}; "core-text" = callPackage - ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable - , prettyprinter, prettyprinter-ansi-terminal, template-haskell - , text, text-short - }: - mkDerivation { - pname = "core-text"; - version = "0.2.2.6"; - sha256 = "0yywrgcm2g8p93kklckj258l89cmg0li3aikil1rsgrqrnawwc87"; - libraryHaskellDepends = [ - base bytestring deepseq fingertree hashable prettyprinter - prettyprinter-ansi-terminal template-haskell text text-short - ]; - description = "A rope type based on a finger tree over UTF-8 fragments"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "core-text_0_2_3_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable , prettyprinter, prettyprinter-ansi-terminal, template-haskell , text, text-short @@ -60287,7 +60396,6 @@ self: { ]; description = "A rope type based on a finger tree over UTF-8 fragments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "corebot-bliki" = callPackage @@ -60752,21 +60860,21 @@ self: { }) {}; "cpkg" = callPackage - ({ mkDerivation, base, binary, bytestring, bzlib - , composition-prelude, containers, cpphs, dhall, dir-traverse - , directory, filemanip, filepath, hashable, hspec, hspec-megaparsec - , http-client, http-client-tls, libarchive, lzlib, lzma, megaparsec - , microlens, mtl, network-uri, optparse-applicative, prettyprinter - , process, recursion, temporary, text, zip-archive, zlib, zstd + ({ mkDerivation, base, binary, bytestring, bz2, composition-prelude + , containers, cpphs, dhall, dir-traverse, directory, filemanip + , filepath, hashable, hspec, hspec-megaparsec, http-client + , http-client-tls, libarchive, lzlib, lzma, megaparsec, microlens + , mtl, network-uri, optparse-applicative, prettyprinter, process + , recursion, temporary, text, zip-archive, zlib, zstd }: mkDerivation { pname = "cpkg"; - version = "0.2.4.1"; - sha256 = "0amv5kwba1amh6nsqfh6bb2gm7a3ky5lrjjr9c88w0qfyk8rr3am"; + version = "0.2.4.3"; + sha256 = "03gvw5z4g49j7aq8dqzmam69xxn18gmnpnvgg56p6gh9vck1nwhr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bzlib composition-prelude containers dhall + base binary bytestring bz2 composition-prelude containers dhall dir-traverse directory filemanip filepath hashable http-client http-client-tls libarchive lzlib lzma megaparsec microlens mtl network-uri prettyprinter process recursion temporary text @@ -62062,17 +62170,17 @@ self: { "crypto-classical" = callPackage ({ mkDerivation, base, bytestring, containers, crypto-numbers , crypto-random, microlens, microlens-th, modular-arithmetic - , QuickCheck, random, random-shuffle, text, transformers + , QuickCheck, text, transformers }: mkDerivation { pname = "crypto-classical"; - version = "0.2.0"; - sha256 = "0gnqvsw5nbank1yanvjrqjprqd80y00scajmjdjyfbpiq47lj4c9"; + version = "0.2.1"; + sha256 = "0mqvygx8pvvmaalqzr94nf400smq8y22shyvfhxrh69hs6q0dgw6"; libraryHaskellDepends = [ base bytestring containers crypto-numbers crypto-random microlens - microlens-th modular-arithmetic QuickCheck random random-shuffle - text transformers + microlens-th modular-arithmetic text transformers ]; + testHaskellDepends = [ base bytestring microlens QuickCheck ]; description = "An educational tool for studying classical cryptography schemes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71688,12 +71796,12 @@ self: { broken = true; }) {}; - "directory_1_3_5_0" = callPackage + "directory_1_3_6_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.5.0"; - sha256 = "0lzx67630dsvwf3iraabdsqxbpzal2irbdxav87sq9bj818v1rb9"; + version = "1.3.6.0"; + sha256 = "1fxgha63sw3zc3hv4qswk595alxkhl4nikip9ab46ni4m83hyvmf"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -71896,8 +72004,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.2.0"; - sha256 = "0qqhzvv3ilylmpg6bn0pgg0ww6biqikfardpsqn4b78vqqp7pxjd"; + version = "1.4.0"; + sha256 = "1011zrn5axjm44zmnj21q3w33pwwkciici2zf2sqz2plvkxn4c1w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75105,8 +75213,8 @@ self: { }: mkDerivation { pname = "dtab"; - version = "1.1.0.1"; - sha256 = "18p10a2x6ra18aj6cphgswq4sjjkdrq58pk7ikgmpgq9sj4bxgpr"; + version = "1.1.1.1"; + sha256 = "1pxhvnm5vvgfxwm42s3w3i5nk0lx75xgsr1c487hkswip48fiyd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75203,19 +75311,6 @@ self: { }) {}; "dual" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "dual"; - version = "0.1.0.3"; - sha256 = "1w8haw9q7cljiq58nh7fmywbgcxnx8xz33zx8gr9imkagh56gwv3"; - libraryHaskellDepends = [ base ]; - description = "Dual category"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "dual_0_1_1_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "dual"; @@ -75436,15 +75531,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dunai_0_5_2_1" = callPackage - ({ mkDerivation, base, MonadRandom, transformers, transformers-base + "dunai_0_6_0" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space + , transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.5.2.1"; - sha256 = "18ccvjmr03v4fghlv2hcb3g4c9zrq0ccasr2i9r71dp07mhrpaba"; + version = "0.6.0"; + sha256 = "00ww23294xq8jh9mlg3rd0yz33vl09vdd176hja3l0yskd8cpbxn"; libraryHaskellDepends = [ - base MonadRandom transformers transformers-base + base MonadRandom simple-affine-space transformers transformers-base ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -78224,23 +78320,23 @@ self: { "elynx-seq" = callPackage ({ mkDerivation, async, base, bytestring, containers , data-memocombinators, elynx-tools, elynx-tree, hmatrix, hspec - , hspec-megaparsec, integration, lens, math-functions, matrices + , hspec-megaparsec, integration, math-functions, matrices , megaparsec, mwc-random, optparse-applicative, parallel, primitive , statistics, transformers, vector, vector-th-unbox, word8 }: mkDerivation { pname = "elynx-seq"; - version = "0.0.1"; - sha256 = "0v43nqpx17zbqv0537jrikkfnvadcmfc5byxh8lk369ma76029y7"; + version = "0.1.0"; + sha256 = "07kykql8i5msy2n091bwbawagbfpw8q553k5s89j3y5bi6d4aahg"; libraryHaskellDepends = [ async base bytestring containers data-memocombinators elynx-tools - elynx-tree hmatrix integration lens math-functions matrices - megaparsec mwc-random optparse-applicative parallel primitive - statistics transformers vector vector-th-unbox word8 + elynx-tree hmatrix integration math-functions matrices megaparsec + mwc-random optparse-applicative parallel primitive statistics + transformers vector vector-th-unbox word8 ]; testHaskellDepends = [ async base bytestring containers data-memocombinators elynx-tools - elynx-tree hmatrix hspec hspec-megaparsec integration lens + elynx-tree hmatrix hspec hspec-megaparsec integration math-functions matrices megaparsec mwc-random optparse-applicative parallel primitive statistics transformers vector vector-th-unbox word8 @@ -78252,36 +78348,38 @@ self: { }) {}; "elynx-tools" = callPackage - ({ mkDerivation, base, bytestring, containers, fast-logger, hmatrix - , lifted-base, matrices, megaparsec, monad-control, monad-logger - , mwc-random, optparse-applicative, parallel, primitive - , template-haskell, text, time, transformers, transformers-base - , vector, zlib + ({ mkDerivation, aeson, async, base, bytestring, containers + , cryptohash-sha256, deepseq, fast-logger, hmatrix, lifted-base + , matrices, megaparsec, monad-control, monad-logger, mwc-random + , optparse-applicative, parallel, primitive, template-haskell, text + , time, transformers, transformers-base, vector, zlib }: mkDerivation { pname = "elynx-tools"; - version = "0.0.1"; - sha256 = "17h6rncyb4insjarss4a8467d4mybmwa9dwgjrw7sb66y301xy8w"; + version = "0.1.0"; + sha256 = "0dhri3chyyqq8svw1lkl89hdrjb7b2bin50gqv3d6hrxs9813yz3"; libraryHaskellDepends = [ - base bytestring containers fast-logger hmatrix lifted-base matrices - megaparsec monad-control monad-logger mwc-random - optparse-applicative parallel primitive template-haskell text time - transformers transformers-base vector zlib + aeson async base bytestring containers cryptohash-sha256 deepseq + fast-logger hmatrix lifted-base matrices megaparsec monad-control + monad-logger mwc-random optparse-applicative parallel primitive + template-haskell text time transformers transformers-base vector + zlib ]; description = "Tools for ELynx"; license = stdenv.lib.licenses.gpl3; }) {}; "elynx-tree" = callPackage - ({ mkDerivation, base, bytestring, containers, elynx-tools, hspec - , hspec-megaparsec, lifted-async, math-functions, megaparsec - , mwc-random, optparse-applicative, parallel, primitive, QuickCheck - , quickcheck-instances, statistics, transformers, vector + ({ mkDerivation, base, bytestring, containers, criterion + , elynx-tools, hspec, hspec-megaparsec, lifted-async + , math-functions, megaparsec, mwc-random, optparse-applicative + , parallel, primitive, QuickCheck, quickcheck-instances, statistics + , transformers, vector }: mkDerivation { pname = "elynx-tree"; - version = "0.0.1"; - sha256 = "0gd14cshy143q7gdxfkb0laxbramkxlqnr2s15z89rbs75hfgqa9"; + version = "0.1.0"; + sha256 = "1mg4k03xx1zmsn54ip5q27p3qll13dcfk2gh2xyfy097b4mlwrzp"; libraryHaskellDepends = [ base bytestring containers elynx-tools lifted-async math-functions megaparsec mwc-random optparse-applicative parallel primitive @@ -78293,6 +78391,12 @@ self: { optparse-applicative parallel primitive QuickCheck quickcheck-instances statistics transformers vector ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion elynx-tools lifted-async + math-functions megaparsec mwc-random optparse-applicative parallel + primitive QuickCheck quickcheck-instances statistics transformers + vector + ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -79577,10 +79681,8 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.6.0.0"; - sha256 = "1cf74r1zdb289x27linjg8di5gcsi1jg771gyb0rqaf5carl9b0f"; - revision = "1"; - editedCabalFile = "19dbxan77gsqy4v23npfbq5p3qwb6wz3r7mhs6290ghpfhzy8yp4"; + version = "0.6.0.1"; + sha256 = "0al3ms7gxd1ws8bs694h7ka2rg9kn3v36qgwrxm2hq4ys80y7r65"; libraryHaskellDepends = [ base containers template-haskell th-desugar th-extras void ]; @@ -79999,6 +80101,34 @@ self: { broken = true; }) {}; + "ersatz_0_4_8" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest, fail + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.8"; + sha256 = "1gddf8zhavxri80f3nnd29ff6k7n03ggcah4qglknci7h94z7v8c"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base directory doctest filepath ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -80048,8 +80178,8 @@ self: { }: mkDerivation { pname = "escape-artist"; - version = "1.1.0"; - sha256 = "1zjisjmcmp8sd8dkai20x71zzz5g94a7p93h9c4nspbyzf5ymk72"; + version = "1.2.0.1"; + sha256 = "1plr0vj3zjic1hy0bbr3sipqrawrym9ypakkihcdaw5fff98i4n3"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring hspec QuickCheck silently text @@ -80228,7 +80358,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_3_1" = callPackage + "esqueleto_3_3_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -80238,8 +80368,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.1"; - sha256 = "19s7grwdjh39w13c34wg8kkcc0r17a9vbriz9g4z0hcz6yv7ajx2"; + version = "3.3.1.1"; + sha256 = "1qi28ma8j5kfygjxnixlazxsyrkdqv8ljz3icwqi5dlscsnj6v3v"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -81555,6 +81685,21 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "exceptionfree-readfile" = callPackage + ({ mkDerivation, base, criterion, deepseq, hspec, process + , temporary + }: + mkDerivation { + pname = "exceptionfree-readfile"; + version = "0.1.0.0"; + sha256 = "12czqrkbb1f69d2fxjnzzrxlyayvs24k6pwq9kclfsql8iscn063"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec process temporary ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "An exception-free readFile for use with '+RTS -xc -RTS' projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exceptions" = callPackage ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -82948,17 +83093,6 @@ self: { }) {}; "failable" = callPackage - ({ mkDerivation, base, mtl, transformers }: - mkDerivation { - pname = "failable"; - version = "1.2.2.0"; - sha256 = "0cwnqipq23mhcadhxgqghsh5br8lrny7r3zlxiz05l7s3in5vsdk"; - libraryHaskellDepends = [ base mtl transformers ]; - description = "A 'Failable' error monad class to unify failure across monads that can fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "failable_1_2_4_0" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "failable"; @@ -82967,7 +83101,6 @@ self: { libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "failable-list" = callPackage @@ -83045,10 +83178,8 @@ self: { }: mkDerivation { pname = "fake"; - version = "0.1.1.2"; - sha256 = "0jwndfsyc5p7da97658j14x5gynbifkx7ikg8k09ym9gizkrmdd2"; - revision = "2"; - editedCabalFile = "17ggg7m04xr42353b2gyx965c8qgymd4nvlzcm5zyx2v7q9zwy8f"; + version = "0.1.1.3"; + sha256 = "07ciaxbfvhajjdj5sidvy9cxpjfssjkxykrbgnghihrla78pwq1n"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -83986,6 +84117,21 @@ self: { broken = true; }) {}; + "fcf-containers" = callPackage + ({ mkDerivation, base, doctest, first-class-families, Glob }: + mkDerivation { + pname = "fcf-containers"; + version = "0.1.0"; + sha256 = "1rvchhv59640iiwx2f9byf5klayx150aws1wz54v85bfcsxwsrac"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base first-class-families ]; + executableHaskellDepends = [ base first-class-families ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Data structures and algorithms for first-class-families"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fcg" = callPackage ({ mkDerivation }: mkDerivation { @@ -84032,6 +84178,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fclabels_2_0_4" = callPackage + ({ mkDerivation, base, base-orphans, criterion, HUnit, mtl + , template-haskell, transformers + }: + mkDerivation { + pname = "fclabels"; + version = "2.0.4"; + sha256 = "1ks59vcliy2x9i01qxpd4k455m7wpcfhcldgmhkym9wmwfxy0sf2"; + libraryHaskellDepends = [ + base base-orphans mtl template-haskell transformers + ]; + testHaskellDepends = [ + base HUnit mtl template-haskell transformers + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "First class accessor labels implemented as lenses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fclabels-monadlib" = callPackage ({ mkDerivation, base, fclabels, monadLib }: mkDerivation { @@ -84991,12 +85157,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fgl_5_7_0_2" = callPackage + ({ mkDerivation, array, base, containers, deepseq, hspec + , microbench, QuickCheck, transformers + }: + mkDerivation { + pname = "fgl"; + version = "5.7.0.2"; + sha256 = "13zqdwj6j2y5827w3dcx8kl1gini4x938bfh4c5g5jc3b37rlnll"; + libraryHaskellDepends = [ + array base containers deepseq transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base deepseq microbench ]; + description = "Martin Erwig's Functional Graph Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fgl-arbitrary" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { pname = "fgl-arbitrary"; - version = "0.2.0.3"; - sha256 = "0ln1szgfy8fa78l3issq4fx3aqnnd54w3cb4wssrfi48vd5rkfjm"; + version = "0.2.0.5"; + sha256 = "1wp6v4wb2g6alq4r26da1zmc3g2g2xzca0znf4ldw4552azasaxx"; libraryHaskellDepends = [ base fgl QuickCheck ]; testHaskellDepends = [ base containers fgl hspec QuickCheck ]; description = "QuickCheck support for fgl"; @@ -85986,14 +86170,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "first-class-families_0_6_0_0" = callPackage - ({ mkDerivation, base }: + "first-class-families_0_7_0_0" = callPackage + ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "first-class-families"; - version = "0.6.0.0"; - sha256 = "0a1f789d3lv8hvd3nidwglx11yvwiakvmabpz1hzgdjyfnrpg98n"; + version = "0.7.0.0"; + sha256 = "0dvlmfhnbbrr3yxq4idpipvlxda21qvayx6gk93f66jzcl5726my"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; description = "First class type families"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -86763,6 +86947,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "flat-mcmc_1_5_1" = callPackage + ({ mkDerivation, base, formatting, mcmc-types, monad-par + , monad-par-extras, mwc-probability, pipes, primitive, text + , transformers, vector + }: + mkDerivation { + pname = "flat-mcmc"; + version = "1.5.1"; + sha256 = "1fi18hx6mz7qskhnnjviaghqz0vsbrvglyk16xzj3kywx70hakpb"; + libraryHaskellDepends = [ + base formatting mcmc-types monad-par monad-par-extras + mwc-probability pipes primitive text transformers vector + ]; + testHaskellDepends = [ base vector ]; + description = "Painless general-purpose sampling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flat-tex" = callPackage ({ mkDerivation, base, directory, parsec }: mkDerivation { @@ -87314,6 +87517,38 @@ self: { broken = true; }) {}; + "flp" = callPackage + ({ mkDerivation, alex, array, base, containers, deepseq, happy + , haskell-src-meta, HUnit, pretty-simple, prettyprinter + , template-haskell, test-framework, test-framework-hunit, th-lift + , transformers + }: + mkDerivation { + pname = "flp"; + version = "0.1.0.0"; + sha256 = "0aw3a1krisx4vhn2kpdizxhp2j8rnwv5iwm6z2qv2av1yh99j8h6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers deepseq haskell-src-meta prettyprinter + template-haskell th-lift transformers + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + array base containers deepseq haskell-src-meta pretty-simple + prettyprinter template-haskell th-lift transformers + ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ + array base containers deepseq haskell-src-meta HUnit prettyprinter + template-haskell test-framework test-framework-hunit th-lift + transformers + ]; + testToolDepends = [ alex happy ]; + description = "A layout spec language for memory managers implemented in Rust"; + license = stdenv.lib.licenses.mit; + }) {}; + "fltkhs" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath , fltk14, libGL, libGLU, mtl, OpenGLRaw, parsec, pkg-config, text @@ -89905,6 +90140,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "from-sum_0_2_3_0" = callPackage + ({ mkDerivation, base, doctest, Glob, transformers }: + mkDerivation { + pname = "from-sum"; + version = "0.2.3.0"; + sha256 = "1rdsynimmq81y3g5c8z9yvlqhsl99hnvjq4wvdci5ql788cq4m81"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Combinators for working with Maybe and Either"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fromhtml" = callPackage ({ mkDerivation, base, bytestring, process-extras, text }: mkDerivation { @@ -90769,8 +91017,8 @@ self: { pname = "functor-classes-compat"; version = "1"; sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "5"; - editedCabalFile = "0n823v0avzdwvmfm5fgw5gsmrlvd12pdx1clkislpd5yq4ffgjw7"; + revision = "6"; + editedCabalFile = "0r0h3hp182w9ndhr5lrvhzl1vyj2f3vvh32fpdnbxb8xkkhx55sa"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -91200,6 +91448,24 @@ self: { broken = true; }) {}; + "fused-effects-squeal" = callPackage + ({ mkDerivation, base, fused-effects, squeal-postgresql, unliftio + , unliftio-core, unliftio-pool + }: + mkDerivation { + pname = "fused-effects-squeal"; + version = "0.1.0.0"; + sha256 = "0j91ynfb546mdlyp6jm3jpj99g4gk3ps978i9p4jxy6ivaj4pz75"; + libraryHaskellDepends = [ + base fused-effects squeal-postgresql unliftio unliftio-core + unliftio-pool + ]; + description = "A fused-effects adapter for squeal-postgresql"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fusion" = callPackage ({ mkDerivation, base, directory, doctest, filepath, pipes-safe , transformers, void @@ -94848,8 +95114,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.2"; - sha256 = "1651nwlja2n2z03js0plhiihms52j1663lx4wcvzm33synh6xa4j"; + version = "8.8.3.0"; + sha256 = "01xlp9drkwdh5n822x2pvga95lpvwa195lf9wpnx8z9v5sj2lksa"; libraryHaskellDepends = [ base bytestring ghc-lib-parser uniplate ]; @@ -95303,6 +95569,18 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-tcplugins-extra_0_4" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.4"; + sha256 = "0z85ma3r7k4g669br3sdsmnxnk8srh1xi0wggi1gzqrrwpylyv8w"; + libraryHaskellDepends = [ base ghc ]; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-time-alloc-prof" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, tasty, tasty-hunit, temporary, text, time @@ -97826,6 +98104,8 @@ self: { testToolDepends = [ git ]; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitHUD" = callPackage @@ -98183,17 +98463,18 @@ self: { "githud" = callPackage ({ mkDerivation, base, bytestring, daemons, data-default, directory , mtl, network, parsec, process, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, unix, utf8-string + , tasty-quickcheck, tasty-smallcheck, temporary, text, unix + , utf8-string }: mkDerivation { pname = "githud"; - version = "3.1.0"; - sha256 = "0shdb3a73w0n0p9pl0j7gmsqjwvniah3l251cgn27sp1cm33li8r"; + version = "3.2.0"; + sha256 = "12q21ha2v85ss6df0wx6h1300l93msqv0zwcgn3g2bir66blyd8a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring daemons data-default directory mtl network parsec - process text unix utf8-string + process temporary text unix utf8-string ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -103726,6 +104007,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) graphviz;}; + "graphviz_2999_20_0_4" = callPackage + ({ mkDerivation, base, bytestring, colour, containers, criterion + , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, graphviz + , hspec, hspec-discover, mtl, polyparse, process, QuickCheck + , temporary, text, wl-pprint-text + }: + mkDerivation { + pname = "graphviz"; + version = "2999.20.0.4"; + sha256 = "047f6sa5rp0f2npgvdrj5irylh0raf01a6nrjj2vsf1mzb1q83xr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring colour containers directory dlist fgl filepath mtl + polyparse process temporary text wl-pprint-text + ]; + testHaskellDepends = [ + base containers fgl fgl-arbitrary filepath hspec QuickCheck text + ]; + testSystemDepends = [ graphviz ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; + description = "Bindings to Graphviz for graph visualisation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) graphviz;}; + "graql" = callPackage ({ mkDerivation, aeson, base, containers, hspec, markdown-unlit , process, regex-posix, scientific, text @@ -108805,8 +109113,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.3.2.0"; - sha256 = "0jaw7s82l0nsr1axqkngcc4wfnmh790jdqbnsknwvyk6anvbpacb"; + version = "0.4.0.1"; + sha256 = "1baxmy5lz8w8yjnaslzrmpnwx7rgqixkwbkzfb034024wlb9w0am"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -110098,8 +110406,8 @@ self: { }: mkDerivation { pname = "harg"; - version = "0.4.1.0"; - sha256 = "1h1hdhlm5fjfm5cr052gf6cxp6r4lnz9a3b68ypj4b716hymir44"; + version = "0.4.2.0"; + sha256 = "14a5d73klg7da1pg30as9xnky95jxh1kl0qrzihvgd5m2kybsrb0"; libraryHaskellDepends = [ aeson barbies base bytestring directory higgledy optparse-applicative split text yaml @@ -111825,6 +112133,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-lexer_1_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "haskell-lexer"; + version = "1.1"; + sha256 = "1mb3np20ig0hbgnfxrzr3lczq7ya4p76g20lvnxch8ikck61afii"; + libraryHaskellDepends = [ base ]; + description = "A fully compliant Haskell 98 lexer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -114963,34 +115283,6 @@ self: { }) {inherit (pkgs) aspell;}; "hasql" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, dlist, hashable, hashtables, loch-th, mtl - , placeholders, postgresql-binary, postgresql-libpq, profunctors - , QuickCheck, quickcheck-instances, rebase, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, text-builder, transformers - , vector - }: - mkDerivation { - pname = "hasql"; - version = "1.4.0.1"; - sha256 = "04112217385hh7bqzs4sr0263yy3pzny10ym4j5vmy9kwrbygk2d"; - libraryHaskellDepends = [ - attoparsec base base-prelude bytestring bytestring-strict-builder - contravariant contravariant-extras dlist hashable hashtables - loch-th mtl placeholders postgresql-binary postgresql-libpq - profunctors text text-builder transformers vector - ]; - testHaskellDepends = [ - bug QuickCheck quickcheck-instances rebase rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ bug criterion rerebase ]; - description = "An efficient PostgreSQL driver with a flexible mapping API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql_1_4_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, dlist, hashable, hashtables, loch-th, mtl @@ -115016,7 +115308,6 @@ self: { benchmarkHaskellDepends = [ bug criterion rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -115899,10 +116190,8 @@ self: { }: mkDerivation { pname = "haxr"; - version = "3000.11.3.1"; - sha256 = "1wyb848mb0b6idkbi5jarsf6qi1zzl3yh6xd05g228kykii8k9mg"; - revision = "1"; - editedCabalFile = "1g5vqgpk02kx502w0klps88i0h0mfwmb8ai14xm5b90jmd9kndn3"; + version = "3000.11.4"; + sha256 = "1pyf0wjifsvsnx7zzhbn8ps0n578r0p89p2ib0nx1rsi2f1x21i5"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -116268,6 +116557,17 @@ self: { broken = true; }) {}; + "hcad" = callPackage + ({ mkDerivation, base, containers, gasp, mtl }: + mkDerivation { + pname = "hcad"; + version = "0.1"; + sha256 = "0qx0qpd7wg4555hlkv6fn80zyi0c5wmq8nd2fd1m6y25xmgbvkqm"; + libraryHaskellDepends = [ base containers gasp mtl ]; + description = "Haskell CAD library"; + license = "GPL"; + }) {}; + "hcc" = callPackage ({ mkDerivation, base, bytestring, language-c }: mkDerivation { @@ -117354,6 +117654,8 @@ self: { pname = "hedgehog"; version = "1.0.2"; sha256 = "1058d5fcv3hhvlx34a8xkg8r75p93l2yhacdbga8d4radiayy34f"; + revision = "1"; + editedCabalFile = "0rcga61rs098y4h44d5144qa7ismibvb44vw97ykazmz5yfg1n9l"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory erf exceptions fail lifted-async mmorph monad-control mtl @@ -117405,8 +117707,8 @@ self: { }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.4"; - sha256 = "0cvaa8rrjwz00z377b0s6c2yyfyxka78cpw66bkrlzyihjqqg6gn"; + version = "0.2.4.1"; + sha256 = "0qa938cy1bm3shq0l4rfdq5cmb54jjy0qpp6cmx1xjd6yrdqrkxc"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers wl-pprint-annotated @@ -117786,8 +118088,8 @@ self: { pname = "heist"; version = "1.1.0.1"; sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq"; - revision = "1"; - editedCabalFile = "08ihm07rqkhaxgnxr4ix08chxpqs0gps2b5xv79lzbl6cn6rj63c"; + revision = "2"; + editedCabalFile = "1w9iabqa3pm2160275z6mh658zlyp7vkj18ch064ry3y3a6cymbk"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -119798,17 +120100,14 @@ self: { }) {}; "hhwloc" = callPackage - ({ mkDerivation, base, Cabal, directory, process }: + ({ mkDerivation, base, Cabal, directory }: mkDerivation { pname = "hhwloc"; - version = "0.2.0"; - sha256 = "16plkwv42cbrrrl73864vcabcyd9irkbvq2jcki500vkxx92yxvj"; - isLibrary = true; - isExecutable = true; + version = "0.2.1"; + sha256 = "1vzlk2zgbs0l322gff71pap6y5dz7l6wkblyrpn9vip5bf0b12vs"; enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal directory process ]; + setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; description = "Bindings to https://www.open-mpi.org/projects/hwloc"; license = stdenv.lib.licenses.mit; }) {}; @@ -121518,6 +121817,18 @@ self: { license = "(BSD-2-Clause OR Apache-2.0)"; }) {}; + "hkd-default" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "hkd-default"; + version = "1.1.0.0"; + sha256 = "1ff8sfd68a06s7kfc85ww6w5wm7m0f70vd2bi0lbkj0r14rsn7vg"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ aeson base ]; + description = "Apply default value for optional field of HKD"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hkd-delta" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -122101,8 +122412,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.2.8"; - sha256 = "088wkpazj0lxx0fnzxqnfsicv59adnwzkj1rr5yjlmy4lr6sd5iz"; + version = "2.2.9"; + sha256 = "1six65y2x89q4a1kz5vm3pcjpwpp423h8nzp6kjka6cm5hn5ahdp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125181,12 +125492,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpath-directory" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hpath-filepath + , hpath-posix, hspec, HUnit, IfElse, process, safe-exceptions + , streamly, streamly-bytestring, time, unix, unix-bytestring + , utf8-string + }: + mkDerivation { + pname = "hpath-directory"; + version = "0.13.1"; + sha256 = "0vb60w275zljkscj0gi84c82xzyvvqixlw79jw4bcasxcygb70cf"; + libraryHaskellDepends = [ + base bytestring exceptions hpath-filepath hpath-posix IfElse + safe-exceptions streamly streamly-bytestring time unix + unix-bytestring utf8-string + ]; + testHaskellDepends = [ + base bytestring hpath-filepath hpath-posix hspec HUnit IfElse + process time unix unix-bytestring utf8-string + ]; + description = "Alternative to 'directory' package with ByteString based filepaths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hpath-filepath" = callPackage ({ mkDerivation, base, bytestring, unix, word8 }: mkDerivation { pname = "hpath-filepath"; - version = "0.10.3"; - sha256 = "0kd7qnw2bwiwqmbqkwxa15i45hjkmxvmrzblspqvfv3p3dxm8wg6"; + version = "0.10.4"; + sha256 = "01sclksryvl8z56asxda2q4wx0snc89482xlav6mrgzxsi432a07"; libraryHaskellDepends = [ base bytestring unix word8 ]; description = "ByteString based filepath manipulation"; license = stdenv.lib.licenses.bsd3; @@ -125194,20 +125528,16 @@ self: { "hpath-io" = callPackage ({ mkDerivation, base, bytestring, exceptions, hpath - , hpath-filepath, hspec, HUnit, IfElse, process, safe-exceptions - , streamly, time, unix, unix-bytestring, utf8-string + , hpath-directory, hpath-posix, safe-exceptions, streamly, time + , unix }: mkDerivation { pname = "hpath-io"; - version = "0.12.0"; - sha256 = "00bl6ixbnv6ld3fxnvb17wp277sn2srhia9p32mkx07ih0dwy4g2"; + version = "0.13.1"; + sha256 = "0bpjr4hqwz7hlj81ndi2lyi95halm822mmpyw91pimq6k2m635wk"; libraryHaskellDepends = [ - base bytestring exceptions hpath hpath-filepath IfElse - safe-exceptions streamly time unix unix-bytestring utf8-string - ]; - testHaskellDepends = [ - base bytestring hpath hspec HUnit IfElse process time unix - unix-bytestring utf8-string + base bytestring exceptions hpath hpath-directory hpath-posix + safe-exceptions streamly time unix ]; description = "High-level IO operations on files/directories"; license = stdenv.lib.licenses.bsd3; @@ -125215,6 +125545,23 @@ self: { broken = true; }) {}; + "hpath-posix" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hpath-filepath + , IfElse, safe-exceptions, streamly, streamly-bytestring, time + , unix, unix-bytestring, utf8-string + }: + mkDerivation { + pname = "hpath-posix"; + version = "0.13.0"; + sha256 = "1008rwl379wfnynbbi7jym46hl3zalz3bla0zc0wndzid42sf4wl"; + libraryHaskellDepends = [ + base bytestring exceptions hpath-filepath IfElse safe-exceptions + streamly streamly-bytestring time unix unix-bytestring utf8-string + ]; + description = "Some low-level POSIX glue code, that is not in 'unix'"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hpc_0_6_0_3" = callPackage ({ mkDerivation, base, containers, directory, filepath, time }: mkDerivation { @@ -126261,17 +126608,6 @@ self: { }) {inherit (pkgs) fltk; fltk_images = null;}; "hs-functors" = callPackage - ({ mkDerivation, base, tagged, transformers }: - mkDerivation { - pname = "hs-functors"; - version = "0.1.5.0"; - sha256 = "19mfp7vvyh65jg186kd65ycrhljb0l45a32lw92dvcdx8nbqsb7j"; - libraryHaskellDepends = [ base tagged transformers ]; - description = "Functors from products of Haskell and its dual to Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hs-functors_0_1_6_0" = callPackage ({ mkDerivation, base, tagged, transformers }: mkDerivation { pname = "hs-functors"; @@ -126280,7 +126616,6 @@ self: { libraryHaskellDepends = [ base tagged transformers ]; description = "Functors from products of Haskell and its dual to Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-gchart" = callPackage @@ -131752,27 +132087,6 @@ self: { }) {}; "http-directory" = callPackage - ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client - , http-client-tls, http-date, http-types, text, time, xml-conduit - }: - mkDerivation { - pname = "http-directory"; - version = "0.1.5"; - sha256 = "075crysy7avf97vlskwlk8813q2bnqw9p3q29c5yb2yhmykrpwyn"; - revision = "1"; - editedCabalFile = "0ynm88f9v3h5dlyf2kzydqwr2l90gwjysffr6gbnlyqw9x46pb04"; - libraryHaskellDepends = [ - base bytestring html-conduit http-client http-client-tls http-date - http-types text time xml-conduit - ]; - testHaskellDepends = [ base hspec ]; - description = "http directory listing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "http-directory_0_1_7" = callPackage ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client , http-client-tls, http-date, http-types, network-uri, text, time , xml-conduit @@ -132256,40 +132570,6 @@ self: { }) {}; "http-streams" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, Cabal - , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec - , hspec-expectations, http-common, HUnit, io-streams, lifted-base - , mtl, network, network-uri, openssl-streams, snap-core - , snap-server, system-fileio, system-filepath, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.6.1"; - sha256 = "18vxd35n7s3z4gjvad94bknc8z1w9d7ccgphnhsxlz5cackizmxq"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory HsOpenSSL http-common io-streams mtl - network network-uri openssl-streams text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams lifted-base mtl - network network-uri openssl-streams snap-core snap-server - system-fileio system-filepath text transformers - unordered-containers - ]; - description = "An HTTP client using io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "http-streams_0_8_7_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, blaze-builder, bytestring, case-insensitive , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations @@ -133751,32 +134031,6 @@ self: { }) {}; "hw-excess" = callPackage - ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec - , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, QuickCheck, safe, vector - }: - mkDerivation { - pname = "hw-excess"; - version = "0.2.2.1"; - sha256 = "1n4qgnwf61gdwai163sqkc4lzhni65f94r5hcmq0im502596iy9b"; - libraryHaskellDepends = [ - base hw-bits hw-prim hw-rankselect-base safe vector - ]; - testHaskellDepends = [ - base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck - vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion hw-prim vector - ]; - description = "Excess"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-excess_0_2_2_2" = callPackage ({ mkDerivation, base, bytestring, criterion, doctest , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, QuickCheck, safe @@ -137631,34 +137885,31 @@ self: { "implicit" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg - , bytestring, bytestring-builder, containers, criterion, deepseq - , directory, filepath, hspec, JuicyPixels, monads-tf, mtl - , NumInstances, optparse-applicative, parallel, parsec, random - , silently, snap-core, snap-server, storable-endian, text - , transformers, unordered-containers, vector-space + , bytestring, containers, criterion, deepseq, directory, filepath + , hspec, JuicyPixels, monads-tf, optparse-applicative, parallel + , parsec, snap-core, snap-server, storable-endian, text + , transformers, vector-space }: mkDerivation { pname = "implicit"; - version = "0.2.0"; - sha256 = "1lj206x2s7sdjg6yllhp809d7k84xa6ky70859jyw4m6bry4xyaw"; + version = "0.3.0.1"; + sha256 = "190493di4n0j9yii02jb808k97a9avg5qlxx6gydhw0qmjijh11n"; + revision = "1"; + editedCabalFile = "1jqi3wxxwyzjdl0ygpn1qkg549wrnxj90pfhhl9m7rhb665pi0v4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-builder blaze-markup blaze-svg bytestring - bytestring-builder containers criterion deepseq directory filepath - hspec JuicyPixels monads-tf NumInstances parallel parsec silently - snap-core snap-server storable-endian text transformers - unordered-containers vector-space + base blaze-builder blaze-markup blaze-svg bytestring containers + deepseq directory filepath hspec JuicyPixels monads-tf parallel + parsec storable-endian text transformers vector-space ]; executableHaskellDepends = [ - base blaze-builder blaze-markup blaze-svg bytestring containers - criterion deepseq directory filepath JuicyPixels monads-tf - optparse-applicative parallel parsec silently snap-core snap-server - storable-endian text transformers vector-space + base bytestring criterion filepath optparse-applicative snap-core + snap-server text vector-space ]; - testHaskellDepends = [ base containers hspec mtl parsec ]; - benchmarkHaskellDepends = [ base criterion parsec random ]; - description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.."; + testHaskellDepends = [ base hspec parsec ]; + benchmarkHaskellDepends = [ base criterion parsec ]; + description = "A math-inspired programmatic 2D & 3D CAD system"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -138771,14 +139022,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "inline-c-cpp_0_4_0_1" = callPackage + "inline-c-cpp_0_4_0_2" = callPackage ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions , template-haskell }: mkDerivation { pname = "inline-c-cpp"; - version = "0.4.0.1"; - sha256 = "1bsmm6sqxjzlk6mdq5a8vwsc1cy0ag0lvajdpsbqq7vradj54yqq"; + version = "0.4.0.2"; + sha256 = "0nb7n2q47jbny7rj9y1hn6lnailnmpy4y7j6jaalny123kxsdipp"; libraryHaskellDepends = [ base containers inline-c safe-exceptions template-haskell ]; @@ -139287,8 +139538,8 @@ self: { pname = "integer-logarithms"; version = "1.0.3"; sha256 = "05pc5hws66csvcvfswlwcr2fplwn1lbssvwifjxkbbwqhq0n5qjs"; - revision = "1"; - editedCabalFile = "1z6z63jr42jn073fd9ns7jcrw7n5lwx076q4b5rgzak7q1ixw2i8"; + revision = "2"; + editedCabalFile = "0a6j3313vz7n7dn8abddyib4jggblaq89f87ib4imdwjxjajbm33"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -139801,15 +140052,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "intervals_0_9" = callPackage + "intervals_0_9_1" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, directory , distributive, doctest, filepath, ghc-prim, QuickCheck , template-haskell }: mkDerivation { pname = "intervals"; - version = "0.9"; - sha256 = "0v5z5h0lcsfxiz5m876b1pwygxic5l5p0ijnhzibbpzpqg1lahs4"; + version = "0.9.1"; + sha256 = "1s9pj2dah94smq769q4annxv2grdx376wvhzl4rsq85kjppf5a6z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -143026,8 +143277,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "joint"; - version = "0.1.4"; - sha256 = "1q1fsi5c5mzdvy7sg0abgbivmgg8dr2whxsyfhm20dy6z1hqav65"; + version = "0.1.5"; + sha256 = "065n7na9064l50xsh1lf4qkzpa7360can0axncl49d6gcxk1gh1i"; libraryHaskellDepends = [ base ]; description = "Trying to compose non-composable"; license = stdenv.lib.licenses.bsd3; @@ -143482,10 +143733,8 @@ self: { }: mkDerivation { pname = "json-api-lib"; - version = "0.1.1.1"; - sha256 = "096n08y80rkjn090w9pybwbfbwamfdig451nbgd48x0nrk6c091n"; - revision = "1"; - editedCabalFile = "1imz33mc4216qznvqdnh1j3wlifxnim4mhbl7d5zpinri4y0v2yd"; + version = "0.1.2.0"; + sha256 = "0qq34fw7b6kv4ywv7bzpsahn7b8mdn42cwwkhgqazsdf7wx72qqy"; libraryHaskellDepends = [ aeson base containers data-default lens lens-aeson text unordered-containers uri-encode @@ -145160,6 +145409,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kanji_3_4_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion + , deepseq, hashable, HUnit-approx, microlens, microlens-aeson + , optparse-applicative, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "kanji"; + version = "3.4.1"; + sha256 = "1pgzmwn738yl2ac7al0fzr8cabp8gh1qzbhhi0ylxy4x6s90ll2r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers deepseq hashable text + ]; + executableHaskellDepends = [ + aeson aeson-pretty base containers microlens microlens-aeson + optparse-applicative text transformers + ]; + testHaskellDepends = [ + aeson base containers HUnit-approx tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ aeson base containers criterion text ]; + description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kansas-comet" = callPackage ({ mkDerivation, aeson, base, containers, data-default-class , scotty, stm, text, time, transformers, unordered-containers @@ -145168,8 +145444,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "17"; - editedCabalFile = "1qnjg28rkwxwn2f8xisbx4f8pqxw2d70mczrjbrbyvx6gkdqzvri"; + revision = "18"; + editedCabalFile = "0yxgndvrashc0cp3zv39gjrzw7p53g0k51p13q67nqnpxhh05w2k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -146355,6 +146631,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keys_3_12_3" = callPackage + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "keys"; + version = "3.12.3"; + sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; + libraryHaskellDepends = [ + array base comonad containers free hashable semigroupoids + semigroups tagged transformers transformers-compat + unordered-containers + ]; + description = "Keyed functors and containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "keysafe" = callPackage ({ mkDerivation, aeson, argon2, async, base, bloomfilter , bytestring, containers, deepseq, directory, disk-free-space @@ -147444,6 +147739,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_1_0_11" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "1.0.11"; + sha256 = "0sch6xpmkb3941bfv7g3qjvgsm9z74ra4z24y22j8w264naag601"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -149351,6 +149659,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-puppet_1_4_6_2" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filecache, filepath, formatting, Glob + , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data + , http-client, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parsec, parser-combinators + , pcre-utils, protolude, random, regex-pcre-builtin, scientific + , servant, servant-client, split, stm, strict-base-types, temporary + , text, time, transformers, unix, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.4.6.2"; + sha256 = "07rv00rpxza9pg0jg19bh5pnk065mxadb7qcxw5i822ad22b85yn"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory filecache filepath + formatting hashable hruby hslogger http-api-data http-client lens + lens-aeson megaparsec memory mtl operational parsec + parser-combinators pcre-utils protolude random regex-pcre-builtin + scientific servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring containers Glob hslogger + http-client lens mtl optparse-applicative regex-pcre-builtin + strict-base-types text transformers unordered-containers vector + yaml + ]; + testHaskellDepends = [ + base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl + pcre-utils scientific strict-base-types temporary text transformers + unordered-containers vector + ]; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -152344,6 +152696,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "libmpd_0_9_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default-class, filepath, hspec, mtl, network, old-locale + , QuickCheck, safe-exceptions, text, time, unix, utf8-string + }: + mkDerivation { + pname = "libmpd"; + version = "0.9.1.0"; + sha256 = "1f1svf4dxpbqmxkq1nc11nyfm68wrh00v2wf68yzfwc6win2jhfr"; + libraryHaskellDepends = [ + attoparsec base bytestring containers data-default-class filepath + mtl network old-locale safe-exceptions text time utf8-string + ]; + testHaskellDepends = [ + attoparsec base bytestring containers data-default-class filepath + hspec mtl network old-locale QuickCheck safe-exceptions text time + unix utf8-string + ]; + description = "An MPD client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "libnix" = callPackage ({ mkDerivation, aeson, base, directory, errors, filepath, process , protolude, tasty, tasty-hunit, text @@ -153173,8 +153548,8 @@ self: { }: mkDerivation { pname = "lightstep-haskell"; - version = "0.5.1"; - sha256 = "1limzjjjxf6mnd7lgsjbr9hwgzyxjmmy5r9h6ia0rwjaxn42bai4"; + version = "0.5.2"; + sha256 = "0j4dlvw4hhbawwfaxfqmh2bmhqha7902rainvbwi1xw2v73pqwdg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155130,22 +155505,20 @@ self: { "llvm-extra" = callPackage ({ mkDerivation, base, bool8, containers, enumset, llvm-tf - , non-empty, prelude-compat, QuickCheck, storable-enum - , storable-tuple, tagged, tfp, transformers, utility-ht + , non-empty, prelude-compat, QuickCheck, storable-enum, tagged, tfp + , transformers, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.9"; - sha256 = "1hmzfqslklgr7xq3fjl88sx2zhjga3m2bm504nh1wwdf1c7y8p3m"; + version = "0.9.1"; + sha256 = "0wxs8ki3l5fyijdv7z0xyrikx4whazyxv69ly0x98ag25l5fxwyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bool8 containers enumset llvm-tf non-empty prelude-compat storable-enum tagged tfp transformers utility-ht ]; - testHaskellDepends = [ - base llvm-tf QuickCheck storable-tuple tfp utility-ht - ]; + testHaskellDepends = [ base llvm-tf QuickCheck tfp utility-ht ]; doHaddock = false; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -155157,8 +155530,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "9.0.0"; - sha256 = "100cgwmfasf5l7bh55c0ihaaaqh05s8wwz3kyzajdr5hnfxjy2lm"; + version = "9.1.0"; + sha256 = "1nfgh56wrlw13w0an9vyp78ahz2lp0yy0v7yqh1zr22a0mnwnq3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -155467,8 +155840,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "9.0"; - sha256 = "18pkaa8hkrz96nn1jy8kzfcwkz9vyisjnl1fh8x1kiknqyq14jwa"; + version = "9.1"; + sha256 = "1vl7wflgyplw9w8xnryccp263lkzmydrylzvadrll9yzs0jg7p8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156154,26 +156527,26 @@ self: { ({ mkDerivation, aeson, aeson-qq, base, bytestring, containers , criterion, data-default, directory, filepath, generic-lens, hspec , hspec-core, lens, mtl, process, QuickCheck, template-haskell - , text, time, vformat, vformat-time, yaml + , text, time, vformat, vformat-aeson, vformat-time, yaml }: mkDerivation { pname = "log4hs"; - version = "0.7.0.0"; - sha256 = "06dcnhxfy18r3jrfdsklsiqcn2zmh9pxfra1ayhrl1mljj44dmd9"; + version = "0.8.0.0"; + sha256 = "15a3xz9bg29ci4yfxmn7dhnblz48cf7ijl27fvqgr8j4b3m8z4hn"; libraryHaskellDepends = [ aeson base bytestring containers data-default directory filepath generic-lens lens mtl template-haskell text time vformat - vformat-time yaml + vformat-aeson vformat-time yaml ]; testHaskellDepends = [ aeson aeson-qq base bytestring containers data-default directory filepath generic-lens hspec hspec-core lens mtl process QuickCheck - template-haskell text time vformat vformat-time yaml + template-haskell text time vformat vformat-aeson vformat-time yaml ]; benchmarkHaskellDepends = [ aeson aeson-qq base bytestring containers criterion data-default directory filepath generic-lens lens mtl template-haskell text time - vformat vformat-time yaml + vformat vformat-aeson vformat-time yaml ]; description = "A python logging style log library"; license = stdenv.lib.licenses.bsd3; @@ -156289,6 +156662,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_3_9" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , prettyprinter, semigroups, stm, stm-delay, text, time + , transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "logging-effect"; + version = "1.3.9"; + sha256 = "18g0yw5k0xcpiz3chag61smjc9fi4iy99sv9sqhq8f2v61p355dr"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl prettyprinter + semigroups stm stm-delay text time transformers transformers-base + unliftio-core + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + prettyprinter text time + ]; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, prettyprinter @@ -158991,17 +159388,6 @@ self: { }) {}; "managed" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "managed"; - version = "1.0.6"; - sha256 = "1kbrw99yh5x5blykmx2n88mplbbi4ss1ij5j17b7asw6q0ihm9zi"; - libraryHaskellDepends = [ base transformers ]; - description = "A monad for managed values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "managed_1_0_7" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; @@ -159010,7 +159396,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee" = callPackage @@ -159635,24 +160020,23 @@ self: { }) {}; "mapalgebra" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, deepseq, hmatrix, HUnit-approx, massiv, massiv-io - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , hmatrix, HUnit-approx, massiv, massiv-io, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, vector }: mkDerivation { pname = "mapalgebra"; - version = "0.1.2"; - sha256 = "191f8ipm12c270nhwa7g4ibadnajj8pys8q0vjc5l7f0s9m4g8ak"; + version = "0.2.0"; + sha256 = "1bz4dg7wh66zpghsdb7d7hdqj5413005m3mcfb73gl7xncf21mk5"; libraryHaskellDepends = [ - base bytestring containers data-default deepseq hmatrix massiv - massiv-io vector + base bytestring containers deepseq hmatrix massiv massiv-io vector ]; testHaskellDepends = [ - base containers hmatrix HUnit-approx massiv massiv-io QuickCheck - tasty tasty-hunit tasty-quickcheck vector + base containers hmatrix HUnit-approx massiv QuickCheck tasty + tasty-hunit tasty-quickcheck vector ]; benchmarkHaskellDepends = [ - base containers criterion hmatrix massiv massiv-io vector + base criterion hmatrix massiv massiv-io vector ]; description = "Efficient, polymorphic Map Algebra"; license = stdenv.lib.licenses.bsd3; @@ -160191,31 +160575,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest - , data-default-class, deepseq, doctest, exceptions - , mersenne-random-pure64, primitive, QuickCheck, random, scheduler - , splitmix, template-haskell, unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.4.4.0"; - sha256 = "13hwf1z9iqybrjsn21gkglqq3knin6x84rflv3wk6wplk7dfhd2n"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector - ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 QuickCheck random splitmix - template-haskell - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv_0_4_5_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -160279,29 +160638,6 @@ self: { }) {}; "massiv-test" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default - , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec - , massiv, primitive, QuickCheck, scheduler, unliftio, vector - }: - mkDerivation { - pname = "massiv-test"; - version = "0.1.1"; - sha256 = "0fz3bf0lmwhzbxwpfschwk4yn3dzr5p542dqkvkbdmlx97spm1vi"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions hspec massiv - primitive QuickCheck scheduler unliftio vector - ]; - testHaskellDepends = [ - base bytestring containers data-default deepseq genvalidity-hspec - hspec massiv QuickCheck scheduler vector - ]; - description = "Library that contains generators, properties and tests for Massiv Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv-test_0_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec , massiv, primitive, QuickCheck, scheduler, unliftio, vector @@ -163010,14 +163346,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-ghc_0_4_11_1" = callPackage + "microlens-ghc_0_4_12" = callPackage ({ mkDerivation, array, base, bytestring, containers, microlens , transformers }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.11.1"; - sha256 = "19h3rgh3xhp7zgnhpqhpihca05s69mimzkx0sh30lg96p99wx69r"; + version = "0.4.12"; + sha256 = "07qh66alv00jz4l3w80km8grym6sk36c5kx5jfaya20irq91ni1b"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -163075,14 +163411,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-platform_0_4_0" = callPackage + "microlens-platform_0_4_1" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: mkDerivation { pname = "microlens-platform"; - version = "0.4.0"; - sha256 = "0q90qsrcr6pa0nvzk46573ykxrf21lr4xm0jp5sp5pd30kx21fmx"; + version = "0.4.1"; + sha256 = "0zlijw6ib9zf15n750qz6jlvj9l6sdf0d29w8nkflr2bspbvxn03"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -163128,14 +163464,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-th_0_4_3_2" = callPackage + "microlens-th_0_4_3_4" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell , th-abstraction, transformers }: mkDerivation { pname = "microlens-th"; - version = "0.4.3.2"; - sha256 = "0wz27ir4fs4231a20iiy2ghnyyg4qd75h45k6602017pww1hv44x"; + version = "0.4.3.4"; + sha256 = "08cixz1840ycc1y2b8anf1pqzlhnh89i6wskixd5s5brf8jl0l79"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -164855,8 +165191,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.6.1.0"; - sha256 = "0gjcfv60wapq3cwxic0p8kp9nm1jh67br8sdqh35dh6ycc9c77fi"; + version = "0.7.2.0"; + sha256 = "10mmc9gaq4wg9ixs1fwi7ga41lpiih5xx2w278fv6nli0p7flx3j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164874,18 +165210,16 @@ self: { }) {}; "mmsyn7l" = callPackage - ({ mkDerivation, base, directory, mmsyn2, mmsyn7ukr, vector }: + ({ mkDerivation, base, mmsyn2, mmsyn7ukr, vector }: mkDerivation { pname = "mmsyn7l"; - version = "0.2.3.0"; - sha256 = "1i9va9ynk4iihvgm5ivdf9pnjc7md2crdfkyww3a709ff416v60x"; + version = "0.3.2.0"; + sha256 = "0h3j7y6k9zagw0djj8hrnlhfdqg60hb52h9xb3ni326ijshw2qil"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base directory mmsyn2 mmsyn7ukr vector ]; - executableHaskellDepends = [ - base directory mmsyn2 mmsyn7ukr vector - ]; - description = "Modifies the amplitude of the sound representations for the Ukrainian language created by mmsyn7ukr package"; + libraryHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ]; + executableHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ]; + description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -164913,8 +165247,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.9.3.0"; - sha256 = "1qqr5zkzs03bhj6gmld60j5sxrhw2myiy8aip4svs2xyz3f8wp04"; + version = "0.12.0.4"; + sha256 = "0516d16g28wpyz52962zbvljmh59k1h8ncrav26a3hz1x6ifgg01"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165048,17 +165382,18 @@ self: { "mod" = callPackage ({ mkDerivation, base, deepseq, integer-gmp, quickcheck-classes - , quickcheck-classes-base, semirings, tasty, tasty-quickcheck + , quickcheck-classes-base, semirings, tasty, tasty-quickcheck, time }: mkDerivation { pname = "mod"; - version = "0.1.0.0"; - sha256 = "10cvd4275jzd8h1f227nivbvf52kbk0hn00zwrb1hmrgif6a31gd"; + version = "0.1.1.0"; + sha256 = "03v942bd1hqcvikg71639f1p4s2zrx3zpf1yhwfrkl22c62cy99k"; libraryHaskellDepends = [ base deepseq integer-gmp semirings ]; testHaskellDepends = [ base quickcheck-classes quickcheck-classes-base semirings tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base time ]; description = "Fast type-safe modular arithmetic"; license = stdenv.lib.licenses.mit; }) {}; @@ -170476,6 +170811,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability_2_2_0" = callPackage + ({ mkDerivation, base, containers, mwc-random, primitive + , transformers + }: + mkDerivation { + pname = "mwc-probability"; + version = "2.2.0"; + sha256 = "11zfchdsipfik1vrrx53d8h1j6b8lzrndwnnyvcnz1dqlz0dgqdz"; + libraryHaskellDepends = [ + base containers mwc-random primitive transformers + ]; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-probability-transition" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hspec, logging-effect , mtl, mwc-probability, primitive, QuickCheck, transformers @@ -171027,15 +171378,18 @@ self: { }) {}; "n-ary-functor" = callPackage - ({ mkDerivation, base, doctest, doctest-discover }: + ({ mkDerivation, base, Cabal, cabal-doctest, doctest + , natural-transformation, transformers + }: mkDerivation { pname = "n-ary-functor"; - version = "0.1.0.0"; - sha256 = "1v1ki6mfgj7jhj7w94w15sisd57akwlb0c2s3bczvj47f7f8p7vi"; - revision = "1"; - editedCabalFile = "1pnl2kx406l99icyii50mr3vdaa6hxcsbgh37sh43my3l5dkfl57"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest doctest-discover ]; + version = "1.0"; + sha256 = "18ny8fvg9cz4l6zvrvw0jcjbkp7x75h3cl3p20chlqhnl3m17zlx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base natural-transformation transformers + ]; + testHaskellDepends = [ base doctest ]; description = "An n-ary version of Functor"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -172420,22 +172774,24 @@ self: { }) {}; "net-spider" = callPackage - ({ mkDerivation, aeson, base, containers, data-interval, doctest - , doctest-discover, extended-reals, greskell, greskell-websocket - , hashable, hspec, monad-logger, safe-exceptions, scientific, text - , time, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, containers, data-interval + , doctest, doctest-discover, extended-reals, greskell + , greskell-websocket, hashable, hspec, monad-logger + , regex-applicative, safe-exceptions, scientific, text, time + , unordered-containers, vector }: mkDerivation { pname = "net-spider"; - version = "0.4.0.1"; - sha256 = "0fzxyg4bypbarzizn3cb6g9ywvqqsl0i32mxcwn2ki9ihlp20601"; + version = "0.4.1.0"; + sha256 = "09ww6ya4h7j8vd9j18492qx6x0y1aqmis271smrb45mylj4hsaqb"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell - greskell-websocket hashable monad-logger safe-exceptions scientific - text time unordered-containers vector + greskell-websocket hashable monad-logger regex-applicative + safe-exceptions scientific text time unordered-containers vector ]; testHaskellDepends = [ - aeson base doctest doctest-discover hspec text vector + aeson base bytestring doctest doctest-discover hspec text time + vector ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; @@ -172488,18 +172844,19 @@ self: { "net-spider-rpl" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, conduit-parse , fast-logger, greskell, hashable, hspec, ip, monad-logger, mtl - , net-spider, safe-exceptions, text, time + , net-spider, regex-applicative, safe-exceptions, text, time }: mkDerivation { pname = "net-spider-rpl"; - version = "0.4.0.1"; - sha256 = "117ymh7sbaf2d3hivcm0c9xczxb2sgs0gggyk9fv4zpk32pywhlm"; + version = "0.4.1.0"; + sha256 = "0j0w1sgr1b0vn5249agz94vlz1az9pfi8fswd72s84lpcn9jyw89"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger - mtl net-spider safe-exceptions text time + mtl net-spider regex-applicative safe-exceptions text time ]; testHaskellDepends = [ - base bytestring fast-logger hspec ip monad-logger net-spider text + aeson base bytestring fast-logger hspec ip monad-logger net-spider + text ]; description = "NetSpider data model and utility for RPL networks"; license = stdenv.lib.licenses.bsd3; @@ -173246,18 +173603,6 @@ self: { }) {}; "network-byte-order" = callPackage - ({ mkDerivation, base, bytestring, doctest }: - mkDerivation { - pname = "network-byte-order"; - version = "0.1.2.0"; - sha256 = "1y2azf5zbydzvi4b0hxmy7am4kgpkq8ajnsbrpfrqz87b5y87ccy"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring doctest ]; - description = "Network byte order utilities"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-byte-order_0_1_3_0" = callPackage ({ mkDerivation, base, bytestring, doctest }: mkDerivation { pname = "network-byte-order"; @@ -173267,7 +173612,6 @@ self: { testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bytestring" = callPackage @@ -174073,6 +174417,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-uri_2_7_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, HUnit, parsec + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "network-uri"; + version = "2.7.0.0"; + sha256 = "0sgqw1bi6dv28a3cw2kjxiy1sfjjfwdk5ikmnk1v828inlk7zwgz"; + libraryHaskellDepends = [ base deepseq parsec template-haskell ]; + testHaskellDepends = [ + base criterion deepseq HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "URI manipulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-uri-flag" = callPackage ({ mkDerivation, network, network-uri }: mkDerivation { @@ -174987,6 +175350,33 @@ self: { license = "GPL"; }) {}; + "nix-freeze-tree" = callPackage + ({ mkDerivation, base, binary, bytestring, data-fix, directory + , directory-tree, hnix, hnix-store-core, HUnit + , optparse-applicative, path, prettyprinter, raw-strings-qq, tasty + , tasty-discover, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "nix-freeze-tree"; + version = "0.1.0.0"; + sha256 = "06l323g6qx87lbs9hbmnjr0b40f548w8496p7pihxrla1kb2v31x"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-fix directory directory-tree hnix + hnix-store-core optparse-applicative path prettyprinter + raw-strings-qq text transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit optparse-applicative tasty tasty-discover tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Convert a tree of files into fixed-output derivations"; + license = stdenv.lib.licenses.agpl3Plus; + }) {}; + "nix-paths" = callPackage ({ mkDerivation, base, nix, process }: mkDerivation { @@ -177579,10 +177969,8 @@ self: { }: mkDerivation { pname = "oeis"; - version = "0.3.9"; - sha256 = "13hv0qal024jq52k1rgy3hd9h9s8labkcngr0zk8jpcgi45jqsca"; - revision = "1"; - editedCabalFile = "0rb6l3qblay8aiwaznp35gj7vwmhm87y57wvf3babwrh91s88jaj"; + version = "0.3.10"; + sha256 = "0aa5i0328k8pf0y439b95c3ipv70lfabvv55jp64pwb9kx6p5ymv"; libraryHaskellDepends = [ base HTTP network network-uri ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -177707,8 +178095,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.4.0.1"; - sha256 = "0761m8yi8yrqspf9hig6pbdzchz8nvc9qn995wz4v0wklcypiagr"; + version = "0.5.0.0"; + sha256 = "09ykb49qzg0hpkjgylmilvy9dkcsxlv1lxrp0mwqamq4vxkm2wz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178889,6 +179277,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opentelemetry" = callPackage + ({ mkDerivation, async, base, clock, exceptions, hashable, random + , tasty, tasty-discover, tasty-quickcheck, text + , unordered-containers + }: + mkDerivation { + pname = "opentelemetry"; + version = "0.0.0.0"; + sha256 = "14k1lskdan3p7pddch9h0vr56ksyb4vnkm79rn4nlv4m9ycbxs7l"; + libraryHaskellDepends = [ + base clock exceptions hashable random text unordered-containers + ]; + testHaskellDepends = [ + async base tasty tasty-discover tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + license = stdenv.lib.licenses.asl20; + }) {}; + + "opentelemetry-lightstep" = callPackage + ({ mkDerivation, async, base, exceptions, http-types, http2 + , http2-client, http2-client-grpc, http2-grpc-proto-lens, lens, mtl + , network, opentelemetry, proto-lens, proto-lens-protobuf-types + , proto-lens-runtime, text, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-lightstep"; + version = "0.0.0.0"; + sha256 = "1nnpis5ka6fgf0vmvcf68zqnjw69pvs91qm6slsgv58aww6fn9a2"; + libraryHaskellDepends = [ + base exceptions http-types http2 http2-client http2-client-grpc + http2-grpc-proto-lens lens mtl network opentelemetry proto-lens + proto-lens-protobuf-types proto-lens-runtime text + unordered-containers + ]; + testHaskellDepends = [ async base opentelemetry ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -181301,6 +181730,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pandoc-csv2table_1_0_8" = callPackage + ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: + mkDerivation { + pname = "pandoc-csv2table"; + version = "1.0.8"; + sha256 = "0sf0af2cx5fi3a2iixkjjdpzp0153hxsjzs5wwqssby39g7s24gb"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; + executableHaskellDepends = [ base csv pandoc pandoc-types ]; + description = "Convert CSV to Pandoc Table Markdown"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-emphasize-code" = callPackage ({ mkDerivation, base, filepath, hashable, lucid, mtl, pandoc-types , process, semigroups, tasty, tasty-discover, tasty-hspec @@ -183638,6 +184083,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "password_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, doctest, QuickCheck + , quickcheck-instances, scrypt, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "password"; + version = "1.0.0.0"; + sha256 = "08igga8jd7g0lnakmn8lq7ssyqwkknp0lbnlhbq4qwin9n8pzl0c"; + libraryHaskellDepends = [ base scrypt text ]; + testHaskellDepends = [ + base bytestring doctest QuickCheck quickcheck-instances scrypt + tasty tasty-quickcheck text + ]; + description = "plain-text password and hashed password datatypes and functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "password-instances" = callPackage ({ mkDerivation, aeson, base, doctest, http-api-data, password , persistent, QuickCheck, quickcheck-instances @@ -183656,6 +184119,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "password-instances_1_0_0_0" = callPackage + ({ mkDerivation, aeson, base, doctest, http-api-data, password + , persistent, QuickCheck, quickcheck-instances + }: + mkDerivation { + pname = "password-instances"; + version = "1.0.0.0"; + sha256 = "0i87ij207i4zvmgji457dimhpmy8hs7ddwpqr86riyscdvzvml91"; + libraryHaskellDepends = [ + aeson base http-api-data password persistent + ]; + testHaskellDepends = [ + base doctest QuickCheck quickcheck-instances + ]; + description = "typeclass instances for password package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "passwords" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -183994,6 +184476,17 @@ self: { broken = true; }) {}; + "pathological-bytestrings" = callPackage + ({ mkDerivation, base, bytestring, random }: + mkDerivation { + pname = "pathological-bytestrings"; + version = "0.1.0.0"; + sha256 = "04877061vp9fv5qd0cdazmn8dd1l0zsqpxvw1awvbzjyfzl31k1y"; + libraryHaskellDepends = [ base bytestring random ]; + description = "Pathological ByteStrings for testing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "paths" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , template-haskell, text, time @@ -185130,17 +185623,17 @@ self: { "perceptual-hash" = callPackage ({ mkDerivation, base, containers, cpphs, criterion, deepseq , filepath, hip, hspec, optparse-applicative, par-traverse - , primitive, repa, stm, vector, vector-algorithms + , primitive, stm, vector, vector-algorithms }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.3.2"; - sha256 = "0nmky6x40wcc9b3n9ijjw8ynbwmpqa4gb26mqzi6dxn298bgm12g"; + version = "0.1.3.3"; + sha256 = "15f36b1xv5lq7gw7nd10mmhfyi935v07rdq04vzl2msdd6cn0j3d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base hip primitive repa vector vector-algorithms + base hip primitive vector vector-algorithms ]; executableHaskellDepends = [ base containers filepath optparse-applicative par-traverse stm @@ -185590,7 +186083,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_10_4" = callPackage + "persistent_2_10_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, fast-logger, hspec , http-api-data, monad-logger, mtl, path-pieces, resource-pool @@ -185600,8 +186093,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.10.4"; - sha256 = "1cxswz72sqdg2z1nbpgp1k5qr41djgk8qbf8nz7wfppsrhacyffi"; + version = "2.10.5"; + sha256 = "1xrfl7yrjppgbyw5msiayn54k3my4wh77pgmlv3kmp5vybhbfjzj"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data monad-logger mtl @@ -185985,6 +186478,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent-pagination_0_1_1_1" = callPackage + ({ mkDerivation, base, conduit, containers, esqueleto, foldl, hspec + , hspec-discover, microlens, mtl, persistent, persistent-sqlite + , persistent-template, QuickCheck, time + }: + mkDerivation { + pname = "persistent-pagination"; + version = "0.1.1.1"; + sha256 = "03rxynxj2xx25l1zy42f06649m57blpx4inadb2a4dgz62zzyk5q"; + libraryHaskellDepends = [ + base conduit esqueleto foldl microlens mtl persistent + ]; + testHaskellDepends = [ + base conduit containers esqueleto hspec hspec-discover mtl + persistent persistent-sqlite persistent-template QuickCheck time + ]; + testToolDepends = [ hspec-discover ]; + description = "Efficient and correct pagination for persistent or esqueleto queries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-parser" = callPackage ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { @@ -186258,7 +186773,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; - "persistent-sqlite_2_10_5_2" = callPackage + "persistent-sqlite_2_10_6_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger , persistent, persistent-template, persistent-test, QuickCheck @@ -186268,8 +186783,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.10.5.2"; - sha256 = "0agag3cgivl6mk38pqzr0qw5lxps9p2bgdwvi5658l46hs7bixxn"; + version = "2.10.6.1"; + sha256 = "0s6zfqs7s8kpswicsbf8bwn1c5wg3jh2nl8nd7z9lk7h46ba0387"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -186316,7 +186831,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_8_0_1" = callPackage + "persistent-template_2_8_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data , monad-control, monad-logger, path-pieces, persistent, QuickCheck @@ -186325,8 +186840,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.8.0.1"; - sha256 = "0chgzq70ss8b9hkq0v6zi2kdqsbj3xxcl485ajmwrxclkz1f8c3n"; + version = "2.8.2.1"; + sha256 = "1w39n6164l99k1p8fk5c9aawbps6p3cmi4xgn123qmcmc1cw0nrj"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -190100,6 +190615,8 @@ self: { pname = "pointfree-fancy"; version = "1.1.1.15"; sha256 = "1jbxgn4raa5zzy5riflvx1sch6ar78fi84yf0ag86yxda3lh70qd"; + revision = "1"; + editedCabalFile = "1hk3558yviij4d4x93h253x7rpqmnjj7imgydgllgi7xa0jzwknc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190300,6 +190817,31 @@ self: { broken = true; }) {}; + "policeman" = callPackage + ({ mkDerivation, ansi-terminal, base, Cabal, containers + , dir-traverse, directory, filepath, ghc, gitrev, hedgehog, hspec + , mtl, optparse-applicative, relude, shellmet, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "policeman"; + version = "0.0.0.0"; + sha256 = "1klrqj70pmar8z6yki1aq62zqs2fyrwshr24ryi94x8ndf919zd3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base Cabal containers dir-traverse directory filepath + ghc gitrev mtl optparse-applicative relude shellmet text + transformers unordered-containers + ]; + executableHaskellDepends = [ base relude ]; + testHaskellDepends = [ + base Cabal directory filepath hedgehog hspec relude text + ]; + description = "Haskell PVP version adviser"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "polimorf" = callPackage ({ mkDerivation, base, binary, containers, text }: mkDerivation { @@ -193617,6 +194159,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pretty-show_1_10" = callPackage + ({ mkDerivation, array, base, filepath, ghc-prim, happy + , haskell-lexer, pretty, text + }: + mkDerivation { + pname = "pretty-show"; + version = "1.10"; + sha256 = "1lkgvbv00v1amvpqli6y4dzsbs25l4v3wlagvhwx8qxhw2390zrh"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base filepath ghc-prim haskell-lexer pretty text + ]; + libraryToolDepends = [ happy ]; + executableHaskellDepends = [ base ]; + description = "Tools for working with derived `Show` instances and generic inspection of values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-show-ansi-wl" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, ghc-prim, happy , haskell-lexer @@ -195584,8 +196147,8 @@ self: { }: mkDerivation { pname = "prometheus-metrics-ghc"; - version = "1.0.0"; - sha256 = "15zzj9dy9kfvkcypgnvh8xa6xsx0489ck8f30bm8958qp0za145z"; + version = "1.0.1"; + sha256 = "18816z271daza8yl6sqagv4y26f977d66s26kvjq680pykcflxwx"; libraryHaskellDepends = [ base prometheus-client text utf8-string ]; @@ -197327,6 +197890,27 @@ self: { broken = true; }) {}; + "purescheme-wai-routing-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-media, http-types + , interpolate, text, wai, warp + }: + mkDerivation { + pname = "purescheme-wai-routing-core"; + version = "0.1.0.0"; + sha256 = "18ngmq6yb3l1ywigl38jm2x6wi097wjdym5z3hh5qkjndcygkjji"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-media http-types interpolate text wai + ]; + executableHaskellDepends = [ + aeson base bytestring http-types text wai warp + ]; + testHaskellDepends = [ base ]; + description = "Simple Routing functions for Wai Applications"; + license = stdenv.lib.licenses.asl20; + }) {}; + "purescript" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty , ansi-terminal, ansi-wl-pprint, array, base, base-compat @@ -198183,10 +198767,10 @@ self: { ({ mkDerivation, base, network-uri, template-haskell }: mkDerivation { pname = "qq-literals"; - version = "0.1.0.0"; - sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr"; + version = "0.1.0.1"; + sha256 = "00a0lhjpv7vn90ah5s7qzpzq21x1r7wv24mkffiinj75bc8acnas"; revision = "1"; - editedCabalFile = "1ckapl1mca1w61ifrfmaw2x06cy86chbicyb96kgp1hzkcpnx97k"; + editedCabalFile = "0x81c0injndvlx5adrgk85yrf8p07mr1glcdd1x444mm3035zjvy"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base network-uri template-haskell ]; description = "Compile-time checked literal values via QuasiQuoters"; @@ -200955,25 +201539,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, distributive, doctest, markdown-unlit, tasty - , tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.3.1.2"; - sha256 = "16fjvck4zw5ysj9bzqrblxv5n3p600rmlv7waxm13a5fmzr9vg2k"; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - testToolDepends = [ markdown-unlit ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rank2classes_1_3_2_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest , markdown-unlit, tasty, tasty-hunit, template-haskell , transformers @@ -200992,7 +201557,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rapid" = callPackage @@ -201297,10 +201861,8 @@ self: { ({ mkDerivation, base, stm, time, time-units }: mkDerivation { pname = "rate-limit"; - version = "1.4.1"; - sha256 = "0gm5jmi779niqsbgmkqqx6dsfw6yvfp4wlfibg9fzzmcc4i968g2"; - revision = "1"; - editedCabalFile = "01f3wf7q6117g2q5b9pp2rranxqyccmyl961r81151dpx21fiar7"; + version = "1.4.2"; + sha256 = "0zb19vwzyj1vg890776r3bprmjzhs9kr2r1vqa42nxv9nvwvnljm"; libraryHaskellDepends = [ base stm time time-units ]; description = "A basic library for rate-limiting IO actions"; license = stdenv.lib.licenses.bsd3; @@ -203845,24 +204407,29 @@ self: { }) {}; "reflex-ghci" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, fsnotify - , optparse-applicative, process, reflex, reflex-fsnotify - , reflex-process, reflex-vty, regex-tdfa, text, unix, vty + ({ mkDerivation, base, bytestring, dependent-sum, directory + , filepath, fsnotify, mtl, optparse-applicative, primitive, process + , ref-tf, reflex, reflex-fsnotify, reflex-process, reflex-vty + , regex-tdfa, temporary, text, unix, vty }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.3.1"; - sha256 = "0z4bw7dk5ccxydraj7n2j9hvclm8zi7y2k5mmssq1acr3wfsxq2h"; + version = "0.1.4.0"; + sha256 = "16kd9slfm6kczgcmh4n42gyxpyykz6s6hafkgsh66lcd7a1d85s8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory filepath fsnotify process reflex - reflex-fsnotify reflex-process reflex-vty regex-tdfa text unix + reflex-fsnotify reflex-process reflex-vty regex-tdfa text unix vty ]; executableHaskellDepends = [ base optparse-applicative process reflex reflex-process reflex-vty text vty ]; + testHaskellDepends = [ + base bytestring dependent-sum directory mtl primitive process + ref-tf reflex reflex-process reflex-vty temporary text + ]; description = "A GHCi widget library for use in reflex applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -203974,8 +204541,8 @@ self: { }: mkDerivation { pname = "reflex-process"; - version = "0.2.0.0"; - sha256 = "0vj4kr8p7r4jc7xl62vd3zk29q2bikgq9fgcgkwbi8fxcfwy94cr"; + version = "0.2.1.0"; + sha256 = "0q5l7vqdbgzrfyl8jzbx5f3c5xhnxjn3081p602drirnxy3js7yk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204145,6 +204712,19 @@ self: { broken = true; }) {}; + "refractor" = callPackage + ({ mkDerivation, base, gauge }: + mkDerivation { + pname = "refractor"; + version = "0.0.0.0"; + sha256 = "145airjpxr3x137180vds5vxlmxs7dh4vjn9grkwyjx8cmx3r842"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "See README for more info"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "refresht" = callPackage ({ mkDerivation, base, data-default, exceptions, lens, mtl }: mkDerivation { @@ -204277,6 +204857,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex_1_1_0_0" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring, containers + , hashable, regex-base, regex-pcre-builtin, regex-tdfa + , template-haskell, text, time, time-locale-compat, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "regex"; + version = "1.1.0.0"; + sha256 = "02hxgy5ck3h5pwd5gzs4565qbql8457cjdbbc2yrk236qzc1qa8x"; + libraryHaskellDepends = [ + array base base-compat bytestring containers hashable regex-base + regex-pcre-builtin regex-tdfa template-haskell text time + time-locale-compat transformers unordered-containers utf8-string + ]; + description = "Toolkit for regex-base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-applicative" = callPackage ({ mkDerivation, base, containers, criterion, smallcheck, tasty , tasty-hunit, tasty-smallcheck, transformers @@ -204446,32 +205046,32 @@ self: { ({ mkDerivation, array, base, base-compat, blaze-html, bytestring , containers, data-default, directory, filepath, hashable, heredoc , http-conduit, regex, regex-base, regex-pcre-builtin, regex-tdfa - , regex-tdfa-text, regex-with-pcre, shelly, smallcheck, tasty - , tasty-hunit, tasty-smallcheck, template-haskell, text, time + , regex-with-pcre, shelly, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, template-haskell, text, time , time-locale-compat, transformers, unordered-containers , utf8-string }: mkDerivation { pname = "regex-examples"; - version = "1.0.2.0"; - sha256 = "0qpf4b2zxdlih1smlhybs923n2gjaxhx8i1rgjw6v7ng13vnriiy"; + version = "1.1.0.0"; + sha256 = "02lpkr6y6q8mz30ily0gj6haqzma9a5x002jc08s5lx3s5h60b63"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base base-compat blaze-html bytestring containers data-default directory filepath hashable heredoc http-conduit regex - regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text - regex-with-pcre shelly smallcheck tasty tasty-hunit - tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers utf8-string + regex-base regex-pcre-builtin regex-tdfa regex-with-pcre shelly + smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text + time time-locale-compat transformers unordered-containers + utf8-string ]; testHaskellDepends = [ array base base-compat blaze-html bytestring containers data-default directory filepath hashable heredoc http-conduit regex - regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text - regex-with-pcre shelly smallcheck tasty tasty-hunit - tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers utf8-string + regex-base regex-pcre-builtin regex-tdfa regex-with-pcre shelly + smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text + time time-locale-compat transformers unordered-containers + utf8-string ]; description = "Tutorial, tests and example programs for regex"; license = stdenv.lib.licenses.bsd3; @@ -204868,6 +205468,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-with-pcre_1_1_0_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, regex + , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "regex-with-pcre"; + version = "1.1.0.0"; + sha256 = "18wq136snwk0i8l1fv878lmwh3rlvz6k68skrda70xr0i132wpax"; + libraryHaskellDepends = [ + base base-compat bytestring containers regex regex-base + regex-pcre-builtin regex-tdfa template-haskell text transformers + unordered-containers + ]; + description = "Toolkit for regex-base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-wrapper" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , regex-tdfa, string-conv, text @@ -209713,8 +210332,8 @@ self: { }: mkDerivation { pname = "row-types"; - version = "0.3.0.0"; - sha256 = "1w1xzkvg9fakz1d8a3dkfyi32gm52abrbky2knf8vhz6k5xc645i"; + version = "0.3.1.0"; + sha256 = "0nwhv2hdl7176bysyqw0zvfqlck0k638cvnwm49lld4zyaxrkq5h"; libraryHaskellDepends = [ base constraints deepseq generic-lens hashable profunctors text unordered-containers @@ -214438,17 +215057,18 @@ self: { }) {}; "semantic-source" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest - , generic-monoid, hashable, hedgehog, QuickCheck, semilattices - , tasty, tasty-hedgehog, tasty-hunit, text + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , doctest, generic-monoid, hashable, hedgehog, lingo, pathtype + , QuickCheck, semilattices, tasty, tasty-hedgehog, tasty-hunit + , text }: mkDerivation { pname = "semantic-source"; - version = "0.0.1.0"; - sha256 = "0zzybqys2vc2i06ggkbzcd8b2s68j3qpsrds55p0cvd9ng4dlvgi"; + version = "0.0.2.0"; + sha256 = "072iax2d2nhskpmm754ii28qdfvxrbwpvgix0igrrfaa52pcw286"; libraryHaskellDepends = [ - aeson base bytestring deepseq generic-monoid hashable semilattices - text + aeson base bytestring containers deepseq generic-monoid hashable + lingo pathtype semilattices text ]; testHaskellDepends = [ base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit @@ -216929,31 +217549,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.9.4"; - sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq"; - revision = "2"; - editedCabalFile = "1x7f0dbqgzlwzmr20l6hln4s86kblak4j9h0p9igcqibmplc70zn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - QuickCheck servant text - ]; - testToolDepends = [ hspec-discover ]; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_9_4_1" = callPackage ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover , hspec-expectations, language-ecmascript, lens, QuickCheck , servant, servant-foreign, text @@ -216974,7 +217569,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-jsonrpc" = callPackage @@ -217192,31 +217786,6 @@ self: { }) {}; "servant-multipart" = callPackage - ({ mkDerivation, base, bytestring, directory, http-client - , http-media, lens, network, resourcet, servant, servant-docs - , servant-foreign, servant-server, text, transformers, wai - , wai-extra, warp - }: - mkDerivation { - pname = "servant-multipart"; - version = "0.11.4"; - sha256 = "0vcwrdzj1xyjg11yvfcds9rql3gcwgdcdq4z085g44fpabjxj50s"; - revision = "2"; - editedCabalFile = "0pr0crsxc9m6p06m5qk39gzvqnj3hcxql0almpjfag0ifpviwkgk"; - libraryHaskellDepends = [ - base bytestring directory http-media lens resourcet servant - servant-docs servant-foreign servant-server text transformers wai - wai-extra - ]; - testHaskellDepends = [ - base bytestring http-client network servant servant-server text - transformers wai warp - ]; - description = "multipart/form-data (e.g file upload) support for servant"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-multipart_0_11_5" = callPackage ({ mkDerivation, array, base, bytestring, directory, http-client , http-media, lens, network, random, resourcet, servant , servant-client, servant-client-core, servant-docs @@ -217238,7 +217807,6 @@ self: { ]; description = "multipart/form-data (e.g file upload) support for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-named" = callPackage @@ -219759,6 +220327,32 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_24" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.24"; + sha256 = "1fpkq5av7xyffsgghj5b85i8pzpnmkfcyjawhfm5lyhqpq1g5wh3"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -223504,29 +224098,27 @@ self: { "slynx" = callPackage ({ mkDerivation, async, base, bytestring, containers , data-memocombinators, elynx-seq, elynx-tools, elynx-tree, hmatrix - , integration, lens, math-functions, matrices, megaparsec - , monad-logger, mwc-random, optparse-applicative, parallel - , primitive, statistics, text, transformers, vector - , vector-th-unbox, word8 + , integration, math-functions, matrices, megaparsec, monad-logger + , mwc-random, optparse-applicative, parallel, primitive, statistics + , text, transformers, vector, vector-th-unbox, word8 }: mkDerivation { pname = "slynx"; - version = "0.0.1"; - sha256 = "1wwzgslhbdn5q5sd9706sbz2zjqk6dhch72jb43cqbfh4jkfr8r1"; + version = "0.1.0"; + sha256 = "0bxdjwwxzpl437a2fzjb8vazbsz16jk2szxhbr63y12hckgjpzrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers data-memocombinators elynx-seq - elynx-tools elynx-tree hmatrix integration lens math-functions - matrices megaparsec monad-logger mwc-random optparse-applicative - parallel primitive statistics text transformers vector - vector-th-unbox word8 + elynx-tools elynx-tree hmatrix integration math-functions matrices + megaparsec monad-logger mwc-random optparse-applicative parallel + primitive statistics text transformers vector vector-th-unbox word8 ]; executableHaskellDepends = [ async base bytestring containers data-memocombinators elynx-seq - elynx-tools hmatrix integration lens math-functions matrices - megaparsec monad-logger mwc-random optparse-applicative parallel - primitive statistics text transformers vector vector-th-unbox word8 + elynx-tools hmatrix integration math-functions matrices megaparsec + monad-logger mwc-random optparse-applicative parallel primitive + statistics text transformers vector vector-th-unbox word8 ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; @@ -223609,6 +224201,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck-kind-generics" = callPackage + ({ mkDerivation, base, gauge, kind-generics, kind-generics-th + , smallcheck + }: + mkDerivation { + pname = "smallcheck-kind-generics"; + version = "0.0.0.1"; + sha256 = "08g6xa7gp55b1cmg8ys18qm5lxn7fdhl360rrsznfzfylihfp0dn"; + libraryHaskellDepends = [ + base kind-generics kind-generics-th smallcheck + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "See README for more info"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smallcheck-laws" = callPackage ({ mkDerivation, base, smallcheck, smallcheck-series }: mkDerivation { @@ -227686,6 +228295,8 @@ self: { pname = "splitmix"; version = "0.0.3"; sha256 = "1k0amgkz7rvyz3lnw7m786ilnr1cibwhx9sc4qynq329gxan5r7w"; + revision = "1"; + editedCabalFile = "178d81ksnmgppbd09ci53r88iyacn3phy55v5i4ybfz5d8rfjpa5"; libraryHaskellDepends = [ base deepseq random time ]; testHaskellDepends = [ async base base-compat-batteries bytestring deepseq HUnit process @@ -228372,8 +228983,8 @@ self: { }: mkDerivation { pname = "sscan"; - version = "0.1"; - sha256 = "1yrv6nfkd2sb3hn1jxl5vbfp81bxg96mm5wi0icd5cjfil4dvyj7"; + version = "0.2"; + sha256 = "0zy2fgxsx8p8350iclrbmhd74q429yrcyk37xfplq47hz394j3g5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231963,8 +232574,8 @@ self: { }: mkDerivation { pname = "streaming-osm"; - version = "1.0.0.1"; - sha256 = "0zf9f079ssmm1gy1ngcqz1faxyardv91ynv5lc5xfh8fhgk9a65c"; + version = "1.0.1"; + sha256 = "0rsyp7lzsj254i7r6gak48fwlpkbq9i7aw4mjdmym4y55mhj1d64"; libraryHaskellDepends = [ attoparsec base bytestring containers resourcet streaming streaming-attoparsec streaming-bytestring text transformers vector @@ -232191,6 +232802,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "streamly-bytestring" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, filepath + , gauge, hspec, hspec-discover, quickcheck-instances, random + , streamly, temporary + }: + mkDerivation { + pname = "streamly-bytestring"; + version = "0.1.0.1"; + sha256 = "1z6cf88sbcadv6fpf6pnp6inl1p2sz48jfwc9ya9ava5rnrwy08i"; + libraryHaskellDepends = [ base bytestring streamly ]; + testHaskellDepends = [ + base bytestring directory filepath hspec hspec-discover + quickcheck-instances random streamly temporary + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge random streamly + ]; + description = "Library for streamly and bytestring interoperation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streamly-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, criterion, exceptions , hspec, mtl, QuickCheck, quickcheck-instances, streaming @@ -233169,6 +233802,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "structs_0_1_3" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, directory + , doctest, filepath, ghc-prim, parallel, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "structs"; + version = "0.1.3"; + sha256 = "1y8w44lsybzrkhnv2nrk4zpsp01hny66syibh3xwqpi06k18h2lr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell + ]; + testHaskellDepends = [ + base directory doctest filepath parallel primitive QuickCheck tasty + tasty-hunit tasty-quickcheck + ]; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -233436,31 +234091,34 @@ self: { "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, file-embed, filepath, haskell-src-exts, HUnit, mtl - , optparse-applicative, random, semigroups, strict, syb - , test-framework, test-framework-hunit, yaml + , directory, file-embed, filepath, haskell-src-exts, HsYAML + , HsYAML-aeson, HUnit, mtl, optparse-applicative, random + , semigroups, strict, syb, test-framework, test-framework-hunit }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.4.4"; - sha256 = "1399q6chjhnyf2vifmwp3cw8253ra762wm5873ndjjd2z6da8gg2"; + version = "0.10.0.0"; + sha256 = "1ribq5fnfg7bwzj7h8br2jnpjnw905dzr9yysx3h9nkw1593rw56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers directory file-embed - filepath haskell-src-exts mtl semigroups syb yaml + filepath haskell-src-exts HsYAML HsYAML-aeson mtl semigroups syb ]; executableHaskellDepends = [ aeson base bytestring Cabal containers directory file-embed - filepath haskell-src-exts mtl optparse-applicative strict syb yaml + filepath haskell-src-exts HsYAML HsYAML-aeson mtl + optparse-applicative strict syb ]; testHaskellDepends = [ aeson base bytestring Cabal containers directory file-embed - filepath haskell-src-exts HUnit mtl random syb test-framework - test-framework-hunit yaml + filepath haskell-src-exts HsYAML HsYAML-aeson HUnit mtl random syb + test-framework test-framework-hunit ]; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stylist" = callPackage @@ -234046,8 +234704,8 @@ self: { }: mkDerivation { pname = "super-user-spark"; - version = "0.4.0.3"; - sha256 = "0z2alc67p8nvvwaxxrgwhkwfki1iw7ycs3ay8kyfw0wh01d2cmgk"; + version = "0.4.0.4"; + sha256 = "1zn9bp9zn0k8kvjik03fpq5ps1fz980b06z7s178r00dmx6abjl0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235348,8 +236006,8 @@ self: { }: mkDerivation { pname = "symbiote"; - version = "0.0.3"; - sha256 = "0ghxakwnwjhmpgicxs8rgkrxlclgdlskhl8aqblbsabk0nj9gyaj"; + version = "0.0.4"; + sha256 = "1qvlwjghd8gg6g9vl2lx94byp0j4fnbgbv7pnzna3grfs7gk1768"; libraryHaskellDepends = [ abides aeson async base bytestring cereal chan containers exceptions extractable-singleton hashable monad-control-aligned mtl @@ -235931,8 +236589,8 @@ self: { }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.2.1"; - sha256 = "0bgla347pfdaai41rp9jny2k1hv0k1s8jdmqhd54v5c60cxl6p9l"; + version = "0.8.3"; + sha256 = "1ff56jrk2a3hppw9s1iv167926vcmd9p51mzav73kkaxni1n6hry"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -235945,8 +236603,9 @@ self: { base llvm-extra llvm-tf numeric-prelude QuickCheck random storablevector synthesizer-core tfp utility-ht ]; + doHaddock = false; description = "Efficient signal processing using runtime compilation"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -237480,27 +238139,26 @@ self: { "tar-bytestring" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-handle - , containers, criterion, deepseq, hpath, hpath-filepath, hpath-io - , QuickCheck, tasty, tasty-quickcheck, time, unix, word8 + , containers, criterion, deepseq, hpath-directory, hpath-filepath + , QuickCheck, safe-exceptions, tasty, tasty-quickcheck, time, unix + , word8 }: mkDerivation { pname = "tar-bytestring"; - version = "0.6.1.0"; - sha256 = "1h7zq7ad5pnvfbf62s7p1irrxgs6jaf4pv4xivjq1diyj3i4nkzp"; - revision = "1"; - editedCabalFile = "1pykrgxcazbmab2749ckcwmvwy88ycs4vbrag218i9sb3193q1d8"; + version = "0.6.1.1"; + sha256 = "0spg2hqlpz0j2bx42vhv5q9fghr0k773w0kr96k8fvg4ff7cs5wa"; libraryHaskellDepends = [ - array base bytestring containers deepseq hpath hpath-filepath - hpath-io time unix word8 + array base bytestring containers deepseq hpath-directory + hpath-filepath safe-exceptions time unix word8 ]; testHaskellDepends = [ - array base bytestring bytestring-handle containers deepseq hpath - hpath-filepath hpath-io QuickCheck tasty tasty-quickcheck time unix - word8 + array base bytestring bytestring-handle containers deepseq + hpath-directory hpath-filepath QuickCheck safe-exceptions tasty + tasty-quickcheck time unix word8 ]; benchmarkHaskellDepends = [ - array base bytestring containers criterion deepseq hpath - hpath-filepath hpath-io time unix word8 + array base bytestring containers criterion deepseq hpath-directory + hpath-filepath safe-exceptions time unix word8 ]; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; @@ -238138,6 +238796,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-lua_0_2_2" = callPackage + ({ mkDerivation, base, bytestring, directory, file-embed, filepath + , hslua, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "tasty-lua"; + version = "0.2.2"; + sha256 = "0m75dffrj6ziaalrch91kzj76ki0chbf33pi7mrx0c1gzmpvn8gv"; + libraryHaskellDepends = [ + base bytestring file-embed hslua tasty text + ]; + testHaskellDepends = [ + base directory filepath hslua tasty tasty-hunit + ]; + description = "Write tests in Lua, integrate into tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-program" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, process, tasty }: @@ -241071,6 +241748,24 @@ self: { broken = true; }) {}; + "text-offset" = callPackage + ({ mkDerivation, base, bytestring, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, vector + }: + mkDerivation { + pname = "text-offset"; + version = "0.1.0.0"; + sha256 = "0milfq5nnz4ar5ka3yvcf2vxh9cw5p272j7q8ysaf6vajbax4bq0"; + libraryHaskellDepends = [ base text vector ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + description = "Library for converting between line/column and byte offset"; + license = stdenv.lib.licenses.asl20; + }) {}; + "text-plus" = callPackage ({ mkDerivation, base, bytestring, doctest, HTF, pretty, QuickCheck , strict-data, text, util-plus @@ -241272,7 +241967,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "text-show_3_8_3" = callPackage + "text-show_3_8_4" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -241282,8 +241977,8 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.8.3"; - sha256 = "1l4mg4vgdixhpsncqyf9xq7nw0dskcd41hg4rb12s2623sjdxb2p"; + version = "3.8.4"; + sha256 = "03ia42rfp0znxjj2amiwj5k4f41rbkg7nfvd5j09rjkwy7532jbq"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -243446,8 +244141,8 @@ self: { pname = "time-compat"; version = "1.9.2.2"; sha256 = "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52"; - revision = "1"; - editedCabalFile = "0k8ph4sydaiqp8dav4if6hpiaq8h1xsr93khmdr7a1mmfwdxr64r"; + revision = "2"; + editedCabalFile = "1i94pch4zj713gxcrlb09airbh3hqqs7cscjjfkxk9lixkk6iwnc"; libraryHaskellDepends = [ base base-orphans deepseq time ]; testHaskellDepends = [ base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit @@ -244271,33 +244966,6 @@ self: { }) {}; "tintin" = callPackage - ({ mkDerivation, base, clay, containers, data-has, directory - , frontmatter, inflections, inliterate, lucid, optparse-generic - , process, require, temporary, text, universum, yaml - }: - mkDerivation { - pname = "tintin"; - version = "1.10.0"; - sha256 = "04946h5jr7pbj8n46vbipj46n5klqb83az9nasq7smkv1kdz6dv6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base clay containers data-has directory frontmatter inflections - inliterate lucid process require temporary text universum yaml - ]; - libraryToolDepends = [ require ]; - executableHaskellDepends = [ - base optparse-generic require universum - ]; - executableToolDepends = [ require ]; - testHaskellDepends = [ base require ]; - description = "A softer alternative to Haddock"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "tintin_1_10_1" = callPackage ({ mkDerivation, base, clay, containers, data-has, directory , frontmatter, inflections, inliterate, lucid, optparse-generic , process, require, temporary, text, universum, yaml @@ -244651,15 +245319,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tldr_0_6_1" = callPackage + "tldr_0_6_2" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers , directory, filepath, optparse-applicative, semigroups, tasty , tasty-golden, text, typed-process }: mkDerivation { pname = "tldr"; - version = "0.6.1"; - sha256 = "0nzmflhhrrnryl2jcd7bbwa52rwkp22cxqgwwqbgkyrbxslrwllh"; + version = "0.6.2"; + sha256 = "13m88za5pfal00kldqjgag232k563y168ri84acdim8km62b861z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244809,28 +245477,28 @@ self: { }) {}; "tlynx" = callPackage - ({ mkDerivation, base, bytestring, containers, elynx-seq + ({ mkDerivation, array, base, bytestring, containers, elynx-seq , elynx-tools, elynx-tree, lifted-async, math-functions, megaparsec - , monad-logger, mwc-random, optparse-applicative, parallel - , primitive, QuickCheck, quickcheck-instances, statistics, text - , transformers, vector + , monad-logger, MonadRandom, mwc-random, optparse-applicative + , parallel, primitive, QuickCheck, quickcheck-instances, statistics + , text, transformers, vector }: mkDerivation { pname = "tlynx"; - version = "0.0.1"; - sha256 = "0acgwn0czk3kpsnsrlkmxrm7cc0mv6wwx75nr5v3hc1ir1hais6n"; + version = "0.1.0"; + sha256 = "0l4i4hyyw0m8kj2fqy4arcfyn9vnl4zdsbicz191hlc1nx935byn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers elynx-seq elynx-tools elynx-tree - lifted-async math-functions megaparsec monad-logger mwc-random - optparse-applicative parallel primitive QuickCheck + array base bytestring containers elynx-seq elynx-tools elynx-tree + lifted-async math-functions megaparsec monad-logger MonadRandom + mwc-random optparse-applicative parallel primitive QuickCheck quickcheck-instances statistics text transformers vector ]; executableHaskellDepends = [ - base bytestring containers elynx-tools elynx-tree lifted-async - math-functions megaparsec monad-logger mwc-random - optparse-applicative parallel primitive QuickCheck + array base bytestring containers elynx-tools elynx-tree + lifted-async math-functions megaparsec monad-logger MonadRandom + mwc-random optparse-applicative parallel primitive QuickCheck quickcheck-instances statistics text transformers vector ]; description = "Handle phylogenetic trees"; @@ -247103,8 +247771,8 @@ self: { pname = "tree-diff"; version = "0.1"; sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3"; - revision = "1"; - editedCabalFile = "1nxwbn3z4a2102r45yhk0i6vb8fyc5mb894daai7l3l16rjzkp5a"; + revision = "2"; + editedCabalFile = "081fcdkps3sc1pcfbcxs5f1ifnpx8hsk9ms2gafd793lia6whfsk"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers hashable parsec parsers pretty @@ -247337,8 +248005,8 @@ self: { }: mkDerivation { pname = "tree-sitter-tsx"; - version = "0.4.1.0"; - sha256 = "0bznbbg8yj1qd5z4bqjxf8y4jjbb8w2d68xzmbp66rjbw7nzcs60"; + version = "0.4.2.0"; + sha256 = "1qr84fkid3ci0r51884bj01yp11fr5v7dy8ac4j90mv9xc54rjw6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base semantic-source template-haskell tree-sitter @@ -247361,8 +248029,8 @@ self: { }: mkDerivation { pname = "tree-sitter-typescript"; - version = "0.4.1.0"; - sha256 = "0p53vi3mjmln5mrmsv6w43jbdlcjywq61qm4911w3qqwmwjbgn14"; + version = "0.4.2.0"; + sha256 = "1g4m7rfvhwgjiwhk3s4dmsz7is03xakqfbmdrn9vq3c97bc5fb5n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base semantic-source template-haskell tree-sitter @@ -248609,35 +249277,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, criterion, directory, doctest, exceptions, fail - , foldl, hostname, managed, optional-args, optparse-applicative - , process, semigroups, stm, streaming-commons, system-fileio - , system-filepath, temporary, text, time, transformers, unix - , unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.5.15"; - sha256 = "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f"; - revision = "1"; - editedCabalFile = "02q1rv7zx31xz9wnmcqwd4w3iw7623p07iyi21zr0cqlignic5pg"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock containers directory - exceptions foldl hostname managed optional-args - optparse-applicative process semigroups stm streaming-commons - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ - base doctest fail system-filepath temporary - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_5_16" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, fail , foldl, hostname, managed, optional-args, optparse-applicative @@ -248662,7 +249301,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -249566,6 +250204,8 @@ self: { pname = "type-equality"; version = "1"; sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; + revision = "1"; + editedCabalFile = "13lsff17dxz852f5bhjz8d1by704rzvwr67qqfc5dz5s7xc28qyk"; libraryHaskellDepends = [ base ]; description = "Data.Type.Equality compat package"; license = stdenv.lib.licenses.bsd3; @@ -249886,27 +250526,6 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim - , hspec, QuickCheck, random, temporary, text, weigh - }: - mkDerivation { - pname = "type-of-html"; - version = "1.5.0.0"; - sha256 = "0bj05wmhsgn7x3437l6488mkalffn90c4g33njx6xy8p81ls26l9"; - libraryHaskellDepends = [ - base bytestring containers double-conversion ghc-prim text - ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion deepseq ghc ghc-paths random - temporary text weigh - ]; - description = "High performance type driven html generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-of-html_1_5_1_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim , hspec, QuickCheck, random, text, weigh @@ -249925,7 +250544,6 @@ self: { ]; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-of-html-static" = callPackage @@ -256178,8 +256796,8 @@ self: { }: mkDerivation { pname = "vectortiles"; - version = "1.5.0"; - sha256 = "1vy990m7vlsw0ffi0ys7xpz97npw0b3vldw6ykhcsyxhvhg6jrif"; + version = "1.5.1"; + sha256 = "1g5n7xrpzj1kfbmk97lak6p7m0g7irkcmd5cl0gh23bxsfzmbnkh"; libraryHaskellDepends = [ base bytestring containers deepseq hashable mtl protocol-buffers protocol-buffers-descriptor text transformers unordered-containers @@ -256206,8 +256824,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.3.1.5"; - sha256 = "0f120aalldbcwyyjmm6chvqgyp70lifqbas7q442qqficw7yi6hg"; + version = "0.3.1.6"; + sha256 = "0s9d3g47qnzcpi2p1z60axrr53jbc6q4qyma88qxsrf6ava115ar"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -256461,6 +257079,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_5_3" = callPackage + ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable + , megaparsec, microlens, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.5.3"; + sha256 = "0i883v04i1a3sjn1vx15yb3bwi9pq41z650aq3zci72vyvbhr0n7"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base base-prelude checkers megaparsec microlens QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -256484,14 +257121,18 @@ self: { }) {}; "vformat" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, QuickCheck }: + ({ mkDerivation, base, containers, exceptions, hspec, QuickCheck + , template-haskell + }: mkDerivation { pname = "vformat"; - version = "0.13.0.0"; - sha256 = "0ribzajgsjmpbr4r248hiy5krx692ik623gpz6iz1qqrv4w54lnv"; - libraryHaskellDepends = [ base containers exceptions ]; + version = "0.14.1.0"; + sha256 = "0wg419mqdqsi6msgy4k7jgqdqba96pmv58dpyd6ar6hq7b90na69"; + libraryHaskellDepends = [ + base containers exceptions template-haskell + ]; testHaskellDepends = [ - base containers exceptions hspec QuickCheck + base containers exceptions hspec QuickCheck template-haskell ]; description = "A Python str.format() like formatter"; license = stdenv.lib.licenses.bsd3; @@ -259620,7 +260261,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "warp_3_3_8" = callPackage + "warp_3_3_9" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types @@ -259630,8 +260271,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.8"; - sha256 = "13amshbyz185inkx1xd0ywa1096dlwp3s24hkrls166wiiq6gzc4"; + version = "3.3.9"; + sha256 = "1hb8984sp0dri2a65sql0j310x47063dn4mbpmax0bkn13l4b6j3"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -260219,30 +260860,32 @@ self: { "web-rep" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, box, clay - , foldl, generic-lens, interpolatedstring-perl6, javascript-bridge - , JuicyPixels, language-javascript, lens, lucid, lucid-svg, mmorph - , mtl, optparse-generic, scotty, streaming, tasty, tasty-hspec - , text, text-format, transformers, unordered-containers, wai - , wai-extra, wai-middleware-static + , doctest, foldl, generic-lens, interpolatedstring-perl6 + , javascript-bridge, JuicyPixels, language-javascript, lens, lucid + , lucid-svg, mmorph, mtl, optparse-generic, scotty, streaming + , tasty, tasty-hspec, text, text-format, transformers + , unordered-containers, wai, wai-extra, wai-middleware-static }: mkDerivation { pname = "web-rep"; - version = "0.2.0"; - sha256 = "0mxsqx9gigi70xj372qrwsfahy1ra17jhagvrv6y7pzzl3g0rfws"; + version = "0.3.0"; + sha256 = "1qfgs3jb146a37zpsgcl2vc4k6p9h1mqhhkgrcq386x535v2ivmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bifunctors box clay foldl generic-lens interpolatedstring-perl6 javascript-bridge JuicyPixels - language-javascript lens lucid lucid-svg mmorph mtl scotty - streaming text text-format transformers unordered-containers - wai-middleware-static + language-javascript lens lucid lucid-svg mmorph mtl + optparse-generic scotty streaming text text-format transformers + unordered-containers wai wai-extra wai-middleware-static ]; executableHaskellDepends = [ attoparsec base box lens lucid optparse-generic scotty text wai wai-extra wai-middleware-static ]; - testHaskellDepends = [ base lens lucid tasty tasty-hspec text ]; + testHaskellDepends = [ + base doctest lens lucid tasty tasty-hspec text + ]; description = "representations of a web page"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -261554,27 +262197,6 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog - , primitive, QuickCheck, quickcheck-classes, semirings - }: - mkDerivation { - pname = "wide-word"; - version = "0.1.0.9"; - sha256 = "0k8v6iggsrbmmq82b4zziyg9arh6fvwqsfid15nnycdfgsaafph3"; - revision = "1"; - editedCabalFile = "1d9ahyjh7wjpr7llmvj2r7y6c0gl91yq501aj9c5qfpyhbc59jzl"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ - base bytestring ghc-prim hedgehog primitive QuickCheck - quickcheck-classes semirings - ]; - description = "Data types for large but fixed width signed and unsigned integers"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "wide-word_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog , primitive, QuickCheck, quickcheck-classes, semirings }: @@ -262217,6 +262839,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wl-pprint-text_1_2_0_1" = callPackage + ({ mkDerivation, base, base-compat, text }: + mkDerivation { + pname = "wl-pprint-text"; + version = "1.2.0.1"; + sha256 = "030ckgzz14sv2c317g4j5g68hyq9xi40cmv0apwclw6sc6xgsvly"; + libraryHaskellDepends = [ base base-compat text ]; + description = "A Wadler/Leijen Pretty Printer for Text values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wlc-hs" = callPackage ({ mkDerivation, base, c2hs, containers, data-default, lens, pretty , process, transformers, wlc, xkbcommon @@ -266740,8 +267374,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; - revision = "2"; - editedCabalFile = "1zyb6z4q46f09lsnswk3z401p5nry65k5cp3jypbcwc8m122hgb1"; + revision = "3"; + editedCabalFile = "02zzv9xlmvja8jpgnk1r7wfrh33593qbmhbwrcnw0bmjvbk28ps1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -267328,6 +267962,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod_1_6_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit + , data-default-class, directory, fast-logger, monad-logger + , semigroups, shakespeare, streaming-commons, template-haskell + , text, unix, unordered-containers, wai, wai-extra, wai-logger + , warp, yaml, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.6.0.1"; + sha256 = "113qm6x4q2s08l5423j1ksc3bdlbf9pxj4y9p8nf36gbz6dy6xqh"; + libraryHaskellDepends = [ + aeson base bytestring conduit data-default-class directory + fast-logger monad-logger semigroups shakespeare streaming-commons + template-haskell text unix unordered-containers wai wai-extra + wai-logger warp yaml yesod-core yesod-form yesod-persistent + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-alerts" = callPackage ({ mkDerivation, alerts, base, blaze-html, blaze-markup, safe, text , yesod-core @@ -267434,6 +268090,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_6_8_1" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.8.1"; + sha256 = "1zpmcywc8qkx93y05r8zgzds8wj5sg6b5jhzi17g6fwnaha2i1qj"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -267861,8 +268546,8 @@ self: { pname = "yesod-colonnade"; version = "1.3.0.1"; sha256 = "1x5m3xv4jq2x49fnvxw3v8bvbsx4hdccykcn32fz3cwavp4p1q1p"; - revision = "1"; - editedCabalFile = "0cgxpqqpaqy3009k5l8v7f1z4jm4162k69y9q5xb3dk1925nfqyp"; + revision = "2"; + editedCabalFile = "0z3zcfxsbjm1azbbscccimsazkc10jp0i24wznwb2pvm4pa5a7j4"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade conduit conduit-extra text yesod-core yesod-elements @@ -268016,6 +268701,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_17_2" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.17.2"; + sha256 = "0rcfksbxnwcpg5qh9vjkddv39q95mx4nxzgix51bbwa128hhzcwf"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -270558,6 +271281,19 @@ self: { broken = true; }) {}; + "zbar" = callPackage + ({ mkDerivation, base, c2hs, zbar }: + mkDerivation { + pname = "zbar"; + version = "0.1.1.0"; + sha256 = "03d81yxqf15q0ryynni55pww0z5v313yg0nb00r8zlibn96mjf5z"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ zbar ]; + libraryToolDepends = [ c2hs ]; + description = "zbar bindings in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) zbar;}; + "zcache" = callPackage ({ mkDerivation, array, base, containers, mersenne-random-pure64 }: mkDerivation { From 3430ded6c8060b60754753717020ae3a5b3f1a2c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Jan 2020 16:17:23 +0100 Subject: [PATCH 145/241] haskellPackages.bustle: clean up with lib.pipe --- .../haskell-modules/configuration-common.nix | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 53b053fcb05..4a67c9e91f0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -602,28 +602,33 @@ self: super: { # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; - # Install icons, metadata and cli program. - # Do not build hgettext as it is broken - # https://gitlab.freedesktop.org/bustle/bustle/issues/13 - bustle = overrideCabal (disableCabalFlag (super.bustle.override { hgettext = null; }) "hgettext") (drv: { - buildDepends = [ pkgs.libpcap ]; - buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; - patches = [ - # fix build - # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14 - (pkgs.fetchpatch { - url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch"; - sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa"; - }) - (pkgs.fetchpatch { - url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch"; - sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a"; - }) - ]; - postInstall = '' - make install PREFIX=$out - ''; - }); + bustle = pkgs.lib.pipe super.bustle [ + # Do not build hgettext as it is broken + # https://gitlab.freedesktop.org/bustle/bustle/issues/13 + (bustle: bustle.override { hgettext = null; }) + (bustle: disableCabalFlag bustle "hgettext") + + # Install icons, metadata and cli program. + (bustle: overrideCabal bustle (drv: { + buildDepends = [ pkgs.libpcap ]; + buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; + patches = [ + # fix build + # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14 + (pkgs.fetchpatch { + url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch"; + sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa"; + }) + (pkgs.fetchpatch { + url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch"; + sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a"; + }) + ]; + postInstall = '' + make install PREFIX=$out + ''; + })) + ]; # Byte-compile elisp code for Emacs. ghc-mod = overrideCabal super.ghc-mod (drv: { From 41416193316f3a8c887e983ca4bf17ac218481b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Jan 2020 16:32:22 +0100 Subject: [PATCH 146/241] haskellPackages.bustle: fix building on Hydra Bustle is proclaiming OtherLicense even though the code is licensed under LGPL 2.1+. This causes cabal2nix to set hydraPlatforms = stdenv.lib.platforms.none in hackage-packages.nix for the package. Lets let's unset the attribute and fix the license. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4a67c9e91f0..9c256f82dab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -608,6 +608,14 @@ self: super: { (bustle: bustle.override { hgettext = null; }) (bustle: disableCabalFlag bustle "hgettext") + # Bustle specifies OtherLicense even though the code is actually LGPL + # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/17 + (bustle: bustle.overrideAttrs (attrs: { + meta = builtins.removeAttrs attrs.meta [ "hydraPlatforms" ] // { + license = pkgs.lib.licenses.lgpl21Plus; + }; + })) + # Install icons, metadata and cli program. (bustle: overrideCabal bustle (drv: { buildDepends = [ pkgs.libpcap ]; From 135cc0c58ddb733200c65cc51fdf1f8f64833758 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 13:25:03 +0100 Subject: [PATCH 147/241] haskell-cabal-plan: update overrides for new version of base-compat --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9c256f82dab..8f127e9490d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1272,7 +1272,7 @@ self: super: { }); # The LTS-14.x version of their dependencies are too old. - cabal-plan = super.cabal-plan.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; ansi-terminal = self.ansi-terminal_0_10_2; base-compat = self.base-compat_0_11_0; semialign = self.semialign_1_1; time-compat = doJailbreak super.time-compat; }); + cabal-plan = super.cabal-plan.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; ansi-terminal = self.ansi-terminal_0_10_2; base-compat = self.base-compat_0_11_1; semialign = self.semialign_1_1; time-compat = doJailbreak super.time-compat; }); hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_23_0; }; # Version bounds for http-client are too strict: From 6bedeceb8a050677ad88987cef45fcbfab8a2f48 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 25 Jan 2020 14:38:13 +0100 Subject: [PATCH 148/241] ghc: update 8.10.1 pre-release to announced rc1 https://mail.haskell.org/pipermail/ghc-devs/2020-January/018530.html The version previously fetched was `8.10.0.20200108`. --- pkgs/development/compilers/ghc/8.10.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index b68e4802551..314b2fea9c7 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -86,12 +86,12 @@ let in stdenv.mkDerivation (rec { - version = "8.10.0.20200108"; + version = "8.10.0.20200123"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/8.10.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "1xm6cb3s2x3rycnyvkh12mp65xi3zbwrk5ima8sg7c245f3dl0ay"; + sha256 = "162s5g33s918i12qfcqdj5wanc10xg07g5lq3gpm5j7c1v0y1zrf"; }; enableParallelBuilding = true; From 2b10aed0d71c9495c7f0171760e74aec45baceba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 13:26:34 +0100 Subject: [PATCH 149/241] ghc-8.8.x: update version overrides for microlens packages --- .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index be852679c9a..508398449ea 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -85,10 +85,10 @@ self: super: { lens = self.lens_4_18_1; memory = self.memory_0_15_0; microlens = self.microlens_0_4_11_2; - microlens-ghc = self.microlens-ghc_0_4_11_1; + microlens-ghc = self.microlens-ghc_0_4_12; microlens-mtl = self.microlens-mtl_0_2_0_1; - microlens-platform = self.microlens-platform_0_4_0; - microlens-th = self.microlens-th_0_4_3_2; + microlens-platform = self.microlens-platform_0_4_1; + microlens-th = self.microlens-th_0_4_3_4; network = self.network_3_1_1_1; optparse-applicative = self.optparse-applicative_0_15_1_0; pandoc = dontCheck super.pandoc_2_9_1_1; # https://github.com/jgm/pandoc/issues/6086 From 8d4509e34d85501dca2eed1a2dfbd5c0611b0f5b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 29 Jan 2020 00:44:11 +0100 Subject: [PATCH 150/241] haskell generic-builder: Fix package conf handling Previously the package conf files were handled without paying attention to the fact that it's pretty-printed output. One problem was discovered with GHC 8.8.1 on Darwin, where the dynamic-library-dirs first field seems to have increased in length, meaning while before it was dynamic-library-dirs: some-small-directory-name some-more-directories Now it is dynamic-library-dirs: some-larger-directory-name some-more-directories Which breaks the code installed for https://github.com/NixOS/nixpkgs/pull/25537, because that assumed the former format, resulting in the reoccurence of the bug in https://github.com/NixOS/nixpkgs/issues/22810, see https://github.com/Infinisil/all-hies/issues/43 This commit fixes this by "unprettyfying" the package conf files before processing them. Closes https://github.com/NixOS/nixpkgs/pull/78738. --- .../haskell-modules/generic-builder.nix | 56 ++++++++++++++++--- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c93fc5b7e45..513987dae7b 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -132,6 +132,37 @@ let main = defaultMain ''; + # This awk expression transforms a package conf file like + # + # author: John Doe + # description: + # The purpose of this library is to do + # foo and bar among other things + # + # into a more easily processeable form: + # + # author: John Doe + # description: The purpose of this library is to do foo and bar among other things + unprettyConf = builtins.toFile "unpretty-cabal-conf.awk" '' + /^[^ ]+:/ { + # When the line starts with a new field, terminate the previous one with a newline + if (started == 1) print "" + # to strip leading spaces + $1=$1 + printf "%s", $0 + started=1 + } + + /^ +/ { + # to strip leading spaces + $1=$1 + printf " %s", $0 + } + + # Terminate the final field with a newline + END { print "" } + ''; + crossCabalFlags = [ "--with-ghc=${ghcCommand}" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" @@ -344,12 +375,22 @@ stdenv.mkDerivation ({ # libraries) from all the dependencies. local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir - for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'|sort -u); do - ln -s "$d/"*.dylib $dynamicLinksDir + + # Unprettify all package conf files before reading/writing them + for d in "$packageConfDir/"*; do + # gawk -i inplace seems to strip the last newline + gawk -f ${unprettyConf} "$d" > tmp + mv tmp "$d" + done + + for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do + for lib in "$d/"*.dylib; do + ln -s "$lib" "$dynamicLinksDir" + done done # Edit the local package DB to reference the links directory. for f in "$packageConfDir/"*.conf; do - sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f + sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," "$f" done '') + '' ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache @@ -418,10 +459,6 @@ stdenv.mkDerivation ({ runHook postHaddock ''; - # The scary sed expression handles two cases in v2.5 Cabal's package configs: - # 1. 'id: short-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO' - # 2. 'id:\n - # very-long-descriptive-useful-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO' installPhase = '' runHook preInstall @@ -436,8 +473,9 @@ stdenv.mkDerivation ({ rmdir "$packageConfFile" fi for packageConfFile in "$packageConfDir/"*; do - local pkgId=$( ${gnused}/bin/sed -n -e ':a' -e '/^id:$/N; s/id:\n[ ]*\([^\n]*\).*$/\1/p; s/id:[ ]*\([^\n]*\)$/\1/p; ta' $packageConfFile ) - mv $packageConfFile $packageConfDir/$pkgId.conf + local pkgId=$(gawk -f ${unprettyConf} "$packageConfFile" \ + | grep '^id:' | cut -d' ' -f2) + mv "$packageConfFile" "$packageConfDir/$pkgId.conf" done # delete confdir if there are no libraries From 6516c12dbe3ae4a295f1d42b367f463d925d7bf1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 13:47:41 +0100 Subject: [PATCH 151/241] haskell-policeman: add overrides to provide newer versions of dependencies --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 508398449ea..357d800e6b7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -144,4 +144,7 @@ self: super: { easytest_0_3 = markBroken super.easytest_0_3; haskell-src = markBrokenVersion "1.0.3.0" super.haskell-src; + # The LTS-14.x version of the dependencies are too old. + policeman = super.policeman.overrideScope (self: super: { ansi-terminal = self.ansi-terminal_0_10_2; relude = self.relude_0_6_0_0; }); + } From 6d068993b5fa0eb2768ce33278fbba8bbde749cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 13:51:25 +0100 Subject: [PATCH 152/241] haskell-relude-6.0.0.0 does not pass its doctest suite --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 357d800e6b7..e7f121f979a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -147,4 +147,7 @@ self: super: { # The LTS-14.x version of the dependencies are too old. policeman = super.policeman.overrideScope (self: super: { ansi-terminal = self.ansi-terminal_0_10_2; relude = self.relude_0_6_0_0; }); + # https://github.com/kowainik/relude/issues/241 + relude_0_6_0_0 = dontCheck super.relude_0_6_0_0; + } From 5e90d04ee7bb71bbea604e2820939fe936f96e24 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 21:38:10 +0100 Subject: [PATCH 153/241] haskell-bustle: simplify the override now that those changes are in cabal2nix Might be of interest to @jtojnar. --- .../haskell-modules/configuration-common.nix | 55 +++++++------------ 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8f127e9490d..5e43d516e91 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -602,41 +602,26 @@ self: super: { # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; - bustle = pkgs.lib.pipe super.bustle [ - # Do not build hgettext as it is broken - # https://gitlab.freedesktop.org/bustle/bustle/issues/13 - (bustle: bustle.override { hgettext = null; }) - (bustle: disableCabalFlag bustle "hgettext") - - # Bustle specifies OtherLicense even though the code is actually LGPL - # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/17 - (bustle: bustle.overrideAttrs (attrs: { - meta = builtins.removeAttrs attrs.meta [ "hydraPlatforms" ] // { - license = pkgs.lib.licenses.lgpl21Plus; - }; - })) - - # Install icons, metadata and cli program. - (bustle: overrideCabal bustle (drv: { - buildDepends = [ pkgs.libpcap ]; - buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; - patches = [ - # fix build - # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14 - (pkgs.fetchpatch { - url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch"; - sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa"; - }) - (pkgs.fetchpatch { - url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch"; - sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a"; - }) - ]; - postInstall = '' - make install PREFIX=$out - ''; - })) - ]; + # Install icons, metadata and cli program. + bustle = overrideCabal super.bustle (drv: { + buildDepends = [ pkgs.libpcap ]; + buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; + patches = [ + # fix build + # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14 + (pkgs.fetchpatch { + url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch"; + sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa"; + }) + (pkgs.fetchpatch { + url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch"; + sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a"; + }) + ]; + postInstall = '' + make install PREFIX=$out + ''; + }); # Byte-compile elisp code for Emacs. ghc-mod = overrideCabal super.ghc-mod (drv: { From a7712a1a313ea350710257b29faad781b4cd30db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 21:39:55 +0100 Subject: [PATCH 154/241] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-16-g2971916 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d77d0f7de2d7a3bf919db4403fcbf362872017e2. --- .../haskell-modules/hackage-packages.nix | 91 +++++++++++++++---- 1 file changed, 72 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3acf66968e3..cc38a751ac3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24037,8 +24037,8 @@ self: { pname = "aeson-schemas"; version = "1.0.3"; sha256 = "0fmhqibw6mw9shxh94riqq465njbgjsv539xb6sx7qpkhcck2csi"; - revision = "1"; - editedCabalFile = "19fk0ccb68143mj7ndp6qflksz7vlja0gbmrqqyaf1zr5z0f9q1v"; + revision = "2"; + editedCabalFile = "0dydrwj8d7337c0qdxc7cxg8y2hb89ksli9692rvx7zfan41cpq7"; libraryHaskellDepends = [ aeson base bytestring first-class-families megaparsec template-haskell text unordered-containers @@ -44751,14 +44751,15 @@ self: { "bustle" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers, dbus - , directory, filepath, gio, gio-unix, glib, gtk3, hgettext, HUnit - , mtl, pango, pcap, process, QuickCheck, setlocale, system-glib - , test-framework, test-framework-hunit, text, time + , directory, filepath, gio, glib, gtk3, HUnit, mtl, pango, pcap + , process, QuickCheck, system-glib, test-framework + , test-framework-hunit, text, time }: mkDerivation { pname = "bustle"; version = "0.7.5"; sha256 = "0r0ng67b2q9ww0adv1fdrpmgmdyjqv6ksd9g6kkn9cjwnaascq3p"; + configureFlags = [ "-f-hgettext" ]; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -44766,18 +44767,15 @@ self: { libraryPkgconfigDepends = [ system-glib ]; executableHaskellDepends = [ base bytestring cairo containers dbus directory filepath gio glib - gtk3 hgettext mtl pango pcap process setlocale text time + gtk3 mtl pango pcap process text time ]; - executablePkgconfigDepends = [ gio-unix ]; testHaskellDepends = [ - base bytestring cairo containers dbus directory filepath gtk3 - hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework - test-framework-hunit text + base bytestring cairo containers dbus directory filepath gtk3 HUnit + mtl pango pcap QuickCheck test-framework test-framework-hunit text ]; description = "Draw sequence diagrams of D-Bus traffic"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gio-unix = null; system-glib = pkgs.glib;}; + license = stdenv.lib.licenses.lgpl21Plus; + }) {system-glib = pkgs.glib;}; "butcher" = callPackage ({ mkDerivation, base, bifunctors, containers, deque, extra, free @@ -144003,6 +144001,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "json-feed_1_0_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "1.0.8"; + sha256 = "1sagnnk73510vxdhqr2798k1s00jcsp6yfb689fpar360vfzwssm"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + description = "JSON Feed"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -158286,6 +158304,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lz4-bytes" = callPackage + ({ mkDerivation, base, byteslice, primitive, run-st, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "lz4-bytes"; + version = "0.1.0.0"; + sha256 = "02lc1ka16vfwljsh1ybp4cn39rpgiwp38qj1ayr77ha3nhjzr9z0"; + libraryHaskellDepends = [ base byteslice primitive run-st ]; + testHaskellDepends = [ + base byteslice primitive tasty tasty-quickcheck + ]; + description = "Bindings to LZ4"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lz4-conduit" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-arbitrary , conduit, conduit-extra, mtl, QuickCheck, resourcet @@ -165138,8 +165172,8 @@ self: { }: mkDerivation { pname = "mmsyn4"; - version = "0.1.5.0"; - sha256 = "0bwdngcasppsfk7znijzimgrrbiilapz4cqg45j2xvd5niaqkfkm"; + version = "0.1.6.0"; + sha256 = "0kz7wpfpvfayb6jgd0wwrb3dljcigmqdiixb7b86vyh36nzxhcfj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165155,8 +165189,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn5"; - version = "0.4.2.2"; - sha256 = "1y5f9fwc9k7hbmnk8fvm6m6h2lrdsfijr6jn0dfj6fhc17kmp46p"; + version = "0.4.3.0"; + sha256 = "02ndmx1ndm87i2xlnaarw8yljjki1k7ak0jyb5s0c7hkvlrl7qax"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; license = stdenv.lib.licenses.mit; @@ -165168,8 +165202,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.6.2.0"; - sha256 = "1qmyak0srd3ksj8kk8a8dyy6cbg9kdacdlldnpw46778a5792k0m"; + version = "0.6.3.0"; + sha256 = "0q74chfvrqf963lib315mqrvf6s5vx2fpg6zqrjprmr8254qaabm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -191127,6 +191161,8 @@ self: { pname = "polysemy"; version = "1.2.3.0"; sha256 = "0vb0k3kmzsjw45p220nw780wlax1r7mv56j06vkzqclkf8s5jky3"; + revision = "2"; + editedCabalFile = "0dzmkna6jb2im9kdslp90z6ynk2qzzg2j495i3y933ywdavvci93"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -238847,6 +238883,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-quickcheck_0_10_1_1" = callPackage + ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck + , random, tagged, tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + version = "0.10.1.1"; + sha256 = "098zyfl5958zikaqfyam75hv5l46pks5bnp3r7533bbmr4a60cpq"; + libraryHaskellDepends = [ + base optparse-applicative QuickCheck random tagged tasty + ]; + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + description = "QuickCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-quickcheck-laws" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { From 74a0d4dc3cc21f4657489a722227342136effcbd Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 16 Jan 2020 21:28:43 -0500 Subject: [PATCH 155/241] python3Packages.cirq: init at 0.6.1 Add Google's Cirq package. Uses: Quantum information science. --- .../python-modules/cirq/default.nix | 86 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 + 2 files changed, 90 insertions(+) create mode 100644 pkgs/development/python-modules/cirq/default.nix diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix new file mode 100644 index 00000000000..d6109e8aaba --- /dev/null +++ b/pkgs/development/python-modules/cirq/default.nix @@ -0,0 +1,86 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, google_api_python_client +, matplotlib +, networkx +, numpy +, pandas +, pythonProtobuf # pythonPackages.protobuf +, requests +, scipy +, sortedcontainers +, sympy +, typing-extensions + # test inputs +, pytestCheckHook +, pytest-benchmark +, ply +, pydot +, pyyaml +, pygraphviz +}: + +buildPythonPackage rec { + pname = "cirq"; + version = "0.6.1"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "quantumlib"; + repo = "cirq"; + rev = "v${version}"; + sha256 = "0lhr2dka7vpz9xd6akxphrcv2b3ni2cgjywpc1r7qpqa5mrq1q7f"; + }; + + # Cirq 0.6 requires networkx==2.3 only for optional qiskit dependency/test, disable this to avoid networkx version conflicts. https://github.com/quantumlib/Cirq/issues/2368 + # Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts + prePatch = '' + substituteInPlace requirements.txt --replace "networkx==2.3" "networkx" \ + --replace "protobuf==3.8.0" "protobuf" + + # Fix sympy 1.5 test failures. Should be fixed in v0.7 + substituteInPlace cirq/optimizers/eject_phased_paulis_test.py --replace "phase_exponent=0.125 + x / 8" "phase_exponent=0.125 + x * 0.125" + substituteInPlace cirq/contrib/quirk/cells/parse_test.py --replace "parse_formula('5t') == 5 * t" "parse_formula('5t') == 5.0 * t" + ''; + + propagatedBuildInputs = [ + google_api_python_client + numpy + matplotlib + networkx + pandas + pythonProtobuf + requests + scipy + sortedcontainers + sympy + typing-extensions + ]; + + doCheck = true; + # pythonImportsCheck = [ "cirq" "cirq.Ciruit" ]; # cirq's importlib hook doesn't work here + dontUseSetuptoolsCheck = true; + checkInputs = [ + pytestCheckHook + pytest-benchmark + ply + pydot + pyyaml + pygraphviz + ]; + # TODO: enable op_serializer_test. Error is type checking, for some reason wants bool instead of numpy.bool_. Not sure if protobuf or internal issue + pytestFlagsArray = [ + "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope + "--ignore=cirq/google/op_serializer_test.py" # investigating in https://github.com/quantumlib/Cirq/issues/2727 + ]; + + meta = with lib; { + description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; + homepage = "http://github.com/quantumlib/cirq"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a93212d0c1..81f8c7e48a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1824,6 +1824,10 @@ in { cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; + cirq = callPackage ../development/python-modules/cirq { + pythonProtobuf = self.protobuf; + }; + colorcet = callPackage ../development/python-modules/colorcet { }; coloredlogs = callPackage ../development/python-modules/coloredlogs { }; From c13bf84d45c1dbc0011d393efd2e4c867016ea01 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 27 Jan 2020 15:13:54 -0500 Subject: [PATCH 156/241] libraries.science.math.scs: 2.0.2 -> 2.1.1 --- pkgs/development/libraries/science/math/scs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 51a72585c0c..db808b093fe 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scs"; - version = "2.0.2"; + version = "2.1.1"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; - rev = "v${version}"; - sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9"; + rev = version; + sha256 = "14g5m3lcvrbwpq1bq0liq00jh0gm1947lg3z4jfsp43f6p5alb20"; }; # Actually link and add libgfortran to the rpath @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { longDescription = '' Numerical optimization package for solving large-scale convex cone problems ''; - homepage = https://github.com/cvxgrp/scs; + homepage = "https://github.com/cvxgrp/scs"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.bhipple ]; From f206eea2cf940eae20e1dbdb981d24cc3f56b684 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Jan 2020 22:12:12 +0100 Subject: [PATCH 157/241] ghc-8.10.x: add a bunch of jailbreaks to fix builds --- .../configuration-ghc-8.10.x.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5fc85101d4c..96c50aa43d3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -42,4 +42,29 @@ self: super: { unix = null; xhtml = null; + # Jailbreak to fix the build. + async = doJailbreak super.async; + hashable = doJailbreak super.hashable; + primitive_0_7_0_0 = doJailbreak (dontCheck super.primitive_0_7_0_0); # evaluating the test suite gives an infinite recursion + regex-base_0_94_0_0 = doJailbreak super.regex-base_0_94_0_0; + regex-compat_0_95_2_0 = doJailbreak super.regex-compat_0_95_2_0; + regex-posix_0_96_0_0 = doJailbreak super.regex-posix_0_96_0_0; + tar = doJailbreak super.tar; + tasty-expected-failure = doJailbreak super.tasty-expected-failure; + unliftio-core = doJailbreak super.unliftio-core; + vector = doJailbreak super.vector; + zlib = doJailbreak super.zlib; + parallel = doJailbreak super.parallel; + split = doJailbreak super.split; + + # Use the latest version to fix the build. + generic-deriving = self.generic-deriving_1_13_1; + optparse-applicative = self.optparse-applicative_0_15_1_0; + primitive = self.primitive_0_7_0_0; + regex-base = self.regex-base_0_94_0_0; + regex-compat = self.regex-compat_0_95_2_0; + regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43; + regex-posix = self.regex-posix_0_96_0_0; + regex-tdfa = self.regex-tdfa_1_3_1_0; + } From eaea88814f2a68c3205029a889d501d3323acfc2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Feb 2020 07:19:33 +1000 Subject: [PATCH 158/241] buildah: 1.13.1 -> 1.13.2 https://github.com/containers/buildah/blob/v1.13.2/CHANGELOG.md#v1132-2020-01-29 --- pkgs/development/tools/buildah/default.nix | 4 ++-- .../tools/buildah/disable-go-module-mode.patch | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 7a17d3dfb56..2711dafa689 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0swhpdr970ik6fhvmj45r84lsp1n6rxm0bgv9i1lvrxy1mdv7r9x"; + sha256 = "0860ynv93gbicpczfapvrd558dzbqicy9rv4ivyjhb6yyfgy4qai"; }; outputs = [ "bin" "man" "out" ]; diff --git a/pkgs/development/tools/buildah/disable-go-module-mode.patch b/pkgs/development/tools/buildah/disable-go-module-mode.patch index a6f211412ea..86ca9132529 100644 --- a/pkgs/development/tools/buildah/disable-go-module-mode.patch +++ b/pkgs/development/tools/buildah/disable-go-module-mode.patch @@ -12,22 +12,21 @@ buildGoPackage may lead to inconsistencies. 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile -index 9d04177d..4cf9b6a2 100644 +index 07724ce4..6383646e 100644 --- a/Makefile +++ b/Makefile -@@ -15,12 +15,7 @@ BUILDAH := buildah +@@ -15,14 +15,8 @@ BUILDAH := buildah GO := go GO110 := 1.10 GOVERSION := $(findstring $(GO110),$(shell go version)) -# test for go module support -ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) -export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor +-export GO_TEST=GO111MODULE=on $(GO) test -mod=vendor -else export GO_BUILD=$(GO) build + export GO_TEST=$(GO) test -endif - + GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed")) SOURCE_DATE_EPOCH ?= $(if $(shell date +%s),$(shell date +%s),$(error "date failed")) --- -2.24.0 - From 71db54a01f461dddd80ae9af106101221207eb98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jan 2020 23:14:55 +0000 Subject: [PATCH 159/241] gqrx: 2.11.5 -> 2.12.1 --- pkgs/applications/radio/gqrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 03acf9e1135..e95c7d77952 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.11.5"; + version = "2.12.1"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "0q9i0dhd6blagxzk84pzqjq8n4ym3jc1mkkhygg8yncr4vq2saaf"; + sha256 = "00alf3q6y313xpx6p7v43vqsphd2x4am4q362lw21bcy9wc4jidw"; }; nativeBuildInputs = [ cmake ]; From e801159c66fec7360df82ee63129db970a23470c Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Wed, 22 Jan 2020 01:13:19 -0500 Subject: [PATCH 160/241] cockatrice: 2017-08-31 -> 2019-08-31 - formatting - add wrapQtAppsHook - use fetchFromGitHub instead of fetchurl - don't construct name manually - add homepage to meta - remove repositories.get from meta - use mkDerivation instead of stdenv.mkDerivation - add qtwebsockets dependency --- pkgs/games/cockatrice/default.nix | 42 +++++++++++++++++-------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index fa3b906268d..cc85d556216 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, cmake, qtbase, qtmultimedia, protobuf, qttools +{ stdenv, fetchFromGitHub, mkDerivation, cmake, protobuf +, qtbase, qtmultimedia, qttools, qtwebsockets, wrapQtAppsHook }: -stdenv.mkDerivation rec { - name = "${pname}-unstable-${version}"; - pname = "cockatrice"; - version = "2017-01-20"; +mkDerivation rec { + pname = "cockatrice"; + version = "2019-08-31-Release-2.7.2"; - src = fetchurl { - url = "https://github.com/Cockatrice/Cockatrice/archive/${version}-Release.tar.gz"; - sha256 = "1gbcn8vffqdagidlamx670jxymhzaw28r4c6aqg3pq0s6by1l65f"; - }; + src = fetchFromGitHub { + owner = "Cockatrice"; + repo = "Cockatrice"; + rev = "${version}"; + sha256 = "17nfz4z6zfkiwcrq1rpm8bc7zh4gvcmb3fis9gdjjbji20dvcfxp"; + }; - buildInputs = [ - cmake qtbase qtmultimedia protobuf qttools - ]; + buildInputs = [ + cmake qtbase qtmultimedia protobuf qttools qtwebsockets + ]; - meta = { - repositories.git = git://github.com/Cockatrice/Cockatrice.git; - description = "A cross-platform virtual tabletop for multiplayer card games"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ spencerjanssen ]; - platforms = with stdenv.lib.platforms; linux; - }; + nativeBuildInputs = [ wrapQtAppsHook ]; + + meta = { + homepage = "https://github.com/Cockatrice/Cockatrice"; + description = "A cross-platform virtual tabletop for multiplayer card games"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ spencerjanssen ]; + platforms = with stdenv.lib.platforms; linux; + }; } From 9cc8ca50e998702690a2a50bf5ccf700486348bf Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Fri, 31 Jan 2020 19:59:22 -0500 Subject: [PATCH 161/241] cockatrice: remove spencerjanssen from maintainers --- pkgs/games/cockatrice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index cc85d556216..74a4b9a70bf 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { homepage = "https://github.com/Cockatrice/Cockatrice"; description = "A cross-platform virtual tabletop for multiplayer card games"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ spencerjanssen ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } From 4b7e4e8b1271fbd10e17cc6dd691dab6193666b0 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Fri, 31 Jan 2020 19:59:38 -0500 Subject: [PATCH 162/241] cockatrice: add evanjs to maintainers --- pkgs/games/cockatrice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 74a4b9a70bf..83ae5816b28 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { homepage = "https://github.com/Cockatrice/Cockatrice"; description = "A cross-platform virtual tabletop for multiplayer card games"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ evanjs ]; platforms = with stdenv.lib.platforms; linux; }; } From e39ecb09b7b4dd757352caab8ecc0be772f6eaf0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jan 2020 17:30:05 -0800 Subject: [PATCH 163/241] gnome3.evolution: 3.34.2 -> 3.34.3 (#78969) --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index a8c5d93b88d..a82bd0d1843 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.34.2"; + version = "3.34.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c"; + sha256 = "1s4y29iszvd3zppgxx2qc2jr1lg7ipl3072jnn8g2l3bghcvq7xq"; }; nativeBuildInputs = [ From 01ccb67598f8a475bee13c97d90a6d95013ab5ce Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 24 Jan 2020 20:36:48 -0500 Subject: [PATCH 164/241] nixos/httpd: code cleanup --- nixos/modules/services/monitoring/nagios.nix | 2 +- .../modules/services/web-apps/limesurvey.nix | 2 +- nixos/modules/services/web-apps/mediawiki.nix | 2 +- nixos/modules/services/web-apps/moodle.nix | 2 +- nixos/modules/services/web-apps/wordpress.nix | 2 +- nixos/modules/services/web-apps/zabbix.nix | 2 +- .../web-servers/apache-httpd/default.nix | 196 +++++++++--------- ...r-server-options.nix => vhost-options.nix} | 0 8 files changed, 101 insertions(+), 107 deletions(-) rename nixos/modules/services/web-servers/apache-httpd/{per-server-options.nix => vhost-options.nix} (100%) diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 3ca79dddaf5..9ac6869068f 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -154,7 +154,7 @@ in }; virtualHost = mkOption { - type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix); + type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); example = literalExample '' { hostName = "example.org"; adminAddr = "webmaster@example.org"; diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix index e00a47191c6..56265e80957 100644 --- a/nixos/modules/services/web-apps/limesurvey.nix +++ b/nixos/modules/services/web-apps/limesurvey.nix @@ -100,7 +100,7 @@ in }; virtualHost = mkOption { - type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix); + type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); example = literalExample '' { hostName = "survey.example.org"; diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 8a109b39bb5..e9ed53857d8 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -290,7 +290,7 @@ in }; virtualHost = mkOption { - type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix); + type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); example = literalExample '' { hostName = "mediawiki.example.org"; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index 595d070d940..1196780cf6e 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -140,7 +140,7 @@ in }; virtualHost = mkOption { - type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix); + type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); example = literalExample '' { hostName = "moodle.example.org"; diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index ad4f39fbf52..c48a4409737 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -209,7 +209,7 @@ let }; virtualHost = mkOption { - type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix); + type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); example = literalExample '' { adminAddr = "webmaster@example.org"; diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix index ee8447810c6..00719512834 100644 --- a/nixos/modules/services/web-apps/zabbix.nix +++ b/nixos/modules/services/web-apps/zabbix.nix @@ -113,7 +113,7 @@ in }; virtualHost = mkOption { - type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix); + type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); example = literalExample '' { hostName = "zabbix.example.org"; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 9942c63acce..2452ca20b05 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -4,21 +4,21 @@ with lib; let - mainCfg = config.services.httpd; + cfg = config.services.httpd; runtimeDir = "/run/httpd"; - httpd = mainCfg.package.out; + pkg = cfg.package.out; - httpdConf = mainCfg.configFile; + httpdConf = cfg.configFile; - php = mainCfg.phpPackage.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ }; + php = cfg.phpPackage.override { apacheHttpd = pkg.dev; /* otherwise it only gets .out */ }; phpMajorVersion = lib.versions.major (lib.getVersion php); - mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = httpd; }; + mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = pkg; }; - vhosts = attrValues mainCfg.virtualHosts; + vhosts = attrValues cfg.virtualHosts; mkListenInfo = hostOpts: if hostOpts.listen != [] then hostOpts.listen @@ -41,23 +41,18 @@ let "mime" "autoindex" "negotiation" "dir" "alias" "rewrite" "unixd" "slotmem_shm" "socache_shmcb" - "mpm_${mainCfg.multiProcessingModule}" + "mpm_${cfg.multiProcessingModule}" ] - ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ]) + ++ (if cfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ]) ++ optional enableSSL "ssl" ++ optional enableUserDir "userdir" - ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } - ++ optional mainCfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } - ++ optional mainCfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } - ++ mainCfg.extraModules; + ++ optional cfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } + ++ optional cfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } + ++ optional cfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } + ++ cfg.extraModules; - - allDenied = "Require all denied"; - allGranted = "Require all granted"; - - - loggingConf = (if mainCfg.logFormat != "none" then '' - ErrorLog ${mainCfg.logDir}/error.log + loggingConf = (if cfg.logFormat != "none" then '' + ErrorLog ${cfg.logDir}/error.log LogLevel notice @@ -66,7 +61,7 @@ let LogFormat "%{Referer}i -> %U" referer LogFormat "%{User-agent}i" agent - CustomLog ${mainCfg.logDir}/access.log ${mainCfg.logFormat} + CustomLog ${cfg.logDir}/access.log ${cfg.logFormat} '' else '' ErrorLog /dev/null ''); @@ -88,34 +83,36 @@ let sslConf = '' - SSLSessionCache shmcb:${runtimeDir}/ssl_scache(512000) + + SSLSessionCache shmcb:${runtimeDir}/ssl_scache(512000) - Mutex posixsem + Mutex posixsem - SSLRandomSeed startup builtin - SSLRandomSeed connect builtin + SSLRandomSeed startup builtin + SSLRandomSeed connect builtin - SSLProtocol ${mainCfg.sslProtocols} - SSLCipherSuite ${mainCfg.sslCiphers} - SSLHonorCipherOrder on + SSLProtocol ${cfg.sslProtocols} + SSLCipherSuite ${cfg.sslCiphers} + SSLHonorCipherOrder on + ''; mimeConf = '' - TypesConfig ${httpd}/conf/mime.types + TypesConfig ${pkg}/conf/mime.types AddType application/x-x509-ca-cert .crt AddType application/x-pkcs7-crl .crl AddType application/x-httpd-php .php .phtml - MIMEMagicFile ${httpd}/conf/magic + MIMEMagicFile ${pkg}/conf/magic ''; mkVHostConf = hostOpts: let - adminAddr = if hostOpts.adminAddr != null then hostOpts.adminAddr else mainCfg.adminAddr; + adminAddr = if hostOpts.adminAddr != null then hostOpts.adminAddr else cfg.adminAddr; listen = filter (listen: !listen.ssl) (mkListenInfo hostOpts); listenSSL = filter (listen: listen.ssl) (mkListenInfo hostOpts); @@ -203,9 +200,9 @@ let '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations))); in '' - ${optionalString mainCfg.logPerVirtualHost '' - ErrorLog ${mainCfg.logDir}/error-${hostOpts.hostName}.log - CustomLog ${mainCfg.logDir}/access-${hostOpts.hostName}.log ${hostOpts.logFormat} + ${optionalString cfg.logPerVirtualHost '' + ErrorLog ${cfg.logDir}/error-${hostOpts.hostName}.log + CustomLog ${cfg.logDir}/access-${hostOpts.hostName}.log ${hostOpts.logFormat} ''} ${optionalString (hostOpts.robotsEntries != "") '' @@ -217,7 +214,7 @@ let Options Indexes FollowSymLinks AllowOverride None - ${allGranted} + Require all granted ${optionalString hostOpts.enableUserDir '' @@ -244,7 +241,7 @@ let Alias ${elem.urlPath} ${elem.dir}/ Options +Indexes - ${allGranted} + Require all granted AllowOverride All ''; @@ -259,20 +256,20 @@ let confFile = pkgs.writeText "httpd.conf" '' - ServerRoot ${httpd} + ServerRoot ${pkg} ServerName ${config.networking.hostName} DefaultRuntimeDir ${runtimeDir}/runtime PidFile ${runtimeDir}/httpd.pid - ${optionalString (mainCfg.multiProcessingModule != "prefork") '' + ${optionalString (cfg.multiProcessingModule != "prefork") '' # mod_cgid requires this. ScriptSock ${runtimeDir}/cgisock ''} - MaxClients ${toString mainCfg.maxClients} - MaxRequestsPerChild ${toString mainCfg.maxRequestsPerChild} + MaxClients ${toString cfg.maxClients} + MaxRequestsPerChild ${toString cfg.maxRequestsPerChild} ${let @@ -281,12 +278,12 @@ let in concatStringsSep "\n" uniqueListen } - User ${mainCfg.user} - Group ${mainCfg.group} + User ${cfg.user} + Group ${cfg.group} ${let mkModule = module: - if isString module then { name = module; path = "${httpd}/modules/mod_${module}.so"; } + if isString module then { name = module; path = "${pkg}/modules/mod_${module}.so"; } else if isAttrs module then { inherit (module) name path; } else throw "Expecting either a string or attribute set including a name and path."; in @@ -296,37 +293,37 @@ let AddHandler type-map var - ${allDenied} + Require all denied ${mimeConf} ${loggingConf} ${browserHacks} - Include ${httpd}/conf/extra/httpd-default.conf - Include ${httpd}/conf/extra/httpd-autoindex.conf - Include ${httpd}/conf/extra/httpd-multilang-errordoc.conf - Include ${httpd}/conf/extra/httpd-languages.conf + Include ${pkg}/conf/extra/httpd-default.conf + Include ${pkg}/conf/extra/httpd-autoindex.conf + Include ${pkg}/conf/extra/httpd-multilang-errordoc.conf + Include ${pkg}/conf/extra/httpd-languages.conf TraceEnable off - ${if enableSSL then sslConf else ""} + ${sslConf} # Fascist default - deny access to everything. Options FollowSymLinks AllowOverride None - ${allDenied} + Require all denied # But do allow access to files in the store so that we don't have # to generate clauses for every generated file that we # want to serve. - ${allGranted} + Require all granted - ${mainCfg.extraConfig} + ${cfg.extraConfig} ${concatMapStringsSep "\n" mkVHostConf vhosts} ''; @@ -334,7 +331,7 @@ let # Generate the PHP configuration file. Should probably be factored # out into a separate module. phpIni = pkgs.runCommand "php.ini" - { options = mainCfg.phpOptions; + { options = cfg.phpOptions; preferLocalBuild = true; } '' @@ -367,17 +364,13 @@ in (mkRemovedOptionModule [ "services" "httpd" "sslServerKey" ] "Please define a virtual host using `services.httpd.virtualHosts`.") ]; - ###### interface + # interface options = { services.httpd = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable the Apache HTTP Server."; - }; + enable = mkEnableOption "the Apache HTTP Server"; package = mkOption { type = types.package; @@ -404,7 +397,7 @@ in default = ""; description = '' Configuration lines appended to the generated Apache - configuration file. Note that this mechanism may not work + configuration file. Note that this mechanism will not work when is overridden. ''; }; @@ -419,7 +412,7 @@ in ] ''; description = '' - Additional Apache modules to be used. These can be + Additional Apache modules to be used. These can be specified as a string in the case of modules distributed with Apache, or as an attribute set specifying the name and path of the @@ -458,8 +451,7 @@ in type = types.str; default = "wwwrun"; description = '' - User account under which httpd runs. The account is created - automatically if it doesn't exist. + User account under which httpd runs. ''; }; @@ -467,8 +459,7 @@ in type = types.str; default = "wwwrun"; description = '' - Group under which httpd runs. The account is created - automatically if it doesn't exist. + Group under which httpd runs. ''; }; @@ -476,15 +467,15 @@ in type = types.path; default = "/var/log/httpd"; description = '' - Directory for Apache's log files. It is created automatically. + Directory for Apache's log files. It is created automatically. ''; }; virtualHosts = mkOption { - type = with types; attrsOf (submodule (import ./per-server-options.nix)); + type = with types; attrsOf (submodule (import ./vhost-options.nix)); default = { localhost = { - documentRoot = "${httpd}/htdocs"; + documentRoot = "${pkg}/htdocs"; }; }; example = literalExample '' @@ -540,17 +531,18 @@ in '' date.timezone = "CET" ''; - description = - "Options appended to the PHP configuration file php.ini."; + description = '' + Options appended to the PHP configuration file php.ini. + ''; }; multiProcessingModule = mkOption { - type = types.str; + type = types.enum [ "event" "prefork" "worker" ]; default = "prefork"; example = "worker"; description = '' - Multi-processing module to be used by Apache. Available + Multi-processing module to be used by Apache. Available modules are prefork (the default; handles each request in a separate child process), worker (hybrid approach that starts a @@ -572,8 +564,9 @@ in type = types.int; default = 0; example = 500; - description = - "Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited"; + description = '' + Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited. + ''; }; sslCiphers = mkOption { @@ -592,10 +585,9 @@ in }; + # implementation - ###### implementation - - config = mkIf config.services.httpd.enable { + config = mkIf cfg.enable { assertions = [ { @@ -626,30 +618,30 @@ in warnings = mapAttrsToList (name: hostOpts: '' Using config.services.httpd.virtualHosts."${name}".servedFiles is deprecated and will become unsupported in a future release. Your configuration will continue to work as is but please migrate your configuration to config.services.httpd.virtualHosts."${name}".locations before the 20.09 release of NixOS. - '') (filterAttrs (name: hostOpts: hostOpts.servedFiles != []) mainCfg.virtualHosts); + '') (filterAttrs (name: hostOpts: hostOpts.servedFiles != []) cfg.virtualHosts); - users.users = optionalAttrs (mainCfg.user == "wwwrun") { + users.users = optionalAttrs (cfg.user == "wwwrun") { wwwrun = { - group = mainCfg.group; + group = cfg.group; description = "Apache httpd user"; uid = config.ids.uids.wwwrun; }; }; - users.groups = optionalAttrs (mainCfg.group == "wwwrun") { + users.groups = optionalAttrs (cfg.group == "wwwrun") { wwwrun.gid = config.ids.gids.wwwrun; }; security.acme.certs = mapAttrs (name: hostOpts: { - user = mainCfg.user; - group = mkDefault mainCfg.group; - email = if hostOpts.adminAddr != null then hostOpts.adminAddr else mainCfg.adminAddr; + user = cfg.user; + group = mkDefault cfg.group; + email = if hostOpts.adminAddr != null then hostOpts.adminAddr else cfg.adminAddr; webroot = hostOpts.acmeRoot; extraDomains = genAttrs hostOpts.serverAliases (alias: null); postRun = "systemctl reload httpd.service"; - }) (filterAttrs (name: hostOpts: hostOpts.enableACME) mainCfg.virtualHosts); + }) (filterAttrs (name: hostOpts: hostOpts.enableACME) cfg.virtualHosts); - environment.systemPackages = [httpd]; + environment.systemPackages = [ pkg ]; # required for "apachectl configtest" environment.etc."httpd/httpd.conf".source = httpdConf; @@ -700,35 +692,37 @@ in after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME; path = - [ httpd pkgs.coreutils pkgs.gnugrep ] - ++ optional mainCfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function. + [ pkg pkgs.coreutils pkgs.gnugrep ] + ++ optional cfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function. environment = - optionalAttrs mainCfg.enablePHP { PHPRC = phpIni; } - // optionalAttrs mainCfg.enableMellon { LD_LIBRARY_PATH = "${pkgs.xmlsec}/lib"; }; + optionalAttrs cfg.enablePHP { PHPRC = phpIni; } + // optionalAttrs cfg.enableMellon { LD_LIBRARY_PATH = "${pkgs.xmlsec}/lib"; }; preStart = '' - mkdir -m 0700 -p ${mainCfg.logDir} + mkdir -m 0700 -p ${cfg.logDir} # Get rid of old semaphores. These tend to accumulate across # server restarts, eventually preventing it from restarting # successfully. - for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${mainCfg.user} ' | cut -f2 -d ' '); do + for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do ${pkgs.utillinux}/bin/ipcrm -s $i done ''; - serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}"; - serviceConfig.ExecStop = "${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop"; - serviceConfig.ExecReload = "${httpd}/bin/httpd -f ${httpdConf} -k graceful"; - serviceConfig.Group = mainCfg.group; - serviceConfig.Type = "forking"; - serviceConfig.PIDFile = "${runtimeDir}/httpd.pid"; - serviceConfig.Restart = "always"; - serviceConfig.RestartSec = "5s"; - serviceConfig.RuntimeDirectory = "httpd httpd/runtime"; - serviceConfig.RuntimeDirectoryMode = "0750"; + serviceConfig = { + ExecStart = "@${pkg}/bin/httpd httpd -f ${httpdConf}"; + ExecStop = "${pkg}/bin/httpd -f ${httpdConf} -k graceful-stop"; + ExecReload = "${pkg}/bin/httpd -f ${httpdConf} -k graceful"; + Group = cfg.group; + Type = "forking"; + PIDFile = "${runtimeDir}/httpd.pid"; + Restart = "always"; + RestartSec = "5s"; + RuntimeDirectory = "httpd httpd/runtime"; + RuntimeDirectoryMode = "0750"; + }; }; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix similarity index 100% rename from nixos/modules/services/web-servers/apache-httpd/per-server-options.nix rename to nixos/modules/services/web-servers/apache-httpd/vhost-options.nix From 02247205624a3fc260764cba954e75989775ec86 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 28 Jan 2020 19:29:14 -0500 Subject: [PATCH 165/241] nixos/httpd: provision log directory with tmpfiles instead of mkdir --- .../services/web-servers/apache-httpd/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 2452ca20b05..3200a26364f 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -681,6 +681,15 @@ in "access_compat" ]; + systemd.tmpfiles.rules = + let + svc = config.systemd.services.httpd.serviceConfig; + in + [ + "d '${cfg.logDir}' 0700 ${svc.User} ${svc.Group}" + "Z '${cfg.logDir}' - ${svc.User} ${svc.Group}" + ]; + systemd.services.httpd = let vhostsACME = filter (hostOpts: hostOpts.enableACME) vhosts; @@ -701,8 +710,6 @@ in preStart = '' - mkdir -m 0700 -p ${cfg.logDir} - # Get rid of old semaphores. These tend to accumulate across # server restarts, eventually preventing it from restarting # successfully. @@ -715,6 +722,7 @@ in ExecStart = "@${pkg}/bin/httpd httpd -f ${httpdConf}"; ExecStop = "${pkg}/bin/httpd -f ${httpdConf} -k graceful-stop"; ExecReload = "${pkg}/bin/httpd -f ${httpdConf} -k graceful"; + User = "root"; Group = cfg.group; Type = "forking"; PIDFile = "${runtimeDir}/httpd.pid"; From d13360bfb77b645cf7ee7dae314e3741d7d7d267 Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 31 Jan 2020 18:00:45 -0800 Subject: [PATCH 166/241] lua5: Fix src URLs The 672c3c1d2a8ed40c1ef6bd29823af6a8c915584c refactor accidentally dropped the last version component from the source URLs. This change puts its back. $ for lua in lua5_{1,2,3};do nix-instantiate --json --eval . -A $lua.src.urls | jq -r '.[]' | xargs nix-prefetch-url; done Before this change: lua-5.1.tar.gz 1hbjhh211p82vhwqhx4mmhmvhv56060acnka80gbmfdk3q3bjnvz (wrong hash because this is lua 5.1.0. We want 5.1.5 ) lua-5.2.tar.gz HTTP error 404 lua-5.3.tar.gz HTTP error 404 After this change: lua-5.1.5.tar.gz 0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16 lua-5.2.4.tar.gz 0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr <-- Desired hash lua-5.3.5.tar.gz 1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc Converted to base16 with `nix-hash --type sha256 --to-base16`: lua-5.1.5.tar.gz 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 <-- Desired hash lua-5.2.4.tar.gz b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b lua-5.3.5.tar.gz 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac <-- Desired hash --- pkgs/development/interpreters/lua-5/interpreter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index fb0021cb709..6fc2e53b961 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -17,7 +17,7 @@ self = stdenv.mkDerivation rec { version = "${luaversion}.${sourceVersion.patch}"; src = fetchurl { - url = "https://www.lua.org/ftp/${pname}-${luaversion}.tar.gz"; + url = "https://www.lua.org/ftp/${pname}-${version}.tar.gz"; sha256 = hash; }; From dd0efcdb0b031b63451713402a1df9a41346567f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 02:02:09 +0000 Subject: [PATCH 167/241] hylafaxplus: 7.0.1 -> 7.0.2 --- pkgs/servers/hylafaxplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 828098e6de8..289ae59d379 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -30,8 +30,8 @@ let name = "hylafaxplus-${version}"; - version = "7.0.1"; - sha256 = "0ckgmk0vffjifxgmb594fmjmmsq3q9gsasrk3g8sb2v7h6q4r2vz"; + version = "7.0.2"; + sha256 = "17vym1gz5ppy3q6zbw2y4nkq1dspn31k12zcmva44fnw9diwvsfb"; configSite = substituteAll { name = "hylafaxplus-config.site"; From 2a04e3bb8d37fc345ae8159e7724200fb57b140b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 31 Jan 2020 19:07:02 -0500 Subject: [PATCH 168/241] phpPackages.sqlsrv: 5.6.1 -> 5.8.0 --- pkgs/top-level/php-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 8a610392110..44b55790bff 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -614,14 +614,12 @@ let }; sqlsrv = buildPecl { - version = "5.6.1"; + version = "5.8.0"; pname = "sqlsrv"; - sha256 = "0ial621zxn9zvjh7k1h755sm2lc9aafc389yxksqcxcmm7kqmd0a"; + sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; - buildInputs = [ pkgs.unixODBC ]; - - meta.broken = isPhp74; # Build error + buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; }; v8 = buildPecl { From a6bc6fbb0bfebac2bffa2f2456a4bf868de0446b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 31 Jan 2020 19:08:42 -0500 Subject: [PATCH 169/241] phpPackages.pdo_sqlsrv: 5.6.1 -> 5.8.0 --- pkgs/top-level/php-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 44b55790bff..e439ebe7188 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -288,14 +288,12 @@ let }; pdo_sqlsrv = buildPecl { - version = "5.6.1"; + version = "5.8.0"; pname = "pdo_sqlsrv"; - sha256 = "02ill1iqffa5fha9iz4y91823scml24ikfk8pn90jyycfwv07x6a"; + sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll"; - buildInputs = [ pkgs.unixODBC ]; - - meta.broken = isPhp74; # Build error + buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; }; php-cs-fixer = mkDerivation rec { From 097737b5a44b8dfd06647a56bcc991e8dfb12686 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 03:50:56 +0000 Subject: [PATCH 170/241] jmol: 14.30.1 -> 14.30.2 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 2577b2a16e6..7259705bc80 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.30.1"; + version = "14.30.2"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0qnxsw6pjjkn6yigrfh85fz58ibqdmbv1jhf6i5q68wm5pr1ff3d"; + sha256 = "0f9sxhxyqrd1vvmq566v1zpzzlci37pm9j7alzak766x5dg5yyz1"; }; patchPhase = '' From afd0330e6ff43580573c1ae11849d83a764f9195 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 04:03:41 +0000 Subject: [PATCH 171/241] latex2html: 2019.2 -> 2020 --- pkgs/tools/misc/latex2html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 59f52c5cf6f..c379a0d1abc 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2019.2"; + version = "2020"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1bcdhbaxf334wlxzkw5samj2y2q173709y0km3x8xs4bbh70ds6c"; + sha256 = "0z53pdf8pvarlqb3kbdz0w2r6922mv7mcdna5qp5z24wspfmv3zn"; }; buildInputs = [ ghostscript netpbm perl ]; From 171982e2a9f576d2a3f035dbba22e4300616d456 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 29 Jan 2020 16:35:10 -0800 Subject: [PATCH 172/241] kubernetes-helm: 3.0.1 -> 3.0.3 and improve build meta --- pkgs/applications/networking/cluster/helm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 45b6e9dcf33..318253f2c43 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "helm"; - version = "3.0.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0l5rmmrb6b57w1szwp6g7ad3xv0pgvc394mzjr4bi3bzcjsn7wny"; + sha256 = "1gdrm3zz7524c8v3g128drfzdyalxlipbzxmwhalm7px4p5z4n0j"; }; - modSha256 = "0xjzzwmq3i77anb7w2qfnz7vc0gxq02lylj0xs6dzwl543winshm"; + modSha256 = "1kmm6yb03g9lsz380rvf32j4icp3rcq7ixxcgsxfgpwqvq08zkn6"; goPackagePath = "k8s.io/helm"; subPackages = [ "cmd/helm" ]; - buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.gitCommit=v${version}" ]; + buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -27,6 +27,6 @@ buildGoModule rec { homepage = https://github.com/kubernetes/helm; description = "A package manager for kubernetes"; license = licenses.asl20; - maintainers = with maintainers; [ rlupton20 edude03 saschagrunert ]; + maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ]; }; } From 6f2523e1b3d9f9eb4d3f3d59f9e8d962efc1a6e9 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 30 Jan 2020 14:07:08 -0800 Subject: [PATCH 173/241] kubernetes-helm: drop unneeded goPackagePath from legacy go support Co-Authored-By: Wael Nasreddine --- pkgs/applications/networking/cluster/helm/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 318253f2c43..6ceee567592 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -12,7 +12,6 @@ buildGoModule rec { }; modSha256 = "1kmm6yb03g9lsz380rvf32j4icp3rcq7ixxcgsxfgpwqvq08zkn6"; - goPackagePath = "k8s.io/helm"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; From 05a3625d36924183fdcd54a8be3d3494dae44da3 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 1 Feb 2020 13:52:20 +0800 Subject: [PATCH 174/241] brook: 20200102 -> 20200201 --- pkgs/tools/networking/brook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index 1b3b22b2adf..48da63ae855 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "brook"; - version = "20200102"; + version = "20200201"; goPackagePath = "github.com/txthinking/brook"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "17h74p4apghljiyqjxgk6c4hqnyqs4lsn15gbysx26r4cvzglpx6"; + sha256 = "0fyw2q99gapnrg836x299sgagx94a5jpw4x3gnsf69fih7cqp9lm"; }; goDeps = ./deps.nix; From e2ad8ef8cf3032efe2edb4b11a273b760c90a005 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Sun, 27 Oct 2019 17:06:10 +0100 Subject: [PATCH 175/241] tpm2-pkcs11: init at v1.0.1 --- .../0001-configure-ac-version.patch | 13 +++ pkgs/misc/tpm2-pkcs11/default.nix | 79 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 94 insertions(+) create mode 100644 pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch create mode 100644 pkgs/misc/tpm2-pkcs11/default.nix diff --git a/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch b/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch new file mode 100644 index 00000000000..fa2575cb938 --- /dev/null +++ b/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index e861e42..018c19c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,7 +26,7 @@ + #;**********************************************************************; + + AC_INIT([tpm2-pkcs11], +- [m4_esyscmd_s([git describe --tags --always --dirty])], ++ [git-@VERSION@], + [https://github.com/tpm2-software/tpm2-pkcs11/issues], + [], + [https://github.com/tpm2-software/tpm2-pkcs11]) diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix new file mode 100644 index 00000000000..d34619d5b52 --- /dev/null +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -0,0 +1,79 @@ +{ stdenv, lib, fetchFromGitHub, substituteAll +, pkgconfig, autoreconfHook, autoconf-archive, makeWrapper, patchelf +, tpm2-tss, tpm2-tools, opensc, openssl, sqlite, python37, glibc, libyaml +, abrmdSupport ? true, tpm2-abrmd ? null +}: + +stdenv.mkDerivation rec { + pname = "tpm2-pkcs11"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = pname; + rev = version; + sha256 = "sha256:06kpf730al50xv1q53ahycky3im23ysrqp40libls4k24zxs9ha2"; + }; + + patches = lib.singleton ( + substituteAll { + src = ./0001-configure-ac-version.patch; + VERSION = version; + }); + + # The preConfigure phase doesn't seem to be working here + # ./bootstrap MUST be executed as the first step, before all + # of the autoreconfHook stuff + postPatch = '' + ./bootstrap + ''; + + nativeBuildInputs = [ + pkgconfig autoreconfHook autoconf-archive makeWrapper patchelf + ]; + buildInputs = [ + tpm2-tss tpm2-tools opensc openssl sqlite libyaml + (python37.withPackages (ps: [ ps.pyyaml ps.cryptography ps.pyasn1-modules ])) + ]; + + outputs = [ "out" "bin" "dev" ]; + + dontStrip = true; + dontPatchELF = true; + + # To be able to use the userspace resource manager, the RUNPATH must + # explicitly include the tpm2-abrmd shared libraries. + preFixup = let + rpath = lib.makeLibraryPath ( + (lib.optional abrmdSupport tpm2-abrmd) + ++ [ + tpm2-tss + sqlite + openssl + glibc + libyaml + ] + ); + in '' + patchelf \ + --set-rpath ${rpath} \ + ${lib.optionalString abrmdSupport "--add-needed ${lib.makeLibraryPath [tpm2-abrmd]}/libtss2-tcti-tabrmd.so"} \ + --add-needed ${lib.makeLibraryPath [tpm2-tss]}/libtss2-tcti-device.so \ + $out/lib/libtpm2_pkcs11.so.0.0.0 + ''; + + postInstall = '' + mkdir -p $bin/bin/ $bin/share/tpm2_pkcs11/ + mv ./tools/* $bin/share/tpm2_pkcs11/ + makeWrapper $bin/share/tpm2_pkcs11/tpm2_ptool.py $bin/bin/tpm2_ptool \ + --prefix PATH : ${lib.makeBinPath [ tpm2-tools ]} + ''; + + meta = with lib; { + description = "A PKCS#11 interface for TPM2 hardware"; + homepage = https://github.com/tpm2-software/tpm2-pkcs11; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ lschuermann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bb7da68843..20b00f37535 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6847,6 +6847,8 @@ in tpm2-abrmd = callPackage ../tools/security/tpm2-abrmd { }; + tpm2-pkcs11 = callPackage ../misc/tpm2-pkcs11 { }; + tpm2-tools = callPackage ../tools/security/tpm2-tools { }; trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules {}; From 1e5cfc9cc88b3f11bca636069ea3aa1525a9c579 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Jan 2020 04:20:00 -0500 Subject: [PATCH 176/241] cointop: 1.4.1 -> 1.4.4 --- pkgs/applications/misc/cointop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 29700774219..ef897d2ea59 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = version; - sha256 = "067jsn66xs30d5yz9z8cvpxbvh8a95kllkb2wk134c43bfxy2m34"; + sha256 = "12yi1lmyd5y4cgcjclkczf93jj7wd6k8aqnhq21dd1mx65l77swv"; }; goPackagePath = "github.com/miguelmota/cointop"; From eaf1fbaef4b5c0c0b5e51a8183867efd7d5c99e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2020 10:07:37 +0100 Subject: [PATCH 177/241] nixos-rebuild: --use-remote-sudo does not take an argument Also remove outdated comment about trailing space. --- nixos/modules/installer/tools/nixos-rebuild.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 61b4af11027..7db323d38e6 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -91,9 +91,7 @@ while [ "$#" -gt 0 ]; do shift 1 ;; --use-remote-sudo) - # note the trailing space maybeSudo=(sudo --) - shift 1 ;; *) echo "$0: unknown option \`$i'" From b08aab73db154ff1dc3755c9690dff08044e2e69 Mon Sep 17 00:00:00 2001 From: ahiaao Date: Fri, 29 Nov 2019 13:32:18 -0800 Subject: [PATCH 178/241] ocamlPackages.nocrypto: Fixed crashes caused by build nondeterminism --- pkgs/development/ocaml-modules/nocrypto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 833da3bb67c..be4befe9c1c 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocamlbuild findlib topkg cpuid ocb-stubblr ]; propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; - buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}"; + buildPhase = "${topkg.buildPhase} --accelerate false --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; meta = { From 8bad3b174916e9b72392e5434363c4c88dc1049c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 1 Feb 2020 07:20:12 -0300 Subject: [PATCH 179/241] xfce.catfish: 1.4.12 -> 1.4.13 --- pkgs/desktops/xfce/applications/catfish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 736e89a4f44..7b9587b988b 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "catfish"; - version = "1.4.12"; + version = "1.4.13"; src = fetchurl { url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0jhk4x97vip6h7rsw8hbwzfjmz55w6dpcj9v96m54xr15gh31yy3"; + sha256 = "0fg89946z6n8njxn4mv29jksw8yavg8vypsljn9031pjwl3fmh2q"; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://docs.xfce.org/apps/catfish/start; + homepage = "https://docs.xfce.org/apps/catfish/start"; description = "Handy file search tool"; longDescription = '' Catfish is a handy file searching tool. The interface is From ab6f52db5936e03f296f3dee8af0e9807557086c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 10:37:15 +0000 Subject: [PATCH 180/241] ocamlPackages.lambdaTerm: 2.0.2 -> 2.0.3 --- pkgs/development/ocaml-modules/lambda-term/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 1b5594d5565..89009c6d4bc 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "lambda-term"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz"; - sha256 = "1p9yczrx78pf5hvhcg1qiqb2vdlmw6bmhhjsm4wiqjq2cc6piaqw"; + sha256 = "1n1b3ffj41a1lm2315hh870yj9h8gg8g9jcxha6dr3xx8r84np3v"; }; buildInputs = [ libev ]; From 2485e6399e1737d9795f836bb057ab0daf719f03 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 30 Jan 2020 11:55:50 +0100 Subject: [PATCH 181/241] nixos/networking-interfaces: change preferTempAddress to allow disabling temp addresses --- nixos/modules/tasks/network-interfaces.nix | 63 +++++++++++++++++----- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 31e2ed1cd1e..cef9c38c2e3 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -143,13 +143,34 @@ let description = "Name of the interface."; }; - preferTempAddress = mkOption { - type = types.bool; - default = cfg.enableIPv6; - defaultText = literalExample "config.networking.enableIPv6"; + tempAddress = mkOption { + type = types.enum [ "default" "enabled" "disabled" ]; + default = if cfg.enableIPv6 then "default" else "disabled"; + defaultText = literalExample ''if cfg.enableIPv6 then "default" else "disabled"''; description = '' - When using SLAAC prefer a temporary (IPv6) address over the EUI-64 - address for originating connections. This is used to reduce tracking. + When IPv6 is enabled with SLAAC, this option controls the use of + temporary address (aka privacy extensions). This is used to reduce tracking. + The three possible values are: + + + + + "default" to generate temporary addresses and use + them by default; + + + + + "enabled" to generate temporary addresses but keep + using the standard EUI-64 ones by default; + + + + + "disabled" to completely disable temporary addresses. + + + ''; }; @@ -287,6 +308,11 @@ let let defined = x: x != "_mkMergedOptionModule"; in [ + (mkChangedOptionModule [ "preferTempAddress" ] [ "tempAddress" ] + (config: + let bool = getAttrFromPath [ "preferTempAddress" ] config; + in if bool then "default" else "enabled" + )) (mkRenamedOptionModule [ "ip4" ] [ "ipv4" "addresses"]) (mkRenamedOptionModule [ "ip6" ] [ "ipv6" "addresses"]) (mkRemovedOptionModule [ "subnetMask" ] '' @@ -945,7 +971,7 @@ in The networking.interfaces."${i.name}" must not have any defined ips when it is a slave. ''; })) ++ (forEach interfaces (i: { - assertion = i.preferTempAddress -> cfg.enableIPv6; + assertion = i.tempAddress != "disabled" -> cfg.enableIPv6; message = '' Temporary addresses are only needed when IPv6 is enabled. ''; @@ -973,8 +999,11 @@ in "net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces); } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces) (i: forEach [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" true))) - // listToAttrs (forEach (filter (i: i.preferTempAddress) interfaces) - (i: nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" 2)); + // listToAttrs (forEach interfaces + (i: let + opt = i.tempAddress; + val = { disabled = 0; enabled = 1; default = 2; }.${opt}; + in nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" val)); # Capabilities won't work unless we have at-least a 4.3 Linux # kernel because we need the ambient capability @@ -1103,10 +1132,18 @@ in (pkgs.writeTextFile rec { name = "ipv6-privacy-extensions.rules"; destination = "/etc/udev/rules.d/99-${name}"; - text = concatMapStrings (i: '' - # enable IPv6 privacy addresses but prefer EUI-64 addresses for ${i.name} - ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=1" - '') (filter (i: !i.preferTempAddress) interfaces); + text = concatMapStrings (i: + let + opt = i.tempAddress; + val = if opt == "disabled" then 0 else 1; + msg = if opt == "disabled" + then "completely disable IPv6 privacy addresses" + else "enable IPv6 privacy addresses but prefer EUI-64 addresses"; + in + '' + # override to ${msg} for ${i.name} + ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr=${toString val}" + '') (filter (i: i.tempAddress != "default") interfaces); }) ] ++ lib.optional (cfg.wlanInterfaces != {}) (pkgs.writeTextFile { From 1d9538d77a335b4fcee44073e3b0d8cbf0bec03f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 30 Jan 2020 11:57:09 +0100 Subject: [PATCH 182/241] nixos/tests/networking: use new tempAddress option --- nixos/tests/networking.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 9448a104073..933a4451af9 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -533,7 +533,7 @@ let useNetworkd = networkd; useDHCP = false; interfaces.eth1 = { - preferTempAddress = true; + tempAddress = "default"; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; useDHCP = true; @@ -546,7 +546,7 @@ let useNetworkd = networkd; useDHCP = false; interfaces.eth1 = { - preferTempAddress = false; + tempAddress = "enabled"; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; useDHCP = true; From 0c19bfb8ac31e99b1707d83dabaec5438171c516 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 30 Jan 2020 11:57:58 +0100 Subject: [PATCH 183/241] nixos/docs: document preferTempAddress -> tempAddress change --- nixos/doc/manual/release-notes/rl-2003.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 13981c0853d..186db88d237 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -539,6 +539,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet The LLVM versions 3.5, 3.9 and 4 (including the corresponding CLang versions) have been dropped. + + + The option has + been replaced by . + The new option allows better control of the IPv6 temporary addresses, + including completely disabling them for interfaces where they are not + needed. + + From 3086338f9dabb17d6c209606d661991d9a98f4a0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 7 Jan 2020 16:06:23 +0100 Subject: [PATCH 184/241] yosys: user placeholder --- pkgs/development/compilers/yosys/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 8948af17145..cd34f95c691 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,8 +1,15 @@ -{ stdenv, fetchFromGitHub -, pkgconfig, bison, flex -, tcl, readline, libffi, python3 -, protobuf, zlib +{ stdenv +, bison +, fetchFromGitHub +, flex +, libffi +, pkgconfig +, protobuf +, python3 +, readline +, tcl , verilog +, zlib }: with builtins; @@ -37,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; - makeFlags = [ "ENABLE_PROTOBUF=1" ]; + makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; patchPhase = '' substituteInPlace ../yosys-abc/Makefile \ @@ -58,7 +65,6 @@ stdenv.mkDerivation rec { ln -s ../yosys-abc abc make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCREV := default' >> Makefile.conf - makeFlags="PREFIX=$out $makeFlags" # we have to do this ourselves for some reason... (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) From e0b28fb806ff748c3c12aa33e82eb6a63ea0da11 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 7 Jan 2020 16:09:08 +0100 Subject: [PATCH 185/241] yosys: don't use srcs array, but single src --- pkgs/development/compilers/yosys/default.nix | 52 +++++++++----------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index cd34f95c691..c6684c631e4 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -14,31 +14,27 @@ with builtins; -stdenv.mkDerivation rec { +let + # NOTE: the version of abc used here is synchronized with + # the one in the yosys Makefile of the version above; + # keep them the same for quality purposes. + abc = fetchFromGitHub { + owner = "berkeley-abc"; + repo = "abc"; + rev = "623b5e82513d076a19f864c01930ad1838498894"; + sha256 = "1mrfqwsivflqdzc3531r6mzp33dfyl6dnqjdwfcq137arqh36m67"; + }; +in stdenv.mkDerivation rec { pname = "yosys"; version = "2019.10.18"; - srcs = [ - (fetchFromGitHub { - owner = "yosyshq"; - repo = "yosys"; - rev = "3c41599ee1f62e4d77ba630fa1a245ef3fe236fa"; - sha256 = "0jg2g8v08ax1q6qlvn8c1h147m03adzrgf21043xwbh4c7s5k137"; - name = "yosys"; - }) - - # NOTE: the version of abc used here is synchronized with - # the one in the yosys Makefile of the version above; - # keep them the same for quality purposes. - (fetchFromGitHub { - owner = "berkeley-abc"; - repo = "abc"; - rev = "623b5e82513d076a19f864c01930ad1838498894"; - sha256 = "1mrfqwsivflqdzc3531r6mzp33dfyl6dnqjdwfcq137arqh36m67"; - name = "yosys-abc"; - }) - ]; - sourceRoot = "yosys"; + src = fetchFromGitHub { + owner = "yosyshq"; + repo = "yosys"; + rev = "3c41599ee1f62e4d77ba630fa1a245ef3fe236fa"; + sha256 = "0jg2g8v08ax1q6qlvn8c1h147m03adzrgf21043xwbh4c7s5k137"; + name = "yosys"; + }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; @@ -47,22 +43,22 @@ stdenv.mkDerivation rec { makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; patchPhase = '' - substituteInPlace ../yosys-abc/Makefile \ - --replace 'CC := gcc' "" \ - --replace 'CXX := g++' "" substituteInPlace ./Makefile \ --replace 'CXX = clang' "" \ --replace 'LD = clang++' 'LD = $(CXX)' \ --replace 'CXX = gcc' "" \ --replace 'LD = gcc' 'LD = $(CXX)' \ --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \ - --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' + --replace 'echo UNKNOWN' 'echo ${substring 0 10 src.rev}' patchShebangs tests ''; preBuild = '' - chmod -R u+w ../yosys-abc - ln -s ../yosys-abc abc + cp -R ${abc} abc + chmod -R u+w . + substituteInPlace abc/Makefile \ + --replace 'CC := gcc' "" \ + --replace 'CXX := g++' "" make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCREV := default' >> Makefile.conf From 62af92b848476e9ae92dae11dfea47f8d560e1eb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 1 Feb 2020 12:48:46 +0100 Subject: [PATCH 186/241] cppcheck: 1.88 -> 1.90 --- pkgs/development/tools/analysis/cppcheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 1b7467608be..0f3e810ec42 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.88"; + version = "1.90"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1jiqv9pzzy2gxkdhxv3gqjarwgbvc7kxyc66dm3i6xwp94bl89dv"; + sha256 = "10qqyvx44llbchwqjyipra0nzqqkb9majpp582ac55imc5b8sxa3"; }; buildInputs = [ pcre ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; - makeFlags = [ "PREFIX=$(out)" "CFGDIR=$(out)/cfg" "HAVE_RULES=yes" ]; + makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ]; outputs = [ "out" "man" ]; From 48085826fa1cd014a9dd97365fe63fbff7ea40f4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 12:11:30 +0100 Subject: [PATCH 187/241] yosys: use external abc --- pkgs/development/compilers/yosys/default.nix | 27 +++----------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index c6684c631e4..f034d88b0dc 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,4 +1,5 @@ { stdenv +, abc-verifier , bison , fetchFromGitHub , flex @@ -12,19 +13,7 @@ , zlib }: -with builtins; - -let - # NOTE: the version of abc used here is synchronized with - # the one in the yosys Makefile of the version above; - # keep them the same for quality purposes. - abc = fetchFromGitHub { - owner = "berkeley-abc"; - repo = "abc"; - rev = "623b5e82513d076a19f864c01930ad1838498894"; - sha256 = "1mrfqwsivflqdzc3531r6mzp33dfyl6dnqjdwfcq137arqh36m67"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "yosys"; version = "2019.10.18"; @@ -49,18 +38,14 @@ in stdenv.mkDerivation rec { --replace 'CXX = gcc' "" \ --replace 'LD = gcc' 'LD = $(CXX)' \ --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \ - --replace 'echo UNKNOWN' 'echo ${substring 0 10 src.rev}' + --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' patchShebangs tests ''; preBuild = '' - cp -R ${abc} abc chmod -R u+w . - substituteInPlace abc/Makefile \ - --replace 'CC := gcc' "" \ - --replace 'CXX := g++' "" make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} - echo 'ABCREV := default' >> Makefile.conf + echo 'ABCEXTERNAL = ${abc-verifier}/bin/abc' >> Makefile.conf # we have to do this ourselves for some reason... (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) @@ -68,10 +53,6 @@ in stdenv.mkDerivation rec { doCheck = true; checkInputs = [ verilog ]; - # checkPhase defaults to VERBOSE=y, which gets passed down to abc, - # which then does $(VERBOSE)gcc, which then complains about not - # being able to find ygcc. Life is pain. - checkFlags = [ " " ]; meta = { description = "Framework for RTL synthesis tools"; From 214cac8b26d69b8841e5042e3f0bc2720a75f9f3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 12:15:45 +0100 Subject: [PATCH 188/241] yosys: 2019.10.18 -> 2020.02.01 --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index f034d88b0dc..b34125bcacd 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2019.10.18"; + version = "2020.02.01"; src = fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "3c41599ee1f62e4d77ba630fa1a245ef3fe236fa"; - sha256 = "0jg2g8v08ax1q6qlvn8c1h147m03adzrgf21043xwbh4c7s5k137"; + rev = "a1c840ca5d6e8b580e21ae48550570aa9665741a"; + sha256 = "1vna04dh6l68nifssgs3hxqwn4k529krmm4crj94a8wwhwra52mh"; name = "yosys"; }; From 351f47da57f5fdae14877147ca8b0898273256d9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 12:16:45 +0100 Subject: [PATCH 189/241] abc-verifier: 2018-07-08 -> 2020-01-11 --- pkgs/applications/science/logic/abc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index c832d12627a..0252273efd0 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "abc-verifier"; - version = "2018-07-08"; + version = "2020-01-11"; src = fetchFromGitHub { owner = "berkeley-abc"; repo = "abc"; - rev = "24407e13db4b8ca16c3996049b2d33ec3722de39"; - sha256 = "1rckji7nk81n6v1yajz7daqwipxacv7zlafknvmbiwji30j47sq5"; + rev = "71f2b40320127561175ad60f6f2428f3438e5243"; + sha256 = "15sn146ajxql7l1h8rsag5lhn4spwvgjhwzqawfr78snzadw8by3"; }; nativeBuildInputs = [ cmake ]; From 570afbcb5bec1585f01eeefa48afe57410e84914 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 12:33:46 +0100 Subject: [PATCH 190/241] abc-verifier: passthru rev Some consumers of abc-verifier require certain abc versions. For that reason, expose the exact rev via a passtrhru. --- pkgs/applications/science/logic/abc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 0252273efd0..8551a3ee4ca 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -1,16 +1,20 @@ { fetchFromGitHub, stdenv, readline, cmake }: -stdenv.mkDerivation { +let + rev = "71f2b40320127561175ad60f6f2428f3438e5243"; +in stdenv.mkDerivation { pname = "abc-verifier"; version = "2020-01-11"; src = fetchFromGitHub { + inherit rev; owner = "berkeley-abc"; repo = "abc"; - rev = "71f2b40320127561175ad60f6f2428f3438e5243"; sha256 = "15sn146ajxql7l1h8rsag5lhn4spwvgjhwzqawfr78snzadw8by3"; }; + passthru.rev = rev; + nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; From b437fa4c523e80b74307bf602ebd0a30d18efc63 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 12:34:30 +0100 Subject: [PATCH 191/241] yosys: check abc-verifier rev to ensure compatibility --- pkgs/development/compilers/yosys/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index b34125bcacd..7027c5a0523 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -42,13 +42,20 @@ stdenv.mkDerivation rec { patchShebangs tests ''; - preBuild = '' + preBuild = let + shortAbcRev = builtins.substring 0 7 abc-verifier.rev; + in '' chmod -R u+w . make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCEXTERNAL = ${abc-verifier}/bin/abc' >> Makefile.conf # we have to do this ourselves for some reason... (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) + + if ! grep -q "ABCREV = ${shortAbcRev}" Makefile;then + echo "yosys isn't compatible with the provided abc (${shortAbcRev}), failing." + exit 1 + fi ''; doCheck = true; From 4d5d5ed62d8d19cf5815d8ff0926d5f6d83fa8f3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 1 Feb 2020 13:36:10 +0100 Subject: [PATCH 192/241] rmilter: remove unused files The merge 98640fd48212f8e6552517f667bba1901f5936d4 was done incorrectly. --- pkgs/servers/mail/rmilter/default.nix | 33 --------------------------- 1 file changed, 33 deletions(-) delete mode 100644 pkgs/servers/mail/rmilter/default.nix diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix deleted file mode 100644 index 9d7730e399f..00000000000 --- a/pkgs/servers/mail/rmilter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, bison, flex, pkgconfig, openssl, pcre -, libmilter, opendkim, libmemcached, glib }: - -let patchedLibmilter = stdenv.lib.overrideDerivation libmilter (_ : { - patches = libmilter.patches ++ [ ./fd-passing-libmilter.patch ]; -}); -in - -stdenv.mkDerivation rec { - pname = "rmilter"; - version = "1.10.0"; - - src = fetchFromGitHub { - owner = "vstakhov"; - repo = "rmilter"; - rev = version; - sha256 = "1gbp6jah88l6xqgflim01ycyp63l733bgir65fxnnrmifj1qzymh"; - }; - - nativeBuildInputs = [ bison cmake flex pkgconfig ]; - buildInputs = [ libmemcached patchedLibmilter openssl pcre opendkim glib ]; - - meta = with stdenv.lib; { - homepage = https://github.com/vstakhov/rmilter; - license = licenses.asl20; - description = '' - Daemon to integrate rspamd and milter compatible MTA, for example - postfix or sendmail - ''; - maintainers = with maintainers; [ avnik fpletz ]; - platforms = with platforms; linux; - }; -} From 41483340c47f5f37277c9c293b80db8679157178 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 1 Feb 2020 13:51:26 +0100 Subject: [PATCH 193/241] b3sum: init at 0.1.3 --- .../tools/security/b3sum/add-cargo-lock.patch | 585 ++++++++++++++++++ pkgs/tools/security/b3sum/default.nix | 27 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 614 insertions(+) create mode 100644 pkgs/tools/security/b3sum/add-cargo-lock.patch create mode 100644 pkgs/tools/security/b3sum/default.nix diff --git a/pkgs/tools/security/b3sum/add-cargo-lock.patch b/pkgs/tools/security/b3sum/add-cargo-lock.patch new file mode 100644 index 00000000000..309e0f147e7 --- /dev/null +++ b/pkgs/tools/security/b3sum/add-cargo-lock.patch @@ -0,0 +1,585 @@ +--- /dev/null 2020-01-18 15:11:39.204798767 +0100 ++++ b3sum/Cargo.lock 2020-01-24 14:27:29.593356345 +0100 +@@ -0,0 +1,582 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "anyhow" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "arrayref" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "assert_cmd" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "b3sum" ++version = "0.1.3" ++dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "blake3 0.1.3", ++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "duct 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "blake3" ++version = "0.1.3" ++dependencies = [ ++ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "clap" ++version = "2.33.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-queue" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "difference" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "doc-comment" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "duct" ++version = "0.13.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "shared_child 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "escargot" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "itoa" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "libc" ++version = "0.2.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memmap" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memoffset" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "os_pipe" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "predicates" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "predicates-core" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "predicates-tree" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "scopeguard" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.104" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "shared_child" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "treeline" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" ++"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" ++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" ++"checksum assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6283bac8dd7226470d491bc4737816fea4ca1fba7a2847f2e9097fd6bfb4624c" ++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" ++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" ++"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" ++"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" ++"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" ++"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" ++"checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97" ++"checksum duct 0.13.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1607fa68d55be208e83bcfbcfffbc1ec65c9fbcf9eb1a5d548dc3ac0100743b0" ++"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" ++"checksum escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d" ++"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" ++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" ++"checksum hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" ++"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" ++"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" ++"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" ++"checksum once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b" ++"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22" ++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4" ++"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" ++"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" ++"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" ++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" ++"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" ++"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" ++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++"checksum serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "eab8f15f15d6c41a154c1b128a22f2dfabe350ef53c40953d84e36155c91192b" ++"checksum shared_child 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8cebcf3a403e4deafaf34dc882c4a1b6a648b43e5670aa2e4bb985914eaeb2d2" ++"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" ++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix new file mode 100644 index 00000000000..4056c3b5b1b --- /dev/null +++ b/pkgs/tools/security/b3sum/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "b3sum"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "BLAKE3-team"; + repo = "BLAKE3"; + rev = version; + sha256 = "1aigwwv576ybb3x3fppq46kbvd3k4fc4w1hh2hkzyyic6fibwbpy"; + }; + + sourceRoot = "source/b3sum"; + + cargoSha256 = "0qw7sr817lmj9xicc03cj1k49lwjwc1whllc7sj2g4c0nl2vndir"; + verifyCargoDeps = false; + + cargoPatches = [ ./add-cargo-lock.patch ]; + + meta = { + description = "BLAKE3 cryptographic hash function"; + homepage = "https://github.com/BLAKE3-team/BLAKE3/"; + maintainers = with lib.maintainers; [ fpletz ]; + license = with lib.licenses; [ cc0 asl20 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9773e7f795f..71d5ac8cb60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1101,6 +1101,8 @@ in azureus = callPackage ../tools/networking/p2p/azureus { }; + b3sum = callPackage ../tools/security/b3sum {}; + backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; bandwhich = callPackage ../tools/networking/bandwhich { From 80c99eedef827f2a76602dbbe354921991b9755a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 1 Feb 2020 13:54:05 +0100 Subject: [PATCH 194/241] halfempty: init at 0.30 --- pkgs/development/tools/halfempty/default.nix | 37 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/halfempty/default.nix diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/development/tools/halfempty/default.nix new file mode 100644 index 00000000000..e576b2321c6 --- /dev/null +++ b/pkgs/development/tools/halfempty/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, utillinux, scowl }: + +stdenv.mkDerivation rec { + pname = "halfempty"; + version = "0.30"; + + src = fetchFromGitHub { + owner = "googleprojectzero"; + repo = pname; + rev = "v${version}"; + sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc"; + }; + + nativeBuildInputs = [ pkgconfig utillinux ]; + buildInputs = [ glib ]; + + enableParallelBuilding = true; + + postPatch = '' + substituteInPlace test/Makefile \ + --replace '/usr/share/dict/words' '${scowl}/share/dict/words.txt' + ''; + + installPhase = '' + install -vDt $out/bin halfempty + ''; + + doCheck = true; + checkTarget = "test"; + + meta = { + description = "Fast, parallel test case minimization tool"; + homepage = "https://github.com/googleprojectzero/halfempty/"; + maintainers = with lib.maintainers; [ fpletz ]; + license = with lib.licenses; [ asl20 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71d5ac8cb60..dbf728b2e1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10181,6 +10181,8 @@ in hadolint = haskell.lib.justStaticExecutables haskellPackages.hadolint; + halfempty = callPackage ../development/tools/halfempty {}; + hcloud = callPackage ../development/tools/hcloud { }; help2man = callPackage ../development/tools/misc/help2man { }; From e8b8e8c615384f94531ccb394301011dce689541 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 1 Feb 2020 13:55:57 +0100 Subject: [PATCH 195/241] rspamd: 1.9.4 -> 2.2 --- nixos/doc/manual/release-notes/rl-2003.xml | 9 +++++++++ pkgs/servers/mail/rspamd/default.nix | 22 ++++++---------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index cf53ecd7671..a3d1dae09b3 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -555,6 +555,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet needed. + + + Rspamd was updated to version 2.2. Read + + the upstream migration notes carefully. Please be especially + aware that some modules were removed and the default Bayes backend is + now Redis. + + diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 0823ed2fe4b..3d04d35a3c5 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,8 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, perl -, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu -, hyperscan, libfann, gd, jemalloc, openblas, lua -, withFann ? true -, withGd ? false +, glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu +, hyperscan, jemalloc, openblas, lua, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 , withLuaJIT ? stdenv.isx86_64 @@ -10,24 +8,19 @@ assert withHyperscan -> stdenv.isx86_64; -let libmagic = file; # libmagic provided by file package ATM -in - stdenv.mkDerivation rec { pname = "rspamd"; - version = "1.9.4"; + version = "2.2"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "0b8n7xazmzjb6jf8sk0jg0x861nf1ayzxsvjaymw1qjgpn371r51"; + sha256 = "0rqiz4xm20w80q8p4grcgqcrg14yiddsay0aw00f0v82h4apw7k8"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ glib libevent libmagic openssl pcre sqlite ragel icu jemalloc ] - ++ lib.optional withFann libfann - ++ lib.optional withGd gd + buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan ++ lib.optional withBlas openblas ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; @@ -39,10 +32,7 @@ stdenv.mkDerivation rec { "-DLOGDIR=/var/log/rspamd" "-DLOCAL_CONFDIR=/etc/rspamd" "-DENABLE_JEMALLOC=ON" - ] ++ lib.optional withFann "-DENABLE_FANN=ON" - ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON" - ++ lib.optional withGd "-DENABLE_GD=ON" - ++ lib.optional (!withLuaJIT) "-DENABLE_TORCH=OFF"; + ] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"; meta = with stdenv.lib; { homepage = "https://rspamd.com"; From 8fa1aad283845b2a3db68bd4f80c3c34671a8fc3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 1 Feb 2020 14:07:58 +0100 Subject: [PATCH 196/241] wego: 2017-04-03 -> 2019-02-11 --- pkgs/applications/misc/wego/default.nix | 8 +++--- pkgs/applications/misc/wego/deps.nix | 36 ++++++++++++++++--------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 567d299fd3a..0dc13e290f5 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "wego"; - version = "unstable-2017-04-03"; - rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c"; - + version = "unstable-2019-02-11"; + rev = "994e4f141759a1070d7b0c8fbe5fad2cc7ee7d45"; + goPackagePath = "github.com/schachmat/wego"; src = fetchgit { inherit rev; url = "https://github.com/schachmat/wego"; - sha256 = "0w8sypwg0s2mvhk9cdibqr8bz5ipiiacs60a39sdswrpc4z486hg"; + sha256 = "1affzwi5rbp4zkirhmby8bvlhsafw7a4rs27caqwyj8g3jhczmhy"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix index 74ab69a30e1..133315cd022 100644 --- a/pkgs/applications/misc/wego/deps.nix +++ b/pkgs/applications/misc/wego/deps.nix @@ -1,11 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"; + sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; + }; + } { goPackagePath = "github.com/mattn/go-isatty"; fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + rev = "31745d66dd679ac0ac4f8d3ecff168fce6170c6a"; + sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; }; } { @@ -13,17 +23,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + rev = "18c3d09a134a52720932bbaa92c798a0ab111004"; + sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; }; } { @@ -35,4 +36,13 @@ sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49"; }; } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "b016eb3dc98ea7f69ed55e8216b87187067ae621"; + sha256 = "1k0qr26046d228gi6ngkfxp4m1rjgxk4jj75h0kh1cpyp91n5rja"; + }; + } ] From cff0aa3a1cc2c41d808ef65bd5eade21b2cd7523 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 1 Feb 2020 14:09:04 +0100 Subject: [PATCH 197/241] riot-web: 1.5.6 -> 1.5.8 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ada903701e2..2156214db6b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.6"; + version = "1.5.8"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "063ynbil038y201skyldj2ysr0hwgwq981w1iw104xd17x31zmn0"; + sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx"; }; installPhase = let From e0028e45aa71da6679d097a9649640cae7ef26fe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 1 Feb 2020 14:10:08 +0100 Subject: [PATCH 198/241] sqlmap: 1.3.12 -> 1.4 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 17141897d58..e6478554d60 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.3.12"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "3bad3275e2f29ffa54d4013a2ac2c77e87d01a1d745065d54ed5e60bc68dfbf0"; + sha256 = "0s6lgp66bn0l4a5mwxiv9h04sa7braqvjskns315lb93lyb4y092"; }; # No tests in archive diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbf728b2e1d..858975f429b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10618,6 +10618,8 @@ in sqlite-web = callPackage ../development/tools/database/sqlite-web { }; + sqlmap = python3Packages.sqlmap; + sselp = callPackage ../tools/X11/sselp{ }; stm32cubemx = callPackage ../development/tools/misc/stm32cubemx { }; From 6b0f9e39514cca07f390534dde36cd1250aaccc8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 1 Feb 2020 14:17:02 +0100 Subject: [PATCH 199/241] perlPackages.PerlTidy: 20190915 -> 20200110 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2dc64f63465..5bfd4fade64 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14432,12 +14432,12 @@ let doCheck = false; }; - PerlTidy = buildPerlPackage { + PerlTidy = buildPerlPackage rec { pname = "Perl-Tidy"; - version = "20190915"; + version = "20200110"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20190915.tar.gz; - sha256 = "c236dfacbba115cfc3f2868006c8601e021fe97c13cd2170a49bf8d404cc701b"; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-${version}.tar.gz"; + sha256 = "11l0isqr7ysrm1y07lrla0ns1x3wvjw8im4kk50rsh22iyw3mhf8"; }; meta = { description = "Indent and reformat perl scripts"; From 0f20047e4ce1eb790f6e1bb8cb991542281a912f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 1 Feb 2020 08:34:40 -0500 Subject: [PATCH 200/241] linux: 4.19.100 -> 4.19.101 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 00f5fb9db94..11751ca880b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.100"; + version = "4.19.101"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04z7c36k78k5hhwhli0kalmvpkiwqli09gj5dmns82wklsv8n4sq"; + sha256 = "1i4bkwankl5q95kgqmmyzdkwmf3b8ppkb8ild9bw12mkpmm1a9my"; }; } // (args.argsOverride or {})) From 9b668eb4cca30488001321fb73e18e9ce0f43382 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 1 Feb 2020 08:35:31 -0500 Subject: [PATCH 201/241] linux: 5.4.16 -> 5.4.17 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 60be4978945..26bc92a7ef4 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.16"; + version = "5.4.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ynspac26hn7pj8fahacvdlyq8kqin0hmfjiymi20y3l57gl25ci"; + sha256 = "1fbl5knf6pini9lsx8mqkdmf3qbsydqvaxggh6nd1vk9mzv2npwl"; }; } // (args.argsOverride or {})) From d0f3e3e07f78e57f00f7c69d0da68dcc7aebdbad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 1 Feb 2020 09:18:35 -0500 Subject: [PATCH 202/241] oh-my-zsh: 2020-01-30 -> 2020-01-31 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 86e786668e1..e4af7d6fedc 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-01-30"; + version = "2020-01-31"; pname = "oh-my-zsh"; - rev = "dcffc895806f5c2aaade3fce09772e1c9f52504e"; + rev = "69caf98cf754553fda969b0bf1d4966f0498f58f"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "08qaxwfvm66iyidxrf6z7m7yahx3ksrnw4v0ld2sf5nxracmmlmh"; + sha256 = "0hkgqhb7a5a0zm2rn22agfphzzvd9y9v6hs8zc6cpx1xxdqp36pm"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 508fdb7a7c88a8fe7434f8bf658d2d282c809aaf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 1 Feb 2020 09:23:08 -0500 Subject: [PATCH 203/241] linux: 5.5 -> 5.5.1 --- pkgs/os-specific/linux/kernel/linux-5.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix index 7347cf1fa66..86654d133ab 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5"; + version = "5.5.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0c131fi6s7vgvka1c0597vnvcmwn1pp968rci5kq64iwj3pd9yx6"; + sha256 = "1n9hwzbhp43a4lvmyb0mbayfnb9s1h6nbg23i93wzg7391hr28q3"; }; } // (args.argsOverride or {})) From 0142bd49cce94475cde12f5684570b5620f8a9fb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 1 Feb 2020 17:07:43 +0100 Subject: [PATCH 204/241] gitlab: 12.7.4 -> 12.7.5 https://about.gitlab.com/releases/2020/01/31/gitlab-12-7-5-released/ --- .../version-management/gitlab/data.json | 6 +-- .../version-management/gitlab/gitaly/deps.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 5 +-- .../gitlab/rubyEnv/Gemfile.lock | 25 +++++------ .../gitlab/rubyEnv/gemset.nix | 43 ++++++++++--------- 5 files changed, 40 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 814a94f2e4b..6e83e5d2566 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,9 +1,9 @@ { - "version": "12.7.4", - "repo_hash": "02n1paz1m8dq8kmill1bwgkzai5yx7zzqa0rc3cz50pdyfq9lp5c", + "version": "12.7.5", + "repo_hash": "0jlhaakpg6bycajbhm3100gs2ka9f6iv529dvj3y1k6gysd2dpvs", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.7.4-ee", + "rev": "v12.7.5-ee", "passthru": { "GITALY_SERVER_VERSION": "1.83.0", "GITLAB_PAGES_VERSION": "1.12.0", diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index f710523103f..8853dded8f2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1319,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + rev = "v1.1.4"; + sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; }; } { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 0c3974ceeba..04c9f9808a7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -132,9 +132,8 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '~> 6.8' -gem 'aws-sdk-core', '~> 3' -gem 'aws-sdk-cloudformation', '~> 1' -gem 'faraday_middleware-aws-sigv4' +gem 'aws-sdk' +gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.12' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index d4dd0a37570..0733d49c3de 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -81,15 +81,13 @@ GEM attr_required (1.0.1) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.263.0) - aws-sdk-cloudformation (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.88.0) - aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) + aws-sdk (2.11.374) + aws-sdk-resources (= 2.11.374) + aws-sdk-core (2.11.374) + aws-sigv4 (~> 1.0) jmespath (~> 1.0) + aws-sdk-resources (2.11.374) + aws-sdk-core (= 2.11.374) aws-sigv4 (1.1.0) aws-eventstream (~> 1.0, >= 1.0.2) axiom-types (0.1.1) @@ -278,9 +276,9 @@ GEM faraday (~> 0.8) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - faraday_middleware-aws-sigv4 (0.3.0) - aws-sigv4 (~> 1.0) - faraday (>= 0.15) + faraday_middleware-aws-signers-v4 (0.1.7) + aws-sdk-resources (~> 2) + faraday (~> 0.9) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json @@ -1144,8 +1142,7 @@ DEPENDENCIES atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print - aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3) + aws-sdk babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.4.0) @@ -1191,7 +1188,7 @@ DEPENDENCIES escape_utils (~> 1.1) factory_bot_rails (~> 5.1.0) faraday (~> 0.12) - faraday_middleware-aws-sigv4 + faraday_middleware-aws-signers-v4 fast_blank ffaker (~> 2.10) flipper (~> 0.17.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f1c2f04e260..a1f2a95197c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -319,37 +319,38 @@ }; version = "1.0.3"; }; - aws-partitions = { + aws-sdk = { + dependencies = ["aws-sdk-resources"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr3f9bdh9lxqy4c999sk99avy46fygx4hf3i86adpvrj6axmygs"; + sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0"; type = "gem"; }; - version = "1.263.0"; - }; - aws-sdk-cloudformation = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11fhscz4y6lq9c8p0ikq5608qbv4bhi6sq7bxn6vnsgx9m45kvq1"; - type = "gem"; - }; - version = "1.29.0"; + version = "2.11.374"; }; aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + dependencies = ["aws-sigv4" "jmespath"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yl3aw8q7ddm5x2wrqdry038gnkw0ys5il2qhlifqyc0qk8yhlfz"; + sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9"; type = "gem"; }; - version = "3.88.0"; + version = "2.11.374"; + }; + aws-sdk-resources = { + dependencies = ["aws-sdk-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4"; + type = "gem"; + }; + version = "2.11.374"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -1316,16 +1317,16 @@ }; version = "0.12.2"; }; - faraday_middleware-aws-sigv4 = { - dependencies = ["aws-sigv4" "faraday"]; + faraday_middleware-aws-signers-v4 = { + dependencies = ["aws-sdk-resources" "faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gk2qakcvvbgfvvfd8cgf13sligv5mp816ykmra9llqmbfym8ikl"; + sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp"; type = "gem"; }; - version = "0.3.0"; + version = "0.1.7"; }; faraday_middleware-multi_json = { dependencies = ["faraday_middleware" "multi_json"]; From c9d6dee9e469fe752bacf3fb885e23e4e01e7b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 1 Feb 2020 17:13:41 +0000 Subject: [PATCH 205/241] nixos/locate: don't create /var/cache This is already handled by the default systemd tmpfiles. fixes #78941 --- nixos/modules/misc/locate.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 552535c253e..dc668796c78 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -131,13 +131,6 @@ in { ++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component" ++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts"; - # directory creation needs to be separated from main service - # because ReadWritePaths fails when the directory doesn't already exist - systemd.tmpfiles.rules = - let dir = dirOf cfg.output; in - mkIf (dir != "/var/cache") - [ "d ${dir} 0755 root root -" ]; - systemd.services.update-locatedb = { description = "Update Locate Database"; path = mkIf (!isMLocate) [ pkgs.su ]; From 13d81e6b52b31393d75dc6f8ccefda92ee9f1903 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 1 Feb 2020 18:18:29 +0100 Subject: [PATCH 206/241] trac: disabling pygments tests --- pkgs/tools/misc/trac/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/trac/default.nix b/pkgs/tools/misc/trac/default.nix index 39bbf6850eb..f41087ca3fd 100644 --- a/pkgs/tools/misc/trac/default.nix +++ b/pkgs/tools/misc/trac/default.nix @@ -28,6 +28,9 @@ buildPythonApplication rec { # Removing the date format tests as they are outdated substituteInPlace trac/util/tests/__init__.py \ --replace "suite.addTest(datefmt.test_suite())" "" + # Removing Pygments tests as per https://trac.edgewall.org/ticket/13229 + substituteInPlace trac/mimeview/tests/__init__.py \ + --replace "suite.addTest(pygments.test_suite())" "" ''; propagatedBuildInputs = [ From 1882d20155ba10982e76856c0433de7690a574b4 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Sat, 1 Feb 2020 10:05:42 -0800 Subject: [PATCH 207/241] pre-commit: installed git hook should have full path to binary (#77638) pre-commit currently install impure Git hooks that look for the `pre-commit` binary in PATH. If the user has `pre-commit` loaded via a nix-shell instead of having it installed then GUI editors, such as Intellij, won't be able to use Git commit because the hook fails trying to look for the `pre-commit` binary in PATH. This patch updates the hook template to use the hardcoded path to the `pre-commit` binary if it was found, fallback to using the one from PATH. --- .../python-modules/pre-commit/default.nix | 10 ++++++++ ...use-the-hardcoded-path-to-pre-commit.patch | 25 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index d3808bbb911..963aa19653b 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -7,6 +7,7 @@ , importlib-metadata , importlib-resources , nodeenv +, python , six , toml , virtualenv @@ -22,6 +23,10 @@ buildPythonApplication rec { sha256 = "0l5qg1cw4a0670m96s0ryy5mqz5aslfrrnwpriqgmrnsgdixhj4g"; }; + patches = [ + ./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch + ]; + propagatedBuildInputs = [ aspy-yaml cached-property @@ -38,6 +43,11 @@ buildPythonApplication rec { # slow and impure doCheck = false; + preFixup = '' + substituteInPlace $out/${python.sitePackages}/pre_commit/resources/hook-tmpl \ + --subst-var-by pre-commit $out + ''; + meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; homepage = https://pre-commit.com/; diff --git a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch new file mode 100644 index 00000000000..23115bbbd20 --- /dev/null +++ b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch @@ -0,0 +1,25 @@ +From d9e6999e32112602ec276634cb004eda3ca64ec3 Mon Sep 17 00:00:00 2001 +From: "Wael M. Nasreddine" +Date: Mon, 13 Jan 2020 11:04:58 -0800 +Subject: [PATCH] hook-tmpl: use the hardcoded path to pre-commit, if found + +--- + pre_commit/resources/hook-tmpl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl +index 213d16e..3a99211 100755 +--- a/pre_commit/resources/hook-tmpl ++++ b/pre_commit/resources/hook-tmpl +@@ -107,6 +107,8 @@ def _exe() -> Tuple[str, ...]: + except OSError: + pass + ++ if os.path.isfile('@pre-commit@/bin/pre-commit') and os.access('@pre-commit@/bin/pre-commit', os.X_OK): ++ return ('@pre-commit@/bin/pre-commit', 'run') + if distutils.spawn.find_executable('pre-commit'): + return ('pre-commit', 'run') + +-- +2.23.1 + From 7dadbc7a986adeeb3027f49d0ea93bf1d162357f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 1 Feb 2020 19:25:52 +0100 Subject: [PATCH 208/241] confluence: Add support for MySQL driver If Confluence should be connected to a MySQL database, the JDBC driver is required. Also switch to stdenvNoCC, because we don't really use cc. --- pkgs/servers/atlassian/confluence.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index a5aead770b8..c140e3ae390 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -1,9 +1,12 @@ -{ stdenv, lib, fetchurl +{ stdenvNoCC, lib, fetchurl, mysql_jdbc ? null , enableSSO ? false , crowdProperties ? null +, withMysql ? true }: -stdenv.mkDerivation rec { +assert withMysql -> (mysql_jdbc != null); + +stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; version = "7.2.0"; @@ -28,6 +31,8 @@ stdenv.mkDerivation rec { cat < confluence/WEB-INF/classes/crowd.properties ${crowdProperties} EOF + '' + lib.optionalString withMysql '' + cp -v ${mysql_jdbc}/share/java/*jar confluence/WEB-INF/lib/ ''; installPhase = '' @@ -35,7 +40,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Team collaboration software written in Java and mainly used in corporate environments"; homepage = "https://www.atlassian.com/software/confluence"; license = licenses.unfree; From 808a5676ce2711c82e983bc677825bcaea0d2dad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 19:10:38 +0000 Subject: [PATCH 209/241] python37Packages.asgiref: 3.2.2 -> 3.2.3 --- pkgs/development/python-modules/asgiref/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index e75be31c85f..08f52ce51ad 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.2.2"; + version = "3.2.3"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "11lnynspgdi5zp3hd8piy8h9fq0s3ck6lzyl7h0fn2mxxyx83yh2"; + sha256 = "1b8h50wvvby9m17q39kc0ql8a2yvg2f89ii7zrl2phaw0vb9i109"; }; propagatedBuildInputs = [ async-timeout ]; From 507e483284311518d9059302bd313b596c0f8f46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 11:18:36 -0800 Subject: [PATCH 210/241] orca: 3.34.1 -> 3.34.2 (#79014) --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 1dc6a9cfee5..998d5d528e9 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.34.1"; + version = "3.34.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q38n7hyshkiszmn361skxjynxr31lcms7a1iny6d0zlpmh1vnk4"; + sha256 = "0aaagz8mxvfigrsdbmg22q44vf5yhkbw4rh4cnizysbfvijk4dan"; }; patches = [ From ff36673ffbef4e2a95f8d790d006200f5d55be77 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 19:42:04 +0000 Subject: [PATCH 211/241] python27Packages.cbor2: 4.1.2 -> 5.0.1 --- pkgs/development/python-modules/cbor2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 5d044b4199c..811ecef1f86 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "4.1.2"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1bp9l3wdj0wm15xlmlcwbgv6hc6vcfx39nssikj8fkwnd7d1bdhp"; + sha256 = "1fid6li95jx9c3v83v8c2c8lb03jgirkk9mjmck30yxcwmlxp6a2"; }; nativeBuildInputs = [ setuptools_scm ]; From 87bee366b7ad298353abd88b3ddf6d8d59aef92e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 19:59:11 +0000 Subject: [PATCH 212/241] python37Packages.altair: 4.0.0 -> 4.0.1 --- pkgs/development/python-modules/altair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index db3c2d27c8b..c80af1acdc5 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.0.0"; + version = "4.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "92dcd7b84c715f8e02bbdf37e36193a4af8138b5b064c05f237e6ed41573880a"; + sha256 = "145gjad415zjfp0ciq1b19i97ibavj8fki1vzhjppqz55k4704nk"; }; propagatedBuildInputs = [ From 3b4fc5b60fa1abfb4ed60361efca1cc9fa14e1e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 20:37:02 +0000 Subject: [PATCH 213/241] python37Packages.asyncpg: 0.20.0 -> 0.20.1 --- pkgs/development/python-modules/asyncpg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 2a47f13fe4b..14e5b56cb0c 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.20.0"; + version = "0.20.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0yjszgg1zbbsfxj1gv17ymc2hcfvymkvg69dvpvwy0dqspjxq0ma"; + sha256 = "1c4mcjrdbvvq5crrfc3b9m221qb6pxp55yynijihgfnvvndz2jrr"; }; checkInputs = [ From 76cecce17c0c0d39cdaf59c4c5d9e5cef71310e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 21:04:55 +0000 Subject: [PATCH 214/241] python27Packages.azure-mgmt-iothub: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/azure-mgmt-iothub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index cdb20167b9c..1e4c8923d7d 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "19gcvmcd0r9xi2i3m800h3ak0mkf9yj64d55z7nrk25v3ksx0wrl"; + sha256 = "1xms5wf21z9i28xl0p515xb08mrlsqnzhxcwv7pjlf26lwxadfi0"; }; propagatedBuildInputs = [ From 096a51a35a96dee6436dceda76041414e4dc9d02 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 1 Feb 2020 21:53:05 +0000 Subject: [PATCH 215/241] poetry: 1.0.2 -> 1.0.3 --- pkgs/development/tools/poetry/poetry.lock | 190 ++++++++++--------- pkgs/development/tools/poetry/pyproject.toml | 2 +- pkgs/development/tools/poetry/src.json | 4 +- 3 files changed, 108 insertions(+), 88 deletions(-) diff --git a/pkgs/development/tools/poetry/poetry.lock b/pkgs/development/tools/poetry/poetry.lock index 182f389363d..8cc55799405 100644 --- a/pkgs/development/tools/poetry/poetry.lock +++ b/pkgs/development/tools/poetry/poetry.lock @@ -207,7 +207,7 @@ testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2)", "pytes [[package]] category = "main" description = "Backports and enhancements for the contextlib module" -marker = "python_version < \"3\"" +marker = "python_version < \"3.4\"" name = "contextlib2" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" @@ -227,7 +227,7 @@ description = "Code coverage measurement for Python" name = "coverage" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" -version = "5.0.2" +version = "5.0.3" [package.extras] toml = ["toml"] @@ -363,7 +363,7 @@ description = "File identification library for Python" name = "identify" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" -version = "1.4.9" +version = "1.4.11" [package.extras] license = ["editdistance"] @@ -453,6 +453,21 @@ MarkupSafe = ">=0.23" [package.extras] i18n = ["Babel (>=0.8)"] +[[package]] +category = "dev" +description = "A very fast and expressive template engine." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "jinja2" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "2.11.1" + +[package.dependencies] +MarkupSafe = ">=0.23" + +[package.extras] +i18n = ["Babel (>=0.8)"] + [[package]] category = "main" description = "An implementation of JSON Schema validation for Python" @@ -623,9 +638,9 @@ docs = ["sphinx"] test = ["pytest", "pytest-cov"] [[package]] -category = "main" +category = "dev" description = "More routines for operating on iterables, beyond itertools" -marker = "python_version < \"3.8\"" +marker = "python_version <= \"2.7\"" name = "more-itertools" optional = false python-versions = "*" @@ -635,22 +650,22 @@ version = "5.0.0" six = ">=1.0.0,<2.0.0" [[package]] -category = "main" +category = "dev" description = "More routines for operating on iterables, beyond itertools" -marker = "python_version < \"3.8\" or python_version > \"2.7\"" +marker = "python_version > \"2.7\"" name = "more-itertools" optional = false python-versions = ">=3.4" version = "7.2.0" [[package]] -category = "main" +category = "dev" description = "More routines for operating on iterables, beyond itertools" -marker = "python_version >= \"3.5\" and python_version < \"3.8\" or python_version < \"3.8\" or python_version > \"2.7\"" +marker = "python_version > \"2.7\"" name = "more-itertools" optional = false python-versions = ">=3.5" -version = "8.0.2" +version = "8.2.0" [[package]] category = "main" @@ -674,7 +689,7 @@ description = "Core utilities for Python packages" name = "packaging" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "20.0" +version = "20.1" [package.dependencies] pyparsing = ">=2.0.2" @@ -727,7 +742,7 @@ description = "Pexpect allows easy control of interactive console applications." name = "pexpect" optional = false python-versions = "*" -version = "4.7.0" +version = "4.8.0" [package.dependencies] ptyprocess = ">=0.5" @@ -1139,8 +1154,8 @@ category = "main" description = "Python 2 and 3 compatibility utilities" name = "six" optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*" -version = "1.13.0" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" +version = "1.14.0" [[package]] category = "main" @@ -1260,7 +1275,7 @@ marker = "python_version >= \"3.6\" and python_version < \"4.0\"" name = "typed-ast" optional = false python-versions = "*" -version = "1.4.0" +version = "1.4.1" [[package]] category = "main" @@ -1288,8 +1303,8 @@ category = "main" description = "HTTP library with thread-safe connection pooling, file post, and more." name = "urllib3" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" -version = "1.25.7" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" +version = "1.25.8" [package.extras] brotli = ["brotlipy (>=0.6.0)"] @@ -1331,14 +1346,16 @@ marker = "python_version >= \"3.5\" and python_version < \"3.8\" or python_versi name = "zipp" optional = false python-versions = ">=2.7" -version = "0.6.0" +version = "1.1.0" [package.dependencies] -more-itertools = "*" +[package.dependencies.contextlib2] +python = "<3.4" +version = "*" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pathlib2", "contextlib2", "unittest2"] +testing = ["pathlib2", "unittest2", "jaraco.itertools"] [metadata] content-hash = "e0b632d8363fdf9f70d93901ff537714611bfc31705a897f6d2fb3bc010bca0a" @@ -1479,37 +1496,37 @@ coverage = [ {file = "coverage-4.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351"}, {file = "coverage-4.5.4-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5"}, {file = "coverage-4.5.4.tar.gz", hash = "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c"}, - {file = "coverage-5.0.2-cp27-cp27m-macosx_10_12_x86_64.whl", hash = "sha256:511ec0c00840e12fb4e852e4db58fa6a01ca4da72f36a9766fae344c3d502033"}, - {file = "coverage-5.0.2-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:d22b4297e7e4225ccf01f1aa55e7a96412ea0796b532dd614c3fcbafa341128e"}, - {file = "coverage-5.0.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:593853aa1ac6dcc6405324d877544c596c9d948ef20d2e9512a0f5d2d3202356"}, - {file = "coverage-5.0.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:e65a5aa1670db6263f19fdc03daee1d7dbbadb5cb67fd0a1f16033659db13c1d"}, - {file = "coverage-5.0.2-cp27-cp27m-win32.whl", hash = "sha256:d4a2b578a7a70e0c71f662705262f87a456f1e6c1e40ada7ea699abaf070a76d"}, - {file = "coverage-5.0.2-cp27-cp27m-win_amd64.whl", hash = "sha256:28f7f73b34a05e23758e860a89a7f649b85c6749e252eff60ebb05532d180e86"}, - {file = "coverage-5.0.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:7d1cc7acc9ce55179616cf72154f9e648136ea55987edf84addbcd9886ffeba2"}, - {file = "coverage-5.0.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:2d0cb9b1fe6ad0d915d45ad3d87f03a38e979093a98597e755930db1f897afae"}, - {file = "coverage-5.0.2-cp35-cp35m-macosx_10_12_x86_64.whl", hash = "sha256:bfe102659e2ec13b86c7f3b1db6c9a4e7beea4255058d006351339e6b342d5d2"}, - {file = "coverage-5.0.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:23688ff75adfa8bfa2a67254d889f9bdf9302c27241d746e17547c42c732d3f4"}, - {file = "coverage-5.0.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:1bf7ba2af1d373a1750888724f84cffdfc697738f29a353c98195f98fc011509"}, - {file = "coverage-5.0.2-cp35-cp35m-win32.whl", hash = "sha256:569f9ee3025682afda6e9b0f5bb14897c0db03f1a1dc088b083dd36e743f92bb"}, - {file = "coverage-5.0.2-cp35-cp35m-win_amd64.whl", hash = "sha256:cf908840896f7aa62d0ec693beb53264b154f972eb8226fb864ac38975590c4f"}, - {file = "coverage-5.0.2-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:eaad65bd20955131bcdb3967a4dea66b4e4d4ca488efed7c00d91ee0173387e8"}, - {file = "coverage-5.0.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:225e79a5d485bc1642cb7ba02281419c633c216cdc6b26c26494ba959f09e69f"}, - {file = "coverage-5.0.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:bd82b684bb498c60ef47bb1541a50e6d006dde8579934dcbdbc61d67d1ea70d9"}, - {file = "coverage-5.0.2-cp36-cp36m-win32.whl", hash = "sha256:7ca3db38a61f3655a2613ee2c190d63639215a7a736d3c64cc7bbdb002ce6310"}, - {file = "coverage-5.0.2-cp36-cp36m-win_amd64.whl", hash = "sha256:47874b4711c5aeb295c31b228a758ce3d096be83dc37bd56da48ed99efb8813b"}, - {file = "coverage-5.0.2-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:955ec084f549128fa2702f0b2dc696392001d986b71acd8fd47424f28289a9c3"}, - {file = "coverage-5.0.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1f4ee8e2e4243971618bc16fcc4478317405205f135e95226c2496e2a3b8dbbf"}, - {file = "coverage-5.0.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:f45fba420b94165c17896861bb0e8b27fb7abdcedfeb154895d8553df90b7b00"}, - {file = "coverage-5.0.2-cp37-cp37m-win32.whl", hash = "sha256:cca38ded59105f7705ef6ffe1e960b8db6c7d8279c1e71654a4775ab4454ca15"}, - {file = "coverage-5.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:cb2b74c123f65e8166f7e1265829a6c8ed755c3cd16d7f50e75a83456a5f3fd7"}, - {file = "coverage-5.0.2-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:53e7438fef0c97bc248f88ba1edd10268cd94d5609970aaf87abbe493691af87"}, - {file = "coverage-5.0.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:c1e4e39e43057396a5e9d069bfbb6ffeee892e40c5d2effbd8cd71f34ee66c4d"}, - {file = "coverage-5.0.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:5b0a07158360d22492f9abd02a0f2ee7981b33f0646bf796598b7673f6bbab14"}, - {file = "coverage-5.0.2-cp38-cp38m-win32.whl", hash = "sha256:88b51153657612aea68fa684a5b88037597925260392b7bb4509d4f9b0bdd889"}, - {file = "coverage-5.0.2-cp38-cp38m-win_amd64.whl", hash = "sha256:189aac76d6e0d7af15572c51892e7326ee451c076c5a50a9d266406cd6c49708"}, - {file = "coverage-5.0.2-cp39-cp39m-win32.whl", hash = "sha256:d095a7b473f8a95f7efe821f92058c8a2ecfb18f8db6677ae3819e15dc11aaae"}, - {file = "coverage-5.0.2-cp39-cp39m-win_amd64.whl", hash = "sha256:ddeb42a3d5419434742bf4cc71c9eaa22df3b76808e23a82bd0b0bd360f1a9f1"}, - {file = "coverage-5.0.2.tar.gz", hash = "sha256:b251c7092cbb6d789d62dc9c9e7c4fb448c9138b51285c36aeb72462cad3600e"}, + {file = "coverage-5.0.3-cp27-cp27m-macosx_10_12_x86_64.whl", hash = "sha256:cc1109f54a14d940b8512ee9f1c3975c181bbb200306c6d8b87d93376538782f"}, + {file = "coverage-5.0.3-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:be18f4ae5a9e46edae3f329de2191747966a34a3d93046dbdf897319923923bc"}, + {file = "coverage-5.0.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:3230d1003eec018ad4a472d254991e34241e0bbd513e97a29727c7c2f637bd2a"}, + {file = "coverage-5.0.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:e69215621707119c6baf99bda014a45b999d37602cb7043d943c76a59b05bf52"}, + {file = "coverage-5.0.3-cp27-cp27m-win32.whl", hash = "sha256:1daa3eceed220f9fdb80d5ff950dd95112cd27f70d004c7918ca6dfc6c47054c"}, + {file = "coverage-5.0.3-cp27-cp27m-win_amd64.whl", hash = "sha256:51bc7710b13a2ae0c726f69756cf7ffd4362f4ac36546e243136187cfcc8aa73"}, + {file = "coverage-5.0.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:9bea19ac2f08672636350f203db89382121c9c2ade85d945953ef3c8cf9d2a68"}, + {file = "coverage-5.0.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:5012d3b8d5a500834783689a5d2292fe06ec75dc86ee1ccdad04b6f5bf231691"}, + {file = "coverage-5.0.3-cp35-cp35m-macosx_10_12_x86_64.whl", hash = "sha256:d513cc3db248e566e07a0da99c230aca3556d9b09ed02f420664e2da97eac301"}, + {file = "coverage-5.0.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:3dbb72eaeea5763676a1a1efd9b427a048c97c39ed92e13336e726117d0b72bf"}, + {file = "coverage-5.0.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:15cf13a6896048d6d947bf7d222f36e4809ab926894beb748fc9caa14605d9c3"}, + {file = "coverage-5.0.3-cp35-cp35m-win32.whl", hash = "sha256:fca1669d464f0c9831fd10be2eef6b86f5ebd76c724d1e0706ebdff86bb4adf0"}, + {file = "coverage-5.0.3-cp35-cp35m-win_amd64.whl", hash = "sha256:1e44a022500d944d42f94df76727ba3fc0a5c0b672c358b61067abb88caee7a0"}, + {file = "coverage-5.0.3-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:b26aaf69713e5674efbde4d728fb7124e429c9466aeaf5f4a7e9e699b12c9fe2"}, + {file = "coverage-5.0.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:722e4557c8039aad9592c6a4213db75da08c2cd9945320220634f637251c3894"}, + {file = "coverage-5.0.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:7afad9835e7a651d3551eab18cbc0fdb888f0a6136169fbef0662d9cdc9987cf"}, + {file = "coverage-5.0.3-cp36-cp36m-win32.whl", hash = "sha256:25dbf1110d70bab68a74b4b9d74f30e99b177cde3388e07cc7272f2168bd1477"}, + {file = "coverage-5.0.3-cp36-cp36m-win_amd64.whl", hash = "sha256:c312e57847db2526bc92b9bfa78266bfbaabac3fdcd751df4d062cd4c23e46dc"}, + {file = "coverage-5.0.3-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:a8b8ac7876bc3598e43e2603f772d2353d9931709345ad6c1149009fd1bc81b8"}, + {file = "coverage-5.0.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:527b4f316e6bf7755082a783726da20671a0cc388b786a64417780b90565b987"}, + {file = "coverage-5.0.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d649dc0bcace6fcdb446ae02b98798a856593b19b637c1b9af8edadf2b150bea"}, + {file = "coverage-5.0.3-cp37-cp37m-win32.whl", hash = "sha256:cd60f507c125ac0ad83f05803063bed27e50fa903b9c2cfee3f8a6867ca600fc"}, + {file = "coverage-5.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:c60097190fe9dc2b329a0eb03393e2e0829156a589bd732e70794c0dd804258e"}, + {file = "coverage-5.0.3-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:d7008a6796095a79544f4da1ee49418901961c97ca9e9d44904205ff7d6aa8cb"}, + {file = "coverage-5.0.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ea9525e0fef2de9208250d6c5aeeee0138921057cd67fcef90fbed49c4d62d37"}, + {file = "coverage-5.0.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:c62a2143e1313944bf4a5ab34fd3b4be15367a02e9478b0ce800cb510e3bbb9d"}, + {file = "coverage-5.0.3-cp38-cp38m-win32.whl", hash = "sha256:b0840b45187699affd4c6588286d429cd79a99d509fe3de0f209594669bb0954"}, + {file = "coverage-5.0.3-cp38-cp38m-win_amd64.whl", hash = "sha256:76e2057e8ffba5472fd28a3a010431fd9e928885ff480cb278877c6e9943cc2e"}, + {file = "coverage-5.0.3-cp39-cp39m-win32.whl", hash = "sha256:b63dd43f455ba878e5e9f80ba4f748c0a2156dde6e0e6e690310e24d6e8caf40"}, + {file = "coverage-5.0.3-cp39-cp39m-win_amd64.whl", hash = "sha256:da93027835164b8223e8e5af2cf902a4c80ed93cb0909417234f4a9df3bcd9af"}, + {file = "coverage-5.0.3.tar.gz", hash = "sha256:77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef"}, ] cryptography = [ {file = "cryptography-2.8-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:fb81c17e0ebe3358486cd8cc3ad78adbae58af12fc2bf2bc0bb84e8090fa5ce8"}, @@ -1571,8 +1588,8 @@ httpretty = [ {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"}, ] identify = [ - {file = "identify-1.4.9-py2.py3-none-any.whl", hash = "sha256:72e9c4ed3bc713c7045b762b0d2e2115c572b85abfc1f4604f5a4fd4c6642b71"}, - {file = "identify-1.4.9.tar.gz", hash = "sha256:6f44e637caa40d1b4cb37f6ed3b262ede74901d28b1cc5b1fc07360871edd65d"}, + {file = "identify-1.4.11-py2.py3-none-any.whl", hash = "sha256:1222b648251bdcb8deb240b294f450fbf704c7984e08baa92507e4ea10b436d5"}, + {file = "identify-1.4.11.tar.gz", hash = "sha256:d824ebe21f38325c771c41b08a95a761db1982f1fc0eee37c6c97df3f1636b96"}, ] idna = [ {file = "idna-2.8-py2.py3-none-any.whl", hash = "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"}, @@ -1597,6 +1614,8 @@ jeepney = [ jinja2 = [ {file = "Jinja2-2.10.3-py2.py3-none-any.whl", hash = "sha256:74320bb91f31270f9551d46522e33af46a80c3d619f4a4bf42b3164d30b5911f"}, {file = "Jinja2-2.10.3.tar.gz", hash = "sha256:9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de"}, + {file = "Jinja2-2.11.1-py2.py3-none-any.whl", hash = "sha256:b0eaf100007721b5c16c1fc1eecb87409464edc10469ddc9a22a27a99123be49"}, + {file = "Jinja2-2.11.1.tar.gz", hash = "sha256:93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250"}, ] jsonschema = [ {file = "jsonschema-3.2.0-py2.py3-none-any.whl", hash = "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163"}, @@ -1669,8 +1688,8 @@ more-itertools = [ {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"}, {file = "more-itertools-7.2.0.tar.gz", hash = "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"}, {file = "more_itertools-7.2.0-py3-none-any.whl", hash = "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"}, - {file = "more-itertools-8.0.2.tar.gz", hash = "sha256:b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d"}, - {file = "more_itertools-8.0.2-py3-none-any.whl", hash = "sha256:c833ef592a0324bcc6a60e48440da07645063c453880c9477ceb22490aec1564"}, + {file = "more-itertools-8.2.0.tar.gz", hash = "sha256:b1ddb932186d8a6ac451e1d95844b382f55e12686d51ca0c68b6f61f2ab7a507"}, + {file = "more_itertools-8.2.0-py3-none-any.whl", hash = "sha256:5dd8bcf33e5f9513ffa06d5ad33d78f31e1931ac9a18f33d37e77a180d393a7c"}, ] msgpack = [ {file = "msgpack-0.6.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:774f5edc3475917cd95fe593e625d23d8580f9b48b570d8853d06cac171cd170"}, @@ -1699,8 +1718,8 @@ nodeenv = [ {file = "nodeenv-1.3.4-py2.py3-none-any.whl", hash = "sha256:561057acd4ae3809e665a9aaaf214afff110bbb6a6d5c8a96121aea6878408b3"}, ] packaging = [ - {file = "packaging-20.0-py2.py3-none-any.whl", hash = "sha256:aec3fdbb8bc9e4bb65f0634b9f551ced63983a529d6a8931817d52fdd0816ddb"}, - {file = "packaging-20.0.tar.gz", hash = "sha256:fe1d8331dfa7cc0a883b49d75fc76380b2ab2734b220fbb87d774e4fd4b851f8"}, + {file = "packaging-20.1-py2.py3-none-any.whl", hash = "sha256:170748228214b70b672c581a3dd610ee51f733018650740e98c7df862a583f73"}, + {file = "packaging-20.1.tar.gz", hash = "sha256:e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334"}, ] pastel = [ {file = "pastel-0.1.1-py2.py3-none-any.whl", hash = "sha256:a904e1659512cc9880a028f66de77cc813a4c32f7ceb68725cbc8afad57ef7ef"}, @@ -1719,8 +1738,8 @@ pep562 = [ {file = "pep562-1.0.tar.gz", hash = "sha256:58cb1cc9ee63d93e62b4905a50357618d526d289919814bea1f0da8f53b79395"}, ] pexpect = [ - {file = "pexpect-4.7.0-py2.py3-none-any.whl", hash = "sha256:2094eefdfcf37a1fdbfb9aa090862c1a4878e5c7e0e7e7088bdb511c558e5cd1"}, - {file = "pexpect-4.7.0.tar.gz", hash = "sha256:9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb"}, + {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, + {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, ] pkginfo = [ {file = "pkginfo-1.5.0.1-py2.py3-none-any.whl", hash = "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"}, @@ -1874,8 +1893,8 @@ shellingham = [ {file = "shellingham-1.3.1.tar.gz", hash = "sha256:985b23bbd1feae47ca6a6365eacd314d93d95a8a16f8f346945074c28fe6f3e0"}, ] six = [ - {file = "six-1.13.0-py2.py3-none-any.whl", hash = "sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd"}, - {file = "six-1.13.0.tar.gz", hash = "sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"}, + {file = "six-1.14.0-py2.py3-none-any.whl", hash = "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"}, + {file = "six-1.14.0.tar.gz", hash = "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a"}, ] subprocess32 = [ {file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"}, @@ -1916,26 +1935,27 @@ tox = [ {file = "tox-3.14.3.tar.gz", hash = "sha256:06ba73b149bf838d5cd25dc30c2dd2671ae5b2757cf98e5c41a35fe449f131b3"}, ] typed-ast = [ - {file = "typed_ast-1.4.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:262c247a82d005e43b5b7f69aff746370538e176131c32dda9cb0f324d27141e"}, - {file = "typed_ast-1.4.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:71211d26ffd12d63a83e079ff258ac9d56a1376a25bc80b1cdcdf601b855b90b"}, - {file = "typed_ast-1.4.0-cp35-cp35m-win32.whl", hash = "sha256:630968c5cdee51a11c05a30453f8cd65e0cc1d2ad0d9192819df9978984529f4"}, - {file = "typed_ast-1.4.0-cp35-cp35m-win_amd64.whl", hash = "sha256:ffde2fbfad571af120fcbfbbc61c72469e72f550d676c3342492a9dfdefb8f12"}, - {file = "typed_ast-1.4.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4e0b70c6fc4d010f8107726af5fd37921b666f5b31d9331f0bd24ad9a088e631"}, - {file = "typed_ast-1.4.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:bc6c7d3fa1325a0c6613512a093bc2a2a15aeec350451cbdf9e1d4bffe3e3233"}, - {file = "typed_ast-1.4.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:cc34a6f5b426748a507dd5d1de4c1978f2eb5626d51326e43280941206c209e1"}, - {file = "typed_ast-1.4.0-cp36-cp36m-win32.whl", hash = "sha256:d896919306dd0aa22d0132f62a1b78d11aaf4c9fc5b3410d3c666b818191630a"}, - {file = "typed_ast-1.4.0-cp36-cp36m-win_amd64.whl", hash = "sha256:354c16e5babd09f5cb0ee000d54cfa38401d8b8891eefa878ac772f827181a3c"}, - {file = "typed_ast-1.4.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95bd11af7eafc16e829af2d3df510cecfd4387f6453355188342c3e79a2ec87a"}, - {file = "typed_ast-1.4.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:18511a0b3e7922276346bcb47e2ef9f38fb90fd31cb9223eed42c85d1312344e"}, - {file = "typed_ast-1.4.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d7c45933b1bdfaf9f36c579671fec15d25b06c8398f113dab64c18ed1adda01d"}, - {file = "typed_ast-1.4.0-cp37-cp37m-win32.whl", hash = "sha256:d755f03c1e4a51e9b24d899561fec4ccaf51f210d52abdf8c07ee2849b212a36"}, - {file = "typed_ast-1.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2b907eb046d049bcd9892e3076c7a6456c93a25bebfe554e931620c90e6a25b0"}, - {file = "typed_ast-1.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fdc1c9bbf79510b76408840e009ed65958feba92a88833cdceecff93ae8fff66"}, - {file = "typed_ast-1.4.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:7954560051331d003b4e2b3eb822d9dd2e376fa4f6d98fee32f452f52dd6ebb2"}, - {file = "typed_ast-1.4.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:48e5b1e71f25cfdef98b013263a88d7145879fbb2d5185f2a0c79fa7ebbeae47"}, - {file = "typed_ast-1.4.0-cp38-cp38-win32.whl", hash = "sha256:1170afa46a3799e18b4c977777ce137bb53c7485379d9706af8a59f2ea1aa161"}, - {file = "typed_ast-1.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:838997f4310012cf2e1ad3803bce2f3402e9ffb71ded61b5ee22617b3a7f6b6e"}, - {file = "typed_ast-1.4.0.tar.gz", hash = "sha256:66480f95b8167c9c5c5c87f32cf437d585937970f3fc24386f313a4c97b44e34"}, + {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"}, + {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb"}, + {file = "typed_ast-1.4.1-cp35-cp35m-win32.whl", hash = "sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919"}, + {file = "typed_ast-1.4.1-cp35-cp35m-win_amd64.whl", hash = "sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01"}, + {file = "typed_ast-1.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75"}, + {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652"}, + {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"}, + {file = "typed_ast-1.4.1-cp36-cp36m-win32.whl", hash = "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1"}, + {file = "typed_ast-1.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa"}, + {file = "typed_ast-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614"}, + {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41"}, + {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b"}, + {file = "typed_ast-1.4.1-cp37-cp37m-win32.whl", hash = "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe"}, + {file = "typed_ast-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355"}, + {file = "typed_ast-1.4.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6"}, + {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907"}, + {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d"}, + {file = "typed_ast-1.4.1-cp38-cp38-win32.whl", hash = "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c"}, + {file = "typed_ast-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4"}, + {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34"}, + {file = "typed_ast-1.4.1.tar.gz", hash = "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b"}, ] typing = [ {file = "typing-3.7.4.1-py2-none-any.whl", hash = "sha256:c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36"}, @@ -1945,8 +1965,8 @@ typing = [ urllib3 = [ {file = "urllib3-1.24.3-py2.py3-none-any.whl", hash = "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"}, {file = "urllib3-1.24.3.tar.gz", hash = "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"}, - {file = "urllib3-1.25.7-py2.py3-none-any.whl", hash = "sha256:a8a318824cc77d1fd4b2bec2ded92646630d7fe8619497b142c84a9e6f5a7293"}, - {file = "urllib3-1.25.7.tar.gz", hash = "sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"}, + {file = "urllib3-1.25.8-py2.py3-none-any.whl", hash = "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc"}, + {file = "urllib3-1.25.8.tar.gz", hash = "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc"}, ] virtualenv = [ {file = "virtualenv-16.7.9-py2.py3-none-any.whl", hash = "sha256:55059a7a676e4e19498f1aad09b8313a38fcc0cdbe4fdddc0e9b06946d21b4bb"}, @@ -1961,6 +1981,6 @@ webencodings = [ {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, ] zipp = [ - {file = "zipp-0.6.0-py2.py3-none-any.whl", hash = "sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335"}, - {file = "zipp-0.6.0.tar.gz", hash = "sha256:3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e"}, + {file = "zipp-1.1.0-py2.py3-none-any.whl", hash = "sha256:15428d652e993b6ce86694c3cccf0d71aa7afdc6ef1807fa25a920e9444e0281"}, + {file = "zipp-1.1.0.tar.gz", hash = "sha256:d9d2efe11d3a3fb9184da550d35bd1319dc8e30a63255927c82bb42fca1f4f7c"}, ] diff --git a/pkgs/development/tools/poetry/pyproject.toml b/pkgs/development/tools/poetry/pyproject.toml index 283091dfbc1..13e8199331b 100644 --- a/pkgs/development/tools/poetry/pyproject.toml +++ b/pkgs/development/tools/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.0.2" +version = "1.0.3" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace " diff --git a/pkgs/development/tools/poetry/src.json b/pkgs/development/tools/poetry/src.json index 6e4b26b152f..dd8816ac072 100644 --- a/pkgs/development/tools/poetry/src.json +++ b/pkgs/development/tools/poetry/src.json @@ -1,6 +1,6 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "636ce8b0eba7dfa390b3fd961d1b9fb533d5d033", - "sha256": "0g562k09wjgl1r3412n0cvr870wmsz3l9gicdci1j6m8dh4w5856" + "rev": "ed4434253762f943255af20e98098b19a65ca1a6", + "sha256": "1ivi984rkavxzxap1rq55yf6jjf2pi90f4riw2ww41hj87prv26q" } \ No newline at end of file From 216a05423e5f6df83d2b55e6c7ba2e6778f1d63a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 22:04:05 +0000 Subject: [PATCH 216/241] python27Packages.django-picklefield: 2.0 -> 2.1.1 --- .../development/python-modules/django-picklefield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 4bcd767bd63..9ba4e14c31a 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "2.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "f1733a8db1b6046c0d7d738e785f9875aa3c198215de11993463a9339aa4ea24"; + sha256 = "0imncys5s3vsy2q79nn7k5d670da1xgmcr9gmhn06fry6ibf39b7"; }; propagatedBuildInputs = [ django ]; From 913cc56c44591ee78e1bbd62617aeccd07423f14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 22:08:12 +0000 Subject: [PATCH 217/241] python37Packages.aiorun: 2019.11.1 -> 2020.1.3 --- pkgs/development/python-modules/aiorun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 7e38bb76873..aa7462ba831 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiorun"; - version = "2019.11.1"; + version = "2020.1.3"; format = "flit"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cjrh"; repo = pname; rev = "v${version}"; - sha256 = "04p3sci6af6qqfkcqamsqhmqqrigcwvl4bmx8yv5ppvkyq39pxi7"; + sha256 = "0ka0pj6xr47j7rw6kd5mkrr5jyhn631pfpd95ig7vbln4434qnb4"; }; checkInputs = [ From a6e9b59633f4c1e615ff69a454720fb3350bd910 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 1 Feb 2020 19:47:21 +0100 Subject: [PATCH 218/241] k9s: 0.9.3 -> 0.13.6 PR #79031 --- pkgs/applications/networking/cluster/k9s/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 6fbad55f807..3125ab3330e 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "k9s"; - version = "0.9.3"; + version = "0.13.6"; # rev is the release commit, mainly for version command output - rev = "1a9a83b34cdd0c9b4e793ed6b4b5c16ea1a949a0"; + rev = "8fedc42304ce33df314664eb0c4ac73be59065af"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; - rev = version; - sha256 = "0k27mfccz563r18zlbaxll305vrmrx19ym6znsikvqxlmhy86g36"; + rev = "v${version}"; + sha256 = "1gffbj6pgys6k3i8ikcy3yr2r9cwg0xki55yz5yg6z4a8h0jc8a6"; }; buildFlagsArray = '' @@ -20,7 +20,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${rev} ''; - modSha256 = "09rwbl8zd06ax5hidm5l1schwqvsr5ndlqh09w1rq9fqjijy649y"; + modSha256 = "04k1wfhyignxy84pvq09fxvvk7pxdswbrzxvxc50dz8n8y7wcnjf"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; From 4200386fb634061751648cb8fd283a23ece0b071 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 1 Feb 2020 18:01:25 -0500 Subject: [PATCH 219/241] rl-2003: add note about Geary module --- nixos/doc/manual/release-notes/rl-2003.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 4ee9ebd6a2b..59026758850 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -103,6 +103,13 @@ services.xserver.displayManager.defaultSession = "xfce+icewm"; via . + + + To use Geary you should enable instead of + just adding it to . + It was created so Geary could function properly outside of GNOME. + + From cbce59a9cc3500d7376f7317faa9e78991648426 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 05:29:58 -0500 Subject: [PATCH 220/241] nixos/doc/network-manager: updates Fixes #71161 --- .../doc/manual/configuration/network-manager.xml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml index d103ee24978..3953e0ffe85 100644 --- a/nixos/doc/manual/configuration/network-manager.xml +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -28,17 +28,21 @@ nmtui (curses-based terminal user interface). See their manual pages for details on their usage. Some desktop environments (GNOME, KDE) have their own configuration tools for NetworkManager. On XFCE, there is - no configuration tool for NetworkManager by default: by adding - networkmanagerapplet to the list of system packages, the - graphical applet will be installed and will launch automatically when XFCE is - starting (and will show in the status tray). + no configuration tool for NetworkManager by default: by enabling , the + graphical applet will be installed and will launch automatically when the graphical session is started. networking.networkmanager and networking.wireless - (WPA Supplicant) cannot be enabled at the same time: you can still connect - to the wireless networks using NetworkManager. + (WPA Supplicant) can be used together if desired. To do this you need to instruct + NetworkManager to ignore those interfaces like: + + = [ + "*" "except:type:wwan" "except:type:gsm" +]; + + Refer to the option description for the exact syntax and references to external documentation. From 76e859f386b4fd0d7f3ea6dc663d677ef742ac9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 23:30:17 +0000 Subject: [PATCH 221/241] python27Packages.python-sql: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/python-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 54cb815bf3d..846a9c26d70 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "05ni936y0ia9xmryl7mlhbj9i80nnvq1bi4zxhb96rv7yvpb3fqb"; + sha256 = "0f0g10y0whvax8yv0rfs7b4yd68lbxbss1za0mvbvr65b8r3pdxz"; }; meta = { From 2f780790b3f46eb02259ee9e80081533d7f54dfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Feb 2020 00:04:17 +0000 Subject: [PATCH 222/241] python27Packages.relatorio: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/relatorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index ce9a4888eb9..3b98128bcf7 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "relatorio"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "0q93sl7ppfvjxylgq9m5n4xdgv4af7d69yxd84zszq10vjmpsg6k"; + sha256 = "0an1yiy4pxfazrbaw4sm8ybhxqn46yzsakkl9qjklafn1j69lnza"; }; propagatedBuildInputs = [ From b8dbf0f2fb0d1f06fa5d454d1e0cd21f96f00fd4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Feb 2020 00:10:26 +0000 Subject: [PATCH 223/241] python27Packages.quantities: 0.12.3 -> 0.12.4 --- pkgs/development/python-modules/quantities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 83cce4ad4ba..6e92881aad0 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.3"; + version = "0.12.4"; src = fetchPypi { inherit pname version; - sha256 = "582f3c7aeba897846761e966615e01202a5e5d06add304492931b05085d19883"; + sha256 = "12qx6cgib3wxmm2cvann4zw4jnhhn24ms61ifq9f3jbh31nn6gd3"; }; propagatedBuildInputs = [ numpy ]; From 1b167d92c747add42af79106dad15ce521075967 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Feb 2020 00:50:16 +0000 Subject: [PATCH 224/241] python27Packages.pdftotext: 2.1.2 -> 2.1.4 --- pkgs/development/python-modules/pdftotext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 0a2427283f4..fc329009d31 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.1.2"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "c8bdc47b08baa17b8e03ba1f960fc6335b183d2644eaf7300e088516758a6090"; + sha256 = "00xf3jmpb4m3q758wvk4khpcmiys4gmd88vvrz6i7yw1jl268y6k"; }; buildInputs = [ poppler ]; From a5a153e489c4db4018d85b8c997fe754f97710be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Feb 2020 03:37:46 +0000 Subject: [PATCH 225/241] python37Packages.nest-asyncio: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/nest-asyncio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 334edd0cf1e..102c41d0117 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,16 +5,16 @@ }: buildPythonPackage rec { - version = "1.2.1"; + version = "1.2.2"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "7d4d7c1ca2aad0e5c2706d0222c8ff006805abfd05caa97e6127c8811d0f6adc"; + sha256 = "06hw495yqg60j738jp3qaxryhyrs36lpgmblf1sm2m2c3mgm92p5"; }; - # tests not packaged with source dist as of 1.2.1/1.2.2, and + # tests not packaged with source dist as of 1.2.2/1.2.2, and # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) doCheck = false; pythonImportsCheck = [ "nest_asyncio" ]; From 8fb61784376952adae80c9458595053dbcfae0b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Feb 2020 06:33:39 +0000 Subject: [PATCH 226/241] qpdf: 9.1.0 -> 9.1.1 --- pkgs/development/libraries/qpdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 68362be596b..c50c62d7794 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libjpeg, zlib, perl }: -let version = "9.1.0"; +let version = "9.1.1"; in stdenv.mkDerivation rec { pname = "qpdf"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ygd80wxcmh613n04x2kmf8wlsl0drxyd5wwdcrm1rzj0xwvpfrs"; + sha256 = "0dj27wb9xg6pg95phbflfvy9rwxn1gh3kc4n175g0pf41r0zrim2"; }; nativeBuildInputs = [ perl ]; From cc19751a18606e151b900691c9197490fbc6067f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Feb 2020 05:30:14 +0000 Subject: [PATCH 227/241] python37Packages.uvicorn: 0.10.4 -> 0.11.2 --- pkgs/development/python-modules/uvicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 73d797bc43e..f6cc91413c0 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.10.4"; + version = "0.11.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0z4h04mbkzqgpk698bac6f50jxkf02ils6khzl7zbw7yvi6gkkc8"; + sha256 = "145c569j4511zw3wglyv9qgd7g1757ypi2blcckpcmahqw11l5p2"; }; propagatedBuildInputs = [ From 4e0486fcd94f075351ab69306eb8042b32cc2447 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 1 Feb 2020 23:45:35 -0600 Subject: [PATCH 228/241] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 468 ++++++++++++++-------------- 1 file changed, 234 insertions(+), 234 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d4823066d8d..e7aeb87914c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -204,12 +204,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2019-12-13"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "6d6ac26c537b996819eda9f0cf8f303d10048c10"; - sha256 = "120bx0wskkpk2r05sv74430270lf3c5j1z02bd05i9747dbjcgq5"; + rev = "84e87ab52e18fb1b06c71ca0a03dfe949b12ff22"; + sha256 = "0nffpmkraxfdh9fv1j7k413kw1vn3s4vdr26r5srfr21ck835l2c"; }; }; @@ -226,12 +226,12 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2019-07-11"; + version = "2020-01-27"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "59d1bbdec7d82740811806c4d4da1963089064a8"; - sha256 = "0yfh6if7zch7zrq7f6a0npfhqg2vsa8gilvbj5a6whhvhay3pcw3"; + rev = "364e803cfae22a9ef6d7543631495ba8644f3cce"; + sha256 = "0rfy490584qrqa01p3yp7wzgqxn69vbdg37fydj43ah8i1vj3w76"; }; }; @@ -314,23 +314,23 @@ let coc-eslint = buildVimPluginFrom2Nix { pname = "coc-eslint"; - version = "2020-01-15"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-eslint"; - rev = "51ee1951213a1e809d3e279ba2ad2a5050602aa6"; - sha256 = "1pggil5y6zk6jnfpmv2r7fiaar8lnzjqi3b7qknmi0w9rxcl7r0v"; + rev = "e1059e0481f71507daafffbd88cb053edec6d66f"; + sha256 = "1zb9637bsw0y73cwy7g5bhs3abi2hha8rvwji83jy3c31xals3y1"; }; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2019-10-30"; + version = "2020-01-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "56d45aaef20356e750530f9f80c99cd2f9184ac1"; - sha256 = "17rbrjp35jd6rw66js88qaki2hk0cm1bvylfzjngdbzbgjc1qz1h"; + rev = "99a156b0af36365707aa97afa6544020eb2f4fe2"; + sha256 = "1lq0gjwxh0qhx6vp85bld8sng47yf6pb28n3wkfi6m6718wz8dq3"; }; }; @@ -424,12 +424,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-01-15"; + version = "2020-01-26"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "8806b10655380bb3bac6143450e93da7f003223b"; - sha256 = "0rzyha80vqpjisp6sf3whbcy53a69i8zk6c781ag1a699b38gbq9"; + rev = "a360f269ded6b6bd9303f563d68fa05587e59f88"; + sha256 = "1v55ld7jdrgq44cz8z8nncl4lfnwi48nnvhk9iy8zgqhrd1al8ji"; }; }; @@ -512,12 +512,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-01-04"; + version = "2020-01-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "b57debd2faa71118258f29968f17b3cd06664b1e"; - sha256 = "1jk20qjr5az6hjxrmjm8vdq0ks40bq55cw0y7xsmivw6cb61m367"; + rev = "66b684a530358355d85dd792b21f3e49b4fba24b"; + sha256 = "1f14lj6fr11w2vgklym36s0awlwgp50d2kahmj380igqv8dipf3j"; }; }; @@ -810,34 +810,34 @@ let defx-git = buildVimPluginFrom2Nix { pname = "defx-git"; - version = "2019-12-25"; + version = "2020-01-18"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-git"; - rev = "6f064b7aa45491aa728f976f49012c6abe244f15"; - sha256 = "1909f4q4b5yc2g8x8spxs7q9iq94ls2id2xa9k9cf9h93x2jla5y"; + rev = "b5d0b842064ddb7a7af0e790f4648cb1909ed43f"; + sha256 = "0i8vi6zhnv088qc3f3wa5h4b17xnpvmr603srhg44zx2clcjblnr"; }; }; defx-icons = buildVimPluginFrom2Nix { pname = "defx-icons"; - version = "2020-01-16"; + version = "2020-01-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-icons"; - rev = "26363a6fd830cc02b84f330955c055845f0a8356"; - sha256 = "02fga1rmg4if7pbk5awkwfqn4cl0mvpypxgq6wpvcwb3xp0axkbr"; + rev = "15e783260e9d021dfbd94fbd18bf2fc6ba263daa"; + sha256 = "0fw4lj2xk7bzyfyb91lhm3zm5gb8drkzwr7aj5viidaajd157ray"; }; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-01-16"; + version = "2020-01-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "e05b8406536f6cf79ddb5a57a9b4cbcf0f026b76"; - sha256 = "0pvfnwkzgw9357r3mjsv4kx64w8sjjfvffb8nw4h4s50q3kkv42x"; + rev = "0b5e1225c515f47ff0ffb12bf9f1141b53c52cc5"; + sha256 = "1y382rlmn9ns9rckp0m37kyaxzyjz27g8lph9n0sj1lw4rjzblql"; }; }; @@ -876,12 +876,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-01-16"; + version = "2020-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "5bd1b8a9a87106733b89dad3f49d8681f0e18084"; - sha256 = "1aacvm6abgszmirwvqj1j21fifvwqzq9amqlcg1rc91i0qd7f19m"; + rev = "54e15f738b41990b140866e72d4b6457e36cfdf3"; + sha256 = "1rh6d6bl67r41k8x3v8s52ish27cw3qgd01i80lgwjskq29qy808"; }; }; @@ -955,12 +955,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-12-22"; + version = "2020-01-26"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "63beb118c8d215bad4f8759b84608fd463abebc5"; - sha256 = "1rilqprq6fq01qj1idgvy38p827gjq2bsx93xfbim6yc4hkj10d9"; + rev = "395f1a91be8b748f6b92f069a60c69ca8e2c96f1"; + sha256 = "0iwcybwadp2198sxiwbbcirmjgvfw89v40qa51akj5vvalr6r5bg"; fetchSubmodules = true; }; }; @@ -1055,12 +1055,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-01-10"; + version = "2020-02-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "1e1af97ed05f12ad16104365d40e1f26a3e98a1d"; - sha256 = "01zgvadp7h47ni9bvvgbg68vxb0hijw670xyps557ii4aadkk28f"; + rev = "6e01000280edc9c9c56ef7b1d59977fc93e3bf4c"; + sha256 = "00qvpp7r7wnccfzfxq9xa4cyxzr25zy32mpxscnbixc7cv5y981x"; }; }; @@ -1099,23 +1099,23 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-01-16"; + version = "2020-01-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "3bb3bbaa4508b5c2a1d2653304a0e24e9e1ed186"; - sha256 = "112qnnzhszfr9yflfqrj6wgjzz1w5j8m59qrzlqgi8wr7mzvwlb0"; + rev = "0711b8686c1d25b21337d935ee34f339df671cc1"; + sha256 = "1l8l0v4818all14rilbjkl0iazgxqdwsffr9a91gxgxzr81zxvdh"; }; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-12-27"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "7e5b4a91ad55b992247edb87543ed7855db1a199"; - sha256 = "0cbdk4bxk0alq69fjxk4ryfk1w6pvjkqp2sv7rj8qgrwgpqdv5wd"; + rev = "21fbc2afe8f30e98b890fb42fc6bc18fc0c0380e"; + sha256 = "1za9q891bxc355qn7v0wasnvf2j6pvhizbp6ycj411hjcw90jwns"; fetchSubmodules = true; }; }; @@ -1178,12 +1178,12 @@ let far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2019-05-25"; + version = "2020-01-28"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "3c6a6a1ede26690dfaa9dd3c23929b1be6176745"; - sha256 = "1w7bb3wf99pvqwsakkwjf98qarx2v4xy5jpf29xx0574vfj1w29m"; + rev = "451e76934599893685f5283bfd2b53d5526239d4"; + sha256 = "1g0vmfi15yn5llzrqddzxvz8ypzz6z9ksxij6nr33w6qdzvid27s"; }; }; @@ -1311,12 +1311,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-01-09"; + version = "2020-01-27"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "40a6ed21bc811e7795c525ce9a4fc689c6b99f60"; - sha256 = "020g3032gggxllnapqf7nbg5wqjg3c2z190f2jx3cl6z0fswgiwz"; + rev = "dfa37af1baa37c1eb0a34d9bf303b5f2aa9fbc4c"; + sha256 = "1cx0bj1c1ynzqqvjx0rrbkbhkql6zs11k6sbpbn7gdch4437cjzs"; }; }; @@ -1333,12 +1333,12 @@ let gist-vim = buildVimPluginFrom2Nix { pname = "gist-vim"; - version = "2020-01-09"; + version = "2020-01-29"; src = fetchFromGitHub { owner = "mattn"; repo = "gist-vim"; - rev = "c1f9b5aef7fa68f5151e62ceadbc9a9c48d58962"; - sha256 = "0q83dqhp3n0hj0mdkvj2kilywpqy512r1vpay0f9z57vkx29grzr"; + rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; + sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; }; }; @@ -1399,12 +1399,12 @@ let gv-vim = buildVimPluginFrom2Nix { pname = "gv-vim"; - version = "2019-12-09"; + version = "2020-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "a18f4465974dfbd53f1ea33bfbbcc8a32baf1b4b"; - sha256 = "1b4y39zqjggqw6sybmr73di3grhnk19xb5jvyckjb43rp8nxrr00"; + rev = "72dc64df998355b41a75ebfa32adfd08ed5c5819"; + sha256 = "01g4rnsh2n691n9a6gqhyzivr4mzlgz3i2mwb7vxpkp61yf755bb"; }; }; @@ -1531,12 +1531,12 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2019-10-21"; + version = "2020-01-18"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "088293c426c398b2655f01026cd146f536a703c7"; - sha256 = "1ib4p3r8qnlybfw53asn8xk0y9w5ppjpkn2c51bsx1v5an82jjbl"; + rev = "08e36b649c83eece7edbd2e04e42e077aebc78eb"; + sha256 = "0jawl7fs6wl3ny9vsmzqv5pnkv5nn6wj1nx7hzgdl41183958pni"; }; }; @@ -1564,12 +1564,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-01-14"; + version = "2020-01-24"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "e2abec21c5d9794d22d4b0c0327d274c87a99c9f"; - sha256 = "18mbhabl9iixy11pg055akmdrdrfna9dlbi2xysshjzijrc7gdkw"; + rev = "c9bdefca547d8d9fc1add1231d1f7d381d056ebf"; + sha256 = "1pddriamagd93v45j7ycvlxgs2inxs3gq6616x5d82v7g3ipypgk"; fetchSubmodules = true; }; }; @@ -1719,23 +1719,23 @@ let lightline-ale = buildVimPluginFrom2Nix { pname = "lightline-ale"; - version = "2018-06-12"; + version = "2020-01-18"; src = fetchFromGitHub { owner = "maximbaz"; repo = "lightline-ale"; - rev = "dd59077f9537b344f7ae80f713c1e4856ec1520c"; - sha256 = "1f9v6nsksy36s5i27nfx6vmyfyjk27p2w2g6x25cw56b0r3sgxmx"; + rev = "a1931d473d6600ccf7e426158b79c9df29463dda"; + sha256 = "1zmwi4b8sbl3zpzp8hlz7j3gg4p9628s0174pcd2n6mdkfh235g5"; }; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-12-27"; + version = "2020-02-01"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "f4fa096a67afbe593bd53cf618850c32512b5d47"; - sha256 = "0qrz4nwb4imnxiqk3p1r4sxib1gjicpsr3g6l8mdgw806l1jc9mg"; + rev = "f7dd47eb55aed259cbc3e913f78c4ab21b3504bf"; + sha256 = "0hg9dcp2bwkj4ly06g60sw4akd5ziah325jdmwwj09xq8q4vsvll"; }; }; @@ -1917,12 +1917,12 @@ let neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete-vim"; - version = "2019-03-28"; + version = "2020-01-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "5f3e213c629b7fe1aa3723bf56fe3ead5555a526"; - sha256 = "1x5hnh7riv50c7ywnn2mch0rgks5r2y4k32y8bb616ld0xndaa4b"; + rev = "0f83788cb67e0743a3a9c8d3a3a6e52a01bdc6c2"; + sha256 = "1ydnb576qbdbij7ipciw0m46wbj45gj7xirpmqxazgp9y6b13isf"; }; }; @@ -1961,12 +1961,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-01-07"; + version = "2020-01-27"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "2669c679fa2d39457eba3f84f50404d7994e22cf"; - sha256 = "1ag11acrg32qgwn0c3lsv7ai0f8hs3hklpnqjx84jb0kb1fqp8s2"; + rev = "dd76544b09a01c81157f1e6d440fda760ed14125"; + sha256 = "12ywqpy8dbjxn384c0basbns4y8j3znwi3rrvvqqra4vxay8cpgn"; }; }; @@ -1983,23 +1983,23 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-01-14"; + version = "2020-01-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "c2d13761b75db006a72797402b9ef41630c7ddaa"; - sha256 = "1xv41xcxic1mj7544pmvs8iafidr69cb6xg6gn8xc6byh4wv409v"; + rev = "0d7f506538a82b594e3527c58f7b2bccd44d9a85"; + sha256 = "0clb394pkxwrh14rbll4ffpx45sqgvmlbrr9bl3q58q7b5qhg54d"; }; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-01-08"; + version = "2020-01-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "5673f584c06431978a17609865f2adcf5e934be3"; - sha256 = "05g4dixqn584h6z2w7va676q74fl1839f86wsjfm09kfdlql4n1m"; + rev = "3581e4c3f4c3c37fd614ad67bb54e6959326508b"; + sha256 = "05mwn8yxk27gym42j5jra6fm199ah17ack65jqvhvslycgk28khc"; }; }; @@ -2060,23 +2060,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-12-30"; + version = "2020-01-25"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "24df32304e20677ab061115e7bc8a37f382c60e9"; - sha256 = "00w46597m8xsdksm2smqmslxk6ydnig4ycwn4fn0ybrlmyalclhi"; + rev = "cbadb3d93e5dcb121793b182880ee784dbd78978"; + sha256 = "0zk9a6ns5552nc9d65cxigv84v1p8dkdm9zwrvhi37vjznknb7gy"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-01-16"; + version = "2020-01-28"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "26740d1157dc1befe2a088052e10cf00436a5003"; - sha256 = "13q14clp94mmzfkixxd9rg16div5sngnxhqagvj06jw53cs23cdg"; + rev = "8c48845d11adc4c9b07fc727725ed68be5d3177f"; + sha256 = "0d8rlmj65lq50iznangcrpdyd1233qwbv8yn86pzd3n7s3r18l3g"; }; }; @@ -2137,12 +2137,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2019-10-28"; + version = "2020-01-21"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "aa343ab3089cb520289a614a7b7c71f43134b34a"; - sha256 = "0qn0mq59x8jdkjvv47g2fjxnagvpa7pb01vl4jjrdwq34639i1bg"; + rev = "eed0efd34297966533b6e7155dedfcc59a84baae"; + sha256 = "1sa60pw609v2a0dacaddx3d861xidc72id4dipa55k5ck3ma4vns"; }; }; @@ -2159,12 +2159,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-01-05"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "7a15a52c0a7d735625ac73dc4d8efe70c5e99707"; - sha256 = "1wpp54gvb90qhgnxmp3fvfc3dbkdxk3q712c7wyd9alpbk4608fk"; + rev = "9c9687f1339809a9ebfb3994c967abb473517684"; + sha256 = "17ggvs6w2qb4lyph9fn8y2q2ihay47672h7wr62525l7sgldjih4"; }; }; @@ -2225,23 +2225,23 @@ let open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser-vim"; - version = "2019-11-14"; + version = "2020-01-27"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "cd29e8c8db02cd7744728a8f77a829b967e5ff31"; - sha256 = "0n1q76bcavkh1smk3l78ai7jh7qzn3sbpqcxs3pjf5za5j4c5i48"; + rev = "88168d9c4cc41000b8020c852b6a75cb99bc7e1b"; + sha256 = "0f14ij1c0mqjxbwjgp5nsss3ja21w7lkfkh08x1fvcf88h4y91j6"; }; }; palenight-vim = buildVimPluginFrom2Nix { pname = "palenight-vim"; - version = "2019-08-21"; + version = "2020-01-17"; src = fetchFromGitHub { owner = "drewtempelmeyer"; repo = "palenight.vim"; - rev = "139f5b929a8be2530c7386a5b4610d4459941199"; - sha256 = "061iqgw9kzpsni9159bd8hllpkdmnrjbzpi9phy91l9klnja2cam"; + rev = "f332f9efe73227a47c18bade892ac55682641733"; + sha256 = "0nd2hqvxnjnbsp17x666nwyy0s9j9b6igyfhl44p7lkci6560gwp"; }; }; @@ -2522,12 +2522,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-12-21"; + version = "2020-01-26"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "05f98470e55722aaf9b1a1ef1eb272f2d95e349d"; - sha256 = "0hg8jmbybhfaiiwzm4rh7m706mwvzkyk1vzg8jxq8653cbbjfzib"; + rev = "a1dfe1d47301cd02a2eb2ab56a0ff17e29d53bd2"; + sha256 = "08pmrrn5v1b69g51gs5dv5ri7fwwjfnp0wdnjiigkzkff069001r"; }; }; @@ -2632,12 +2632,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2020-01-05"; + version = "2020-01-24"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "c09ffbbf54b4c25996f864b0f75ebc7a1fca6919"; - sha256 = "1sn952wil99jqc3r9hr017604s6gb99jwwmbldmkdh9qcr03kjvm"; + rev = "7024da097c1530c25cb1f8b63f07c00c04ca2c6f"; + sha256 = "1kghrk6xmx48prv54qmv4j515bbvivc7gbpkaci7a088k9cdvgk8"; }; }; @@ -2742,12 +2742,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-01-12"; + version = "2020-01-29"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "3b756bc1066a6df6b54415f2aa7eceaa67ee1ee4"; - sha256 = "1c9nsg36an3jyma0bhz6c9ymmcrayim6cxn82g37skl040gksvn4"; + rev = "f3766538720116f099a8b1517f76ae2f094afd20"; + sha256 = "1bzjav87fcibwlp8siqnx6x8wv8w3mwrrqrd5w19ny9scr5x2a65"; }; }; @@ -2786,12 +2786,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-01-16"; + version = "2020-01-23"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "db6f884fc77aaaf29772e209a54f5f346d2083e5"; - sha256 = "0vywdbvrwbimdizjzdncmrsl21jbklqwxq4g2piw3kqmgk721jg0"; + rev = "679a9d9ac9579bd18225409d85ed4870fb6c9c62"; + sha256 = "1s4736104vfaj7rfcdzcnmgbnxxi0ngs07km0p2fi1m2zc68602l"; }; }; @@ -2863,12 +2863,12 @@ let thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail-vim"; - version = "2017-04-24"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00"; - sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5"; + rev = "7d65524dddaeed5629e6b9c8926c56ef8dd0c553"; + sha256 = "02707pl5dqfgkxx2i4wcfxx2zdpm86g5l4n4wn1dms35bcn2c8l8"; }; }; @@ -2908,12 +2908,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-11-15"; + version = "2020-01-22"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "393b3d0d55b951ad8d28f63f0e28c48e25ff48e4"; - sha256 = "1hwn530p6zcjhk2lcmiqgrahxmp9hkwbzjbz4vnqdf1j6w9aqrwp"; + rev = "4d3858eb060a1fd2213b075a707d39cbb118ae3e"; + sha256 = "0qny9z459x7hp5y43iivws2m312clacysdy1nnb3cr1fyhw9pflx"; }; }; @@ -2930,12 +2930,12 @@ let tsuquyomi = buildVimPluginFrom2Nix { pname = "tsuquyomi"; - version = "2020-01-13"; + version = "2020-01-21"; src = fetchFromGitHub { owner = "Quramy"; repo = "tsuquyomi"; - rev = "1fc47734abcb272df4321a50e2587c4c9e0a0a1a"; - sha256 = "0dwc22zhzslgk60slr60rn26ww3ppl52nf6pcbnagxwfzadn5l6z"; + rev = "785af7476e0db2522372ef585c86947fc5625c81"; + sha256 = "1grjd7zpds9vgllf4y7iymbkxi9kaks1dccgmhkp0vas8hlvpiy6"; }; }; @@ -2974,12 +2974,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-01-06"; + version = "2020-01-30"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "d450defdb29842e66b779715941a98cbf73736ea"; - sha256 = "196fi75rvhj0lrzpzkpzvlnrncnjysxj8iww0drc1aawjfkmn1ni"; + rev = "7314b0051e8155b1b70bbc3811d1e740423dedbf"; + sha256 = "1w2dhl25g8cy980bsj1w4xp76r5rsgym3l2d1acxabixi8bgbzjr"; }; }; @@ -3007,12 +3007,12 @@ let vader-vim = buildVimPluginFrom2Nix { pname = "vader-vim"; - version = "2019-05-18"; + version = "2020-01-26"; src = fetchFromGitHub { owner = "junegunn"; repo = "vader.vim"; - rev = "de8a976f1eae2c2b680604205c3e8b5c8882493c"; - sha256 = "1pibls5s74fkzvj7spdpdn2s6zka0zxg4yr02s6jd0bcniq210b5"; + rev = "44b74b4155ec1c28fd8c6dccd90b8736dcd87aa3"; + sha256 = "00shc6v2jh0jcksfk1ba5slw5m4amxk140j524xyva3kpvdfm814"; }; }; @@ -3271,23 +3271,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-01-13"; + version = "2020-01-30"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "8d694cba9c22efe8320a8fbc919a50bd938e7929"; - sha256 = "17kjbc13rsjaxkpfj0f90v3khzid02rrkcdjss3sqa35f37wn2bz"; + rev = "f659a98d501a1eea9f0229aba85499ab2f8308e6"; + sha256 = "0k0mpgy1kz6lvr55i9i6py0mbig4w323xzcq0wjk7gjlllh2xilz"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-01-07"; + version = "2020-01-30"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "9cfa14a6b7e2bd923b3f14252091ed35eda188fd"; - sha256 = "09ap3w0ixbk5yxsyw165kh7lxmrbjlnz16a1z5qpd9d7afbl3k69"; + rev = "9d6b2fdf66c178dfb0ffb4879b22845f980289c5"; + sha256 = "1lfxn6f9688irzw6dkj0dmfchmf8xzmky56kmfy83prnc1jql8yj"; }; }; @@ -3337,12 +3337,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-01-09"; + version = "2020-01-23"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "4159c742ed0b547026b9e398ef78b31527b5e167"; - sha256 = "0yq4jl252bndr45yhqwmv9mzgjsscywm0wn0lqz70xbz9ik69gvk"; + rev = "9a0a3184348c513e0ad67d44ad65f57405b2db2a"; + sha256 = "0i38d39myhn0mabwz24g7d6bnnbs94nhxppig868kq6qfjqb9ydy"; }; }; @@ -3579,12 +3579,12 @@ let vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; - version = "2019-06-28"; + version = "2020-02-01"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-cursorword"; - rev = "c35c5e686769db02bb9ccf30cc21fc13786f7f14"; - sha256 = "1115j8ch1p6q5x3y85pmdgib7ya0m0j8j52gblh0mlw823zf3lrf"; + rev = "80c4a28ad90a32fb40f01df44e6208bb7709753d"; + sha256 = "1cn605aj3qa11df8arhdsd6x0rpkz83w1r6a3g21cwd5j37x6gkr"; }; }; @@ -3645,12 +3645,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-12-17"; + version = "2020-01-26"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "9c12328df924ddb875ee1e5c9fc0f939b62d6a6c"; - sha256 = "1kpkwqrhix7whd00pcbanf3ij55x34cqc6qz3r2xshcmydk5vqxn"; + rev = "5d84cb9ce7fdf7d3fd729a9d3f59060ca5ab3a6e"; + sha256 = "0jsssvh1h4kzs51fcgd1gyrkrx6ldf5z3dcnllc26qz4fki1ds89"; }; }; @@ -3711,12 +3711,12 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2020-01-13"; + version = "2020-01-19"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "d534ba0d0c211d8228408c88fa3ebde13fecec37"; - sha256 = "0yc28synqrqjnzgzpmn7ji3nnidb55mm8n27d0kkd2l80bygg8n4"; + rev = "9194ce922d7edda10d9e1e4f053fd9abab0370c7"; + sha256 = "0is9y46l90n0jklsrs8hkwq5a4vr36gvb6pybfc8yxyiph9pdyki"; }; }; @@ -3755,12 +3755,12 @@ let vim-elm-syntax = buildVimPluginFrom2Nix { pname = "vim-elm-syntax"; - version = "2020-01-06"; + version = "2020-01-25"; src = fetchFromGitHub { owner = "andys8"; repo = "vim-elm-syntax"; - rev = "904025e5db117fe292fdb7ae490feff1540696ea"; - sha256 = "0nm1pzq5qg9mcg0vhvqjbnq20f98njf2yn0sfzlyjgna2ivvjasg"; + rev = "846a5929bff5795256fbca96707e451dbc755e36"; + sha256 = "05jkx4dbkb646wy0igqpwc55iamm0a030dswhirg6nyl3x6qzgym"; }; }; @@ -3821,12 +3821,12 @@ let vim-fetch = buildVimPluginFrom2Nix { pname = "vim-fetch"; - version = "2019-04-03"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "wsdjeg"; repo = "vim-fetch"; - rev = "76c08586e15e42055c9c21321d9fca0677442ecc"; - sha256 = "0avcqjcqvxgj00r477ps54rjrwvmk5ygqm3qrzghbj9m1gpyp2kz"; + rev = "dd674b50b261275a6a75cab6929b7bb7c5c4acba"; + sha256 = "1hadfzhzkq2n9k3yga55fsl6nm5mgl2vv975jnxsi4qgz9cwcsgr"; }; }; @@ -3920,12 +3920,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-01-15"; + version = "2020-01-30"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "c83355d5c52002f94d08267f1d14ca6d1a2763e9"; - sha256 = "19afdby0byyr9flirfd7w3zzp66sab2bh03bh9y7jaglm1hpxfhm"; + rev = "1c1014a0464cfb4985b6f913381a2a7a2f7b87bd"; + sha256 = "006mn3dpxx0yf4da4gy7lw43lp78w4sp9isv4rq5pjc9q02hs0hy"; }; }; @@ -3964,12 +3964,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-01-15"; + version = "2020-01-22"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "9add23a492cba86df506db3be363c699f6c8d28e"; - sha256 = "18s8a5634sldcz1fmn58lkgx8wlp4pq7gglal6qk84ckmsvlxcdx"; + rev = "2ef4f7e7b20dce7fd89adbeb6a943240b77a7a8e"; + sha256 = "01gqp1rg1pwnb0nz8b15ii704p5b36wsax4yglkjbxa216f3snj9"; }; }; @@ -3997,12 +3997,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-01-08"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "810e4b9faf1583443fe2d027d11993fb698b080f"; - sha256 = "0841030jxifv0x8y4vqz0dvwkxirbynra5iibfgyv485ynhw2l8i"; + rev = "311ea9dbbe91186afc8262cb2a2e52b406a32dbd"; + sha256 = "1ri7hbm3g4bx56cqpic109dvggpj9nxifdwgk35ka08yc7v9vcl4"; }; }; @@ -4074,12 +4074,12 @@ let vim-haskellConcealPlus = buildVimPluginFrom2Nix { pname = "vim-haskellConcealPlus"; - version = "2019-10-21"; + version = "2020-01-21"; src = fetchFromGitHub { owner = "enomsg"; repo = "vim-haskellConcealPlus"; - rev = "c76b73b17a5eaf4fd535b6bd1f533ea847fd20f7"; - sha256 = "01p9rjpp9g859axlq2mpj89dg3d7n40rmqx2x66aql87m8rzjmam"; + rev = "d59da33c16966f694b2e4f0bfc57515a935da83f"; + sha256 = "1y2hgcpls21738lhrgimsxnkhxxqczp05nmk68s28xssbn4dqgma"; }; }; @@ -4107,12 +4107,12 @@ let vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2018-10-08"; + version = "2020-01-30"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "51e25c9fa3bd2dca500ee0c910a45641d57a57fa"; - sha256 = "1way32pgp0cb74p47g0fa5dqrz804lrypbddy65zcf3nd6rnr5qy"; + rev = "3871624ec89c9e8257b20044fd48a1836c05cbfc"; + sha256 = "0n99rva98m6qillax8anx9kby5n2826qql83wa4x3ibdjk1zng69"; }; }; @@ -4294,12 +4294,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-11-11"; + version = "2020-01-24"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "2e4a8c485cdf601bb2f2761ea68c09750a0b82e0"; - sha256 = "1zvqpk8qvkhglfdi6ma7ads54w0i8v8vy4k3gcrrjydmwwa2v34l"; + rev = "db595656304959dcc3805cf63ea9a430e3f01e8f"; + sha256 = "0lr0506zbax41xdbfgmm70iiyqi6g8lsmwfy9112fnd9n62s32yd"; }; }; @@ -4383,12 +4383,12 @@ let vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2019-03-20"; + version = "2020-01-20"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "fbb88789b531e1fc1abe25b2f44f4f4c8a73f14d"; - sha256 = "0661dnm0idaqy28pw03fznq5hpl2pbb4r0c1gvdmf59ywhsa2dav"; + rev = "48ba343c8c1ca3039224727096aae214f51327d1"; + sha256 = "0m8skd86p2cr0wz8rghj4is3fgnlh7vrw7can916li35i3hajid2"; }; }; @@ -4592,12 +4592,12 @@ let vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2020-01-15"; + version = "2020-01-22"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "93138310df5faca67dae456a641cb84506765a10"; - sha256 = "0ai0icgwcr7ygwfj3s1hfg7mrpfmaccapp3vcd674p5f81brhcdq"; + rev = "f13357964cc074d4fe747787065bfb19046f7fce"; + sha256 = "0kqik4xgnk3cw7ls53djij086rbp49klzckc4zs4ph4cjwcpjhgq"; }; }; @@ -4669,12 +4669,12 @@ let vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2019-11-16"; + version = "2020-01-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "c44d3c432243d39469046f4e25d38a690e49c755"; - sha256 = "0bvml6jcjd986ggx63sf9w4h852ivnshw6ilf6x2grfhnvsdgcgs"; + rev = "96a3f837c112cb64e0a9857b69f6d6a71041155e"; + sha256 = "11h7jyg7fhjmq3pmpc93nrsxm175ra14407rs3558h8p04snc159"; }; }; @@ -4746,12 +4746,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-12-18"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "b29871936f064be43ea9774cdf6980677830288c"; - sha256 = "0i20dlcnaf84fnsip9bfqz2clqgsq2vrzjxwq2mc1pj8pfvgr8r3"; + rev = "2bbb80576a62f58417e05d8600bb5647868bedf7"; + sha256 = "0b90dfngcssjxmvmjdrlzs0xkly5dhn8rldzzmj75x7z7r1dxchl"; }; }; @@ -4768,12 +4768,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2020-01-16"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "f7ea41a3bec8362ff0adf3336bc068cbcc636420"; - sha256 = "04hmcqag21fmb3flabbhybp6s8ysf3rxr05kxqdlln4wamimag81"; + rev = "0d1129e5cf1b0e3a90e923c3b5f40133bf153f7c"; + sha256 = "162l2p8md8lfyfjxzlmlz5ky5kvvr6wjmdk8r8lk6ygpkl2b51f7"; }; }; @@ -4801,12 +4801,12 @@ let vim-pathogen = buildVimPluginFrom2Nix { pname = "vim-pathogen"; - version = "2019-11-12"; + version = "2020-01-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-pathogen"; - rev = "a553410f1bdb9000fbc764069f3a5ec3454a02bc"; - sha256 = "1klnfqdb1v5zba8rm1ldga6wjhywgx870svyd4z2j3hqlrrvdfrb"; + rev = "c6bc42404597c718e4a032a98e21e63321cbb05a"; + sha256 = "1scj84vlrn2kavnq2wabhdzhnlkb3w046grv9j3976i5ykjmyiif"; }; }; @@ -4834,12 +4834,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-01-06"; + version = "2020-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "2f5f74e5e67f657e9fdac54891a76721bcd3ead3"; - sha256 = "08772rc8wqpbxwqqkl8v9x79sijkdigypqlr12ph7jc45qfdqblp"; + rev = "c3b6b7c2971da730d66f6955d5c467db8dae536b"; + sha256 = "088jyadfssgyyfb588vahskszbxm1vygp5dxkky7njs6v3g8lk5v"; }; }; @@ -4856,12 +4856,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-12-31"; + version = "2020-01-25"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "e8454d66ab8376cf9c7e42f09749d5bd17d98f89"; - sha256 = "19hajmja01hrzmq6f0lfnc03d7zpk0ixa9h9j5giskxp151f7vjr"; + rev = "35ea4d2b9072594b6c0ccf87bde7978ed9f94755"; + sha256 = "0r72q4wbja6qxk64lhqh6871xlndwi87w5cnxfq9bh7cnrx9dzhy"; }; }; @@ -5010,12 +5010,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2019-12-08"; + version = "2020-01-26"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "81f64ec3f33165159017f782bc8a1ce9f97348b4"; - sha256 = "0dja73g2mhbwnb29yqcwamwh77k8l3qqbmn25w9pa2mlnfkp9jy8"; + rev = "871e7a16dcb5a9c1ce8ae34978d6922e804e3472"; + sha256 = "1gacbgw1d273adp46mbasjrkrpk8ajmv8qi43pl4bjsqzdcigbg7"; }; }; @@ -5219,12 +5219,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-01-15"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "867f5cc995aec6c6f065d0ad76f5f0c914df4493"; - sha256 = "1gnxqqa93laf1yg94pvg5sb8hn59h1x33dyn68hwrld4yf8hriz1"; + rev = "71b30be0012448178b3371ea50909e097fdf9b55"; + sha256 = "16bcjhr236swc0wm50lvgl8nr4vr8xd69mgadi5r5lkqn1nflw4l"; }; }; @@ -5307,12 +5307,12 @@ let vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2019-07-28"; + version = "2020-01-22"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "5837cb38f656f120e7a04ae73f749303d78b9191"; - sha256 = "0n04mxdq80xkjgi75n1c2gg2s6am5kns8rj7pz6dvvlqr4vxyrjf"; + rev = "634791f5f61aaf49ce16df2698f99a2847f6318e"; + sha256 = "0hr794fn7b5zka3whk3hwh4hznv6y3a19ffsdbgdywr70wwb5grf"; }; }; @@ -5384,23 +5384,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-01-06"; + version = "2020-01-30"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "5ae986685ba479718b3f59263c519976cf9b4c80"; - sha256 = "1dhgzpjykx9slv6lfbjnyci5ndixisdgym3y8zanhhhjp4nff41b"; + rev = "c779b9e8458b5129b55e45e943ea5fe025af066c"; + sha256 = "152k628lbnhckrcr3rfm0nr6magmvwrvmvjdj19sw9g3r2lyqp8j"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-01-09"; + version = "2020-02-02"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "2f4efe7028e493a3d9eb06ccb7e27780b81687b7"; - sha256 = "1yfpishvgj1zdnhsixzjqnbmvfw8qg908zqnis3gk8s9fmnrw6fz"; + rev = "d0b1e060a7d6dce541f5535f9cc5a24bab1f45aa"; + sha256 = "0z0002nij5n5y9vkx7c1fhngpz60py2xp2lkyy0xd7b1wynh3pgw"; }; }; @@ -5604,12 +5604,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-01-11"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "1b4d7269600a926a394b146f7d39044cd4dafa19"; - sha256 = "0wknx72x7mbkw9007b6ylp1cpl6jap4kv3y85f9sz2lwlsbbkk4b"; + rev = "e9dac3d1091397df6245ec6fc75fb67501e85bc3"; + sha256 = "0kss80xh0j0hvv4mz472cxwwx7pgipjrxg5kj67bllxkrixv8i29"; }; }; @@ -5692,12 +5692,12 @@ let vim-yaml = buildVimPluginFrom2Nix { pname = "vim-yaml"; - version = "2019-01-07"; + version = "2020-01-30"; src = fetchFromGitHub { owner = "stephpy"; repo = "vim-yaml"; - rev = "0da1975ec394154349db744c1996fe2ef8fa5ed0"; - sha256 = "0kvsy6k4snwykpxk49x06jizxqrjjmbhhdcwiyiqy0029n05322l"; + rev = "8fc9136a9c3f64b3e65bb6170391f9daf2c23056"; + sha256 = "08bg7mxvgrl070m0kk4rmain7h3rv712jj6lk9l808cfjzaw9343"; }; }; @@ -5791,12 +5791,12 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2020-01-06"; + version = "2020-01-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "7425059fe2d9689f8560f1a47590677740669fdd"; - sha256 = "1rp5jq4jv8zga98pw62635mby0sgw0inzknlwcdy0f2lfbdvaq8g"; + rev = "51f4664c92f0f1b121127c84d3b1c901e1c698f0"; + sha256 = "06nzh4x7j7j3nvw2s4m1gmds0z0bldxbizja91jd43qma9xnwvlk"; }; }; @@ -5813,12 +5813,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-01-15"; + version = "2020-02-01"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5da264d236fa735fb6ab64d132f5cdf5a5612170"; - sha256 = "1gdcz9zm99j9xm7qar38d979il2vmvgh0a4n0zm2rdp10n1p669k"; + rev = "2f407de42781648809628b566d4b7cd7d7ea0722"; + sha256 = "1m4nmh9zdnxz1cd4nwixp6gjgxl4lqjrpfijg2f9mypc2n3j1zhc"; }; }; @@ -5857,12 +5857,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-01-15"; + version = "2020-01-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "323591f0a45c59b8e94c2b7b0995530cb1a153af"; - sha256 = "1j1ijn1s9qirb55z2qyf0h48m00j6rsz45y1djkz55m63ckr576l"; + rev = "dd5769ec7a1e4c2c8927a6af4d26f88524faa60c"; + sha256 = "0jad10lx3lvfy56gnk50lpcbwyxk16yxm5i1p3r3zwsqra03kw5h"; }; }; @@ -5879,12 +5879,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2019-11-13"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "f0dd97bd4076c9a1410786c3e5baba7bd3028b05"; - sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; + rev = "4c880407bcb6a873e83f845168e8a4ce90dfa856"; + sha256 = "1ms9v8zwijz15m0vj2pg1p1svbvh9ghd072hgiqlbwphi2a5g9gn"; }; }; @@ -5967,24 +5967,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-01-13"; + version = "2020-01-31"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "976d10ee24ce4d8790bcd80b3f7c6b8bbc9ec76d"; - sha256 = "0f3kgb07js6pjr6p03iyspn5k852y5b90w1ylas7lbgz32a1f3hp"; + rev = "ae182ee2449db2cce3055f7430b3adf6c0867948"; + sha256 = "0s96pd5ky2mxngxbw7lkhxbjzq74ay9jyk0zjy0q3ldd3xv4ssx5"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2020-01-04"; + version = "2020-01-26"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "d9a9ce47de8b88100e4230805bf44d394197476d"; - sha256 = "1ggr6dhppmc34wah8d6dwjfb9kkaazlxajvnd972pyx9c56crl89"; + rev = "124661f218e80b96c1f9f3d124e99f9a2fd2d83b"; + sha256 = "09v1wdx4xydz6f72wwm30p2h12zn3dfpywjw69z8zw6bbb4h8ksn"; fetchSubmodules = true; }; }; @@ -6013,23 +6013,23 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2019-10-01"; + version = "2020-01-23"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "90d28f75948d267058433d62b5450a3bc044ddc3"; - sha256 = "0c7f6g4j6gz08j7r8j0qjqq2nw01vcvs5i19lzhy2gp9kh5dg85m"; + rev = "ec6f369a000602e37e7c066b725f9d6bd12538f4"; + sha256 = "1ff5ac8lp7fq854kgf03c5h695lm60giw0qda5z428mmzwq0xask"; }; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-01-12"; + version = "2020-01-21"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "2a1de0f764e42f8b76daafc24249d6cb4a743c16"; - sha256 = "0lbry8s34ld97m05q091q2dmpfkn8k6nsj0q1vrbrsml5i5xig9c"; + rev = "669d4562d3ce0dba704374f1ccca66e4106b5234"; + sha256 = "0i3rg58wwq3h4lhqgpbdparrbshjif8z7aw0ivc1gx67zyyvlsip"; }; }; From 73c51e064a9a730ebba9518d960755d287a86035 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 1 Feb 2020 23:49:34 -0600 Subject: [PATCH 229/241] vimPlugins.bclose-vim: init at 2018-10-10 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e7aeb87914c..56bdedd87cc 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -191,6 +191,17 @@ let }; }; + bclose-vim = buildVimPluginFrom2Nix { + pname = "bclose-vim"; + version = "2018-10-10"; + src = fetchFromGitHub { + owner = "rbgrouleff"; + repo = "bclose.vim"; + rev = "99018b4a2dd18aea1cbd3aa23565b01a0f8c5b73"; + sha256 = "09a7g0nxn8cbnfz6za8q1p46kb5zbvxl80077hrjpnx4xc82xn2h"; + }; + }; + bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; version = "2020-01-10"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9ce6f478672..effd095a151 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -366,6 +366,7 @@ raghur/vim-ghost raichoo/purescript-vim Raimondi/delimitMate rakr/vim-one +rbgrouleff/bclose.vim reedes/vim-pencil reedes/vim-wordy rhysd/committia.vim From f22e45aeecb380bbd89202f15082c2f37c1212e2 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Thu, 30 Jan 2020 14:59:48 +0100 Subject: [PATCH 230/241] dotnetCorePackages: Fix closure size --- pkgs/development/compilers/dotnet/buildDotnet.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/dotnet/buildDotnet.nix b/pkgs/development/compilers/dotnet/buildDotnet.nix index 58e67ff008a..5ba57ed6918 100644 --- a/pkgs/development/compilers/dotnet/buildDotnet.nix +++ b/pkgs/development/compilers/dotnet/buildDotnet.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; dontPatchELF = true; + noDumpEnvVars = true; installPhase = '' runHook preInstall From c3620abe24660fa121c667763f77fc42bc2b7a84 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sun, 2 Feb 2020 02:19:53 -0600 Subject: [PATCH 231/241] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 56bdedd87cc..8fbc3944286 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1178,12 +1178,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2020-01-01"; + version = "2020-02-02"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "419279ec95260efe3af42c8b03b823e59f09c3bc"; - sha256 = "1cydvb4jbh8h1n09rc8446fspvfvbgbqz5a21nbadbkg3106wn3c"; + rev = "4355adcfe26e34744f95a467a07642094ac75884"; + sha256 = "0acya14rrmryfv6lmihx5mrjaa6aqqp1mfmyn3jawsynrgrfalc4"; }; }; @@ -1575,12 +1575,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-01-24"; + version = "2020-02-02"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "c9bdefca547d8d9fc1add1231d1f7d381d056ebf"; - sha256 = "1pddriamagd93v45j7ycvlxgs2inxs3gq6616x5d82v7g3ipypgk"; + rev = "ea4de13344084623d243bed3ebfccde9f9076585"; + sha256 = "0hw3564qqmjdykk1bpb5hgi2ysv0lfpw7z8kbs9mv6sxhln1p7js"; fetchSubmodules = true; }; }; From 8ec9dedc7724b996b84f5a174363e1283fb47d92 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sun, 2 Feb 2020 02:22:29 -0600 Subject: [PATCH 232/241] vimPlugins.lf-vim: init at 2019-10-11 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/overrides.nix | 4 ++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 16 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 8fbc3944286..5ae96e963b3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1706,6 +1706,17 @@ let }; }; + lf-vim = buildVimPluginFrom2Nix { + pname = "lf-vim"; + version = "2019-10-11"; + src = fetchFromGitHub { + owner = "ptzz"; + repo = "lf.vim"; + rev = "8ffbae128b8887283b2d4b3a660e5be0de58ea0c"; + sha256 = "0gzj9h31f4synjqfv8dhqihr6fgi3ar06xqjjl5fb4269p9964lb"; + }; + }; + lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; version = "2019-11-26"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index fc3d295e6ee..334df8e405e 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -481,6 +481,10 @@ self: super: { }; }); + lf-vim = super.lf-vim.overrideAttrs(old: { + dependencies = with super; [ bclose-vim ]; + }); + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { postPatch = old.postPatch or "" + '' substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index effd095a151..c444868a183 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -355,6 +355,7 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +ptzz/lf.vim python-mode/python-mode qnighy/lalrpop.vim qpkorr/vim-bufkill From 443152f6513b1f67537c9c8d2047f90e186a4f44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 23:40:00 +0000 Subject: [PATCH 233/241] python27Packages.rpyc: 4.1.2 -> 4.1.3 --- pkgs/development/python-modules/rpyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 42d7b442ad6..5b2345f803e 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "rpyc"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = pname; rev = version; - sha256 = "1xvrcik1650r1412fg79va0kd0fgg1ml241y1ai429qwy87dil1k"; + sha256 = "145mi8p37x9cbfm5117g4ng7b5rmghjjwgm319qqhwgzvqg3y4j9"; }; propagatedBuildInputs = [ plumbum ]; From 3afa921423a5044591cfcef8caac9ef225e1c28e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Feb 2020 20:48:42 +0000 Subject: [PATCH 234/241] python27Packages.josepy: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/josepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index d3b5ad79d6c..87b5a4d8bba 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1lq2s1649zinfii9ccl1wk6aqpaj35r8xwz44020ylp9ky1rmv4w"; + sha256 = "068nkdbag049cjs9q3rrs5j5f1239202y0g9xblii6rr0fjgyhf3"; }; propagatedBuildInputs = [ From 4d67e30713972b7404f5a9fc29017c3c694ccc08 Mon Sep 17 00:00:00 2001 From: Asad Saeeduddin Date: Sun, 2 Feb 2020 01:25:29 -0500 Subject: [PATCH 235/241] gitAndTools.git-interactive-rebase-tool: init --- maintainers/maintainer-list.nix | 6 + .../git-and-tools/default.nix | 2 + .../01-terminaltests.patch | 169 ++++++++++++++++++ .../git-interactive-rebase-tool/default.nix | 27 +++ 4 files changed, 204 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch create mode 100644 pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b55f44c1d61..fe887b9d7ce 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8004,4 +8004,10 @@ githubId = 56247270; name = "Foxit"; }; + masaeedu = { + email = "masaeedu@gmail.com"; + github = "masaeedu"; + githubId = 3674056; + name = "Asad Saeeduddin"; + }; } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c6e046ea45b..3a68f790382 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -103,6 +103,8 @@ let git-imerge = callPackage ./git-imerge { }; + git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool {}; + git-machete = python3Packages.callPackage ./git-machete { }; git-octopus = callPackage ./git-octopus { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch new file mode 100644 index 00000000000..1bbae6dc01a --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch @@ -0,0 +1,169 @@ +--- a/src/display/utils.rs ++++ b/src/display/utils.rs +@@ -53,166 +53,3 @@ + _ => ColorMode::TwoTone, + } + } +- +-#[cfg(all(windows, test))] +-mod tests { +- use crate::display::color_mode::ColorMode; +- use crate::display::utils::detect_color_mode; +- +- #[test] +- fn detect_color_mode_windows() { +- assert_eq!(detect_color_mode(2), ColorMode::ThreeBit); +- } +-} +- +-#[cfg(all(unix, test))] +-mod tests { +- use crate::display::color_mode::ColorMode; +- use crate::display::utils::detect_color_mode; +- use std::env::{remove_var, set_var}; +- +- fn clear_env() { +- remove_var("COLORTERM"); +- remove_var("VTE_VERSION"); +- remove_var("TERM_PROGRAM"); +- remove_var("TERM"); +- } +- +- #[test] +- fn detect_color_mode_no_env_2_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(2), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_no_env_8_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(8), ColorMode::ThreeBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_less_8_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(7), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_no_env_16_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(16), ColorMode::FourBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_less_16_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(15), ColorMode::ThreeBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_256_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(256), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_less_256_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(255), ColorMode::FourBit); +- } +- +- #[test] +- fn detect_color_mode_no_env_more_256_colors() { +- clear_env(); +- assert_eq!(detect_color_mode(257), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_term_env_no_256() { +- clear_env(); +- set_var("TERM", "XTERM"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_term_env_with_256() { +- clear_env(); +- set_var("TERM", "XTERM-256"); +- assert_eq!(detect_color_mode(0), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_term_program_env_apple_terminal() { +- clear_env(); +- set_var("TERM_PROGRAM", "Apple_Terminal"); +- assert_eq!(detect_color_mode(0), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_term_program_env_iterm() { +- clear_env(); +- set_var("TERM_PROGRAM", "iTerm.app"); +- assert_eq!(detect_color_mode(0), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_term_program_env_other() { +- clear_env(); +- set_var("TERM_PROGRAM", "other"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_vte_version_0_36_00() { +- clear_env(); +- set_var("VTE_VERSION", "3600"); +- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); +- } +- +- #[test] +- fn detect_color_mode_vte_version_greater_0_36_00() { +- clear_env(); +- set_var("VTE_VERSION", "3601"); +- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); +- } +- +- #[test] +- fn detect_color_mode_vte_version_less_0_36_00() { +- clear_env(); +- set_var("VTE_VERSION", "1"); +- assert_eq!(detect_color_mode(0), ColorMode::EightBit); +- } +- +- #[test] +- fn detect_color_mode_vte_version_0() { +- clear_env(); +- set_var("VTE_VERSION", "0"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +- #[test] +- fn detect_color_mode_vte_version_invalid() { +- clear_env(); +- set_var("VTE_VERSION", "invalid"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +- +- #[test] +- fn detect_color_mode_colorterm_env_is_truecolor() { +- clear_env(); +- set_var("COLORTERM", "truecolor"); +- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); +- } +- +- #[test] +- fn detect_color_mode_colorterm_env_is_24bit() { +- clear_env(); +- set_var("COLORTERM", "24bit"); +- assert_eq!(detect_color_mode(0), ColorMode::TrueColor); +- } +- +- #[test] +- fn detect_color_mode_colorterm_env_is_other() { +- clear_env(); +- set_var("COLORTERM", "other"); +- assert_eq!(detect_color_mode(0), ColorMode::TwoTone); +- } +-} diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix new file mode 100644 index 00000000000..81b4486d569 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -0,0 +1,27 @@ +{ lib, ncurses5, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "git-interactive-rebase-tool"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "MitMaro"; + repo = pname; + rev = version; + sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q"; + }; + + patches = [ ./01-terminaltests.patch ]; + + cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk"; + + buildInputs = [ ncurses5 ]; + + meta = with lib; { + homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; + description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; + changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ masaeedu ]; + }; +} From afc3d258249c3682992b094e4b7180a63cbf4c86 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Sun, 26 Jan 2020 11:48:59 +0100 Subject: [PATCH 236/241] nixosTests.buildbot: Port to python --- nixos/tests/buildbot.nix | 130 +++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index f5c8c4863b6..5655a34a8b5 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -1,12 +1,11 @@ +# Test ensures buildbot master comes up correctly and workers can connect + { system ? builtins.currentSystem, config ? {}, pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; - -# Test ensures buildbot master comes up correctly and workers can connect -makeTest { +import ./make-test-python.nix { name = "buildbot"; nodes = { @@ -39,75 +38,76 @@ makeTest { services.openssh.enable = true; networking.firewall.allowedTCPPorts = [ 22 9418 ]; environment.systemPackages = with pkgs; [ git ]; + systemd.services.git-daemon = { + description = "Git daemon for the test"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig.Restart = "always"; + path = with pkgs; [ coreutils git openssh ]; + environment = { HOME = "/root"; }; + preStart = '' + git config --global user.name 'Nobody Fakeuser' + git config --global user.email 'nobody\@fakerepo.com' + rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo + mkdir -pv /srv/repos/fakerepo ~/.ssh + ssh-keyscan -H gitrepo > ~/.ssh/known_hosts + cat ~/.ssh/known_hosts + + mkdir -p /src/repos/fakerepo + cd /srv/repos/fakerepo + rm -rf * + git init + echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh + cat fakerepo.sh + touch .git/git-daemon-export-ok + git add fakerepo.sh .git/git-daemon-export-ok + git commit -m fakerepo + ''; + script = '' + git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr + ''; + }; }; }; testScript = '' - #Start up and populate fake repo - $gitrepo->waitForUnit("multi-user.target"); - print($gitrepo->execute(" \ - git config --global user.name 'Nobody Fakeuser' && \ - git config --global user.email 'nobody\@fakerepo.com' && \ - rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \ - mkdir -pv /srv/repos/fakerepo ~/.ssh && \ - ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \ - cat ~/.ssh/known_hosts && \ - cd /srv/repos/fakerepo && \ - git init && \ - echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \ - cat fakerepo.sh && \ - touch .git/git-daemon-export-ok && \ - git add fakerepo.sh .git/git-daemon-export-ok && \ - git commit -m fakerepo && \ - git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \ - ")); + gitrepo.wait_for_unit("git-daemon.service") + gitrepo.wait_for_unit("multi-user.target") - # Test gitrepo - $bbmaster->waitForUnit("network-online.target"); - #$bbmaster->execute("nc -z gitrepo 9418"); - print($bbmaster->execute(" \ - rm -rfv /tmp/fakerepo && \ - git clone git://gitrepo/fakerepo /tmp/fakerepo && \ - pwd && \ - ls -la && \ - ls -la /tmp/fakerepo \ - ")); + with subtest("Repo is accessible via git daemon"): + bbmaster.wait_for_unit("network-online.target") + bbmaster.succeed("rm -rfv /tmp/fakerepo") + bbmaster.succeed("git clone git://gitrepo/fakerepo /tmp/fakerepo") - # Test start master and connect worker - $bbmaster->waitForUnit("buildbot-master.service"); - $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/; - $bbworker->waitForUnit("network-online.target"); - $bbworker->execute("nc -z bbmaster 8010"); - $bbworker->execute("nc -z bbmaster 9989"); - $bbworker->waitForUnit("buildbot-worker.service"); - print($bbworker->execute("ls -la /home/bbworker/worker")); + with subtest("Master service and worker successfully connect"): + bbmaster.wait_for_unit("buildbot-master.service") + bbmaster.wait_until_succeeds("curl --fail -s --head http://bbmaster:8010") + bbworker.wait_for_unit("network-online.target") + bbworker.succeed("nc -z bbmaster 8010") + bbworker.succeed("nc -z bbmaster 9989") + bbworker.wait_for_unit("buildbot-worker.service") + with subtest("Stop buildbot worker"): + bbmaster.succeed("systemctl -l --no-pager status buildbot-master") + bbmaster.succeed("systemctl stop buildbot-master") + bbworker.fail("nc -z bbmaster 8010") + bbworker.fail("nc -z bbmaster 9989") + bbworker.succeed("systemctl -l --no-pager status buildbot-worker") + bbworker.succeed("systemctl stop buildbot-worker") - # Test stop buildbot master and worker - print($bbmaster->execute(" \ - systemctl -l --no-pager status buildbot-master && \ - systemctl stop buildbot-master \ - ")); - $bbworker->fail("nc -z bbmaster 8010"); - $bbworker->fail("nc -z bbmaster 9989"); - print($bbworker->execute(" \ - systemctl -l --no-pager status buildbot-worker && \ - systemctl stop buildbot-worker && \ - ls -la /home/bbworker/worker \ - ")); - - - # Test buildbot daemon mode - $bbmaster->execute("buildbot create-master /tmp"); - $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg"); - $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg"); - $bbmaster->execute("buildbot start /tmp"); - $bbworker->execute("nc -z bbmaster 8011"); - $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/; - $bbmaster->execute("buildbot stop /tmp"); - $bbworker->fail("nc -z bbmaster 8011"); - + with subtest("Buildbot daemon mode works"): + bbmaster.succeed( + "buildbot create-master /tmp", + "mv -fv /tmp/master.cfg.sample /tmp/master.cfg", + "sed -i 's/8010/8011/' /tmp/master.cfg", + "buildbot start /tmp", + "nc -z bbmaster 8011", + ) + bbworker.wait_until_succeeds("curl --fail -s --head http://bbmaster:8011") + bbmaster.wait_until_succeeds("buildbot stop /tmp") + bbworker.fail("nc -z bbmaster 8011") ''; meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; -} +} {} From 8f6f418e424d891477d2ead07192b55c22b63c35 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Sun, 26 Jan 2020 16:54:53 +0100 Subject: [PATCH 237/241] nixosTests.ihatemoney: Port to python --- nixos/tests/ihatemoney.nix | 59 ++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/nixos/tests/ihatemoney.nix b/nixos/tests/ihatemoney.nix index 14db17fe5e6..7df0ea0b691 100644 --- a/nixos/tests/ihatemoney.nix +++ b/nixos/tests/ihatemoney.nix @@ -1,13 +1,5 @@ -{ system ? builtins.currentSystem -, config ? {} -, pkgs ? import ../.. { inherit system config; } -}: - let - inherit (import ../lib/testing.nix { inherit system pkgs; }) makeTest; -in -map ( - backend: makeTest { + f = backend: import ./make-test-python.nix ({ pkgs, ... }: { name = "ihatemoney-${backend}"; machine = { lib, ... }: { services.ihatemoney = { @@ -30,23 +22,34 @@ map ( }; }; testScript = '' - $machine->waitForOpenPort(8000); - $machine->waitForUnit("uwsgi.service"); - my $return = $machine->succeed("curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay\@example.com'"); - die "wrong project id $return" unless "\"yay\"\n" eq $return; - my $timestamp = $machine->succeed("stat --printf %Y /var/lib/ihatemoney/secret_key"); - my $owner = $machine->succeed("stat --printf %U:%G /var/lib/ihatemoney/secret_key"); - die "wrong ownership for the secret key: $owner, is uwsgi running as the right user ?" unless $owner eq "ihatemoney:ihatemoney"; - $machine->shutdown(); - $machine->start(); - $machine->waitForOpenPort(8000); - $machine->waitForUnit("uwsgi.service"); - # check that the database is really persistent - print $machine->succeed("curl --basic -u yay:yay http://localhost:8000/api/projects/yay"); - # check that the secret key is really persistent - my $timestamp2 = $machine->succeed("stat --printf %Y /var/lib/ihatemoney/secret_key"); - die unless $timestamp eq $timestamp2; - $machine->succeed("curl http://localhost:8000 | grep ihatemoney"); + machine.wait_for_open_port(8000) + machine.wait_for_unit("uwsgi.service") + + assert '"yay"' in machine.succeed( + "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay\@example.com'" + ) + owner, timestamp = machine.succeed( + "stat --printf %U:%G___%Y /var/lib/ihatemoney/secret_key" + ).split("___") + assert "ihatemoney:ihatemoney" == owner + + with subtest("Restart machine and service"): + machine.shutdown() + machine.start() + machine.wait_for_open_port(8000) + machine.wait_for_unit("uwsgi.service") + + with subtest("check that the database is really persistent"): + machine.succeed("curl --basic -u yay:yay http://localhost:8000/api/projects/yay") + + with subtest("check that the secret key is really persistent"): + timestamp2 = machine.succeed("stat --printf %Y /var/lib/ihatemoney/secret_key") + assert timestamp == timestamp2 + + assert "ihatemoney" in machine.succeed("curl http://localhost:8000") ''; - } -) [ "sqlite" "postgresql" ] + }); +in { + ihatemoney-sqlite = f "sqlite"; + ihatemoney-postgresql = f "postgresql"; +} From 5ae9820ea4f90fc4966837ec1cd577dcd469ead7 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Sun, 26 Jan 2020 18:17:10 +0100 Subject: [PATCH 238/241] nixosTests.keymap: Port to python --- nixos/tests/keymap.nix | 98 +++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 40 deletions(-) diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index 2b4c1ab7b05..09d5d2a6c9e 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -3,14 +3,13 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; let readyFile = "/tmp/readerReady"; resultFile = "/tmp/readerResult"; testReader = pkgs.writeScript "test-input-reader" '' - #!${pkgs.stdenv.shell} rm -f ${resultFile} ${resultFile}.tmp logger "testReader: START: Waiting for $1 characters, expecting '$2'." touch ${readyFile} @@ -27,56 +26,75 @@ let ''; - mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let - combinedTests = foldAttrs (acc: val: acc ++ val) [] (builtins.attrValues tests); - perlStr = val: "'${escape ["'" "\\"] val}'"; - lq = length combinedTests.qwerty; - le = length combinedTests.expect; - msg = "length mismatch between qwerty (${toString lq}) and expect (${toString le}) lists!"; - send = concatMapStringsSep ", " perlStr combinedTests.qwerty; - expect = if (lq == le) then concatStrings combinedTests.expect else throw msg; - - in makeTest { + mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; makeTest { name = "keymap-${layout}"; + machine.console.keyMap = mkOverride 900 layout; machine.services.xserver.desktopManager.xterm.enable = false; - machine.i18n.consoleKeyMap = mkOverride 900 layout; machine.services.xserver.layout = mkOverride 900 layout; machine.imports = [ ./common/x11.nix extraConfig ]; testScript = '' + import json + import shlex - sub mkTest ($$) { - my ($desc, $cmd) = @_; - subtest $desc, sub { - # prepare and start testReader - $machine->execute("rm -f ${readyFile} ${resultFile}"); - $machine->succeed("$cmd ${testReader} ${toString le} ".q(${escapeShellArg expect} & )); + def run_test_case(cmd, xorg_keymap, test_case_name, inputs, expected): + with subtest(test_case_name): + assert len(inputs) == len(expected) + machine.execute("rm -f ${readyFile} ${resultFile}") - if ($desc eq "Xorg keymap") { - # make sure the xterm window is open and has focus - $machine->waitForWindow(qr/testterm/); - $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync"); - } + # set up process that expects all the keys to be entered + machine.succeed( + "{} {} {} {} &".format( + cmd, + "${testReader}", + len(inputs), + shlex.quote("".join(expected)), + ) + ) - # wait for reader to be ready - $machine->waitForFile("${readyFile}"); - $machine->sleep(1); + if xorg_keymap: + # make sure the xterm window is open and has focus + machine.wait_for_window("testterm") + machine.wait_until_succeeds( + "${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible " + "--class testterm windowfocus --sync" + ) - # send all keys - foreach ((${send})) { $machine->sendKeys($_); }; + # wait for reader to be ready + machine.wait_for_file("${readyFile}") + machine.sleep(1) - # wait for result and check - $machine->waitForFile("${resultFile}"); - $machine->succeed("grep -q 'PASS:' ${resultFile}"); - }; - }; + # send all keys + for key in inputs: + machine.send_key(key) - $machine->waitForX; + # wait for result and check + machine.wait_for_file("${resultFile}") + machine.succeed("grep -q 'PASS:' ${resultFile}") - mkTest "VT keymap", "openvt -sw --"; - mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e"; + + with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file: + tests = json.load(json_file) + + keymap_environments = { + "VT Keymap": "openvt -sw --", + "Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e", + } + + machine.wait_for_x() + + for keymap_env_name, command in keymap_environments.items(): + with subtest(keymap_env_name): + for test_case_name, test_data in tests.items(): + run_test_case( + command, + False, + test_case_name, + test_data["qwerty"], + test_data["expect"], + ) ''; }; @@ -89,7 +107,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest { altgr.expect = [ "~" "#" "{" "[" "|" ]; }; - extraConfig.i18n.consoleKeyMap = "azerty/fr"; + extraConfig.console.keyMap = "azerty/fr"; extraConfig.services.xserver.layout = "fr"; }; @@ -99,7 +117,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest { homerow.expect = [ "a" "r" "s" "t" "n" "e" "i" "o" ]; }; - extraConfig.i18n.consoleKeyMap = "colemak/colemak"; + extraConfig.console.keyMap = "colemak/colemak"; extraConfig.services.xserver.layout = "us"; extraConfig.services.xserver.xkbVariant = "colemak"; }; @@ -151,7 +169,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest { altgr.expect = [ "@" "|" "{" "[" "]" "}" ]; }; - extraConfig.i18n.consoleKeyMap = "de"; + extraConfig.console.keyMap = "de"; extraConfig.services.xserver.layout = "de"; }; } From 0c960262d159d3a884dadc3d4e4b131557dad116 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 2 Feb 2020 12:05:13 +0100 Subject: [PATCH 239/241] oraclejdk8: document removals in the release notes --- nixos/doc/manual/release-notes/rl-2003.xml | 6 ++++++ pkgs/top-level/aliases.nix | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 96774055b83..74cfbfc782a 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -571,6 +571,12 @@ auth required pam_succeed_if.so uid >= 1000 quiet now Redis. + + + The *psu versions of oraclejdk8 have been removed + as they aren't provided by upstream anymore. + + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c543af2405c..c75efae1abb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -557,4 +557,11 @@ mapAliases ({ clang_39 = llvm_4; clang_35 = llvm_4; clang_4 = llvm_4; + + /* Cleanup before 20.09 */ + oraclejdk8psu = throw '' + The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed! + ''; + oraclejre8psu = oraclejdk8psu; + oraclejdk8psu_distro = oraclejdk8psu; }) From 5495cb91eb7c3fe1d93be2ea08f75fdd7c907036 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 2 Feb 2020 15:29:40 +0100 Subject: [PATCH 240/241] Revert "rmdir: avoid failing when directory did not exist" This reverts commit 45db499d2de2235388212a911b8344b58ddfda36. --- nixos/modules/system/activation/activation-script.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 495d77dfd49..9141c8222b7 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -205,7 +205,7 @@ in '' else '' rm -f /usr/bin/env - rmdir -p /usr/bin || true + rmdir --ignore-fail-on-non-empty /usr/bin /usr ''; system.activationScripts.ld-linux = @@ -218,7 +218,7 @@ in mv -f ${target}.tmp ${target} # atomically replace '' else '' rm -f ${target} - rmdir $(dirname ${target}) || true + rmdir --ignore-fail-on-non-empty $(dirname ${target}) '') { "i686-linux" ."/lib/ld-linux.so.2" = "${pkgs.glibc.out}/lib/ld-linux.so.2"; From 26aba55951a09340959b68330875904ac43a3a31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 2 Feb 2020 15:29:49 +0100 Subject: [PATCH 241/241] Revert "add config.environment.ld-linux" This reverts commit af665d822a166ae62547c1c310207f11acaded17, see https://github.com/NixOS/nixpkgs/pull/78798#issuecomment-580059834 for the reasons in a similar PR. --- .../system/activation/activation-script.nix | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 9141c8222b7..ddfd1af4a31 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -162,16 +162,6 @@ in /usr/bin/env. ''; }; - - environment.ld-linux = mkOption { - default = false; - type = types.bool; - visible = false; - description = '' - Install symlink to ld-linux(8) system-wide to allow running unmodified ELF binaries. - It might be useful to run games or executables distributed inside jar files. - ''; - }; }; @@ -208,27 +198,6 @@ in rmdir --ignore-fail-on-non-empty /usr/bin /usr ''; - system.activationScripts.ld-linux = - concatStrings ( - mapAttrsToList - (target: source: - if config.environment.ld-linux then '' - mkdir -m 0755 -p $(dirname ${target}) - ln -sfn ${escapeShellArg source} ${target}.tmp - mv -f ${target}.tmp ${target} # atomically replace - '' else '' - rm -f ${target} - rmdir --ignore-fail-on-non-empty $(dirname ${target}) - '') - { - "i686-linux" ."/lib/ld-linux.so.2" = "${pkgs.glibc.out}/lib/ld-linux.so.2"; - "x86_64-linux" ."/lib/ld-linux.so.2" = "${pkgs.pkgsi686Linux.glibc.out}/lib/ld-linux.so.2"; - "x86_64-linux" ."/lib64/ld-linux-x86-64.so.2" = "${pkgs.glibc.out}/lib64/ld-linux-x86-64.so.2"; - "aarch64-linux"."/lib/ld-linux-aarch64.so.1" = "${pkgs.glibc.out}/lib/ld-linux-aarch64.so.1"; - "armv7l-linux" ."/lib/ld-linux-armhf.so.3" = "${pkgs.glibc.out}/lib/ld-linux-armhf.so.3"; - }.${pkgs.stdenv.system} or {} - ); - system.activationScripts.specialfs = '' specialMount() {