diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-12-04 17:44:17 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-12-04 17:44:17 -0600 |
| commit | 5b8deaceca7538f7f33c7e72464ec2590c14dc43 (patch) | |
| tree | 5cd2f63728218d2c41f04d77c9a9c9987bc26afa /pkgs/applications/graphics/krita | |
| parent | 360a5f0549cc556bed6bcf5c5ef8d2b603765c19 (diff) | |
| parent | 00bff935cb14b56a6c268ba149ef16a9f2d8015e (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Fixed conflict in pkgs/applications/graphics/krita/ krita: 5.1.5 -> 5.2.0 7a40fdc288e69ba94947c1c4ec29c0f24e461eef , and treewide: use kde mirror everywhere, don't use pname in download urls aa15f5066d695de4c4027bd8bdcf4cedcf58d058
Diffstat (limited to 'pkgs/applications/graphics/krita')
| -rw-r--r-- | pkgs/applications/graphics/krita/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/graphics/krita/generic.nix | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index ff6d8384195a7..c8d1fea0b78cc 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }: -callPackage ./generic.nix (args // { +callPackage ./generic.nix { version = "5.2.0"; kde-channel = "stable"; hash = "sha256-02oZc4pZw2dQucx1IuPJslWQGjOqwGmgeDgnUIqKkpc="; -}) +} diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 195c96fe8ccf3..6846997a05df8 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -10,7 +10,6 @@ , version , kde-channel , hash -, callPackage }: mkDerivation rec { @@ -18,7 +17,7 @@ mkDerivation rec { inherit version; src = fetchurl { - url = "https://download.kde.org/${kde-channel}/${pname}/${version}/${pname}-${version}.tar.gz"; + url = "mirror://kde/${kde-channel}/krita/${version}/krita-${version}.tar.gz"; inherit hash; }; |