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

Commits on May 7, 2017

  1. intero-nix-shim: fix runtime dependencies

    @michalrus
    michalrus committed May 7, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    michalrus Michal Rus
    GPG key ID: 396762D2C75A20A7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6aefa13 View commit details

  2. Merge branch 'intero-nix-shim' of git://github.com/michalrus/nixpkgs

    @shlevy
    shlevy committed May 7, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    63841d1 View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/development/tools/haskell/intero-nix-shim/default.nix
10 changes: 8 additions & 2 deletions pkgs/development/tools/haskell/intero-nix-shim/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ mkDerivation, base, directory, filepath, optparse-applicative
, posix-escape, split, stdenv, unix, fetchFromGitHub
{ mkDerivation, base, cabal-install, directory, fetchFromGitHub
, filepath, intero, optparse-applicative, posix-escape, split
, stdenv, unix
}:
mkDerivation {
pname = "intero-nix-shim";
@@ -16,6 +17,11 @@ mkDerivation {
base directory filepath optparse-applicative posix-escape split
unix
];
postInstall = ''
mkdir -p $out/libexec
ln -s ${cabal-install}/bin/cabal $out/libexec
ln -s ${intero }/bin/intero $out/libexec
'';
homepage = "https://github.com/michalrus/intero-nix-shim";
license = stdenv.lib.licenses.asl20;
}