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

autoPatchelfHook: optimize performance; better error handling #101142

Merged
merged 6 commits into from Dec 3, 2020

Conversation

@DavHau
Copy link
Contributor

@DavHau DavHau commented Oct 20, 2020

Motivation for this change

autoPatchelfHook has the following problems:

  • quadratic complexity (very noticeable with larger amount of binaries)
  • it can fail without stating any useful information about the problematic input. In fact the last error lines are very misleading since it looks like the last processed file could be the problem, while the error actually occured afterwards
  • Finding and adding missing build inputs as a user is a slow process, since autoPatchelfHook fails immediately after hitting the first missing dependency and one has to run it over and over again, fixing only one input each time.
  • invalid ELF files were causing autoPatchelfHook to crash.
Things done
  • oraganize dependencies in an associative array for efficient lookups
  • if patchelf fails, print an error message which states the exact file and command which has failed
  • If dependencies are missing, first collect all missing dependencies, then fail with a message stating all missing dependencies
  • believed valid ELF files are now first tested via a simple patchelf $file to make sure they are actually valid for patchelf.
  • 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.
xfix
xfix approved these changes Oct 20, 2020
@FRidh FRidh added this to WIP in Staging via automation Oct 20, 2020
@FRidh FRidh moved this from WIP to Needs review in Staging Oct 20, 2020
@nixos-discourse
Copy link

@nixos-discourse nixos-discourse commented Oct 21, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/mach-nix-create-python-environments-quick-and-easy/6858/79

@DavHau DavHau requested a review from symphorien Oct 26, 2020
@symphorien
Copy link
Member

@symphorien symphorien commented Nov 3, 2020

I'm not proficient enough in bash to review. All I can say is that if you feel brave enough, you can run shellcheck on the file :)

@DavHau
Copy link
Contributor Author

@DavHau DavHau commented Nov 7, 2020

Thanks for the hint.

I went through shellcheck now and got rid of the red ones and most of the orange ones. A few of them are definitely not satisfiable. But I think it is fine now. I tested autoPatchelfHook again and it worked.

BTW, wouldn't it be best to include shellcheck as a github check, since multiple people are referring to it?

Also I'm playing with the thought of re-implementing autoPatchelfHook some day in python and make use of multiprocessing (or async), since it is still quite slow after all.
Would that change we welcomed, or is introducing python as a depdendency a deal breaker?

@DavHau DavHau requested a review from symphorien Nov 7, 2020
@DavHau
Copy link
Contributor Author

@DavHau DavHau commented Nov 14, 2020

@Ericson2314 @SuperSandro2000
Anything left to do here?

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Nov 23, 2020

This rebuilds quite a lot. Can you please target staging?

@DavHau DavHau changed the base branch from master to staging Nov 24, 2020
@DavHau
Copy link
Contributor Author

@DavHau DavHau commented Nov 30, 2020

Targeted staging
@SuperSandro2000

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Dec 1, 2020

BTW, wouldn't it be best to include shellcheck as a github check, since multiple people are referring to it?

I would be definitely for it. Less work for me and the CI complains about a lot of stuff.

You could create an issue or if it is not to much work create a PR, too. It is important that only changed files are complained about.

Would that change we welcomed, or is introducing python as a depdendency a deal breaker?

I would prefer it if it would be kept bash only to reduce rebuilds and cyclic dependencies. Maybe you can utilize parallels or some bash multi thread tricks like storing pids and waiting until they are done. I can dig you up an examplke if you like.

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Dec 1, 2020

or better you suggest it here #104594 to be added to the list.

@DavHau
Copy link
Contributor Author

@DavHau DavHau commented Dec 2, 2020

Thanks for your comment. I added a proposal for shellcheck in the issue mentioned.
Keeping autoPatchelfHook in bash sounds reasonable considering the risk of circular dependencies.

The time might come where I'd like to optimize this further. But for now the most important issues are fixed I think.
Is there anything left to be done here?

Not sure if this helps, but this version of auto-patchelf.sh is used in mach-nix for some time now and I didn't receive any issues so far concerning .so dependencies.

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Dec 3, 2020

Is there anything left to be done here?

I am not sure and thats why I don't feel comfortable merging this.

@DavHau
Copy link
Contributor Author

@DavHau DavHau commented Dec 3, 2020

Github assigned 4 reviewers. One approved, one unresponsive and 2 not sure. No further comments given on what needs to be improved.
I'm kind of stuck here.
@FRidh, maybe you can help. I've seen you previously moved this to Needs Review in Staging.

@FRidh
Copy link
Member

@FRidh FRidh commented Dec 3, 2020

@DavHau like @symphorien I am not very competent with bash, so I can't review this. Otherwise, I do like the change!

Anyway, I will merge it. If it causes trouble it can always be reverted.

Also I'm playing with the thought of re-implementing autoPatchelfHook some day in python and make use of multiprocessing (or async), since it is still quite slow after all.
Would that change we welcomed, or is introducing python as a depdendency a deal breaker?

Some other scripts were converted from bash, but got some resistance and the feedback that they should be implemented in rust instead. I disagree with that it absolutely needs to be rust. You will get mixed responses.

Note you will always have a small part of bash considering the stdenv is in bash.

@FRidh FRidh merged commit c7843cf into NixOS:staging Dec 3, 2020
19 checks passed
Staging automation moved this from Needs review to Done Dec 3, 2020
@eadwu
Copy link
Member

@eadwu eadwu commented Dec 11, 2020

This seems to break when ldd is run on non-native binaries (or at least the only change recently to patchelf I saw).

i.e. Native is x86_64
Breaks seem to occur with Intel 80386, version 1 (SYSV), ARM, EABI5 version 1 (GNU/Linux), which are all dynamically linked and ELF 32-bit LSB executable according to file.

eadwu added a commit to eadwu/nixpkgs that referenced this issue Dec 11, 2020
…elf"

This reverts commit c7843cf, reversing
changes made to d4ac2c7.
eadwu added a commit to eadwu/nixpkgs that referenced this issue Dec 11, 2020
…elf"

This reverts commit c7843cf, reversing
changes made to d4ac2c7.
eadwu added a commit to eadwu/nixpkgs that referenced this issue Dec 12, 2020
…elf"

This reverts commit c7843cf, reversing
changes made to d4ac2c7.
@DavHau
Copy link
Contributor Author

@DavHau DavHau commented Dec 12, 2020

@eadwu, I'm not sure if I understand correctly. A binary which has been processes by autoPatchelfHook is afterwards broken, so that it cannot be read by ldd of another platform? Or is autoPatchelfHook failing during build?
Could you provide an example on how to reproduce this, or give some hints?

@eadwu
Copy link
Member

@eadwu eadwu commented Dec 12, 2020

nix-build -A vscode-extensions.ms-python.python.

If I remember correctly, it crashes in this step https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/setup-hooks/auto-patchelf.sh#L133

eadwu added a commit to eadwu/nixpkgs that referenced this issue Dec 12, 2020
…elf"

This reverts commit c7843cf, reversing
changes made to d4ac2c7.
@numinit
Copy link
Contributor

@numinit numinit commented Dec 13, 2020

I can reproduce this crash with androidenv. Running with set -x, it seems like I get a failure when patching mksdcard:

++ isELF ./mksdcard
++ local fn=./mksdcard
++ local fd
++ local magic
++ exec
++ read -r -n 4 -u 11 magic
++ exec
++ '[' $'\177ELF' = $'\177ELF' ']'
++ return 0
+++ LANG=C
+++ readelf -l ./mksdcard
++ segmentHeaders='
Elf file type is EXEC (Executable file)
Entry point 0x8048640
There are 9 program headers, starting at offset 52

Program Headers:
  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
  PHDR           0x000034 0x08048034 0x08048034 0x00120 0x00120 R E 0x4
  INTERP         0x000154 0x08048154 0x08048154 0x00013 0x00013 R   0x1
      [Requesting program interpreter: /lib/ld-linux.so.2]
  LOAD           0x000000 0x08048000 0x08048000 0x01ba0 0x01ba0 R E 0x1000
  LOAD           0x001f0c 0x0804af0c 0x0804af0c 0x0013c 0x40974 RW  0x1000
  DYNAMIC        0x001f20 0x0804af20 0x0804af20 0x000d0 0x000d0 RW  0x4
  NOTE           0x000168 0x08048168 0x08048168 0x00044 0x00044 R   0x4
  GNU_EH_FRAME   0x001934 0x08049934 0x08049934 0x00074 0x00074 R   0x4
  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x4
  GNU_RELRO      0x001f0c 0x0804af0c 0x0804af0c 0x000f4 0x000f4 R   0x1

 Section to Segment mapping:
  Segment Sections...
   00
   01     .interp
   02     .interp .note.ABI-tag .note.gnu.build-id .gnu.hash .dynsym .dynstr .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text .fini .rodata .eh_frame_hdr .eh_frame
   03     .ctors .dtors .jcr .dynamic .got .got.plt .data .bss
   04     .dynamic
   05     .note.ABI-tag .note.gnu.build-id
   06     .eh_frame_hdr
   07
   08     .ctors .dtors .jcr .dynamic .got '
+++ echo '
Elf file type is EXEC (Executable file)
Entry point 0x8048640
There are 9 program headers, starting at offset 52

Program Headers:
  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
  PHDR           0x000034 0x08048034 0x08048034 0x00120 0x00120 R E 0x4
  INTERP         0x000154 0x08048154 0x08048154 0x00013 0x00013 R   0x1
      [Requesting program interpreter: /lib/ld-linux.so.2]
  LOAD           0x000000 0x08048000 0x08048000 0x01ba0 0x01ba0 R E 0x1000
  LOAD           0x001f0c 0x0804af0c 0x0804af0c 0x0013c 0x40974 RW  0x1000
  DYNAMIC        0x001f20 0x0804af20 0x0804af20 0x000d0 0x000d0 RW  0x4
  NOTE           0x000168 0x08048168 0x08048168 0x00044 0x00044 R   0x4
  GNU_EH_FRAME   0x001934 0x08049934 0x08049934 0x00074 0x00074 R   0x4
  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x4
  GNU_RELRO      0x001f0c 0x0804af0c 0x0804af0c 0x000f4 0x000f4 R   0x1

 Section to Segment mapping:
  Segment Sections...
   00
   01     .interp
   02     .interp .note.ABI-tag .note.gnu.build-id .gnu.hash .dynsym .dynstr .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text .fini .rodata .eh_frame_hdr .eh_frame
   03     .ctors .dtors .jcr .dynamic .got .got.plt .data .bss
   04     .dynamic
   05     .note.ABI-tag .note.gnu.build-id
   06     .eh_frame_hdr
   07
   08     .ctors .dtors .jcr .dynamic .got '
+++ grep '^Program Headers:'
++ '[' -n 'Program Headers:' ']'
++ isExecutable ./mksdcard
+++ LANG=C
+++ readelf -h -l ./mksdcard
+++ grep '^ *Type: *EXEC\>\|^ *INTERP\>'
++ isExeResult='  Type:                              EXEC (Executable file)
  INTERP         0x000154 0x08048154 0x08048154 0x00013 0x00013 R   0x1'
++ '[' -n '  Type:                              EXEC (Executable file)
  INTERP         0x000154 0x08048154 0x08048154 0x00013 0x00013 R   0x1' ']'
+++ echo '
Elf file type is EXEC (Executable file)
Entry point 0x8048640
There are 9 program headers, starting at offset 52

Program Headers:
  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
  PHDR           0x000034 0x08048034 0x08048034 0x00120 0x00120 R E 0x4
  INTERP         0x000154 0x08048154 0x08048154 0x00013 0x00013 R   0x1
      [Requesting program interpreter: /lib/ld-linux.so.2]
  LOAD           0x000000 0x08048000 0x08048000 0x01ba0 0x01ba0 R E 0x1000
  LOAD           0x001f0c 0x0804af0c 0x0804af0c 0x0013c 0x40974 RW  0x1000
  DYNAMIC        0x001f20 0x0804af20 0x0804af20 0x000d0 0x000d0 RW  0x4
  NOTE           0x000168 0x08048168 0x08048168 0x00044 0x00044 R   0x4
  GNU_EH_FRAME   0x001934 0x08049934 0x08049934 0x00074 0x00074 R   0x4
  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x4
  GNU_RELRO      0x001f0c 0x0804af0c 0x0804af0c 0x000f4 0x000f4 R   0x1

 Section to Segment mapping:
  Segment Sections...
   00
   01     .interp
   02     .interp .note.ABI-tag .note.gnu.build-id .gnu.hash .dynsym .dynstr .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text .fini .rodata .eh_frame_hdr .eh_frame
   03     .ctors .dtors .jcr .dynamic .got .got.plt .data .bss
   04     .dynamic
   05     .note.ABI-tag .note.gnu.build-id
   06     .eh_frame_hdr
   07
   08     .ctors .dtors .jcr .dynamic .got '
+++ grep '^ *INTERP\>'
++ '[' -n '  INTERP         0x000154 0x08048154 0x08048154 0x00013 0x00013 R   0x1' ']'
++ patchelf ./mksdcard
++ autoPatchelfFile ./mksdcard
++ local dep rpath= toPatch=./mksdcard
++ local interpreter
++ interpreter=/nix/store/1yvpgm763b3hvg8q4fzpzmflr5674x4j-glibc-2.32-10/lib/ld-linux-x86-64.so.2
++ isExecutable ./mksdcard
+++ LANG=C
+++ readelf -h -l ./mksdcard
+++ grep '^ *Type: *EXEC\>\|^ *INTERP\>'
++ isExeResult='  Type:                              EXEC (Executable file)
  INTERP         0x000154 0x08048154 0x08048154 0x00013 0x00013 R   0x1'
++ '[' -n '  Type:                              EXEC (Executable file)
  INTERP         0x000154 0x08048154 0x08048154 0x00013 0x00013 R   0x1' ']'
++ runPatchelf --set-interpreter /nix/store/1yvpgm763b3hvg8q4fzpzmflr5674x4j-glibc-2.32-10/lib/ld-linux-x86-64.so.2 ./mksdcard
++ patchelf --set-interpreter /nix/store/1yvpgm763b3hvg8q4fzpzmflr5674x4j-glibc-2.32-10/lib/ld-linux-x86-64.so.2 ./mksdcard
++ '[' -n '' ']'
++ echo 'searching for dependencies of ./mksdcard'
searching for dependencies of ./mksdcard
++ runPatchelf --remove-rpath ./mksdcard
++ patchelf --remove-rpath ./mksdcard
++ local missing
+++ ldd ./mksdcard
+++ sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p'
++ missing=
+ exitHandler
+ exitCode=1
+ set +e
+ '[' -n '' ']'
+ ((  1 != 0  ))
+ runHook failureHook
+ local hookName=failureHook
+ shift
+ local 'hooksSlice=failureHooks[@]'
+ local hook
+ for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}
+ _eval '_callImplicitHook 0 failureHook'
+ declare -F '_callImplicitHook 0 failureHook'
+ eval '_callImplicitHook 0 failureHook'
++ _callImplicitHook 0 failureHook
++ local def=0
++ local hookName=failureHook
++ declare -F failureHook
++ type -p failureHook
++ '[' -n '' ']'
++ return 0
+ return 0
+ '[' -n '' ']'
+ exit 1
error: --- Error --- nix-shell
builder for '/nix/store/bf1jj23rj4mgpc76lvqwmx52r0g3rkyl-androidsdk.drv' failed with exit code 1; last 10 log lines:
  ++ _callImplicitHook 0 failureHook
  ++ local def=0
  ++ local hookName=failureHook
  ++ declare -F failureHook
  ++ type -p failureHook
  ++ '[' -n '' ']'
  ++ return 0
  + return 0
  + '[' -n '' ']'

@numinit
Copy link
Contributor

@numinit numinit commented Dec 13, 2020

mksdcard (from an already patched version) is: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked, interpreter /nix/store/2wrfwfdpklhaqhjxgq6yd257cagdxgph-glibc-2.32/lib/ld-linux-x86-64.so.2, for GNU/Linux 2.6.24, BuildID[sha1]=119b9b83c17fa0228acfd582e951ea8b050e1229, not stripped

@Mic92
Copy link
Member

@Mic92 Mic92 commented Dec 13, 2020

So question is why this fails:

$ ldd ./mksdcard | sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p'

@DavHau
Copy link
Contributor Author

@DavHau DavHau commented Dec 13, 2020

I found the problem.

local missing="$(...)"

seems to behave differently than

local missing
missing="$()"

DavHau added a commit to DavHau/nixpkgs that referenced this issue Dec 13, 2020
@numinit
Copy link
Contributor

@numinit numinit commented Dec 13, 2020

@DavHau Yeah, Shellcheck will actually warn about that. Declaring a local and using $() in the same line will hide the return value.

github-actions bot added a commit to andir/nixos.cloud that referenced this issue Dec 26, 2020
## Changelog for nixpkgs:
Commits: [NixOS/nixpkgs@57a787c...be0b453d](NixOS/nixpkgs@57a787c...be0b453)

* [`975db4fb`](NixOS/nixpkgs@975db4f) libreswan: Unbreak the package
* [`eff84793`](NixOS/nixpkgs@eff8479) libreswan: remove darwin from list of supported platforms
* [`76ea74b9`](NixOS/nixpkgs@76ea74b) volctl: 0.6.3 -> 0.8.0
* [`e78a2d39`](NixOS/nixpkgs@e78a2d3) vtk: qt514 -> qt515
* [`27679361`](NixOS/nixpkgs@2767936) thunderbird: Add gpg/gpgme dependencies. Fixes NixOS/nixpkgs#98765.
* [`f86651e6`](NixOS/nixpkgs@f86651e) texlive.combine: set allowSubstitutes = true
* [`be8a89e7`](NixOS/nixpkgs@be8a89e) directx-shader-compiler: Add Darwin support
* [`6ac71f59`](NixOS/nixpkgs@6ac71f5) linux: backport support for RTL8761b to 5.4
* [`81f4bca1`](NixOS/nixpkgs@81f4bca) rtl8761b-firmware: init at rtk1395
* [`9b3fe2ee`](NixOS/nixpkgs@9b3fe2e) kakoune: fix installCheck
* [`e72bd9f0`](NixOS/nixpkgs@e72bd9f) thunderbird-bin: Add gpg/gpgme dependencies. Fixes NixOS/nixpkgs#98765
* [`44372487`](NixOS/nixpkgs@4437248) thunderbird, thunderbird.bin: Refactor: Reorder import lists.
* [`07c40561`](NixOS/nixpkgs@07c4056) gnats: format hardened flag isn't supported
* [`8123355e`](NixOS/nixpkgs@8123355) ncmpcpp: 0.8.2 -> 0.9.1
* [`39ebc637`](NixOS/nixpkgs@39ebc63) nixos/tests/prometheus: increase `memorySize`
* [`81f1b21a`](NixOS/nixpkgs@81f1b21) perldevel: 5.33.4 -> 5.33.5
* [`5a26fb3c`](NixOS/nixpkgs@5a26fb3) prometheus: 2.22.2 -> 2.23.0
* [`7262fb68`](NixOS/nixpkgs@7262fb6) imapfilter: 2.6.16 -> 2.7.5
* [`b33b0865`](NixOS/nixpkgs@b33b086) prometheus: gross hack to fix linker flags for versioning info
* [`fd4a486d`](NixOS/nixpkgs@fd4a486) gama: 2.09 -> 2.12
* [`1ed65d38`](NixOS/nixpkgs@1ed65d3) qgis: 3.10.11 → 3.10.13, mark unbroken
* [`c25347d8`](NixOS/nixpkgs@c25347d) qjackctl: add `jackSession` option
* [`2a9b003c`](NixOS/nixpkgs@2a9b003) yj: 4.0.0 -> 5.0.0
* [`6481892b`](NixOS/nixpkgs@6481892) pythonPackages.backports_unittest-mock: Disable tests
* [`55f2b802`](NixOS/nixpkgs@55f2b80) pythonPackages.pytest-black: Disable tests
* [`bfec86da`](NixOS/nixpkgs@bfec86d) pythonPackages.pytest-mypy: Disable tests
* [`77d92137`](NixOS/nixpkgs@77d9213) pythonPackages.setuptools-scm-git-archive: Disable tests
* [`ed0c68df`](NixOS/nixpkgs@ed0c68d) python37Packages.zstd: 1.4.5.1 -> 1.4.8.1
* [`3c2bacaa`](NixOS/nixpkgs@3c2baca) python37Packages.pybullet: 3.0.7 -> 3.0.8
* [`f061d6ff`](NixOS/nixpkgs@f061d6f) coursier: 2.0.7 -> 2.0.8
* [`421b7874`](NixOS/nixpkgs@421b787) python3Packages.botocore: 1.19.42 -> 1.19.43
* [`be349362`](NixOS/nixpkgs@be34936) python3Packages.boto3: 1.16.42 -> 1.16.43
* [`9f371adb`](NixOS/nixpkgs@9f371ad) awscli: 1.18.202 -> 1.18.203
* [`1d364e51`](NixOS/nixpkgs@1d364e5) tests/shadow: Improve
* [`cb665178`](NixOS/nixpkgs@cb66517) picocom: 3.1 -> 3.2a (NixOS/nixpkgs#107379)
* [`f971e075`](NixOS/nixpkgs@f971e07) python37Packages.casbin: 0.13.0 -> 0.14.0
* [`2a9ac172`](NixOS/nixpkgs@2a9ac17) lib.systems: update processor architecture info
* [`466759ff`](NixOS/nixpkgs@466759f) libnice: 0.1.16 -> 0.1.18
* [`fe23bdae`](NixOS/nixpkgs@fe23bda) alsaLib: 1.2.3 -> 1.2.4
* [`72f71e90`](NixOS/nixpkgs@72f71e9) alsa-firmware: 1.2.1 -> 1.2.4
* [`1734a9a5`](NixOS/nixpkgs@1734a9a) tilt: 0.17.13 -> 0.18.1
* [`e24bf906`](NixOS/nixpkgs@e24bf90) vscode: 1.51.1 -> 1.52.1
* [`1714db88`](NixOS/nixpkgs@1714db8) python37Packages.hmmlearn: unbreak tests
* [`18906f45`](NixOS/nixpkgs@18906f4) anki-bin: init at 2.1.36
* [`0769fe27`](NixOS/nixpkgs@0769fe2) anki-bin: add darwin support
* [`847b317a`](NixOS/nixpkgs@847b317) anki-bin: force x11
* [`97216046`](NixOS/nixpkgs@9721604) steamPackages.steam: add udev rules
* [`156ce8d3`](NixOS/nixpkgs@156ce8d) brave: 1.18.70 -> 1.18.75
* [`cb1e980a`](NixOS/nixpkgs@cb1e980) craftos-pc: init at 2.4.5
* [`5ea85813`](NixOS/nixpkgs@5ea8581) qjackctl: 0.6.3 -> 0.9.0
* [`3b05df1d`](NixOS/nixpkgs@3b05df1) arduino: core 1.8.12 -> 1.8.13
* [`5b95e93e`](NixOS/nixpkgs@5b95e93) zig: 0.6.0 -> 0.7.1
* [`7a369982`](NixOS/nixpkgs@7a36998) pythonPackages.fontparts: 0.9.6 -> 0.9.7
* [`3daa2557`](NixOS/nixpkgs@3daa255) websocketpp: fix cross
* [`c505e571`](NixOS/nixpkgs@c505e57) tree-sitter: patch out web-ui by default, to drop emscripten
* [`a285c3e9`](NixOS/nixpkgs@a285c3e) Revert "alsa-firmware: 1.2.1 -> 1.2.4"
* [`2c3ca455`](NixOS/nixpkgs@2c3ca45) mavproxy: 1.8.29 -> 1.8.30
* [`61892329`](NixOS/nixpkgs@6189232) python37Packages.auth0-python: 3.13.0 -> 3.14.0
* [`f63d8369`](NixOS/nixpkgs@f63d836) picard: 2.5.4 -> 2.5.5
* [`0b505071`](NixOS/nixpkgs@0b50507) libctemplate: 2.3 -> 2.4 (NixOS/nixpkgs#107423)
* [`022d7207`](NixOS/nixpkgs@022d720) arduino: use gtk3
* [`caa725a6`](NixOS/nixpkgs@caa725a) nixos/nextcloud: fix missing quotes arround $* in occ wrapper and replace with $@
* [`12b1d81a`](NixOS/nixpkgs@12b1d81) orca: 3.38.1 -> 3.38.2
* [`e8824681`](NixOS/nixpkgs@e882468) arduino: teensyduino 1.51 -> 1.53
* [`2b131c97`](NixOS/nixpkgs@2b131c9) nixos/kresd: set .stopIfChanged = false
* [`351f3c04`](NixOS/nixpkgs@351f3c0) chromiumDev: Fix the build (libxshmfence is now required)
* [`bdedc49b`](NixOS/nixpkgs@bdedc49) fbcat: init at 0.5.1
* [`4ac5d226`](NixOS/nixpkgs@4ac5d22) autoPatchelfHook: fix bug introduced by NixOS/nixpkgs#101142
* [`2fde1e63`](NixOS/nixpkgs@2fde1e6) autoPatchelfHook: fix shellcheck errors
* [`2efcf6dc`](NixOS/nixpkgs@2efcf6d) autoPatchelf: add comment why ignore failing ldd/sed
* [`2cab4879`](NixOS/nixpkgs@2cab487) toybox: fix cross-compilation
* [`c674a513`](NixOS/nixpkgs@c674a51) nixos/systemd: provide libidn2 for systemd-resolved
@aszlig
Copy link
Member

@aszlig aszlig commented Jan 8, 2021

@FRidh: Can you please CC me next time before merging anything autopatchelf-related, since this has (apart from #106830) added a few merge conflicts of my WIP branches and I just found out about this.

@symphorien
Copy link
Member

@symphorien symphorien commented Jan 9, 2021

maybe add yourself as codeowner ?

@aszlig
Copy link
Member

@aszlig aszlig commented Jan 9, 2021

@symphorien: Thought about this already, but I still don't like the notion of "owner" in this regard (which to me would imply BDFL) and I only want to be notified. However, since the alternative would be to rely on everyone to do a git shortlog (or similar) and ofborg doesn't recognise setup hooks, I think I'm going for the codeowners file :-/

aszlig added a commit to aszlig/nixpkgs that referenced this issue Jan 9, 2021
I really hate the very concept of this file (the reason being that I
think "owner" implies some form of BDFL rather than just being
notified), but since there were recent[1] changes[2] in auto-patchelf.sh
which I missed it's probably a good idea to add myself there solely for
being notified, because ofborg can't seem to infer maintainer
information here.

To make indentation consistent with all the other entries in the
codeowners file, I also re-indented the other entries in the "Nixpkgs
Internals" block.

[1]: NixOS#101142
[2]: NixOS#106830

Signed-off-by: aszlig <aszlig@nix.build>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet