diff --git a/lib/sources.nix b/lib/sources.nix index 407829b547b0..ae2df7235213 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -43,7 +43,9 @@ let lib.hasSuffix ".o" baseName || lib.hasSuffix ".so" baseName || # Filter out nix-build result symlinks - (type == "symlink" && lib.hasPrefix "result" baseName) + (type == "symlink" && lib.hasPrefix "result" baseName) || + # Filter out sockets and other types of files we can't have in the store. + (type == "unknown") ); # Filters a source tree removing version control files and directories using cleanSourceWith diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index db5dddd4d8d6..35eb360c9211 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1909,6 +1909,12 @@ githubId = 3086255; name = "Barry Moore II"; }; + chisui = { + email = "chisui.pd@gmail.com"; + github = "chisui"; + githubId = 4526429; + name = "Philipp Dargel"; + }; chivay = { email = "hubert.jasudowicz@gmail.com"; github = "chivay"; @@ -4811,6 +4817,12 @@ githubId = 26877687; name = "Yurii Izorkin"; }; + j0xaf = { + email = "j0xaf@j0xaf.de"; + name = "Jörn Gersdorf"; + github = "j0xaf"; + githubId = 932697; + }; j0hax = { name = "Johannes Arnold"; email = "johannes.arnold@stud.uni-hannover.de"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6103774ddd0d..4836bce97528 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -98,6 +98,7 @@ in deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./dendrite.nix {}; dhparams = handleTest ./dhparams.nix {}; + disable-installer-tools = handleTest ./disable-installer-tools.nix {}; discourse = handleTest ./discourse.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {}; diff --git a/nixos/tests/disable-installer-tools.nix b/nixos/tests/disable-installer-tools.nix new file mode 100644 index 000000000000..23c15faa8d33 --- /dev/null +++ b/nixos/tests/disable-installer-tools.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }: + +{ + name = "disable-installer-tools"; + + machine = + { pkgs, lib, ... }: + { + system.disableInstallerTools = true; + boot.enableContainers = false; + environment.defaultPackages = []; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + + with subtest("nixos installer tools should not be included"): + machine.fail("which nixos-rebuild") + machine.fail("which nixos-install") + machine.fail("which nixos-generate-config") + machine.fail("which nixos-enter") + machine.fail("which nixos-version") + machine.fail("which nixos-build-vms") + + with subtest("perl should not be included"): + machine.fail("which perl") + ''; +}) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 7e1865462e63..81912379de1d 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.7.0"; + version = "3.7.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "YixaO54+V9RTYS+Of7AVvBtxUEuCdbzlJmyIBj5k8jlD0bvRP1XwIIeADnofKBLAa2ZsmiQunznPLsjQWgr4JA=="; + sha512 = "n+ZFfKYUx6silpH4bGNRdh5JJPchjKNzFLAhZQPecK2DkmygY35/ZYUNSBioqxuGKax+I/mY5podmQ5iD95ohQ=="; }; appimageContents = appimageTools.extractType2 { @@ -34,7 +34,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/31"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/32"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/wasabibackend/create_deps.sh b/pkgs/applications/blockchains/wasabibackend/create_deps.sh old mode 100644 new mode 100755 index 814f92a341a6..79bc88ca8996 --- a/pkgs/applications/blockchains/wasabibackend/create_deps.sh +++ b/pkgs/applications/blockchains/wasabibackend/create_deps.sh @@ -1,13 +1,26 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p dotnet-sdk_3 nixfmt +#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixfmt +set -euo pipefail # Run this script to generate deps.nix -# ./create_deps.sh /path/to/package/source/checkout > deps.nix # TODO: consolidate with other dotnet deps generation scripts by which # this script is inspired: # - pkgs/servers/nosql/eventstore/create-deps.sh # - pkgs/development/dotnet-modules/python-language-server/create_deps.sh +# - pkgs/misc/emulators/ryujinx/updater.sh + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +exec 2>&1 6> "$deps_file" + +store_src="$( nix-build ../../../.. -A wasabibackend.src --no-out-link )" +src="$(mktemp -d)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" +pushd "$src" URLBASE="https://www.nuget.org/api/v2/package" @@ -30,69 +43,56 @@ DEPS_TEMPLATE=" sha256 = \"%s\"; })" +tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root +trap 'rm -rf "$tmpdir"' EXIT -function generate_restore_log() { - checkout_path=$1 - >&2 echo "generating restore log for $checkout_path..." - cd $checkout_path - dotnet nuget locals all --clear - dotnet restore -v normal --no-cache WalletWasabi.Backend -r linux-x64 - cd - -} +HOME="$tmpdir" dotnet restore --packages "$tmpdir"/.nuget/packages \ + --no-cache --force --runtime linux-x64 \ + WalletWasabi.Backend/WalletWasabi.Backend.csproj >&2 -function process_restore_log() { - restore_log=$1 - >&2 echo "processing restore log..." - while read line; do - if echo $line | grep -q "^[[:space:]]*Installing"; then - l=$(echo $line | xargs) - l=${l#Installing } - l=${l%.} - echo $l - fi - done < $restore_log -} +mapfile -t repos < <( + xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config | + while IFS= read index + do + curl --compressed -fsL "$index" | \ + jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' + done +) -function prefetch_deps() { - processed_log=$1 - >&2 echo "prefetching deps..." - while read line; do - name=$(echo $line | cut -d' ' -f1) - >&2 echo "prefetching '$name' version: $version" - version=$(echo $line | cut -d' ' -f2) - hash=$(nix-prefetch-url "$URLBASE/$name/$version" 2>/dev/null) - echo "$name $version $hash" - done < $processed_log -} +echo $DEPS_HEADER >&6 -function generate_deps_expression() { - packages=$1 - >&2 echo "generating deps nix-expression..." - echo $DEPS_HEADER - while read line; do - name=$(echo $line | cut -d' ' -f1) - version=$(echo $line | cut -d' ' -f2) - hash=$(echo $line | cut -d' ' -f3) - printf "$DEPS_TEMPLATE" $name $version $hash - done < $packages - echo $DEPS_FOOTER -} +cd "$tmpdir/.nuget/packages" +for package in * +do + cd "$package" + for version in * + do + found=false + for repo in "${repos[@]}" + do + url="$repo$package/$version/$package.$version.nupkg" + if curl -fsL "$url" -o /dev/null + then + found=true + break + fi + done -function main() { - checkout_path=$1 - tmpdir=$(mktemp -d) - generate_restore_log $checkout_path > $tmpdir/restore.log - process_restore_log $tmpdir/restore.log > $tmpdir/processed.log - prefetch_deps $tmpdir/processed.log > $tmpdir/prefetched.log - generate_deps_expression $tmpdir/prefetched.log > $tmpdir/deps.nix - nixfmt $tmpdir/deps.nix - cat $tmpdir/deps.nix - rm -rf $tmpdir -} + if ! $found + then + echo "couldn't find $package $version" >&2 + exit 1 + fi -if [ ! -d "$1" ]; then - >&2 echo "First argument must be a directory, the path to the package source checkout" - exit 1 -fi + sha256=$(nix-prefetch-url "$url" 2>/dev/null) -main $@ + printf "$DEPS_TEMPLATE" $package $version $sha256 >&6 + done + cd .. +done + +echo $DEPS_FOOTER >&6 + +exec 6>&- + +nixfmt "$deps_file" diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index 4d4489efa3cb..47ee3f9bfe59 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -9,948 +9,948 @@ let in [ (fetchNuGet { - name = "System.Xml.XmlSerializer"; - version = "4.0.11"; - sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + name = "microsoft.aspnetcore.app.runtime.linux-x64"; + version = "3.1.19"; + sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) - (fetchNuGet { - name = "System.Threading.Overlapped"; - version = "4.0.1"; - sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; - }) - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.0.1"; - sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; - }) - (fetchNuGet { - name = "System.Private.DataContractSerialization"; - version = "4.1.1"; - sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.0.0"; - sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.0.1"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; - }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) - (fetchNuGet { - name = "Microsoft.VisualStudio.Web.CodeGeneration.Tools"; - version = "2.0.2"; - sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) - (fetchNuGet { - name = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts"; - version = "2.0.2"; - sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; - }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Physical"; - version = "2.0.0"; - sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; - }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.1.0"; - sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App"; - version = "2.0.5"; - sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; - }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography"; - version = "4.0.0"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; - }) - (fetchNuGet { - name = "NuGet.Frameworks"; - version = "4.0.0"; - sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq"; - }) - (fetchNuGet { - name = "Microsoft.Build.Runtime"; - version = "15.3.409"; - sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.0.0"; - sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.0.1"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "10.0.1"; - sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.DotNetAppHost"; - version = "2.0.5"; - sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws"; - }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.4.0"; - sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileSystemGlobbing"; - version = "2.0.0"; - sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.0.0"; - sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.0.1"; - sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.DotNetHostPolicy"; - version = "2.0.5"; - sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.1"; - sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - name = "System.Collections.Specialized"; - version = "4.3.0"; - sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; - }) - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.3.0"; - sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; - }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; - version = "4.3.0"; - sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.0"; - sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; - }) - (fetchNuGet { - name = "Microsoft.Build.Framework"; - version = "15.3.409"; - sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; - }) - (fetchNuGet { - name = "Microsoft.Build.Tasks.Core"; - version = "15.3.409"; - sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933"; - }) - (fetchNuGet { - name = "System.Text.Encoding.CodePages"; - version = "4.0.1"; - sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; - }) - (fetchNuGet { - name = "Microsoft.Build.Utilities.Core"; - version = "15.3.409"; - sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; - }) - (fetchNuGet { - name = "Microsoft.Build"; - version = "15.3.409"; - sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Formatters"; - version = "4.3.0"; - sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.3.0"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Dataflow"; - version = "4.6.0"; - sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.3.0"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; - }) - (fetchNuGet { - name = "System.IO.Pipes"; - version = "4.0.0"; - sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za"; - }) - (fetchNuGet { - name = "System.Diagnostics.FileVersionInfo"; - version = "4.0.0"; - sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { - name = "System.Diagnostics.Contracts"; - version = "4.0.1"; - sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.3.0"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; - }) - (fetchNuGet { - name = "System.Runtime.Loader"; - version = "4.0.0"; - sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; - }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Xml"; - version = "4.1.1"; - sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; - }) - (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.2.0"; - sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.3.0"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; - }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; - version = "4.3.0"; - sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; - }) - (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.3.0"; - sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }) - (fetchNuGet { - name = "System.Linq.Parallel"; - version = "4.0.1"; - sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.3.0"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; - }) - (fetchNuGet { - name = "System.Diagnostics.Process"; - version = "4.1.0"; - sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.0.1"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "2.0.0"; - sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.DotNetHostResolver"; - version = "2.0.5"; - sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; - }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }) - (fetchNuGet { - name = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; - }) - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; - version = "4.0.0"; - sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; - }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; - }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) - (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.0.1"; - sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) - (fetchNuGet { - name = "System.Resources.Writer"; - version = "4.0.0"; - sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; - }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.0.1"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; - }) - (fetchNuGet { - name = "System.Console"; - version = "4.0.0"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; - }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.0.1"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; - }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; - version = "4.0.1"; - sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.1.0"; - sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; - }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - name = "System.Resources.Reader"; - version = "4.0.0"; - sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; - }) - (fetchNuGet { - name = "System.Threading.Thread"; - version = "4.0.0"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; - }) - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.0.1"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.2.0"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; - }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; - }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; - }) - (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; - }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; - }) - (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) - (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "11.0.1"; - sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "1.0.0"; - sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; - }) - (fetchNuGet { - name = "Newtonsoft.Json.Bson"; - version = "1.0.2"; - sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.JsonPatch"; + name = "microsoft.aspnetcore.jsonpatch"; version = "3.1.1"; sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; }) (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; - }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.7.0"; - sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; - }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.7.0"; - sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.47"; - sha256 = "1plri6q83jn80m95np0zxdg3nk2f36z8v42j4sg5wjv8qppp866d"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; + name = "microsoft.aspnetcore.mvc.newtonsoftjson"; version = "3.1.1"; sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; }) (fetchNuGet { - name = "Microsoft.Win32.Registry"; + name = "microsoft.build"; + version = "15.3.409"; + sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; + }) + (fetchNuGet { + name = "microsoft.build.framework"; + version = "15.3.409"; + sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; + }) + (fetchNuGet { + name = "microsoft.build.runtime"; + version = "15.3.409"; + sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; + }) + (fetchNuGet { + name = "microsoft.build.tasks.core"; + version = "15.3.409"; + sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933"; + }) + (fetchNuGet { + name = "microsoft.build.utilities.core"; + version = "15.3.409"; + sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; + }) + (fetchNuGet { + name = "microsoft.csharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "microsoft.csharp"; version = "4.7.0"; - sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { - name = "NBitcoin.Secp256k1"; - version = "1.0.3"; - sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj"; - }) - (fetchNuGet { - name = "Microsoft.OpenApi"; - version = "1.1.4"; - sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3"; - }) - (fetchNuGet { - name = "Swashbuckle.AspNetCore.SwaggerUI"; - version = "5.0.0"; - sha256 = "0d7vjq489rz208j6k3rb7vq6mzxzff3mqg83yk2rqy25vklrsbjd"; - }) - (fetchNuGet { - name = "Swashbuckle.AspNetCore"; - version = "5.0.0"; - sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09"; - }) - (fetchNuGet { - name = "Swashbuckle.AspNetCore.SwaggerGen"; - version = "5.0.0"; - sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.ApiDescription.Server"; + name = "microsoft.extensions.apidescription.server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) (fetchNuGet { - name = "Swashbuckle.AspNetCore.Swagger"; - version = "5.0.0"; - sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; + name = "microsoft.extensions.fileproviders.abstractions"; + version = "2.0.0"; + sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; }) (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; + name = "microsoft.extensions.fileproviders.physical"; + version = "2.0.0"; + sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; + }) + (fetchNuGet { + name = "microsoft.extensions.filesystemglobbing"; + version = "2.0.0"; + sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; + }) + (fetchNuGet { + name = "microsoft.extensions.logging.abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + }) + (fetchNuGet { + name = "microsoft.extensions.primitives"; + version = "2.0.0"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + }) + (fetchNuGet { + name = "microsoft.netcore.app"; + version = "2.0.5"; + sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; + }) + (fetchNuGet { + name = "microsoft.netcore.app.runtime.linux-x64"; + version = "3.1.19"; + sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + }) + (fetchNuGet { + name = "microsoft.netcore.dotnetapphost"; + version = "2.0.5"; + sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws"; + }) + (fetchNuGet { + name = "microsoft.netcore.dotnethostpolicy"; + version = "2.0.5"; + sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; + }) + (fetchNuGet { + name = "microsoft.netcore.dotnethostresolver"; + version = "2.0.5"; + sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "2.0.1"; + sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "microsoft.openapi"; + version = "1.1.4"; + sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3"; + }) + (fetchNuGet { + name = "microsoft.visualstudio.web.codegeneration.contracts"; + version = "2.0.2"; + sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; + }) + (fetchNuGet { + name = "microsoft.visualstudio.web.codegeneration.tools"; + version = "2.0.2"; + sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6"; + }) + (fetchNuGet { + name = "microsoft.win32.primitives"; version = "4.0.1"; - sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.0.11"; - sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; + name = "microsoft.win32.registry"; + version = "4.0.0"; + sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) (fetchNuGet { - name = "System.Private.Uri"; - version = "4.0.1"; - sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; + name = "microsoft.win32.registry"; + version = "4.7.0"; + sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; + name = "nbitcoin"; + version = "5.0.47"; + sha256 = "1plri6q83jn80m95np0zxdg3nk2f36z8v42j4sg5wjv8qppp866d"; }) (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; + name = "nbitcoin.secp256k1"; + version = "1.0.3"; + sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj"; }) (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.1.0"; - sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; + name = "netstandard.library"; + version = "1.6.0"; + sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.1.0"; - sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; + name = "netstandard.library"; + version = "2.0.1"; + sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; }) (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; + name = "newtonsoft.json"; + version = "10.0.1"; + sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; + name = "newtonsoft.json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; }) (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; + name = "newtonsoft.json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; + name = "newtonsoft.json.bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.1.0"; - sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; + name = "nuget.frameworks"; + version = "4.0.0"; + sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq"; }) (fetchNuGet { - name = "runtime.any.System.Collections"; + name = "runtime.any.system.collections"; version = "4.0.11"; sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) (fetchNuGet { - name = "runtime.any.System.Globalization"; + name = "runtime.any.system.diagnostics.tracing"; + version = "4.1.0"; + sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; + }) + (fetchNuGet { + name = "runtime.any.system.globalization"; version = "4.0.11"; sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; }) (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; + name = "runtime.any.system.io"; + version = "4.1.0"; + sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; + }) + (fetchNuGet { + name = "runtime.any.system.reflection"; + version = "4.1.0"; + sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; + }) + (fetchNuGet { + name = "runtime.any.system.reflection.primitives"; + version = "4.0.1"; + sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; + }) + (fetchNuGet { + name = "runtime.any.system.resources.resourcemanager"; version = "4.0.1"; sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; }) (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; + name = "runtime.any.system.runtime"; + version = "4.1.0"; + sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; + }) + (fetchNuGet { + name = "runtime.any.system.runtime.handles"; + version = "4.0.1"; + sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; + }) + (fetchNuGet { + name = "runtime.any.system.runtime.interopservices"; + version = "4.1.0"; + sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; + }) + (fetchNuGet { + name = "runtime.any.system.text.encoding"; + version = "4.0.11"; + sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; + }) + (fetchNuGet { + name = "runtime.any.system.threading.tasks"; + version = "4.0.11"; + sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; + }) + (fetchNuGet { + name = "runtime.native.system"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.system.io.compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) + (fetchNuGet { + name = "runtime.native.system.net.http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.unix.system.diagnostics.debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) + (fetchNuGet { + name = "runtime.unix.system.private.uri"; + version = "4.0.1"; + sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; + }) + (fetchNuGet { + name = "runtime.unix.system.runtime.extensions"; + version = "4.1.0"; + sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; + }) + (fetchNuGet { + name = "swashbuckle.aspnetcore"; + version = "5.0.0"; + sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09"; + }) + (fetchNuGet { + name = "swashbuckle.aspnetcore.swagger"; + version = "5.0.0"; + sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; + }) + (fetchNuGet { + name = "swashbuckle.aspnetcore.swaggergen"; + version = "5.0.0"; + sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; + }) + (fetchNuGet { + name = "swashbuckle.aspnetcore.swaggerui"; + version = "5.0.0"; + sha256 = "0d7vjq489rz208j6k3rb7vq6mzxzff3mqg83yk2rqy25vklrsbjd"; + }) + (fetchNuGet { + name = "system.appcontext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) + (fetchNuGet { + name = "system.buffers"; + version = "4.0.0"; + sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; + }) + (fetchNuGet { + name = "system.collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "system.collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "system.collections.concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "system.collections.immutable"; + version = "1.2.0"; + sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; + }) + (fetchNuGet { + name = "system.collections.nongeneric"; + version = "4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }) + (fetchNuGet { + name = "system.collections.nongeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "system.collections.specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "system.componentmodel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "system.componentmodel.primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "system.componentmodel.typeconverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "system.console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "system.diagnostics.contracts"; + version = "4.0.1"; + sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j"; + }) + (fetchNuGet { + name = "system.diagnostics.debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "system.diagnostics.debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "system.diagnostics.diagnosticsource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "system.diagnostics.fileversioninfo"; + version = "4.0.0"; + sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3"; + }) + (fetchNuGet { + name = "system.diagnostics.process"; + version = "4.1.0"; + sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; + }) + (fetchNuGet { + name = "system.diagnostics.tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "system.diagnostics.tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "system.diagnostics.tracesource"; + version = "4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; + }) + (fetchNuGet { + name = "system.diagnostics.tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "system.dynamic.runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "system.dynamic.runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "system.globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "system.globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "system.globalization.calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "system.globalization.extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "system.globalization.extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "system.io"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "system.io"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "system.io.compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) + (fetchNuGet { + name = "system.io.compression.zipfile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) + (fetchNuGet { + name = "system.io.filesystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "system.io.filesystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "system.io.filesystem.primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "system.io.filesystem.primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "system.io.pipes"; + version = "4.0.0"; + sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za"; + }) + (fetchNuGet { + name = "system.linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "system.linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "system.linq.expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "system.linq.expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "system.linq.parallel"; + version = "4.0.1"; + sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; + }) + (fetchNuGet { + name = "system.net.http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "system.net.primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "system.net.sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "system.objectmodel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "system.objectmodel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "system.private.datacontractserialization"; + version = "4.1.1"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; + }) + (fetchNuGet { + name = "system.private.uri"; + version = "4.0.1"; + sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; + }) + (fetchNuGet { + name = "system.reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "system.reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "system.reflection.emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "system.reflection.emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "system.reflection.emit.ilgeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "system.reflection.emit.ilgeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "system.reflection.emit.lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "system.reflection.emit.lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "system.reflection.extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "system.reflection.extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "system.reflection.metadata"; + version = "1.3.0"; + sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; + }) + (fetchNuGet { + name = "system.reflection.primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "system.reflection.primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "system.reflection.typeextensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "system.reflection.typeextensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "system.resources.reader"; + version = "4.0.0"; + sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; + }) + (fetchNuGet { + name = "system.resources.resourcemanager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "system.resources.resourcemanager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "system.resources.writer"; + version = "4.0.0"; + sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; + }) + (fetchNuGet { + name = "system.runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "system.runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "system.runtime.compilerservices.unsafe"; + version = "4.4.0"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + }) + (fetchNuGet { + name = "system.runtime.extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "system.runtime.extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "system.runtime.handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "system.runtime.handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "system.runtime.interopservices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "system.runtime.interopservices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "system.runtime.loader"; + version = "4.0.0"; + sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; + }) + (fetchNuGet { + name = "system.runtime.numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "system.runtime.numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "system.runtime.serialization.formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "system.runtime.serialization.primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "system.runtime.serialization.primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "system.runtime.serialization.xml"; + version = "4.1.1"; + sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; + }) + (fetchNuGet { + name = "system.security.accesscontrol"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }) + (fetchNuGet { + name = "system.security.cryptography.algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "system.security.cryptography.cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "system.security.cryptography.csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "system.security.cryptography.encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "system.security.cryptography.openssl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "system.security.cryptography.primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "system.security.cryptography.x509certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "system.security.principal"; + version = "4.0.1"; + sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; + }) + (fetchNuGet { + name = "system.security.principal.windows"; + version = "4.7.0"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }) + (fetchNuGet { + name = "system.text.encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "system.text.encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "system.text.encoding.codepages"; + version = "4.0.1"; + sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; + }) + (fetchNuGet { + name = "system.text.encoding.extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "system.text.encoding.extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "system.threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "system.threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "system.threading.overlapped"; + version = "4.0.1"; + sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; + }) + (fetchNuGet { + name = "system.threading.tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "system.threading.tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "system.threading.tasks.dataflow"; + version = "4.6.0"; + sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1"; + }) + (fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "system.threading.thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) + (fetchNuGet { + name = "system.threading.threadpool"; + version = "4.0.10"; + sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + }) + (fetchNuGet { + name = "system.threading.timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "system.xml.readerwriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "system.xml.readerwriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "system.xml.xdocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "system.xml.xdocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "system.xml.xmldocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) + (fetchNuGet { + name = "system.xml.xmldocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "system.xml.xmlserializer"; + version = "4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) + (fetchNuGet { + name = "system.xml.xpath"; + version = "4.0.1"; + sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; + }) + (fetchNuGet { + name = "system.xml.xpath.xmldocument"; + version = "4.0.1"; + sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; + }) ] diff --git a/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix index 9f010921d629..2533153bd447 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix @@ -4,18 +4,18 @@ trivialBuild rec { pname = "agda-mode"; - version = pkgs.haskellPackages.Agda.version; + version = haskellPackages.Agda.version; dontUnpack = true; # already byte-compiled by Agda builder buildPhase = '' - agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate` + agda=`${haskellPackages.Agda}/bin/agda-mode locate` cp `dirname $agda`/*.el* . ''; meta = { - inherit (pkgs.haskellPackages.Agda.meta) homepage license; + inherit (haskellPackages.Agda.meta) homepage license; description = "Agda2-mode for Emacs extracted from Agda package"; longDescription = '' Wrapper packages that liberates init.el from `agda-mode locate` magic. diff --git a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix index 9bbe7e4ca550..fa7725fbb94c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix @@ -1,6 +1,7 @@ { lib , trivialBuild , fetchFromGitHub +, emacs }: trivialBuild rec { diff --git a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix index 22f8ae64d9c0..58c542a57f4f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix @@ -2,7 +2,6 @@ , trivialBuild , fetchFromGitHub , emacs -, emacsPackages }: trivialBuild rec { @@ -20,7 +19,7 @@ trivialBuild rec { emacs ] ++ propagatedUserEnvPkgs; - propagatedUserEnvPkgs = with emacsPackages; [ + propagatedUserEnvPkgs = with emacs.pkgs; [ evil markdown-mode ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix index 7c45b11c840d..8b353409c372 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , emacs +, trivialBuild }: trivialBuild { diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix index 6b298cee4891..067d6f4481f2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchFromGitHub , trivialBuild , emacs }: diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix index 065f76552b14..b0df381b5f95 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, trivialBuild , emacs }: diff --git a/pkgs/applications/editors/neovim/tests.nix b/pkgs/applications/editors/neovim/tests.nix index 202b18efb8cf..085fceac1108 100644 --- a/pkgs/applications/editors/neovim/tests.nix +++ b/pkgs/applications/editors/neovim/tests.nix @@ -87,10 +87,30 @@ rec { nvim_with_plug = neovim.override { extraName = "-with-plug"; configure.plug.plugins = with pkgs.vimPlugins; [ - vim-go + base16-vim ]; + configure.customRC = '' + color base16-tomorrow-night + set background=dark + ''; }; + run_nvim_with_plug = runTest nvim_with_plug '' + export HOME=$TMPDIR + ${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit! + ''; + + + # check that the vim-doc hook correctly generates the tag + # we know for a fact packer has a doc folder + checkForTags = vimPlugins.packer-nvim.overrideAttrs(oldAttrs: { + doInstallCheck = true; + installCheckPhase = '' + [ -f $out/doc/tags ] + ''; + }); + + # nixpkgs should detect that no wrapping is necessary nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 7458377d42de..d4fc82b91393 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.40"; + version = "0.99.41"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-K1rf8/7kEpfLOPYJGh5U2eTnr5XCDhuc+seoUAKW7aE="; + sha256 = "sha256-Bhk5xpJiVDSTxP1wAFTL39MgAIOa6Is9NTF1WEh6S1A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index b570ebc09dcd..917059370ca6 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-oInE8fwE+7a+F4NevKPuYQqCP9GkPhqayLu8HCmVbLs="; + sha256 = "sha256-B/ga5MpjXoLe5H/JosmrS/Wuj1elzQHPsnz/qOm7Hrg="; }; - vendorSha256 = "sha256-VvO5YnDofdEku9+RC6PPHWSZY8qZt9N3JNzlm5omNAc="; + vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 058e20da0ce5..ab1704681299 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.129"; + version = "0.0.130"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256:1x49vvd363w9xyrzjgmynj2b320hzpz388fh5vpp0q0qk8q3gwkk"; + sha256 = "sha256-UamSiwjR68Pfm3uyHaI871VaGwIKJ5DShl8uE3rvX+U="; }; }; }.${branch} diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 081a4cab1df2..909a3ec767c6 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -1,74 +1,54 @@ -{ lib, stdenv, fetchurl -, xorgproto, motif, libX11, libXt, libXpm, bison -, flex, automake, autoconf, libtool, runtimeShell +{ lib, stdenv, fetchFromGitLab, xorgproto, motif, libX11, libXt, libXpm, bison +, flex, automake, autoconf, libtool }: stdenv.mkDerivation rec { pname = "alliance"; - version = "5.1.1"; + version = "unstable-2021-09-15"; - src = fetchurl { - url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${pname}-${version}.tar.bz2"; - sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1"; + src = fetchFromGitLab { + domain = "gitlab.lip6.fr"; + owner = "vlsi-eda"; + repo = "alliance"; + rev = "5e83c92d0307cce9d599f7099fb0023f81d26d65"; + sha256 = "Vd3MTT4eKn4FMt0/F4fQUPcWq25kH0FpeGxQUOetKPY="; }; + prePatch = "cd alliance/src"; nativeBuildInputs = [ libtool automake autoconf flex ]; buildInputs = [ xorgproto motif libX11 libXt libXpm bison ]; - sourceRoot = "alliance/src/"; + ALLIANCE_TOP = placeholder "out"; configureFlags = [ - "--prefix=$(out)" + "--prefix=${placeholder "out"}" "--enable-alc-shared" ]; - preConfigure = '' - mkdir -p $out/etc - - #texlive for docs seems extreme - mkdir -p $out/share/alliance - mv ./documentation $out/share/alliance + postPatch = '' + # texlive for docs seems extreme substituteInPlace autostuff \ - --replace "$newdirs documentation" "$newdirs" \ - --replace documentation Solaris + --replace "$newdirs documentation" "$newdirs" + + substituteInPlace sea/src/DEF_grammar_lex.l --replace "ifndef FLEX_BETA" \ + "if (YY_FLEX_MAJOR_VERSION <= 2) && (YY_FLEX_MINOR_VERSION < 6)" - substituteInPlace sea/src/DEF_grammar_lex.l \ - --replace "ifndef FLEX_BETA" "if (YY_FLEX_MAJOR_VERSION <= 2) && (YY_FLEX_MINOR_VERSION < 6)" ./autostuff ''; - allianceInstaller = '' - #!${runtimeShell} - cp -v -r -n --no-preserve=mode $out/etc/* /etc/ > /etc/alliance-install.log - ''; - - allianceUnInstaller = '' - #!${runtimeShell} - awk '{print \$3}' /etc/alliance-install.log | xargs rm - awk '{print \$3}' /etc/alliance-install.log | xargs rmdir - rm /etc/alliance-install.log - ''; - postInstall = '' sed -i "s|ALLIANCE_TOP|$out|" distrib/*.desktop mkdir -p $out/share/applications cp -p distrib/*.desktop $out/share/applications/ mkdir -p $out/icons/hicolor/48x48/apps/ cp -p distrib/*.png $out/icons/hicolor/48x48/apps/ - - echo "${allianceInstaller}" > $out/bin/alliance-install - chmod +x $out/bin/alliance-install - - echo "${allianceUnInstaller}" > $out/bin/alliance-uninstall - chmod +x $out/bin/alliance-uninstall ''; meta = with lib; { - description = "Complete set of free CAD tools and portable libraries for VLSI design"; - homepage = "http://www-asim.lip6.fr/recherche/alliance/"; + description = "(deprecated) Complete set of free CAD tools and portable libraries for VLSI design"; + homepage = "http://coriolis.lip6.fr/"; license = with licenses; gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ l-as ]; platforms = with platforms; linux; - broken = true; }; } diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 82d173697438..3d64639d33fa 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -327,7 +327,7 @@ stdenv.mkDerivation { ### ### Remove LC_UUID ### - + optionalString (stdenv.targetPlatform.isDarwin && !(stdenv.cc.bintools.bintools.isGNU or false)) '' + + optionalString (stdenv.targetPlatform.isDarwin && !(bintools.isGNU or false)) '' echo "-no_uuid" >> $out/nix-support/libc-ldflags-before '' diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 5913ec7a0d03..60e6ca3d4e82 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -51,10 +51,6 @@ mkDerivation rec { xorg.xf86inputlibinput.dev ]; - postPatch = '' - sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt - ''; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index d8ca0ddfdec3..37134f240dc3 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -40,14 +40,8 @@ mkDerivation { sed '1i#include ' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp ''; CXXFLAGS = [ - "-I${lib.getDev xorgserver}/include/xorg" - "-I${lib.getDev xf86inputsynaptics}/include/xorg" ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"'' ]; - cmakeFlags = [ - "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" - "-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg" - ]; postInstall = '' # Display ~/Desktop contents on the desktop by default. sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index f78c546542a2..89d7f4c7d922 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -80,58 +80,58 @@ rec { # v3.1.1 (LTS) aspnetcore_3_1 = buildAspNetCore { - version = "3.1.8"; + version = "3.1.19"; sha512 = { - x86_64-linux = "0i3dqsmh5x2aaagw30zvr0ydmzms5j6xvmwq0yx79r1hncw0zg8w1zq7cxvaddszl13d24wxb8vm4varkiv3fy8z3n2ndmhlqa2qcyw"; - aarch64-linux = "3f3xky7jqpqwnsg730ka1576ppsspi25xlqsrqmwlbanad0r89lidfppr34nsys9gb5f1vx1zkv73dn4jhl6yawnas9j9f8nhi5mq40"; - x86_64-darwin = "1gbiizljh80m9sqv4ynvch7si55if43f4ccfd9ynakwm777fddbg8py338l7irnxc5rid3xzw7c0yj5p8f22n38krlxkvr1zcwij68b"; + x86_64-linux = "c9234b5dba62c88b5f7e869c7dc7fc94d9cd7b300b0ed2461132c32762c0d3d1f23a1ee0432264704fefeb35f77ca7d1dd41910daee84df9aa325559a43cfc71"; + aarch64-linux = "4cba9b43a9beb977bb50c290c0e7cbbf42664538609079dd1bc0e925a0cc4a1f76748492d4d0d402610ae910e878449bab5d797a9f12e63399585b11f9bfbee9"; + x86_64-darwin = "a30959156c818d8d93df398742a70a050decfddbd777ddd6adb4d3c1aa5ed129545eab8f0aa3f12be991611dbc3582336ed747f3075906a2a29a1cd30ef3ad90"; }; }; netcore_3_1 = buildNetCore { - version = "3.1.8"; + version = "3.1.19"; sha512 = { - x86_64-linux = "19gbb92lkfwmx4ic27v5g4cs8qzxiq8cv7sw9pxa8kibgr7lgifvg8dh3pd0i30a78yg5lc3fsdy0jal5i2k049nak72rfhxhrk5yxc"; - aarch64-linux = "0h0zfj82wafk6brmh35ah1qfxgxs4nm3wc47i14vhvkg78rz25w46rnah88zf9gkllnbhfxkw1ivcl4mm6l4ri9hv9367rr627hybvf"; - x86_64-darwin = "0zcp77lh6rvj1vlnjnnd9gqrwazn9v572l0x6r7b9pkjjq7fdh5cnjcc1cvkv9rb00mssd9jjv7yjdpv4i8i9hwby85g9bn500qx42c"; + x86_64-linux = "2cf268cc13bb4739203a18a9160aac58f2088e8ec275b1f7ef2fe2b74bc16edfdfbeb886a74fc9421edbf2899fa9e3ee7ea2734a83b1800b4a9848fb7e10bbbe"; + aarch64-linux = "c6a97bc6e2f2644d57d3fa5a512274b7129956371b07e0f39f734875b15bc0c178a9b068e2fa3e06e8a3a6696163ad1856f5d87a689612211ee02e589138110e"; + x86_64-darwin = "41ae9bc0212247c4721f41be384dae620971360c09fa31430f062c2ab851f10506ef620bf63ee414819b5dd20ddae8a1ce581bbe0d699378b244375e0822bd34"; }; }; sdk_3_1 = buildNetCoreSdk { - version = "3.1.402"; + version = "3.1.413"; sha512 = { - x86_64-linux = "2zdb5cl4swg7kvnla6kgnnwg3kkb3rj2ccizg43fw89h8nacr1klz3zdl5km9l553lvm364dy8xsdwm79bw1ch0qgff6snnbbxlw5a2"; - aarch64-linux = "1aq8fhsn15362x99dfp72m67zbswrg30xscy1n983mmq76qn5ha6sy8pyj84l7qcs0n1b7akb77qyi3d2ns8bd2wl6s1dacl24gn10p"; - x86_64-darwin = "1gk6sgd9gdc6nr64mdfj6lhzdi6ixi5c1r0i1b7bhkg2xycx5cnbgjycrpqh17h6wbp68dz4mkg5hf1y3527hdwypa9k0sqdg3yrdb8"; + x86_64-linux = "2a0824f11aba0b79d3f9a36af0395649bc9b4137e61b240a48dccb671df0a5b8c2086054f8e495430b7ed6c344bb3f27ac3dfda5967d863718a6dadeca951a83"; + aarch64-linux = "39f198f07577faf81f09ca621fb749d5aac38fc05e7e6bd6226009679abc7d001454068430ddb34b320901955f42de3951e2707e01bce825b5216df2bc0c8eca"; + x86_64-darwin = "2c8e5b7e578aa36d40946d0deea93dff72a68ebb5504b1593d86d63022be8b65b284cf2adad711a926b7170fc865ac4cb38531a4f2ef087e07147e67300e86b8"; }; }; # v5.0.0 aspnetcore_5_0 = buildAspNetCore { - version = "5.0.0"; + version = "5.0.10"; sha512 = { - x86_64-linux = "402046ee144915ef7d75a788cf19552eea56cf897681721b74bfc403fd366f71eb7e56f6b83ea299b6b812c6b87378c15e7bfe249415427dcd147dfeacd084d0"; - aarch64-linux = "13e174de1cf10135531468c2a76852de2c37253f4d8b487ff25d249c2d7a1c590475545ca246515338baff2950422ec6c5ffe2180e8327f25cb5f9fede696ccc"; - x86_64-darwin = "b47a9958f5412b22edb2cb47702ad442c389901ede3ca2a7f75d901f8ed608494431849f498c2191327065ff1db52a1658b1a8c0feb53aaec4c814fb0baf6818"; + x86_64-linux = "60fd41e42e07a96416baf2dd7ea8112a7c7d510bc6f4656274981777d2cf5e824cd519924cdf06215338d74e78cdc7801e1b24c39b3d67cd2d1b3c6fee6474a9"; + aarch64-linux = "e86dd5b26e5add2f35c3a029c78e3c447755a319c105d371da297f66db5eff260f3f55ccf23e508e9a33536876708ac2e358dc62a4a28518f88df3a9131adb01"; + x86_64-darwin = "124abacba27e26249d265d51fd7abc7ab0bed9859ce3a6a8e4f193031bff3f28dd81af639542b0cc043a3957e2a90a2f5b41c6ec6b4a50a4cb8fce12bc8654f9"; }; }; net_5_0 = buildNetCore { - version = "5.0.0"; + version = "5.0.10"; sha512 = { - x86_64-linux = "d4d67df5ff5f6dde0d865a6e87559955bd57429df396cf7d05fe77f09e6220c67dc5e66439b1801ca4d301a62f81f666122bf4b623b31a46b861677dcafc62a4"; - aarch64-linux = "c7a5ae2bd4e0edbd3b681c2997ebf1633bfa1cd30a4333cb63fc9945b4e7c9278282516fb5bc22c710ce6fb59dc2e28230c07b0e99826165fa148406ab8afb0f"; - x86_64-darwin = "eba97211e158a0c1c15b03a79b42027319d83456dc377a2513c32defb560cd43fcfa1e84154a43243b77ca6b454c4dbc32be4153f0ba9c954c7b1e69ab5d7c53"; + x86_64-linux = "421b00d5751381e6bf829dcba8fa0d781f0efd065be492739d60a4bef2b7b362dbec77fa3289e2ee45cab40616f95318fc214699ffe2f33aa15e77c2d163841c"; + aarch64-linux = "30861f2bd41fcd7c1d657be1eafa09f22886af0c3e09d1854c626b675a469347ce9fb79b2ea92b5ed4e2fd3d3457766ac03fc5393a690099e1d2b9b15f3334b9"; + x86_64-darwin = "2839f4fafa1f85a90b43a74a4898cbba915324f7363f1716e58cb9163d1415fa4d360703e27d0cadfe8495a370ccddbcfcc514076a880d6343a0bff76bb5ac2a"; }; }; sdk_5_0 = buildNetCoreSdk { - version = "5.0.202"; + version = "5.0.401"; sha512 = { - x86_64-linux = "Ae1Z8jYYSYdAVnPSSUDVXOKdgw59u8GVVv3AOJMDnmBGcS3m+QHcmREEeg3uT9FTGbfpT4ox32uYH6Nb2T2YOA=="; - aarch64-linux = "JuwSWgY35xrK0gOGR034mhAemulIkhtd4M00P0vA6EtOeyMY4Vl4cj6zudMh6Jt5DD8EJKQ8KbABX8byuePp2Q=="; - x86_64-darwin = "jxnfTbQUb0dJ2/NX2pu8Pi/F/e4EaDm2Ta5U+6sSYj/s6nNp6NHxtEn7BzhQ9/EVLszl/oXi3lL0d/BPbzldEA=="; + x86_64-linux = "a444d44007709ceb68d8f72dec0531e17f85f800efc0007ace4fa66ba27f095066930e6c6defcd2f85cdedea2fec25e163f5da461c1c2b8563e5cd7cb47091e0"; + aarch64-linux = "770dcf18c08cd285934af61bedc06ffcc16a74115d15376f72376cdfbb4ab9cc9f53537ca1fe5d906b4b3c30b960ffe1404d6f7e01254091b4b9d288e9e972fa"; + x86_64-darwin = "eca773f407314123fd5b2017f68520c0647651f53e546583c4145b596c230c42898b3e56355cd5ace76b793df4aca3cd7ff9142718c86eedeabbabb70b393d0e"; }; }; } diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index deb72e522cdc..0ddd7e7cbac4 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -137,10 +137,10 @@ } { name = "microsoft.netcore.app.host.linux-x64"; - version = "3.1.14"; + version = "3.1.19"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.14/microsoft.netcore.app.host.linux-x64.3.1.14.nupkg"; - sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.19/microsoft.netcore.app.host.linux-x64.3.1.19.nupkg"; + sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }; } { diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index 899f38d256dd..9ebbaceae502 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -48,8 +48,8 @@ in [ (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + version = "3.1.19"; + sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) (fetchNuGet { @@ -78,8 +78,8 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + version = "3.1.19"; + sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) (fetchNuGet { diff --git a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt index ec49eee7e9cf..541bedcbe566 100644 --- a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt +++ b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt @@ -1,2 +1,2 @@ -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.8 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.8 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.19 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.19 diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 14d0e38f3d9f..794a09749c55 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen glog ] - ++ lib.optional runTests gflags; + buildInputs = lib.optional runTests gflags; + propagatedBuildInputs = [ eigen glog ]; # The Basel BUILD file conflicts with the cmake build directory on # case-insensitive filesystems, eg. darwin. diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index f5652a61c1de..ef8cd49ba297 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,37 +1,53 @@ -{ lib, stdenv, fetchurl, fetchzip, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.9.8.5"; + version = "0.9.9.8"; pname = "glm"; - src = fetchzip { - url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip"; - sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2"; + src = fetchFromGitHub { + owner = "g-truc"; + repo = pname; + rev = version; + sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; - nativeBuildInputs = [ cmake ]; - outputs = [ "out" "doc" ]; - cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ]; + nativeBuildInputs = [ cmake ]; - # fetch newer version of platform.h which correctly supports gcc 7.3 - gcc7PlatformPatch = fetchurl { - url = "https://raw.githubusercontent.com/g-truc/glm/384dab02e45a8ad3c1a3fa0906e0d5682c5b27b9/glm/simd/platform.h"; - sha256 = "0ym0sgwznxhfyi014xs55x3ql7r65fjs34sqb5jiaffkdhkqgzia"; - }; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=OFF" + "-DBUILD_STATIC_LIBS=OFF" + "-DGLM_TEST_ENABLE=${if doCheck then "ON" else "OFF"}" + ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' - cp ${gcc7PlatformPatch} glm/simd/platform.h - ''; + doCheck = true; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0"; + installPhase = '' + runHook preInstall - postInstall = '' + # Install header-only library + mkdir -p $out/include + cp -rv ../glm $out/include + rm $out/include/glm/CMakeLists.txt + rm $out/include/glm/detail/*.cpp + + # Install CMake files + mkdir -p $out/lib + cp -rv ../cmake $out/lib + substituteInPlace $out/lib/cmake/glm/glmConfig.cmake \ + --replace 'GLM_INCLUDE_DIRS ''${_IMPORT_PREFIX}' "GLM_INCLUDE_DIRS $out/include" + + # Install pkg-config file + mkdir -p $out/lib/pkgconfig + substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc + + # Install docs mkdir -p $doc/share/doc/glm - cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm + cp -rv ../doc/api $doc/share/doc/glm/html + cp -v ../doc/manual.pdf $doc/share/doc/glm + + runHook postInstall ''; meta = with lib; { @@ -41,10 +57,10 @@ stdenv.mkDerivation rec { graphics software based on the OpenGL Shading Language (GLSL) specification and released under the MIT license. ''; - homepage = "http://glm.g-truc.net/"; + homepage = "https://github.com/g-truc/glm"; license = licenses.mit; platforms = platforms.unix; - maintainers = with lib.maintainers; [ ]; + maintainers = with maintainers; [ smancill ]; }; } diff --git a/pkgs/development/libraries/glm/glm.pc.in b/pkgs/development/libraries/glm/glm.pc.in new file mode 100644 index 000000000000..e196c793d1d5 --- /dev/null +++ b/pkgs/development/libraries/glm/glm.pc.in @@ -0,0 +1,7 @@ +prefix=@out@ +includedir=@out@/include + +Name: GLM +Description: OpenGL Mathematics +Version: @version@ +Cflags: -I${includedir} diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 40347940ff04..090b445a3a5c 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Vc"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "09nf6j1hyq2yv0c1cmnv4ff5243ylsajy1xj3dz8c2qqcm14y6cm"; + sha256 = "sha256-rh2vcn58xDsbxxABrxneCq6TKIyT51KxGB7sOtHpvYE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 538de4ba7de9..810b5dfedd01 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - version = "2.3.1"; + version = "2.3.2"; pname = "elementpath"; disabled = pythonOlder "3.6"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1imjilhmbw08469irlbr3am5zksbg327n7mznxfixrigq9d65qx6"; + sha256 = "01h68v077xbcnqn9v52i8d6s6i7ds3zycn3ddn11hc074m4gg3af"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index ef13bf471e16..ca6d54f59e7c 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.46.0"; + version = "0.47.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "08a4p4q96zz6qp3cy7hs5jn9h2gf68d8zchw4w0kk83sm1r8rpxw"; + sha256 = "sha256-7I7g/jxaVQDvhoGLWVerqYZhFhGUM/FwH1XCpLpg3D0="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index f9535ac0f31f..bd6ada6ecd10 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "7.0.2"; + version = "7.0.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0y5zsay9b6xgibs6m4gckw63jip35vsdfajsh1nw2zcb2xs1a7qs"; + sha256 = "sha256-j1lipshccPUpMR+o28hDyaJbrVgj6AHijFqOgVmrBkg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 66129553b736..7addcf531426 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.20"; + version = "1.5.21"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ce76ce598ac910fbae6aae0db00aac21d19d62bdc8c616ed6e6a6a395dc44513"; + sha256 = "5aaaddb06dc4b6f9ba08254d8d806a2bd2406925a9caf3a51fdffbd5d09728e2"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index a305a8309a93..ac4531328fcf 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.8.1"; + version = "2021.9.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-ULaybf2uV8lY9J9EHlszbnLWZJ0QO7y6BQxvdQX+nMU="; + sha256 = "sha256-S25x9k6vBwnmJq15y5PVUWaTujT9UNHvgIX9uH+N8dY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index 5c7ca4350abe..e5f8ce159f1f 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-snapshot"; - version = "0.6.3"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "f99152df98587f883f37bb0315f082ab3e0c565f53413f1193bb0019b992c3ea"; + sha256 = "427b5ab088b25a1c8b63ce99725040664c840ff1f5a3891252723cce972897f9"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index ffe784ad1995..9218cc593930 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { import r2pipe r2 = r2pipe.open('${coreutils}/bin/ls') r2.cmd('a') - r2.quit() EOF ''; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 8921e0061aa6..f8f48793e902 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "scikits.odes"; - version = "2.6.1"; + version = "2.6.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b"; + sha256 = "267d8bfa1e18d075d574158053d887562381e88176ebab856516b52b14860983"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix index 42e93d63faee..0d5020c59958 100644 --- a/pkgs/development/python-modules/simplekml/default.nix +++ b/pkgs/development/python-modules/simplekml/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "simplekml"; - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5"; + sha256 = "cda687be2754395fcab664e908ebf589facd41e8436d233d2be37a69efb1c536"; }; # no tests are defined in 1.3.5 diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index a556a83aa49f..a0e9230517b6 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -9,1209 +9,1504 @@ in [ (fetchNuGet { - name = "Castle.Core"; + name = "castle.core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + name = "microsoft.aspnetcore.app.runtime.linux-x64"; + version = "3.1.19"; + sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) - (fetchNuGet { - name = "Microsoft.AspNet.WebApi.Client"; + name = "microsoft.aspnet.webapi.client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; }) - (fetchNuGet { - name = "Microsoft.IdentityModel.Logging"; + name = "microsoft.csharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "microsoft.identitymodel.logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; }) - (fetchNuGet { - name = "Microsoft.IdentityModel.Tokens"; + name = "microsoft.identitymodel.tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; }) - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + name = "microsoft.netcore.app.runtime.linux-x64"; + version = "3.1.19"; + sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; + name = "microsoft.netcore.platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; + name = "microsoft.netcore.platforms"; + version = "1.0.1-rc2-24027"; + sha256 = "1a0w5fv8slfr4q7m3mh78lb9awdwyz4zv3bb73vybkyq1f6z7lx8"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; + name = "microsoft.netcore.platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; + name = "microsoft.netcore.runtime"; + version = "1.0.2-rc2-24027"; + sha256 = "0ippdn16381l8i2iy63i45nk0p303fjbd4amh7biwvqxgagfbvhh"; + }) + (fetchNuGet { + name = "microsoft.netcore.runtime.coreclr"; + version = "1.0.2-rc2-24027"; + sha256 = "05y0jz6vfl9zs0lmmwsz6arf7r0mg2dm93ymizrzmqn706krz45x"; + }) + (fetchNuGet { + name = "microsoft.netcore.runtime.native"; + version = "1.0.2-rc2-24027"; + sha256 = "11hpbbmnjbskw7s6sx32l6qzz63kshx0gyp3sawyxk82nbqrissl"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.0.1-rc2-24027"; + sha256 = "1j1458jska7540ng7fdf5i06k2vy71mxl5dld4x5s8gfndxpdzdj"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; + name = "microsoft.netcore.windows.apisets"; + version = "1.0.1-rc2-24027"; + sha256 = "034m9p417iq3yzipg393wp4bddsh80di9iad78vvvh7w5difdv0x"; + }) + (fetchNuGet { + name = "microsoft.net.test.sdk"; version = "15.0.0"; sha256 = "1ca9v53dphsgk22spilfwq1hjzp2sgrrj85v7hd7wfc6gjh31mb5"; }) - (fetchNuGet { - name = "Microsoft.TestPlatform.ObjectModel"; + name = "microsoft.testplatform.objectmodel"; version = "15.0.0"; sha256 = "0xqssz2y8jzqph6kv1fzy00wzjcnc2whhlf8jsszgpn69ld7f1rb"; }) - (fetchNuGet { - name = "Microsoft.TestPlatform.TestHost"; + name = "microsoft.testplatform.testhost"; version = "15.0.0"; sha256 = "1mi59wxwdqyzmkan0v9qrar96f50xs6k38xzv3l6ky859si2qk4b"; }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; + name = "microsoft.win32.primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; + name = "microsoft.win32.primitives"; + version = "4.0.1-rc2-24027"; + sha256 = "1rvb076s4ksvmbvnxi4sv2f9f22izqp2rca0scjqya5x1qhcgkp0"; + }) + (fetchNuGet { + name = "microsoft.win32.primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; + name = "microsoft.win32.registry"; version = "4.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; + name = "microsoft.win32.registry"; version = "4.4.0"; sha256 = "088j2anh1rnkxdcycw5kgp97ahk7cj741y6kask84880835arsb6"; }) - (fetchNuGet { - name = "Minimatch"; + name = "minimatch"; version = "2.0.0"; sha256 = "1k84q1bz1qq2nh35nip8vmi65wixsh5y7piln5b4n172xzhfqvx0"; }) - (fetchNuGet { - name = "Moq"; + name = "moq"; version = "4.11.0"; sha256 = "08bnk80scjjqnkdbjam8grcqrw2rvj9z7556hiznac7in3fcp77w"; }) - (fetchNuGet { - name = "NETStandard.Library"; + name = "netstandard.library"; + version = "1.5.0-rc2-24027"; + sha256 = "1kazwidj63w53r1s6fd8sgykb70kdic27fg9qhg74qzwm354imwm"; + }) + (fetchNuGet { + name = "netstandard.library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) - (fetchNuGet { - name = "NETStandard.Library"; + name = "netstandard.library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "10.0.1"; - sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; - }) - - (fetchNuGet { - name = "Newtonsoft.Json"; + name = "newtonsoft.json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { - name = "Newtonsoft.Json"; + name = "newtonsoft.json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { - name = "Newtonsoft.Json.Bson"; + name = "newtonsoft.json.bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { - name = "runtime.any.System.Collections"; + name = "runtime.any.system.collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; + name = "runtime.any.system.diagnostics.tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; + name = "runtime.any.system.diagnostics.tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; + name = "runtime.any.system.globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; + name = "runtime.any.system.globalization.calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { - name = "runtime.any.System.IO"; + name = "runtime.any.system.io"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; + name = "runtime.any.system.reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; + name = "runtime.any.system.reflection.extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; + name = "runtime.any.system.reflection.primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; + name = "runtime.any.system.resources.resourcemanager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; + name = "runtime.any.system.runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; + name = "runtime.any.system.runtime.handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; + name = "runtime.any.system.runtime.interopservices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; + name = "runtime.any.system.text.encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; + name = "runtime.any.system.text.encoding.extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; + name = "runtime.any.system.threading.tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; + name = "runtime.any.system.threading.timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.system"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.system"; + version = "4.0.0-rc2-24027"; + sha256 = "0n3ndk1g5qdd892sjcz3y2qmg8ki8b001qfgl2fkwv5f52m65pz9"; + }) + (fetchNuGet { + name = "runtime.native.system"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; + name = "runtime.native.system.io.compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) + (fetchNuGet { + name = "runtime.native.system.io.compression"; + version = "4.1.0-rc2-24027"; + sha256 = "1qnd05bsrz88cr4wnkq7haf2bwml2zzjcscjk94v8ka4isi1i89b"; + }) + (fetchNuGet { + name = "runtime.native.system.io.compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; + name = "runtime.native.system.net.http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.system.net.http"; + version = "4.0.1-rc2-24027"; + sha256 = "0dpgj544rfdqlgjc1nwslwbq49mp286wyy6rfnklxlbfgc2mr216"; + }) + (fetchNuGet { + name = "runtime.native.system.net.http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; + name = "runtime.native.system.security.cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography"; + version = "4.0.0-rc2-24027"; + sha256 = "0pkd72vrqn1jxc20g8h2pgqz02xn2rfbl0m4i7b82xa8bc483jmz"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography.apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + name = + "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; + name = "runtime.unix.microsoft.win32.primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { - name = "runtime.unix.System.Console"; + name = "runtime.unix.system.console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; + name = "runtime.unix.system.diagnostics.debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; + name = "runtime.unix.system.io.filesystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; + name = "runtime.unix.system.net.primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; + name = "runtime.unix.system.net.sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; + name = "runtime.unix.system.private.uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; + name = "runtime.unix.system.runtime.extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { - name = "Sdk"; - version = "1.0.0"; - sha256 = "0425gviagj8xl8mwl4bwn1v98j7407sdk78xgxk37z62vgcgs73w"; + name = "system.appcontext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) - (fetchNuGet { - name = "System.AppContext"; + name = "system.appcontext"; + version = "4.1.0-rc2-24027"; + sha256 = "0c0x3sg12a5zwiamvxs9c4bhdwmmm9by6x5da58fbrzz7afbaaag"; + }) + (fetchNuGet { + name = "system.appcontext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { - name = "System.Buffers"; + name = "system.buffers"; + version = "4.0.0-rc2-24027"; + sha256 = "1mqnay87pkxih73984jf5fm14d0m6yjq4cv4cqbj37nmgm54ssjp"; + }) + (fetchNuGet { + name = "system.buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { - name = "System.Collections"; + name = "system.collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { - name = "System.Collections"; + name = "system.collections"; + version = "4.0.11-rc2-24027"; + sha256 = "0ijpgf7iy3mcvr9327craxsb0lsznprajqzjy59sspc75gk0yahq"; + }) + (fetchNuGet { + name = "system.collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { - name = "System.Collections.Concurrent"; + name = "system.collections.concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "system.collections.concurrent"; + version = "4.0.12-rc2-24027"; + sha256 = "0yhc5q74vb9vb9cmyrr9p4dfql62dr7c8ajbaxnzzs917v2z68q4"; + }) + (fetchNuGet { + name = "system.collections.concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { - name = "System.Collections.Immutable"; + name = "system.collections.immutable"; version = "1.2.0"; sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; + name = "system.collections.nongeneric"; + version = "4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }) + (fetchNuGet { + name = "system.collections.nongeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { - name = "System.Collections.Specialized"; + name = "system.collections.specialized"; + version = "4.0.1"; + sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; + }) + (fetchNuGet { + name = "system.collections.specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { - name = "System.ComponentModel"; + name = "system.componentmodel"; + version = "4.0.1"; + sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; + }) + (fetchNuGet { + name = "system.componentmodel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { - name = "System.ComponentModel.EventBasedAsync"; + name = "system.componentmodel.eventbasedasync"; version = "4.0.11"; sha256 = "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh"; }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; + name = "system.componentmodel.primitives"; + version = "4.1.0"; + sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; + }) + (fetchNuGet { + name = "system.componentmodel.primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; + name = "system.componentmodel.typeconverter"; version = "4.1.0"; sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; + name = "system.componentmodel.typeconverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { - name = "System.Console"; + name = "system.console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "system.console"; + version = "4.0.0-rc2-24027"; + sha256 = "072m313av0s5cfpr2rpq07p7c13dy4rh1ngigv3dnr1yyvab9081"; + }) + (fetchNuGet { + name = "system.console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; + name = "system.diagnostics.debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; + name = "system.diagnostics.debug"; + version = "4.0.11-rc2-24027"; + sha256 = "11rz0kdzk4bw9yc85jmskxla7i1bs61kladqzvymrg8xn3lk488a"; + }) + (fetchNuGet { + name = "system.diagnostics.debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; + name = "system.diagnostics.diagnosticsource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "system.diagnostics.diagnosticsource"; + version = "4.0.0-rc2-24027"; + sha256 = "1cizj1xvaz7dm701r4bl6s08858j1r2794y7xx8abyw8j91c957w"; + }) + (fetchNuGet { + name = "system.diagnostics.diagnosticsource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { - name = "System.Diagnostics.Process"; + name = "system.diagnostics.process"; version = "4.1.0"; sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; }) - (fetchNuGet { - name = "System.Diagnostics.TextWriterTraceListener"; + name = "system.diagnostics.textwritertracelistener"; version = "4.0.0"; sha256 = "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs"; }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; + name = "system.diagnostics.tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "system.diagnostics.tools"; + version = "4.0.1-rc2-24027"; + sha256 = "080gd86c1pkfkzz67ispkzxc426lfh82zajayiizbgwd6yqa7fv5"; + }) + (fetchNuGet { + name = "system.diagnostics.tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; + name = "system.diagnostics.tracesource"; version = "4.0.0"; sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; + name = "system.diagnostics.tracesource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; + name = "system.diagnostics.tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; + name = "system.diagnostics.tracing"; + version = "4.1.0-rc2-24027"; + sha256 = "0a0c24lm8yn0hbvd5m64lv7xhs2bmhm5fdpk89xvxj14zdarqhm6"; + }) + (fetchNuGet { + name = "system.diagnostics.tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; + name = "system.dynamic.runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "system.dynamic.runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { - name = "System.Globalization"; + name = "system.globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { - name = "System.Globalization"; + name = "system.globalization"; + version = "4.0.11-rc2-24027"; + sha256 = "0yl161lr85smzdfzb7fbk0lfrqk5ns71hcnws6vm3sn2aqvfmhpn"; + }) + (fetchNuGet { + name = "system.globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { - name = "System.Globalization.Calendars"; + name = "system.globalization.calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "system.globalization.calendars"; + version = "4.0.1-rc2-24027"; + sha256 = "0whr2qird567iyc137s10qs0xi6607kjii9wi8a8g1f9lybzlz5k"; + }) + (fetchNuGet { + name = "system.globalization.calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { - name = "System.Globalization.Extensions"; + name = "system.globalization.extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "system.globalization.extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { - name = "System.IdentityModel.Tokens.Jwt"; + name = "system.identitymodel.tokens.jwt"; version = "5.2.1"; sha256 = "08n1z9ngsi26qlhwpjzxafhwl3p279widfci64l2ahxf1gprfqsx"; }) - (fetchNuGet { - name = "System.IO"; + name = "system.io"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { - name = "System.IO"; + name = "system.io"; + version = "4.1.0-rc2-24027"; + sha256 = "0rwqmn743gl21xnb3rwqkdacshd5l86pn23mc4bviva3pbncbjs4"; + }) + (fetchNuGet { + name = "system.io"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { - name = "System.IO.Compression"; + name = "system.io.compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) + (fetchNuGet { + name = "system.io.compression"; + version = "4.1.0-rc2-24027"; + sha256 = "07s5zxdw3ihxdv0mjxb2ywzg9phcp4bayrhkadzm95l4kcv0xaij"; + }) + (fetchNuGet { + name = "system.io.compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; + name = "system.io.compression.zipfile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) + (fetchNuGet { + name = "system.io.compression.zipfile"; + version = "4.0.1-rc2-24027"; + sha256 = "0np6vf9rnfasz0sqys56kpryc84qcqi1a1rfskmycdlxk182p3s2"; + }) + (fetchNuGet { + name = "system.io.compression.zipfile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { - name = "System.IO.FileSystem"; + name = "system.io.filesystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { - name = "System.IO.FileSystem"; + name = "system.io.filesystem"; + version = "4.0.1-rc2-24027"; + sha256 = "0hpw3ssnbcv9l1lnlcym2bv3h3sf2znif4brys2i3868s6h946k6"; + }) + (fetchNuGet { + name = "system.io.filesystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { - name = "System.IO.FileSystem.AccessControl"; + name = "system.io.filesystem.accesscontrol"; version = "4.4.0"; sha256 = "11sna2bv5ai4sivrs7g2gp7g0yjp02s0kasl01j3fa1cvnwwvgkv"; }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "system.io.filesystem.primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "system.io.filesystem.primitives"; + version = "4.0.1-rc2-24027"; + sha256 = "04q3sxrfxqgig9scmxblxlb6n6fypv535lby26pi20ixszs19dxc"; + }) + (fetchNuGet { + name = "system.io.filesystem.primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { - name = "System.Linq"; + name = "system.io.filesystem.watcher"; + version = "4.0.0-rc2-24027"; + sha256 = "0g2h4q0w42frdz101z2cxs4n9zpxvzb43wnzawx1f26vpilz7km4"; + }) + (fetchNuGet { + name = "system.linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { - name = "System.Linq"; + name = "system.linq"; + version = "4.1.0-rc2-24027"; + sha256 = "0icbsy0vq07achclz32jvnnfdchkgylsjj67gra3fn5906s40n24"; + }) + (fetchNuGet { + name = "system.linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - name = "System.Linq.Expressions"; + name = "system.linq.expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "system.linq.expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { - name = "System.Net.Http"; + name = "system.net.http"; + version = "4.0.1-rc2-24027"; + sha256 = "1j9z5as3k7ydr4yi83lwh09hqj32g2ndpjgj25xvny5a32dl2mhz"; + }) + (fetchNuGet { + name = "system.net.http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "system.net.http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { - name = "System.Net.NameResolution"; + name = "system.net.nameresolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { - name = "System.Net.Primitives"; + name = "system.net.primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "system.net.primitives"; + version = "4.0.11-rc2-24027"; + sha256 = "16wv24cb39639i7fcw005hh1rggyz2bgn51dpkdc67aq9lz76ivm"; + }) + (fetchNuGet { + name = "system.net.primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { - name = "System.Net.Sockets"; + name = "system.net.sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "system.net.sockets"; + version = "4.1.0-rc2-24027"; + sha256 = "062kbbvm17nhwmcxjnakfv3i23vrk6c9gmz6x8q79kcr5hxr40qs"; + }) + (fetchNuGet { + name = "system.net.sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { - name = "System.ObjectModel"; + name = "system.objectmodel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "system.objectmodel"; + version = "4.0.12-rc2-24027"; + sha256 = "065p89awfiz9kb304hqs7wkfpykd9z9kkv84ihm813msv54i8lvj"; + }) + (fetchNuGet { + name = "system.objectmodel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { - name = "System.Private.DataContractSerialization"; + name = "system.private.datacontractserialization"; version = "4.1.1"; sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }) - (fetchNuGet { - name = "System.Private.DataContractSerialization"; + name = "system.private.datacontractserialization"; version = "4.3.0"; sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; }) - (fetchNuGet { - name = "System.Private.Uri"; + name = "system.private.uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { - name = "System.Reflection"; + name = "system.reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { - name = "System.Reflection"; + name = "system.reflection"; + version = "4.1.0-rc2-24027"; + sha256 = "0717y8iqcw19g2zkcs0hkalvjhnpaq5mapd82kxkhiq1djgjhhi2"; + }) + (fetchNuGet { + name = "system.reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { - name = "System.Reflection.Emit"; + name = "system.reflection.emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "system.reflection.emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; + name = "system.reflection.emit.ilgeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "system.reflection.emit.ilgeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; + name = "system.reflection.emit.lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "system.reflection.emit.lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { - name = "System.Reflection.Extensions"; + name = "system.reflection.extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { - name = "System.Reflection.Extensions"; + name = "system.reflection.extensions"; + version = "4.0.1-rc2-24027"; + sha256 = "0lgz7wwdb02vapa17hgdkf1jnq1mcsbq8gwy6a9iqd04d2mfanv7"; + }) + (fetchNuGet { + name = "system.reflection.extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { - name = "System.Reflection.Metadata"; + name = "system.reflection.metadata"; version = "1.3.0"; sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; }) - (fetchNuGet { - name = "System.Reflection.Primitives"; + name = "system.reflection.primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { - name = "System.Reflection.Primitives"; + name = "system.reflection.primitives"; + version = "4.0.1-rc2-24027"; + sha256 = "1xjbwji89s69f9lq8wcjfkz8y9ym9zffgj2mg9bv0rxwyqcynpz8"; + }) + (fetchNuGet { + name = "system.reflection.primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) - - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; + name = "system.reflection.typeextensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; + name = "system.reflection.typeextensions"; version = "4.4.0"; sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; + name = "system.resources.resourcemanager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; + name = "system.resources.resourcemanager"; + version = "4.0.1-rc2-24027"; + sha256 = "06lkqk5hjkcna19inpda5fqbxvd9pq5cs61di7kmhrd2sgzbs6xj"; + }) + (fetchNuGet { + name = "system.resources.resourcemanager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { - name = "System.Runtime"; + name = "system.runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { - name = "System.Runtime"; + name = "system.runtime"; + version = "4.1.0-rc2-24027"; + sha256 = "1g5ghiyfb8njzfz39cswizjbxgaamil7kgkzgab93fhgk7jksmyg"; + }) + (fetchNuGet { + name = "system.runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { - name = "System.Runtime.Extensions"; + name = "system.runtime.extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { - name = "System.Runtime.Extensions"; + name = "system.runtime.extensions"; + version = "4.1.0-rc2-24027"; + sha256 = "09k4c6is31dpccwgb749055m2ad0b84rnapk69fmj3wjswacg26p"; + }) + (fetchNuGet { + name = "system.runtime.extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { - name = "System.Runtime.Handles"; + name = "system.runtime.handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { - name = "System.Runtime.Handles"; + name = "system.runtime.handles"; + version = "4.0.1-rc2-24027"; + sha256 = "0lw4amgaryahvija5xxb2vmybq7ks4b4ir7g7nc1xw6x9x58jf2q"; + }) + (fetchNuGet { + name = "system.runtime.handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; + name = "system.runtime.interopservices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; + name = "system.runtime.interopservices"; + version = "4.1.0-rc2-24027"; + sha256 = "0v5phdy7yr6d1q13fvb6hhd32k89l93z6x4hlkh5qhm1zlavaabl"; + }) + (fetchNuGet { + name = "system.runtime.interopservices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; + name = "system.runtime.interopservices.pinvoke"; + version = "4.0.0-rc2-24027"; + sha256 = "0qsgwvr6ppvllblb64p5plr7ssbmwfxxc4qf6l1xfincza8np34r"; + }) + (fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.0.0-rc2-24027"; + sha256 = "03pgqbgahfgvigyrsd08snzsryg90shfjlbdv4jk6yzfr27va3n2"; + }) + (fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { - name = "System.Runtime.Loader"; + name = "system.runtime.loader"; version = "4.0.0"; sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; }) - (fetchNuGet { - name = "System.Runtime.Loader"; + name = "system.runtime.loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) - (fetchNuGet { - name = "System.Runtime.Numerics"; + name = "system.runtime.numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "system.runtime.numerics"; + version = "4.0.1-rc2-24027"; + sha256 = "1gkkc7njymmb12dd952q89x2h2jdrhp171vszsjqzh5q2ryj25gh"; + }) + (fetchNuGet { + name = "system.runtime.numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Json"; + name = "system.runtime.serialization.json"; version = "4.0.2"; sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; + name = "system.runtime.serialization.primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; + name = "system.runtime.serialization.primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Xml"; + name = "system.runtime.serialization.xml"; version = "4.3.0"; sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; }) - (fetchNuGet { - name = "System.Security.AccessControl"; + name = "system.security.accesscontrol"; version = "4.4.0"; sha256 = "0ixqw47krkazsw0ycm22ivkv7dpg6cjz8z8g0ii44bsx4l8gcx17"; }) - (fetchNuGet { - name = "System.Security.Claims"; + name = "system.security.claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; + name = "system.security.cryptography.algorithms"; + version = "4.1.0-rc2-24027"; + sha256 = "183qanczf0jb6njgr9pibyr5jh0m8xwrja3j0pcdnzab0cii3n17"; + }) + (fetchNuGet { + name = "system.security.cryptography.algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; + name = "system.security.cryptography.algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; + name = "system.security.cryptography.cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "system.security.cryptography.cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; + name = "system.security.cryptography.cng"; version = "4.4.0"; sha256 = "1grg9id80m358crr5y4q4rhhbrm122yw8jrlcl1ybi7nkmmck40n"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; + name = "system.security.cryptography.csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "system.security.cryptography.csp"; + version = "4.0.0-rc2-24027"; + sha256 = "0nny9yvnhf3l5hjsy3ina8cha6sjln993vzkzdqka9d7rq1z23d5"; + }) + (fetchNuGet { + name = "system.security.cryptography.csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; + name = "system.security.cryptography.encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "system.security.cryptography.encoding"; + version = "4.0.0-rc2-24027"; + sha256 = "19f83159vrfnfppzchjclk82w2x1mkvnx1y5yg1f238dpjb2ri8w"; + }) + (fetchNuGet { + name = "system.security.cryptography.encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; + name = "system.security.cryptography.openssl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "system.security.cryptography.openssl"; + version = "4.0.0-rc2-24027"; + sha256 = "1mqw7xkh4pj110f249c4jpv9mg1sd8c2cr6kj2zc0mic325vvg0s"; + }) + (fetchNuGet { + name = "system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Pkcs"; + name = "system.security.cryptography.pkcs"; version = "4.4.0"; sha256 = "1bn7d2czpc994qzdph4drv7p1cv4x55j2dhbmr113p0gs4hx33zh"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; + name = "system.security.cryptography.primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "system.security.cryptography.primitives"; + version = "4.0.0-rc2-24027"; + sha256 = "16zwyw3glsq2flq1crd0c24i336bc42rj28a9rjvvkg428vz4rf8"; + }) + (fetchNuGet { + name = "system.security.cryptography.primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { - name = "System.Security.Cryptography.ProtectedData"; + name = "system.security.cryptography.protecteddata"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; + name = "system.security.cryptography.x509certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "system.security.cryptography.x509certificates"; + version = "4.1.0-rc2-24027"; + sha256 = "1gfxc9p73zak46klrfsyxgkcyzbvqnjarsm0wkvmj31n9g4dpjkz"; + }) + (fetchNuGet { + name = "system.security.cryptography.x509certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { - name = "System.Security.Principal"; + name = "system.security.principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; + name = "system.security.principal.windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; + name = "system.security.principal.windows"; version = "4.4.0"; sha256 = "11rr16fp68apc0arsymgj18w8ajs9a4366wgx9iqwny4glrl20wp"; }) - (fetchNuGet { - name = "System.ServiceProcess.ServiceController"; + name = "system.serviceprocess.servicecontroller"; version = "4.4.0"; sha256 = "0hyijvysbcjh20mbbgajg9wh04nkjd6y5lqxgm0a6m28zjcjshl6"; }) - (fetchNuGet { - name = "System.Text.Encoding"; + name = "system.text.encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { - name = "System.Text.Encoding"; + name = "system.text.encoding"; + version = "4.0.11-rc2-24027"; + sha256 = "0qkaldb06dwmi8gb940h75n9cs5rgy6sqcpa6f443mhahmagmsbd"; + }) + (fetchNuGet { + name = "system.text.encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { - name = "System.Text.Encoding.CodePages"; + name = "system.text.encoding.codepages"; version = "4.4.0"; sha256 = "07bzjnflxjk9vgpljfybrpqmvsr9qr2f20nq5wf11imwa5pbhgfc"; }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; + name = "system.text.encoding.extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; + name = "system.text.encoding.extensions"; + version = "4.0.11-rc2-24027"; + sha256 = "02xic3hhfy48s50bxh25as1l9v3afgrhlxqfnd5ki4qirxly7qs6"; + }) + (fetchNuGet { + name = "system.text.encoding.extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; + name = "system.text.regularexpressions"; + version = "4.0.12-rc2-24027"; + sha256 = "1111sgvbxrxq9c1i0nziqddlzfdc2bsawd0jcf2nna9nkcn4d6br"; + }) + (fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "system.text.regularexpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { - name = "System.Threading"; + name = "system.threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { - name = "System.Threading"; + name = "system.threading"; + version = "4.0.11-rc2-24027"; + sha256 = "0aa4zaqma4yagjd44m2j13gr9qzn8rv8dbz3p9mjdk0dx1zpi4iq"; + }) + (fetchNuGet { + name = "system.threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { - name = "System.Threading.Channels"; + name = "system.threading.channels"; version = "4.5.0"; sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; }) - (fetchNuGet { - name = "System.Threading.Tasks"; + name = "system.threading.overlapped"; + version = "4.0.1-rc2-24027"; + sha256 = "1ansaxwkc4xi2ngpiv8gjmv02d75y0nb4lfqzxy73r3radakqvdp"; + }) + (fetchNuGet { + name = "system.threading.tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { - name = "System.Threading.Tasks"; + name = "system.threading.tasks"; + version = "4.0.11-rc2-24027"; + sha256 = "0fsgdzdxm3yj1cym421ymn8x8anhyzgzc1529q5xd1vq4yknwfq0"; + }) + (fetchNuGet { + name = "system.threading.tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; + name = "system.threading.tasks.extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.0.0-rc2-24027"; + sha256 = "108sdqpy3ga6gzksl59w1k21a3jlrh8x2igyxh3dm3212rca1pyg"; + }) + (fetchNuGet { + name = "system.threading.tasks.extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; + name = "system.threading.tasks.extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) - (fetchNuGet { - name = "System.Threading.Thread"; + name = "system.threading.thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + name = "system.threading.thread"; + version = "4.0.0-rc2-24027"; + sha256 = "1gv963m4523m3m9gbn819bfzmhxqsv93m5kaqmbv4ijyziby2872"; }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; + name = "system.threading.threadpool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { - name = "System.Threading.Timer"; + name = "system.threading.timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "system.threading.timer"; + version = "4.0.1-rc2-24027"; + sha256 = "06kwi42lgf3zw3b5yw668ammbjl6208y182wyqaaqrxgn5gs4yh7"; + }) + (fetchNuGet { + name = "system.threading.timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; + name = "system.xml.readerwriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; + name = "system.xml.readerwriter"; + version = "4.0.11-rc2-24027"; + sha256 = "0vywggi6mqkbr6g1a1fh821hqfnyq1k829vlhfw908l7mj75k34d"; + }) + (fetchNuGet { + name = "system.xml.readerwriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { - name = "System.Xml.XDocument"; + name = "system.xml.xdocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "system.xml.xdocument"; + version = "4.0.11-rc2-24027"; + sha256 = "1rvglifac6xq1lawm78w49fq9cl8zvs1g4vrsd2hhf0vb4i85p1z"; + }) + (fetchNuGet { + name = "system.xml.xdocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; + name = "system.xml.xmldocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; + name = "system.xml.xmldocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "System.Xml.XmlSerializer"; + name = "system.xml.xmlserializer"; + version = "4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) + (fetchNuGet { + name = "system.xml.xmlserializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) - (fetchNuGet { - name = "System.Xml.XPath"; + name = "system.xml.xpath"; version = "4.0.1"; sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; + name = "system.xml.xpath.xmldocument"; version = "4.0.1"; sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; }) - (fetchNuGet { name = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) - (fetchNuGet { name = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { name = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) - (fetchNuGet { name = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) - (fetchNuGet { name = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) - (fetchNuGet { name = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) - (fetchNuGet { name = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) - (fetchNuGet { name = "xunit.runner.visualstudio"; version = "2.4.1"; sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn"; }) - (fetchNuGet { - name = "YamlDotNet.Signed"; + name = "yamldotnet.signed"; version = "5.3.0"; sha256 = "1gnp5aa2zzg7v61bbn2ra1npy0p07szp5w8vqk44fdj3fcvrdxib"; }) - ] diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index a11163385893..4a9c05b4a4e6 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wKtgMUt7QquT6mS3AI+XrZqbJOZxj6jlJi+7uC9w7xU="; + sha256 = "sha256-4qnisgWhdAWZda8iy9nkph7//bVKJuUeEDS1GaAx+FQ="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-TMhhCVVFTanKdbDp7L3ZaiNohWo5a/jFbQjdRiBlCkk="; + cargoSha256 = "sha256-f3wzuXH2ByXHHOq3zLaMtYm2HJ4BzmZe2e6DQ3V7qVo="; doCheck = false; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index 59253a4f7da2..61fa49b0adba 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage rec { mkdir -p $out/share/kak/autoload/plugins cp rc/parinfer.kak $out/share/kak/autoload/plugins/ - rtpPath=$out/share/vim-plugins/parinfer-rust - mkdir -p $rtpPath/plugin + rtpPath=$out/plugin + mkdir -p $rtpPath sed "s,let s:libdir = .*,let s:libdir = '${placeholder "out"}/lib'," \ - plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim + plugin/parinfer.vim > $rtpPath/parinfer.vim ''; meta = with lib; { diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index c037a2dcf8c0..8866a38643f8 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -65,7 +65,7 @@ (fetchNuGet { name = "Markdig"; version = "0.25.0"; sha256 = "1f7iqkaphfyf6szjrp0633rj44wynqgiqyivbja5djyxjy4csfyy"; }) (fetchNuGet { name = "MessagePack"; version = "2.3.75"; sha256 = "0mcpxym6g47lyfalnr27mmavmgmd46k6f9g7id8cn1anbbvd4xv1"; }) (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.75"; sha256 = "06a1ys161gvw1sr771w909gwd1y4dizdvldknkhy8484drj90prd"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.8"; sha256 = "13k0p0k1gqk12hnxj4l5yjbyv8y51ggkybrqjjr3yf3411vyy4q2"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.8"; sha256 = "0rladdnd7g8gh7hj5gbrcp3dlspngad4xhgk0qmpzhlc3qr4snf2"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.8"; sha256 = "03d2ydy7zap5hri7k1f30d1i9jaqj0nijwgp2z6b36gwqck9rys7"; }) @@ -124,7 +124,7 @@ (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.1"; sha256 = "01ar5ba2sal9wnpa1xnnikhgb37vzhg2cspz45wf760jflpai2vv"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 6ae51812b3d5..5d403b7e93cb 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -12,17 +12,17 @@ (fetchNuGet { name = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) (fetchNuGet { name = "LibHac"; version = "0.12.0"; sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.5"; sha256 = "09nsi9fa8kb3jpnim0hdap3jabskvpr4fmpvnj5wsh3gp91vqvgb"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.5"; sha256 = "10g2vdsz685agqbd7h7dd9gvs584prpai0zv37r59wzlynj1assl"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { name = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.5"; sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.5"; sha256 = "1233y31z46yqzjgwpa6mmb1h63iqp6wbly6mbwkjqm2adx1wkp47"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.5"; sha256 = "1a1ijdk61l0h25sj9ypcf96vz1c08ca7q5809g82qpi9m34kw8b8"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.5"; sha256 = "1gc4msk61jgj9ill4icp0mn523g411iqpxphp0fykfvqdpqyqg46"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix index b6c75e03654d..5b235188c06a 100644 --- a/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -6,7 +6,7 @@ rec { addRtp = path: attrs: derivation: - derivation // { rtp = "${derivation}/${path}"; } // { + derivation // { rtp = "${derivation}"; } // { overrideAttrs = f: buildVimPlugin (attrs // f attrs); }; @@ -26,6 +26,9 @@ rec { addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // { name = namePrefix + name; + # dont move the doc folder since vim expects it + forceShare= [ "man" "info" ]; + nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ vimGenDocHook ]; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 9b0cae766e1c..a80ed2061e58 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -37,6 +37,9 @@ , xkb-switch , ycmd +# test dependencies +, neovim-unwrapped + # command-t dependencies , rake , ruby @@ -392,6 +395,12 @@ self: super: { substituteInPlace $out/bin/minimap_generator.sh \ --replace "code-minimap" "${code-minimap}/bin/code-minimap" ''; + + doCheck = true; + checkPhase = '' + ${neovim-unwrapped}/bin/nvim -n -u NONE -i NONE -V1 --cmd "set rtp+=$out" --cmd "runtime! plugin/*.vim" -c "MinimapToggle" +quit! + ''; + }); ncm2 = super.ncm2.overrideAttrs (old: { diff --git a/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh index cbf666f8b74d..d5f0a00ebcc2 100644 --- a/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh +++ b/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh @@ -5,7 +5,7 @@ echo "Sourcing vim-gen-doc-hook" vimPluginGenTags() { echo "Executing vimPluginGenTags" - target="$out/@rtpPath@/$pname" + target="$out/@rtpPath@" mkdir -p $out/@rtpPath@ # build help tags @@ -16,7 +16,7 @@ vimPluginGenTags() { exit 1 fi else - echo "No docs available" + echo "No docs available for $target" fi if [ -n "$addonInfo" ]; then diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 0516a84ce953..3e609b575119 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -187,8 +187,9 @@ let rtpPath = "."; - nativeImpl = packages: - (let + # Generates a packpath folder as expected by vim + packDir = packages: + let # dir is "start" or "opt" linkLuaPlugin = plugin: packageName: dir: '' mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname}/lua @@ -205,7 +206,7 @@ let then linkLuaPlugin pluginPath else linkVimlPlugin pluginPath; - packageLinks = (packageName: {start ? [], opt ? []}: + packageLinks = packageName: {start ? [], opt ? []}: let # `nativeImpl` expects packages to be derivations, not strings (as # opposed to older implementations that have to maintain backwards @@ -230,21 +231,20 @@ let ++ [ "mkdir -p $out/pack/${packageName}/start/__python3_dependencies" "ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3" - ] - ); - packDir = (packages: + ]; + in stdenv.mkDerivation { name = "vim-pack-dir"; src = ./.; installPhase = lib.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList packageLinks packages)); preferLocalBuild = true; - } - ); - in + }; + + nativeImpl = packages: '' set packpath^=${packDir packages} set runtimepath^=${packDir packages} - ''); + ''; /* Generates a vimrc string @@ -295,7 +295,7 @@ let plugImpl = ('' source ${vimPlugins.vim-plug.rtp}/plug.vim - call plug#begin('/dev/null') + silent! call plug#begin('/dev/null') '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + '' diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ad6fc97ea8a6..92c530432a89 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1390,6 +1390,18 @@ let }; }; + tabnine.tabnine-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tabnine-vscode"; + publisher = "tabnine"; + version = "3.4.27"; + sha256 = "sha256-Xg/N59a38OKEWb/4anysslensUoj9ENcuobkyByFDxE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ec43ae9d59d4..9932e46839a9 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -367,35 +367,35 @@ self: super: xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; - installFlags = [ - "sdkdir=${placeholder "out"}/include/xorg" + configureFlags = [ + "--with-sdkdir=${placeholder "dev"}/include/xorg" ]; }); xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: { - installFlags = [ - "sdkdir=${placeholder "out"}/include/xorg" + configureFlags = [ + "--with-sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: { - installFlags = [ - "sdkdir=${placeholder "out"}/include/xorg" + configureFlags = [ + "--with-sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - installFlags = [ - "sdkdir=${placeholder "dev"}/include/xorg" + configureFlags = [ + "--with-sdkdir=${placeholder "dev"}/include/xorg" ]; }); xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev - installFlags = [ - "sdkdir=${placeholder "out"}/include/xorg" - "configdir=${placeholder "out"}/share/X11/xorg.conf.d" + configureFlags = [ + "--with-sdkdir=${placeholder "dev"}/include/xorg" + "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d" ]; }); diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 09f0a3cb1375..f217408c28d0 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.41.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-0utKBCe65lCaamoF4uqvku1zTX2QPpV/6xBtpGteVYw="; + sha256 = "sha256-t6/w998mTsFl/V/zcbVxokJk4VZWDoOXsjr93GW7Zh4="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix new file mode 100644 index 000000000000..96b07874df45 --- /dev/null +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "fits-cloudctl"; + version = "0.9.11"; + + src = fetchFromGitHub { + owner = "fi-ts"; + repo = "cloudctl"; + rev = "v${version}"; + sha256 = "1i9h96b0b69ib72b2ayp8mhgvkm21jbh8mf7wb1fp2gdzbxcgrhg"; + }; + + vendorSha256 = "1fs1jqxz36i25vyb0mznkjglz8wwq9a8884052cjpacvsgd3glkf"; + + meta = with lib; { + description = "Command-line client for FI-TS Finance Cloud Native services"; + homepage = "https://github.com/fi-ts/cloudctl"; + license = licenses.mit; + maintainers = with maintainers; [ j0xaf ]; + }; +} diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index f861a9cfdfb0..7b34bccecb5c 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -3,7 +3,7 @@ (fetchNuGet { name = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) (fetchNuGet { name = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.14"; sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { name = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; }) (fetchNuGet { name = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; }) diff --git a/pkgs/tools/games/steam-acf/default.nix b/pkgs/tools/games/steam-acf/default.nix new file mode 100644 index 000000000000..ea6572216104 --- /dev/null +++ b/pkgs/tools/games/steam-acf/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "steam-acf"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "chisui"; + repo = "acf"; + rev = "v${version}"; + sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2"; + }; + + cargoSha256 = "0fzlvn0sl7613hpsb7ncykmcl53dgl8rzsg317nwkj2w679q4xq6"; + + meta = with lib; { + description = "Tool to convert Steam .acf files to JSON"; + homepage = "https://github.com/chisui/acf"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ chisui ]; + mainProgram = "acf"; + }; +} diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index 82edd2df4dd9..6875e6f12343 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -1,19 +1,35 @@ -{ lib, stdenv, fetchurl, tcl, tk }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, tcl +, tk +}: stdenv.mkDerivation rec { pname = "uudeview"; version = "0.5.20"; + src = fetchurl { - url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz"; + url = "http://www.fpx.de/fp/Software/UUDeview/download/${pname}-${version}.tar.gz"; sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4"; }; buildInputs = [ tcl tk ]; - hardeningDisable = [ "format" ]; + configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ]; - # https://wiki.tcl.tk/3577 - patches = [ ./matherr.patch ]; + patches = [ + # https://wiki.tcl.tk/3577 + ./matherr.patch + # format hardening + (fetchpatch { + url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch"; + sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw"; + extraPrefix = ""; + }) + ]; + postPatch = '' substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish" ''; @@ -21,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; homepage = "http://www.fpx.de/fp/Software/UUDeview/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/networking/opensnitch/daemon.nix b/pkgs/tools/networking/opensnitch/daemon.nix index d7359ea0e70c..31057a8f5271 100644 --- a/pkgs/tools/networking/opensnitch/daemon.nix +++ b/pkgs/tools/networking/opensnitch/daemon.nix @@ -5,6 +5,8 @@ , libnetfilter_queue , libnfnetlink , lib +, coreutils +, iptables }: buildGoModule rec { @@ -32,6 +34,12 @@ buildGoModule rec { postBuild = '' mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd + mkdir -p $out/lib/systemd/system + substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ + --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ + --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ + --replace "/bin/mkdir" "${coreutils}/bin/mkdir" + sed -i '/\[Service\]/a Environment=PATH=${iptables}/bin' $out/lib/systemd/system/opensnitchd.service ''; vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk="; diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 82c52419c67c..b871b4a53b21 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "RustSec"; repo = "rustsec"; rev = "cargo-audit%2Fv${version}"; - sha256 = "1rmhizgld35996kzp3fal2zl20aqpnmkzx0clc80n30p814isdrw"; + sha256 = "1j5ijrjhzqimamhj51qhpbaxx485hcxhaj64lknkn0xrda3apkx8"; }; - cargoSha256 = "10li9w3m4xxb8943802y74dgb1wsgjkn74hwn2x47c0w0yjiig7p"; + cargoSha256 = "1qvrzaila3wbjmc7ri5asa3di2nzln78ys9innzd84fr36c90kkc"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/tools/security/yubikey-touch-detector/default.nix new file mode 100644 index 000000000000..93531d3a2b67 --- /dev/null +++ b/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -0,0 +1,26 @@ +{ lib, libnotify, buildGoModule, fetchFromGitHub, pkg-config }: + +buildGoModule rec { + pname = "yubikey-touch-detector"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "maximbaz"; + repo = "yubikey-touch-detector"; + rev = version; + sha256 = "sha256-I9dRCQhbXd8K1zp291z9XVwHI9DcxgvrzYaHICZH5v0="; + }; + vendorSha256 = "sha256-UeDLGwYrXwLOtQt/8fEmficc/1j0x+zr/JLa6lLF5cs="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libnotify ]; + + meta = with lib; { + description = "A tool to detect when your YubiKey is waiting for a touch (to send notification or display a visual indicator on the screen)."; + homepage = "https://github.com/maximbaz/yubikey-touch-detector"; + maintainers = with maintainers; [ sumnerevans ]; + license = licenses.isc; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7fbd3653863..5f3300b6df99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2771,6 +2771,8 @@ with pkgs; firestarter = callPackage ../applications/misc/firestarter { }; + fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; + frangipanni = callPackage ../tools/text/frangipanni { }; fselect = callPackage ../tools/misc/fselect { }; @@ -19522,6 +19524,8 @@ with pkgs; yubikey-agent = callPackage ../tools/security/yubikey-agent { }; + yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { }; + zchunk = callPackage ../development/libraries/zchunk { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -29681,6 +29685,8 @@ with pkgs; steamcmd = steamPackages.steamcmd; + steam-acf = callPackage ../tools/games/steam-acf { }; + protontricks = python3Packages.callPackage ../tools/package-management/protontricks { winetricks = winetricks.override { # Remove default build of wine to reduce closure size. diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 99f8b5eb7da3..eb75ec193c93 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -1,4 +1,5 @@ { pkgs +, linuxKernel , config , buildPackages , callPackage @@ -16,14 +17,31 @@ # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. # - Update linux_latest_hardened when the patches become available -let - kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; +with linuxKernel; +let deblobKernel = kernel: callPackage ../os-specific/linux/kernel/linux-libre.nix { linux = kernel; }; - kernels = lib.makeExtensible (self: with self; + # Hardened Linux + hardenedKernelFor = kernel': overrides: + let kernel = kernel'.override overrides; + in kernel.override { + structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { + inherit lib; + inherit (kernel) version; + }; + kernelPatches = kernel.kernelPatches ++ [ + kernelPatches.hardened.${kernel.meta.branch} + ]; + modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; + isHardened = true; + }; +in { + kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; + + kernels = recurseIntoAttrs (lib.makeExtensible (self: with self; let callPackage = newScope self; in { linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { @@ -204,7 +222,7 @@ let linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_13_hardened = hardenedKernelFor kernels.linux_5_13 { }; - }); + })); /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -429,20 +447,6 @@ let ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; }); - # Hardened Linux - hardenedKernelFor = kernel': overrides: - let kernel = kernel'.override overrides; - in kernel.override { - structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit lib; - inherit (kernel) version; - }; - kernelPatches = kernel.kernelPatches ++ [ - kernelPatches.hardened.${kernel.meta.branch} - ]; - modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; - isHardened = true; - }; hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); vanillaPackages = { @@ -471,7 +475,7 @@ let linux_rpi4 = packagesFor kernels.linux_rpi4; }; - packages = vanillaPackages // rtPackages // rpiPackages // { + packages = recurseIntoAttrs (vanillaPackages // rtPackages // rpiPackages // { linux_mptcp_95 = packagesFor kernels.linux_mptcp_95; # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -495,7 +499,7 @@ let linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre); linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); - }; + }); packageAliases = { linux_default = packages.linux_5_10; @@ -509,22 +513,11 @@ let manualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); -in - -{ - packages = recurseIntoAttrs packages; - kernels = recurseIntoAttrs kernels; - inherit packageAliases; - inherit vanillaPackages rtPackages rpiPackages; - inherit kernelPatches packagesFor hardenedPackagesFor; - customPackage = { version, src, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (packagesFor (manualConfig { inherit version src configfile lib stdenv allowImportFromDerivation; })); - inherit manualConfig; - # Derive one of the default .config files linuxConfig = { src,