Merge staging-next-21.05 into staging-21.05
This commit is contained in:
commit
eb280e0cf6
@ -25,7 +25,7 @@ let
|
|||||||
else "");
|
else "");
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "signal-desktop";
|
pname = "signal-desktop";
|
||||||
version = "5.10.0"; # Please backport all updates to the stable channel.
|
version = "5.11.0"; # Please backport all updates to the stable channel.
|
||||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||||
# When releases "expire" the application becomes unusable until an update is
|
# When releases "expire" the application becomes unusable until an update is
|
||||||
# applied. The expiration date for the current release can be extracted with:
|
# applied. The expiration date for the current release can be extracted with:
|
||||||
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||||
sha256 = "049i4nypqr6lx8f3w32pia6cfb3pmqmvasxjb5zhp6mxb3vn7wz3";
|
sha256 = "17r7apmsz5bvcfnf81m6jjsj17a4h7bhgy1vllwyyvaa585nspmp";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -5,9 +5,9 @@
|
|||||||
let
|
let
|
||||||
# NOTE: bumping the version and updating the hash is insufficient;
|
# NOTE: bumping the version and updating the hash is insufficient;
|
||||||
# you must use bundix to generate a new gemset.nix in the Vagrant source.
|
# you must use bundix to generate a new gemset.nix in the Vagrant source.
|
||||||
version = "2.2.17";
|
version = "2.2.18";
|
||||||
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
|
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
|
||||||
sha256 = "sha256-T48ui7jgq9ni3pC09Jd2WzkT9PBaJ+SUDfcXA5QMjM8=";
|
sha256 = "sha256-NQiwkGuDLXMXyNNiIHmOwnS3IefvY9DPmRxo8Z2drpA=";
|
||||||
|
|
||||||
deps = bundlerEnv rec {
|
deps = bundlerEnv rec {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
@ -64,10 +64,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl";
|
sha256 = "1iykfw2j6dd26rhgid3a17zghrmbmi68ppf3a7cdkvii68p4f37a";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.84.0";
|
version = "0.85.0";
|
||||||
};
|
};
|
||||||
ffi = {
|
ffi = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
@ -138,10 +138,10 @@
|
|||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj";
|
sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "3.5.1";
|
version = "3.6.0";
|
||||||
};
|
};
|
||||||
little-plugger = {
|
little-plugger = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
@ -310,15 +310,15 @@
|
|||||||
version = "2.3.2";
|
version = "2.3.2";
|
||||||
};
|
};
|
||||||
vagrant_cloud = {
|
vagrant_cloud = {
|
||||||
dependencies = ["excon" "log4r"];
|
dependencies = ["excon" "log4r" "rexml"];
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1rwfw014fbvaxshf8abi87srfaiirb7cr93s61qm177jm8q86h57";
|
sha256 = "0np0d8rjca130si5iaxasbqmfbbx4l3kd9mxdsa3p5mqiia7za3b";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "3.0.4";
|
version = "3.0.5";
|
||||||
};
|
};
|
||||||
wdm = {
|
wdm = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user