Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4cc5592fe2d2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ca57dc9171c
Choose a head ref
  • 7 commits
  • 4 files changed
  • 6 contributors

Commits on Aug 1, 2019

  1. Merge #65687: gnupatch: update links to patches 

    (cherry picked from commit c4ce832)
    @vcunat
    vcunat committed Aug 1, 2019
    Copy the full SHA
    2af7aac View commit details

Commits on Aug 2, 2019

  1. gnupatch: avoid rebuild from 2af7aac PR #65687 

    vcunat is really sorry for not noticing this.

(cherry picked from commit 002b853)
    @ivan @vcunat
    ivan authored and vcunat committed Aug 2, 2019
    Copy the full SHA
    e851ccd View commit details

  2. vagrant: 2.2.3 -> 2.2.5 

    (cherry picked from commit 5521aae)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
    @angristan @Ma27
    angristan authored and Ma27 committed Aug 2, 2019
    Copy the full SHA
    25eb016 View commit details

  3. skype: 8.45.0.41 -> 8.46.0.60 

    https://support.skype.com/en/faq/FA34778/release-notes-for-skype-for-windows-mac-linux-and-web
(cherry picked from commit 5ae032b)
    @dtzWill @lheckemann
    dtzWill authored and lheckemann committed Aug 2, 2019
    Copy the full SHA
    4af7f7d View commit details

  4. skype: 8.46.0.60 -> 8.47.0.59 

    (cherry picked from commit dca70ab)
    @dtzWill @lheckemann
    dtzWill authored and lheckemann committed Aug 2, 2019
    Copy the full SHA
    a800b9b View commit details

  5. skypeforlinux: 8.47.0.59 -> 8.49.0.49 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/skypeforlinux/versions

(cherry picked from commit 2928e4c)
    @r-ryantm @lheckemann
    r-ryantm authored and lheckemann committed Aug 2, 2019
    Copy the full SHA
    429adc6 View commit details

  6. skypeforlinux: 8.49.0.49 => 8.50.0.38 

    (cherry picked from commit a0d3143)
    @soundray @lheckemann
    soundray authored and lheckemann committed Aug 2, 2019
    Copy the full SHA
    9ca57dc View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ let

# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
version = "8.45.0.41";
version = "8.50.0.38";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -58,7 +58,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
sha256 = "1k54gpaphkjv5qhqlwm2vbxbbci7nra4a5l0bhylkkzhsip6cvcm";
sha256 = "1g0aacp4qgzp3018w1s685yr3ssqlw0z2x6ifrj01k4ig82jfkn6";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
4 changes: 2 additions & 2 deletions pkgs/development/tools/vagrant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,9 +4,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.3";
version = "2.2.5";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
sha256 = "1j00glqn8b1zsgqg2nyk5as405a6s6vclswg2ri0a229hnsiabvs";
sha256 = "0a228f5185b24b72efcc5a3924f86fa9fabab6f7562c3c63c1d9d239aa72a7b1";

deps = bundlerEnv rec {
name = "${pname}-${version}";
133 changes: 36 additions & 97 deletions pkgs/development/tools/vagrant/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
{
addressable = {
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
type = "gem";
};
version = "2.6.0";
};
bcrypt_pbkdf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv";
sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
builder = {
source = {
@@ -34,21 +27,14 @@
version = "0.6.3";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
type = "gem";
};
version = "1.1.4";
};
crack = {
dependencies = ["safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
type = "gem";
};
version = "0.4.3";
version = "1.1.5";
};
diff-lcs = {
source = {
@@ -60,12 +46,14 @@
};
domain_name = {
dependencies = ["unf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
type = "gem";
};
version = "0.5.20180417";
version = "0.5.20190701";
};
ed25519 = {
source = {
@@ -83,30 +71,26 @@
};
version = "2.7.0";
};
fake_ftp = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rn7lxdk3sqc2i4v2c5k25b9ca1qnkdf32nv04y760aml9mszwf7";
type = "gem";
};
version = "0.1.1";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
type = "gem";
};
version = "1.10.0";
version = "1.11.1";
};
gssapi = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh";
type = "gem";
};
version = "1.2.0";
version = "1.3.0";
};
gyoku = {
dependencies = ["builder"];
@@ -117,14 +101,6 @@
};
version = "1.3.1";
};
hashdiff = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
type = "gem";
};
version = "0.3.8";
};
hashicorp-checkpoint = {
source = {
remotes = ["https://rubygems.org"];
@@ -203,12 +179,14 @@
version = "3.2.2";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
version = "3.2018.0812";
version = "3.2019.0331";
};
multi_json = {
source = {
@@ -260,22 +238,6 @@
};
version = "2.6.0";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.3";
};
rake = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
type = "gem";
};
version = "12.0.0";
};
rb-fsevent = {
source = {
remotes = ["https://rubygems.org"];
@@ -338,15 +300,6 @@
};
version = "3.5.0";
};
rspec-its = {
dependencies = ["rspec-core" "rspec-expectations"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3";
type = "gem";
};
version = "1.2.0";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
source = {
@@ -381,20 +334,14 @@
version = "0.6.2";
};
rubyzip = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
type = "gem";
};
version = "1.2.2";
};
safe_yaml = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
type = "gem";
};
version = "1.0.4";
version = "1.2.3";
};
thor = {
source = {
@@ -414,15 +361,14 @@
version = "0.1.4";
};
unf_ext = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
type = "gem";
};
version = "0.0.7.5";
};
vagrant = {
dependencies = ["bcrypt_pbkdf" "childprocess" "ed25519" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "rubyzip" "vagrant_cloud" "wdm" "winrm" "winrm-elevated" "winrm-fs"];
version = "0.0.7.6";
};
vagrant-spec = {
dependencies = ["childprocess" "log4r" "rspec" "thor"];
@@ -452,23 +398,16 @@
};
version = "0.1.1";
};
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
type = "gem";
};
version = "2.3.2";
};
winrm = {
dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l299w172hl023b3v2vnbx4cqfjq9k2pp8blc1dz8n6g9dc6pk9f";
sha256 = "19vxrclxc5l8n2agwvv291740s6gna2phg3lkybjb0ldkmpi3sj2";
type = "gem";
};
version = "2.3.1";
version = "2.3.2";
};
winrm-elevated = {
dependencies = ["winrm" "winrm-fs"];
6 changes: 4 additions & 2 deletions pkgs/tools/text/gnupatch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,11 +14,13 @@ stdenv.mkDerivation rec {
# https://git.savannah.gnu.org/cgit/patch.git/patch/?id=f290f48a621867084884bfff87f8093c15195e6a
./CVE-2018-6951.patch
(fetchurl {
url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Allow_input_files_to_be_missing_for_ed-style_patches.patch;
url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1;
name = "Allow_input_files_to_be_missing_for_ed-style_patches.patch";
sha256 = "0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64";
})
(fetchurl { # CVE-2018-1000156
url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Fix_arbitrary_command_execution_in_ed-style_patches.patch;
url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d;
name = "Fix_arbitrary_command_execution_in_ed-style_patches.patch";
sha256 = "1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg";
})
# https://git.savannah.gnu.org/cgit/patch.git/commit/?id=9c986353e420ead6e706262bf204d6e03322c300