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: a49a2fb8c10c
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: 0cd47d9c05e7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 26, 2020

  1. zulip: 4.0.0 -> 5.0.0 (#85770) 

    Zulip 5.0 fixes multiple security issues. See:
https://blog.zulip.org/2020/04/01/zulip-desktop-5-0-0-security-release/

(cherry picked from commit 1586f28)
Reason: Zulip < 5.0.0 no longer works with the Zulip server---if you run
it with an up to date Zulip server you get an error message requesting
you upgrade to 5.0 and the app will otherwise not be functional.
    @alevy
    alevy authored Apr 26, 2020
    Copy the full SHA
    c0c339b View commit details

  2. ec2-amis.nix: add NixOS 20.03 images 

    Fixes #85857.

(cherry picked from commit 9cf9e66)
    @AmineChikhaoui
    AmineChikhaoui committed Apr 26, 2020
    Copy the full SHA
    a1e2b64 View commit details

  3. Merge pull request #86060 from AmineChikhaoui/20.03-amis-backport 

    [20.03] ec2-amis.nix: add NixOS 20.03 images
    @grahamc
    grahamc authored Apr 26, 2020
    Copy the full SHA
    0cd47d9 View commit details
Showing with 22 additions and 3 deletions.
  1. +20 −1 nixos/modules/virtualisation/ec2-amis.nix
  2. +2 −2 pkgs/applications/networking/instant-messengers/zulip/default.nix
21 changes: 20 additions & 1 deletion nixos/modules/virtualisation/ec2-amis.nix
View file
Original file line number Diff line number Diff line change
@@ -307,5 +307,24 @@ let self = {
"19.09".ap-northeast-2.hvm-ebs = "ami-03d4ae7d0b5fc364f";
"19.09".ap-south-1.hvm-ebs = "ami-0b599690b35aeef23";

latest = self."19.09";
# 20.03.1554.94e39623a49
"20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013";
"20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1";
"20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd";
"20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c";
"20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b";
"20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85";
"20.03".us-east-2.hvm-ebs = "ami-030296bb256764655";
"20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741";
"20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2";
"20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7";
"20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7";
"20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd";
"20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c";
"20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45";
"20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d";
"20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86";
"20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d";

latest = self."20.03";
}; in self
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/zulip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@

let
pname = "zulip";
version = "4.0.0";
version = "5.0.0";
name = "${pname}-${version}";

src = fetchurl {
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
sha256 = "1pni02mb5bvwx3k45vd6ga269ghdl633gjklyslai24rrhp16h9z";
sha256 = "0qwlhkzb3lbzk3piyfx8nn827kcafrl3j1nxrn18f8px9gwasinz";
name="${pname}-${version}.AppImage";
};