From d458ad1abe391f04764082beeb194d10b3c9e850 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 26 Jul 2023 18:21:18 -0400 Subject: [PATCH] treewide: remove attrPath from nix-update-script calls --- .../file-managers/portfolio-filemanager/default.nix | 4 +--- pkgs/applications/graphics/komikku/default.nix | 4 +--- pkgs/applications/misc/dialect/default.nix | 4 +--- pkgs/applications/misc/organicmaps/default.nix | 1 - pkgs/applications/misc/tuba/default.nix | 4 +--- pkgs/development/tools/lv_img_conv/default.nix | 4 +--- pkgs/tools/admin/ejson2env/default.nix | 4 +--- pkgs/tools/admin/gimme-aws-creds/default.nix | 4 +--- 8 files changed, 7 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index e0b9954e1f5c..0fcfa61907a7 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -67,9 +67,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "portfolio-filemanager"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 008cfc5d2ba2..b444841f8f72 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -81,9 +81,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "komikku"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 8c04161844b1..be2fcdbe4a71 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -70,9 +70,7 @@ python3.pkgs.buildPythonApplication rec { # handle setup hooks better strictDeps = false; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/dialect-app/dialect"; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 4395cf7721de..4d8d3aa78112 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -67,7 +67,6 @@ mkDerivation rec { passthru = { updateScript = nix-update-script { - attrPath = pname; extraArgs = [ "-vr" "(.*)-android" ]; }; }; diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index f1a33bc10009..5b97307abcf1 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -66,9 +66,7 @@ stdenv.mkDerivation rec { ]); passthru = { - updateScript = nix-update-script { - attrPath = "tuba"; - }; + updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/development/tools/lv_img_conv/default.nix b/pkgs/development/tools/lv_img_conv/default.nix index dc1a4f5ae023..e00b960c46b9 100644 --- a/pkgs/development/tools/lv_img_conv/default.nix +++ b/pkgs/development/tools/lv_img_conv/default.nix @@ -52,9 +52,7 @@ buildNpmPackage rec { makeWrapper ${nodePackages.ts-node}/bin/ts-node $out/bin/lv_img_conv --add-flags $out/lib/node_modules/lv_img_conv/lib/cli.ts ''; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { changelog = "https://github.com/lvgl/lv_img_conv/releases/tag/v${version}"; diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index fae0ce1f7b9a..1b28cdcc4fe4 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -19,9 +19,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - passthru.updateScript = nix-update-script { - attrPath = pname; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix index 2beecd158bc5..b565fd0ee020 100644 --- a/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -93,9 +93,7 @@ python.pkgs.buildPythonApplication rec { passthru = { inherit python; - updateScript = nix-update-script { - attrPath = pname; - }; + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = gimme-aws-creds; command = ''touch tmp.conf && OKTA_CONFIG="tmp.conf" gimme-aws-creds --version'';