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.

Sign up for GitHub

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

Jump to bottom

cataclysm-dda{,-git}: move common attributes to common.nix #43080

Merged
merged 2 commits into from Aug 2, 2018
Merged

cataclysm-dda{,-git}: move common attributes to common.nix #43080

merged 2 commits into from Aug 2, 2018

Conversation

mnacamura
Copy link
Contributor

@mnacamura mnacamura commented Jul 5, 2018 •
edited

Motivation for this change

In the derivations of cataclysm-dda{,-git}, most attributes overlap between the two versions. It would be better to put them into a common tool box.
I would like to update the git version as well.
EDIT: #43578 has already bumped version.

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)
  • Fits CONTRIBUTING.md.

@mnacamura mnacamura force-pushed the cdda branch 2 times, most recently from 39bf81f to 72624e2 Compare July 17, 2018 05:20
@matthewbauer
Copy link
Member

@GrahamcOfBorg build cataclysm-dda cataclysm-dda-git

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: cataclysm-dda, cataclysm-dda-git

Partial log (click to expand)

install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \
                   LICENSE.txt -t /nix/store/l82vhnzc8na7h2abkjcfpmfr2cmdyyiy-cataclysm-dda-git-2018-07-15/share/cataclysm-dda/
mkdir -p /nix/store/l82vhnzc8na7h2abkjcfpmfr2cmdyyiy-cataclysm-dda-git-2018-07-15/share/locale
LOCALE_DIR=/nix/store/l82vhnzc8na7h2abkjcfpmfr2cmdyyiy-cataclysm-dda-git-2018-07-15/share/locale lang/compile_mo.sh all
post-installation fixup
strip is /nix/store/qfxcr8c4fg7lkybrny9n2sb77bmippdx-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/l82vhnzc8na7h2abkjcfpmfr2cmdyyiy-cataclysm-dda-git-2018-07-15/bin
patching script interpreter paths in /nix/store/l82vhnzc8na7h2abkjcfpmfr2cmdyyiy-cataclysm-dda-git-2018-07-15
/nix/store/wrm3yv55h2qppjyvhvb83qz6is7g6syc-cataclysm-dda-0.C
/nix/store/l82vhnzc8na7h2abkjcfpmfr2cmdyyiy-cataclysm-dda-git-2018-07-15

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cataclysm-dda, cataclysm-dda-git

Partial log (click to expand)

LOCALE_DIR=/nix/store/mmx3zzdbd3s6fw3lx2v2i4z68flqfa69-cataclysm-dda-git-2018-07-15/share/locale lang/compile_mo.sh all
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/mmx3zzdbd3s6fw3lx2v2i4z68flqfa69-cataclysm-dda-git-2018-07-15
shrinking /nix/store/mmx3zzdbd3s6fw3lx2v2i4z68flqfa69-cataclysm-dda-git-2018-07-15/bin/cataclysm-tiles
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/mmx3zzdbd3s6fw3lx2v2i4z68flqfa69-cataclysm-dda-git-2018-07-15/bin
patching script interpreter paths in /nix/store/mmx3zzdbd3s6fw3lx2v2i4z68flqfa69-cataclysm-dda-git-2018-07-15
checking for references to /build in /nix/store/mmx3zzdbd3s6fw3lx2v2i4z68flqfa69-cataclysm-dda-git-2018-07-15...
/nix/store/sny5vgjqs251z4xfc8jbcidazz7bm7ch-cataclysm-dda-0.C
/nix/store/mmx3zzdbd3s6fw3lx2v2i4z68flqfa69-cataclysm-dda-git-2018-07-15

@matthewbauer matthewbauer merged commit 8fe1620 into NixOS:master Aug 2, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cataclysm-dda, cataclysm-dda-git

Partial log (click to expand)

LOCALE_DIR=/nix/store/la65c8l3941085jwgy5haiwli8x0qagw-cataclysm-dda-git-2018-07-15/share/locale lang/compile_mo.sh all
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/la65c8l3941085jwgy5haiwli8x0qagw-cataclysm-dda-git-2018-07-15
shrinking /nix/store/la65c8l3941085jwgy5haiwli8x0qagw-cataclysm-dda-git-2018-07-15/bin/cataclysm-tiles
strip is /nix/store/zrs21zqcchgyabjf4xfimncdq16njizc-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/la65c8l3941085jwgy5haiwli8x0qagw-cataclysm-dda-git-2018-07-15/bin
patching script interpreter paths in /nix/store/la65c8l3941085jwgy5haiwli8x0qagw-cataclysm-dda-git-2018-07-15
checking for references to /build in /nix/store/la65c8l3941085jwgy5haiwli8x0qagw-cataclysm-dda-git-2018-07-15...
/nix/store/xnyp50yi0kx568g0ijglrnaqba64libn-cataclysm-dda-0.C
/nix/store/la65c8l3941085jwgy5haiwli8x0qagw-cataclysm-dda-git-2018-07-15

@mnacamura mnacamura deleted the cdda branch August 2, 2018 06:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mnacamura @matthewbauer @GrahamcOfBorg