pyrox.dev / nixpkgs
lol
fork atom

nbxplorer: use fetch-deps instead of custom create-deps.sh

authored by

David McFarland and committed by
Pavol Rusnak 5c924eeb 4a816921

+3 -52
unified split
+1 -2
pkgs/applications/blockchains/btcpayserver/update.sh
··· 8 8 ../nbxplorer/update.sh 9 9 echo 10 10 echo "Updating btcpayserver" 11 - # Include Razor SDK packages in deps.nix 12 - ../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false' 11 + ../nbxplorer/util/update-common.sh btcpayserver deps.nix
+1 -1
pkgs/applications/blockchains/nbxplorer/update.sh
··· 3 3 4 4 scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) 5 5 6 - getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix '' 6 + getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix
-46
pkgs/applications/blockchains/nbxplorer/util/create-deps.sh
··· 1 - #!/usr/bin/env nix-shell 2 - #!nix-shell -i bash -p dotnet-sdk_6 3 - set -euo pipefail 4 - 5 - # Writes deps for dotnet package in $pkgSrc to $depsFile. 6 - # Expects $pkgSrc to contain a single .sln file. 7 - 8 - pkgSrc=$1 9 - depsFile=$(realpath "$2") 10 - customFlags=$3 11 - 12 - sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) 13 - [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } 14 - 15 - tmpdir=$(mktemp -d /tmp/$pkgName-src.XXX) 16 - echo "Using tmp dir: $tmpdir" 17 - cp -rT "$pkgSrc" "$tmpdir" 18 - chmod -R +w "$tmpdir" 19 - 20 - pushd "$tmpdir" > /dev/null 21 - mkdir home 22 - echo "Running dotnet restore for $sln" 23 - HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ 24 - dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log 25 - 26 - echo "{ fetchNuGet }: [" > "$depsFile" 27 - while read pkgSpec; do 28 - { read pname; read version; } < <( 29 - # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2 30 - sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkgSpec" 31 - ) 32 - sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg) 33 - cat >> "$depsFile" <<EOF 34 - (fetchNuGet { 35 - pname = "$pname"; 36 - version = "$version"; 37 - sha256 = "$sha256"; 38 - }) 39 - EOF 40 - done < <(find home/.nuget/packages -name '*.nuspec' | LC_ALL=C sort) 41 - echo "]" >> "$depsFile" 42 - 43 - echo "Created $depsFile" 44 - 45 - popd > /dev/null 46 - rm -r $tmpdir
+1 -3
pkgs/applications/blockchains/nbxplorer/util/update-common.sh
··· 10 10 11 11 pkgName=$1 12 12 depsFile=$2 13 - customFlags=$3 14 13 15 14 : ${getVersionFromTags:=} 16 15 : ${refetch:=} ··· 75 74 echo 76 75 77 76 # Create deps file 78 - storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" 79 - . "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags" 77 + $(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile"