Merge branch 'master' into staging-next

2019-09-27 22:13:02 +02:00
parent ab77ea0bf2 f9021cc129
commit 217cf982c7
222 changed files with 1897 additions and 1146 deletions
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -29,7 +29,7 @@ with super;
    # Parse out a version number without the Lua version inserted
    version = with pkgs.lib; let
      version' = super.cqueues.version;
-      rel = splitString "." version';
+      rel = splitVersion version';
      date = head rel;
      rev = last (splitString "-" (last rel));
    in "${date}-${rev}";