From 78c9a71c4d185a372c3e16d5bc044eb46268c854 Mon Sep 17 00:00:00 2001 From: cwyc <16950437+cwyc@users.noreply.github.com> Date: Sat, 18 Mar 2023 20:22:34 -0400 Subject: [PATCH 01/58] webp-pixbuf-loader: 0.0.7 -> 0.2.2 --- pkgs/development/libraries/webp-pixbuf-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/pkgs/development/libraries/webp-pixbuf-loader/default.nix index c0c52242c12d..bf2c8c28dbdb 100644 --- a/pkgs/development/libraries/webp-pixbuf-loader/default.nix +++ b/pkgs/development/libraries/webp-pixbuf-loader/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "webp-pixbuf-loader"; - version = "0.0.7"; + version = "0.2.2"; src = fetchFromGitHub { owner = "aruiz"; repo = "webp-pixbuf-loader"; rev = version; - sha256 = "sha256-Za5/9YlDRqF5oGI8ZfLhx2ZT0XvXK6Z0h6fu5CGvizc="; + sha256 = "sha256-TdZK2OTwetLVmmhN7RZlq2NV6EukH1Wk5Iwer2W/aHc="; }; nativeBuildInputs = [ From c701a4dd299aaa82589e4e4d4ce49ae330729a25 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Apr 2023 16:10:09 +0200 Subject: [PATCH 02/58] lib.sources.pathType and co.: Move to lib.filesystem These functions only work with the filesystem, they don't import anything as sources --- lib/default.nix | 5 +++-- lib/filesystem.nix | 26 ++++++++++++++++++++++++++ lib/sources.nix | 37 ++++++++++++++++++------------------- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 0424db36b2e9..8fea4b8ad637 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -117,10 +117,11 @@ let inherit (self.meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio hiPrioSet getLicenseFromSpdxId getExe; - inherit (self.sources) pathType pathIsDirectory cleanSourceFilter + inherit (self.filesystem) pathType pathIsDirectory pathIsRegularFile; + inherit (self.sources) cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext - canCleanSource pathIsRegularFile pathIsGitRepo; + canCleanSource pathIsGitRepo; inherit (self.modules) evalModules setDefaultModuleLocation unifyModuleSyntax applyModuleArgsIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 948196055203..2d8a62639ec9 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -2,12 +2,38 @@ { lib }: let + inherit (builtins) + getAttr + readDir + pathExists + ; + inherit (lib.strings) hasPrefix ; + + inherit (lib.filesystem) + pathType + ; in { + + /* + Returns the type of a path: regular (for file), symlink, or directory. + */ + pathType = path: getAttr (baseNameOf path) (readDir (dirOf path)); + + /* + Returns true if the path exists and is a directory, false otherwise. + */ + pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false; + + /* + Returns true if the path exists and is a regular file, false otherwise. + */ + pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false; + /* A map of all haskell packages defined in the given path, identified by having a cabal file with the same name as the diff --git a/lib/sources.nix b/lib/sources.nix index 3ad7dc633554..d990777c6fcc 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -18,21 +18,11 @@ let pathExists readFile ; - - /* - Returns the type of a path: regular (for file), symlink, or directory. - */ - pathType = path: getAttr (baseNameOf path) (readDir (dirOf path)); - - /* - Returns true if the path exists and is a directory, false otherwise. - */ - pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false; - - /* - Returns true if the path exists and is a regular file, false otherwise. - */ - pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false; + inherit (lib.filesystem) + pathType + pathIsDirectory + pathIsRegularFile + ; /* A basic filter for `cleanSourceWith` that removes @@ -271,11 +261,20 @@ let }; in { - inherit - pathType - pathIsDirectory - pathIsRegularFile + pathType = lib.warnIf (lib.isInOldestRelease 2305) + "lib.sources.pathType has been moved to lib.filesystem.pathType." + lib.filesystem.pathType; + + pathIsDirectory = lib.warnIf (lib.isInOldestRelease 2305) + "lib.sources.pathIsDirectory has been moved to lib.filesystem.pathIsDirectory." + lib.filesystem.pathIsDirectory; + + pathIsRegularFile = lib.warnIf (lib.isInOldestRelease 2305) + "lib.sources.pathIsRegularFile has been moved to lib.filesystem.pathIsRegularFile." + lib.filesystem.pathIsRegularFile; + + inherit pathIsGitRepo commitIdFromGitRepo From 88954fe971cf01482e9ca604c0e5c522fee1f877 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 06:23:45 +0000 Subject: [PATCH 03/58] linphone: 5.0.8 -> 5.0.15 --- .../networking/instant-messengers/linphone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 2869401b5969..209e2d2714f2 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "5.0.8"; + version = "5.0.15"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-e/0yGHtOHMgPhaF5xELodKS9/v/mbnT3ZpE12lXAocU="; + hash = "sha256-tCtOFHspT0CmBCGvs5b/tNH+W1tuHuje6Zt0UwagOB4="; }; patches = [ From 71caaca6f3c1d0eca6391ed6b389255714bc1907 Mon Sep 17 00:00:00 2001 From: toastal Date: Tue, 25 Apr 2023 13:16:49 +0700 Subject: [PATCH 04/58] mpris-scrobbler: add ListenBrainz to the desc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The project’s online manpage (https://www.mankier.com/1/mpris-scrobbler) mentions ListenBrainz before the other services. --- pkgs/tools/audio/mpris-scrobbler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix index ba80aa6ad0e3..a5e7b2483305 100644 --- a/pkgs/tools/audio/mpris-scrobbler/default.nix +++ b/pkgs/tools/audio/mpris-scrobbler/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Minimalistic scrobbler for libre.fm & last.fm"; + description = "Minimalistic scrobbler for ListenBrainz, libre.fm, & last.fm"; homepage = "https://github.com/mariusor/mpris-scrobbler"; license = licenses.mit; maintainers = with maintainers; [ emantor ]; From 2759dddde7e6e655435cd05793f93a60ffde5bce Mon Sep 17 00:00:00 2001 From: Freya Arbjerg Date: Sun, 30 Apr 2023 17:14:57 +0200 Subject: [PATCH 05/58] Darktable: 4.2.0 -> 4.2.1 https://github.com/darktable-org/darktable/releases/tag/release-4.2.1 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index cc727a9a8509..b00e8f822ad2 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -58,12 +58,12 @@ }: stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.2.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9"; + sha256 = "603a39c6074291a601f7feb16ebb453fd0c5b02a6f5d3c7ab6db612eadc97bac"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; From d8d762ae3da64aec746f60baeb92b5b5964fbbdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 May 2023 06:25:07 +0000 Subject: [PATCH 06/58] belle-sip: 5.2.37 -> 5.2.53 --- pkgs/development/libraries/belle-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 2a0abc3a338e..8e5b6abf5fcc 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "5.2.37"; + version = "5.2.53"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-e5CwLzpvW5ktv5R8PZkNmSXAi/SaTltJs9LY26iKsLo="; + sha256 = "sha256-uZrsDoLIq9jusM5kGXMjspWvFgRq2TF/CLMvTuDSEgM="; }; nativeBuildInputs = [ cmake ]; From 378ab7d595a2fdd75f6bd6e970b5892113587831 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 10 May 2023 14:28:37 -0400 Subject: [PATCH 07/58] kubernetes-helm: 3.11.3 -> 3.12.0 Diff: https://github.com/helm/helm/compare/v3.11.3...v3.12.0 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 15b0a443c915..4e17f07444d4 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.11.3"; + version = "3.12.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-BIjbSHs0sOLYB+26EHy9f3YJtUYnzgdADIXB4n45Rv0="; + sha256 = "sha256-Fu1d1wpiD7u8lLMAe8WuOxJxDjY85vK8MPHz0iBr5Ps="; }; - vendorHash = "sha256-uz3ZqCcT+rmhNCO+y3PuCXWjTxUx8u3XDgcJxt7A37g="; + vendorHash = "sha256-PvuuvM/ReDPI1hBQu4DsKdXXoD2C5BLvxU5Ld3h4hTE="; subPackages = [ "cmd/helm" ]; ldflags = [ From 1c0cbd22de6b946b0059d55b70bacb6d1e1b7a91 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Sun, 14 May 2023 23:23:51 +0200 Subject: [PATCH 08/58] space-station-14-launcher: 0.20.5 -> 0.21.1 --- pkgs/games/space-station-14-launcher/deps.nix | 107 +++++++----------- .../space-station-14-launcher.nix | 4 +- 2 files changed, 45 insertions(+), 66 deletions(-) diff --git a/pkgs/games/space-station-14-launcher/deps.nix b/pkgs/games/space-station-14-launcher/deps.nix index 0028f0dadd59..e5a21e6450bc 100644 --- a/pkgs/games/space-station-14-launcher/deps.nix +++ b/pkgs/games/space-station-14-launcher/deps.nix @@ -2,29 +2,29 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "0.10.13"; sha256 = "1df46dvjyax8jjdcvdavpzq5bwxacrw71j557mcm1401vv3r1vn3"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.19"; sha256 = "1yzrbp0b6kv9h9d4kl96ldr6ln40xj1j2yvbvpm0pgv7ajwr7qhc"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.13"; sha256 = "1yl402l5cwbv6gwy3p8r702ypp3p8w5wi8im25c2bjnv31889l8r"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.13"; sha256 = "1y206hrfwyg8023z0m7dik1hlir1r18h8q0f0zqz3sabyy5k276w"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.13"; sha256 = "11khr3w7gwlm1bajfh5zhrsfcfd9kbw5mbgwnbjq7i5lq9glriid"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.13"; sha256 = "18gygzg12facawvzmfgpja4rsagy670dv1dcrx4shfl7w8l998jp"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.13"; sha256 = "18b2pykfcgw9pyjmdqq7i1n8j330n7xrwyldl9bpkvahswinvhza"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.13"; sha256 = "1y93xh9mgaa8nzsmp6la8jkw0bqia4i1cx7vmwzy7c5j7pd81aq4"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.13"; sha256 = "0j0kdh6dbii59v972azhwq69rmak63lp5f5jqz3pi94mifx4bayy"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.13"; sha256 = "0k5y0w164m03q278m4wr7zzf3vfq9nb0am9vmmprivpn1xwwa7ml"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.13"; sha256 = "0jyl1rrn1n07dnqn76ijwhxgkc45dmsfh2d811n4695ndaz85nkl"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.13"; sha256 = "1y8x9hjdlxg4q8q958i364cbak8xjh4nldp38cnxwjir814p0xwh"; }) - (fetchNuGet { pname = "CodeHollow.FeedReader"; version = "1.2.1"; sha256 = "050ni2952n2xmbq0vyk37wpxhgcfsffm8w0wh27km75nim6l3jnj"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.19"; sha256 = "0wlmr4dlz8x3madm7xwhmsf0kgdnwcy6n7zvfd9x6h0bllii1lbn"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.19"; sha256 = "0vghwp1wx6l1z0dlvd9aqdaikz6k34q0i9yzaphqlzjp6ms2g2ny"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.19"; sha256 = "1zlcp8mwn2nscrdsvxlspny22m054gsva9az27pvk7s2s5mrqgfk"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.19"; sha256 = "01fin1w9nwa3c9kpvbri26x1r4g59hmayx9r5hxwbhq7s7vm5ghr"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.19"; sha256 = "0c9rw2wckyx9h5yfhm0af5zbs53n9bnhv0mlshl7mn0p92v1wfl3"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.19"; sha256 = "0kx4qka2rdmlp54qyn04hh79qc5w796gv3ryv24n82hpplzksqi9"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.19"; sha256 = "0klk9hqas0h3d3lmr0di175nw2kwq5br1xpprkb4y4m83r5lfy0s"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.19"; sha256 = "16cl9ssmyif2a25fq9kvxs2vr83j589yns53zkfr3wmggl9n6lf2"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.19"; sha256 = "1pd3jmrdc738j7b4d8rzaj7fxrfq1m2pl3i62z2ym3h0sxl51xy2"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.19"; sha256 = "1h71w73r7r9ci059qwsjqnhp60l8sfd3i3xsw37qfnbhslcna6hh"; }) + (fetchNuGet { pname = "CodeHollow.FeedReader"; version = "1.2.6"; sha256 = "1ac98diww07cfs3cv142nlwzi9w3n2s5w7m60mkc0rpzg0vpq3mv"; }) (fetchNuGet { pname = "Dapper"; version = "2.0.123"; sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.4.9"; sha256 = "0ssgh42fi5m6xyw36f4km04ls9nq4w8cpbck8gh7g8n3ixz05rrw"; }) - (fetchNuGet { pname = "Fody"; version = "6.6.0"; sha256 = "0cx708ah61cxmvpaq040mhqwrv937rvlmskwihg1w118729k9yv0"; }) - (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 = "DynamicData"; version = "7.13.1"; sha256 = "0hy2ba2nkhgp23glkinhfx3v892fkkf4cr9m41daaahnl2r2l8y1"; }) + (fetchNuGet { pname = "Fody"; version = "6.6.4"; sha256 = "1hhdwj0ska7dvak9hki8cnyfmmw5r8yw8w24gzsdwhqx68dnrvsx"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) - (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) + (fetchNuGet { pname = "libsodium"; version = "1.0.18.2"; sha256 = "02xd4phd6wfixhdq48ma92c166absqw41vdq5kvjch8p0vc9cdl2"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.16"; sha256 = "1v02j1i139a8x32hgi1yhcpp754xi0sg5b7iqzmslvinfg3b7dwn"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.16"; sha256 = "1xdhn8v8y947kw29npck1h9qaw8rj81q7a0qwawpc2200ds96n40"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) @@ -33,8 +33,8 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "6.0.1"; sha256 = "04kzr5mi899fd1fmd56wkh14whcvyibb484dfirdsd0kgrkcb0x6"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "6.0.1"; sha256 = "0gzn3rynp9k6mx4h4dhq124b7ra8m11rkjh40r2r8z4gkr0shjv1"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.4"; sha256 = "0lsbzwqiwqv2qq6858aphq7rsp6fs3i0di132w7c0r2r081szql9"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.4"; sha256 = "0mhfj8bj8dlc01y20ihq6j9r59f67cry6yd6qi6rg9zh93m43jpv"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.16"; sha256 = "1pv9arqbmxlh86rnx6nss2cl91hi22j83p66m4ahds34caykf32l"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.16"; sha256 = "1w89n5grnxdis0wclfimi9ij8g046yrw76rhmcp8l57xm8nl21yj"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.16"; sha256 = "1fjrc1l7ihal93ybxqzlxrs7vdqb9jhkabh2acwrmlh7q5197vn2"; }) @@ -47,9 +47,9 @@ (fetchNuGet { pname = "Microsoft.Toolkit.Mvvm"; version = "7.1.2"; sha256 = "0hrlgjr41hlpp3hb697i0513x2cm4ysbl0wj4bj67md604cmkv14"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) - (fetchNuGet { pname = "NSec.Cryptography"; version = "20.2.0"; sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "17.1.9"; sha256 = "0z4jjvrb56hjbgb1kiq1spj6jw7yai1cwg69pbwfj89wknr9alvg"; }) - (fetchNuGet { pname = "ReactiveUI.Fody"; version = "17.1.9"; sha256 = "1chzyccmckyym6svxh8qj34vy4vn51ixrxgwcvwq0bnr6pxlxkx7"; }) + (fetchNuGet { pname = "NSec.Cryptography"; version = "22.4.0"; sha256 = "0v89wyvl58ia8r74wn3shajs1ia0rgx1p60nlr87g7ys6lq7ql2d"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.4.26"; sha256 = "0xhj4vk64smjfw7sr2gqxvradqbgky6jgfryq8q85h1hz10r7xaa"; }) + (fetchNuGet { pname = "ReactiveUI.Fody"; version = "18.4.26"; sha256 = "0i79ajjmibg10cardpq9qh5wy1b4ngvb2v33fr4c5pf1y65xzhmr"; }) (fetchNuGet { pname = "Robust.Natives"; version = "0.1.1"; sha256 = "1spfaxk8nsx368zncdcj0b3kg7gj7h14mjji19xrraf8ij0dnczw"; }) (fetchNuGet { pname = "Robust.Natives.Angle"; version = "0.1.1-chromium4758"; sha256 = "0awydljd6psr0w661p9q73pg2aa29lfb4i0arkpszl0ra33mhrah"; }) (fetchNuGet { pname = "Robust.Natives.Fluidsynth"; version = "0.1.0"; sha256 = "00nkww5sjixs1dmn979niq0hrhplcpabrp18bmpm240wl53ay72x"; }) @@ -59,7 +59,6 @@ (fetchNuGet { pname = "Robust.Natives.Swnfd"; version = "0.1.0"; sha256 = "1ssnl6zasf2cdaffib4pzyfd1w962y1zmcsivyalgpsh6p4g9as1"; }) (fetchNuGet { pname = "Robust.Shared.AuthLib"; version = "0.1.2"; sha256 = "1vn19d81n8jdyy75ryrlajyxr0kp7pwjdlbyqcn8gcid5plrzmh0"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) @@ -70,9 +69,7 @@ (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) @@ -85,43 +82,33 @@ (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "3.1.1"; sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) - (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.2-beta1"; sha256 = "0yvk5g9jjmr7hg695zb0wid44dqjjngycjdng2xs6awqbx9kydcw"; }) + (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.2-beta2"; sha256 = "1145jlprsgll8ixwib0i8phc6jsv6nm4yki4wi1bkxx2bgf9yjay"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0-preview.178"; sha256 = "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0-preview.178"; sha256 = "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0-preview.178"; sha256 = "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"; }) - (fetchNuGet { pname = "SpaceWizards.Sodium"; version = "0.2.0"; sha256 = "1w4c555krimgkvz7nir2z63vav05125cwgsqvs65lq8qfmfh2h50"; }) - (fetchNuGet { pname = "SpaceWizards.Sodium.Interop"; version = "1.0.18-beta3"; sha256 = "1lxbgccqzpyyf70rbn0lc22ib4fjyi95ajl392rlk6hq1cl3wgpj"; }) - (fetchNuGet { pname = "Splat"; version = "14.1.1"; sha256 = "0j79ph1mgmwn4kmvnwi5vs7pskiavwz01l8lgax5z36nri0mwpxj"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.0.6"; sha256 = "1ip0a653dx5cqybxg27zyz5ps31f2yz50g3jvz3vx39isx79gax3"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.6"; sha256 = "1w4iyg0v1v1z2m7akq7rv8lsgixp2m08732vr14vgpqs918bsy1i"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.6"; sha256 = "16378rh1lcqxynf5qj0kh8mrsb0jp37qqwg4285kqc5pknvh1bx3"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.0.6"; sha256 = "0chgrqyycb1kqnaxnhhfg0850b94blhzni8zn79c7ggb3pd2ykyz"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; }) + (fetchNuGet { pname = "SpaceWizards.Sodium"; version = "0.2.1"; sha256 = "059slmfg8diivd7hv53cp24vvrzfviqp6fyg8135azynyxk787fp"; }) + (fetchNuGet { pname = "SpaceWizards.Sodium.Interop"; version = "1.0.18-beta4"; sha256 = "1w59i27z2xdvdflfbnq2braas5f4gpkq9m1xcmc1961hm97z1wvn"; }) + (fetchNuGet { pname = "Splat"; version = "14.6.8"; sha256 = "1nj0bsqcr93n8jdyb1all8l35gydlgih67kr7cs1bc12l18fwx2w"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) @@ -144,26 +131,18 @@ (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "TerraFX.Interop.Windows"; version = "10.0.20348"; sha256 = "1ns39bkb0i6d92z3mk0hf72cli7k8x99c412329ngrivxivxxap8"; }) + (fetchNuGet { pname = "TerraFX.Interop.Windows"; version = "10.0.22621.1"; sha256 = "0qbiaczssgd28f1kb1zz1g0fqsizv36qr2lbjmdrd1lfsyp2a2nj"; }) (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) - (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.2.1"; sha256 = "1fkqvmq3b4lla6cyaacxpjjqxzcxb5wmz1zb8834pzc7mdjcx5jz"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "11.2.1"; sha256 = "0acd7k97nqzisyqql71m6l0b0lvkr612zaav42hw0y1qnp06jdi4"; }) + (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.6.1"; sha256 = "0348gj9g5rl0pj2frx4vscj6602gfyn9ba3i1rmfcrxh9jwwa09m"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "13.0.2"; sha256 = "031pvc6idvjyrn1bfdn8zaljrndp5ch7fkcn82f06332gqs3n8k8"; }) ] diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 0ebfad0586ba..5b4dc1b372ef 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.20.5"; + version = "0.21.1"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-uonndoqDOgPtnSk5v0KyyR8BQ9neAH1ploEY/kKD0IQ="; + hash = "sha256-uJ/47cQZsGgrExemWCWeSM/U6eW2HoKWHCsVE2KypVQ="; fetchSubmodules = true; }; From 20a65903132c737e45167e66842cae669ff046a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 14 May 2023 22:14:15 -0300 Subject: [PATCH 09/58] pythonPackages.pythonefl: broken with python 3.11 --- pkgs/development/python-modules/python-efl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 77e6266ffd37..8df6ee96e7d9 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -48,6 +48,8 @@ buildPythonPackage rec { platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members; - broken = true; + # The generated files in the tarball aren't compatible with python 3.11 + # See https://sourceforge.net/p/enlightenment/mailman/message/37794291/ + broken = python.pythonAtLeast "3.11"; }; } From c904468ae4950ca68753fa49cb7e9acd02a18c07 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Wed, 17 May 2023 07:07:12 +0100 Subject: [PATCH 10/58] discord-sh: unstable-2022-05-19 -> 2.0.0 --- pkgs/tools/networking/discord-sh/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/discord-sh/default.nix b/pkgs/tools/networking/discord-sh/default.nix index 98696fad0780..50e84034428d 100644 --- a/pkgs/tools/networking/discord-sh/default.nix +++ b/pkgs/tools/networking/discord-sh/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, curl, jq, coreutils }: +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, curl, jq, coreutils, file }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "discord-sh"; - version = "unstable-2022-05-19"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ChaoticWeg"; repo = "discord.sh"; - rev = "6aaea548f88eb48b7adeef824fbddac1c4749447"; - sha256 = "sha256-RoPhn/Ot4ID1nEbZEz1bd2iq8g7mU2e7kwNRvZOD/pc="; + rev = "v${version}"; + sha256 = "sha256-ZOGhwR9xFzkm+q0Gm8mSXZ9toXG4xGPNwBQMCVanCbY="; }; # ignore Makefile by disabling buildPhase. Upstream Makefile tries to download @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation { runHook preInstall install -Dm555 discord.sh $out/bin/discord.sh wrapProgram $out/bin/discord.sh \ - --set PATH "${lib.makeBinPath [ curl jq coreutils ]}" + --set PATH "${lib.makeBinPath [ curl jq coreutils file ]}" runHook postInstall ''; From 7800869591895c83c3ef43861c1f225c02693b78 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Fri, 3 Mar 2023 02:52:20 +0300 Subject: [PATCH 11/58] waydroid: 1.3.4 -> 1.4.1 --- pkgs/os-specific/linux/waydroid/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index d01759e8ed69..2cf6e0c47e48 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -11,7 +11,6 @@ , iproute2 , iptables , util-linux -, which , wrapGAppsHook , xclip , runtimeShell @@ -19,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.3.4"; + version = "1.4.1"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI="; + sha256 = "sha256-0AkNzMIumvgnVcLKX72E2+Eg54Y9j7tdIYPsroOTLWA="; }; buildInputs = [ @@ -39,6 +38,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + dbus-python gbinder-python pyclip pygobject3 @@ -63,6 +63,7 @@ python3Packages.buildPythonApplication rec { wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [ "$out" + python3Packages.dbus-python python3Packages.gbinder-python python3Packages.pygobject3 python3Packages.pyclip @@ -70,15 +71,11 @@ python3Packages.buildPythonApplication rec { kmod lxc util-linux - which xclip ]}" substituteInPlace $out/lib/waydroid/tools/helpers/*.py \ --replace '"sh"' '"${runtimeShell}"' - - substituteInPlace $out/share/applications/*.desktop \ - --replace "/usr" "$out" ''; meta = with lib; { From a1dedc908d1d9f7e2b9490dc7b3b3020e8fe7d0b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Apr 2023 16:44:58 +0200 Subject: [PATCH 12/58] lib.filesystem.pathType and co.: Add tests Co-Authored-By: Robert Hensing --- lib/tests/filesystem.sh | 88 +++++++++++++++++++++++++++++++++++++++++ lib/tests/release.nix | 3 ++ 2 files changed, 91 insertions(+) create mode 100755 lib/tests/filesystem.sh diff --git a/lib/tests/filesystem.sh b/lib/tests/filesystem.sh new file mode 100755 index 000000000000..ab1504abb490 --- /dev/null +++ b/lib/tests/filesystem.sh @@ -0,0 +1,88 @@ +#!/usr/bin/env bash + +# Tests lib/filesystem.nix +# Run: +# [nixpkgs]$ lib/tests/filesystem.sh +# or: +# [nixpkgs]$ nix-build lib/tests/release.nix + +set -euo pipefail +shopt -s inherit_errexit + +# Use +# || die +die() { + echo >&2 "test case failed: " "$@" + exit 1 +} + +if test -n "${TEST_LIB:-}"; then + NIX_PATH=nixpkgs="$(dirname "$TEST_LIB")" +else + NIX_PATH=nixpkgs="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.."; pwd)" +fi +export NIX_PATH + +work="$(mktemp -d)" +clean_up() { + rm -rf "$work" +} +trap clean_up EXIT +cd "$work" + +mkdir directory +touch regular +ln -s target symlink +mkfifo fifo + +checkPathType() { + local path=$1 + local expectedPathType=$2 + local actualPathType=$(nix-instantiate --eval --strict --json 2>&1 \ + -E '{ path }: let lib = import ; in lib.filesystem.pathType path' \ + --argstr path "$path") + if [[ "$actualPathType" != "$expectedPathType" ]]; then + die "lib.filesystem.pathType \"$path\" == $actualPathType, but $expectedPathType was expected" + fi +} + +checkPathType "$PWD/directory" '"directory"' +checkPathType "$PWD/regular" '"regular"' +checkPathType "$PWD/symlink" '"symlink"' +checkPathType "$PWD/fifo" '"unknown"' + +checkPathIsDirectory() { + local path=$1 + local expectedIsDirectory=$2 + local actualIsDirectory=$(nix-instantiate --eval --strict --json 2>&1 \ + -E '{ path }: let lib = import ; in lib.filesystem.pathIsDirectory path' \ + --argstr path "$path") + if [[ "$actualIsDirectory" != "$expectedIsDirectory" ]]; then + die "lib.filesystem.pathIsDirectory \"$path\" == $actualIsDirectory, but $expectedIsDirectory was expected" + fi +} + +checkPathIsDirectory "$PWD/directory" "true" +checkPathIsDirectory "$PWD/regular" "false" +checkPathIsDirectory "$PWD/symlink" "false" +checkPathIsDirectory "$PWD/fifo" "false" +checkPathIsDirectory "$PWD/non-existent" "false" + +checkPathIsRegularFile() { + local path=$1 + local expectedIsRegularFile=$2 + local actualIsRegularFile=$(nix-instantiate --eval --strict --json 2>&1 \ + -E '{ path }: let lib = import ; in lib.filesystem.pathIsRegularFile path' \ + --argstr path "$path") + if [[ "$actualIsRegularFile" != "$expectedIsRegularFile" ]]; then + die "lib.filesystem.pathIsRegularFile \"$path\" == $actualIsRegularFile, but $expectedIsRegularFile was expected" + fi +} + +checkPathIsRegularFile "$PWD/directory" "false" +checkPathIsRegularFile "$PWD/regular" "true" +checkPathIsRegularFile "$PWD/symlink" "false" +checkPathIsRegularFile "$PWD/fifo" "false" +checkPathIsRegularFile "$PWD/non-existent" "false" + +echo >&2 tests ok diff --git a/lib/tests/release.nix b/lib/tests/release.nix index dbf6683d49a8..f5c6e81030ca 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -44,6 +44,9 @@ pkgs.runCommand "nixpkgs-lib-tests" { echo "Running lib/tests/modules.sh" bash lib/tests/modules.sh + echo "Running lib/tests/filesystem.sh" + TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh + echo "Running lib/tests/sources.sh" TEST_LIB=$PWD/lib bash lib/tests/sources.sh From 5346636c20ff57410b25a6a8897d4e95f75e040c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Apr 2023 16:13:03 +0200 Subject: [PATCH 13/58] lib.filesystem: Minor refactor Co-Authored-By: Robert Hensing --- lib/filesystem.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 2d8a62639ec9..f604eb90434b 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -3,7 +3,6 @@ let inherit (builtins) - getAttr readDir pathExists ; @@ -22,17 +21,20 @@ in /* Returns the type of a path: regular (for file), symlink, or directory. */ - pathType = path: getAttr (baseNameOf path) (readDir (dirOf path)); + pathType = path: + (readDir (dirOf path)).${baseNameOf path}; /* Returns true if the path exists and is a directory, false otherwise. */ - pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false; + pathIsDirectory = path: + pathExists path && pathType path == "directory"; /* Returns true if the path exists and is a regular file, false otherwise. */ - pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false; + pathIsRegularFile = path: + pathExists path && pathType path == "regular"; /* A map of all haskell packages defined in the given path, From bb6eab0bdbe060cb578fc9be5925a76a1635424f Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Apr 2023 16:47:30 +0200 Subject: [PATCH 14/58] lib.filesystem.pathType: Fix for filesystem root argument Previously this function couldn't handle / being passed, it would throw an error: error: attribute '' missing at nixpkgs/lib/filesystem.nix:24:20: 23| */ 24| pathType = path: (readDir (dirOf path)).${baseNameOf path}; | ^ 25| Consequently this also fixes the lib.filesystem.{pathIsDirectory,pathIsRegularFile} functions. --- lib/filesystem.nix | 7 ++++++- lib/tests/filesystem.sh | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index f604eb90434b..13f4ebb26402 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -22,7 +22,12 @@ in Returns the type of a path: regular (for file), symlink, or directory. */ pathType = path: - (readDir (dirOf path)).${baseNameOf path}; + # The filesystem root is the only path where `dirOf / == /` and + # `baseNameOf /` is not valid. We can detect this and directly return + # "directory", since we know the filesystem root can't be anything else. + if dirOf path == path + then "directory" + else (readDir (dirOf path)).${baseNameOf path}; /* Returns true if the path exists and is a directory, false otherwise. diff --git a/lib/tests/filesystem.sh b/lib/tests/filesystem.sh index ab1504abb490..61710da92ba2 100755 --- a/lib/tests/filesystem.sh +++ b/lib/tests/filesystem.sh @@ -46,6 +46,7 @@ checkPathType() { fi } +checkPathType "/" '"directory"' checkPathType "$PWD/directory" '"directory"' checkPathType "$PWD/regular" '"regular"' checkPathType "$PWD/symlink" '"symlink"' @@ -62,6 +63,7 @@ checkPathIsDirectory() { fi } +checkPathIsDirectory "/" "true" checkPathIsDirectory "$PWD/directory" "true" checkPathIsDirectory "$PWD/regular" "false" checkPathIsDirectory "$PWD/symlink" "false" @@ -79,6 +81,7 @@ checkPathIsRegularFile() { fi } +checkPathIsRegularFile "/" "false" checkPathIsRegularFile "$PWD/directory" "false" checkPathIsRegularFile "$PWD/regular" "true" checkPathIsRegularFile "$PWD/symlink" "false" From d064d972f07b908db3efb909d6663bee3adf8d40 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Apr 2023 16:58:29 +0200 Subject: [PATCH 15/58] lib.filesystem.pathType: Improve error for non-existent paths Previously it would fail with error: attribute 'nonexistent' missing at nixpkgs/lib/filesystem.nix:29:10: 28| if dirOf path == path then "directory" 29| else (readDir (dirOf path)).${baseNameOf path}; | ^ 30| --- lib/filesystem.nix | 6 +++++- lib/tests/filesystem.sh | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 13f4ebb26402..db120a48c64b 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -22,10 +22,14 @@ in Returns the type of a path: regular (for file), symlink, or directory. */ pathType = path: + if ! pathExists path + # Fail irrecoverably to mimic the historic behavior of this function and + # the new builtins.readFileType + then abort "lib.filesystem.pathType: Path ${toString path} does not exist." # The filesystem root is the only path where `dirOf / == /` and # `baseNameOf /` is not valid. We can detect this and directly return # "directory", since we know the filesystem root can't be anything else. - if dirOf path == path + else if dirOf path == path then "directory" else (readDir (dirOf path)).${baseNameOf path}; diff --git a/lib/tests/filesystem.sh b/lib/tests/filesystem.sh index 61710da92ba2..4a5ffeb12431 100755 --- a/lib/tests/filesystem.sh +++ b/lib/tests/filesystem.sh @@ -51,6 +51,7 @@ checkPathType "$PWD/directory" '"directory"' checkPathType "$PWD/regular" '"regular"' checkPathType "$PWD/symlink" '"symlink"' checkPathType "$PWD/fifo" '"unknown"' +checkPathType "$PWD/non-existent" "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'" checkPathIsDirectory() { local path=$1 From 84a3d633d6f3653675d794ef5e8e90bf0cb7c502 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Apr 2023 17:16:10 +0200 Subject: [PATCH 16/58] lib.filesystem.pathType and co.: Improve documentation --- lib/filesystem.nix | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index db120a48c64b..6dfd273b0a55 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -19,7 +19,18 @@ in { /* - Returns the type of a path: regular (for file), symlink, or directory. + The type of a path. The path needs to exist and be accessible. + The result is either "directory" for a directory, "regular" for a regular file, "symlink" for a symlink, or "unknown" for anything else. + + Type: + pathType :: Path -> String + + Example: + pathType /. + => "directory" + + pathType /some/file.nix + => "regular" */ pathType = path: if ! pathExists path @@ -34,13 +45,39 @@ in else (readDir (dirOf path)).${baseNameOf path}; /* - Returns true if the path exists and is a directory, false otherwise. + Whether a path exists and is a directory. + + Type: + pathIsDirectory :: Path -> Bool + + Example: + pathIsDirectory /. + => true + + pathIsDirectory /this/does/not/exist + => false + + pathIsDirectory /some/file.nix + => false */ pathIsDirectory = path: pathExists path && pathType path == "directory"; /* - Returns true if the path exists and is a regular file, false otherwise. + Whether a path exists and is a regular file, meaning not a symlink or any other special file type. + + Type: + pathIsRegularFile :: Path -> Bool + + Example: + pathIsRegularFile /. + => false + + pathIsRegularFile /this/does/not/exist + => false + + pathIsRegularFile /some/file.nix + => true */ pathIsRegularFile = path: pathExists path && pathType path == "regular"; From fcaa2b1097e46c286b4651f5f2d7653f52ae860b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 5 Apr 2023 18:42:22 +0200 Subject: [PATCH 17/58] lib.filesystem.pathType: Use new builtins.readFileType if available Co-Authored-By: Robert Hensing --- lib/filesystem.nix | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 6dfd273b0a55..37b60e4fe11e 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -32,17 +32,21 @@ in pathType /some/file.nix => "regular" */ - pathType = path: - if ! pathExists path - # Fail irrecoverably to mimic the historic behavior of this function and - # the new builtins.readFileType - then abort "lib.filesystem.pathType: Path ${toString path} does not exist." - # The filesystem root is the only path where `dirOf / == /` and - # `baseNameOf /` is not valid. We can detect this and directly return - # "directory", since we know the filesystem root can't be anything else. - else if dirOf path == path - then "directory" - else (readDir (dirOf path)).${baseNameOf path}; + pathType = + builtins.readFileType or + # Nix <2.14 compatibility shim + (path: + if ! pathExists path + # Fail irrecoverably to mimic the historic behavior of this function and + # the new builtins.readFileType + then abort "lib.filesystem.pathType: Path ${toString path} does not exist." + # The filesystem root is the only path where `dirOf / == /` and + # `baseNameOf /` is not valid. We can detect this and directly return + # "directory", since we know the filesystem root can't be anything else. + else if dirOf path == path + then "directory" + else (readDir (dirOf path)).${baseNameOf path} + ); /* Whether a path exists and is a directory. From 378bf1a6192a5d46ceb7e07af7be1d37b93b47c7 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 22 May 2023 14:17:42 +0200 Subject: [PATCH 18/58] lib/filesystem.nix: Update top comment Co-Authored-By: Robert Hensing --- lib/filesystem.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index 37b60e4fe11e..4860d4d02a77 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -1,6 +1,8 @@ -# Functions for copying sources to the Nix store. +# Functions for querying information about the filesystem +# without copying any files to the Nix store. { lib }: +# Tested in lib/tests/filesystem.sh let inherit (builtins) readDir From 1e8c419898448628d0ad478e83c5f1bb1f8ff478 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 02:07:44 +0000 Subject: [PATCH 19/58] kubernetes-helmPlugins.helm-diff: 3.7.0 -> 3.8.0 --- .../networking/cluster/helm/plugins/helm-diff.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index d1d431b0e60d..cb8ae2178395 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bG1i6Tea7BLWuy5cd3+249sOakj2LfAZLphtjMLdlug="; + sha256 = "sha256-7HUD6OcAQ4tFTZJfjdonU1Q/CGJZ4AAZx7nB68d0QQs="; }; - vendorSha256 = "sha256-80cTeD+rCwKkssGQya3hMmtYnjia791MjB4eG+m5qd0="; + vendorHash = "sha256-2tiBFS3gvSbnyighSorg/ar058ZJmiQviaT13zOS8KA="; ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; From cfae366324b4f322088e8728a1ebd2f374a8554d Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 22 May 2023 22:27:38 -0400 Subject: [PATCH 20/58] argc: 1.1.0 -> 1.2.0 Diff: https://github.com/sigoden/argc/compare/v1.1.0...v1.2.0 Changelog: https://github.com/sigoden/argc/releases/tag/v1.2.0 --- pkgs/development/tools/argc/default.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix index d87863a79b9c..853030a025f8 100644 --- a/pkgs/development/tools/argc/default.nix +++ b/pkgs/development/tools/argc/default.nix @@ -2,29 +2,34 @@ , rustPlatform , fetchFromGitHub , installShellFiles -, rust -, stdenv +, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - hash = "sha256-db75OoFmsR03lK99vGg8+fHJENOyoDFo+uqQJNYmI9M="; + hash = "sha256-sJINgB1cGtqLPl2RmwgChwnSrJL5TWu5AU6hfLhvmE4="; }; - cargoHash = "sha256-6TC4RWDcg4el+jkq8Jal0k+2sdNsjMkMYqP/b9wP5mU="; + cargoHash = "sha256-HrmqARhEKlAjrW6QieVEEKkfda6R69oLcG/6fd3rvWM="; + + patches = [ + # tests make the assumption that the compiled binary is in target/debug, + # which fails since `cargoBuildHook` uses `--release` and `--target` + (fetchpatch { + name = "fix-tests-with-release-or-target"; + url = "https://github.com/sigoden/argc/commit/a4f2db46e27cad14d3251ef0b25b6f2ea9e70f0e.patch"; + hash = "sha256-bsHSo11/RVstyzdg0BKFhjuWUTLdKO4qsWIOjTTi+HQ="; + }) + ]; nativeBuildInputs = [ installShellFiles ]; - preCheck = '' - export PATH=target/${rust.toRustTarget stdenv.hostPlatform}/release:$PATH - ''; - postInstall = '' installShellCompletion --cmd argc \ --bash <($out/bin/argc --argc-completions bash) \ From 2b85317d4d73201804a670cf2ce0daa2145de021 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 23 May 2023 03:01:22 +0000 Subject: [PATCH 21/58] radioboat: 0.2.3 -> 0.3.0 --- pkgs/applications/audio/radioboat/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/radioboat/default.nix b/pkgs/applications/audio/radioboat/default.nix index 729a56c0f723..3dc97a84b62f 100644 --- a/pkgs/applications/audio/radioboat/default.nix +++ b/pkgs/applications/audio/radioboat/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "radioboat"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "slashformotion"; repo = "radioboat"; rev = "v${version}"; - sha256 = "sha256-nY8h09SDTQPKLAHgWr3q8yRGtw3bIWvAFVu05rqXPcg="; + hash = "sha256-4k+WK2Cxu1yBWgvEW9LMD2RGfiY7XDAe0qqph82zvlI="; }; - vendorSha256 = "sha256-76Q77BXNe6NGxn6ocYuj58M4aPGCWTekKV5tOyxBv2U="; + vendorHash = "sha256-H2vo5gngXUcrem25tqz/1MhOgpNZcN+IcaQHZrGyjW8="; ldflags = [ "-s" @@ -46,7 +46,6 @@ buildGoModule rec { tests.version = testers.testVersion { package = radioboat; command = "radioboat version"; - version = version; }; }; From 32376ec1e798c52da4aa214c0ad5220ca89d6353 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 03:01:32 +0000 Subject: [PATCH 22/58] wlrctl: 0.2.1 -> 0.2.2 --- pkgs/tools/wayland/wlrctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wlrctl/default.nix b/pkgs/tools/wayland/wlrctl/default.nix index 4b093a65cd1f..ebe6629f3704 100644 --- a/pkgs/tools/wayland/wlrctl/default.nix +++ b/pkgs/tools/wayland/wlrctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wlrctl"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromSourcehut { owner = "~brocellous"; repo = "wlrctl"; rev = "v${version}"; - sha256 = "039cxc82k7x473n6d65jray90rj35qmfdmr390zy0c7ic7vn4b78"; + sha256 = "sha256-5mDcCSHbZMbfXbksAO4YhELznKpanse7jtbtfr09HL0="; }; strictDeps = true; From b4c4a0bfc98147a7e766c5b83fa150f601255b32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 03:04:07 +0000 Subject: [PATCH 23/58] steampipe: 0.19.5 -> 0.20.2 --- pkgs/tools/misc/steampipe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index d98cd194dd59..3331e11987ea 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.19.5"; + version = "0.20.2"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-eF6LlQTSCscReTHUZzFI/gR1E/pNs52m68gnJmKnfGk="; + sha256 = "sha256-enjInsu1gaztdUr8z7GgBnL1pKnHoAtST4qGzQeBAhs="; }; - vendorHash = "sha256-XrEdaNLG46BwMEF/vhAk9+A6vH4mpbtH7vWXd01Y7ME="; + vendorHash = "sha256-FWLEuSdhXSQJMd4PiiPTFC8aXkIlQ9LhL6/Dq7LkPPc="; proxyVendor = true; patchPhase = '' From f3f607dcc3a77fa5d3df432aecd4e9c49dcb61ed Mon Sep 17 00:00:00 2001 From: Vanilla Date: Tue, 23 May 2023 11:32:40 +0800 Subject: [PATCH 24/58] layan-gtk-theme: update 2021-06-30 -> 2023-05-23 --- pkgs/data/themes/layan-gtk-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/layan-gtk-theme/default.nix b/pkgs/data/themes/layan-gtk-theme/default.nix index 7892fbe9f316..597734ae9aef 100644 --- a/pkgs/data/themes/layan-gtk-theme/default.nix +++ b/pkgs/data/themes/layan-gtk-theme/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "layan-gtk-theme"; - version = "2021-06-30"; + version = "2023-05-23"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-FI8+AJlcPHGOzxN6HUKLtPGLe8JTfTQ9Az9NsvVUK7g="; + sha256 = "sha256-R8QxDMOXzDIfioAvvescLAu6NjJQ9zhf/niQTXZr+yA="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 3869deb3ab7e12478e09ddabfda2059684c17249 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 03:38:01 +0000 Subject: [PATCH 25/58] discord-canary: 0.0.151 -> 0.0.154 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ba2a3997de68..4fd9f16039e3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.27"; ptb = "0.0.42"; - canary = "0.0.151"; + canary = "0.0.154"; development = "0.0.216"; } else { stable = "0.0.273"; @@ -24,7 +24,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-ZN+lEGtSajgYsyMoGRmyTZCpUGVmb9LKgVv89NA4m7U="; + sha256 = "sha256-rtqPQZBrmxnHuXgzmC7VNiucXBBmtrn8AiKNDtxaR7c="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 835bdc9b9760f20cb07617b4a16ddb8b999a2f89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 03:43:15 +0000 Subject: [PATCH 26/58] ssocr: 2.22.1 -> 2.23.1 --- pkgs/applications/misc/ssocr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index 4496f2a59532..3605d1a7f864 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ssocr"; - version = "2.22.1"; + version = "2.23.1"; src = fetchFromGitHub { owner = "auerswal"; repo = "ssocr"; rev = "v${version}"; - sha256 = "sha256-j1l1o1wtVQo+G9HfXZ1sJQ8amsUQhuYxFguWFQoRe/s="; + sha256 = "sha256-EfZsTrZI6vKM7tB6mKNGEkdfkNFbN5p4TmymOJGZRBk="; }; nativeBuildInputs = [ pkg-config ]; From 6835a7b510f4ae446eeb6246833b29763e7625db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 04:05:06 +0000 Subject: [PATCH 27/58] gremlin-console: 3.6.3 -> 3.6.4 --- pkgs/applications/misc/gremlin-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 475d3df9718a..709393f3051e 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.6.3"; + version = "3.6.4"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-+IzTCaRlYW1i4ZzEgOpEA0rXN45A2q1iddrqU9up2IA="; + sha256 = "sha256-3fZA0U7dobr4Zsudin9OmwcYUw8gdltUWFTVe2l8ILw="; }; nativeBuildInputs = [ makeWrapper ]; From dd7ea5054d998e775f641e3aa6fc1570d8757943 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 04:12:34 +0000 Subject: [PATCH 28/58] python310Packages.python-pidfile: 3.0.0 -> 3.1.1 --- pkgs/development/python-modules/python-pidfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-pidfile/default.nix b/pkgs/development/python-modules/python-pidfile/default.nix index f2ba27897b46..4bcc21ba1c77 100644 --- a/pkgs/development/python-modules/python-pidfile/default.nix +++ b/pkgs/development/python-modules/python-pidfile/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-pidfile"; - version = "3.0.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - hash = "sha256-HhCX30G8dfV0WZ/++J6LIO/xvfyRkdPtJkzC2ulUKdA="; + hash = "sha256-pgQBL2iagsHMRFEKI85ZwyaIL7kcIftAy6s+lX958M0="; }; propagatedBuildInputs = [ From 8cd2ab890e425b6a3bd55c39612cb72bafb8e5d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 04:23:23 +0000 Subject: [PATCH 29/58] micronaut: 3.9.1 -> 3.9.2 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 4220a378b23c..e7d80c0c3091 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.9.1"; + version = "3.9.2"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-Z4Nf4U6hPuSDvCLCxymaouPz+msUytR7Gqof4opATxo="; + sha256 = "sha256-LhNpkCOWgFmzGml4weIpUCHPREcDXlstSzyMZz0tBo8="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 44b98d80ea6a56ccc1838aa0ac9e891de9130913 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 23 May 2023 12:59:00 +0800 Subject: [PATCH 30/58] rl-2311: Add placeholder entries This fixes manual-combined validation. --- nixos/doc/manual/release-notes/rl-2311.section.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index b5531584db39..7e260d2eca04 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -2,11 +2,18 @@ ## Highlights {#sec-release-23.11-highlights} +- Create the first release note entry in this section! + ## New Services {#sec-release-23.11-new-services} +- Create the first release note entry in this section! + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} +- Create the first release note entry in this section! + ## Other Notable Changes {#sec-release-23.11-notable-changes} +- Create the first release note entry in this section! From 2bddf8a8ffe1a82a46571074aa61772ee35a36fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 05:34:42 +0000 Subject: [PATCH 31/58] arangodb: 3.10.3 -> 3.10.5.2 --- pkgs/servers/nosql/arangodb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 443fdeffb10a..74d832803b1d 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,5 +1,5 @@ { - # gcc 11.2 suggested on 3.10.3. + # gcc 11.2 suggested on 3.10.5.2. # gcc 11.3.0 unsupported yet, investigate gcc support when upgrading # See https://github.com/arangodb/arangodb/issues/17454 gcc10Stdenv @@ -32,13 +32,13 @@ in gcc10Stdenv.mkDerivation rec { pname = "arangodb"; - version = "3.10.3"; + version = "3.10.5.2"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "sha256-Jp2rvapTe0CtyYfh1YLJ5eUngh8V+BCUQ/OgH3nE2Ro="; + sha256 = "sha256-64iTxhG8qKTSrTlH/BWDJNnLf8VnaCteCKfQ9D2lGDQ="; fetchSubmodules = true; }; From 273c654405dc83995bfc65e2f46edba047f266ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 06:09:18 +0000 Subject: [PATCH 32/58] consul-template: 0.31.0 -> 0.32.0 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 9f6f2b842253..5ddc121f9d65 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-6B6qijC10WOyGQ9159DK0+WSE19fXbwQc023pkg1iqQ="; + hash = "sha256-jpUDNtcJBcxlHt4GEVZLGT11QBgLHgOR3Y2TT7GROls="; }; - vendorHash = "sha256-wNZliD6mcJT+/U/1jiwdYubYe0Oa+YR6vSLo5vs0bDk="; + vendorHash = "sha256-DV+sZkTKsTygO/LOi6z0vSUgavyqYKB4F2fMxuFFdvw="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From 1c3f5c9002dfa8344daf1919fa51122b06d3c234 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 06:13:55 +0000 Subject: [PATCH 33/58] python310Packages.wandb: 0.15.2 -> 0.15.3 --- pkgs/development/python-modules/wandb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index dde5915652a7..05a6bf51d730 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.15.2"; + version = "0.15.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -60,7 +60,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cAmX3r6XhCBUnC/fNNPakZUNEcDFke0DJMi2PW7sOho="; + hash = "sha256-i1Lo6xbkCgRTJwRjk2bXkZ5a/JRUCzFzmEuPQlPvZf4="; }; patches = [ From 9f959e71548103122f028a8f3b5fe86dc529dae5 Mon Sep 17 00:00:00 2001 From: Hadi Date: Mon, 22 May 2023 13:13:30 -0400 Subject: [PATCH 34/58] androidenv: rename android sdk package name --- pkgs/development/mobile/androidenv/deploy-androidpackages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix index aaedae1eb4bf..36d5842d9f68 100644 --- a/pkgs/development/mobile/androidenv/deploy-androidpackages.nix +++ b/pkgs/development/mobile/androidenv/deploy-androidpackages.nix @@ -60,7 +60,7 @@ let in stdenv.mkDerivation ({ inherit buildInputs; - pname = lib.concatMapStringsSep "-" (package: package.name) sortedPackages; + pname = "android-sdk-${lib.concatMapStringsSep "-" (package: package.name) sortedPackages}"; version = lib.concatMapStringsSep "-" (package: package.revision) sortedPackages; src = map (package: if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all From 6b9462f227480b52833cb189fcaf0c0446bc6e10 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 22 May 2023 15:42:17 +0200 Subject: [PATCH 35/58] python3Packages.latex2mathml: 3.75.5 -> 3.76.0 --- pkgs/development/python-modules/latex2mathml/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix index 2fafb8935008..4ff8ba6df59b 100644 --- a/pkgs/development/python-modules/latex2mathml/default.nix +++ b/pkgs/development/python-modules/latex2mathml/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchFromGitHub , poetry-core -, setuptools , pytestCheckHook , multidict , xmljson @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "latex2mathml"; - version = "3.75.5"; + version = "3.76.0"; disabled = pythonOlder "3.8"; @@ -19,7 +18,7 @@ buildPythonPackage rec { owner = "roniemartinez"; repo = pname; rev = version; - hash = "sha256-ezSksOUvSUqo8MktjKU5ZWhAxtFHwFkSAOJ8rG2jgoU="; + hash = "sha256-CoWXWgu1baM5v7OC+OlRHZB0NkPue4qFzylJk4Xq2e4="; }; format = "pyproject"; @@ -28,10 +27,6 @@ buildPythonPackage rec { poetry-core ]; - propagatedBuildInputs = [ - setuptools # needs pkg_resources at runtime - ]; - nativeCheckInputs = [ pytestCheckHook multidict From 7fc30298e4f5904b40f851eb5fa2c1ca36feae7f Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 22 May 2023 21:37:39 +0900 Subject: [PATCH 36/58] python3Packages.skorch: 0.12.1 -> 0.13.0 Changelog: https://github.com/skorch-dev/skorch/blob/master/CHANGES.md --- .../python-modules/skorch/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index f4b45e88811e..17cc53dccc7a 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -14,11 +15,11 @@ buildPythonPackage rec { pname = "skorch"; - version = "0.12.1"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - hash = "sha256-fjNbNY/Dr7lgVGPrHJTvPGuhyPR6IVS7ohBQMI+J1+k="; + hash = "sha256-k9Zs4uqskHLqVHOKK7dIOmBSUmbDpOMuPS9eSdxNjO0="; }; propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ]; @@ -37,10 +38,19 @@ buildPythonPackage rec { "test_load_cuda_params_to_cpu" # failing tests "test_pickle_load" + ] ++ lib.optionals stdenv.isDarwin [ + # there is a problem with the compiler selection + "test_fit_and_predict_with_compile" ]; - # tries to import `transformers` and download HuggingFace data - disabledTestPaths = [ "skorch/tests/test_hf.py" ]; + disabledTestPaths = [ + # tries to import `transformers` and download HuggingFace data + "skorch/tests/test_hf.py" + ] ++ lib.optionals (stdenv.hostPlatform.system != "x86_64-linux") [ + # torch.distributed is disabled by default in darwin + # aarch64-linux also failed these tests + "skorch/tests/test_history.py" + ]; pythonImportsCheck = [ "skorch" ]; From 787f9411545c91031e5c35d10aebb7872204b235 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 07:22:03 +0000 Subject: [PATCH 37/58] vtm: 0.9.9h -> 0.9.9i --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 15386aeb8974..75c57fefd494 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9h"; + version = "0.9.9i"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-6JyOoEJoJ/y6pXfhQV4nei2NAOCClScFDscwqNPKZu8="; + sha256 = "sha256-pkso0Bpb+0Zua3MIXXEbaJDl/oENa51157mXTJXJC/A="; }; nativeBuildInputs = [ cmake ]; From 315db268438383a679d04f94d5790a5524eed1f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 07:26:47 +0000 Subject: [PATCH 38/58] fselect: 0.8.2 -> 0.8.3 --- pkgs/tools/misc/fselect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index ed64002fedd2..8621e4e674f4 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-JhiNLlgnVIrecYNlestociTXHBxfUMTQHSzo3/ePXds="; + sha256 = "sha256-f0fc+gj6t1PPdMekYzuZCy2WJrjssLzdsxFoBdFRKBM="; }; - cargoHash = "sha256-HOOxr5hBrenziai+TxatgXjMi8G3xqIM8OqdMeeKEgg="; + cargoHash = "sha256-nYavH8D3dQsr9tKB7PFETGp+KgTm/1EhRtAdTqbwrzQ="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; From 4eb5dce0d9c1987d780fd0889e13a5a5e1aa6f31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 07:31:56 +0000 Subject: [PATCH 39/58] wch-isp: 0.2.4 -> 0.2.5 --- pkgs/development/embedded/wch-isp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/wch-isp/default.nix b/pkgs/development/embedded/wch-isp/default.nix index b83b64292f4a..a08afa5729af 100644 --- a/pkgs/development/embedded/wch-isp/default.nix +++ b/pkgs/development/embedded/wch-isp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wch-isp"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "jmaselbas"; repo = pname; rev = "v${version}"; - hash = "sha256-YjxzfDSZRMa7B+hNqtj87nRlRuQyr51VidZqHLddgwI="; + hash = "sha256-JF1g2Qb1gG93lSaDQvltT6jCYk/dKntsIJPkQXYUvX4="; }; nativeBuildInputs = [ pkg-config ]; From 5eb7d5e09656a2f29093d25c0aa1269c9b62e782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 07:37:35 +0000 Subject: [PATCH 40/58] python311Packages.rplcd: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/rplcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rplcd/default.nix b/pkgs/development/python-modules/rplcd/default.nix index b0b68cb79a34..466bfa0ae966 100644 --- a/pkgs/development/python-modules/rplcd/default.nix +++ b/pkgs/development/python-modules/rplcd/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "rplcd"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit version; pname = "RPLCD"; - hash = "sha256-AIEiL+IPU76DF+P08c5qokiJcZdNNDJ/Jjng2Z292LY="; + hash = "sha256-uZ0pPzWK8cBSX8/qvcZGYEnlVdtWn/vKPyF1kfwU5Pk="; }; # Disable check because it depends on a GPIO library From f1c8b1c8b3fcd598b028b20b94d478453ae879ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 07:48:37 +0000 Subject: [PATCH 41/58] python310Packages.pulumi-aws: 5.40.0 -> 5.41.0 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 78766baadcb5..5046e61b4091 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.40.0"; + version = "5.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-DMSBQhBxbVfU7ULkLI8KV7JJLBsaVb/Z9BZZG2GEOzQ="; + hash = "sha256-axVzystW9kvyMP35h/GCN1Cy1y8CYNxZglWeXVJfWSc="; }; sourceRoot = "${src.name}/sdk/python"; From 46b5120d5ef0a70ffd814ce93aa13085ea0d985f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 23 May 2023 09:52:15 +0200 Subject: [PATCH 42/58] xrdp: 0.9.22 -> 0.9.22.1 https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.22.1 --- pkgs/applications/networking/remote/xrdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 67ddde5ce14e..0fb74488f0bf 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -34,7 +34,7 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.22"; + version = "0.9.22.1"; pname = "xrdp"; src = fetchFromGitHub { @@ -42,7 +42,7 @@ let repo = "xrdp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-/i2rLVrN1twKtQH6Qt1OZOPGZzegWBOKpj0Wnin8cR8="; + hash = "sha256-8gAP4wOqSmar8JhKRt4qRRwh23coIn0Q8Tt9ClHQSt8="; }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; From 75d229d5e63d0cd979935c46c502bf9d644ae34f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 08:10:23 +0000 Subject: [PATCH 43/58] libva-utils: 2.18.1 -> 2.18.2 --- pkgs/development/libraries/libva/utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 7b187c394c35..5606dd57c07d 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.18.1"; + version = "2.18.2"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-t8N+MQ/HueQWtNzEzfAPZb4q7FjFNhpTmX4JbJ5ZGqM="; + sha256 = "sha256-D7GPS/46jiIY8K0qPlMlYhmn+yWhTA+I6jAuxclNJSU="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From afdb1e0d7d306ee788c1c8ddec7168a7951a9406 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 23 May 2023 11:12:14 +0300 Subject: [PATCH 44/58] python310Packages.jaxlib: unbreak on aarch64-linux --- .../development/python-modules/jaxlib/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 1f4c8a9693b2..2bcf5e9c17c3 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -63,7 +63,7 @@ let # aarch64-darwin is broken because of https://github.com/bazelbuild/rules_cc/pull/136 # however even with that fix applied, it doesn't work for everyone: # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129 - broken = stdenv.isAarch64 || stdenv.isDarwin; + broken = stdenv.isDarwin; }; cudatoolkit_joined = symlinkJoin { @@ -129,6 +129,11 @@ let "zlib" ]; + arch = + # KeyError: ('Linux', 'arm64') + if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.linuxArch == "arm64" then "aarch64" + else stdenv.targetPlatform.linuxArch; + bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}"; @@ -291,7 +296,7 @@ let '' else throw "Unsupported stdenv.cc: ${stdenv.cc}"); installPhase = '' - ./bazel-bin/build/build_wheel --output_path=$out --cpu=${stdenv.targetPlatform.linuxArch} + ./bazel-bin/build/build_wheel --output_path=$out --cpu=${arch} ''; }; @@ -299,11 +304,11 @@ let }; platformTag = if stdenv.targetPlatform.isLinux then - "manylinux2014_${stdenv.targetPlatform.linuxArch}" + "manylinux2014_${arch}" else if stdenv.system == "x86_64-darwin" then - "macosx_10_9_${stdenv.targetPlatform.linuxArch}" + "macosx_10_9_${arch}" else if stdenv.system == "aarch64-darwin" then - "macosx_11_0_${stdenv.targetPlatform.linuxArch}" + "macosx_11_0_${arch}" else throw "Unsupported target platform: ${stdenv.targetPlatform}"; in From 5eb54a1cfbc7d11ff91f6c4e6e63c0537998884c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 23 May 2023 10:15:00 +0200 Subject: [PATCH 45/58] epub2txt2: use makeFlags instead of preConfigure, add mainProgram --- pkgs/tools/text/epub2txt2/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/epub2txt2/default.nix b/pkgs/tools/text/epub2txt2/default.nix index b648d706e5fa..c8645fc5fe2a 100644 --- a/pkgs/tools/text/epub2txt2/default.nix +++ b/pkgs/tools/text/epub2txt2/default.nix @@ -11,12 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-zzcig5XNh9TqUHginsfoC47WrKavqi6k6ezir+OOMJk="; }; - preConfigure = '' - sed -i Makefile -e 's!DESTDIR)!out)!' - sed -i Makefile -e 's!/usr!!' - ''; - - makeFlags = [ "CC:=$(CC)" ]; + makeFlags = [ "CC:=$(CC)" "PREFIX:=$(out)" ]; meta = { description = "A simple command-line utility for Linux, for extracting text from EPUB documents."; @@ -24,5 +19,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.leonid ]; + mainProgram = "epub2txt"; }; } From a777ab8ab098f3833877e42e2203806c6269bff9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 08:30:23 +0000 Subject: [PATCH 46/58] pgbackrest: 2.45 -> 2.46 --- pkgs/tools/backup/pgbackrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index 211f9b8466ad..fc86d5922eb7 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.45"; + version = "2.46"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-wm7wNxxwRAmFG7ZsZMR8TXp+xVu673g6w95afLalnc8="; + sha256 = "sha256-Jd49ZpG/QhX+ayk9Ld0FB8abemfxQV6KZZuSXmybZw4="; }; nativeBuildInputs = [ pkg-config ]; From 2ae0d901746e824786dc472eb340d5fcace5c041 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 23 May 2023 11:02:03 +0200 Subject: [PATCH 47/58] hugo: 0.111.3 -> 0.112.0 https://github.com/gohugoio/hugo/releases/tag/v0.112.0 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 3603bc13669d..0bc11f9eae82 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.111.3"; + version = "0.112.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - hash = "sha256-PgconAixlSgRHqmfRdOtcpVJyThZIKAB9Pm4AUvYVGQ="; + hash = "sha256-sZjcl7jxiNwz8rM2/jcpN/9iuZn6UTleNE6YZ/vmDso="; }; - vendorHash = "sha256-2a6+s0xLlj3VzXp9zbZgIi7WJShbUQH48tUG9Slm770="; + vendorHash = "sha256-A4mWrTSkE1NcLj8ozGXQJIrFMvqeoBC7y7eOTeh3ktw="; doCheck = false; From 0b33577097fcc7246f7a482e0a0dcc3d047ca23a Mon Sep 17 00:00:00 2001 From: dmayle Date: Wed, 19 Apr 2023 12:52:56 -0700 Subject: [PATCH 48/58] python310Packages.tensorflow-datasets: fix build --- .../tensorflow-datasets/default.nix | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 13777b7e76a1..77d96f466e7b 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -2,6 +2,8 @@ , attrs , beautifulsoup4 , buildPythonPackage +, click +, datasets , dill , dm-tree , fetchFromGitHub @@ -14,6 +16,7 @@ , jinja2 , langdetect , lib +, lxml , matplotlib , mwparserfromhell , networkx @@ -24,6 +27,7 @@ , pillow , promise , protobuf +, psutil , pycocotools , pydub , pytest-xdist @@ -65,6 +69,7 @@ buildPythonPackage rec { numpy promise protobuf + psutil requests six tensorflow-metadata @@ -79,12 +84,15 @@ buildPythonPackage rec { nativeCheckInputs = [ apache-beam beautifulsoup4 + click + datasets ffmpeg imagemagick jax jaxlib jinja2 langdetect + lxml matplotlib mwparserfromhell networkx @@ -109,19 +117,29 @@ buildPythonPackage rec { "tensorflow_datasets/core/dataset_info_test.py" "tensorflow_datasets/core/features/features_test.py" "tensorflow_datasets/core/github_api/github_path_test.py" + "tensorflow_datasets/core/registered_test.py" "tensorflow_datasets/core/utils/gcs_utils_test.py" + "tensorflow_datasets/import_without_tf_test.py" "tensorflow_datasets/scripts/cli/build_test.py" # Requires `pretty_midi` which is not packaged in `nixpkgs`. - "tensorflow_datasets/audio/groove_test.py" + "tensorflow_datasets/audio/groove.py" + "tensorflow_datasets/datasets/groove/groove_dataset_builder_test.py" # Requires `crepe` which is not packaged in `nixpkgs`. - "tensorflow_datasets/audio/nsynth_test.py" + "tensorflow_datasets/audio/nsynth.py" + "tensorflow_datasets/datasets/nsynth/nsynth_dataset_builder_test.py" + + # Requires `conllu` which is not packaged in `nixpkgs`. + "tensorflow_datasets/core/dataset_builders/conll/conllu_dataset_builder_test.py" + "tensorflow_datasets/datasets/universal_dependencies/universal_dependencies_dataset_builder_test.py" + "tensorflow_datasets/datasets/xtreme_pos/xtreme_pos_dataset_builder_test.py" # Requires `gcld3` and `pretty_midi` which are not packaged in `nixpkgs`. "tensorflow_datasets/core/lazy_imports_lib_test.py" # Requires `tensorflow_io` which is not packaged in `nixpkgs`. + "tensorflow_datasets/core/features/audio_feature_test.py" "tensorflow_datasets/image/lsun_test.py" # Requires `envlogger` which is not packaged in `nixpkgs`. @@ -133,6 +151,10 @@ buildPythonPackage rec { # to the differences in some of the dependencies? "tensorflow_datasets/rl_unplugged/rlu_atari/rlu_atari_test.py" + # Fails with `ValueError: setting an array element with a sequence` + "tensorflow_datasets/core/dataset_utils_test.py" + "tensorflow_datasets/core/features/sequence_feature_test.py" + # Requires `tensorflow_docs` which is not packaged in `nixpkgs` and the test is for documentation anyway. "tensorflow_datasets/scripts/documentation/build_api_docs_test.py" From 616a54de8ecb60250e118d421d7d1268cd100842 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 23 May 2023 11:19:59 +0200 Subject: [PATCH 49/58] maintainers: add thilobillerbeck --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a9c45507d9b9..7dafa9675c3f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15796,6 +15796,12 @@ github = "thielema"; githubId = 898989; }; + thilobillerbeck = { + name = "Thilo Billerbeck"; + email = "thilo.billerbeck@officerent.de"; + github = "thilobillerbeck"; + githubId = 7442383; + }; thled = { name = "Thomas Le Duc"; email = "dev@tleduc.de"; From f2545326949b68ee55054dcf876d4fea4cb08452 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Tue, 23 May 2023 11:20:14 +0200 Subject: [PATCH 50/58] bun: 0.6.2 -> 0.6.3 --- pkgs/development/web/bun/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 311c7ffd8d28..e89bdcdf1111 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.6.2"; + version = "0.6.3"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "Zt17kNKVyqql+wHxR+H2peyz3ADj5h506Vg5jJVF6uE="; + sha256 = "u2sgfejY9I6zjpo30H63Pf8FrnI9yzvKZKdVCEwuMJo="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "I8Z0S6th4Iay5/5VPnL+wY0ROUAyOzNPtkOij8KsyMo="; + sha256 = "fGq9m17WZ382UOROpAHUuk21mU1WhgmzQDUAb0RpGfo="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "zl5/fihD+if18ykCJV4VBXhqoarSLsIpT+sz1Ba1Xtg="; + sha256 = "npRAY3ffTDd5uOcHGoKksD5mDHPBqYAqxuuQKd4PC3Q="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "aXZzMxsmkFiZgvLv6oZurb4lc6R2/SmJ6GQaZV/kCLw="; + sha256 = "UBrNOjrK+40OlkiFT8d8oav/2ZSAaz0xWYCalGtahs8="; }; }; updateScript = writeShellScript "update-bun" '' @@ -74,7 +74,7 @@ stdenvNoCC.mkDerivation rec { mit # bun core lgpl21Only # javascriptcore and webkit ]; - maintainers = with maintainers; [ DAlperin jk ]; + maintainers = with maintainers; [ DAlperin jk thilobillerbeck ]; platforms = builtins.attrNames passthru.sources; }; } From 12f7d7792930509092986ad6b7820f381301e507 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 23 May 2023 12:27:11 +0300 Subject: [PATCH 51/58] python310Packages.jax: fix build on aarch64-linux --- pkgs/development/python-modules/jax/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 12a69358b45e..4901467262f3 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { "test_custom_linear_solve_cholesky" "test_custom_root_with_aux" "testEigvalsGrad_shape" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ] ++ lib.optionals stdenv.isAarch64 [ # See https://github.com/google/jax/issues/14793. "test_for_loop_fixpoint_correctly_identifies_loop_varying_residuals_unrolled_for_loop" "testQdwhWithRandomMatrix3" @@ -107,6 +107,9 @@ buildPythonPackage rec { "tests/nn_test.py" "tests/random_test.py" "tests/sparse_test.py" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # RuntimeWarning: invalid value encountered in cast + "tests/lax_test.py" ]; # As of 0.3.22, `import jax` does not work without jaxlib being installed. From 48af6808743a3513e233947edfa8ec9a60ede94d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 10:00:22 +0000 Subject: [PATCH 52/58] ustreamer: 5.37 -> 5.38 --- pkgs/applications/video/ustreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index de2b6898ddeb..77ad5af676ed 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.37"; + version = "5.38"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "sha256-Ervzk5TNYvo7nHyt0cBN8BMjgJKu2sqeXCltero3AnE="; + sha256 = "sha256-pc1Pf8KnjGPb74GbcmHaj/XCD0wjgiglaAKjnZUa6Ag="; }; buildInputs = [ libbsd libevent libjpeg ]; From 8b75b96ea3aae346176cc11de24e7fd8ff4d7b1a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 23 May 2023 07:22:51 +1000 Subject: [PATCH 53/58] crun: 1.8.4 -> 1.8.5 Diff: https://github.com/containers/crun/compare/1.8.4...1.8.5 Changelog: https://github.com/containers/crun/releases/tag/1.8.5 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index ae4896e3570d..fbc4482536f1 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-wJ9V47X3tofFiwOzYignycm3PTRQWcAJ9iR2r5rJeJA="; + hash = "sha256-T51dVNtqQbXoPshlAkBzJOGTNTPM+AlqRYbqS8GX2NE="; fetchSubmodules = true; }; From c2f0c9e2d08747ac78764ad8754386ad3bd41a35 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 23 May 2023 12:05:58 +0200 Subject: [PATCH 54/58] helix: prevent grammars referencing sources (#233580) --- pkgs/applications/editors/helix/grammars.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/helix/grammars.nix b/pkgs/applications/editors/helix/grammars.nix index be764ac75693..2f5f97970c4c 100644 --- a/pkgs/applications/editors/helix/grammars.nix +++ b/pkgs/applications/editors/helix/grammars.nix @@ -47,7 +47,6 @@ then "${source}/${grammar.source.subpath}" else source; - dontUnpack = true; dontConfigure = true; FLAGS = [ @@ -64,13 +63,13 @@ buildPhase = '' runHook preBuild - if [[ -e "$src/src/scanner.cc" ]]; then - $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS - elif [[ -e "$src/src/scanner.c" ]]; then - $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS + if [[ -e "src/scanner.cc" ]]; then + $CXX -c "src/scanner.cc" -o scanner.o $FLAGS + elif [[ -e "src/scanner.c" ]]; then + $CC -c "src/scanner.c" -o scanner.o $FLAGS fi - $CC -c "$src/src/parser.c" -o parser.o $FLAGS + $CC -c "src/parser.c" -o parser.o $FLAGS $CXX -shared -o $NAME.so *.o runHook postBuild From 011cd2cdbfb48f4c864c358fa3a81786524dab9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 May 2023 10:16:36 +0000 Subject: [PATCH 55/58] ofono: 2.0 -> 2.1 --- pkgs/tools/networking/ofono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index f17e96f0d744..4872900b0fb7 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "2.0"; + version = "2.1"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "sha256-T8rfReruvHGQCN9IDGIrFCoNjFKKMnUGPKzxo2HTZFQ="; + sha256 = "sha256-GxQfh/ps5oM9G6B1EVgnjo8LqHD1hMqdnju1PCQq3kA="; }; patches = [ From bec9f57aa59e20f3c22d0e85188bd1623c205918 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 16 May 2023 13:10:59 +0200 Subject: [PATCH 56/58] =?UTF-8?q?coqPackages.CoLoR:=201.8.2=20=E2=86=92=20?= =?UTF-8?q?1.8.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/CoLoR/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index a926f6d8092d..a47927459e03 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -5,12 +5,14 @@ mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ + {case = range "8.14" "8.17"; out = "1.8.3"; } {case = range "8.12" "8.16"; out = "1.8.2"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } {case = range "8.6" "8.7"; out = "1.4.0"; } ] null; + release."1.8.3".sha256 = "sha256-mMUzIorkQ6WWQBJLk1ioUNwAdDdGHJyhenIvkAjALVU="; release."1.8.2".sha256 = "sha256:1gvx5cxm582793vxzrvsmhxif7px18h9xsb2jljy2gkphdmsnpqj"; release."1.8.1".sha256 = "0knhca9fffmyldn4q16h9265i7ih0h4jhcarq4rkn0wnn7x8w8yw"; release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; From a1815ec7dab8d4d331dd058f3f0e57d13e93384a Mon Sep 17 00:00:00 2001 From: rxiao Date: Mon, 22 May 2023 16:34:23 +1000 Subject: [PATCH 57/58] python3.pkgs.mmengine: init at 0.7.3 --- .../python-modules/mmengine/default.nix | 78 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/development/python-modules/mmengine/default.nix diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix new file mode 100644 index 000000000000..3771cfc77f50 --- /dev/null +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -0,0 +1,78 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, torch +, opencv4 +, yapf +, coverage +, mlflow +, lmdb +, matplotlib +, numpy +, pyyaml +, rich +, termcolor +, addict +, parameterized +}: + +buildPythonPackage rec { + pname = "mmengine"; + version = "0.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "open-mmlab"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Ook85XWosxbvshsQxZEoAWI/Ugl2uSO8zoNJ5EuuW1E="; + }; + + # tests are disabled due to sandbox env. + disabledTests = [ + "test_fileclient" + "test_http_backend" + "test_misc" + ]; + + nativeBuildInputs = [ pytestCheckHook ]; + + nativeCheckInputs = [ + coverage + lmdb + mlflow + torch + parameterized + ]; + + propagatedBuildInputs = [ + addict + matplotlib + numpy + pyyaml + rich + termcolor + yapf + opencv4 + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + pythonImportsCheck = [ + "mmengine" + ]; + + meta = with lib; { + description = "a foundational library for training deep learning models based on PyTorch"; + homepage = "https://github.com/open-mmlab/mmengine"; + changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ rxiao ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c79c80eade01..2afa62866499 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6299,6 +6299,8 @@ self: super: with self; { mmcv = callPackage ../development/python-modules/mmcv { }; + mmengine = callPackage ../development/python-modules/mmengine { }; + mmh3 = callPackage ../development/python-modules/mmh3 { }; mmpython = callPackage ../development/python-modules/mmpython { }; From 93581dbb574af0b5142638a559aa66db1ddc4042 Mon Sep 17 00:00:00 2001 From: rxiao Date: Mon, 22 May 2023 16:36:15 +1000 Subject: [PATCH 58/58] python3.pkgs.mmcv: 1.7.1 -> 2.0.0 --- pkgs/development/python-modules/mmcv/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix index 40efd7589f21..fcc59e417c0c 100644 --- a/pkgs/development/python-modules/mmcv/default.nix +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -18,6 +18,7 @@ , pyturbojpeg , tifffile , lmdb +, mmengine , symlinkJoin }: @@ -48,16 +49,16 @@ let in buildPythonPackage rec { pname = "mmcv"; - version = "1.7.1"; + version = "2.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "open-mmlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-b4MLBPNRCcPq1osUvqo71PCWVX7lOjAH+dXttd4ZapU"; + hash = "sha256-36PcvoB0bM0VoNb2psURYFo3krmgHG47OufU6PVjHyw="; }; preConfigure = '' @@ -100,6 +101,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook torchvision lmdb onnx onnxruntime scipy pyturbojpeg tifffile ]; propagatedBuildInputs = [ + mmengine torch opencv4 yapf