diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/tools/misc/thefuck | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/thefuck')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/thefuck/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/nixpkgs/pkgs/tools/misc/thefuck/default.nix index 13509af98c02..a3aa31d4dedd 100644 --- a/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication +{ lib, stdenv, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six , go, mock, pytestCheckHook, pytest-mock }: @@ -18,6 +18,23 @@ buildPythonApplication rec { checkInputs = [ go mock pytestCheckHook pytest-mock ]; + disabledTests = lib.optional stdenv.isDarwin [ + "test_settings_defaults" + "test_from_file" + "test_from_env" + "test_settings_from_args" + "test_get_all_executables_exclude_paths" + "test_with_blank_cache" + "test_with_filled_cache" + "test_when_etag_changed" + "test_for_generic_shell" + "test_on_first_run" + "test_on_run_after_other_commands" + "test_when_cant_configure_automatically" + "test_when_already_configured" + "test_when_successfully_configured" + ]; + meta = with lib; { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; |