Browse Source

Update to output repository being run

Samuel W. Flint 3 years ago
parent
commit
d881bba79a
4 changed files with 43 additions and 41 deletions
  1. 1 1
      Cargo.lock
  2. 1 1
      Cargo.toml
  3. 40 39
      flake.nix
  4. 1 0
      src/lib/run.rs

+ 1 - 1
Cargo.lock

@@ -171,7 +171,7 @@ dependencies = [
 
 [[package]]
 name = "sync-it"
-version = "1.1.1"
+version = "1.2.0"
 dependencies = [
  "clap",
  "home",

+ 1 - 1
Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sync-it"
-version = "1.1.1"
+version = "1.2.0"
 authors = ["Samuel W. Flint <swflint@flintfam.org>"]
 edition = "2018"
 

+ 40 - 39
flake.nix

@@ -7,46 +7,47 @@
   };
 
   outputs = { self, nixpkgs, utils }:
-    utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-      in
-      rec {
-        packages = rec {
+    utils.lib.eachDefaultSystem (
+      system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
+          rec {
+            packages = rec {
+
+              sync-it = pkgs.rustPlatform.buildRustPackage rec {
+                name = "sync-it";
+                version = "1.2.0";
+
+                src = ./.;
+
+                cargoSha256 = "ctv+0OgWtNh9ZO+ZCh+ehU8oOU2tQPQKNS7NbRgVHl4=";
+
+                meta = with pkgs.stdenv.lib; {
+                  description = "A simple, customizable synchronization tool.";
+                  license = licenses.gpl3Plus;
+                  maintainers = with maintainers; [ swflint ];
+                };
+              };
+
+              devEnvironment = pkgs.mkShell {
+                name = "sync-it-dev-environment";
+
+                buildInputs = [
+                  pkgs.pre-commit
+                  pkgs.rustc
+                  pkgs.cargo
+                  pkgs.rls
+                  pkgs.clippy
+                  pkgs.rustfmt
+                  pkgs.sloc
+                ];
+              };
 
-          sync-it = pkgs.rustPlatform.buildRustPackage rec {
-            name = "sync-it";
-            version = "1.1.1";
-
-            src = ./.;
-
-            cargoSha256 = "gfpIOyEj5gmOzcQPfLK5dxxXzWwYv6TiZ7mNvbb1tTE=";
-
-            meta = with pkgs.stdenv.lib; {
-              description = "A simple, customizable synchronization tool.";
-              license = licenses.gpl3Plus;
-              maintainers = with maintainers; [ swflint ];
             };
-          };
-
-          devEnvironment = pkgs.mkShell {
-            name = "sync-it-dev-environment";
-
-            buildInputs = [
-              pkgs.pre-commit
-              pkgs.rustc
-              pkgs.cargo
-              pkgs.rls
-              pkgs.clippy
-              pkgs.rustfmt
-              pkgs.sloc
-            ];
-          };
-
-        };
-
-        defaultPackage = packages.sync-it;
-        devShell = packages.devEnvironment;
-      }
+
+            defaultPackage = packages.sync-it;
+            devShell = packages.devEnvironment;
+          }
     );
 }

+ 1 - 0
src/lib/run.rs

@@ -95,6 +95,7 @@ pub fn run_repository_sync(config: &Config, name: String) {
                     let repo_type = config.repo_types.get(&repository.repo_type);
                     match repo_type {
                         Some(repo_type) => {
+                            println!("\n\nRepository {} ({}):", name, location);
                             run_command_in_directory(location.to_string(),
                                                      Template::new(&repo_type.pre_inward).render(&options));
                             run_command_in_directory(location.to_string(),