diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-27 18:28:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 18:28:31 +0000 |
| commit | bef2fbcd27e27342ce0227e715f63b135a6d2258 (patch) | |
| tree | 84131bad52abead9018d16f4349fb1855df29d33 /pkgs/misc | |
| parent | 2137c13b409525616ce92598e3440c088096044a (diff) | |
| parent | 0b5fd3b7847445f3683ff60c8b896a7f2adc3b0e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/mame/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/vscode-extensions/default.nix | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index c7ac7a65ccd3..b50181a4d98d 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,10 +1,8 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper +{ lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper , python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: -with stdenv; - let majorVersion = "0"; minorVersion = "226"; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index b894eb7fa4dd..604a47e1ed45 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -189,6 +189,23 @@ let }; }; + elmtooling.elm-ls-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "elm-ls-vscode"; + publisher = "Elmtooling"; + version = "2.0.1"; + sha256 = "06x5ld2r1hzns2s052mvhmfiaawjzcn0jf5lkfprhmrkxnmfdd43"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog"; + description = "Elm language server"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Elmtooling.elm-ls-vscode"; + homepage = "https://github.com/elm-tooling/elm-language-client-vscode"; + license = licenses.mit; + maintainers = with maintainers; [ mcwitt ]; + }; + }; + esbenp.prettier-vscode = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; |