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

Gstreamer: 1.14.0 -> 1.14.2 #45776

Merged
merged 11 commits into from Sep 20, 2018
Merged

Gstreamer: 1.14.0 -> 1.14.2 #45776

merged 11 commits into from Sep 20, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Aug 30, 2018 •
edited

Motivation for this change

I could not run nox-review wip, as the resulting nix-build used more than 20GB of RAM...

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)
  • Fits CONTRIBUTING.md.

@bkchr bkchr changed the title Gstreamer 1.14.2 Gstreamer: 1.14.0 -> 1.14.2 Aug 30, 2018
@bkchr bkchr requested a review from FRidh as a code owner August 30, 2018 11:48
vcunat
vcunat reviewed Aug 30, 2018
View reviewed changes
pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,7 +5,7 @@

stdenv.mkDerivation rec {
name = "gst-vaapi-${version}";
version = "1.14.0";
version = "1.14.2";
Copy link
Member

Choose a reason for hiding this comment

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

The hash also needs an update.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for finding this mistake. Solved :)

Copy link
Member

Choose a reason for hiding this comment

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

I just tried to build gst_all_1... all the rest had succeeded.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But now it works?

@vcunat
Copy link
Member

vcunat commented Aug 30, 2018

@GrahamcOfBorg build gst_all_1

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: gst_all_1

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gst_all_1

Partial log (click to expand)

/nix/store/d8pgp7xg5mgzzxin4hvnmrdxzdql1ip5-gst-libav-1.14.2
/nix/store/mhwi7pq77crni86s5m9f37lipmjl70sa-gst-plugins-bad-1.14.2
/nix/store/737vicn1g70ixa95i8pwkizyfgn083dy-gst-plugins-base-1.14.2
/nix/store/r7gpqcd50bkxkwys5gk7m3a9lqlwd1kq-gst-plugins-good-1.14.2
/nix/store/rk5amg70chfnrsi40j53va122vqr4fg3-gst-plugins-ugly-1.14.2
/nix/store/5rsyz70h5ayqqnb4ywm1fjbzn9w7iix6-gst-rtsp-server-1.14.2
/nix/store/fn24lambaza48ja3fgrdmjr1jp6335qn-gst-vaapi-1.14.2
/nix/store/kic46a4n22c4xlppmvvf00hr3h8zyhsv-gst-validate-1.14.2
/nix/store/3wfvnh8l12wjrd266061dr60wipf7x9i-gstreamer-1.14.2
/nix/store/55m0s87wkgdsaccsrhp8553v0j914gh6-gstreamermm-1.10.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gst_all_1

Partial log (click to expand)

/nix/store/a0ja23qg337sxvk3f3ivvrfz70jlwvml-gst-libav-1.14.2
/nix/store/sbl5pq0qs7wdchyw218l34halap9a7zm-gst-plugins-bad-1.14.2
/nix/store/qmlbkvwwci616kpd0qmzgrxm7kjlzwlm-gst-plugins-base-1.14.2
/nix/store/sh4n3hzfzm9cihvi15xchvpv9v2ic2hh-gst-plugins-good-1.14.2
/nix/store/z60k5dc62vhm1akzlcrx9jp85p9kbc3s-gst-plugins-ugly-1.14.2
/nix/store/prvfb2m7f1gqlmqzibv66yq4vmv495ya-gst-rtsp-server-1.14.2
/nix/store/96k7aiaz9xvycl5fw3lbly7fls2i6r3x-gst-vaapi-1.14.2
/nix/store/q4dl7dkqp3chwxmcgc83rzkdz7qhkfaf-gst-validate-1.14.2
/nix/store/8gjqj1cpvrzalqs9b7yjmdf78ijfmjnk-gstreamer-1.14.2
/nix/store/46m95r7pvr08bzxgx8fi0ysfzs9bc8lh-gstreamermm-1.10.0

@bkchr
Copy link
Contributor Author

bkchr commented Sep 3, 2018

@vcunat will you merge this?

@bkchr
Copy link
Contributor Author

bkchr commented Sep 20, 2018

@matthewbauer @ttuegel someone of you wants to merge this?

@matthewbauer
Copy link
Member

Should go in staging i think.

@bkchr bkchr changed the base branch from master to staging-next September 20, 2018 21:02
@bkchr
Copy link
Contributor Author

bkchr commented Sep 20, 2018

@matthewbauer is staging-next the correct one?

@matthewbauer matthewbauer merged commit 92158a4 into NixOS:staging-next Sep 20, 2018
@matthewbauer
Copy link
Member

Yep that should work

@LnL7
Copy link
Member

LnL7 commented Oct 2, 2018

Unless it's a security fix, changes should go to staging and not directly staging-next.

@vcunat
Copy link
Member

vcunat commented Oct 2, 2018

Yes, things are merged to staging instead, at least generally.

@bkchr
Copy link
Contributor Author

bkchr commented Oct 2, 2018

Is there any documentation, which pull request should end in which branch? I find it very confusing.

@vcunat
Copy link
Member

vcunat commented Oct 2, 2018 •
edited

There's an RFC only so far: NixOS/rfcs#26 but that part about where to merge seems to have worked well in the past few months that we're trying the workflow.

EDIT: except for the important point that we might change the branch name(s) :-)

@bkchr
Copy link
Contributor Author

bkchr commented Oct 2, 2018

Okay, ty :)

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

@vcunat vcunat vcunat left review comments

@FRidh FRidh Awaiting requested review from FRidh

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@bkchr @vcunat @GrahamcOfBorg @matthewbauer @LnL7