diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:04:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:04:20 +0200 |
| commit | ad1d58c6227abf2a9c80311eb09166a532384ed2 (patch) | |
| tree | 852498ff298f9b01c0d2c8b4c883da1a00912260 /pkgs/shells | |
| parent | ebe4fd146b29c92fb59f243f75e46afc9f1a9048 (diff) | |
| parent | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/oil/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 05e9a0c757e..9f1bf3ce6af 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,14 +1,12 @@ { stdenv, lib, fetchurl }: -let - version = "0.6.0"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "oil"; - inherit version; + version = "0.7.pre3"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1dw4mgnlmaxlfygasfihgvbj32d3m9w6k5j7azb9d9lp35f3l7hl"; + sha256 = "01zc36zaasaagr54rnh90k0j7pbnj0cc6a9pvz6gs6pk91i80lqg"; }; postPatch = '' @@ -23,10 +21,9 @@ stdenv.mkDerivation { dontStrip = true; meta = { + description = "A new unix shell"; homepage = https://www.oilshell.org/; - description = "A new unix shell, still in its early stages"; - license = with lib.licenses; [ psfl # Includes a portion of the python interpreter and standard library asl20 # Licence for Oil itself |