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

Commits on Oct 21, 2019

  1. zoom-us: 3.0.303290.1010 -> 3.0.306796.1020

    @NeQuissimus
    NeQuissimus committed Oct 21, 2019
    Copy the full SHA
    b1c21ad View commit details

  2. oh-my-zsh: 2019-10-19 -> 2019-10-20

    @NeQuissimus
    NeQuissimus committed Oct 21, 2019
    Copy the full SHA
    ad5994f 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
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;

version = "3.0.303290.1010";
version = "3.0.306796.1020";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
sha256 = "0rs18csmwb8r5n0fc1ka1zjz3f0rydm6fxiy1pa1c2k5bmya56f9";
sha256 = "0nh93pyincwfmx3z5x4s0ym3n0ff492nwd9wh3xkcl518pslxpxy";
};
};

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 = "2019-10-19";
version = "2019-10-20";
pname = "oh-my-zsh";
rev = "05dfd0ae8520e58e852c574f55c83fe6f49fb189";
rev = "a7c740b1d7d0033c6de118439c7935962b2a5c2a";

src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
sha256 = "1ky926ih9b56xgh8xp8dsnzjliwzd8rr0cqn4wjf74z42bg2cnw0";
sha256 = "1kwmjizldfsvxppf8xmgqh0644gnfvcns4l9cjpcvd0nk616yg0f";
};

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