diff options
Diffstat (limited to 'pkgs/applications')
6 files changed, 40 insertions, 119 deletions
diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 80cebab40c318..3d89289c747af 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.6.16"; + version = "0.6.17"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2xPm4DahTv3+T92qMYuistfPTlZaJUushP0yrgHYqco="; + sha256 = "sha256-diZl+izb55EFQaL6soLVNrFhoi7AOFkFnVcAU2XlI+c="; }; - cargoHash = "sha256-oPRW1x/hXhT8LBW3Z3jMBoal5zC6jKKOTo/RrDwgeJU="; + cargoHash = "sha256-VW+tMnjuVnf/PsBAoMnOxbyNna1UpGB/5V52XSzBJr8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 605d90eaab9db..b25ee1ac6cdc1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2021.2.1.14"; # "Android Studio Chipmunk (2021.2.1)" - sha256Hash = "1cy7ngm160w819ikrd459kg6lnk1k16jjnjm3d0aksmlws5b12z9"; + version = "2021.2.1.15"; # "Android Studio Chipmunk (2021.2.1)" + sha256Hash = "ABjg38DdKSFwBRb3osRDN3xVd4jaf7CkUkPstDAHRb4="; }; betaVersion = { - version = "2021.2.1.11"; # "Android Studio Chipmunk (2021.2.1) Beta 4" - sha256Hash = "0in8x6v957y9hsnz5ak845pdpvgvnvlm0s6r9y8f27zkm947vbjd"; + version = "2021.3.1.14"; # "Android Studio Dolphin (2021.3.1) Beta 5" + sha256Hash = "k1Qt54u45rwHsQNz9TVqnFB65kBKtfFZ3OknpfutKPI="; }; latestVersion = { # canary & dev - version = "2021.3.1.9"; # "Android Studio Dolphin (2021.3.1) Canary 9" - sha256Hash = "0nx26xwy67mnbkz37m3nw354siv152sa6zx94pxrvbnxxgppigfb"; + version = "2022.1.1.8"; # "Android Studio Electric Eel (2022.1.1) Canary 8" + sha256Hash = "0bZXx4YpMztLAnwuBaSaNT3GJNfYnqCDanwR+Q7qyUc="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 4c6bb5d0da0f9..60d4856cae6f5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -33,24 +33,6 @@ vim-with-plugins in PATH: # To automatically load a plugin when opening a filetype, add vimrc lines like: # autocmd FileType php :packadd phpCompletion }; - - # plugins can also be managed by VAM - vimrcConfig.vam.knownPlugins = pkgs.vimPlugins; # optional - vimrcConfig.vam.pluginDictionaries = [ - # load always - { name = "youcompleteme"; } - { names = ["youcompleteme" "foo"]; } - - # only load when opening a .php file - { name = "phpCompletion"; ft_regex = "^php\$"; } - { name = "phpCompletion"; filename_regex = "^.php\$"; } - - # provide plugin which can be loaded manually: - { name = "phpCompletion"; tag = "lazy"; } - - # full documentation at github.com/MarcWeber/vim-addon-manager - ]; - }; WHAT IS A VIM PLUGIN? @@ -278,7 +260,7 @@ let plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); - pathogenPackages.pathogen = lib.warn "'pathogen' attribute is deprecated. Use 'packages' instead in your vim configuration" { + pathogenPackages.pathogen = { start = plugins; }; in @@ -313,71 +295,26 @@ let yet */ - vamImpl = lib.optionalString (vam != null) - (let + vamImpl = + let knownPlugins = vam.knownPlugins or vimPlugins; # plugins specified by the user specifiedPlugins = map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries); # plugins with dependencies plugins = findDependenciesRecursively specifiedPlugins; - - # Convert scalars, lists, and attrs, to VimL equivalents - toVimL = x: - if builtins.isString x then "'${lib.replaceStrings [ "\n" "'" ] [ "\n\\ " "''" ] x}'" - else if builtins.isAttrs x && builtins ? out then toVimL x # a derivation - else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toVimL n}: ${toVimL v}") x)}}" - else if builtins.isList x then "[${lib.concatMapStringsSep ", " toVimL x}]" - else if builtins.isInt x || builtins.isFloat x then builtins.toString x - else if builtins.isBool x then (if x then "1" else "0") - else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; - - in assert builtins.hasAttr "vim-addon-manager" knownPlugins; - '' - filetype indent plugin on | syn on - - let g:nix_plugin_locations = {} - ${lib.concatMapStrings (plugin: '' - let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}" - '') plugins} - let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins.vim-addon-manager.rtp}" - - let g:vim_addon_manager = {} - - if exists('g:nix_plugin_locations') - " nix managed config - - " override default function making VAM aware of plugin locations: - fun! NixPluginLocation(name) - let path = get(g:nix_plugin_locations, a:name, "") - return path == "" ? vam#DefaultPluginDirFromName(a:name) : path - endfun - let g:vim_addon_manager.plugin_dir_by_name = 'NixPluginLocation' - " tell Vim about VAM: - let &rtp.=(empty(&rtp)?"":','). g:nix_plugin_locations['vim-addon-manager'] - else - " standalone config - - let &rtp.=(empty(&rtp)?"":',').c.plugin_root_dir.'/vim-addon-manager' - if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload') - " checkout VAM - execute '!git clone --depth=1 https://github.com/MarcWeber/vim-addon-manager ' - \ shellescape(c.plugin_root_dir.'/vim-addon-manager', 1) - endif - endif - - " tell vam which plugins to load, and when: - let l = [] - ${lib.concatMapStrings (p: "call add(l, ${toVimL p})\n") vam.pluginDictionaries} - call vam#Scripts(l, {}) - ''); + vamPackages.vam = { + start = plugins; + }; + in + nativeImpl vamPackages; entries = [ beforePlugins - vamImpl ] + ++ lib.optional (vam != null) (lib.warn "'vam' attribute is deprecated. Use 'packages' instead in your vim configuration" vamImpl) ++ lib.optional (packages != null && packages != []) (nativeImpl packages) - ++ lib.optional (pathogen != null) pathogenImpl + ++ lib.optional (pathogen != null) (lib.warn "'pathogen' attribute is deprecated. Use 'packages' instead in your vim configuration" pathogenImpl) ++ lib.optional (plug != null) plugImpl ++ [ customRC ]; @@ -468,37 +405,6 @@ rec { vimWithRC = throw "vimWithRC was removed, please use vim.customize instead"; - pluginnames2Nix = {name, namefiles} : vim_configurable.customize { - inherit name; - vimrcConfig.vam.knownPlugins = vimPlugins; - vimrcConfig.vam.pluginDictionaries = ["vim2nix"]; - vimrcConfig.customRC = '' - " Yes - this is impure and will create the cache file and checkout vim-pi - " into ~/.vim/vim-addons - let g:vim_addon_manager.plugin_root_dir = "/tmp/vim2nix-".$USER - if !isdirectory(g:vim_addon_manager.plugin_root_dir) - call mkdir(g:vim_addon_manager.plugin_root_dir) - else - echom repeat("=", 80) - echom "WARNING: reusing cache directory :".g:vim_addon_manager.plugin_root_dir - echom repeat("=", 80) - endif - let opts = {} - let opts.nix_prefetch_git = "${nix-prefetch-git}/bin/nix-prefetch-git" - let opts.nix_prefetch_hg = "${nix-prefetch-hg}/bin/nix-prefetch-hg" - let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache' - let opts.plugin_dictionaries = [] - ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles } - - " uncomment for debugging failures - " let opts.try_catch = 0 - - " add more files - " let opts.plugin_dictionaries += map(.. other file ) - call nix#ExportPluginsForNix(opts) - ''; - }; - vimGenDocHook = callPackage ({ vim }: makeSetupHook { name = "vim-gen-doc-hook"; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index e8d382bbf21bf..bc48ce3e2afcc 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -36,12 +36,15 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); + disabledTests = lib.optionals stdenv.isDarwin [ + "test_nonmedia_files" + ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Yet another simple static gallery generator"; homepage = "http://sigal.saimon.org/"; license = licenses.mit; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index aad3eaf529a0a..c1ada27d581e7 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "singular"; - version = "4.3.0"; + version = "4.3.1"; # since the tarball does not contain tests, we fetch from GitHub. src = fetchFromGitHub { @@ -33,9 +33,8 @@ stdenv.mkDerivation rec { # if a release is tagged (which sometimes does not happen), it will # be in the format below. - # rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; - rev = "d895b0f1f543c61eb03adddad20f08655a419d4e"; - sha256 = "sha256-c5Qr6VUuPKjfw8fowjJJz3oGAyUwo/K0WeMvU5djzVA="; + rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; + sha256 = "sha256-3r3epwaVbyveyYtmfxuevO4Q52J6FbI6RRqiaHQGJIk="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f0932fde2d5e2..6e2377bbec4bb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, unixtools, which }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, unixtools +, which +}: stdenv.mkDerivation rec { pname = "git-extras"; @@ -11,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek="; }; + patches = [ + (fetchpatch { + url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch"; + sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc="; + }) + ]; + postPatch = '' patchShebangs check_dependencies.sh ''; |