Merge pull request #40 from tenx-tech/newer-cargo2nix

Convert to modern cargo2nix

.gitattributes

@@ -0,0 +1,4 @@
+# https://help.github.com/en/github/administering-a-repository/customizing-how-changed-files-appear-on-github
+
+**/Cargo.nix linguist-generated=true
+

README.md

@@ -13,16 +13,18 @@ Includes `Co-authored by` lines in commits for ye automatically when ye collabor
 ## Embark
 
 1. `git clone` this ship
-1. `cargo build` and `cargo install --path .` for now
-1. Add co-pirates by running:
+2. Install `rmob` on your machine using one of the commands below:
+   * Standard: `cargo install --path .`
+   * Nix: `nix-env -iA package -f .`
+3. Add co-pirates by running:
     ```bash
     rmob copirate enlist cb "Charlotte de Berry" "[email protected]"
     ```
-1. In your repo, `rmob embark`
-1. `rmob sail` away!
+4. In your repo, `rmob embark`
+5. `rmob sail` away!
 
 ---
-```
+```text
 Rmob 0.1.0
 Arr! Git mobbing in Rust
 

default.nix

@@ -1,159 +1,37 @@
 {
-  nixpkgsPath ? ./nixpkgs.nix,
+  sources ? import ./nix/sources.nix,
   system ? builtins.currentSystem,
+  crossSystem ? null,
   overlays ? [],
-  crossSystem ? (import <nixpkgs/lib>).systems.examples.musl64,
 }:
 let
-  version = "0.1.0";
+  inherit (sources) nixpkgs nixpkgsMozilla cargo2nix;
 
-  # mozilla nixpkgs rust overlay
-  nixpkgs-mozilla = builtins.fetchGit {
-    url = https://github.com/mozilla/nixpkgs-mozilla;
-    ref = "master";
-    rev = "50bae918794d3c283aeb335b209efd71e75e3954";
-  };
-  rustOverlay = import "${nixpkgs-mozilla}/rust-overlay.nix";
-
-  cargo2nix = builtins.fetchGit {
-    url = https://github.com/tenx-tech/cargo2nix;
-    ref = "master";
-    rev = "7208abba93c2e92b92f0788158a0a935c39e57b8";
-  };
-  cargo2nixOverlay = import "${cargo2nix}/overlay";
-
-  # bootstrap Nixpkgs with the overlays
-  pkgs = import nixpkgsPath {
+  pkgs = import nixpkgs {
     inherit system crossSystem;
-    overlays = overlays ++ [ rustOverlay cargo2nixOverlay ];
-  };
-
-  inherit (pkgs) lib;
-
-  # openssl supply
-  openssl =
-    pkgs:
-      pkgs.buildPackages.symlinkJoin {
-        name = "openssl";
-        paths = with pkgs.openssl; [out dev];
-      };
-
-  # macos frameworks supply, if on darwin
-  macosFrameworks = if pkgs.stdenv.isDarwin
-    then
-      with pkgs.darwin.apple_sdk.frameworks;
-      [Security CoreServices]
-    else [];
-
-  # choice of rustc
-  rustChannel = pkgs.buildPackages.rustChannelOf {
-    channel = "1.37.0";
-  };
-
-  inherit (rustChannel) cargo;
-  rustc = rustChannel.rust.override {
-    targets = [
-      (pkgs.rustBuilder.rustLib.realHostTriple pkgs.stdenv.targetPlatform)
-      "aarch64-unknown-linux-gnu"
+    overlays =
+      let
+        rustOverlay = import "${nixpkgsMozilla}/rust-overlay.nix";
+        cargo2nixOverlay = import "${cargo2nix}/overlay";
+      in
+        overlays ++ [ cargo2nixOverlay rustOverlay ];
+  };
+
+  rustPkgs = pkgs.rustBuilder.makePackageSet' {
+    rustChannel = "1.37.0";
+    packageFun = import ./Cargo.nix;
+    localPatterns = [
+      ''^(src)(/.*)?'' # Integration test in `tests/` doesn't work in sandbox.
+      ''[^/]*\.(rs|toml)$''
     ];
   };
-
-  # source filter
-  srcFilter = {src, name, type}:
-    (type == "regular" && lib.hasSuffix ".nix" (baseNameOf name) -> false) &&
-    (type == "regular" && lib.hasPrefix "." (baseNameOf name) -> false) &&
-    (type == "symlink" && lib.hasPrefix "${toString src}/result" name -> false) &&
-    (type == "unknown" -> false)
-  ;
-
-  # define source location
-  resolver = let version' = version; in { source, name, version, ... }: {
-    unknown.rmob.${version'} = pkgs.rustBuilder.rustLib.cleanLocalSource srcFilter ./.;
-  }.${source}.${name}.${version};
-
-  # build your crate
-  packageFun = import ./deps.nix;
-
-  config = pkgs: {
-    rustcflags = {
-      "registry+https://github.com/rust-lang/crates.io-index"."*" = [
-        "--cap-lints"
-        "warn"
-      ];
-    };
-    environment = {
-      "registry+https://github.com/rust-lang/crates.io-index".openssl-sys."*".OPENSSL_DIR = openssl pkgs;
-    };
-
-    buildInputs = {
-      unknown.rmob."*" = with pkgs; [ libiconv ] ++ macosFrameworks;
-      "registry+https://github.com/rust-lang/crates.io-index".curl-sys."*" = with pkgs; [ nghttp2 ] ++ macosFrameworks;
-      "registry+https://github.com/rust-lang/crates.io-index".libgit2-sys."*" = with pkgs; [ libiconv ] ++ macosFrameworks;
-    };
-  };
-
-  rustPackages = pkgs.callPackage ./crate.nix {
-    inherit packageFun rustc cargo resolver;
-    config = config pkgs;
-    buildConfig = config pkgs.buildPackages;
-  };
-
-  # done
-
-  # your rust build is available here
-  package = rustPackages.unknown.rmob.${version} {
-    freezeFeatures = true;
-    meta.platforms = lib.platforms.darwin ++ lib.platforms.linux;
-  };
-
-  # how to use cargo2nix to speed up resolution:
-
-  resolveResponse =
-    let
-      request =
-        builtins.toFile
-          "resolve-request.json"
-          (builtins.toJSON
-            (pkgs.rustBuilder.rustLib.buildResolveRequest {
-              initial = [
-                {
-                  package-id = "rmob ${version}";
-                }
-              ];
-              inherit (pkgs) stdenv;
-              inherit packageFun;
-            }));
-    in
-    lib.importJSON
-      (pkgs.runCommand
-        "resolve"
-        { nativeBuildInputs = [package]; }
-        "cargo2nix resolve <${request} >$out");
-
-  rustPackagesWithResolve = pkgs.callPackage ./crate.nix {
-    inherit packageFun rustc cargo resolver;
-    config = config pkgs // { resolve = resolveResponse; };
-    buildConfig = config pkgs.buildPackages // { resolve = resolveResponse; };
-  };
-
 in
-{
-  inherit package;
-
-  package' = rustPackagesWithResolve.unknown.rmob.${version} {};
-
-
-  # and you can make a development shell
-  shell = pkgs.rustBuilder.makeShell {
-    inherit packageFun cargo rustc;
-    packageResolver = { source, name, version, sha256, ... }:
-      {
-        src = resolver { inherit source name version; };
-      };
-    excludeCrates.unknown = "*";
-    environment.OPENSSL_DIR = openssl pkgs;
-    nativeBuildInputs = [ pkgs.buildPackages.buildPackages.jq ];
-
-    inherit (rustPackages.config) features;
-  };
-}
+  rec {
+    inherit rustPkgs;
+    package = rustPkgs.workspace.rmob {};
+    ci = pkgs.rustBuilder.runTests rustPkgs.workspace.rmob { depsBuildBuild = [ pkgs.git ]; };
+    shell = pkgs.mkShell {
+      inputsFrom = pkgs.lib.mapAttrsToList (_: pkg: pkg {}) rustPkgs.noBuild.workspace;
+      nativeBuildInputs = with rustPkgs; [ cargo rustc ];
+    };
+  }