tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #30017 from zzamboni/vagrant-2.0.0

vagrant: 1.9.5 -> 2.0.0

authored by

Jörg Thalheim and committed by
GitHub b370700d dcd55809

+5 -5
unified split
+4 -4
pkgs/development/tools/vagrant/default.nix
··· 2 , libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: 3 4 let 5 - version = "1.9.5"; 6 rake = buildRubyGem { 7 inherit ruby; 8 gemName = "rake"; ··· 17 else "system ${stdenv.system} not supported"; 18 19 sha256 = { 20 - "x86_64-linux" = "16ijzaacfbqrgh561bf51747d2rv8kydgs14dfdr572qi0f88baw"; 21 - "i686-linux" = "0lvkb4k0a34a8hzlsi0apf056rhyprh5w0gn16d0n2ijnaf9j2yk"; 22 - "x86_64-darwin" = "070mrczsx1j0jl9sx6963l3hrk9anqa13r008wk1d22d25xj25mc"; 23 }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); 24 25 arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system;
··· 2 , libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: 3 4 let 5 + version = "2.0.0"; 6 rake = buildRubyGem { 7 inherit ruby; 8 gemName = "rake"; ··· 17 else "system ${stdenv.system} not supported"; 18 19 sha256 = { 20 + "x86_64-linux" = "184amybyxqlxqr8fk6lyx2znmci1fazsiby90q7d1xx2ihz3hm5x"; 21 + "i686-linux" = "19r1m5jila40x69m1qz2hslz7v1hdg8wwdhcq8d5qjnzwfmlw2qz"; 22 + "x86_64-darwin" = "154400iqs01235bclr8ic7g9jv01lfs766bmv7p8784r3xsblvsr"; 23 }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); 24 25 arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system;
+1 -1
pkgs/top-level/all-packages.nix
··· 7602 universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; 7603 7604 vagrant = callPackage ../development/tools/vagrant { 7605 - ruby = ruby_2_2; 7606 }; 7607 7608 bashdb = callPackage ../development/tools/misc/bashdb { };
··· 7602 universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; 7603 7604 vagrant = callPackage ../development/tools/vagrant { 7605 + ruby = ruby_2_3; 7606 }; 7607 7608 bashdb = callPackage ../development/tools/misc/bashdb { };