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

xcpc: init at version 20070122 #34965

Merged
merged 2 commits into from Feb 27, 2018
Merged

xcpc: init at version 20070122 #34965

merged 2 commits into from Feb 27, 2018

Conversation

bignaux
Copy link
Contributor

@bignaux bignaux commented Feb 14, 2018

Motivation for this change

libdsk : new , dep for xcpc
xcpc + caprice32 , small derivations, i put all this in same commit, should be easy to review.

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.

sha256 = "12yv56blm49qmshpk4mgc802bs51wv2ra87hmcbf2wxma39c45fy";
};

patchPhase = "substituteInPlace cap32.cfg --replace /usr/local $out";
Copy link
Member

Choose a reason for hiding this comment

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

Suggest using prePatch or postPatch instead. Replacing patchPhase prevents addition of patches while overriding like caprice32.overrideAttrs (o: {patches = [./foo.patch];})

@@ -0,0 +1,22 @@
{ stdenv, fetchurl }:

with stdenv.lib;
Copy link
Member

Choose a reason for hiding this comment

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

Probably move this to meta, since you're not using any of stdenv.lib elsewhere and it may cause confusion

@lheckemann
Copy link
Member

@GrahamcOfBorg build caprice32 xcpc

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘caprice32-02102017’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/misc/emulators/caprice32/default.nix:19 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/58h0rcl7w872lbxcncywichh396bisgy-caprice32-02102017
shrinking /nix/store/58h0rcl7w872lbxcncywichh396bisgy-caprice32-02102017/bin/cap32
gzipping man pages under /nix/store/58h0rcl7w872lbxcncywichh396bisgy-caprice32-02102017/share/man/
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/58h0rcl7w872lbxcncywichh396bisgy-caprice32-02102017/bin 
patching script interpreter paths in /nix/store/58h0rcl7w872lbxcncywichh396bisgy-caprice32-02102017
checking for references to /tmp/nix-build-caprice32-02102017.drv-0 in /nix/store/58h0rcl7w872lbxcncywichh396bisgy-caprice32-02102017...
/nix/store/58h0rcl7w872lbxcncywichh396bisgy-caprice32-02102017
/nix/store/1wcpchnrwcayrj0z7v1inziv8dc0aqjw-xcpc-20070122

stdenv.mkDerivation rec {

pname = "caprice32";
version = "02102017";
Copy link
Member

Choose a reason for hiding this comment

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

20170210 so that version ordering works, maybe add dashes for clarity

@lheckemann
Copy link
Member

Overall LGTM. Please split into multiple commits according to CONTRIBUTING.md though

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/awgw4sqfxkfq0rvxwcwd92k8cazbs204-caprice32-02102017
shrinking /nix/store/awgw4sqfxkfq0rvxwcwd92k8cazbs204-caprice32-02102017/bin/cap32
gzipping man pages under /nix/store/awgw4sqfxkfq0rvxwcwd92k8cazbs204-caprice32-02102017/share/man/
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/awgw4sqfxkfq0rvxwcwd92k8cazbs204-caprice32-02102017/bin
patching script interpreter paths in /nix/store/awgw4sqfxkfq0rvxwcwd92k8cazbs204-caprice32-02102017
checking for references to /build in /nix/store/awgw4sqfxkfq0rvxwcwd92k8cazbs204-caprice32-02102017...
/nix/store/awgw4sqfxkfq0rvxwcwd92k8cazbs204-caprice32-02102017
/nix/store/zva8ybhrf2kwsizc1vl1xcwpqpg85b90-xcpc-20070122

@bignaux bignaux changed the title 2 CPC emulators xcpc: init at version 20070122 Feb 15, 2018
};

meta = with stdenv.lib; {
description = "a library for accessing discs and disc image files";
Copy link
Contributor

Choose a reason for hiding this comment

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

Please capitalize the description

description = "a library for accessing discs and disc image files";
homepage = http://www.seasip.info/Unix/LibDsk/ ;
license = licenses.gpl2;
maintainers = [ maintainers.genesis ];
Copy link
Contributor

Choose a reason for hiding this comment

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

It's generally preferred to use a maintainer handle that matches the github handle.

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 will change maintainers in a separate PR for all my derivation.

@bignaux
Copy link
Contributor Author

bignaux commented Feb 20, 2018

i'd wake up here to close PR. 20070122 is official name of this release btw.

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