Skip to content

moar: 1.33.0 -> 2.6.1, rename to moor, modernize #435670

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

Merged
getchoo merged 6 commits into from
Oct 22, 2025
Merged

moar: 1.33.0 -> 2.6.1, rename to moor, modernize #435670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a7d7da
moar: rename to moor
getchoo Aug 21, 2025
c217cdd
moor: 1.33.0 -> 2.6.1
getchoo Aug 21, 2025
fedfddc
moor: modernize
getchoo Aug 21, 2025
2635b47
moor: add versionCheckHook
getchoo Aug 21, 2025
266fdd3
moor: add cross package to tests
getchoo Aug 21, 2025
ccb8f2a
moor: add getchoo to maintainers
getchoo Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/release-notes/rl-2511.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@

- `sail-riscv` 0.8 follows [upstream](https://github.com/riscv/sail-riscv/blob/7cc4620eb1a57bfe04832baccdcf5727e9459bd4/doc/ChangeLog.md) and provides only a single binary, `sail_riscv_sim`.

- `moar` has been updated from `1.33.0` to `2.0.0`, and renamed to `moor` following an upstream decision. See the [release notes](https://github.com/walles/moor/releases/tag/v2.0.0) for more.

- `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md.

Expand Down
41 changes: 0 additions & 41 deletions pkgs/by-name/mo/moar/package.nix
View file
Open in desktop

This file was deleted.

56 changes: 56 additions & 0 deletions pkgs/by-name/mo/moor/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
lib,
buildGoModule,
fetchFromGitHub,
installShellFiles,
nix-update-script,
pkgsCross,
versionCheckHook,
}:

buildGoModule (finalAttrs: {
pname = "moor";
version = "2.6.1";

src = fetchFromGitHub {
owner = "walles";
repo = "moor";
tag = "v${finalAttrs.version}";
hash = "sha256-5MiTxspdNTFfLnif5C3gcQ0suxRrjerlZl2+kPAjiBM=";
};

vendorHash = "sha256-ve8QT2dIUZGTFYESt9vIllGTan22ciZr8SQzfqtqQfw=";

nativeBuildInputs = [ installShellFiles ];

ldflags = [
"-s"
"-w"
"-X"
"main.versionString=v${finalAttrs.version}"
];

nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

postInstall = ''
installManPage ./moor.1
'';

passthru = {
tests.cross-aarch64 = pkgsCross.aarch64-multiplatform.moor;
Copy link
Contributor

@RossSmyth RossSmyth Aug 22, 2025

Choose a reason for hiding this comment

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

I have been told not to use pkgsCross within package definitions, even within passthru tests.

Copy link
Member Author

@getchoo getchoo Aug 22, 2025

Choose a reason for hiding this comment

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

This is the first time I'm really hearing of that

I'm not exactly sure why we shouldn't either. There's the evaluation performance penalty obviously, but this is only being run in OfBorg for one package. I believe that should be fine?

I'd also question how else we're supposed to ensure cross builds for packages still work without pkgsCross. Even in the code that was finally merged with that PR for example, nixosTests.wine still uses it. Cross build regressions are super common in PRs, so this would definitely be a hole that needs to be filled

If there's something I'm missing here and this is a bigger issue, I'd really recommend documenting it @Ericson2314

Copy link
Member

@Ericson2314 Ericson2314 Sep 3, 2025

Choose a reason for hiding this comment

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

I'll defer to @alyssais on this. I don't get why we cannot just run pkgsCross.aarch64-multiplatform.moor.tests, test all packages cross compiled. Forcing cross tests for some packages feels ad hoc to me.

Copy link
Member

@alyssais alyssais Sep 4, 2025

Choose a reason for hiding this comment

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

I think it's basically harmless in passthru.tests. Eventually, it would be nice to make pkgsCross not visible inside packages, but I don't see this as a blocker because we can have some other stage where we add cross tests to packages that need it. Even if we had a way to automatically a cross test build on every package in OfBorg, we'd still need a way to mark which packages were expected to work.

Copy link
Member

@Ericson2314 Ericson2314 Sep 4, 2025

Choose a reason for hiding this comment

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

OK, sounds good!

updateScript = nix-update-script { };
};

meta = {
description = "Nice-to-use pager for humans";
homepage = "https://github.com/walles/moor";
changelog = "https://github.com/walles/moor/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd2WithViews;
mainProgram = "moor";
maintainers = with lib.maintainers; [
foo-dogsquared
getchoo
];
};
})
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,6 +1761,7 @@ mapAliases {
miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21
mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07
mmutils = throw "'mmutils' has been removed due to being unmaintained upstream"; # Added 2025-08-29
moar = lib.warnOnInstantiate "`moar` has been renamed to `moor` by upstream in v2.0.0. See https://github.com/walles/moor/pull/305 for more." pkgs.moor; # Added 2025-09-02
mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17
mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17
Expand Down
Loading