commit 81d07ef48fe47e958a97419c6d17ece4c5b71cd5 · pyrox.dev/nixpkgs

+12 -12
pkgs/development/interpreters/ruby/default.nix
···

       18
       18
        
         # Contains the ruby version heuristics

     

       19
       19
        
         rubyVersion = import ./ruby-version.nix { inherit lib; };

     

       20
       20
        
       

     

       21
       21
       -
         generic = { version, sha256, cargoSha256 ? null }: let

     

       21
       21
       +
         generic = { version, hash, cargoHash ? null }: let

     

       22
       22
        
           ver = version;

     

       23
       23
        
           atLeast30 = lib.versionAtLeast ver.majMin "3.0";

     

       24
       24
        
           atLeast31 = lib.versionAtLeast ver.majMin "3.1";

     
···

       65
       65
        
       

     

       66
       66
        
               src = fetchurl {

     

       67
       67
        
                 url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz";

     

       68
       68
       -
                 inherit sha256;

     

       68
       68
       +
                 inherit hash;

     

       69
       69
        
               };

     

       70
       70
        
       

     

       71
       71
        
               # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.

     
···

       111
       111
        
                   # Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions.

     

       112
       112
        
                   (fetchpatch {

     

       113
       113
        
                     url = "https://github.com/ruby/ruby/commit/0acc05caf7518cd0d63ab02bfa036455add02346.patch";

     

       114
       114
       -
                     sha256 = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk=";

     

       114
       114
       +
                     hash = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk=";

     

       115
       115
        
                   })

     

       116
       116
        
                ]

     

       117
       117
        
                 ++ ops (!atLeast30 && rubygemsSupport) [

     
···

       126
       126
        
                   # See https://github.com/ruby/ruby/pull/2930

     

       127
       127
        
                   (fetchpatch {

     

       128
       128
        
                     url = "https://github.com/ruby/ruby/commit/261d8dd20afd26feb05f00a560abd99227269c1c.patch";

     

       129
       129
       -
                     sha256 = "0wrii25cxcz2v8bgkrf7ibcanjlxwclzhayin578bf0qydxdm9qy";

     

       129
       129
       +
                     hash = "sha256-HqfaevMYuIVOsdEr+CnjnUqr2IrH5fkW2uKzzoqIMXM=";

     

       130
       130
        
                   })

     

       131
       131
        
                 ]

     

       132
       132
        
                 ++ ops atLeast31 [

     
···

       142
       142
        
               cargoDeps = if yjitSupport then rustPlatform.fetchCargoTarball {

     

       143
       143
        
                 inherit src;

     

       144
       144
        
                 sourceRoot = "${pname}-${version}/${cargoRoot}";

     

       145
       145
       -
                 sha256 = cargoSha256;

     

       145
       145
       +
                 hash = cargoHash;

     

       146
       146
        
               } else null;

     

       147
       147
        
       

     

       148
       148
        
               postUnpack = opString rubygemsSupport ''

     
···

       318
       318
        
       

     

       319
       319
        
         ruby_2_7 = generic {

     

       320
       320
        
           version = rubyVersion "2" "7" "8" "";

     

       321
       321
       -
           sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A=";

     

       321
       321
       +
           hash = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A=";

     

       322
       322
        
         };

     

       323
       323
        
       

     

       324
       324
        
         ruby_3_1 = generic {

     

       325
       325
        
           version = rubyVersion "3" "1" "4" "";

     

       326
       326
       -
           sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y=";

     

       326
       326
       +
           hash = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y=";

     

       327
       327
        
         };

     

       328
       328
        
       

     

       329
       329
        
         ruby_3_2 = generic {

     

       330
       330
        
           version = rubyVersion "3" "2" "2" "";

     

       331
       331
       -
           sha256 = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w=";

     

       332
       332
       -
           cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ=";

     

       331
       331
       +
           hash = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w=";

     

       332
       332
       +
           cargoHash = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ=";

     

       333
       333
        
         };

     

       334
       334
        
       

     

       335
       335
        
         ruby_3_3 = generic {

     

       336
       336
       -
           version = rubyVersion "3" "3" "0" "preview3";

     

       337
       337
       -
           sha256 = "sha256-CWkUG+kuZ+DtuEqPs1SsyY8BvXjmAqI6DxNgRcgvSAk=";

     

       338
       338
       -
           cargoSha256 = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";

     

       336
       336
       +
           version = rubyVersion "3" "3" "0" "rc1";

     

       337
       337
       +
           hash = "sha256-xP+COVqQ73bH+Qa3aHAm4KuWsJTc86Uy2auXeEoHMiI=";

     

       338
       338
       +
           cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";

     

       339
       339
        
         };

     

       340
       340
        
       

     

       341
       341
        
       }