Robert Schütz 2 years ago committed by Robert Schütz
parent c0723eef37
commit 1e2983dab5
  1. 4
      pkgs/applications/plasma-mobile/angelfish.nix
  2. 19
      pkgs/applications/plasma-mobile/audiotube.nix
  3. 1
      pkgs/applications/plasma-mobile/default.nix
  4. 2
      pkgs/applications/plasma-mobile/fetch.sh
  5. 8
      pkgs/applications/plasma-mobile/kasts.nix
  6. 12
      pkgs/applications/plasma-mobile/neochat.nix
  7. 8
      pkgs/applications/plasma-mobile/plasma-dialer.nix
  8. 4
      pkgs/applications/plasma-mobile/plasma-settings.nix
  9. 9
      pkgs/applications/plasma-mobile/spacebar.nix
  10. 184
      pkgs/applications/plasma-mobile/srcs.nix
  11. 1
      pkgs/top-level/aliases.nix
  12. 2
      pkgs/top-level/all-packages.nix

@ -19,8 +19,8 @@
, srcs , srcs
# These must be updated in tandem with package updates. # These must be updated in tandem with package updates.
, cargoShaForVersion ? "21.08" , cargoShaForVersion ? "21.12"
, cargoSha256 ? "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak" , cargoSha256 ? "lEqaLwXC30YBWZieEh84O8GUDvnsBSh0HaMWJWHaZJI="
}: }:
# Guard against incomplete updates. # Guard against incomplete updates.

@ -1,6 +1,5 @@
{ lib { lib
, mkDerivation , mkDerivation
, fetchpatch
, extra-cmake-modules , extra-cmake-modules
@ -16,14 +15,6 @@
mkDerivation rec { mkDerivation rec {
pname = "audiotube"; pname = "audiotube";
patches = [
# Fix compatibility with ytmusicapi 0.19.1
(fetchpatch {
url = "https://invent.kde.org/plasma-mobile/audiotube/-/commit/734caa02805988200f923b88d1590b3f7dac8ac2.patch";
sha256 = "0zq4f0w84dv0630bpvmqkfmhxbvibr2fxhzy6d2mnf098028gzyd";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules
python3Packages.wrapPython python3Packages.wrapPython
@ -37,13 +28,11 @@ mkDerivation rec {
kirigami2 kirigami2
qtmultimedia qtmultimedia
qtquickcontrols2 qtquickcontrols2
python3Packages.youtube-dl ] ++ pythonPath;
python3Packages.ytmusicapi
];
pythonPath = [ pythonPath = with python3Packages; [
python3Packages.youtube-dl yt-dlp
python3Packages.ytmusicapi ytmusicapi
]; ];
preFixup = '' preFixup = ''

@ -73,6 +73,7 @@ let
krecorder = callPackage ./krecorder.nix {}; krecorder = callPackage ./krecorder.nix {};
ktrip = callPackage ./ktrip.nix {}; ktrip = callPackage ./ktrip.nix {};
kweather = callPackage ./kweather.nix {}; kweather = callPackage ./kweather.nix {};
neochat = callPackage ./neochat.nix {};
plasma-dialer = callPackage ./plasma-dialer.nix {}; plasma-dialer = callPackage ./plasma-dialer.nix {};
plasma-phonebook = callPackage ./plasma-phonebook.nix {}; plasma-phonebook = callPackage ./plasma-phonebook.nix {};
plasma-settings = callPackage ./plasma-settings.nix {}; plasma-settings = callPackage ./plasma-settings.nix {};

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.08/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.12/ -A '*.tar.xz' )

@ -10,9 +10,12 @@
, kcoreaddons , kcoreaddons
, ki18n , ki18n
, kirigami2 , kirigami2
, networkmanager-qt
, qtkeychain
, qtmultimedia , qtmultimedia
, qtquickcontrols2 , qtquickcontrols2
, syndication , syndication
, taglib
}: }:
let let
@ -37,9 +40,12 @@ mkDerivation rec {
kcoreaddons kcoreaddons
ki18n ki18n
kirigami2 kirigami2
qtquickcontrols2 networkmanager-qt
qtkeychain
qtmultimedia qtmultimedia
qtquickcontrols2
syndication syndication
taglib
]; ];
preFixup = '' preFixup = ''

@ -1,6 +1,5 @@
{ mkDerivation { mkDerivation
, lib , lib
, fetchFromGitLab
, pkg-config , pkg-config
, cmake , cmake
, cmark , cmark
@ -28,15 +27,6 @@
mkDerivation rec { mkDerivation rec {
pname = "neochat"; pname = "neochat";
version = "22.02";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "network";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs=";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
@ -64,7 +54,7 @@ mkDerivation rec {
]; ];
meta = with lib; { meta = with lib; {
description = "A client for matrix, the decentralized communication protocol."; description = "A client for matrix, the decentralized communication protocol";
homepage = "https://apps.kde.org/en/neochat"; homepage = "https://apps.kde.org/en/neochat";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];

@ -13,11 +13,11 @@
, kpeople , kpeople
, libphonenumber , libphonenumber
, libpulseaudio , libpulseaudio
, libqofono , modemmanager-qt
, protobuf , protobuf
, pulseaudio-qt , pulseaudio-qt
, qtfeedback
, qtquickcontrols2 , qtquickcontrols2
, telepathy
}: }:
mkDerivation rec { mkDerivation rec {
@ -38,11 +38,11 @@ mkDerivation rec {
kpeople kpeople
libphonenumber libphonenumber
libpulseaudio libpulseaudio
libqofono modemmanager-qt
protobuf # Needed by libphonenumber protobuf # Needed by libphonenumber
pulseaudio-qt pulseaudio-qt
qtfeedback
qtquickcontrols2 qtquickcontrols2
telepathy
]; ];
meta = with lib; { meta = with lib; {

@ -11,6 +11,8 @@
, kdbusaddons , kdbusaddons
, ki18n , ki18n
, kitemmodels , kitemmodels
, modemmanager-qt
, networkmanager-qt
, plasma-framework , plasma-framework
}: }:
@ -29,6 +31,8 @@ mkDerivation rec {
kdbusaddons kdbusaddons
ki18n ki18n
kitemmodels kitemmodels
modemmanager-qt
networkmanager-qt
plasma-framework plasma-framework
]; ];

@ -11,8 +11,10 @@
, kpeople , kpeople
, libphonenumber , libphonenumber
, libqofono , libqofono
, modemmanager-qt
, protobuf , protobuf
, telepathy , qcoro
, qtquickcontrols2
}: }:
mkDerivation rec { mkDerivation rec {
@ -30,9 +32,10 @@ mkDerivation rec {
knotifications knotifications
kpeople kpeople
libphonenumber libphonenumber
libqofono modemmanager-qt
protobuf # Needed by libphonenumber protobuf # Needed by libphonenumber
telepathy qcoro
qtquickcontrols2
]; ];
meta = with lib; { meta = with lib; {

@ -4,155 +4,187 @@
{ {
alligator = { alligator = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/alligator-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/alligator-21.12.tar.xz";
sha256 = "1dhwfwd1v5wmx3sldpygb79kz87j13wd0arhlkm94z1whsixan0q"; sha256 = "0g4fp9b5n1dn27yn5ynk9yiqq2841cfa33ba9dvvmh21y82qsnkw";
name = "alligator-21.08.tar.xz"; name = "alligator-21.12.tar.xz";
}; };
}; };
angelfish = { angelfish = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/angelfish-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/angelfish-21.12.tar.xz";
sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh"; sha256 = "19wv68g9637zlgpnvf1jp60pdbakfgdh0z6jpzsaxqh70vlgmiba";
name = "angelfish-21.08.tar.xz"; name = "angelfish-21.12.tar.xz";
}; };
}; };
audiotube = { audiotube = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/audiotube-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/audiotube-21.12.tar.xz";
sha256 = "14h4xna9v70lmp7cfpvdnz0f5a4gwgj0q3byccmawm38xsv15v8c"; sha256 = "1q7zraa9z7vdfyg3r3mkigk2x15sskwnhaz06zmprxim0bky44qp";
name = "audiotube-21.08.tar.xz"; name = "audiotube-21.12.tar.xz";
}; };
}; };
calindori = { calindori = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/calindori-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/calindori-21.12.tar.xz";
sha256 = "08s16a8skh02n8ygqwryxpzczj5aqr5k58aijaz2gzx45m7ym31b"; sha256 = "1rm9gdb0hp5w7wzb8km0fr0affbng9jy6vcc86qsz6b4v4j2pirb";
name = "calindori-21.08.tar.xz"; name = "calindori-21.12.tar.xz";
}; };
}; };
kalk = { kalk = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kalk-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/kalk-21.12.tar.xz";
sha256 = "0xzrahpz47yajalsfmpzmavxjwmr4bgljwyz2dhxdg40ryjxdy23"; sha256 = "109q95kyrxp8m7zfmdmpgz4kzlqrkhz90gnrcclg1vcj272nbcyj";
name = "kalk-21.08.tar.xz"; name = "kalk-21.12.tar.xz";
}; };
}; };
kasts = { kasts = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kasts-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/kasts-21.12.tar.xz";
sha256 = "10v6icxwv46nihzbdi0n2w71bsg7l166z7jf9rb7vf2mjh1gqavn"; sha256 = "1rnmhpxjjq9p2kpbhdpd9v5hwk47jn1x8v0krbw5761v1sc1j5v0";
name = "kasts-21.08.tar.xz"; name = "kasts-21.12.tar.xz";
}; };
}; };
kclock = { kclock = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kclock-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/kclock-21.12.tar.xz";
sha256 = "1zq0fxlwd7l3b6dgfqsmv1x4wvhmrjz5r0a38hbd7j7pzgyix47d"; sha256 = "15069139zvxw1766gckqzb01ka55pd5idzbv8nd7n24kbls90xqj";
name = "kclock-21.08.tar.xz"; name = "kclock-21.12.tar.xz";
}; };
}; };
keysmith = { keysmith = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/keysmith-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/keysmith-21.12.tar.xz";
sha256 = "0fa8inli7cwmb75af0mr2cflng0r6k3pd6ckih6ph7szqbpg2x90"; sha256 = "05k2v3bd2szb1h47jwfvshbhx1ifmx1m8lv76i8jmn8kpwla0fzy";
name = "keysmith-21.08.tar.xz"; name = "keysmith-21.12.tar.xz";
};
};
khealthcertificate = {
version = "21.12";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.12/khealthcertificate-21.12.tar.xz";
sha256 = "065nc1mswpqz2lrxqamm5jf5f6nx3xhf3h7rw313crf175xq1vi3";
name = "khealthcertificate-21.12.tar.xz";
}; };
}; };
koko = { koko = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/koko-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/koko-21.12.tar.xz";
sha256 = "1sqlcl871m6dlrnkkhqa3xfwix01d74d7jf94r1a3p32hqljv76p"; sha256 = "18gxhngjzrg6ngprcal309kk42ls7xvaf311iybxfqsjxzc63hml";
name = "koko-21.08.tar.xz"; name = "koko-21.12.tar.xz";
}; };
}; };
kongress = { kongress = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kongress-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/kongress-21.12.tar.xz";
sha256 = "099ds4bv4ngx21f28hxcvc17wd2nk786kydwf2h5n3mdd2mgz3ka"; sha256 = "1b85pq25grrcl3y5d0npay1f8jajr9iqqrpvvqh7i56bsxh6vwzw";
name = "kongress-21.08.tar.xz"; name = "kongress-21.12.tar.xz";
}; };
}; };
krecorder = { krecorder = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/krecorder-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/krecorder-21.12.tar.xz";
sha256 = "1381x889h37saf6k875iqhwz5vbixrp7650smxp31r56ycrqq26i"; sha256 = "02di8py29ah60cqanggjyf5jlcz0qixl8jgb0hm89jjqsqndd14w";
name = "krecorder-21.08.tar.xz"; name = "krecorder-21.12.tar.xz";
}; };
}; };
ktrip = { ktrip = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/ktrip-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/ktrip-21.12.tar.xz";
sha256 = "0ipxi3pqd7mznq3qjf9j9w3wyck85lxnr81ay6b3ricfb08ry68x"; sha256 = "1i31j1hf6c4h86vprl3gyv05dvg6dvzls6im71kqx1ynm1xjr6gr";
name = "ktrip-21.08.tar.xz"; name = "ktrip-21.12.tar.xz";
}; };
}; };
kweather = { kweather = {
version = "21.08"; version = "21.12";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.12/kweather-21.12.tar.xz";
sha256 = "101virkh7sbrzm2022axnnb5k3gw3hk4gr2v0w0i8xfl6d4dpr7j";
name = "kweather-21.12.tar.xz";
};
};
neochat = {
version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/kweather-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/neochat-21.12.tar.xz";
sha256 = "0b1zjwsakwsnh6827zjhypvb04c78gwwygr7k1cy2x3finrp5if5"; sha256 = "12mb518chd4psb9gbxgnbjl8n7grsmr2wk03k7f238pxjmxi94w3";
name = "kweather-21.08.tar.xz"; name = "neochat-21.12.tar.xz";
}; };
}; };
plasma-dialer = { plasma-dialer = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/plasma-dialer-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/plasma-dialer-21.12.tar.xz";
sha256 = "14vgjg0nihhm446cfrrld1l43r50dlah5xs2ypdnm68618bdc7p1"; sha256 = "0pvyz4f9fmm5iahndps9mgnhbvh35ajgmnzkmmknny0pr5b3x01d";
name = "plasma-dialer-21.08.tar.xz"; name = "plasma-dialer-21.12.tar.xz";
}; };
}; };
plasma-phonebook = { plasma-phonebook = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/plasma-phonebook-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/plasma-phonebook-21.12.tar.xz";
sha256 = "09gr5mkwhayx6k6bhm29bmcvdlqqw8jj7gydh5fz40g9z98c84km"; sha256 = "1qh7hqr6sbxrf92sa1pzsdp59fgc3s3b8vh42vyfww7p1v9gf4aq";
name = "plasma-phonebook-21.08.tar.xz"; name = "plasma-phonebook-21.12.tar.xz";
}; };
}; };
plasma-settings = { plasma-settings = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/plasma-settings-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/plasma-settings-21.12.tar.xz";
sha256 = "005v1gyrzl9b0k875p2wipja3l8l4awp8nl2d1jx7c28lqaspz2j"; sha256 = "1gr6wb4jsdizxg3zc0vynfa7fwpiz5ah2s1qpcdir80fjyxhxld7";
name = "plasma-settings-21.08.tar.xz"; name = "plasma-settings-21.12.tar.xz";
};
};
plasmatube = {
version = "21.12";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.12/plasmatube-21.12.tar.xz";
sha256 = "15jyffv4q11sklh7wwivdny58ia09yyrjdj2r6wqjclrdb8n9ni7";
name = "plasmatube-21.12.tar.xz";
}; };
}; };
qmlkonsole = { qmlkonsole = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/qmlkonsole-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/qmlkonsole-21.12.tar.xz";
sha256 = "1p3ysf6sgiji86400523hm67rvw3znj3a7k6g6s83dxynxdh2faq"; sha256 = "0ywdrz00i40hwhci3l4p8f0z4bjnn9vvsz0p154p1cdn7cz9ydca";
name = "qmlkonsole-21.08.tar.xz"; name = "qmlkonsole-21.12.tar.xz";
}; };
}; };
spacebar = { spacebar = {
version = "21.08"; version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/spacebar-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/spacebar-21.12.tar.xz";
sha256 = "1cg36iys4x7p97ywilnp2lzz1ry5a1m7jz38yh2yiw6m8wvzfqff"; sha256 = "062vcba6krp3ksskd2v8szvdblmbzdw580blzy767iac4fx6zybf";
name = "spacebar-21.08.tar.xz"; name = "spacebar-21.12.tar.xz";
}; };
}; };
tokodon = { tokodon = {
version = "21.08"; version = "21.12";
src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.12/tokodon-21.12.tar.xz";
sha256 = "0wd41f7xza26lmznj3qisn9islhwnp6kzqsbm66j0vppb35sbfb3";
name = "tokodon-21.12.tar.xz";
};
};
vakzination = {
version = "21.12";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma-mobile/21.08/tokodon-21.08.tar.xz"; url = "${mirror}/stable/plasma-mobile/21.12/vakzination-21.12.tar.xz";
sha256 = "0j9zfcdss1872hv8xxrmy0jjmcz3y5kdz8gdrd6qmig5scrzjvnf"; sha256 = "191g6j7s01khg5vbxzbx8d6729vxvgbw3di1bprgm26ahxl430l4";
name = "tokodon-21.08.tar.xz"; name = "vakzination-21.12.tar.xz";
}; };
}; };
} }

@ -871,6 +871,7 @@ mapAliases ({
navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07
ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22
neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
neochat = libsForQt5.plasmaMobileGear.neochat; # added 2022-05-10
netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22
networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22

@ -8524,8 +8524,6 @@ with pkgs;
neo-cowsay = callPackage ../tools/misc/neo-cowsay { }; neo-cowsay = callPackage ../tools/misc/neo-cowsay { };
neochat = libsForQt5.callPackage ../applications/networking/instant-messengers/neochat { };
neofetch = callPackage ../tools/misc/neofetch { }; neofetch = callPackage ../tools/misc/neofetch { };
nerdfonts = callPackage ../data/fonts/nerdfonts { }; nerdfonts = callPackage ../data/fonts/nerdfonts { };

Loading…
Cancel
Save