diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-10-06 20:58:48 -0400 |
---|---|---|
committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-10-19 20:42:59 -0400 |
commit | 74134f7eeef4108b718fc929bb05985c1cc1f982 (patch) | |
tree | 90e3e4b933e227e1501715824bdfff26c0fee235 | |
parent | 2837f21ee941c86f49b298452a7e009e721c8eed (diff) |
angelfish: Provide as Plasma Mobile Gear
-rw-r--r-- | pkgs/applications/plasma-mobile/angelfish.nix (renamed from pkgs/applications/networking/browsers/angelfish/default.nix) | 11 | ||||
-rw-r--r-- | pkgs/applications/plasma-mobile/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/angelfish/default.nix b/pkgs/applications/plasma-mobile/angelfish.nix index dedc51469670a..29d511d85f8ba 100644 --- a/pkgs/applications/networking/browsers/angelfish/default.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -16,20 +16,15 @@ , qtquickcontrols2 , qtwebengine , rustPlatform +, srcs }: mkDerivation rec { pname = "angelfish"; - version = "21.08"; - - src = fetchurl { - url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz"; - sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh"; - }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + src = srcs.angelfish.src; + name = "${pname}-${srcs.angelfish.version}"; sha256 = "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak"; }; diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 643727834f992..fd9ae2a2bae84 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -62,6 +62,7 @@ let }; in { alligator = callPackage ./alligator.nix {}; + angelfish = callPackage ./angelfish.nix { inherit srcs; }; audiotube = callPackage ./audiotube.nix {}; calindori = callPackage ./calindori.nix {}; kalk = callPackage ./kalk.nix {}; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b7938faada577..ada242aab1f88 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -53,6 +53,7 @@ mapAliases ({ aminal = throw "aminal was renamed to darktile."; # added 2021-09-28 ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 + angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 arduino_core = arduino-core; # added 2015-02-04 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ed831d797be8..7bf7a500bbfe3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23437,8 +23437,6 @@ with pkgs; }); android-studio = androidStudioPackages.stable; - angelfish = libsForQt5.callPackage ../applications/networking/browsers/angelfish { }; - animbar = callPackage ../applications/graphics/animbar { }; antfs-cli = callPackage ../applications/misc/antfs-cli {}; |