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: b2ec3b6db2b1
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: f2c181613648
Choose a head ref
  • 3 commits
  • 5 files changed
  • 3 contributors

Commits on Jun 5, 2019

  1. vim_configurable: also apply the security patch

    @vcunat
    vcunat committed Jun 5, 2019

    Verified

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

  2. firefox-wayland: Add missing dependency libglvnd (libEGL) 

    Firefox running in wayland mode is unable to find and load
libEGL.so (and says so on stdout). This puts it in "basic"
mode (unaccelerated graphics) and disables WebGL. Fix this by adding
libglvnd to the LD_LIBRARY_PATH.

(cherry picked from commit ae2778c)
    @talyz @andir
    talyz authored and andir committed Jun 5, 2019

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    17ebcb4 View commit details

Commits on Jun 6, 2019

  1. grafana: 6.2.1 -> 6.2.2 

    (cherry picked from commit 27f3d7a)
    @WilliButz @markuskowa
    WilliButz authored and markuskowa committed Jun 6, 2019

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    f2c1816 View commit details
6 changes: 6 additions & 0 deletions pkgs/applications/editors/vim/common.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,12 @@ rec {

hardeningDisable = [ "fortify" ];

patches = [
# Arbitrary code execution fix
# https://github.com/numirias/security/blob/cf4f74e0c6c6e4bbd6b59823aa1b85fa913e26eb/doc/2019-06-04_ace-vim-neovim.md
./0001-source-command-doesnt-check-for-the-sandbox-5357552.patch
];

postPatch =
# Use man from $PATH; escape sequences are still problematic.
''
4 changes: 3 additions & 1 deletion pkgs/applications/editors/vim/configurable.nix
View file
Original file line number Diff line number Diff line change
@@ -76,7 +76,9 @@ in stdenv.mkDerivation rec {
"default" = common.src; # latest release
};

patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch;
patches = common.patches or []
++ [ ./cflags-prune.diff ]
++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch;

configureFlags = [
"--enable-gui=${guiSupport}"
8 changes: 1 addition & 7 deletions pkgs/applications/editors/vim/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ in
stdenv.mkDerivation rec {
name = "vim-${version}";

inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
inherit (common) version src patches postPatch hardeningDisable enableParallelBuilding meta;

nativeBuildInputs = [ gettext pkgconfig ];
buildInputs = [ ncurses ]
@@ -25,12 +25,6 @@ stdenv.mkDerivation rec {
cf-private
];

patches = [
# Arbitrary code execution fix
# https://github.com/numirias/security/blob/cf4f74e0c6c6e4bbd6b59823aa1b85fa913e26eb/doc/2019-06-04_ace-vim-neovim.md
./0001-source-command-doesnt-check-for-the-sandbox-5357552.patch
];

configureFlags = [
"--enable-multibyte"
"--enable-nls"
3 changes: 2 additions & 1 deletion pkgs/applications/networking/browsers/firefox/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

## various stuff that can be plugged in
, flashplayer, hal-flash
, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
, jrePlugin, icedtea_web
, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
@@ -75,6 +75,7 @@ let
libs = lib.optional stdenv.isLinux udev
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos
++ lib.optional gdkWayland libglvnd
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/grafana/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

buildGoPackage rec {
version = "6.2.1";
version = "6.2.2";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";

@@ -11,12 +11,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "04db47rv8mp7l167v7krmkmxl7v4b9cd9r9kx4gqavgp6mdhrln8";
sha256 = "16sf9g79crwjarmspc35lab47vfnw59rjn2vcrgrz8y3l466qn8p";
};

srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1zmmn6j3n4ygc3jjy47xcq31d9ydfbw4q2j5327zrw1msy389xj1";
sha256 = "12w309bgii0qsjc7p6zssliy8y2jkixhf8g464f4mr8pnkx1yamz";
};

postPatch = ''