about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2023-06-28 23:41:18 +0200
committerGitHub <noreply@github.com>2023-06-28 23:41:18 +0200
commit198bd0a4a7dbf059b4bbb307c0b389ee8d8e5d1c (patch)
tree1eb1cec186e41f0f2bbed767dff2c5fe906230cb /pkgs/applications
parent37bceead9019439c608464e87377626608becb09 (diff)
parent7af46fb0476330aaa2fe7a1627827007005918ef (diff)
Merge pull request #239622 from corngood/dotnet-misc
dotnet: misc fixes 
Diffstat (limited to 'pkgs/applications')
-rwxr-xr-xpkgs/applications/blockchains/nbxplorer/util/update-common.sh5
-rwxr-xr-xpkgs/applications/emulators/ryujinx/updater.sh4
-rw-r--r--pkgs/applications/graphics/pinta/default.nix1
-rwxr-xr-xpkgs/applications/misc/ArchiSteamFarm/update.sh4
-rwxr-xr-xpkgs/applications/version-management/git-credential-manager/update.sh3
5 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
index 6346c2fa9f400..1354588a75491 100755
--- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
+++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh
@@ -9,7 +9,6 @@ set -euo pipefail
 trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR
 
 pkgName=$1
-depsFile=$2
 
 : ${getVersionFromTags:=}
 : ${refetch:=}
@@ -41,7 +40,7 @@ fi
 if [[ $newVersion == $oldVersion && ! $refetch ]]; then
   echo "nixpkgs already has the latest version $newVersion"
   echo "Run this script with env var refetch=1 to re-verify the content hash via GPG"
-  echo "and to recreate $(basename "$depsFile"). This is useful for reviewing a version update."
+  echo "and to recreate deps.nix. This is useful for reviewing a version update."
   exit 0
 fi
 
@@ -74,4 +73,4 @@ fi
 echo
 
 # Create deps file
-$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile"
+$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link)
diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh
index 5827271138d62..3aae3943aa5a7 100755
--- a/pkgs/applications/emulators/ryujinx/updater.sh
+++ b/pkgs/applications/emulators/ryujinx/updater.sh
@@ -3,8 +3,6 @@
 set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-DEPS_FILE="$(realpath "./deps.nix")"
-
 # provide a github token so you don't get rate limited
 # if you use gh cli you can use:
 #     `export GITHUB_TOKEN="$(cat ~/.config/gh/config.yml | yq '.hosts."github.com".oauth_token' -r)"`
@@ -75,4 +73,4 @@ fi
 
 echo "building Nuget lockfile"
 
-$(nix-build -A ryujinx.fetch-deps --no-out-link) "$DEPS_FILE"
+$(nix-build -A ryujinx.fetch-deps --no-out-link)
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index f38a9a9dcfe12..2f523813a24b9 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -26,7 +26,6 @@ buildDotnetModule rec {
   # How-to update deps:
   # $ nix-build -A pinta.fetch-deps
   # $ ./result
-  # $ cp /tmp/Pinta-deps.nix ./pkgs/applications/graphics/pinta/deps.nix
   # TODO: create update script
   nugetDeps = ./deps.nix;
 
diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh
index 84e25328fbfd2..9af9acb69835b 100755
--- a/pkgs/applications/misc/ArchiSteamFarm/update.sh
+++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh
@@ -3,8 +3,6 @@
 set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-deps_file="$(realpath ./deps.nix)"
-
 new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases" | jq -r  'map(select(.prerelease == false)) | .[0].tag_name')"
 old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
 
@@ -22,7 +20,7 @@ if [[ "${1:-}" != "--deps-only" ]]; then
     update-source-version ArchiSteamFarm "$new_version"
 fi
 
-$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file"
+$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link)
 
 popd
 "$asf_path/web-ui/update.sh"
diff --git a/pkgs/applications/version-management/git-credential-manager/update.sh b/pkgs/applications/version-management/git-credential-manager/update.sh
index e1a03f296f1fc..a24eed3f27106 100755
--- a/pkgs/applications/version-management/git-credential-manager/update.sh
+++ b/pkgs/applications/version-management/git-credential-manager/update.sh
@@ -20,5 +20,4 @@ hash="$(nix-prefetch ./.)"
 sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9=]{44}\"/hash = \"${hash}\"/" default.nix
 
 
-nugetDeps="$(realpath ./deps.nix)"
-$(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link) "$nugetDeps"
+$(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link)