diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-24 14:07:44 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-24 14:07:50 +0200 |
commit | 153fa063ee2853e86654a9d3987f19990c666f00 (patch) | |
tree | de48576d4c8a65e557f913b5a6dae048dd4e84da /pkgs | |
parent | a619546ecad2a21f1d0208f36f497eaf3582ff95 (diff) | |
parent | fc37099c05138ee0481554497afde3305ccd6708 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/eigenpy/default.nix
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/gh/gh-gei/deps.nix | 37 | ||||
-rw-r--r-- | pkgs/by-name/gh/gh-gei/package.nix | 27 | ||||
-rw-r--r-- | pkgs/by-name/np/npm-lockfile-fix/package.nix | 3 | ||||
-rw-r--r-- | pkgs/by-name/pr/protoc-gen-connect-es/package.nix | 39 | ||||
-rwxr-xr-x | pkgs/by-name/pr/protoc-gen-connect-es/update.sh | 30 | ||||
-rw-r--r-- | pkgs/by-name/pr/protoc-gen-es/package.nix | 44 | ||||
-rwxr-xr-x | pkgs/by-name/pr/protoc-gen-es/update.sh | 30 | ||||
-rw-r--r-- | pkgs/development/python-modules/eigenpy/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
9 files changed, 216 insertions, 7 deletions
diff --git a/pkgs/by-name/gh/gh-gei/deps.nix b/pkgs/by-name/gh/gh-gei/deps.nix new file mode 100644 index 0000000000000..1f9bc071f17a7 --- /dev/null +++ b/pkgs/by-name/gh/gh-gei/deps.nix @@ -0,0 +1,37 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "AWSSDK.Core"; version = "3.7.300.11"; sha256 = "1460yndb9gfy4qx36g4lxaqxzb3p19kfqp7czi28i1p7z7nh38vi"; }) + (fetchNuGet { pname = "AWSSDK.S3"; version = "3.7.304"; sha256 = "0hjls7477rm3g7bvd8m7ch37lmllnsv71x1lhjjn8g2nk7d3lk0q"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; sha256 = "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"; }) + (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.19.1"; sha256 = "0rdgvlbqkcyc356xs0wzwbm92lf95621mf2shk30i3ahp0k0gd0k"; }) + (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.18.1"; sha256 = "1hjzggfv24598601jhcdfcaflbd5b97aglhxy7a5ymy1aszhwp9k"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.7.0"; sha256 = "1zj4wwsad2j7y1byigm3c386rv56xr05mwxjlgqh0h0n5w5yjc4w"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.7.0"; sha256 = "1lz3ha3pp58hd4y031z64slcf9rh7g1cgkrlrbhi4vpa67xhynnh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "7.0.0"; sha256 = "196b13zkkq0fhfgigkhwcw1hhaj4dj5pc27z7d5niaizzx6ycwiw"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "Polly"; version = "7.2.4"; sha256 = "0lvhi2a18p6ay780lbw18656297s9i45cvpp4dr9k5lhg7fwl2y1"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) + (fetchNuGet { pname = "System.CommandLine.NamingConventionBinder"; version = "2.0.0-beta4.22272.1"; sha256 = "07hcz8jcqla4fs7cd2r0lanqsa13nl9l37spby9bc5p2apkyrz0m"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) + (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) +] diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix new file mode 100644 index 0000000000000..bf0ac23a7b0f9 --- /dev/null +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, buildDotnetModule +}: + +buildDotnetModule rec { + pname = "gh-gei"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "github"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cz301JzGZTAu0DcxmFpEmBemEij1+OIw4dB2PpwyYS0="; + }; + + projectFile = "src/gei/gei.csproj"; + nugetDeps = ./deps.nix; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. + + meta = with lib; { + homepage = "https://github.com/github/gh-gei"; + description = "Migration CLI for GitHub to GitHub migrations"; + license = licenses.mit; + maintainers = with maintainers; [ lafrenierejm ]; + mainProgram = "gei"; + }; +} diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix index 8e5564172dafa..69c5d40756b7b 100644 --- a/pkgs/by-name/np/npm-lockfile-fix/package.nix +++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix @@ -26,8 +26,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Add missing integrity and resolved fields to a package-lock.json file"; + homepage = "https://github.com/jeslie0/npm-lockfile-fix"; mainProgram = "npm-lockfile-fix"; license = lib.licenses.mit; - maintainers = [ maintainers.lucasew ]; + maintainers = with maintainers; [ lucasew felschr ]; }; } diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/package.nix b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix new file mode 100644 index 0000000000000..a245ee5e4f02f --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-connect-es/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + npm-lockfile-fix, +}: + +buildNpmPackage rec { + pname = "protoc-gen-connect-es"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "connectrpc"; + repo = "connect-es"; + rev = "refs/tags/v${version}"; + hash = "sha256-qCIwr4Hyc5PARUa7tMntuyWRmO6ognmtjxN0myo8FXc="; + + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; + }; + + npmDepsHash = "sha256-OGwEpXZqzMSIES+cmseQlo6/vzkx5ztO0gM/rUB0tGY="; + + npmWorkspace = "packages/protoc-gen-connect-es"; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Protobuf plugin for generating Connect-ecompatiblenabled ECMAScript code"; + homepage = "https://github.com/connectrpc/connect-es"; + changelog = "https://github.com/connectrpc/connect-es/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ + felschr + jtszalay + ]; + }; +} diff --git a/pkgs/by-name/pr/protoc-gen-connect-es/update.sh b/pkgs/by-name/pr/protoc-gen-connect-es/update.sh new file mode 100755 index 0000000000000..6306267da77fd --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-connect-es/update.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env -S nix shell nixpkgs#gnugrep nixpkgs#gnused nixpkgs#coreutils nixpkgs#curl nixpkgs#wget nixpkgs#jq nixpkgs#nix-update nixpkgs#prefetch-npm-deps nixpkgs#npm-lockfile-fix nixpkgs#nodejs --command bash + +set -euo pipefail + +version="$( + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/connectrpc/connect-es/releases" | + jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | + grep -oP "^v\K.*" +)" +url="https://raw.githubusercontent.com/connectrpc/connect-es/v$version/" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +tmp="$(mktemp -d)" +trap 'rm -rf -- "$tmp"' EXIT + +pushd -- "$tmp" +wget "$url/package-lock.json" +npm-lockfile-fix package-lock.json +npm_hash=$(prefetch-npm-deps package-lock.json) +popd + +pushd "$(dirname "${BASH_SOURCE[0]}")" +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +popd + +nix-update protoc-gen-connect-es --version "$version" diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix new file mode 100644 index 0000000000000..4b357e4705503 --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + npm-lockfile-fix, +}: + +buildNpmPackage rec { + pname = "protoc-gen-es"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "bufbuild"; + repo = "protobuf-es"; + rev = "refs/tags/v${version}"; + hash = "sha256-bHl8gqNrTm1+Cnj43RWmrLDUz+G11C4gprEiNOpyOdQ="; + + postFetch = '' + ${lib.getExe npm-lockfile-fix} $out/package-lock.json + ''; + }; + + npmDepsHash = "sha256-ozkkakfSBycu83gTs8Orhm5Tg8kRSrF/vMJxVnPjhIw="; + + npmWorkspace = "packages/protoc-gen-es"; + + preBuild = '' + npm run --workspace=packages/protobuf build + npm run --workspace=packages/protoplugin build + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Protobuf plugin for generating ECMAScript code"; + homepage = "https://github.com/bufbuild/protobuf-es"; + changelog = "https://github.com/bufbuild/protobuf-es/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ + felschr + jtszalay + ]; + }; +} diff --git a/pkgs/by-name/pr/protoc-gen-es/update.sh b/pkgs/by-name/pr/protoc-gen-es/update.sh new file mode 100755 index 0000000000000..7507fbd1fe338 --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-es/update.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env -S nix shell nixpkgs#gnugrep nixpkgs#gnused nixpkgs#coreutils nixpkgs#curl nixpkgs#wget nixpkgs#jq nixpkgs#nix-update nixpkgs#prefetch-npm-deps nixpkgs#npm-lockfile-fix nixpkgs#nodejs --command bash + +set -euo pipefail + +version="$( + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/bufbuild/protobuf-es/releases" | + jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | + grep -oP "^v\K.*" +)" +url="https://raw.githubusercontent.com/bufbuild/protobuf-es/v$version/" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +tmp="$(mktemp -d)" +trap 'rm -rf -- "$tmp"' EXIT + +pushd -- "$tmp" +wget "$url/package-lock.json" +npm-lockfile-fix package-lock.json +npm_hash=$(prefetch-npm-deps package-lock.json) +popd + +pushd "$(dirname "${BASH_SOURCE[0]}")" +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +popd + +nix-update protoc-gen-es --version "$version" diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index 999552a240878..f1a67cc0ff750 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + buildPythonPackage, fetchFromGitHub, cmake, doxygen, @@ -11,14 +11,15 @@ scipy, }: -stdenv.mkDerivation (finalAttrs: { +buildPythonPackage rec { pname = "eigenpy"; version = "3.7.0"; + pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; - rev = "refs/tags/v${finalAttrs.version}"; + rev = "v${version}"; hash = "sha256-D/k/ka500EZch5Ydym2WYtd5vciGkd9rdBUSjTsZ0w4="; }; @@ -55,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Bindings between Numpy and Eigen using Boost.Python"; homepage = "https://github.com/stack-of-tasks/eigenpy"; - changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ nim65s @@ -63,4 +64,4 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = platforms.unix; }; -}) +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b24863bf01bd1..da4ea26d21548 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3794,7 +3794,7 @@ self: super: with self; { eggdeps = callPackage ../development/python-modules/eggdeps { }; - eigenpy = toPythonModule (callPackage ../development/python-modules/eigenpy { }); + eigenpy = callPackage ../development/python-modules/eigenpy { }; einops = callPackage ../development/python-modules/einops { }; |