ion: unstable-2021-05-10 -> unstable-2022-11-27

Diff: https://github.com/redox-os/ion/compare/1170b84587bbad260a3ecac8e249a216cb1fd5e9...3bb8966fc99ba223033e1e02b0a6d50fc25cbef4

1 files changed, 27 insertions, 15 deletions

diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index ce15dbf2d25..d99b4baa427 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -1,33 +1,45 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, libiconv }:
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, stdenv
+, darwin
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "ion";
-  version = "unstable-2021-05-10";
+  version = "unstable-2022-11-27";
 
   src = fetchFromGitHub {
     owner = "redox-os";
     repo = "ion";
-    rev = "1170b84587bbad260a3ecac8e249a216cb1fd5e9";
-    sha256 = "sha256-lI1GwA3XerRJaC/Z8vTZc6GzRDLjv3w768C+Ui6Q+3Q=";
+    rev = "3bb8966fc99ba223033e1e02b0a6d50fc25cbef4";
+    sha256 = "sha256-6KW/YkMQFeGb1i+1YdADZRW89UruHsfPhMq9Cvxjl/4=";
   };
 
-  cargoSha256 = "sha256-hURpgxc99iIMtzIlR6Kbfqcbu1uYLDHnfVLqgmMbvFA=";
+  cargoSha256 = "sha256-KLKPnj4SmAuspjMPAGLJ8Yy9SxAi6FvGE/FIF58lAH8=";
 
-  meta = with lib; {
-    description = "Modern system shell with simple (and powerful) syntax";
-    homepage = "https://gitlab.redox-os.org/redox-os/ion";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dywedir ];
-  };
+  patches = [
+    # remove git revision from the build script to fix build
+    ./build-script.patch
+  ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-    libiconv
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
   ];
 
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  checkFlags = lib.optionals stdenv.isDarwin [
+    # test assumes linux
+    "--skip=binary::completer::tests::filename_completion"
+  ];
 
   passthru = {
     shellPath = "/bin/ion";
   };
+
+  meta = with lib; {
+    description = "Modern system shell with simple (and powerful) syntax";
+    homepage = "https://gitlab.redox-os.org/redox-os/ion";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dywedir ];
+  };
 }