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

Commits on Nov 13, 2019

  1. oil: 0.7.pre5 -> 0.7.pre6

    dywedir committed Nov 13, 2019
    Copy the full SHA
    1c30315 View commit details
  2. Merge pull request #73327 from dywedir/oil

    oil: 0.7.pre5 -> 0.7.pre6
    lheckemann authored Nov 13, 2019
    Copy the full SHA
    0b0bd1a View commit details
Showing with 3 additions and 12 deletions.
  1. +3 −12 pkgs/shells/oil/default.nix
15 changes: 3 additions & 12 deletions pkgs/shells/oil/default.nix
Original file line number Diff line number Diff line change
@@ -2,22 +2,13 @@

stdenv.mkDerivation rec {
pname = "oil";
version = "0.7.pre5";
version = "0.7.pre6";

src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
sha256 = "1vpk4my8lp7wik8ywspawimya2a7hb1qjkp5vpm7ypmkya5jqivc";
sha256 = "1yhfrxrqd4jbjsf0g2fkxv8zypcndnikv9g15yp9szgp4sh1r9vv";
};


# TODO remove at next bump
patches = [
(fetchpatch {
url = "https://github.com/oilshell/oil/commit/81551d76ae5a8b53179f2472492d0b44f13f84fd.patch";
sha256 = "0v99cx13ajqmf489vvxkqhqi9pjyc8jn0dgc8wp78gsv9js2k7km";
})
];

postPatch = ''
patchShebangs build
'';
@@ -34,7 +25,7 @@ stdenv.mkDerivation rec {

meta = {
description = "A new unix shell";
homepage = https://www.oilshell.org/;
homepage = "https://www.oilshell.org/";

license = with lib.licenses; [
psfl # Includes a portion of the python interpreter and standard library