public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-31 09:50:38 +02:00
parent 98640fd482 81760f3235
commit fc74ba8291
364 changed files with 8989 additions and 6877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/shells/oil/default.nix
View File

@@ -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