libusb-compat: 0.1.5 -> 0.1.7 && change libusb source to GitHub #48434

lschuermann · 2018-10-14T20:06:56Z

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.

infinisil · 2018-10-14T20:27:48Z

pkgs/development/libraries/libusb1/default.nix


  src = fetchurl {
-    url = "mirror://sourceforge/libusb/${name}.tar.bz2";
+    url = "https://github.com/libusb/libusb/releases/download/v${version}/${name}.tar.bz2";


Couldn't fetchFromGitHub here be used instead? The release pages don't seem to contain anything other than just the source code.

Actually, there seems to be some difference in the source archive and release tarball: https://gist.github.com/lschuermann/61ab11d3cc7ae3f9073f0c0e1da04981.
I think most of these files could be generated using autoreconfHook, however I'm not quite sure whether a release tarball or building from the source archive is preferred.

This is the same situation as in #48381.

I'd prefer to use the source tarballs (non-release). This way the build will also succeed if somebody overrides src with something else.

Good point. I'll change it to use fetchFromGitHub.

lschuermann · 2018-10-14T21:20:38Z

I can't build using @GrahamcOfBorg yet, can you try @infinisil?

peterhoeg · 2018-10-15T03:58:35Z

@GrahamcOfBorg build libusb-compat

GrahamcOfBorg · 2018-10-15T03:58:43Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: libusb-compat

Partial log (click to expand)

Cannot nix-instantiate `libusb-compat' because:
error: attribute 'libusb-compat' in selection path 'libusb-compat' not found

GrahamcOfBorg · 2018-10-15T03:58:52Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: libusb-compat

Partial log (click to expand)

Cannot nix-instantiate `libusb-compat' because:
error: attribute 'libusb-compat' in selection path 'libusb-compat' not found

peterhoeg · 2018-10-15T04:39:26Z

@grahamofborg build libusb libusb1

infinisil · 2018-10-15T06:17:17Z

@GrahamcOfBorg build libusb libusb1

GrahamcOfBorg · 2018-10-15T06:18:11Z

Success on x86_64-darwin (full log)

Attempted: libusb, libusb1

Partial log (click to expand)

strip is /nix/store/53nysl8bqwxihwzs1pgwka20nf8mbvlp-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/6bac4zkx3arcm60b7xfk55xa6jng35w8-libusb-compat-0.1.7/lib
patching script interpreter paths in /nix/store/6bac4zkx3arcm60b7xfk55xa6jng35w8-libusb-compat-0.1.7
/nix/store/6bac4zkx3arcm60b7xfk55xa6jng35w8-libusb-compat-0.1.7/lib/libusb-0.1.4.dylib: fixing dylib
strip is /nix/store/53nysl8bqwxihwzs1pgwka20nf8mbvlp-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/mvgv734fi9h8dxm3c9xkp8ibh6wivcfx-libusb-compat-0.1.7-dev/lib  /nix/store/mvgv734fi9h8dxm3c9xkp8ibh6wivcfx-libusb-compat-0.1.7-dev/bin
patching script interpreter paths in /nix/store/mvgv734fi9h8dxm3c9xkp8ibh6wivcfx-libusb-compat-0.1.7-dev
/nix/store/mvgv734fi9h8dxm3c9xkp8ibh6wivcfx-libusb-compat-0.1.7-dev/bin/libusb-config: interpreter directive changed from "/bin/sh" to "/nix/store/frkmk9zf3vdkdbh05hlhln8j17srj8fx-bash-4.4-p23/bin/sh"
/nix/store/6bac4zkx3arcm60b7xfk55xa6jng35w8-libusb-compat-0.1.7
/nix/store/p3lih2cl4b24l40smj92wsbrah6acsck-libusb-1.0.22

infinisil · 2018-10-15T06:18:13Z

Actually, that's a whole lotta rebuilds, this should go to staging. I doubt ofborg can build this without timeouting

Edit: Oh right, the package itself shouldn't timeout, only the stuff that depends on it

GrahamcOfBorg · 2018-10-15T06:18:25Z

Success on aarch64-linux (full log)

Attempted: libusb, libusb1

Partial log (click to expand)

patching script interpreter paths in /nix/store/22amby0m2s4xih3qyn2sfgwyq2k92zpn-libusb-compat-0.1.7
checking for references to /build in /nix/store/22amby0m2s4xih3qyn2sfgwyq2k92zpn-libusb-compat-0.1.7...
shrinking RPATHs of ELF executables and libraries in /nix/store/8l4ns0icf5ndqjr3zmc16b9df49zq7ii-libusb-compat-0.1.7-dev
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8l4ns0icf5ndqjr3zmc16b9df49zq7ii-libusb-compat-0.1.7-dev/lib  /nix/store/8l4ns0icf5ndqjr3zmc16b9df49zq7ii-libusb-compat-0.1.7-dev/bin
patching script interpreter paths in /nix/store/8l4ns0icf5ndqjr3zmc16b9df49zq7ii-libusb-compat-0.1.7-dev
/nix/store/8l4ns0icf5ndqjr3zmc16b9df49zq7ii-libusb-compat-0.1.7-dev/bin/libusb-config: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/8l4ns0icf5ndqjr3zmc16b9df49zq7ii-libusb-compat-0.1.7-dev...
/nix/store/22amby0m2s4xih3qyn2sfgwyq2k92zpn-libusb-compat-0.1.7
/nix/store/1s6jqxqgldwn46x3v89l2zkx6fmnrllh-libusb-1.0.22

GrahamcOfBorg · 2018-10-15T06:19:18Z

Success on x86_64-linux (full log)

Attempted: libusb, libusb1

Partial log (click to expand)

patching script interpreter paths in /nix/store/3gqlnvl7gppp2xj73hd7pah8x8wljxxj-libusb-compat-0.1.7
checking for references to /build in /nix/store/3gqlnvl7gppp2xj73hd7pah8x8wljxxj-libusb-compat-0.1.7...
shrinking RPATHs of ELF executables and libraries in /nix/store/8ckxhdcm43a3rzcl4wq2rv7ddydfl83r-libusb-compat-0.1.7-dev
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8ckxhdcm43a3rzcl4wq2rv7ddydfl83r-libusb-compat-0.1.7-dev/lib  /nix/store/8ckxhdcm43a3rzcl4wq2rv7ddydfl83r-libusb-compat-0.1.7-dev/bin
patching script interpreter paths in /nix/store/8ckxhdcm43a3rzcl4wq2rv7ddydfl83r-libusb-compat-0.1.7-dev
/nix/store/8ckxhdcm43a3rzcl4wq2rv7ddydfl83r-libusb-compat-0.1.7-dev/bin/libusb-config: interpreter directive changed from "/bin/sh" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/8ckxhdcm43a3rzcl4wq2rv7ddydfl83r-libusb-compat-0.1.7-dev...
/nix/store/3gqlnvl7gppp2xj73hd7pah8x8wljxxj-libusb-compat-0.1.7
/nix/store/889agdq681fspyrih78lmyy8anlf14la-libusb-1.0.22

lschuermann · 2018-10-15T06:33:45Z

Actually, that's a whole lotta rebuilds, this should go to staging. I doubt ofborg can build this without timeouting

My understanding of what @GrahamcOfBorg build libusb does might not be correct, but I always thought that it only builds all dependencies of libusb, not those depending on libusb. That shouldn't be too much, right?
I'm guessing that Hydra will have a hard time rebuilding 501+ packages.

infinisil · 2018-10-15T06:36:37Z

Oh actually, when you switch this PR to staging, ofborg might not be able to build it because on staging stdenv got changed there.

But anyways, this looks good to me if it's on staging.

lschuermann · 2018-10-15T07:01:05Z

I noticed that the switch to staging pulled all the other commits from master over too. Should I rather rebase my commits? I've never contributed something to staging before. 😢

infinisil · 2018-10-17T00:58:13Z

@GrahamcOfBorg eval

GrahamcOfBorg · 2018-10-19T09:22:57Z

Success on aarch64-linux (full log)

Attempted: libusb

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/j2zdw7nvnp6igh7nn3viilg6mjddsh3l-libusb-compat-0.1.7/lib
patching script interpreter paths in /nix/store/j2zdw7nvnp6igh7nn3viilg6mjddsh3l-libusb-compat-0.1.7
checking for references to /build in /nix/store/j2zdw7nvnp6igh7nn3viilg6mjddsh3l-libusb-compat-0.1.7...
shrinking RPATHs of ELF executables and libraries in /nix/store/pn48p4ha3j7iry0n468f50jjxjdig27h-libusb-compat-0.1.7-dev
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/pn48p4ha3j7iry0n468f50jjxjdig27h-libusb-compat-0.1.7-dev/lib  /nix/store/pn48p4ha3j7iry0n468f50jjxjdig27h-libusb-compat-0.1.7-dev/bin
patching script interpreter paths in /nix/store/pn48p4ha3j7iry0n468f50jjxjdig27h-libusb-compat-0.1.7-dev
/nix/store/pn48p4ha3j7iry0n468f50jjxjdig27h-libusb-compat-0.1.7-dev/bin/libusb-config: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/pn48p4ha3j7iry0n468f50jjxjdig27h-libusb-compat-0.1.7-dev...
/nix/store/j2zdw7nvnp6igh7nn3viilg6mjddsh3l-libusb-compat-0.1.7

GrahamcOfBorg · 2018-10-19T09:22:58Z

Success on x86_64-linux (full log)

Attempted: libusb

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/y2ksj9ga0yk42gq6xy7rm5ks2j8kyf1p-libusb-compat-0.1.7/lib
patching script interpreter paths in /nix/store/y2ksj9ga0yk42gq6xy7rm5ks2j8kyf1p-libusb-compat-0.1.7
checking for references to /build in /nix/store/y2ksj9ga0yk42gq6xy7rm5ks2j8kyf1p-libusb-compat-0.1.7...
shrinking RPATHs of ELF executables and libraries in /nix/store/n1glr2n5flw3fgq1h650wiq95fdk990m-libusb-compat-0.1.7-dev
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/n1glr2n5flw3fgq1h650wiq95fdk990m-libusb-compat-0.1.7-dev/lib  /nix/store/n1glr2n5flw3fgq1h650wiq95fdk990m-libusb-compat-0.1.7-dev/bin
patching script interpreter paths in /nix/store/n1glr2n5flw3fgq1h650wiq95fdk990m-libusb-compat-0.1.7-dev
/nix/store/n1glr2n5flw3fgq1h650wiq95fdk990m-libusb-compat-0.1.7-dev/bin/libusb-config: interpreter directive changed from "/bin/sh" to "/nix/store/r47p5pzx52m3n34vdgqpk5rvqgm0m24m-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/n1glr2n5flw3fgq1h650wiq95fdk990m-libusb-compat-0.1.7-dev...
/nix/store/y2ksj9ga0yk42gq6xy7rm5ks2j8kyf1p-libusb-compat-0.1.7

mmahut · 2019-08-19T11:28:57Z

Are there any updates on this pull request, please?

lschuermann · 2019-08-20T14:33:28Z

v0.1.7 still seems to be the most recent release, and changing the source to GitHub is probably a good idea. It appears there have been some changes on staging already, I'll see whether this PR still makes sense for libusb1 and then rebase accordingly.

Forgot about this for a while, putting it on the top of my todo list.

peterhoeg · 2019-08-21T06:30:27Z

Please also make the name -> pname transition while at it.

prusnak · 2019-10-27T22:32:08Z

@lschuermann ping?

peterhoeg · 2020-03-03T13:21:10Z

@lschuermann, any chance you have time to get these few changes sorted so we can get this merged?

lschuermann · 2020-03-06T14:25:39Z

Yes, I was very busy these previous months, but starting today I have time for nixpkgs again. Let me sort this this very weekend. Sorry.

Also, change the source repository to the GitHub repository pointed to by the official website.

lschuermann · 2020-03-08T19:34:42Z

Now both libusb and libusb-compat are up to date, build directly from source instead of a release tarball and use the official GitHub repo for fetching said sources. I rebased on the current staging again.

This should work, but I didn't manage to build it yet. My server's on it currently, but seeing how many packages I have to build from source this will take some long time.

EDIT: Successfully built both libusb and libusb1 from my nixpkgs branch.

lschuermann · 2020-03-08T19:36:00Z

pkgs/development/libraries/libusb1/default.nix

@@ -43,8 +48,4 @@ stdenv.mkDerivation (rec {
    license = licenses.lgpl21Plus;
    maintainers = [ ];
  };
-} // stdenv.lib.optionalAttrs withStatic {
-  # Carefully added here to avoid a mass rebuild.
-  # Inline this the next time this package changes.


I've inlined this statement as we're changing the expression anyways.

prusnak · 2020-03-08T22:19:51Z

Why would you want to build from git checkout instead of the release tarball? I don't think we want this.

The idea was to replace the sourceforge release tarball with the github release tarball, not to replace the tarball with the git checkout.

Drop the aa63d51 commit from the PR, but you can keep the dontDisableStatic = withStatic; refactor.

doronbehar · 2020-03-08T22:27:42Z

To put my 2 cents, I think fetchgit and it's derivatives are superior to release tarballs because in the future, they'll might get updated automatically by bots such as @r-ryantm .

mmahut · 2020-03-09T09:26:23Z

Just a side note, fetchFromGitHub uses the tarball, as per:

https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchgithub/default.nix#L31

Mic92 · 2020-03-09T10:32:44Z

I also agree that fetchFromGitHub makes the expression more flexible. Also autoreconfHook will make sure that the build system is regenerated with the latest autoconf source.

lschuermann · 2020-03-10T07:10:52Z

Also autoreconfHook will make sure that the build system is regenerated with the latest autoconf source.

I think that was the entire idea. Not building from the release tarball removes unnecessary dependencies, and allows to override the src attribute for building and developing on non-releases.

lschuermann · 2020-03-10T07:14:06Z

Just a side note, fetchFromGitHub uses the tarball, as per:

You have to distinguish release tarballs (uploaded by the author of the project) and archive tarballs, which are generated by GitHub as a checkout of the commit.

We are now using archive tarballs, which is a checkout of the tag and doesn't have the possibility of the author making malicious changes which aren't in the Git repo, like with release tarballs.

GrahamcOfBorg added 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ labels Oct 14, 2018

infinisil reviewed Oct 14, 2018

View reviewed changes

lschuermann changed the base branch from master to staging October 15, 2018 06:46

lschuermann force-pushed the libusb-mirror branch from 44b0761 to 07e4caa Compare October 19, 2018 09:06

GrahamcOfBorg added 10.rebuild-darwin: 101-500 and removed 10.rebuild-darwin: 501+ labels Oct 19, 2018

doronbehar approved these changes Feb 23, 2020

View reviewed changes

Leon Schuermann added 2 commits March 8, 2020 19:38

libusb-compat: 0.1.5 -> 0.1.7

54bab3f

Also, change the source repository to the GitHub repository pointed to by the official website.

libusb: build from source instead of release tarball

aa63d51

lschuermann force-pushed the libusb-mirror branch from 07e4caa to aa63d51 Compare March 8, 2020 19:17

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 501-1000 10.rebuild-linux: 2501-5000 and removed 10.rebuild-darwin: 101-500 labels Mar 8, 2020

lschuermann commented Mar 8, 2020

View reviewed changes

Mic92 merged commit 9f55c5e into NixOS:staging Mar 9, 2020

peterhoeg mentioned this pull request Mar 19, 2020

libusb-compat: fix up the .so so it can find libusb1 #82944

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

libusb-compat: 0.1.5 -> 0.1.7 && change libusb source to GitHub #48434

libusb-compat: 0.1.5 -> 0.1.7 && change libusb source to GitHub #48434

lschuermann commented Oct 14, 2018

infinisil Oct 14, 2018

lschuermann Oct 14, 2018

infinisil Oct 14, 2018

lschuermann Oct 14, 2018

lschuermann commented Oct 14, 2018

peterhoeg commented Oct 15, 2018

GrahamcOfBorg commented Oct 15, 2018

GrahamcOfBorg commented Oct 15, 2018

peterhoeg commented Oct 15, 2018

infinisil commented Oct 15, 2018

GrahamcOfBorg commented Oct 15, 2018

infinisil commented Oct 15, 2018 •

edited

GrahamcOfBorg commented Oct 15, 2018

GrahamcOfBorg commented Oct 15, 2018

lschuermann commented Oct 15, 2018

infinisil commented Oct 15, 2018

lschuermann commented Oct 15, 2018 •

edited

infinisil commented Oct 17, 2018

GrahamcOfBorg commented Oct 19, 2018

GrahamcOfBorg commented Oct 19, 2018

mmahut commented Aug 19, 2019

lschuermann commented Aug 20, 2019 •

edited

peterhoeg commented Aug 21, 2019

prusnak commented Oct 27, 2019

peterhoeg commented Mar 3, 2020 •

edited

lschuermann commented Mar 6, 2020

lschuermann commented Mar 8, 2020 •

edited

lschuermann Mar 8, 2020

prusnak commented Mar 8, 2020 •

edited

doronbehar commented Mar 8, 2020

mmahut commented Mar 9, 2020

Mic92 commented Mar 9, 2020

lschuermann commented Mar 10, 2020

lschuermann commented Mar 10, 2020

libusb-compat: 0.1.5 -> 0.1.7 && change libusb source to GitHub #48434

libusb-compat: 0.1.5 -> 0.1.7 && change libusb source to GitHub #48434

Conversation

lschuermann commented Oct 14, 2018

Things done

infinisil Oct 14, 2018

Choose a reason for hiding this comment

lschuermann Oct 14, 2018

Choose a reason for hiding this comment

infinisil Oct 14, 2018

Choose a reason for hiding this comment

lschuermann Oct 14, 2018

Choose a reason for hiding this comment

lschuermann commented Oct 14, 2018

peterhoeg commented Oct 15, 2018

GrahamcOfBorg commented Oct 15, 2018

GrahamcOfBorg commented Oct 15, 2018

peterhoeg commented Oct 15, 2018

infinisil commented Oct 15, 2018

GrahamcOfBorg commented Oct 15, 2018

infinisil commented Oct 15, 2018 • edited

GrahamcOfBorg commented Oct 15, 2018

GrahamcOfBorg commented Oct 15, 2018

lschuermann commented Oct 15, 2018

infinisil commented Oct 15, 2018

lschuermann commented Oct 15, 2018 • edited

infinisil commented Oct 17, 2018

GrahamcOfBorg commented Oct 19, 2018

GrahamcOfBorg commented Oct 19, 2018

mmahut commented Aug 19, 2019

lschuermann commented Aug 20, 2019 • edited

peterhoeg commented Aug 21, 2019

prusnak commented Oct 27, 2019

peterhoeg commented Mar 3, 2020 • edited

lschuermann commented Mar 6, 2020

lschuermann commented Mar 8, 2020 • edited

lschuermann Mar 8, 2020

Choose a reason for hiding this comment

prusnak commented Mar 8, 2020 • edited

doronbehar commented Mar 8, 2020

mmahut commented Mar 9, 2020

Mic92 commented Mar 9, 2020

lschuermann commented Mar 10, 2020

lschuermann commented Mar 10, 2020

infinisil commented Oct 15, 2018 •

edited

lschuermann commented Oct 15, 2018 •

edited

lschuermann commented Aug 20, 2019 •

edited

peterhoeg commented Mar 3, 2020 •

edited

lschuermann commented Mar 8, 2020 •

edited

prusnak commented Mar 8, 2020 •

edited