commit 7a2dd2ecf9cadba2f3bdb5696e505c9fb2672f7a · pyrox.dev/nixpkgs

+1 -1

pkgs/development/interpreters/ruby/default.nix

···

       48
       48
        
             , buildEnv, bundler, bundix

     

       49
       49
        
             , libiconv, libobjc, libunwind, Foundation

     

       50
       50
        
             , makeWrapper, buildRubyGem, defaultGemConfig

     

       51
       51
       -
             , baseRuby ? buildPackages.ruby.override {

     

       51
       51
       +
             , baseRuby ? buildPackages.ruby_3_1.override {

     

       52
       52
        
                 useRailsExpress = false;

     

       53
       53
        
                 docSupport = false;

     

       54
       54
        
                 rubygemsSupport = false;

+3 -1

pkgs/development/ruby-modules/bundler-app/default.nix

···

       35
       35
        
       }@args:

     

       36
       36
        
       

     

       37
       37
        
       let

     

       38
       38
       -
         basicEnv = (callPackage ../bundled-common {}) args;

     

       38
       38
       +
         basicEnv = (callPackage ../bundled-common {

     

       39
       39
       +
           inherit ruby;

     

       40
       40
       +
         }) args;

     

       39
       41
        
       

     

       40
       42
        
         cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // {

     

       41
       43
        
           inherit preferLocalBuild allowSubstitutes; # pass the defaults

+7 -1

pkgs/top-level/all-packages.nix

···

       4926
       4926
        
           enableExtraPlugins = true;

     

       4927
       4927
        
         };

     

       4928
       4928
        
       

     

       4929
       4929
       -
         asciidoctor = callPackage ../tools/typesetting/asciidoctor { };

     

       4929
       4929
       +
         asciidoctor = callPackage ../tools/typesetting/asciidoctor {

     

       4930
       4930
       +
           bundlerApp = bundlerApp.override {

     

       4931
       4931
       +
             # asciidoc supports both ruby 2 and 3,

     

       4932
       4932
       +
             # but we don't want to be stuck on it:

     

       4933
       4933
       +
             ruby = ruby_3_1;

     

       4934
       4934
       +
           };

     

       4935
       4935
       +
         };

     

       4930
       4936
        
       

     

       4931
       4937
        
         asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };

     

       4932
       4938