From da8b0f0621ed423d6103b4a5a304eea496999a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Aug 2024 04:54:11 -0700 Subject: [PATCH] fetchNextcloudApp: use fetchurl by default --- nixos/doc/manual/release-notes/rl-2411.section.md | 4 ++++ pkgs/build-support/fetchnextcloudapp/default.nix | 2 +- pkgs/servers/nextcloud/packages/default.nix | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4a4dba0fdafb..eb1675967901 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -175,6 +175,10 @@ and `nodePackages.vscode-json-languageserver-bin` were dropped due to an unmaintained upstream. The `vscode-langservers-extracted` package is a maintained drop-in replacement. +- `fetchNextcloudApp` has been rewritten to use `fetchurl` rather than + `fetchzip`. This invalidates all existing hashes but you can restore the old + behavior by passing it `unpack = true`. + - `haskell.lib.compose.justStaticExecutables` now disallows references to GHC in the output by default, to alert users to closure size issues caused by [#164630](https://github.com/NixOS/nixpkgs/issues/164630). See ["Packaging diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index 9d12919eaac3..2f5b7504c091 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -8,7 +8,7 @@ , patches ? [ ] , description ? null , homepage ? null -, unpack ? true # whether to use fetchzip rather than fetchurl +, unpack ? false # whether to use fetchzip rather than fetchurl }: applyPatches ({ inherit patches; diff --git a/pkgs/servers/nextcloud/packages/default.nix b/pkgs/servers/nextcloud/packages/default.nix index ad07dd4a20da..8af2e2f5833b 100644 --- a/pkgs/servers/nextcloud/packages/default.nix +++ b/pkgs/servers/nextcloud/packages/default.nix @@ -19,7 +19,6 @@ let packages = self: appName = pname; appVersion = data.version; license = appBaseDefs.${pname}; - unpack = false; inherit (data) url hash description homepage; }) {};