commit 1bc5bf4beb759e563ffc7a8a3067f10a00b45a7d · pyrox.dev/nixpkgs

-4

pkgs/development/ruby-modules/gem/default.nix

···

       36
       36
        
           rubyName = builtins.parseDrvName ruby.name;

     

       37
       37
        
         in "${rubyName.name}${rubyName.version}-")

     

       38
       38
        
       , buildInputs ? []

     

       39
       39
       -
       , doCheck ? false

     

       40
       39
        
       , meta ? {}

     

       41
       40
        
       , patches ? []

     

       42
       41
        
       , gemPath ? []

     
···

       79
       78
        
       

     

       80
       79
        
       stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {

     

       81
       80
        
         inherit ruby;

     

       82
       82
       -
         inherit doCheck;

     

       83
       81
        
         inherit dontBuild;

     

       84
       82
        
         inherit dontStrip;

     

       85
       83
        
         inherit type;

     
···

       95
       93
        
         name = attrs.name or "${namePrefix}${gemName}-${version}";

     

       96
       94
        
       

     

       97
       95
        
         inherit src;

     

       98
       98
       -
       

     

       99
       99
       -
         phases = attrs.phases or [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "fixupPhase" ];

     

       100
       96
        
       

     

       101
       97
        
         unpackPhase = attrs.unpackPhase or ''

     

       102
       98
        
           runHook preUnpack

+9 -9

pkgs/development/tools/vagrant/Gemfile.lock

···

       11
       11
        
       PATH

     

       12
       12
        
         remote: .

     

       13
       13
        
         specs:

     

       14
       14
       -
           vagrant (2.0.1)

     

       14
       14
       +
           vagrant (2.0.2)

     

       15
       15
        
             childprocess (~> 0.6.0)

     

       16
       16
        
             erubis (~> 2.7.0)

     

       17
       17
       -
             hashicorp-checkpoint (~> 0.1.1)

     

       17
       17
       +
             hashicorp-checkpoint (~> 0.1.5)

     

       18
       18
        
             i18n (>= 0.6.0, <= 0.8.0)

     

       19
       19
        
             listen (~> 3.1.5)

     

       20
       20
        
             log4r (~> 1.1.9, < 1.1.11)

     

       21
       21
        
             net-scp (~> 1.2.0)

     

       22
       22
        
             net-sftp (~> 2.1)

     

       23
       23
       -
             net-ssh (~> 4.1.0)

     

       23
       23
       +
             net-ssh (~> 4.2.0)

     

       24
       24
        
             rb-kqueue (~> 0.2.0)

     

       25
       25
        
             rest-client (>= 1.6.0, < 3.0)

     

       26
       26
        
             ruby_dep (<= 1.3.1)

     
···

       50
       50
        
           gyoku (1.3.1)

     

       51
       51
        
             builder (>= 2.1.2)

     

       52
       52
        
           hashdiff (0.3.7)

     

       53
       53
       -
           hashicorp-checkpoint (0.1.4)

     

       53
       53
       +
           hashicorp-checkpoint (0.1.5)

     

       54
       54
        
           http-cookie (1.0.3)

     

       55
       55
        
             domain_name (~> 0.5)

     

       56
       56
        
           httpclient (2.8.3)

     
···

       67
       67
        
           mime-types (3.1)

     

       68
       68
        
             mime-types-data (~> 3.2015)

     

       69
       69
        
           mime-types-data (3.2016.0521)

     

       70
       70
       -
           multi_json (1.12.2)

     

       70
       70
       +
           multi_json (1.13.1)

     

       71
       71
        
           net-scp (1.2.1)

     

       72
       72
        
             net-ssh (>= 2.6.5)

     

       73
       73
        
           net-sftp (2.1.2)

     

       74
       74
        
             net-ssh (>= 2.6.5)

     

       75
       75
       -
           net-ssh (4.1.0)

     

       75
       75
       +
           net-ssh (4.2.0)

     

       76
       76
        
           netrc (0.11.0)

     

       77
       77
        
           nori (2.6.0)

     

       78
       78
        
           public_suffix (3.0.1)

     

       79
       79
        
           rake (12.0.0)

     

       80
       80
       -
           rb-fsevent (0.10.2)

     

       80
       80
       +
           rb-fsevent (0.10.3)

     

       81
       81
        
           rb-inotify (0.9.10)

     

       82
       82
        
             ffi (>= 0.5.0, < 2)

     

       83
       83
        
           rb-kqueue (0.2.5)

     
···

       109
       109
        
           thor (0.18.1)

     

       110
       110
        
           unf (0.1.4)

     

       111
       111
        
             unf_ext

     

       112
       112
       -
           unf_ext (0.0.7.4)

     

       112
       112
       +
           unf_ext (0.0.7.5)

     

       113
       113
        
           wdm (0.1.1)

     

       114
       114
        
           webmock (2.3.2)

     

       115
       115
        
             addressable (>= 2.3.6)

     
···

       127
       127
        
           winrm-elevated (1.1.0)

     

       128
       128
        
             winrm (~> 2.0)

     

       129
       129
        
             winrm-fs (~> 1.0)

     

       130
       130
       -
           winrm-fs (1.1.1)

     

       130
       130
       +
           winrm-fs (1.2.0)

     

       131
       131
        
             erubis (~> 2.7)

     

       132
       132
        
             logging (>= 1.6.1, < 3.0)

     

       133
       133
        
             rubyzip (~> 1.1)

+10 -1

pkgs/development/tools/vagrant/default.nix

···

       28
       28
        
         gemName = "vagrant";

     

       29
       29
        
         inherit version;

     

       30
       30
        
       

     

       31
       31
       -
         doCheck = true;

     

       31
       31
       +
         doInstallCheck = true;

     

       32
       32
        
         dontBuild = false;

     

       33
       33
        
         src = fetchurl { inherit url sha256; };

     

       34
       34
        
       

     
···

       42
       42
        
           wrapProgram "$out/bin/vagrant" \

     

       43
       43
        
             --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \

     

       44
       44
        
             --prefix PATH ':' "${lib.getBin libarchive}/bin"

     

       45
       45
       +
         '';

     

       46
       46
       +
       

     

       47
       47
       +
         installCheckPhase = ''

     

       48
       48
       +
           if [[ "$("$out/bin/vagrant" --version)" == "Vagrant ${version}" ]]; then

     

       49
       49
       +
             echo 'Vagrant smoke check passed'

     

       50
       50
       +
           else

     

       51
       51
       +
             echo 'Vagrant smoke check failed'

     

       52
       52
       +
             return 1

     

       53
       53
       +
           fi

     

       45
       54
        
         '';

     

       46
       55
        
       

     

       47
       56
        
         passthru = {

+13 -13

pkgs/development/tools/vagrant/gemset.nix

···

       104
       104
        
         hashicorp-checkpoint = {

     

       105
       105
        
           source = {

     

       106
       106
        
             remotes = ["https://rubygems.org"];

     

       107
       107
       -
             sha256 = "15shgckjnxqpz1n9z6y4ax1dcnn5vdqcva29gdg2l7ny0g1w7c7m";

     

       107
       107
       +
             sha256 = "1z6mwzvd7p2wqhmk07dwrhvm0ncgqm7pxn0pr2k025rwsspp9bsd";

     

       108
       108
        
             type = "gem";

     

       109
       109
        
           };

     

       110
       110
       -
           version = "0.1.4";

     

       110
       110
       +
           version = "0.1.5";

     

       111
       111
        
         };

     

       112
       112
        
         http-cookie = {

     

       113
       113
        
           dependencies = ["domain_name"];

     
···

       188
       188
        
         multi_json = {

     

       189
       189
        
           source = {

     

       190
       190
        
             remotes = ["https://rubygems.org"];

     

       191
       191
       -
             sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";

     

       191
       191
       +
             sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";

     

       192
       192
        
             type = "gem";

     

       193
       193
        
           };

     

       194
       194
       -
           version = "1.12.2";

     

       194
       194
       +
           version = "1.13.1";

     

       195
       195
        
         };

     

       196
       196
        
         net-scp = {

     

       197
       197
        
           dependencies = ["net-ssh"];

     
···

       214
       214
        
         net-ssh = {

     

       215
       215
        
           source = {

     

       216
       216
        
             remotes = ["https://rubygems.org"];

     

       217
       217
       -
             sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q";

     

       217
       217
       +
             sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx";

     

       218
       218
        
             type = "gem";

     

       219
       219
        
           };

     

       220
       220
       -
           version = "4.1.0";

     

       220
       220
       +
           version = "4.2.0";

     

       221
       221
        
         };

     

       222
       222
        
         netrc = {

     

       223
       223
        
           source = {

     
···

       254
       254
        
         rb-fsevent = {

     

       255
       255
        
           source = {

     

       256
       256
        
             remotes = ["https://rubygems.org"];

     

       257
       257
       -
             sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";

     

       257
       257
       +
             sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";

     

       258
       258
        
             type = "gem";

     

       259
       259
        
           };

     

       260
       260
       -
           version = "0.10.2";

     

       260
       260
       +
           version = "0.10.3";

     

       261
       261
        
         };

     

       262
       262
        
         rb-inotify = {

     

       263
       263
        
           dependencies = ["ffi"];

     
···

       391
       391
        
         unf_ext = {

     

       392
       392
        
           source = {

     

       393
       393
        
             remotes = ["https://rubygems.org"];

     

       394
       394
       -
             sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";

     

       394
       394
       +
             sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";

     

       395
       395
        
             type = "gem";

     

       396
       396
        
           };

     

       397
       397
       -
           version = "0.0.7.4";

     

       397
       397
       +
           version = "0.0.7.5";

     

       398
       398
        
         };

     

       399
       399
        
         vagrant = {

     

       400
       400
        
           dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"];

     
···

       404
       404
        
           source = {

     

       405
       405
        
             fetchSubmodules = false;

     

       406
       406
        
             rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1";

     

       407
       407
       -
             sha256 = "03bpxlliyiny062p8a8vxyb1hymxpgfwliky4vlqn7lbm6z7n6kr";

     

       407
       407
       +
             sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h";

     

       408
       408
        
             type = "git";

     

       409
       409
        
             url = "https://github.com/mitchellh/vagrant-spec.git";

     

       410
       410
        
           };

     
···

       449
       449
        
           dependencies = ["erubis" "logging" "rubyzip" "winrm"];

     

       450
       450
        
           source = {

     

       451
       451
        
             remotes = ["https://rubygems.org"];

     

       452
       452
       -
             sha256 = "0vax34qbr3n6jifxyzr4nngaz8vrmzw6ydw21cnnrhidfkqgh7ja";

     

       452
       452
       +
             sha256 = "1i3w2j2rmhjqj8lynca2m1dm1m5fv1x35xwhk3vyr15dn260z56g";

     

       453
       453
        
             type = "gem";

     

       454
       454
        
           };

     

       455
       455
       -
           version = "1.1.1";

     

       455
       455
       +
           version = "1.2.0";

     

       456
       456
        
         };

     

       457
       457
        
       }