From fb988d2f7a085c849ef3cbdf16af3641c6896304 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sun, 4 Feb 2024 21:52:17 +0100 Subject: oil: rename to oil-python --- pkgs/by-name/oi/oil-python/package.nix | 58 ++++++++++++++++++++++++++++++++++ pkgs/shells/oil/default.nix | 58 ---------------------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 58 insertions(+), 60 deletions(-) create mode 100644 pkgs/by-name/oi/oil-python/package.nix delete mode 100644 pkgs/shells/oil/default.nix (limited to 'pkgs') diff --git a/pkgs/by-name/oi/oil-python/package.nix b/pkgs/by-name/oi/oil-python/package.nix new file mode 100644 index 000000000000..0c5cf044e09a --- /dev/null +++ b/pkgs/by-name/oi/oil-python/package.nix @@ -0,0 +1,58 @@ +{ 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.20.0"; + + src = fetchurl { + url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; + hash = "sha256-QrhfUru6Sju44W8j/DlMQwK8/ZY48GfwHDfSPy7kSaA="; + }; + + 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 = "A new unix shell - Old python build"; + 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; [ lheckemann alva ]; + changelog = "https://www.oilshell.org/release/${version}/changelog.html"; + }; + + passthru = { + shellPath = "/bin/osh"; + }; +} diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix deleted file mode 100644 index de3116c19949..000000000000 --- a/pkgs/shells/oil/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ 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.20.0"; - - src = fetchurl { - url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-QrhfUru6Sju44W8j/DlMQwK8/ZY48GfwHDfSPy7kSaA="; - }; - - 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 = "A new unix shell"; - 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; [ lheckemann alva ]; - changelog = "https://www.oilshell.org/release/${version}/changelog.html"; - }; - - passthru = { - shellPath = "/bin/osh"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc5e7a94999f..57e020e11307 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15358,8 +15358,6 @@ with pkgs; oh = callPackage ../shells/oh { }; - oil = callPackage ../shells/oil { }; - oksh = callPackage ../shells/oksh { }; scponly = callPackage ../shells/scponly { }; -- cgit 1.4.1 From c627c0f561795577e75438598745cac758f7fea1 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Fri, 26 Jan 2024 17:03:58 +0100 Subject: oil: init at 0.20.0 This is the new C++ version Co-authored-by: Szymon Scholz --- pkgs/by-name/oi/oil/package.nix | 74 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/oi/oil/package.nix (limited to 'pkgs') diff --git a/pkgs/by-name/oi/oil/package.nix b/pkgs/by-name/oi/oil/package.nix new file mode 100644 index 000000000000..78109a5396fe --- /dev/null +++ b/pkgs/by-name/oi/oil/package.nix @@ -0,0 +1,74 @@ +{ 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.20.0"; + + src = fetchurl { + url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; + hash = "sha256-d4BIRj8bPyd7awZyJPlZYBwr+o82IKGh4y4/urOYOxc="; + }; + + postPatch = '' + 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), + # 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 = "A new unix shell"; + 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; [ lheckemann alva ]; + changelog = "https://www.oilshell.org/release/${version}/changelog.html"; + }; + + passthru = { + shellPath = "/bin/osh"; + }; +} -- cgit 1.4.1 From d339fffc7d514b53511ea528d3d6f770e5a79365 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Sun, 4 Feb 2024 21:57:01 +0100 Subject: oil: add myself as maintainer --- pkgs/by-name/oi/oil/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/by-name/oi/oil/package.nix b/pkgs/by-name/oi/oil/package.nix index 78109a5396fe..58e52dac3f0d 100644 --- a/pkgs/by-name/oi/oil/package.nix +++ b/pkgs/by-name/oi/oil/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ lheckemann alva ]; + maintainers = with lib.maintainers; [ lheckemann alva mkg20001 ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; -- cgit 1.4.1