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

akvcam: 1.1.1 -> 1.2.0 #110741

Merged
merged 1 commit into from Mar 21, 2021
Merged

akvcam: 1.1.1 -> 1.2.0 #110741

merged 1 commit into from Mar 21, 2021

Conversation

austinbutler
Copy link
Member

Motivation for this change

Update version, also fixes this module on kernel 5.10.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from freezeboy January 25, 2021 06:09
@austinbutler
Copy link
Member Author

Result of nixpkgs-review pr 110741 run on x86_64-linux 1

2 packages marked as broken and skipped:
  • linuxPackages_hardkernel_4_14.akvcam
  • linuxPackages_hardkernel_latest.akvcam
1 package failed to build:
  • linuxPackages-libre.akvcam
16 packages built:
  • linuxPackages.akvcam (linuxPackages_5_4.akvcam)
  • linuxPackages_4_14.akvcam
  • linuxPackages_4_19.akvcam
  • linuxPackages_4_4.akvcam
  • linuxPackages_4_9.akvcam
  • linuxPackages_5_10.akvcam (linuxPackages_latest.akvcam)
  • linuxPackages_hardened.akvcam
  • linuxPackages_latest-libre.akvcam
  • linuxPackages_latest_hardened.akvcam
  • linuxPackages_latest_xen_dom0.akvcam
  • linuxPackages_latest_xen_dom0_hardened.akvcam
  • linuxPackages_lqx.akvcam
  • linuxPackages_testing_bcachefs.akvcam
  • linuxPackages_xen_dom0.akvcam
  • linuxPackages_xen_dom0_hardened.akvcam
  • linuxPackages_zen.akvcam

@freezeboy
Copy link
Contributor

Any idea why the "libre" kernel is not working ?

@austinbutler
Copy link
Member Author

austinbutler commented Jan 30, 2021 •
edited

Unfortunately, no. The answer must be somewhere in the changes from 1.1.1 to 1.2.0, but I am not knowledgeable with kernel things.

I don't know how to actually make nix-build build the libre kernel with the akvcam module enabled, do you happen to know?

@freezeboy
Copy link
Contributor

@austinbutler to build the module

nix-build -A linuxPackages-libre.akvcam

If you want to build a full kernel / configuration, you must set

boot.kernelPackages = pkgs.linuxPackage_libre;
boot.kernelModules = [ "akvcam" ];

@austinbutler
Copy link
Member Author

Seems to fail on applying some bluetooth patch.

applying patch /nix/store/2lr5rrl7ipi8yf0vw8bacqxv1xaw7gph-rtl8761b-support.patch
patching file drivers/bluetooth/btrtl.c
Hunk #1 FAILED at 130.
Hunk #2 succeeded at 255 (offset 4 lines).
1 out of 2 hunks FAILED -- saving rejects to file drivers/bluetooth/btrtl.c.rej
builder for '/nix/store/hg7kjfjgffx9p5wcpc2yg19g31x6va1l-linux-config-5.4.92.drv' failed with exit code 1
cannot build derivation '/nix/store/rvnjsf94c4lccjjyivq9133xvp61l7vj-linux-5.4.92.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/0g4yfmrcmf78kbp5abpkz68540km5p5w-akvcam-1.2.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/0g4yfmrcmf78kbp5abpkz68540km5p5w-akvcam-1.2.0.drv' failed

What's surprising to me is that trying to build the libre kernel by itself requires me to enable non-free? Doesn't that defeat the point of the libre kernel?

❯ nix-build -A linuxPackages-libre                                                                                                                                                               ~/Documents/nixpkgs
error: Package ‘amdgpu-pro-17.40-5.4.92’ in /home/austin/Documents/nixpkgs/pkgs/os-specific/linux/amdgpu-pro/default.nix:175 has an unfree license (‘unfree’), refusing to evaluate.

But either way, at least for me the libre kernel fails on the same bluetooth patch on master.

❯ NIXPKGS_ALLOW_UNFREE=1 NIXPKGS_ALLOW_BROKEN=1 nix-build -A linuxPackages-libre
patching file drivers/bluetooth/btrtl.c
Hunk #1 FAILED at 130.
Hunk #2 succeeded at 255 (offset 4 lines).
1 out of 2 hunks FAILED -- saving rejects to file drivers/bluetooth/btrtl.c.rej
builder for '/nix/store/4z9v6i5wrr7rs9wqfrik9ycqn8f3lwaa-linux-config-5.4.95.drv' failed with exit code 1
cannot build derivation '/nix/store/8jlvi5rg5xn3419m21h3pchra7zpl9pc-linux-5.4.95.drv': 1 dependencies couldn't be built
error: build of '/nix/store/03xx88n1q2bn80s7ma55gwj9hizi7i1i-zfs-kernel-2.0.2-5.4.95.drv', '/nix/store/059n5qhsdywhg53hj6zxz3pfnjpzkfaa-tuxedo-keyboard-5.4.95-2019-08-26.drv', '/nix/store/1104mpwyh9bsb42qi7ay937br5y4jrsh-ndiswrapper-1.63-5.4.95.drv', '/nix/store/1ik1jqk7rxg6x5w53x4zac8fgnbr734n-bcc-0.18.0.drv', '/nix/store/1lc89msmk19mzkyr2m0qp8nhai6izc83-nvidia-x11-460.27.04-5.4.95.drv', '/nix/store/35rn8ir39ky4hbhbwgyd4v4sqc6cpcdg-can-isotp-20200910.drv', '/nix/store/4f0p7gwyinn39aw3p6f34cg76qa0l9q6-wireguard-1.0.20201221.drv', '/nix/store/4m3abm36rkfbqkycn52c2wwg0jg4ibp2-mba6x_bl-2016-12-08.drv', '/nix/store/4mm570430njqqjd2f54bvrlmnq28m9xr-lttng-modules-2.10.5-5.4.95.drv', '/nix/store/5344l1n6z5rvfjpb92zli3jbvqhg15z7-rtl8192eu-5.4.95-4.4.1.20200620.drv', '/nix/store/53cai5hbqi85n1b3n6jnp82i4m408j34-dpdk-20.05-5.4.95.drv', '/nix/store/5s26n5fn38ingb1jvqp1xch6j696mgp6-oci-seccomp-bpf-hook-1.2.1.drv', '/nix/store/69ymzfjkslavgvvv8d6mirjhcigm5g6q-fwts-efi-runtime-20.11.00-5.4.95.drv', '/nix/store/6dfh66idgj9x9ql0a0gbikrs8w333jf3-anbox-modules-2019-11-15-5.4.95.drv', '/nix/store/6hya1aifdna068mhycbsyb2akqmk6dl5-nvidia-x11-460.39-5.4.95.drv', '/nix/store/6j0h7x78smr7xr7g9faj09w2i3mp5n3l-system76-module-1.0.9-5.4.95.drv', '/nix/store/6qggh77lx82n5nfbgihf0dbl017ypg31-linux-phc-intel-0.4.0-rev25-5.4.95.drv', '/nix/store/70y1i364ap7fh7v4s915fplhx8qgzwqi-systemtap-5.4.95-4.1.drv', '/nix/store/7lv6clhxh9a320rr3dgdh2zdbc2gimci-v86d-0.1.10-5.4.95.drv', '/nix/store/7n7cw14szrcppmbps99jlx2ivacbs4pm-sch_cake-2017-07-16.drv', '/nix/store/7pn7163w1dk0pgarp8flrmp4dvmjc09k-vhba-20190831.drv', '/nix/store/8jlvi5rg5xn3419m21h3pchra7zpl9pc-linux-5.4.95.drv', '/nix/store/9avxg3f0vbpxqdwrix1zmd2i7bxmimlc-broadcom-sta-6.30.223.271-5.4.95.drv', '/nix/store/9c9mh4nsy1v0nfddbnb8qc88svhsj5jd-VirtualBox-GuestAdditions-6.1.18-5.4.95.drv', '/nix/store/9sw97gr0mvl7vkysaz59pydj7hca1s0s-rtl8821cu-5.4.95-unstable-2020-12-21.drv', '/nix/store/a73qkn78lm6bi9fyga9l13rvvhlx353h-rtl8723bs-5.4.95-2017-04-06.drv', '/nix/store/aq94qqhx20h7faxihdjaz7cpbp9cna9m-ena-2.3.0-5.4.95.drv', '/nix/store/b5xff5aaa378x9c93zd8gq1r1692jh5c-mxu11x0-1.4-5.4.95.drv', '/nix/store/bjxzbshvf7kvbxmcvsq7d8nz9ddbnr9a-v4l2loopback-0.12.5-5.4.95.drv', '/nix/store/c5bwps4x1dp84zz7ipf9v6pag4z1r5nr-tbs-2018.04.18-5.4.95.drv', '/nix/store/d61l0xdd6fvprzawinxiaghj9y7bs7ad-rtlwifi_new-2019-08-21.drv', '/nix/store/dwihlxl2c15ja4fap6zky0b8ckbnqak5-openafs-1.8.7-5.4.95-gnu.drv', '/nix/store/f7ayr8bxx3b7hsprmfxal5lh5ziyvdrh-nvidiabl-2020-10-01-5.4.95.drv', '/nix/store/fb4147wr18263ny1nbvqzhlh87nqg938-openrazer-2.9.0-5.4.95.drv', '/nix/store/g0an6i1f95b4x63hv9x6g4n78zbwf7bf-acpi-call-2020-04-07-5.4.95.drv', '/nix/store/g7yjvp0k2l2as6xb0p6wringjsi3v9pd-bpftrace-0.11.4.drv', '/nix/store/gk05yb2qmqkwaca5qhdg1h02n6vbnkyv-odp-dpdk-1.22.0.0_DPDK_18.11.drv', '/nix/store/hpfnahjwgkc7p0s923hj477gymv3a163-ddcci-driver-5.4.95-0.3.3.drv', '/nix/store/hq9vzrzvyfd8hfclpl6kp826cz1sqdw7-rtl88xxau-aircrack-5.4.95-fc0194.drv', '/nix/store/i1xh2hhvfc61alcryn6yxqldb2x8y4nd-cryptodev-linux-1.11-5.4.95.drv', '/nix/store/imlcn2y4kd8wcm9q1789cfxd310ssrd9-nvidia-x11-455.46.04-5.4.95.drv', '/nix/store/iqpaxw1kcq1fdgcq7k82sv4qfm2qwggk-rtl8821au-5.4.95-5.1.5+41.drv', '/nix/store/j7qxwj7jl09bpl7ip86zycnhzzdxcdxv-rtl8821ce-5.4.95-unstable-2020-12-16.drv', '/nix/store/jsgl3yk5plr8bjwr3cknbpi2rxbca0fy-ati-drivers-15.12-5.4.95.drv', '/nix/store/kr1aziwpzncqix8azncja3ilhxvjw330-nvidia-x11-304.137-5.4.95.drv', '/nix/store/l3fn6lp2x9qpbpbrllk50cr9sv7hhjsa-it87-2018-08-14-5.4.95.drv', '/nix/store/mcp06r40ppir6xab45mzi3wjnhk0a8gf-rtl8812au-5.4.95-5.6.4.2_35491.20200702.drv', '/nix/store/mfvai6yyw1x3lnzy80dabzs4brrfdmc1-bbswitch-0.8-5.4.95.drv', '/nix/store/mmip804p2gddqgil5g8dl5941ij6nv85-r8125-9.004.01.drv', '/nix/store/n1mvvxi4csl0j5lvj48j5yf5pv8zl9ap-virtualbox-modules-6.1.18-5.4.95.drv', '/nix/store/n3g51axrfyvg5q2n4b7v60zh7l82v585-system76-io-module-1.0.1-5.4.95.drv', '/nix/store/n77n5ixkh57870ilf29p62b77ibdwb92-mwprocapture-1.2.4177-5.4.95.drv', '/nix/store/nsmpwjf011vis8p45ci8s15x49vivyl5-akvcam-1.1.1.drv', '/nix/store/pal202c8adqfl8qzlk575347yd67r3v6-openafs-1.9.0-5.4.95-gnu.drv', '/nix/store/rcnf9llhxwbhppmxssjyqim15f1x5bfd-rtl88x2bu-5.4.95-unstable-2020-08-20.drv', '/nix/store/rqq0429d3mf4zsa99i8li48av48nmsv6-chipsec-1.5.1.drv', '/nix/store/rw4ak90sm54sbmnz8whyzr5hx6f6ljqw-sysdig-0.27.1.drv', '/nix/store/s19gkvxsc4y6nynpxjnq7a0g6gdmswp5-exfat-nofuse-2020-04-15-5.4.95.drv', '/nix/store/s70z3jg2sz1jnhkp627r81ssq3rbg9vd-facetimehd-unstable-2020-04-16-5.4.95.drv', '/nix/store/sal74h1j6lx9c28zwpnpxpv2jrmr9jb5-jool-4.0.9-5.4.95.drv', '/nix/store/shlibn80dy96h89dd1pijsy0vy71gwsj-xpadneo-0.8.4.drv', '/nix/store/v0g34hmlzn4n3xmr9369fln69k17h3ar-nvidia-x11-390.138-5.4.95.drv', '/nix/store/v39nnizj5pfx5wlixx90mvh1ykldpjn8-amdgpu-pro-17.40-5.4.95.drv', '/nix/store/vpyqd1xvsx2g4zx9bwnmh31bhsc63jkb-tp_smapi-0.43-5.4.95.drv', '/nix/store/wfwk4h3p240slz0k13zk9xl5mvnbjcal-gcadapter-oc-kmod-1.4.drv', '/nix/store/wg5rj4609k11x0ngzh7q3jbh7qg7wp0h-asus-wmi-sensors-unstable-2019-11-07-5.4.95.drv', '/nix/store/wlabsfgk1jaj4kqv6k8dqq6zhhkng67k-zenpower-0.1.12.drv', '/nix/store/x6mmqwq36w864gjmr3nhmidr6k23fpmv-digimend-unstable-2019-06-18.drv', '/nix/store/x8g27n6kmgccm29n89i1z04y5bzlvm19-system76-acpi-module-1.0.1-5.4.95.drv', '/nix/store/xhpbrbr6hydd9pr8hgzffk6nnniygpkn-rtl8814au-5.4.95-4.3.21.drv', '/nix/store/xn6wrzkarcydfb99ssarfwiwrb8kcqfy-ixgbevf-4.6.1-5.4.95.drv', '/nix/store/xxhc3j58qsfk6m0pc2s6hlsi8qgisb24-nvidia-x11-340.108-5.4.95.drv', '/nix/store/xyiwnlxj530cs8nb6bx0d3yrvi5iwfsx-batman-adv-2021.0-5.4.95.drv', '/nix/store/ysvh9r6g70qzjy4dfgfr99zlcz58j6qi-evdi-v1.7.2.drv', '/nix/store/yw25dnp71bdlw8w7fkz5a8ni5sm6ykwb-netatop-5.4.95-3.1.drv', '/nix/store/z0imv88ih1cn2rqn9k603ba2afbpf8bm-r8168-5.4.95-8.048.03.drv' failed

So I think we can safely ignore the libre kernel failure as it seems unrelated to this PR.

@austinbutler austinbutler mentioned this pull request Mar 7, 2021
Merged
10 tasks
@ofborg ofborg bot requested a review from freezeboy March 7, 2021 01:19
@austinbutler
Copy link
Member Author

Result of nixpkgs-review pr 110741 run on x86_64-linux 1

2 packages marked as broken and skipped:
  • linuxPackages-libre.akvcam
  • linuxPackages_latest-libre.akvcam
16 packages built:
  • linuxPackages.akvcam
  • linuxPackages_4_14.akvcam
  • linuxPackages_4_19.akvcam
  • linuxPackages_4_4.akvcam
  • linuxPackages_4_9.akvcam
  • linuxPackages_5_10.akvcam
  • linuxPackages_5_11.akvcam
  • linuxPackages_hardened.akvcam
  • linuxPackages_latest_hardened.akvcam
  • linuxPackages_latest_xen_dom0.akvcam
  • linuxPackages_latest_xen_dom0_hardened.akvcam
  • linuxPackages_lqx.akvcam
  • linuxPackages_testing_bcachefs.akvcam
  • linuxPackages_xen_dom0.akvcam
  • linuxPackages_xen_dom0_hardened.akvcam
  • linuxPackages_zen.akvcam

freezeboy
freezeboy approved these changes Mar 8, 2021
View reviewed changes
Copy link
Contributor

@freezeboy freezeboy left a comment

Choose a reason for hiding this comment

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

LGTM

@SuperSandro2000 SuperSandro2000 merged commit c537eda into NixOS:master Mar 21, 2021
@austinbutler austinbutler deleted the akvcam-120 branch May 24, 2021 02:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@freezeboy freezeboy freezeboy approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@austinbutler @freezeboy @SuperSandro2000