From 714f94398434a948095c5ee597e69661974cd7fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 15 Oct 2022 17:26:49 +0200 Subject: [PATCH 001/222] CONTRIBUTING.md: "no squash merges" --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c4bea0ae252..82f53c91ea40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,6 +53,10 @@ In addition to writing properly formatted commit messages, it's important to inc For package version upgrades and such a one-line commit message is usually sufficient. +We prefer not to use the "squash merge" feature in nixpkgs: in order to keep as much information as possible in the commit history, we expect pull requests to consist of self-contained commits as described above. +This means that, after addressing review comments and before the PR is merged, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`. +Useful commands to be comfortable with are `git commit --amend`, `git commit --fixup` and `git rebase -i` (and don't forget that git lets you define aliases!). + ## Rebasing between branches (i.e. from master to staging) From time to time, changes between branches must be rebased, for example, if the From 6fdd38373ef9667ef959538908275701597c09c8 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 18 Oct 2022 22:47:32 +0200 Subject: [PATCH 002/222] BeatSaberModManager: init at 0.0.2 --- pkgs/games/BeatSaberModManager/default.nix | 59 +++++++++++++++++ pkgs/games/BeatSaberModManager/deps.nix | 73 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 134 insertions(+) create mode 100644 pkgs/games/BeatSaberModManager/default.nix create mode 100644 pkgs/games/BeatSaberModManager/deps.nix diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix new file mode 100644 index 000000000000..efaa13b6a605 --- /dev/null +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -0,0 +1,59 @@ +{ + lib, + + buildDotnetModule, + fetchFromGitHub, + + libX11, + libICE, + libSM, + fontconfig, +}: + +buildDotnetModule rec { + pname = "BeatSaberModManager"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "affederaffe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-6+9pWr8jJzs430Ai2ddh/2DK3C2bQA1e1+BNDrKhyzY="; + fetchSubmodules = true; # It vendors BSIPA-Linux + }; + + nugetDeps = ./deps.nix; + + dotnetInstallFlags = [ + # FIXME It doesn't like that for some reason beyond my ability to package dotnet + "-p:PublishSingleFile=false" + ]; + + runtimeDeps = [ + libX11 + libICE + libSM + fontconfig + ]; + + meta = with lib; { + description = "Yet another mod installer for Beat Saber, heavily inspired by ModAssistant"; + homepage = "https://github.com/affederaffe/BeatSaberModManager"; + longDescription = '' + BeatSaberModManager is yet another mod installer for Beat Saber, heavily inspired by ModAssistant + It strives to look more visually appealing and support both Windows and Linux, while still being as feature-rich as ModAssistant. + + Features + + - Windows and Linux support + - Dependency resolution + - Installed mod detection + - Mod uninstallation + - Theming support + - OneClick™ support for BeatSaver, ModelSaber and Playlists + ''; + license = licenses.mit; + maintainers = with maintainers; [ atemu ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix new file mode 100644 index 000000000000..8a0f34b7cabe --- /dev/null +++ b/pkgs/games/BeatSaberModManager/deps.nix @@ -0,0 +1,73 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Avalonia"; version = "0.10.16"; sha256 = "1197xyswinazahjd8mhfsrjszhcv4mdj48c56bmdlcsf6zbpravz"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.16"; sha256 = "1xlg7r9r77fc9bcjw3rnnknncny7mcnkin6nwhg0sig4ab6givd2"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.16"; sha256 = "09fg9j411kq0012wvix1bxiybif3pm1if624mwg4ng7w2z97dfl3"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.16"; sha256 = "1rxcbsbszgyb77gxp4zvg9k1cxw40vbm1z04dn5dqp4bfam9gnnh"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.16"; sha256 = "10p93y3zr8aq8malahdllknk28afr0p2n7fz1c7hbhbkdpfjz01a"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.16"; sha256 = "1m6cgql12rkzxxzvyxd1d0f5z2k4myby6d90li5p3nhblswx6jpk"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.16"; sha256 = "1cp1i07v1pkbff2qm046r1g517lw14q3vrli6f2k0i6aw7naay80"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.16"; sha256 = "00iv96n2q2qg34zgqzcaja39396fbk8fj373d7zld46c64kf8g4h"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.16"; sha256 = "1rla042nc9mc36qnpipszrf0sffwi5d83cr9dmihpa015bby42pz"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.16"; sha256 = "171jv4hdi2r0wgmrjv8ajnjmwrf9j2d0g4ffyhhmmjnaclckgzgv"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.16"; sha256 = "0yr8vkn59phlgcjkhzyygn2i3ghzhvd64sy84qyxxxyfm376cyxr"; }) + (fetchNuGet { pname = "DryIoc.dll"; version = "5.1.0"; sha256 = "0vim3xmaajnvhwz01028lizjl2j0y2r2cbiwz0ga7n903pncrahw"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.4"; sha256 = "0mfmlsdd48dpwiphqhq8gsix2528mc6anp7rakd6vyzmig60f520"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.2.9"; sha256 = "156747759npb2dgsnd2y1bq2vnmmssizsz78kf80mr8pd60wlbj4"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.1.0"; sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.1.0"; sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.0.11"; sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.0.11"; sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) + (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) + (fetchNuGet { pname = "Splat"; version = "14.3.4"; sha256 = "1j5riry4hc6gmw6zkwqq4fsw4rcddnb8kwyhnb321qp60z8v8pv4"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "ThisAssembly.AssemblyInfo"; version = "1.0.9"; sha256 = "0rvav885cq7ia5kzwp7d37c2azsg47988z2fn6ksi1q6y294crxm"; }) + (fetchNuGet { pname = "ThisAssembly.Prerequisites"; version = "1.0.9"; sha256 = "1igi76li4c1iif71141jhn7x5w0ng1vmqj5ijjhdxz289n6wjf2g"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.3.4"; sha256 = "0w1bz5sr6y5fhgx1f54xyl8rx7y3kyf1fhacnd6akq8970zjdkdi"; }) +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c4a47223a04..1314dc70efb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3026,6 +3026,8 @@ with pkgs; beats = callPackage ../tools/misc/beats { }; + BeatSaberModManager = callPackage ../games/BeatSaberModManager/default.nix { }; + beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { inherit (plasma5Packages) breeze-icons; }; From 0fb17c04fe34ac45247d35a1e4e0521652d9c494 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 18 Oct 2022 23:39:42 +0200 Subject: [PATCH 003/222] BeatSaberModManager: install as single file --- .../add-runtime-identifier.patch | 12 ++++++++++++ pkgs/games/BeatSaberModManager/default.nix | 15 ++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 pkgs/games/BeatSaberModManager/add-runtime-identifier.patch diff --git a/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch new file mode 100644 index 000000000000..0f49cc07f0a8 --- /dev/null +++ b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch @@ -0,0 +1,12 @@ +--- a/BeatSaberModManager/BeatSaberModManager.csproj ++++ b/BeatSaberModManager/BeatSaberModManager.csproj +@@ -14,6 +14,7 @@ + true + true + Resources/Icons/Icon.ico ++ @RuntimeIdentifier@ + + + + +Diff finished. Tue Oct 18 23:16:23 2022 diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index efaa13b6a605..5f25c4d33392 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -1,5 +1,7 @@ { lib, + dotnet-sdk, + targetPlatform, buildDotnetModule, fetchFromGitHub, @@ -22,12 +24,15 @@ buildDotnetModule rec { fetchSubmodules = true; # It vendors BSIPA-Linux }; - nugetDeps = ./deps.nix; + # This _must_ be specified in the project file and it can only be one so + # obviously you wouldn't specify it as an upstream project. Typical M$. + patches = [ ./add-runtime-identifier.patch ]; + postPatch = '' + substituteInPlace BeatSaberModManager/BeatSaberModManager.csproj \ + --replace @RuntimeIdentifier@ "${dotnet-sdk.passthru.systemToDotnetRid targetPlatform.system}" + ''; - dotnetInstallFlags = [ - # FIXME It doesn't like that for some reason beyond my ability to package dotnet - "-p:PublishSingleFile=false" - ]; + nugetDeps = ./deps.nix; runtimeDeps = [ libX11 From ea570d1ed3a1779ed48109766998480d7e2a9e87 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 18 Oct 2022 23:51:39 +0200 Subject: [PATCH 004/222] BeatSaberModManager: leave link to PR comment for context --- pkgs/games/BeatSaberModManager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index 5f25c4d33392..b8a533ed265b 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -26,6 +26,7 @@ buildDotnetModule rec { # This _must_ be specified in the project file and it can only be one so # obviously you wouldn't specify it as an upstream project. Typical M$. + # https://github.com/NixOS/nixpkgs/pull/196648#discussion_r998709996 patches = [ ./add-runtime-identifier.patch ]; postPatch = '' substituteInPlace BeatSaberModManager/BeatSaberModManager.csproj \ From 4d6a7480991970801c0d195eebac90180026367b Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 19 Oct 2022 02:14:28 +0200 Subject: [PATCH 005/222] BeatSaberModManager: use substituteAll instead of custom postPatch --- .../BeatSaberModManager/add-runtime-identifier.patch | 2 +- pkgs/games/BeatSaberModManager/default.nix | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch index 0f49cc07f0a8..a7d17b59a35b 100644 --- a/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch +++ b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch @@ -4,7 +4,7 @@ true true Resources/Icons/Icon.ico -+ @RuntimeIdentifier@ ++ @runtimeIdentifier@ diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index b8a533ed265b..e726644c21dc 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -2,6 +2,7 @@ lib, dotnet-sdk, targetPlatform, + substituteAll, buildDotnetModule, fetchFromGitHub, @@ -27,11 +28,12 @@ buildDotnetModule rec { # This _must_ be specified in the project file and it can only be one so # obviously you wouldn't specify it as an upstream project. Typical M$. # https://github.com/NixOS/nixpkgs/pull/196648#discussion_r998709996 - patches = [ ./add-runtime-identifier.patch ]; - postPatch = '' - substituteInPlace BeatSaberModManager/BeatSaberModManager.csproj \ - --replace @RuntimeIdentifier@ "${dotnet-sdk.passthru.systemToDotnetRid targetPlatform.system}" - ''; + patches = [ + (substituteAll { + src = ./add-runtime-identifier.patch; + runtimeIdentifier = dotnet-sdk.passthru.systemToDotnetRid targetPlatform.system; + }) + ]; nugetDeps = ./deps.nix; From 269c1f5e9047559328b9259be64884809812f996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Mon, 19 Sep 2022 20:22:31 +0100 Subject: [PATCH 006/222] naproche: 2022-04-19 -> 2022-10-24 --- pkgs/applications/science/logic/naproche/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix index 047ed73262ee..ecc347080081 100644 --- a/pkgs/applications/science/logic/naproche/default.nix +++ b/pkgs/applications/science/logic/naproche/default.nix @@ -2,13 +2,13 @@ with haskellPackages; mkDerivation { pname = "Naproche-SAD"; - version = "2022-04-19"; + version = "2022-10-24"; src = fetchFromGitHub { owner = "naproche"; repo = "naproche"; - rev = "2514c04e715395b7a839e11b63046eafb9c6a1da"; - sha256 = "1bdgyk4fk65xi7n778rbgddpg4zhggj8wjslxbizrzi81my9a3vm"; + rev = "c8c4ca2d5fdb92bf17e0e54c99bd2a9691255d80"; + sha256 = "0xvh6kkl5k5ygp2nrbq3k0snvzczbmcp1yrwdkah3fzhf9i3yykx"; }; isExecutable = true; From c012d55d9f6fdd1c9c873d0d389c59ea1a53c031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Mon, 19 Sep 2022 21:36:25 +0100 Subject: [PATCH 007/222] scala_3: expose scala3-bare as attribute --- pkgs/development/compilers/scala/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 11787f1aa690..2ad68ffec3b3 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -21,4 +21,4 @@ stdenv.mkDerivation { ''; inherit (bare) meta; -} +} // { inherit bare; } From 8ff2a80445e05743e252acd5a223452230757617 Mon Sep 17 00:00:00 2001 From: Simon Kohlmeyer Date: Thu, 27 Oct 2022 17:14:18 +0200 Subject: [PATCH 008/222] python311Packages.cffi: patch failing test This seems like an upstream issue with the final release of python3.11. Sadly, their gitlab is down right now, but I will pass the patch upstream as soon as I can. --- pkgs/development/python-modules/cffi/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 66b315f14ab0..52b9ab08fc4d 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pytestCheckHook, - libffi, pkg-config, pycparser + libffi, pkg-config, pycparser, python, fetchpatch }: if isPyPy then null else buildPythonPackage rec { @@ -17,6 +17,17 @@ if isPyPy then null else buildPythonPackage rec { propagatedBuildInputs = [ pycparser ]; + patches = + # Fix test that failed because python seems to have changed the exception format in the + # final release. This patch should be included in the next version and can be removed when + # it is released. + lib.optionals (python.pythonVersion == "3.11") [ + (fetchpatch { + url = "https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816d789639b49d3ae867213393ed7abdff.diff"; + sha256 = "sha256-3wpZeBqN4D8IP+47QDGK7qh/9Z0Ag4lAe+H0R5xCb1E="; + }) + ]; + postPatch = lib.optionalString stdenv.isDarwin '' # Remove setup.py impurities substituteInPlace setup.py \ From 82c5c3c9a9b5309a329f8b247621b0f36fd9210e Mon Sep 17 00:00:00 2001 From: seb314 Date: Sat, 2 Oct 2021 13:34:25 +0200 Subject: [PATCH 009/222] wireguard: when dyn-dns refresh is enabled, reconnect after failures Make the dynamic-dns refresh systemd service (controlled via the preexisting option dynamicEndpointRefreshSecond) robust to e.g. dns failures that happen on intermittent network connections. Background: When dns resolution fails with a 'permanent' error ("Name or service not known" instead of "Temporary failure in name resolution"), wireguard won't retry despite WG_ENDPOINT_RESOLUTION_RETRIES=infinity. -> This change should improve reliability/connectivity. somewhat related thread: https://github.com/NixOS/nixpkgs/issues/63869 --- .../modules/services/networking/wireguard.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 55b84935b6cb..5c18a1001d8d 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -224,6 +224,21 @@ let ''; }; + dynamicEndpointRefreshRestartSeconds = mkOption { + default = null; + example = 5; + type = with types; nullOr ints.unsigned; + description = lib.mdDoc '' + When the dynamic endpoint refresh that is configured via + dynamicEndpointRefreshSeconds exits (likely due to a failure), + restart that service after this many seconds. + + If set to `null` the value of + {option}`networking.wireguard.dynamicEndpointRefreshSeconds` + will be used as the default. + ''; + }; + persistentKeepalive = mkOption { default = null; type = with types; nullOr int; @@ -320,7 +335,16 @@ let # cannot be used with systemd timers (see `man systemd.timer`), # which is why `simple` with a loop is the best choice here. # It also makes starting and stopping easiest. + # + # Restart if the service exits (e.g. when wireguard gives up after "Name or service not known" dns failures): + Restart = "always"; + RestartSec = if null != peer.dynamicEndpointRefreshRestartSeconds + then peer.dynamicEndpointRefreshRestartSeconds + else peer.dynamicEndpointRefreshSeconds; }; + unitConfig = lib.optionalAttrs dynamicRefreshEnabled { + StartLimitIntervalSec = 0; + }; script = let wg_setup = concatStringsSep " " ( From f6b110fb50d805b5cc0178fd4ff85a90b955ee2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Mon, 19 Sep 2022 21:40:46 +0100 Subject: [PATCH 010/222] isabelle: 2021-1 -> 2022 --- .../science/logic/isabelle/default.nix | 59 +++++++++++++------ pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 009af3463a25..1bb7ede6da7b 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,5 +1,24 @@ -{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin, fetchhg }: -# nettools needed for hostname +{ lib +, stdenv +, fetchurl +, coreutils +, nettools +, java +, scala_3 +, polyml +, z3 +, veriT +, vampire +, eprover-ho +, naproche +, rlwrap +, perl +, makeDesktopItem +, isabelle-components +, isabelle +, symlinkJoin +, fetchhg +}: let sha1 = stdenv.mkDerivation { @@ -29,7 +48,7 @@ let }; in stdenv.mkDerivation rec { pname = "isabelle"; - version = "2021-1"; + version = "2022"; dirname = "Isabelle${version}"; @@ -39,26 +58,27 @@ in stdenv.mkDerivation rec { fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc"; + sha256 = "0b84rx9b7b5y8m1sg7xdp17j6yngd2dkx6v5bkd8h7ly102lai18"; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; + sha256 = "1ih4gykkp1an43qdgc5xzyvf30fhs0dah3y0a5ksbmvmjsfnxyp7"; }; + nativeBuildInputs = [ java ]; + buildInputs = [ polyml z3 veriT vampire eprover-ho nettools ] ++ lib.optionals (!stdenv.isDarwin) [ java ]; - sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; + sourceRoot = dirname; - postUnpack = if stdenv.isDarwin then '' - mv $sourceRoot ${dirname} - sourceRoot=${dirname} - '' else null; + postUnpack = lib.optionalString stdenv.isDarwin '' + mv $sourceRoot.app $sourceRoot + ''; postPatch = '' - patchShebangs . + patchShebangs lib/Tools/ bin/ cat >contrib/z3*/etc/settings < Date: Fri, 7 Oct 2022 17:39:55 +0100 Subject: [PATCH 011/222] isabelle-linter: 2021-1 -> 2022-09-05 --- .../isabelle/components/isabelle-linter.nix | 20 ++++++++--- .../logic/isabelle/components/mkBuild.nix | 36 ------------------- 2 files changed, 16 insertions(+), 40 deletions(-) delete mode 100644 pkgs/applications/science/logic/isabelle/components/mkBuild.nix diff --git a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix index 7fca547f67c8..565537cf439c 100644 --- a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix +++ b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix @@ -2,16 +2,28 @@ stdenv.mkDerivation rec { pname = "isabelle-linter"; - version = "Isabelle2021-1-v1.0.0"; + version = "unstable-2022-09-05"; src = fetchFromGitHub { owner = "isabelle-prover"; repo = "isabelle-linter"; - rev = version; - sha256 = "0v6scc2rhj6bjv530gzz6i57czzcgpkw7a9iqnfdnm5gvs5qjk7a"; + rev = "0424fc05426d5f7a23adf19ad08c690c17184e86"; + sha256 = "02afbgmi195ibichjkpni2wjgjkszv7i6qkmmprwrmb4jd2wdvd5"; }; - installPhase = import ./mkBuild.nix { inherit isabelle; path = "${pname}-${version}"; }; + nativeBuildInputs = [ isabelle ]; + + buildPhase = '' + export HOME=$TMP + isabelle components -u $(pwd) + isabelle scala_build + ''; + + installPhase = '' + dir=$out/Isabelle${isabelle.version}/contrib/${pname}-${version} + mkdir -p $dir + cp -r * $dir/ + ''; meta = with lib; { description = "Linter component for Isabelle."; diff --git a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix b/pkgs/applications/science/logic/isabelle/components/mkBuild.nix deleted file mode 100644 index a05b5196b007..000000000000 --- a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ isabelle, path }: - -let - dir = "$out/isabelle/${isabelle.dirname}"; - iDir = "${isabelle}/${isabelle.dirname}"; -in '' - shopt -s extglob - mkdir -p ${dir}/lib/classes - - cDir=$out/${isabelle.dirname}/contrib/${path} - mkdir -p $cDir - cp -r !(isabelle) $cDir - - cd ${dir} - ln -s ${iDir}/!(lib|bin) ./ - ln -s ${iDir}/lib/!(classes) lib/ - ln -s ${iDir}/lib/classes/* lib/classes/ - - mkdir bin/ - cp ${iDir}/bin/* bin/ - - export HOME=$TMP - bin/isabelle components -u $cDir - bin/isabelle scala_build - - cd lib/classes - for f in ${iDir}/lib/classes/*; do - rm $(basename $f) - done - - lDir=$out/${isabelle.dirname}/lib/classes/ - mkdir -p $lDir - cp -r * $lDir - cd $out - rm -rf isabelle -'' From 8d9532935c5a2bc730f962d971a29dde8509696d Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 5 Nov 2022 13:10:46 +0100 Subject: [PATCH 012/222] BeatSaberModManager: add upstream issue link --- pkgs/games/BeatSaberModManager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix index e726644c21dc..eec57d7cf0dd 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/games/BeatSaberModManager/default.nix @@ -28,6 +28,7 @@ buildDotnetModule rec { # This _must_ be specified in the project file and it can only be one so # obviously you wouldn't specify it as an upstream project. Typical M$. # https://github.com/NixOS/nixpkgs/pull/196648#discussion_r998709996 + # https://github.com/affederaffe/BeatSaberModManager/issues/5 patches = [ (substituteAll { src = ./add-runtime-identifier.patch; From b5bf049ab1a5a727a980cd074915ab0962eb417d Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 1 Nov 2022 12:30:14 -0700 Subject: [PATCH 013/222] platformio: 6.1.4 -> 6.1.5 --- pkgs/development/embedded/platformio/core.nix | 5 +++-- pkgs/development/embedded/platformio/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index bcbcbdcb2cac..afd60ec2aebc 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -21,8 +21,9 @@ with python3.pkgs; buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ - --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' \ - --replace 'aiofiles==0.8.*' 'aiofiles==22.1.*' \ + --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16,<=0.19"' \ + --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1,<=0.21"' \ + --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ --replace 'wsproto==' 'wsproto>=' ''; diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index e0443c080c32..241914fa3e1e 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -3,14 +3,14 @@ let callPackage = newScope self; - version = "6.1.4"; + version = "6.1.5"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "sha256-PLVsXnaflEZdn12lWrpnm8+uNfwB+T7JXnvjQihfuSs="; + sha256 = "sha256-7Wx3O2zL5Dlbk7rooiHutpN63kAjhuYijgsZru+oaOI="; }; self = { From 2870a6be78a5d2f383590941ba8005cb57198a34 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Thu, 17 Nov 2022 10:50:33 -0800 Subject: [PATCH 014/222] datefmt: 0.2.1 -> 0.2.2 --- pkgs/tools/misc/datefmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/datefmt/default.nix b/pkgs/tools/misc/datefmt/default.nix index c70d04326fc8..cffa589e3878 100644 --- a/pkgs/tools/misc/datefmt/default.nix +++ b/pkgs/tools/misc/datefmt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "datefmt"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "http://cdn.jb55.com/tarballs/datefmt/datefmt-${version}.tar.gz"; - sha256 = "5d5e765380afe39eb39d48f752aed748b57dfd843a4947b2a6d18ab9b5e68092"; + url = "https://cdn.jb55.com/tarballs/datefmt/datefmt-${version}.tar.gz"; + sha256 = "sha256-HgW/vOGVEmAbm8k3oIwIa+cogq7qmX7MfTmHqxv9lhY="; }; makeFlags = [ "PREFIX=$(out)" ]; From c6fdb1557565b2d241cce917239d5092db8b4934 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 20 Nov 2022 20:46:29 -0500 Subject: [PATCH 015/222] wob: 0.13 -> 0.14.2 --- pkgs/tools/wayland/wob/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index 75f23051c6ea..bb03399f55fb 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, inih , meson , ninja , pkg-config @@ -13,13 +14,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.13"; + version = "0.14.2"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "sha256-CXRBNnnhNV5LBIasVtmGrRG4ZXFGC7qNInU7Y0QsHbs="; + sha256 = "sha256-u4jLVLGcMTgDEgN8jW5d59m3GorJX7Z6+qKhzvbON3k="; }; strictDeps = true; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols ] + buildInputs = [ inih wayland wayland-protocols ] ++ lib.optional stdenv.isLinux libseccomp; mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; From 2d40e4bc7f616feb53e6048aa8cbda83c89a7828 Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Mon, 21 Nov 2022 12:30:30 -0600 Subject: [PATCH 016/222] flameshot: Add darwin support --- pkgs/tools/misc/flameshot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index ea1de3bb24d6..4f7f81b066e0 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -33,6 +33,6 @@ mkDerivation rec { homepage = "https://github.com/flameshot-org/flameshot"; maintainers = with maintainers; [ scode oxalica ]; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From a0365c414c541b4259eeee1fbb5407c1d4cfa3e3 Mon Sep 17 00:00:00 2001 From: Godefroid Chapelle Date: Wed, 23 Nov 2022 11:53:47 +0100 Subject: [PATCH 017/222] python3Packages.zc-buildout: 3.0.0b2 -> 3.0.1 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/python-modules/buildout/default.nix | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee2014d6525b..e20149db52c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5149,6 +5149,12 @@ fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA"; }]; }; + gotcha = { + email = "gotcha@bubblenet.be"; + github = "gotcha"; + githubId = 105204; + name = "Godefroid Chapelle"; + }; govanify = { name = "Gauvain 'GovanifY' Roussel-Tarbouriech"; email = "gauvain@govanify.com"; diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix index efb0a0587114..ace266347994 100644 --- a/pkgs/development/python-modules/buildout/default.nix +++ b/pkgs/development/python-modules/buildout/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "zc-buildout"; - version = "3.0.0b2"; + version = "3.0.1"; src = fetchFromGitHub { owner = "buildout"; repo = "buildout"; rev = version; - sha256 = "01sj09xx5kmkzynhq1xd8ahn6xqybfi8lrqjqr5lr45aaxjk2pid"; + sha256 = "J/ymUCFhl7EviHMEYSUCTky0ULRT8aL4gNCGxrbqJi0="; }; propagatedBuildInputs = [ @@ -32,6 +32,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/buildout/buildout"; homepage = "https://www.buildout.org"; license = licenses.zpl21; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ gotcha ]; }; } From 0f49f88a87a9771c1e041ce2ba7c1e19354a4552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 24 Nov 2022 22:35:24 -0800 Subject: [PATCH 018/222] z3: use python3 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa0c6b4c803a..5591b114f5c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35983,7 +35983,7 @@ with pkgs; }; - inherit (callPackages ../applications/science/logic/z3 { python = python2; }) + inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_11 z3_4_8 z3_4_7; From 152d32009174d62527dd36f8a1d472763a087586 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Fri, 25 Nov 2022 23:20:45 +0000 Subject: [PATCH 019/222] php81Extensions.blackfire: 1.78.1 -> 1.84.0 --- .../tools/misc/blackfire/php-probe.nix | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 29c91a2a1505..3e1fd733ceb9 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -18,35 +18,35 @@ let "8.1" = "blackfire-20210902"; }.${phpMajor} or (throw "Unsupported PHP version."); - version = "1.78.1"; + version = "1.84.0"; hashes = { "x86_64-linux" = { system = "amd64"; - sha256 = "Q9VuZewJ/KX2ZL77d3YLsE80B0y3RYg/hE2H14s9An4="; + sha256 = "4tAqe1ev2s4ZwzPptgXuVL4ZXF37ieGyonBxOFMUKTs="; }; "i686-linux" = { system = "i386"; - sha256 = "YBt6OAeUsQZUyf7P6jIvknq2K0fGWl0xmJkEXFBlTyE="; + sha256 = "OPvn1zcBJDfUu7m3evRayVZNuZJ/KLblm6u4P0z0CvU="; }; "aarch64-linux" = { system = "arm64"; - sha256 = "NTM3xdu+60EBz7pbRyTvhrvvZWVn4tl+LgnkHG1IpYM="; + sha256 = "5P6tVYshPsR4Xl8sCYFuNIRf8LvE6PxWpynP3ZzoP0s="; }; "aarch64-darwin" = { system = "arm64"; sha256 = { "7.4" = { - normal = "4raEYMELZjWfC82348l94G9MTHX2jnF+ZvF4AAxN9JA="; - zts = "HWrcLRZeyFtfJId42iHDN2ci0kTfRoXC/pEv2tObNT8="; + normal = "wNv5LiCbkiyPQFH1jr4Aw4kjHnpqxPa427H4nzNkE8A="; + zts = "FmvzFtukFZPqOz6wkFEtXrb+H8A9bb6ZqeEN9jjtwOQ="; }; "8.0" = { - normal = "kRTULbqlaK3bXRC8WQ1npeZHqWnuobN7eO20oYD5OIE="; - zts = "vWmSXueMIdi+hwmmhCQcltywphLjsNQoCW7eN2KDRvc="; + normal = "tEGMtQf/K5x+dTEd067nhalezmWLKf1A4hM7HM1iwNE="; + zts = "ivbcoqM2U4Zh86+AAml8bHQEn1731A9XsCqW8ai6oKg="; }; "8.1" = { - normal = "JSM/HC2ZYaSBl+cSUtaKQBYPziKk013mwyW9S4DoXFA="; - zts = "9OMm9rEs0o+daxhZdSps4NWQJegLU09zd3SLclGDOns="; + normal = "9GFqlGS2qZWSUoOyYb86RyFdUx2AkQlcq6N2cWHFQ2s="; + zts = "KnxJUxenPxPw0Mo6GdtyLpPN06/K0cSHk2cf7Akf3BE="; }; }; }; @@ -54,16 +54,16 @@ let system = "amd64"; sha256 = { "7.4" = { - normal = "rWaf0Vjkrj78q+64Zy7gJ94Lfwd8waMaOWqoPqRJLRw="; - zts = "zU4cPAWc4k1OEho0fZKutcJ06LstSZhA4U18zx9nfi0="; + normal = "s6aS3INNzOMIV0qW5ROrjX68obnixsOZ4ktnDb/3dGo="; + zts = "4OdHSLLMo9tSVQnaTYfzogeloYPvHxbHhQgACo2V7zA="; }; "8.0" = { - normal = "huGvDPaAmfy8YM6Bg3Y0Ys6JhfIdddOXl1DnnRQsvoE="; - zts = "V4QWMdMhbjQtb2M7g+oHvqy+Mv0Y9j9MwyqeuMZfYkg="; + normal = "JZ6ITbzW7nHmJEQv2KXKPjU9wkY7mH6+tFRJFhJw7ug="; + zts = "x/uP64Ec2tvUylmnWfxsqJMUNlVsFnrxK3CWHdXfgus="; }; "8.1" = { - normal = "pnxegrKPe8WoYAcrnBJanoYT1rg8nO8kQ7SJXQJfymg="; - zts = "m0grZ4Xl6Sm5ZPvmS6mcJGcQOA2ECPJKvzmccqPlyBE="; + normal = "foK+vRwM6PHgToYiPVZIXde18jYJ3bV0Gz23bNS1UYg="; + zts = "LhaaUhOSnAPqHn7LqPgq2UOkS/MoY3CHcpGoFeh+hyo="; }; }; }; @@ -92,6 +92,7 @@ let }; self = stdenv.mkDerivation rec { pname = "php-blackfire"; + extensionName = "blackfire"; inherit version; src = makeSource { From cdb450dcbaed137886897fc5497bade0c895b296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ng=C3=B4=20Ng=E1=BB=8Dc=20=C4=90=E1=BB=A9c=20Huy?= Date: Sat, 26 Nov 2022 12:37:03 +0700 Subject: [PATCH 020/222] maintainers: add huyngo --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee2014d6525b..c3e930236842 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5734,6 +5734,15 @@ githubId = 15371828; name = "Hugo Lageneste"; }; + huyngo = { + email = "huyngo@disroot.org"; + github = "Huy-Ngo"; + name = "Ngô Ngọc Đức Huy"; + githubId = 19296926; + keys = [{ + fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; + }]; + }; hypersw = { email = "baltic@hypersw.net"; github = "hypersw"; From b5fe06f1d2e163355662a010e52e90cbac379a29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Nov 2022 19:23:46 +0000 Subject: [PATCH 021/222] mongodb-compass: 1.33.1 -> 1.34.1 --- pkgs/tools/misc/mongodb-compass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index d946a1918008..15345a28fb90 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.33.1"; + version = "1.34.1"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-Db3Xv6kNAPWqeM+vZeG7GieweaThJO0CCuwm6/v4l2s="; + sha256 = "sha256-TkwSfzTIUMCyNFVA3K+Y2ZKA3gTGXHi1mgySXef1KE4="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From f5339d2339ebc728e32131c8141786b0e5e30cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ng=C3=B4=20Ng=E1=BB=8Dc=20=C4=90=E1=BB=A9c=20Huy?= Date: Sat, 26 Nov 2022 12:44:34 +0700 Subject: [PATCH 022/222] honk: init at 0.9.8 Honk is a minimalistic ActivityPub server. https://humungus.tedunangst.com/r/honk --- pkgs/servers/honk/default.nix | 44 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/servers/honk/default.nix diff --git a/pkgs/servers/honk/default.nix b/pkgs/servers/honk/default.nix new file mode 100644 index 000000000000..913b607ac843 --- /dev/null +++ b/pkgs/servers/honk/default.nix @@ -0,0 +1,44 @@ +{ lib, buildGoModule, fetchurl, installShellFiles, sqlite }: + +buildGoModule rec { + pname = "honk"; + version = "0.9.8"; + + src = fetchurl { + url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz"; + sha256 = "0vh8y1aj2w0y2zxmybhik4iv7myyldfzkd75nzgmlz3vycr60rh6"; + }; + vendorHash = null; + + buildInputs = [ sqlite ]; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "." ]; + + postPatch = '' + substituteInPlace honk.go --replace \ + "var viewDir = \".\"" \ + "var viewDir = \"$out/share/honk\"" + ''; + + postInstall = '' + mkdir -p $out/share/${pname} + mkdir -p $out/share/doc/${pname} + + mv docs/{,honk-}intro.1 + mv docs/{,honk-}hfcs.1 + mv docs/{,honk-}vim.3 + mv docs/{,honk-}activitypub.7 + + installManPage docs/honk.1 docs/honk.3 docs/honk.5 docs/honk.8 \ + docs/honk-intro.1 docs/honk-hfcs.1 docs/honk-vim.3 docs/honk-activitypub.7 + mv docs/{*.html,*.txt,*.jpg,*.png} $out/share/doc/${pname} + mv views $out/share/${pname} + ''; + + meta = with lib; { + description = "An ActivityPub server with minimal setup and support costs."; + homepage = "https://humungus.tedunangst.com/r/honk"; + license = licenses.isc; + maintainers = with maintainers; [ huyngo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c841d8b933da..d95cff8de9d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23726,6 +23726,8 @@ with pkgs; home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components; + honk = callPackage ../servers/honk { }; + hqplayerd = callPackage ../servers/hqplayerd { }; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; From 9c3dc3cfeb15d4073eacb3802e8795abce848607 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Fri, 15 Apr 2022 15:27:40 -0700 Subject: [PATCH 023/222] linux: kernel: enable DRM_HYPERV --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 606a505885d9..1bacfb1315d5 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -303,6 +303,8 @@ let # Intel GVT-g graphics virtualization supports 64-bit only DRM_I915_GVT = whenAtLeast "4.16" yes; DRM_I915_GVT_KVMGT = whenAtLeast "4.16" module; + # Enable Hyper-V Synthetic DRM Driver + DRM_HYPERV = whenAtLeast "5.14" module; } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { # enable HDMI-CEC on RPi boards DRM_VC4_HDMI_CEC = yes; From a980f120e602db7ac88623d68a44e6c761420399 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:08:13 +0100 Subject: [PATCH 024/222] gnome.gnome-calendar: add darwin support --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index f2c0a3aaee35..5782bb861da9 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { description = "Simple and beautiful calendar application for GNOME"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 885901f20a7fedec69f0feeec82bd4309842ab17 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:08:21 +0100 Subject: [PATCH 025/222] gnome.gnome-clocks: add darwin support --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 488922f29100..98a623b9a06b 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { description = "Clock application designed for GNOME 3"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 2d5a1dc13fee53581153b07dd467654e40c3fe17 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:08:32 +0100 Subject: [PATCH 026/222] gnome.vinagre: add darwin support --- pkgs/desktops/gnome/apps/vinagre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix index 9445a5683da9..ea2b1de43653 100644 --- a/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Vinagre"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 1d0badab26b49191106de3213e356ec9fbc795f1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:08:40 +0100 Subject: [PATCH 027/222] gnome.atomix: add darwin support --- pkgs/desktops/gnome/games/atomix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 7720fd1724d6..43278a05b4d6 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Atomix"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 8c318e81d1e64b77f8f6aa8caf440504bc709e3f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:08:48 +0100 Subject: [PATCH 028/222] gnome.hitori: add darwin support --- pkgs/desktops/gnome/games/hitori/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index c17ca56044e4..092735d55a17 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { description = "GTK application to generate and let you play games of Hitori"; maintainers = teams.gnome.members; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 78099fa10d97b7074711d573d902fe3844d1d5e6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:08:55 +0100 Subject: [PATCH 029/222] gnome.tali: add darwin support --- pkgs/desktops/gnome/games/tali/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index 7cb45ec25c1c..99a6cce66431 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "Sort of poker with dice and less money"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From c0cdf0ad4bac64d96bd7c581878d4507c53234c8 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 29 Nov 2022 12:00:00 +0000 Subject: [PATCH 030/222] appimage-run: export OWD documented here: https://docs.appimage.org/packaging-guide/environment-variables.html Fixes #203330 --- pkgs/build-support/appimage/appimage-exec.sh | 3 +++ pkgs/tools/package-management/appimage-run/test.nix | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index 4ff6802e6453..b91d13c4a235 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -7,6 +7,9 @@ fi PATH="@path@:$PATH" apprun_opt=true +OWD=$(readlink -f .) +# can be read by appimages: https://docs.appimage.org/packaging-guide/environment-variables.html +export OWD # src : AppImage # dest : let's unpack() create the directory diff --git a/pkgs/tools/package-management/appimage-run/test.nix b/pkgs/tools/package-management/appimage-run/test.nix index c9bc63c08a8e..34c5ab777268 100644 --- a/pkgs/tools/package-management/appimage-run/test.nix +++ b/pkgs/tools/package-management/appimage-run/test.nix @@ -5,6 +5,10 @@ let url = "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage"; sha256 = "04ws94q71bwskmhizhwmaf41ma4wabvfgjgkagr8wf3vakgv866r"; }; + owdtest = fetchurl { + url = "https://github.com/NixOS/nixpkgs/files/10099048/owdtest.AppImage.gz"; + sha256 = "sha256-EEp9dxz/+l5XkNaVBFgv5v64sizQILnljRAzwXv/yV8="; + }; in runCommand "appimage-run-tests" { buildInputs = [ appimage-run glibcLocales file ]; @@ -18,6 +22,9 @@ in # regression test for #108426 cp ${sample-appImage} foo.appImage LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage + cp ${owdtest} owdtest.AppImage.gz + gunzip owdtest.AppImage.gz + appimage-run owdtest.AppImage set +x touch $out '' From 7a427a54c9582cbad21f25aed4ff5ddb1defb8e3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 30 Nov 2022 00:14:07 -0500 Subject: [PATCH 031/222] pw-viz: init at 0.1.0 --- pkgs/applications/misc/pw-viz/default.nix | 46 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/misc/pw-viz/default.nix diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix new file mode 100644 index 000000000000..f56993247553 --- /dev/null +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -0,0 +1,46 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libGL +, pipewire +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "pw-viz"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ax9d"; + repo = pname; + rev = "v${version}"; + sha256 = "1d46m7w6rzzjpxc2fxwka9xbz49szbfrl63kxlv6kw4lknrladjn"; + }; + + cargoSha256 = "sha256-jx1mUP6ezpwUhmDD9tCJBhHCHU8fEMlB738yYfB1psc="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libGL + pipewire + rustPlatform.bindgenHook + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libxcb + ]; + + postFixup = '' + patchelf $out/bin/pw-viz --add-rpath ${lib.makeLibraryPath [ libGL xorg.libXrandr ]} + ''; + + meta = with lib; { + description = "A simple and elegant pipewire graph editor "; + homepage = "https://github.com/ax9d/pw-viz"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bae0a7823cb..66f1b14686d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9758,6 +9758,8 @@ with pkgs; pwsafe = callPackage ../applications/misc/pwsafe { }; + pw-viz = callPackage ../applications/misc/pw-viz { }; + napi-rs-cli = callPackage ../development/tools/napi-rs-cli { }; neil = callPackage ../development/tools/neil { }; From 173c52841ee598d3a283b6e6e139fed2d40e5b9b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 30 Nov 2022 09:23:27 +0000 Subject: [PATCH 032/222] mythtv: drop unused xlibsWrapper input Validated as no change in `out` output with `diffoscope`. --- pkgs/applications/video/mythtv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 117212813594..0df8cf6a7249 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders, soundtouch, libzip @@ -32,7 +32,7 @@ mkDerivation rec { setSourceRoot = "sourceRoot=$(echo */mythtv)"; buildInputs = [ - freetype qtbase qtscript lame zlib xlibsWrapper libGLU libGL + freetype qtbase qtscript lame zlib libGLU libGL perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 soundtouch libzip ] ++ lib.optional withWebKit qtwebkit; From e5b6cddbb44fed763cb06c565d76e86b54be309c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 09:42:01 +0000 Subject: [PATCH 033/222] python310Packages.ptpython: 3.0.20 -> 3.0.21 --- pkgs/development/python-modules/ptpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 458cd14f7128..084bdef33493 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.20"; + version = "3.0.21"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "eafd4ced27ca5dc370881d4358d1ab5041b32d88d31af8e3c24167fe4af64ed6"; + sha256 = "sha256-pXuZUurEoSVApN+0zNSiQ0A+zrJ7DRMkW15BRMhzHTI="; }; propagatedBuildInputs = [ From 328a29eb8926a861aa30ad2345c20002e5cb583d Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 30 Nov 2022 18:48:10 +0100 Subject: [PATCH 034/222] rxvt-unicode: pass through meta in wrapper Fixes https://github.com/NixOS/nixpkgs/issues/68202 --- pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 9fe78e30ae3d..639c7b5dda50 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -52,6 +52,8 @@ let --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; + inherit (rxvt-unicode-unwrapped) meta; + passthru = { plugins = plugins; tests.test = nixosTests.terminal-emulators.urxvt; From 93e09a1ff4ce922e1abcb62b418657f22ac69cde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 18:22:20 +0000 Subject: [PATCH 035/222] python310Packages.moderngl: 5.7.2 -> 5.7.3 --- pkgs/development/python-modules/moderngl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 10d230fdf018..68cf1d3b4347 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.7.2"; + version = "5.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sfmCY5Yny1HgZfEN10AE1Ev1EVQ6JE51646DXjoQxyA="; + hash = "sha256-fi7pauMSUSGkSI2ifPg/q1MiApyUg1j2OERcuq20ncQ="; }; buildInputs = [ From 97e210ca8b726c005338b48c7f23588b55fcc154 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Nov 2022 20:38:20 +0000 Subject: [PATCH 036/222] python310Packages.pymediainfo: 5.1.0 -> 6.0.1 --- pkgs/development/python-modules/pymediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 50ea8c5cef0d..aaca2dbcd0f5 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "5.1.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "d996c69d50081a24d6dca9679abf43ffd2be368b065f953c2c9082e5d649c734"; + sha256 = "sha256-luBLrA38tya+1wwxSxIZEhxLk0TGapj0Js4n1/mr/7A="; }; postPatch = '' From d4b338dd50e4d854a29833638f5a8a6d14b90ed6 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 30 Nov 2022 21:33:30 +0100 Subject: [PATCH 037/222] wiremock: init at 2.35.0 --- pkgs/tools/networking/wiremock/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/wiremock/default.nix diff --git a/pkgs/tools/networking/wiremock/default.nix b/pkgs/tools/networking/wiremock/default.nix new file mode 100644 index 000000000000..bfa0f9adf248 --- /dev/null +++ b/pkgs/tools/networking/wiremock/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "wiremock"; + version = "2.35.0"; + src = fetchurl { + url = "mirror://maven/com/github/tomakehurst/wiremock-jre8-standalone/${version}/wiremock-jre8-standalone-${version}.jar"; + hash = "sha256-rhVq4oEuPPpHDEftBzEA707HeSc3Kk4gPw471THz61c="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p "$out"/{share/wiremock,bin} + cp ${src} "$out/share/wiremock/wiremock.jar" + + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/wiremock/wiremock.jar" + ''; + + meta = { + description = "A flexible tool for building mock APIs"; + homepage = "https://wiremock.org/"; + maintainers = with lib.maintainers; [ bobvanderlinden ]; + platforms = jre.meta.platforms; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0250438fa03..18cada01b55e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37885,6 +37885,8 @@ with pkgs; wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { }; + wiremock = callPackage ../tools/networking/wiremock { }; + teseq = callPackage ../applications/misc/teseq { }; ape = callPackage ../applications/misc/ape { }; From b0cf855f9fb490e9f4535a79ccf7d7bc508d5f9d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 1 Dec 2022 08:41:16 +1000 Subject: [PATCH 038/222] nixVersions.nix_2_11: 2.11.0 -> 2.11.1 https://github.com/NixOS/nix/compare/2.11.0...2.11.1 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c2d016a1bc33..e6ee3ffe1d87 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -106,8 +106,8 @@ in lib.makeExtensible (self: { }; nix_2_11 = common { - version = "2.11.0"; - sha256 = "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ="; + version = "2.11.1"; + sha256 = "sha256-qCV65kw09AG+EkdchDPq7RoeBznX0Q6Qa4yzPqobdOk="; patches = [ ./patches/flaky-tests.patch (fetchpatch { From 34386263f796ee8bc5367a65af726afd0e9ad16a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 1 Dec 2022 12:32:15 +1000 Subject: [PATCH 039/222] nixos/nix-fallback-paths: 2.11.0 -> 2.11.1 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 4700895cec8e..675674cf5b4b 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/nmq5zcd93qb1yskx42rs910ff0247nn2-nix-2.11.0"; - i686-linux = "/nix/store/ja6im1sw9a8lzczi10lc0iddffl9kzmn-nix-2.11.0"; - aarch64-linux = "/nix/store/myr6fcqa9y4y2fb83zz73dck52vcn81z-nix-2.11.0"; - x86_64-darwin = "/nix/store/2pfjz9b22k9997gh7cb0hjk1qa4lxrvy-nix-2.11.0"; - aarch64-darwin = "/nix/store/lr32i0bdarx1iqsch4sy24jj1jkfw9vf-nix-2.11.0"; + x86_64-linux = "/nix/store/xdlpraypxdimjyfrr4k06narrv8nmfgh-nix-2.11.1"; + i686-linux = "/nix/store/acghbpn3aaj2q64mz3ljipsgf9d9qxlp-nix-2.11.1"; + aarch64-linux = "/nix/store/0lrf6danhdqjsrhala134ak8vn0b9ghj-nix-2.11.1"; + x86_64-darwin = "/nix/store/60sx4c6xflgqk11gvijwzlsczbxgxgwh-nix-2.11.1"; + aarch64-darwin = "/nix/store/dmk5m3nlqp1awaqrp1f06qhhkh3l102n-nix-2.11.1"; } From f898cc1f6b6d376d002706edbc90f147c28c3c09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 08:44:09 +0000 Subject: [PATCH 040/222] python310Packages.pip-tools: 6.8.0 -> 6.11.0 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2486a77dd771..5630ad0946c4 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.8.0"; + version = "6.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Oeiu5GVEbgInjYDb69QyXR3YYzJI9DITxzol9Y59ilU="; + hash = "sha256-kMXcFQ44VuRGO4HMyZMHzPlVTl24OT6yc3BcsLj3HGA="; }; patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; From bbca72b00d44906020c5f32ffd7fcd9fc6fce2a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 10:41:25 +0100 Subject: [PATCH 041/222] python310Packages.pip-tools: add changelog to meta --- pkgs/development/python-modules/pip-tools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 5630ad0946c4..7a595a85d8fd 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Keeps your pinned dependencies fresh"; homepage = "https://github.com/jazzband/pip-tools/"; + changelog = "https://github.com/jazzband/pip-tools/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ zimbatm ]; }; From 59695cfb7361bd13bacabe9c324ca0eb81118e1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 09:51:21 +0000 Subject: [PATCH 042/222] python310Packages.prefixed: 0.4.2 -> 0.5.0 --- pkgs/development/python-modules/prefixed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix index 5f6cf56465a1..6297898eb2e0 100644 --- a/pkgs/development/python-modules/prefixed/default.nix +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "prefixed"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gfTjvBUEbncnE6uA8IaQ5hxSzOsgFBQldU6rWwCxMMk="; + sha256 = "sha256-sTTXNBNiULF7aO7eZaM3D6sBNEEstmvIvjVo/wW9+OQ="; }; checkInputs = [ pytestCheckHook ]; From a9fc8ad66e794988759f99e600b56f00733dbb00 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Thu, 1 Dec 2022 11:07:43 +0100 Subject: [PATCH 043/222] vscode-extensions.esbenp.prettier-vscode: 9.9.0 -> 9.10.3 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index cff8e68ada1f..243e45330c1d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -966,8 +966,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.9.0"; - sha256 = "sha256-Yr7M4HyRNcsBf8YglQLvyZjblMhtkpMP+f9SH8oUav0="; + version = "9.10.3"; + sha256 = "sha256-BTuTTElPYRtbzQvUC3iMYlj7NDkGSDa/IppOGBXjfUM="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; From 16b789287654273d696f3fec2f1890a9fe3e9948 Mon Sep 17 00:00:00 2001 From: Alex Zero Date: Mon, 5 Jul 2021 14:00:05 +0100 Subject: [PATCH 044/222] nixos/tayga: init --- .../from_md/release-notes/rl-2211.section.xml | 7 + .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/tayga.nix | 195 ++++++++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 nixos/modules/services/networking/tayga.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index b72c4326004c..61ba5e7a36bc 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1799,6 +1799,13 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ services.tandoor-recipes. + + + TAYGA, + an out-of-kernel stateless NAT64 implementation. Available as + services.tayga. + + tmate-ssh-server, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index e0aef342c1ac..c7dc68f54d54 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -524,6 +524,8 @@ In addition to numerous new and upgraded packages, this release includes the fol - [Tandoor Recipes](https://tandoor.dev), a self-hosted multi-tenant recipe collection. Available as [services.tandoor-recipes](options.html#opt-services.tandoor-recipes.enable). +- [TAYGA](http://www.litech.org/tayga/), an out-of-kernel stateless NAT64 implementation. Available as [services.tayga](#opt-services.tayga.enable). + - [tmate-ssh-server](https://github.com/tmate-io/tmate-ssh-server), server side part of [tmate](https://tmate.io/). Available as [services.tmate-ssh-server](#opt-services.tmate-ssh-server.enable). - [Uptime Kuma](https://uptime.kuma.pet/), a fancy self-hosted monitoring tool. Available as [services.uptime-kuma](#opt-services.uptime-kuma.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 215e001c2ec1..81fe37a4a64d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -966,6 +966,7 @@ ./services/networking/syncthing-relay.nix ./services/networking/syncplay.nix ./services/networking/tailscale.nix + ./services/networking/tayga.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix diff --git a/nixos/modules/services/networking/tayga.nix b/nixos/modules/services/networking/tayga.nix new file mode 100644 index 000000000000..299ae2777f7c --- /dev/null +++ b/nixos/modules/services/networking/tayga.nix @@ -0,0 +1,195 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.tayga; + + # Converts an address set to a string + strAddr = addr: "${addr.address}/${toString addr.prefixLength}"; + + configFile = pkgs.writeText "tayga.conf" '' + tun-device ${cfg.tunDevice} + + ipv4-addr ${cfg.ipv4.address} + ${optionalString (cfg.ipv6.address != null) "ipv6-addr ${cfg.ipv6.address}"} + + prefix ${strAddr cfg.ipv6.pool} + dynamic-pool ${strAddr cfg.ipv4.pool} + data-dir ${cfg.dataDir} + ''; + + addrOpts = v: + assert v == 4 || v == 6; + { + options = { + address = mkOption { + type = types.str; + description = lib.mdDoc "IPv${toString v} address."; + }; + + prefixLength = mkOption { + type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + description = lib.mdDoc '' + Subnet mask of the interface, specified as the number of + bits in the prefix ("${if v == 4 then "24" else "64"}"). + ''; + }; + }; + }; + + versionOpts = v: { + options = { + router = { + address = mkOption { + type = types.str; + description = lib.mdDoc "The IPv${toString v} address of the router."; + }; + }; + + address = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc "The source IPv${toString v} address of the TAYGA server."; + }; + + pool = mkOption { + type = with types; nullOr (submodule (addrOpts v)); + description = lib.mdDoc "The pool of IPv${toString v} addresses which are used for translation."; + }; + }; + }; +in +{ + options = { + services.tayga = { + enable = mkEnableOption (lib.mdDoc "Tayga"); + + package = mkOption { + type = types.package; + default = pkgs.tayga; + defaultText = lib.literalMD "pkgs.tayga"; + description = lib.mdDoc "This option specifies the TAYGA package to use."; + }; + + ipv4 = mkOption { + type = types.submodule (versionOpts 4); + description = lib.mdDoc "IPv4-specific configuration."; + example = literalExpression '' + { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.1"; + prefixLength = 24; + }; + } + ''; + }; + + ipv6 = mkOption { + type = types.submodule (versionOpts 6); + description = lib.mdDoc "IPv6-specific configuration."; + example = literalExpression '' + { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + } + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/tayga"; + description = lib.mdDoc "Directory for persistent data"; + }; + + tunDevice = mkOption { + type = types.str; + default = "nat64"; + description = lib.mdDoc "Name of the nat64 tun device"; + }; + }; + }; + + config = mkIf cfg.enable { + networking.interfaces."${cfg.tunDevice}" = { + virtual = true; + virtualType = "tun"; + virtualOwner = mkIf config.networking.useNetworkd ""; + ipv4 = { + addresses = [ + { address = cfg.ipv4.router.address; prefixLength = 32; } + ]; + routes = [ + cfg.ipv4.pool + ]; + }; + ipv6 = { + addresses = [ + { address = cfg.ipv6.router.address; prefixLength = 128; } + ]; + routes = [ + cfg.ipv6.pool + ]; + }; + }; + + systemd.services.tayga = { + description = "Stateless NAT64 implementation"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/tayga -d --nodetach --config ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; + Restart = "always"; + + # Hardening Score: + # - nixos-scripts: 2.1 + # - systemd-networkd: 1.6 + ProtectHome = true; + SystemCallFilter = [ + "@network-io" + "@system-service" + "~@privileged" + "~@resources" + ]; + ProtectKernelLogs = true; + AmbientCapabilities = [ + "CAP_NET_ADMIN" + ]; + CapabilityBoundingSet = ""; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + StateDirectory = "tayga"; + DynamicUser = mkIf config.networking.useNetworkd true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + ProtectHostname = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictNamespaces = true; + NoNewPrivileges = true; + ProtectControlGroups = true; + SystemCallArchitectures = "native"; + PrivateTmp = true; + LockPersonality = true; + ProtectSystem = true; + PrivateUsers = true; + ProtectProc = "invisible"; + }; + }; + }; +} From 8d47058b32f1f0fb1b21d73392f3b4e96d139a81 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Wed, 12 Oct 2022 21:16:02 +0200 Subject: [PATCH 045/222] nixos/tests/tayga: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/tayga.nix | 235 ++++++++++++++++++++++++ pkgs/tools/networking/tayga/default.nix | 4 +- 3 files changed, 239 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/tayga.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f97d7b184af8..895cbe4290dc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -638,6 +638,7 @@ in { systemd-misc = handleTest ./systemd-misc.nix {}; tandoor-recipes = handleTest ./tandoor-recipes.nix {}; taskserver = handleTest ./taskserver.nix {}; + tayga = handleTest ./tayga.nix {}; teeworlds = handleTest ./teeworlds.nix {}; telegraf = handleTest ./telegraf.nix {}; teleport = handleTest ./teleport.nix {}; diff --git a/nixos/tests/tayga.nix b/nixos/tests/tayga.nix new file mode 100644 index 000000000000..44974f6efea8 --- /dev/null +++ b/nixos/tests/tayga.nix @@ -0,0 +1,235 @@ +# This test verifies that we can ping an IPv4-only server from an IPv6-only +# client via a NAT64 router. The hosts and networks are configured as follows: +# +# +------ +# Client | eth1 Address: 2001:db8::2/64 +# | | Route: 64:ff9b::/96 via 2001:db8::1 +# +--|--- +# | VLAN 3 +# +--|--- +# | eth2 Address: 2001:db8::1/64 +# Router | +# | nat64 Address: 64:ff9b::1/128 +# | Route: 64:ff9b::/96 +# | Address: 192.0.2.0/32 +# | Route: 192.0.2.0/24 +# | +# | eth1 Address: 100.64.0.1/24 +# +--|--- +# | VLAN 2 +# +--|--- +# Server | eth1 Address: 100.64.0.2/24 +# | Route: 192.0.2.0/24 via 100.64.0.1 +# +------ + +import ./make-test-python.nix ({ pkgs, lib, ... }: + +{ + name = "tayga"; + meta = with pkgs.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = { + # The server is configured with static IPv4 addresses. RFC 6052 Section 3.1 + # disallows the mapping of non-global IPv4 addresses like RFC 1918 into the + # Well-Known Prefix 64:ff9b::/96. TAYGA also does not allow the mapping of + # documentation space (RFC 5737). To circumvent this, 100.64.0.2/24 from + # RFC 6589 (Carrier Grade NAT) is used here. + # To reach the IPv4 address pool of the NAT64 gateway, there is a static + # route configured. In normal cases, where the router would also source NAT + # the pool addresses to one IPv4 addresses, this would not be needed. + server = { + virtualisation.vlans = [ + 2 # towards router + ]; + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce {}; + }; + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "100.64.0.2/24" + ]; + routes = [ + { routeConfig = { Destination = "192.0.2.0/24"; Gateway = "100.64.0.1"; }; } + ]; + }; + }; + }; + + # The router is configured with static IPv4 addresses towards the server + # and IPv6 addresses towards the client. For NAT64, the Well-Known prefix + # 64:ff9b::/96 is used. NAT64 is done with TAYGA which provides the + # tun-interface nat64 and does the translation over it. The IPv6 packets + # are sent to this interfaces and received as IPv4 packets and vice versa. + # As TAYGA only translates IPv6 addresses to dedicated IPv4 addresses, it + # needs a pool of IPv4 addresses which must be at least as big as the + # expected amount of clients. In this test, the packets from the pool are + # directly routed towards the client. In normal cases, there would be a + # second source NAT44 to map all clients behind one IPv4 address. + router_systemd = { + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + + virtualisation.vlans = [ + 2 # towards server + 3 # towards client + ]; + + networking = { + useDHCP = false; + useNetworkd = true; + firewall.enable = false; + interfaces.eth1 = lib.mkForce { + ipv4 = { + addresses = [ { address = "100.64.0.1"; prefixLength = 24; } ]; + }; + }; + interfaces.eth2 = lib.mkForce { + ipv6 = { + addresses = [ { address = "2001:db8::1"; prefixLength = 64; } ]; + }; + }; + }; + + services.tayga = { + enable = true; + ipv4 = { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.0"; + prefixLength = 24; + }; + }; + ipv6 = { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + }; + }; + }; + + router_nixos = { + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + + virtualisation.vlans = [ + 2 # towards server + 3 # towards client + ]; + + networking = { + useDHCP = false; + firewall.enable = false; + interfaces.eth1 = lib.mkForce { + ipv4 = { + addresses = [ { address = "100.64.0.1"; prefixLength = 24; } ]; + }; + }; + interfaces.eth2 = lib.mkForce { + ipv6 = { + addresses = [ { address = "2001:db8::1"; prefixLength = 64; } ]; + }; + }; + }; + + services.tayga = { + enable = true; + ipv4 = { + address = "192.0.2.0"; + router = { + address = "192.0.2.1"; + }; + pool = { + address = "192.0.2.0"; + prefixLength = 24; + }; + }; + ipv6 = { + address = "2001:db8::1"; + router = { + address = "64:ff9b::1"; + }; + pool = { + address = "64:ff9b::"; + prefixLength = 96; + }; + }; + }; + }; + + # The client is configured with static IPv6 addresses. It has also a static + # route for the NAT64 IP space where the IPv4 addresses are mapped in. In + # normal cases, there would be only a default route. + client = { + virtualisation.vlans = [ + 3 # towards router + ]; + + networking = { + useDHCP = false; + interfaces.eth1 = lib.mkForce {}; + }; + + systemd.network = { + enable = true; + networks."vlan1" = { + matchConfig.Name = "eth1"; + address = [ + "2001:db8::2/64" + ]; + routes = [ + { routeConfig = { Destination = "64:ff9b::/96"; Gateway = "2001:db8::1"; }; } + ]; + }; + }; + environment.systemPackages = [ pkgs.mtr ]; + }; + }; + + testScript = '' + # start client and server + for machine in client, server: + machine.wait_for_unit("network-online.target") + machine.log(machine.execute("ip addr")[1]) + machine.log(machine.execute("ip route")[1]) + machine.log(machine.execute("ip -6 route")[1]) + + # test systemd-networkd and nixos-scripts based router + for router in router_systemd, router_nixos: + router.start() + router.wait_for_unit("network-online.target") + router.wait_for_unit("tayga.service") + router.log(machine.execute("ip addr")[1]) + router.log(machine.execute("ip route")[1]) + router.log(machine.execute("ip -6 route")[1]) + + with subtest("Wait for tayga"): + router.wait_for_unit("tayga.service") + + with subtest("Test ICMP"): + client.wait_until_succeeds("ping -c 3 64:ff9b::100.64.0.2 >&2") + + with subtest("Test ICMP and show a traceroute"): + client.wait_until_succeeds("mtr --show-ips --report-wide 64:ff9b::100.64.0.2 >&2") + + router.log(router.execute("systemd-analyze security tayga.service")[1]) + router.shutdown() + ''; +}) diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/tools/networking/tayga/default.nix index 8d0de6a6c188..651f9ad55457 100644 --- a/pkgs/tools/networking/tayga/default.nix +++ b/pkgs/tools/networking/tayga/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { version = "0.9.2"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1700y121lhvpna49bjpssb7jq1abj9qw5wxgjn8gzp6jm4kpj7rb"; }; + passthru.tests.tayga = nixosTests.tayga; + meta = with lib; { description = "Userland stateless NAT64 daemon"; longDescription = '' From 3e534cfde55bfd5a2e1348d25bd27bfe9c615746 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 16 Oct 2022 00:10:40 +0200 Subject: [PATCH 046/222] tayga: correct license to GPL2+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The head of tayga.c says „This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.“ --- pkgs/tools/networking/tayga/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/tools/networking/tayga/default.nix index 651f9ad55457..ef393f5bb152 100644 --- a/pkgs/tools/networking/tayga/default.nix +++ b/pkgs/tools/networking/tayga/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { for networks where dedicated NAT64 hardware would be overkill. ''; homepage = "http://www.litech.org/tayga"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; }; From 028bf68df177ee0d06a2152613d9b82cdda8f51f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 11:39:22 +0100 Subject: [PATCH 047/222] home-assistant: use headless ffmpeg variant --- pkgs/servers/home-assistant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a2308d0998e6..f37145b51ca7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -5,7 +5,7 @@ , fetchpatch , python3 , substituteAll -, ffmpeg +, ffmpeg-headless , inetutils , nixosTests @@ -309,7 +309,7 @@ in python.pkgs.buildPythonApplication rec { patches = [ (substituteAll { src = ./patches/ffmpeg-path.patch; - ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; + ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; }) ]; From 267c1835862c54189c2820fc88e05023f39cf6d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 12:03:00 +0100 Subject: [PATCH 048/222] python3Packages.pytibber: 0.25.6 -> 0.26.1 https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.1 https://github.com/Danielhiversen/pyTibber/releases/tag/0.26.0 --- pkgs/development/python-modules/pytibber/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 4583c883904c..f237c2bc4bc3 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , aiohttp , async-timeout -, graphql-subscription-manager +, gql , python-dateutil , pytest-asyncio , pytestCheckHook @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.25.6"; + version = "0.26.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,15 +21,16 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-aGl43gxrnKwo3ZhN+EpSBMZw0wKWf5aIPFx3goo8Nog="; + hash = "sha256-Bok5dtEpteo20vnQa0myxFHiu2BViqlvKZ5TxAkfFUM="; }; propagatedBuildInputs = [ aiohttp async-timeout - graphql-subscription-manager + gql python-dateutil - ]; + ] + ++ gql.optional-dependencies.websockets; checkInputs = [ pytest-asyncio @@ -48,6 +49,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/Danielhiversen/pyTibber/releases/tag/${version}"; description = "Python library to communicate with Tibber"; homepage = "https://github.com/Danielhiversen/pyTibber"; license = licenses.mit; From 962bc1a79d27e64a6278bee6df4eddc2a1cb98f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 12:10:16 +0100 Subject: [PATCH 049/222] python3Packages.simplisafe-python: 2022.11.0 -> 2022.11.2 https://github.com/bachya/simplisafe-python/releases/tag/2022.11.2 https://github.com/bachya/simplisafe-python/releases/tag/2022.11.1 --- .../development/python-modules/simplisafe-python/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 9312b9f36d17..97b844613b18 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.11.0"; + version = "2022.11.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-I4ZEKJFfCrpwPXl2f+2XJdFD2VkCghiKdgLjRKdZC+0="; + sha256 = "sha256-fGCYsuhqPs3ZYInx6Z3iRb4dtjoA7mJKpBDVx+6d/qA="; }; nativeBuildInputs = [ @@ -80,6 +80,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/bachya/simplisafe-python/releases/tag/${version}"; description = "Python library the SimpliSafe API"; homepage = "https://simplisafe-python.readthedocs.io/"; license = with licenses; [ mit ]; From adb15eda59db7cdd65dc54ee5be533cf3e7dba82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 15:38:20 +0100 Subject: [PATCH 050/222] python310Packages.zigpy: add changelog to meta --- pkgs/development/python-modules/zigpy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index c7abaac023aa..cf3d3b06f7ee 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; + changelog = "https://github.com/zigpy/zigpy/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; From 4ec822f4b7bdbc84b682625e513ce6c372b1a605 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 15:42:42 +0100 Subject: [PATCH 051/222] python310Packages.zigpy: 0.51.5 -> 0.51.6 Changelog: https://github.com/zigpy/zigpy/releases/tag/0.51.6 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index cf3d3b06f7ee..9b5bd33f85e7 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.5"; + version = "0.51.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU="; + hash = "sha256-keQFFWPl2SCy1cyvbqDrA9/Yude8bf0qNiyEbFjFv/o="; }; propagatedBuildInputs = [ From 19105c66f2f5fdcd78be47c9641b290d0599b097 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:17:03 +0100 Subject: [PATCH 052/222] python310Packages.zigpy-deconz: add changelog to meta --- pkgs/development/python-modules/zigpy-deconz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index de08bb59320c..78445df7f2a5 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library which communicates with Deconz radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-deconz"; + changelog = "https://github.com/zigpy/zigpy-deconz/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; From e2ba5b66cd3670352ac606dd4f24b3b329d38f16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:18:07 +0100 Subject: [PATCH 053/222] python310Packages.zigpy-deconz: 0.19.0 -> 0.19.1 Changelog: https://github.com/zigpy/zigpy-deconz/releases/tag/0.19.1 --- pkgs/development/python-modules/zigpy-deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 78445df7f2a5..babfcf54c04e 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.19.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HYLL+1o133Is40wVCPJoUGZO1B/43p+V8K2rJ/mdMFQ="; + hash = "sha256-qbzHG6qoTAm773HAoAjmmanqVtuIDR72ECQH+N+iw3o="; }; propagatedBuildInputs = [ From b2cc0315e3d8b01106b8eeb63c9fa32677f4ebbd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:20:17 +0100 Subject: [PATCH 054/222] python310Packages.zha-quirks: add changelog to meta --- pkgs/development/python-modules/zha-quirks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f81a155bdfa5..c58e3e1d6fbb 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -39,8 +39,9 @@ buildPythonPackage rec { meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; homepage = "https://github.com/dmulcahey/zha-device-handlers"; + changelog = "https://github.com/zigpy/zha-device-handlers/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fab ]; platforms = platforms.linux; }; } From 5f33a76d16d1de6f3c37ae0814ae3690d06d0e28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:21:15 +0100 Subject: [PATCH 055/222] python310Packages.zha-quirks: 0.0.86 -> 0.0.87 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.87 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index c58e3e1d6fbb..86059d60b0cb 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.86"; + version = "0.0.87"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-gKYpjen5JLMiZITLGZbcgqDZedsxeofZyMhRR2ti3Ew="; + hash = "sha256-MX+UWS1h2HMIhyrhtn/tzti2w9RBHptVE3klATIXvAM="; }; propagatedBuildInputs = [ From 3e8534f333ebf1ce71405629cd594a4265e36cc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Nov 2022 16:34:49 +0100 Subject: [PATCH 056/222] python310Packages.bellows: add changelog to meta - update inputs --- .../python-modules/bellows/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index dde3a12480ca..1125e45e6282 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,18 +1,17 @@ { lib +, asynctest , buildPythonPackage -, fetchFromGitHub , click , click-log -, dataclasses +, fetchFromGitHub , pure-pcapy3 , pyserial-asyncio -, voluptuous -, zigpy -, asynctest -, pythonOlder -, pytestCheckHook , pytest-asyncio , pytest-timeout +, pytestCheckHook +, pythonOlder +, voluptuous +, zigpy }: buildPythonPackage rec { @@ -20,11 +19,13 @@ buildPythonPackage rec { version = "0.34.4"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc="; + hash = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc="; }; propagatedBuildInputs = [ @@ -34,8 +35,6 @@ buildPythonPackage rec { pyserial-asyncio voluptuous zigpy - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; checkInputs = [ @@ -53,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to implement EZSP for EmberZNet devices"; homepage = "https://github.com/zigpy/bellows"; + changelog = "https://github.com/zigpy/bellows/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; }; From 9855c146a2ed8e8846c8aa9f835f9411d31e0748 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 12:17:49 +0100 Subject: [PATCH 057/222] home-assistant: 2022.11.4 -> 2022.11.5 https://github.com/home-assistant/core/releases/tag/2022.11.5 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 24 ++----------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7ea4d02a227b..a4b2f5c14cdd 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.11.4"; + version = "2022.11.5"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f37145b51ca7..d2cdd24d4f27 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -51,16 +51,6 @@ let ]; }); - backoff = super.backoff.overridePythonAttrs (oldAttrs: rec { - version = "1.11.1"; - src = fetchFromGitHub { - owner = "litl"; - repo = "backoff"; - rev = "v${version}"; - hash = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4="; - }; - }); - caldav = super.caldav.overridePythonAttrs (old: rec { version = "0.9.1"; src = fetchFromGitHub { @@ -185,16 +175,6 @@ let doCheck = false; # requires pytest-aiohttp>=1.0.0 }); - pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec { - version = "1.0.20"; - src = fetchFromGitHub { - owner = "andrey-git"; - repo = "pysensibo"; - rev = "refs/tags/${version}"; - hash = "sha256-L2NP4XS+dPlBr2h8tsGoa4G7tI9yiI4fwrhvQaKkexk="; - }; - }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -284,7 +264,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.11.4"; + hassVersion = "2022.11.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -302,7 +282,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-3vNwWPFSR9Ap89rAxZjUOptigBaDlboxvLZysMyUUX0="; + hash = "sha256-5QV9k3aMMhkB5ZVNOzkwAcA2qTLT7HBays8BoRyshVo="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 2f5be0392c12d4dfdae3a90b3ccb84e3908220f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 13:40:02 +0000 Subject: [PATCH 058/222] python310Packages.pyface: 7.4.2 -> 7.4.3 --- pkgs/development/python-modules/pyface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index bd0785d9403c..a9329b135894 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.4.2"; + version = "7.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YT7TAcubr7m6o3xEeT13XQPdI9hD7rkm/xPPaJ6v6N0="; + sha256 = "sha256-ds0e4C6UaVH7bCt/+YDduJEhQ31hq15t/epaeTZ9kDY="; }; propagatedBuildInputs = [ From fd962eab8eeb3e41d22fc5f94e9d7fab6fd9fbcc Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 28 Nov 2022 23:45:00 +0100 Subject: [PATCH 059/222] volctl: 0.8.2 -> 0.9.2 --- pkgs/tools/audio/volctl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index d764644bab1a..ed29448d06c9 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -2,17 +2,17 @@ python3Packages.buildPythonApplication rec { pname = "volctl"; - version = "0.8.2"; + version = "0.9.2"; src = fetchFromGitHub { owner = "buzz"; repo = pname; rev = "v${version}"; - sha256 = "1cx27j83pz2qffnzb85fbl1x6pp3irv1kbw7g1hri7kaw6ky4xiz"; + sha256 = "sha256-ill0rwqrgAH7lbzh86DQc1Q71lkYh8PCKZvi4XadsW8="; }; postPatch = '' - substituteInPlace volctl/lib/xwrappers.py \ + substituteInPlace volctl/xwrappers.py \ --replace 'libXfixes.so' "${xorg.libXfixes}/lib/libXfixes.so" \ --replace 'libXfixes.so.3' "${xorg.libXfixes}/lib/libXfixes.so.3" ''; @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = [ pango gtk3 ] ++ (with python3Packages; [ + pulsectl click pycairo pygobject3 From 49c247fe59c5d237e7a0a0a97d947b721868b89d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 16:56:43 +0100 Subject: [PATCH 060/222] python310Packages.neo4j: add changelog to meta --- pkgs/development/python-modules/neo4j/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 38ad7832ee8f..589282df36c3 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -32,7 +32,8 @@ buildPythonPackage rec { meta = with lib; { description = "Neo4j Bolt Driver for Python"; - homepage = "https://github.com/neo4j/neo4j-python-driver"; +nn homepage = "https://github.com/neo4j/neo4j-python-driver"; + changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 77aafd01c2cff68ea99ec8889c7bae6ebfec79aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 16:12:30 +0000 Subject: [PATCH 061/222] python310Packages.pymc: 4.3.0 -> 4.4.0 --- pkgs/development/python-modules/pymc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 4434312e2683..eba6f59435ae 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-pkeAcsdVBDc7eKC03+FDJCYT48PaVcXT8K8U8T4gGKo="; + hash = "sha256-ZBltvvKXfqHYLeYOEYFK8kQc0wHM9+UHLRJFMSYX4Ow="; }; nativeBuildInputs = [ From 7df62d0fe67b75bd9ddec1588fa4d07f88935fe1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 17:18:57 +0100 Subject: [PATCH 062/222] python310Packages.neo4j: 5.2.1 -> 5.3.0 Changelog: https://github.com/neo4j/neo4j-python-driver/releases/tag/5.3.0 --- pkgs/development/python-modules/neo4j/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 589282df36c3..0f95c059d86e 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -3,11 +3,12 @@ , fetchFromGitHub , pythonOlder , pytz +, tomlkit }: buildPythonPackage rec { pname = "neo4j"; - version = "5.2.1"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,11 +17,12 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-d4OkXj6mZjrdRG8UyxWeAh3rLywz2TUk2pZq+Ni1F3s="; + hash = "sha256-x67zkQTUhGS5LIVOW2F+OJxnUPwsH1/bX42RArNscUc="; }; propagatedBuildInputs = [ pytz + tomlkit ]; # Missing dependencies @@ -32,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Neo4j Bolt Driver for Python"; -nn homepage = "https://github.com/neo4j/neo4j-python-driver"; + homepage = "https://github.com/neo4j/neo4j-python-driver"; changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; From 6de9ec5969cad20e5deebc7d60a37737b1382fa9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 13 Nov 2022 18:14:02 +0100 Subject: [PATCH 063/222] nixos/octoprint: add openFirewall option --- nixos/modules/services/misc/octoprint.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 196adb180a5b..c216c6fa2b77 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -17,7 +17,7 @@ let cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON fullConfig); - pluginsEnv = package.python.withPackages (ps: [ps.octoprint] ++ (cfg.plugins ps)); + pluginsEnv = package.python.withPackages (ps: [ ps.octoprint ] ++ (cfg.plugins ps)); package = pkgs.octoprint; @@ -47,6 +47,12 @@ in ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Open ports in the firewall for OctoPrint."; + }; + user = mkOption { type = types.str; default = "octoprint"; @@ -67,7 +73,7 @@ in plugins = mkOption { type = types.functionTo (types.listOf types.package); - default = plugins: []; + default = plugins: [ ]; defaultText = literalExpression "plugins: []"; example = literalExpression "plugins: with plugins; [ themeify stlviewer ]"; description = lib.mdDoc "Additional plugins to be used. Available plugins are passed through the plugins input."; @@ -75,7 +81,7 @@ in extraConfig = mkOption { type = types.attrs; - default = {}; + default = { }; description = lib.mdDoc "Extra options which are added to OctoPrint's YAML configuration file."; }; @@ -128,6 +134,6 @@ in }; }; + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; }; - } From 87adfff3cf067edcb3ee790980511a6fe4170737 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 17:39:28 +0100 Subject: [PATCH 064/222] python310Packages.scmrepo: add changelog to meta --- pkgs/development/python-modules/scmrepo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 62ba132641c9..99452278b317 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "SCM wrapper and fsspec filesystem"; homepage = "https://github.com/iterative/scmrepo"; + changelog = "https://github.com/iterative/scmrepo/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From b92b329d25c448100f92555c53defd1958ef955c Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 1 Dec 2022 17:51:39 +0100 Subject: [PATCH 065/222] papirus-icon-theme: 20221101 -> 20221201 https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/releases/tag/20221201 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 97afe4950554..90b66c32fc97 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20221101"; + version = "20221201"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-MSH7yd5fizBtmkTNG3gMFxNpjVDKWsHM8wogPhBMkk8="; + sha256 = "sha256-Y+flyo8MJVmAoiJ0mSZNu/xhhLzsYr6t8R0c+TOxbq0="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; From 94491ad9fc1f784d44f4cff567aeffba6fd98d7a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 16:52:14 +0000 Subject: [PATCH 066/222] openjdk11: disable JavaFX by default Since openjfk11 depends on python2 (EOL). --- pkgs/development/compilers/openjdk/11.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 820469ab8f15..95abb373272c 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -4,7 +4,8 @@ , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +# disabled by default since openjfx11 depends on python2 (EOL) +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: From 76f20f79c69c2e3717791298395f7ad9a271d8f7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 16:52:53 +0000 Subject: [PATCH 067/222] openjdk12: disable JavaFX by default Since openjfk11 depends on python2 (EOL). --- pkgs/development/compilers/openjdk/12.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index a8de9fe43ffc..60100a5ecc16 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -4,7 +4,8 @@ , libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +# disabled by default since openjfx11 depends on python2 (EOL) +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: From f24ea1f792444f5a312647fef6f95b5e509c0d9f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 16:53:08 +0000 Subject: [PATCH 068/222] openjdk13: disable JavaFX by default Since openjfk11 depends on python2 (EOL). --- pkgs/development/compilers/openjdk/13.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 5b7e87b0ef3a..68a0a9fa7007 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -4,7 +4,8 @@ , libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +# disabled by default since openjfx11 depends on python2 (EOL) +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: From d57353e122a4b4c6ec3d09932195e41f21380554 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 16:53:25 +0000 Subject: [PATCH 069/222] openjdk14: disable JavaFX by default Since openjfk11 depends on python2 (EOL). --- pkgs/development/compilers/openjdk/14.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 1381b0995a76..37c3a6a3de3a 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -4,7 +4,8 @@ , libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath , headless ? false -, enableJavaFX ? openjfx.meta.available, openjfx +# disabled by default since openjfx11 depends on python2 (EOL) +, enableJavaFX ? false, openjfx , enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf }: From eacec3f905caa660994339a3820b5ad74fcd5f48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 18:01:38 +0100 Subject: [PATCH 070/222] python310Packages.scmrepo: 0.1.3 -> 0.1.4 Changelog: https://github.com/iterative/scmrepo/releases/tag/0.1.4 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 99452278b317..4c3dffd0f80f 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.1.3"; + version = "0.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YivsP5c0fnpm/0VCFfyH054LYAQbyEdH+wZTRxsCAY4="; + hash = "sha256-E9uQ8EMLncF9nkOBl1rQLt6I2wEhtv4Z1I1IpCYgorg="; }; postPatch = '' From cd73eb0b88d2e82311ff3f4249b22cc8d45e7f91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 18:05:23 +0100 Subject: [PATCH 071/222] python310Packages.teslajsonpy: 3.2.2 -> 3.3.0 Changelog: https://github.com/zabuldon/teslajsonpy/releases/tag/v3.3.0 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 5d5a2c901390..a7af8b2a905b 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.2.2"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o3MTmMLSdpOprV6wridKF0SxPfKfIvla00/Z9Y2EePE="; + hash = "sha256-hjeMGqCoCC1CYvBPVkSsvU+Us+dtPwNFAFa0y+WNCLg="; }; nativeBuildInputs = [ From a71f71b827e973148aa172e8c8f6f8fc6345579f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 17:16:09 +0000 Subject: [PATCH 072/222] python310Packages.pymunk: 6.3.0 -> 6.4.0 --- pkgs/development/python-modules/pymunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index f28a4908a606..e4caa708afa2 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.3.0"; + version = "6.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-er0+HuCQw2FPeyuBc1BVdutmidYzcKIBqdeteqwsXiA="; + sha256 = "sha256-YNzZ/wQz5s5J5ctXekNo0FksRoX03rZE1wXIghYcck4="; }; propagatedBuildInputs = [ cffi ]; From 5c9e4571573bbd72427ca01c903b1109f2897665 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 18:32:58 +0100 Subject: [PATCH 073/222] python310Packages.pymc: add changelog to meta --- pkgs/development/python-modules/pymc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index eba6f59435ae..b61766324130 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -65,6 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; homepage = "https://github.com/pymc-devs/pymc3"; + changelog = "https://github.com/pymc-devs/pymc/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ nidabdella ]; }; From c003849b5624993cabd59e79438142eca287a6c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 18:41:54 +0100 Subject: [PATCH 074/222] python310Packages.pymunk: add changelog to meta - diable on unsupported Python releases --- .../python-modules/pymunk/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index e4caa708afa2..bdd9b42d972d 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -11,14 +11,20 @@ buildPythonPackage rec { pname = "pymunk"; version = "6.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-YNzZ/wQz5s5J5ctXekNo0FksRoX03rZE1wXIghYcck4="; + hash = "sha256-YNzZ/wQz5s5J5ctXekNo0FksRoX03rZE1wXIghYcck4="; }; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; + buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; @@ -27,15 +33,22 @@ buildPythonPackage rec { ${python.interpreter} setup.py build_ext --inplace ''; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ "pymunk/tests" ]; - pythonImportsCheck = [ "pymunk" ]; + + pythonImportsCheck = [ + "pymunk" + ]; meta = with lib; { description = "2d physics library"; homepage = "https://www.pymunk.org"; + changelog = "https://github.com/viblo/pymunk/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; From cad27dd109f40ea474ea3acdda9d5fd8faedd0ea Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 1 Dec 2022 09:47:55 -0800 Subject: [PATCH 075/222] python310Packages.django-postgresql-netfields: 1.2.2 -> 1.3.0 --- .../python-modules/django-postgresql-netfields/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 141a46f53154..2e440ed4f063 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -7,18 +7,17 @@ # required for tests #, djangorestframework #, psycopg2 -#, unittest2 }: buildPythonPackage rec { - version = "1.2.2"; + version = "1.3.0"; pname = "django-postgresql-netfields"; src = fetchFromGitHub { owner = "jimfunk"; repo = pname; rev = "v${version}"; - sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm"; + hash = "sha256-I+X4yfadtiiZlW7QhfwVbK1qyWn/khH9fWXszCo9uro="; }; # tests need a postgres database @@ -32,7 +31,6 @@ buildPythonPackage rec { # buildInputs = [ # djangorestframework # psycopg2 - # unittest2 # ]; propagatedBuildInputs = [ From fcdc8aee87bdb9413ae9bae09d519366b5166b9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 18:55:31 +0100 Subject: [PATCH 076/222] python310Packages.pyface: add changelog to meta --- pkgs/development/python-modules/pyface/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index a9329b135894..ed2dcba69d4f 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ds0e4C6UaVH7bCt/+YDduJEhQ31hq15t/epaeTZ9kDY="; + hash = "sha256-ds0e4C6UaVH7bCt/+YDduJEhQ31hq15t/epaeTZ9kDY="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/pyface"; + changelog = "https://github.com/enthought/pyface/releases/tag/${version}"; maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; From ab3035c461f2259e28652e01abbb9954c455a909 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 17:57:55 +0000 Subject: [PATCH 077/222] python310Packages.pyomo: 6.4.2 -> 6.4.3 --- pkgs/development/python-modules/pyomo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 23283ab2f5a8..e968a0d840c5 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.4.2"; + version = "6.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-YTcK5UCE6AuGk3iyhLOeqdl0rb8ccOhBRJEew40Rris="; + hash = "sha256-EHttGeQUI8SWo8R9zRchguvDA6U8EKhDbBf5jdwl4dI="; }; propagatedBuildInputs = [ From aacfe97e55d81a1f658bfd915a37ed62e1502b9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 19:05:25 +0100 Subject: [PATCH 078/222] python310Packages.pyomo: add changelog to meta --- pkgs/development/python-modules/pyomo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index e968a0d840c5..a068b4a14072 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Optimization Modeling Objects"; homepage = "http://pyomo.org"; + changelog = "https://github.com/Pyomo/pyomo/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; From 6edf855c1a38185c028c5eb1fe555c5533823c0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 1 Dec 2022 10:14:09 -0800 Subject: [PATCH 079/222] buildkite-agent: 3.40.0 -> 3.41.0 (#203803) --- .../continuous-integration/buildkite-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index a18bfbd22b63..70598ee7266e 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.40.0"; + version = "3.41.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-pd5B7RW13SWtOAwJGxhJBAhihCFkL3TokhWqcy7hVFk="; + sha256 = "sha256-AQaSwdletUP7amDHXIG/3Xsw6rJCJE+eYWj2FYe/vRY="; }; - vendorSha256 = "sha256-+LTjtJFHdYv0zeX8RpK0tuLWRpz5jXBwA7ZOvmA6YV0="; + vendorSha256 = "sha256-NEdwdDM/H6l2XzYCTU11uijZTSEqjIWRHsqg6ML/daY="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash From 8bbfbdc480fac4725a93f52393f37737bedad623 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 18:14:37 +0000 Subject: [PATCH 080/222] python310Packages.pyoverkiz: 1.7.0 -> 1.7.1 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 27dfe940d827..a0f1745b447a 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.7.0"; + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-pmWYg9tWnSTdtiinKw0AaPVwKi1rCZp/xap5gfEzm44="; + hash = "sha256-PGictIBXrUIorAU9Ic41LzEQPJliCpwGoOlkteHUuEw="; }; postPatch = '' From eb701b9e9f50ad5d12b8ed8f8a79421660bc6f5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 19:20:26 +0100 Subject: [PATCH 081/222] python310Packages.pymunk: add missing input --- pkgs/development/python-modules/pymunk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index bdd9b42d972d..54ab01a4e615 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -5,6 +5,7 @@ , python , cffi , pytestCheckHook +, pythonOlder , ApplicationServices }: From e35603d8b26876a87ed298a044242f4d1c647965 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 1 Dec 2022 19:20:39 +0100 Subject: [PATCH 082/222] fastddsgen: upgrade to openjdk17 This prevents build dependency on Python 2.7 (see #201859). Upstream recommends using openjdk8 or 11, but my tests show that using openjdk17 works well. --- pkgs/development/tools/fastddsgen/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index 611b6c9933f4..e56b621610ab 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk11, git, perl, cmake }: +{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk17, git, perl, cmake }: let pname = "fastddsgen"; version = "2.2.0"; @@ -15,7 +15,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - nativeBuildInputs = [ gradle openjdk11 perl ]; + nativeBuildInputs = [ gradle openjdk17 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d); @@ -39,7 +39,7 @@ in stdenv.mkDerivation { inherit pname src version; - nativeBuildInputs = [ gradle openjdk11 ]; + nativeBuildInputs = [ gradle openjdk17 ]; # use our offline deps postPatch = '' @@ -72,7 +72,7 @@ stdenv.mkDerivation { # Override the default start script to use absolute java path cat <$out/bin/fastddsgen #!${runtimeShell} - exec ${openjdk11}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@" + exec ${openjdk17}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@" EOF chmod a+x "$out/bin/fastddsgen" @@ -92,6 +92,6 @@ stdenv.mkDerivation { used to publish or subscribe. ''; maintainers = with maintainers; [ wentasah ]; - platforms = openjdk11.meta.platforms; + platforms = openjdk17.meta.platforms; }; } From 821c943d1b51753e901d5bfd3050626e89c12c43 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 1 Dec 2022 10:18:02 -0800 Subject: [PATCH 083/222] python310Packages.signalslot: remove weakrefmethod This is not needed by the package when on Python >= 3.4. Also add a dependency on pytest-xdist as it's asked for by the package, and it removes some warnings when running tests due to pytest reporting on unknown configuration options consumed by pytest-xdist. --- .../python-modules/signalslot/default.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix index 44f1c91fc435..8c3dfc8bb58f 100644 --- a/pkgs/development/python-modules/signalslot/default.nix +++ b/pkgs/development/python-modules/signalslot/default.nix @@ -2,43 +2,53 @@ , lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook , contexter , eventlet , mock +, pytest-xdist , pytestCheckHook , six -, weakrefmethod }: buildPythonPackage rec { pname = "signalslot"; version = "0.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "sha256-Z26RPNau+4719e82jMhb2LyIR6EvsANI8r3+eKuw494="; }; - propagatedBuildInputs = [ - contexter - six - weakrefmethod - ]; - - checkInputs = [ - eventlet - mock - pytestCheckHook - ]; - - pythonImportsCheck = [ "signalslot" ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "--pep8 --cov" "" \ --replace "--cov-report html" "" ''; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + contexter + six + ]; + + pythonRemoveDeps = [ + "weakrefmethod" # needed until https://github.com/Numergy/signalslot/pull/17 + ]; + + checkInputs = [ + eventlet + mock + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ "signalslot" ]; + meta = with lib; { description = "Simple Signal/Slot implementation"; homepage = "https://github.com/numergy/signalslot"; From c35afb9aeb2952b443ccd352d27ab2d47c755162 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 1 Dec 2022 10:22:51 -0800 Subject: [PATCH 084/222] python310Packages.weakrefmethod: remove This package is only needed by Python 2. Due to its low usage within nixpkgs, I feel that it can be maintained out of tree if necessary. As a benefit, this remove one more dependency on unittest2, which is unmaintained by upstream, and which we would like to remove. --- .../python-modules/weakrefmethod/default.nix | 24 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/weakrefmethod/default.nix diff --git a/pkgs/development/python-modules/weakrefmethod/default.nix b/pkgs/development/python-modules/weakrefmethod/default.nix deleted file mode 100644 index 66c0aef2eb9f..000000000000 --- a/pkgs/development/python-modules/weakrefmethod/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, unittest2 }: - -buildPythonPackage rec { - pname = "weakrefmethod"; - version = "1.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-N7wfu1V1rPghctTre2/EQS131aHXDf8sH4pFdDAc2mY="; - }; - - checkInputs = [ - unittest2 - ]; - - pythonImportsCheck = [ "weakrefmethod" ]; - - meta = with lib; { - description = "A WeakMethod class for storing bound methods using weak references"; - homepage = "https://github.com/twang817/weakrefmethod"; - license = licenses.psfl; - maintainers = with maintainers; [ myaats ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 922692ef1ef8..d1dce8ee80a4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -216,6 +216,7 @@ mapAliases ({ types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 Wand = wand; # added 2022-11-13 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 + weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 websocket_client = websocket-client; # added 2021-06-15 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3f626314490..6867cab1cbf5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11893,8 +11893,6 @@ self: super: with self; { wcwidth = callPackage ../development/python-modules/wcwidth { }; - weakrefmethod = callPackage ../development/python-modules/weakrefmethod { }; - weasyprint = callPackage ../development/python-modules/weasyprint { }; web3 = callPackage ../development/python-modules/web3 { }; From ca271f298814974b08e7e84f379604820f40ffa6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 17:48:30 +0000 Subject: [PATCH 085/222] python310Packages.pyodbc: 4.0.34 -> 4.0.35 --- pkgs/development/python-modules/pyodbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index e62417b2df3a..7d950085413c 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.34"; + version = "4.0.35"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "sha256-fqeGlTK5a41Smx8I6oV2X5TffkpY6Wiy+NRVNGoD5Fw="; + sha256 = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; }; buildInputs = [ unixODBC ]; From 067d0d4f173955d7df30110d3d3f35fefe5a4601 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 19:10:21 +0100 Subject: [PATCH 086/222] python310Packages.pyodbc: add changelog to meta --- .../python-modules/pyodbc/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 7d950085413c..5b8656bbe19f 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -1,24 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, unixODBC }: +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, pythonOlder +, unixODBC +}: buildPythonPackage rec { pname = "pyodbc"; version = "4.0.35"; - disabled = isPyPy; # use pypypdbc instead + format = "setuptools"; + + disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; + hash = "sha256-krmvSOi5KEVbyLlL89oFdR+uwJMqEe7iN8GJxtQ55cg="; }; - buildInputs = [ unixODBC ]; + buildInputs = [ + unixODBC + ]; - doCheck = false; # tests require a database server + # Tests require a database server + doCheck = false; - pythonImportsCheck = [ "pyodbc" ]; + pythonImportsCheck = [ + "pyodbc" + ]; meta = with lib; { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; + changelog = "https://github.com/mkleehammer/pyodbc/releases/tag/${version}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; From efdcde92730d3f0c7ad2a6e8151438485c446c4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 18:47:12 +0000 Subject: [PATCH 087/222] python310Packages.pyphen: 0.13.0 -> 0.13.2 --- pkgs/development/python-modules/pyphen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 6822886bda4e..c231c9964cf1 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyphen"; - version = "0.13.0"; + version = "0.13.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Boc86//WWo/KfCDA49wDJlXH7o3g9VIgXK07V0JlwpM="; + sha256 = "sha256-hH9XoEOlhAjyRnCuAYT/bt+1/VcxdDIIIowCjdxRRDg="; }; nativeBuildInputs = [ From 427a6d3a048de8b37cb478dac9128c89cbe271a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 19:55:33 +0100 Subject: [PATCH 088/222] python310Packages.pymediainfo: add changelog to meta - disable on unsupported Python releases --- .../python-modules/pymediainfo/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index aaca2dbcd0f5..e8bb96a6bb9c 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage +{ lib +, stdenv +, fetchPypi +, buildPythonPackage , libmediainfo , setuptools-scm -, pytest, glibcLocales }: +, pytest +, glibcLocales +, pythonOlder +}: buildPythonPackage rec { pname = "pymediainfo"; version = "6.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-luBLrA38tya+1wwxSxIZEhxLk0TGapj0Js4n1/mr/7A="; + hash = "sha256-luBLrA38tya+1wwxSxIZEhxLk0TGapj0Js4n1/mr/7A="; }; postPatch = '' @@ -22,18 +31,28 @@ buildPythonPackage rec { "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0" ''; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - checkInputs = [ glibcLocales pytest ]; + checkInputs = [ + glibcLocales + pytest + ]; checkPhase = '' export LC_ALL=en_US.UTF-8 py.test -k 'not test_parse_url' tests ''; + pythonImportsCheck = [ + "pymediainfo" + ]; + meta = with lib; { description = "Python wrapper for the mediainfo library"; homepage = "https://github.com/sbraz/pymediainfo"; + changelog = "https://github.com/sbraz/pymediainfo/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jfrankenau ]; }; From 95b21e5eeabac42449675b806df7af73645637c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 19:57:59 +0100 Subject: [PATCH 089/222] python310Packages.moderngl: add changelog to meta --- pkgs/development/python-modules/moderngl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 68cf1d3b4347..d877db512122 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "High performance rendering for Python"; homepage = "https://github.com/moderngl/moderngl"; + changelog = "https://github.com/moderngl/moderngl/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; # should be mesaPlatforms, darwin build breaks. From a80f8fe1a37c7e5719091210ef81c2c86b16c081 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 20:03:54 +0100 Subject: [PATCH 090/222] python310Packages.prefixed: add changelog to meta - disable on unsupported Python releases --- .../python-modules/prefixed/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix index 6297898eb2e0..189494bfaa8a 100644 --- a/pkgs/development/python-modules/prefixed/default.nix +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -2,24 +2,33 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "prefixed"; version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sTTXNBNiULF7aO7eZaM3D6sBNEEstmvIvjVo/wW9+OQ="; + hash = "sha256-sTTXNBNiULF7aO7eZaM3D6sBNEEstmvIvjVo/wW9+OQ="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "prefixed" ]; + pythonImportsCheck = [ + "prefixed" + ]; meta = with lib; { description = "Prefixed alternative numeric library"; homepage = "https://github.com/Rockhopper-Technologies/prefixed"; + changelog = "https://github.com/Rockhopper-Technologies/prefixed/releases/tag/${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ veprbl ]; }; From 473328a5e038f7865867b50a5b5ce19a627141c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Dec 2022 20:10:49 +0100 Subject: [PATCH 091/222] python310Packages.ptpython: add changelog to meta - update disabled - add pythonImportsCheck --- .../python-modules/ptpython/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 084bdef33493..af07f013ee05 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi , appdirs , black , importlib-metadata @@ -11,11 +14,13 @@ buildPythonPackage rec { pname = "ptpython"; version = "3.0.21"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pXuZUurEoSVApN+0zNSiQ0A+zrJ7DRMkW15BRMhzHTI="; + hash = "sha256-pXuZUurEoSVApN+0zNSiQ0A+zrJ7DRMkW15BRMhzHTI="; }; propagatedBuildInputs = [ @@ -24,14 +29,21 @@ buildPythonPackage rec { jedi prompt-toolkit pygments - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; # no tests to run doCheck = false; + pythonImportsCheck = [ + "ptpython" + ]; + meta = with lib; { description = "An advanced Python REPL"; homepage = "https://github.com/prompt-toolkit/ptpython"; + changelog = "https://github.com/prompt-toolkit/ptpython/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ mlieberman85 ]; }; From a4892c68405e01f09e9c0f93927786cf6a7f0287 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Thu, 1 Dec 2022 19:46:37 +0000 Subject: [PATCH 092/222] jfmt: 1.2.0 -> 1.2.1 Changelog: https://github.com/scruffystuffs/jfmt.rs/blob/v1.2.1/CHANGELOG.md --- pkgs/development/tools/jfmt/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/jfmt/default.nix b/pkgs/development/tools/jfmt/default.nix index cf1292b4b121..45a18edfffbe 100644 --- a/pkgs/development/tools/jfmt/default.nix +++ b/pkgs/development/tools/jfmt/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "jfmt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "scruffystuffs"; repo = "${pname}.rs"; - rev = version; - sha256 = "07qb0sjwww6d2n7fw8w4razq1mkn4psrs9wqi1ccndrya1y39d8b"; + rev = "v${version}"; + hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80="; }; - cargoSha256 = "19kg2n53y9nazwpp8gcvdprxry2llf2k7g4q4zalyxkhpf7k6irb"; + cargoHash = "sha256-u/v3P7iPdBJU/0wlSNBq/cjnM3XOnoVfUjrrmo4sTAA="; meta = with lib; { description = "CLI utility to format json files"; homepage = "https://github.com/scruffystuffs/jfmt.rs"; + changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.psibi ]; }; From 562a9b807de69b3c05b0fa439f9f5d0685720ad0 Mon Sep 17 00:00:00 2001 From: Alexandre Acebedo Date: Thu, 1 Dec 2022 21:15:46 +0100 Subject: [PATCH 093/222] youtube-music: fix trayicon and source provenance --- pkgs/applications/audio/youtube-music/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index ac28733c81bc..d96d74b89ce5 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -13,6 +13,8 @@ let in appimageTools.wrapType2 rec { inherit pname version src; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) + ++ [ pkgs.libappindicator ]; extraInstallCommands = '' mv $out/bin/{${pname}-${version},${pname}} @@ -29,7 +31,7 @@ appimageTools.wrapType2 rec { description = "Electron wrapper around YouTube Music"; homepage = "https://th-ch.github.io/youtube-music/"; license = licenses.mit; - sourceProvenance = with sourceTypes; [ fromSource ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = [ maintainers.aacebedo ]; }; From 70f59224049341cf18fb9dff3e95ea1b8687a5b8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 26 Nov 2022 15:27:43 +1000 Subject: [PATCH 094/222] terraform-providers: remove explicit version not needed when we can just remove v from the front of rev --- .../cluster/terraform-providers/default.nix | 2 +- .../terraform-providers/providers.json | 423 ++++++------------ .../terraform-providers/update-provider | 19 +- 3 files changed, 150 insertions(+), 294 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 9f9471627cf6..fc2a44ff9722 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -17,7 +17,7 @@ let ({ owner , repo , rev - , version + , version ? lib.removePrefix "v" rev , hash ? throw "use hash instead of sha256" # added 2202/09 , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 , deleteVendor ? false diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 853380309eb0..8dc5157a341a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -7,8 +7,7 @@ "proxyVendor": true, "repo": "terraform-provider-aci", "rev": "v2.5.2", - "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=", - "version": "2.5.2" + "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=" }, "acme": { "hash": "sha256-H+1/Au/jCxNxrV+kk6tylUF85taZcs44uWed1QH1aRo=", @@ -17,8 +16,7 @@ "proxyVendor": true, "repo": "terraform-provider-acme", "rev": "v2.11.1", - "vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=", - "version": "2.11.1" + "vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -26,8 +24,7 @@ "provider-source-address": "registry.terraform.io/clementblaise/age", "repo": "terraform-provider-age", "rev": "v0.1.1", - "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=", - "version": "0.1.1" + "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { "hash": "sha256-2QdpXNCnnYh75CyqeKJbYgFB63TCcMrWlUPLe/puvOw=", @@ -35,8 +32,7 @@ "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", "rev": "v3.8.1", - "vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=", - "version": "3.8.1" + "vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=" }, "akamai": { "hash": "sha256-QbCDaDII+xEA3lXjODsz8jai2mg3N/3uC4fruiLqvWc=", @@ -44,8 +40,7 @@ "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", "rev": "v3.0.0", - "vendorHash": "sha256-LYoRZIr2+NqxwZYaN1HFTSaCl0wJPVr2Wf0OjdqM5YM=", - "version": "3.0.0" + "vendorHash": "sha256-LYoRZIr2+NqxwZYaN1HFTSaCl0wJPVr2Wf0OjdqM5YM=" }, "alicloud": { "hash": "sha256-rscu2gCvf/8MJBx1coUmne+8DO8b6RFyfMAwhTUPU+w=", @@ -53,8 +48,7 @@ "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", "rev": "v1.192.0", - "vendorHash": null, - "version": "1.192.0" + "vendorHash": null }, "ansible": { "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", @@ -62,8 +56,7 @@ "provider-source-address": "registry.terraform.io/nbering/ansible", "repo": "terraform-provider-ansible", "rev": "v1.0.4", - "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=", - "version": "1.0.4" + "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { "hash": "sha256-EzqsTJwjDQ6pIQxdGPOTbNom0RDurAGT0eJmuwAzO4Y=", @@ -71,8 +64,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/archive", "repo": "terraform-provider-archive", "rev": "v2.2.0", - "vendorHash": null, - "version": "2.2.0" + "vendorHash": null }, "argocd": { "hash": "sha256-yWhq2WolfL7PQVuWr5P7EH0cM78wGyL2+yezh2WzL2c=", @@ -80,8 +72,7 @@ "provider-source-address": "registry.terraform.io/oboukili/argocd", "repo": "terraform-provider-argocd", "rev": "v4.1.0", - "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=", - "version": "4.1.0" + "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=" }, "auth0": { "hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=", @@ -89,8 +80,7 @@ "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", "rev": "v0.40.0", - "vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=", - "version": "0.40.0" + "vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=" }, "avi": { "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", @@ -99,8 +89,7 @@ "proxyVendor": true, "repo": "terraform-provider-avi", "rev": "v22.1.2", - "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=", - "version": "22.1.2" + "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" }, "aviatrix": { "hash": "sha256-1zHaSdDcGynLhgLMDRbRgRzt0IvQI25TDZrYzZwwQ34=", @@ -108,8 +97,7 @@ "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", "rev": "v2.24.1", - "vendorHash": null, - "version": "2.24.1" + "vendorHash": null }, "aws": { "hash": "sha256-jk46oJCbhZa6MzqWd4FQDHXekGKNdzXf/y6qUY+Ts9Q=", @@ -117,8 +105,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", "rev": "v4.41.0", - "vendorHash": "sha256-bsaZDkxPTQQbjtjSR9BZbMVHJ+cy3iEHPRI4l5K+jyg=", - "version": "4.41.0" + "vendorHash": "sha256-bsaZDkxPTQQbjtjSR9BZbMVHJ+cy3iEHPRI4l5K+jyg=" }, "azuread": { "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=", @@ -126,8 +113,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", "rev": "v2.30.0", - "vendorHash": null, - "version": "2.30.0" + "vendorHash": null }, "azurerm": { "hash": "sha256-aUTapTSpNZo2Tg3e/BMBGedEVwX0Sa+T2UrbgyiLOhk=", @@ -135,8 +121,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", "rev": "v3.33.0", - "vendorHash": null, - "version": "3.33.0" + "vendorHash": null }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -144,8 +129,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", "rev": "v1.0.0", - "vendorHash": null, - "version": "1.0.0" + "vendorHash": null }, "baiducloud": { "deleteVendor": true, @@ -154,8 +138,7 @@ "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", "rev": "v1.18.2", - "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=", - "version": "1.18.2" + "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=" }, "bigip": { "hash": "sha256-erJeg7KF3QUi85ueOQTrab2woIC1nkMXRIj/pFm0DGY=", @@ -163,8 +146,7 @@ "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", "rev": "v1.16.0", - "vendorHash": null, - "version": "1.16.0" + "vendorHash": null }, "bitbucket": { "hash": "sha256-eU8vA2fxtdsObgh2dTExGLzzBnfSc2DSGdFHrLXR3SA=", @@ -172,8 +154,7 @@ "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", "rev": "v2.22.0", - "vendorHash": "sha256-Qkla3OEcyiMn6eqBj+4LB8JwpIwceLAASI1qvOcUBD0=", - "version": "2.22.0" + "vendorHash": "sha256-Qkla3OEcyiMn6eqBj+4LB8JwpIwceLAASI1qvOcUBD0=" }, "brightbox": { "hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=", @@ -181,8 +162,7 @@ "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", "rev": "v3.0.5", - "vendorHash": "sha256-ZT+SOHn/8aoZLXUau9toc3NtQNaXfttM0agIw8T28tk=", - "version": "3.0.5" + "vendorHash": "sha256-ZT+SOHn/8aoZLXUau9toc3NtQNaXfttM0agIw8T28tk=" }, "buildkite": { "hash": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=", @@ -191,8 +171,7 @@ "proxyVendor": true, "repo": "terraform-provider-buildkite", "rev": "v0.11.0", - "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=", - "version": "0.11.0" + "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=" }, "checkly": { "hash": "sha256-OKLmcy0egQ9z/eBsdXzGiswByWQ9fiOq4N7ndTW2nso=", @@ -200,8 +179,7 @@ "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", "rev": "v1.6.3", - "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=", - "version": "1.6.3" + "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -209,8 +187,7 @@ "provider-source-address": "registry.terraform.io/CiscoDevNet/ciscoasa", "repo": "terraform-provider-ciscoasa", "rev": "v1.3.0", - "vendorHash": null, - "version": "1.3.0" + "vendorHash": null }, "cloudamqp": { "hash": "sha256-EtFGqYNfyDbS4f1tjRTKcrQNFqEZmmILeuEOpwkx6/4=", @@ -218,8 +195,7 @@ "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", "rev": "v1.20.0", - "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=", - "version": "1.20.0" + "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=" }, "cloudflare": { "hash": "sha256-a0zJ1n4nKHEyjqJeey5MxPhqJU8Bq9a+hqLOCEdTfEE=", @@ -227,8 +203,7 @@ "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", "rev": "v3.28.0", - "vendorHash": "sha256-Jvaud6rkaNMZZ/L/pb8JKGaAYw1MieGq7aU4Abe2VJA=", - "version": "3.28.0" + "vendorHash": "sha256-Jvaud6rkaNMZZ/L/pb8JKGaAYw1MieGq7aU4Abe2VJA=" }, "cloudfoundry": { "hash": "sha256-OOORVbjcXhH6gVjLdOu8kTqy6dzIARruF4H8byMNkko=", @@ -236,8 +211,7 @@ "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", "repo": "terraform-provider-cloudfoundry", "rev": "v0.50.1", - "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=", - "version": "0.50.1" + "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, "cloudinit": { "hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=", @@ -245,8 +219,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/cloudinit", "repo": "terraform-provider-cloudinit", "rev": "v2.2.0", - "vendorHash": null, - "version": "2.2.0" + "vendorHash": null }, "cloudscale": { "hash": "sha256-Eo7zT/KiJdzo7fhAcCg6EV29ENM/XSBumAHmL9J8agU=", @@ -254,8 +227,7 @@ "provider-source-address": "registry.terraform.io/cloudscale-ch/cloudscale", "repo": "terraform-provider-cloudscale", "rev": "v4.0.0", - "vendorHash": null, - "version": "4.0.0" + "vendorHash": null }, "constellix": { "deleteVendor": true, @@ -264,8 +236,7 @@ "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", "rev": "v0.4.5", - "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=", - "version": "0.4.5" + "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { "hash": "sha256-DS27LGhXDYVr+c0wIZe5PjssK8l8Aq4zzh3I+G4WCU8=", @@ -273,8 +244,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", "rev": "v2.16.2", - "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=", - "version": "2.16.2" + "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=" }, "ct": { "hash": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=", @@ -282,8 +252,7 @@ "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", "rev": "v0.11.0", - "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=", - "version": "0.11.0" + "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { "hash": "sha256-QKUmbCyB9Xlr+wfEGiCR+xn8xz81FJ77pY90AzMc/Bw=", @@ -291,8 +260,7 @@ "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", "rev": "v3.18.0", - "vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=", - "version": "3.18.0" + "vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", @@ -300,8 +268,7 @@ "provider-source-address": "registry.terraform.io/awakesecurity/dhall", "repo": "terraform-provider-dhall", "rev": "v0.0.3", - "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=", - "version": "0.0.3" + "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { "hash": "sha256-l/p2HStjvxF6UB1SnY3EoGjC/3t5FdlC6LMk7jn11KI=", @@ -309,8 +276,7 @@ "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", "rev": "v2.25.2", - "vendorHash": null, - "version": "2.25.2" + "vendorHash": null }, "dme": { "hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=", @@ -318,8 +284,7 @@ "provider-source-address": "registry.terraform.io/DNSMadeEasy/dme", "repo": "terraform-provider-dme", "rev": "v1.0.6", - "vendorHash": null, - "version": "1.0.6" + "vendorHash": null }, "dns": { "hash": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", @@ -327,8 +292,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/dns", "repo": "terraform-provider-dns", "rev": "v3.2.3", - "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=", - "version": "3.2.3" + "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=" }, "dnsimple": { "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", @@ -336,8 +300,7 @@ "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", "rev": "v0.15.0", - "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=", - "version": "0.15.0" + "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" }, "docker": { "hash": "sha256-SWfA3WaShBa+5FTyqLv+idVdvavet7V6qRKRGwYePUM=", @@ -345,8 +308,7 @@ "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", "rev": "v2.23.1", - "vendorHash": "sha256-EaWVf8GmNsabpfeOEzRjKPubCyEReGjdzRy7Ohb4mno=", - "version": "2.23.1" + "vendorHash": "sha256-EaWVf8GmNsabpfeOEzRjKPubCyEReGjdzRy7Ohb4mno=" }, "elasticsearch": { "hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=", @@ -354,8 +316,7 @@ "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", "rev": "v2.0.6", - "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=", - "version": "2.0.6" + "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { "hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=", @@ -363,8 +324,7 @@ "provider-source-address": "registry.terraform.io/equinix/equinix", "repo": "terraform-provider-equinix", "rev": "v1.10.0", - "vendorHash": "sha256-ZGPSNz/6qwEU5EY72fIJ1x9bnsN9OZQ6MQ+XNotMGgA=", - "version": "1.10.0" + "vendorHash": "sha256-ZGPSNz/6qwEU5EY72fIJ1x9bnsN9OZQ6MQ+XNotMGgA=" }, "exoscale": { "hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=", @@ -372,8 +332,7 @@ "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", "rev": "v0.41.1", - "vendorHash": null, - "version": "0.41.1" + "vendorHash": null }, "external": { "hash": "sha256-o9vCr3ayqg9Ehi39FgR6vJFZYF1iTcVD4QfYHcs+YbQ=", @@ -381,8 +340,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", "rev": "v2.2.3", - "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=", - "version": "2.2.3" + "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { "hash": "sha256-X2T/t3uDY1jDPhx7IZOwVLx1o4pse5/0T+nrJtRB1Lk=", @@ -390,8 +348,7 @@ "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", "rev": "v3.0.2", - "vendorHash": null, - "version": "3.0.2" + "vendorHash": null }, "flexibleengine": { "hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=", @@ -399,8 +356,7 @@ "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", "rev": "v1.34.0", - "vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=", - "version": "1.34.0" + "vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=" }, "fortios": { "deleteVendor": true, @@ -410,8 +366,7 @@ "proxyVendor": true, "repo": "terraform-provider-fortios", "rev": "v1.16.0", - "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=", - "version": "1.16.0" + "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" }, "gandi": { "hash": "sha256-uXZcYiNsBf5XsMjOjjQeNtGwLhTgYES1E9t63fBEI6Q=", @@ -419,8 +374,7 @@ "provider-source-address": "registry.terraform.io/go-gandi/gandi", "repo": "terraform-provider-gandi", "rev": "v2.2.0", - "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=", - "version": "2.2.0" + "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=" }, "github": { "hash": "sha256-+I2h3wQnLd9EX99begsj4CI5R5i93JowBbGydYQNJHg=", @@ -428,8 +382,7 @@ "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", "rev": "v5.9.1", - "vendorHash": null, - "version": "5.9.1" + "vendorHash": null }, "gitlab": { "hash": "sha256-lNEkUleH0Y3ZQnHqu8cEIGdigqrbRkVRg+9kOk8kU3c=", @@ -437,8 +390,7 @@ "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", "rev": "v3.20.0", - "vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks=", - "version": "3.20.0" + "vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks=" }, "google": { "hash": "sha256-e2jVnL13j4iSb288CB/H6G3vR58bjwi+2ZHzve1tuUo=", @@ -447,8 +399,7 @@ "proxyVendor": true, "repo": "terraform-provider-google", "rev": "v4.44.1", - "vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=", - "version": "4.44.1" + "vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=" }, "google-beta": { "hash": "sha256-ejMWZTSrkGMAKr02TIg0yngzpqEVL8y56JSoQrCJ7lA=", @@ -457,8 +408,7 @@ "proxyVendor": true, "repo": "terraform-provider-google-beta", "rev": "v4.44.1", - "vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=", - "version": "4.44.1" + "vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -466,8 +416,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", "repo": "terraform-provider-googleworkspace", "rev": "v0.7.0", - "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=", - "version": "0.7.0" + "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { "hash": "sha256-DAuG1VYLYr3cz+PR5wNlPBKuUcnbYAO0d9tNxnBiGuU=", @@ -475,8 +424,7 @@ "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", "rev": "v1.31.1", - "vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo=", - "version": "1.31.1" + "vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo=" }, "gridscale": { "hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=", @@ -484,8 +432,7 @@ "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", "rev": "v1.16.2", - "vendorHash": null, - "version": "1.16.2" + "vendorHash": null }, "hcloud": { "hash": "sha256-d/qLN5ev8ywiJr97rrlS9rwfvsEheBD2n8I6D9a7krQ=", @@ -493,8 +440,7 @@ "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", "rev": "v1.36.0", - "vendorHash": "sha256-HsWkHoFs/77b5+6HSV7YgLOwpE2BZyxbGNty8p+OBSM=", - "version": "1.36.0" + "vendorHash": "sha256-HsWkHoFs/77b5+6HSV7YgLOwpE2BZyxbGNty8p+OBSM=" }, "helm": { "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", @@ -502,8 +448,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", "rev": "v2.7.1", - "vendorHash": null, - "version": "2.7.1" + "vendorHash": null }, "heroku": { "hash": "sha256-NabwjOTbBRlDNFBpCshxZMO9E958tfAIPPuyArvacFI=", @@ -511,8 +456,7 @@ "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", "rev": "v5.1.6", - "vendorHash": null, - "version": "5.1.6" + "vendorHash": null }, "hetznerdns": { "hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=", @@ -520,8 +464,7 @@ "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", "repo": "terraform-provider-hetznerdns", "rev": "v2.2.0", - "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=", - "version": "2.2.0" + "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", @@ -530,8 +473,7 @@ "proxyVendor": true, "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", - "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=", - "version": "1.0.4" + "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" }, "http": { "hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=", @@ -539,8 +481,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", "rev": "v3.2.1", - "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=", - "version": "3.2.1" + "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { "hash": "sha256-cr7xV7Z4UU+kRykVSOKeuXDiHQPL4CsCJVXf2uTZOms=", @@ -548,8 +489,7 @@ "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", "rev": "v1.42.0", - "vendorHash": null, - "version": "1.42.0" + "vendorHash": null }, "huaweicloudstack": { "hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=", @@ -557,8 +497,7 @@ "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloudstack", "repo": "terraform-provider-huaweicloudstack", "rev": "v1.3.0", - "vendorHash": null, - "version": "1.3.0" + "vendorHash": null }, "hydra": { "hash": "sha256-A9BemEPLhvYzhksvYRfmhQXY3EEdTxQcmjE9+2+BKqg=", @@ -566,8 +505,7 @@ "provider-source-address": "registry.terraform.io/DeterminateSystems/hydra", "repo": "terraform-provider-hydra", "rev": "v0.1.2", - "vendorHash": null, - "version": "0.1.2" + "vendorHash": null }, "ibm": { "hash": "sha256-VFJ86dMKOHzfq5W154+kmX9poRFjT+LlLRl3HNA52pc=", @@ -575,8 +513,7 @@ "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", "rev": "v1.47.1", - "vendorHash": "sha256-9UIM6T6ceF6WXIbjhSuDv1lNn9rphcZoePPk11X2Olo=", - "version": "1.47.1" + "vendorHash": "sha256-9UIM6T6ceF6WXIbjhSuDv1lNn9rphcZoePPk11X2Olo=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -584,8 +521,7 @@ "provider-source-address": "registry.terraform.io/Icinga/icinga2", "repo": "terraform-provider-icinga2", "rev": "v0.5.0", - "vendorHash": null, - "version": "0.5.0" + "vendorHash": null }, "infoblox": { "hash": "sha256-VquTyQxbVFPImZCwthwf8hJPlUxAxhmed/r1V+qm/ak=", @@ -593,8 +529,7 @@ "provider-source-address": "registry.terraform.io/infobloxopen/infoblox", "repo": "terraform-provider-infoblox", "rev": "v2.1.0", - "vendorHash": null, - "version": "2.1.0" + "vendorHash": null }, "kafka": { "hash": "sha256-bKbY2cOIORy3D9yCBqVuKUZb650sx+87d4wtUB3dPdg=", @@ -602,8 +537,7 @@ "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", "rev": "v0.5.1", - "vendorHash": "sha256-03QV6C2DEN5xwMwABwSvv5Ts6pTHQDBP2zUUqIcOtVQ=", - "version": "0.5.1" + "vendorHash": "sha256-03QV6C2DEN5xwMwABwSvv5Ts6pTHQDBP2zUUqIcOtVQ=" }, "kafka-connect": { "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", @@ -611,8 +545,7 @@ "provider-source-address": "registry.terraform.io/Mongey/kafka-connect", "repo": "terraform-provider-kafka-connect", "rev": "v0.3.0", - "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=", - "version": "0.3.0" + "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=", @@ -620,8 +553,7 @@ "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", "rev": "v4.0.1", - "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=", - "version": "4.0.1" + "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" }, "ksyun": { "hash": "sha256-Rye7gKARdbrB6KDEygEJy9m7VqlGw6QeE2F1oa3n8as=", @@ -629,8 +561,7 @@ "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", "rev": "v1.3.58", - "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=", - "version": "1.3.58" + "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=" }, "kubectl": { "hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=", @@ -638,8 +569,7 @@ "provider-source-address": "registry.terraform.io/gavinbunney/kubectl", "repo": "terraform-provider-kubectl", "rev": "v1.14.0", - "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=", - "version": "1.14.0" + "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { "hash": "sha256-hWFC8VBbM3BRGrX1Y45Znd/W3klYy/7aS7JbbKN7EUg=", @@ -647,8 +577,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", "rev": "v2.16.0", - "vendorHash": null, - "version": "2.16.0" + "vendorHash": null }, "launchdarkly": { "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", @@ -656,8 +585,7 @@ "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", "rev": "v2.9.4", - "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", - "version": "2.9.4" + "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" }, "libvirt": { "hash": "sha256-j5EcxmkCyHwbXzvJ9lfQBRBYa3SbrKc3kbt1KZTm0gY=", @@ -665,8 +593,7 @@ "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", "repo": "terraform-provider-libvirt", "rev": "v0.7.0", - "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=", - "version": "0.7.0" + "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", @@ -674,8 +601,7 @@ "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", "rev": "v1.29.4", - "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=", - "version": "1.29.4" + "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -683,8 +609,7 @@ "provider-source-address": "registry.terraform.io/numtide/linuxbox", "repo": "terraform-provider-linuxbox", "rev": "v0.4.3", - "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=", - "version": "0.4.3" + "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { "hash": "sha256-l9XQpIMMar7ForZuBcGOmqrRuSnthIrilr4CHJ5SiaU=", @@ -692,8 +617,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", "rev": "v2.2.3", - "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=", - "version": "2.2.3" + "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=" }, "logicmonitor": { "hash": "sha256-GQPTFf+JxJB3iO1Us0zOAAG2NonuJ/b5la6f1j2Nd4k=", @@ -701,8 +625,7 @@ "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor", "repo": "terraform-provider-logicmonitor", "rev": "v2.0.3", - "vendorHash": null, - "version": "2.0.3" + "vendorHash": null }, "lxd": { "hash": "sha256-DfRhPRclg/hCmmp0V087hl66WSFbEyXHFUGeehlU290=", @@ -711,8 +634,7 @@ "proxyVendor": true, "repo": "terraform-provider-lxd", "rev": "v1.8.0", - "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=", - "version": "1.8.0" + "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=" }, "mailgun": { "hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=", @@ -720,8 +642,7 @@ "provider-source-address": "registry.terraform.io/wgebis/mailgun", "repo": "terraform-provider-mailgun", "rev": "v0.7.2", - "vendorHash": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=", - "version": "0.7.2" + "vendorHash": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=" }, "matchbox": { "hash": "sha256-vWhdStfwReeD1PHTihBoj4GoKnP85nzNzIV/Tjfcz1M=", @@ -729,8 +650,7 @@ "provider-source-address": "registry.terraform.io/poseidon/matchbox", "repo": "terraform-provider-matchbox", "rev": "v0.5.2", - "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=", - "version": "0.5.2" + "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=" }, "metal": { "hash": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=", @@ -738,8 +658,7 @@ "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", "rev": "v3.3.0", - "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=", - "version": "3.3.0" + "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { "hash": "sha256-mtguRBSa+XrpUqEXb9voDHraae9fOaayX1nQpaeAlo4=", @@ -747,8 +666,7 @@ "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", "rev": "v1.9.1", - "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=", - "version": "1.9.1" + "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=" }, "mongodbatlas": { "hash": "sha256-rHT/x3Wpd7b4u7v1/g6DY85TwRkf5A7KaOiqoWeN05Y=", @@ -756,8 +674,7 @@ "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", "rev": "v1.6.0", - "vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=", - "version": "1.6.0" + "vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -765,8 +682,7 @@ "provider-source-address": "registry.terraform.io/namecheap/namecheap", "repo": "terraform-provider-namecheap", "rev": "v2.1.0", - "vendorHash": null, - "version": "2.1.0" + "vendorHash": null }, "netlify": { "hash": "sha256-7U+hHN/6GqcbI1gX7L01YqVjlUgvdfhgpXvLF2lwbkA=", @@ -774,8 +690,7 @@ "provider-source-address": "registry.terraform.io/AegirHealth/netlify", "repo": "terraform-provider-netlify", "rev": "v0.6.12", - "vendorHash": null, - "version": "0.6.12" + "vendorHash": null }, "newrelic": { "hash": "sha256-d5JRqxMmG7fku8+C8e700nfghz2wbL0n1TrOZb1hkpY=", @@ -783,8 +698,7 @@ "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", "rev": "v3.7.1", - "vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=", - "version": "3.7.1" + "vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -792,8 +706,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", "rev": "v1.4.19", - "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=", - "version": "1.4.19" + "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { "hash": "sha256-qHR3KJa1y10B+iQPgH6lTt/JUqTmiK/60rPCa3gQDP8=", @@ -801,8 +714,7 @@ "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", "rev": "v1.13.0", - "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=", - "version": "1.13.0" + "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=" }, "nsxt": { "hash": "sha256-TOoRtCKdR1fBjk39dbMgBd7pDJGfjvkQAqfpJzWRwRg=", @@ -810,8 +722,7 @@ "provider-source-address": "registry.terraform.io/vmware/nsxt", "repo": "terraform-provider-nsxt", "rev": "v3.2.9", - "vendorHash": null, - "version": "3.2.9" + "vendorHash": null }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", @@ -819,8 +730,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/null", "repo": "terraform-provider-null", "rev": "v3.2.1", - "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=", - "version": "3.2.1" + "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=" }, "nutanix": { "deleteVendor": true, @@ -829,8 +739,7 @@ "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", "rev": "v1.7.1", - "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.7.1" + "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { "hash": "sha256-t8GrhKnKredpbRmx/MAA4tx0kV0yZoFNnacKsp0Htro=", @@ -838,8 +747,7 @@ "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", "rev": "v4.100.0", - "vendorHash": null, - "version": "4.100.0" + "vendorHash": null }, "okta": { "hash": "sha256-2AR416LkqgfHdY18m4k/jqSet7G77HwHuGKilvS3Yig=", @@ -847,8 +755,7 @@ "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", "rev": "v3.39.0", - "vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=", - "version": "3.39.0" + "vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -856,8 +763,7 @@ "provider-source-address": "registry.terraform.io/oktadeveloper/oktaasa", "repo": "terraform-provider-oktaasa", "rev": "v1.0.1", - "vendorHash": null, - "version": "1.0.1" + "vendorHash": null }, "opennebula": { "hash": "sha256-jm7k0k28TSfnUA6P2RjSfF36o/nznvDWcDmJz/MAMXU=", @@ -865,8 +771,7 @@ "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", "rev": "v1.0.2", - "vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=", - "version": "1.0.2" + "vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=" }, "openstack": { "hash": "sha256-k5UyK9jmjZzHw8AwmDRtyCyJgILAcCK+nN+hklJ9VFw=", @@ -874,8 +779,7 @@ "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", "rev": "v1.49.0", - "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=", - "version": "1.49.0" + "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { "hash": "sha256-H1X+wWxdP7MwUtUaQiw0usOO6jwAAVLYMoG5Ut2OcqM=", @@ -883,8 +787,7 @@ "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", "rev": "v1.31.9", - "vendorHash": "sha256-n7Ez596JnRwsKYPuR8lCLo6ez/TFch2kMgoScg7pPUI=", - "version": "1.31.9" + "vendorHash": "sha256-n7Ez596JnRwsKYPuR8lCLo6ez/TFch2kMgoScg7pPUI=" }, "opsgenie": { "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=", @@ -892,8 +795,7 @@ "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", "rev": "v0.6.18", - "vendorHash": null, - "version": "0.6.18" + "vendorHash": null }, "ovh": { "hash": "sha256-6lBhEmeAvTv8xRMi5ZabcJg/59xJ9o4/MaAJP+H7pqk=", @@ -901,8 +803,7 @@ "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", "rev": "v0.23.0", - "vendorHash": null, - "version": "0.23.0" + "vendorHash": null }, "pagerduty": { "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=", @@ -910,8 +811,7 @@ "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", "rev": "v2.6.4", - "vendorHash": null, - "version": "2.6.4" + "vendorHash": null }, "pass": { "hash": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=", @@ -919,8 +819,7 @@ "provider-source-address": "registry.terraform.io/camptocamp/pass", "repo": "terraform-provider-pass", "rev": "v2.0.0", - "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=", - "version": "2.0.0" + "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" }, "postgresql": { "hash": "sha256-pi3st4phjCRq2jlRIW2Z4jt9qp7a1ghmlkjAQSbxhI4=", @@ -928,8 +827,7 @@ "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", "rev": "v1.17.1", - "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=", - "version": "1.17.1" + "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", @@ -937,8 +835,7 @@ "provider-source-address": "registry.terraform.io/pan-net/powerdns", "repo": "terraform-provider-powerdns", "rev": "v1.5.0", - "vendorHash": null, - "version": "1.5.0" + "vendorHash": null }, "rabbitmq": { "hash": "sha256-ZhK9zwBaod+s4tGCSBUjW7ijKeucyToXVQDPlMFmIvk=", @@ -946,8 +843,7 @@ "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", "rev": "v1.7.0", - "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=", - "version": "1.7.0" + "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=" }, "rancher2": { "hash": "sha256-DInP+DpCBOsBdlg1tiujlmN20WB5VQbeHgOiabEv9Zc=", @@ -955,8 +851,7 @@ "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", "rev": "v1.25.0", - "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=", - "version": "1.25.0" + "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=" }, "random": { "hash": "sha256-oYtvVK0OOHyLUG6amhkvmr6zlbzy0CKoS3DxztoLbdE=", @@ -964,8 +859,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", "rev": "v3.4.3", - "vendorHash": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=", - "version": "3.4.3" + "vendorHash": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=" }, "remote": { "hash": "sha256-up4+W2mLii7alqdcBoMBTAWI5Vwfc1QtsDK592sAcDM=", @@ -973,8 +867,7 @@ "provider-source-address": "registry.terraform.io/tenstad/remote", "repo": "terraform-provider-remote", "rev": "v0.1.1", - "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=", - "version": "0.1.1" + "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" }, "rundeck": { "hash": "sha256-GkX5p6hV66G45JG3aJmYD5e2LQvf6kmfa6fQK10tc68=", @@ -982,8 +875,7 @@ "provider-source-address": "registry.terraform.io/rundeck/rundeck", "repo": "terraform-provider-rundeck", "rev": "v0.4.3", - "vendorHash": null, - "version": "0.4.3" + "vendorHash": null }, "scaleway": { "hash": "sha256-0NQRAv05GuVRAkZd580TINEur/G+c0jUmMtyMv05+PY=", @@ -991,8 +883,7 @@ "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", "rev": "v2.7.1", - "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=", - "version": "2.7.1" + "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1000,8 +891,7 @@ "provider-source-address": "registry.terraform.io/numtide/secret", "repo": "terraform-provider-secret", "rev": "v1.2.1", - "vendorHash": null, - "version": "1.2.1" + "vendorHash": null }, "selectel": { "hash": "sha256-glIvlf5lWwkdZKn4rxhR+XnBqUdu9RO+loxke07i2c0=", @@ -1009,8 +899,7 @@ "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", "rev": "v3.9.0", - "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=", - "version": "3.9.0" + "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" }, "sentry": { "hash": "sha256-D6w2HfgIcNFfDXeqzuerK8msrFF7vajk80MUxbUxA+A=", @@ -1018,8 +907,7 @@ "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", "rev": "v0.10.0", - "vendorHash": "sha256-OxapqNRE5Poz6qsFjDv5G5zzivbBldzjC7kbwG2Cswg=", - "version": "0.10.0" + "vendorHash": "sha256-OxapqNRE5Poz6qsFjDv5G5zzivbBldzjC7kbwG2Cswg=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", @@ -1027,8 +915,7 @@ "provider-source-address": "registry.terraform.io/scottwinkler/shell", "repo": "terraform-provider-shell", "rev": "v1.7.10", - "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=", - "version": "1.7.10" + "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { "hash": "sha256-alLC61bEaFiVtoH0Fczj7G0m70ie1RNvTBR+MgYZGkQ=", @@ -1036,8 +923,7 @@ "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", "rev": "v6.18.0", - "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=", - "version": "6.18.0" + "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1045,8 +931,7 @@ "provider-source-address": "registry.terraform.io/skytap/skytap", "repo": "terraform-provider-skytap", "rev": "v0.15.1", - "vendorHash": null, - "version": "0.15.1" + "vendorHash": null }, "snowflake": { "hash": "sha256-V2N9Lq425fdjlJ+lCVQzMAYfEiS2/Oqevz1dIve//FA=", @@ -1054,8 +939,7 @@ "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", "rev": "v0.52.0", - "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=", - "version": "0.52.0" + "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=" }, "sops": { "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", @@ -1063,8 +947,7 @@ "provider-source-address": "registry.terraform.io/carlpett/sops", "repo": "terraform-provider-sops", "rev": "v0.7.1", - "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=", - "version": "0.7.1" + "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { "hash": "sha256-9i8mHWn9+ey0tHPXOjZyNixcrdgAl2Y8sJq/q4WlZzo=", @@ -1072,8 +955,7 @@ "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", "rev": "v1.87.0", - "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=", - "version": "1.87.0" + "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1081,8 +963,7 @@ "provider-source-address": "registry.terraform.io/stackpath/stackpath", "repo": "terraform-provider-stackpath", "rev": "v1.4.0", - "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=", - "version": "1.4.0" + "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=" }, "statuscake": { "hash": "sha256-rT+NJBPA73WCctlZnu0i952fzrGCxVF2vIIvE0SzvNI=", @@ -1090,8 +971,7 @@ "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", "rev": "v2.0.5", - "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=", - "version": "2.0.5" + "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=" }, "sumologic": { "hash": "sha256-lhMPA4ub3NlaYs0pX6FkWuR3LQxytrQxu9DjAjDja2Q=", @@ -1099,8 +979,7 @@ "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", "rev": "v2.19.2", - "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=", - "version": "2.19.2" + "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=" }, "tailscale": { "hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=", @@ -1108,8 +987,7 @@ "provider-source-address": "registry.terraform.io/tailscale/tailscale", "repo": "terraform-provider-tailscale", "rev": "v0.13.5", - "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=", - "version": "0.13.5" + "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=" }, "tencentcloud": { "hash": "sha256-zJ5nDsd5xK/iDk6LqNKJpqCtwVDarUKsv1Arnf0CNGw=", @@ -1117,8 +995,7 @@ "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", "rev": "v1.78.15", - "vendorHash": null, - "version": "1.78.15" + "vendorHash": null }, "tfe": { "hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=", @@ -1126,8 +1003,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", "rev": "v0.39.0", - "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=", - "version": "0.39.0" + "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", @@ -1135,8 +1011,7 @@ "provider-source-address": "registry.terraform.io/a10networks/thunder", "repo": "terraform-provider-thunder", "rev": "v1.0.0", - "vendorHash": null, - "version": "1.0.0" + "vendorHash": null }, "time": { "hash": "sha256-FehWmIkL0o2pleafN/mlBa46cdFqCFUS+coOwFPdb9M=", @@ -1144,8 +1019,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", "rev": "v0.9.1", - "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=", - "version": "0.9.1" + "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=" }, "tls": { "hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=", @@ -1153,8 +1027,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", "rev": "v4.0.4", - "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=", - "version": "4.0.4" + "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=" }, "triton": { "deleteVendor": true, @@ -1163,8 +1036,7 @@ "provider-source-address": "registry.terraform.io/joyent/triton", "repo": "terraform-provider-triton", "rev": "v0.8.2", - "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=", - "version": "0.8.2" + "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { "hash": "sha256-x27daeW4M5/7sUtFcMeJMVBO5TPRXSLuFoREdgJ2J6g=", @@ -1172,8 +1044,7 @@ "provider-source-address": "registry.terraform.io/turbot/turbot", "repo": "terraform-provider-turbot", "rev": "v1.9.1", - "vendorHash": null, - "version": "1.9.1" + "vendorHash": null }, "ucloud": { "hash": "sha256-x3+OuRzZdS429v0JNyZkM3v1etUgURSyi9qkt7RhqlI=", @@ -1181,8 +1052,7 @@ "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", "rev": "v1.32.5", - "vendorHash": null, - "version": "1.32.5" + "vendorHash": null }, "utils": { "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", @@ -1190,8 +1060,7 @@ "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", "rev": "1.5.0", - "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=", - "version": "1.5.0" + "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=" }, "vault": { "hash": "sha256-y5pK+sZ1xWnzlhT4sFUy5Mp6sggLLtaY4Cx2OPamDIc=", @@ -1200,8 +1069,7 @@ "proxyVendor": true, "repo": "terraform-provider-vault", "rev": "v3.11.0", - "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=", - "version": "3.11.0" + "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, "vcd": { "hash": "sha256-/Xb9SzOT300SkJU6Lrk6weastVQiGn6FslziXe85hQ0=", @@ -1209,8 +1077,7 @@ "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", "rev": "v3.8.0", - "vendorHash": "sha256-UHSrQsu59Lr0s1YQ4rv7KT5e20Tz/qhGGl1sv7Dl1Dc=", - "version": "3.8.0" + "vendorHash": "sha256-UHSrQsu59Lr0s1YQ4rv7KT5e20Tz/qhGGl1sv7Dl1Dc=" }, "venafi": { "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", @@ -1218,8 +1085,7 @@ "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", "rev": "v0.16.1", - "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=", - "version": "0.16.1" + "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=" }, "vercel": { "hash": "sha256-/LHyNxal5Il/UzXdCKfVRzK/VVfSYMgoeKerWsedmho=", @@ -1227,8 +1093,7 @@ "provider-source-address": "registry.terraform.io/ondrejsika/vercel", "repo": "terraform-provider-vercel", "rev": "v2.1.0", - "vendorHash": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=", - "version": "2.1.0" + "vendorHash": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=" }, "vpsadmin": { "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", @@ -1236,8 +1101,7 @@ "provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin", "repo": "terraform-provider-vpsadmin", "rev": "v1.0.0", - "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=", - "version": "1.0.0" + "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { "hash": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=", @@ -1245,8 +1109,7 @@ "provider-source-address": "registry.terraform.io/vmware/vra7", "repo": "terraform-provider-vra7", "rev": "v3.0.6", - "vendorHash": null, - "version": "3.0.6" + "vendorHash": null }, "vsphere": { "hash": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=", @@ -1254,8 +1117,7 @@ "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", "rev": "v2.2.0", - "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=", - "version": "2.2.0" + "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=" }, "vultr": { "hash": "sha256-6NiVW6kqUCeit6Dc9GbP4mV03UJkqo+UwHsDE4xMwzQ=", @@ -1263,8 +1125,7 @@ "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", "rev": "v2.11.4", - "vendorHash": null, - "version": "2.11.4" + "vendorHash": null }, "wavefront": { "hash": "sha256-goiYeZ2iV9KjacBr/MMkA+t2WNTJGHHmwebr/ci+Ezg=", @@ -1272,8 +1133,7 @@ "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", "rev": "v3.4.0", - "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=", - "version": "3.4.0" + "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { "hash": "sha256-HBGQ+WrAy+f0nK0iyd/Z+Mj5AshvHyGyBEN0E61ftn0=", @@ -1281,7 +1141,6 @@ "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", "rev": "v0.82.0", - "vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=", - "version": "0.82.0" + "vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index f9626148a37d..f0f2a12337c0 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -107,7 +107,6 @@ if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then source_address=registry.terraform.io/${provider} provider=$(basename "${provider}") update_attr "provider-source-address" "${source_address}" - update_attr version "0" # create empty stings so nix-prefetch works update_attr hash "" update_attr vendorHash "" @@ -116,7 +115,7 @@ else fi old_vendor_hash=$(read_attr vendorHash) -old_version=$(read_attr version) +old_rev=$(read_attr rev) # The provider source address (used inside Terraform `required_providers` block) is # used to compute the registry API endpoint @@ -126,17 +125,17 @@ old_version=$(read_attr version) # registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API) registry_response=$(curl -s https://"${source_address/\///v1/providers/}") -version="$(jq -r '.version' <<<"${registry_response}")" -if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorHash} && ${old_vendor_hash} != "${vendorHash}" ]]; then - echo_provider "already at version ${version}" +rev="$(jq -r '.tag' <<<"${registry_response}")" +if [[ ${old_rev} == "${rev}" && ${force} != 1 && -z ${vendorHash} && ${old_vendor_hash} != "${vendorHash}" ]]; then + echo_provider "already at version ${rev}" exit fi -if [[ ${version} =~ [[:alpha:]] && ${force} != 1 ]]; then - echo_provider "not updating to unstable version ${version}" +if [[ ${rev//v/} =~ [[:alpha:]] && ${force} != 1 ]]; then + echo_provider "not updating to unstable version ${rev}" exit fi -echo_provider "updating from ${old_version} to ${version}" -update_attr version "${version}" +echo_provider "updating from ${old_rev} to ${rev}" +update_attr rev "${rev}" provider_source_url="$(jq -r '.source' <<<"${registry_response}")" @@ -144,8 +143,6 @@ org="$(echo "${provider_source_url}" | cut -d '/' -f 4)" update_attr owner "${org}" repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" -rev="$(jq -r '.tag' <<<"${registry_response}")" -update_attr rev "${rev}" echo_provider "calculating hash" hash=$(generate_hash src) update_attr hash "${hash}" From b18d379a91fddadc986bf57e2889d7478b196ce7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 26 Nov 2022 18:42:21 +1000 Subject: [PATCH 095/222] terraform-providers: add homepage that can be used as provider-source-address also proper urls in the json --- .../cluster/terraform-providers/default.nix | 11 +- .../terraform-providers/providers.json | 282 +++++++++--------- .../terraform-providers/update-all-providers | 2 +- .../terraform-providers/update-provider | 18 +- 4 files changed, 157 insertions(+), 156 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index fc2a44ff9722..f5028d0bfb68 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -24,10 +24,13 @@ let , proxyVendor ? false , mkProviderFetcher ? fetchFromGitHub , mkProviderGoModule ? buildGoModule - # Looks like "registry.terraform.io/vancluever/acme" - , provider-source-address + # "https://registry.terraform.io/providers/vancluever/acme" + , homepage ? "" + # "registry.terraform.io/vancluever/acme" + , provider-source-address ? lib.replaceStrings [ "https://registry" ".io/providers" ] [ "registry" ".io" ] homepage , ... }@attrs: + assert lib.stringLength provider-source-address > 0; mkProviderGoModule { pname = repo; inherit vendorHash version deleteVendor proxyVendor; @@ -42,6 +45,10 @@ let inherit owner repo rev hash; }; + meta = { + inherit homepage; + }; + # Move the provider to libexec postInstall = '' dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8dc5157a341a..e215353f537e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -2,8 +2,8 @@ "aci": { "deleteVendor": true, "hash": "sha256-Y2cNp2BuPEH5wAEwaMVSBgKoHrcy6d4eOlsGPqAxmoU=", + "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", - "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "proxyVendor": true, "repo": "terraform-provider-aci", "rev": "v2.5.2", @@ -11,8 +11,8 @@ }, "acme": { "hash": "sha256-H+1/Au/jCxNxrV+kk6tylUF85taZcs44uWed1QH1aRo=", + "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", - "provider-source-address": "registry.terraform.io/vancluever/acme", "proxyVendor": true, "repo": "terraform-provider-acme", "rev": "v2.11.1", @@ -20,72 +20,72 @@ }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", + "homepage": "https://registry.terraform.io/providers/clementblaise/age", "owner": "clementblaise", - "provider-source-address": "registry.terraform.io/clementblaise/age", "repo": "terraform-provider-age", "rev": "v0.1.1", "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { "hash": "sha256-2QdpXNCnnYh75CyqeKJbYgFB63TCcMrWlUPLe/puvOw=", + "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", - "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", "rev": "v3.8.1", "vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=" }, "akamai": { "hash": "sha256-QbCDaDII+xEA3lXjODsz8jai2mg3N/3uC4fruiLqvWc=", + "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", - "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", "rev": "v3.0.0", "vendorHash": "sha256-LYoRZIr2+NqxwZYaN1HFTSaCl0wJPVr2Wf0OjdqM5YM=" }, "alicloud": { "hash": "sha256-rscu2gCvf/8MJBx1coUmne+8DO8b6RFyfMAwhTUPU+w=", + "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", - "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", "rev": "v1.192.0", "vendorHash": null }, "ansible": { "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", + "homepage": "https://registry.terraform.io/providers/nbering/ansible", "owner": "nbering", - "provider-source-address": "registry.terraform.io/nbering/ansible", "repo": "terraform-provider-ansible", "rev": "v1.0.4", "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { "hash": "sha256-EzqsTJwjDQ6pIQxdGPOTbNom0RDurAGT0eJmuwAzO4Y=", + "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/archive", "repo": "terraform-provider-archive", "rev": "v2.2.0", "vendorHash": null }, "argocd": { "hash": "sha256-yWhq2WolfL7PQVuWr5P7EH0cM78wGyL2+yezh2WzL2c=", + "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", - "provider-source-address": "registry.terraform.io/oboukili/argocd", "repo": "terraform-provider-argocd", "rev": "v4.1.0", "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=" }, "auth0": { "hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=", + "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", - "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", "rev": "v0.40.0", "vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=" }, "avi": { "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", + "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/avi", "proxyVendor": true, "repo": "terraform-provider-avi", "rev": "v22.1.2", @@ -93,40 +93,40 @@ }, "aviatrix": { "hash": "sha256-1zHaSdDcGynLhgLMDRbRgRzt0IvQI25TDZrYzZwwQ34=", + "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", - "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", "rev": "v2.24.1", "vendorHash": null }, "aws": { "hash": "sha256-jk46oJCbhZa6MzqWd4FQDHXekGKNdzXf/y6qUY+Ts9Q=", + "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", "rev": "v4.41.0", "vendorHash": "sha256-bsaZDkxPTQQbjtjSR9BZbMVHJ+cy3iEHPRI4l5K+jyg=" }, "azuread": { "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", "rev": "v2.30.0", "vendorHash": null }, "azurerm": { "hash": "sha256-aUTapTSpNZo2Tg3e/BMBGedEVwX0Sa+T2UrbgyiLOhk=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", "rev": "v3.33.0", "vendorHash": null }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", + "homepage": "https://registry.terraform.io/providers/hashicorp/azurestack", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", "rev": "v1.0.0", "vendorHash": null @@ -134,40 +134,40 @@ "baiducloud": { "deleteVendor": true, "hash": "sha256-0L/T12jeSkdZDJknVu5JffyaniZ1RVWgMpPu3qKNmWU=", + "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", - "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", "rev": "v1.18.2", "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=" }, "bigip": { "hash": "sha256-erJeg7KF3QUi85ueOQTrab2woIC1nkMXRIj/pFm0DGY=", + "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", - "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", "rev": "v1.16.0", "vendorHash": null }, "bitbucket": { "hash": "sha256-eU8vA2fxtdsObgh2dTExGLzzBnfSc2DSGdFHrLXR3SA=", + "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", - "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", "rev": "v2.22.0", "vendorHash": "sha256-Qkla3OEcyiMn6eqBj+4LB8JwpIwceLAASI1qvOcUBD0=" }, "brightbox": { "hash": "sha256-l4gN7gxLMTuUMjf50Hc2Els5pJ4BId1QlRAhykseK7c=", + "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", - "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", "rev": "v3.0.5", "vendorHash": "sha256-ZT+SOHn/8aoZLXUau9toc3NtQNaXfttM0agIw8T28tk=" }, "buildkite": { "hash": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=", + "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", - "provider-source-address": "registry.terraform.io/buildkite/buildkite", "proxyVendor": true, "repo": "terraform-provider-buildkite", "rev": "v0.11.0", @@ -175,56 +175,56 @@ }, "checkly": { "hash": "sha256-OKLmcy0egQ9z/eBsdXzGiswByWQ9fiOq4N7ndTW2nso=", + "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", - "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", "rev": "v1.6.3", "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", + "homepage": "https://registry.terraform.io/providers/CiscoDevNet/ciscoasa", "owner": "CiscoDevNet", - "provider-source-address": "registry.terraform.io/CiscoDevNet/ciscoasa", "repo": "terraform-provider-ciscoasa", "rev": "v1.3.0", "vendorHash": null }, "cloudamqp": { "hash": "sha256-EtFGqYNfyDbS4f1tjRTKcrQNFqEZmmILeuEOpwkx6/4=", + "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", - "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", "rev": "v1.20.0", "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=" }, "cloudflare": { "hash": "sha256-a0zJ1n4nKHEyjqJeey5MxPhqJU8Bq9a+hqLOCEdTfEE=", + "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", - "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", "rev": "v3.28.0", "vendorHash": "sha256-Jvaud6rkaNMZZ/L/pb8JKGaAYw1MieGq7aU4Abe2VJA=" }, "cloudfoundry": { "hash": "sha256-OOORVbjcXhH6gVjLdOu8kTqy6dzIARruF4H8byMNkko=", + "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", - "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", "repo": "terraform-provider-cloudfoundry", "rev": "v0.50.1", "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, "cloudinit": { "hash": "sha256-P4m2ym7p10gwHR9CdPT37OvrgkvOKLG5wxVyYD4UZXs=", + "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/cloudinit", "repo": "terraform-provider-cloudinit", "rev": "v2.2.0", "vendorHash": null }, "cloudscale": { "hash": "sha256-Eo7zT/KiJdzo7fhAcCg6EV29ENM/XSBumAHmL9J8agU=", + "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", - "provider-source-address": "registry.terraform.io/cloudscale-ch/cloudscale", "repo": "terraform-provider-cloudscale", "rev": "v4.0.0", "vendorHash": null @@ -232,128 +232,128 @@ "constellix": { "deleteVendor": true, "hash": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=", + "homepage": "https://registry.terraform.io/providers/Constellix/constellix", "owner": "Constellix", - "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", "rev": "v0.4.5", "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { "hash": "sha256-DS27LGhXDYVr+c0wIZe5PjssK8l8Aq4zzh3I+G4WCU8=", + "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", "rev": "v2.16.2", "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=" }, "ct": { "hash": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=", + "homepage": "https://registry.terraform.io/providers/poseidon/ct", "owner": "poseidon", - "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", "rev": "v0.11.0", "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { "hash": "sha256-QKUmbCyB9Xlr+wfEGiCR+xn8xz81FJ77pY90AzMc/Bw=", + "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", - "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", "rev": "v3.18.0", "vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", + "homepage": "https://registry.terraform.io/providers/awakesecurity/dhall", "owner": "awakesecurity", - "provider-source-address": "registry.terraform.io/awakesecurity/dhall", "repo": "terraform-provider-dhall", "rev": "v0.0.3", "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { "hash": "sha256-l/p2HStjvxF6UB1SnY3EoGjC/3t5FdlC6LMk7jn11KI=", + "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", - "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", "rev": "v2.25.2", "vendorHash": null }, "dme": { "hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=", + "homepage": "https://registry.terraform.io/providers/DNSMadeEasy/dme", "owner": "DNSMadeEasy", - "provider-source-address": "registry.terraform.io/DNSMadeEasy/dme", "repo": "terraform-provider-dme", "rev": "v1.0.6", "vendorHash": null }, "dns": { "hash": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", + "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/dns", "repo": "terraform-provider-dns", "rev": "v3.2.3", "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=" }, "dnsimple": { "hash": "sha256-P1mvxRbOSmQknQxFPEyAkpK5eZQq286oceRFbrgYYqg=", + "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", - "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", "rev": "v0.15.0", "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" }, "docker": { "hash": "sha256-SWfA3WaShBa+5FTyqLv+idVdvavet7V6qRKRGwYePUM=", + "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", - "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", "rev": "v2.23.1", "vendorHash": "sha256-EaWVf8GmNsabpfeOEzRjKPubCyEReGjdzRy7Ohb4mno=" }, "elasticsearch": { "hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=", + "homepage": "https://registry.terraform.io/providers/phillbaker/elasticsearch", "owner": "phillbaker", - "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", "rev": "v2.0.6", "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { "hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=", + "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", - "provider-source-address": "registry.terraform.io/equinix/equinix", "repo": "terraform-provider-equinix", "rev": "v1.10.0", "vendorHash": "sha256-ZGPSNz/6qwEU5EY72fIJ1x9bnsN9OZQ6MQ+XNotMGgA=" }, "exoscale": { "hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=", + "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", - "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", "rev": "v0.41.1", "vendorHash": null }, "external": { "hash": "sha256-o9vCr3ayqg9Ehi39FgR6vJFZYF1iTcVD4QfYHcs+YbQ=", + "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", "rev": "v2.2.3", "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { "hash": "sha256-X2T/t3uDY1jDPhx7IZOwVLx1o4pse5/0T+nrJtRB1Lk=", + "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", - "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", "rev": "v3.0.2", "vendorHash": null }, "flexibleengine": { "hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=", + "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", - "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", "rev": "v1.34.0", "vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=" @@ -361,8 +361,8 @@ "fortios": { "deleteVendor": true, "hash": "sha256-nvK5mbQdCB6lmdyhJbMS15eOER8eIAYv26mc1FCifXs=", + "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", - "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "proxyVendor": true, "repo": "terraform-provider-fortios", "rev": "v1.16.0", @@ -370,32 +370,32 @@ }, "gandi": { "hash": "sha256-uXZcYiNsBf5XsMjOjjQeNtGwLhTgYES1E9t63fBEI6Q=", + "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", - "provider-source-address": "registry.terraform.io/go-gandi/gandi", "repo": "terraform-provider-gandi", "rev": "v2.2.0", "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=" }, "github": { "hash": "sha256-+I2h3wQnLd9EX99begsj4CI5R5i93JowBbGydYQNJHg=", + "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", - "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", "rev": "v5.9.1", "vendorHash": null }, "gitlab": { "hash": "sha256-lNEkUleH0Y3ZQnHqu8cEIGdigqrbRkVRg+9kOk8kU3c=", + "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", - "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", "rev": "v3.20.0", "vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks=" }, "google": { "hash": "sha256-e2jVnL13j4iSb288CB/H6G3vR58bjwi+2ZHzve1tuUo=", + "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", "rev": "v4.44.1", @@ -403,8 +403,8 @@ }, "google-beta": { "hash": "sha256-ejMWZTSrkGMAKr02TIg0yngzpqEVL8y56JSoQrCJ7lA=", + "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", "rev": "v4.44.1", @@ -412,64 +412,64 @@ }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", + "homepage": "https://registry.terraform.io/providers/hashicorp/googleworkspace", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", "repo": "terraform-provider-googleworkspace", "rev": "v0.7.0", "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { "hash": "sha256-DAuG1VYLYr3cz+PR5wNlPBKuUcnbYAO0d9tNxnBiGuU=", + "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", - "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", "rev": "v1.31.1", "vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo=" }, "gridscale": { "hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=", + "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", - "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", "rev": "v1.16.2", "vendorHash": null }, "hcloud": { "hash": "sha256-d/qLN5ev8ywiJr97rrlS9rwfvsEheBD2n8I6D9a7krQ=", + "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", - "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", "rev": "v1.36.0", "vendorHash": "sha256-HsWkHoFs/77b5+6HSV7YgLOwpE2BZyxbGNty8p+OBSM=" }, "helm": { "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", + "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", "rev": "v2.7.1", "vendorHash": null }, "heroku": { "hash": "sha256-NabwjOTbBRlDNFBpCshxZMO9E958tfAIPPuyArvacFI=", + "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", - "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", "rev": "v5.1.6", "vendorHash": null }, "hetznerdns": { "hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=", + "homepage": "https://registry.terraform.io/providers/timohirt/hetznerdns", "owner": "timohirt", - "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", "repo": "terraform-provider-hetznerdns", "rev": "v2.2.0", "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", + "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd", "owner": "loafoe", - "provider-source-address": "registry.terraform.io/loafoe/htpasswd", "proxyVendor": true, "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", @@ -477,160 +477,160 @@ }, "http": { "hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=", + "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", "rev": "v3.2.1", "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { "hash": "sha256-cr7xV7Z4UU+kRykVSOKeuXDiHQPL4CsCJVXf2uTZOms=", + "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", - "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", "rev": "v1.42.0", "vendorHash": null }, "huaweicloudstack": { "hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=", + "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloudstack", "owner": "huaweicloud", - "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloudstack", "repo": "terraform-provider-huaweicloudstack", "rev": "v1.3.0", "vendorHash": null }, "hydra": { "hash": "sha256-A9BemEPLhvYzhksvYRfmhQXY3EEdTxQcmjE9+2+BKqg=", + "homepage": "https://registry.terraform.io/providers/DeterminateSystems/hydra", "owner": "DeterminateSystems", - "provider-source-address": "registry.terraform.io/DeterminateSystems/hydra", "repo": "terraform-provider-hydra", "rev": "v0.1.2", "vendorHash": null }, "ibm": { "hash": "sha256-VFJ86dMKOHzfq5W154+kmX9poRFjT+LlLRl3HNA52pc=", + "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", - "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", "rev": "v1.47.1", "vendorHash": "sha256-9UIM6T6ceF6WXIbjhSuDv1lNn9rphcZoePPk11X2Olo=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", + "homepage": "https://registry.terraform.io/providers/Icinga/icinga2", "owner": "Icinga", - "provider-source-address": "registry.terraform.io/Icinga/icinga2", "repo": "terraform-provider-icinga2", "rev": "v0.5.0", "vendorHash": null }, "infoblox": { "hash": "sha256-VquTyQxbVFPImZCwthwf8hJPlUxAxhmed/r1V+qm/ak=", + "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", - "provider-source-address": "registry.terraform.io/infobloxopen/infoblox", "repo": "terraform-provider-infoblox", "rev": "v2.1.0", "vendorHash": null }, "kafka": { "hash": "sha256-bKbY2cOIORy3D9yCBqVuKUZb650sx+87d4wtUB3dPdg=", + "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", - "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", "rev": "v0.5.1", "vendorHash": "sha256-03QV6C2DEN5xwMwABwSvv5Ts6pTHQDBP2zUUqIcOtVQ=" }, "kafka-connect": { "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", + "homepage": "https://registry.terraform.io/providers/Mongey/kafka-connect", "owner": "Mongey", - "provider-source-address": "registry.terraform.io/Mongey/kafka-connect", "repo": "terraform-provider-kafka-connect", "rev": "v0.3.0", "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=", + "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak", "owner": "mrparkers", - "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", "rev": "v4.0.1", "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" }, "ksyun": { "hash": "sha256-Rye7gKARdbrB6KDEygEJy9m7VqlGw6QeE2F1oa3n8as=", + "homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun", "owner": "kingsoftcloud", - "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", "rev": "v1.3.58", "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=" }, "kubectl": { "hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=", + "homepage": "https://registry.terraform.io/providers/gavinbunney/kubectl", "owner": "gavinbunney", - "provider-source-address": "registry.terraform.io/gavinbunney/kubectl", "repo": "terraform-provider-kubectl", "rev": "v1.14.0", "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { "hash": "sha256-hWFC8VBbM3BRGrX1Y45Znd/W3klYy/7aS7JbbKN7EUg=", + "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", "rev": "v2.16.0", "vendorHash": null }, "launchdarkly": { "hash": "sha256-AsFtlCIGvlG8c+PilhMhaMowaea/g1+IXYzEiIIbZ44=", + "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", - "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", "rev": "v2.9.4", "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" }, "libvirt": { "hash": "sha256-j5EcxmkCyHwbXzvJ9lfQBRBYa3SbrKc3kbt1KZTm0gY=", + "homepage": "https://registry.terraform.io/providers/dmacvicar/libvirt", "owner": "dmacvicar", - "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", "repo": "terraform-provider-libvirt", "rev": "v0.7.0", "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", + "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", - "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", "rev": "v1.29.4", "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", + "homepage": "https://registry.terraform.io/providers/numtide/linuxbox", "owner": "numtide", - "provider-source-address": "registry.terraform.io/numtide/linuxbox", "repo": "terraform-provider-linuxbox", "rev": "v0.4.3", "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { "hash": "sha256-l9XQpIMMar7ForZuBcGOmqrRuSnthIrilr4CHJ5SiaU=", + "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", "rev": "v2.2.3", "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=" }, "logicmonitor": { "hash": "sha256-GQPTFf+JxJB3iO1Us0zOAAG2NonuJ/b5la6f1j2Nd4k=", + "homepage": "https://registry.terraform.io/providers/logicmonitor/logicmonitor", "owner": "logicmonitor", - "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor", "repo": "terraform-provider-logicmonitor", "rev": "v2.0.3", "vendorHash": null }, "lxd": { "hash": "sha256-DfRhPRclg/hCmmp0V087hl66WSFbEyXHFUGeehlU290=", + "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", - "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", "proxyVendor": true, "repo": "terraform-provider-lxd", "rev": "v1.8.0", @@ -638,96 +638,96 @@ }, "mailgun": { "hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=", + "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", - "provider-source-address": "registry.terraform.io/wgebis/mailgun", "repo": "terraform-provider-mailgun", "rev": "v0.7.2", "vendorHash": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=" }, "matchbox": { "hash": "sha256-vWhdStfwReeD1PHTihBoj4GoKnP85nzNzIV/Tjfcz1M=", + "homepage": "https://registry.terraform.io/providers/poseidon/matchbox", "owner": "poseidon", - "provider-source-address": "registry.terraform.io/poseidon/matchbox", "repo": "terraform-provider-matchbox", "rev": "v0.5.2", "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=" }, "metal": { "hash": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=", + "homepage": "https://registry.terraform.io/providers/equinix/metal", "owner": "equinix", - "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", "rev": "v3.3.0", "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { "hash": "sha256-mtguRBSa+XrpUqEXb9voDHraae9fOaayX1nQpaeAlo4=", + "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", - "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", "rev": "v1.9.1", "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=" }, "mongodbatlas": { "hash": "sha256-rHT/x3Wpd7b4u7v1/g6DY85TwRkf5A7KaOiqoWeN05Y=", + "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", - "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", "rev": "v1.6.0", "vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", + "homepage": "https://registry.terraform.io/providers/namecheap/namecheap", "owner": "namecheap", - "provider-source-address": "registry.terraform.io/namecheap/namecheap", "repo": "terraform-provider-namecheap", "rev": "v2.1.0", "vendorHash": null }, "netlify": { "hash": "sha256-7U+hHN/6GqcbI1gX7L01YqVjlUgvdfhgpXvLF2lwbkA=", + "homepage": "https://registry.terraform.io/providers/AegirHealth/netlify", "owner": "AegirHealth", - "provider-source-address": "registry.terraform.io/AegirHealth/netlify", "repo": "terraform-provider-netlify", "rev": "v0.6.12", "vendorHash": null }, "newrelic": { "hash": "sha256-d5JRqxMmG7fku8+C8e700nfghz2wbL0n1TrOZb1hkpY=", + "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", - "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", "rev": "v3.7.1", "vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", + "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", "rev": "v1.4.19", "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { "hash": "sha256-qHR3KJa1y10B+iQPgH6lTt/JUqTmiK/60rPCa3gQDP8=", + "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", - "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", "rev": "v1.13.0", "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=" }, "nsxt": { "hash": "sha256-TOoRtCKdR1fBjk39dbMgBd7pDJGfjvkQAqfpJzWRwRg=", + "homepage": "https://registry.terraform.io/providers/vmware/nsxt", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/nsxt", "repo": "terraform-provider-nsxt", "rev": "v3.2.9", "vendorHash": null }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", + "homepage": "https://registry.terraform.io/providers/hashicorp/null", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/null", "repo": "terraform-provider-null", "rev": "v3.2.1", "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=" @@ -735,296 +735,296 @@ "nutanix": { "deleteVendor": true, "hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=", + "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", - "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", "rev": "v1.7.1", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { "hash": "sha256-t8GrhKnKredpbRmx/MAA4tx0kV0yZoFNnacKsp0Htro=", + "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", - "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", "rev": "v4.100.0", "vendorHash": null }, "okta": { "hash": "sha256-2AR416LkqgfHdY18m4k/jqSet7G77HwHuGKilvS3Yig=", + "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", - "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", "rev": "v3.39.0", "vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", + "homepage": "https://registry.terraform.io/providers/oktadeveloper/oktaasa", "owner": "oktadeveloper", - "provider-source-address": "registry.terraform.io/oktadeveloper/oktaasa", "repo": "terraform-provider-oktaasa", "rev": "v1.0.1", "vendorHash": null }, "opennebula": { "hash": "sha256-jm7k0k28TSfnUA6P2RjSfF36o/nznvDWcDmJz/MAMXU=", + "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", - "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", "rev": "v1.0.2", "vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=" }, "openstack": { "hash": "sha256-k5UyK9jmjZzHw8AwmDRtyCyJgILAcCK+nN+hklJ9VFw=", + "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", - "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", "rev": "v1.49.0", "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { "hash": "sha256-H1X+wWxdP7MwUtUaQiw0usOO6jwAAVLYMoG5Ut2OcqM=", + "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", - "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", "rev": "v1.31.9", "vendorHash": "sha256-n7Ez596JnRwsKYPuR8lCLo6ez/TFch2kMgoScg7pPUI=" }, "opsgenie": { "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=", + "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", - "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", "rev": "v0.6.18", "vendorHash": null }, "ovh": { "hash": "sha256-6lBhEmeAvTv8xRMi5ZabcJg/59xJ9o4/MaAJP+H7pqk=", + "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", - "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", "rev": "v0.23.0", "vendorHash": null }, "pagerduty": { "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=", + "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", - "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", "rev": "v2.6.4", "vendorHash": null }, "pass": { "hash": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=", + "homepage": "https://registry.terraform.io/providers/camptocamp/pass", "owner": "camptocamp", - "provider-source-address": "registry.terraform.io/camptocamp/pass", "repo": "terraform-provider-pass", "rev": "v2.0.0", "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" }, "postgresql": { "hash": "sha256-pi3st4phjCRq2jlRIW2Z4jt9qp7a1ghmlkjAQSbxhI4=", + "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", - "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", "rev": "v1.17.1", "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", + "homepage": "https://registry.terraform.io/providers/pan-net/powerdns", "owner": "pan-net", - "provider-source-address": "registry.terraform.io/pan-net/powerdns", "repo": "terraform-provider-powerdns", "rev": "v1.5.0", "vendorHash": null }, "rabbitmq": { "hash": "sha256-ZhK9zwBaod+s4tGCSBUjW7ijKeucyToXVQDPlMFmIvk=", + "homepage": "https://registry.terraform.io/providers/cyrilgdn/rabbitmq", "owner": "cyrilgdn", - "provider-source-address": "registry.terraform.io/cyrilgdn/rabbitmq", "repo": "terraform-provider-rabbitmq", "rev": "v1.7.0", "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=" }, "rancher2": { "hash": "sha256-DInP+DpCBOsBdlg1tiujlmN20WB5VQbeHgOiabEv9Zc=", + "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", - "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", "rev": "v1.25.0", "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=" }, "random": { "hash": "sha256-oYtvVK0OOHyLUG6amhkvmr6zlbzy0CKoS3DxztoLbdE=", + "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", "rev": "v3.4.3", "vendorHash": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=" }, "remote": { "hash": "sha256-up4+W2mLii7alqdcBoMBTAWI5Vwfc1QtsDK592sAcDM=", + "homepage": "https://registry.terraform.io/providers/tenstad/remote", "owner": "tenstad", - "provider-source-address": "registry.terraform.io/tenstad/remote", "repo": "terraform-provider-remote", "rev": "v0.1.1", "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" }, "rundeck": { "hash": "sha256-GkX5p6hV66G45JG3aJmYD5e2LQvf6kmfa6fQK10tc68=", + "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", "owner": "rundeck", - "provider-source-address": "registry.terraform.io/rundeck/rundeck", "repo": "terraform-provider-rundeck", "rev": "v0.4.3", "vendorHash": null }, "scaleway": { "hash": "sha256-0NQRAv05GuVRAkZd580TINEur/G+c0jUmMtyMv05+PY=", + "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", - "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", "rev": "v2.7.1", "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", + "homepage": "https://registry.terraform.io/providers/numtide/secret", "owner": "numtide", - "provider-source-address": "registry.terraform.io/numtide/secret", "repo": "terraform-provider-secret", "rev": "v1.2.1", "vendorHash": null }, "selectel": { "hash": "sha256-glIvlf5lWwkdZKn4rxhR+XnBqUdu9RO+loxke07i2c0=", + "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", - "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", "rev": "v3.9.0", "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" }, "sentry": { "hash": "sha256-D6w2HfgIcNFfDXeqzuerK8msrFF7vajk80MUxbUxA+A=", + "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", - "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", "rev": "v0.10.0", "vendorHash": "sha256-OxapqNRE5Poz6qsFjDv5G5zzivbBldzjC7kbwG2Cswg=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", + "homepage": "https://registry.terraform.io/providers/scottwinkler/shell", "owner": "scottwinkler", - "provider-source-address": "registry.terraform.io/scottwinkler/shell", "repo": "terraform-provider-shell", "rev": "v1.7.10", "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { "hash": "sha256-alLC61bEaFiVtoH0Fczj7G0m70ie1RNvTBR+MgYZGkQ=", + "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", - "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", "rev": "v6.18.0", "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", + "homepage": "https://registry.terraform.io/providers/skytap/skytap", "owner": "skytap", - "provider-source-address": "registry.terraform.io/skytap/skytap", "repo": "terraform-provider-skytap", "rev": "v0.15.1", "vendorHash": null }, "snowflake": { "hash": "sha256-V2N9Lq425fdjlJ+lCVQzMAYfEiS2/Oqevz1dIve//FA=", + "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", - "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", "rev": "v0.52.0", "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=" }, "sops": { "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", + "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", - "provider-source-address": "registry.terraform.io/carlpett/sops", "repo": "terraform-provider-sops", "rev": "v0.7.1", "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { "hash": "sha256-9i8mHWn9+ey0tHPXOjZyNixcrdgAl2Y8sJq/q4WlZzo=", + "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", - "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", "rev": "v1.87.0", "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", + "homepage": "https://registry.terraform.io/providers/stackpath/stackpath", "owner": "stackpath", - "provider-source-address": "registry.terraform.io/stackpath/stackpath", "repo": "terraform-provider-stackpath", "rev": "v1.4.0", "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=" }, "statuscake": { "hash": "sha256-rT+NJBPA73WCctlZnu0i952fzrGCxVF2vIIvE0SzvNI=", + "homepage": "https://registry.terraform.io/providers/StatusCakeDev/statuscake", "owner": "StatusCakeDev", - "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", "rev": "v2.0.5", "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=" }, "sumologic": { "hash": "sha256-lhMPA4ub3NlaYs0pX6FkWuR3LQxytrQxu9DjAjDja2Q=", + "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", - "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", "rev": "v2.19.2", "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=" }, "tailscale": { "hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=", + "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", - "provider-source-address": "registry.terraform.io/tailscale/tailscale", "repo": "terraform-provider-tailscale", "rev": "v0.13.5", "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=" }, "tencentcloud": { "hash": "sha256-zJ5nDsd5xK/iDk6LqNKJpqCtwVDarUKsv1Arnf0CNGw=", + "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", - "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", "rev": "v1.78.15", "vendorHash": null }, "tfe": { "hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=", + "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", "rev": "v0.39.0", "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", + "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", - "provider-source-address": "registry.terraform.io/a10networks/thunder", "repo": "terraform-provider-thunder", "rev": "v1.0.0", "vendorHash": null }, "time": { "hash": "sha256-FehWmIkL0o2pleafN/mlBa46cdFqCFUS+coOwFPdb9M=", + "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/time", "repo": "terraform-provider-time", "rev": "v0.9.1", "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=" }, "tls": { "hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=", + "homepage": "https://registry.terraform.io/providers/hashicorp/tls", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", "rev": "v4.0.4", "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=" @@ -1032,40 +1032,40 @@ "triton": { "deleteVendor": true, "hash": "sha256-NrXK1ic5F8fBC0lvq7GxlrZe9lMbHvNhodijsC/VG0o=", + "homepage": "https://registry.terraform.io/providers/joyent/triton", "owner": "joyent", - "provider-source-address": "registry.terraform.io/joyent/triton", "repo": "terraform-provider-triton", "rev": "v0.8.2", "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { "hash": "sha256-x27daeW4M5/7sUtFcMeJMVBO5TPRXSLuFoREdgJ2J6g=", + "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", - "provider-source-address": "registry.terraform.io/turbot/turbot", "repo": "terraform-provider-turbot", "rev": "v1.9.1", "vendorHash": null }, "ucloud": { "hash": "sha256-x3+OuRzZdS429v0JNyZkM3v1etUgURSyi9qkt7RhqlI=", + "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", - "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", "rev": "v1.32.5", "vendorHash": null }, "utils": { "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", + "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", - "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", "rev": "1.5.0", "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=" }, "vault": { "hash": "sha256-y5pK+sZ1xWnzlhT4sFUy5Mp6sggLLtaY4Cx2OPamDIc=", + "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/vault", "proxyVendor": true, "repo": "terraform-provider-vault", "rev": "v3.11.0", @@ -1073,72 +1073,72 @@ }, "vcd": { "hash": "sha256-/Xb9SzOT300SkJU6Lrk6weastVQiGn6FslziXe85hQ0=", + "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", "rev": "v3.8.0", "vendorHash": "sha256-UHSrQsu59Lr0s1YQ4rv7KT5e20Tz/qhGGl1sv7Dl1Dc=" }, "venafi": { "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", + "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", - "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", "rev": "v0.16.1", "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=" }, "vercel": { "hash": "sha256-/LHyNxal5Il/UzXdCKfVRzK/VVfSYMgoeKerWsedmho=", + "homepage": "https://registry.terraform.io/providers/ondrejsika/vercel", "owner": "ondrejsika", - "provider-source-address": "registry.terraform.io/ondrejsika/vercel", "repo": "terraform-provider-vercel", "rev": "v2.1.0", "vendorHash": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=" }, "vpsadmin": { "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", + "homepage": "https://registry.terraform.io/providers/vpsfreecz/vpsadmin", "owner": "vpsfreecz", - "provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin", "repo": "terraform-provider-vpsadmin", "rev": "v1.0.0", "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { "hash": "sha256-lHyrBJz6954te57uKpgrqOVztDsDUSqkHtWXnlG0QUw=", + "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/vra7", "repo": "terraform-provider-vra7", "rev": "v3.0.6", "vendorHash": null }, "vsphere": { "hash": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=", + "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", - "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", "rev": "v2.2.0", "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=" }, "vultr": { "hash": "sha256-6NiVW6kqUCeit6Dc9GbP4mV03UJkqo+UwHsDE4xMwzQ=", + "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", - "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", "rev": "v2.11.4", "vendorHash": null }, "wavefront": { "hash": "sha256-goiYeZ2iV9KjacBr/MMkA+t2WNTJGHHmwebr/ci+Ezg=", + "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", - "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", "rev": "v3.4.0", "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { "hash": "sha256-HBGQ+WrAy+f0nK0iyd/Z+Mj5AshvHyGyBEN0E61ftn0=", + "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", - "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", "rev": "v0.82.0", "vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=" diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 288c2f345c2c..0e60b520ca87 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -9,7 +9,7 @@ readarray -t providers < <( jq -r 'to_entries | map_values(.value + { alias: .key }) | .[] - | select(."provider-source-address"?) + | select(."homepage"?) | .alias' providers.json ) diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index f0f2a12337c0..78bb4d2aa81b 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -103,27 +103,21 @@ echo_provider() { pushd "$(dirname "$0")" >/dev/null if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then - echo_provider "init" - source_address=registry.terraform.io/${provider} + homepage="https://registry.terraform.io/providers/${provider}" provider=$(basename "${provider}") - update_attr "provider-source-address" "${source_address}" + echo_provider "init" + update_attr homepage "${homepage}" # create empty stings so nix-prefetch works update_attr hash "" update_attr vendorHash "" -else - source_address="$(read_attr provider-source-address)" fi +homepage="$(read_attr homepage)" + old_vendor_hash=$(read_attr vendorHash) old_rev=$(read_attr rev) -# The provider source address (used inside Terraform `required_providers` block) is -# used to compute the registry API endpoint -# -# registry.terraform.io/hashicorp/aws (provider source address) -# registry.terraform.io/providers/hashicorp/aws (provider URL for the website) -# registry.terraform.io/v1/providers/hashicorp/aws (provider URL for the JSON API) -registry_response=$(curl -s https://"${source_address/\///v1/providers/}") +registry_response=$(curl -s "${homepage//providers/v1/providers}") rev="$(jq -r '.tag' <<<"${registry_response}")" if [[ ${old_rev} == "${rev}" && ${force} != 1 && -z ${vendorHash} && ${old_vendor_hash} != "${vendorHash}" ]]; then From d0594d563c203745e6552fa76f8b447d827cfc73 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 27 Nov 2022 06:54:00 +1000 Subject: [PATCH 096/222] terraform-providers: simplify update script --- .../terraform-providers/update-provider | 43 +++++++------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 78bb4d2aa81b..3f78b37a266a 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -28,14 +28,12 @@ Options: * --force: Force the update even if the version matches. * --no-build: Don't build provider - * --vendor-hash : Override the SHA256 or "null". DOC } +build=1 force= provider= -build=1 -vendorHash= while [[ $# -gt 0 ]]; do case "$1" in @@ -51,11 +49,6 @@ while [[ $# -gt 0 ]]; do build=0 shift ;; - --vendor-hash) - force=1 - vendorHash=$2 - shift 2 - ;; *) if [[ -n ${provider} ]]; then echo "ERROR: provider name was passed two times: '${provider}' and '$1'" @@ -114,19 +107,19 @@ fi homepage="$(read_attr homepage)" -old_vendor_hash=$(read_attr vendorHash) -old_rev=$(read_attr rev) - registry_response=$(curl -s "${homepage//providers/v1/providers}") +old_rev="$(read_attr rev)" rev="$(jq -r '.tag' <<<"${registry_response}")" -if [[ ${old_rev} == "${rev}" && ${force} != 1 && -z ${vendorHash} && ${old_vendor_hash} != "${vendorHash}" ]]; then - echo_provider "already at version ${rev}" - exit -fi -if [[ ${rev//v/} =~ [[:alpha:]] && ${force} != 1 ]]; then - echo_provider "not updating to unstable version ${rev}" - exit +if [[ ${force} != 1 ]]; then + if [[ ${old_rev} == "${rev}" ]]; then + echo_provider "already at version ${rev}" + exit + fi + if [[ ${rev//v/} =~ [[:alpha:]] ]]; then + echo_provider "not updating to unstable version ${rev}" + exit + fi fi echo_provider "updating from ${old_rev} to ${rev}" update_attr rev "${rev}" @@ -141,17 +134,13 @@ echo_provider "calculating hash" hash=$(generate_hash src) update_attr hash "${hash}" -if [[ -z ${vendorHash} ]]; then - if [[ ${old_vendor_hash} == null ]]; then - vendorHash=null - else - echo_provider "calculating vendorHash" - vendorHash=$(generate_hash go-modules) - fi +old_vendor_hash="$(read_attr vendorHash)" +if [[ ${old_vendor_hash} != null ]]; then + echo_provider "calculating vendorHash" + vendorHash=$(generate_hash go-modules) + update_attr vendorHash "${vendorHash}" fi -update_attr vendorHash "${vendorHash}" - # Check that the provider builds if [[ ${build} == 1 ]]; then echo_provider "building" From 4ceb008a8ce6a9b2b07a513841b137d49c402781 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 27 Nov 2022 08:36:57 +1000 Subject: [PATCH 097/222] terraform-providers: add license/spdx --- .../cluster/terraform-providers/default.nix | 4 + .../terraform-providers/providers.json | 141 ++++++++++++++++++ .../terraform-providers/update-all-providers | 2 +- .../terraform-providers/update-provider | 11 ++ 4 files changed, 157 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index f5028d0bfb68..d0ecf82bc1de 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -17,6 +17,7 @@ let ({ owner , repo , rev + , spdx ? "UNSET" , version ? lib.removePrefix "v" rev , hash ? throw "use hash instead of sha256" # added 2202/09 , vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09 @@ -47,6 +48,7 @@ let meta = { inherit homepage; + license = lib.getLicenseFromSpdxId spdx; }; # Move the provider to libexec @@ -77,6 +79,8 @@ let netlify = automated-providers.netlify.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); pass = automated-providers.pass.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); tencentcloud = automated-providers.tencentcloud.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); + # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. + checkly = automated-providers.checkly.override { spdx = "MIT"; }; gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; }; # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e215353f537e..ae9761f6067b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -7,6 +7,7 @@ "proxyVendor": true, "repo": "terraform-provider-aci", "rev": "v2.5.2", + "spdx": "MPL-2.0", "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=" }, "acme": { @@ -16,6 +17,7 @@ "proxyVendor": true, "repo": "terraform-provider-acme", "rev": "v2.11.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-QGZKoxiSiT78gk2vc8uE6k1LAi/S1o5W9TZN7T/1XfA=" }, "age": { @@ -24,6 +26,7 @@ "owner": "clementblaise", "repo": "terraform-provider-age", "rev": "v0.1.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { @@ -32,6 +35,7 @@ "owner": "aiven", "repo": "terraform-provider-aiven", "rev": "v3.8.1", + "spdx": "MIT", "vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=" }, "akamai": { @@ -40,6 +44,7 @@ "owner": "akamai", "repo": "terraform-provider-akamai", "rev": "v3.0.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-LYoRZIr2+NqxwZYaN1HFTSaCl0wJPVr2Wf0OjdqM5YM=" }, "alicloud": { @@ -48,6 +53,7 @@ "owner": "aliyun", "repo": "terraform-provider-alicloud", "rev": "v1.192.0", + "spdx": "MPL-2.0", "vendorHash": null }, "ansible": { @@ -56,6 +62,7 @@ "owner": "nbering", "repo": "terraform-provider-ansible", "rev": "v1.0.4", + "spdx": "MPL-2.0", "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { @@ -64,6 +71,7 @@ "owner": "hashicorp", "repo": "terraform-provider-archive", "rev": "v2.2.0", + "spdx": "MPL-2.0", "vendorHash": null }, "argocd": { @@ -72,6 +80,7 @@ "owner": "oboukili", "repo": "terraform-provider-argocd", "rev": "v4.1.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-hPgZ/2AebjtovopbSEJqsm0J85LdlLWBtP15vaqgLF4=" }, "auth0": { @@ -80,6 +89,7 @@ "owner": "auth0", "repo": "terraform-provider-auth0", "rev": "v0.40.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=" }, "avi": { @@ -89,6 +99,7 @@ "proxyVendor": true, "repo": "terraform-provider-avi", "rev": "v22.1.2", + "spdx": "MPL-2.0", "vendorHash": "sha256-yDkox74g0N8iniWHSNk6KjfM0HJa8H2HUxm6RxrdhkE=" }, "aviatrix": { @@ -97,6 +108,7 @@ "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", "rev": "v2.24.1", + "spdx": "MPL-2.0", "vendorHash": null }, "aws": { @@ -105,6 +117,7 @@ "owner": "hashicorp", "repo": "terraform-provider-aws", "rev": "v4.41.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-bsaZDkxPTQQbjtjSR9BZbMVHJ+cy3iEHPRI4l5K+jyg=" }, "azuread": { @@ -113,6 +126,7 @@ "owner": "hashicorp", "repo": "terraform-provider-azuread", "rev": "v2.30.0", + "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { @@ -121,6 +135,7 @@ "owner": "hashicorp", "repo": "terraform-provider-azurerm", "rev": "v3.33.0", + "spdx": "MPL-2.0", "vendorHash": null }, "azurestack": { @@ -129,6 +144,7 @@ "owner": "hashicorp", "repo": "terraform-provider-azurestack", "rev": "v1.0.0", + "spdx": "MPL-2.0", "vendorHash": null }, "baiducloud": { @@ -138,6 +154,7 @@ "owner": "baidubce", "repo": "terraform-provider-baiducloud", "rev": "v1.18.2", + "spdx": "MPL-2.0", "vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4=" }, "bigip": { @@ -146,6 +163,7 @@ "owner": "F5Networks", "repo": "terraform-provider-bigip", "rev": "v1.16.0", + "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { @@ -154,6 +172,7 @@ "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", "rev": "v2.22.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-Qkla3OEcyiMn6eqBj+4LB8JwpIwceLAASI1qvOcUBD0=" }, "brightbox": { @@ -162,6 +181,7 @@ "owner": "brightbox", "repo": "terraform-provider-brightbox", "rev": "v3.0.5", + "spdx": "MPL-2.0", "vendorHash": "sha256-ZT+SOHn/8aoZLXUau9toc3NtQNaXfttM0agIw8T28tk=" }, "buildkite": { @@ -171,6 +191,7 @@ "proxyVendor": true, "repo": "terraform-provider-buildkite", "rev": "v0.11.0", + "spdx": "MIT", "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=" }, "checkly": { @@ -179,6 +200,7 @@ "owner": "checkly", "repo": "terraform-provider-checkly", "rev": "v1.6.3", + "spdx": null, "vendorHash": "sha256-63M0cOD5QodGMFK0GrxaJsvVFVHXDS5HdgTv4sOmaBA=" }, "ciscoasa": { @@ -187,6 +209,7 @@ "owner": "CiscoDevNet", "repo": "terraform-provider-ciscoasa", "rev": "v1.3.0", + "spdx": "MPL-2.0", "vendorHash": null }, "cloudamqp": { @@ -195,6 +218,7 @@ "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", "rev": "v1.20.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=" }, "cloudflare": { @@ -203,6 +227,7 @@ "owner": "cloudflare", "repo": "terraform-provider-cloudflare", "rev": "v3.28.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-Jvaud6rkaNMZZ/L/pb8JKGaAYw1MieGq7aU4Abe2VJA=" }, "cloudfoundry": { @@ -211,6 +236,7 @@ "owner": "cloudfoundry-community", "repo": "terraform-provider-cloudfoundry", "rev": "v0.50.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" }, "cloudinit": { @@ -219,6 +245,7 @@ "owner": "hashicorp", "repo": "terraform-provider-cloudinit", "rev": "v2.2.0", + "spdx": "MPL-2.0", "vendorHash": null }, "cloudscale": { @@ -227,6 +254,7 @@ "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", "rev": "v4.0.0", + "spdx": "MIT", "vendorHash": null }, "constellix": { @@ -236,6 +264,7 @@ "owner": "Constellix", "repo": "terraform-provider-constellix", "rev": "v0.4.5", + "spdx": "MPL-2.0", "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { @@ -244,6 +273,7 @@ "owner": "hashicorp", "repo": "terraform-provider-consul", "rev": "v2.16.2", + "spdx": "MPL-2.0", "vendorHash": "sha256-9fTmD3VFU12htHeYk64CM23g8ihT2+02DmzTXfZF2Rw=" }, "ct": { @@ -252,6 +282,7 @@ "owner": "poseidon", "repo": "terraform-provider-ct", "rev": "v0.11.0", + "spdx": "Apache-2.0", "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { @@ -260,6 +291,7 @@ "owner": "DataDog", "repo": "terraform-provider-datadog", "rev": "v3.18.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-t3A7ACNbIZ/i5fDhIMDWnKlswT1IHwULejzkfqT5mxQ=" }, "dhall": { @@ -268,6 +300,7 @@ "owner": "awakesecurity", "repo": "terraform-provider-dhall", "rev": "v0.0.3", + "spdx": "BSD-3-Clause", "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { @@ -276,6 +309,7 @@ "owner": "digitalocean", "repo": "terraform-provider-digitalocean", "rev": "v2.25.2", + "spdx": "MPL-2.0", "vendorHash": null }, "dme": { @@ -284,6 +318,7 @@ "owner": "DNSMadeEasy", "repo": "terraform-provider-dme", "rev": "v1.0.6", + "spdx": "MPL-2.0", "vendorHash": null }, "dns": { @@ -292,6 +327,7 @@ "owner": "hashicorp", "repo": "terraform-provider-dns", "rev": "v3.2.3", + "spdx": "MPL-2.0", "vendorHash": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=" }, "dnsimple": { @@ -300,6 +336,7 @@ "owner": "dnsimple", "repo": "terraform-provider-dnsimple", "rev": "v0.15.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-z0vos/tZDUClK/s2yrXZG2RU8QgA8IM6bJj6jSdCnBk=" }, "docker": { @@ -308,6 +345,7 @@ "owner": "kreuzwerker", "repo": "terraform-provider-docker", "rev": "v2.23.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-EaWVf8GmNsabpfeOEzRjKPubCyEReGjdzRy7Ohb4mno=" }, "elasticsearch": { @@ -316,6 +354,7 @@ "owner": "phillbaker", "repo": "terraform-provider-elasticsearch", "rev": "v2.0.6", + "spdx": "MPL-2.0", "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { @@ -324,6 +363,7 @@ "owner": "equinix", "repo": "terraform-provider-equinix", "rev": "v1.10.0", + "spdx": "MIT", "vendorHash": "sha256-ZGPSNz/6qwEU5EY72fIJ1x9bnsN9OZQ6MQ+XNotMGgA=" }, "exoscale": { @@ -332,6 +372,7 @@ "owner": "exoscale", "repo": "terraform-provider-exoscale", "rev": "v0.41.1", + "spdx": "MPL-2.0", "vendorHash": null }, "external": { @@ -340,6 +381,7 @@ "owner": "hashicorp", "repo": "terraform-provider-external", "rev": "v2.2.3", + "spdx": "MPL-2.0", "vendorHash": "sha256-0t+2ixMSsgDK9zzst3s0YWdnS6p7jO0stHnaKio5lvY=" }, "fastly": { @@ -348,6 +390,7 @@ "owner": "fastly", "repo": "terraform-provider-fastly", "rev": "v3.0.2", + "spdx": "MPL-2.0", "vendorHash": null }, "flexibleengine": { @@ -356,6 +399,7 @@ "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", "rev": "v1.34.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=" }, "fortios": { @@ -366,6 +410,7 @@ "proxyVendor": true, "repo": "terraform-provider-fortios", "rev": "v1.16.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-ZgVA2+2tu17dnAc51Aw3k6v8k7QosNTmFjFhmeknxa8=" }, "gandi": { @@ -374,6 +419,7 @@ "owner": "go-gandi", "repo": "terraform-provider-gandi", "rev": "v2.2.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=" }, "github": { @@ -382,6 +428,7 @@ "owner": "integrations", "repo": "terraform-provider-github", "rev": "v5.9.1", + "spdx": "MIT", "vendorHash": null }, "gitlab": { @@ -390,6 +437,7 @@ "owner": "gitlabhq", "repo": "terraform-provider-gitlab", "rev": "v3.20.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks=" }, "google": { @@ -399,6 +447,7 @@ "proxyVendor": true, "repo": "terraform-provider-google", "rev": "v4.44.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=" }, "google-beta": { @@ -408,6 +457,7 @@ "proxyVendor": true, "repo": "terraform-provider-google-beta", "rev": "v4.44.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=" }, "googleworkspace": { @@ -416,6 +466,7 @@ "owner": "hashicorp", "repo": "terraform-provider-googleworkspace", "rev": "v0.7.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { @@ -424,6 +475,7 @@ "owner": "grafana", "repo": "terraform-provider-grafana", "rev": "v1.31.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-4PrQW8h8EtX7hvSh2nzvA4EHwb2AhZqSLhrXlRrq8Lo=" }, "gridscale": { @@ -432,6 +484,7 @@ "owner": "gridscale", "repo": "terraform-provider-gridscale", "rev": "v1.16.2", + "spdx": "MPL-2.0", "vendorHash": null }, "hcloud": { @@ -440,6 +493,7 @@ "owner": "hetznercloud", "repo": "terraform-provider-hcloud", "rev": "v1.36.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-HsWkHoFs/77b5+6HSV7YgLOwpE2BZyxbGNty8p+OBSM=" }, "helm": { @@ -448,6 +502,7 @@ "owner": "hashicorp", "repo": "terraform-provider-helm", "rev": "v2.7.1", + "spdx": "MPL-2.0", "vendorHash": null }, "heroku": { @@ -456,6 +511,7 @@ "owner": "heroku", "repo": "terraform-provider-heroku", "rev": "v5.1.6", + "spdx": "MPL-2.0", "vendorHash": null }, "hetznerdns": { @@ -464,6 +520,7 @@ "owner": "timohirt", "repo": "terraform-provider-hetznerdns", "rev": "v2.2.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { @@ -473,6 +530,7 @@ "proxyVendor": true, "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", + "spdx": "MIT", "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" }, "http": { @@ -481,6 +539,7 @@ "owner": "hashicorp", "repo": "terraform-provider-http", "rev": "v3.2.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { @@ -489,6 +548,7 @@ "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", "rev": "v1.42.0", + "spdx": "MPL-2.0", "vendorHash": null }, "huaweicloudstack": { @@ -497,6 +557,7 @@ "owner": "huaweicloud", "repo": "terraform-provider-huaweicloudstack", "rev": "v1.3.0", + "spdx": "MPL-2.0", "vendorHash": null }, "hydra": { @@ -505,6 +566,7 @@ "owner": "DeterminateSystems", "repo": "terraform-provider-hydra", "rev": "v0.1.2", + "spdx": "MPL-2.0", "vendorHash": null }, "ibm": { @@ -513,6 +575,7 @@ "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", "rev": "v1.47.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-9UIM6T6ceF6WXIbjhSuDv1lNn9rphcZoePPk11X2Olo=" }, "icinga2": { @@ -521,6 +584,7 @@ "owner": "Icinga", "repo": "terraform-provider-icinga2", "rev": "v0.5.0", + "spdx": "MPL-2.0", "vendorHash": null }, "infoblox": { @@ -529,6 +593,7 @@ "owner": "infobloxopen", "repo": "terraform-provider-infoblox", "rev": "v2.1.0", + "spdx": "MPL-2.0", "vendorHash": null }, "kafka": { @@ -537,6 +602,7 @@ "owner": "Mongey", "repo": "terraform-provider-kafka", "rev": "v0.5.1", + "spdx": "MIT", "vendorHash": "sha256-03QV6C2DEN5xwMwABwSvv5Ts6pTHQDBP2zUUqIcOtVQ=" }, "kafka-connect": { @@ -545,6 +611,7 @@ "owner": "Mongey", "repo": "terraform-provider-kafka-connect", "rev": "v0.3.0", + "spdx": "MIT", "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { @@ -553,6 +620,7 @@ "owner": "mrparkers", "repo": "terraform-provider-keycloak", "rev": "v4.0.1", + "spdx": "MIT", "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=" }, "ksyun": { @@ -561,6 +629,7 @@ "owner": "kingsoftcloud", "repo": "terraform-provider-ksyun", "rev": "v1.3.58", + "spdx": "MPL-2.0", "vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=" }, "kubectl": { @@ -569,6 +638,7 @@ "owner": "gavinbunney", "repo": "terraform-provider-kubectl", "rev": "v1.14.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { @@ -577,6 +647,7 @@ "owner": "hashicorp", "repo": "terraform-provider-kubernetes", "rev": "v2.16.0", + "spdx": "MPL-2.0", "vendorHash": null }, "launchdarkly": { @@ -585,6 +656,7 @@ "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", "rev": "v2.9.4", + "spdx": "MPL-2.0", "vendorHash": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=" }, "libvirt": { @@ -593,6 +665,7 @@ "owner": "dmacvicar", "repo": "terraform-provider-libvirt", "rev": "v0.7.0", + "spdx": "Apache-2.0", "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { @@ -601,6 +674,7 @@ "owner": "linode", "repo": "terraform-provider-linode", "rev": "v1.29.4", + "spdx": "MPL-2.0", "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=" }, "linuxbox": { @@ -609,6 +683,7 @@ "owner": "numtide", "repo": "terraform-provider-linuxbox", "rev": "v0.4.3", + "spdx": "BSD-3-Clause", "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { @@ -617,6 +692,7 @@ "owner": "hashicorp", "repo": "terraform-provider-local", "rev": "v2.2.3", + "spdx": "MPL-2.0", "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=" }, "logicmonitor": { @@ -625,6 +701,7 @@ "owner": "logicmonitor", "repo": "terraform-provider-logicmonitor", "rev": "v2.0.3", + "spdx": null, "vendorHash": null }, "lxd": { @@ -634,6 +711,7 @@ "proxyVendor": true, "repo": "terraform-provider-lxd", "rev": "v1.8.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=" }, "mailgun": { @@ -642,6 +720,7 @@ "owner": "wgebis", "repo": "terraform-provider-mailgun", "rev": "v0.7.2", + "spdx": "MPL-2.0", "vendorHash": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=" }, "matchbox": { @@ -650,6 +729,7 @@ "owner": "poseidon", "repo": "terraform-provider-matchbox", "rev": "v0.5.2", + "spdx": "Apache-2.0", "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=" }, "metal": { @@ -658,6 +738,7 @@ "owner": "equinix", "repo": "terraform-provider-metal", "rev": "v3.3.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { @@ -666,6 +747,7 @@ "owner": "aminueza", "repo": "terraform-provider-minio", "rev": "v1.9.1", + "spdx": "Apache-2.0", "vendorHash": "sha256-VxISNcWEnBAa+8WsmqxcT+DPF74X8rLlvdSNJtx0++I=" }, "mongodbatlas": { @@ -674,6 +756,7 @@ "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", "rev": "v1.6.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-dFlDUJGVTWQwXXGaWeG07kKyXcWWzuyqYlPm11yaCqI=" }, "namecheap": { @@ -682,6 +765,7 @@ "owner": "namecheap", "repo": "terraform-provider-namecheap", "rev": "v2.1.0", + "spdx": "Apache-2.0", "vendorHash": null }, "netlify": { @@ -690,6 +774,7 @@ "owner": "AegirHealth", "repo": "terraform-provider-netlify", "rev": "v0.6.12", + "spdx": "MPL-2.0", "vendorHash": null }, "newrelic": { @@ -698,6 +783,7 @@ "owner": "newrelic", "repo": "terraform-provider-newrelic", "rev": "v3.7.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=" }, "nomad": { @@ -706,6 +792,7 @@ "owner": "hashicorp", "repo": "terraform-provider-nomad", "rev": "v1.4.19", + "spdx": "MPL-2.0", "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4=" }, "ns1": { @@ -714,6 +801,7 @@ "owner": "ns1-terraform", "repo": "terraform-provider-ns1", "rev": "v1.13.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=" }, "nsxt": { @@ -722,6 +810,7 @@ "owner": "vmware", "repo": "terraform-provider-nsxt", "rev": "v3.2.9", + "spdx": "NOASSERTION", "vendorHash": null }, "null": { @@ -730,6 +819,7 @@ "owner": "hashicorp", "repo": "terraform-provider-null", "rev": "v3.2.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=" }, "nutanix": { @@ -739,6 +829,7 @@ "owner": "nutanix", "repo": "terraform-provider-nutanix", "rev": "v1.7.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { @@ -747,6 +838,7 @@ "owner": "oracle", "repo": "terraform-provider-oci", "rev": "v4.100.0", + "spdx": "MPL-2.0", "vendorHash": null }, "okta": { @@ -755,6 +847,7 @@ "owner": "okta", "repo": "terraform-provider-okta", "rev": "v3.39.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=" }, "oktaasa": { @@ -763,6 +856,7 @@ "owner": "oktadeveloper", "repo": "terraform-provider-oktaasa", "rev": "v1.0.1", + "spdx": "MPL-2.0", "vendorHash": null }, "opennebula": { @@ -771,6 +865,7 @@ "owner": "OpenNebula", "repo": "terraform-provider-opennebula", "rev": "v1.0.2", + "spdx": "MPL-2.0", "vendorHash": "sha256-tkb+P+eTid5dgCw6bErr7i0F+E8UCt/HyFA2e3y0XT0=" }, "openstack": { @@ -779,6 +874,7 @@ "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", "rev": "v1.49.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { @@ -787,6 +883,7 @@ "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", "rev": "v1.31.9", + "spdx": "MPL-2.0", "vendorHash": "sha256-n7Ez596JnRwsKYPuR8lCLo6ez/TFch2kMgoScg7pPUI=" }, "opsgenie": { @@ -795,6 +892,7 @@ "owner": "opsgenie", "repo": "terraform-provider-opsgenie", "rev": "v0.6.18", + "spdx": "MPL-2.0", "vendorHash": null }, "ovh": { @@ -803,6 +901,7 @@ "owner": "ovh", "repo": "terraform-provider-ovh", "rev": "v0.23.0", + "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { @@ -811,6 +910,7 @@ "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", "rev": "v2.6.4", + "spdx": "MPL-2.0", "vendorHash": null }, "pass": { @@ -819,6 +919,7 @@ "owner": "camptocamp", "repo": "terraform-provider-pass", "rev": "v2.0.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" }, "postgresql": { @@ -827,6 +928,7 @@ "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", "rev": "v1.17.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=" }, "powerdns": { @@ -835,6 +937,7 @@ "owner": "pan-net", "repo": "terraform-provider-powerdns", "rev": "v1.5.0", + "spdx": "MPL-2.0", "vendorHash": null }, "rabbitmq": { @@ -843,6 +946,7 @@ "owner": "cyrilgdn", "repo": "terraform-provider-rabbitmq", "rev": "v1.7.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=" }, "rancher2": { @@ -851,6 +955,7 @@ "owner": "rancher", "repo": "terraform-provider-rancher2", "rev": "v1.25.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=" }, "random": { @@ -859,6 +964,7 @@ "owner": "hashicorp", "repo": "terraform-provider-random", "rev": "v3.4.3", + "spdx": "MPL-2.0", "vendorHash": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=" }, "remote": { @@ -867,6 +973,7 @@ "owner": "tenstad", "repo": "terraform-provider-remote", "rev": "v0.1.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" }, "rundeck": { @@ -875,6 +982,7 @@ "owner": "rundeck", "repo": "terraform-provider-rundeck", "rev": "v0.4.3", + "spdx": "MPL-2.0", "vendorHash": null }, "scaleway": { @@ -883,6 +991,7 @@ "owner": "scaleway", "repo": "terraform-provider-scaleway", "rev": "v2.7.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=" }, "secret": { @@ -891,6 +1000,7 @@ "owner": "numtide", "repo": "terraform-provider-secret", "rev": "v1.2.1", + "spdx": "MPL-2.0", "vendorHash": null }, "selectel": { @@ -899,6 +1009,7 @@ "owner": "selectel", "repo": "terraform-provider-selectel", "rev": "v3.9.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-0UOC70RWcEb/YqPrrc7k+dY7jBuTZLWvUTNxuUZIyu4=" }, "sentry": { @@ -907,6 +1018,7 @@ "owner": "jianyuan", "repo": "terraform-provider-sentry", "rev": "v0.10.0", + "spdx": "MIT", "vendorHash": "sha256-OxapqNRE5Poz6qsFjDv5G5zzivbBldzjC7kbwG2Cswg=" }, "shell": { @@ -915,6 +1027,7 @@ "owner": "scottwinkler", "repo": "terraform-provider-shell", "rev": "v1.7.10", + "spdx": "MPL-2.0", "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { @@ -923,6 +1036,7 @@ "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", "rev": "v6.18.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=" }, "skytap": { @@ -931,6 +1045,7 @@ "owner": "skytap", "repo": "terraform-provider-skytap", "rev": "v0.15.1", + "spdx": "MPL-2.0", "vendorHash": null }, "snowflake": { @@ -939,6 +1054,7 @@ "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", "rev": "v0.52.0", + "spdx": "MIT", "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=" }, "sops": { @@ -947,6 +1063,7 @@ "owner": "carlpett", "repo": "terraform-provider-sops", "rev": "v0.7.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { @@ -955,6 +1072,7 @@ "owner": "spotinst", "repo": "terraform-provider-spotinst", "rev": "v1.87.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=" }, "stackpath": { @@ -963,6 +1081,7 @@ "owner": "stackpath", "repo": "terraform-provider-stackpath", "rev": "v1.4.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-Fvku4OB1sdWuvMx/FIHfOJt9STgao0xPDao6b2SYxcQ=" }, "statuscake": { @@ -971,6 +1090,7 @@ "owner": "StatusCakeDev", "repo": "terraform-provider-statuscake", "rev": "v2.0.5", + "spdx": "MPL-2.0", "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=" }, "sumologic": { @@ -979,6 +1099,7 @@ "owner": "SumoLogic", "repo": "terraform-provider-sumologic", "rev": "v2.19.2", + "spdx": "MPL-2.0", "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=" }, "tailscale": { @@ -987,6 +1108,7 @@ "owner": "tailscale", "repo": "terraform-provider-tailscale", "rev": "v0.13.5", + "spdx": "MIT", "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=" }, "tencentcloud": { @@ -995,6 +1117,7 @@ "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", "rev": "v1.78.15", + "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { @@ -1003,6 +1126,7 @@ "owner": "hashicorp", "repo": "terraform-provider-tfe", "rev": "v0.39.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-Ws9IzlZQDDAdQ4JJ326jHXUe9oQphBXb/ZNO7Kl/A1w=" }, "thunder": { @@ -1011,6 +1135,7 @@ "owner": "a10networks", "repo": "terraform-provider-thunder", "rev": "v1.0.0", + "spdx": "BSD-2-Clause", "vendorHash": null }, "time": { @@ -1019,6 +1144,7 @@ "owner": "hashicorp", "repo": "terraform-provider-time", "rev": "v0.9.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=" }, "tls": { @@ -1027,6 +1153,7 @@ "owner": "hashicorp", "repo": "terraform-provider-tls", "rev": "v4.0.4", + "spdx": "MPL-2.0", "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=" }, "triton": { @@ -1036,6 +1163,7 @@ "owner": "joyent", "repo": "terraform-provider-triton", "rev": "v0.8.2", + "spdx": "MPL-2.0", "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { @@ -1044,6 +1172,7 @@ "owner": "turbot", "repo": "terraform-provider-turbot", "rev": "v1.9.1", + "spdx": "MPL-2.0", "vendorHash": null }, "ucloud": { @@ -1052,6 +1181,7 @@ "owner": "ucloud", "repo": "terraform-provider-ucloud", "rev": "v1.32.5", + "spdx": "MPL-2.0", "vendorHash": null }, "utils": { @@ -1060,6 +1190,7 @@ "owner": "cloudposse", "repo": "terraform-provider-utils", "rev": "1.5.0", + "spdx": "Apache-2.0", "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=" }, "vault": { @@ -1069,6 +1200,7 @@ "proxyVendor": true, "repo": "terraform-provider-vault", "rev": "v3.11.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, "vcd": { @@ -1077,6 +1209,7 @@ "owner": "vmware", "repo": "terraform-provider-vcd", "rev": "v3.8.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-UHSrQsu59Lr0s1YQ4rv7KT5e20Tz/qhGGl1sv7Dl1Dc=" }, "venafi": { @@ -1085,6 +1218,7 @@ "owner": "Venafi", "repo": "terraform-provider-venafi", "rev": "v0.16.1", + "spdx": "MPL-2.0", "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=" }, "vercel": { @@ -1093,6 +1227,7 @@ "owner": "ondrejsika", "repo": "terraform-provider-vercel", "rev": "v2.1.0", + "spdx": null, "vendorHash": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=" }, "vpsadmin": { @@ -1101,6 +1236,7 @@ "owner": "vpsfreecz", "repo": "terraform-provider-vpsadmin", "rev": "v1.0.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { @@ -1109,6 +1245,7 @@ "owner": "vmware", "repo": "terraform-provider-vra7", "rev": "v3.0.6", + "spdx": "MPL-2.0", "vendorHash": null }, "vsphere": { @@ -1117,6 +1254,7 @@ "owner": "hashicorp", "repo": "terraform-provider-vsphere", "rev": "v2.2.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=" }, "vultr": { @@ -1125,6 +1263,7 @@ "owner": "vultr", "repo": "terraform-provider-vultr", "rev": "v2.11.4", + "spdx": "MPL-2.0", "vendorHash": null }, "wavefront": { @@ -1133,6 +1272,7 @@ "owner": "vmware", "repo": "terraform-provider-wavefront", "rev": "v3.4.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { @@ -1141,6 +1281,7 @@ "owner": "yandex-cloud", "repo": "terraform-provider-yandex", "rev": "v0.82.0", + "spdx": "MPL-2.0", "vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 0e60b520ca87..9c39282bc969 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -21,5 +21,5 @@ ${providers[*]} EOF for provider in "${providers[@]}"; do - ./update-provider "$@" "${provider}" + ./update-provider --no-spdx "$@" "${provider}" done diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 3f78b37a266a..5630cbe9ed57 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -34,6 +34,7 @@ DOC build=1 force= provider= +spdx=1 while [[ $# -gt 0 ]]; do case "$1" in @@ -49,6 +50,10 @@ while [[ $# -gt 0 ]]; do build=0 shift ;; + --no-spdx) + spdx=0 + shift + ;; *) if [[ -n ${provider} ]]; then echo "ERROR: provider name was passed two times: '${provider}' and '$1'" @@ -130,6 +135,12 @@ org="$(echo "${provider_source_url}" | cut -d '/' -f 4)" update_attr owner "${org}" repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" + +if [[ ${spdx} == 1 ]]; then + spdx="$(curl -L -s "https://api.github.com/repos/${org}/${repo}/license" | jq -r '.license.spdx_id')" + update_attr spdx "${spdx}" +fi + echo_provider "calculating hash" hash=$(generate_hash src) update_attr hash "${hash}" From e09752334cba82b1cf7f29c9080ada0538e0b076 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:24:09 +1000 Subject: [PATCH 098/222] terraform-providers: remove providers with unclear licensing https://api.github.com/repos/logicmonitor/terraform-provider-logicmonitor/license https://api.github.com/repos/vmware/terraform-provider-nsxt/license https://api.github.com/repos/ondrejsika/terraform-provider-vercel/license --- .../cluster/terraform-providers/default.nix | 4 +++ .../terraform-providers/providers.json | 27 ------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index d0ecf82bc1de..d83a4becf876 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -90,17 +90,21 @@ let removed-providers = let archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}"; + license = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date} because of unclear licensing"; removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { b2 = removed "b2" "2022/06"; checkpoint = removed "checkpoint" "2022/11"; dome9 = removed "dome9" "2022/08"; + logicmonitor = license "logicmonitor" "2022/11"; ncloud = removed "ncloud" "2022/08"; + nsxt = license "nsxt" "2022/11"; opc = archived "opc" "2022/05"; oraclepaas = archived "oraclepaas" "2022/05"; panos = removed "panos" "2022/05"; template = archived "template" "2022/05"; + vercel = license "vercel" "2022/11"; }; # excluding aliases, used by terraform-full diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ae9761f6067b..bd51f284b5d3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -695,15 +695,6 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ=" }, - "logicmonitor": { - "hash": "sha256-GQPTFf+JxJB3iO1Us0zOAAG2NonuJ/b5la6f1j2Nd4k=", - "homepage": "https://registry.terraform.io/providers/logicmonitor/logicmonitor", - "owner": "logicmonitor", - "repo": "terraform-provider-logicmonitor", - "rev": "v2.0.3", - "spdx": null, - "vendorHash": null - }, "lxd": { "hash": "sha256-DfRhPRclg/hCmmp0V087hl66WSFbEyXHFUGeehlU290=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", @@ -804,15 +795,6 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-6ePPxdULuTzLdVzzr12BjLu/lBN+5yIUq8U8FVUw/PM=" }, - "nsxt": { - "hash": "sha256-TOoRtCKdR1fBjk39dbMgBd7pDJGfjvkQAqfpJzWRwRg=", - "homepage": "https://registry.terraform.io/providers/vmware/nsxt", - "owner": "vmware", - "repo": "terraform-provider-nsxt", - "rev": "v3.2.9", - "spdx": "NOASSERTION", - "vendorHash": null - }, "null": { "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", "homepage": "https://registry.terraform.io/providers/hashicorp/null", @@ -1221,15 +1203,6 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-smeySV1kReZyF9bRCunEr89IV219f9845wcHHI1zFz8=" }, - "vercel": { - "hash": "sha256-/LHyNxal5Il/UzXdCKfVRzK/VVfSYMgoeKerWsedmho=", - "homepage": "https://registry.terraform.io/providers/ondrejsika/vercel", - "owner": "ondrejsika", - "repo": "terraform-provider-vercel", - "rev": "v2.1.0", - "spdx": null, - "vendorHash": "sha256-EyzYlJV+DoOjFHq7ZkyZY0zHlvciH1YdTPgEIXZwE2g=" - }, "vpsadmin": { "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", "homepage": "https://registry.terraform.io/providers/vpsfreecz/vpsadmin", From 9063accddd2e68dcc71032459a58399e977374c9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 24 Nov 2022 18:07:09 +1000 Subject: [PATCH 099/222] nomad: refactor --- .../networking/cluster/nomad/1.2.nix | 10 --- .../networking/cluster/nomad/1.3.nix | 10 --- .../networking/cluster/nomad/1.4.nix | 10 --- .../networking/cluster/nomad/default.nix | 70 +++++++++++++++++++ .../networking/cluster/nomad/generic.nix | 39 ----------- pkgs/top-level/all-packages.nix | 22 ++---- 6 files changed, 76 insertions(+), 85 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/nomad/1.2.nix delete mode 100644 pkgs/applications/networking/cluster/nomad/1.3.nix delete mode 100644 pkgs/applications/networking/cluster/nomad/1.4.nix create mode 100644 pkgs/applications/networking/cluster/nomad/default.nix delete mode 100644 pkgs/applications/networking/cluster/nomad/generic.nix diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix deleted file mode 100644 index e53854e95d23..000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.2.15"; - sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI="; - vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto="; -} diff --git a/pkgs/applications/networking/cluster/nomad/1.3.nix b/pkgs/applications/networking/cluster/nomad/1.3.nix deleted file mode 100644 index 65b28b51d25f..000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.3.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.3.8"; - sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I="; - vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00="; -} diff --git a/pkgs/applications/networking/cluster/nomad/1.4.nix b/pkgs/applications/networking/cluster/nomad/1.4.nix deleted file mode 100644 index aa8ef963d8dd..000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.4.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage -, buildGoModule -}: - -callPackage ./generic.nix { - inherit buildGoModule; - version = "1.4.3"; - sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg="; - vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A="; -} diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix new file mode 100644 index 000000000000..faec09480774 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildGoModule +, buildGo119Module +, fetchFromGitHub +, nixosTests +}: + +let + generic = + { buildGoModule, version, sha256, vendorSha256, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorSha256" ]; + in + buildGoModule (rec { + pname = "nomad"; + inherit version vendorSha256; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + inherit sha256; + }; + + # ui: + # Nomad release commits include the compiled version of the UI, but the file + # is only included if we build with the ui tag. + tags = [ "ui" ]; + + meta = with lib; { + homepage = "https://www.nomadproject.io/"; + description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; + platforms = platforms.unix; + license = licenses.mpl20; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ]; + }; + } // attrs'); +in +rec { + # Nomad never updates major go versions within a release series and is unsupported + # on Go versions that it did not ship with. Due to historic bugs when compiled + # with different versions we pin Go for all versions. + # Upstream partially documents used Go versions here + # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md + + nomad = nomad_1_4; + + nomad_1_2 = generic { + buildGoModule = buildGo119Module; + version = "1.2.15"; + sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI="; + vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto="; + }; + + nomad_1_3 = generic { + buildGoModule = buildGo119Module; + version = "1.3.8"; + sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I="; + vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00="; + }; + + nomad_1_4 = generic { + buildGoModule = buildGo119Module; + version = "1.4.3"; + sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg="; + vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A="; + passthru.tests.nomad = nixosTests.nomad; + }; +} diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix deleted file mode 100644 index c5d92eaf1f7e..000000000000 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, version -, sha256 -, vendorSha256 -, nixosTests -}: - -buildGoModule rec { - pname = "nomad"; - inherit version; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = pname; - rev = "v${version}"; - inherit sha256; - }; - - inherit vendorSha256; - - # ui: - # Nomad release commits include the compiled version of the UI, but the file - # is only included if we build with the ui tag. - tags = [ "ui" ]; - - passthru.tests.nomad = nixosTests.nomad; - - meta = with lib; { - homepage = "https://www.nomadproject.io/"; - description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.unix; - license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd2356a81471..5e0e798be20b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9790,22 +9790,12 @@ with pkgs; noip = callPackage ../tools/networking/noip { }; - nomad = nomad_1_4; - - # Nomad never updates major go versions within a release series and is unsupported - # on Go versions that it did not ship with. Due to historic bugs when compiled - # with different versions we pin Go for all versions. - # Upstream partially documents used Go versions here - # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix { - buildGoModule = buildGo119Module; - }; - nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { - buildGoModule = buildGo119Module; - }; - nomad_1_4 = callPackage ../applications/networking/cluster/nomad/1.4.nix { - buildGoModule = buildGo119Module; - }; + inherit (callPackage ../applications/networking/cluster/nomad { }) + nomad + nomad_1_2 + nomad_1_3 + nomad_1_4 + ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; From c9ba8b002f10b3995a41684f1ade3663d8d8c2f4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 20:52:59 +0000 Subject: [PATCH 100/222] bisq-desktop: enableJavaFX in openjdk11 input --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd2356a81471..0bd01cc0e648 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2783,7 +2783,9 @@ with pkgs; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; + bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { + openjdk11 = openjdk11.override { enableJavaFX = true; }; + }; bic = callPackage ../development/interpreters/bic { }; From 33daeebd6baf52cc5640c6c223ff926d07e6e96d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 1 Dec 2022 21:55:14 +0100 Subject: [PATCH 101/222] chromiumBeta: 108.0.5359.71 -> 109.0.5414.25 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c8877bc48035..b009449e64ae 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,15 +19,15 @@ } }, "beta": { - "version": "108.0.5359.71", - "sha256": "0pgzf6xrd71is1dld1arhq366vjp8p54x75zyx6y7vcjqj0a0v6b", - "sha256bin64": "14sarqyw2pdcnkk2xnsdq58wg0s576fjvqfg0ishprm7ndks1z6m", + "version": "109.0.5414.25", + "sha256": "1yl8bxbxnlvypqvnb0kd4z3c793m375pwza43gab35kc1azxfnrg", + "sha256bin64": "1rld29mq6dvd85nvsrxj155m79hylxknhphlmw82i74fa7r6lxhm", "deps": { "gn": { - "version": "2022-10-05", + "version": "2022-11-10", "url": "https://gn.googlesource.com/gn", - "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", - "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" + "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", + "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" } } }, From e4864d2966abc2d8c4c105f0ce6c9bdb9ce3743b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 1 Dec 2022 21:55:15 +0100 Subject: [PATCH 102/222] chromiumDev: 109.0.5414.10 -> 110.0.5449.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index c8877bc48035..1d9726425ee3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "109.0.5414.10", - "sha256": "05yhfb5gznllh9rm6jhzaakj5kvdlxa8c4zqml10h297dbyr44bf", - "sha256bin64": "01fzjxrgzhccj75gvqj5w2xhqrphwzycdfqbsd6nc5p08jizpvy0", + "version": "110.0.5449.0", + "sha256": "1zims8jw7k53qpv4kml3n15hy587jgg0sai7j4zrv3i3lk8jr6g7", + "sha256bin64": "1ykgxr3jxbqdgrq6g6vzbxnig05vljzdx800j6hn3kxwr9cdqwxn", "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-11-29", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "70d6c60823c0233a0f35eccc25b2b640d2980bdc", + "sha256": "04md36i6l07c1bq8mqghrnbf308j9avmqkwqjqm8gciclnrnlsii" } } }, From 4f72a0257b976b9772d66a16d785166439f8eb07 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 21:04:11 +0000 Subject: [PATCH 103/222] charles4: pass `--user-agent` to `curlOptsList` --- pkgs/applications/networking/charles/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 66ec0a7c7b47..f7749946f42e 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -34,6 +34,7 @@ let src = fetchurl { url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz"; + curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; # HTTP 104 otherwise inherit sha256; }; nativeBuildInputs = [ makeWrapper ]; From 62bfe94552048241032a32d679063e2c9c66f199 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 1 Dec 2022 16:17:57 -0500 Subject: [PATCH 104/222] felix-fm: 2.1.0 -> 2.1.1 Diff: https://github.com/kyoheiu/felix/compare/v2.1.0...v2.1.1 Changelog: https://github.com/kyoheiu/felix/blob/v2.1.1/CHANGELOG.md --- pkgs/applications/file-managers/felix-fm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 3e5a8c4cc98c..79b1d62509b7 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CLCzRnczItvnjXtS4BOc9FeBCPQm102U0bDIWAZPzYc="; + sha256 = "sha256-0wYYElXm7Nr1zjtWLSdBaUVsb+2CN4TwaJr5g1juUUs="; }; - cargoSha256 = "sha256-H+uOo3Cm1nFPYyA0qOAcaD4mfSd4Uaq5U20t6V4mmcg="; + cargoSha256 = "sha256-SnXZkMrAhhP8lVFCd6LKHFSg9o2K1Wy+z/4oUZOHoXw="; nativeBuildInputs = [ pkg-config ]; @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # extra test files not shipped with the repository + "--skip=functions::tests::test_list_up_contents" "--skip=magic_image::tests::test_inspect_image" "--skip=magic_packed::tests::test_inspect_signature" ]; From 8be903c231c3bf7b73968800be7682e0e27b6afb Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 18 Oct 2022 14:29:29 +0200 Subject: [PATCH 105/222] citrix-workspace: drop support for some older versions --- .../remote/citrix-workspace/sources.nix | 43 ------------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 47 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 9f4fa9ce751a..9e24ecd211a6 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -13,49 +13,6 @@ let # # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "21.01.0" = { - major = "21"; - minor = "1"; - patch = "0"; - x64hash = "01m9g1bs6iiqbd778gjps2zznvqijlyn3mfw38aa0w1rr6ms326a"; - x86hash = "1mmx5r3wi9i6bwh4kdlpw446m8kijkaar8shi0q1n21fv0ygg3r5"; - x64suffix = "14"; - x86suffix = "14"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2101.html"; - }; - - "21.03.0" = { - major = "21"; - minor = "3"; - patch = "0"; - x64hash = "004pgvxl81l99sqvrs5xzvjivjlc21rrlm2gky9hmbsm53nsl3zc"; - x86hash = "11nn9734a515dm1q880z9wmhvx8ikyh3riayyn42z22q4kd852n3"; - x64suffix = "38"; - x86suffix = "38"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2103.html"; - }; - - "21.06.0" = { - major = "21"; - minor = "6"; - patch = "0"; - x64hash = "f3f98c60b0aaac31eb44dc98f22ee7ae7df229c960d5d29785eb5e9554f85f68"; - x86hash = "c2d9652ad9488a9ff171e62df8455ebe6890bcfade1cc289893ee35322d9d812"; - x64suffix = "28"; - x86suffix = "28"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2106.html"; - }; - - "21.08.0" = { - major = "21"; - minor = "8"; - patch = "0"; - x64hash = "69ddae29cc8b4b68341c3d9503a54ee70ab58a5795fd83e79573f013eda5518c"; - x86hash = "b6d1bde5a8533f22374e1f5bbb3f5949e5b89773d0703e021fbe784b455aad3f"; - x64suffix = "40"; - x86suffix = "40"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2108.html"; - }; "21.09.0" = { major = "21"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e0e798be20b..f13b6e2e8bc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5739,10 +5739,6 @@ with pkgs; cirrusgo = callPackage ../tools/security/cirrusgo { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_21_01_0 - citrix_workspace_21_03_0 - citrix_workspace_21_06_0 - citrix_workspace_21_08_0 citrix_workspace_21_09_0 citrix_workspace_21_12_0 citrix_workspace_22_05_0 From 7b16c6ed61dff729e30c964365c3a4a49e671ec4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 21:18:44 +0000 Subject: [PATCH 106/222] evcc: 0.108.2 -> 0.108.3 --- pkgs/servers/home-automation/evcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index f9726fb62d72..bd611627908e 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.108.2"; + version = "0.108.3"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-vhgqsKwgK27cbmyoTdR6QFCKrG5tRfSutp6DsDDsCTU="; + hash = "sha256-jBUKMsSpcMoW4v9S5pCpojoYzFASj8hmWPzUcqL3doQ="; }; vendorHash = "sha256-10W1BNHcdP77m7lJ/mc+jQeUigoUid3K0wI4bUm5y+s="; From 6a26fe20f7bd1362679b5eb6c1b3a5263c35414b Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Thu, 1 Dec 2022 22:19:57 +0100 Subject: [PATCH 107/222] citrix-workspace: fix 22.7.0 the x64suffix and x86suffix has changed --- .../networking/remote/citrix-workspace/sources.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 9e24ecd211a6..9f8d8489a2cc 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -51,11 +51,11 @@ let major = "22"; minor = "7"; patch = "0"; - x64hash = "a17e4478ad3eac4b0cbc9fb7be0dba2758393ba2d3b6a82b3074ff053586c5f5"; - x86hash = "f08d9c83a1af7873cbb864b26ec24d731fdc2e5045adee982eeef4083982c5bc"; - x64suffix = "20"; - x86suffix = "20"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + x64hash = "ba88490e457e0fe6c610778396e40293067173c182f2343c8c1fda5e2444985c"; + x86hash = "ed9ff8b3be968cacaf6121c783326091899b987e53fac1aafae68ea3e5883403"; + x64suffix = "14"; + x86suffix = "14"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-OLD1.html"; }; }; From 7d7e8155f1a824a52e89e0b2d5a5c33691d49df7 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 21:27:53 +0000 Subject: [PATCH 108/222] conduktor: update sha256 --- pkgs/applications/misc/conduktor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix index 32d9e527dd49..6eb0e832bc95 100644 --- a/pkgs/applications/misc/conduktor/default.nix +++ b/pkgs/applications/misc/conduktor/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/conduktor/builds/releases/download/v${version}/Conduktor-linux-${version}.zip"; - sha256 = "1kr5yh9piqbl6njsnxgh6jzf3vifw8ja5x4qm4znmzi3r49sw0gx"; + sha256 = "sha256-9y/7jni5zIITUWd75AxsfG/b5vCYotmeMeC9aYM2WEs="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; From dbe8182e7433374b5ae7b5454126ce46211f0f03 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 30 Nov 2022 17:15:00 +0100 Subject: [PATCH 109/222] treewide: switch to port type for nixos modules --- .../services/continuous-integration/gocd-server/default.nix | 2 +- .../modules/services/continuous-integration/hydra/default.nix | 2 +- nixos/modules/services/databases/couchdb.nix | 2 +- nixos/modules/services/databases/postgresql.nix | 2 +- nixos/modules/services/games/factorio.nix | 2 +- nixos/modules/services/misc/beanstalkd.nix | 2 +- nixos/modules/services/misc/domoticz.nix | 2 +- nixos/modules/services/misc/gitea.nix | 4 ++-- nixos/modules/services/misc/mediatomb.nix | 2 +- nixos/modules/services/misc/osrm.nix | 2 +- nixos/modules/services/monitoring/graphite.nix | 2 +- .../services/monitoring/prometheus/exporters/collectd.nix | 2 +- nixos/modules/services/networking/chisel-server.nix | 2 +- nixos/modules/services/networking/i2pd.nix | 2 +- nixos/modules/services/networking/mtprotoproxy.nix | 2 +- nixos/modules/services/networking/xinetd.nix | 2 +- nixos/modules/services/search/kibana.nix | 2 +- nixos/modules/services/web-apps/atlassian/confluence.nix | 4 ++-- nixos/modules/services/web-apps/atlassian/jira.nix | 4 ++-- nixos/modules/services/web-apps/hedgedoc.nix | 2 +- nixos/modules/services/web-apps/mastodon.nix | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 25c16a5c721c..bf7fd529bfca 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -46,7 +46,7 @@ in { port = mkOption { default = 8153; - type = types.int; + type = types.port; description = lib.mdDoc '' Specifies port number on which the Go.CD server HTTP interface listens. ''; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 711479575042..564bcd37dec5 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -122,7 +122,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 3000; description = lib.mdDoc '' TCP port the web server should listen to. diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 16b82b867a3d..cdf32654e663 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -122,7 +122,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 5984; description = lib.mdDoc '' Defined the port number to listen. diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index e84116635a37..fe7ef48075a7 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -51,7 +51,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 5432; description = lib.mdDoc '' The port on which PostgreSQL listens. diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index f54c265c34b0..844fd2bce517 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -46,7 +46,7 @@ in services.factorio = { enable = mkEnableOption (lib.mdDoc name); port = mkOption { - type = types.int; + type = types.port; default = 34197; description = lib.mdDoc '' The port to which the service should bind. diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix index 5d34355aebfc..4262cae323b9 100644 --- a/nixos/modules/services/misc/beanstalkd.nix +++ b/nixos/modules/services/misc/beanstalkd.nix @@ -16,7 +16,7 @@ in listen = { port = mkOption { - type = types.int; + type = types.port; description = lib.mdDoc "TCP port that will be used to accept client connections."; default = 11300; }; diff --git a/nixos/modules/services/misc/domoticz.nix b/nixos/modules/services/misc/domoticz.nix index 3358b4de466a..fd9fcf0b78eb 100644 --- a/nixos/modules/services/misc/domoticz.nix +++ b/nixos/modules/services/misc/domoticz.nix @@ -21,7 +21,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = lib.mdDoc "Port to bind to for HTTP, set to 0 to disable HTTP."; }; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index f8bfda165eb6..d29416eda219 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -235,7 +235,7 @@ in }; httpPort = mkOption { - type = types.int; + type = types.port; default = 3000; description = lib.mdDoc "HTTP listen port."; }; @@ -310,7 +310,7 @@ in }; SSH_PORT = mkOption { - type = types.int; + type = types.port; default = 22; example = 2222; description = lib.mdDoc '' diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 3f0bd585371f..632b7caaac40 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -288,7 +288,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 49152; description = lib.mdDoc '' The network port to listen on. diff --git a/nixos/modules/services/misc/osrm.nix b/nixos/modules/services/misc/osrm.nix index bcfb868422cc..12c908a761e3 100644 --- a/nixos/modules/services/misc/osrm.nix +++ b/nixos/modules/services/misc/osrm.nix @@ -21,7 +21,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 5000; description = lib.mdDoc "Port on which the web server will run."; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 8edb2ca09974..017e8a1ba47c 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -94,7 +94,7 @@ in { port = mkOption { description = lib.mdDoc "Graphite web frontend port."; default = 8080; - type = types.int; + type = types.port; }; extraConfig = mkOption { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index d9eedd237c8b..0c2de683ecf7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -18,7 +18,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 25826; description = lib.mdDoc "Network address on which to accept collectd binary network packets."; }; diff --git a/nixos/modules/services/networking/chisel-server.nix b/nixos/modules/services/networking/chisel-server.nix index d3724743209b..134c71430cd0 100644 --- a/nixos/modules/services/networking/chisel-server.nix +++ b/nixos/modules/services/networking/chisel-server.nix @@ -17,7 +17,7 @@ in { }; port = mkOption { description = mdDoc "Port to listen on, falls back to 8080"; - type = with types; nullOr int; + type = with types; nullOr port; default = null; }; authfile = mkOption { diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index b60cbe664b6f..a02f8df11163 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -495,7 +495,7 @@ in ntcp2.enable = mkEnableTrueOption "NTCP2"; ntcp2.published = mkEnableOption (lib.mdDoc "NTCP2 publication"); ntcp2.port = mkOption { - type = types.int; + type = types.port; default = 0; description = lib.mdDoc '' Port to listen for incoming NTCP2 connections (0=auto). diff --git a/nixos/modules/services/networking/mtprotoproxy.nix b/nixos/modules/services/networking/mtprotoproxy.nix index fc3d5dc963a0..3dd197697b23 100644 --- a/nixos/modules/services/networking/mtprotoproxy.nix +++ b/nixos/modules/services/networking/mtprotoproxy.nix @@ -40,7 +40,7 @@ in enable = mkEnableOption (lib.mdDoc "mtprotoproxy"); port = mkOption { - type = types.int; + type = types.port; default = 3256; description = lib.mdDoc '' TCP port to accept mtproto connections on. diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 2ec0cd18dcba..b9120f37ba24 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -78,7 +78,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 0; example = 123; description = lib.mdDoc "Port number of the service."; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index ffc7c4b68cae..5eb2381d5d39 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -43,7 +43,7 @@ in { port = mkOption { description = lib.mdDoc "Kibana listening port"; default = 5601; - type = types.int; + type = types.port; }; cert = mkOption { diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 08cff3286571..fe98c1777ea0 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -56,7 +56,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 8090; description = lib.mdDoc "Port to listen on."; }; @@ -78,7 +78,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 443; example = 80; description = lib.mdDoc "Port used at the proxy"; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 8d28eb162ef2..4cc858216944 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -56,7 +56,7 @@ in }; listenPort = mkOption { - type = types.int; + type = types.port; default = 8091; description = lib.mdDoc "Port to listen on."; }; @@ -78,7 +78,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 443; example = 80; description = lib.mdDoc "Port used at the proxy"; diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index e51da7ee866a..ea27eb7ba390 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -76,7 +76,7 @@ in ''; }; port = mkOption { - type = types.int; + type = types.port; default = 3000; example = 80; description = lib.mdDoc '' diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index c3220a03d33f..a221186adf64 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -313,7 +313,7 @@ in { }; port = lib.mkOption { - type = lib.types.int; + type = lib.types.port; default = 5432; description = lib.mdDoc "Database host port."; }; From 215ff79ae891c33638d0fc6996733713ec4ba5cb Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 18 Oct 2022 14:30:09 +0200 Subject: [PATCH 110/222] citrix_workspace: 22.07.0 -> 22.12.0 --- .../networking/remote/citrix-workspace/sources.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 9f8d8489a2cc..4acc2c57f19f 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -57,6 +57,17 @@ let x86suffix = "14"; homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-OLD1.html"; }; + + "22.12.0" = { + major = "22"; + minor = "12"; + patch = "0"; + x64hash = "3ec5a3d5526a6bac17bb977b173542f5bdd535a53baa6dca80c83a0d61229d74"; + x86hash = "b73f90fe51bbb7391c188a394ea614b67f128ed0d9481bd7824cbcadc0338dae"; + x64suffix = "12"; + x86suffix = "12"; + homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + }; }; # Retain attribute-names for abandoned versions of Citrix workspace to diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f13b6e2e8bc5..fc31e1a15438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5743,8 +5743,9 @@ with pkgs; citrix_workspace_21_12_0 citrix_workspace_22_05_0 citrix_workspace_22_07_0 + citrix_workspace_22_12_0 ; - citrix_workspace = citrix_workspace_22_07_0; + citrix_workspace = citrix_workspace_22_12_0; cmigemo = callPackage ../tools/text/cmigemo { }; From 2f685ba86f859872be88426a983964fe29f9ec00 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 1 Dec 2022 22:08:04 +0000 Subject: [PATCH 111/222] lesstif: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` output with `diffoscope`. --- .../development/libraries/lesstif/default.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index dc0c8c0ed741..a5c37dd0f04f 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,4 +1,15 @@ -{lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}: +{ lib +, stdenv +, fetchurl +, freetype +, fontconfig +, libICE +, libX11 +, libXp +, libXau +, libXext +, libXt +}: stdenv.mkDerivation rec { pname = "lesstif"; @@ -7,8 +18,18 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/lesstif/${pname}-${version}.tar.bz2"; sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb"; }; - buildInputs = [xlibsWrapper]; - propagatedBuildInputs = [libXp libXau]; + buildInputs = [ + freetype + fontconfig + libICE + libX11 + libXext + libXt + ]; + propagatedBuildInputs = [ + libXau + libXp + ]; # These patches fix a number of later issues - in particular the # render_table_crash shows up in 'arb'. The same patches appear From f25d71940b53caa1c678f265dab290a2e307ecbb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 1 Dec 2022 23:16:10 +0100 Subject: [PATCH 112/222] gcc-arm-embedded-{6,7,8,9,10}: drop python27 from dependencies python27 is only required for arm-none-eabi-gdb-py and since python27 is EOL, it's worth disabling python support for GDB, rather then breaking the whole gcc-arm-embedded --- pkgs/development/compilers/gcc-arm-embedded/10/default.nix | 3 +-- pkgs/development/compilers/gcc-arm-embedded/6/default.nix | 3 +-- pkgs/development/compilers/gcc-arm-embedded/7/default.nix | 3 +-- pkgs/development/compilers/gcc-arm-embedded/8/default.nix | 3 +-- pkgs/development/compilers/gcc-arm-embedded/9/default.nix | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 67d775eb7cd8..b10ac198430b 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index a0d414d974f0..51f3c10f6735 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4df2a90f52ea..4d63f7c3ecdc 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 152ecdb867d9..6673cb823485 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index c625134508e3..841084904cf9 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; From 2c90cb930422165072f611aa0168727b2fa86e0f Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Thu, 1 Dec 2022 17:19:28 -0500 Subject: [PATCH 113/222] ec2-amis: add release 22.11 --- .../virtualisation/amazon-ec2-amis.nix | 50 ++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix index 0324c5332cff..446a1b0ecaab 100644 --- a/nixos/modules/virtualisation/amazon-ec2-amis.nix +++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix @@ -488,5 +488,53 @@ let self = { "22.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0f96be48071c13ab2"; "22.05".us-west-2.aarch64-linux.hvm-ebs = "ami-084bc5d777585adfb"; - latest = self."22.05"; + # 22.11.466.596a8e828c5 + + "22.11".eu-west-1.x86_64-linux.hvm-ebs = "ami-01aafe08a4e74bd9a"; + "22.11".af-south-1.x86_64-linux.hvm-ebs = "ami-0d937fc7bf7b8c2ed"; + "22.11".ap-east-1.x86_64-linux.hvm-ebs = "ami-020e59f6affef2732"; + "22.11".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-04a7bd7a969506a87"; + "22.11".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-007b9209171e2dcdd"; + "22.11".ap-northeast-3.x86_64-linux.hvm-ebs = "ami-0c4d0b584cd570584"; + "22.11".ap-south-1.x86_64-linux.hvm-ebs = "ami-02aa47f84c215d593"; + "22.11".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-067a7fca4a01c4dda"; + "22.11".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0638db75ba113c635"; + "22.11".ap-southeast-3.x86_64-linux.hvm-ebs = "ami-08dcda749c59e8747"; + "22.11".ca-central-1.x86_64-linux.hvm-ebs = "ami-09b007688e369f794"; + "22.11".eu-central-1.x86_64-linux.hvm-ebs = "ami-05df1b211df600977"; + "22.11".eu-north-1.x86_64-linux.hvm-ebs = "ami-0427d0897b928e191"; + "22.11".eu-south-1.x86_64-linux.hvm-ebs = "ami-051beda489f0dd109"; + "22.11".eu-west-2.x86_64-linux.hvm-ebs = "ami-0c2090b73fc610ac3"; + "22.11".eu-west-3.x86_64-linux.hvm-ebs = "ami-0d03a150cf6c07022"; + "22.11".me-south-1.x86_64-linux.hvm-ebs = "ami-0443b1af94bff9e3d"; + "22.11".sa-east-1.x86_64-linux.hvm-ebs = "ami-07b2ce95ba17b6bc1"; + "22.11".us-east-1.x86_64-linux.hvm-ebs = "ami-0508167db03652cc4"; + "22.11".us-east-2.x86_64-linux.hvm-ebs = "ami-0e41ac272a7d67029"; + "22.11".us-west-1.x86_64-linux.hvm-ebs = "ami-02f3fb062ee9af563"; + "22.11".us-west-2.x86_64-linux.hvm-ebs = "ami-06b260b3a958948a0"; + + "22.11".eu-west-1.aarch64-linux.hvm-ebs = "ami-0c4132540cabbc7df"; + "22.11".af-south-1.aarch64-linux.hvm-ebs = "ami-0f12780247b337357"; + "22.11".ap-east-1.aarch64-linux.hvm-ebs = "ami-04789617e858da6fb"; + "22.11".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-0f4d8517ab163b274"; + "22.11".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-051a06893bcc696c1"; + "22.11".ap-northeast-3.aarch64-linux.hvm-ebs = "ami-05a086610680a7d8b"; + "22.11".ap-south-1.aarch64-linux.hvm-ebs = "ami-04cd79197824124cd"; + "22.11".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-0437f330961467257"; + "22.11".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-000c2ecbc430c36d7"; + "22.11".ap-southeast-3.aarch64-linux.hvm-ebs = "ami-062e917296b5087c0"; + "22.11".ca-central-1.aarch64-linux.hvm-ebs = "ami-0c91995b735d1b8b6"; + "22.11".eu-central-1.aarch64-linux.hvm-ebs = "ami-0537d704b177a676b"; + "22.11".eu-north-1.aarch64-linux.hvm-ebs = "ami-05f1f532f90d8e16c"; + "22.11".eu-south-1.aarch64-linux.hvm-ebs = "ami-097fe290eafff61ad"; + "22.11".eu-west-2.aarch64-linux.hvm-ebs = "ami-053b6cc7a3394891a"; + "22.11".eu-west-3.aarch64-linux.hvm-ebs = "ami-0a5b6d023afde63c3"; + "22.11".me-south-1.aarch64-linux.hvm-ebs = "ami-024fcb01f8638ed08"; + "22.11".sa-east-1.aarch64-linux.hvm-ebs = "ami-06d72c6e930037236"; + "22.11".us-east-1.aarch64-linux.hvm-ebs = "ami-0b33ffb684d6b07b5"; + "22.11".us-east-2.aarch64-linux.hvm-ebs = "ami-033ff64078c59f378"; + "22.11".us-west-1.aarch64-linux.hvm-ebs = "ami-052d52b9e30a18562"; + "22.11".us-west-2.aarch64-linux.hvm-ebs = "ami-07418b6a4782c9521"; + + latest = self."22.11"; }; in self From af4452b505d1bd1f6a9eaba34af375f2df000aef Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:21:30 +0000 Subject: [PATCH 114/222] =?UTF-8?q?terraform-providers.equinix:=201.10.0?= =?UTF-8?q?=20=E2=86=92=201.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bd51f284b5d3..88a8d44cf63d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -358,13 +358,14 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-gvI9awkKiWWnw6O/KvskFTHZfvajGfgYu8DGsT34Siw=", + "hash": "sha256-jHnpt6B1pPPPKv3vVKOLz+r+CUj6MPEOm4na9Lcxs9w=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", + "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.10.0", + "rev": "v1.11.0", "spdx": "MIT", - "vendorHash": "sha256-ZGPSNz/6qwEU5EY72fIJ1x9bnsN9OZQ6MQ+XNotMGgA=" + "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" }, "exoscale": { "hash": "sha256-pJ9bbI7y6iOzJ8qPIw8SUOj8yLotRig6cmDsvLfc+6U=", From 2abf40d9b5bfaa49898af7b18b69a86247c29f2c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:27:25 +0000 Subject: [PATCH 115/222] =?UTF-8?q?terraform-providers.yandex:=200.82.0=20?= =?UTF-8?q?=E2=86=92=200.83.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 88a8d44cf63d..114ae4610852 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1250,12 +1250,13 @@ "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-HBGQ+WrAy+f0nK0iyd/Z+Mj5AshvHyGyBEN0E61ftn0=", + "hash": "sha256-PX6bqNdfIc7gZDYw3yVpxNgJnHuzr6Cu80puMTQqv4U=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", + "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.82.0", + "rev": "v0.83.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Tgfgq3nrfZP2ie4KLmJq83TfzZ41lc4gwWIULLOQmBw=" + "vendorHash": "sha256-q9Rs2yJtI7MVqBcd9wwtyqR9PzmVkhKatbRRZwFm3po=" } } From 501a9450ac80fee4deb9a04e491cd68e20d27c2d Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 2 Dec 2022 01:40:03 +0300 Subject: [PATCH 116/222] werf: 1.2.190 -> 1.2.191 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index fb19070e4591..f1137e231c0a 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.190"; + version = "1.2.191"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-xjZVBLdDLLlfnXX87lwgIeQ6ySI9cNoE5nrRJVBS/l0="; + hash = "sha256-MNIHY3bswPGd8hhR0/9ZxifSv+/kWvLmNESqYRVPao8="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; From c1d7d635dba9475f9f325a2f255b5ad86a0967c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 22:44:52 +0000 Subject: [PATCH 117/222] firewalld: 1.2.1 -> 1.2.2 --- pkgs/applications/networking/firewalld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index a684ac49d296..f4b7feab5d7f 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-8LLhrAArqa7t9vPe9TE2F0eTfScHFtfolfcXcfboKZQ="; + sha256 = "sha256-RdkGwhSx/zluCtBj8hGjkvJ11ZgPRMM9wWoE+/ynnDc="; }; patches = [ From 9f05b9d63451d37130d9958f26a3655bc8b274da Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 22:46:16 +0000 Subject: [PATCH 118/222] libtorrent-rasterbar-1_2_x: use python3 by default All packages that depend on it are already overriding the default python to python3 in all-packages.nix. Let's just make it the default instead. --- pkgs/applications/networking/p2p/tribler/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e74db03b5332..5bc1cb726443 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -8,8 +8,7 @@ }: let - libtorrent = (python3.pkgs.toPythonModule ( - libtorrent-rasterbar-1_2_x.override { python = python3; })).python; + libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; in stdenv.mkDerivation rec { pname = "tribler"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd2356a81471..b7282a05c0f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6249,7 +6249,7 @@ with pkgs; ddrutility = callPackage ../tools/system/ddrutility { }; inherit (callPackages ../applications/networking/p2p/deluge { - libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; + libtorrent-rasterbar = libtorrent-rasterbar-1_2_x; }) deluge-gtk deluged @@ -21113,7 +21113,7 @@ with pkgs; libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - python = python2; + python = python3; }; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; From db152526571d9e12c7789b9abb774e87847ebc34 Mon Sep 17 00:00:00 2001 From: ziguana Date: Thu, 24 Nov 2022 20:52:10 -0700 Subject: [PATCH 119/222] python3Packages.torch: 1.12.1 -> 1.13.0 https://github.com/pytorch/pytorch/releases/tag/v1.13.0 --- pkgs/development/python-modules/torch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 2c619f46ac37..887738f2c5ff 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -124,7 +124,7 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "1.12.1"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7.0"; @@ -140,7 +140,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-8378BVOBFCRYRG1+yIYFSPKmb1rFOLgR+8pNZKt9NfI="; + hash = "sha256-jlXd+9fYWePDevXRxsjtL4oEdTWirv1ObH0B4A6o6Q4="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ From 05a8ff099f34fe774fab8d49ac95b257dc4f9772 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Nov 2022 21:05:19 +0100 Subject: [PATCH 120/222] python3Packages.torchvision: 0.13.1 -> 0.14.0 https://github.com/pytorch/vision/releases/tag/v0.14.0 --- pkgs/development/python-modules/torchvision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index c44413ba4948..223ef3f1d861 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-QlUAFAG6zEDCDSXR5n2CznspU3fT0kbqySzofGLPgK4="; + hash = "sha256-uoy9okPvFH89FJPRRFseHQisw42mWCSuPNADoGa39fc="; }; nativeBuildInputs = [ libpng ninja which ] From b37ea7e55e16c226bc2e8996b92f7ca34579a60b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Nov 2022 21:28:32 +0100 Subject: [PATCH 121/222] python3Packages.torch-bin: 1.12.1 -> 1.13.0 https://github.com/pytorch/pytorch/releases/tag/v1.13.0 --- pkgs/development/python-modules/torch/bin.nix | 2 +- .../python-modules/torch/binary-hashes.nix | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index ac83f1015726..74329e05d297 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -20,7 +20,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.12.1"; + version = "1.13.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 2169e1873b0b..86948e33a3fc 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,61 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "1.12.1" = { + "1.13.0" = { x86_64-linux-37 = { - name = "torch-1.12.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-/JtHhuxUvmfqqLDHyZmeL0riuJocGOQd4VFaGQRAxpE="; + name = "torch-1.13.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.13.0%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-GRxMQkGgtodNIUUxkHpaQZoYz36ogT0zJSqJlcTwbH4="; }; x86_64-linux-38 = { - name = "torch-1.12.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-3aMSkBIgiVCHzIPTZlRko9wXHQRGDGHDGvRj77+1SJY="; + name = "torch-1.13.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.13.0%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-VsudhAGP8v02zblKMPz5LvZBVX2/OHEMQRoYzvMhUF8="; }; x86_64-linux-39 = { - name = "torch-1.12.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-dyVCDavr/K9EmE7c4yg+6pH5jw99WHS8aMehZL2BJuM="; + name = "torch-1.13.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.13.0%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-Ep2VJJ/iDM2D0VYyOl4qarqD4YhBoArHJOJwrYBt1JM="; }; x86_64-linux-310 = { - name = "torch-1.12.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-trwxJEqigYkp+7MMSDwiHfRx6dhW6AXFof9ysTGunns="; + name = "torch-1.13.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torch-1.13.0%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-MSGHkzNHdbxjr5Xh6jsYaU6qkCrupf2bMhWrryLq+tA="; }; x86_64-darwin-37 = { - name = "torch-1.12.1-cp37-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp37-none-macosx_10_9_x86_64.whl"; - hash = "sha256-ijSi+7qgfJIeGyA/WdPW4A7TefKzhERXc70U4yiltsg="; + name = "torch-1.13.0-cp37-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp37-none-macosx_10_9_x86_64.whl"; + hash = "sha256-zR5n22V14bFzpiYHelTkkREzF4VXqsUGg9sDo04rY2o="; }; x86_64-darwin-38 = { - name = "torch-1.12.1-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-qDILqa2H6AylpqAW5GraTRugxUYm4TXZmyEppFQcUJ0="; + name = "torch-1.13.0-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-75NKIdpvalFtCpxxKoDQnFYSir3Gr43BUb7lGZtMO04="; }; x86_64-darwin-39 = { - name = "torch-1.12.1-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-v+woQ9qmVPBP2iO6gjrwPntvdlCoc823JnUtDjcY2to="; + name = "torch-1.13.0-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-kipJEGE7MQ++uHcH8Ay3b+wyjrYMwTSe0hc+fJtu3Ng="; }; x86_64-darwin-310 = { - name = "torch-1.12.1-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-l2w/mXzqOO6RoN08OkIyJ4VBR0jRdh75JreJ36l8YTQ="; + name = "torch-1.13.0-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-SalJuBNrMrLsByTL9MZni1TpdLfWjxnxIx7qIc3lwjs="; }; aarch64-darwin-38 = { - name = "torch-1.12.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-A+McN3Edss0gHgLeWCbeh1Up5FpVYx0xeq3OLx7UWqg="; + name = "torch-1.13.0-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-8Bqa4NS2nS/EFF6L6rRbeHc0Ld29SDin08Ecp/ZoB0U="; }; aarch64-darwin-39 = { - name = "torch-1.12.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-af4srnw5zK3WWhI3k9MODbiB8cGSeUVRnFwXMjExQ34="; + name = "torch-1.13.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-R/5iKDhr/210MZov/p1O2UPm6FRz146AUCUYxgfWRNI="; }; aarch64-darwin-310 = { - name = "torch-1.12.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-aBBORxWlXEuymoXGqNV9gg4HV9o2O+G6aA+ozFvhe1I="; + name = "torch-1.13.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-D904yWIwlHse2HD+1KVgJS+NI8Oiv02rnS1CsY8uZ8g="; }; }; } From 8d2c37c46bdc517e05c2b1ba4f918c4bea2a3e0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Nov 2022 21:32:56 +0100 Subject: [PATCH 122/222] python3Packages.torchvision-bin: 0.13.1 -> 0.14.0 https://github.com/pytorch/vision/releases/tag/v0.14.0 --- .../python-modules/torchvision/bin.nix | 2 +- .../torchvision/binary-hashes.nix | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index e1a0055af260..8334f569469a 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.13.1"; + version = "0.14.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 9b6301bab2c3..5ebf5b6f01ef 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,61 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.13.1" = { + "0.14.0" = { x86_64-linux-37 = { - name = "torchvision-0.13.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-3PMvbZmEk+duwho4u7hWt0Ailc96Z/sJzlvefn5yV1Y="; + name = "torchvision-0.14.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.0%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-IuZAWuVKUv+kIppkj4EjqaqHbPEidmpOhFzaOkQOIws="; }; x86_64-linux-38 = { - name = "torchvision-0.13.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-w86ys/RW8MmEr3HvVfhjfxeKKdw+E6ZvuwEM7q0okeE="; + name = "torchvision-0.14.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.0%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-DsInXsr//MOf2YwXPhVDo5ZeL86TPwzqeNpjRAPk2bk="; }; x86_64-linux-39 = { - name = "torchvision-0.13.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-dZhqvlchOCWOuXlctM1z9Asr34N0/voa9v9rsNvJcsY="; + name = "torchvision-0.14.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.0%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-0kLPJk8atPVYMCjFqK1Q1YhIA8m4NpkspayPdT5L6Ow="; }; x86_64-linux-310 = { - name = "torchvision-0.13.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-DJorYFrDD89HXWD3m6N4rwBzoi3lhUU/jD3WwUUqubw="; + name = "torchvision-0.14.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.0%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-65W6LC8V57riwtmKi95b8L4aHBcMgZSBUepkho7Q6Yc="; }; x86_64-darwin-37 = { - name = "torchvision-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - hash = "sha256-XmMSQb7jZh3mT4NhZlYiSvLjUS6yWA2nwI4IuMllqKw="; + name = "torchvision-0.14.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.14.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + hash = "sha256-9rQd9eTa9u4hthrlp3q8znv30PdZbJILpJGf57dyfyA="; }; x86_64-darwin-38 = { - name = "torchvision-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl"; - hash = "sha256-8jChpA7XDVHkY85D3yQ+xSCQL4cl3iUC5IXvxe6p2GQ="; + name = "torchvision-0.14.0-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.14.0-cp38-cp38-macosx_10_9_x86_64.whl"; + hash = "sha256-ASPQKAxUeql2aVSSixq5ryElqIYfU68jwH5Wru8PJSA="; }; x86_64-darwin-39 = { - name = "torchvision-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl"; - hash = "sha256-Api647Caw2GGYIhDQAjYK5nWRY/oiIyN+Qcg70s0fUQ="; + name = "torchvision-0.14.0-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.14.0-cp39-cp39-macosx_10_9_x86_64.whl"; + hash = "sha256-amqnKATP+VUMu4kPmMfp/yas38SAZNESn68bv+r2Cgo="; }; x86_64-darwin-310 = { - name = "torchvision-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl"; - hash = "sha256-GShqczxp3L1Be4Z5PfgHvSJ9tXhu14fBcpd0GpsND8c="; + name = "torchvision-0.14.0-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.14.0-cp310-cp310-macosx_10_9_x86_64.whl"; + hash = "sha256-e24XBnYOrOAlfrsGd0BM3WT0z4iAS8Y3n2lM8+1HBZE="; }; aarch64-darwin-38 = { - name = "torchvision-0.13.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-6aVjiU+fpAaS4k0apYw+8EBFABfP7TWY/5Y39ATz/js="; + name = "torchvision-0.14.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-aBEEGMgzoQFT44KwOUWY3RaauCOiFoE5x7T2LqSKREY="; }; aarch64-darwin-39 = { - name = "torchvision-0.13.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-xe1gnIvIjFdSJkALIjLgMJCUR3yCrziVLgNz7e8AA/0="; + name = "torchvision-0.14.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-HEd9u4/20OHHhHqpS1U0cHbGZIY67Wnot5M1yxJnTBs="; }; aarch64-darwin-310 = { - name = "torchvision-0.13.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-CPWS6mGDbr7Otcl/TXqBO519xlG7985EAVY8z65qIfw="; + name = "torchvision-0.14.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-HbVwFKaUboYz4fKGOq6kfVs+dCT5QTarXVCGGm2zVpg="; }; }; } From c0f4a5ea37ec6269bf59e86b935153c114610408 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 26 Nov 2022 21:38:46 +0100 Subject: [PATCH 123/222] python3Packages.torchaudio-bin: 0.12.1 -> 0.13.0 https://github.com/pytorch/audio/releases/tag/v0.13.0 --- .../python-modules/torchaudio/bin.nix | 2 +- .../torchaudio/binary-hashes.nix | 68 +++++++++---------- .../python-modules/torchaudio/prefetch.sh | 6 +- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 7388bbc7d26f..f4bac910e44b 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "0.12.1"; + version = "0.13.0"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 8731c63787cf..6d250f5e429a 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,61 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.12.1" = { + "0.13.0" = { x86_64-linux-37 = { - name = "torchaudio-0.12.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-8Z72lazhnV2ZBtnvpdm5ZHhiyE/wHwEpQ9UzZoi//mw="; + name = "torchaudio-0.13.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.0%2Bcu116-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-OvF+dT8O2tLcb4bfIyWLUooFuAjBnYfK+PeuL9WKmWk="; }; x86_64-linux-38 = { - name = "torchaudio-0.12.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-CCtZ6eUhs/6kaoU0HwDDaK4JTSFKkVJF+OMAu368Zno="; + name = "torchaudio-0.13.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.0%2Bcu116-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-bdL04MnHV95l93Bht8md/bMZHPKu7L6+PUReWdjZ27Y="; }; x86_64-linux-39 = { - name = "torchaudio-0.12.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-pNa5fV9vC1cXeDLhHTCscO7RO2lst2Vmm0K7NzINqgw="; + name = "torchaudio-0.13.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.0%2Bcu116-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-gY+ISeHQukn5OxpU4h/sfBXGDoMpp2a/ojfsMb/bKfs="; }; x86_64-linux-310 = { - name = "torchaudio-0.12.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-KdeBVGBQ1lQxXxCQGwX17E1iptMis0Rfex++o4JmVog="; + name = "torchaudio-0.13.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.0%2Bcu116-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-BV1qgrCA1o8wF0gh8F2qGKMaTVph42i4Yhshwibt1cM="; }; x86_64-darwin-37 = { - name = "torchaudio-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl"; - hash = "sha256-I9vPN68vQdSRwDN8qUUB7H71iK2xdm4esoAz+sVJu9k="; + name = "torchaudio-0.13.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + hash = "sha256-UjOFPP1gy/OmsBlOQB2gqKhXV/SyLc70X+vF00r3src="; }; x86_64-darwin-38 = { - name = "torchaudio-0.12.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp38-cp38-macosx_10_9_x86_64.whl"; - hash = "sha256-pMjBWx6BCpO7d7J/pJFZvqIlO1k++UA5lG7Emu9Rdk8="; + name = "torchaudio-0.13.0-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.0-cp38-cp38-macosx_10_9_x86_64.whl"; + hash = "sha256-QuigF0HACNRPZIDOBkbHSF2YwpwBXHNiUWbbEkByn3Y="; }; x86_64-darwin-39 = { - name = "torchaudio-0.12.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp39-cp39-macosx_10_9_x86_64.whl"; - hash = "sha256-CPkrxTaC07rYYG3ttwpJ5aD3z5MGyRc/B027qXeFRC4="; + name = "torchaudio-0.13.0-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.0-cp39-cp39-macosx_10_9_x86_64.whl"; + hash = "sha256-i/P/vBwdJUJimtHsBkzwG8RiIN53pJo5s2xnB+aMlU8="; }; x86_64-darwin-310 = { - name = "torchaudio-0.12.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp310-cp310-macosx_10_9_x86_64.whl"; - hash = "sha256-3BOL7gayMFRC/BMhcfKgHV9CUJ6qIb34fD0mpvSgn90="; + name = "torchaudio-0.13.0-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.13.0-cp310-cp310-macosx_10_9_x86_64.whl"; + hash = "sha256-K3vMX0qIFMIqZrVa0tjiMBXAgazJkGPtry0VLI+wzns="; }; aarch64-darwin-38 = { - name = "torchaudio-0.12.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-g8CLcabcjiPB17AHgKu55MKVKOR6bmRP497nrCJjgh4="; + name = "torchaudio-0.13.0-cp38-cp38-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.0-cp38-cp38-macosx_12_0_arm64.whl"; + hash = "sha256-qr3i19PWbi1eR0Y0XWGXLifWY2C4/bObnq3KTHOWRxM="; }; aarch64-darwin-39 = { - name = "torchaudio-0.12.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-L8WivI6KrUdbxRnzyCuWSeFLXGV0h/+nEs98UUFD6dc="; + name = "torchaudio-0.13.0-cp39-cp39-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.0-cp39-cp39-macosx_12_0_arm64.whl"; + hash = "sha256-uQnAQRdWGwDV5rZTHTIO2kIjZ4mHoJyDJsFqCyNVbcA="; }; aarch64-darwin-310 = { - name = "torchaudio-0.12.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-HYH3GDfV1b5lHoXKn6k3fstFE7ASnd+wJVQOHCQG0+Y="; + name = "torchaudio-0.13.0-cp310-cp310-macosx_12_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.0-cp310-cp310-macosx_12_0_arm64.whl"; + hash = "sha256-6gUo8Kccm1FRjTBGActHx1N01uq6COFnlMH5lmOuTCA="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 72b919c479dd..807129f227ea 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -18,9 +18,9 @@ url_and_key_list=( "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" - "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" - "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl" ) hashfile=binary-hashes-"$version".nix From 4c1de1fcbe8f528916340e46de6e6d04050faef1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 16:36:01 +0100 Subject: [PATCH 124/222] python3Packages.functorch: drop The functionality has been merged into the torch package. --- .../python-modules/functorch/default.nix | 103 ------------------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 pkgs/development/python-modules/functorch/default.nix diff --git a/pkgs/development/python-modules/functorch/default.nix b/pkgs/development/python-modules/functorch/default.nix deleted file mode 100644 index 033f0a3b4fda..000000000000 --- a/pkgs/development/python-modules/functorch/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ buildPythonPackage -, expecttest -, fetchFromGitHub -, lib -, ninja -, pytestCheckHook -, python -, torch -, pybind11 -, which -}: - -buildPythonPackage rec { - pname = "functorch"; - version = "0.2.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "pytorch"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-33skKk5aAIHn+1149ifolXPA+tpQ+WROAZvwPeGBbrA="; - }; - - # Somewhat surprisingly pytorch is actually necessary for the build process. - # `setup.py` imports `torch.utils.cpp_extension`. - nativeBuildInputs = [ - ninja - torch - which - ]; - - buildInputs = [ - pybind11 - ]; - - preCheck = '' - rm -rf functorch/ - ''; - - checkInputs = [ - expecttest - pytestCheckHook - ]; - - # See https://github.com/pytorch/functorch/issues/835. - disabledTests = [ - # RuntimeError: ("('...', '') is in PyTorch's OpInfo db ", "but is not in functorch's OpInfo db. Please regenerate ", '... and add the new tests to ', 'denylists if necessary.') - "test_coverage_bernoulli_cpu_float32" - "test_coverage_column_stack_cpu_float32" - "test_coverage_diagflat_cpu_float32" - "test_coverage_flatten_cpu_float32" - "test_coverage_linalg_lu_factor_cpu_float32" - "test_coverage_linalg_lu_factor_ex_cpu_float32" - "test_coverage_multinomial_cpu_float32" - "test_coverage_nn_functional_dropout2d_cpu_float32" - "test_coverage_nn_functional_feature_alpha_dropout_with_train_cpu_float32" - "test_coverage_nn_functional_feature_alpha_dropout_without_train_cpu_float32" - "test_coverage_nn_functional_kl_div_cpu_float32" - "test_coverage_normal_cpu_float32" - "test_coverage_normal_number_mean_cpu_float32" - "test_coverage_pca_lowrank_cpu_float32" - "test_coverage_round_decimals_0_cpu_float32" - "test_coverage_round_decimals_3_cpu_float32" - "test_coverage_round_decimals_neg_3_cpu_float32" - "test_coverage_scatter_reduce_cpu_float32" - "test_coverage_svd_lowrank_cpu_float32" - - # > self.assertEqual(len(functorch_lagging_op_db), len(op_db)) - # E AssertionError: Scalars are not equal! - # E - # E Absolute difference: 19 - # E Relative difference: 0.03525046382189239 - "test_functorch_lagging_op_db_has_opinfos_cpu" - - # RuntimeError: PyTorch not compiled with LLVM support! - "test_bias_gelu" - "test_binary_ops" - "test_broadcast1" - "test_broadcast2" - "test_float_double" - "test_float_int" - "test_fx_trace" - "test_int_long" - "test_issue57611" - "test_slice1" - "test_slice2" - "test_transposed1" - "test_transposed2" - "test_unary_ops" - ]; - - pythonImportsCheck = [ "functorch" ]; - - meta = with lib; { - description = "JAX-like composable function transforms for PyTorch"; - homepage = "https://pytorch.org/functorch"; - license = licenses.bsd3; - maintainers = with maintainers; [ samuela ]; - # See https://github.com/NixOS/nixpkgs/pull/174248#issuecomment-1139895064. - platforms = platforms.x86_64; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 922692ef1ef8..7b9a82328817 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -83,6 +83,7 @@ mapAliases ({ flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 + functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 garminconnect-ha = garminconnect; # added 2022-02-05 gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c357d23bfc9..621774044cb8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3540,8 +3540,6 @@ self: super: with self; { functools32 = callPackage ../development/python-modules/functools32 { }; - functorch = callPackage ../development/python-modules/functorch { }; - funcy = callPackage ../development/python-modules/funcy { }; furl = callPackage ../development/python-modules/furl { }; From 1fe0e1abc45cbffb5b18ce6cb0841d057950a4a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Dec 2022 17:55:34 +0100 Subject: [PATCH 125/222] python3Packages.torchinfo: 1.64 -> 1.7.1 https://github.com/TylerYep/torchinfo/releases/tag/v1.7.1 https://github.com/TylerYep/torchinfo/releases/tag/v1.7.0 https://github.com/TylerYep/torchinfo/releases/tag/v1.6.6 https://github.com/TylerYep/torchinfo/releases/tag/v1.6.5 --- pkgs/development/python-modules/torchinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index c18f1c68be98..f751a046aeca 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "torchinfo"; - version = "1.64"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TylerYep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU="; + hash = "sha256-jiQ24gx3N9djvTTB6IthzxcuGWX2/php0Up3IdEDvm8="; }; propagatedBuildInputs = [ From b3f7ea4e42887ff826af7a3b02a749a0f0ecf517 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 23:13:22 +0000 Subject: [PATCH 126/222] ft2-clone: 1.61 -> 1.62 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5b1fbbb2d7df..d4584e191d50 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.61"; + version = "1.62"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-dm+l+CECsr3TzL1ZGAqW+NLQXNh5JRtdYVROKOjKMXY="; + sha256 = "sha256-PHDkCE30sVAFXHjG8d/4ETSDS2KO/j43iMMW0PhCFgI="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) From fe09222b33966cea0f5eda9c2875230538a955b7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 2 Dec 2022 00:32:46 +0100 Subject: [PATCH 127/222] python310Packages.clevercsv: fix build on darwin --- pkgs/development/python-modules/clevercsv/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index a144a51e2ca7..c70350a543de 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -3,8 +3,6 @@ , fetchFromGitHub , cchardet , chardet -, cleo -, clikit , pandas , regex , tabview @@ -27,8 +25,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cchardet chardet - cleo - clikit pandas regex tabview From 8f88cd3f7a96689f9cb41fd87999364c5dfe0b73 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 1 Dec 2022 23:53:16 +0000 Subject: [PATCH 128/222] emacs: drop unused xlibsWrapper --- pkgs/applications/editors/emacs/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 3e195fdec6a9..d6ce650fb8ad 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -7,7 +7,7 @@ , patches ? _: [ ] , macportVersion ? null }: -{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, substituteAll, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, substituteAll, ncurses, libXaw, libXpm , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, m17n_lib, libotf @@ -143,7 +143,7 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation ++ lib.optionals stdenv.isLinux [ dbus libselinux alsa-lib acl gpm ] ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withX - [ xlibsWrapper libXaw Xaw3d gconf cairo ] + [ libXaw Xaw3d gconf cairo ] ++ lib.optionals (withX || withPgtk) [ libXpm libpng libjpeg giflib libtiff ] ++ lib.optionals (withX || withNS || withPgtk ) [ librsvg ] From 99e637da5e2d04b541e182313ce8c129b52f8722 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 00:11:38 +0000 Subject: [PATCH 129/222] goreleaser: 1.13.0 -> 1.13.1 --- pkgs/tools/misc/goreleaser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 74837d367ade..d364af728bb0 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sgYTWiiFsrr+1c3C5GFpwSiGHfYizbjBTcj0JDuZXkE="; + sha256 = "sha256-KItiCVb1H/XgVZT6f0g/VvvXhhHf6MvMEqQsr62c6d0="; }; vendorSha256 = "sha256-UpQ2yFprWdwE67MR5voPjgY7wqrtw/ZQbt05Tbo50XY="; From bf02009f8a9952bcde1d306888e3e6b726d41ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 30 Nov 2022 18:30:37 -0800 Subject: [PATCH 130/222] github-backup: 0.41.0 -> 0.42.0 --- pkgs/tools/misc/github-backup/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix index 801848b6ec8b..c456e063d910 100644 --- a/pkgs/tools/misc/github-backup/default.nix +++ b/pkgs/tools/misc/github-backup/default.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.41.0"; + version = "0.42.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "6e6462125b930de4d28efed7ee0d4377e77371a4918768436c3cecf79cc87078"; + sha256 = "sha256-tFfS3Z7xrbN2QEOrYcUVd8/YwGKfmR2NaUBeXuSL+tY="; }; makeWrapperArgs = [ @@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Backup a github user or organization"; homepage = "https://github.com/josegonzalez/python-github-backup"; - changelog = "https://github.com/josegonzalez/python-github-backup/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 7163503e90b12a35bbe47c7e657a140cd14c5b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Dec 2022 02:22:40 +0100 Subject: [PATCH 131/222] acl2: remove python2 usage --- pkgs/development/interpreters/acl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index e42f26f0bdaf..9953eaa3144c 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll , sbcl, bash, which, perl, hostname -, openssl, glucose, minisat, abc-verifier, z3, python2 +, openssl, glucose, minisat, abc-verifier, z3, python3 , certifyBooks ? true } @ args: @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { which perl hostname # Some of the books require one or more of these external tools: glucose minisat abc-verifier libipasir - z3 (python2.withPackages (ps: [ ps.z3 ])) + z3 (python3.withPackages (ps: [ ps.z3 ])) ]; # NOTE: Parallel building can be memory-intensive depending on the number of From fd0f82330f7c373af512ca2e45f3f82bd2283942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Dec 2022 02:38:31 +0100 Subject: [PATCH 132/222] mdcat: 0.29.0 -> 0.30.3 Diff: https://github.com/lunaryorn/mdcat/compare/mdcat-0.29.0...0.30.3 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index cc46a5acf5f9..3bbd805f9c77 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.29.0"; + version = "0.30.3"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "mdcat"; rev = "mdcat-${version}"; - sha256 = "sha256-Fh2OVb4d6WHuoJM503jaN9lan/JCrxMXZjCVpvuYbRQ="; + sha256 = "sha256-tVkRHyWTpl6dubSDtVJVYkHQOfZDR75vUWmI0lp9tI0="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-ZwJX+kXpj6nARFDx/+LsHWLzMUGBYJvM0DA0+WZukpI="; + cargoSha256 = "sha256-cinO426Q6TO6a1i63ff892kicnPxNrs6tJFpqPYuVWc="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From 1dfeed64ce6e03ebb08734613f1813dab2037c34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 01:48:43 +0000 Subject: [PATCH 133/222] hr: 1.3 -> 1.4 --- pkgs/applications/misc/hr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 706a8ff74955..7435d02c99c8 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hr"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "LuRsT"; repo = "hr"; rev = version; - sha256 = "068kq37lbqfjzh28rlvkprni38ii991naawylwvq6d43y9dpzs2b"; + sha256 = "sha256-Pcnkiq7ipLoz6MFWZkCIxneUuZ3w/d+iqiyTz55WZvs="; }; dontBuild = true; From 4d8e6982cce46b318778f4a3466d466353ec1e24 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 2 Dec 2022 11:57:57 +1000 Subject: [PATCH 134/222] terraform-providers: fix broken meta --- .../networking/cluster/terraform-providers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index d83a4becf876..393cdb65c4de 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -76,9 +76,9 @@ let # These are the providers that don't fall in line with the default model special-providers = { - netlify = automated-providers.netlify.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); - pass = automated-providers.pass.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); - tencentcloud = automated-providers.tencentcloud.overrideAttrs (_: { meta.broken = stdenv.isDarwin; }); + netlify = automated-providers.netlify.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); + pass = automated-providers.pass.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); + tencentcloud = automated-providers.tencentcloud.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; }); # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. checkly = automated-providers.checkly.override { spdx = "MIT"; }; gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; }; From b22e868d22b029931d775493aeeab383e21df056 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Thu, 1 Dec 2022 16:33:53 +0100 Subject: [PATCH 135/222] sourcehut.dispatchsrht: move removal notice to 23.05 release notes --- .../manual/from_md/release-notes/rl-2211.section.xml | 10 ---------- .../manual/from_md/release-notes/rl-2305.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 -- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 1fe25e7be78a..61ba5e7a36bc 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -439,16 +439,6 @@ instead. - - - services.sourcehut.dispatch and the - corresponding package - (sourcehut.dispatchsrht) have been removed - due to - upstream - deprecation. - - The p4 package now only includes the diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 757a719bfefd..736d954d2b88 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -58,6 +58,16 @@ fetch-ec2-metadata.service + + + services.sourcehut.dispatch and the + corresponding package + (sourcehut.dispatchsrht) have been removed + due to + upstream + deprecation. + + The EC2 image module previously detected and automatically diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index b6e0824f8b43..c7dc68f54d54 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -124,8 +124,6 @@ In addition to numerous new and upgraded packages, this release includes the fol - `services.hbase` has been renamed to `services.hbase-standalone`. For production HBase clusters, use `services.hadoop.hbase` instead. -- `services.sourcehut.dispatch` and the corresponding package (`sourcehut.dispatchsrht`) have been removed due to [upstream deprecation](https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/). - - The `p4` package now only includes the open-source Perforce Helix Core command-line client and APIs. It no longer installs the unfree Helix Core Server binaries `p4d`, `p4broker`, and `p4p`. To install the Helix Core Server binaries, use the `p4d` package instead. - The OpenSSL extension for the PHP interpreter used by Nextcloud is built against OpenSSL 1.1 if diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 1b105fdd1f3f..87caecdae034 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -25,6 +25,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services. This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service` +- `services.sourcehut.dispatch` and the corresponding package (`sourcehut.dispatchsrht`) have been removed due to [upstream deprecation](https://sourcehut.org/blog/2022-08-01-dispatch-deprecation-plans/). + - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation. From 2a04723331864b6d472bc9cc6c1d7e3e7ba9d319 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 1 Dec 2022 16:55:05 +0100 Subject: [PATCH 136/222] nixos/rl-2211: remove reference to nowhere MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The note this originally referred to was moved to the “Internal Changes” section and later trimmed down, so the referenced content is no longer there. --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 5 +---- nixos/doc/manual/release-notes/rl-2211.section.md | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 61ba5e7a36bc..6a4573f6711f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -314,10 +314,7 @@ generated using lib.systems.elaborate. In most cases you will want to use the new canExecute predicate instead which also - considers the kernel / syscall interface. It is briefly - described in the release’s - highlights - section. + takes the kernel / syscall interface into account. lib.systems.parse.isCompatible still exists, but has changed semantically: Architectures with differing endianness modes are no longer considered diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index c7dc68f54d54..aedc3c7831c1 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -90,8 +90,7 @@ In addition to numerous new and upgraded packages, this release includes the fol - The `isCompatible` predicate checking CPU compatibility is no longer exposed by the platform sets generated using `lib.systems.elaborate`. In most cases you will want to use the new `canExecute` predicate instead which also - considers the kernel / syscall interface. It is briefly described in the - release's [highlights section](#sec-release-22.11-highlights). + takes the kernel / syscall interface into account. `lib.systems.parse.isCompatible` still exists, but has changed semantically: Architectures with differing endianness modes are *no longer considered compatible*. From 6242ca0d36deda3d36326df6c68dc516ea9fe453 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 04:40:07 +0000 Subject: [PATCH 137/222] babashka: 1.0.166 -> 1.0.167 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index c44628401a80..3cc287c50352 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.0.166"; + version = "1.0.167"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-MrUs6pXu/+QodQl7eatXwmMMsgarxMy2q4o51cxugBA="; + sha256 = "sha256-tqhl2d0HZJNVP3EX2y5YiOmCgJsXegUUO91+f9MxQyU="; }; executable = "bb"; From 7c619b992947b1fe45fc26e8cf6c29766cc80cff Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 2 Dec 2022 00:02:27 -0500 Subject: [PATCH 138/222] cargo-auditable: 0.5.4 -> 0.5.5 Diff: https://github.com/rust-secure-code/cargo-auditable/compare/v0.5.4...v0.5.5 Changelog: https://github.com/rust-secure-code/cargo-auditable/blob/v0.5.5/cargo-auditable/CHANGELOG.md --- pkgs/development/tools/rust/cargo-auditable/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix index 6eec582e212b..64580d8ad8b3 100644 --- a/pkgs/development/tools/rust/cargo-auditable/default.nix +++ b/pkgs/development/tools/rust/cargo-auditable/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-auditable"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "v${version}"; - sha256 = "sha256-udn/Z+raf/fkJ5M/FSH9Au+J9ASu0rz6ZJSl8P+jLT4="; + sha256 = "sha256-mEmTgd7sC2jmYeb5pEO985v/aWWKlq/mSQUAGi32loY="; }; - cargoSha256 = "sha256-k3wWdlLYGZZ44IHatXWq8TK2xCia3YES2jX286QkNH0="; + cargoSha256 = "sha256-G72UUqvFaTY/GQSkpz1wIzjb7vIWuAjvKMZosUB6YsA="; meta = with lib; { description = "A tool to make production Rust binaries auditable"; homepage = "https://github.com/rust-secure-code/cargo-auditable"; + changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; From 34b9b0fb5d706092e9d08c8866cf87fd0442426c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 05:18:26 +0000 Subject: [PATCH 139/222] act: 0.2.33 -> 0.2.34 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index dd0c96a46abf..3489ce3d1f77 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.33"; + version = "0.2.34"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FNOZA4sb0IlKkLiE+uPOE5KJXlU7XbtHlmPJUMJbGNE="; + sha256 = "sha256-75gUiFDKpIfl9xU9MAb/JkTof5NakPHR0lEaMJpSYZQ="; }; - vendorSha256 = "sha256-9ziHGZWHeYk0sxOxIFCnrLd1iqT9orgwE7eixvSMhlc="; + vendorSha256 = "sha256-4r25EqpnCWfJmidWZlerbNaUnDCMPMCcsGRluwHQyvY="; doCheck = false; From 58710ad37d50b420654bb3d1ce50adffe643a6e4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 22 Nov 2022 06:55:49 +0100 Subject: [PATCH 140/222] dar: use llvmPackages_12 rather than gcc on Darwin As pointed out by @wegank in https://github.com/NixOS/nixpkgs/pull/202218#issuecomment-1322708760, a newer clang also works. --- pkgs/tools/backup/dar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 3652529805c6..2ee7331a7338 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,4 +1,4 @@ -{ lib, gccStdenv, fetchurl +args @ { lib, stdenv, llvmPackages_12, fetchurl , which , attr, e2fsprogs , curl, libargon2, librsync, libthreadar @@ -10,9 +10,9 @@ with lib; let - # Fails to build with clang on Darwin: + # Fails to build with clang-11 on Darwin: # error: exception specification of overriding function is more lax than base version - stdenv = gccStdenv; + stdenv = if args.stdenv.isDarwin then llvmPackages_12.stdenv else args.stdenv; in stdenv.mkDerivation rec { From 5b2d084e4da4410225882e1d17bfb4b60eb08697 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 21 Nov 2022 17:59:00 +0100 Subject: [PATCH 141/222] dar: cleanup --- pkgs/tools/backup/dar/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 2ee7331a7338..b6d11d4cda52 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -7,8 +7,6 @@ args @ { lib, stdenv, llvmPackages_12, fetchurl , CoreFoundation }: -with lib; - let # Fails to build with clang-11 on Darwin: # error: exception specification of overriding function is more lax than base version @@ -32,10 +30,10 @@ stdenv.mkDerivation rec { curl librsync libthreadar gpgme libargon2 libgcrypt openssl bzip2 lz4 lzo xz zlib - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ attr e2fsprogs - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation ]; @@ -47,20 +45,20 @@ stdenv.mkDerivation rec { "--enable-threadar" ]; + hardeningDisable = [ "format" ]; + + enableParallelBuilding = true; + postInstall = '' # Disable html help rm -r "$out"/share/dar ''; - enableParallelBuilding = true; - - hardeningDisable = [ "format" ]; - - meta = { + meta = with lib; { homepage = "http://dar.linux.free.fr"; description = "Disk ARchiver, allows backing up files into indexed archives"; maintainers = with maintainers; [ izorkin ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; }; } From dade319b303f6ee6365b9f97a27fd1643e2f27f7 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 21 Nov 2022 18:30:26 +0100 Subject: [PATCH 142/222] dar: one list item per line --- pkgs/tools/backup/dar/default.nix | 43 ++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index b6d11d4cda52..a364c4f13942 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,10 +1,24 @@ -args @ { lib, stdenv, llvmPackages_12, fetchurl -, which -, attr, e2fsprogs -, curl, libargon2, librsync, libthreadar -, gpgme, libgcrypt, openssl -, bzip2, lz4, lzo, xz, zlib -, CoreFoundation +args @ { + lib, + stdenv, + llvmPackages_12, # Anything newer than 11 + fetchurl, + which, + attr, + e2fsprogs, + curl, + libargon2, + librsync, + libthreadar, + gpgme, + libgcrypt, + openssl, + bzip2, + lz4, + lzo, + xz, + zlib, + CoreFoundation, }: let @@ -27,9 +41,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ - curl librsync libthreadar - gpgme libargon2 libgcrypt openssl - bzip2 lz4 lzo xz zlib + curl + librsync + libthreadar + gpgme + libargon2 + libgcrypt + openssl + bzip2 + lz4 + lzo + xz + zlib ] ++ lib.optionals stdenv.isLinux [ attr e2fsprogs From a50b78b535007c3f809c0188f170e67671b083a6 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 21 Nov 2022 18:27:21 +0100 Subject: [PATCH 143/222] dar: use fetchzip It's cleaner to have the source files directly rather than the tarball. fetchzip unpacks tarballs after fetching them. --- pkgs/tools/backup/dar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index a364c4f13942..c697bb4f20f7 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -2,7 +2,7 @@ args @ { lib, stdenv, llvmPackages_12, # Anything newer than 11 - fetchurl, + fetchzip, which, attr, e2fsprogs, @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { version = "2.7.7"; pname = "dar"; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-wD4vUu/WWi8Ee2C77aJGDLUlFl4b4y8RC2Dgzs4/LMk="; + sha256 = "sha256-643hU28Vl0QaqdKoKdQ1Z/j5drE59/jw5xkVO/g+MSw="; }; outputs = [ "out" "dev" ]; From 9ce190c30639927b8264d631b53d583c5e5cfa31 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:10:01 +0000 Subject: [PATCH 144/222] =?UTF-8?q?terraform-providers.akamai:=203.0.0=20?= =?UTF-8?q?=E2=86=92=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 114ae4610852..b37cdb164f91 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -39,13 +39,13 @@ "vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=" }, "akamai": { - "hash": "sha256-QbCDaDII+xEA3lXjODsz8jai2mg3N/3uC4fruiLqvWc=", + "hash": "sha256-SKaSKBV47B9Y0w2zmNOek/UEbUQLtB1qAm6866RAhdA=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v3.0.0", + "rev": "v3.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-LYoRZIr2+NqxwZYaN1HFTSaCl0wJPVr2Wf0OjdqM5YM=" + "vendorHash": "sha256-byReViTX0KRFVgWMkte00CDB/3Mw8Ov5GyD48sENmIA=" }, "alicloud": { "hash": "sha256-rscu2gCvf/8MJBx1coUmne+8DO8b6RFyfMAwhTUPU+w=", From 77be06f89f45d84c67e071faeb22a2c731db105c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:10:07 +0000 Subject: [PATCH 145/222] =?UTF-8?q?terraform-providers.aiven:=203.8.1=20?= =?UTF-8?q?=E2=86=92=203.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b37cdb164f91..5c0a2029f6c2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -30,13 +30,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-2QdpXNCnnYh75CyqeKJbYgFB63TCcMrWlUPLe/puvOw=", + "hash": "sha256-PeIb/HErJ3iIBwzeUmdhNXCYZBqayI2cRSDrye8A3Ys=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v3.8.1", + "rev": "v3.9.0", "spdx": "MIT", - "vendorHash": "sha256-pFRCT0fgWOucw3jNqvSas7pl9KHayJorFmgOKGmL1jI=" + "vendorHash": "sha256-J/x5oc4Qr4c/K5RKswFeWgUDE+ns1bUxfpRlj29uCY0=" }, "akamai": { "hash": "sha256-SKaSKBV47B9Y0w2zmNOek/UEbUQLtB1qAm6866RAhdA=", From f2a3d97c1e5307a51c856cb6e6c4470b371ed990 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:20:03 +0000 Subject: [PATCH 146/222] =?UTF-8?q?terraform-providers.alicloud:=201.192.0?= =?UTF-8?q?=20=E2=86=92=201.193.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5c0a2029f6c2..de5d4f923b62 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -48,11 +48,11 @@ "vendorHash": "sha256-byReViTX0KRFVgWMkte00CDB/3Mw8Ov5GyD48sENmIA=" }, "alicloud": { - "hash": "sha256-rscu2gCvf/8MJBx1coUmne+8DO8b6RFyfMAwhTUPU+w=", + "hash": "sha256-YdXnw0j2PSuT2BoQQUxyomH+dycjy6Fed7+xVuOwJhk=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.192.0", + "rev": "v1.193.0", "spdx": "MPL-2.0", "vendorHash": null }, From ec6b8443dda613d4bb5983e26490ab0481b94357 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:21:31 +0000 Subject: [PATCH 147/222] =?UTF-8?q?terraform-providers.azuread:=202.30.0?= =?UTF-8?q?=20=E2=86=92=202.31.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index de5d4f923b62..20552ba63a54 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -121,11 +121,11 @@ "vendorHash": "sha256-bsaZDkxPTQQbjtjSR9BZbMVHJ+cy3iEHPRI4l5K+jyg=" }, "azuread": { - "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=", + "hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.30.0", + "rev": "v2.31.0", "spdx": "MPL-2.0", "vendorHash": null }, From a1224ebbcce760369bfe213841c630b9416fee17 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:23:41 +0000 Subject: [PATCH 148/222] =?UTF-8?q?terraform-providers.cloudflare:=203.28.?= =?UTF-8?q?0=20=E2=86=92=203.29.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 20552ba63a54..c842d3ae9f3e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -222,13 +222,13 @@ "vendorHash": "sha256-fDYkeUOW9wuypAJR1YFEQp8KhtTfMr8NZeT7TMYXEmU=" }, "cloudflare": { - "hash": "sha256-a0zJ1n4nKHEyjqJeey5MxPhqJU8Bq9a+hqLOCEdTfEE=", + "hash": "sha256-1Ak5NPaOSqF0mJU2/CnssQjz7ekyVE/kqDOS5rYSN10=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.28.0", + "rev": "v3.29.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Jvaud6rkaNMZZ/L/pb8JKGaAYw1MieGq7aU4Abe2VJA=" + "vendorHash": "sha256-2H+xp/A3J/xUf02voYyWP+J5MSsFM7Kz7KlgjaF99ao=" }, "cloudfoundry": { "hash": "sha256-OOORVbjcXhH6gVjLdOu8kTqy6dzIARruF4H8byMNkko=", From dfa4dee620fd5c77b3a7ceeeff7914e58d725de4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:26:11 +0000 Subject: [PATCH 149/222] =?UTF-8?q?terraform-providers.equinix:=201.11.0?= =?UTF-8?q?=20=E2=86=92=201.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c842d3ae9f3e..fe5389ffbd6b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -358,12 +358,12 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-jHnpt6B1pPPPKv3vVKOLz+r+CUj6MPEOm4na9Lcxs9w=", + "hash": "sha256-hU0mqMuB3yvLWJ6ggDvATQeSFdpsEfs/hmvLV6A2Md4=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.11.0", + "rev": "v1.11.1", "spdx": "MIT", "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" }, From dc7289e08863f0e72ac0ab28b6f20ffb6fc86047 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:30:07 +0000 Subject: [PATCH 150/222] =?UTF-8?q?terraform-providers.flexibleengine:=201?= =?UTF-8?q?.34.0=20=E2=86=92=201.35.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fe5389ffbd6b..3ee5a5fd7c2c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -395,13 +395,13 @@ "vendorHash": null }, "flexibleengine": { - "hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=", + "hash": "sha256-LPMSYBp9qSx6PDKAHfFpO6AAR13E9oMCXyH0tkyXamU=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.34.0", + "rev": "v1.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=" + "vendorHash": "sha256-KoqhPXacce8ENYC3nsOOOzYW6baVUfnMbaVbfADyuSw=" }, "fortios": { "deleteVendor": true, From 426c4936d2242ee2187afcf81faf4e319a014ba3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:32:07 +0000 Subject: [PATCH 151/222] =?UTF-8?q?terraform-providers.github:=205.9.1=20?= =?UTF-8?q?=E2=86=92=205.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3ee5a5fd7c2c..ffeddd5f175d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -424,11 +424,11 @@ "vendorHash": "sha256-cStVmI58V46I3MYYYrbCY3llnOx2pyuM2Ku+rhe5DVQ=" }, "github": { - "hash": "sha256-+I2h3wQnLd9EX99begsj4CI5R5i93JowBbGydYQNJHg=", + "hash": "sha256-1C/GG3VhQfnU71rucYefpRsfrS//lpPXHqT/QAHM2z0=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.9.1", + "rev": "v5.11.0", "spdx": "MIT", "vendorHash": null }, From 39ee29e92f8815ffe3bb862efd15c45cebea8249 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:34:05 +0000 Subject: [PATCH 152/222] =?UTF-8?q?terraform-providers.hcloud:=201.36.0=20?= =?UTF-8?q?=E2=86=92=201.36.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ffeddd5f175d..d35203139874 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -489,13 +489,13 @@ "vendorHash": null }, "hcloud": { - "hash": "sha256-d/qLN5ev8ywiJr97rrlS9rwfvsEheBD2n8I6D9a7krQ=", + "hash": "sha256-LbMnERF4ymsM5TLyAxIuawmwnTQMA8A96xKtluPj/2s=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.36.0", + "rev": "v1.36.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-HsWkHoFs/77b5+6HSV7YgLOwpE2BZyxbGNty8p+OBSM=" + "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" }, "helm": { "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", From 4a5224991feedcc98539a1721135da22ac146192 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:34:40 +0000 Subject: [PATCH 153/222] =?UTF-8?q?terraform-providers.aws:=204.41.0=20?= =?UTF-8?q?=E2=86=92=204.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d35203139874..f4a5c464c72d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -112,13 +112,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-jk46oJCbhZa6MzqWd4FQDHXekGKNdzXf/y6qUY+Ts9Q=", + "hash": "sha256-e+D9xI3lZfMDze1YW+Wjni29cPfsSlghmCkLFP/4ork=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.41.0", + "rev": "v4.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-bsaZDkxPTQQbjtjSR9BZbMVHJ+cy3iEHPRI4l5K+jyg=" + "vendorHash": "sha256-mDn16Cww7PD5tPKRKf4uoOK3UJH9se8LCziTX10XcXY=" }, "azuread": { "hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=", From 68612bfb3f77eeb5a5d4556c47e943d30867281d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:36:51 +0000 Subject: [PATCH 154/222] =?UTF-8?q?terraform-providers.huaweicloud:=201.42?= =?UTF-8?q?.0=20=E2=86=92=201.43.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f4a5c464c72d..f8a545d7cec0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -544,11 +544,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-cr7xV7Z4UU+kRykVSOKeuXDiHQPL4CsCJVXf2uTZOms=", + "hash": "sha256-3fNNip9KZywpW/0xSQbdtTipHsYwLIUBzKIOdYsm+Bk=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.42.0", + "rev": "v1.43.0", "spdx": "MPL-2.0", "vendorHash": null }, From f648ba020263aef9188c59656cd039149acaadab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:39:05 +0000 Subject: [PATCH 155/222] =?UTF-8?q?terraform-providers.mailgun:=200.7.2=20?= =?UTF-8?q?=E2=86=92=200.7.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f8a545d7cec0..df4c4b5630d8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -707,13 +707,13 @@ "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=" }, "mailgun": { - "hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=", + "hash": "sha256-EQDpDuLX3uKVom/UuNbWX72N6pTPSvK+qh6nyHTcMiI=", "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", "repo": "terraform-provider-mailgun", - "rev": "v0.7.2", + "rev": "v0.7.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=" + "vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc=" }, "matchbox": { "hash": "sha256-vWhdStfwReeD1PHTihBoj4GoKnP85nzNzIV/Tjfcz1M=", From 13a57fb6e0d6253c44ebed697520c50ccfab529a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:40:31 +0000 Subject: [PATCH 156/222] =?UTF-8?q?terraform-providers.ibm:=201.47.1=20?= =?UTF-8?q?=E2=86=92=201.48.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index df4c4b5630d8..9ef9d851771f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -571,13 +571,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-VFJ86dMKOHzfq5W154+kmX9poRFjT+LlLRl3HNA52pc=", + "hash": "sha256-XWoEUHGTtQ0MFRs5NbW7nA9gvhrlqh78KNqA6M7s+yE=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.47.1", + "rev": "v1.48.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9UIM6T6ceF6WXIbjhSuDv1lNn9rphcZoePPk11X2Olo=" + "vendorHash": "sha256-uzXtXpS2reCJK63vipri8nCyHRCLmQxakFuIoMyl95E=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", From 0b71bb7db6d74be267fc1cc763907cc63c23433a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:40:51 +0000 Subject: [PATCH 157/222] =?UTF-8?q?terraform-providers.newrelic:=203.7.1?= =?UTF-8?q?=20=E2=86=92=203.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9ef9d851771f..426b5128435c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -770,13 +770,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-d5JRqxMmG7fku8+C8e700nfghz2wbL0n1TrOZb1hkpY=", + "hash": "sha256-wTQmqe7oicD7MOZdKgRHlz4Vs8dQqEUjnrKU/1pldRI=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.7.1", + "rev": "v3.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-gKPopfkEx1YRxcsO8W2+2EqKJfYbJ/pJgpydc1YScDA=" + "vendorHash": "sha256-CIiRPwzlx5WWyRmg2tXEB+yp05ZbN5mLBGuFxm0h//4=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", From 4f4a3168122f34e3ee098566490097c480ca9bd0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:42:20 +0000 Subject: [PATCH 158/222] =?UTF-8?q?terraform-providers.postgresql:=201.17.?= =?UTF-8?q?1=20=E2=86=92=201.18.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 426b5128435c..556dfa9c8dc5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -906,11 +906,11 @@ "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" }, "postgresql": { - "hash": "sha256-pi3st4phjCRq2jlRIW2Z4jt9qp7a1ghmlkjAQSbxhI4=", + "hash": "sha256-6QqXp0riYy6pJPmESrUv3J9BDY9Sl44/U2sIB663Gfw=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.17.1", + "rev": "v1.18.0", "spdx": "MPL-2.0", "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=" }, From 6f53ca69535db10748397b1cfa64d2eafb23e18d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:43:43 +0000 Subject: [PATCH 159/222] =?UTF-8?q?terraform-providers.spotinst:=201.87.0?= =?UTF-8?q?=20=E2=86=92=201.87.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 556dfa9c8dc5..59b08a479140 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1050,13 +1050,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-9i8mHWn9+ey0tHPXOjZyNixcrdgAl2Y8sJq/q4WlZzo=", + "hash": "sha256-yzFbSTSxvnTu3v6A3DRTh5Le79dHaYFcqBu2xZ9pSXM=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.87.0", + "rev": "v1.87.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=" + "vendorHash": "sha256-dMqXpKHnIjJEq84Bxoio+jxQMwQ2Yt41/grU6LRSo/A=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", From 6ae4eac7fd290af91504dd29924a50e696018762 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:45:50 +0000 Subject: [PATCH 160/222] =?UTF-8?q?terraform-providers.ucloud:=201.32.5=20?= =?UTF-8?q?=E2=86=92=201.33.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 59b08a479140..8eca44259be7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1159,11 +1159,11 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-x3+OuRzZdS429v0JNyZkM3v1etUgURSyi9qkt7RhqlI=", + "hash": "sha256-x1YQYan1W2AVg/L6BP8HfORpR2neoljZkQP3tDBM+MI=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.32.5", + "rev": "v1.33.0", "spdx": "MPL-2.0", "vendorHash": null }, From 123764dd8fa94376fca7ed130e7907729fa8d829 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:46:58 +0000 Subject: [PATCH 161/222] =?UTF-8?q?terraform-providers.tencentcloud:=201.7?= =?UTF-8?q?8.15=20=E2=86=92=201.78.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8eca44259be7..33edaebbf252 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1095,11 +1095,11 @@ "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=" }, "tencentcloud": { - "hash": "sha256-zJ5nDsd5xK/iDk6LqNKJpqCtwVDarUKsv1Arnf0CNGw=", + "hash": "sha256-kmcZfq9gL3kybCVl4MHXYKykrqtupf7dvizbhNVVhms=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.15", + "rev": "v1.78.16", "spdx": "MPL-2.0", "vendorHash": null }, From 642519fe8e4e57a90579287fc7a06864f17b5ecd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:48:08 +0000 Subject: [PATCH 162/222] =?UTF-8?q?terraform-providers.utils:=201.5.0=20?= =?UTF-8?q?=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 33edaebbf252..6aa0511186ad 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1168,13 +1168,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=", + "hash": "sha256-B2FdeukUD+xuJHBT1Yv9G2txjX/OmkxAGXDUw2HItig=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.5.0", + "rev": "1.6.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-D1QpZTh/4BgAbsoo4RRpJoIFwkHYBkN5JWfCOe5N/A0=" + "vendorHash": "sha256-jyGp0HIu+VxZ7n6Cctq6pi6Z7IKZ7W7FeqnGXk9Pt7o=" }, "vault": { "hash": "sha256-y5pK+sZ1xWnzlhT4sFUy5Mp6sggLLtaY4Cx2OPamDIc=", From da4612004384689017f4df09f1705ae94e494a3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Dec 2022 08:48:03 +0100 Subject: [PATCH 163/222] python310Packages.pyphen: add changelog to meta - add pythonImportsCheck - disable on older Python releases --- pkgs/development/python-modules/pyphen/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index c231c9964cf1..65b88d5d611b 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -3,6 +3,7 @@ , fetchPypi , flit , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -10,9 +11,11 @@ buildPythonPackage rec { version = "0.13.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-hH9XoEOlhAjyRnCuAYT/bt+1/VcxdDIIIowCjdxRRDg="; + hash = "sha256-hH9XoEOlhAjyRnCuAYT/bt+1/VcxdDIIIowCjdxRRDg="; }; nativeBuildInputs = [ @@ -27,9 +30,14 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "ptpython" + ]; + meta = with lib; { - description = "Pure Python module to hyphenate text"; + description = "Module to hyphenate text"; homepage = "https://github.com/Kozea/Pyphen"; + changelog = "https://github.com/Kozea/Pyphen/releases/tag/${version}"; license = with licenses; [gpl2 lgpl21 mpl20]; maintainers = with maintainers; [ rvl ]; }; From 2210841466d2d45d073bf6d43ab18bdee4d74ae9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Dec 2022 08:55:14 +0100 Subject: [PATCH 164/222] python310Packages.django-postgresql-netfields: add changelog to meta - disable on unsupported Python releases - add pythonImportsCheck --- .../django-postgresql-netfields/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 2e440ed4f063..a78d45a236d1 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -10,8 +10,11 @@ }: buildPythonPackage rec { - version = "1.3.0"; pname = "django-postgresql-netfields"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jimfunk"; @@ -20,6 +23,12 @@ buildPythonPackage rec { hash = "sha256-I+X4yfadtiiZlW7QhfwVbK1qyWn/khH9fWXszCo9uro="; }; + propagatedBuildInputs = [ + django + netaddr + six + ]; + # tests need a postgres database doCheck = false; @@ -33,15 +42,15 @@ buildPythonPackage rec { # psycopg2 # ]; - propagatedBuildInputs = [ - django - netaddr - six + pythonImportsCheck = [ + "netfields" ]; meta = with lib; { description = "Django PostgreSQL netfields implementation"; homepage = "https://github.com/jimfunk/django-postgresql-netfields"; + changelog = "https://github.com/jimfunk/django-postgresql-netfields/blob/v${version}/CHANGELOG"; license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } From 9b0ce02247af67139374e07de60b10658f3625ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Dec 2022 08:57:31 +0100 Subject: [PATCH 165/222] python310Packages.django-postgresql-netfields: add missing input --- .../python-modules/django-postgresql-netfields/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index a78d45a236d1..657d68c1195e 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -4,6 +4,7 @@ , netaddr , six , fetchFromGitHub +, pythonOlder # required for tests #, djangorestframework #, psycopg2 From 99269923c67e0cb0c29e0d0b794b481b8a7ea373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 2 Dec 2022 11:00:55 +0300 Subject: [PATCH 166/222] live555: 2022.07.14 -> 2022.12.01 --- pkgs/development/libraries/live555/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 6b5f6410d54f..7ceb70bb8bcd 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "live555"; - version = "2022.07.14"; + version = "2022.12.01"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" ]; - sha256 = "sha256-VrWkBmLdP0MYfiFit3Mtkv7Ti8dWPmrndrbKo+BpRCA="; + sha256 = "sha256-BXwdPcJMJrM+FMTcNZKIWt8iBAOh4SVeihAeIzxpwQg="; }; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; From 795fc6368245a7c0bc050396ab22a88af416248a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Fri, 2 Dec 2022 09:55:10 +0300 Subject: [PATCH 167/222] vlc: 3.0.17.3 -> 3.0.18 --- pkgs/applications/video/vlc/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 41c14d6e439a..d67bd55f505d 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -83,11 +83,11 @@ let in stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.17.3"; + version = "3.0.18"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ="; + sha256 = "sha256-VwlEOcNl2KqLm0H6MIDMDu8r7+YCW7XO9yKszGJa7ew="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of @@ -190,12 +190,8 @@ stdenv.mkDerivation rec { BUILDCC = "${stdenv.cc}/bin/gcc"; patches = [ - # patches to build with recent live555 + # patch to build with recent live555 # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473 - (fetchpatch { - url = "https://code.videolan.org/videolan/vlc/uploads/3c84ea58d7b94d7a8d354eaffe4b7d55/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch"; - sha256 = "171d3qjl9a4dm13sqig3ra8s2zcr76wfnqz4ba4asg139cyc1axd"; - }) (fetchpatch { url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch"; sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda"; From 2d811a3709aef8b3aca8a75627685099484d6d39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 08:39:50 +0000 Subject: [PATCH 168/222] datree: 1.8.1 -> 1.8.8 --- pkgs/development/tools/datree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 8bba03238e1c..780e489cd849 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.8.1"; + version = "1.8.8"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-g+8O6gtBx6UTIUDtVtt2je9ZS+50kOgJX15amuj83g4="; + hash = "sha256-R0wYkckmNIcTElll39vrnK5nMLqbx3C/+cQtogNwmP8="; }; vendorHash = "sha256-m3O5AoAHSM6rSnmL5N7V37XU38FADb0Edt/EZvvb2u4="; From 3f12b7e27287d65d2242d12e21adb861be41ad6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Dec 2022 10:06:01 +0100 Subject: [PATCH 169/222] python310Packages.django-postgresql-netfields: disable pythonImportsCheck --- .../python-modules/django-postgresql-netfields/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix index 657d68c1195e..5564e0f6de22 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -43,9 +43,10 @@ buildPythonPackage rec { # psycopg2 # ]; - pythonImportsCheck = [ - "netfields" - ]; + # Requires psycopg2 + # pythonImportsCheck = [ + # "netfields" + # ]; meta = with lib; { description = "Django PostgreSQL netfields implementation"; From 6ace70150e0ded515f9bdf78c6ebe8f389739067 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Thu, 1 Dec 2022 22:05:47 +0000 Subject: [PATCH 170/222] klibc: 2.0.10 -> 2.0.11 Changelog: https://lists.zytor.com/archives/klibc/2022-October/004689.html --- pkgs/os-specific/linux/klibc/default.nix | 4 ++-- .../linux/klibc/no-reinstall-kernel-headers.patch | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 47cf03a3a87f..bc2160c8484c 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0="; + hash = "sha256-XrMOXh7HPcTjhMYLuUOvicUxdMgvh3Ev3TTdMoZNX2A="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch index 709dd30f8c7e..bf46a17f3d7d 100644 --- a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch +++ b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch @@ -1,11 +1,12 @@ -diff -Naur klibc-2.0.3-orig/scripts/Kbuild.install klibc-2.0.3/scripts/Kbuild.install ---- klibc-2.0.3-orig/scripts/Kbuild.install 2013-12-03 13:53:46.000000000 -0500 -+++ klibc-2.0.3/scripts/Kbuild.install 2014-01-04 18:17:09.342609021 -0500 -@@ -95,7 +95,6 @@ +diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install +index 0788637f..6708e19f 100644 +--- a/scripts/Kbuild.install ++++ b/scripts/Kbuild.install +@@ -102,7 +102,6 @@ header: $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. - $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 + ifneq ($(srctree),$(objtree)) + $(Q)cp -rf $(srctree)/usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. + endif From 4b6303bf3d6f3ee2d2a20a8ba69678e3fc5e0f6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 05:32:17 +0000 Subject: [PATCH 171/222] atmos: 1.13.1 -> 1.16.0 --- pkgs/applications/networking/cluster/atmos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 16635f17600f..c1e4df0a3893 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.13.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iL8quRwW4idY880aEM2rwXRh6JXIvMzlfBDcz2TgHjw="; + sha256 = "sha256-6NUuKU8KQBfHE6fcN3a9lBcUk7p5I9SuY9g+qJxGXmU="; }; - vendorSha256 = "sha256-pr33Ya6cg3EKIVTBTY8DD0lyTMPF1FcRQK2jdyPiE44="; + vendorSha256 = "sha256-vZwADD7fi9ZvJby9Ijdeueid8jRfUyyj6Nu4kgkO5Wo="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; From 443c70789b27b1cd0be94663234edc7ac548f8ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 09:49:52 +0000 Subject: [PATCH 172/222] emacsPackages.ebuild-mode: 1.60 -> 1.61 --- .../elisp-packages/manual-packages/ebuild-mode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix index 04a105ed5145..7473a8587929 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix @@ -2,11 +2,11 @@ trivialBuild rec { pname = "ebuild-mode"; - version = "1.60"; + version = "1.61"; src = fetchurl { url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; - sha256 = "sha256-XN+RLVff4yvxjaAuNjUgSOzU0KdnVGMt9B78rfW389g="; + sha256 = "sha256-/n3gs99psdiCA1Kjtljfx9T5anGPphtsMIC2nOCv0wk="; }; meta = with lib; { From 748088becddc23e70042ea9055ba83a5d92cbbe9 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 2 Dec 2022 09:50:12 +0000 Subject: [PATCH 173/222] vimPlugins.ctrlp-cmatcher: python2 -> python3 --- .../editors/vim/plugins/overrides.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3e0109aaef8a..9db737e419e3 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -310,7 +310,21 @@ self: super: { }); ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: { - buildInputs = [ python2 ]; + # drop Python 2 patches + # https://github.com/JazzCore/ctrlp-cmatcher/pull/44 + patches = [ + (fetchpatch { + name = "drop_python2_pt1.patch"; + url = "https://github.com/JazzCore/ctrlp-cmatcher/commit/3abad6ea155a7f6e138e1de3ac5428177bfb0254.patch"; + sha256 = "sha256-fn2puqYeJdPTdlTT4JjwVz7b3A+Xcuj/xtP6TETlB1U="; + }) + (fetchpatch { + name = "drop_python2_pt2.patch"; + url = "https://github.com/JazzCore/ctrlp-cmatcher/commit/385c8d02398dbb328b1a943a94e7109fe6473a08.patch"; + sha256 = "sha256-yXKCq8sqO0Db/sZREuSeqKwKO71cmTsAvWftoOQehZo="; + }) + ]; + buildInputs = with python3.pkgs; [ python3 setuptools ]; buildPhase = '' patchShebangs . ./install.sh From c4d3365d2e28a830ef063ee55330bbf132b3e435 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 2 Dec 2022 09:50:39 +0000 Subject: [PATCH 174/222] vimPlugins.vim-wakatime: python2 -> python3 --- pkgs/applications/editors/vim/plugins/overrides.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 9db737e419e3..c569941ed2be 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -10,7 +10,6 @@ , substituteAll # Language dependencies -, python2 , python3 , rustPlatform @@ -1192,7 +1191,7 @@ self: super: { }); vim-wakatime = super.vim-wakatime.overrideAttrs (old: { - buildInputs = [ python2 ]; + buildInputs = [ python3 ]; }); vim-xdebug = super.vim-xdebug.overrideAttrs (old: { From 132e60b840e1a51ec93484a175cd1cb2adaf8e30 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 2 Dec 2022 02:02:05 -0800 Subject: [PATCH 175/222] calc: 2.14.1.0 -> 2.14.1.2 Also fixed GitHub source url. --- pkgs/applications/science/math/calc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 41adb1cfbe6c..d521da2f114c 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.14.1.0"; + version = "2.14.1.2"; src = fetchurl { urls = [ - "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" + "https://github.com/lcn2/calc/releases/download/v${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-C1YWZS4x7htUWF3MhRLQIYChL4rdwJxASdPQjttUr0A="; + sha256 = "sha256-3o8jKmEYxNQtExOkjqTVU24mtSok+T/RnRw6goNzThM="; }; postPatch = '' From 3627243f815fdfcad3815e4a5e16aa4b59d706b1 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 2 Dec 2022 11:29:12 +0100 Subject: [PATCH 176/222] nushell: 0.71.0 -> 0.72.0 Wanted to see if the tests are still failing. They are. https://github.com/nushell/nushell/issues/6708 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 4da72442edc9..432cbfe9ac9f 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.71.0"; + version = "0.72.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-81vyW5GovBnH3tLr77V2uLIkigymF+nOZ0F/J4eEu9Q="; + sha256 = "sha256-CWFG3ltSWwUPz+cVXUL0RaDxmm1A3Ie0BUBFFZfR9Mc="; }; - cargoSha256 = "sha256-A7MvyAQpd05uSkTw2fgQAN45dqku1RWYag5LIkS6GnY="; + cargoSha256 = "sha256-VgE14440BumaL/wZz1ONjIK1nsJWaPlvy7M0R+ojb9A="; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; From 0cccb224ee5c2d4632170836d5d183347784d38d Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Fri, 2 Dec 2022 10:29:26 +0000 Subject: [PATCH 177/222] klibc: link initrd-network-ssh test --- pkgs/os-specific/linux/klibc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index bc2160c8484c..1a194421a6bc 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl }: +{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl, nixosTests }: let commonMakeFlags = [ @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { done ''; + passthru.tests = { + # uses klibc's ipconfig + inherit (nixosTests) initrd-network-ssh; + }; + meta = { description = "Minimalistic libc subset for initramfs usage"; homepage = "https://kernel.org/pub/linux/libs/klibc/"; From b647182c16d1f841ca8bc6e5305bf50fc45c62ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Dec 2022 11:44:02 +0100 Subject: [PATCH 178/222] gojq: 0.12.9 -> 0.12.10 Diff: https://github.com/itchyny/gojq/compare/v0.12.9...v0.12.10 --- pkgs/development/tools/gojq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index 5c85a5c17418..b70801d0228e 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gojq"; - version = "0.12.9"; + version = "0.12.10"; src = fetchFromGitHub { owner = "itchyny"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AII3mC+JWOP0x4zf8FQdRhOmckPgY7BDRoKICCFkn9Q="; + sha256 = "sha256-JlxxfazVNJzQzG2p8L+5MoevSNNWf5mi14n3f/Q+MZU="; }; - vendorSha256 = "sha256-RtackQ4uJo1j2jePu9xd0idQBKbwBh4L2spiS2mRynw="; + vendorSha256 = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; ldflags = [ "-s" "-w" ]; From 6110a6009fc77348e9c47e0801a9b884dc76c730 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 2 Dec 2022 10:49:10 +0000 Subject: [PATCH 179/222] lib/modules: Add context to the "option does not exist" error Add trace items that provide context for a failed definition that can not be caught within the Nix language. This also adds a test for the `tryEval` behavior of `showDefs`. --- lib/modules.nix | 13 ++++++++++++- lib/tests/modules.sh | 3 +++ lib/tests/modules/define-enable-abort.nix | 3 +++ lib/tests/modules/define-enable-throw.nix | 3 +++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 lib/tests/modules/define-enable-abort.nix create mode 100644 lib/tests/modules/define-enable-throw.nix diff --git a/lib/modules.nix b/lib/modules.nix index 204a2cc1ac12..23e531de5c3a 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -284,7 +284,18 @@ rec { if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then let firstDef = head merged.unmatchedDefns; - baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}"; + baseMsg = + let + optText = showOption (prefix ++ firstDef.prefix); + defText = + builtins.addErrorContext + "while evaluating the error message for definitions for `${optText}', which is an option that does not exist" + (builtins.addErrorContext + "while evaluating a definition from `${firstDef.file}'" + ( showDefs [ firstDef ]) + ); + in + "The option `${optText}' does not exist. Definition values:${defText}"; in if attrNames options == [ "_module" ] then diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 6d2eb24db55c..75b316c97212 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -64,6 +64,9 @@ checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix # Check boolean option. checkConfigOutput '^false$' config.enable ./declare-enable.nix checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix +checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*' config.enable ./define-enable-throw.nix +checkConfigError 'while evaluating a definition from `.*/define-enable-abort.nix' config.enable ./define-enable-abort.nix +checkConfigError 'while evaluating the error message for definitions for .enable., which is an option that does not exist' config.enable ./define-enable-abort.nix checkConfigOutput '^1$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix diff --git a/lib/tests/modules/define-enable-abort.nix b/lib/tests/modules/define-enable-abort.nix new file mode 100644 index 000000000000..85b58a567cad --- /dev/null +++ b/lib/tests/modules/define-enable-abort.nix @@ -0,0 +1,3 @@ +{ + config.enable = abort "oops"; +} diff --git a/lib/tests/modules/define-enable-throw.nix b/lib/tests/modules/define-enable-throw.nix new file mode 100644 index 000000000000..16a59b781dc5 --- /dev/null +++ b/lib/tests/modules/define-enable-throw.nix @@ -0,0 +1,3 @@ +{ + config.enable = throw "oops"; +} From 08918f71d0942753e3442a9bff9c6fd487623611 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 23:28:50 +0000 Subject: [PATCH 180/222] gcsfuse: 0.41.8 -> 0.41.9 --- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 16d0ae0be8c8..225048f0e3a8 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gcsfuse"; - version = "0.41.8"; + version = "0.41.9"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-9Y6phVYWI5xhqJf2LL9WbaG8vyfNcGUcnaHjKA4krjA="; + sha256 = "sha256-hfdQa0e1S1cIF4V2XPFBl4jzzTWlIxZIJ99PRxCP55s="; }; vendorSha256 = null; From 145c4f431d7634d374a896855886d83c2f027ed0 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Fri, 2 Dec 2022 12:25:02 +0100 Subject: [PATCH 181/222] bookstack: 22.06.2 -> 22.11 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 338 +++++++++--------- 2 files changed, 171 insertions(+), 171 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 9f295cf5197c..bcac0e37ffc0 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "22.06.2"; + version = "22.11"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "17njpfmf5y4h59dvq30rrz1bda81kmbikxfmf7lm892x3vqc0vvx"; + sha256 = "1k82dmlrq0ni9c4wf77d4jzrf24jxi1h5zfsj7132z4ql5di5gz4"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index b4ec6bf6514b..24340a54e81e 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -15,10 +15,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-4ff51d01da43aa3bd36eef921a9cd4e0ff843fab"; + name = "aws-aws-sdk-php-337e447997148b9e5024c2d0ae69618b1cbf80d6"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/4ff51d01da43aa3bd36eef921a9cd4e0ff843fab"; - sha256 = "0hja973aylbd5hhvxi0c3yrb0nr84xww73dcadwa25jnivln5mq7"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/337e447997148b9e5024c2d0ae69618b1cbf80d6"; + sha256 = "1pwghj67zah616cvdrbs2fwgwn99jhxi95mdfq6l2jhpy59gymkc"; }; }; }; @@ -35,10 +35,10 @@ let "barryvdh/laravel-dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-dompdf-de83130d029289e1b59f28b41c314ce1d157b4a0"; + name = "barryvdh-laravel-dompdf-1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/de83130d029289e1b59f28b41c314ce1d157b4a0"; - sha256 = "19pv4zxvhka6war0w4s0wfqfjbnpq43qhkj1kxb3agh83ni6jrx0"; + url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; + sha256 = "0xvaq6mp9s8nxlpfisa50fr8rjb6vmivxdbr985q9vydadh1dsv2"; }; }; }; @@ -85,10 +85,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; + name = "doctrine-dbal-f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; - sha256 = "0jf1whbf0d5kizrlzdm29ld5lrk4fgmayr239vyl2dmdzzxyvkhf"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"; + sha256 = "09kv9g6693gr3i2wbfc1riyzgfkm5kkamhzfj4skrsw14pvacsgf"; }; }; }; @@ -105,20 +105,20 @@ let "doctrine/event-manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f"; + name = "doctrine-event-manager-95aa4cb529f1e96576f3fda9f5705ada4056a520"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f"; - sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8"; + url = "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520"; + sha256 = "0xi2s28jmmvrndg1yd0r5s10d9a0q6j2dxdbazvcbws9waf0yrvj"; }; }; }; "doctrine/inflector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-inflector-8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"; + name = "doctrine-inflector-d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"; - sha256 = "1l83jbj4k59m1agi041gzx1rxix1wzxw9mvnivmg1hqr158149n7"; + url = "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"; + sha256 = "1z6y0mxqadarw76whppcl0h0cj7p5n6k7mxihggavq46i2wf7nhj"; }; }; }; @@ -135,20 +135,20 @@ let "dompdf/dompdf" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-5031045d9640b38cfc14aac9667470df09c9e090"; + name = "dompdf-dompdf-c5310df0e22c758c85ea5288175fc6cd777bc085"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090"; - sha256 = "1ciw3mc6pq3rwpzsgc71gdbwppqjdfcr0fhq3435c27ni5y8z4c5"; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/c5310df0e22c758c85ea5288175fc6cd777bc085"; + sha256 = "1h9y3v02qdijc6hmi7p8x626jlhkjd2pcck9mkcmm5sz9xzqhdwb"; }; }; }; "dragonmantank/cron-expression" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "dragonmantank-cron-expression-be85b3f05b46c39bbc0d95f6c071ddff669510fa"; + name = "dragonmantank-cron-expression-782ca5968ab8b954773518e9e49a6f892a34b2a8"; src = fetchurl { - url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa"; - sha256 = "09k5cj8bay6jkphjl5ngfx7qb17dxnlvpf6918a9ms8am731s2a6"; + url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8"; + sha256 = "18pxn1v3b2yhwzky22p4wn520h89rcrihl7l6hd0p769vk1b2qg9"; }; }; }; @@ -165,50 +165,50 @@ let "filp/whoops" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "filp-whoops-a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"; + name = "filp-whoops-f7948baaa0330277c729714910336383286305da"; src = fetchurl { - url = "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"; - sha256 = "0hc9zfh3i7br30831grccm4wny9dllpswhaw8hdn988mvg5xrdy0"; + url = "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da"; + sha256 = "1l70lq27h072ria2pgmf9dp3h5awszirqd1khlcknl4w1hww3swv"; }; }; }; "graham-campbell/result-type" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "graham-campbell-result-type-0690bde05318336c7221785f2a932467f98b64ca"; + name = "graham-campbell-result-type-a878d45c1914464426dc94da61c9e1d36ae262a8"; src = fetchurl { - url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca"; - sha256 = "0a6kj3vxmhr1wh2kggmrl6y41hkg19jc0iq8qw095lf11mr4bd83"; + url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8"; + sha256 = "1xayas92b467yixpc79l7ydgspy3s76cpfddv7lrvd691y11g1vb"; }; }; }; "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; + name = "guzzlehttp-guzzle-b50a2a1251152e43f6a37f0fa053e730a67d25ba"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; - sha256 = "0a8491bb72y61r3ghqn32kabsj8rxhj9pddnkkr14x3wbc10zfr4"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba"; + sha256 = "0cy828r0kafx58jh0k1cy17y77qh248d9kfk9ncn9pyq2q5v9p9p"; }; }; }; "guzzlehttp/promises" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-promises-fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; + name = "guzzlehttp-promises-b94b2807d85443f9719887892882d0329d1e2598"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; - sha256 = "09ivi77y49bpc2sy3xhvgq22rfh2fhv921mn8402dv0a8bdprf56"; + url = "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598"; + sha256 = "1vvac7y5ax955qjg7dyjmaw3vab9v2lypjygap0040rv3z4x9vz8"; }; }; }; "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-13388f00956b1503577598873fffb5ae994b5737"; + name = "guzzlehttp-psr7-67c26b443f348a51926030c83481b85718457d3d"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737"; - sha256 = "05vc1q903nxfg11y9mcnlg253lm5d81jjg6wv76hjiwx8m47lbac"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d"; + sha256 = "09avh5xzmzwfpa5xv9zw90ypyfrhpyhszbli395prgh3llnrx9wg"; }; }; }; @@ -235,50 +235,40 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-2cf142cd5100b02da248acad3988bdaba5635e16"; + name = "laravel-framework-7411d9fa71c1b0fd73a33e225f14512b74e6c81e"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/2cf142cd5100b02da248acad3988bdaba5635e16"; - sha256 = "19n6ynj4cbpxx1h4y1np61i7mdahfbzfajly95w4zqss5bm67j73"; + url = "https://api.github.com/repos/laravel/framework/zipball/7411d9fa71c1b0fd73a33e225f14512b74e6c81e"; + sha256 = "0pdxr823p52cf284yfqwncii52g4zgk2gw5prn774h26v42dwaqw"; }; }; }; "laravel/serializable-closure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-09f0e9fb61829f628205b7c94906c28740ff9540"; + name = "laravel-serializable-closure-47afb7fae28ed29057fdca37e16a84f90cc62fae"; src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540"; - sha256 = "1b0kdx0cs43ci4pyhhv874k5i0k42iiizz1mz0f6wk8lpzhk0r6r"; + url = "https://api.github.com/repos/laravel/serializable-closure/zipball/47afb7fae28ed29057fdca37e16a84f90cc62fae"; + sha256 = "1mfj1jszq1mssxfh68y3s43sq90bpj25a2kpj0djbmcrccgwd46z"; }; }; }; "laravel/socialite" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-socialite-68afb03259b82d898c68196cbcacd48596a9dd72"; + name = "laravel-socialite-1cd1682b709b8808a5b5dbb68179a58d1342aa7b"; src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/68afb03259b82d898c68196cbcacd48596a9dd72"; - sha256 = "0pp8wqbjvsdsh4x8nvafp0fz42iwaqbm4l7qf91q0c1jqqfqqx6r"; + url = "https://api.github.com/repos/laravel/socialite/zipball/1cd1682b709b8808a5b5dbb68179a58d1342aa7b"; + sha256 = "0h37rw9ndh56dh71d8jaxidpnyr7xs42nnim88aaxas304j7jdwa"; }; }; }; "laravel/tinker" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-tinker-dff39b661e827dae6e092412f976658df82dbac5"; + name = "laravel-tinker-5062061b4924af3392225dd482ca7b4d85d8b8ef"; src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5"; - sha256 = "0az4n99pfrhrnr7diwi656f8y9qbynxzdw25md29ji8bw0isbc6d"; - }; - }; - }; - "laravel/ui" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-ui-65ec5c03f7fee2c8ecae785795b829a15be48c2c"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c"; - sha256 = "0hr8kkbxvxxidnw86r1i92938wajhskv68zjn1627h1i16b10ysm"; + url = "https://api.github.com/repos/laravel/tinker/zipball/5062061b4924af3392225dd482ca7b4d85d8b8ef"; + sha256 = "0smv55xbj6pk223v3nfd0fi5n4l8v85c4pra98ahq3615xma3k8c"; }; }; }; @@ -295,20 +285,20 @@ let "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-094defdb4a7001845300334e7c1ee2335925ef99"; + name = "league-flysystem-3239285c825c152bcc315fe0e87d6b55f5972ed1"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99"; - sha256 = "0dn71b1pwikbwz1cmmz9k1fc8k1fsmah3gy8sqxbz7czhqn5qiva"; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/3239285c825c152bcc315fe0e87d6b55f5972ed1"; + sha256 = "0p1cirl7j9b3gvbp264d08abfnrki89jr7rx0cbw0bjw1apf4spz"; }; }; }; "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972"; + name = "league-flysystem-aws-s3-v3-af286f291ebab6877bac0c359c6c2cb017eb061d"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972"; - sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d"; + sha256 = "1dyj1cvf2pbvkdw9i53qg6lycxv0di85qnjzcvy5lphrxambifxy"; }; }; }; @@ -352,13 +342,23 @@ let }; }; }; + "masterminds/html5" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "masterminds-html5-897eb517a343a2281f11bc5556d6548db7d93947"; + src = fetchurl { + url = "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947"; + sha256 = "12fmcgsrmh0f0llnpcvk33mrs4067nw246ci5619rr79ijy3yc0k"; + }; + }; + }; "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-5579edf28aee1190a798bfa5be8bc16c563bd524"; + name = "monolog-monolog-720488632c590286b88b80e62aa3d3d551ad4a50"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524"; - sha256 = "014sys8bv57jbpag7xlc7vplc1qy4h5jppy258hpr0xfbh27cg3w"; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50"; + sha256 = "0wg1y0mghhib6cp9gcavbs6ajfs9rgxc2ssipqb5yfwfkkbwrif6"; }; }; }; @@ -375,30 +375,30 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-97a34af22bde8d0ac20ab34b29d7bfe360902055"; + name = "nesbot-carbon-ad35dd71a6a212b98e4b87e97389b6fa85f0e347"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055"; - sha256 = "0dagm5dr9pbyvxhmspdwmpwgnxf65mjk24a32cw8h5wqfn0p99i8"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad35dd71a6a212b98e4b87e97389b6fa85f0e347"; + sha256 = "1a7qlk82jfxnf84v4vwwgs9b325mb07whkc5vxrqjjjp8krncxbi"; }; }; }; "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-34bea19b6e03d8153165d8f30bba4c3be86184c1"; + name = "nikic-php-parser-f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1"; - sha256 = "1yj97j9cdx48566qwjl5q8hkjkrd1xl59aczb1scspxay37l9w72"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"; + sha256 = "0lsw925jy1y1vvsx5da6abn1ky7g6whaxx9g524jgqgbaljrjhxm"; }; }; }; "onelogin/php-saml" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "onelogin-php-saml-247a45c079e65a78185d5489bdda0f95826c014d"; + name = "onelogin-php-saml-b22a57ebd13e838b90df5d3346090bc37056409d"; src = fetchurl { - url = "https://api.github.com/repos/onelogin/php-saml/zipball/247a45c079e65a78185d5489bdda0f95826c014d"; - sha256 = "1hmv63ba9164khnwmrrl0m8n0zjl729afp5nsvl8nz7frharilb4"; + url = "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d"; + sha256 = "1bi65bi04a26zmaz7ms0qyg6i86k4cd9g8qs7dp1pphpvflgz461"; }; }; }; @@ -445,30 +445,30 @@ let "phenx/php-svg-lib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phenx-php-svg-lib-4498b5df7b08e8469f0f8279651ea5de9626ed02"; + name = "phenx-php-svg-lib-76876c6cf3080bcb6f249d7d59705108166a6685"; src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02"; - sha256 = "01w65haq96sfyjl8ahm9nb95wasgl66ymv5lycx1cbagy653xdin"; + url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685"; + sha256 = "0bjynrs81das9f9jwd5jgsxx9gjv2m6c0mkvlgx4w1f4pgbvwsf5"; }; }; }; "phpoption/phpoption" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpoption-phpoption-eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; + name = "phpoption-phpoption-dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"; src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; - sha256 = "1lk50y8jj2mzbwc2mxfm2xdasxf4axya72nv8wfc1vyz9y5ys3li"; + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"; + sha256 = "12i9gc2q75iv6c0x87zj3j499pl8k0wzh3yzvgrhg97nhbdhab5c"; }; }; }; "phpseclib/phpseclib" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-2f0b7af658cbea265cbb4a791d6c29a6613f98ef"; + name = "phpseclib-phpseclib-dbc2307d5c69aeb22db136c52e91130d7f2ca761"; src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef"; - sha256 = "08azglzhm6j821p5w3nb61ny7gz4lgj5kdmr1f1h723f8sjjwmfs"; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761"; + sha256 = "1xpb0wi54rg33w7w357l6vh1kg9yh0pwabhmf8r9ih35s05n58a9"; }; }; }; @@ -575,10 +575,10 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-c23686f9c48ca202710dbb967df8385a952a2daf"; + name = "psy-psysh-1acec99d6684a54ff92f8b548a4e41b566963778"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf"; - sha256 = "1qjqb3x1sgqz9m6ckzgsymdgwqkd9kf8zv6wy5xiwhaxvqv4f0i7"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/1acec99d6684a54ff92f8b548a4e41b566963778"; + sha256 = "169v5160qhq07n3mvhifrgvjqrbm0306nn2ibiqwrcfqyyhq43z0"; }; }; }; @@ -655,10 +655,10 @@ let "socialiteproviders/manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-manager-4e63afbd26dc45ff263591de2a0970436a6a0bf9"; + name = "socialiteproviders-manager-738276dfbc2b68a9145db7b3df1588d53db528a1"; src = fetchurl { - url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/4e63afbd26dc45ff263591de2a0970436a6a0bf9"; - sha256 = "1056ilack76b0zsqv7i1znidg5nyd9iznvznh5x7vsryspjvx358"; + url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/738276dfbc2b68a9145db7b3df1588d53db528a1"; + sha256 = "0d7ayh72cdxkslmgdgj0d6rkqghyhbdhdhkiz9064virm7fa5ii0"; }; }; }; @@ -725,20 +725,20 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-829d5d1bf60b2efeb0887b7436873becc71a45eb"; + name = "symfony-console-ea59bb0edfaf9f28d18d8791410ee0355f317669"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb"; - sha256 = "1mvlkvs7xq6l1lb6cgwy8j3avfhgx6aiz70ln6i6vaap7yhr3zh5"; + url = "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669"; + sha256 = "1qvr9av4c9kac5q2lpwiwq269rq5pxdvnvb32asysifw30zd5j3d"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-b0a190285cd95cb019237851205b8140ef6e368e"; + name = "symfony-css-selector-c1681789f059ab756001052164726ae88512ae3d"; src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e"; - sha256 = "1wpxfb7xcn7sjpcgz45582wxymq9d089a71mz80kmwrlblcvxq99"; + url = "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d"; + sha256 = "1v1kpfqc4njdpqqa668vkz7mqxsklzbsf62pcgdvkbg724ck4zis"; }; }; }; @@ -755,10 +755,10 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-c116cda1f51c678782768dce89a45f13c949455d"; + name = "symfony-error-handler-539cf1428b8442303c6e876ad7bf5a7babd91091"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d"; - sha256 = "16bvys7dkhja7bjf42k7rxd7d96fbsp1aj3n50a6b6fj3q2jkxwm"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/539cf1428b8442303c6e876ad7bf5a7babd91091"; + sha256 = "0x2r3kpip9cmdn5d47isamyas13sl43y50wfk23zwj5vh70qgh5s"; }; }; }; @@ -785,230 +785,230 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-9b630f3427f3ebe7cd346c277a1408b00249dad9"; + name = "symfony-finder-7872a66f57caffa2916a584db1aa7f12adc76f8c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9"; - sha256 = "0b2rdx4080jav1ixqxrl4mabn91amf81xsj533b067vdfq4rcfv4"; + url = "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c"; + sha256 = "111qy05azqwj14v0k034lwd970slx081x56pnicyxsbg3yc9wmnp"; }; }; }; "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-6b0d0e4aca38d57605dcd11e2416994b38774522"; + name = "symfony-http-foundation-75bd663ff2db90141bfb733682459d5bbe9e29c3"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522"; - sha256 = "0633r4dx8xrbllqxfxl9fhfr32qak5wx8p2zysb3g9yqp0saf4gb"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3"; + sha256 = "195w56aicv57nmcwsai6jklicb9qqak4imk4xwsgc3i98yw3md2w"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-34b121ad3dc761f35fe1346d2f15618f8cbf77f8"; + name = "symfony-http-kernel-fc63c8c3e1036d424820cc993a4ea163778dc5c7"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/34b121ad3dc761f35fe1346d2f15618f8cbf77f8"; - sha256 = "02x5ym8p9mjn7j69a85nkg50685m9kq6xwhnzpydbn28w3rwksdv"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/fc63c8c3e1036d424820cc993a4ea163778dc5c7"; + sha256 = "0z1cg1ac1r00c0i5apvk8rrglwswcy6gx9w9v5kmk7ajijnk583m"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-2b3802a24e48d0cfccf885173d2aac91e73df92e"; + name = "symfony-mime-1c118b253bb3495d81e95a6e3ec6c2766a98a0c4"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e"; - sha256 = "0qsfkx1md5xkvq5cxkj3qggmk5ykcsdm6i9553p9r14iqpxhnkqg"; + url = "https://api.github.com/repos/symfony/mime/zipball/1c118b253bb3495d81e95a6e3ec6c2766a98a0c4"; + sha256 = "1r06lijy4zbqppyfnvnq2arbjn0dwzb1d14lcy5wsbh3k3bgpsvq"; }; }; }; "symfony/polyfill-ctype" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; + name = "symfony-polyfill-ctype-5bbc823adecdae860bb64756d639ecfec17b050a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; - sha256 = "18235xiqpjx9nzx3pzylm5yzqr6n1j8wnnrzgab1hpbvixfrbqba"; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a"; + sha256 = "0vyv70z1yi2is727d1mkb961w5r1pb1v3wy1pvdp30h8ffy15wk6"; }; }; }; "symfony/polyfill-iconv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-iconv-143f1881e655bebca1312722af8068de235ae5dc"; + name = "symfony-polyfill-iconv-927013f3aac555983a5059aada98e1907d842695"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc"; - sha256 = "19v4r40vx62a181l6zfs7n40w9f7npy7jw5x6dssg40hl4a0i3p2"; + url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695"; + sha256 = "1qmnzd3r2l35rx84r8ai0596dywsj7q5y3dngaf1vsz16k5ig409"; }; }; }; "symfony/polyfill-intl-grapheme" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-433d05519ce6990bf3530fba6957499d327395c2"; + name = "symfony-polyfill-intl-grapheme-511a08c03c1960e08a883f4cffcacd219b758354"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2"; - sha256 = "11169jh39mhr591b61iara8hvq4pnfzgkynlqg90iv510c74d1cg"; + url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354"; + sha256 = "0ifsgsyxf0z0nkynqvr5259dm5dsmbgdpvyi5zfvy8935mi0ki0i"; }; }; }; "symfony/polyfill-intl-idn" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; + name = "symfony-polyfill-intl-idn-639084e360537a19f9ee352433b84ce831f3d2da"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; - sha256 = "1bcdl48ji0dmswwvw2b66qxdxxawbx8bgicc02la92gacps08n5v"; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da"; + sha256 = "1i2wcsbfbwdyrx8545yrrvbdaf4l2393pjvg9266q74611j6pzxj"; }; }; }; "symfony/polyfill-intl-normalizer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-219aa369ceff116e673852dce47c3a41794c14bd"; + name = "symfony-polyfill-intl-normalizer-19bd1e4fcd5b91116f14d8533c57831ed00571b6"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd"; - sha256 = "1cwckrazq4p4i9ysjh8wjqw8qfnp0rx48pkwysch6z7vkgcif22w"; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6"; + sha256 = "1d80jph5ykiw6ydv8fwd43s0aglh24qc1yrzds2f3aqanpbk1gr2"; }; }; }; "symfony/polyfill-mbstring" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; + name = "symfony-polyfill-mbstring-8ad114f6b39e2c98a8b0e3bd907732c207c2b534"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; - sha256 = "0y289x91c9lgr8vlixj5blayf9lsgi4nn2gyn3a99brvn2jnh6q8"; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534"; + sha256 = "1ym84qp609i50lv4vkd4yz99y19kaxd5kmpdnh66mxx1a4a104mi"; }; }; }; "symfony/polyfill-php72" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-bf44a9fd41feaac72b074de600314a93e2ae78e2"; + name = "symfony-polyfill-php72-869329b1e9894268a8a61dabb69153029b7a8c97"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2"; - sha256 = "11knb688wcf8yvrprgp4z02z3nb6s5xj3wrv77n2qjkc7nc8q7l7"; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97"; + sha256 = "1h0lbh8d41sa4fymmw03yzws3v3z0lz4lv1kgcld7r53i2m3wfwp"; }; }; }; "symfony/polyfill-php73" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php73-e440d35fa0286f77fb45b79a03fedbeda9307e85"; + name = "symfony-polyfill-php73-9e8ecb5f92152187c4799efd3c96b78ccab18ff9"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85"; - sha256 = "1c7w7j375a1fxq5m4ldy72jg5x4dpijs8q9ryqxvd6gmj1lvncqy"; + url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9"; + sha256 = "1p0jr92x323pl4frjbhmziyk5g1zig1g30i1v1p0wfli2sq8h5mb"; }; }; }; "symfony/polyfill-php80" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-cfa0ae98841b9e461207c13ab093d76b0fa7bace"; + name = "symfony-polyfill-php80-7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace"; - sha256 = "1kbh4j01kxxc39ls9kzkg7dj13cdlzwy599b96harisysn47jw2n"; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"; + sha256 = "16yydk7rsknlasrpn47n4b4js8svvp4rxzw99dkav52wr3cqmcwd"; }; }; }; "symfony/polyfill-php81" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-13f6d1271c663dc5ae9fb843a8f16521db7687a1"; + name = "symfony-polyfill-php81-707403074c8ea6e2edaf8794b0157a0bfa52157a"; src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1"; - sha256 = "01dqzkdppaw7kh1vkckkzn54aql4iw6m9vyg99ahhzmqc2krs91x"; + url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a"; + sha256 = "05qrjfnnnz402l11wm0ydblrip7hjll12yqxmh2wd02b0s8dj29f"; }; }; }; "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"; + name = "symfony-process-6e75fe6874cbc7e4773d049616ab450eff537bf1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"; - sha256 = "1vv2xwk3cvr144yxjj6k4afhkv50v2b957lscncs6m3rvi2zs1nk"; + url = "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1"; + sha256 = "0jzymj7jh9zm376p3ydq6adid9cxd8fmmk2hdnyjk30chsb37yfw"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"; + name = "symfony-routing-5c9b129efe9abce9470e384bf65d8a7e262eee69"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"; - sha256 = "1lk7dbcxvfwmyx65hm0v78ma79f67jnq2xnzg6k0wz52161rk6cl"; + url = "https://api.github.com/repos/symfony/routing/zipball/5c9b129efe9abce9470e384bf65d8a7e262eee69"; + sha256 = "0pa3zqqsa9jf362zdhg8jhppv1z7nnj6hq65dym473p1c3zwyfxb"; }; }; }; "symfony/service-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-service-contracts-24d9dc654b83e91aa59f9d167b131bc3b5bea24c"; + name = "symfony-service-contracts-4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c"; - sha256 = "1flrnq7dw7rg8b901fbi7gv6k25hqbhffpd15w751fmzsrpzaphl"; + url = "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; + sha256 = "0lh0vxy0h4wsjmnlf42s950bicsvkzz6brqikfnfb5kmvi0xhcm6"; }; }; }; "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-985e6a9703ef5ce32ba617c9c7d97873bb7b2a99"; + name = "symfony-string-571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99"; - sha256 = "0hjkz8bb95ibp2am8i84b7ijh48llip613l0cc8i5fg5q12b20sn"; + url = "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"; + sha256 = "1hwji8pwsfb79sdrigbisxs0cjnhs1qbm6rrflhqyhpviwvbhyqx"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-1639abc1177d26bcd4320e535e664cef067ab0ca"; + name = "symfony-translation-f0ed07675863aa6e3939df8b1bc879450b585cab"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca"; - sha256 = "0q7f4hfv8n7px5fhh0f8ii6lbfj9xp7fas5ls7yazm4980c06a1x"; + url = "https://api.github.com/repos/symfony/translation/zipball/f0ed07675863aa6e3939df8b1bc879450b585cab"; + sha256 = "0a6y9glxjaiflprlr3fk8qgjdhqmqzjf912pq1qbn0lmc7f0y8pr"; }; }; }; "symfony/translation-contracts" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-contracts-1211df0afa701e45a04253110e959d4af4ef0f07"; + name = "symfony-translation-contracts-136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07"; - sha256 = "09d057ycwa7l34ph32agkcbam8jwpxh6fr1ay17xf9haczlgs1ad"; + url = "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; + sha256 = "1z1514i3gsxdisyayzh880i8rj954qim7c183cld91kvvqcqi7x0"; }; }; }; "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-af52239a330fafd192c773795520dc2dd62b5657"; + name = "symfony-var-dumper-6894d06145fefebd9a4c7272baa026a1c394a430"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657"; - sha256 = "1dxmwyg3wxq313zfrjwywkfsi38lq6i3prq69f47vbiqajfs55jn"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/6894d06145fefebd9a4c7272baa026a1c394a430"; + sha256 = "055s38szlhpxrhv1kjawsm5rwh6dr7drk9jpyj6a5r0g4jn63m72"; }; }; }; "tijsverkoyen/css-to-inline-styles" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "tijsverkoyen-css-to-inline-styles-da444caae6aca7a19c0c140f68c6182e337d5b1c"; + name = "tijsverkoyen-css-to-inline-styles-4348a3a06651827a27d989ad1d13efec6bb49b19"; src = fetchurl { - url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c"; - sha256 = "13lzhf1kswg626b8zd23z4pa7sg679si368wcg6pklqvijnn0any"; + url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/4348a3a06651827a27d989ad1d13efec6bb49b19"; + sha256 = "0fs2w9hw0drf1hszidrmplrph7ay8m8pv58pqv26v0228m4l6vlm"; }; }; }; "vlucas/phpdotenv" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "vlucas-phpdotenv-264dce589e7ce37a7ba99cb901eed8249fbec92f"; + name = "vlucas-phpdotenv-1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7"; src = fetchurl { - url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f"; - sha256 = "0z2q376k3rww8qb9jdywm3fj386pqmcx7rg6msd3zdrjxfbqcqnl"; + url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7"; + sha256 = "13h4xyxhdjn1n7xcxbcdhj20rv5fsaigbsbz61x2i224hj76620a"; }; }; }; From cddaa5ea0eb1167bb503fa82aed63bbee1dfd5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Fri, 2 Dec 2022 08:29:36 -0300 Subject: [PATCH 182/222] openasar: unstable-2022-10-10 -> unstable-2022-12-01 --- .../networking/instant-messengers/discord/openasar.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 2ba3cf79a618..6ec3f86b7b55 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-10-10"; + version = "unstable-2022-12-01"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "7a04cb57dff43f328de78addc234e9d21ff079a8"; - hash = "sha256-6zYXv+iAfDEFHQ4FwNVEA4+zWiDyeLvkm17f4LuaCJg="; + rev = "f2da613f2b803ad97b43be5a7803f510619e578e"; + hash = "sha256-WQIqbyD7QXa5mfX7X3BQ0Hx2+Ye4k8csx9fhvowvYKw="; }; postPatch = '' From 4acd8f01256f4eca3f81918ec8e07c9c302a76de Mon Sep 17 00:00:00 2001 From: Marcelo Amancio de Lima Santos Date: Fri, 2 Dec 2022 08:32:20 -0300 Subject: [PATCH 183/222] waynergy: 0.0.13 -> 0.0.14 --- pkgs/tools/wayland/waynergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/tools/wayland/waynergy/default.nix index 7208334ea506..36ad2fd19b42 100644 --- a/pkgs/tools/wayland/waynergy/default.nix +++ b/pkgs/tools/wayland/waynergy/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "waynergy"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "r-c-f"; repo = "waynergy"; rev = "v${version}"; - hash = "sha256-eTY7tktUmoTZO3w9uP1P8cIz0mmFiWm5YFGVAS6JwwE="; + hash = "sha256-LtLZDYZGoKNPRZeceMf/ndbO1QfMLkfxHeAo1YNjmm4="; }; depsBuildBuild = [ pkg-config ]; From 9332df94e1378f3ae96c64b4504e2a6c636e4ce2 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Fri, 2 Dec 2022 13:43:36 +0100 Subject: [PATCH 184/222] nvidia-vaapi-driver: 0.0.7 > unstable-2022-12-01 Make the vaapi driver do nothing instead of crash on nvidia 525 drivers --- pkgs/development/libraries/nvidia-vaapi-driver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 3554457d3f27..eb7e1e9acc9b 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.7"; + version = "unstable-2022-12-01"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-c74XJW9e8sgjBuTpZQOgIvgEoP73aQlx6beE6bChYfw="; + rev = "6e8b0d067c52c3a7e0c3de745337e6e733c59207"; + sha256 = "sha256-HL/sjNPsLhzl8NZ/9l8in27vUrMkyUIcNr/+HhiaTT0="; }; nativeBuildInputs = [ From 097149393ff12ebd1d54f954c2a3656e5ed80896 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 2 Dec 2022 05:00:32 -0800 Subject: [PATCH 185/222] python{27,310}Packages.deprecation: remove unittest2, break on Python 2 (#202236) --- .../python-modules/deprecation/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 0e15f2d74c61..e32e8cc5df06 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -1,10 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , fetchpatch , packaging -, python -, pythonAtLeast -, pythonOlder -, unittest2 , unittestCheckHook }: @@ -17,7 +15,7 @@ buildPythonPackage rec { sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj"; }; - patches = lib.optionals (pythonAtLeast "3.10") [ + patches = [ # fixes for python 3.10 test suite (fetchpatch { url = "https://github.com/briancurtin/deprecation/pull/57/commits/e13e23068cb8d653a02a434a159e8b0b7226ffd6.patch"; @@ -28,11 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ]; - # avoiding mass rebuilds for python3.9, but no longer - # needed with patch - checkInputs = [ unittestCheckHook ] ++ lib.optionals (pythonOlder "3.10") [ - unittest2 - ]; + checkInputs = [ unittestCheckHook ]; meta = with lib; { description = "A library to handle automated deprecations"; From e8927c46b8693b1d0b1d6e12cd602c6647217d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 2 Dec 2022 13:39:47 +0100 Subject: [PATCH 186/222] nixos/doc: document `mkOrder` and friends Add a section on ordering option definitions. Also mention `mkDefault` in the section on `mkOverride`. Clarify the code a bit by renaming `defaultPriority` to `defaultOverridePriority` and introducing `defaultOrderPriority`. --- lib/modules.nix | 19 ++++----- .../manual/development/option-def.section.md | 26 ++++++++++-- .../development/option-def.section.xml | 40 ++++++++++++++++--- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 4 files changed, 67 insertions(+), 20 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 204a2cc1ac12..f5e69ad4bcf5 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -833,7 +833,7 @@ rec { filterOverrides' = defs: let - getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPriority; + getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultOverridePriority; highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs; strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def; in { @@ -842,7 +842,7 @@ rec { }; /* Sort a list of properties. The sort priority of a property is - 1000 by default, but can be overridden by wrapping the property + defaultOrderPriority by default, but can be overridden by wrapping the property using mkOrder. */ sortProperties = defs: let @@ -851,7 +851,7 @@ rec { then def // { value = def.value.content; inherit (def.value) priority; } else def; defs' = map strip defs; - compare = a: b: (a.priority or 1000) < (b.priority or 1000); + compare = a: b: (a.priority or defaultOrderPriority) < (b.priority or defaultOrderPriority); in sort compare defs'; # This calls substSubModules, whose entire purpose is only to ensure that @@ -887,10 +887,13 @@ rec { mkOptionDefault = mkOverride 1500; # priority of option defaults mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default + defaultOverridePriority = 100; mkImageMediaOverride = mkOverride 60; # image media profiles can be derived by inclusion into host config, hence needing to override host config, but do allow user to mkForce mkForce = mkOverride 50; mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ + defaultPriority = lib.warnIf (lib.isInOldestRelease 2305) "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead." defaultOverridePriority; + mkFixStrictness = lib.warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id; mkOrder = priority: content: @@ -899,11 +902,9 @@ rec { }; mkBefore = mkOrder 500; + defaultOrderPriority = 1000; mkAfter = mkOrder 1500; - # The default priority for things that don't have a priority specified. - defaultPriority = 100; - # Convenient property used to transfer all definitions and their # properties from one option to another. This property is useful for # renaming options, and also for including properties from another module @@ -930,10 +931,10 @@ rec { # Similar to mkAliasAndWrapDefinitions but copies over the priority from the # option as well. # - # If a priority is not set, it assumes a priority of defaultPriority. + # If a priority is not set, it assumes a priority of defaultOverridePriority. mkAliasAndWrapDefsWithPriority = wrap: option: let - prio = option.highestPrio or defaultPriority; + prio = option.highestPrio or defaultOverridePriority; defsWithPrio = map (mkOverride prio) option.definitions; in mkAliasIfDef option (wrap (mkMerge defsWithPrio)); @@ -1115,7 +1116,7 @@ rec { # to definitions. mkDerivedConfig = opt: f: mkOverride - (opt.highestPrio or defaultPriority) + (opt.highestPrio or defaultOverridePriority) (f opt.value); doRename = { from, to, visible, warn, use, withPriority ? true }: diff --git a/nixos/doc/manual/development/option-def.section.md b/nixos/doc/manual/development/option-def.section.md index 91b24cd4a3a1..22cf38873cf0 100644 --- a/nixos/doc/manual/development/option-def.section.md +++ b/nixos/doc/manual/development/option-def.section.md @@ -59,17 +59,35 @@ config = { ## Setting Priorities {#sec-option-definitions-setting-priorities .unnumbered} A module can override the definitions of an option in other modules by -setting a *priority*. All option definitions that do not have the lowest +setting an *override priority*. All option definitions that do not have the lowest priority value are discarded. By default, option definitions have -priority 1000. You can specify an explicit priority by using -`mkOverride`, e.g. +priority 100 and option defaults have priority 1500. +You can specify an explicit priority by using `mkOverride`, e.g. ```nix services.openssh.enable = mkOverride 10 false; ``` This definition causes all other definitions with priorities above 10 to -be discarded. The function `mkForce` is equal to `mkOverride 50`. +be discarded. The function `mkForce` is equal to `mkOverride 50`, and +`mkDefault` is equal to `mkOverride 1000`. + +## Ordering Definitions {#sec-option-definitions-ordering .unnumbered} + +It is also possible to influence the order in which the definitions for an option are +merged by setting an *order priority* with `mkOrder`. The default order priority is 1000. +The functions `mkBefore` and `mkAfter` are equal to `mkOrder 500` and `mkOrder 1500`, respectively. +As an example, + +```nix +hardware.firmware = mkBefore [ myFirmware ]; +``` + +This definition ensures that `myFirmware` comes before other unordered +definitions in the final list value of `hardware.firmware`. + +Note that this is different from [override priorities](#sec-option-definitions-setting-priorities): +setting an order does not affect whether the definition is included or not. ## Merging Configurations {#sec-option-definitions-merging .unnumbered} diff --git a/nixos/doc/manual/from_md/development/option-def.section.xml b/nixos/doc/manual/from_md/development/option-def.section.xml index 8c9ef181affd..3c1a979e70f3 100644 --- a/nixos/doc/manual/from_md/development/option-def.section.xml +++ b/nixos/doc/manual/from_md/development/option-def.section.xml @@ -66,11 +66,11 @@ config = { Setting Priorities A module can override the definitions of an option in other - modules by setting a priority. All option - definitions that do not have the lowest priority value are - discarded. By default, option definitions have priority 1000. You - can specify an explicit priority by using - mkOverride, e.g. + modules by setting an override priority. All + option definitions that do not have the lowest priority value are + discarded. By default, option definitions have priority 100 and + option defaults have priority 1500. You can specify an explicit + priority by using mkOverride, e.g. services.openssh.enable = mkOverride 10 false; @@ -78,7 +78,35 @@ services.openssh.enable = mkOverride 10 false; This definition causes all other definitions with priorities above 10 to be discarded. The function mkForce is - equal to mkOverride 50. + equal to mkOverride 50, and + mkDefault is equal to + mkOverride 1000. + + +
+ Ordering Definitions + + It is also possible to influence the order in which the + definitions for an option are merged by setting an order + priority with mkOrder. The default + order priority is 1000. The functions mkBefore + and mkAfter are equal to + mkOrder 500 and + mkOrder 1500, respectively. As an example, + + +hardware.firmware = mkBefore [ myFirmware ]; + + + This definition ensures that myFirmware comes + before other unordered definitions in the final list value of + hardware.firmware. + + + Note that this is different from + override + priorities: setting an order does not affect whether the + definition is included or not.
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 9af7e07ccfba..eae898a08a69 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -806,7 +806,7 @@ in optional ( cfg.writableStore && cfg.useNixStoreImage && - opt.writableStore.highestPrio > lib.modules.defaultPriority) + opt.writableStore.highestPrio > lib.modules.defaultOverridePriority) '' You have enabled ${opt.useNixStoreImage} = true, without setting ${opt.writableStore} = false. From 600e933e3d9a89266ace4cdc92dbc464ee428db8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 14:10:37 +0000 Subject: [PATCH 187/222] aocd: 1.2.1 -> 1.2.3 --- pkgs/development/python-modules/aocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index 3202ac66f862..303a57da19da 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "aocd"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "wimglenn"; repo = "advent-of-code-data"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Oz1sy+BHekI0ApDKn7hNMDvQrog6EB0JPry7SV5fxig="; + sha256 = "sha256-//f/VWrTKukpNea8xprGQ7jobw10g5MQnnuM6/bAcGw="; }; propagatedBuildInputs = [ From e22898f9a536e37ad4978680d2a9c37fdedf5668 Mon Sep 17 00:00:00 2001 From: Thomas BESSOU Date: Fri, 2 Dec 2022 14:28:18 +0100 Subject: [PATCH 188/222] smartgithg: 22.1.0 -> 22.1.1 --- .../applications/version-management/smartgithg/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 885ee4a6ef93..15d26406bb8d 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , makeDesktopItem , jre @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.0"; + version = "22.1.1"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-CcujqgvNvHK4Si1KJq3vRER3SID2XKPbOXL0zd+ezpU="; + sha256 = "sha256-twN1Clnj17A2IUOOhvs8hs6PuvC81j9GqF0yKIk3IkQ="; }; nativeBuildInputs = [ wrapGAppsHook ]; From cba2dbc72ff7bc3b4ede74f8b26edb17110c1141 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 23 Oct 2022 01:02:33 +0000 Subject: [PATCH 189/222] vsce: init at 2.15.0 --- pkgs/development/tools/vsce/default.nix | 47 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/tools/vsce/default.nix diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix new file mode 100644 index 000000000000..89959b544ed8 --- /dev/null +++ b/pkgs/development/tools/vsce/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +, pkg-config +, libsecret +, python3 +, testers +, vsce +}: + +buildNpmPackage rec { + pname = "vsce"; + version = "2.15.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "vscode-vsce"; + rev = "v${version}"; + hash = "sha256-WDKOHQV6J22l0ELmXwl5BC5x7MsI6TAMeU3oBFpwqx4="; + }; + + npmDepsHash = "sha256-i2LpQ/4MwkUGTUhih0ybLv5np45j7m4kCx9IOBIgtXo="; + + postPatch = '' + substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' + ''; + + nativeBuildInputs = [ pkg-config python3 ]; + + buildInputs = [ libsecret ]; + + makeCacheWritable = true; + npmFlags = [ "--legacy-peer-deps" ]; + + passthru.tests.version = testers.testVersion { + package = vsce; + }; + + meta = with lib; { + homepage = "https://github.com/microsoft/vscode-vsce"; + description = "Visual Studio Code Extension Manager"; + maintainers = with maintainers; [ aaronjheng ]; + license = licenses.mit; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b93e6734821..45833aa87f48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32936,6 +32936,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + vsce = callPackage ../development/tools/vsce { }; + vscode = callPackage ../applications/editors/vscode/vscode.nix { }; vscode-fhs = vscode.fhs; vscode-fhsWithPackages = vscode.fhsWithPackages; From 74949d9c4054947db0ecb667914a24dd694767e4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 2 Dec 2022 15:42:27 +0100 Subject: [PATCH 190/222] ungoogled-chromium: 107.0.5304.122 -> 108.0.5359.72 --- .../networking/browsers/chromium/common.nix | 6 +----- .../browsers/chromium/upstream-info.json | 14 +++++++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b67c3dba906c..50cbc80e0c7e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -261,7 +261,7 @@ let # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; # The default value is hardcoded instead of using pkg-config: - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; # Because we use a different toolchain / compiler version: treat_warnings_as_errors = false; # We aren't compiling with Chrome's Clang (would enable Chrome-specific @@ -295,15 +295,11 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; - } // optionalAttrs (!chromiumVersionAtLeast "108") { - use_system_libwayland_server = true; - } // optionalAttrs (chromiumVersionAtLeast "108") { # The default has changed to false. We'll build with libwayland from # Nixpkgs for now but might want to eventually use the bundled libwayland # as well to avoid incompatibilities (if this continues to be a problem # from time to time): use_system_libwayland = true; - system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index def30a61f656..538b3cf099a9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "107.0.5304.122", - "sha256": "0f2jdvlnp1s5ia01lnqk0ykqji2x4ab9g4kxk637n4csf0i1gj85", + "version": "108.0.5359.72", + "sha256": "1ijvphbmkzha8nbvz17dwypwj1lz7hzr7q9fvk6gma27b1m1d57m", "sha256bin64": null, "deps": { "gn": { - "version": "2022-09-14", + "version": "2022-10-05", "url": "https://gn.googlesource.com/gn", - "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5", - "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp" + "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6", + "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x" }, "ungoogled-patches": { - "rev": "107.0.5304.122-1", - "sha256": "109j5jvsbj9dylj8prz7bkzc8czjv2c8bm0albwnkyxymcpd3w6p" + "rev": "108.0.5359.72-1", + "sha256": "0gv9566w1q0abam7ngjb0qw7kg2dp43lixm51m9avsvvb6a4wyzz" } } } From 827c5e45f8cd294f00f022cf38896a7168046b93 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 2 Dec 2022 15:51:21 +0100 Subject: [PATCH 191/222] lemon-graph: unbreak on all platforms --- pkgs/development/libraries/lemon-graph/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix index 04f0514781bf..81c21bb68d69 100644 --- a/pkgs/development/libraries/lemon-graph/default.nix +++ b/pkgs/development/libraries/lemon-graph/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - doCheck = true; + # error: no viable conversion from ... + doCheck = !stdenv.isDarwin; meta = with lib; { homepage = "https://lemon.cs.elte.hu/trac/lemon"; @@ -23,6 +24,5 @@ stdenv.mkDerivation rec { license = licenses.boost; maintainers = with maintainers; [ trepetti ]; platforms = platforms.all; - broken = stdenv.isAarch64 || stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612613a9e0b3..a9aa16af4fb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19991,7 +19991,9 @@ with pkgs; lmdbxx = callPackage ../development/libraries/lmdbxx { }; - lemon-graph = callPackage ../development/libraries/lemon-graph { }; + lemon-graph = callPackage ../development/libraries/lemon-graph { + stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; + }; levmar = callPackage ../development/libraries/levmar { }; From 5969123b9f3449228c812b6fa0eb6c34a25b084c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 14:54:26 +0000 Subject: [PATCH 192/222] cmst: 2022.05.01 -> 2022.11.30 --- pkgs/tools/networking/cmst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index ce066ed7c07a..9539e7293fae 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cmst"; - version = "2022.05.01"; + version = "2022.11.30"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = "${pname}-${version}"; - sha256 = "sha256-d3uvJf1tI9vXyq1eIbHkKrinBuPkYoBUcusHsJmSqMA="; + sha256 = "sha256-4zrV+VPtzMVaNjY/t1Fix0bODRMgtC3t+kFM1meNzlA="; }; nativeBuildInputs = [ qmake qttools ]; From ec14e0fbefde6e6db1b01930df020a42bea94bdc Mon Sep 17 00:00:00 2001 From: misuzu Date: Fri, 2 Dec 2022 16:59:41 +0200 Subject: [PATCH 193/222] snac2: init at 2.12 --- pkgs/servers/snac2/default.nix | 33 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/snac2/default.nix diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix new file mode 100644 index 000000000000..2e4a54ff481e --- /dev/null +++ b/pkgs/servers/snac2/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, fetchFromGitea +, curl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "snac2"; + version = "2.12"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "grunfink"; + repo = pname; + rev = version; + hash = "sha256-mSk4qWte3Lksb0fxUfVZGT34eWsS4VfUlGN5yt4/pgs="; + }; + + buildInputs = [ curl openssl ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = "mkdir -p $out/bin"; + + meta = with lib; { + homepage = "https://codeberg.org/grunfink/snac2"; + description = "A simple, minimalistic ActivityPub instance (2.x, C)"; + license = licenses.mit; + maintainers = with maintainers; [ misuzu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bae0a7823cb..1e79b297364a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22489,6 +22489,8 @@ with pkgs; snappy = callPackage ../development/libraries/snappy { }; + snac2 = callPackage ../servers/snac2 { }; + snappymail = callPackage ../servers/snappymail { }; snow = callPackage ../tools/security/snow { }; From 4ac78ea992241a6a2f4462285807161f22d7779b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 22:02:34 +0000 Subject: [PATCH 194/222] fastly: 4.3.0 -> 4.4.0 --- pkgs/misc/fastly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 1c653327e717..3fe7295738f3 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fastly"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-TxN0DQ4OKfHn+u4ixpCgcyRRTs52IZRjgcbJuqajeVo="; + sha256 = "sha256-i3X4VetosUD60QCztJFFRWwHb4kCIaB8MjrT8gA4dYw="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -23,7 +23,7 @@ buildGoModule rec { subPackages = [ "cmd/fastly" ]; - vendorSha256 = "sha256-7EtyQYPe+oJmQ7uECbjkBjLnM9T03g6gFwUwebKuccc="; + vendorSha256 = "sha256-zilgzfPD7HmHt0/u94JLaY6NPvn1JjXFu1K2YO0tF9M="; nativeBuildInputs = [ installShellFiles ]; From ac8be8eadbb429f2e43dc7a2ee983ab2df7f3386 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Dec 2022 00:43:57 +0000 Subject: [PATCH 195/222] copilot-cli: 1.23.0 -> 1.24.0 --- pkgs/tools/admin/copilot-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index a1c9117ae512..96afae58b173 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K+OWAZudk/xxKZw0zdsJfMj1jRhzOamBI7wd5ttmaiY="; + sha256 = "sha256-OTt9sJuLv+fY2OTK4FGl15/YmxnPRqGXNnKYl9TtHxE="; }; - vendorSha256 = "sha256-DCjJJZKVDFyZXItWRzBsxb8xLZNDLWI2kAp4KKKn9yA="; + vendorSha256 = "sha256-dH39ZpATq5Oafr7Guc+zYUhjlAgiwpc5HKHWlMm4buU="; nativeBuildInputs = [ installShellFiles ]; From f83b30ae39d7285296963dbf305e4c57003b6193 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Nov 2022 05:37:30 +0000 Subject: [PATCH 196/222] awscli2: 2.9.0 -> 2.9.1 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 463063e6a664..67c366823d24 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -34,14 +34,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.0"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.1"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-kPMoGOn6ws4DjA9fR9gci7vHPIqOSsgMXa1wCiwN8yU="; + sha256 = "sha256-VK/82U+yb1KuIaAm9XuSZF55zIxvsYcIfNqVrzC6FOs="; }; nativeBuildInputs = [ From 1b31a927e0c0fe8e59355b05e21a455a3b3fd96a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 15:25:16 +0000 Subject: [PATCH 197/222] nomad-driver-podman: 0.4.0 -> 0.4.1 --- .../networking/cluster/nomad-driver-podman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix index 7e08eee1f390..eba9a8375dcc 100644 --- a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix +++ b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nomad-driver-podman"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-33hyMKwU04ywXKv4JEhRvEbe2DWQEAQ0moy6zypXdpU="; + sha256 = "sha256-miarvcV+b/6kbjHru7MpBIBU/v9ldHJGeXh2ATQ3BQ0="; }; - vendorSha256 = "sha256-5PQIWSGSR5vizWEsResBLd//yWs99o/bj5DVpRMBwhA="; + vendorSha256 = "sha256-AtgxHAkNzzjMQoSqROpuNoSDum/6JR+mLpcHLFL9EIY="; subPackages = [ "." ]; From 11c32f4a71fbed97ba0d55e851425d462dff96f2 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Fri, 2 Dec 2022 09:44:18 +0100 Subject: [PATCH 198/222] nixos/rl-2211: make it clear NixOS isn't a set of packages Co-authored-by: Valentin Gagarin Co-authored-by: Martin Weinelt --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 4 ++-- nixos/doc/manual/release-notes/rl-2211.section.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 6a4573f6711f..32db72f3b13e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -2,8 +2,8 @@ Release 22.11 (“Raccoon”, 2022.11/30) The NixOS release team is happy to announce a new version of NixOS - 22.11. NixOS is both a Linux distribution, and a set of packages - usable on other Linux systems and macOS. + 22.11. NixOS is a Linux distribution, whose set of packages can also + be used on other Linux systems and macOS. This release is supported until the end of June 2023, handing over diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index aedc3c7831c1..5ab7038cae3a 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -1,6 +1,6 @@ # Release 22.11 (“Raccoon”, 2022.11/30) {#sec-release-22.11} -The NixOS release team is happy to announce a new version of NixOS 22.11. NixOS is both a Linux distribution, and a set of packages usable on other Linux systems and macOS. +The NixOS release team is happy to announce a new version of NixOS 22.11. NixOS is a Linux distribution, whose set of packages can also be used on other Linux systems and macOS. This release is supported until the end of June 2023, handing over to NixOS 23.05. From ffbb0204d81952b4e764be84200404d643c62501 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 01:17:10 +0000 Subject: [PATCH 199/222] richgo: 0.3.10 -> 0.3.11 --- pkgs/development/tools/richgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 26393000cdd5..f8468d1f175b 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "richgo"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "kyoh86"; repo = "richgo"; rev = "v${version}"; - sha256 = "sha256-USHg1KXl0MOWifiVu+KdjvrbDlAh6T/ReKFKeIpVK0A="; + sha256 = "sha256-a8CxJKk9fKGYTDtY/mU/3gcdIeejg20sL8Tm4ozgDl4="; }; - vendorSha256 = "sha256-O63QEo0/+m9cYktMg4+RloLuUfAlCG0eGkxpHPFg/Cw="; + vendorSha256 = "sha256-j2RZOt5IRb2oEQ6sFu+nXpVkDsnppA6h9YT4F7AiCoY="; meta = with lib; { description = "Enrich `go test` outputs with text decorations"; From 31aa7cb06150618479ebf51e449c8ddce0dcd80f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Dec 2022 16:51:48 +0100 Subject: [PATCH 200/222] python310Packages.bleak-retry-connector: 2.8.5 -> 2.8.7 --- .../python-modules/bleak-retry-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index ce23142f8928..af101a7a07ef 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.8.5"; + version = "2.8.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Uct040yI4tJkdQNBAJhr/aOjMRcGkTOAnm4pzmeHNZM="; + hash = "sha256-V/MXy2Q8iUFmEqnUygIoPisq0ZY9gO31QEXLajYtDUo="; }; postPatch = '' From 5b2fa95c0b0f55e7d7ab47822e88eed55dd1f62e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 05:48:13 +0000 Subject: [PATCH 201/222] carapace: 0.18.0 -> 0.18.1 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 896e78f20961..161fd08fb46c 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "sha256-dZ1TeBIP8560VHdDBR6JRbJaZmpvmKKUqzZ7ZYGsEXk="; + sha256 = "sha256-w0olExMi8Qlk06r0SRYoeZjbTh79/ggH/JwfVFgE31Y="; }; - vendorSha256 = "sha256-6+hooVadDN/unf5oMyVzC3pjXwVLzsYBt7vzKuYUgXU="; + vendorSha256 = "sha256-huHbAS0sh/wqEMabnUNsdNMo4M3EXa/PNEA8QgMRAC4="; subPackages = [ "./cmd/carapace" ]; From 3b93e042b6a5519812b813dc4cf02bd1c4783465 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Dec 2022 17:05:22 +0100 Subject: [PATCH 202/222] python310Packages.adafruit-platformdetect: 3.36.0 -> 3.37.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 64aca1ab3eed..edbb16b0063c 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.36.0"; + version = "3.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-c5AJsTR6qfBtxlTkjRpVoxDGO6TxJ6BvD9HX+Icf1ig="; + hash = "sha256-vhBx/NABOD2patBzI15XZqbTTtbf3rTUIDx1sYg+yYg="; }; nativeBuildInputs = [ From dbdd8fad26f4111a3bc6bbc2f7d32f43cb77ae57 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 2 Dec 2022 16:11:59 +0000 Subject: [PATCH 203/222] testers.testBuildFailure: Read last log line without final newline --- pkgs/build-support/testers/expect-failure.sh | 2 +- pkgs/build-support/testers/test/default.nix | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh index 23e8698cf479..0e1bbe9a678c 100644 --- a/pkgs/build-support/testers/expect-failure.sh +++ b/pkgs/build-support/testers/expect-failure.sh @@ -21,7 +21,7 @@ set -eu echo "testBuildFailure: Expecting non-zero exit from builder and args: ${*@Q}" ("$@" 2>&1) | @coreutils@/bin/tee $TMPDIR/testBuildFailure.log \ - | while read ln; do + | while IFS= read -r ln; do echo "original builder: $ln" done diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index d6dfbe34fd21..26e622c8763f 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -29,15 +29,24 @@ lib.recurseIntoAttrs { happy = runCommand "testBuildFailure-happy" { failed = testers.testBuildFailure (runCommand "fail" {} '' echo ok-ish >$out + echo failing though echo also stderr 1>&2 + echo 'line\nwith-\bbackslashes' + printf "incomplete line - no newline" + exit 3 ''); } '' + grep -F 'ok-ish' $failed/result + grep -F 'failing though' $failed/testBuildFailure.log grep -F 'also stderr' $failed/testBuildFailure.log - grep -F 'ok-ish' $failed/result + grep -F 'line\nwith-\bbackslashes' $failed/testBuildFailure.log + grep -F 'incomplete line - no newline' $failed/testBuildFailure.log + [[ 3 = $(cat $failed/testBuildFailure.exit) ]] + touch $out ''; From 660bebff99e9d2b0df21c27dd3285de89f5aac01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Dec 2022 17:13:58 +0100 Subject: [PATCH 204/222] gitleaks: add changelog to meta --- pkgs/tools/security/gitleaks/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 5d7465f728a8..e0b54248d9aa 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -14,10 +14,10 @@ buildGoModule rec { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iIjQytsZDz9H5wT44jBBZCx8NvfAhNBl7pTv3mCkeMY="; + hash = "sha256-iIjQytsZDz9H5wT44jBBZCx8NvfAhNBl7pTv3mCkeMY="; }; - vendorSha256 = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; + vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; ldflags = [ "-s" @@ -25,7 +25,9 @@ buildGoModule rec { "-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/cmd.Version=${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; # With v8 the config tests are are blocking doCheck = false; @@ -49,6 +51,7 @@ buildGoModule rec { API keys and tokens in git repos. ''; homepage = "https://github.com/zricethezav/gitleaks"; + changelog = "https://github.com/zricethezav/gitleaks/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 518f576b9acfdf82a24937e009edab2920466dfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Dec 2022 17:15:00 +0100 Subject: [PATCH 205/222] gitleaks: 8.15.1 -> 8.15.2 Diff: https://github.com/zricethezav/gitleaks/compare/v8.15.1...v8.15.2 Changelog: https://github.com/zricethezav/gitleaks/releases/tag/v8.15.2 --- pkgs/tools/security/gitleaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index e0b54248d9aa..607920e03082 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.15.1"; + version = "8.15.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - hash = "sha256-iIjQytsZDz9H5wT44jBBZCx8NvfAhNBl7pTv3mCkeMY="; + hash = "sha256-3hDAkKuKBp3Q61rDWXy4NWgOteSQAjcdom0GzM35hlc="; }; vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; From 7c01788915c61b7d82b1816733bab736a135c30f Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 2 Dec 2022 11:41:17 -0500 Subject: [PATCH 206/222] topiary: init at unstable-2022-12-02 --- .../tools/misc/topiary/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/misc/topiary/default.nix diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix new file mode 100644 index 000000000000..9a9529bfb5b4 --- /dev/null +++ b/pkgs/development/tools/misc/topiary/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "topiary"; + version = "unstable-2022-12-02"; + + src = fetchFromGitHub { + owner = "tweag"; + repo = pname; + rev = "ae861a30097bd6297f553eb0ea2597f86f16d156"; + sha256 = "sha256-WVrl+LxWSbHkbFGbkUhmw4Klwg6CzfnLAz8F0mF0kb8="; + }; + + cargoSha256 = "sha256-qoCOcYp1NYz/YhIBP6AkCCudVLpqhztRehc2xZoYp9A="; + + postInstall = '' + install -Dm444 languages/* -t $out/share/languages + ''; + + TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages"; + + meta = with lib; { + description = "A uniform formatter for simple languages, as part of the Tree-sitter ecosystem"; + homepage = "https://github.com/tweag/topiary"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86067e061c06..a7f52b806c80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12246,6 +12246,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; + topiary = callPackage ../development/tools/misc/topiary { }; + todo = callPackage ../tools/misc/todo { }; tor = callPackage ../tools/security/tor { }; From 4fbfcfba88b688c2bc1cdfce3544cd3a2d56cde2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Dec 2022 17:45:46 +0100 Subject: [PATCH 207/222] dnscontrol: 3.22.1 -> 3.23.0 Diff: https://github.com/StackExchange/dnscontrol/compare/v3.22.1...v3.23.0 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index d4f567022c2d..6012ed489ba7 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.22.1"; + version = "3.23.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lv4ZX8QXRkicPH69kvUAPcgesGvhQkNiwZiNcFbReSU="; + sha256 = "sha256-eIFrVeaNJcYSzMHo5I2g0isdkz/VZmw5mPTSBtdUgzM="; }; - vendorSha256 = "sha256-gKsYy3izx8i7nOazBF4w1SPUJT9D2hbjOr6LqonVqno="; + vendorSha256 = "sha256-fVxzPYyMihxcwWEey5b5mhiRkoSPK4ZOqzYg7zSj0zM="; ldflags = [ "-s" "-w" ]; From c9ee337525b2a0ef3900d041f72927f5e8ed468e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 2 Dec 2022 17:49:39 +0100 Subject: [PATCH 208/222] gitsign: 0.3.2 -> 0.4.1 https://github.com/sigstore/gitsign/releases/tag/v0.4.0 https://github.com/sigstore/gitsign/releases/tag/v0.4.1 --- pkgs/tools/security/gitsign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitsign/default.nix b/pkgs/tools/security/gitsign/default.nix index f6d61ce25e09..11a8394a63c4 100644 --- a/pkgs/tools/security/gitsign/default.nix +++ b/pkgs/tools/security/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.3.2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hDVn7ZiZoY0FSgIsApZliMIq1xjuNdg+DMvKzP5kET0="; + sha256 = "sha256-lSE4BLwtxicngvnDCcMa6F6c3+Okn9NKAOnT2FGi7kU="; }; - vendorSha256 = "sha256-5hVcul5DlHZ0Gtw1LdBmxGpsmuD2bTtwPGysOUwe2k0="; + vendorSha256 = "sha256-WrVunAxOXXGSbs9OyKydeg4N/s871mt2O3t2e5DxXQo="; nativeBuildInputs = [ makeWrapper ]; From df1810c6e8794384edaf8a2a9ecb44faaff0d5fa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 2 Dec 2022 18:20:04 +0100 Subject: [PATCH 209/222] ViennaRNA: 2.4.18 -> 2.5.1 --- .../science/molecular-dynamics/viennarna/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix index 1629a6bba268..3d20eeabe268 100644 --- a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix +++ b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "ViennaRNA"; - version = "2.4.18"; + version = "2.5.1"; src = fetchurl { - url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/${pname}-${version}.tar.gz"; - sha256 = "17b0mcfkms0gn1a3faa4cakig65k9nk282x6mdh1mmjwbqzp5akw"; + url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_5_x/${pname}-${version}.tar.gz"; + sha256 = "sha256-BUAEN88VWV4QsaJd9snEiFbzVhMPnR44D6iGa20n9Fc="; }; buildInputs = [ @@ -34,7 +34,5 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = platforms.unix; - # Perl bindings fail on aarch64-darwin with "Undefined symbols for architecture arm64" - broken = stdenv.isDarwin && stdenv.isAarch64; }; } From c8f9d170d460fbbc971b8885a0ada3d3d61739b3 Mon Sep 17 00:00:00 2001 From: Jasper Woudenberg Date: Sat, 5 Jun 2021 16:14:01 +0200 Subject: [PATCH 210/222] nixos/resilio: support secret files When using the declarative shared folder configuration for resilio sync it is now possible to pass a path from which to read the secret should be read at runtime. The path will not be added to the nix store. The 'secret' parameter to specify the secret directly is still supported. This option will still store the secret in the nix store. This commit follows the pattern described in this issue, for upstream programs that do not provide support for setting a password using a file: https://github.com/NixOS/nixpkgs/issues/24288 --- .../from_md/release-notes/rl-2305.section.xml | 7 ++++ .../manual/release-notes/rl-2305.section.md | 2 ++ nixos/modules/services/networking/resilio.nix | 35 +++++++++++++++---- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 736d954d2b88..b730d591868f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -121,6 +121,13 @@ package. + + + Resilio sync secret keys can now be provided using a secrets + file at runtime, preventing these secrets from ending up in + the Nix store. + +
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 87caecdae034..d630b993c0f4 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -40,3 +40,5 @@ In addition to numerous new and upgraded packages, this release has the followin - The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules) - A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm). + +- Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store. diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index d21f108024e5..5a861dd874cb 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -8,7 +8,6 @@ let resilioSync = pkgs.resilio-sync; sharedFoldersRecord = map (entry: { - secret = entry.secret; dir = entry.directory; use_relay_server = entry.useRelayServer; @@ -40,6 +39,31 @@ let shared_folders = sharedFoldersRecord; })); + sharedFoldersSecretFiles = map (entry: { + dir = entry.directory; + secretFile = if builtins.hasAttr "secret" entry then + toString (pkgs.writeTextFile { + name = "secret-file"; + text = entry.secret; + }) + else + entry.secretFile; + }) cfg.sharedFolders; + + runConfigPath = "/run/rslsync/config.json"; + + createConfig = pkgs.writeShellScriptBin "create-resilio-config" '' + ${pkgs.jq}/bin/jq \ + '.shared_folders |= map(.secret = $ARGS.named[.dir])' \ + ${ + lib.concatMapStringsSep " \\\n " + (entry: ''--arg '${entry.dir}' "$(cat '${entry.secretFile}')"'') + sharedFoldersSecretFiles + } \ + <${configFile} \ + >${runConfigPath} + ''; + in { options = { @@ -186,7 +210,7 @@ in default = []; type = types.listOf (types.attrsOf types.anything); example = - [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y"; + [ { secretFile = "/run/resilio-secret"; directory = "/home/user/sync_test"; useRelayServer = true; useTracker = true; @@ -202,9 +226,6 @@ in description = lib.mdDoc '' Shared folder list. If enabled, web UI must be disabled. Secrets can be generated using `rslsync --generate-secret`. - Note that this secret will be - put inside the Nix store, so it is realistically not very - secret. If you would like to be able to modify the contents of this directories, it is recommended that you make your user a @@ -256,8 +277,10 @@ in Restart = "on-abort"; UMask = "0002"; User = "rslsync"; + RuntimeDirectory = "rslsync"; + ExecStartPre = "${createConfig}/bin/create-resilio-config"; ExecStart = '' - ${resilioSync}/bin/rslsync --nodaemon --config ${configFile} + ${resilioSync}/bin/rslsync --nodaemon --config ${runConfigPath} ''; }; }; From bc3b07cb93e042901f138ebef7433c44f468e92d Mon Sep 17 00:00:00 2001 From: Jasper Woudenberg Date: Tue, 8 Jun 2021 08:56:38 +0200 Subject: [PATCH 211/222] resilio: Add jwoudenberg as extra maintainer --- nixos/modules/services/networking/resilio.nix | 2 ++ pkgs/applications/networking/resilio-sync/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index 5a861dd874cb..cc9495bf2383 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -285,4 +285,6 @@ in }; }; }; + + meta.maintainers = with maintainers; [ jwoudenberg ]; } diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 3d12b11b5141..c52e96066f8c 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; + maintainers = with maintainers; [ domenkozar thoughtpolice cwoac jwoudenberg ]; }; } From d968c6eded3efd1d5a64cad9357f92c5cbbf149b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 2 Dec 2022 12:51:37 +0000 Subject: [PATCH 212/222] pypy2, pypy3: drop unused xlibsWrapper --- pkgs/development/interpreters/python/pypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index c0c11b121af7..0c3b73e9fd5b 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, substituteAll, fetchurl , zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security -, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 +, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, libX11 , self, gdbm, db, xz , python-setup-hook # For the Python package set @@ -53,7 +53,7 @@ in with passthru; stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db + bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl libX11 gdbm db ] ++ optionals isPy3k [ xz ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ From 0114278a9a3a3bb1b026c4edbe503034d7375e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 21 Nov 2022 11:01:13 +0100 Subject: [PATCH 213/222] zsh: fix modules when cross-compiling --- pkgs/shells/zsh/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 7e177a1744cd..782c2fb2bea3 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -44,6 +44,16 @@ stdenv.mkDerivation { "--enable-pcre" "--enable-zprofile=${placeholder "out"}/etc/zprofile" "--disable-site-fndir" + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ + # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba + "zsh_cv_shared_environ=yes" + "zsh_cv_shared_tgetent=yes" + "zsh_cv_shared_tigetstr=yes" + "zsh_cv_sys_dynamic_clash_ok=yes" + "zsh_cv_sys_dynamic_rtld_global=yes" + "zsh_cv_sys_dynamic_execsyms=yes" + "zsh_cv_sys_dynamic_strip_exe=yes" + "zsh_cv_sys_dynamic_strip_lib=yes" ]; # the zsh/zpty module is not available on hydra From 466fbe73e3c49953aeb173dff50673a12ac26fef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 18:56:43 +0000 Subject: [PATCH 214/222] libsForQt5.qtstyleplugin-kvantum: 1.0.6 -> 1.0.7 --- pkgs/development/libraries/qtstyleplugin-kvantum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 322ca7266747..f50f47413b4a 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "35PrC4UZJJJgDUMv/xoz4R9HA9hidZ9HmXSgte6B+a8="; + sha256 = "Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; }; nativeBuildInputs = [ From eb10cd096365571b145df446dfd9eae0e581942e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 19:23:10 +0000 Subject: [PATCH 215/222] logseq: 0.8.11 -> 0.8.12 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index bb879bce1572..54e3e98d48b8 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.11"; + version = "0.8.12"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-c8gP7OJwnCEXnT2FQH1ttYRzZfbcJL86FX2JQezJI+s="; + sha256 = "sha256-I1jGPNGlZ53N3ZlN9nN/GSgQIfdoUeclyuMl+PpNVY4="; name = "${pname}-${version}.AppImage"; }; From 31759fd27f67f2ef3823e2e112b2bb0f3d5d0852 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 11:40:21 +0000 Subject: [PATCH 216/222] flannel: 0.20.1 -> 0.20.2 --- pkgs/tools/networking/flannel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 3660b8610af6..57e75462e3a6 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.20.1"; + version = "0.20.2"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-0DRHUT2kXHQMnIEGHwzF70Gr3eP+Zg3rvAGtYyqtzLo="; + sha256 = "sha256-kuYW73orgtJsz+PC9Cr7XAtfFxiUSi42Sn6iMbwX0HA="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; From 735f24b77518b30923f3f8bf27cdf89dd408050b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 20:43:27 +0000 Subject: [PATCH 217/222] marwaita: 16.0 -> 16.1 --- pkgs/data/themes/marwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 3aa93d2a1164..70d519e73161 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "16.0"; + version = "16.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-kBXGYXOrza4tb5J9hmheDhZcwEd1xT6wLUc9cBGJ/AY="; + sha256 = "sha256-NYJ3cVxWd3vVkjr+Ni4kmhQzL9E+paexejrNA8pRfPE="; }; buildInputs = [ From bd2f039f4559e434dee1e55b638234fe99e79e6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Dec 2022 20:56:41 +0000 Subject: [PATCH 218/222] mame: 0.249 -> 0.250 --- pkgs/applications/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 48d77ce5e6fe..a5b104d31abe 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.249"; + version = "0.250"; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "sha256-im6y/E0pQxruX2kNXZLE3fHq+zXfsstnOoC1QvH4fd4="; + sha256 = "sha256-jexs/1ovRk9Is5orD7hT9fN+dYm+WA+57aZ6JH7zjL4="; }; outputs = [ "out" "tools" ]; From d4a769b6dcb29854ab80329c64300cc7cef53c2a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 2 Dec 2022 21:03:42 +0000 Subject: [PATCH 219/222] zsh-git-prompt: python2 -> python3 --- pkgs/shells/zsh/zsh-git-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 6af5fe7cc66c..f9e5633476ab 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -25,7 +25,7 @@ # installed. # { fetchFromGitHub -, python2 +, python3 , git , lib , haskellPackages @@ -45,7 +45,7 @@ haskellPackages.callPackage prePatch = '' substituteInPlace zshrc.sh \ --replace ':-"python"' ':-"haskell"' \ - --replace 'python ' '${python2.interpreter} ' \ + --replace 'python ' '${python3.interpreter} ' \ --replace 'git ' '${git}/bin/git ' ''; preCompileBuildDriver = "cd src"; From 188b935b6d75af9b58ddd63cb665ca8410de1d74 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 2 Dec 2022 15:09:55 +0100 Subject: [PATCH 220/222] alt-ergo: fix version string --- pkgs/applications/science/logic/alt-ergo/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index d7396d5d9a61..7077d56f8069 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -21,6 +21,9 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex seq stdlib-shims zarith ]; + preBuild = '' + substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"' + ''; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { From 3e04410ced5c98a12cfcba179b0854fff99f2813 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Dec 2022 10:21:44 +0000 Subject: [PATCH 221/222] pkgsMusl.cdrkit: fix build These are the same tricks that Alpine uses. --- pkgs/tools/cd-dvd/cdrkit/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index e28d4f8b9c7e..6f9c7a656d1b 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -13,10 +13,16 @@ stdenv.mkDerivation rec { buildInputs = [ libcap zlib bzip2 perl ]; hardeningDisable = [ "format" ]; + NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isMusl "-D__THROW="; # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace include/xconfig.h.in \ + --replace "#define HAVE_RCMD 1" "#undef HAVE_RCMD" + ''; + postInstall = '' # file name compatibility with the old cdrecord (growisofs wants this name) ln -s $out/bin/genisoimage $out/bin/mkisofs From 76aad1f1e6e6ebf96d05b96e9c1f800094a26180 Mon Sep 17 00:00:00 2001 From: Markus Wamser Date: Sat, 3 Dec 2022 00:33:08 +0100 Subject: [PATCH 222/222] dfrs: init at 0.0.7 (#204179) Co-authored-by: Sandro --- pkgs/tools/system/dfrs/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/system/dfrs/default.nix diff --git a/pkgs/tools/system/dfrs/default.nix b/pkgs/tools/system/dfrs/default.nix new file mode 100644 index 000000000000..f9bbbd12388f --- /dev/null +++ b/pkgs/tools/system/dfrs/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "dfrs"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "anthraxx"; + repo = pname; + rev = version; + sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk"; + }; + + cargoSha256 = "1dgmn4g35yc7hwnxznkrpwnikn329nc0z8y7bxlcd308k1v83919"; + + meta = with lib; { + description = "Display file system space usage using graphs and colors"; + homepage = "https://github.com/anthraxx/dfrs"; + license = licenses.mit; + maintainers = with maintainers; [ wamserma ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 179ddac9aff0..94e9e8826cf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6262,6 +6262,8 @@ with pkgs; dfc = callPackage ../tools/system/dfc { }; + dfrs = callPackage ../tools/system/dfrs { }; + dev86 = callPackage ../development/compilers/dev86 { }; diskrsync = callPackage ../tools/backup/diskrsync { };