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

Commits on Jun 5, 2019

  1. vim_configurable: also apply the security patch

    @vcunat
    vcunat committed Jun 5, 2019
    Copy the full SHA
    e95bbcf View commit details
Showing with 10 additions and 8 deletions.
  1. +6 −0 pkgs/applications/editors/vim/common.nix
  2. +3 −1 pkgs/applications/editors/vim/configurable.nix
  3. +1 −7 pkgs/applications/editors/vim/default.nix
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"