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

[Backport release-24.05] epson-escpr2: 1.2.11 -> 1.2.12 #326589

Merged
merged 2 commits into from
Jul 12, 2024

Conversation

Shawn8901
Copy link
Contributor

Description of changes

Manual backport of #325904

Things done

  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@Shawn8901 Shawn8901 marked this pull request as ready for review July 12, 2024 15:49
@Shawn8901 Shawn8901 requested a review from Ma27 July 12, 2024 15:50
@Shawn8901
Copy link
Contributor Author

Shawn8901 commented Jul 12, 2024

2024-07-12T15:50:30.8259304Z Checking paths: pkgs/os-specific/bsd
2024-07-12T15:50:30.9495073Z Checking paths: pkgs/build-support/php
2024-07-12T15:50:30.9827766Z Checking paths: pkgs/development/cuda-modules pkgs/test/cuda pkgs/top-level/cuda-packages.nix 
2024-07-12T15:50:31.1261265Z Checking paths: nixos/modules/services/cluster/k3s nixos/tests/k3s pkgs/applications/networking/cluster/k3s 
2024-07-12T15:50:31.1796862Z Checking paths: maintainers/maintainer-list.nix maintainers/team-list.nix 
2024-07-12T15:50:32.3205021Z maintainers/maintainer-list.nix: not formatted
2024-07-12T15:50:32.3428623Z Error: nixfmt failed.

not sure why it complains on that in my pr, havent touched those :(

Also not quite sure what exactly the cherry-pick check is complaining about, as the resulting diff locks the same, it would be very appreciated if someone could give me insights, so that i can prevent that in the future/fix it.

@Ma27
Copy link
Member

Ma27 commented Jul 12, 2024

'Check that Nix files are formatted` errors with

maintainers/maintainer-list.nix: not formatted

Not related, will ignore.

cc @infinisil

@infinisil
Copy link
Member

@Ma27 #326628

@Ma27 Ma27 merged commit 9b665d7 into NixOS:release-24.05 Jul 12, 2024
23 of 27 checks passed
@Shawn8901 Shawn8901 deleted the backport-325904-to-release-24.05 branch July 12, 2024 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants