about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2019-11-13 12:02:38 +0100
committerGitHub <noreply@github.com>2019-11-13 12:02:38 +0100
commit0b0bd1a267627c5f9177e6d2d43af1cca8114e33 (patch)
treeb0497e60bca3ac644a3d88449de144a521a52b05
parent529f030d26337a4fe5348e094461ada1be529886 (diff)
parent1c3031548888cdae6f26d9b46b0bd3560d10c98d (diff)
downloadnixlib-0b0bd1a267627c5f9177e6d2d43af1cca8114e33.tar
nixlib-0b0bd1a267627c5f9177e6d2d43af1cca8114e33.tar.gz
nixlib-0b0bd1a267627c5f9177e6d2d43af1cca8114e33.tar.bz2
nixlib-0b0bd1a267627c5f9177e6d2d43af1cca8114e33.tar.lz
nixlib-0b0bd1a267627c5f9177e6d2d43af1cca8114e33.tar.xz
nixlib-0b0bd1a267627c5f9177e6d2d43af1cca8114e33.tar.zst
nixlib-0b0bd1a267627c5f9177e6d2d43af1cca8114e33.zip
Merge pull request #73327 from dywedir/oil
oil: 0.7.pre5 -> 0.7.pre6
-rw-r--r--pkgs/shells/oil/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index d2ecf032d3e4..eeb6f9ab6a9c 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -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