diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-12 08:57:26 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-12 08:57:26 +0200 |
| commit | febc27b59a70b47594790ae562cbe579d73dae20 (patch) | |
| tree | ff79c2f1d3a3802eb5019c05b97ada8089e045d9 /pkgs/misc | |
| parent | df412d462f698d0ac1404c2bfe00c456354e1669 (diff) | |
| parent | dbdc5af9e8145dbc7ffe71cf1c7287d7497f1c16 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/staging.nix | 8 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 5c2469f8f44e0..48ea93a97a8e8 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -7,7 +7,7 @@ let patch = (callPackage ./sources.nix {}).staging; (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; in assert stdenv.lib.getVersion wineUnstable == patch.version; -stdenv.lib.overrideDerivation wineUnstable (self: { +(stdenv.lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; @@ -21,4 +21,8 @@ stdenv.lib.overrideDerivation wineUnstable (self: { ./patchinstall.sh DESTDIR="$PWD/.." --all cd .. ''; -}) +})) // { + meta = wineUnstable.meta // { + description = wineUnstable.meta.description + " (with staging patches)"; + }; +} diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 73c5690b19271..d9a68b90041eb 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -24,6 +24,7 @@ , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, golangci-lint , impl, iferr, gocode, gocode-gomod, go-tools +, gopls # direnv-vim dependencies , direnv @@ -593,6 +594,7 @@ self: super: { golint golangci-lint gomodifytags + gopls gotags gotools iferr |