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

z88dk : init at unstable-2018-02-20 #35039

Closed
wants to merge 6 commits into from
Closed

Conversation

bignaux
Copy link
Contributor

@bignaux bignaux commented Feb 16, 2018

Motivation for this change
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
    • 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/)
  • Fits CONTRIBUTING.md.

@@ -0,0 +1,60 @@
--- /nix/store/lqr8s3yi8gn98gf3xybrmxg2dj1d4li2-source/Makefile 1970-01-01 01:00:01.000000000 +0100
Copy link
Contributor

Choose a reason for hiding this comment

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

This patch looks odd to me, is it possible to avoid referring to store paths here? Perhaps it'd be better to modify the PREFIX define using sed or something instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't see the problem here, this line is just to say it's a reference ... you can replace with what you want, the thing is that it a huge directory, so i don' t over copy but diff . I think it could be a good thing to have such store , it shows that you diff from the real nix fetched sources ... anyway ... the better is the worse ennemie of the good. Where should i past my time, fix random reviewer suggestion ...

Copy link
Contributor

Choose a reason for hiding this comment

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

The issue is that you're checking in a fairly large diff compared to a single line of sed. What is more it seems the diff would have to be updated on each bump, given that it refers to specific store paths.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i spend 2 days on that. I tried to fix the latest stable first until try to have working library in last time. It took very very long time to compile this stuff, each iteration is very long. It results in a 180MB of compiler + libraries. just to say, the value. I'm using it with caprice32 ... How i see the stuff : "Release early, release often" .

Copy link
Contributor

Choose a reason for hiding this comment

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

Well, the patch will likely break the next time the version is bumped, unless you can show that patch will apply cleanly upon a version bump.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done ...

@@ -1,5 +1,5 @@
--- /nix/store/lqr8s3yi8gn98gf3xybrmxg2dj1d4li2-source/Makefile 1970-01-01 01:00:01.000000000 +0100
+++ lqr8s3yi8gn98gf3xybrmxg2dj1d4li2-source/Makefile 2018-02-16 13:28:44.979280387 +0100
--- joachifm-rtfm/Makefile 1970-01-01 01:00:01.000000000 +0100
Copy link
Contributor

Choose a reason for hiding this comment

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

Classy ...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the origin of diff is not a problem, how can i spend my time fixing real stuff and doing good job ... and my sense of humor is like that :) i would prefer to keep the first one since it doesn't matter ...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i should not have to edit a patch file generated by diff -Naur , and i would prefer fixing upstream later.

@bignaux bignaux changed the title z88dk : init at 20180217-49a7c60 z88dk : init at unstable-2018-02-17 Feb 17, 2018

install: install-clean
- install -d $(DESTDIR)/$(prefix) $(DESTDIR)/$(prefix_share)/lib
+ install -d $(DESTDIR)/$(prefix) $(DESTDIR)/$(prefix_share)/lib
Copy link
Member

Choose a reason for hiding this comment

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

What is the functional difference here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nothing, something remove trailing whitespaces and my diff is a bit bigger than it could. But btw, i'd prefer fix that upstream later.

Copy link
Member

Choose a reason for hiding this comment

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

It might be helpful to refer to a pull request, if it exists - Then future contributor have an easier time to update z88dk, if changes were applied upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, i did it for squashfuse, but i wont do that for z88dk for the moment (i can't contribute all project with fixes, and i need to use more z88dk to do so). I think "Release early, release often" was a good principle . I spent two day on this , i think future contributor would prefer modify existing not perfect derivation than start from scratch. Btw i've 6 open PR for nix, so i see the quality required is very high for new derivation.

Copy link
Member

Choose a reason for hiding this comment

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

Your open PR requests are more likely related to backlog nixpkgs maintainer have due lack of time.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok. As you can see, i commit upstream project i do nix derivation, but sometime, i don't want to waste time to argue , and this patch was some of waste of time. They modify this makefile very often, since z88dk team are in a newlib , new compatibility with sdcc and so, that this was just a not so quick fix to let it works in nix and make stuff with.

Copy link
Member

Choose a reason for hiding this comment

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

they were pretty quick merging the change btw: z88dk/z88dk#612

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i've to admit. and i was quick to merge the fixing on #fc094db . I've other things to fix as examples optional installation and others stuff. But i'm happy to see nix curators are alive, i've so much to do in it.

@bignaux bignaux changed the title z88dk : init at unstable-2018-02-17 z88dk : init at unstable-2018-02-20 Feb 20, 2018
bignaux referenced this pull request in z88dk/z88dk Feb 20, 2018
At this point:

- Cannot delete properly (so no good for input) - needs a custom
  fgets_cons since fonts are proportional and we can't 8 - space - 8 to
  clear the last character
- Can't set colours
- Scrolling is only in character increments
- Fixed window size of the whole screen
- Screen needs to be cleared before use or we end up xor with the
  tape loading status
- No fzx_* C API

Switch in with -pragma-redirect:fputc_cons=fputc_cons_fzx and configure
the font with -pragma-redirect:CRT_FONT_FZX=_ff....
@Mic92 Mic92 mentioned this pull request Feb 20, 2018
8 tasks
Mic92 pushed a commit to Mic92/nixpkgs that referenced this pull request Feb 20, 2018
@Mic92 Mic92 closed this in #35244 Feb 20, 2018
Mic92 added a commit that referenced this pull request Feb 20, 2018
@bignaux bignaux deleted the z88dk branch February 20, 2018 22:11
@bignaux
Copy link
Contributor Author

bignaux commented Feb 21, 2018

You're very lucky you know, people available as suborb is not frequent on project... btw i've noticed the change and will take that in count next z88dk release.

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

4 participants