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

Fix/bitwig #50652

Merged
merged 2 commits into from Nov 23, 2018
Merged

Fix/bitwig #50652

merged 2 commits into from Nov 23, 2018

Conversation

mrVanDalo
Copy link
Contributor

@mrVanDalo mrVanDalo commented Nov 19, 2018 •
edited

Motivation for this change

fixing #49530
I needed to split up libxkbcommon to version 8 and version 7.

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.

@mrVanDalo mrVanDalo force-pushed the fix/bitwig branch 2 times, most recently from 1668a3b to fe12922 Compare November 19, 2018 01:14
worldofpeace
worldofpeace reviewed Nov 21, 2018
View reviewed changes
pkgs/top-level/all-packages.nix
@@ -11157,7 +11157,9 @@ with pkgs;

libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };

libxkbcommon = callPackage ../development/libraries/libxkbcommon { };
libxkbcommon = libxkbcommon_8;
libxkbcommon_8 = callPackage ../development/libraries/libxkbcommon { };
Copy link
Contributor

Choose a reason for hiding this comment

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

Introducing libxkbcommon_8 and aliasing it to libxkbcommon shouldn't be done for something as trivial as this.

Copy link
Member

Choose a reason for hiding this comment

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

Why that?

Copy link
Contributor

Choose a reason for hiding this comment

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

@Mic92 Seems unnecessary to me, you disagree?

Copy link
Member

Choose a reason for hiding this comment

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

It is quite a common pattern in nixpkgs that we keep have aliases like that even if there are only two versions.

worldofpeace
worldofpeace reviewed Nov 21, 2018
View reviewed changes
pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix Outdated
"-Dx-locale-root=${libX11.out}/share/X11/locale"
];

doCheck = false; # fails, needs unicode locale
Copy link
Contributor

Choose a reason for hiding this comment

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

Can't reproduce locally.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah this came in after the version bump, according to git history.

@mrVanDalo
Copy link
Contributor Author

as @worldofpeace pointed out there are some build configuration which are not correct, this was due to the fact, I used the build script for version 8 to build version 7. I fixed it by putting the build script of the older version 7 in place (from the git-history).

@worldofpeace
Copy link
Contributor

I fixed it by putting the build script of the older version 7 in place (from the git-history).
Great, shouldn't be any problems then.

Because the Borg has added some higher rebuild labels(501+) this should probably be delivered to staging.

@pbogdan
Copy link
Member

pbogdan commented Nov 23, 2018

In principle for the purposes stated in the PR this shouldn't need to rebuild anything except libxkbcommon_7 and bitwig.

Mic92
Mic92 reviewed Nov 23, 2018
View reviewed changes
pkgs/development/libraries/libxkbcommon/default.nix Outdated
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, yacc, xkeyboard_config, libxcb, libX11, doxygen }:

stdenv.mkDerivation rec {
name = "libxkbcommon-0.8.0";
name = "libxkbcommon-${version}";
version = "0.8.0";
Copy link
Member

Choose a reason for hiding this comment

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

this is causing the mass-rebuild.

Copy link
Member

Choose a reason for hiding this comment

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

If you undo it, we can merge it into master.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK

Copy link
Contributor Author

Choose a reason for hiding this comment

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

DONE 👍

@worldofpeace
Copy link
Contributor

@GrahamcOfBorg build libxkbcommon_7

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libxkbcommon_7

Partial log (click to expand)

strip is /nix/store/6dpnd5aniypn8124mmy8f88s4mq2zl07-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/c9kb653ig3fswx7hdxmbp5n7qpfy56xv-libxkbcommon-0.7.2/lib
patching script interpreter paths in /nix/store/c9kb653ig3fswx7hdxmbp5n7qpfy56xv-libxkbcommon-0.7.2
checking for references to /build in /nix/store/c9kb653ig3fswx7hdxmbp5n7qpfy56xv-libxkbcommon-0.7.2...
shrinking RPATHs of ELF executables and libraries in /nix/store/cn1zddbbfdkmkzh15w219qrs7zyrs5sd-libxkbcommon-0.7.2-dev
strip is /nix/store/6dpnd5aniypn8124mmy8f88s4mq2zl07-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/cn1zddbbfdkmkzh15w219qrs7zyrs5sd-libxkbcommon-0.7.2-dev/lib
patching script interpreter paths in /nix/store/cn1zddbbfdkmkzh15w219qrs7zyrs5sd-libxkbcommon-0.7.2-dev
checking for references to /build in /nix/store/cn1zddbbfdkmkzh15w219qrs7zyrs5sd-libxkbcommon-0.7.2-dev...
/nix/store/c9kb653ig3fswx7hdxmbp5n7qpfy56xv-libxkbcommon-0.7.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libxkbcommon_7

Partial log (click to expand)

strip is /nix/store/rpbg8gmqxhz8g61p1plz5d2srs84pvmv-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/j05b921ffixzc1srlg46y88aan1xhxji-libxkbcommon-0.7.2/lib
patching script interpreter paths in /nix/store/j05b921ffixzc1srlg46y88aan1xhxji-libxkbcommon-0.7.2
checking for references to /build in /nix/store/j05b921ffixzc1srlg46y88aan1xhxji-libxkbcommon-0.7.2...
shrinking RPATHs of ELF executables and libraries in /nix/store/l8hr1b0671rwlfkm65qm6rlfsq23adx6-libxkbcommon-0.7.2-dev
strip is /nix/store/rpbg8gmqxhz8g61p1plz5d2srs84pvmv-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/l8hr1b0671rwlfkm65qm6rlfsq23adx6-libxkbcommon-0.7.2-dev/lib
patching script interpreter paths in /nix/store/l8hr1b0671rwlfkm65qm6rlfsq23adx6-libxkbcommon-0.7.2-dev
checking for references to /build in /nix/store/l8hr1b0671rwlfkm65qm6rlfsq23adx6-libxkbcommon-0.7.2-dev...
/nix/store/j05b921ffixzc1srlg46y88aan1xhxji-libxkbcommon-0.7.2

@worldofpeace
Copy link
Contributor

Looks good, this needs a backport to 18.09 I presume.

@worldofpeace worldofpeace merged commit 6fcc67e into NixOS:master Nov 23, 2018
@worldofpeace
Copy link
Contributor

backported in fabf2dd..172eb14

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

@Mic92 Mic92 Mic92 left review comments

@worldofpeace worldofpeace worldofpeace left review comments

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mrVanDalo @worldofpeace @pbogdan @GrahamcOfBorg @Mic92