Unverified Commit fa957fa9 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

oil, oils-for-unix: 0.22.0 -> 0.23.0 and deprecate oil (#350417)

parents 9a79bc99 2202e9bc

pkgs/by-name/oi/oil/package.nix

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }:



let

  readline-all = symlinkJoin {

    name = "readline-all"; paths = [ readline readline.dev ];

  };

in

stdenv.mkDerivation rec {

  pname = "oil";

  version = "0.22.0";



  src = fetchurl {

    url = "https://www.oilshell.org/download/oil-${version}.tar.xz";

    hash = "sha256-RS5/1Ci2hqp1LP65viuU+fz3upqyLgrlcKh83PeCJC4=";

  };



  postPatch = ''

    patchShebangs build

  '';



  preInstall = ''

    mkdir -p $out/bin

  '';



  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),

  # 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";

  configureFlags = [

    "--datarootdir=${placeholder "out"}"

  ] ++ lib.optionals withReadline [

    "--with-readline"

    "--readline=${readline-all}"

  ];



  # Stripping breaks the bundles by removing the zip file from the end.

  dontStrip = true;



  meta = {

    description = "New unix shell - Python version";

    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

    ];



    platforms = lib.platforms.all;

    maintainers = with lib.maintainers; [ melkor333 ];

    changelog = "https://www.oilshell.org/release/${version}/changelog.html";

  };



  passthru = {

    shellPath = "/bin/osh";

  };

}

pkgs/by-name/oi/oils-for-unix/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,11 +8,11 @@ let 
in

stdenv.mkDerivation rec {

  pname = "oils-for-unix";

  version = "0.22.0";

  version = "0.23.0";



  src = fetchurl {

    url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz";

    hash = "sha256-etZK2VH6qbj9MQ/BffCpMpHgQat1MRrKG8hcu/p61F8=";

    hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE=";

  };



  postPatch = ''

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -826,6 +826,7 @@ mapAliases { 
  o = orbiton; # Added 2023-04-09

  oathToolkit = oath-toolkit; # Added 2022-04-04

  oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17

  oil = lib.warn "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22

  onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04

  opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20

  opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20