Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da04a8e39741
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b06e65aad2b3
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Nov 6, 2020

  1. cargo-make: 0.32.7 -> 0.32.8 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.32.8
    @Ma27
    Ma27 committed Nov 6, 2020
    Copy the full SHA
    8051411 View commit details

  2. curlie: 1.5.4 -> 1.6.0 

    https://github.com/rs/curlie/releases/tag/v1.6.0

Fixes integration with `curl-7.73.0` which we have on `master`
since 4df8aa7.
    @Ma27
    Ma27 committed Nov 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f71d393 View commit details

  3. vagrant: 2.2.10 -> 2.2.11 

    https://github.com/hashicorp/vagrant/blob/main/CHANGELOG.md#2211-november-05-2020
    @Ma27
    Ma27 committed Nov 6, 2020
    Copy the full SHA
    b06e65a View commit details
6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-make/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.32.7";
version = "0.32.8";

src = fetchCrate {
inherit pname version;
sha256 = "0x8alv0jdk7xl63b2m4696w2hwqnbwxfqz6f3gisljll42xp6n2z";
sha256 = "sha256-TwutU4RjiYtxc2vT67Bgqe/WRHi5aXwgzvZu7Wk4Cao=";
};

nativeBuildInputs = [ pkg-config ];

buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

cargoSha256 = "1y2izxlc1nz3kqzrnhh9ir8j1gwvpj4cma2iqd65s9cf7xpkr6cx";
cargoSha256 = "sha256-HzRriPVaMn6qDu6h/NQjILglO4/0//8J1orV4Uz+XEI=";

# Some tests fail because they need network access.
# However, Travis ensures a proper build.
4 changes: 2 additions & 2 deletions pkgs/development/tools/vagrant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,9 +5,9 @@
let
# NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source.
version = "2.2.10";
version = "2.2.11";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj";
sha256 = "sha256-KDQDEMebqQYgsBroHmQrm/OJWTES9C9eGl0dDHTBpIc=";

deps = bundlerEnv rec {
name = "${pname}-${version}";
106 changes: 16 additions & 90 deletions pkgs/development/tools/vagrant/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -39,17 +39,6 @@
};
version = "1.1.7";
};
domain_name = {
dependencies = ["unf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
type = "gem";
};
version = "0.5.20190701";
};
ed25519 = {
groups = ["default"];
platforms = [];
@@ -70,15 +59,15 @@
};
version = "1.9.0";
};
erubis = {
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs";
type = "gem";
};
version = "2.7.0";
version = "0.78.0";
};
ffi = {
groups = ["default"];
@@ -122,17 +111,6 @@
};
version = "0.1.5";
};
http-cookie = {
dependencies = ["domain_name"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
type = "gem";
};
version = "1.0.3";
};
httpclient = {
groups = ["default"];
platforms = [];
@@ -196,16 +174,6 @@
};
version = "2.3.0";
};
mime = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr";
type = "gem";
};
version = "0.4.4";
};
mime-types = {
dependencies = ["mime-types-data"];
groups = ["default"];
@@ -222,10 +190,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
type = "gem";
};
version = "3.2020.0512";
version = "3.2020.1104";
};
multi_json = {
groups = ["default"];
@@ -264,20 +232,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9";
type = "gem";
};
version = "6.1.0";
};
netrc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
sha256 = "1hlyp6z3ffwdcnzq9khrkz6waxggn4hnzsczbp3mz61lhx4qiri3";
type = "gem";
};
version = "0.11.0";
version = "6.2.0.rc1";
};
nori = {
groups = ["default"];
@@ -321,17 +279,6 @@
};
version = "0.2.5";
};
rest-client = {
dependencies = ["http-cookie" "mime-types" "netrc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
type = "gem";
};
version = "2.0.2";
};
ruby_dep = {
groups = ["default"];
platforms = [];
@@ -362,37 +309,16 @@
};
version = "2.3.0";
};
unf = {
dependencies = ["unf_ext"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
type = "gem";
};
version = "0.1.4";
};
unf_ext = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
type = "gem";
};
version = "0.0.7.7";
};
vagrant_cloud = {
dependencies = ["rest-client"];
dependencies = ["excon" "log4r"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16jpnq4xa7gavm024wk1rgmkfb850g89rv56f26dkh0rdhbqiqvs";
sha256 = "0b3b9ybd6mskfz2vffb6li2y6njdc9xqhik9c4mvzq9dchxpbxlj";
type = "gem";
};
version = "2.0.3";
version = "3.0.2";
};
wdm = {
groups = ["default"];
@@ -410,31 +336,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym";
sha256 = "0k9i86v805gpya3pyqahjykljbdwpjsrk7hsdqrl05j2rpidvk4v";
type = "gem";
};
version = "2.3.4";
version = "2.3.5";
};
winrm-elevated = {
dependencies = ["erubi" "winrm" "winrm-fs"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv";
sha256 = "0savhyfry7ii9axcmprvbzhrz4sd9byd8wifn74bd7y78asrbpdq";
type = "gem";
};
version = "1.2.1";
version = "1.2.2";
};
winrm-fs = {
dependencies = ["erubi" "logging" "rubyzip" "winrm"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43";
sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d";
type = "gem";
};
version = "1.3.4";
version = "1.3.5";
};
}
73 changes: 57 additions & 16 deletions pkgs/development/tools/vagrant/gemset_libvirt.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
{
builder = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
type = "gem";
};
version = "3.2.4";
};
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs";
type = "gem";
};
version = "0.62.0";
version = "0.78.0";
};
fog-core = {
dependencies = ["builder" "excon" "formatador"];
dependencies = ["builder" "excon" "formatador" "mime-types"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ac25s2wv7m6av7h7vjzd2bg3srhnn5yrz3lq1xpimhnfmp82sw6";
sha256 = "0bwqm9n69y5y0a5iickr358z7w4hml3flqwfz8b7cnj1ldabhnjn";
type = "gem";
};
version = "1.43.0";
version = "2.2.3";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
@@ -37,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gk16gsjd51x71wla7h5jqr6x5ywpwz5l8jdv76f9mr6fp1j2bkf";
sha256 = "0by97bx0szdz47kdy0fqvx6j2kzy5yhrwbvvsfbh27dm9c0vfwgr";
type = "gem";
};
version = "0.5.0";
version = "0.7.0";
};
fog-xml = {
dependencies = ["fog-core" "nokogiri"];
@@ -68,31 +78,62 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
type = "gem";
};
version = "2.3.1";
};
mime-types = {
dependencies = ["mime-types-data"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
type = "gem";
};
version = "2.1.0";
version = "3.3.1";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
type = "gem";
};
version = "3.2020.1104";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
version = "2.4.0";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
type = "gem";
};
version = "2.3.0";
version = "1.15.0";
};
nokogiri = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
type = "gem";
};
version = "1.8.5";
version = "1.10.10";
};
ruby-libvirt = {
groups = ["default"];
@@ -110,9 +151,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wm5yvml3sxdzpnlp4q6yhy695syy8byd1g7cxll4pmj1kwlknym";
sha256 = "1b1m8fg1rin6ps15ykqhwz6qm7isadb83r22b733dkw2gvvj91jv";
type = "gem";
};
version = "0.0.45";
version = "0.2.1";
};
}
}
6 changes: 3 additions & 3 deletions pkgs/tools/networking/curlie/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule rec {
pname = "curlie";
version = "1.5.4";
version = "1.6.0";

src= fetchFromGitHub {
owner = "rs";
repo = pname;
rev = "v${version}";
sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx";
sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8=";
};

vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm";
vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI=";

doCheck = false;