diff options
author | Maciej Krüger <mkg20001@gmail.com> | 2024-03-15 15:44:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-15 15:44:43 +0100 |
commit | bda93c2221bc4185056723795c62e1b4cc661c4b (patch) | |
tree | 8e4fff281f5742aef02077ee34e7060c8895a3d9 /pkgs/by-name | |
parent | e103b83b33a6fdfccd896555fd26c8a575ee7ea5 (diff) | |
parent | bc206a940b2cc558b0d78a4158e71569f9b4f653 (diff) |
Merge pull request #294258 from mkg20001/oil-fix
oil: apply renames as requested by upstream
Diffstat (limited to 'pkgs/by-name')
-rw-r--r-- | pkgs/by-name/oi/oil/package.nix | 30 | ||||
-rw-r--r-- | pkgs/by-name/oi/oils-for-unix/package.nix (renamed from pkgs/by-name/oi/oil-python/package.nix) | 37 |
2 files changed, 32 insertions, 35 deletions
diff --git a/pkgs/by-name/oi/oil/package.nix b/pkgs/by-name/oi/oil/package.nix index 58e52dac3f0d1..c6ba73d1ef8ee 100644 --- a/pkgs/by-name/oi/oil/package.nix +++ b/pkgs/by-name/oi/oil/package.nix @@ -7,40 +7,24 @@ let in stdenv.mkDerivation rec { pname = "oil"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-d4BIRj8bPyd7awZyJPlZYBwr+o82IKGh4y4/urOYOxc="; + url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; + hash = "sha256-eoImAByJFtAEaPYn02XerR/0+dXO8IdhnTEDCMKmlJI="; }; postPatch = '' - patchShebangs _build + patchShebangs build ''; preInstall = '' mkdir -p $out/bin ''; - buildPhase = '' - runHook preBuild - - _build/oils.sh - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - ./install - - runHook postInstall - ''; - strictDeps = true; buildInputs = lib.optional withReadline readline; - # As of 0.19.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder), + # As of 0.20.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder), # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to # work just fine though, so we disable the error here. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; @@ -55,7 +39,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { - description = "A new unix shell"; + description = "A new unix shell - Python version"; homepage = "https://www.oilshell.org/"; license = with lib.licenses; [ @@ -64,7 +48,7 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ lheckemann alva mkg20001 ]; + maintainers = with lib.maintainers; [ lheckemann alva melkor333 ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; diff --git a/pkgs/by-name/oi/oil-python/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index 0c5cf044e09a7..f477d66d8a07c 100644 --- a/pkgs/by-name/oi/oil-python/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -6,25 +6,41 @@ let }; in stdenv.mkDerivation rec { - pname = "oil"; - version = "0.20.0"; + pname = "oils-for-unix"; + version = "0.21.0"; src = fetchurl { - url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-QrhfUru6Sju44W8j/DlMQwK8/ZY48GfwHDfSPy7kSaA="; + url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; + hash = "sha256-g8uEK68J9BsCHEvJGDgsKUmsuR1MvChEC9A00Y2sZU4="; }; postPatch = '' - patchShebangs build + patchShebangs _build ''; preInstall = '' mkdir -p $out/bin ''; + buildPhase = '' + runHook preBuild + + _build/oils.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ./install + + runHook postInstall + ''; + strictDeps = true; buildInputs = lib.optional withReadline readline; - # As of 0.20.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder), + # As of 0.19.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder), # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to # work just fine though, so we disable the error here. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; @@ -39,16 +55,13 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { - description = "A new unix shell - Old python build"; + description = "A Unix shell with JSON-compatible structured data. It's our upgrade path from bash to a better language and runtime."; homepage = "https://www.oilshell.org/"; - license = with lib.licenses; [ - psfl # Includes a portion of the python interpreter and standard library - asl20 # Licence for Oil itself - ]; + license = lib.licenses.asl20; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ lheckemann alva ]; + maintainers = with lib.maintainers; [ lheckemann alva mkg20001 melkor333 ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; |