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

qbs: 1.8 -> 1.12 #45877

Closed
wants to merge 1 commit into from
Closed

qbs: 1.8 -> 1.12 #45877

wants to merge 1 commit into from

Conversation

w-zygmuntowicz
Copy link

No description provided.

@timokau
Copy link
Member

timokau commented Aug 31, 2018

Thanks for the contribution!

Why didn't you use the issue template? What kind of testing did you do?

@GrahamcOfBorg build qbs

@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: qbs

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.

timokau
timokau requested changes Aug 31, 2018
View reviewed changes
pkgs/development/tools/build-managers/qbs/default.nix

src = fetchFromGitHub {
owner = "qt-labs";
repo = "qbs";
rev = "fa9c21d6908e0dad805113f570ac883c1dc5067a";
sha256 = "1manriz75rav1vldkk829yk1la9md4m872l5ykl9m982i9801d9g";
rev = "2440b19b288096e1601674de2ac15c560af469cd";
Copy link
Member

Choose a reason for hiding this comment

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

The qbs releases are tagged so this should be rev = "v${version}" for easier updating. I don't know why that wasn't the case before.

pkgs/development/tools/build-managers/qbs/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "qbs-${version}";

version = "1.8";
version = "1.12";

src = fetchFromGitHub {
owner = "qt-labs";
Copy link
Member

Choose a reason for hiding this comment

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

Apparently the owner is now qbs since github.com/qt-labs/qts redirects to github.com/qts/qts.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: qbs

Partial log (click to expand)

shrinking /nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12/bin/qbs-create-project
shrinking /nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12/bin/qbs-config-ui
gzipping man pages under /nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12/share/man/
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12/lib  /nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12/libexec  /nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12/bin
patching script interpreter paths in /nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12
checking for references to /build in /nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12...
postPatchMkspecs
postPatchMkspecs
/nix/store/2mxmpfrv03flhaj3fal4dajbm0pki8x6-qbs-1.12

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: qbs

Partial log (click to expand)

shrinking /nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12/bin/qbs-create-project
shrinking /nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12/bin/qbs
gzipping man pages under /nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12/share/man/
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12/lib  /nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12/libexec  /nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12/bin
patching script interpreter paths in /nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12
checking for references to /build in /nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12...
postPatchMkspecs
postPatchMkspecs
/nix/store/zrl9cdlm15a2j99gsb15mqzdqigjillc-qbs-1.12

@Mic92
Copy link
Member

Mic92 commented Sep 1, 2018

I also upgraded this a while back, but never made a pull request. Can you also consider my changes: Mic92@68afccc ?

@c0bw3b c0bw3b self-assigned this Nov 4, 2018
@Ekleog
Copy link
Member

Ekleog commented Nov 7, 2018

(triage) @rebelyer Are you still interested in moving this forward by integrating the changes proposed by @Mic92?

@c0bw3b c0bw3b mentioned this pull request Nov 7, 2018
Merged
9 tasks
@c0bw3b c0bw3b closed this Nov 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau requested changes

Assignees

@c0bw3b c0bw3b

Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@w-zygmuntowicz @timokau @GrahamcOfBorg @Mic92 @Ekleog @c0bw3b @Janik-Haag