diff options
160 files changed, 277 insertions, 295 deletions
diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index 08c0e2f0ba66a..9bae2b126f5bc 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -81,7 +81,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; tests.version = testers.testVersion { diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index af22a9dce67ce..c02ee512669ae 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { # sandbox to be disabled. doCheck = false; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 343fbb7bc97ab..e5d846606a714 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -96,9 +96,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru.updateScript = gitUpdater { - inherit pname version; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "An easy-to-use wineprefix manager"; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix index fb1646dbbcca5..40d5d57144820 100644 --- a/pkgs/applications/misc/diffuse/default.nix +++ b/pkgs/applications/misc/diffuse/default.nix @@ -53,7 +53,6 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; }; diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index b5c97a7456dd3..161991f032644 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -66,7 +66,7 @@ perlPackages.buildPerlPackage rec { wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB" ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/trizen/fbmenugen"; diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix index 8b06988a20b21..2aebbf5194a21 100644 --- a/pkgs/applications/misc/gnome-firmware/default.nix +++ b/pkgs/applications/misc/gnome-firmware/default.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = gitUpdater { - inherit pname version; ignoredVersions = "(alpha|beta|rc).*"; }; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 28c089060aa8b..d5c1115acbf7c 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = gitUpdater { - inherit pname version; ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x url = src.gitRepoUrl; }; diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 9710399ab6358..75dac02f56ecf 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -76,7 +76,6 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gitUpdater { - inherit pname version; ignoredVersions = ''master.*''; }; }; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index e0700263512d6..e15b3c9ba6393 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Command line tool that generates XDG menus for several window managers"; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 868729514d4ba..ae8aa4656c032 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; url = "https://github.com/lwindolf/${pname}"; rev-prefix = "v"; }; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 69276c229b3c2..7d7009e02431f 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -30,9 +30,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = genericUpdater { - inherit pname version; versionLister = writeShellScript "anydesk-versionLister" '' - echo "# Versions for $1:" >> "$2" curl -s https://anydesk.com/en/downloads/linux \ | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ | uniq \ diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index a38b7f85050a7..a04e9a82e8c49 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -25,7 +25,6 @@ buildGoModule rec { passthru = { updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; ignoredVersions = ".(rc|beta).*"; }; diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index b2ae28baa92b4..d4aa6e6dfc0b5 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; ignoredVersions = ''.*\.90\..*''; }; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 493b4525d2f8a..84596f6d93823 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -76,7 +76,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gitUpdater { - inherit pname version; ignoredVersions = "ci.*"; }; }; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 1eaedf218cda4..2650f330c0a99 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "git_review" ]; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Tool to submit code to Gerrit"; diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix index d8b4427364175..a1c4ec5c69495 100644 --- a/pkgs/applications/version-management/gitqlient/default.nix +++ b/pkgs/applications/version-management/gitqlient/default.nix @@ -69,7 +69,6 @@ mkDerivation rec { ]; passthru.updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 6061f0c7775f5..405dcf53837e2 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -15,8 +15,8 @@ let attrPath = lib.toLower pname; rev-prefix = "v"; }; - updateScript = builtins.elemAt updater 0; - updateArgs = map (lib.escapeShellArg) (builtins.tail updater); + updateScript = builtins.elemAt updater.command 0; + updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command); in writers.writeBash "update-epgstation" '' set -euxo pipefail diff --git a/pkgs/applications/video/mirakurun/update.nix b/pkgs/applications/video/mirakurun/update.nix index 6fd13f81b87ad..3670bf150cc4f 100644 --- a/pkgs/applications/video/mirakurun/update.nix +++ b/pkgs/applications/video/mirakurun/update.nix @@ -17,8 +17,8 @@ let # exclude prerelease versions ignoredVersions = "-"; }; - updateScript = builtins.elemAt updater 0; - updateArgs = map (lib.escapeShellArg) (builtins.tail updater); + updateScript = builtins.elemAt updater.command 0; + updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command); in writers.writeBash "update-mirakurun" '' set -euxo pipefail diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index e996ae92d2160..acd0bb496b5d5 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -76,7 +76,6 @@ mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 053b01cb2258a..0fa6ff10d96a0 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; url = "https://git.enlightenment.org/e16/e16"; rev-prefix = "v"; }; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 49894bd0daa20..fb89731a8461b 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -70,7 +70,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix index 7a919ff5845ea..04adcf563814d 100644 --- a/pkgs/common-updater/generic-updater.nix +++ b/pkgs/common-updater/generic-updater.nix @@ -1,8 +1,9 @@ { stdenv, writeScript, coreutils, gnugrep, gnused, common-updater-scripts, nix }: -{ pname -, version -, attrPath ? pname +{ name ? null +, pname ? null +, version ? null +, attrPath ? null , versionLister , ignoredVersions ? "" , rev-prefix ? "" @@ -15,22 +16,28 @@ let fileForGitCommands = "update-git-commits.txt"; # shell script to update package - updateScript = writeScript "update-script.sh" '' + updateScript = writeScript "generic-update-script.sh" '' #! ${stdenv.shell} set -o errexit set -x - pname="$1" - version="$2" - attr_path="$3" - version_lister="$4" - ignored_versions="$5" - rev_prefix="$6" - odd_unstable="$7" - patchlevel_unstable="$8" + name="$1" + pname="$2" + version="$3" + attr_path="$4" + version_lister="$5" + ignored_versions="$6" + rev_prefix="$7" + odd_unstable="$8" + patchlevel_unstable="$9" + + [[ -n "$name" ]] || name="$UPDATE_NIX_NAME" + [[ -n "$pname" ]] || pname="$UPDATE_NIX_PNAME" + [[ -n "$version" ]] || version="$UPDATE_NIX_OLD_VERSION" + [[ -n "$attr_path" ]] || attr_path="$UPDATE_NIX_ATTR_PATH" # print header - echo "# $pname-$version" >> ${fileForGitCommands} + echo "# $name" >> ${fileForGitCommands} function version_is_ignored() { local tag="$1" @@ -55,7 +62,7 @@ let return 1 } - tags=$($version_lister --pname=${pname} --file="${fileForGitCommands}") || exit 1 + tags=$($version_lister --pname=$pname --attr-path=$attr_path --file="${fileForGitCommands}") || exit 1 # print available tags for tag in $tags; do @@ -104,5 +111,7 @@ let echo "" >> ${fileForGitCommands} ''; -in -[ updateScript pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ] +in { + name = "generic-update-script"; + command = [ updateScript name pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ]; +} diff --git a/pkgs/common-updater/git-updater.nix b/pkgs/common-updater/git-updater.nix index b68f4a29011d6..86bf88ada8c41 100644 --- a/pkgs/common-updater/git-updater.nix +++ b/pkgs/common-updater/git-updater.nix @@ -3,9 +3,9 @@ , common-updater-scripts }: -{ pname -, version -, attrPath ? pname +{ pname ? null +, version ? null +, attrPath ? null , ignoredVersions ? "" , rev-prefix ? "" , odd-unstable ? false diff --git a/pkgs/common-updater/http-two-levels-updater.nix b/pkgs/common-updater/http-two-levels-updater.nix index f9e1e1b7204ad..8ece1161015c4 100644 --- a/pkgs/common-updater/http-two-levels-updater.nix +++ b/pkgs/common-updater/http-two-levels-updater.nix @@ -3,9 +3,9 @@ , common-updater-scripts }: -{ pname -, version -, attrPath ? pname +{ pname ? null +, version ? null +, attrPath ? null , ignoredVersions ? "" , rev-prefix ? "" , odd-unstable ? false diff --git a/pkgs/common-updater/scripts/list-archive-two-levels-versions b/pkgs/common-updater/scripts/list-archive-two-levels-versions index 4263a9de3ca3e..11db08ad07b8f 100755 --- a/pkgs/common-updater/scripts/list-archive-two-levels-versions +++ b/pkgs/common-updater/scripts/list-archive-two-levels-versions @@ -2,20 +2,24 @@ # lists all available versions listed for a package in a site (http) -archive="" # archive url pname="" # package name +attr_path="" # package attribute path +url="" # directory list url file="" # file for writing debugging information while (( $# > 0 )); do flag="$1" shift 1 case "$flag" in - --url=*) - archive="${flag#*=}" - ;; --pname=*) pname="${flag#*=}" ;; + --attr-path=*) + attr_path="${flag#*=}" + ;; + --url=*) + url="${flag#*=}" + ;; --file=*) file="${flag#*=}" ;; @@ -26,29 +30,33 @@ while (( $# > 0 )); do esac done -# by default set url to the base dir of the first url in src.urls -if [[ -z "$archive" ]]; then - archive="$(nix-instantiate $systemArg --eval -E \ - "with import ./. {}; dirOf (dirOf (lib.head $UPDATE_NIX_ATTR_PATH.src.urls))" \ - | tr -d '"')" +if [[ -z "$pname" ]]; then + pname="$UPDATE_NIX_NAME" fi -if [[ -z "$pname" ]]; then - pname="$UPDATE_NIX_ATTR_PATH" +if [[ -z "$attr_path" ]]; then + attr_path="$UPDATE_NIX_ATTR_PATH" +fi + +# by default set url to the base dir of the first url in src.urls +if [[ -z "$url" ]]; then + url="$(nix-instantiate $systemArg --eval -E \ + "with import ./. {}; dirOf (dirOf (lib.head $attr_path.src.urls))" \ + | tr -d '"')" fi # print a debugging message if [[ -n "$file" ]]; then - echo "# Listing versions for '$pname' at $archive" >> $file + echo "# Listing versions for '$pname' at $url" >> $file fi -# list all major-minor versions from archive -tags1=$(curl -sS "$archive/") +# list all major-minor versions from url +tags1=$(curl -sS "$url/") tags1=$(echo "$tags1" | sed -rne 's,^<a href="([0-9]+\.[0-9]+)/">.*,\1,p') # print available versions for tag in $tags1; do - tags2=$(curl -sS "$archive/$tag/") + tags2=$(curl -sS "$url/$tag/") tags2=$(echo "$tags2" | sed -rne "s,^<a href=\"$pname-([0-9.]+)\\.[^0-9].*\">.*,\\1,p") echo "$tags2" done diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index 86b4949f055d0..186dfd5ea6d4a 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -2,22 +2,24 @@ # lists all available tags from a git repository -echo "# pname=$UPDATE_NIX_ATTR_PATH" > /tmp/test.txt - +pname="" # package name +attr_path="" # package attribute path url="" # git repository url -pname="" # package name file="" # file for writing debugging information while (( $# > 0 )); do flag="$1" shift 1 case "$flag" in - --url=*) - url="${flag#*=}" - ;; --pname=*) pname="${flag#*=}" ;; + --attr-path=*) + attr_path="${flag#*=}" + ;; + --url=*) + url="${flag#*=}" + ;; --file=*) file="${flag#*=}" ;; @@ -28,17 +30,21 @@ while (( $# > 0 )); do esac done +if [[ -z "$pname" ]]; then + pname="$UPDATE_NIX_NAME" +fi + +if [[ -z "$attr_path" ]]; then + attr_path="$UPDATE_NIX_ATTR_PATH" +fi + # By default we set url to src.url or src.meta.homepage if [[ -z "$url" ]]; then url="$(nix-instantiate $systemArg --eval -E \ - "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.meta.homepage or $UPDATE_NIX_ATTR_PATH.src.url" \ + "with import ./. {}; $attr_path.src.meta.homepage or $attr_path.src.url" \ | tr -d '"')" fi -if [[ -z "$pname" ]]; then - pname="$UPDATE_NIX_ATTR_PATH" -fi - # print a debugging message if [[ -n "$file" ]]; then echo "# Listing tags for '$pname' at $url" >> $file diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index c1ae9e416e434..c94135f86fa2b 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Colloid icon theme"; diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 4c02e9943c290..c3064aeb9b7fb 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -46,7 +46,6 @@ stdenvNoCC.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 7efc6059bb87d..05c5092e9b421 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Icon pack based on marwaita and papirus icons"; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 2014ca5b697c7..74af2c541923d 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Numix icon theme (circle version)"; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index bd07817b6fb78..7f1e353af2935 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Numix icon theme (square version)"; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 18ba78ac24ecc..410439da6ca68 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Numix icon theme"; diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index e2f3e6cb3bb60..98000a42b4002 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Flat colorful design icon theme"; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index dcff587dd357d..44e8fdb6c05fa 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Flat and colorful personality icon theme"; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index d9a62462e97c1..2f0c03220daf1 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Icon pack flat with light colors"; diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix index dabe19d68d714..641100488036d 100644 --- a/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A modern and clean Gtk theme"; diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix index ebfc339ead510..8c2dcb8a8738a 100644 --- a/pkgs/data/themes/colloid-kde/default.nix +++ b/pkgs/data/themes/colloid-kde/default.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A clean and concise theme for KDE Plasma desktop"; diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 7dcb5a8a501a4..5376a618aa924 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Flat Gtk+ theme based on Elegant Design"; diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 19a7eb4a0fad3..730a6112af279 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; diff --git a/pkgs/data/themes/layan-kde/default.nix b/pkgs/data/themes/layan-kde/default.nix index 40cd6c055bf13..3b030337b7bc1 100644 --- a/pkgs/data/themes/layan-kde/default.nix +++ b/pkgs/data/themes/layan-kde/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A flat Design theme for KDE Plasma desktop"; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index e9819fae1da74..93119396af65b 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index dcf6988f5939e..d89cf6a1268b0 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A stylish flat Design theme for GTK based desktop environments"; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 4fc9b0ab8c024..0cb0d59f2b489 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Mac OSX Mojave like theme for GTK based desktop environments"; diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix index 30ef4ed82d360..44182aa3f45a9 100644 --- a/pkgs/data/themes/qogir-kde/default.nix +++ b/pkgs/data/themes/qogir-kde/default.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A flat Design theme for KDE Plasma desktop"; diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index f6ea2c61aa89c..3789e18de36f5 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index dc13b4abfb6b4..12795e68e70e8 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Flat Material Design theme for GTK based desktop environments"; diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 0fafc538cda64..81892e7c0d6de 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -74,8 +74,6 @@ python3.pkgs.buildPythonApplication rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; - attrPath = "cinnamon.warpinator"; ignoredVersions = "^master.*"; }; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 38ea496f3b739..f6d21c2465302 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { extensionPortalSlug = "dash-to-dock"; updateScript = gitUpdater { - pname = "gnomeExtensions.dash-to-dock"; - inherit version; rev-prefix = "extensions.gnome.org-v"; }; }; diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index d6a167aa3ff4d..b95dd4b6fdf26 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -8,6 +8,7 @@ , qttools , lxqt , libconfig +, gitUpdater }: mkDerivation rec { @@ -38,7 +39,7 @@ mkDerivation rec { --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ ''; - passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 28ea04116034f..fbac7dbd034d0 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -2,13 +2,6 @@ let packages = self: with self; { - # Update script tailored to LXQt packages from git repository - lxqtUpdateScript = { pname, version, src }: - pkgs.gitUpdater { - inherit pname version; - attrPath = "lxqt.${pname}"; - }; - # For compiling information, see: # - https://github.com/lxqt/lxqt/wiki/Building-from-source diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 3ce80110b01c7..7ef8fb7ca1b1b 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -11,7 +11,7 @@ , menu-cache , qtx11extras , qttools -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -43,7 +43,7 @@ mkDerivation rec { menu-cache ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/libfm-qt"; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 5a15e94ef7a16..41d8ea6222d82 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -10,7 +10,7 @@ , polkit-qt , kwindowsystem , xorg -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -50,7 +50,7 @@ mkDerivation rec { sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt ''; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Core utility library for all LXQt components"; diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index ea2f28c09df65..4496cade96850 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -5,7 +5,7 @@ , qtbase , qtsvg , lxqt-build-tools -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -37,7 +37,7 @@ mkDerivation rec { ) ''; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/libqtxdg"; diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 138be56bd5c3f..4fdfa341e9231 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -5,7 +5,7 @@ , cmake , qtbase , lxqt-build-tools -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -28,7 +28,7 @@ mkDerivation rec { qtbase ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 80312574f3926..4672e402c9ad0 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -13,7 +13,7 @@ , libfm-qt , libexif , menu-cache -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -46,7 +46,7 @@ mkDerivation rec { menu-cache ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lximage-qt"; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index d38b37281f0f4..1ccd00e2208f2 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -9,7 +9,7 @@ , kwindowsystem , liblxqt , libqtxdg -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -37,7 +37,7 @@ mkDerivation rec { libqtxdg ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-about"; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 7917ce1f4fb46..e634a3ba9ead0 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -10,7 +10,7 @@ , liblxqt , libqtxdg , polkit-qt -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -47,7 +47,7 @@ mkDerivation rec { done ''; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-admin"; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index d3ddb03b9271b..bfbd4381a97f0 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -11,7 +11,7 @@ , qtbase , qttools , qtx11extras -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -43,7 +43,7 @@ mkDerivation rec { hardeningDisable = [ "format" ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-archiver/"; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index d543cf11c359d..670cdc44e551c 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -9,7 +9,7 @@ , qtbase , glib , perl -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -69,7 +69,7 @@ mkDerivation rec { cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake ''; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-build-tools"; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 4981723c354c9..4d3af9fee1170 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -15,7 +15,7 @@ , libqtxdg , xkeyboard_config , xorg -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -64,7 +64,7 @@ mkDerivation rec { '${xkeyboard_config}/share/X11/xkb/rules/base.lst' ''; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-config"; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 8e589f2b0c68c..b362e3ee4de79 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -10,7 +10,7 @@ , kwindowsystem , liblxqt , libqtxdg -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -39,7 +39,7 @@ mkDerivation rec { libqtxdg ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-globalkeys"; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 76f2a4a7018e9..fc30d2884b450 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -10,7 +10,7 @@ , liblxqt , libqtxdg , qtx11extras -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -39,7 +39,7 @@ mkDerivation rec { qtx11extras ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-notificationd"; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 605f87baad6bb..b1d2ba4eb55cf 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -10,7 +10,7 @@ , kwindowsystem , liblxqt , libqtxdg -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -39,7 +39,7 @@ mkDerivation rec { libqtxdg ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 9451e5784027b..8e65df1146121 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -17,7 +17,7 @@ , lxmenu-data , lxqt-build-tools , lxqt-globalkeys -, lxqtUpdateScript +, gitUpdater , menu-cache , pcre , qtbase @@ -71,7 +71,7 @@ mkDerivation rec { xorg.libpthreadstubs ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-panel"; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 58fdc88576d60..03c634d0535f7 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -14,7 +14,7 @@ , liblxqt , libqtxdg , pcre -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -47,7 +47,7 @@ mkDerivation rec { pcre ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-policykit"; diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 3d09030ebf433..7f20c96c7702a 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -13,7 +13,7 @@ , liblxqt , libqtxdg , lxqt-globalkeys -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -45,7 +45,7 @@ mkDerivation rec { lxqt-globalkeys ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-powermanagement"; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index c123d6cd1e6d1..b0672b4ca58f1 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -6,7 +6,7 @@ , libfm-qt , libqtxdg , lxqt-build-tools -, lxqtUpdateScript +, gitUpdater , qtbase , qtsvg , qttools @@ -44,7 +44,7 @@ mkDerivation rec { --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" ''; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-qtplugin"; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index ee1da2e8dc9b6..285067c3944e0 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -15,7 +15,7 @@ , menu-cache , muparser , pcre -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -49,7 +49,7 @@ mkDerivation rec { pcre ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-runner"; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index ebab3bbee6150..3a2db7b8dffad 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -15,7 +15,7 @@ , procps , xorg , xdg-user-dirs -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -50,7 +50,7 @@ mkDerivation rec { xdg-user-dirs ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-session"; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 7a9ca126287bb..1ef839b20c963 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -11,7 +11,7 @@ , liblxqt , libqtxdg , sudo -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -41,7 +41,7 @@ mkDerivation rec { sudo ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-sudo"; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 0ad382b4b1d74..94e7e82b837ab 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , lxqt-build-tools -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -22,7 +22,7 @@ mkDerivation rec { lxqt-build-tools ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/lxqt-themes"; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index b52ec327989ab..2adfc9ac2dcf9 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -10,7 +10,7 @@ , xorg , lxqt-build-tools , openbox -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -41,7 +41,7 @@ mkDerivation rec { openbox ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/obconf-qt"; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index e08a04aee7641..a3ff84150ce9f 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -9,6 +9,7 @@ , qtbase , qttools , qtx11extras +, gitUpdater }: mkDerivation rec { @@ -36,7 +37,7 @@ mkDerivation rec { pcre ]; - passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/pavucontrol-qt"; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index d5bfb1dd3bfbe..b3fadab60fa73 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -12,7 +12,7 @@ , libfm-qt , menu-cache , lxmenu-data -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -44,7 +44,7 @@ mkDerivation rec { lxmenu-data ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; postPatch = '' substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index 75862dfc7d5a9..64ce835d3a66c 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -4,7 +4,7 @@ , cmake , qtbase , qttools -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -27,7 +27,7 @@ mkDerivation rec { qttools ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Cross-platform clipboard history applet"; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index ab43b35615ade..1523a9e6ed3d0 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -6,7 +6,7 @@ , liblxqt , libqtxdg , lxqt-build-tools -, lxqtUpdateScript +, gitUpdater , qtbase , qttools , qtx11extras @@ -37,7 +37,7 @@ mkDerivation rec { qtx11extras ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/qps"; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index a32881c4532d9..d4ec676bb4871 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -7,7 +7,7 @@ , qtbase , qttools , qtx11extras -, lxqtUpdateScript +, gitUpdater , nixosTests }: @@ -34,7 +34,7 @@ mkDerivation rec { qtermwidget ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; passthru.tests.test = nixosTests.terminal-emulators.qterminal; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 04e80e74d503a..ec441cbcf1551 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -6,7 +6,7 @@ , qtbase , qttools , lxqt-build-tools -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -30,7 +30,7 @@ mkDerivation rec { qttools ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index def7935a1c914..22567be834927 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -5,7 +5,7 @@ , qtbase , libqtxdg , lxqt-build-tools -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -29,7 +29,7 @@ mkDerivation rec { libqtxdg ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/qtxdg-tools"; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index f73fd1036c8d5..6041c57b980fc 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -12,7 +12,7 @@ , perl , xorg , autoPatchelfHook -, lxqtUpdateScript +, gitUpdater }: mkDerivation rec { @@ -44,7 +44,7 @@ mkDerivation rec { xorg.libXdmcp ]; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/screengrab"; diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 5ba1193a8c7c1..5fb51936bb83e 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -6,7 +6,7 @@ , libfm-qt , lxqt-qtplugin , qtx11extras -, lxqtUpdateScript +, gitUpdater , extraQtStyles ? [] }: @@ -33,7 +33,7 @@ mkDerivation rec { ] ++ extraQtStyles; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt"; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 1a35169d5a278..486d27baf565b 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "A simple multi-page document viewer for the MATE desktop"; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 3806d8cf482c2..bb19521e835c9 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Dropbox extension for Caja file manager"; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 0d1dd2baa1b2e..c099c18418f17 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Set of extensions for Caja file manager"; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 649f6f3c7e46a..8fb4738a9a47a 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "File manager for the MATE desktop"; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 092d113465522..8604c0f5ee905 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -4,11 +4,10 @@ let packages = self: with self; { # Update script tailored to mate packages from git repository - mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }: + mateUpdateScript = { pname, odd-unstable ? true, rev-prefix ? "v", url ? null }: pkgs.gitUpdater { - inherit pname version odd-unstable rev-prefix; + inherit odd-unstable rev-prefix; url = if url == null then "https://git.mate-desktop.org/${pname}" else url; - attrPath = "mate.${pname}"; }; atril = callPackage ./atril { }; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 98e03044ad430..560197e31336c 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Archive Manager for MATE"; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 45f9a714c23e7..897886a4022ef 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "An image viewing and cataloging program for the MATE desktop"; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 4a0e1b604a530..17abf388fee81 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Keyboard management library for MATE"; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 5021a0f870e7c..e32154a0ba01c 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Mixer library for MATE"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index f68d33a4a516d..55eacf8d63e37 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Library to access weather information from online services for MATE"; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 612a2c22b1014..27e41079243db 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "MATE default window manager"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 8fafe4237d6c4..a67b82d0109dc 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Applets for use with the MATE panel"; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index cb006cf53279c..639f156c8ac7c 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ninja ]; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Background images and data for MATE"; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 12ea1adf55388..cdb743cac665c 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Calculator for the MATE desktop"; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index e247eef07cc34..0f4a1901932b6 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Common files for development of MATE packages"; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 25d8f889d3988..bfe5afe96036f 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Utilities to configure the MATE desktop"; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 85d6ca40532bb..2df32d0b48793 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Library with common API for various MATE modules"; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 0b46d092c70ff..d6d96a33ac141 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -5,7 +5,7 @@ , gtk3 , mate , hicolor-icon-theme -, mateUpdateScript +, gitUpdater }: stdenv.mkDerivation rec { @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { - inherit pname version; - url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza"; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + url = "https://github.com/mate-desktop-legacy-archive/${pname}"; }; meta = with lib; { diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 0f4f7a71e2816..1f874fa6f16e5 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Icon themes from MATE"; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index be5db13e11a53..7d0d1eec009f4 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { homepage = "https://github.com/mate-desktop/mate-indicator-applet"; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 5663821ab417e..78f3d2db2e796 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Media tools for MATE"; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index cab4bc0b16056..183b9c2dfac50 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index fbbedce99a959..6d7af4148b4ff 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "MATE utilities for netbooks"; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 1e79e778699b0..4c82397ef681b 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Notification daemon for MATE Desktop"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 258fe5f68f9fc..b1273bb72ae57 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "The MATE panel"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 1c67e62bb8009..f966c53d52a04 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Integrates polkit authentication for MATE desktop"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index d77fb6b5b2eb6..9505f8c43ea7d 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "The MATE Power Manager"; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index e9994e15e6373..ed1036a33b745 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Screen saver and locker for the MATE desktop"; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 48a16c84d1da4..7c5988e345037 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 03a18008e4363..f3a5e22173fc7 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "mate" ]; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "MATE Desktop session manager"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 20a9a97d25141..159d13e59122b 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "MATE settings daemon"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 9da865f2dcfcf..3ba0d855a26df 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "System monitor for the MATE desktop"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 9f19d905ca4b2..e58d3291ff0ca 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; passthru.tests.test = nixosTests.terminal-emulators.mate-terminal; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index af186e4c5a2d7..26485865324fd 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "A set of themes from MATE"; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 4030641799fe5..644a1aa35ca57 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -73,10 +73,7 @@ python3Packages.buildPythonApplication rec { done ''; - passthru.updateScript = gitUpdater { - inherit pname version; - attrPath = "mate.${pname}"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Tweak tool for the MATE Desktop"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index f24b02e793786..d5fcd44887ac9 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "MATE User Guide"; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 04a09d6f06cdb..8dc35d7046694 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "User level public file sharing for the MATE desktop"; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 13e5e5154ca70..110ec7e406558 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Utilities for the MATE desktop"; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index a4c08eba61440..fe619bee483e9 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "MATE Desktop menu editor"; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 76ea344a88f97..287529a9735d9 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Powerful text editor for the MATE desktop"; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 0b0a1a833fc04..b9c58d8d92687 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { description = "Python binding for Caja components"; diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index d58ae684fcb40..f78f420cabc7b 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -65,10 +65,7 @@ python3Packages.buildPythonApplication rec { # Disable check because there is no test in the source distribution doCheck = false; - passthru.updateScript = gitUpdater { - inherit pname version; - rev-prefix = "${pname}-"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "${pname}-"; }; meta = with lib; { homepage = "https://docs.xfce.org/apps/catfish/start"; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix index 8c37dde65ccb2..23ad1069fb74f 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix @@ -1,15 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: - -let - category = "art"; -in +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, httpTwoLevelsUpdater }: stdenv.mkDerivation rec { pname = "xfce4-icon-theme"; version = "4.4.3"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/art/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "sha256-1HhmktVrilY/ZqXyYPHxOt4R6Gx4y8slqfml/EfPZvo="; }; @@ -28,7 +24,9 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = httpTwoLevelsUpdater { + url = "https://archive.xfce.org/src/art/${pname}"; + }; meta = with lib; { homepage = "https://www.xfce.org/"; diff --git a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index aae86985b3017..6eda846ee3116 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -1,19 +1,17 @@ -{ lib, stdenv, fetchurl, xfce }: - -let - category = "art"; -in +{ lib, stdenv, fetchurl, httpTwoLevelsUpdater }: stdenv.mkDerivation rec { pname = "xfwm4-themes"; version = "4.10.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "mirror://xfce/src/art/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "sha256-MhTV8A6XA7XoyefDKH1gbe3scoXOtNXbMy6TraZv1XU="; }; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = httpTwoLevelsUpdater { + url = "https://archive.xfce.org/src/art/${pname}"; + }; meta = with lib; { homepage = "https://www.xfce.org/"; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 294ecc6188c06..811ed736e7a52 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -5,13 +5,6 @@ lib.makeScope pkgs.newScope (self: with self; { genericUpdater = pkgs.genericUpdater; - archiveUpdater = { category, pname, version }: - pkgs.httpTwoLevelsUpdater { - inherit pname version; - attrPath = "xfce.${pname}"; - url = "https://archive.xfce.org/src/${category}/${pname}"; - }; - mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index 261178381e4e2..608053fcbf550 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -42,7 +42,7 @@ let pos = builtins.unsafeGetAttrPos "pname" args; passthru.updateScript = gitUpdater { - inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; + inherit rev-prefix odd-unstable patchlevel-unstable; }; meta = with lib; { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index cc4ce861e7246..6d8e1199b99be 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -7,7 +7,7 @@ , xfce4-panel , libxfce4ui , gtk2 -, xfce +, gitUpdater }: let @@ -33,7 +33,10 @@ in stdenv.mkDerivation rec { gtk2 ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib;{ homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index e4a252c7ed069..cbf526e3d98be 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -8,7 +8,7 @@ , libxfce4ui , xfconf , gtk3 -, xfce +, gitUpdater }: let @@ -35,7 +35,10 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 81498aea96f4b..7f1cfe91891e8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -8,7 +8,7 @@ , libxfce4ui , xfconf , gtk3 -, xfce +, gitUpdater }: let @@ -35,7 +35,10 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index 1b794ff2b8364..6a43c237037b3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -7,7 +7,7 @@ , xfce4-panel , libxfce4ui , gtk3 -, xfce +, gitUpdater }: let @@ -33,7 +33,10 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index fdd3af5fe402f..1b06566170aef 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, xfce4-panel, libxfce4ui, - exo, gnutls, libgcrypt, xfce }: + exo, gnutls, libgcrypt, gitUpdater }: let category = "panel-plugins"; @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { libgcrypt ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index 566475869345f..fa681dba7bbaf 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, - libxfce4ui, gtk3, exo, xfce }: + libxfce4ui, gtk3, exo, gitUpdater }: let category = "panel-plugins"; @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { exo ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index e6f5df643210c..032b29eaef3d4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; - attrPath = "xfce.${pname}"; rev-prefix = "v"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index 6cb2fcc66c020..0d6782dc821e0 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -6,7 +6,7 @@ , xfce4-panel , libxfce4ui , xfconf -, xfce +, gitUpdater }: let @@ -31,7 +31,10 @@ in stdenv.mkDerivation rec { xfconf ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 22b4d8c4f40f9..2e82deb2d3f18 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui, - libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce + libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, gitUpdater }: let @@ -38,7 +38,10 @@ stdenv.mkDerivation rec { "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index d264181bd48fc..9f6d92b745ecd 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -6,7 +6,7 @@ , xfce4-panel , libxfce4ui , xfconf -, xfce +, gitUpdater }: let @@ -31,7 +31,10 @@ in stdenv.mkDerivation rec { xfconf ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index c3cb16dfa830e..96dabfbf48bd5 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: +{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, gitUpdater }: let category = "panel-plugins"; @@ -28,7 +28,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 5ceda9cb8bd38..cd30b79650e3f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, libxml2, libsoup, upower, - libxfce4ui, xfce4-panel, xfconf, hicolor-icon-theme, xfce }: + libxfce4ui, xfce4-panel, xfconf, hicolor-icon-theme, gitUpdater }: let category = "panel-plugins"; @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; + passthru.updateScript = gitUpdater { + url = "https://gitlab.xfce.org/panel-plugins/${pname}"; + rev-prefix = "${pname}-"; + }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index e056c90a55020..5449eadc6d37f 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -31,10 +31,7 @@ stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = gitUpdater { - inherit pname version; - attrPath = "xfce.thunar-dropbox-plugin"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://github.com/Jeinzi/thunar-dropbox"; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 96b677b27b5b2..b91c5025db3bc 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -79,7 +79,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; passthru.updateScript = gitUpdater { - inherit pname version; ignoredVersions = ".ubuntu.*"; }; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index d0e1399b6aa63..d95a00b6ee6b4 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = gitUpdater { - inherit pname version; # No nicer place to find latest release. url = "https://git.code.sf.net/p/gnu-efi/code"; }; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index ed979c02c868d..803ab5e96dc5d 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0092a8fdc6c7e..5d5e90770f45b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -122,7 +122,6 @@ stdenv.mkDerivation rec { libinput-module = nixosTests.libinput; }; updateScript = gitUpdater { - inherit pname version; patchlevel-unstable = true; }; }; diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index 45c535d81bf32..040bc4758076b 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { ]; passthru.updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index d3bcaa2658bad..b602573706c47 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index b050c8d0caf37..9b312a2d5ef1d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -80,8 +80,6 @@ mkDerivation rec { }; passthru.updateScript = gitUpdater { - inherit pname version; - attrPath = "libsForQt5.mlt"; rev-prefix = "v"; }; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 94fe4878f06c6..94de6c20210bd 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -58,8 +58,6 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; - attrPath = "libsForQt5.${pname}"; rev-prefix = "V"; }; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index a3b093c382759..16989c13b8258 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -79,7 +79,6 @@ stdenv.mkDerivation rec { doInstallCheck = !stdenv.hostPlatform.isMusl; passthru.updateScript = gitUpdater { - inherit pname version; url = "https://sourceware.org/git/elfutils.git"; rev-prefix = "elfutils-"; }; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 63a24bac8354c..664bd9892d2a4 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-mpers=check" ]; passthru.updateScript = gitUpdater { - inherit pname version; # No nicer place to find latest release. url = "https://github.com/strace/strace.git"; rev-prefix = "v"; diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix index 473a25e090203..f36205bec9c93 100644 --- a/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/pkgs/development/tools/rust/cargo-rr/default.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec { passthru = { updateScript = gitUpdater { - inherit pname version; rev-prefix = "v"; }; }; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 09c3ac16071e3..87c5c91ecea0f 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = gitUpdater { - inherit pname version; # No nicer place to find latest release. url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git"; rev-prefix = "v"; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 8023350463424..669a145358e90 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -58,7 +58,6 @@ in stdenv.mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; # No nicer place to find latest release. url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"; rev-prefix = "v"; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 234771054aed6..3b248b60efeee 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ (python3.withPackages (p: with p; [ pyelftools ])) ]; passthru.updateScript = gitUpdater { - inherit pname version; url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; rev-prefix = "v"; }; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index e83e3e92b701a..830e505adccfd 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -56,9 +56,7 @@ stdenv.mkDerivation rec { passthru.tests.btrbk = nixosTests.btrbk; passthru.updateScript = genericUpdater { - inherit pname version; versionLister = writeShellScript "btrbk-versionLister" '' - echo "# Versions for $1:" >> "$2" ${curl}/bin/curl -s https://digint.ch/download/btrbk/releases/ | ${perl}/bin/perl -lne 'print $1 if /btrbk-([0-9.]*)\.tar/' ''; }; diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix index cbaf67aa8cc2c..fe45720ee814e 100644 --- a/pkgs/tools/backup/stenc/default.nix +++ b/pkgs/tools/backup/stenc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - passthru.updateScript = gitUpdater { inherit pname version; }; + passthru.updateScript = gitUpdater { }; meta = { description = "SCSI Tape Encryption Manager"; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 608c318b10a63..00ee1a7640d53 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { }; passthru.updateScript = gitUpdater { - inherit pname version; # No nicer place to find latest release. url = "https://github.com/kdave/btrfs-progs.git"; rev-prefix = "v"; diff --git a/pkgs/tools/misc/nncp/default.nix b/pkgs/tools/misc/nncp/default.nix index 005dead66269c..037abfb84ea55 100644 --- a/pkgs/tools/misc/nncp/default.nix +++ b/pkgs/tools/misc/nncp/default.nix @@ -30,9 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = genericUpdater { - inherit pname version; versionLister = writeShellScript "nncp-versionLister" '' - echo "# Versions for $1:" >> "$2" ${curl}/bin/curl -s ${meta.downloadPage} | ${perl}/bin/perl -lne 'print $1 if /Release.*>([0-9.]+)</' ''; }; diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index 9761fd73f4f37..012ab2fc6cb73 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -28,8 +28,6 @@ python3Packages.buildPythonApplication rec { ''; passthru.updateScript = gitUpdater { - inherit version; - pname = "unicode-paracode"; rev-prefix = "v"; }; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 1447569020c9e..ce066ed7c07a9 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -22,7 +22,6 @@ mkDerivation rec { ''; passthru.updateScript = gitUpdater { - inherit pname version; rev-prefix = "${pname}-"; }; |