Merge pull request #125156 from samueldr/feature/plasma-mobile-apps-only

Add Plasma Mobile Gear 21.05

authored by Samuel Dionne-Riel and committed by GitHub 31285207 cae56824

+865 -3
+1
pkgs/applications/kde/default.nix
··· 174 ksquares = callPackage ./ksquares.nix {}; 175 kqtquickcharts = callPackage ./kqtquickcharts.nix {}; 176 kpkpass = callPackage ./kpkpass.nix {}; 177 kreversi = callPackage ./kreversi.nix {}; 178 krdc = callPackage ./krdc.nix {}; 179 krfb = callPackage ./krfb.nix {};
··· 174 ksquares = callPackage ./ksquares.nix {}; 175 kqtquickcharts = callPackage ./kqtquickcharts.nix {}; 176 kpkpass = callPackage ./kpkpass.nix {}; 177 + kpublictransport = callPackage ./kpublictransport.nix {}; 178 kreversi = callPackage ./kreversi.nix {}; 179 krdc = callPackage ./krdc.nix {}; 180 krfb = callPackage ./krfb.nix {};
+13
pkgs/applications/kde/kpublictransport.nix
···
··· 1 + { mkDerivation 2 + , lib 3 + , extra-cmake-modules 4 + }: 5 + 6 + mkDerivation { 7 + pname = "kpublictransport"; 8 + meta = with lib; { 9 + license = [ licenses.cc0 ]; 10 + maintainers = [ maintainers.samueldr ]; 11 + }; 12 + nativeBuildInputs = [ extra-cmake-modules ]; 13 + }
+40
pkgs/applications/plasma-mobile/alligator.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + 7 + , kconfig 8 + , kcoreaddons 9 + , ki18n 10 + , kirigami2 11 + , qtquickcontrols2 12 + , syndication 13 + }: 14 + 15 + mkDerivation rec { 16 + pname = "alligator"; 17 + 18 + nativeBuildInputs = [ 19 + cmake 20 + extra-cmake-modules 21 + ]; 22 + 23 + buildInputs = [ 24 + kconfig 25 + kcoreaddons 26 + ki18n 27 + kirigami2 28 + qtquickcontrols2 29 + syndication 30 + ]; 31 + 32 + meta = with lib; { 33 + description = "RSS reader made with kirigami"; 34 + homepage = "https://invent.kde.org/plasma-mobile/alligator"; 35 + # https://invent.kde.org/plasma-mobile/alligator/-/commit/db30f159c4700244532b17a260deb95551045b7a 36 + # * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL 37 + license = with licenses; [ gpl2Only gpl3Only ]; 38 + maintainers = with maintainers; [ samueldr ]; 39 + }; 40 + }
+46
pkgs/applications/plasma-mobile/calindori.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + 7 + , kcalendarcore 8 + , kconfig 9 + , kcoreaddons 10 + , kdbusaddons 11 + , ki18n 12 + , kirigami2 13 + , knotifications 14 + , kpeople 15 + , kservice 16 + , qtquickcontrols2 17 + }: 18 + 19 + mkDerivation rec { 20 + pname = "calindori"; 21 + 22 + nativeBuildInputs = [ 23 + cmake 24 + extra-cmake-modules 25 + ]; 26 + 27 + buildInputs = [ 28 + kcalendarcore 29 + kconfig 30 + kcoreaddons 31 + kdbusaddons 32 + ki18n 33 + kirigami2 34 + knotifications 35 + kpeople 36 + kservice 37 + qtquickcontrols2 38 + ]; 39 + 40 + meta = with lib; { 41 + description = "Calendar for Plasma Mobile"; 42 + homepage = "https://invent.kde.org/plasma-mobile/calindori"; 43 + license = licenses.gpl3Plus; 44 + maintainers = with maintainers; [ samueldr ]; 45 + }; 46 + }
+76
pkgs/applications/plasma-mobile/default.nix
···
··· 1 + /* 2 + 3 + # New packages 4 + 5 + READ THIS FIRST 6 + 7 + This module is for official packages in the Plasma Mobile Gear. All 8 + available packages are listed in `./srcs.nix`, although some are not yet 9 + packaged in Nixpkgs. 10 + 11 + IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. 12 + 13 + See also `pkgs/applications/kde` as this is what this is based on. 14 + 15 + # Updates 16 + 17 + 1. Update the URL in `./fetch.sh`. 18 + 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile` 19 + from the top of the Nixpkgs tree. 20 + 3. Use `nox-review wip` to check that everything builds. 21 + 4. Commit the changes and open a pull request. 22 + 23 + */ 24 + 25 + { lib 26 + , libsForQt5 27 + , fetchurl 28 + }: 29 + 30 + let 31 + minQtVersion = "5.15"; 32 + broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; 33 + 34 + mirror = "mirror://kde"; 35 + srcs = import ./srcs.nix { inherit fetchurl mirror; }; 36 + 37 + mkDerivation = args: 38 + let 39 + inherit (args) pname; 40 + inherit (srcs.${pname}) src version; 41 + mkDerivation = 42 + libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; 43 + in 44 + mkDerivation (args // { 45 + inherit pname version src; 46 + 47 + outputs = args.outputs or [ "out" ]; 48 + 49 + meta = 50 + let meta = args.meta or {}; in 51 + meta // { 52 + homepage = meta.homepage or "https://www.plasma-mobile.org/"; 53 + platforms = meta.platforms or lib.platforms.linux; 54 + broken = meta.broken or broken; 55 + }; 56 + }); 57 + 58 + packages = self: with self; 59 + let 60 + callPackage = self.newScope { 61 + inherit mkDerivation; 62 + }; 63 + in { 64 + alligator = callPackage ./alligator.nix {}; 65 + calindori = callPackage ./calindori.nix {}; 66 + kalk = callPackage ./kalk.nix {}; 67 + kclock = callPackage ./kclock.nix {}; 68 + koko = callPackage ./koko.nix {}; 69 + krecorder = callPackage ./krecorder.nix {}; 70 + ktrip = callPackage ./ktrip.nix {}; 71 + plasma-dialer = callPackage ./plasma-dialer.nix {}; 72 + plasma-phonebook = callPackage ./plasma-phonebook.nix {}; 73 + spacebar = callPackage ./spacebar.nix {}; 74 + }; 75 + 76 + in lib.makeScope libsForQt5.newScope packages
+1
pkgs/applications/plasma-mobile/fetch.sh
···
··· 1 + WGET_ARGS=( http://download.kde.org/stable/plasma-mobile/21.05 -A '*.tar.xz' )
+50
pkgs/applications/plasma-mobile/kalk.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + , bison 7 + , flex 8 + 9 + , gmp 10 + , mpfr 11 + 12 + , kconfig 13 + , kcoreaddons 14 + , ki18n 15 + , kirigami2 16 + , kunitconversion 17 + , qtfeedback 18 + , qtquickcontrols2 19 + }: 20 + 21 + mkDerivation rec { 22 + pname = "kalk"; 23 + 24 + nativeBuildInputs = [ 25 + cmake 26 + extra-cmake-modules 27 + bison 28 + flex 29 + ]; 30 + 31 + buildInputs = [ 32 + gmp 33 + mpfr 34 + 35 + kconfig 36 + kcoreaddons 37 + ki18n 38 + kirigami2 39 + kunitconversion 40 + qtfeedback 41 + qtquickcontrols2 42 + ]; 43 + 44 + meta = with lib; { 45 + description = "Calculator built with kirigami"; 46 + homepage = "https://invent.kde.org/plasma-mobile/kalk"; 47 + license = licenses.gpl3Plus; 48 + maintainers = with maintainers; [ samueldr ]; 49 + }; 50 + }
+44
pkgs/applications/plasma-mobile/kclock.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + 7 + , kconfig 8 + , kcoreaddons 9 + , kdbusaddons 10 + , ki18n 11 + , kirigami2 12 + , knotifications 13 + , plasma-framework 14 + , qtmultimedia 15 + , qtquickcontrols2 16 + }: 17 + 18 + mkDerivation rec { 19 + pname = "kclock"; 20 + 21 + nativeBuildInputs = [ 22 + cmake 23 + extra-cmake-modules 24 + ]; 25 + 26 + buildInputs = [ 27 + kconfig 28 + kcoreaddons 29 + kdbusaddons 30 + ki18n 31 + kirigami2 32 + knotifications 33 + plasma-framework 34 + qtmultimedia 35 + qtquickcontrols2 36 + ]; 37 + 38 + meta = with lib; { 39 + description = "Clock app for plasma mobile"; 40 + homepage = "https://invent.kde.org/plasma-mobile/kclock"; 41 + license = licenses.gpl2Plus; 42 + maintainers = with maintainers; [ samueldr ]; 43 + }; 44 + }
+81
pkgs/applications/plasma-mobile/koko.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , fetchurl 5 + , cmake 6 + , extra-cmake-modules 7 + 8 + , exiv2 9 + , kconfig 10 + , kcoreaddons 11 + , kdeclarative 12 + , kfilemetadata 13 + , kguiaddons 14 + , ki18n 15 + , kio 16 + , kirigami2 17 + , knotifications 18 + , kpurpose 19 + , kquickimageedit 20 + , qtgraphicaleffects 21 + , qtlocation 22 + , qtquickcontrols2 23 + }: 24 + 25 + let 26 + # URLs snapshotted through 27 + # https://web.archive.org/save/$url 28 + # Update when stale enough I guess? 29 + admin1 = fetchurl { 30 + url = "https://web.archive.org/web/20210714035424if_/http://download.geonames.org/export/dump/admin1CodesASCII.txt"; 31 + sha256 = "0r783yzajs26hvccdy4jv2v06xfgadx2g90fz3yn7lx8flz4nhwm"; 32 + }; 33 + admin2 = fetchurl { 34 + url = "https://web.archive.org/web/20210714035427if_/http://download.geonames.org/export/dump/admin2Codes.txt"; 35 + sha256 = "1n5nzp3xblhr93rb1sadi5vfbw29slv5lc6cxq21h3x3cg0mwqh3"; 36 + }; 37 + cities1000 = fetchurl { 38 + url = "https://web.archive.org/web/20210714035406if_/http://download.geonames.org/export/dump/cities1000.zip"; 39 + sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; 40 + }; 41 + in 42 + mkDerivation rec { 43 + pname = "koko"; 44 + 45 + nativeBuildInputs = [ 46 + cmake 47 + extra-cmake-modules 48 + ]; 49 + 50 + buildInputs = [ 51 + exiv2 52 + kconfig 53 + kcoreaddons 54 + kdeclarative 55 + kfilemetadata 56 + kguiaddons 57 + ki18n 58 + kio 59 + kirigami2 60 + knotifications 61 + kpurpose 62 + kquickimageedit 63 + qtgraphicaleffects 64 + qtlocation 65 + qtquickcontrols2 66 + ]; 67 + 68 + prePatch = '' 69 + ln -s ${admin1} src/admin1CodesASCII.txt 70 + ln -s ${admin2} src/admin2Codes.txt 71 + ln -s ${cities1000} src/cities1000.zip 72 + ''; 73 + 74 + meta = with lib; { 75 + description = "Image gallery mobile application"; 76 + homepage = "https://apps.kde.org/koko/"; 77 + # LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL 78 + license = [ licenses.lgpl3Only licenses.lgpl21Only ]; 79 + maintainers = with maintainers; [ samueldr ]; 80 + }; 81 + }
+36
pkgs/applications/plasma-mobile/krecorder.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + 7 + , kconfig 8 + , ki18n 9 + , kirigami2 10 + , qtmultimedia 11 + , qtquickcontrols2 12 + }: 13 + 14 + mkDerivation rec { 15 + pname = "krecorder"; 16 + 17 + nativeBuildInputs = [ 18 + cmake 19 + extra-cmake-modules 20 + ]; 21 + 22 + buildInputs = [ 23 + kconfig 24 + ki18n 25 + kirigami2 26 + qtmultimedia 27 + qtquickcontrols2 28 + ]; 29 + 30 + meta = with lib; { 31 + description = "Audio recorder for Plasma Mobile"; 32 + homepage = "https://invent.kde.org/plasma-mobile/krecorder"; 33 + license = licenses.gpl3Plus; 34 + maintainers = with maintainers; [ samueldr ]; 35 + }; 36 + }
+45
pkgs/applications/plasma-mobile/ktrip.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + 7 + , kconfig 8 + , kcontacts 9 + , kcoreaddons 10 + , ki18n 11 + , kirigami-addons 12 + , kirigami2 13 + , kitemmodels 14 + , kpublictransport 15 + , qtquickcontrols2 16 + }: 17 + 18 + mkDerivation rec { 19 + pname = "ktrip"; 20 + 21 + nativeBuildInputs = [ 22 + cmake 23 + extra-cmake-modules 24 + ]; 25 + 26 + buildInputs = [ 27 + kconfig 28 + kcontacts 29 + kcoreaddons 30 + ki18n 31 + kirigami-addons 32 + kirigami2 33 + kitemmodels 34 + kpublictransport 35 + qtquickcontrols2 36 + ]; 37 + 38 + meta = with lib; { 39 + description = "Public transport trip planner"; 40 + homepage = "https://apps.kde.org/ktrip/"; 41 + # GPL-2.0-or-later 42 + license = licenses.gpl2Plus; 43 + maintainers = with maintainers; [ samueldr ]; 44 + }; 45 + }
+54
pkgs/applications/plasma-mobile/plasma-dialer.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + 7 + , kcontacts 8 + , kcoreaddons 9 + , kdbusaddons 10 + , ki18n 11 + , kirigami2 12 + , knotifications 13 + , kpeople 14 + , libphonenumber 15 + , libpulseaudio 16 + , libqofono 17 + , protobuf 18 + , pulseaudio-qt 19 + , qtquickcontrols2 20 + , telepathy 21 + }: 22 + 23 + mkDerivation rec { 24 + pname = "plasma-dialer"; 25 + 26 + nativeBuildInputs = [ 27 + cmake 28 + extra-cmake-modules 29 + ]; 30 + 31 + buildInputs = [ 32 + kcontacts 33 + kcoreaddons 34 + kdbusaddons 35 + ki18n 36 + kirigami2 37 + knotifications 38 + kpeople 39 + libphonenumber 40 + libpulseaudio 41 + libqofono 42 + protobuf # Needed by libphonenumber 43 + pulseaudio-qt 44 + qtquickcontrols2 45 + telepathy 46 + ]; 47 + 48 + meta = with lib; { 49 + description = "Dialer for Plasma Mobile"; 50 + homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer"; 51 + license = licenses.gpl3Plus; 52 + maintainers = with maintainers; [ samueldr ]; 53 + }; 54 + }
+41
pkgs/applications/plasma-mobile/plasma-phonebook.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + 7 + , kcontacts 8 + , kcoreaddons 9 + , kirigami2 10 + , kirigami-addons 11 + , kpeople 12 + , kpeoplevcard 13 + , qtquickcontrols2 14 + }: 15 + 16 + mkDerivation rec { 17 + pname = "plasma-phonebook"; 18 + 19 + nativeBuildInputs = [ 20 + cmake 21 + extra-cmake-modules 22 + ]; 23 + 24 + buildInputs = [ 25 + kcontacts 26 + kcoreaddons 27 + kirigami2 28 + kirigami-addons 29 + kpeople 30 + kpeoplevcard 31 + qtquickcontrols2 32 + ]; 33 + 34 + meta = with lib; { 35 + description = "Phone book for Plasma Mobile"; 36 + homepage = "https://invent.kde.org/plasma-mobile/plasma-phonebook"; 37 + # https://invent.kde.org/plasma-mobile/plasma-phonebook/-/commit/3ac27760417e51c051c5dd44155c3f42dd000e4f 38 + license = licenses.gpl3Plus; 39 + maintainers = with maintainers; [ samueldr ]; 40 + }; 41 + }
+40
pkgs/applications/plasma-mobile/spacebar.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + 4 + , cmake 5 + , extra-cmake-modules 6 + 7 + , kcontacts 8 + , ki18n 9 + , kirigami2 10 + , knotifications 11 + , kpeople 12 + , libqofono 13 + , telepathy 14 + }: 15 + 16 + mkDerivation rec { 17 + pname = "spacebar"; 18 + 19 + nativeBuildInputs = [ 20 + cmake 21 + extra-cmake-modules 22 + ]; 23 + 24 + buildInputs = [ 25 + kcontacts 26 + ki18n 27 + kirigami2 28 + knotifications 29 + kpeople 30 + libqofono 31 + telepathy 32 + ]; 33 + 34 + meta = with lib; { 35 + description = "SMS application for Plasma Mobile"; 36 + homepage = "https://invent.kde.org/plasma-mobile/spacebar"; 37 + license = licenses.gpl2Plus; 38 + maintainers = with maintainers; [ samueldr ]; 39 + }; 40 + }
+118
pkgs/applications/plasma-mobile/srcs.nix
···
··· 1 + # DO NOT EDIT! This file is generated automatically. 2 + # Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile/ 3 + { fetchurl, mirror }: 4 + 5 + { 6 + alligator = { 7 + version = "21.05"; 8 + src = fetchurl { 9 + url = "${mirror}/stable/plasma-mobile/21.05/alligator-21.05.tar.xz"; 10 + sha256 = "04zgxfx2zmn1p2ap08i5sfsnrly3smip4ylr07ghkhkiyjzbv9w6"; 11 + name = "alligator-21.05.tar.xz"; 12 + }; 13 + }; 14 + angelfish = { 15 + version = "21.05"; 16 + src = fetchurl { 17 + url = "${mirror}/stable/plasma-mobile/21.05/angelfish-21.05.tar.xz"; 18 + sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075"; 19 + name = "angelfish-21.05.tar.xz"; 20 + }; 21 + }; 22 + calindori = { 23 + version = "21.05"; 24 + src = fetchurl { 25 + url = "${mirror}/stable/plasma-mobile/21.05/calindori-21.05.tar.xz"; 26 + sha256 = "110f9ri9r1nb6q1ybhkfxljl4q5gqxikh9z0xkzjjbxjjqfscqcj"; 27 + name = "calindori-21.05.tar.xz"; 28 + }; 29 + }; 30 + kalk = { 31 + version = "21.05"; 32 + src = fetchurl { 33 + url = "${mirror}/stable/plasma-mobile/21.05/kalk-21.05.tar.xz"; 34 + sha256 = "04n65hx0j9rx6b3jq69zgypi8qjd4ig3rfw7d44c3q7dgh4k451l"; 35 + name = "kalk-21.05.tar.xz"; 36 + }; 37 + }; 38 + kclock = { 39 + version = "21.05"; 40 + src = fetchurl { 41 + url = "${mirror}/stable/plasma-mobile/21.05/kclock-21.05.tar.xz"; 42 + sha256 = "0pa5hvax0y80l8yrqczh9mcknfm3z0vdq3xc35cxdiz1vc6fwqmd"; 43 + name = "kclock-21.05.tar.xz"; 44 + }; 45 + }; 46 + koko = { 47 + version = "21.05"; 48 + src = fetchurl { 49 + url = "${mirror}/stable/plasma-mobile/21.05/koko-21.05.tar.xz"; 50 + sha256 = "00hnzkl8dvf15psrcfh96b8wfb3pbggd2f7xnadzcb87sbaml035"; 51 + name = "koko-21.05.tar.xz"; 52 + }; 53 + }; 54 + kongress = { 55 + version = "21.05"; 56 + src = fetchurl { 57 + url = "${mirror}/stable/plasma-mobile/21.05/kongress-21.05.tar.xz"; 58 + sha256 = "0qxgpi04ra9crc6drgbdm9arjbvcx52pprjr1dj8acch07f6i2gs"; 59 + name = "kongress-21.05.tar.xz"; 60 + }; 61 + }; 62 + krecorder = { 63 + version = "21.05"; 64 + src = fetchurl { 65 + url = "${mirror}/stable/plasma-mobile/21.05/krecorder-21.05.tar.xz"; 66 + sha256 = "0ydaidxx2616bixihyaagvyym1r5s9rjkgg04vq9k4608d4vnn5c"; 67 + name = "krecorder-21.05.tar.xz"; 68 + }; 69 + }; 70 + ktrip = { 71 + version = "21.05"; 72 + src = fetchurl { 73 + url = "${mirror}/stable/plasma-mobile/21.05/ktrip-21.05.tar.xz"; 74 + sha256 = "0hxgnncyc2ir6i9p6s9fy1r4mhxgm643pxvp8lj3j5y0c5wk2kp9"; 75 + name = "ktrip-21.05.tar.xz"; 76 + }; 77 + }; 78 + plasma-dialer = { 79 + version = "21.05"; 80 + src = fetchurl { 81 + url = "${mirror}/stable/plasma-mobile/21.05/plasma-dialer-21.05.tar.xz"; 82 + sha256 = "0kwkjn7ry6snc86qi1j7kcq5qa6rbyk5i7v6gqf7a7wywkk9n045"; 83 + name = "plasma-dialer-21.05.tar.xz"; 84 + }; 85 + }; 86 + plasma-phonebook = { 87 + version = "21.05"; 88 + src = fetchurl { 89 + url = "${mirror}/stable/plasma-mobile/21.05/plasma-phonebook-21.05.tar.xz"; 90 + sha256 = "0aqqi3gvcsh4zg41zf8y0c626lwrabjchhr8pxj4n9la7y0wdvca"; 91 + name = "plasma-phonebook-21.05.tar.xz"; 92 + }; 93 + }; 94 + plasma-settings = { 95 + version = "21.05"; 96 + src = fetchurl { 97 + url = "${mirror}/stable/plasma-mobile/21.05/plasma-settings-21.05.tar.xz"; 98 + sha256 = "16bhx0i8gvi9ina4jxzx02xyzypyjic9646lahxvzvzmd9hn9ipi"; 99 + name = "plasma-settings-21.05.tar.xz"; 100 + }; 101 + }; 102 + qmlkonsole = { 103 + version = "21.05"; 104 + src = fetchurl { 105 + url = "${mirror}/stable/plasma-mobile/21.05/qmlkonsole-21.05.tar.xz"; 106 + sha256 = "1ga48n09zlgvf5vvk2m26ak3ih5gjf361xxnyfprimmd7yj23han"; 107 + name = "qmlkonsole-21.05.tar.xz"; 108 + }; 109 + }; 110 + spacebar = { 111 + version = "21.05"; 112 + src = fetchurl { 113 + url = "${mirror}/stable/plasma-mobile/21.05/spacebar-21.05.tar.xz"; 114 + sha256 = "16lvi5yzmvk6gb5m7csk44y2jbkk7psn1lkljmj1938p2475b94c"; 115 + name = "spacebar-21.05.tar.xz"; 116 + }; 117 + }; 118 + }
+44
pkgs/development/libraries/kirigami-addons/default.nix
···
··· 1 + { lib 2 + , mkDerivation 3 + , fetchFromGitLab 4 + 5 + , cmake 6 + , extra-cmake-modules 7 + 8 + , ki18n 9 + , kirigami2 10 + , qtquickcontrols2 11 + }: 12 + 13 + mkDerivation rec { 14 + pname = "kirigami-addons"; 15 + version = "21.05"; 16 + 17 + src = fetchFromGitLab { 18 + domain = "invent.kde.org"; 19 + owner = "libraries"; 20 + repo = pname; 21 + rev = "v${version}"; 22 + sha256 = "0pwkpag15mvzhd3hvdwx0a8ajwq9j30r6069vsx85bagnag3zanh"; 23 + }; 24 + 25 + nativeBuildInputs = [ 26 + cmake 27 + extra-cmake-modules 28 + ]; 29 + 30 + buildInputs = [ 31 + ki18n 32 + kirigami2 33 + qtquickcontrols2 34 + ]; 35 + 36 + meta = with lib; { 37 + description = "Add-ons for the Kirigami framework"; 38 + homepage = "https://invent.kde.org/libraries/kirigami-addons"; 39 + # https://invent.kde.org/libraries/kirigami-addons/-/blob/b197d98fdd079b6fc651949bd198363872d1be23/src/treeview/treeviewplugin.cpp#L1-5 40 + license = licenses.lgpl2Plus; 41 + maintainers = with maintainers; [ samueldr ]; 42 + }; 43 + } 44 +
+29
pkgs/development/libraries/libqofono/0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch
···
··· 1 + From 8b508d427c4fd472639ba8d4a0d3b8ab69e3f2e3 Mon Sep 17 00:00:00 2001 2 + From: Samuel Dionne-Riel <samuel@dionne-riel.com> 3 + Date: Tue, 30 Mar 2021 16:37:52 -0400 4 + Subject: [PATCH] [NixOS] Skip tests, they're shock-full of hardcoded FHS paths 5 + 6 + --- 7 + libqofono.pro | 4 +--- 8 + 1 file changed, 1 insertion(+), 3 deletions(-) 9 + 10 + diff --git a/libqofono.pro b/libqofono.pro 11 + index 60d0b89..638a4a8 100644 12 + --- a/libqofono.pro 13 + +++ b/libqofono.pro 14 + @@ -1,5 +1,5 @@ 15 + TEMPLATE = subdirs 16 + -SUBDIRS += src plugin test ofonotest 17 + +SUBDIRS += src plugin 18 + OTHER_FILES += \ 19 + rpm/libqofono-qt5.spec \ 20 + TODO \ 21 + @@ -7,5 +7,3 @@ OTHER_FILES += \ 22 + 23 + src.target = src-target 24 + plugin.depends = src-target 25 + -test.depends = src-target 26 + -ofonotest.depends = src-target 27 + -- 28 + 2.28.0 29 +
+34
pkgs/development/libraries/libqofono/0001-NixOS-provide-mobile-broadband-provider-info-path.patch
···
··· 1 + From 04106010ae2a13b3a2a93e210062998ee51778ca Mon Sep 17 00:00:00 2001 2 + From: Samuel Dionne-Riel <samuel@dionne-riel.com> 3 + Date: Tue, 30 Mar 2021 15:47:38 -0400 4 + Subject: [PATCH] [NixOS] provide mobile-broadband-provider-info path 5 + 6 + --- 7 + src/qofonoconnectioncontext.cpp | 4 ++-- 8 + 1 file changed, 2 insertions(+), 2 deletions(-) 9 + 10 + diff --git a/src/qofonoconnectioncontext.cpp b/src/qofonoconnectioncontext.cpp 11 + index b5877ed..455167c 100644 12 + --- a/src/qofonoconnectioncontext.cpp 13 + +++ b/src/qofonoconnectioncontext.cpp 14 + @@ -346,7 +346,7 @@ bool QOfonoConnectionContext::validateProvisioning(const QString &providerString 15 + QXmlQuery query; 16 + QString provider = providerString; 17 + 18 + - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); 19 + + query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); 20 + 21 + if (provider.contains("\'")) { 22 + provider = provider.replace("\'", "&apos;"); 23 + @@ -457,7 +457,7 @@ void QOfonoConnectionContext::provision(const QString &provider, const QString & 24 + { 25 + #ifdef QOFONO_PROVISIONING 26 + QXmlQuery query; 27 + - query.setFocus(QUrl("/usr/share/mobile-broadband-provider-info/serviceproviders.xml")); 28 + + query.setFocus(QUrl("@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml")); 29 + 30 + QString providerStr = provider; 31 + if (providerStr.contains("\'")) { 32 + -- 33 + 2.28.0 34 +
+58
pkgs/development/libraries/libqofono/default.nix
···
··· 1 + { lib 2 + , substituteAll 3 + , mkDerivation 4 + , fetchFromGitLab 5 + , mobile-broadband-provider-info 6 + , qmake 7 + , qtbase 8 + , qtdeclarative 9 + }: 10 + 11 + mkDerivation rec { 12 + pname = "libqofono"; 13 + version = "0.103"; 14 + 15 + src = fetchFromGitLab { 16 + domain = "git.sailfishos.org"; 17 + owner = "mer-core"; 18 + repo = "libqofono"; 19 + rev = version; 20 + sha256 = "1ly5aj412ljcjvhqyry6nhiglbzzhczsy1a6w4i4fja60b2m1z45"; 21 + }; 22 + 23 + patches = [ 24 + (substituteAll { 25 + src = ./0001-NixOS-provide-mobile-broadband-provider-info-path.patch; 26 + inherit mobile-broadband-provider-info; 27 + }) 28 + ./0001-NixOS-Skip-tests-they-re-shock-full-of-hardcoded-FHS.patch 29 + ]; 30 + 31 + # Replaces paths from the Qt store path to this library's store path. 32 + postPatch = '' 33 + substituteInPlace src/src.pro \ 34 + --replace /usr $out \ 35 + --replace '$$[QT_INSTALL_PREFIX]' "$out" \ 36 + --replace 'target.path = $$[QT_INSTALL_LIBS]' "target.path = $out/lib" 37 + 38 + substituteInPlace plugin/plugin.pro \ 39 + --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' 40 + ''; 41 + 42 + nativeBuildInputs = [ 43 + qmake 44 + ]; 45 + 46 + buildInputs = [ 47 + qtbase 48 + qtdeclarative 49 + ]; 50 + 51 + meta = with lib; { 52 + description = "Library for accessing the ofono daemon, and declarative plugin for it"; 53 + homepage = "https://git.sailfishos.org/mer-core/libqofono/"; 54 + license = licenses.lgpl21Plus; 55 + maintainers = with maintainers; [ samueldr ]; 56 + platforms = platforms.linux; 57 + }; 58 + }
-1
pkgs/top-level/aliases.nix
··· 373 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; 374 joseki = apache-jena-fuseki; # added 2016-02-28 375 json_glib = json-glib; # added 2018-02-25 376 - kalk = kalker; # added 2021-06-03 377 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 378 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 379 kodiGBM = kodi-gbm;
··· 373 jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream"; 374 joseki = apache-jena-fuseki; # added 2016-02-28 375 json_glib = json-glib; # added 2018-02-25 376 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 377 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 378 kodiGBM = kodi-gbm;
+14 -2
pkgs/top-level/qt5-packages.nix
··· 43 }; 44 in (lib.makeOverridable mkGear attrs); 45 46 - in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { 47 48 - inherit kdeFrameworks plasma5 kdeGear qt5; 49 50 # Alias for backwards compatibility. Added 2021-05-07. 51 kdeApplications = kdeGear; ··· 88 89 kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; 90 91 kimageannotator = callPackage ../development/libraries/kimageannotator { }; 92 93 kproperty = callPackage ../development/libraries/kproperty { }; ··· 119 libqglviewer = callPackage ../development/libraries/libqglviewer { 120 inherit (pkgs.darwin.apple_sdk.frameworks) AGL; 121 }; 122 123 libqtav = callPackage ../development/libraries/libqtav { }; 124
··· 43 }; 44 in (lib.makeOverridable mkGear attrs); 45 46 + plasmaMobileGear = let 47 + mkPlamoGear = import ../applications/plasma-mobile; 48 + attrs = { 49 + inherit libsForQt5; 50 + inherit (pkgs) lib fetchurl; 51 + }; 52 + in (lib.makeOverridable mkPlamoGear attrs); 53 54 + in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { 55 + 56 + inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear qt5; 57 58 # Alias for backwards compatibility. Added 2021-05-07. 59 kdeApplications = kdeGear; ··· 96 97 kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; 98 99 + kirigami-addons = libsForQt5.callPackage ../development/libraries/kirigami-addons { }; 100 + 101 kimageannotator = callPackage ../development/libraries/kimageannotator { }; 102 103 kproperty = callPackage ../development/libraries/kproperty { }; ··· 129 libqglviewer = callPackage ../development/libraries/libqglviewer { 130 inherit (pkgs.darwin.apple_sdk.frameworks) AGL; 131 }; 132 + 133 + libqofono = callPackage ../development/libraries/libqofono { }; 134 135 libqtav = callPackage ../development/libraries/libqtav { }; 136