Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 90219516829d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c8ef36904b57
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Feb 17, 2017

  1. pcsctools: unbreak 'gscriptor' by adding cairo 

    Fixes this:

  $ gscriptor
  Can't load '/nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so' for module Pango: /nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so: undefined symbol: cairo_font_type_to_sv at /nix/store/5z1wn7knhckr3a0asb8lzp99sdai09f2-perl-5.22.2/lib/perl5/5.22.2/x86_64-linux-thread-multi/DynaLoader.pm line 193.
   at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  Compilation failed in require at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  BEGIN failed--compilation aborted at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  Compilation failed in require at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28.
  BEGIN failed--compilation aborted at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28.

(cherry picked from commit 73112a6)
    @bjornfor
    bjornfor committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    f97ec84 View commit details
    Browse the repository at this point in the history

  2. sweethome3d: 5.2 -> 5.4 

    (cherry picked from commit be7a6eb)
    @2chilled @bjornfor
    2chilled authored and bjornfor committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    1c41906 View commit details
    Browse the repository at this point in the history

  3. sweethome3d: version compatible with master and 16.09 

    [Bjørn: let the package function take 'libXxf86vm' as input instead of
'xorg' (the whole set).]

(cherry picked from commit 89a0365)
    @2chilled @bjornfor
    2chilled authored and bjornfor committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    c8ef369 View commit details
    Browse the repository at this point in the history