From 839d828b9c367e384c41077d4c76494515c156aa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Aug 2022 15:51:22 +0000 Subject: [PATCH 01/15] treewide: firmware: stdenv -> stdenvNoCC None of these packages use a compiler, except for alsa-firmware, which has the appropriate compiler in depsBuildBuild already. Tested by building a NixOS system with hardware.enableAllFirmware = true. --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- .../linux/alsa-project/alsa-firmware/default.nix | 4 ++-- pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix | 5 ++--- .../linux/firmware/b43-firmware/6.30.163.46.nix | 4 ++-- .../linux/firmware/broadcom-bt-firmware/default.nix | 7 ++----- .../linux/firmware/facetimehd-calibration/default.nix | 4 ++-- .../linux/firmware/facetimehd-firmware/default.nix | 4 ++-- .../linux/firmware/intel2200BGFirmware/default.nix | 4 ++-- .../linux/firmware/libreelec-dvb-firmware/default.nix | 4 ++-- .../linux/firmware/raspberrypi-wireless/default.nix | 4 ++-- pkgs/os-specific/linux/firmware/rt5677/default.nix | 4 ++-- .../linux/firmware/rtl8192su-firmware/default.nix | 4 ++-- .../linux/firmware/rtl8723bs-firmware/default.nix | 4 ++-- .../linux/firmware/rtl8761b-firmware/default.nix | 4 ++-- .../linux/firmware/xow_dongle-firmware/default.nix | 6 ++---- pkgs/os-specific/linux/firmware/zd1211/default.nix | 4 ++-- 16 files changed, 32 insertions(+), 38 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 2c92896b5a1c..cef187bf2578 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; version = "2022.06.06"; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index 2ef971a8cf7f..8ddc97890e92 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 98d793c5d998..a5683a1ce535 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -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; }; } - diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 92c179726d25..e117db45b182 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -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"; diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index a0985cad0dbe..073d443bee41 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -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"; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix index 86a3924c0e28..ca6782688728 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 1c3d8fbbaf7d..6679f1f19e75 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index 7c195cd2d7ca..716c5e4d8288 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "intel2200BGFirmware"; version = "3.1"; diff --git a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix index 2103012d3ed9..9579ff11c739 100644 --- a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, lib}: +{ stdenvNoCC, fetchFromGitHub, lib}: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "libreelec-dvb-firmware"; version = "1.4.2"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index c9192744a46a..730e839bd457 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "raspberrypi-wireless-firmware"; version = "2021-12-06"; diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix index f21d34bbe533..47e0068cc348 100644 --- a/pkgs/os-specific/linux/firmware/rt5677/default.nix +++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "rt5677-firmware"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 3363140ad569..53f32ac31f9d 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: with lib; -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "rtl8192su"; version = "unstable-2016-10-05"; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index f3ea80348b3b..8e486e1c4b2c 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -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; diff --git a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix index 925521696da9..c3fbe79537c4 100644 --- a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "rtl8761b-firmware"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix index 72e3817f2aa2..824615a4baf2 100644 --- a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix @@ -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; }; } - - diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 075e46a5de55..6b86277ebc6e 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "zd1211-firmware"; version = "1.5"; From 1239258e5260ac18355dc2fe145e3b232ff82f53 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 16 Aug 2022 15:58:03 +0200 Subject: [PATCH 02/15] typos: 1.10.1 -> 1.11.1 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index ee5c636509af..5c2550e89093 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -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"; From 138e71667ef13c54ec4377eac91c62085f6b1d2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 14:49:17 +0000 Subject: [PATCH 03/15] libnbd: 1.14.0 -> 1.14.1 --- pkgs/development/libraries/libnbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 9ff3ee15a174..2156e9c2f97f 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -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 = [ From 27882f4e0e88b418867387b4f232189e4cbd7c5e Mon Sep 17 00:00:00 2001 From: booklearner Date: Tue, 16 Aug 2022 13:09:16 -0400 Subject: [PATCH 04/15] maintainers: update email (`booklearner`) Signed-off-by: booklearner --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0259d9ede1e5..fdbeccb45b67 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1778,7 +1778,7 @@ }; booklearner = { name = "booklearner"; - email = "hey@booklearner.org"; + email = "booklearner@proton.me"; matrix = "@booklearner:matrix.org"; github = "booklearner"; githubId = 103979114; From 5f6251aab7f747359320b1edbd2236dfebdfaedf Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 16 Aug 2022 21:48:45 +0200 Subject: [PATCH 05/15] numix-icon-theme-circle: 22.08.07 -> 22.08.15 https://github.com/numixproject/numix-icon-theme-circle/releases/tag/22.08.15 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 2385d413d3c4..1caa99ff9f80 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -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 ]; From a09957f96b56d9eccbbb3835511d7779e96676d9 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 16 Aug 2022 21:49:57 +0200 Subject: [PATCH 06/15] numix-icon-theme-square: 22.08.07 -> 22.08.15 https://github.com/numixproject/numix-icon-theme-square/releases/tag/22.08.15 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 35f9f72591db..3c24621f42e7 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -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 ]; From c784cdbf6b98e3e3aefb678b6ee8309cbb8bee15 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 16 Aug 2022 20:46:05 -0300 Subject: [PATCH 07/15] biber: import patch for Perl 5.36.0 compat --- pkgs/tools/typesetting/biber/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 992da3578e51..b85dfcff3e2e 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -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 From ab2905f473e91062d6cf6fb918020868fa4e1fca Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 17 Aug 2022 00:25:55 +0000 Subject: [PATCH 08/15] vscodium: 1.70.1 -> 1.70.1.22228 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f6b52a4fede7..7d671496cfc6 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -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"; From 953213ab851f20c33c2e71e7cad13367ebc36d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 14 Aug 2022 18:12:08 +0200 Subject: [PATCH 09/15] oneDDN: 2.3.2 -> 2.6.1 --- pkgs/development/libraries/oneDNN/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index a4c4bb057251..8137f2b55b31 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -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"; From 579237dbf5fa9722b204b62406d2e1a21516df51 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sat, 15 Jan 2022 07:29:24 +1000 Subject: [PATCH 10/15] onnxruntime: init at 1.10.0 (resurrected) --- .../libraries/onnxruntime/default.nix | 135 ++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 + 3 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/onnxruntime/default.nix diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix new file mode 100644 index 000000000000..4e41513bb191 --- /dev/null +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -0,0 +1,135 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, runCommand +, patchutils +, pkg-config +, glibcLocales +, cmake +, python3 +, libpng +, zlib +, eigen +, protobuf +, nsync +, flatbuffers +, howard-hinnant-date +, re2 +, nlohmann_json +, boost +, oneDNN +}: + +let + externals = { + pytorch_cpuinfo = fetchFromGitHub { + owner = "pytorch"; + repo = "cpuinfo"; + rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; + sha256 = "sha256-nXBnloVTuB+AVX59VDU/Wc+Dsx94o92YQuHp3jowx2A="; + }; + onnx = fetchFromGitHub { + owner = "onnx"; + repo = "onnx"; + rev = "be76ca7148396176784ba8733133b9fb1186ea0d"; + sha256 = "sha256-WwbfUijV67LL69RPgz+4m6EcwSyBNFweGUe0jkYRpbg="; + }; + "SafeInt/safeint" = fetchFromGitHub { + owner = "dcleblanc"; + repo = "SafeInt"; + rev = "a104e0cf23be4fe848f7ef1f3e8996fe429b06bb"; + sha256 = "sha256-LmQNIoHPqvl8asn86P33SDn+lCg8LpLfxUmoG9CGEdc="; + }; + }; +in +stdenv.mkDerivation rec { + pname = "onnxruntime"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "onnxruntime"; + rev = "v${version}"; + sha256 = "sha256-kWl0xrbTQL2FBSvpiqTcaj8uZV+ZV8gJJvj4/I0jopw="; + }; + + preConfigure = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: path: '' + rmdir cmake/external/${name} + ln -s ${path} cmake/external/${name} + '') externals); + + patches = [ + # Exclude the flatbuffers change which breaks things + (runCommand "filtered" { + AUR_PATCH = fetchpatch { + name = "aur-build-fixes.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/build-fixes.patch?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; + sha256 = "sha256-bAJWThTbECQaoqDdkjHLneg6I1BshGMyCWaj7nfACvA="; + }; + } '' + ${patchutils}/bin/filterdiff --hunks 1,2 $AUR_PATCH > $out + '') + (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="; + }) + ]; + + # TODO: build server, and move .so's to lib output + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + buildInputs = [ + libpng + zlib + protobuf + nsync + flatbuffers + howard-hinnant-date + re2 + nlohmann_json + boost + oneDNN + ]; + + cmakeDir = "../cmake"; + + cmakeFlags = [ + "-Donnxruntime_PREFER_SYSTEM_LIB=ON" + "-Donnxruntime_BUILD_SHARED_LIB=ON" + "-Donnxruntime_ENABLE_LTO=ON" + "-Donnxruntime_BUILD_UNIT_TESTS=OFF" + "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" + "-Donnxruntime_USE_MPI=ON" + "-Deigen_SOURCE_PATH=${eigen.src}" + "-Donnxruntime_USE_DNNL=YES" + ]; + + enableParallelBuilding = true; + + meta = { + 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"; + # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures + platforms = lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jonringer puffnfresh ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bd27f1db3182..3d1eb0c2035a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd7a49ef54fe..bc770ddbc03d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From da9cf977b7d2c0ee780277d26664628a7c087712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 14 Aug 2022 18:37:57 +0200 Subject: [PATCH 11/15] onnxruntime: 1.10.0 -> 1.12.1 --- .../libraries/onnxruntime/default.nix | 92 ++++++++----------- 1 file changed, 37 insertions(+), 55 deletions(-) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 4e41513bb191..e3ef22676412 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -2,74 +2,43 @@ , lib , fetchFromGitHub , fetchpatch -, runCommand -, patchutils +, fetchurl , pkg-config -, glibcLocales , cmake , python3 , libpng , zlib , eigen , protobuf -, nsync -, flatbuffers , howard-hinnant-date -, re2 , nlohmann_json , boost , oneDNN +, gtest }: let - externals = { - pytorch_cpuinfo = fetchFromGitHub { - owner = "pytorch"; - repo = "cpuinfo"; - rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; - sha256 = "sha256-nXBnloVTuB+AVX59VDU/Wc+Dsx94o92YQuHp3jowx2A="; - }; - onnx = fetchFromGitHub { - owner = "onnx"; - repo = "onnx"; - rev = "be76ca7148396176784ba8733133b9fb1186ea0d"; - sha256 = "sha256-WwbfUijV67LL69RPgz+4m6EcwSyBNFweGUe0jkYRpbg="; - }; - "SafeInt/safeint" = fetchFromGitHub { - owner = "dcleblanc"; - repo = "SafeInt"; - rev = "a104e0cf23be4fe848f7ef1f3e8996fe429b06bb"; - sha256 = "sha256-LmQNIoHPqvl8asn86P33SDn+lCg8LpLfxUmoG9CGEdc="; - }; + # 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.10.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "sha256-kWl0xrbTQL2FBSvpiqTcaj8uZV+ZV8gJJvj4/I0jopw="; + sha256 = "sha256-wwllEemiHTp9aJcCd1gsTS4WUVMp5wW+4i/+6DzmAeM="; + fetchSubmodules = true; }; - preConfigure = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: path: '' - rmdir cmake/external/${name} - ln -s ${path} cmake/external/${name} - '') externals); - patches = [ - # Exclude the flatbuffers change which breaks things - (runCommand "filtered" { - AUR_PATCH = fetchpatch { - name = "aur-build-fixes.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/build-fixes.patch?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; - sha256 = "sha256-bAJWThTbECQaoqDdkjHLneg6I1BshGMyCWaj7nfACvA="; - }; - } '' - ${patchutils}/bin/filterdiff --hunks 1,2 $AUR_PATCH > $out - '') + # 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"; @@ -77,44 +46,57 @@ stdenv.mkDerivation rec { }) ]; - # TODO: build server, and move .so's to lib output - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkg-config python3 + gtest ]; buildInputs = [ libpng zlib protobuf - nsync - flatbuffers howard-hinnant-date - re2 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=OFF" + "-Donnxruntime_BUILD_UNIT_TESTS=ON" "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" "-Donnxruntime_USE_MPI=ON" "-Deigen_SOURCE_PATH=${eigen.src}" "-Donnxruntime_USE_DNNL=YES" ]; - enableParallelBuilding = true; + doCheck = true; - meta = { + 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 @@ -126,10 +108,10 @@ stdenv.mkDerivation rec { compatibility. ''; homepage = "https://github.com/microsoft/onnxruntime"; - changelog = "https://github.com/microsoft/onnxruntime/releases"; + changelog = "https://github.com/microsoft/onnxruntime/releases/tag/v${version}"; # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures - platforms = lib.platforms.unix; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jonringer puffnfresh ]; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ jonringer puffnfresh ck3d ]; }; } From 738dcf6608aa4860d9ef348a5a863d2d1310f413 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Aug 2022 11:37:48 +1000 Subject: [PATCH 12/15] terraform-providers.dome9: remove broken vendoring, needs to be fixed upstream --- .../networking/cluster/terraform-providers/default.nix | 1 + .../cluster/terraform-providers/providers.json | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index fcc70509e7a1..4ce10a30f7df 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -70,6 +70,7 @@ let in lib.optionalAttrs config.allowAliases { b2 = removed "b2" "2022/06"; + dome9 = removed "dome9" "2022/08"; opc = archived "opc" "2022/05"; oraclepaas = archived "oraclepaas" "2022/05"; template = archived "template" "2022/05"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 52ff28cfc72e..fac8e778d658 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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", From 50be8adfef2d6eb9a6996d451a307ac3b9073df9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Aug 2022 11:38:39 +1000 Subject: [PATCH 13/15] terraform-providers.ncloud: remove broken vendoring, needs to be fixed upstream --- .../networking/cluster/terraform-providers/default.nix | 1 + .../cluster/terraform-providers/providers.json | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 4ce10a30f7df..312bf72f5a5a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -71,6 +71,7 @@ let 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"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fac8e778d658..acffa01ce67b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -767,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", From 817f5c4a8a91264eb287591962db7e23c626568f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Aug 2022 04:16:48 +0000 Subject: [PATCH 14/15] terraform-providers: update 2022-08-17 --- .../terraform-providers/providers.json | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index acffa01ce67b..9ab1a586edee 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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", @@ -397,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, @@ -426,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", @@ -445,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", @@ -545,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", @@ -653,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", @@ -889,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", @@ -1024,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", @@ -1114,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", From 04c142749cce5f7bd13d9b09175e72ae2c6e35d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 01:28:03 +0000 Subject: [PATCH 15/15] wireless-regdb: 2022.06.06 -> 2022.08.12 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index cef187bf2578..1bf0abc41ae5 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ 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;