summary refs log tree commit diff
diff options
context:
space:
mode:
authorhappysalada <raphael@megzari.com>2021-05-19 11:17:47 +0900
committerRaphael Megzari <raphael@megzari.com>2021-05-21 11:53:16 +0900
commit788deaad9dbc27b94c0d930b617f659e71ea7987 (patch)
tree8457caf24e6786f81912d80b46b97c069244a593
parentceb8edb36985b5461414570d75b8ca4176f5b638 (diff)
downloadnixpkgs-788deaad9dbc27b94c0d930b617f659e71ea7987.tar
nixpkgs-788deaad9dbc27b94c0d930b617f659e71ea7987.tar.gz
nixpkgs-788deaad9dbc27b94c0d930b617f659e71ea7987.tar.bz2
nixpkgs-788deaad9dbc27b94c0d930b617f659e71ea7987.tar.lz
nixpkgs-788deaad9dbc27b94c0d930b617f659e71ea7987.tar.xz
nixpkgs-788deaad9dbc27b94c0d930b617f659e71ea7987.tar.zst
nixpkgs-788deaad9dbc27b94c0d930b617f659e71ea7987.zip
ion: unstable-2020-03-22 -> unstable-2020-05-10
fix darwin build
-rw-r--r--pkgs/shells/ion/default.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index 77691e99b25..f20c80810a0 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, libiconv }:
 
 rustPlatform.buildRustPackage rec {
   pname = "ion";
-  version = "unstable-2020-03-22";
+  version = "unstable-2021-05-10";
 
   src = fetchFromGitHub {
     owner = "redox-os";
     repo = "ion";
-    rev = "1fbd29a6d539faa6eb0f3186a361e208d0a0bc05";
-    sha256 = "0r5c87cs8jlc9kpb6bi2aypldw1lngf6gzjirf13gi7iy4q08ik7";
+    rev = "1170b84587bbad260a3ecac8e249a216cb1fd5e9";
+    sha256 = "sha256-lI1GwA3XerRJaC/Z8vTZc6GzRDLjv3w768C+Ui6Q+3Q=";
   };
 
-  cargoSha256 = "1ph3r3vspy700mb8pica8478v9arqz07k2nzpbrdkdkqgfcwlgcg";
+  cargoSha256 = "sha256-hURpgxc99iIMtzIlR6Kbfqcbu1uYLDHnfVLqgmMbvFA=";
 
   meta = with lib; {
     description = "Modern system shell with simple (and powerful) syntax";
@@ -22,8 +22,11 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin [
     Security
+    libiconv
   ];
 
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   passthru = {
     shellPath = "/bin/ion";
   };