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

akira-unstable: unbreak by removing vala-lint dependency #269200

Merged
merged 1 commit into from
Nov 22, 2023

Conversation

pbsds
Copy link
Member

@pbsds pbsds commented Nov 22, 2023

Description of changes

ZHF #265948
fixes https://hydra.nixos.org/build/241858923

Our vala-lint seems hit by vala-lang/vala-lint#181, (https://hydra.nixos.org/build/241858665)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Priorities

Add a 👍 reaction to pull requests you find important.

@pbsds pbsds marked this pull request as ready for review November 22, 2023 14:36
@bobby285271 bobby285271 merged commit 4ff9b40 into NixOS:master Nov 22, 2023
5 of 6 checks passed
@bobby285271
Copy link
Member

Thanks

Copy link
Contributor

Successfully created backport PR for release-23.11:

@bobby285271
Copy link
Member

I feel like the vala-lint issue is more likely caused by glib update, this can probably be used for bisecting

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index c11f6b8432bc..74b0f85e3bde 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -19,6 +19,7 @@
 , darwin
 , makeHardcodeGsettingsPatch
 , testers
+, buildDocs ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isStatic
 }:
 
 assert stdenv.isLinux -> util-linuxMinimal != null;
@@ -45,7 +46,7 @@ let
     ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
 
-  buildDocs = stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isStatic;
+  # buildDocs = stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isStatic;
 in
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix
index 063563da3790..a51ccb211a09 100644
--- a/pkgs/development/tools/vala-lint/default.nix
+++ b/pkgs/development/tools/vala-lint/default.nix
@@ -10,8 +10,15 @@
 , gettext
 , wrapGAppsHook
 , unstableGitUpdater
+, replaceDependency
 }:
 
+let
+  glib' = ((glib.overrideAttrs (attrs: { src = /home/bobby285271/glib; })).override { buildDocs = false; });
+
+  replaceDependencies = drv: replaceList: builtins.foldl' (acc: deps: replaceDependency (deps // { drv = acc; })) (lib.getDev drv) replaceList;
+  substGlib = builtins.map (drv: if drv == glib then glib' else replaceDependencies drv [ { oldDependency = glib.dev; newDependency = glib'.dev; } { oldDependency = glib.out; newDependency = glib'.out; } ]);
+in
 stdenv.mkDerivation rec {
   pname = "vala-lint";
   version = "unstable-2023-05-25";
@@ -23,7 +30,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-OnBeiYm83XjAezHEBEA2LvJ5ErVOyKclXJcS0cYaLIg=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = substGlib [
     gettext
     meson
     ninja
@@ -32,7 +39,7 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
   ];
 
-  buildInputs = [
+  buildInputs = substGlib [
     glib
   ];

@pbsds
Copy link
Member Author

pbsds commented Nov 22, 2023

I tried reverting a4f2ad8 and i still get the same error

@bobby285271
Copy link
Member

bobby285271 commented Nov 22, 2023

The glib commit I bisected to is in bce876b (which is still part of GNOME 45 PR).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants