From c3b03050eb0894142532be35087c350fdc71fb3b Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 23 Dec 2021 17:10:49 +0200 Subject: [PATCH 1/2] krita: 4.4.8 -> 5.0.0 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 7e0a8915c408..e9393a2e5a87 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "4.4.8"; + version = "5.0.0"; kde-channel = "stable"; - sha256 = "1y0d8gnxfdg5nfwk8dgx8fc2bwskvnys049napb1a9fr25bqmimw"; + sha256 = "sha256-hNWDPbyrP9OkGPTDdnDYKtkZQw8MbQpXuZOQdHHuzFc="; }) From 2f2dc9dd620905b6f717cae38d744f37144d4a20 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 23 Dec 2021 19:43:37 +0200 Subject: [PATCH 2/2] krita-beta: alias to krita --- pkgs/applications/graphics/krita/beta.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 pkgs/applications/graphics/krita/beta.nix diff --git a/pkgs/applications/graphics/krita/beta.nix b/pkgs/applications/graphics/krita/beta.nix deleted file mode 100644 index 7733c1248fc2..000000000000 --- a/pkgs/applications/graphics/krita/beta.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "5.0.0-beta2"; - kde-channel = "unstable"; - sha256 = "0hwh6k40f4kmwg14dy0vvm0m8cx8n0q67lrrc620da9mign3hjs7"; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 672fdf21b025..dab34668b217 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -418,6 +418,7 @@ mapAliases ({ kerberos = libkrb5; # moved from top-level 2021-03-14 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10 kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23 + krita-beta = krita; # moved from top-level 2021-12-23 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; letsencrypt = certbot; # added 2016-05-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ce798e8a88f..52169b6bcb54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26516,7 +26516,6 @@ with pkgs; krane = callPackage ../applications/networking/cluster/krane { }; krita = libsForQt5.callPackage ../applications/graphics/krita { }; - krita-beta = libsForQt5.callPackage ../applications/graphics/krita/beta.nix { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { };