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: 566982e0ee2a
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: 98c9ae41de70
Choose a head ref
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Jul 18, 2020

  1. barlow: init at 1.422

    @marsam
    marsam committed Jul 18, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 325649BCA6D53027
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f1d5d21 View commit details

  2. visualvm: 2.0.2 -> 2.0.3

    @r-ryantm
    r-ryantm committed Jul 18, 2020
    Copy the full SHA
    bdc6bb9 View commit details

  3. 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.
    @tadfisher
    tadfisher authored Jul 18, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    903a0ca View commit details

Commits on Jul 19, 2020

  1. Merge pull request #93442 from marsam/init-barlow 

    barlow: init at 1.422
    @marsam
    marsam authored Jul 19, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7546f2d View commit details

  2. Merge pull request #93440 from r-ryantm/auto-update/visualvm 

    visualvm: 2.0.2 -> 2.0.3
    @marsam
    marsam authored Jul 19, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    98c9ae4 View commit details
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
];
@@ -72,6 +72,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
'';

28 changes: 28 additions & 0 deletions pkgs/data/fonts/barlow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ lib, fetchzip }:
let
version = "1.422";
in
fetchzip rec {
name = "barlow-${version}";

url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip";

sha256 = "08ld4c3zq4d1px07lc64i7l8848zsc61ddy3654w2sh0hx5sm5ld";

postFetch = ''
mkdir -p $out/share/fonts/
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot
unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
'';

meta = with lib; {
description = "A grotesk variable font superfamily";
homepage = "https://tribby.com/fonts/barlow/";
license = licenses.ofl;
maintainers = [ maintainers.marsam ];
platforms = platforms.all;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/tools/java/visualvm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:

stdenv.mkDerivation rec {
version = "2.0.2";
version = "2.0.3";
pname = "visualvm";

src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
sha256 = "19h5804izhdhdwbpyfbfqsjwmnabz2djbhkv7gvzs66jxc6q8mgx";
sha256 = "1pwgsasja30xbm1ma0kp4nami2nwyy6aizam8nfl6jd7jkz4d7mk";
};

desktopItem = makeDesktopItem {
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -18103,6 +18103,8 @@ in

bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };

barlow = callPackage ../data/fonts/barlow { };

bgnet = callPackage ../data/documentation/bgnet { };

bibata-cursors = callPackage ../data/icons/bibata-cursors { };