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: ef5faff8c696
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 159ffc8304be
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 27, 2020

  1. oh-my-zsh: 2020-05-24 -> 2020-05-26

    @NeQuissimus
    NeQuissimus committed May 27, 2020
    Copy the full SHA
    bc9c90c View commit details

  2. zoom-us: 5.0.408598.0517 -> 5.0.413237.0524

    @NeQuissimus
    NeQuissimus committed May 27, 2020
    Copy the full SHA
    159ffc8 View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  2. +3 −3 pkgs/shells/zsh/oh-my-zsh/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;

version = "5.0.408598.0517";
version = "5.0.413237.0524";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
sha256 = "1irpnrxl91pc9naz0d9m252scnbfdbdi7yh19hd3arvk3fppjk7w";
sha256 = "09hr31pzjgwaa898akl953k7fcshkq8r065i2047mk247bjy278k";
};
};

6 changes: 3 additions & 3 deletions pkgs/shells/zsh/oh-my-zsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2020-05-24";
version = "2020-05-26";
pname = "oh-my-zsh";
rev = "5ea25e6736430ab5b8439d11b2e9a837a803771b";
rev = "93cc3964e2d265ab0571298d69d2eed0a65d13f2";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "047vdx7c5fsli6yh35kmp25nxs2bgji21837iq5dwq8nvyq42a9i";
sha256 = "1g5v7zg22xf338qgymdfybs4m3wpy38s6b3jvw40lc7bw680ldsp";
};

pathsToLink = [ "/share/oh-my-zsh" ];