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

ocropus: remove #170176

Merged
merged 1 commit into from
May 10, 2022
Merged

ocropus: remove #170176

merged 1 commit into from
May 10, 2022

Conversation

armeenm
Copy link
Contributor

@armeenm armeenm commented Apr 25, 2022

Description of changes

Ocropus doesn't support python3 and hasn't seen much activity lately, so it's unlikely it will anytime soon.
NB: The pkgs/top-level/aliases.nix has some noise because I sorted the "O" section.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 25, 2022
@Mindavi
Copy link
Contributor

Mindavi commented May 4, 2022

cc @domenkozar who's maintainer

@davidak
Copy link
Member

davidak commented May 9, 2022

Generally looks good

Needs rebase

@SuperSandro2000 SuperSandro2000 added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 9, 2022
@Mindavi Mindavi removed the 2.status: merge conflict This PR has merge conflicts with the target branch label May 10, 2022
@Mindavi
Copy link
Contributor

Mindavi commented May 10, 2022

I think something went wrong during rebase since there seem to be unrelated changes in the aliases file

@armeenm
Copy link
Contributor Author

armeenm commented May 10, 2022

Yep, should be good now.
(The whole "O" aliases section needs a sort, fyi)

@Mindavi Mindavi merged commit 20653f4 into NixOS:master May 10, 2022
@Mindavi
Copy link
Contributor

Mindavi commented May 10, 2022

Probably better to do that when there's less churn :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants