diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
| commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
| tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim | |
| parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip | |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim b/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim index 0ddbeaae6be1..f6160795c5c8 100644 --- a/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim +++ b/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim @@ -50,7 +50,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'-'.date.'";', \ ' src = fetchgit {', \ ' url = "'. a:repository.url .'";', @@ -74,7 +74,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'";', \ ' src = fetchhg {', \ ' url = "'. a:repository.url .'";', @@ -99,7 +99,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = keys(get(addon_info, 'dependencies', {})) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'";', \ ' src = fetchurl {', \ ' url = "'. a:repository.url .'";', |