diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-30 18:39:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-30 18:39:36 +0100 |
| commit | 9cd2dbc569e08afde0a36bec51b603b5f97a6ca2 (patch) | |
| tree | c1e0e00cdc3447e4c528b4e92b05e17be3c2ec50 /pkgs/misc | |
| parent | cc07ec890d0e7b31d7154f1bce6d3ba19aae5a1e (diff) | |
| parent | 49b136377a93391f8fb2c80b9d14852dd531bb6c (diff) | |
| download | nixlib-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar nixlib-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.gz nixlib-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.bz2 nixlib-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.lz nixlib-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.xz nixlib-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.tar.zst nixlib-9cd2dbc569e08afde0a36bec51b603b5f97a6ca2.zip | |
Merge branch 'master' into staging
Hopefully this will fix the mass abortion on Hydra; restarting the jobs didn't help.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/themes/vertex/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix index fe48bb14d40c..5db712f818ec 100644 --- a/pkgs/misc/themes/vertex/default.nix +++ b/pkgs/misc/themes/vertex/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "theme-vertex"; - version = "20161009"; + version = "20170128"; src = fetchFromGitHub { owner = "horst3180"; repo = "vertex-theme"; - rev = "c861918a7fccf6d0768d45d790a19a13bb23485e"; - sha256 = "13abgl18m04sj44gqipxbagpan4jqral65w59rgnhb6ldxgnhg33"; + rev = version; + sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 5110897e32aa..3ce88320ddfa 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -366,6 +366,8 @@ rec { ''; })); + vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; + buildVimPluginFrom2Nix = a: buildVimPlugin ({ buildPhase = ":"; configurePhase =":"; |