mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #294258 from mkg20001/oil-fix
oil: apply renames as requested by upstream
This commit is contained in:
commit
bda93c2221
|
@ -442,4 +442,4 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||||
- QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS).
|
- QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS).
|
||||||
The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform.
|
The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform.
|
||||||
|
|
||||||
- The oil shell is now using the c++ version by default. The python based build is still available as `oil-python`
|
- The oil shell's c++ version is now available as `oils-for-unix`. The python version is still available as `oil`
|
||||||
|
|
|
@ -7,40 +7,24 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "oil";
|
pname = "oil";
|
||||||
version = "0.20.0";
|
version = "0.21.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz";
|
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||||
hash = "sha256-d4BIRj8bPyd7awZyJPlZYBwr+o82IKGh4y4/urOYOxc=";
|
hash = "sha256-eoImAByJFtAEaPYn02XerR/0+dXO8IdhnTEDCMKmlJI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs _build
|
patchShebangs build
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
runHook preBuild
|
|
||||||
|
|
||||||
_build/oils.sh
|
|
||||||
|
|
||||||
runHook postBuild
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
./install
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
buildInputs = lib.optional withReadline readline;
|
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
|
# 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.
|
# 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";
|
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
|
||||||
|
@ -55,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A new unix shell";
|
description = "A new unix shell - Python version";
|
||||||
homepage = "https://www.oilshell.org/";
|
homepage = "https://www.oilshell.org/";
|
||||||
|
|
||||||
license = with lib.licenses; [
|
license = with lib.licenses; [
|
||||||
|
@ -64,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
platforms = lib.platforms.all;
|
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";
|
changelog = "https://www.oilshell.org/release/${version}/changelog.html";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6,25 +6,41 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "oil";
|
pname = "oils-for-unix";
|
||||||
version = "0.20.0";
|
version = "0.21.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz";
|
||||||
hash = "sha256-QrhfUru6Sju44W8j/DlMQwK8/ZY48GfwHDfSPy7kSaA=";
|
hash = "sha256-g8uEK68J9BsCHEvJGDgsKUmsuR1MvChEC9A00Y2sZU4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs build
|
patchShebangs _build
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preInstall = ''
|
preInstall = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
_build/oils.sh
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
./install
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
buildInputs = lib.optional withReadline readline;
|
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
|
# 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.
|
# 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";
|
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
|
||||||
|
@ -39,16 +55,13 @@ stdenv.mkDerivation rec {
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
|
||||||
meta = {
|
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/";
|
homepage = "https://www.oilshell.org/";
|
||||||
|
|
||||||
license = with lib.licenses; [
|
license = lib.licenses.asl20;
|
||||||
psfl # Includes a portion of the python interpreter and standard library
|
|
||||||
asl20 # Licence for Oil itself
|
|
||||||
];
|
|
||||||
|
|
||||||
platforms = lib.platforms.all;
|
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";
|
changelog = "https://www.oilshell.org/release/${version}/changelog.html";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue