Merge branch 'master' into unused5

pkgs/development/ruby-modules/bundled-common/default.nix

@@ -61,7 +61,7 @@ let
   else
     name;
 
-  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
+  copyIfBundledByPath = { bundledByPath ? false, ...}:
   (if bundledByPath then
       assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/
     else ""

pkgs/development/ruby-modules/bundled-common/functions.nix

@@ -22,9 +22,9 @@ rec {
     else gemset;
   };
 
-  filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
+  filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
 
-  platformMatches = {rubyEngine, version, ...}@ruby: attrs: (
+  platformMatches = {rubyEngine, version, ...}: attrs: (
   !(attrs ? "platforms") ||
   builtins.length attrs.platforms == 0 ||
     builtins.any (platform:

pkgs/development/ruby-modules/bundled-common/test.nix

@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs:
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }:
 let
   testConfigs = {
     inherit lib;

pkgs/development/ruby-modules/bundler-env/test.nix

@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs:
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}:
 let
   bundlerEnv = callPackage ./default.nix stubs // {
     basicEnv = callPackage ../bundled-common stubs;