nixpkgs: 0-unstable-2025-02-26 -> 0-unstable-2025-02-28
This commit is contained in:
@@ -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 {
|
# gvfs = super.gvfs.override {
|
||||||
# # saves 20 minutes of build time and cross issues, for unused feature
|
# # saves 20 minutes of build time and cross issues, for unused feature
|
||||||
# samba = null;
|
# samba = null;
|
||||||
|
@@ -35,6 +35,7 @@
|
|||||||
mercantile
|
mercantile
|
||||||
numpy
|
numpy
|
||||||
scipy
|
scipy
|
||||||
|
typing-extensions
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@@ -51,11 +52,16 @@
|
|||||||
wrapPythonPrograms
|
wrapPythonPrograms
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postInstallCheck = ''
|
||||||
|
$out/bin/ols --help
|
||||||
|
'';
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
"ols"
|
"ols"
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
doInstallCheck = true;
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@@ -11,6 +11,7 @@
|
|||||||
ninja,
|
ninja,
|
||||||
python3,
|
python3,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
versionCheckHook,
|
||||||
wrapGAppsHook3,
|
wrapGAppsHook3,
|
||||||
}: stdenv.mkDerivation (finalAttrs: {
|
}: stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "lgtrombetta-compass";
|
pname = "lgtrombetta-compass";
|
||||||
@@ -23,28 +24,6 @@
|
|||||||
hash = "sha256-NXy9JihGwpDaZmNUNUAOYfqQTWQM4dXtTQ/4Ukgi11U=";
|
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 = [
|
nativeBuildInputs = [
|
||||||
desktop-file-utils # for update-desktop-database
|
desktop-file-utils # for update-desktop-database
|
||||||
gettext # for msgfmt
|
gettext # for msgfmt
|
||||||
@@ -73,10 +52,35 @@
|
|||||||
python3.pkgs.pyxdg
|
python3.pkgs.pyxdg
|
||||||
];
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = [
|
||||||
|
# python3.pkgs.pythonImportsCheckHook
|
||||||
|
versionCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
"compass"
|
"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;
|
doInstallCheck = true;
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
|
@@ -8,8 +8,8 @@
|
|||||||
mkNixpkgs ? import ./mkNixpkgs.nix {}
|
mkNixpkgs ? import ./mkNixpkgs.nix {}
|
||||||
}:
|
}:
|
||||||
mkNixpkgs {
|
mkNixpkgs {
|
||||||
rev = "2aa37bb93fb33769ee887e399313a21b52dce710";
|
rev = "5db39d669a21ca7f0e76c295e7664b9d938b7042";
|
||||||
sha256 = "sha256-/ZmWq+GY7R8IL6CyykV9eKtgxb0kVpAnykYvEv9XQAE=";
|
sha256 = "sha256-SUZZMAn19X3Ym6lVb18LoXhCS2yicrRr83si5VyJDS0=";
|
||||||
version = "0-unstable-2025-02-26";
|
version = "0-unstable-2025-02-28";
|
||||||
branch = "master";
|
branch = "master";
|
||||||
}
|
}
|
||||||
|
@@ -2,8 +2,8 @@
|
|||||||
mkNixpkgs ? import ./mkNixpkgs.nix {}
|
mkNixpkgs ? import ./mkNixpkgs.nix {}
|
||||||
}:
|
}:
|
||||||
mkNixpkgs {
|
mkNixpkgs {
|
||||||
rev = "98be054e5b8a4cdebd5649221ab51f089530d1a6";
|
rev = "749375426d72ead4bdac625818e7be62a6bbbaf4";
|
||||||
sha256 = "sha256-FIBdw9D1wA4soXIfgynCA5wZTp29wOvcEh4XMbXcDks=";
|
sha256 = "sha256-IDxPfbSdIy7XAP1hneGOfr2jsj+hFUsvFhpRksYqols=";
|
||||||
version = "0-unstable-2025-02-26";
|
version = "0-unstable-2025-02-28";
|
||||||
branch = "staging-next";
|
branch = "staging-next";
|
||||||
}
|
}
|
||||||
|
@@ -2,8 +2,8 @@
|
|||||||
mkNixpkgs ? import ./mkNixpkgs.nix {}
|
mkNixpkgs ? import ./mkNixpkgs.nix {}
|
||||||
}:
|
}:
|
||||||
mkNixpkgs {
|
mkNixpkgs {
|
||||||
rev = "dd4fe9226477a2ca666c4a831a5eef6f593c24b7";
|
rev = "29dcbf482396b9e5bdf1ec92973a8451e0aaa1d5";
|
||||||
sha256 = "sha256-5fNpGtBGVnxPSqqgmfTwwqPUSfcapca4hAOx18ylZew=";
|
sha256 = "sha256-ps1xz98RAUqrT+V7GFpzf/uHaoh9o5ZoOpE7SnSB6sY=";
|
||||||
version = "0-unstable-2025-02-26";
|
version = "0-unstable-2025-02-28";
|
||||||
branch = "staging";
|
branch = "staging";
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user