diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2020-10-28 03:00:32 +0100 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2020-10-28 03:03:27 +0100 |
commit | db0fe5c3eb1d680fb8c635f8e327c412528eba90 (patch) | |
tree | eb73686ee894bbc2d528824803dacf5bc914f28f /pkgs/misc | |
parent | 5d03fe6ac4b2e5e4132bb6f893380544ae2cf008 (diff) | |
parent | c127653b72574199463a73a56e1809223eaec0df (diff) |
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that was fixed in 1088f05 & eba8f542.
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/frescobaldi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/lightspark/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/screensavers/betterlockscreen/default.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 9 | ||||
-rw-r--r-- | pkgs/misc/vscode-extensions/default.nix | 21 |
5 files changed, 31 insertions, 9 deletions
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 830d5bea36a0e..82a3aa8c7befc 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -29,9 +29,9 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://frescobaldi.org/"; - description = ''Frescobaldi is a LilyPond sheet music text editor''; + description = "A LilyPond sheet music text editor"; longDescription = '' - Powerful text editor with syntax highlighting and automatic completion, + Powerful text editor with syntax highlighting and automatic completion, Music view with advanced Point & Click, Midi player to proof-listen LilyPond-generated MIDI files, Midi capturing to enter music, Powerful Score Wizard to quickly setup a music score, Snippet Manager diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index 833d8a82990e9..86177892f4319 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre -, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm +, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm , llvm, glibmm }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg - gnome2.pango lzma nasm llvm glibmm + pango lzma nasm llvm glibmm ]; enableParallelBuilding = true; diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 735a2cd3b76f0..f090156a85c0d 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; + description = "A simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed"; homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 98c52a5a0af81..88e535da5b030 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -60,18 +60,19 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.158"; + version = "0.1.160"; LanguageClient-neovim-src = fetchFromGitHub { owner = "autozimu"; repo = "LanguageClient-neovim"; rev = version; - sha256 = "14xggdgp5qw4yj4gdsgr8s2nxm098m88q8rx6fzd2j20njv308ki"; + sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { - name = "LanguageClient-neovim-bin"; + pname = "LanguageClient-neovim-bin"; + inherit version; src = LanguageClient-neovim-src; - cargoSha256 = "0nin1gydf6q4mmxljm2xbd1jfl3wpzx3pvlqwspahblv9j2bf5ck"; + cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 70c68abe313a6..53796981e59c3 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -10,6 +10,7 @@ in # So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # +stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) { alanz.vscode-hie-server = buildVscodeMarketplaceExtension { @@ -48,6 +49,26 @@ in }; }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dhall-lang"; + publisher = "dhall"; + version = "0.0.4"; + sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf"; + }; + meta = { license = stdenv.lib.licenses.mit; }; + }; + + dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-dhall-lsp-server"; + publisher = "dhall"; + version = "0.0.4"; + sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js"; + }; + meta = { license = stdenv.lib.licenses.mit; }; + }; + formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { mktplcRef = { name = "auto-close-tag"; |