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

axoloti: init at 1.0.12 #28328

Closed
wants to merge 0 commits into from
Closed

axoloti: init at 1.0.12 #28328

wants to merge 0 commits into from

Conversation

TealG
Copy link
Contributor

@TealG TealG commented Aug 17, 2017

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@TealG, thanks for your PR! By analyzing the history of the files in this pull request, we identified @zimbatm, @zraexy and @vcunat to be potential reviewers.

@Mic92
Copy link
Member

Mic92 commented Aug 26, 2017

Why I am the author of this commit :)

@@ -5,19 +5,19 @@
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
, libstartup_notification, libvpx, makeWrapper, mesa
, nspr, nss, pango, perl, python, libpulseaudio, sqlite
, unzip, xlibs, which, yasm, zip, zlib
, unzip, xlibs, which, yasm, zip, zlib, gcc
Copy link
Member

Choose a reason for hiding this comment

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

Please make this a separate commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

indeed, this does not belong there, must be a merge issue since I didn't modify this myself -- will check

@@ -60,7 +60,7 @@ in pythonPackages.buildPythonApplication rec {
owner = "foosel";
repo = "OctoPrint";
rev = version;
sha256 = "06l8khbq3waaaa4cqpv6056w1ziylkfgzlb28v30i1h234rlkknq";
sha256 = "1hci8cfmbzcghla1vmrcn6zicm8nj50drm7gp2hkr0drglq5fgr2";
Copy link
Member

Choose a reason for hiding this comment

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

Please make this a separate commit.

@@ -4,7 +4,7 @@
}:

let
version = "4.3.0";
version = "4.4.0";
Copy link
Member

Choose a reason for hiding this comment

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

Please make this a separate commit.

cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/
install -vD dist/Axoloti.jar $out/share/axoloti/

cat > $out/bin/axoloti <<EOF
Copy link
Member

Choose a reason for hiding this comment

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

makeWrapper is preferred here, see https://nixos.org/nixpkgs/manual/#sec-language-java as an example

Copy link
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

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

The package itself looks good to me.

@joachifm
Copy link
Contributor

joachifm commented Sep 6, 2017

@TealG are you still working on this?

@TealG TealG requested a review from edolstra as a code owner October 4, 2017 13:38
@TealG
Copy link
Contributor Author

TealG commented Oct 4, 2017

@joachifm should be done now, fixed merge issues + replaced cat with makeWrapper as @Mic92 suggested

@@ -590,6 +590,7 @@
taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";
tari = "Peter Marheine <peter@taricorp.net>";
tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
TealG = "Teal Gaure <~@Teal.Gr>"
Copy link
Member

@Mic92 Mic92 Oct 4, 2017

Choose a reason for hiding this comment

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

missing trailing semicolon.

@TealG
Copy link
Contributor Author

TealG commented Oct 4, 2017

@Mic92 fixed

@TealG TealG closed this Oct 4, 2017
@Mic92
Copy link
Member

Mic92 commented Oct 4, 2017

Did you close the pr by accident?

@TealG
Copy link
Contributor Author

TealG commented Oct 4, 2017

@Mic92 yes got closed by a push accidentally.. created a new one at #30086

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

5 participants