ion: unstable-2022-11-27 -> unstable-2024-09-20

pkgs/shells/ion/build-script.patch

@@ -1,17 +1,17 @@
+diff --git a/build.rs b/build.rs
+index 9a32b7a2..77bc41bc 100644
 --- a/build.rs
 +++ b/build.rs
-@@ -23,13 +23,7 @@ fn write_version_file() -> io::Result<()> {
-     let target = env::var("TARGET").unwrap();
-     let version_fname = Path::new(&env::var("OUT_DIR").unwrap()).join("version_string");
+@@ -25,10 +25,9 @@ fn write_version_file() -> io::Result<()> {
      let mut version_file = File::create(&version_fname)?;
--    write!(
--        &mut version_file,
+     write!(
+         &mut version_file,
 -        "r#\"ion {} ({})\nrev {}\"#",
--        version,
++        "r#\"ion {} ({})\nrev \"#",
+         version,
 -        target,
 -        get_git_rev()?.trim()
--    )?;
-+    write!(&mut version_file, "r#\"ion {version} ({target})\n\"#")?;
++        target
+     )?;
      Ok(())
- }
- 
+ }

pkgs/shells/ion/default.nix

@@ -1,31 +1,29 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, stdenv
-, darwin
+{
+  lib,
+  rustPlatform,
+  fetchFromGitLab
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "ion";
-  version = "unstable-2022-11-27";
+  version = "unstable-2024-09-20";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
+    domain = "gitlab.redox-os.org";
     owner = "redox-os";
     repo = "ion";
-    rev = "3bb8966fc99ba223033e1e02b0a6d50fc25cbef4";
-    sha256 = "sha256-6KW/YkMQFeGb1i+1YdADZRW89UruHsfPhMq9Cvxjl/4=";
+    rev = "8acd140eeec76cd5efbd36f9ea8425763200a76b";
+    hash = "sha256-jiJ5XW7S6/pVEOPYJKurolLI3UrOyuaEP/cqm1a0rIU=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "calculate-0.7.0" = "sha256-wUmi8XLgEMgECeaCM0r1KxJ+oTd47QozgFBANKSwt24=";
-      "decimal-2.1.0" = "sha256-s5mDRCkaDBUdaywYEJzTfe7qH25sG5UUo5iVmPE+zrw=";
+      "calculate-0.7.0" = "sha256-3CI+7TZeW1sk6pBigxESK/E7G+G1/MniVIn4sqfk7+w=";
       "nix-0.23.1" = "sha256-yWJYrQt9piJHhqBkH/hn9dsXR8oqzl0RKPrzx9fvqlw=";
       "object-pool-0.5.3" = "sha256-LWP0b62sk2dcqnQEEvLmZVvWSVLJ722yH/zIIPL93W4=";
-      "redox_liner-0.5.1" = "sha256-OT9E4AwQgm5NngcCtcno1VKhkS4d8Eq/l+8aYHvXtTY=";
+      "redox_liner-0.5.2" = "sha256-ZjVLACkyOT6jVRWyMj0ixJwCv6IjllCLHNTERlncIpk=";
       "small-0.1.0" = "sha256-QIzEfFc0EDEllf+YxVyV7j/PvC7nVWiK0YYBoZBQZ3Q=";
-      "termion-1.5.6" = "sha256-NTY/2SbqkSyslnN5Xg6lrQ0MTrOhTMHqN+XXqN6Nkr8=";
     };
   };
 
@@ -34,24 +32,16 @@ rustPlatform.buildRustPackage rec {
     ./build-script.patch
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
-
-  checkFlags = lib.optionals stdenv.hostPlatform.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";
-    mainProgram = "ion";
     homepage = "https://gitlab.redox-os.org/redox-os/ion";
     license = licenses.mit;
-    maintainers = with maintainers; [ dywedir ];
+    maintainers = with maintainers; [dywedir arthsmn];
+    mainProgram = "ion";
+    platforms = platforms.unix;
   };
 }