Skip to content

trivial: tiny cleanups and fixes#49864

Merged
7c6f434c merged 8 commits intoNixOS:masterfrom
oxij:pkgs/tiny-things
Nov 8, 2018
Merged

trivial: tiny cleanups and fixes#49864
7c6f434c merged 8 commits intoNixOS:masterfrom
oxij:pkgs/tiny-things

Conversation

@oxij
Copy link
Member

@oxij oxij commented Nov 7, 2018

  • Running with these applied.

@oxij oxij requested review from edolstra, nbp and ttuegel as code owners November 7, 2018 09:08
@oxij oxij force-pushed the pkgs/tiny-things branch from fe3ddf6 to 43965b2 Compare November 7, 2018 09:10
@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 7, 2018
@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Nov 7, 2018

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

GrahamcOfBorg commented Nov 7, 2018

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

roberth
roberth reviewed Nov 7, 2018
View reviewed changes
pkgs/applications/networking/browsers/firefox/common.nix Outdated
Copy link
Member

@roberth roberth Nov 7, 2018

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"

roberth
roberth reviewed Nov 7, 2018
View reviewed changes
nixos/release.nix Outdated
Copy link
Member

@roberth roberth Nov 7, 2018

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.

ttuegel
ttuegel reviewed Nov 8, 2018
View reviewed changes
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 oxij force-pushed the pkgs/tiny-things branch from 43965b2 to 3902085 Compare November 8, 2018 05:23
@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 GrahamcOfBorg added the 6.topic: printing Drivers, CUPS & Co. label Nov 8, 2018
@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Nov 8, 2018

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 GrahamcOfBorg added 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 8, 2018
@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Nov 8, 2018

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

GrahamcOfBorg commented Nov 8, 2018

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

GrahamcOfBorg commented Nov 8, 2018

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

Reviewers

@roberth roberth roberth left review comments

@ttuegel ttuegel ttuegel left review comments

@edolstra edolstra Awaiting requested review from edolstra

@nbp nbp Awaiting requested review from nbp

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: printing Drivers, CUPS & Co. 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@oxij @GrahamcOfBorg @roberth @ttuegel @7c6f434c