Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

convco: init at 0.3.2 #110375

Merged
merged 2 commits into from Jan 25, 2021
Merged

convco: init at 0.3.2 #110375

merged 2 commits into from Jan 25, 2021

Conversation

Hoverbear
Copy link
Member

Motivation for this change

Introduce the convco tool from https://github.com/convco/convco.

Example usage, while in a conventional commit respecting git repo like Mayastor or Junctor or Vector:

convco changelog > CHANGELOG.md
convco commit --refactor
convco version
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Hoverbear Hoverbear changed the title convco: Add package convco: init at v0.3.2 Jan 21, 2021
@Hoverbear Hoverbear mentioned this pull request Jan 21, 2021
Closed
SuperSandro2000
SuperSandro2000 requested changes Jan 21, 2021
View reviewed changes
maintainers/maintainer-list.nix Outdated Show resolved Hide resolved
pkgs/development/tools/convco/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/convco/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/convco/default.nix Outdated Show resolved Hide resolved
@Hoverbear
maintainers: add hoverbear
67c61e7 
Signed-off-by: Ana Hobden <operator@hoverbear.org>
@Hoverbear
Copy link
Member Author

@SuperSandro2000 Gosh, thanks for the fast review. :) I've resolved those issues and will be mindful of them in the future!

@SuperSandro2000 SuperSandro2000 changed the title convco: init at v0.3.2 convco: init at 0.3.2 Jan 21, 2021
@Hoverbear Hoverbear mentioned this pull request Jan 21, 2021
Closed
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 110375 run on x86_64-darwin 1

1 package failed to build and are new build failure:

@Hoverbear
Copy link
Member Author

Hmmm it looks like there is an iconv error:

  cargo:warning=In file included from libgit2/src/commit_list.c:12:
  cargo:warning=In file included from libgit2/src/odb.h:19:
  cargo:warning=In file included from libgit2/src/filter.h:12:
  cargo:warning=In file included from libgit2/src/attr_file.h:17:
  cargo:warning=In file included from libgit2/src/futils.h:14:
  cargo:warning=libgit2/src/path.h:430:10: fatal error: 'iconv.h' file not found
  cargo:warning=#include <iconv.h>
  cargo:warning=         ^~~~~~~~~
  cargo:warning=In file included from libgit2/src/merge_driver.c:12:
  cargo:warning=In file included from libgit2/src/merge.h:15:
  cargo:warning=In file included from libgit2/src/iterator.h:15:
  cargo:warning=In file included from libgit2/src/ignore.h:12:
  cargo:warning=In file included from libgit2/src/repository.h:24:
  cargo:warning=In file included from libgit2/src/attrcache.h:12:
  cargo:warning=In file included from libgit2/src/attr_file.h:17:
  cargo:warning=In file included from libgit2/src/futils.h:14:
  cargo:warning=libgit2/src/path.h:430:10: fatal error: 'iconv.h' file not found
  cargo:warning=#include <iconv.h>
  cargo:warning=         ^~~~~~~~~
  cargo:warning=1 error generated.
  exit code: 1

@Hoverbear Hoverbear force-pushed the pkg-convco branch 2 times, most recently from f4ed10b to 31a5c62 Compare January 22, 2021 00:46
cole-h
cole-h approved these changes Jan 22, 2021
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM and runs fine. Using the instructions provided in the PR body, I was able to generate a CHANGELOG.md for Vector. Cool tool!

Result of nixpkgs-review pr 110375 run on x86_64-linux 1

1 package built:
  • convco

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 110375 run on x86_64-darwin 1

1 package failed to build and are new build failure:

darwin patch

diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix
index 2e1987e72d6..b3071f8f387 100644
--- a/pkgs/development/tools/convco/default.nix
+++ b/pkgs/development/tools/convco/default.nix
@@ -1,5 +1,5 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv, openssl, perl, pkg-config,
-}:
+{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config
+, libiconv, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "convco";
@@ -14,9 +14,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z";
 
-  buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
   nativeBuildInputs = [ openssl perl pkg-config ];
 
+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+
   meta = with lib; {
     description = "A Conventional commit cli";
     homepage = "https://github.com/convco/convco";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e903d966f58..46a9d0bdcac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10695,7 +10695,9 @@ in
 
   crate2nix = callPackage ../development/tools/rust/crate2nix { };
 
-  convco = callPackage ../development/tools/convco { };
+  convco = callPackage ../development/tools/convco {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   maturin = callPackage ../development/tools/rust/maturin { };
   inherit (rustPackages) rls;

@Hoverbear Hoverbear force-pushed the pkg-convco branch 2 times, most recently from f1feec1 to 631266d Compare January 22, 2021 18:09
@Hoverbear
Copy link
Member Author

Thank you -- Darwin patch applied.

SuperSandro2000
SuperSandro2000 requested changes Jan 24, 2021
View reviewed changes
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 110375 run on x86_64-darwin 1

1 package built:
  • convco

@Hoverbear
convco: init at 0.3.2
65ea0f1 
Signed-off-by: Ana Hobden <operator@hoverbear.org>
@SuperSandro2000 SuperSandro2000 merged commit 853e2e0 into NixOS:master Jan 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@cole-h cole-h cole-h approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Hoverbear @SuperSandro2000 @cole-h @Janik-Haag