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

Jump to bottom

freetype: 2.9 -> 2.9.1 #52524

Merged
merged 1 commit into from Jan 12, 2019
Merged

freetype: 2.9 -> 2.9.1 #52524

merged 1 commit into from Jan 12, 2019

Conversation

stephengroat
Copy link
Contributor

@stephengroat stephengroat commented Dec 19, 2018 •
edited

exclude freetype-config

Motivation for this change
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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@stephengroat stephengroat mentioned this pull request Dec 19, 2018
Closed
10 tasks
@stephengroat
Copy link
Contributor Author

tried running compilation of all dependent packages but got a python error

# nix-shell -p nox --run "nox-review wip"
Traceback (most recent call last):
  File "/nix/store/q44d9mm88q6b5xlxdf49maxapm00f82a-nox-0.0.6/bin/.nox-review-wrapped", line 12, in <module>
    sys.exit(cli())
  File "/nix/store/sbgdkzwznx5vx2w8iz1rxbxi6c3ibka6-python3.6-click-6.7/lib/python3.6/site-packages/click/core.py", line 722, in __call__
    return self.main(*args, **kwargs)
  File "/nix/store/sbgdkzwznx5vx2w8iz1rxbxi6c3ibka6-python3.6-click-6.7/lib/python3.6/site-packages/click/core.py", line 676, in main
    _verify_python3_env()
  File "/nix/store/sbgdkzwznx5vx2w8iz1rxbxi6c3ibka6-python3.6-click-6.7/lib/python3.6/site-packages/click/_unicodefun.py", line 118, in _verify_python3_env
    'for mitigation steps.' + extra)
RuntimeError: Click will abort further execution because Python 3 was configured to use ASCII as encoding for the environment.  Consult http://click.pocoo.org/python3/for mitigation steps.

Additional information: on this system no suitable UTF-8
locales were discovered.  This most likely requires resolving
by reconfiguring the locale system.

@marsam
Copy link
Contributor

marsam commented Dec 19, 2018

I think nox is a bit unmaintained, you can try nix-review

nix-shell -p nix-review --run "nix-review pr 52524"

beware that is a huge amount of rebuilds

@stephengroat
Copy link
Contributor Author

@marsam thanks for the help, but with this script, i'm still having an error

# git clone https://github.com/stephengroat/nixpkgs -b patch-2 && cd nixpkgs
# nix-shell -p nix-review --run "nix-review pr 52524"
$ git fetch --force https://github.com/NixOS/nixpkgs master:refs/nix-review/0 pull/52524/head:refs/nix-review/1
remote: Enumerating objects: 58, done.
remote: Counting objects: 100% (58/58), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 92 (delta 54), reused 56 (delta 54), pack-reused 34
Unpacking objects: 100% (92/92), done.
From https://github.com/NixOS/nixpkgs
 * [new branch]              master               -> refs/nix-review/0
 * [new ref]                 refs/pull/52524/head -> refs/nix-review/1
 * [new tag]                 18.09-beta           -> 18.09-beta
$ git worktree add ./.review/pr-52524 c5ef5c9137deeded568fd8ca1bf6754a59abc437
Preparing worktree (detached HEAD c5ef5c9137d)
Checking out files: 100% (17870/17870), done.
HEAD is now at c5ef5c9137d python.pkgs.cherrypy: disable on python2
$ git merge --no-commit 72d3636960f6b9bb0b7b360af236e4beaffd9310
Automatic merge went well; stopped before committing as requested
error: CherryPy-18.0.1 not supported for interpreter python2.7
(use '--show-trace' to show detailed location information)
https://github.com/NixOS/nixpkgs/pull/52524 failed to build
$ git worktree prune

@stephengroat
Copy link
Contributor Author

@GrahamcOfBorg build freetype

@stephengroat stephengroat mentioned this pull request Dec 26, 2018
Closed
10 tasks
@Mic92
Copy link
Member

Mic92 commented Dec 26, 2018

@stephengroat what locale do you have configured? Something like export LC_ALL=en_US.utf-8 should fix the nox-review failure.

@stephengroat
Copy link
Contributor Author

@Mic92 for the newer version, i'm getting a CherryPie related error

# nix-shell -p nix-review --run "nix-review pr 52524"
$ git fetch --force https://github.com/NixOS/nixpkgs master:refs/nix-review/0 pull/52524/head:refs/nix-review/1
remote: Enumerating objects: 136, done.
remote: Counting objects: 100% (136/136), done.
remote: Compressing objects: 100% (35/35), done.
remote: Total 137 (delta 97), reused 130 (delta 94), pack-reused 1
Receiving objects: 100% (137/137), 271.39 KiB | 15.08 MiB/s, done.
Resolving deltas: 100% (97/97), completed with 33 local objects.
From https://github.com/NixOS/nixpkgs
 * [new branch]              master               -> refs/nix-review/0
 * [new ref]                 refs/pull/52524/head -> refs/nix-review/1
 * [new tag]                 18.09-beta           -> 18.09-beta
$ git worktree add ./.review/pr-52524 984c8431816fbb691709145806e553e7fd61b9c6
Preparing worktree (detached HEAD 984c8431816)
Checking out files: 100% (17895/17895), done.
HEAD is now at 984c8431816 Merge pull request #52895 from ivan/qbittorrent-4.1.5
$ git merge --no-commit 72d3636960f6b9bb0b7b360af236e4beaffd9310
Automatic merge went well; stopped before committing as requested
error: CherryPy-18.0.1 not supported for interpreter python2.7
(use '--show-trace' to show detailed location information)
https://github.com/NixOS/nixpkgs/pull/52524 failed to build
$ git worktree prune

@stephengroat
freetype: 2.9 -> 2.9.1
ff8d76a 
exclude freetype-config
@ttuegel
Copy link
Member

ttuegel commented Jan 12, 2019

This looks good to me, except that it needs to go into staging instead of master.

@stephengroat stephengroat changed the base branch from master to staging January 12, 2019 15:20
@stephengroat
Copy link
Contributor Author

@ttuegel done

@ttuegel ttuegel merged commit a59e729 into NixOS:staging Jan 12, 2019
@ttuegel
Copy link
Member

ttuegel commented Jan 12, 2019

Thanks!

@stephengroat stephengroat deleted the patch-2 branch January 12, 2019 16:22
@stephengroat stephengroat restored the patch-2 branch January 14, 2019 05:42
@stephengroat stephengroat deleted the patch-2 branch January 14, 2019 06:18
@dtzWill
Copy link
Member

dtzWill commented Jan 15, 2019 •
edited

Breaks texlive?

@GrahamcOfBorg build texlive.bin.core

EDIT: and php? :( :(

EDIT2: b179338

I suggest something like the above commit--restoring the postInstall and adding --enable-freetype-config to configureFlags. Or revert entirely until this PR fixes the fallout.

@fpletz
Copy link
Member

fpletz commented Jan 16, 2019

@dtzWill Your commit looks good to me. Cherry-picked onto staging as cabe7d6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel ttuegel approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@stephengroat @marsam @Mic92 @ttuegel @dtzWill @fpletz @GrahamcOfBorg