Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7cc2f6cc5474
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9fbcf91b3c5b
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Feb 17, 2021

  1. Remove ripgrep test 

    VM tests are expensive (and prone to random failures) so they should
only be used for things that can only be tested in a VM, not for
things that could be tested in a regular checkPhase or derivation.
    @edolstra
    edolstra committed Feb 17, 2021
    4
    Copy the full SHA
    dd63561 View commit details

  2. ripgrep: Set app program name 

    NixOS/nix#4498
    @edolstra
    edolstra committed Feb 17, 2021
    2
    Copy the full SHA
    9fbcf91 View commit details
Showing with 1 addition and 14 deletions.
  1. +0 −1 nixos/tests/all-tests.nix
  2. +0 −13 nixos/tests/ripgrep.nix
  3. +1 −0 pkgs/tools/text/ripgrep/default.nix
1 change: 0 additions & 1 deletion nixos/tests/all-tests.nix
View file
Original file line number Diff line number Diff line change
@@ -332,7 +332,6 @@ in
redis = handleTest ./redis.nix {};
redmine = handleTest ./redmine.nix {};
restic = handleTest ./restic.nix {};
ripgrep = handleTest ./ripgrep.nix {};
robustirc-bridge = handleTest ./robustirc-bridge.nix {};
roundcube = handleTest ./roundcube.nix {};
rspamd = handleTest ./rspamd.nix {};
13 changes: 0 additions & 13 deletions nixos/tests/ripgrep.nix
View file

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/tools/text/ripgrep/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/BurntSushi/ripgrep";
license = with licenses; [ unlicense /* or */ mit ];
maintainers = with maintainers; [ tailhook globin ma27 zowoq ];
mainProgram = "rg";
};
}