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: 25c3d0da53ff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e7348b4d6e3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 7, 2020

  1. skim: fix bash completion

    @marsam
    marsam committed Apr 7, 2020
    Copy the full SHA
    e4f9166 View commit details

  2. Merge pull request #84581 from marsam/fix-skim 

    skim: fix bash completion
    @marsam
    marsam authored Apr 7, 2020
    Copy the full SHA
    3e7348b View commit details
Showing with 10 additions and 2 deletions.
  1. +10 −2 pkgs/tools/misc/skim/default.nix
12 changes: 10 additions & 2 deletions pkgs/tools/misc/skim/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch }:

rustPlatform.buildRustPackage rec {
pname = "skim";
@@ -15,7 +15,15 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "14p4ppbl2mak21jvxpbd1b28jaw2629bc8kv7875cdzy3ksxyji3";

patchPhase = ''
patches = [
# Fix bash completion. Remove with the next release
(fetchpatch {
url = "https://github.com/lotabout/skim/commit/60ca3484090c2e73a1de396500c73a6ad6e0bde9.patch";
sha256 = "07nibr13vmxscbwavrckhcbsvxwkpan4a6ml0qfr1ny36xbc6y3p";
})
];

postPatch = ''
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
'';