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

Commits on Oct 6, 2019

  1. oil: enable readline

    Alva committed Oct 6, 2019

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    1047a16 View commit details

  2. oil: add passthru.shellPath

    Alva committed Oct 6, 2019
    Copy the full SHA
    fe30f41 View commit details

Commits on Oct 7, 2019

  1. Merge pull request #70531 from fjallarefur/oil 

    oil: enable readline
    @lheckemann
    lheckemann authored Oct 7, 2019
    Copy the full SHA
    e831ebc View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/shells/oil/default.nix
9 changes: 8 additions & 1 deletion pkgs/shells/oil/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch }:
{ stdenv, lib, fetchurl, fetchpatch, readline }:

stdenv.mkDerivation rec {
pname = "oil";
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
'';

buildInputs = [ readline ];
configureFlags = [ "--with-readline" ];

# Stripping breaks the bundles by removing the zip file from the end.
dontStrip = true;

@@ -40,4 +43,8 @@ stdenv.mkDerivation rec {

maintainers = with lib.maintainers; [ lheckemann ];
};

passthru = {
shellPath = "/bin/osh";
};
}