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

Commits on Jan 5, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    Copy the full SHA
    0283016 View commit details

Commits on Jan 6, 2020

  1. Merge pull request #76961 from eraserhd/parinfer-rust-0.4.2

    parinfer-rust: 0.3.1 -> 0.4.2
    dywedir authored Jan 6, 2020
    Copy the full SHA
    0537534 View commit details
Showing with 12 additions and 4 deletions.
  1. +12 −4 pkgs/development/tools/parinfer-rust/default.nix
16 changes: 12 additions & 4 deletions pkgs/development/tools/parinfer-rust/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages }:

rustPlatform.buildRustPackage rec {
pname = "parinfer-rust";
version = "0.3.1";
version = "0.4.2";

src = fetchFromGitHub {
owner = "eraserhd";
repo = "parinfer-rust";
rev = "v${version}";
sha256 = "0w7fcg33k8k16q8wzax44ck8csa2dr7bmwcz1g57dz33vhxi8ajc";
sha256 = "1k2kr1zlxx3w3kwb634kngzx8vl5iif1yr6zk2xh46gjwqb3223l";
};

cargoSha256 = "17fkzpvfaxixllr9nxx7dnpqxkiighggryxf30j3lafghyrx987f";
cargoSha256 = "0i5wy15w985nxwl4b6rzb06hchzjwph6ygzjkkmigm9diw9jcycn";

buildInputs = [ llvmPackages.libclang llvmPackages.clang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

postInstall = ''
mkdir -p $out/share/kak/autoload/plugins
cp rc/parinfer.kak $out/share/kak/autoload/plugins/
rtpPath=$out/share/vim-plugins/parinfer-rust
mkdir -p $rtpPath/plugin
sed "s,let s:libdir = .*,let s:libdir = '${placeholder "out"}/lib'," \
plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim
'';

meta = with stdenv.lib; {