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

horizon: 20190716 -> 1.0.0 #56497

Closed
wants to merge 5 commits into from
Closed

horizon: 20190716 -> 1.0.0 #56497

wants to merge 5 commits into from

Conversation

@Luz
Copy link
Contributor

@Luz Luz commented Feb 28, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

sha256 = "0qxw3vsbf9cg6b3pp3z1k2fjl8xrnjdr2gcncnr5jzd1mix6yd4y";
};

# Version in specific format, created by: "git log -1 --pretty="format:%h %ci %s"
Copy link
Contributor

@joachifm joachifm Mar 23, 2019

Choose a reason for hiding this comment

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

Updating this by hand seems like it'd get annoying after a while. What about just taking part of src.rev or does it have to have that format? Or at least use git within the build to produce the thing.

Also note that overriding patchPhase prevents users from passing additional patches via patches; not necessarily a problem, but something to be aware of.

Loading

echo "const char *gitversion = \"810fc8d 2019-02-27 00:05:27 +0100 fix some includes\";" > src/gitversion.cpp
'';

buildInputs = [ pkgconfig sqlite libyamlcpp libuuid gnome3.gtkmm epoxy librsvg zeromq cppzmq glm libgit2 curl boost python3 opencascade ];
Copy link
Contributor

@joachifm joachifm Mar 23, 2019

Choose a reason for hiding this comment

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

I think pkgconfig makes more sense as a native build input

Loading

NIX_CFLAGS_COMPILE = "-I${opencascade}/include/oce";

installPhase = ''
mkdir -p $out/bin
Copy link
Contributor

@joachifm joachifm Mar 23, 2019

Choose a reason for hiding this comment

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

Golfing: I believe this reduces to install -Dt $out/bin horizon-{eda,imp}

Loading

Choose a reason for hiding this comment

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

We now have an install target that also installs icons, desktop entry and such.

Loading

@joachifm
Copy link
Contributor

@joachifm joachifm commented Mar 23, 2019

@GrahamcOfBorg build horizon-eda

Loading

@Luz Luz closed this Jul 16, 2019
@Luz Luz deleted the horizon-eda branch Jul 16, 2019
@Luz Luz restored the horizon-eda branch Jul 16, 2019
@Luz Luz reopened this Jul 16, 2019
Copy link
Member

@aanderse aanderse left a comment

I have left a few comments I hope you will find helpful.

Loading

{ stdenv, fetchFromGitHub, pkgconfig, sqlite, libyamlcpp, libuuid, gnome3, epoxy, librsvg, zeromq, cppzmq, glm, libgit2, curl, boost, python3, opencascade, libzip, podofo, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "horizon-eda-${version}";
Copy link
Member

@aanderse aanderse Aug 5, 2019

Choose a reason for hiding this comment

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

Please use pname = "horizon-eda"; instead as name = "${pname}-${version}"; is already implied.

Loading


stdenv.mkDerivation rec {
name = "horizon-eda-${version}";
version = "20190716";
Copy link
Member

@aanderse aanderse Aug 5, 2019

Choose a reason for hiding this comment

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

If a package is not a release but a commit from a repository, then the version part of the name must be the date of that (fetched) commit. The date must be in "YYYY-MM-DD" format. Also append "unstable" to the name - e.g., "pkgname-unstable-2014-09-23".

Loading

echo "const char *gitversion = \"${src.rev}\";" > src/gitversion.cpp
'';

buildInputs = [ pkgconfig sqlite libyamlcpp libuuid gnome3.gtkmm epoxy librsvg zeromq cppzmq glm libgit2 curl boost python3 libzip podofo opencascade ];
Copy link
Member

@aanderse aanderse Aug 5, 2019

Choose a reason for hiding this comment

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

Please see comment by @joachifm about pkgconfig belonging to nativeBuildInputs instead.

Loading


meta = with stdenv.lib; {
description = "A free EDA software to develop printed circuit boards";
homepage = https://github.com/carrotIndustries/horizon;
Copy link
Member

@aanderse aanderse Aug 5, 2019

Choose a reason for hiding this comment

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

Please quote.

Loading

'';

preFixup = ''
wrapProgram "$out/bin/horizon-eda" "''${gappsWrapperArgs[@]}"
Copy link
Member

@aanderse aanderse Aug 5, 2019

Choose a reason for hiding this comment

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

Is this actually required?

Loading

@Luz Luz force-pushed the horizon-eda branch from 0cd2175 to 3107ec7 Feb 5, 2020
@Luz Luz changed the title horizon-eda-unstable: init at 2019-02-27 horizon: 20190716 -> 1.0.0 Feb 6, 2020
@Luz Luz requested a review from aanderse Feb 6, 2020
src = fetchFromGitHub {
owner = "horizon-eda";
repo = "horizon";
rev = "3f777bd2501b953981d64cf2054c265ce8d65c02";
Copy link
Member

@aanderse aanderse Feb 8, 2020

Choose a reason for hiding this comment

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

Suggested change
rev = "3f777bd2501b953981d64cf2054c265ce8d65c02";
rev = "v${version}";

Loading

sha256 = "1d40lfgylwl3srqazyjgw9l3n7i82xrvkjcxvpx7ddyzy1d2aqmr";
};

buildInputs = [ sqlite libyamlcpp libuuid gnome3.gtkmm epoxy librsvg zeromq cppzmq glm libgit2 curl boost python3 libzip podofo opencascade ];
Copy link
Member

@aanderse aanderse Feb 8, 2020

Choose a reason for hiding this comment

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

I would prefer if you were to sort this alphabetically (easier for me to do a quick comparison against https://docs.horizon-eda.org/en/latest/build-linux.html), but more importantly place each entry on a new line, like so:

buildInputs = [
  boost
  curl
  ...
  zeromq
];

Loading

@yrashk yrashk mentioned this pull request May 4, 2020
10 tasks
yrashk added a commit to yrashk/nixpkgs that referenced this issue May 13, 2020
@stale
Copy link

@stale stale bot commented Aug 13, 2020

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

Loading

@guserav
Copy link
Contributor

@guserav guserav commented Jan 30, 2021

As of #99964 this is merged so this shouldn't be necessary any longer

Loading

@guserav guserav closed this Jan 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants