Merge pull request #215180 from aaronArinder/aaronarinder/rover-0.11.0-and-darwin

maintainers/maintainer-list.nix

@@ -206,6 +206,12 @@
     githubId = 22131756;
     name = "Aaqa Ishtyaq";
   };
+  aaronarinder = {
+    email = "aaronarinder@gmail.com";
+    github = "aaronArinder";
+    githubId = 26738844;
+    name = "Aaron Arinder";
+  };
   aaronjanse = {
     email = "aaron@ajanse.me";
     matrix = "@aaronjanse:matrix.org";

pkgs/development/tools/rover/default.nix

@@ -3,32 +3,46 @@
 , fetchFromGitHub
 , perl
 , rustPlatform
+, darwin
+, stdenv
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "rover";
-  version = "0.5.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "apollographql";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-wBHMND/xpm9o7pkWMUj9lEtEkzy3mX+E4Dt7qDn6auY=";
+    sha256 = "sha256-Ei6EeM0+b3EsMoRo38nHO79onT9Oq/cfbiCZhyDYQrc=";
   };
 
-  cargoSha256 = "sha256-n0R2MdAYGsOsYt4x1N1KdGvBZYTALyhSzCGW29bnFU4=";
+  cargoSha256 = "sha256-+iDU8LPb7P4MNQ8MB5ldbWq4wWRcnbgOmSZ93Z//5O0=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+    darwin.apple_sdk.frameworks.CoreServices
+  ];
 
   nativeBuildInputs = [
     perl
   ];
 
-  # The rover-client's build script (crates/rover-client/build.rs) will try to
+  # This test checks whether the plugins specified in the plugins json file are
+  # valid by making a network call to the repo that houses their binaries; but, the
+  # build env can't make network calls (impurity)
+  cargoTestFlags = [
+    "-- --skip=latest_plugins_are_valid_versions"
+  ];
+
+  # The rover-client's build script (xtask/src/commands/prep/schema.rs) will try to
   # download the API's graphql schema at build time to our read-only filesystem.
   # To avoid this we pre-download it to a location the build script checks.
   preBuild = ''
-    mkdir crates/rover-client/.schema
+    cp ${./schema}/hash.id              crates/rover-client/.schema/
-    cp ${./schema}/etag.id        crates/rover-client/.schema/
+    cp ${./schema}/etag.id              crates/rover-client/.schema/
-    cp ${./schema}/schema.graphql crates/rover-client/.schema/
+    cp ${./schema}/schema.graphql       crates/rover-client/.schema/
   '';
 
   passthru.updateScript = ./update.sh;
@@ -41,10 +55,9 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    description = "A CLI for managing and maintaining graphs with Apollo Studio";
+    description = "A CLI for interacting with ApolloGraphQL's developer tooling, including managing self-hosted and GraphOS graphs.";
     homepage = "https://www.apollographql.com/docs/rover";
     license = licenses.mit;
-    maintainers = [ maintainers.ivanbrennan ];
+    maintainers = [ maintainers.ivanbrennan maintainers.aaronarinder ];
-    platforms = ["x86_64-linux"];
   };
 }

pkgs/development/tools/rover/schema/etag.id

@@ -1 +1 @@
-2694c7b893d44c9ad8f5d7161116deb9985a6bd05e8e0cdcd7379947430e6f89
+d35f8c48cb89329f33656944fa9e997de1e778b043b9ca4d78c8accdecfd9046

pkgs/development/tools/rover/schema/hash.id

@@ -0,0 +1 @@
+ff145f12604d11312e6a2f8a61a3d226fcdb2ca79f6b7fbc24c5a22aa23ab1af