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.

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

sirula: 1.0.0-unstable -> 1.1.0 #371977

Merged
merged 3 commits into from
Jan 18, 2025
Merged

sirula: 1.0.0-unstable -> 1.1.0 #371977

merged 3 commits into from
Jan 18, 2025

Conversation

atagen
Copy link
Contributor

@atagen atagen commented Jan 8, 2025

Things done

  • updated source to 1.1.0
  • updated Cargo.lock
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 8, 2025
Copy link
Contributor

@l1npengtul l1npengtul left a comment

Choose a reason for hiding this comment

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

Use of pname binding here is discouraged.

pkgs/by-name/si/sirula/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/si/sirula/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/si/sirula/package.nix Outdated Show resolved Hide resolved
@atagen
Copy link
Contributor Author

atagen commented Jan 8, 2025

depends on #372016 now for maintainer update

@l1npengtul
Copy link
Contributor

You can add yourself to maintainers in the same PR, just make sure the commit that touches the maintainers file comes before the commit that changes the package.

@l1npengtul
Copy link
Contributor

l1npengtul commented Jan 8, 2025

Also, the package isn't formatted properly. Please make sure you are using nixfmt, as alejandra is not RFC compliant (I know from experience).

Here is the diff for reference:

-{ nix-update-script, lib, fetchFromGitHub, rustPlatform, pkg-config, gtk3
-, gtk-layer-shell, }:
+{
+  nix-update-script,
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  gtk3,
+  gtk-layer-shell,
+}:
 rustPlatform.buildRustPackage {
   pname = "sirula";
   version = "1.1.0";
@@ -13,14 +20,16 @@ rustPlatform.buildRustPackage {
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "osstrtools-0.2.2" =
-        "sha256-Co4pcikfN4vtIVK7ZsRGCWMAhMJWNNVZe/AdN1nMlmQ=";
+      "osstrtools-0.2.2" = "sha256-Co4pcikfN4vtIVK7ZsRGCWMAhMJWNNVZe/AdN1nMlmQ=";
     };
   };
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ gtk3 gtk-layer-shell ];
+  buildInputs = [
+    gtk3
+    gtk-layer-shell
+  ];
 
   passthru.updateScript = nix-update-script { };

@atagen
Copy link
Contributor Author

atagen commented Jan 8, 2025

oh well, it's needed across a few PRs for me to become maintainer, better not to pin it to any one of them

@atagen
Copy link
Contributor Author

atagen commented Jan 8, 2025

Also, the package isn't formatted properly. Please make sure you are using nixfmt, as alejandra is not RFC compliant (I know from experience).

I use it like , nixfmt pkgs/by-name/si/sirula/package.nix, maybe comma is not using nixfmt-rfc-style for this but nixfmt-classic or something?

@l1npengtul
Copy link
Contributor

Also, the package isn't formatted properly. Please make sure you are using nixfmt, as alejandra is not RFC compliant (I know from experience).

I use it like , nixfmt pkgs/by-name/si/sirula/package.nix, maybe comma is not using nixfmt-rfc-style for this but nixfmt-classic or something?

Thats odd, should be the correct usage...
Perhaps try using nix-shell -p nixfmt-rfc-style to ensure you're getting the correct one?

@l1npengtul
Copy link
Contributor

l1npengtul commented Jan 8, 2025

oh well, it's needed across a few PRs for me to become maintainer, better not to pin it to any one of them

Ah, ok.

@l1npengtul l1npengtul added 8.has: package (update) This PR updates a package to a newer version 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed 9.needs: maintainer Package or module needs active maintainers and removed 9.needs: maintainer Package or module needs active maintainers 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed labels Jan 8, 2025
Copy link
Contributor

@l1npengtul l1npengtul left a comment

Choose a reason for hiding this comment

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

Please format this file again.

@atagen atagen requested a review from l1npengtul January 17, 2025 01:05
@atagen
Copy link
Contributor Author

atagen commented Jan 17, 2025

oops, I didn't mean to ping you. was trying to figure out what's failing in these tests/how to rerun them since it seems the CI itself was broken at that time? sorry

@Eveeifyeve
Copy link
Contributor

Use of pname binding here is discouraged.

Related Resource: #277994

@Eveeifyeve
Copy link
Contributor

@NixOS/nixpkgs-vet could you re-run the ci as it broke at curl stage which is not this pr fault.

@philiptaron
Copy link
Contributor

@NixOS/nixpkgs-vet could you re-run the ci as it broke at curl stage which is not this pr fault.

Done. Passed.

pkgs/by-name/si/sirula/package.nix Outdated Show resolved Hide resolved
atagen added 2 commits January 18, 2025 12:48
update to 1.1.0, switch to useFetchCargoVendor, fix lib antipatterns
@niklaskorz
Copy link
Contributor

Please change the PR title to "sirula: 1.0.0-unstable -> 1.1.0"

@atagen atagen changed the title sirula: 1.0.0-unstable to 1.1.0 sirula: 1.0.0-unstable -> 1.1.0 Jan 18, 2025
@Eveeifyeve
Copy link
Contributor

The code looks good, I just need to test on my end with both nixpkgs review and local bin build then I will approve it.

@niklaskorz
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 371977


x86_64-linux

✅ 1 package built:
  • sirula

aarch64-linux

✅ 1 package built:
  • sirula

@niklaskorz niklaskorz added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Jan 18, 2025
@pbsds pbsds merged commit b2ed948 into NixOS:master Jan 18, 2025
34 of 36 checks passed
@atagen atagen deleted the sirula-update branch January 18, 2025 23:11
dustypomerleau pushed a commit to dustypomerleau/nixpkgs that referenced this pull request Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants