From ccd343f0b6a953cce43f7c80e65e6a1fe91a1c7f Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 28 Feb 2025 16:52:05 +0000 Subject: [PATCH] nixpkgs: 0-unstable-2025-02-26 -> 0-unstable-2025-02-28 --- overlays/preferences.nix | 10 ---- pkgs/by-name/geoclue-ols/package.nix | 6 +++ pkgs/by-name/lgtrombetta-compass/package.nix | 48 ++++++++++--------- pkgs/by-name/nixpkgs-bootstrap/master.nix | 6 +-- .../nixpkgs-bootstrap/staging-next.nix | 6 +-- pkgs/by-name/nixpkgs-bootstrap/staging.nix | 6 +-- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/overlays/preferences.nix b/overlays/preferences.nix index 7a4bcb673..dc61d322d 100644 --- a/overlays/preferences.nix +++ b/overlays/preferences.nix @@ -86,16 +86,6 @@ in # # }; # }; - go2tv = super.go2tv.overrideAttrs (upstream: { - # XXX(2025-02-12): with release 1.18.0, listing devices gives error (even with UDP 1900 whitelisted in firewall): - # > Encountered error(s): checkflags error: checkTflag service loading error: loadSSDPservices: No available Media Renderers - # reverts a4cd63f512f31efccf68c34f42aaf4cd2278ba9a - # done as overlay instead of in hosts/common/programs/go2tv.nix so that python consumers like sane-cast also get this fix. - postPatch = (upstream.postPatch or "") + '' - substituteInPlace devices/devices.go --replace-fail "239.255.255.250:1900" "" - ''; - }); - # gvfs = super.gvfs.override { # # saves 20 minutes of build time and cross issues, for unused feature # samba = null; diff --git a/pkgs/by-name/geoclue-ols/package.nix b/pkgs/by-name/geoclue-ols/package.nix index 559a832e8..bdeb5b057 100644 --- a/pkgs/by-name/geoclue-ols/package.nix +++ b/pkgs/by-name/geoclue-ols/package.nix @@ -35,6 +35,7 @@ mercantile numpy scipy + typing-extensions ]; nativeBuildInputs = [ @@ -51,11 +52,16 @@ wrapPythonPrograms ''; + postInstallCheck = '' + $out/bin/ols --help + ''; + pythonImportsCheck = [ "ols" ]; doCheck = true; + doInstallCheck = true; strictDeps = true; meta = with lib; { diff --git a/pkgs/by-name/lgtrombetta-compass/package.nix b/pkgs/by-name/lgtrombetta-compass/package.nix index 2291c7b40..3f76bc573 100644 --- a/pkgs/by-name/lgtrombetta-compass/package.nix +++ b/pkgs/by-name/lgtrombetta-compass/package.nix @@ -11,6 +11,7 @@ ninja, python3, stdenv, + versionCheckHook, wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { pname = "lgtrombetta-compass"; @@ -23,28 +24,6 @@ hash = "sha256-NXy9JihGwpDaZmNUNUAOYfqQTWQM4dXtTQ/4Ukgi11U="; }; - postPatch = '' - substituteInPlace data/meson.build \ - --replace-fail "install_dir: '/lib/udev/rules.d'" "install_dir: join_paths(get_option('datadir'), 'lib/udev/rules.d')" - ''; - - preConfigure = '' - patchShebangs --build build-aux/meson/postinstall.py - ''; - - postFixup = '' - wrapPythonPrograms - ''; - - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/compass --help | grep -q compass - - runHook postInstallCheck - ''; - - nativeBuildInputs = [ desktop-file-utils # for update-desktop-database gettext # for msgfmt @@ -73,10 +52,35 @@ python3.pkgs.pyxdg ]; + nativeCheckInputs = [ + # python3.pkgs.pythonImportsCheckHook + versionCheckHook + ]; + pythonImportsCheck = [ "compass" ]; + postPatch = '' + substituteInPlace data/meson.build \ + --replace-fail "install_dir: '/lib/udev/rules.d'" "install_dir: join_paths(get_option('datadir'), 'lib/udev/rules.d')" + ''; + + preConfigure = '' + patchShebangs --build build-aux/meson/postinstall.py + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + preInstallCheck = '' + version=v$version + ''; + + versionCheckProgram = "${placeholder "out"}/bin/compass"; + + doCheck = true; doInstallCheck = true; strictDeps = true; diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index b5e2827ca..15fc9301d 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -8,8 +8,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {} }: mkNixpkgs { - rev = "2aa37bb93fb33769ee887e399313a21b52dce710"; - sha256 = "sha256-/ZmWq+GY7R8IL6CyykV9eKtgxb0kVpAnykYvEv9XQAE="; - version = "0-unstable-2025-02-26"; + rev = "5db39d669a21ca7f0e76c295e7664b9d938b7042"; + sha256 = "sha256-SUZZMAn19X3Ym6lVb18LoXhCS2yicrRr83si5VyJDS0="; + version = "0-unstable-2025-02-28"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index c494f7d4b..37f1c4c9d 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {} }: mkNixpkgs { - rev = "98be054e5b8a4cdebd5649221ab51f089530d1a6"; - sha256 = "sha256-FIBdw9D1wA4soXIfgynCA5wZTp29wOvcEh4XMbXcDks="; - version = "0-unstable-2025-02-26"; + rev = "749375426d72ead4bdac625818e7be62a6bbbaf4"; + sha256 = "sha256-IDxPfbSdIy7XAP1hneGOfr2jsj+hFUsvFhpRksYqols="; + version = "0-unstable-2025-02-28"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index d7050bddc..27cf7f2cd 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {} }: mkNixpkgs { - rev = "dd4fe9226477a2ca666c4a831a5eef6f593c24b7"; - sha256 = "sha256-5fNpGtBGVnxPSqqgmfTwwqPUSfcapca4hAOx18ylZew="; - version = "0-unstable-2025-02-26"; + rev = "29dcbf482396b9e5bdf1ec92973a8451e0aaa1d5"; + sha256 = "sha256-ps1xz98RAUqrT+V7GFpzf/uHaoh9o5ZoOpE7SnSB6sY="; + version = "0-unstable-2025-02-28"; branch = "staging"; }