Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-08-17 06:02:32 +00:00 committed by GitHub
commit d6b3da0273
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 226 additions and 128 deletions

View file

@ -1778,7 +1778,7 @@
};
booklearner = {
name = "booklearner";
email = "hey@booklearner.org";
email = "booklearner@proton.me";
matrix = "@booklearner:matrix.org";
github = "booklearner";
githubId = 103979114;

View file

@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "1jvi34ym7d6j5zl9d7wg3rcy34f4ji907mixfmvs7g0z1vlra2sv";
x86_64-darwin = "19nnkx2l4rvm23r8ii2a0jn8lvanmshwsjrsgmi7dcnf68143601";
aarch64-linux = "17rx5v3kzwzkzhckly8s413370mrh7rcyhpnppmn39gkvy68ydhs";
aarch64-darwin = "0ff0yn3kcb35s775w0k2l3szs137ph593qa7y3p2h4sbfsrgljxz";
armv7l-linux = "0qhik2qhbwpjrbkpdc8cblvrh1hqld69il78zmayq1bbkqzhhmp5";
x86_64-linux = "04jmp9z9b8gqq1nxfw186fnyd0glcp0s8iiy5g2zy2y7jsllm5qi";
x86_64-darwin = "119k1q1dnnhzdyv3wx13ghpwvsrmb1s8ira50ldlac3dr54rhjc9";
aarch64-linux = "0sr9q4rm63p6lgg3qq86hmkcyg4i6znijw1k5h0sv1qc9hrlq6gv";
aarch64-darwin = "0n742ka8ap35klx5yiba08fyqfq5077l8f8b8r5if91rcdwmkwm1";
armv7l-linux = "0a5wd91ksdgabalgmk9pwjjl2haxdidyxz3bnrmrvr1hnlylq1mh";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.70.1";
version = "1.70.1.22228";
pname = "vscodium";
executableName = "codium";

View file

@ -70,6 +70,8 @@ let
in
lib.optionalAttrs config.allowAliases {
b2 = removed "b2" "2022/06";
dome9 = removed "dome9" "2022/08";
ncloud = removed "ncloud" "2022/08";
opc = archived "opc" "2022/05";
oraclepaas = archived "oraclepaas" "2022/05";
template = archived "template" "2022/05";

View file

@ -32,10 +32,10 @@
"owner": "aiven",
"provider-source-address": "registry.terraform.io/aiven/aiven",
"repo": "terraform-provider-aiven",
"rev": "v3.5.0",
"sha256": "sha256-MLcC3fGQaXdtB+4/is30mn9+jbq7UUULFs7DxKE2jxM=",
"vendorSha256": "sha256-mnj8AlVKrTgCOexA9CZELxB1rYtOflXg+dBrSu++enI=",
"version": "3.5.0"
"rev": "v3.5.1",
"sha256": "sha256-EJPf8jDANrjg+XPhFn6L7GPUya2WbrSUX8/hQldQmnQ=",
"vendorSha256": "sha256-X9AJM4OsJ2/zl2Mm6gaz5wA6hk9AfOlUFYYN9Ojirrc=",
"version": "3.5.1"
},
"akamai": {
"owner": "akamai",
@ -51,10 +51,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.180.0",
"sha256": "sha256-vBRik7iS9hUCdj4RfiwXswuIGOHlCMt0QHV2k9yIiGs=",
"rev": "v1.181.0",
"sha256": "sha256-zJagnn/nfueGwevgQaaiB5Y3DF6214JPa/fD/XctLHU=",
"vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=",
"version": "1.180.0"
"version": "1.181.0"
},
"ansible": {
"owner": "nbering",
@ -307,10 +307,10 @@
"owner": "digitalocean",
"provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
"repo": "terraform-provider-digitalocean",
"rev": "v2.21.0",
"sha256": "sha256-ei3nr3SAxQBXQikzPtRs9Y6VyOavTg9GXnLVfAI7QvU=",
"rev": "v2.22.1",
"sha256": "sha256-Sc2altZo/8Y1UYpZjT8beq3VUljJAdzyXexB9Yi5WQI=",
"vendorSha256": null,
"version": "2.21.0"
"version": "2.22.1"
},
"dme": {
"owner": "DNSMadeEasy",
@ -348,15 +348,6 @@
"vendorSha256": "sha256-aPt1y7UEL+Y4aRm0rfHr/yJ393NP2oAqgz7+fo/msQo=",
"version": "2.20.2"
},
"dome9": {
"owner": "dome9",
"provider-source-address": "registry.terraform.io/dome9/dome9",
"repo": "terraform-provider-dome9",
"rev": "v1.27.4",
"sha256": "sha256-+3jIq7f21CkuF3UZYV3o+ZIdoQi0hFgO/qXwdhkcaPI=",
"vendorSha256": null,
"version": "1.27.4"
},
"elasticsearch": {
"owner": "phillbaker",
"provider-source-address": "registry.terraform.io/phillbaker/elasticsearch",
@ -406,10 +397,10 @@
"owner": "FlexibleEngineCloud",
"provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine",
"repo": "terraform-provider-flexibleengine",
"rev": "v1.31.1",
"sha256": "sha256-QB3O9Ez+hFgBE1yYi1kqtC3WW//Ueg/Ij4p2WbQz/AE=",
"vendorSha256": "sha256-P2/yK6aLNdmC8g5dMKK0hpAdj76KtewzVVHQsVgr3J4=",
"version": "1.31.1"
"rev": "v1.32.0",
"sha256": "sha256-zO5bt17cwMnv6kk1McRPOrs4UJ15MBpTRT2WoDovXG4=",
"vendorSha256": "sha256-jX98VUNTOa0C9WiAiFUiFQ9W7vhRdXCgmmxz84CmEpw=",
"version": "1.32.0"
},
"fortios": {
"deleteVendor": true,
@ -435,10 +426,10 @@
"owner": "integrations",
"provider-source-address": "registry.terraform.io/integrations/github",
"repo": "terraform-provider-github",
"rev": "v4.28.0",
"sha256": "sha256-Pu8I+tAcrEN8ZtBv/gH1VguO1GVk3tnqeJ50cLh7/HQ=",
"rev": "v4.29.0",
"sha256": "sha256-on43tlkPxtQFwjbr5zOvzgO8RfcGc8XbUXZURa81Kkc=",
"vendorSha256": null,
"version": "4.28.0"
"version": "4.29.0"
},
"gitlab": {
"owner": "gitlabhq",
@ -454,20 +445,20 @@
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.31.0",
"sha256": "sha256-Y9iyWjC+XLkselVIhaM0N7iNelbdlF9jV7AjTYiD8RM=",
"vendorSha256": "sha256-hu1uK1yW07NlV3/DnKQxdGhbrzpq6MADmgkRr4+VQ1w=",
"version": "4.31.0"
"rev": "v4.32.0",
"sha256": "sha256-idekFsYnrQ4wHjAIPlZn8dSEqOP9KWQvaqImIN/mJA8=",
"vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=",
"version": "4.32.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.31.0",
"sha256": "sha256-5Ieq8LvhrlFevMgr7JKeGCkWWejjOvKhKfXpPvsNzRU=",
"vendorSha256": "sha256-hu1uK1yW07NlV3/DnKQxdGhbrzpq6MADmgkRr4+VQ1w=",
"version": "4.31.0"
"rev": "v4.32.0",
"sha256": "sha256-9iYS8lc4+QPnwMMscU/5mcDlaQrKV8Srhn9o64hZq6k=",
"vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=",
"version": "4.32.0"
},
"googleworkspace": {
"owner": "hashicorp",
@ -554,10 +545,10 @@
"owner": "huaweicloud",
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.38.2",
"sha256": "sha256-ZbfSpno3yEJ7u6g1dBWMza2uLS1FXEzvSKi+mMLbVGQ=",
"rev": "v1.39.0",
"sha256": "sha256-ckjCINqaW8taEzmBEjje3s15OmaAi9LWcSd7vgJyDug=",
"vendorSha256": null,
"version": "1.38.2"
"version": "1.39.0"
},
"huaweicloudstack": {
"owner": "huaweicloud",
@ -662,10 +653,10 @@
"owner": "launchdarkly",
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
"repo": "terraform-provider-launchdarkly",
"rev": "v2.8.0",
"sha256": "sha256-H/oKgylo8LLmx2v0BTj6Vb7JQbf9JCooFmsziog6r4E=",
"rev": "v2.9.0",
"sha256": "sha256-/9J0c79zm3s0i1Um+w+etlpsd37svtovqmBXnGZ1tog=",
"vendorSha256": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=",
"version": "2.8.0"
"version": "2.9.0"
},
"libvirt": {
"owner": "dmacvicar",
@ -776,15 +767,6 @@
"vendorSha256": null,
"version": "2.1.0"
},
"ncloud": {
"owner": "NaverCloudPlatform",
"provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud",
"repo": "terraform-provider-ncloud",
"rev": "v2.2.9",
"sha256": "sha256-D9B3IJZZOCR/kzFee3sBPEbDcAL33kIef/NAYDuJv7U=",
"vendorSha256": "sha256-DPK/RF63rz5AQY/LybT8I6z6vSvqrFqypslhquRrgfg=",
"version": "2.2.9"
},
"netlify": {
"owner": "AegirHealth",
"provider-source-address": "registry.terraform.io/AegirHealth/netlify",
@ -907,10 +889,10 @@
"owner": "opsgenie",
"provider-source-address": "registry.terraform.io/opsgenie/opsgenie",
"repo": "terraform-provider-opsgenie",
"rev": "v0.6.11",
"sha256": "sha256-R+IKAI86DhQ2E74VpswqG75p7PRzSV77at2+dAyI5RI=",
"rev": "v0.6.14",
"sha256": "sha256-IoN7z8/ZPEr6pW7vnDjY65+gAtncV1fr+YsnggSZuZA=",
"vendorSha256": null,
"version": "0.6.11"
"version": "0.6.14"
},
"ovh": {
"owner": "ovh",
@ -1042,10 +1024,10 @@
"owner": "jianyuan",
"provider-source-address": "registry.terraform.io/jianyuan/sentry",
"repo": "terraform-provider-sentry",
"rev": "v0.9.3",
"sha256": "sha256-FTwJ0H5k5zeglgjur3O6b4GybWAmVF4K7QmNMlvHnlY=",
"vendorSha256": "sha256-lmnZLgCTpKGhk+rUWwL2GQoBAXlU006Sk1GZrcEvhD4=",
"version": "0.9.3"
"rev": "v0.9.4",
"sha256": "sha256-dNyUp+gXrOvMQu5tEnv2dOsXihyd19gdYakIo7+h3pY=",
"vendorSha256": "sha256-ohPZpFCjawaymVHZoCstPeu+p0erRnfnpbjipT6Sp20=",
"version": "0.9.4"
},
"shell": {
"owner": "scottwinkler",
@ -1132,19 +1114,19 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.77.1",
"sha256": "sha256-U/gmvLHu/Gt7pfxXAQYEQdpS1r7Epees2VkaHdnK1VI=",
"rev": "v1.77.3",
"sha256": "sha256-OHE8o4KJ2dsSS/Erl7MrRrAl8DTIxotEg69S9fuh7iY=",
"vendorSha256": null,
"version": "1.77.1"
"version": "1.77.3"
},
"tfe": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/tfe",
"repo": "terraform-provider-tfe",
"rev": "v0.35.0",
"sha256": "sha256-YSQrDiaADEi8eTnFaXfsX3wz4bst/h/gVts4YjWbVzI=",
"vendorSha256": "sha256-Qa0EKVaMFpSpTc5z4KhAeK8bhDNPeac1QzeTSNkUwA0=",
"version": "0.35.0"
"rev": "v0.36.0",
"sha256": "sha256-xMIrEkjcYkM/LXdu/0gNX6iMJKZhGs9z2vQBbDHdelo=",
"vendorSha256": "sha256-ck6H22N5IXJVa0KeXM0Ntv+16l97v8GaT7xfGme57QE=",
"version": "0.36.0"
},
"thunder": {
"owner": "a10networks",

View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "22.08.07";
version = "22.08.15";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-nYRiAp8cHDyWGlb/s6ysiI2w2Oo7yj1HnKPo0EOqvhY=";
sha256 = "sha256-2Ay5wykXuXKwcGFvFKu6SIFKdWFMdBvHwgSrqNCszMM=";
};
nativeBuildInputs = [ gtk3 ];

View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "22.08.07";
version = "22.08.15";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-AWDahl9DUAEYY7OW9E323LOdM37INcAbEXA19FYRObE=";
sha256 = "sha256-VJsxZFzraCQPNr/zS7ElPk52Tq5YHrFxaQJMUuHcnLw=";
};
nativeBuildInputs = [ gtk3 ];

View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenvNoCC, fetchurl }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "wireless-regdb";
version = "2022.06.06";
version = "2022.08.12";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-rAD5fv7M5QRu0GnR2T8zZf35lMfHhUqPxQgx6VlTcjA=";
sha256 = "sha256-Wcj30Xlm23Gyf5DnNe6PW0LKNSdpSoxebptWvTecO4Q=";
};
dontBuild = true;

View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "libnbd";
version = "1.14.0";
version = "1.14.1";
src = fetchurl {
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
hash = "sha256-fwVAMqZGX1HZMA/81qb67K5gwSqtcT1HnLBLdqDr4Cc=";
hash = "sha256-LwgXVWOWwyc9OUJEKHkDQEfGBy41XsdbRuG+zluFc3E=";
};
nativeBuildInputs = [

View file

@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "oneDNN";
version = "2.3.2";
version = "2.6.1";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
sha256 = "sha256-sfTcBthrnt7m9AnzdwWl9yLu1jRpwUp8i9s9DlA3IJo=";
sha256 = "sha256-cO8hT5ZrA9VegxOFH9fHm3YKK4A6XmaWIAfPTytNu6I=";
};
outputs = [ "out" "dev" "doc" ];
@ -21,12 +21,6 @@ stdenv.mkDerivation rec {
# Tests fail on some Hydra builders, because they do not support SSE4.2.
doCheck = false;
# The cmake install gets tripped up and installs a nix tree into $out, in
# addition to the correct install; clean it up.
postInstall = ''
rm -r $out/nix
'';
meta = with lib; {
description = "oneAPI Deep Neural Network Library (oneDNN)";
homepage = "https://01.org/oneDNN";

View file

@ -0,0 +1,117 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, fetchurl
, pkg-config
, cmake
, python3
, libpng
, zlib
, eigen
, protobuf
, howard-hinnant-date
, nlohmann_json
, boost
, oneDNN
, gtest
}:
let
# prefetch abseil
# Note: keep URL in sync with `cmake/external/abseil-cpp.cmake`
abseil = fetchurl {
url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip";
sha256 = "sha256-pFZ/8C+spnG5XjHTFbqxi0K2xvGmDpHG6oTlohQhEsI=";
};
in
stdenv.mkDerivation rec {
pname = "onnxruntime";
version = "1.12.1";
src = fetchFromGitHub {
owner = "microsoft";
repo = "onnxruntime";
rev = "v${version}";
sha256 = "sha256-wwllEemiHTp9aJcCd1gsTS4WUVMp5wW+4i/+6DzmAeM=";
fetchSubmodules = true;
};
patches = [
# Use dnnl from nixpkgs instead of submodules
(fetchpatch {
name = "system-dnnl.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad";
sha256 = "sha256-58RBrQnAWNtc/1pmFs+PkZ6qCsL1LfMY3P0exMKzotA=";
})
];
nativeBuildInputs = [
cmake
pkg-config
python3
gtest
];
buildInputs = [
libpng
zlib
protobuf
howard-hinnant-date
nlohmann_json
boost
oneDNN
];
# TODO: build server, and move .so's to lib output
outputs = [ "out" "dev" ];
enableParallelBuilding = true;
cmakeDir = "../cmake";
cmakeFlags = [
"-Donnxruntime_PREFER_SYSTEM_LIB=ON"
"-Donnxruntime_BUILD_SHARED_LIB=ON"
"-Donnxruntime_ENABLE_LTO=ON"
"-Donnxruntime_BUILD_UNIT_TESTS=ON"
"-Donnxruntime_USE_PREINSTALLED_EIGEN=ON"
"-Donnxruntime_USE_MPI=ON"
"-Deigen_SOURCE_PATH=${eigen.src}"
"-Donnxruntime_USE_DNNL=YES"
];
doCheck = true;
postPatch = ''
substituteInPlace cmake/external/abseil-cpp.cmake \
--replace "${abseil.url}" "${abseil}"
'';
postInstall = ''
# perform parts of `tools/ci_build/github/linux/copy_strip_binary.sh`
install -m644 -Dt $out/include \
../include/onnxruntime/core/framework/provider_options.h \
../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \
../include/onnxruntime/core/session/onnxruntime_*.h
'';
meta = with lib; {
description = "Cross-platform, high performance scoring engine for ML models";
longDescription = ''
ONNX Runtime is a performance-focused complete scoring engine
for Open Neural Network Exchange (ONNX) models, with an open
extensible architecture to continually address the latest developments
in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX
standard with complete implementation of all ONNX operators, and
supports all ONNX releases (1.2+) with both future and backwards
compatibility.
'';
homepage = "https://github.com/microsoft/onnxruntime";
changelog = "https://github.com/microsoft/onnxruntime/releases/tag/v${version}";
# https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures
platforms = platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ jonringer puffnfresh ck3d ];
};
}

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.10.1";
version = "1.11.1";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-CdmzGqqzMvLYAXJ2hpjoOQ8FA53PzGspWdjTFWlshYI=";
hash = "sha256-jQmihZl1mKBHg7HLKAbe9uuL1QM+cF0beFj8htz0IOU=";
};
cargoHash = "sha256-X41CSz52S2M4rUsX/GiDGoBpZgUS8UNPvHg7rxbsG0k=";
cargoHash = "sha256-bO9QMMJY+gQyV811qXdwiH1oxW+5Q+dZqG/oT35Eze4=";
meta = with lib; {
description = "Source code spell checker";

View file

@ -1,6 +1,6 @@
{ lib, buildPackages, stdenv, autoreconfHook, fetchurl }:
{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "alsa-firmware";
version = "1.2.4";

View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, b43FirmwareCutter }:
{ lib, stdenvNoCC, fetchurl, b43FirmwareCutter }:
let version = "5.100.138"; in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "b43-firmware";
inherit version;
@ -24,4 +24,3 @@ stdenv.mkDerivation {
license = lib.licenses.unfree;
};
}

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, b43FirmwareCutter }:
{ lib, stdenvNoCC, fetchurl, b43FirmwareCutter }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "b43-firmware";
version = "6.30.163.46";

View file

@ -1,9 +1,6 @@
{ lib, stdenv, fetchurl, cabextract, bt-fw-converter }:
{ lib, stdenvNoCC, fetchurl, cabextract, bt-fw-converter }:
# Kernels between 4.2 and 4.7 will not work with
# this packages as they expect the firmware to be named "BCM.hcd"
# see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "broadcom-bt-firmware";
version = "12.0.1.1012";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unrar-wrapper, pkgs }:
{ lib, stdenvNoCC, fetchurl, unrar-wrapper, pkgs }:
let
@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "facetimehd-calibration";
inherit version;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cpio, xz, pkgs }:
{ lib, stdenvNoCC, fetchurl, cpio, xz, pkgs }:
let
@ -33,7 +33,7 @@ let
in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "facetimehd-firmware";
inherit version;

View file

@ -1,8 +1,8 @@
{ stdenv
{ stdenvNoCC
, lib
, fetchurl }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "intel2200BGFirmware";
version = "3.1";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, lib}:
{ stdenvNoCC, fetchFromGitHub, lib}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "libreelec-dvb-firmware";
version = "1.4.2";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "raspberrypi-wireless-firmware";
version = "2021-12-06";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
name = "rt5677-firmware";
src = fetchFromGitHub {

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
with lib;
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "rtl8192su";
version = "unstable-2016-10-05";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, linuxPackages }:
{ lib, stdenvNoCC, linuxPackages }:
with lib;
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "rtl8723bs-firmware";
version = linuxPackages.rtl8723bs.version;
inherit (linuxPackages.rtl8723bs) src;

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
name = "rtl8761b-firmware";
src = fetchFromGitHub {

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, cabextract }:
{ stdenvNoCC, lib, fetchurl, cabextract }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "xow_dongle-firmware";
version = "2017-07";
@ -32,5 +32,3 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}

View file

@ -1,9 +1,9 @@
{ stdenv
{ stdenvNoCC
, lib
, fetchurl
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "zd1211-firmware";
version = "1.5";

View file

@ -24,6 +24,14 @@ perlPackages.buildPerlModule {
src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
patches = [
# Perl 5.36.0 compatibility: https://github.com/plk/biber/pull/411
(fetchpatch {
url = "https://github.com/plk/biber/commit/d9e961710074d266ad6bdf395c98868d91952088.patch";
sha256 = "08fx7mvq78ndnj59xv3crncih7a8201rr31367kphysz2msjbj52";
})
];
buildInputs = with perlPackages; [
autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K

View file

@ -989,7 +989,6 @@ mapAliases ({
odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25
ofp = throw "ofp is not compatible with odp-dpdk";
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # Added 2020-12-04
openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06
opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22

View file

@ -4382,6 +4382,8 @@ with pkgs;
online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools;
onnxruntime = callPackage ../development/libraries/onnxruntime { };
xkbd = callPackage ../applications/misc/xkbd { };
libpsm2 = callPackage ../os-specific/linux/libpsm2 { };