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

cfitsio: 3.41 -> 3.43 #36316

Merged
merged 1 commit into from Mar 5, 2018
Merged

cfitsio: 3.41 -> 3.43 #36316

merged 1 commit into from Mar 5, 2018

Conversation

DougBurke
Copy link
Contributor

Motivation for this change

Version update.

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.
Additional notes

I tried nix-shell -p nox --run "nox-review wip" but it failed building dcraw with what looked to me a completely-unrelated issue: there were a lot of warnings from gcc-7.3.0 about misleading indentation and other recently-added warnings, with the error apparently being (there was a long trace-back and I didn't investigate thoroughly):

dcraw.cc:9245:25: error: call of overloaded 'abs(unsigned int&)' is ambiguous
       if (abs(i) < abs(c)) {

The cfitsio library now has (as of version 3.42) support for using the curl library to support file access via the https protocol. I did try adding a flag to build this, but it wasn't clear to me if I had truly succeeded due to what appears to be NixOS/nix#598 - namely I couldn't flip the flag from its default value (I am a nix neophyte).

The cfitsio library also has optional support for bzip-encoded files, which suffered a similar fate.

The cfitsio library has a simple test-suite - build a program against the library, run it and it produces screen output, and then compare this output to the expected value. Is it worth adding a test suite for this?

@grahamc
Copy link
Member

grahamc commented Mar 5, 2018

@GrahamcOfBorg build cfitsio

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘cfitsio-3.43’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/development/libraries/cfitsio/default.nix:18 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 aarch64-linux (full log)

Partial log (click to expand)

cp fitsio.h fitsio2.h longnam.h drvrsmem.h /nix/store/6q00ardpyjk0kycxpm9k6dhdyqxjmdxc-cfitsio-3.43/include
cp cfitsio.pc /nix/store/6q00ardpyjk0kycxpm9k6dhdyqxjmdxc-cfitsio-3.43/lib/pkgconfig
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/6q00ardpyjk0kycxpm9k6dhdyqxjmdxc-cfitsio-3.43
shrinking /nix/store/6q00ardpyjk0kycxpm9k6dhdyqxjmdxc-cfitsio-3.43/lib/libcfitsio.so.5.3.43
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/6q00ardpyjk0kycxpm9k6dhdyqxjmdxc-cfitsio-3.43/lib
patching script interpreter paths in /nix/store/6q00ardpyjk0kycxpm9k6dhdyqxjmdxc-cfitsio-3.43
checking for references to /build in /nix/store/6q00ardpyjk0kycxpm9k6dhdyqxjmdxc-cfitsio-3.43...
/nix/store/6q00ardpyjk0kycxpm9k6dhdyqxjmdxc-cfitsio-3.43

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

cp fitsio.h fitsio2.h longnam.h drvrsmem.h /nix/store/p02lpr2jb4vxnypdx4m5956h9pb0pg2s-cfitsio-3.43/include
cp cfitsio.pc /nix/store/p02lpr2jb4vxnypdx4m5956h9pb0pg2s-cfitsio-3.43/lib/pkgconfig
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/p02lpr2jb4vxnypdx4m5956h9pb0pg2s-cfitsio-3.43
shrinking /nix/store/p02lpr2jb4vxnypdx4m5956h9pb0pg2s-cfitsio-3.43/lib/libcfitsio.so.5.3.43
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/p02lpr2jb4vxnypdx4m5956h9pb0pg2s-cfitsio-3.43/lib 
patching script interpreter paths in /nix/store/p02lpr2jb4vxnypdx4m5956h9pb0pg2s-cfitsio-3.43
checking for references to /tmp/nix-build-cfitsio-3.43.drv-0 in /nix/store/p02lpr2jb4vxnypdx4m5956h9pb0pg2s-cfitsio-3.43...
/nix/store/p02lpr2jb4vxnypdx4m5956h9pb0pg2s-cfitsio-3.43

@adisbladis adisbladis merged commit 81fed4d into NixOS:master Mar 5, 2018
@adisbladis
Copy link
Member

Thank you :)

@DougBurke DougBurke deleted the fix/cfitsio-3430-update branch March 5, 2018 11:57
@chrisburr chrisburr mentioned this pull request Mar 14, 2018
Merged
8 tasks
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 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@DougBurke @grahamc @GrahamcOfBorg @adisbladis @Janik-Haag