diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 24941676a336..3dd50d38df55 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -135,6 +135,8 @@ - `vimacs` has been removed, as it has not been maintained in 10 years and was built for an old version of vim (6.0). +- The deprecated `appimageTools.extractType1`, `appimageTools.extractType2`, and `appimageTools.wrapType1` aliases now emit warnings. Use `appimageTools.extract` and `appimageTools.wrapType2` instead. + ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 08a2a91e9ad8..eb08cecb39fb 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -16,7 +16,7 @@ let hash = "sha256-yuoNGAV6JuPfm5GagzD4R2ojBRpKo9aZ8K92jC63MQE="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index f32b9ca5592e..27c63ff0262d 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -55,9 +55,9 @@ rec { ''; # for compatibility, deprecated - extractType1 = extract; - extractType2 = extract; - wrapType1 = wrapType2; + extractType1 = lib.warn "'appimageTools.extractType1' is deprecated, use 'appimageTools.extract' instead" extract; + extractType2 = lib.warn "'appimageTools.extractType2' is deprecated, use 'appimageTools.extract' instead" extract; + wrapType1 = lib.warn "'appimageTools.wrapType1' is deprecated, use 'appimageTools.wrapType2' instead" wrapType2; wrapAppImage = lib.extendMkDerivation { constructDrv = buildFHSEnv; diff --git a/pkgs/by-name/al/altus/package.nix b/pkgs/by-name/al/altus/package.nix index c8e89b4e075f..9736ca9dbba7 100644 --- a/pkgs/by-name/al/altus/package.nix +++ b/pkgs/by-name/al/altus/package.nix @@ -15,7 +15,7 @@ let hash = "sha256-FSyXs9thTQ5T5bvCfg/+QXBZMIOyoijAw0dUsvLRGH8="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix index 84636d1c40e0..b476f323a8c6 100644 --- a/pkgs/by-name/ar/archipelago/package.nix +++ b/pkgs/by-name/ar/archipelago/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { zenity ]; - appimageContents = appimageTools.extractType2 { inherit (finalAttrs) pname version src; }; + appimageContents = appimageTools.extract { inherit (finalAttrs) pname version src; }; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix index eedb324cdc63..111db6b4257f 100644 --- a/pkgs/by-name/ar/arduino-ide/package.nix +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-m4RYtjJMZ01M1qwKc70Gkey9QLQ4Gk59rwpunm4TY2g="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/aw/awakened-poe-trade/package.nix b/pkgs/by-name/aw/awakened-poe-trade/package.nix index 2ca5552d233c..be2cfcb77e0e 100644 --- a/pkgs/by-name/aw/awakened-poe-trade/package.nix +++ b/pkgs/by-name/aw/awakened-poe-trade/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { }; passthru = { - appImageContents = appimageTools.extractType2 { + appImageContents = appimageTools.extract { inherit (finalAttrs) pname src version; }; diff --git a/pkgs/by-name/ba/badlion-client/package.nix b/pkgs/by-name/ba/badlion-client/package.nix index c309ec2983a3..1a7bd7cbd3cd 100644 --- a/pkgs/by-name/ba/badlion-client/package.nix +++ b/pkgs/by-name/ba/badlion-client/package.nix @@ -9,7 +9,7 @@ appimageTools.wrapAppImage rec { pname = "badlion-client"; version = "4.5.4"; - src = appimageTools.extractType2 { + src = appimageTools.extract { inherit pname version; src = fetchurl { name = "badlion-client-linux"; diff --git a/pkgs/by-name/bl/bloomrpc/package.nix b/pkgs/by-name/bl/bloomrpc/package.nix index 40b35cd31902..6b05050caa79 100644 --- a/pkgs/by-name/bl/bloomrpc/package.nix +++ b/pkgs/by-name/bl/bloomrpc/package.nix @@ -14,7 +14,7 @@ let hash = "sha512-PebdYDpcplPN5y3mRu1mG6CXenYfYvBXNLgIGEr7ZgKnR5pIaOfJNORSNYSdagdGDb/B1sxuKfX4+4f2cqgb6Q=="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname src version; }; in diff --git a/pkgs/by-name/bo/bootstrap-studio/package.nix b/pkgs/by-name/bo/bootstrap-studio/package.nix index 2393ea7d82f1..4a2c1ad7f8c9 100644 --- a/pkgs/by-name/bo/bootstrap-studio/package.nix +++ b/pkgs/by-name/bo/bootstrap-studio/package.nix @@ -11,7 +11,7 @@ let url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage"; sha256 = "sha256-tn5MkRSS2SLqVU5SQOH0WYN15wll7nREFA9rkXTPAtQ="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/bu/buckets/package.nix b/pkgs/by-name/bu/buckets/package.nix index c8e84075de3d..82926973f5dc 100644 --- a/pkgs/by-name/bu/buckets/package.nix +++ b/pkgs/by-name/bu/buckets/package.nix @@ -32,7 +32,7 @@ let url = "https://github.com/buckets/application/releases/download/v${version}/Buckets-linux-latest-${platform}-${version}.AppImage"; inherit hash; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/bu/buttercup-desktop/package.nix b/pkgs/by-name/bu/buttercup-desktop/package.nix index 24197d672939..2b172cb54e14 100644 --- a/pkgs/by-name/bu/buttercup-desktop/package.nix +++ b/pkgs/by-name/bu/buttercup-desktop/package.nix @@ -11,7 +11,7 @@ let url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; sha256 = "sha256-iCuvs+FisYPvCmPVg1dhYMX+Lw3WmrMSRytdy6TLrxg="; }; - appimageContents = appimageTools.extractType2 { inherit pname src version; }; + appimageContents = appimageTools.extract { inherit pname src version; }; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/ca/caido-desktop/package.nix b/pkgs/by-name/ca/caido-desktop/package.nix index cedb8a7c3e42..e4b60fd49ea4 100644 --- a/pkgs/by-name/ca/caido-desktop/package.nix +++ b/pkgs/by-name/ca/caido-desktop/package.nix @@ -50,7 +50,7 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; linux = appimageTools.wrapType2 { inherit diff --git a/pkgs/by-name/ca/capacities/package.nix b/pkgs/by-name/ca/capacities/package.nix index 31640eae43bb..5825a237c048 100644 --- a/pkgs/by-name/ca/capacities/package.nix +++ b/pkgs/by-name/ca/capacities/package.nix @@ -14,7 +14,7 @@ let hash = "sha256-ATiX1h9hXmKMFtY6OEyZEoJ/SxJGgbj5/QZwFF1sfFQ="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname src diff --git a/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix b/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix index bb04e0b7cc69..a3e617153b4e 100644 --- a/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix +++ b/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix @@ -14,7 +14,7 @@ let name = "Caprine-${version}.AppImage"; inherit sha256; }; - extracted = appimageTools.extractType2 { inherit pname version src; }; + extracted = appimageTools.extract { inherit pname version src; }; in (appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/cl/clash-nyanpasu/package.nix b/pkgs/by-name/cl/clash-nyanpasu/package.nix index ec1d9bd16df9..4b460677d4b5 100644 --- a/pkgs/by-name/cl/clash-nyanpasu/package.nix +++ b/pkgs/by-name/cl/clash-nyanpasu/package.nix @@ -15,7 +15,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = let - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in '' install -Dm444 ${appimageContents}/clash-nyanpasu.desktop -t $out/share/applications diff --git a/pkgs/by-name/cl/clickup/package.nix b/pkgs/by-name/cl/clickup/package.nix index 6f77e0149a61..3a75c398e7ba 100644 --- a/pkgs/by-name/cl/clickup/package.nix +++ b/pkgs/by-name/cl/clickup/package.nix @@ -23,7 +23,7 @@ let extraPkgs = pkgs: [ pkgs.libxkbfile ]; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in stdenvNoCC.mkDerivation { inherit pname version; diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index 2093d0afc901..e41c7702ad85 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-rD0yXZAEUcPtxWlWuZD77gjw6JlcUvBsaDYGj+NgLss="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/cr/crypto-org-wallet/package.nix b/pkgs/by-name/cr/crypto-org-wallet/package.nix index 1456085acbd6..8587acdf9f06 100644 --- a/pkgs/by-name/cr/crypto-org-wallet/package.nix +++ b/pkgs/by-name/cr/crypto-org-wallet/package.nix @@ -9,7 +9,7 @@ appimageTools.wrapAppImage rec { pname = "chain-desktop-wallet"; version = "1.5.1"; - src = appimageTools.extractType2 { + src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/crypto-com/chain-desktop-wallet/releases/download/v${version}/Crypto.com-DeFi-Desktop-Wallet-${version}.AppImage"; diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix index 7747ac41388f..ff76914a8f86 100644 --- a/pkgs/by-name/de/deskreen/package.nix +++ b/pkgs/by-name/de/deskreen/package.nix @@ -28,7 +28,7 @@ appimageTools.wrapType2 rec { }; extraInstallCommands = let - contents = appimageTools.extractType2 { inherit pname version src; }; + contents = appimageTools.extract { inherit pname version src; }; in '' install -m 444 -D ${contents}/deskreen-ce.desktop $out/share/applications/deskreen-ce.desktop diff --git a/pkgs/by-name/ev/everdo/package.nix b/pkgs/by-name/ev/everdo/package.nix index b4f74e40f83b..002306b5f3da 100644 --- a/pkgs/by-name/ev/everdo/package.nix +++ b/pkgs/by-name/ev/everdo/package.nix @@ -12,7 +12,7 @@ let hash = "sha256-67b0gSoVcCIfkFRUL3afgB6eYj5YEuvDTtQgTIwV9S0="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/fi/firefly-desktop/package.nix b/pkgs/by-name/fi/firefly-desktop/package.nix index ccc35bad670d..0509587fa163 100644 --- a/pkgs/by-name/fi/firefly-desktop/package.nix +++ b/pkgs/by-name/fi/firefly-desktop/package.nix @@ -11,7 +11,7 @@ let url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/firefly-desktop-${version}.AppImage"; sha256 = "sha256-MATMl5eEIauDQpz8/wqIzD7IugPVZ2HJAWCbDM4n+hA="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/fl/fluent-reader/package.nix b/pkgs/by-name/fl/fluent-reader/package.nix index 4da9aa2f4341..cffb561dfae4 100644 --- a/pkgs/by-name/fl/fluent-reader/package.nix +++ b/pkgs/by-name/fl/fluent-reader/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-AJxE1X6X/KJg/6xWZQJyvgHj9TabFBk2TQdotDs4iWQ="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/fr/framesh/package.nix b/pkgs/by-name/fr/framesh/package.nix index a9fe230b7bb8..11517d16a34f 100644 --- a/pkgs/by-name/fr/framesh/package.nix +++ b/pkgs/by-name/fr/framesh/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-t60jsA4ojXF805OUrqIOdk8eP9PlwA/g0XxEBCahmb4="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/fr/freelens-bin/linux.nix b/pkgs/by-name/fr/freelens-bin/linux.nix index 758134cbef62..bb7ee0e6cfdd 100644 --- a/pkgs/by-name/fr/freelens-bin/linux.nix +++ b/pkgs/by-name/fr/freelens-bin/linux.nix @@ -8,7 +8,7 @@ makeWrapper, }: let - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/ft/ftb-app/package.nix b/pkgs/by-name/ft/ftb-app/package.nix index f64787188cb4..2adb9fbc147a 100644 --- a/pkgs/by-name/ft/ftb-app/package.nix +++ b/pkgs/by-name/ft/ftb-app/package.nix @@ -39,7 +39,7 @@ let }; in let - appimageContents = appimageTools.extractType2 { inherit pname src version; }; + appimageContents = appimageTools.extract { inherit pname src version; }; in appimageTools.wrapType2 { inherit diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index 8e795dc3e82c..a06ad7874749 100644 --- a/pkgs/by-name/gd/gdevelop/linux.nix +++ b/pkgs/by-name/gd/gdevelop/linux.nix @@ -17,7 +17,7 @@ let } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; postExtract = '' substituteInPlace $out/gdevelop.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=gdevelop' diff --git a/pkgs/by-name/gs/gsender/package.nix b/pkgs/by-name/gs/gsender/package.nix index 2a436d5b9af7..d78939d9616f 100644 --- a/pkgs/by-name/gs/gsender/package.nix +++ b/pkgs/by-name/gs/gsender/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-xWsRSzJm5aA13qCBI2MRzauvPqoOBtxqtGb3gLAa3sI="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 rec { diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix index b857c4f8d5b3..8219a4e1d25c 100644 --- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix +++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix @@ -11,7 +11,7 @@ let url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; hash = "sha256-91Wa50dJAW6Re1MBperHFoftAPagihUP4fv5cMb+pxI="; }; - extractedFiles = appimageTools.extractType2 { inherit pname version src; }; + extractedFiles = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix index 72065ce77776..b6fb6ba4cf67 100644 --- a/pkgs/by-name/he/heynote/package.nix +++ b/pkgs/by-name/he/heynote/package.nix @@ -14,7 +14,7 @@ let sha256 = "sha256-37as29Jh5Xz3nEW5aryD52puqaCiAxlMBs+aRIZbbU8="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit version pname src; }; diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index 603fb82a1110..1f07591def2c 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -14,7 +14,7 @@ let inherit hash; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index ddbfdba315b7..05ddeffc30c5 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -82,7 +82,7 @@ else extraInstallCommands = let - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in '' # Install .desktop files diff --git a/pkgs/by-name/ht/httpie-desktop/package.nix b/pkgs/by-name/ht/httpie-desktop/package.nix index cbc8f16e72bc..7cd383b1fba5 100644 --- a/pkgs/by-name/ht/httpie-desktop/package.nix +++ b/pkgs/by-name/ht/httpie-desktop/package.nix @@ -22,7 +22,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = let - contents = appimageTools.extractType2 { inherit pname version src; }; + contents = appimageTools.extract { inherit pname version src; }; in '' install -Dm644 ${contents}/httpie.desktop $out/share/applications/httpie.desktop diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index f8aee94087e8..f534a4eb999a 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -12,7 +12,7 @@ let hash = "sha256-LQ2z8yUUhKLs98YvHHLnhqqtcJFGIvEQ19kB5l0Ti9E="; }; - appimageContents = appimageTools.extractType2 { inherit pname src version; }; + appimageContents = appimageTools.extract { inherit pname src version; }; in appimageTools.wrapType2 { inherit pname src version; diff --git a/pkgs/by-name/ir/irccloud/package.nix b/pkgs/by-name/ir/irccloud/package.nix index 46b52eabb89d..515728692942 100644 --- a/pkgs/by-name/ir/irccloud/package.nix +++ b/pkgs/by-name/ir/irccloud/package.nix @@ -13,7 +13,7 @@ let sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index f0ea40c96961..6edddcef66ee 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -24,7 +24,7 @@ let hash = "sha256-NNTIq02kisIjINS2TCh0Rb2UyRMSlJLR2+uzZmWxSVo="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version; src = linux-src; }; diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix index 6a86bd446dd7..8b1bcddb5dc5 100644 --- a/pkgs/by-name/jb/jbrowse/package.nix +++ b/pkgs/by-name/jb/jbrowse/package.nix @@ -13,7 +13,7 @@ let sha256 = "sha256-aCmNpZX8TBZm7nbS13GBUG4a/X4kvwWRHvwWWykoLwU="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/je/jet-pilot/package.nix b/pkgs/by-name/je/jet-pilot/package.nix index fd467b654bf5..96dce6edbfab 100644 --- a/pkgs/by-name/je/jet-pilot/package.nix +++ b/pkgs/by-name/je/jet-pilot/package.nix @@ -13,7 +13,7 @@ appimageTools.wrapType2 rec { hash = "sha256-W1VRV29ZV8nD3wAcSNAsWguN8s+zio0lsVaZwAnCOwE="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; meta = { description = "Open-source Kubernetes desktop client that focuses on less clutter, speed and good looks"; diff --git a/pkgs/by-name/kc/kchat/package.nix b/pkgs/by-name/kc/kchat/package.nix index e081c502dfdf..1b47a67ec612 100644 --- a/pkgs/by-name/kc/kchat/package.nix +++ b/pkgs/by-name/kc/kchat/package.nix @@ -16,7 +16,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = let - contents = appimageTools.extractType2 { inherit pname version src; }; + contents = appimageTools.extract { inherit pname version src; }; in '' mkdir -p "$out/share/applications" diff --git a/pkgs/by-name/ki/kirimoto/package.nix b/pkgs/by-name/ki/kirimoto/package.nix index 0e0252bccc61..837d490f0a19 100644 --- a/pkgs/by-name/ki/kirimoto/package.nix +++ b/pkgs/by-name/ki/kirimoto/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-kf0dy/VelirxBHq0e593c/PM0hurvJqOh1VkDndzNFA="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 rec { diff --git a/pkgs/by-name/km/kmeet/package.nix b/pkgs/by-name/km/kmeet/package.nix index f1c2246105ba..f3c1575ba5a1 100644 --- a/pkgs/by-name/km/kmeet/package.nix +++ b/pkgs/by-name/km/kmeet/package.nix @@ -16,7 +16,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = let - contents = appimageTools.extractType2 { inherit pname version src; }; + contents = appimageTools.extract { inherit pname version src; }; in '' mkdir -p "$out/share/applications" diff --git a/pkgs/by-name/kr/krunker/linux.nix b/pkgs/by-name/kr/krunker/linux.nix index 53ba2687952f..d2a0f7faa570 100644 --- a/pkgs/by-name/kr/krunker/linux.nix +++ b/pkgs/by-name/kr/krunker/linux.nix @@ -11,7 +11,7 @@ let hash = "sha512-a8E5heLsKXOtv/wRKlrnV0GD48cY1mOiSSDW93c7YZ+HoeuBQDxtRaHKg5EqU51Yi+d4tPF5nOh10jZW36c7WQ=="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 0ea559d58ac9..eee00dfc749c 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -15,7 +15,7 @@ let hash = "sha256-XjJBywTscKNNVLTvcVfJPNfKPBBcKoeeSSmDSqz8ePk="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/le/lens/linux.nix b/pkgs/by-name/le/lens/linux.nix index 81ed42f60958..63f7b56011b7 100644 --- a/pkgs/by-name/le/lens/linux.nix +++ b/pkgs/by-name/le/lens/linux.nix @@ -8,7 +8,7 @@ makeWrapper, }: let - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/li/listen1/package.nix b/pkgs/by-name/li/listen1/package.nix index 8205313a331c..29998b51e474 100644 --- a/pkgs/by-name/li/listen1/package.nix +++ b/pkgs/by-name/li/listen1/package.nix @@ -11,7 +11,7 @@ let url = "https://github.com/listen1/listen1_desktop/releases/download/v${version}/listen1_${version}_linux_x86_64.AppImage"; hash = "sha256-RMpusz9bNrHpN23HrncjteiIGkLJgsP7FS2t7zD1Ud0="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/lm/lmath/package.nix b/pkgs/by-name/lm/lmath/package.nix index 76c9c95bba70..202fe4e2fd9e 100644 --- a/pkgs/by-name/lm/lmath/package.nix +++ b/pkgs/by-name/lm/lmath/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-JOV+g7izjctCkHl5q/9T2PSUZzPzVPisHppbPofVYy0="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index 3ee92f83149c..c168a53eef20 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -14,7 +14,7 @@ let src = fetchurl { inherit url hash; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit diff --git a/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix index faf62ceeb2bb..fc655da03cd6 100644 --- a/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix @@ -14,7 +14,7 @@ let inherit hash; }; - extracted = appimageTools.extractType2 { + extracted = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/mo/mobilecoin-wallet/package.nix b/pkgs/by-name/mo/mobilecoin-wallet/package.nix index 59cfed619faa..b6e5f17f9a6e 100644 --- a/pkgs/by-name/mo/mobilecoin-wallet/package.nix +++ b/pkgs/by-name/mo/mobilecoin-wallet/package.nix @@ -11,7 +11,7 @@ let url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; hash = "sha256-JfG+eHsPFXZKi9Vjbw7CPvhmeMvfPWSDS65Ey4Lb8iQ="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index c513e7211733..ad637755bee2 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -22,7 +22,7 @@ let hash = "sha256-QYBh9ZvmJse3ZimvpU+9ky6ml0pCSZ3mVrYtWtMQGA0="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; extraPkgs = pkgs: [ libxshmfence ]; diff --git a/pkgs/by-name/mo/mockoon/package.nix b/pkgs/by-name/mo/mockoon/package.nix index ea3155a85606..13df4f0911de 100644 --- a/pkgs/by-name/mo/mockoon/package.nix +++ b/pkgs/by-name/mo/mockoon/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-Y6DmoWGvNp0cvRYgDDMHul5K6CzhiWxMxVTR+W9PE5E="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/mo/molotov/package.nix b/pkgs/by-name/mo/molotov/package.nix index 39453f9aa5ec..ddba3d4bc28a 100644 --- a/pkgs/by-name/mo/molotov/package.nix +++ b/pkgs/by-name/mo/molotov/package.nix @@ -11,7 +11,7 @@ let url = "https://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage"; sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/mo/motrix/package.nix b/pkgs/by-name/mo/motrix/package.nix index bb197a6f2fe4..ca84e4b7aad2 100644 --- a/pkgs/by-name/mo/motrix/package.nix +++ b/pkgs/by-name/mo/motrix/package.nix @@ -12,7 +12,7 @@ let hash = "sha256-oSO+VH3bZcjnXjECqZgOmsvlOONbfgOq50qVLvHdKfo="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index 8e6caa95094f..0b8a3bb503c0 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -28,7 +28,7 @@ let sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/mu/muffon/package.nix b/pkgs/by-name/mu/muffon/package.nix index 8cb1e4ad2523..f924e969c568 100644 --- a/pkgs/by-name/mu/muffon/package.nix +++ b/pkgs/by-name/mu/muffon/package.nix @@ -12,7 +12,7 @@ let url = "https://github.com/staniel359/muffon/releases/download/v${version}/muffon-${version}-linux-x86_64.AppImage"; hash = "sha256-C9oaRXS4w89i4tq/hWh5n5uHUETzaoEid49OII/+5dg="; }; - appimageContents = appimageTools.extractType2 { inherit pname src version; }; + appimageContents = appimageTools.extract { inherit pname src version; }; in appimageTools.wrapType2 { inherit pname src version; diff --git a/pkgs/by-name/my/mycrypto/package.nix b/pkgs/by-name/my/mycrypto/package.nix index 670ddfe2e0ad..9856fbd7348e 100644 --- a/pkgs/by-name/my/mycrypto/package.nix +++ b/pkgs/by-name/my/mycrypto/package.nix @@ -15,7 +15,7 @@ let inherit sha256; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix index 29da868bf46a..d68dcc807510 100644 --- a/pkgs/by-name/na/navicat-premium/package.nix +++ b/pkgs/by-name/na/navicat-premium/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "navicat-premium"; version = "17.3.7"; - src = appimageTools.extractType2 { + src = appimageTools.extract { inherit (finalAttrs) pname version; src = { diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix index a963443c55a6..e2d8c99953bc 100644 --- a/pkgs/by-name/no/notesnook/package.nix +++ b/pkgs/by-name/no/notesnook/package.nix @@ -37,7 +37,7 @@ let updateScript = ./update.sh; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/nr/nrfconnect-bluetooth-low-energy/package.nix b/pkgs/by-name/nr/nrfconnect-bluetooth-low-energy/package.nix index 569ae3efe518..00a4c05acedc 100644 --- a/pkgs/by-name/nr/nrfconnect-bluetooth-low-energy/package.nix +++ b/pkgs/by-name/nr/nrfconnect-bluetooth-low-energy/package.nix @@ -16,7 +16,7 @@ let name = "${pname}-${version}.AppImage"; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/nr/nrfconnect/package.nix b/pkgs/by-name/nr/nrfconnect/package.nix index 3cab06663ea4..4fd9be6b7e0d 100644 --- a/pkgs/by-name/nr/nrfconnect/package.nix +++ b/pkgs/by-name/nr/nrfconnect/package.nix @@ -16,7 +16,7 @@ let name = "${pname}-${version}.AppImage"; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/p3/p3x-onenote/package.nix b/pkgs/by-name/p3/p3x-onenote/package.nix index 5e97421da8c4..2538937abb6d 100644 --- a/pkgs/by-name/p3/p3x-onenote/package.nix +++ b/pkgs/by-name/p3/p3x-onenote/package.nix @@ -26,7 +26,7 @@ let inherit hash; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 8bccfa2d2a70..a408cb652bb5 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { inherit pname version; - src = appimageTools.extractType2 { + src = appimageTools.extract { inherit pname version; src = "${src}/pCloud.AppImage"; diff --git a/pkgs/by-name/pi/pinokio/package.nix b/pkgs/by-name/pi/pinokio/package.nix index 37925159de60..2211ff7baf1c 100644 --- a/pkgs/by-name/pi/pinokio/package.nix +++ b/pkgs/by-name/pi/pinokio/package.nix @@ -18,7 +18,7 @@ let } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; meta = { homepage = "https://pinokio.computer"; diff --git a/pkgs/by-name/pl/plexamp/package.nix b/pkgs/by-name/pl/plexamp/package.nix index 69ee9e7b457c..48884cef6183 100644 --- a/pkgs/by-name/pl/plexamp/package.nix +++ b/pkgs/by-name/pl/plexamp/package.nix @@ -15,7 +15,7 @@ let hash = "sha512-Ww/QfMgmeghthfuGfc4Plv7vUKLikLf4R+SImG6TuYg0pDJ5psuHtXQezV0BurVRm6eQ+Ori+YGK2A52tCkcfw=="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/pu/pureref/package.nix b/pkgs/by-name/pu/pureref/package.nix index ac59cb8a306f..df1ef4af442f 100644 --- a/pkgs/by-name/pu/pureref/package.nix +++ b/pkgs/by-name/pu/pureref/package.nix @@ -29,7 +29,7 @@ let chmod 755 $out ''; in -appimageTools.wrapType1 { +appimageTools.wrapType2 { pname = "pureref"; inherit version; diff --git a/pkgs/by-name/qu/quba/package.nix b/pkgs/by-name/qu/quba/package.nix index 0b3cf029a91b..1599c1eb767f 100644 --- a/pkgs/by-name/qu/quba/package.nix +++ b/pkgs/by-name/qu/quba/package.nix @@ -34,7 +34,7 @@ let hash = "sha256-xB1r8DNFOFQQx+MeGC1mWhf7PuMavM7DyYRBlEjAZ8k="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; linux = appimageTools.wrapType2 { inherit diff --git a/pkgs/by-name/ra/raven-reader/package.nix b/pkgs/by-name/ra/raven-reader/package.nix index f8eea38f80f4..2190e780a2c0 100644 --- a/pkgs/by-name/ra/raven-reader/package.nix +++ b/pkgs/by-name/ra/raven-reader/package.nix @@ -11,7 +11,7 @@ let url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; sha256 = "sha256-RkpUWM1hAH73ePpQPj2C3SOukLpcPXbaXmb1VbcHaSU="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix index b78cc8ef5c1e..6e15520095d6 100644 --- a/pkgs/by-name/re/redact/package.nix +++ b/pkgs/by-name/re/redact/package.nix @@ -12,7 +12,7 @@ let url = "https://update-desktop.redact.dev/build/Redact-${version}.AppImage"; hash = "sha256-NnOQIVv/Y4C+qR5TsXh7rQq/WOYd7Vdtfru4x78djZA="; }; - appimageContents = appimageTools.extractType2 { inherit pname src version; }; + appimageContents = appimageTools.extract { inherit pname src version; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/re/requestly/package.nix b/pkgs/by-name/re/requestly/package.nix index 54e2893ed819..965398f5ad0e 100644 --- a/pkgs/by-name/re/requestly/package.nix +++ b/pkgs/by-name/re/requestly/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-aUhgn6QeCHcs3yi1KKzw+yOUucbTOeNqObTYZTkKqrs="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/re/revolt-desktop/package.nix b/pkgs/by-name/re/revolt-desktop/package.nix index 44bd4a551480..724ad9cec9cf 100644 --- a/pkgs/by-name/re/revolt-desktop/package.nix +++ b/pkgs/by-name/re/revolt-desktop/package.nix @@ -52,7 +52,7 @@ .${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - appimageContents = appimageTools.extractType2 { inherit (final) src pname version; }; + appimageContents = appimageTools.extract { inherit (final) src pname version; }; dontUnpack = true; diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix index 53f2ba21e419..6cb27e9292fb 100644 --- a/pkgs/by-name/sa/saleae-logic-2/package.nix +++ b/pkgs/by-name/sa/saleae-logic-2/package.nix @@ -26,7 +26,7 @@ appimageTools.wrapType2 { extraInstallCommands = let - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in '' mkdir -p $out/etc/udev/rules.d diff --git a/pkgs/by-name/so/sonixd/package.nix b/pkgs/by-name/so/sonixd/package.nix index 839bea79ef46..fb8927682302 100644 --- a/pkgs/by-name/so/sonixd/package.nix +++ b/pkgs/by-name/so/sonixd/package.nix @@ -11,7 +11,7 @@ let url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; sha256 = "sha256-j8B+o/CJ5SsZPMNbugyP3T9Kb+xuxlVxH02loxlwwDg="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 rec { inherit pname version src; diff --git a/pkgs/by-name/ss/ssb-patchwork/package.nix b/pkgs/by-name/ss/ssb-patchwork/package.nix index 64c456fc7ecd..1dfad79849b1 100644 --- a/pkgs/by-name/ss/ssb-patchwork/package.nix +++ b/pkgs/by-name/ss/ssb-patchwork/package.nix @@ -20,7 +20,7 @@ let inherit pname version src; }; # we only use this to extract the icon - appimage-contents = appimageTools.extractType2 { + appimage-contents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/su/sunsama/package.nix b/pkgs/by-name/su/sunsama/package.nix index 838d16cd2857..5914c153ad17 100644 --- a/pkgs/by-name/su/sunsama/package.nix +++ b/pkgs/by-name/su/sunsama/package.nix @@ -11,7 +11,7 @@ let url = "https://download.todesktop.com/2003096gmmnl0g1/sunsama-${version}-build-260521zej1bgvs1-x86_64.AppImage"; hash = "sha512-Stb0Mcap4KmRkj/s5jf1uZLm8sR5KNKGpZKXa2VtBIFxKofS1CxQJDWiJiPSNGsqtezLxmvsC4VSI45isYQSpQ=="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/ti/timeular/package.nix b/pkgs/by-name/ti/timeular/package.nix index 56030cabfc59..2bc65443d79f 100644 --- a/pkgs/by-name/ti/timeular/package.nix +++ b/pkgs/by-name/ti/timeular/package.nix @@ -13,7 +13,7 @@ let hash = "sha256-oXdalYfysZ4Jb46eHABSkiWThMuc2JGCmP/mk0vCjkE="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/up/upscayl/linux.nix b/pkgs/by-name/up/upscayl/linux.nix index 1833aa9b7f9b..49d84d38f4f2 100644 --- a/pkgs/by-name/up/upscayl/linux.nix +++ b/pkgs/by-name/up/upscayl/linux.nix @@ -9,7 +9,7 @@ }: let - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in diff --git a/pkgs/by-name/vi/via/package.nix b/pkgs/by-name/vi/via/package.nix index 2e47cda3afc1..764fbe02847a 100644 --- a/pkgs/by-name/vi/via/package.nix +++ b/pkgs/by-name/vi/via/package.nix @@ -12,7 +12,7 @@ let name = "via-${version}-linux.AppImage"; sha256 = "sha256-+uTvmrqHK7L5VA/lUHCZZeRYPUrcVA+vjG7venxuHhs="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/vi/vial/package.nix b/pkgs/by-name/vi/vial/package.nix index c33272e0c828..f7ab9065ce39 100644 --- a/pkgs/by-name/vi/vial/package.nix +++ b/pkgs/by-name/vi/vial/package.nix @@ -12,7 +12,7 @@ let hash = "sha256-sN8i/MOPhaLZ4iJNKz/MdpRIGTZVV/G5qD7o+ID8dAM="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; diff --git a/pkgs/by-name/wo/wowup-cf/package.nix b/pkgs/by-name/wo/wowup-cf/package.nix index 431db3d0f368..e469d1071f13 100644 --- a/pkgs/by-name/wo/wowup-cf/package.nix +++ b/pkgs/by-name/wo/wowup-cf/package.nix @@ -13,9 +13,9 @@ let hash = "sha256-596j+i2TTbzpGfdWwzzoQKpB6AD2rqT0hvF4nvbD32A="; }; - appimageContents = appimageTools.extractType1 { inherit pname version src; }; + appimageContents = appimageTools.extract { inherit pname version src; }; in -appimageTools.wrapType1 { +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' diff --git a/pkgs/by-name/ze/zettlr/package.nix b/pkgs/by-name/ze/zettlr/package.nix index 8cb8e8abb17e..5977f8b37574 100644 --- a/pkgs/by-name/ze/zettlr/package.nix +++ b/pkgs/by-name/ze/zettlr/package.nix @@ -15,7 +15,7 @@ let url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; hash = "sha256-l1jpZZ6vAlmTlu0m106waeVQaM1mZb5wC1Tcv2IS0Ec="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in