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

kimg: init at 0.3.0 #95890

Merged
merged 1 commit into from Aug 28, 2020
Merged

kimg: init at 0.3.0 #95890

merged 1 commit into from Aug 28, 2020

Conversation

siraben
Copy link
Member

@siraben siraben commented Aug 21, 2020

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.

@siraben siraben force-pushed the kimg-init branch 2 times, most recently from 48320f7 to 937d0f0 Compare August 21, 2020 09:50
@siraben siraben changed the title kimg: init at 0.2.1 kimg: init at 0.3.0 Aug 21, 2020
pkgs/development/tools/misc/kimg/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/misc/kimg/default.nix Outdated Show resolved Hide resolved
pkgs/development/tools/misc/kimg/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/development/tools/misc/kimg/default.nix Outdated Show resolved Hide resolved
@siraben
Copy link
Member Author

siraben commented Aug 22, 2020

Applying suggestions causes the build to fail on darwin.

@siraben
Copy link
Member Author

siraben commented Aug 22, 2020

Pushed another commit that addresses the suggestions, works on darwin.

@siraben
Copy link
Member Author

siraben commented Aug 22, 2020

@GrahamcOfBorg build kimg

@siraben
Copy link
Member Author

siraben commented Aug 27, 2020

I think it's ready to merge.

sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk";
};

nativeBuildInputs = [ cmake asciidoc pkgconfig imagemagick7Big ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Sounds like imagemagick should go to regular buildInputs.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is used with asciidoc to generate the man pages, so it should be in nativeBuildInputs.

Copy link
Contributor

@danieldk danieldk Aug 27, 2020

Choose a reason for hiding this comment

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

Scratch that. I misremember, has been a week since I looked at the derivation. It does use imagemagick in the actual program, so this should indeed be in buildInputs.

pkgs/development/tools/misc/kimg/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

Thanks. I moved imagemagick to buildInputs.

Result of nixpkgs-review pr 95890 1

1 package built:
- kimg

Will merge when ofborg is happy.

@danieldk
Copy link
Contributor

@ofborg eval
@ofborg build kimg

@danieldk danieldk merged commit 44780f3 into NixOS:master Aug 28, 2020
@siraben siraben deleted the kimg-init branch August 28, 2020 11:35
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.

None yet

3 participants