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: 190e79d0f381
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: 9ea61f7bc445
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Jun 20, 2020

  1. nixos/btrfs autoScrub: don't fail when scrub finishes successfully 

    (cherry picked from commit 55d16d5)
    @symphorien
    symphorien committed Jun 20, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    154c3f3 View commit details

Commits on Jul 21, 2020

  1. zoom-us: Link libfaac to fix audio recording (#93374) 

    Fixes #93341.

Using strace reveals that zoom is attempting to load "libfaac1.so" from
its PATH. As faac provides "libfaac.so.0", solve this by linking from
there to "libfaac1.so" in zoom's output.

This is the same solution as the one we use for libjpeg_turbo.

(cherry picked from commit 903a0ca)
    @tadfisher @veprbl
    tadfisher authored and veprbl committed Jul 21, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    a90a5c5 View commit details

  2. grim: 1.3.0 -> 1.3.1 

    https://github.com/emersion/grim/releases/tag/v1.3.1
(cherry picked from commit cfcc630)
    @Ma27
    Ma27 committed Jul 21, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    cbf3cb5 View commit details

  3. Merge pull request #91162 from symphorien/backport-btrfs-scrub-success 

    [20.03] backport: nixos/btrfs autoScrub: don't fail when scrub finishes successfully
    @timokau
    timokau authored Jul 21, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    9ea61f7 View commit details
Showing with 11 additions and 5 deletions.
  1. +4 −1 nixos/modules/tasks/filesystems/btrfs.nix
  2. +5 −2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  3. +2 −2 pkgs/tools/graphics/grim/default.nix
5 changes: 4 additions & 1 deletion nixos/modules/tasks/filesystems/btrfs.nix
View file
Original file line number Diff line number Diff line change
@@ -128,7 +128,10 @@ in
Nice = 19;
IOSchedulingClass = "idle";
ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}";
ExecStop = "${pkgs.btrfs-progs}/bin/btrfs scrub cancel ${fs}";
# if the service is stopped before scrub end, cancel it
ExecStop = pkgs.writeShellScript "btrfs-scrub-maybe-cancel" ''
(${pkgs.btrfs-progs}/bin/btrfs scrub status ${fs} | ${pkgs.gnugrep}/bin/grep finished) || ${pkgs.btrfs-progs}/bin/btrfs scrub cancel ${fs}
'';
};
};
in listToAttrs (map scrubService cfgScrub.fileSystems);
7 changes: 5 additions & 2 deletions pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
, qtwebengine
# Runtime
, coreutils, libjpeg_turbo, pciutils, procps, utillinux
, coreutils, libjpeg_turbo, faac, pciutils, procps, utillinux
, pulseaudioSupport ? true, libpulseaudio ? null
}:

@@ -40,7 +40,7 @@ in mkDerivation {
nativeBuildInputs = [ autoPatchelfHook ];

buildInputs = [
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo qtbase
dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo faac qtbase
qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2
qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
];
@@ -73,6 +73,9 @@ in mkDerivation {
# TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd
ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $out/share/zoom-us/libturbojpeg.so
# Again, requires faac with a nonstandard filename.
ln -s $(readlink -e "${faac}/lib/libfaac.so") $out/share/zoom-us/libfaac1.so
runHook postInstall
'';

4 changes: 2 additions & 2 deletions pkgs/tools/graphics/grim/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "grim";
version = "1.3.0";
version = "1.3.1";

src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "14gqilgd27c4j2wn7fla72yj8syx0542rsanh61syikrv0hxgkvy";
sha256 = "0fjmjq0ws9rlblkcqxxw2lv7zvvyi618jqzlnz5z9zb477jwdfib";
};

nativeBuildInputs = [