diff options
Diffstat (limited to 'pkgs/development')
111 files changed, 406 insertions, 452 deletions
diff --git a/pkgs/development/beam-modules/elixir-ls/pin.json b/pkgs/development/beam-modules/elixir-ls/pin.json index bd206eb1d1a20..79909f98b7de2 100644 --- a/pkgs/development/beam-modules/elixir-ls/pin.json +++ b/pkgs/development/beam-modules/elixir-ls/pin.json @@ -1,5 +1,5 @@ { - "version": "0.12.0", - "sha256": "sha256-ZieKL98EUT3RbZ1UZkhrnXjg3N0RATKB69F8D7IWnJ8=", - "depsSha256": "sha256-Otm8koWrDYxodfliIe+q4U+39eStR5umEKnQQmOOGeA=" + "version": "0.13.0", + "sha256": "sha256-eUAlnEKhoJ3j2Ii2EBL620jv3aGeMJcWoMMG+vWIdm4=", + "depsSha256": "sha256-fAt9BpEE9truGWpor0BttVd9aNZlgQ6UTorIEcJ82wM=" } diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index c2cb6eb37823b..fddcbcea466b3 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -28,7 +28,6 @@ let ## Files in versions/ are generated automatically by update.sh ## dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); - dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; }); dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); in @@ -38,7 +37,8 @@ rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; -} // dotnet_3_1 // dotnet_5_0 // dotnet_6_0 // dotnet_7_0 + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; +} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 diff --git a/pkgs/development/compilers/dotnet/versions/5.0.nix b/pkgs/development/compilers/dotnet/versions/5.0.nix deleted file mode 100644 index 64da95920d5a7..0000000000000 --- a/pkgs/development/compilers/dotnet/versions/5.0.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: - -# v5.0 (eol) -{ - aspnetcore_5_0 = buildAspNetCore { - inherit icu; - version = "5.0.17"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2b96f83-e22a-4fa6-a10e-709b3effac9a/0d6ade6c0ceebc8ef7dbf2b1a6d86f17/aspnetcore-runtime-5.0.17-linux-x64.tar.gz"; - sha512 = "d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6eb8aee2-cbea-4c4f-9bb9-ea6229ec229b/d6c438e5071c359ad995134f0a33e731/aspnetcore-runtime-5.0.17-linux-arm64.tar.gz"; - sha512 = "ac1a9d89f1b730dfdca9c2e48373ef21f8f9316014eefbe6b11516f8195d3b3efc4e482883774b74ea2ff1cb77174a2cb471bd1157ab5b7d71621e3026c38e9b"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/25e4817f-6fd0-46dc-be0d-d819445bac5c/a8fa228c872df683741c8a79745f8fb3/aspnetcore-runtime-5.0.17-osx-x64.tar.gz"; - sha512 = "bb0c43c723090fa2d8a0255e6fc8c004ebe7baf2d5d56e22ad2e6336a67fe415333d451e459c8857c0ccb5819d998232c9617bf45f222559d4b8891b0af41f20"; - }; - }; - }; - - runtime_5_0 = buildNetRuntime { - inherit icu; - version = "5.0.17"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e77438f6-865f-45e0-9a52-3e4b04aa609f/024a880ed4bfbfd3b9f222fec0b6aaff/dotnet-runtime-5.0.17-linux-x64.tar.gz"; - sha512 = "a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6690730f-cf10-40f1-9d4d-4c0d002f22d0/e117133858f190c169873200b8d7b9d7/dotnet-runtime-5.0.17-linux-arm64.tar.gz"; - sha512 = "99cb11871924d3abedcc9c8079c54bc0c550203c7cbe4e349ed70d4355f40e4620b68d90b797e6461d898c06bed6953580e2cd4ad01483e5de107ca5a3409610"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/39326cf0-dc7f-42a3-9f7a-fe30c75c7a7f/33cbce552148e13d47120fe4502f5b5e/dotnet-runtime-5.0.17-osx-x64.tar.gz"; - sha512 = "31add512418640f98bc9511509db2049a2674c7725169d26be89218a02ac7972e03e5d6be5a3d45a0dfa764e6eade503a8f4957b7b198ec6ad412e423d95f1b9"; - }; - }; - }; - - sdk_5_0 = buildNetSdk { - inherit icu; - version = "5.0.408"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/904da7d0-ff02-49db-bd6b-5ea615cbdfc5/966690e36643662dcc65e3ca2423041e/dotnet-sdk-5.0.408-linux-x64.tar.gz"; - sha512 = "abbf22c420df2d8398d1616efa3d31e1b8f96130697746c45ad68668676d12e65ec3b4dd75f28a5dc7607da58b6e369693c0e658def15ce2431303c28e99db55"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4b71fac-a2fd-4516-ac58-100fb09d796a/e79d6c2a8040b59bf49c0d167ae70a7b/dotnet-sdk-5.0.408-linux-arm64.tar.gz"; - sha512 = "50f23d7aca91051d8b7c37f1a76b1eb51e6fe73e017d98558d757a6b9699e4237d401ce81515c1601b8c21eb62fee4e0b4f0bbed8967eefa3ceba75fc242f01b"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4aeecc7c-7ffa-418f-9362-cf5eb3ed0396/055d5e6064a9fdecd7d906f5f262373d/dotnet-sdk-5.0.408-osx-x64.tar.gz"; - sha512 = "3fdd4deac2809b00c0f669d5488000ac1b9a47dee6ab7b31167d7cec4759a10ee347fd4f52090a40684e5ecc1e1f57eb99c558e561edfd1436a2f77fc1c1a0b2"; - }; - }; - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mfawgcc23r44a1r7ynafxwga6jzn0f0z5ys03qssrvlcdsb376x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "183xgqzlwd5lhacxdwcjl8vcq7r7xypv0hddps9k32mmmwf83d8h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "0i5pp1smjkyhiyhcbkyc3cxz0sx9204bfml8wsdy7bxznbh2gkmw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "1fmd9jq2nzy63hjh4sa6zl636wpgwr3r8ahzln5w14m9k87lfdbk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "066fwdlssbv556zd9w1x87x1j8j4kafj9rxyy0692bssdb4gcyc8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1qvvqf8mmzzc7a7fhx324dprnbxhknr3qxspb2xhsn3yyg44xn2d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "1gzf2gv4z9bn1cr1kpqpf1jf7m0p0wd1pxq5ndylq6bw353yglk1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1lml70ln9bfjrfjf3jbxfzd5kgd4cp4h7v052md5ja364g7lalsy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0j90fri15c05lw96xybgvqkysfm7g8grhkrg25g75vhi6ni2ricj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "1bdb887xvgxsmphys83zp9skn848p1r8viclc8p29w1rby4wi19i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.17"; sha256 = "0y90p765sj54clf2bwrka99w73g8b9550b4qvyilqggzydl1c1hk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.17"; sha256 = "07v7vyqm556xr1ypkazfp6gh6drgf20zkwbhkpja8bwdcr6lphbb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "5.0.17"; sha256 = "0sbzlzhazh31s63hw9553hk9j56fxssncmfgidiyh0dg73aacrsp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "5.0.17"; sha256 = "1qxphvlr882rvmj71y2imnf6r3hh4ln2n138qjyv1z129dp2g4y1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.17"; sha256 = "02g5w41ivrw3n6cy3l3ixhcl8bw1fsv4bzs2m34k9h5fqmliaf3c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "5.0.17"; sha256 = "07rfkxpf6rp8x0lybl8hx40mk09w5gjrr9djkjcp8lvjgzidnxq9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "5.0.17"; sha256 = "1i7wka56n3akr96jrkj37jx98bwxfzhpx5705930v50izligd08x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.17"; sha256 = "15f1kqlpp1d05dhg3dfya32vvzbpj6c7gxds947f10jb0hqlnhdj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "5.0.17"; sha256 = "1j1334zxv815ksdnllnbwwsbwnimjlpknjmqy1riy2zpswxlfkz6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mmgd6nacx4fzf0w02ch0qxa43vrv6wfspykxsy2bkpvrnvr8xr9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "16whaq82pj6fqa0vam3a0va9ly843aa1z12hza040vn6252kk9fq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "1zavnwqvn2f7lhb880wgv02anrvqsh6l34w72knwd31irggph08l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "173r2srcbad2prrw3l914scmdks3mghxgszvlwypdjnv0f2szgvv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "0jgcfs3jc98jfyaaamssznckbpnaygplk8pjsp6dswpansz5bnnq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1ph5kx18syinp8bpzw80bgq3njl65gwzws727xcmxnysgm7snmjp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "0m4jhn70parwnl18fql0sk9sf14y8cf08xw6x2cm5bfhnc9jvjny"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1af20jkv73767b4fy18s2dvjncaca1ny0csyr7wbhvqfs59y3n1x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0llhsi03wyp2yjqy0snywqgwjgam91i4nsf5lc9kaxkk5h6vj1a0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "0xvprbjwd3fymddvavsy7wk5q2hp45hdi10qz4rdbmns23vqkzmf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0vhvxpba3i9ffp4gp56l3rnlhq9yg07n3dv5qi89zb90vgyqjh1p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "074c9byxwmndfdavxn103220f5gklaaxc9wj7zpb5v3yr3ads30f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "03jkkpsy2zjfp722fa2fcnpk2g6jzy0bn9vip5c39k78y5pz29x6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1ih6c104skp9q17i2dnsma45l6nv5c62vv2i1988dcjw2v0sl98m"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0gwsxd1l0n32xnw0lyjixj2634iyygdb8pd7chydsr3qk8njxnpk"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0x5dhn1jkwqnd0cki1vi97rhyfac6w79hvh9dxvnkn2k04sbps8q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ipx3qn78z6gi415c4fa9wgy8k75aifbml6ys1c9ghl6yxbv0fd0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1wgbx648yndl0hh8vx6sflfwjyr5pfhi7vj7v19l6vxnrr1096w7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17jc8jc2dk1g8996jpq3k0g6c5inijivxkbz0grxrgr5jbyiv19y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0ydn40qn6cs6f20byvmc9j008s6csxjbh6jh5w4q995vipcmcpcj"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bw08wlf96vcyix850y8jips1glrz2cbj647af4d7gggw8p3wwzw"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0xsqyw848scwcz09pgc719776q712xabx4xv47srzij34p2pq7np"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "00b0vipypjai4l8icr74kjhglxx2xlc3nw3vyiwisg52l9zyby66"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1cdgd4p5zr1mzz9hlb5mj946zfa1vn9wya5y2bhqn9y4ak831wzp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "17v8m4fxm4q40z49a2h4lw9dawg6pwfv4s2dskzc23ggcjgr6dp1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1fbqi92prqmvxx0rx7vhl10l665jmmhb2ng5jndimggydb0ckpqh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1rijxkzzk65xs9z2ygs13h0rhw1cli5vwshmvs1gfnwhhn8ic0gx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "02mxvpm2zs5jvawigvxlnrw6si4zwj6qlcas99m9xdmm8yqq22cm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0c1lcl3yy88vdfw12c7h0ww596qfjd5f8l2mn7mlqs6i3f864bkg"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w0wg9ah7vngvpyds67l6qhizpkdf2r6m6cqyyvv3s5dw5l8rxin"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17yy7605vkfz0f4h58005gdfg6fnjxlcnq0vg0hrxsgbdqmd7p1i"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0av25fgkdl7zvn44wp8gqx2xl2mdlv1f9cgxzp7xk5yq8f7ynxpq"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1smhmdfq0jlv1gq18hdaj0y9yzkvqzmki19c0b3j5b76yxxxpbwz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0n0cdb9zpdb4h4v6r265pqmqg8c94ydywvna6jp1c6qhqlr0qk39"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1s2n2sx29c8rx549zizj8yrddjl98a7vwvxw56y0jvvbwphr9gz4"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "19m66yvv0hnmyrmx2l4drbls0fcib75fxq2csdx6p8gd54bnrsh3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bcnlsxcrvhybcjbb9879njx0c4z76y7djx4643g1rpjnkcrj9ww"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1bf95h2f0dmpmv7z7961zia5vaqvmjq3wkf6iil9jxv4z674624w"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "02q593q09mwwh23m86048vc7b7an7pqch5nd86d4hxzkamnpnpsa"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "16vzxywfj88gjcwfnmcb6b50ld8dp46i4pqiwwcy7yz15xgdhbm2"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ix5lg2j5ihdfp9j3jdxc042g4syjzc4bafid465j52h6znsm6wm"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w30v8r26cg427n5glm9nz6r10baalkqq5icqqxkq71hmh8fsjqb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "168iq4hdp6bhdpgqa1mir1bygmh2ggwkys1r82d6kpl2lzbxjy28"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "18jpw2wbrb1b941729lb7hiq4yfq2z53pcxwz4mpgawnr58y0562"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0ig464fcsj2jr0p02f6slifwf1m0408g95npm0vccf5ww1nbgkpi"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0qj5avmjrvabxzimprg4m54k3p6zkwrhbpv0byc8c9gbi47s323j"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "05ghz164lpff7n8mrxs7jm2h8n3clsg4w953zrag3k5ry9j36m9c"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0azgs542mbg69jlc81529i2z5m728w8sc2i9m5dx15hvxqqqcjiz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "12n1kcgcv5z8hkvjqfk0n705kcipbai4sgcwiimi52xpaf34xw8m"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0b1s2m0a7xcdzfz22x6k7v5hkca90azdjk6pw7wwdnvszwq26nxp"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1sjpq07swgj0isdgyh6p2yb254qb9781lv44xfhj6nz7mx2yhdh1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1gnzrqdp26d7pwwz29gm4qb09n2zsb767qkhbwkifcsyxlwi6m0f"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "089jww13gaf7x7yd9d3qkyx9iq8abcp3r147hd9nblh561c9bzbg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1nycl1rayk0fhaakpj6q9rfp2lv3dpl7pziavmd9kcfryz952ff5"; }) - ]; - }; -} diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index e23dbdbd6c1b1..9780dac344b1a 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -21,11 +21,11 @@ }: let - version = "8.48.0.53"; - openjdk = "8.0.265"; + version = "8.68.0.19"; + openjdk = "8.0.362"; - sha256_linux = "ed32513524b32a83b3b388831c69d1884df5675bd5069c6d1485fd1a060be209"; - sha256_darwin = "36f189bfbd0255195848835819377474ba9c1c868e3c204633c451c96e21f30a"; + sha256_linux = "sha256-jNty0iJoXG+sp7v2fGCrwZWCSZfQ4tkYe8ERixQMKL0="; + sha256_darwin = "sha256-3/P3puM6a7tCHP5eZM6IzbdPrqnhY1dTa7QWss9M08M="; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 03dff2348a290..b4338738f892e 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -22,12 +22,12 @@ }: let - version = "11.52.13"; - openjdk = "11.0.13"; + version = "11.62.17"; + openjdk = "11.0.18"; - sha256_x64_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f"; - sha256_x64_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e"; - sha256_aarch64_darwin = "dmzfergSUVz39T30PT/6ZtT8JNqv5lzdX7zUsXsFGJg="; + sha256_x64_linux = "sha256-b65oEbDzrrsUw+WaX94USBz/QS74yiMiGZPxqzMmmqs="; + sha256_x64_darwin = "sha256-nRRWTWiog8bRblmmPIPE5YibA34St3ZrJpZN91qEDUg="; + sha256_aarch64_darwin = "sha256-TBTrBxOfGo6MV+Md49P3sDfqVG1e+NraqfVbw9WTppk="; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isAarch64 && stdenv.isDarwin then sha256_aarch64_darwin else if stdenv.isDarwin then sha256_x64_darwin else sha256_x64_linux; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 7ded64ec572e9..5a7ec31f50c1d 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, StructTact, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "cheerios"; owner = "uwplse"; inherit version; - defaultVersion = if versions.range "8.6" "8.16" coq.version then "20200201" else null; + defaultVersion = if lib.versions.range "8.6" "8.16" coq.version then "20200201" else null; release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d"; release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1"; diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 9dabae0bdbca5..a926f6d8092da 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "color"; owner = "fblanqui"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ {case = range "8.12" "8.16"; out = "1.8.2"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } @@ -26,6 +26,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://github.com/fblanqui/color"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; - maintainers = with maintainers; [ jpas jwiegley ]; + maintainers = with lib.maintainers; [ jpas jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index 7b9ded1e399a8..a0761dfb5193a 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, autoconf, automake, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "HoTT"; repo = "Coq-HoTT"; owner = "HoTT"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; @@ -20,6 +20,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://homotopytypetheory.org/"; description = "Homotopy type theory"; - maintainers = with maintainers; [ siddharthist ]; + maintainers = with lib.maintainers; [ siddharthist ]; }; } diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 23922dcce4285..e0a9e1f6bfc4e 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "InteractionTrees"; owner = "DeepSpec"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; @@ -12,6 +12,6 @@ with lib; mkCoqDerivation rec { propagatedBuildInputs = [ coq-ext-lib paco ]; meta = { description = "A Library for Representing Recursive and Impure Programs in Coq"; - maintainers = with maintainers; [ larsr ]; + maintainers = with lib.maintainers; [ larsr ]; }; } diff --git a/pkgs/development/coq-modules/LibHyps/default.nix b/pkgs/development/coq-modules/LibHyps/default.nix index 1a9eb9cec059e..b0997e857b09e 100644 --- a/pkgs/development/coq-modules/LibHyps/default.nix +++ b/pkgs/development/coq-modules/LibHyps/default.nix @@ -1,11 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "LibHyps"; owner = "Matafou"; inherit version; - defaultVersion = if (versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null; + defaultVersion = if (lib.versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null; release = { "2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h"; }; @@ -16,6 +15,6 @@ mkCoqDerivation { meta = { description = "Hypotheses manipulation library"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 3fb8a42cfb56c..778ab142654dc 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "StructTact"; owner = "uwplse"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.6" "8.16"; out = "20210328"; } { case = range "8.5" "8.13"; out = "20181102"; } ] null; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 8a4243a870430..72d88dec6f1d7 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -1,7 +1,5 @@ { lib, mkCoqDerivation, coq, compcert, ITree, version ? null }: -with lib; - # A few modules that are not built and installed by default # but that may be useful to some users. # They depend on ITree. @@ -11,7 +9,7 @@ let extra_floyd_files = [ "powerlater.v" ] # floyd/printf.v is broken in VST 2.9 - ++ optional (!versions.isGe "8.13" coq.coq-version) "printf.v" + ++ lib.optional (!lib.versions.isGe "8.13" coq.coq-version) "printf.v" ++ [ "quickprogram.v" ]; @@ -24,7 +22,7 @@ mkCoqDerivation { owner = "PrincetonUniversity"; repo = "VST"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.15" "8.16"; out = "2.11.1"; } { case = range "8.14" "8.16"; out = "2.10"; } { case = range "8.13" "8.15"; out = "2.9"; } diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index 08322fb7fc409..62eb9c389abbc 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "Velisarios"; owner = "vrahli"; inherit version; - defaultVersion = if versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; + defaultVersion = if lib.versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; release."20180221".rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; release."20180221".sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 80b964b390428..6dec34a095d7b 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, Cheerios, InfSeqExt, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "verdi"; owner = "uwplse"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.7" "8.16"; out = "20211026"; } { case = range "8.7" "8.14"; out = "20210524"; } { case = range "8.7" "8.13"; out = "20200131"; } diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix index 90ddf3e524ff0..180b7b88fced0 100644 --- a/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/pkgs/development/coq-modules/aac-tactics/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "aac-tactics"; @@ -21,7 +20,7 @@ mkCoqDerivation { release."8.5.0".sha256 = "sha256-7yNxJn6CH5xS5w/zsXfcZYORa6e5/qS9v8PUq2o02h4="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.16"; out = "8.16.0"; } { case = "8.15"; out = "8.15.1"; } { case = "8.14"; out = "8.14.1"; } @@ -37,7 +36,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "Coq plugin providing tactics for rewriting universally quantified equations"; longDescription = '' This Coq plugin provides tactics for rewriting universally quantified diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix index 63ba0e8050721..f40bdbf1899cc 100644 --- a/pkgs/development/coq-modules/addition-chains/default.nix +++ b/pkgs/development/coq-modules/addition-chains/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, mathcomp-fingroup, paramcoq , version ? null }: -with lib; mkCoqDerivation { pname = "addition-chains"; @@ -12,7 +11,7 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; @@ -21,7 +20,7 @@ mkCoqDerivation { useDune = true; - meta = { + meta = with lib; { description = "Exponentiation algorithms following addition chains"; longDescription = '' Addition chains are algorithms for computations of the p-th diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 5a7331c22206e..72768777c1b57 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp-ssreflect, version ? null }: -with lib; mkCoqDerivation { pname = "autosubst"; @@ -8,13 +7,13 @@ mkCoqDerivation { release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.7"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; - meta = { + meta = with lib; { homepage = "https://www.ps.uni-saarland.de/autosubst/"; description = "Automation for de Bruijn syntax and substitution in Coq"; maintainers = with maintainers; [ siraben jwiegley ]; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index f2e64ab2f61b3..c62e20a5a2e7f 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "bignums"; owner = "coq"; displayVersion = { bignums = ""; }; inherit version; - defaultVersion = if versions.isGe "8.6" coq.coq-version + defaultVersion = if lib.versions.isGe "8.6" coq.coq-version then "${coq.coq-version}.0" else null; release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw="; @@ -25,5 +25,5 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { license = licenses.lgpl2; }; + meta = { license = lib.licenses.lgpl2; }; } diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 97feac90c3bd2..ed214533b03ff 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, ssreflect, equations, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "category-theory"; owner = "jwiegley"; @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."20180709".sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "1.0.0"; } { case = range "8.10" "8.15"; out = "20211213"; } { case = range "8.8" "8.9"; out = "20190414"; } @@ -28,6 +28,6 @@ with lib; mkCoqDerivation { meta = { description = "A formalization of category theory in Coq for personal study and practical work"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/ceres/default.nix b/pkgs/development/coq-modules/ceres/default.nix index 375eb6c75bb08..75d57936ff5f2 100644 --- a/pkgs/development/coq-modules/ceres/default.nix +++ b/pkgs/development/coq-modules/ceres/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "ceres"; @@ -8,10 +7,10 @@ mkCoqDerivation { owner = "Lysxia"; inherit version; - defaultVersion = if versions.range "8.8" "8.16" coq.version then "0.4.0" else null; + defaultVersion = if lib.versions.range "8.8" "8.16" coq.version then "0.4.0" else null; release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; - meta = { + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.mit; maintainers = with maintainers; [ Zimmi48 ]; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index fb6527989d8eb..fb33f92bcc2a5 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -5,8 +5,6 @@ , version ? null }: -with lib; - let compcert = mkCoqDerivation rec { pname = "compcert"; @@ -15,7 +13,7 @@ let compcert = mkCoqDerivation rec { inherit version; releaseRev = v: "v${v}"; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.14" "8.16"; out = "3.11"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } @@ -84,7 +82,7 @@ let compcert = mkCoqDerivation rec { }; in compcert.overrideAttrs (o: { - patches = with versions; switch [ coq.version o.version ] [ + patches = with lib.versions; lib.switch [ coq.version o.version ] [ { cases = [ (range "8.12.2" "8.13.2") "3.8" ]; out = [ # Support for Coq 8.12.2 diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index cb6dedca35512..2d10f683cc360 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -1,16 +1,16 @@ { lib, mkCoqDerivation, coq, callPackage }: -with lib; let mkContrib = pname: coqs: param: + let mkContrib = pname: coqs: param: let contribVersion = {version ? null}: mkCoqDerivation ({ inherit pname version; owner = "coq-contribs"; mlPlugin = true; - } // optionalAttrs (builtins.elem coq.coq-version coqs) ({ + } // lib.optionalAttrs (builtins.elem coq.coq-version coqs) ({ defaultVersion = param.version; release = { "${param.version}" = { inherit (param) rev sha256; }; }; } // (removeAttrs param [ "version" "rev" "sha256" ])) ); in - makeOverridable contribVersion {} ; in + lib.makeOverridable contribVersion {} ; in { aac-tactics = mkContrib "aac-tactics" [ "8.7" "8.8" ] { "8.7" = { diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index a2ef7e09a7d65..16a26d9fa32eb 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.1.0"; } { case = range "8.7" "8.15"; out = "1.0.0"; } ] null; @@ -14,7 +14,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ mathcomp-algebra ]; - meta = { + meta = with lib; { description = "A formalization of bitset operations in Coq"; license = licenses.asl20; maintainers = with maintainers; [ ptival ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index b6f124b3f0fba..d555e55389b17 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "coq-ext-lib"; owner = "coq-ext-lib"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "0.11.7"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } @@ -30,6 +30,6 @@ with lib; mkCoqDerivation rec { meta = { description = "A collection of theories and plugins that may be useful in other Coq developments"; - maintainers = with maintainers; [ jwiegley ptival ]; + maintainers = with lib.maintainers; [ jwiegley ptival ]; }; } diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 7caf754ae50a2..028b4c5025eb2 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq-haskell"; owner = "jwiegley"; inherit version; - defaultVersion = if versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; + defaultVersion = if lib.versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; release."20171215".rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; release."20171215".sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; @@ -16,6 +16,6 @@ with lib; mkCoqDerivation { meta = { description = "A library for formalizing Haskell types and functions in Coq"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index 77c42fb48d4eb..a0b27dda845f0 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { + mkCoqDerivation rec { pname = "coq-record-update"; owner = "tchajed"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "0.3.1"; } ] null; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; @@ -13,6 +13,6 @@ with lib; mkCoqDerivation rec { buildFlags = [ "NO_TEST=1" ]; meta = { description = "Library to create Coq record update functions"; - maintainers = with maintainers; [ ineol ]; + maintainers = with lib.maintainers; [ ineol ]; }; } diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index d3a8e366a0a47..1ccbf9e82a0fe 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -2,14 +2,12 @@ mathcomp-real-closed, lib, version ? null }: -with lib; - (mkCoqDerivation { pname = "CoqEAL"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.13.0") ]; out = "1.1.1"; } { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } @@ -28,9 +26,9 @@ with lib; meta = { description = "CoqEAL - The Coq Effective Algebra Library"; - license = licenses.mit; + license = lib.licenses.mit; }; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ optional (versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; + ++ lib.optional (lib.versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; }) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 853e77990b6eb..e5e23247f1413 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { inherit version; pname = "coqhammer"; owner = "lukaszcz"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.15"; out = "1.3.2-coq8.15"; } { case = "8.14"; out = "1.3.2-coq8.14"; } { case = "8.13"; out = "1.3.2-coq8.13"; } @@ -57,7 +57,7 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { homepage = "http://cl-informatik.uibk.ac.at/cek/coqhammer/"; description = "Automation for Dependent Type Theory"; license = licenses.lgpl21; diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index 4e1f9e5f66628..a11bfb2c0db7d 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -8,14 +8,14 @@ , coq , version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "coqide"; inherit version; inherit (coq) src; release."${coq.version}" = {}; - defaultVersion = if versions.isGe "8.14" coq.version then coq.version else null; + defaultVersion = if lib.versions.isGe "8.14" coq.version then coq.version else null; preConfigure = '' patchShebangs dev/tools/ diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index ac05af587253a..cfba685e35fbd 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,11 +1,11 @@ { which, lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coqprime"; owner = "thery"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix index a4f7ca405f713..b43cadb918e36 100644 --- a/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/pkgs/development/coq-modules/coqtail-math/default.nix @@ -1,12 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; - mkCoqDerivation { pname = "coqtail-math"; owner = "coq-community"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.15"; out = "8.14"; } { case = range "8.11" "8.13"; out = "20201124"; } ] null; @@ -15,7 +13,7 @@ mkCoqDerivation { release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; mlPlugin = true; - meta = { + meta = with lib; { license = licenses.lgpl3Only; maintainers = [ maintainers.siraben ]; }; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 09327f2ff76c5..b6e2df653becd 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,12 +1,12 @@ { lib, mkCoqDerivation, autoconf, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coquelicot"; owner = "coquelicot"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } @@ -20,7 +20,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; - meta = { + meta = with lib; { homepage = "http://coquelicot.saclay.inria.fr/"; description = "A Coq library for Reals"; license = licenses.lgpl3; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index d019d4b4e55f4..84bca53931ccb 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -1,9 +1,9 @@ { lib, mkCoqDerivation, coq, bignums, math-classes, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "corn"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } { case = (range "8.11" "8.16"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } @@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec { propagatedBuildInputs = [ bignums math-classes ]; - meta = { + meta = with lib; { homepage = "http://c-corn.github.io/"; license = licenses.gpl2; description = "A Coq library for constructive analysis"; diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index f08e86ccc4f85..06e80f118bc02 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -1,14 +1,13 @@ { lib, mkCoqDerivation, coq, version ? null , ssreflect }: -with lib; mkCoqDerivation { pname = "deriving"; owner = "arthuraa"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "0.1.0"; } ] null; @@ -20,7 +19,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "Generic instances of MathComp classes"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index e247294655784..da26b0774d417 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,14 +1,13 @@ { lib, mkCoqDerivation, autoreconfHook, coq, version ? null }: -with lib; -let hasWarning = versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in +let hasWarning = lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in mkCoqDerivation { pname = "dpdgraph"; owner = "Karmaki"; repo = "coq-dpdgraph"; inherit version; - defaultVersion = switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ { case = "8.16"; out = "1.0+8.16"; } { case = "8.15"; out = "1.0+8.15"; } { case = "8.14"; out = "1.0+8.14"; } @@ -47,11 +46,11 @@ mkCoqDerivation { # dpd_compute.ml uses deprecated Pervasives.compare # Versions prior to 0.6.5 do not have the WARN_ERR build flag - preConfigure = optionalString hasWarning '' + preConfigure = lib.optionalString hasWarning '' substituteInPlace Makefile.in --replace "-warn-error +a " "" ''; - buildFlags = optional hasWarning "WARN_ERR="; + buildFlags = lib.optional hasWarning "WARN_ERR="; preInstall = '' mkdir -p $out/bin @@ -59,7 +58,7 @@ mkCoqDerivation { extraInstallFlags = [ "BINDIR=$(out)/bin" ]; - meta = { + meta = with lib; { description = "Build dependency graphs between Coq objects"; license = licenses.lgpl21; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index ffe72ad330bcd..5f38c4bbae24c 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { +(mkCoqDerivation { pname = "equations"; owner = "mattam82"; repo = "Coq-Equations"; inherit version; - defaultVersion = switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ { case = "8.16"; out = "1.3+8.16"; } { case = "8.15"; out = "1.3+8.15"; } { case = "8.14"; out = "1.3+8.14"; } @@ -57,11 +57,11 @@ with lib; (mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { homepage = "https://mattam82.github.io/Coq-Equations/"; description = "A plugin for Coq to add dependent pattern-matching"; maintainers = with maintainers; [ jwiegley ]; }; }).overrideAttrs (o: { - preBuild = "coq_makefile -f _CoqProject -o Makefile${optionalString (versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}"; + preBuild = "coq_makefile -f _CoqProject -o Makefile${lib.optionalString (lib.versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}"; }) diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 2a038ff0c11a0..b6345d7b0ac3f 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -2,14 +2,13 @@ , ssreflect , deriving }: -with lib; (mkCoqDerivation { pname = "extructures"; owner = "arthuraa"; inherit version; - defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [ + defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.11" "8.16") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } @@ -23,7 +22,7 @@ with lib; propagatedBuildInputs = [ ssreflect ]; - meta = { + meta = with lib; { description = "Finite data structures with extensional reasoning"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; @@ -31,5 +30,5 @@ with lib; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ optional (versionAtLeast o.version "0.3.0") deriving; + ++ lib.optional (lib.versionAtLeast o.version "0.3.0") deriving; }) diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index d94dc03b63779..0a6375907e899 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -1,6 +1,6 @@ {lib, mkCoqDerivation, coq, python27, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "fiat"; owner = "mit-plv"; repo = "fiat"; @@ -29,6 +29,6 @@ with lib; mkCoqDerivation rec { meta = { homepage = "http://plv.csail.mit.edu/fiat/"; description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index ed973996feeae..cf39c8211b78f 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,12 +1,12 @@ { lib, bash, autoconf, automake, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "flocq"; owner = "flocq"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "4.1.0"; } { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } @@ -22,7 +22,7 @@ with lib; mkCoqDerivation { mlPlugin = true; useMelquiondRemake.logpath = "Flocq"; - meta = { + meta = with lib; { description = "A floating-point formalization for the Coq system"; license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 3615f5513a39d..6548da52b9f7c 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "fourcolor"; @@ -12,15 +11,15 @@ mkCoqDerivation { release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals="; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.11") (isGe "1.12") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } - { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } + { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Formal proof of the Four Color Theorem "; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index 5377600caba42..4f9e7a12e0482 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -1,7 +1,7 @@ { lib, mkCoqDerivation, coq, hydra-battles, gaia, mathcomp-zify, mathcomp, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "gaia-hydras"; repo = "hydra-battles"; @@ -10,7 +10,7 @@ with lib; mkCoqDerivation rec { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [ + defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp.version] [ { cases = [ (range "8.14" "8.16") (isGe "1.12.0") ]; out = "0.6"; } { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } ] null; @@ -23,7 +23,7 @@ with lib; mkCoqDerivation rec { useDune = true; - meta = { + meta = with lib; { description = "Comparison between ordinals in Gaia and Hydra battles"; longDescription = '' The Gaia and Hydra battles projects develop different notions of ordinals. diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index d4fa4a1da3099..a2994dcc9b347 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, mathcomp, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "gaia"; release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5"; @@ -11,7 +11,7 @@ with lib; mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.15"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; maintainers = with maintainers; [ Zimmi48 ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 52e69e90d135f..5a4b4b2a4d018 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,12 +1,12 @@ { which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "gappalib"; repo = "coq"; owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; + defaultVersion = if lib.versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n"; @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ flocq ]; useMelquiondRemake.logpath = "Gappa"; - meta = { + meta = with lib; { description = "Coq support library for Gappa"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix index 19efb786addf0..1b16f8c3948a5 100644 --- a/pkgs/development/coq-modules/goedel/default.nix +++ b/pkgs/development/coq-modules/goedel/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, hydra-battles, pocklington, version ? null }: -with lib; mkCoqDerivation { pname = "goedel"; @@ -11,13 +10,13 @@ mkCoqDerivation { release."8.13.0".sha256 = "0sqqkmj6wsk4xmhrnqkhcsbsrqjzn2gnk67nqzgrmjpw5danz8y5"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; - meta = { + meta = with lib; { description = "The Gödel-Rosser 1st incompleteness theorem in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index c2fca0a16a71c..cbd919c7aa618 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,8 +1,6 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup , hierarchy-builder, version ? null }: -with lib; - mkCoqDerivation { pname = "graph-theory"; @@ -11,13 +9,13 @@ mkCoqDerivation { releaseRev = v: "v${v}"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.9"; } ] null; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; - meta = { + meta = with lib; { description = "Library of formalized graph theory results in Coq"; longDescription = '' A library of formalized graph theory results, including various diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index c3a815eb5c87e..fc96b2abf98c5 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -5,13 +5,13 @@ let fetcher = {rev, repo, owner, sha256, domain, ...}: url = "https://${domain}/${owner}/${repo}/download/${repo}-${rev}.zip"; inherit sha256; }; in -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "heq"; repo = "Heq"; owner = "gil.hur"; domain = "sf.snu.ac.kr"; inherit version fetcher; - defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null; + defaultVersion = if lib.versions.isLt "8.8" coq.coq-version then "0.92" else null; release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74"; mlPlugin = true; @@ -22,6 +22,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://ropas.snu.ac.kr/~gil.hur/Heq/"; description = "Heq : a Coq library for Heterogeneous Equality"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 4f319587de934..9bcc07387b1e2 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, coq-elpi, version ? null }: -with lib; let hb = mkCoqDerivation { +let hb = mkCoqDerivation { pname = "hierarchy-builder"; owner = "math-comp"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.15" "8.16"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } @@ -25,16 +25,16 @@ with lib; let hb = mkCoqDerivation { extraInstallFlags = [ "VFILES=structures.v" ]; - meta = { + meta = with lib; { description = "High level commands to declare a hierarchy based on packed classes"; maintainers = with maintainers; [ cohencyril siraben ]; license = licenses.mit; }; }; in hb.overrideAttrs (o: - optionalAttrs (versions.isGe "1.2.0" o.version || o.version == "dev") + lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") { buildPhase = "make build"; } // - optionalAttrs (versions.isGe "1.1.0" o.version || o.version == "dev") + lib.optionalAttrs (lib.versions.isGe "1.1.0" o.version || o.version == "dev") { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } ) diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix index 2729f7c213918..06798c5fcc291 100644 --- a/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/pkgs/development/coq-modules/hydra-battles/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, equations, LibHyps, version ? null }: -with lib; (mkCoqDerivation { pname = "hydra-battles"; @@ -11,14 +10,14 @@ with lib; releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; useDune = true; - meta = { + meta = with lib; { description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq"; longDescription = '' An exploration of some properties of Kirby and Paris' hydra @@ -33,5 +32,5 @@ with lib; }; }).overrideAttrs(o: let inherit (o) version; in { - propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version || version == "dev") LibHyps; + propagatedBuildInputs = [ equations ] ++ lib.optional (lib.versions.isGe "0.6" version || version == "dev") LibHyps; }) diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index a2a59e1ab22c4..f72dd69f36172 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, stdpp, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "iris"; domain = "gitlab.mpi-sws.org"; owner = "iris"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } @@ -26,7 +26,7 @@ with lib; mkCoqDerivation rec { fi ''; - meta = { + meta = with lib; { description = "The Coq development of the Iris Project"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 1ffa37ec6c321..e2dfe98cf9895 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { pname = "itauto"; @@ -11,7 +10,7 @@ mkCoqDerivation rec { release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9"; release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "8.16.0"; } { case = isEq "8.15"; out = "8.15.0"; } { case = isEq "8.14"; out = "8.14.0"; } @@ -22,7 +21,7 @@ mkCoqDerivation rec { nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); enableParallelBuilding = false; - meta = { + meta = with lib; { description = "A reflexive SAT solver parameterised by a leaf tactic and Nelson-Oppen support"; maintainers = with maintainers; [ siraben ]; license = licenses.gpl3Plus; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index c938a7ad02790..da28184296006 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, which, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "ltac2"; owner = "coq"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.10"; out = "0.3"; } { case = "8.9"; out = "0.2"; } { case = "8.8"; out = "0.1"; } @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "A robust and expressive tactic language for Coq"; maintainers = [ maintainers.vbgl ]; license = licenses.lgpl21; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index da708f87e4777..d40dacd39380a 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "math-classes"; inherit version; - defaultVersion = if versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null; + defaultVersion = if lib.versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null; release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425"; release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; @@ -14,6 +14,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://math-classes.github.io"; description = "A library of abstract interfaces for mathematical structures in Coq."; - maintainers = with maintainers; [ siddharthist jwiegley ]; + maintainers = with lib.maintainers; [ siddharthist jwiegley ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp-abel/default.nix b/pkgs/development/coq-modules/mathcomp-abel/default.nix index 43228252b55fe..bae9266d4de10 100644 --- a/pkgs/development/coq-modules/mathcomp-abel/default.nix +++ b/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib; with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.2.1"; } { cases = [ (range "8.10" "8.15") (range "1.12.0" "1.14.0") ]; out = "1.2.0"; } { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; } diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index f4ae2afd38685..af37096a4fb18 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -1,14 +1,14 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, coq-elpi, mathcomp-zify, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "algebra-tactics"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.coq-version mathcomp-algebra.version ] [ + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } ] null; @@ -18,6 +18,6 @@ with lib; mkCoqDerivation { meta = { description = "Ring and field tactics for Mathematical Components"; - maintainers = with maintainers; [ cohencyril ]; + maintainers = with lib.maintainers; [ cohencyril ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index a42b551d18450..3e67675b5efbc 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -21,7 +21,7 @@ let release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.5.3"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } { cases = [ (isGe "8.13") (range "1.13" "1.14") ]; out = "0.5.1"; } @@ -40,7 +40,7 @@ let classical-deps = [ mathcomp.algebra mathcomp-finmap hierarchy-builder ]; analysis-deps = [ mathcomp.field mathcomp-bigenough ]; intra-deps = if package == "single" then [] - else map mathcomp_ (head (splitList (pred.equal package) packages)); + else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "." else if package == "analysis" then "theories" else "${package}"; pname = if package == "single" then "mathcomp-analysis-single" diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 7804a61c93062..a4e4a1ecbb5c2 100644 --- a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "bigenough"; @@ -11,7 +11,7 @@ with lib; mkCoqDerivation { "1.0.1".sha256 = "sha256:02f4dv4rz72liciwxb2k7acwx6lgqz4381mqyq5854p3nbyn06aw"; }; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "1.0.0"; } ] null; @@ -20,6 +20,6 @@ with lib; mkCoqDerivation { meta = { description = "A small library to do epsilon - N reasonning"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 8c29208c3f631..551d33c9fadfd 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -1,12 +1,12 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "finmap"; owner = "math-comp"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } @@ -33,6 +33,6 @@ with lib; mkCoqDerivation { meta = { description = "A finset and finmap library"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index aef912c6151ce..b114a3f290d39 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -1,7 +1,7 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-bigenough, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "real-closed"; @@ -17,7 +17,7 @@ with lib; mkCoqDerivation { "1.0.1".sha256 = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; }; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } @@ -37,6 +37,6 @@ with lib; mkCoqDerivation { meta = { description = "Mathematical Components Library on real closed fields"; - license = licenses.cecill-c; + license = lib.licenses.cecill-c; }; } diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 706ee0686922c..19ecfcc384de7 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -1,14 +1,15 @@ { coq, mkCoqDerivation, mathcomp-ssreflect, mathcomp-fingroup, lib, version ? null }@args: -with lib; mkCoqDerivation { + +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "tarjan"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.version mathcomp-ssreflect.version ] [{ + defaultVersion = with lib.versions; + lib.switch [ coq.version mathcomp-ssreflect.version ] [{ cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0"; }] null; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; @@ -17,6 +18,6 @@ with lib; mkCoqDerivation { meta = { description = "Proofs of Tarjan and Kosaraju connected components algorithms"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 5f34434b50f9f..090cc4567c3b0 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -1,6 +1,5 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "word"; @@ -15,13 +14,13 @@ mkCoqDerivation { release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "2.0"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Yet Another Coq Library on Machine Words"; maintainers = [ maintainers.vbgl ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 1ac1d928738bf..86dd239ebf732 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -1,14 +1,14 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { namePrefix = [ "coq" "mathcomp" ]; pname = "zify"; repo = "mczify"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.coq-version mathcomp-algebra.version ] [ + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; @@ -19,6 +19,6 @@ with lib; mkCoqDerivation rec { meta = { description = "Micromega tactics for Mathematical Components"; - maintainers = with maintainers; [ cohencyril ]; + maintainers = with lib.maintainers; [ cohencyril ]; }; } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 7be30844eb050..031536b7a6ef6 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -18,7 +18,7 @@ let repo = "math-comp"; owner = "math-comp"; withDoc = single && (args.withDoc or false); - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "1.15.0"; } { case = range "8.11" "8.15"; out = "1.14.0"; } { case = range "8.11" "8.15"; out = "1.13.0"; } @@ -50,7 +50,7 @@ let mathcomp_ = package: let mathcomp-deps = if package == "single" then [] - else map mathcomp_ (head (splitList (pred.equal package) packages)); + else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; pname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index ab036add60bba..9a22d82dd4001 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -5,7 +5,7 @@ with builtins // lib; let repo = "metacoq"; owner = "MetaCoq"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with versions; lib.switch coq.coq-version [ { case = "8.11"; out = "1.0-beta2-8.11"; } { case = "8.12"; out = "1.0-beta2-8.12"; } # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3) @@ -34,7 +34,7 @@ let metacoq_ = package: let metacoq-deps = if package == "single" then [] - else map metacoq_ (head (splitList (pred.equal package) packages)); + else map metacoq_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "./" else "./${package}"; pname = if package == "all" then "metacoq" else "metacoq-${package}"; pkgallMake = '' diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index 6072f9995c061..82d2a16f77ffa 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "8.15"; } { case = range "8.10" "8.13"; out = "8.10"; } ] null; @@ -14,7 +14,7 @@ with lib; mkCoqDerivation { sourceRoot = "source/Metalib"; - meta = { + meta = with lib; { license = licenses.mit; maintainers = [ maintainers.jwiegley ]; }; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 57f4a381b2049..19c6015ce928e 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, lib, version ? null, useDune ? false }@args: -with lib; mkCoqDerivation { + mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; @@ -8,7 +8,7 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } @@ -31,7 +31,7 @@ with lib; mkCoqDerivation { "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - useDuneifVersion = v: versions.isGe "1.5.3" v || v == "dev"; + useDuneifVersion = v: lib.versions.isGe "1.5.3" v || v == "dev"; preConfigure = '' patchShebangs configure || true @@ -42,7 +42,7 @@ with lib; mkCoqDerivation { meta = { description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - license = licenses.cecill-c; + license = lib.licenses.cecill-c; }; } -// optionalAttrs (args?useDune) { inherit useDune; } +// lib.optionalAttrs (args?useDune) { inherit useDune; } diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 066976e8b4b73..b6770aa633def 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "odd-order"; @@ -11,7 +10,7 @@ mkCoqDerivation { releaseRev = v: "mathcomp-odd-order.${v}"; inherit version; - defaultVersion = with versions; switch mathcomp.character.version [ + defaultVersion = with lib.versions; lib.switch mathcomp.character.version [ { case = (range "1.13.0" "1.15.0"); out = "1.14.0"; } { case = (range "1.12.0" "1.14.0"); out = "1.13.0"; } { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; } @@ -27,7 +26,7 @@ mkCoqDerivation { mathcomp.all ]; - meta = { + meta = with lib; { description = "Formal proof of the Odd Order Theorem"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index ea0988ef6073d..e9163c16132cb 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "paco"; owner = "snu-sf"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.12" "8.16"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } @@ -27,6 +27,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://plv.mpi-sws.org/paco/"; description = "A Coq library implementing parameterized coinduction"; - maintainers = with maintainers; [ jwiegley ptival ]; + maintainers = with lib.maintainers; [ jwiegley ptival ]; }; } diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index e03f44320cf9c..cc4966affcfdd 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -1,9 +1,9 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "paramcoq"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; @@ -24,7 +24,7 @@ with lib; mkCoqDerivation { release."1.1.2+coq8.7".sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; releaseRev = v: "v${v}"; mlPlugin = true; - meta = { + meta = with lib; { description = "Coq plugin for parametricity"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index f764267d77e0b..8a30fbeb961af 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }: -with lib; mkCoqDerivation { pname = "parsec"; @@ -11,14 +10,14 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; - meta = { + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.bsd3; maintainers = with maintainers; [ Zimmi48 ]; diff --git a/pkgs/development/coq-modules/pocklington/default.nix b/pkgs/development/coq-modules/pocklington/default.nix index 111bffeca2c93..a9e0d43a5a7ac 100644 --- a/pkgs/development/coq-modules/pocklington/default.nix +++ b/pkgs/development/coq-modules/pocklington/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "pocklington"; @@ -9,11 +8,11 @@ mkCoqDerivation { release."8.12.0".sha256 = "sha256-0xBrw9+4g14niYdNqp0nx00fPJoSSnaDSDEaIVpPfjs="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isGe "8.7"; out = "8.12.0"; } ] null; - meta = { + meta = with lib; { description = "Pocklington's criterion for primality in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index 2d83cbfd883fa..44e938e16dbdf 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { pname = "reglang"; @@ -9,14 +8,14 @@ mkCoqDerivation { release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.1.2"; } ] null; propagatedBuildInputs = [ ssreflect ]; - meta = { + meta = with lib; { description = "Regular Language Representations in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix index d2124d56f3f5a..c8fb6982b84e6 100644 --- a/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/pkgs/development/coq-modules/relation-algebra/default.nix @@ -1,12 +1,11 @@ { lib, mkCoqDerivation, coq, aac-tactics, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "relation-algebra"; owner = "damien-pous"; releaseRev = v: - if versions.isGe "1.7.6" v + if lib.versions.isGe "1.7.6" v then "v.${v}" else "v${v}"; @@ -20,7 +19,7 @@ mkCoqDerivation { release."1.7.1".sha256 = "sha256-WWVMcR6z8rT4wzZPb8SlaVWGe7NC8gScPqawd7bltQA="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "1.7.8"; } { case = isEq "8.15"; out = "1.7.7"; } { case = isEq "8.14"; out = "1.7.6"; } @@ -35,7 +34,7 @@ mkCoqDerivation { propagatedBuildInputs = [ aac-tactics mathcomp.ssreflect ]; - meta = { + meta = with lib; { description = "Relation algebra library for Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.gpl3Plus; diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index ecbef5b92feae..468be219d0d73 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { pname = "semantics"; @@ -15,7 +14,7 @@ mkCoqDerivation rec { release."8.6.0".sha256 = "sha256-GltkGQ3tJqUPAbdDkqqvKLLhMOap50XvGaCkjshiNdY="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "8.14.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -34,7 +33,7 @@ mkCoqDerivation rec { done ''; - meta = { + meta = with lib; { description = "A survey of programming language semantics styles in Coq"; longDescription = '' A survey of semantics styles in Coq, from natural semantics through diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index e3ec9bfdc39ac..27641f4f5a99a 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -17,7 +17,7 @@ in inherit version release; defaultVersion = with versions; - switch coq.version [ + lib.switch coq.version [ { case = isEq "8.16"; out = "8.16.0+0.16.0"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index f9fe909d8caa5..509ce57c5cff5 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,11 +1,11 @@ { lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "simple-io"; owner = "Lysxia"; repo = "coq-simple-io"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "1.7.0"; } { case = range "8.7" "8.13"; out = "1.3.0"; } ] null; @@ -21,7 +21,7 @@ with lib; mkCoqDerivation { passthru.tests.HelloWorld = callPackage ./test.nix {}; - meta = { + meta = with lib; { description = "Purely functional IO for Coq"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/smpl/default.nix b/pkgs/development/coq-modules/smpl/default.nix index f03065cf04503..2ba755dd42d02 100644 --- a/pkgs/development/coq-modules/smpl/default.nix +++ b/pkgs/development/coq-modules/smpl/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "smpl"; @@ -13,7 +12,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = isEq "8.15"; out = "8.15"; } { case = isEq "8.14"; out = "8.14"; } { case = "8.13.2"; out = "8.13"; } @@ -23,7 +22,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "A Coq plugin providing an extensible tactic similar to first"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 89a6abd2b1ac4..49c4348b9af57 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, gcc10StdenvCompat, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }: -with lib; let # version of veriT that works with SMTCoq @@ -23,7 +22,7 @@ mkCoqDerivation { release."2021-09-17".sha256 = "sha256-bF7ES+tXraaAJwVEwAMx3CUESpNlAUerQjr4d2eaGJQ="; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = isEq "8.13"; out = "2021-09-17"; } ] null; @@ -34,7 +33,7 @@ mkCoqDerivation { # This is meant to ease future troubleshooting of cvc4 build failures passthru = { inherit cvc4; }; - meta = { + meta = with lib; { description = "Communication between Coq and SAT/SMT solvers "; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 19b72c4e948cc..d20b637321416 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "stdpp"; inherit version; domain = "gitlab.mpi-sws.org"; owner = "iris"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } @@ -24,7 +24,7 @@ with lib; mkCoqDerivation rec { fi ''; - meta = { + meta = with lib; { description = "An extended “Standard Library” for Coq"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 79d3ce2d7a049..8ded1abeb146c 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { +(mkCoqDerivation { pname = "tlc"; owner = "charguer"; inherit version; displayVersion = { tlc = false; }; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "20211215"; } { case = range "8.12" "8.13"; out = "20210316"; } { case = range "8.10" "8.12"; out = "20200328"; } @@ -16,14 +16,14 @@ with lib; (mkCoqDerivation { release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl"; - meta = { + meta = with lib; { homepage = "http://www.chargueraud.org/softs/tlc/"; description = "A non-constructive library for Coq"; license = licenses.free; maintainers = [ maintainers.vbgl ]; }; }).overrideAttrs (x: - if versionAtLeast x.version "20210316" + if lib.versionAtLeast x.version "20210316" then {} else { installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index 71849c50ae9e9..de73fbadbf051 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }: -with lib; mkCoqDerivation rec { pname = "topology"; @@ -15,7 +14,7 @@ mkCoqDerivation rec { release."8.6.0".sha256 = "sha256-eu/dBEFo3y6vnXlJljUD4hds6+qgAPQVvsuspyGHcj8="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -25,9 +24,9 @@ mkCoqDerivation rec { propagatedBuildInputs = [ zorns-lemma ]; - useDuneifVersion = versions.isGe "9.0"; + useDuneifVersion = lib.versions.isGe "9.0"; - meta = { + meta = with lib; { description = "General topology in Coq"; longDescription = '' This library develops some of the basic concepts and results of diff --git a/pkgs/development/coq-modules/trakt/default.nix b/pkgs/development/coq-modules/trakt/default.nix index f10e69cc4e90a..8bc7581489c3e 100644 --- a/pkgs/development/coq-modules/trakt/default.nix +++ b/pkgs/development/coq-modules/trakt/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, coq-elpi, version ? null }: -with lib; mkCoqDerivation { pname = "trakt"; @@ -9,13 +8,13 @@ mkCoqDerivation { release."1.0".sha256 = "sha256-Qhw5fWFYxUFO2kIWWz/og+4fuy9aYG27szfNk3IglhY="; inherit version; - defaultVersion = with versions; switch [ coq.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version ] [ { cases = [ (range "8.13" "8.16") ]; out = "1.0"; } ] null; propagatedBuildInputs = [ coq-elpi ]; - meta = { + meta = with lib; { description = "A generic goal preprocessing tool for proof automation tactics in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index dedb58b593565..19696bd81d4fd 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { pname = "zorns-lemma"; @@ -16,7 +15,7 @@ with lib; release."8.5.0".sha256 = "sha256-mH/v02ObMjbVPYx2H+Jhz+Xp0XRKN67iMAdA1VNFzso="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -25,9 +24,9 @@ with lib; { case = "8.5"; out = "8.5.0"; } ] null; - useDuneifVersion = versions.isGe "9.0"; + useDuneifVersion = lib.versions.isGe "9.0"; - meta = { + meta = with lib; { description = "Development of basic set theory"; longDescription = '' This Coq library develops some basic set theory. The main @@ -37,4 +36,4 @@ with lib; maintainers = with maintainers; [ siraben ]; license = licenses.lgpl21Plus; }; -}).overrideAttrs({version, ...}: if versions.isGe "9.0" version then { repo = "topology"; } else {}) +}).overrideAttrs({version, ...}: if lib.versions.isGe "9.0" version then { repo = "topology"; } else {}) diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 3586a674904b8..d17ca4ea751e9 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: +{ lib, stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { pname = "exempi"; @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { doCheck = stdenv.isLinux && stdenv.is64bit; dontDisableStatic = doCheck; + enableParallelBuilding = true; + meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; - homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/"; + homepage = "https://libopenraw.freedesktop.org/exempi/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 3021aced93f6d..7a073b143b932 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index e49473b79edeb..67d9ec29b207c 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { doCheck = false; # fails - # Fix for #40213, probably permanent, because upstream doesn't seem to be - # developed anymore. Alternatively, gcc7Stdenv could be used. - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; + NIX_CFLAGS_COMPILE = + if stdenv.cc.isGNU then "-Wno-error=array-bounds -Wno-error=stringop-overflow=8" + else "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion"; meta = with lib; { - homepage = "https://sourceforge.net/projects/omxil/"; + homepage = "https://omxil.sourceforge.net/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsv/default.nix b/pkgs/development/libraries/libsv/default.nix new file mode 100644 index 0000000000000..fb319bf30f346 --- /dev/null +++ b/pkgs/development/libraries/libsv/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libsv"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "uael"; + repo = "sv"; + rev = "v${version}"; + sha256 = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Public domain cross-platform semantic versioning in C99"; + homepage = "https://github.com/uael/sv"; + license = licenses.unlicense; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 8fed0e47e43ff..098dc64cf1548 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation rec { pname = "vxl"; - version = "3.3.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "vxl"; repo = "vxl"; rev = "v${version}"; - sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr"; + sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E="; }; nativeBuildInputs = [ cmake unzip ]; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 90758db16edd4..c4c20f207a412 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ AndersonTorres ]; - platforms = python3.meta.platforms; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d33ff9907a9a0..31891967df4fd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2019,6 +2019,40 @@ buildLuarocksPackage { }; }) {}; +lualdap = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "lualdap"; + version = "1.3.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lualdap-1.3.0-1.rockspec"; + sha256 = "0b51sm0fz4kiim20w538v31k9g20wq3msxdkh17drkr60ab25sc8"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lualdap/lualdap", + "rev": "be380f5d98f779c813a4fb4ae1400262366fc8d4", + "date": "2021-06-05T15:49:42+02:00", + "path": "/nix/store/99sy73yz6sidqhkl0kwdsd7r853aw38n-lualdap", + "sha256": "133d8br5f24z03ni38m0czrqfz0mr0ksdrc1g73rawpmiqarpps8", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://lualdap.github.io/lualdap/"; + description = "A Lua interface to the OpenLDAP library"; + maintainers = with lib.maintainers; [ aanderse ]; + license.fullName = "MIT"; + }; +}) {}; + lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, luasocket }: diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 6488ed507a665..419842a09677e 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -27,6 +27,7 @@ , mariadb , mpfr , neovim-unwrapped +, openldap , openssl , pcre , pkg-config @@ -329,6 +330,12 @@ with prev; disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; }); + lualdap = prev.luaLib.overrideLuarocks prev.lualdap (drv: { + externalDeps = [ + { name = "LDAP"; dep = openldap; } + ]; + }); + luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ { name = "CRYPTO"; dep = openssl; } diff --git a/pkgs/development/nim-packages/asynctools/default.nix b/pkgs/development/nim-packages/asynctools/default.nix new file mode 100644 index 0000000000000..54893d00a9803 --- /dev/null +++ b/pkgs/development/nim-packages/asynctools/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }: + +buildNimPackage rec { + pname = "asynctools"; + version = "unstable-2021-07-06"; + + src = fetchFromGitHub { + owner = "cheatfate"; + repo = "asynctools"; + rev = "84ced6d002789567f2396c75800ffd6dff2866f7"; + hash = "sha256-mrO+WeSzCBclqC2UNCY+IIv7Gs8EdTDaTeSgXy3TgNM="; + }; + + meta = with lib; { + description = "Various asynchronous tools for Nim language"; + homepage = "https://github.com/cheatfate/asynctools"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch b/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch new file mode 100644 index 0000000000000..8c7176ee16c8f --- /dev/null +++ b/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch @@ -0,0 +1,13 @@ +diff --git a/bin/fiber/fiber.ml b/bin/fiber/fiber.ml +index 188a92cc9..6087a8687 100644 +--- a/bin/fiber/fiber.ml ++++ b/bin/fiber/fiber.ml +@@ -129,7 +129,7 @@ let worker pool = + + let get_concurrency () = + try +- let ic = Unix.open_process_in "getconf _NPROCESSORS_ONLN" in ++ let ic = Unix.open_process_in "@getconf@/bin/getconf _NPROCESSORS_ONLN" in + let close () = ignore (Unix.close_process_in ic) in + let sc = Scanf.Scanning.from_channel ic in + try diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index ae58d206c04c4..b075ea53021a3 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -3,6 +3,7 @@ , checkseum, logs, psq, fmt , result, rresult, fpath, base64, bos, digestif, alcotest , crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd +, getconf, substituteAll }: buildDunePackage rec { @@ -16,6 +17,13 @@ buildDunePackage rec { sha256 = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; }; + patches = [ + (substituteAll { + src = ./carton-find-getconf.patch; + getconf = "${getconf}"; + }) + ]; + # remove changelogs for mimic and the git* packages postPatch = '' rm CHANGES.md diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix index df84083ccb3d1..97396769fd05e 100644 --- a/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -47,6 +47,8 @@ buildDunePackage { astring ]; + __darwinAllowLocalNetworking = true; + meta = paf.meta // { description = "A CoHTTP client with its HTTP/AF implementation"; }; diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index acd16434f6eee..d172e73e13b29 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -61,6 +61,8 @@ buildDunePackage rec { alcotest-lwt ]; + __darwinAllowLocalNetworking = true; + meta = { description = "HTTP/AF and MirageOS"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 9b043f7e00563..169e3496e779f 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KYKs/yUUKmgWxNp+EhD1Wcim/9dajatdl0QW0bZKByg="; + hash = "sha256-0ubTvpHT6HfCg5lfdbzAnP77oWPZw2N78qZs6tGim6M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index f391b68aacaad..8751b583729b1 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8dhYoj3/EXwMZLRduwskoAn7NSjA4N8xhIw8UbAAhnY="; + hash = "sha256-2kRj5zlAPVO2U3EzN+opz5OBtwEru5RqGOXGqLUPaUA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 2488ad04956b0..00b6e6ba9aba5 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.13"; + version = "2.5.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8QkDAVHjVEqicntSMb98JitmR5toOTGhgEk7cH3xSFI="; + sha256 = "sha256-5M51eWdER9/K15H2yUQjvXMjzYNwx9BLIKSW/ToDU5g="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index ef17ba8f40e3a..9f2e31fbc7df2 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-11BdMhUhxbzkSrBEFdqpjkgcOcCZG498ylEHIMbomW4="; + hash = "sha256-SxhGUwcZjaRNCS5dB2hh5uctFGHWuKnM48CcIz6VMh8="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to control Lupusec alarm control panels"; homepage = "https://github.com/majuss/lupupy"; + changelog = "https://github.com/majuss/lupupy/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index e34359d082312..f0baddf628db3 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -1,10 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , docopt , pillow -, enum34 , scikitimage , aggdraw , pytestCheckHook @@ -14,16 +13,21 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.23"; + version = "1.9.24"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-pJUf5rE5QMnfNytU1P0Zbj1iztrK5xrX4CJ/WvIG8mY="; + hash = "sha256-RW8v3UeO2tCjKkCqraFw2IfVt2YL3EbixfGsK7pOQYI="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + ]; propagatedBuildInputs = [ aggdraw @@ -33,13 +37,18 @@ buildPythonPackage rec { scikitimage ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "psd_tools" ]; + pythonImportsCheck = [ + "psd_tools" + ]; meta = with lib; { description = "Python package for reading Adobe Photoshop PSD files"; homepage = "https://github.com/kmike/psd-tools"; + changelog = "https://github.com/psd-tools/psd-tools/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 819dc0634d4a6..6f820298ec13c 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, bazel_3 , buildBazelPackage , buildPythonPackage , python @@ -45,6 +46,8 @@ let tensorflow ]; + bazel = bazel_3; + bazelTarget = ":pip_pkg"; fetchAttrs = { diff --git a/pkgs/development/python-modules/tika/default.nix b/pkgs/development/python-modules/tika/default.nix index 375560ad98178..f71772749c13e 100644 --- a/pkgs/development/python-modules/tika/default.nix +++ b/pkgs/development/python-modules/tika/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tika"; - version = "1.24"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "wsUPQFYi90UxhBEE+ehcF1Ea7eEd6OU4XqsaKaMfGRs="; + sha256 = "sha256-VmcOuBKUTrJe1z8bOwdapB56E1t0skCCLyi4GeWzc9o="; }; propagatedBuildInputs = [ pyyaml requests ]; diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index fdd4d84673b55..fec39c962a668 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-YWL1aPcMdU4lo7h/T2sdl2H6qnx3lfMtV39Ak4yP88w="; + sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; }; - cargoSha256 = "sha256-q59hpnXc00OzrJk1KOWbIPQYfIE+7ku9XtTDXHgwQBg="; + cargoSha256 = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index ad4746c48c0c3..f7604220f3aa9 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -63,6 +63,9 @@ python3.pkgs.buildPythonApplication rec { "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 "test_creation_allow_system_packages" + ] ++ lib.optionals stdenv.isDarwin [ + # https://github.com/NixOS/nixpkgs/issues/209358 + "test_scripts_no_environment" ]; meta = with lib; { diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index e80e4c8b4d441..dbc794e020845 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.48.0"; + version = "0.48.2"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "0sdmfdmxgks9bbzg8nn1gdx55g7qiwpdxkx6p9lwa71mdfc14r2z"; + sha256 = "0hh3zm21a976px3lhf2przczspiyk88k68fmnwsknn281y9pyr70"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://ktlint.github.io/"; license = licenses.mit; platforms = jre_headless.meta.platforms; + changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; }; } diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 66983ea8a49de..34e8311800e4c 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.7.0"; + version = "0.7.4"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-qjwnHFJpgDVaiSF3rKkyEbhIG4QbMOUrN1rnc9MnKU0="; + hash = "sha256-YTONlTE9cTl0O7EHRVhrPtuGgIUdX8mvdWu352uHbCE="; }; - cargoHash = "sha256-efVnO9hNIEiAzOK0mkPMNrWlWHYEWwV2HWac8jBxW5k="; + cargoHash = "sha256-U2bbZZCeY7/Jp7AuAKYcZzDIpIxGbNJrmr2Sr2CMr2A="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix index af4ed6977b19a..9c6505b3abd55 100644 --- a/pkgs/development/tools/misc/nimlsp/default.nix +++ b/pkgs/development/tools/misc/nimlsp/default.nix @@ -2,17 +2,17 @@ nimPackages.buildNimPackage rec { pname = "nimlsp"; - version = "0.4.1"; + version = "0.4.4"; nimBinOnly = true; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${version}"; - sha256 = "sha256-LAtUGhYEcOwvZzexQ2y3/HPgOge2EsScCbujJ/hz5Ec="; + sha256 = "sha256-Z67iKlL+dnRbxdFt/n/fsUcb2wpZwzPpL/G29jfCaMY="; }; - buildInputs = with nimPackages; [ jsonschema ]; + buildInputs = with nimPackages; [ jsonschema asynctools ]; nimFlags = [ "--threads:on" diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 29673d99dd0b1..aae650fbdc252 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ]; meta = with lib; { - homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + homepage = "https://www.typerex.org/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; maintainers = [ maintainers.jirkamarsik ]; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 8854ee18bf616..0afcf1abe9ea9 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.230"; + version = "0.0.231"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-40QVmxdEuWQEFCkf8ypEWsH1R6A3WjTXWPC99RnWsgI="; + sha256 = "sha256-BXRM3MS77B39B6ylrkZyLQqndF+DkjJek0u1KfOuazI="; }; - cargoSha256 = "sha256-ek/+qYOsFhbwWuHn6ezWzsxxeK0umrNAZZVFJl2ya1M="; + cargoSha256 = "sha256-HYGFE5WpY0puAmCkvByR1vomuEwA0+L9eetp6FGyPhg="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 6112b01e79f43..5e699f9a7b06a 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,30 +1,26 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.37"; + version = "1.0.38"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-BdaOtbZ+F1cgoZRmoQM/5Rzx4OUHmqSnsApeNfWz+J8="; + sha256 = "sha256-n7GDvniwkyCYiu7/qw0TQsVsTZfjcSpkF2Qo/uO60e4="; }; - cargoHash = "sha256-2wD0QJFTW8cIv8S1JSgffBqlcPOVd151WuKlaZF+6aA="; - - buildInputs = lib.optional stdenv.isDarwin libiconv; + cargoHash = "sha256-oA+8bceow7Cdao9FhkXkfFyrCpgvR4NJHddevbhUFkA="; meta = with lib; { - description = - "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; + description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; homepage = "https://github.com/dtolnay/cargo-expand"; + changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ figsoda xrelkd ]; }; } diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 05d20447dc593..a90ac2780e8a8 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-01-16"; - cargoSha256 = "sha256-M0AwSksEUKVw+Eo+D7BnkoKycNRQDOnemIgremXp5fs="; + version = "2023-01-23"; + cargoSha256 = "sha256-NSdHvWN5BIEXZMFiweKYbJayxDqlFmqJp+sIzeORhSU="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-m+EVsqnYIDdabuIs7K+e343RZ7V3mQHijoYuHWS7Dj4="; + sha256 = "sha256-Uq6jngJnf2UqKrOzqMXtq5IVxkU3eNCkmORPdccLxp0="; }; auditable = true; # TODO: remove when this is the default |