Merge staging-next into staging
This commit is contained in:
@@ -13,12 +13,12 @@
|
||||
|
||||
let
|
||||
pname = "autobrr";
|
||||
version = "1.61.0";
|
||||
version = "1.62.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "autobrr";
|
||||
repo = "autobrr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qFLHszkdpnOZj7dalwSPX/NSlAtLcVpIcEXxbtE8lLU=";
|
||||
hash = "sha256-lygDs92WiIzHYgYqel2nseWcXgBFEQV+i5tC0NYpYUE=";
|
||||
};
|
||||
|
||||
autobrr-web = stdenvNoCC.mkDerivation {
|
||||
@@ -40,7 +40,7 @@ let
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-ifzkLoXTdySr3uTy4Mc4WvDA6yd0RBVXbTtozHequsA=";
|
||||
hash = "sha256-XFGxutHWk1RHnrN//WVTr4RyARIkygdG2C1Af5W0dBc=";
|
||||
};
|
||||
|
||||
postBuild = ''
|
||||
@@ -60,7 +60,7 @@ buildGoModule rec {
|
||||
src
|
||||
;
|
||||
|
||||
vendorHash = "sha256-bbIoNW32b6N6t/MvCfSN/BdoHN0rZIMqWsJHL2amKPE=";
|
||||
vendorHash = "sha256-/MOP06po885vg1C6j+let8UC710j68oP+L3j9oEU0Lw=";
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${autobrr-web}/* web/dist
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "double-entry-generator";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "deb-sig";
|
||||
repo = "double-entry-generator";
|
||||
hash = "sha256-DsNcQacbdBzOMK9mVuuK8yz9RXqykYLhXE5YSFYmipA=";
|
||||
hash = "sha256-GscpYNS30npOVZzRmbuCQvJzamgaK4riBiSngBg7szc=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/QMt8zPvHM9znUc0+iUC82bOUJoBmH+shJ9D7AHiQ1E=";
|
||||
vendorHash = "sha256-NoWUaawApdTSWGRul9mpOxgRZWTE7LTz3pJgwU2NWVU=";
|
||||
|
||||
excludedPackages = [ "hack" ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "enzyme";
|
||||
version = "0.0.175";
|
||||
version = "0.0.176";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnzymeAD";
|
||||
repo = "Enzyme";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6uqPnkJeyn4R1mc/vVSVIl6sarSo41drKe9tTqWDJU0=";
|
||||
hash = "sha256-/c8gxv9i4oHp3/7z6c1lU1lWPsPK27xkjjNjrPwieZE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -14,13 +14,13 @@ assert
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "open-policy-agent";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oFtF/Uze9X1aaDzQXpZwbRXi11VnTTkkosfSSIeIxcc=";
|
||||
hash = "sha256-4FRNTB24JWyF3Zuhx3T6LjNs83+wDh4gmE9rh3cu/Vk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
python3,
|
||||
libcxx,
|
||||
enableShared ? !stdenv.hostPlatform.isStatic,
|
||||
doFakeLibgcc ? stdenv.hostPlatform.useLLVM,
|
||||
devExtraCmakeFlags ? [ ],
|
||||
getVersionFile,
|
||||
}:
|
||||
@@ -105,6 +106,10 @@ stdenv.mkDerivation (
|
||||
''
|
||||
+ lib.optionalString (enableShared && stdenv.hostPlatform.isWindows) ''
|
||||
ln -s $out/lib/libunwind.dll.a $out/lib/libunwind_shared.dll.a
|
||||
''
|
||||
+ lib.optionalString (doFakeLibgcc) ''
|
||||
ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so
|
||||
ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so.1
|
||||
'';
|
||||
|
||||
meta = llvm_meta // {
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
docutils,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
pydantic,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
rstcheck-core,
|
||||
sphinx,
|
||||
typer,
|
||||
types-docutils,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -34,20 +31,15 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
docutils
|
||||
rstcheck-core
|
||||
types-docutils
|
||||
pydantic
|
||||
typer
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
optional-dependencies = {
|
||||
sphinx = [ sphinx ];
|
||||
};
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved.
|
||||
"test_error_without_config_file_macos"
|
||||
"test_file_1_is_bad_without_config_macos"
|
||||
];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "rstcheck" ];
|
||||
|
||||
|
||||
@@ -81,5 +81,6 @@ bootstrapStdenv.mkDerivation (finalAttrs: {
|
||||
lib.licenses.bsd2
|
||||
lib.licenses.bsd3
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
+3
-3
@@ -6,18 +6,18 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "universal-remote-card";
|
||||
version = "4.4.3";
|
||||
version = "4.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nerwyn";
|
||||
repo = "android-tv-card";
|
||||
rev = version;
|
||||
hash = "sha256-LhA4yDodTyeKxSr3BAYea/gohrHdsQIb2+MVixOBjC8=";
|
||||
hash = "sha256-+FBNhN1sW4tjwWxGXAnKIPDR5gZtKoekh/N8mioXo+8=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-call-git.patch ];
|
||||
|
||||
npmDepsHash = "sha256-/0bxOC9e8+mfWAyj/yPXVGS4OAdFNU5H3x8z9aS0LBA=";
|
||||
npmDepsHash = "sha256-KzxcEItSMTAeARjYRCmGjEIGuMLrdFjs+3AfcLr6AHc=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -4362,6 +4362,10 @@ with pkgs;
|
||||
|
||||
rstcheck = with python3Packages; toPythonApplication rstcheck;
|
||||
|
||||
rstcheckWithSphinx = rstcheck.overridePythonAttrs (oldAttrs: {
|
||||
dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.sphinx;
|
||||
});
|
||||
|
||||
rtmpdump_gnutls = rtmpdump.override {
|
||||
gnutlsSupport = true;
|
||||
opensslSupport = false;
|
||||
|
||||
Reference in New Issue
Block a user