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

trivial: tiny cleanups and fixes #49864

Merged
merged 8 commits into from Nov 8, 2018
Merged

Conversation

oxij
Copy link
Member

@oxij oxij commented Nov 7, 2018

  • Running with these applied.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: espeak-ng, mesa

Partial log (click to expand)

copying path '/nix/store/dx73vl5hk3883kg4gnqpcyxf6gkji023-flac-1.3.2' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/gc6hmwhp4k17lpcssjwi5pjn09qfr7nw-libvorbis-1.3.6' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/8zqhfxdvz5r8mh66rmxsg02wpr0wfyxa-sonic-2016-03-01' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/6pr06lwr0fl6jl5nzmgqjif6h503ivpb-libsndfile-1.0.28' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/x1nkxjschn3fw6bmi05gly10nhzvdd9c-speexdsp-1.2rc3' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/dl6q0sya45sij9gmn0xnchiq484ayn86-libpulseaudio-12.2' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/3l366nd30bzpyyh8lfdgxbs540qqwn8z-pcaudiolib-2016-07-19' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/0s5x9k8c4qz93kh7d20gd4kapyg7l8z2-espeak-ng-1.49.2' from 'https://nix-cache.s3.amazonaws.com'...
/nix/store/0s5x9k8c4qz93kh7d20gd4kapyg7l8z2-espeak-ng-1.49.2
/nix/store/mfbspg0y079dl8dcrk5rsh3mh10wjwmp-mesa-noglu-18.2.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: espeak-ng, mesa

Partial log (click to expand)

shrinking /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/bin/speak-ng
shrinking /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/lib/libespeak-ng-test.so.1.1.49
shrinking /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/lib/libespeak-ng.so.1.1.49
gzipping man pages under /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/lib  /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/bin
patching script interpreter paths in /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2
checking for references to /build in /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2...
/nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2
/nix/store/ywxaw0sb94xxswqap1aygipw69y3m9my-mesa-noglu-18.2.2

@@ -18,7 +18,7 @@
## optional libraries

, alsaSupport ? stdenv.isLinux, alsaLib
, pulseaudioSupport ? true, libpulseaudio
, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
Copy link
Member

Choose a reason for hiding this comment

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

Commit message should be descriptive like "firefox: disable pulseaudio support on non-Linux by default"

@@ -108,7 +108,7 @@ let
let
configEvaled = import lib/eval-config.nix {
inherit system;
modules = [ module versionModule ];
modules = [ configuration module versionModule ];
Copy link
Member

Choose a reason for hiding this comment

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

Looks like [ configuration module versionModule ] should be factored out across the entire file.

Copy link
Member

@ttuegel ttuegel left a comment

Choose a reason for hiding this comment

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

Qt changes look fine to me.

@oxij
Copy link
Member Author

oxij commented Nov 8, 2018

@roberth done.

@oxij
Copy link
Member Author

oxij commented Nov 8, 2018 via email

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: espeak-ng, mesa

Partial log (click to expand)

these paths will be fetched (2.21 MiB download, 6.75 MiB unpacked):
  /nix/store/0s5x9k8c4qz93kh7d20gd4kapyg7l8z2-espeak-ng-1.49.2
  /nix/store/3l366nd30bzpyyh8lfdgxbs540qqwn8z-pcaudiolib-2016-07-19
copying path '/nix/store/3l366nd30bzpyyh8lfdgxbs540qqwn8z-pcaudiolib-2016-07-19' from 'https://cache.nixos.org'...
copying path '/nix/store/0s5x9k8c4qz93kh7d20gd4kapyg7l8z2-espeak-ng-1.49.2' from 'https://cache.nixos.org'...
/nix/store/0s5x9k8c4qz93kh7d20gd4kapyg7l8z2-espeak-ng-1.49.2
/nix/store/mfbspg0y079dl8dcrk5rsh3mh10wjwmp-mesa-noglu-18.2.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: espeak-ng, gnuradio-rds, mesa

Partial log (click to expand)

copying path '/nix/store/x4kkl7js1366w25vljgwdd7ciccw1x31-python2.7-PyQt-x11-gpl-4.12' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/2dkvlz3x1jf83s9zmn9klh6d3jf8icgh-qwt-6.1.3' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/zmddrmjvcsqwg1br6vkyx3ynbab54bqx-uhd-3.12.0.0' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/qhw4mb6rk3ysx9n3w57q6v87ac5nca9q-wxwidgets-3.0.4' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/gzn0ywb6ajf5v0a0yfn82gwxrxjbanrh-python2.7-wxPython-3.0.2.0' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/0z787nql9xx49w6f5frvvma87yz6bg0p-gnuradio-3.7.13.4' from 'https://nix-cache.s3.amazonaws.com'...
copying path '/nix/store/4xk956ax1wfwqalwaiww912pab3zg9ci-gnuradio-rds-1.0.0' from 'https://nix-cache.s3.amazonaws.com'...
/nix/store/0s5x9k8c4qz93kh7d20gd4kapyg7l8z2-espeak-ng-1.49.2
/nix/store/4xk956ax1wfwqalwaiww912pab3zg9ci-gnuradio-rds-1.0.0
/nix/store/mfbspg0y079dl8dcrk5rsh3mh10wjwmp-mesa-noglu-18.2.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: espeak-ng, mesa

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2
shrinking /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/bin/espeak-ng
shrinking /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/bin/speak-ng
shrinking /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/lib/libespeak-ng-test.so.1.1.49
shrinking /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/lib/libespeak-ng.so.1.1.49
gzipping man pages under /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/lib  /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2/bin
patching script interpreter paths in /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2
checking for references to /build in /nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2...

@7c6f434c 7c6f434c merged commit adf41ed into NixOS:master Nov 8, 2018
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: espeak-ng, gnuradio-rds, mesa

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/zrkzcpj5qdx2zrh15kh77c6pk9dmwrn5-gnuradio-rds-1.0.0
shrinking /nix/store/zrkzcpj5qdx2zrh15kh77c6pk9dmwrn5-gnuradio-rds-1.0.0/lib/python2.7/site-packages/rds/_rds_swig.so
shrinking /nix/store/zrkzcpj5qdx2zrh15kh77c6pk9dmwrn5-gnuradio-rds-1.0.0/lib/libgnuradio-rds-3.7.0git.so.0.0.0
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/zrkzcpj5qdx2zrh15kh77c6pk9dmwrn5-gnuradio-rds-1.0.0/lib
patching script interpreter paths in /nix/store/zrkzcpj5qdx2zrh15kh77c6pk9dmwrn5-gnuradio-rds-1.0.0
checking for references to /build in /nix/store/zrkzcpj5qdx2zrh15kh77c6pk9dmwrn5-gnuradio-rds-1.0.0...
/nix/store/3sq9iscbz3v3c7az4kn9phs713yc9cw4-espeak-ng-1.49.2
/nix/store/zrkzcpj5qdx2zrh15kh77c6pk9dmwrn5-gnuradio-rds-1.0.0
/nix/store/ywxaw0sb94xxswqap1aygipw69y3m9my-mesa-noglu-18.2.2

@oxij oxij deleted the pkgs/tiny-things branch November 18, 2018 08:57
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