commit 0135e61b4c59357e01e0fda713e95402ea3a443c · pyrox.dev/nixpkgs

+53 -3

nixos/modules/services/continuous-integration/gitlab-runner.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.gitlab-runner;

     

       7
       7
       -
         configFile = pkgs.writeText "config.toml" cfg.configText;

     

       7
       7
       +
         configFile =

     

       8
       8
       +
           if (cfg.configFile == null) then

     

       9
       9
       +
             (pkgs.runCommand "config.toml" {

     

       10
       10
       +
               buildInputs = [ pkgs.remarshal ];

     

       11
       11
       +
             } ''

     

       12
       12
       +
               remarshal -if json -of toml \

     

       13
       13
       +
                 < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \

     

       14
       14
       +
                 > $out

     

       15
       15
       +
             '')

     

       16
       16
       +
           else

     

       17
       17
       +
             cfg.configFile;

     

       8
       18
        
         hasDocker = config.virtualisation.docker.enable;

     

       9
       19
        
       in

     

       10
       20
        
       {

     

       11
       21
        
         options.services.gitlab-runner = {

     

       12
       22
        
           enable = mkEnableOption "Gitlab Runner";

     

       13
       23
        
       

     

       14
       14
       -
           configText = mkOption {

     

       15
       15
       -
             description = "Verbatim config.toml to use";

     

       24
       24
       +
           configFile = mkOption {

     

       25
       25
       +
             default = null;

     

       26
       26
       +
             description = ''

     

       27
       27
       +
               Configuration file for gitlab-runner.

     

       28
       28
       +
               Use this option in favor of configOptions to avoid placing CI tokens in the nix store.

     

       29
       29
       +
       

     

       30
       30
       +
               <option>configFile</option> takes precedence over <option>configOptions</option>.

     

       31
       31
       +
       

     

       32
       32
       +
               Warning: Not using <option>configFile</option> will potentially result in secrets

     

       33
       33
       +
               leaking into the WORLD-READABLE nix store.

     

       34
       34
       +
             '';

     

       35
       35
       +
             type = types.nullOr types.path;

     

       36
       36
       +
           };

     

       37
       37
       +
       

     

       38
       38
       +
           configOptions = mkOption {

     

       39
       39
       +
             description = ''

     

       40
       40
       +
               Configuration for gitlab-runner

     

       41
       41
       +
               <option>configFile</option> will take precedence over this option.

     

       42
       42
       +
       

     

       43
       43
       +
               Warning: all Configuration, especially CI token, will be stored in a

     

       44
       44
       +
               WORLD-READABLE file in the Nix Store.

     

       45
       45
       +
       

     

       46
       46
       +
               If you want to protect your CI token use <option>configFile</option> instead.

     

       47
       47
       +
             '';

     

       48
       48
       +
             type = types.attrs;

     

       49
       49
       +
             example = {

     

       50
       50
       +
               concurrent = 2;

     

       51
       51
       +
               runners = [{

     

       52
       52
       +
                 name = "docker-nix-1.11";

     

       53
       53
       +
                 url = "https://CI/";

     

       54
       54
       +
                 token = "TOKEN";

     

       55
       55
       +
                 executor = "docker";

     

       56
       56
       +
                 builds_dir = "";

     

       57
       57
       +
                 docker = {

     

       58
       58
       +
                   host = "";

     

       59
       59
       +
                   image = "nixos/nix:1.11";

     

       60
       60
       +
                   privileged = true;

     

       61
       61
       +
                   disable_cache = true;

     

       62
       62
       +
                   cache_dir = "";

     

       63
       63
       +
                 };

     

       64
       64
       +
               }];

     

       65
       65
       +
             };

     

       16
       66
        
           };

     

       17
       67
        
       

     

       18
       68
        
           gracefulTermination = mkOption {

-1

nixos/modules/services/web-servers/phpfpm/default.nix

···

       150
       150
        
                 PrivateDevices = true;

     

       151
       151
        
                 ProtectSystem = "full";

     

       152
       152
        
                 ProtectHome = true;

     

       153
       153
       -
                 NoNewPrivileges = true;

     

       154
       153
        
                 RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";

     

       155
       154
        
                 Type = "notify";

     

       156
       155
        
                 ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";

+2 -2

pkgs/applications/audio/mopidy-iris/default.nix

···

       2
       2
        
       

     

       3
       3
        
       pythonPackages.buildPythonApplication rec {

     

       4
       4
        
         name = "mopidy-iris-${version}";

     

       5
       5
       -
         version = "3.1.3";

     

       5
       5
       +
         version = "3.2.0";

     

       6
       6
        
       

     

       7
       7
        
         src = pythonPackages.fetchPypi {

     

       8
       8
        
           inherit version;

     

       9
       9
        
           pname = "Mopidy-Iris";

     

       10
       10
       -
           sha256 = "144q83cfgdwlj5gv9wyi902xfjybsaa9n7d5azs14jpbnmmbj61f";

     

       10
       10
       +
           sha256 = "cb97cb14b2d6836f3c28c5fd0ada44b4a33f2e74380f44bd5d03beffa5f67b30";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         propagatedBuildInputs = [

+18 -19

pkgs/applications/audio/renoise/default.nix

···

       1
       1
       -
       { stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }:

     

       1
       1
       +
       { stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }:

     

       2
       2
        
       

     

       3
       3
       +
       # To use the full release version:

     

       4
       4
       +
       # 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version

     

       5
       5
       +
       #    for your machine to some stable location.

     

       6
       6
       +
       # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.

     

       7
       7
       +
       # Note: Renoise creates an individual build for each license which screws somewhat with the

     

       8
       8
       +
       # use of functions like requireFile as the hash will be different for every user.

     

       9
       9
       +
       let fileversion = "3_1_0";

     

       10
       10
       +
       in

     

       3
       11
        
       stdenv.mkDerivation rec {

     

       4
       12
        
         name = "renoise";

     

       5
       5
       -
       

     

       6
       13
        
         buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];

     

       7
       14
        
       

     

       8
       15
        
         src =

     

       9
       16
        
           if stdenv.system == "x86_64-linux" then

     

       10
       10
       -
               if demo then

     

       17
       17
       +
               if builtins.isNull releasePath then

     

       11
       18
        
               fetchurl {

     

       12
       12
       -
                   url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2";

     

       13
       13
       -
                   sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg";

     

       19
       19
       +
                   url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2";

     

       20
       20
       +
                   sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";

     

       14
       21
        
               }

     

       15
       22
        
               else

     

       16
       16
       -
               requireFile {

     

       17
       17
       -
                   url = "http://backstage.renoise.com/frontend/app/index.html#/login";

     

       18
       18
       -
                   name = "rns_3_0_1_linux_x86_64.tar.gz";

     

       19
       19
       -
                   sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd";

     

       20
       20
       -
               }

     

       23
       23
       +
               releasePath

     

       21
       24
        
           else if stdenv.system == "i686-linux" then

     

       22
       22
       -
               if demo then

     

       25
       25
       +
               if builtins.isNull releasePath then

     

       23
       26
        
               fetchurl {

     

       24
       24
       -
                   url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2";

     

       25
       25
       -
                   sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58";

     

       27
       27
       +
                   url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2";

     

       28
       28
       +
                   sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";

     

       26
       29
        
               }

     

       27
       30
        
               else

     

       28
       28
       -
               requireFile {

     

       29
       29
       -
                   url = "http://backstage.renoise.com/frontend/app/index.html#/login";

     

       30
       30
       -
                   name = "rns_3_0_1_reg_x86.tar.gz";

     

       31
       31
       -
                   sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7";

     

       32
       32
       -
               }

     

       33
       33
       -
           else throw "platform is not suppored by Renoise";

     

       31
       31
       +
               releasePath

     

       32
       32
       +
           else throw "Platform is not supported by Renoise";

     

       34
       33
        
       

     

       35
       34
        
         installPhase = ''

     

       36
       35
        
           cp -r Resources $out

+2 -6

pkgs/applications/display-managers/sddm/default.nix

···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
       in mkDerivation rec {

     

       17
       17
       -
         name = "sddm-unwrapped-${version}";

     

       17
       17
       +
         name = "sddm-${version}";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "sddm";

     
···

       36
       36
        
         nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];

     

       37
       37
        
       

     

       38
       38
        
         buildInputs = [

     

       39
       39
       -
           libxcb libpthreadstubs libXdmcp libXau pam systemd

     

       40
       40
       -
         ];

     

       41
       41
       -
       

     

       42
       42
       -
         propagatedBuildInputs = [

     

       43
       43
       -
           qtbase qtdeclarative

     

       39
       39
       +
           libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd

     

       44
       40
        
         ];

     

       45
       41
        
       

     

       46
       42
        
         cmakeFlags = [

+20

pkgs/applications/kde/akonadi-calendar.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts,

     

       5
       5
       +
         kidentitymanagement, kio, kmailtransport,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "akonadi-calendar";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         propagatedBuildInputs = [

     

       16
       16
       +
           akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement

     

       17
       17
       +
           kio kmailtransport

     

       18
       18
       +
         ];

     

       19
       19
       +
         outputs = [ "out" "dev" ];

     

       20
       20
       +
       }

+10 -6

pkgs/applications/kde/akonadi-contacts.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, lib,

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
        
         extra-cmake-modules,

     

       4
       4
       -
         akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,

     

       5
       5
       -
         kio, kitemmodels, kmime, ktextwidgets, qtwebengine,

     

       4
       4
       +
         qtwebengine,

     

       5
       5
       +
         grantlee,

     

       6
       6
       +
         kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison,

     

       7
       7
       +
         akonadi, akonadi-mime, kcontacts, kmime,

     

       6
       8
        
       }:

     

       7
       9
        
       

     

       8
       10
        
       mkDerivation {

     

       9
       11
        
         name = "akonadi-contacts";

     

       10
       12
        
         meta = {

     

       11
       13
        
           license = with lib.licenses; [ gpl2 lgpl21 ];

     

       12
       12
       -
           maintainers = [ lib.maintainers.ttuegel ];

     

       14
       14
       +
           maintainers = kdepimTeam;

     

       13
       15
        
         };

     

       14
       16
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       15
       17
        
         buildInputs = [

     

       16
       16
       -
           akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio

     

       17
       17
       -
           kitemmodels kmime ktextwidgets qtwebengine

     

       18
       18
       +
           qtwebengine

     

       19
       19
       +
           grantlee

     

       20
       20
       +
           kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison

     

       21
       21
       +
           akonadi-mime kcontacts kmime

     

       18
       22
        
         ];

     

       19
       23
        
         propagatedBuildInputs = [ akonadi ];

     

       20
       24
        
         outputs = [ "out" "dev" ];

+6 -8

pkgs/applications/kde/akonadi-mime.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, lib,

     

       3
       3
       -
         extra-cmake-modules,

     

       4
       4
       -
         akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime,

     

       5
       5
       -
         shared_mime_info

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, shared_mime_info,

     

       4
       4
       +
         akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime

     

       6
       5
        
       }:

     

       7
       6
        
       

     

       8
       7
        
       mkDerivation {

     

       9
       8
        
         name = "akonadi-mime";

     

       10
       9
        
         meta = {

     

       11
       10
        
           license = with lib.licenses; [ gpl2 lgpl21 ];

     

       12
       12
       -
           maintainers = [ lib.maintainers.ttuegel ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       13
       12
        
         };

     

       14
       14
       -
         nativeBuildInputs = [ extra-cmake-modules ];

     

       15
       15
       -
         buildInputs = [ akonadi shared_mime_info

     

       16
       16
       -
                         kdbusaddons ki18n kio kitemmodels kmime ];

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];

     

       14
       14
       +
         buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];

     

       17
       15
        
         outputs = [ "out" "dev" ];

     

       18
       16
        
       }

+18

pkgs/applications/kde/akonadi-notes.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, kcompletion, ki18n, kitemmodels, kmime, kxmlgui

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "akonadi-notes";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [

     

       15
       15
       +
           akonadi kcompletion ki18n kitemmodels kmime kxmlgui

     

       16
       16
       +
         ];

     

       17
       17
       +
         outputs = [ "out" "dev" ];

     

       18
       18
       +
       }

+20

pkgs/applications/kde/akonadi-search.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime,

     

       5
       5
       +
         krunner, qtbase, xapian

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "akonadi-search";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [ kcmutils krunner xapian ];

     

       16
       16
       +
         propagatedBuildInputs = [

     

       17
       17
       +
           akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase

     

       18
       18
       +
         ];

     

       19
       19
       +
         outputs = [ "out" "dev" ];

     

       20
       20
       +
       }

+10 -10

pkgs/applications/kde/akonadi/akonadi-paths.patch

···

       33
       33
        
       -    }

     

       34
       34
        
        

     

       35
       35
        
       -    const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);

     

       36
       36
       -
       +    const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);

     

       36
       36
       +
       +    const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);

     

       37
       37
        
            if (!mysqladminPath.isEmpty()) {

     

       38
       38
        
        #ifndef Q_OS_WIN

     

       39
       39
        
                defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")

     
···

       42
       42
        
            }

     

       43
       43
        
        

     

       44
       44
        
       -    mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);

     

       45
       45
       -
       +    mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);

     

       45
       45
       +
       +    mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);

     

       46
       46
        
            qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;

     

       47
       47
        
        

     

       48
       48
        
       -    mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);

     

       49
       49
       -
       +    mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK);

     

       49
       49
       +
       +    mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);

     

       50
       50
        
            qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;

     

       51
       51
        
        

     

       52
       52
        
            mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();

     
···

       55
       55
        
            mPassword = settings.value(QStringLiteral("Password")).toString();

     

       56
       56
        
            mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();

     

       57
       57
        
       -    mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();

     

       58
       58
       -
       +    mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);

     

       58
       58
       +
       +    mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);

     

       59
       59
        
            mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();

     

       60
       60
        
            settings.endGroup();

     

       61
       61
        
        

     
···

       84
       84
        
        

     

       85
       85
        
            // generate config file

     

       86
       86
        
       -    const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));

     

       87
       87
       -
       +    const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");

     

       87
       87
       +
       +    const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");

     

       88
       88
        
            const QString localConfig  = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));

     

       89
       89
        
            const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");

     

       90
       90
        
            if (globalConfig.isEmpty()) {

     
···

       133
       133
        
       -

     

       134
       134
        
       -        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);

     

       135
       135
        
       -        defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);

     

       136
       136
       -
       +        defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);

     

       136
       136
       +
       +        defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);

     

       137
       137
        
                defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));

     

       138
       138
        
                defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));

     

       139
       139
        
            }

     
···

       145
       145
        
       -    if (mInternalServer && mServerPath.isEmpty()) {

     

       146
       146
        
       -        mServerPath = defaultServerPath;

     

       147
       147
        
       -    }

     

       148
       148
       -
       +    mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);

     

       148
       148
       +
       +    mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL);

     

       149
       149
        
            qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;

     

       150
       150
        
            mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();

     

       151
       151
        
            if (mInternalServer && mInitDbPath.isEmpty()) {

     
···

       166
       166
        
                Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);

     

       167
       167
        
                const QStringList arguments = QStringList() << executable << identifier();

     

       168
       168
        
       -        const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));

     

       169
       169
       -
       +        const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher");

     

       169
       169
       +
       +        const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");

     

       170
       170
        
                mController->start(agentLauncherExec, arguments);

     

       171
       171
        
            }

     

       172
       172
        
            return true;

     
···

       179
       179
        
            mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld

     

       180
       180
        
            connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);

     

       181
       181
        
       -    mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);

     

       182
       182
       -
       +    mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);

     

       182
       182
       +
       +    mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);

     

       183
       183
        
        

     

       184
       184
        
            if (mAgentServerEnabled) {

     

       185
       185
        
                mAgentServer = new Akonadi::ProcessControl;

     

       186
       186
        
                connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);

     

       187
       187
        
       -        mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);

     

       188
       188
       -
       +        mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);

     

       188
       188
       +
       +        mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);

     

       189
       189
        
            }

     

       190
       190
        
        

     

       191
       191
        
        #ifndef QT_NO_DEBUG

+9 -13

pkgs/applications/kde/akonadi/default.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, copyPathsToStore, lib,

     

       3
       3
       -
         extra-cmake-modules,

     

       4
       4
       -
         kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,

     

       5
       5
       -
         kwindowsystem, kcrash, kio,

     

       6
       6
       -
         boost, kitemmodels, shared_mime_info,

     

       7
       7
       -
         mysql

     

       2
       2
       +
         mkDerivation, copyPathsToStore, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, shared_mime_info,

     

       4
       4
       +
         boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,

     

       5
       5
       +
         ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,

     

       8
       6
        
       }:

     

       9
       7
        
       

     

       10
       8
        
       mkDerivation {

     

       11
       9
        
         name = "akonadi";

     

       12
       10
        
         meta = {

     

       13
       11
        
           license = [ lib.licenses.lgpl21 ];

     

       14
       14
       -
           maintainers = [ lib.maintainers.ttuegel ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       15
       13
        
         };

     

       16
       14
        
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       17
       17
       -
         nativeBuildInputs = [ extra-cmake-modules ];

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];

     

       18
       16
        
         buildInputs = [

     

       19
       19
       -
           kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio

     

       20
       20
       -
           kwindowsystem kcrash shared_mime_info

     

       17
       17
       +
           kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n

     

       18
       18
       +
           kiconthemes kio kwindowsystem qttools

     

       21
       19
        
         ];

     

       22
       20
        
         propagatedBuildInputs = [ boost kitemmodels ];

     

       23
       23
       -
         cmakeFlags = [

     

       24
       24
       -
           "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld"

     

       25
       25
       -
         ];

     

       21
       21
       +
         outputs = [ "out" "dev" ];

     

       26
       22
        
         NIX_CFLAGS_COMPILE = [

     

       27
       23
        
           ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"''

     

       28
       24
        
           ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"''

+21

pkgs/applications/kde/akonadiconsole.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,

     

       5
       5
       +
         kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit,

     

       6
       6
       +
         ktextwidgets, kxmlgui, messagelib, qtbase,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       mkDerivation {

     

       10
       10
       +
         name = "akonadiconsole";

     

       11
       11
       +
         meta = {

     

       12
       12
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       13
       13
       +
           maintainers = kdepimTeam;

     

       14
       14
       +
         };

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets

     

       18
       18
       +
           kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui

     

       19
       19
       +
           messagelib qtbase

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+30

pkgs/applications/kde/akregator.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         qtwebengine,

     

       5
       5
       +
         grantlee,

     

       6
       6
       +
         kcmutils, kcrash, kiconthemes, knotifyconfig, kparts, ktexteditor,

     

       7
       7
       +
         kwindowsystem,

     

       8
       8
       +
         akonadi, akonadi-mime, grantleetheme, kontactinterface, libkdepim, libkleo,

     

       9
       9
       +
         messagelib, syndication

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       mkDerivation {

     

       13
       13
       +
         name = "akregator";

     

       14
       14
       +
         meta = {

     

       15
       15
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       16
       16
       +
           maintainers = kdepimTeam;

     

       17
       17
       +
         };

     

       18
       18
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       19
       19
       +
         buildInputs = [

     

       20
       20
       +
           qtwebengine

     

       21
       21
       +
       

     

       22
       22
       +
           grantlee

     

       23
       23
       +
       

     

       24
       24
       +
           kcmutils kcrash kiconthemes knotifyconfig kparts ktexteditor kwindowsystem

     

       25
       25
       +
       

     

       26
       26
       +
           akonadi akonadi-mime grantleetheme kontactinterface libkdepim libkleo

     

       27
       27
       +
           messagelib syndication

     

       28
       28
       +
         ];

     

       29
       29
       +
         outputs = [ "out" "dev" ];

     

       30
       30
       +
       }

+2 -2

pkgs/applications/kde/ark/default.nix

···

       7
       7
        
         khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive,

     

       8
       8
        
       

     

       9
       9
        
         # Archive tools

     

       10
       10
       -
         p7zip, unzipNLS, zip,

     

       10
       10
       +
         p7zip, unzip, zip,

     

       11
       11
        
       

     

       12
       12
        
         # Unfree tools

     

       13
       13
        
         unfreeEnableUnrar ? false, unrar,

     
···

       25
       25
        
           let

     

       26
       26
        
             PATH =

     

       27
       27
        
               lib.makeBinPath

     

       28
       28
       -
               ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);

     

       28
       28
       +
               ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);

     

       29
       29
        
           in ''

     

       30
       30
        
             wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"

     

       31
       31
        
           '';

-20

pkgs/applications/kde/build-support/application.nix

···

       1
       1
       -
       { mkDerivation, lib, srcs }:

     

       2
       2
       -
       

     

       3
       3
       -
       args:

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
         inherit (args) name;

     

       7
       7
       -
         sname = args.sname or name;

     

       8
       8
       -
         inherit (srcs."${sname}") src version;

     

       9
       9
       -
       in

     

       10
       10
       -
       mkDerivation (args // {

     

       11
       11
       -
         name = "${name}-${version}";

     

       12
       12
       -
         inherit src;

     

       13
       13
       -
       

     

       14
       14
       -
         outputs = args.outputs or [ "out" "dev" ];

     

       15
       15
       -
       

     

       16
       16
       -
         meta = {

     

       17
       17
       -
           platforms = lib.platforms.linux;

     

       18
       18
       -
           homepage = http://www.kde.org;

     

       19
       19
       -
         } // (args.meta or {});

     

       20
       20
       -
       })

+20

pkgs/applications/kde/calendarsupport.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,

     

       5
       5
       +
         kholidays, kidentitymanagement, kmime, pimcommon, qttools,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "calendarsupport";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools

     

       17
       17
       +
         ];

     

       18
       18
       +
         propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];

     

       19
       19
       +
         outputs = [ "out" "dev" ];

     

       20
       20
       +
       }

+68 -10

pkgs/applications/kde/default.nix

···

       33
       33
        
       let

     

       34
       34
        
         mirror = "mirror://kde";

     

       35
       35
        
         srcs = import ./srcs.nix { inherit fetchurl mirror; };

     

       36
       36
       -
       in

     

       37
       36
        
       

     

       38
       38
       -
       let

     

       37
       37
       +
         mkDerivation = args:

     

       38
       38
       +
           let

     

       39
       39
       +
             inherit (args) name;

     

       40
       40
       +
             sname = args.sname or name;

     

       41
       41
       +
             inherit (srcs."${sname}") src version;

     

       42
       42
       +
             mkDerivation =

     

       43
       43
       +
               libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};

     

       44
       44
       +
           in

     

       45
       45
       +
             mkDerivation (args // {

     

       46
       46
       +
               name = "${name}-${version}";

     

       47
       47
       +
               inherit src;

     

       48
       48
       +
       

     

       49
       49
       +
               outputs = args.outputs or [ "out" ];

     

       50
       50
       +
       

     

       51
       51
       +
               meta = {

     

       52
       52
       +
                 platforms = lib.platforms.linux;

     

       53
       53
       +
                 homepage = "http://www.kde.org";

     

       54
       54
       +
               } // (args.meta or {});

     

       55
       55
       +
             });

     

       39
       56
        
       

     

       40
       57
        
         packages = self: with self;

     

       41
       58
        
           let

     

       42
       59
        
             callPackage = self.newScope {

     

       43
       43
       -
               mkDerivation = import ./build-support/application.nix {

     

       44
       44
       -
                 inherit lib;

     

       45
       45
       -
                 inherit srcs;

     

       46
       46
       -
                 mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};

     

       47
       47
       -
               };

     

       60
       60
       +
               inherit mkDerivation;

     

       61
       61
       +
       

     

       62
       62
       +
               # Team of maintainers assigned to the KDE PIM suite

     

       63
       63
       +
               kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];

     

       48
       64
        
             };

     

       49
       65
        
           in {

     

       50
       66
        
             kdelibs = callPackage ./kdelibs { inherit attica phonon; };

     

       51
       67
        
             akonadi = callPackage ./akonadi {};

     

       68
       68
       +
             akonadi-calendar = callPackage ./akonadi-calendar.nix {};

     

       52
       69
        
             akonadi-contacts = callPackage ./akonadi-contacts.nix {};

     

       53
       70
        
             akonadi-mime = callPackage ./akonadi-mime.nix {};

     

       54
       54
       -
             ark = callPackage ./ark/default.nix {};

     

       71
       71
       +
             akonadi-notes = callPackage ./akonadi-notes.nix {};

     

       72
       72
       +
             akonadi-search = callPackage ./akonadi-search.nix {};

     

       73
       73
       +
             akonadiconsole = callPackage ./akonadiconsole.nix {};

     

       74
       74
       +
             akregator = callPackage ./akregator.nix {};

     

       75
       75
       +
             ark = callPackage ./ark {};

     

       55
       76
        
             baloo-widgets = callPackage ./baloo-widgets.nix {};

     

       77
       77
       +
             calendarsupport = callPackage ./calendarsupport.nix {};

     

       56
       78
        
             dolphin = callPackage ./dolphin.nix {};

     

       57
       79
        
             dolphin-plugins = callPackage ./dolphin-plugins.nix {};

     

       80
       80
       +
             eventviews = callPackage ./eventviews.nix {};

     

       58
       81
        
             ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };

     

       59
       82
        
             filelight = callPackage ./filelight.nix {};

     

       83
       83
       +
             grantleetheme = callPackage ./grantleetheme {};

     

       60
       84
        
             gwenview = callPackage ./gwenview.nix {};

     

       85
       85
       +
             incidenceeditor = callPackage ./incidenceeditor.nix {};

     

       61
       86
        
             k3b = callPackage ./k3b.nix {};

     

       87
       87
       +
             kaddressbook = callPackage ./kaddressbook.nix {};

     

       88
       88
       +
             kalarmcal = callPackage ./kalarmcal.nix {};

     

       62
       89
        
             kate = callPackage ./kate.nix {};

     

       63
       63
       -
             kdenlive = callPackage ./kdenlive.nix {};

     

       90
       90
       +
             kcachegrind = callPackage ./kcachegrind.nix {};

     

       64
       91
        
             kcalc = callPackage ./kcalc.nix {};

     

       65
       65
       -
             kcachegrind = callPackage ./kcachegrind.nix {};

     

       92
       92
       +
             kcalcore = callPackage ./kcalcore.nix {};

     

       93
       93
       +
             kcalutils = callPackage ./kcalutils.nix {};

     

       66
       94
        
             kcolorchooser = callPackage ./kcolorchooser.nix {};

     

       67
       95
        
             kcontacts = callPackage ./kcontacts.nix {};

     

       96
       96
       +
             kdav = callPackage ./kdav.nix {};

     

       68
       97
        
             kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};

     

       69
       98
        
             kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};

     

       70
       99
        
             kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};

     

       100
       100
       +
             kdenlive = callPackage ./kdenlive.nix {};

     

       101
       101
       +
             kdepim-runtime = callPackage ./kdepim-runtime.nix {};

     

       102
       102
       +
             kdepim-apps-libs = callPackage ./kdepim-apps-libs {};

     

       71
       103
        
             kdf = callPackage ./kdf.nix {};

     

       72
       104
        
             kgpg = callPackage ./kgpg.nix {};

     

       73
       105
        
             khelpcenter = callPackage ./khelpcenter.nix {};

     

       106
       106
       +
             kholidays = callPackage ./kholidays.nix {};

     

       107
       107
       +
             kidentitymanagement = callPackage ./kidentitymanagement.nix {};

     

       74
       108
        
             kig = callPackage ./kig.nix {};

     

       109
       109
       +
             kimap = callPackage ./kimap.nix {};

     

       75
       110
        
             kio-extras = callPackage ./kio-extras.nix {};

     

       111
       111
       +
             kldap = callPackage ./kldap.nix {};

     

       112
       112
       +
             kleopatra = callPackage ./kleopatra.nix {};

     

       113
       113
       +
             kmail = callPackage ./kmail.nix {};

     

       114
       114
       +
             kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};

     

       115
       115
       +
             kmailtransport = callPackage ./kmailtransport.nix {};

     

       116
       116
       +
             kmbox = callPackage ./kmbox.nix {};

     

       76
       117
        
             kmime = callPackage ./kmime.nix {};

     

       77
       118
        
             kmix = callPackage ./kmix.nix {};

     

       78
       119
        
             kolourpaint = callPackage ./kolourpaint.nix {};

     

       79
       120
        
             kompare = callPackage ./kompare.nix {};

     

       80
       121
        
             konsole = callPackage ./konsole.nix {};

     

       122
       122
       +
             kontact = callPackage ./kontact.nix {};

     

       123
       123
       +
             kontactinterface = callPackage ./kontactinterface.nix {};

     

       124
       124
       +
             korganizer = callPackage ./korganizer.nix {};

     

       125
       125
       +
             kpimtextedit = callPackage ./kpimtextedit.nix {};

     

       126
       126
       +
             kqtquickcharts = callPackage ./kqtquickcharts.nix {};

     

       81
       127
        
             krfb = callPackage ./krfb.nix {};

     

       128
       128
       +
             ktnef = callPackage ./ktnef.nix {};

     

       82
       129
        
             kwalletmanager = callPackage ./kwalletmanager.nix {};

     

       130
       130
       +
             libgravatar = callPackage ./libgravatar.nix {};

     

       83
       131
        
             libkcddb = callPackage ./libkcddb.nix {};

     

       84
       132
        
             libkdcraw = callPackage ./libkdcraw.nix {};

     

       133
       133
       +
             libkdepim = callPackage ./libkdepim.nix {};

     

       85
       134
        
             libkexiv2 = callPackage ./libkexiv2.nix {};

     

       86
       135
        
             libkipi = callPackage ./libkipi.nix {};

     

       136
       136
       +
             libkleo = callPackage ./libkleo.nix {};

     

       87
       137
        
             libkomparediff2 = callPackage ./libkomparediff2.nix {};

     

       138
       138
       +
             libksieve = callPackage ./libksieve.nix {};

     

       139
       139
       +
             mailcommon = callPackage ./mailcommon.nix {};

     

       140
       140
       +
             mailimporter = callPackage ./mailimporter.nix {};

     

       88
       141
        
             marble = callPackage ./marble.nix {};

     

       142
       142
       +
             mbox-importer = callPackage ./mbox-importer.nix {};

     

       143
       143
       +
             messagelib = callPackage ./messagelib.nix {};

     

       89
       144
        
             okteta = callPackage ./okteta.nix {};

     

       90
       145
        
             okular = callPackage ./okular.nix {};

     

       146
       146
       +
             pimcommon = callPackage ./pimcommon.nix {};

     

       147
       147
       +
             pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};

     

       91
       148
        
             print-manager = callPackage ./print-manager.nix {};

     

       92
       149
        
             spectacle = callPackage ./spectacle.nix {};

     

       150
       150
       +
             syndication = callPackage ./syndication.nix {};

     

       93
       151
        
       

     

       94
       152
        
             l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });

     

       95
       153
        
           };

+18

pkgs/applications/kde/eventviews.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "eventviews";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [

     

       15
       15
       +
           akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools

     

       16
       16
       +
         ];

     

       17
       17
       +
         outputs = [ "out" "dev" ];

     

       18
       18
       +
       }

+1 -1

pkgs/applications/kde/ffmpegthumbs.nix

···

       11
       11
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       14
       14
       -
         propagatedBuildInputs = [ ffmpeg kio ];

     

       14
       14
       +
         buildInputs = [ ffmpeg kio ];

     

       15
       15
        
       }

+20

pkgs/applications/kde/grantleetheme/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, copyPathsToStore, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "grantleetheme";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         output = [ "out" "dev" ];

     

       14
       14
       +
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase

     

       18
       18
       +
         ];

     

       19
       19
       +
         propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ];

     

       20
       20
       +
       }

+166

pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch

···

       1
       1
       +
       Index: grantleetheme-17.04.0/src/grantleetheme_p.h

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- grantleetheme-17.04.0.orig/src/grantleetheme_p.h

     

       4
       4
       +
       +++ grantleetheme-17.04.0/src/grantleetheme_p.h

     

       5
       5
       +
       @@ -47,7 +47,7 @@ public:

     

       6
       6
       +
            QString description;

     

       7
       7
       +
            QString name;

     

       8
       8
       +
            QString dirName;

     

       9
       9
       +
       -    QString absolutePath;

     

       10
       10
       +
       +    QStringList absolutePaths;

     

       11
       11
       +
            QString author;

     

       12
       12
       +
            QString email;

     

       13
       13
       +
        

     

       14
       14
       +
       Index: grantleetheme-17.04.0/src/grantleetheme.cpp

     

       15
       15
       +
       ===================================================================

     

       16
       16
       +
       --- grantleetheme-17.04.0.orig/src/grantleetheme.cpp

     

       17
       17
       +
       +++ grantleetheme-17.04.0/src/grantleetheme.cpp

     

       18
       18
       +
       @@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr

     

       19
       19
       +
            , description(other.description)

     

       20
       20
       +
            , name(other.name)

     

       21
       21
       +
            , dirName(other.dirName)

     

       22
       22
       +
       -    , absolutePath(other.absolutePath)

     

       23
       23
       +
       +    , absolutePaths(other.absolutePaths)

     

       24
       24
       +
            , author(other.author)

     

       25
       25
       +
            , email(other.email)

     

       26
       26
       +
            , loader(other.loader)

     

       27
       27
       +
       @@ -63,12 +63,15 @@ void ThemePrivate::setupEngine()

     

       28
       28
       +
        

     

       29
       29
       +
        void ThemePrivate::setupLoader()

     

       30
       30
       +
        {

     

       31
       31
       +
       -    // Get the parent dir with themes, we set the theme directory separately

     

       32
       32
       +
       -    QDir dir(absolutePath);

     

       33
       33
       +
       -    dir.cdUp();

     

       34
       34
       +
       +    QStringList templateDirs;

     

       35
       35
       +
       +    for (const QString& path : absolutePaths) {

     

       36
       36
       +
       +        QDir dir(path);

     

       37
       37
       +
       +        dir.cdUp();

     

       38
       38
       +
       +        templateDirs << dir.absolutePath();

     

       39
       39
       +
       +    }

     

       40
       40
       +
        

     

       41
       41
       +
            loader = QSharedPointer<Grantlee::FileSystemTemplateLoader>::create();

     

       42
       42
       +
       -    loader->setTemplateDirs({ dir.absolutePath() });

     

       43
       43
       +
       +    loader->setTemplateDirs(templateDirs);

     

       44
       44
       +
            loader->setTheme(dirName);

     

       45
       45
       +
        

     

       46
       46
       +
            if (!sEngine) {

     

       47
       47
       +
       @@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons

     

       48
       48
       +
            Grantlee::Context ctx = createContext();

     

       49
       49
       +
            ctx.insert(QStringLiteral("error"), reason);

     

       50
       50
       +
            ctx.insert(QStringLiteral("templateName"), origTemplateName);

     

       51
       51
       +
       -    const QString errorString = failedTemplate

     

       52
       52
       +
       -            ? failedTemplate->errorString()

     

       53
       53
       +
       -            : QStringLiteral("(null template)");

     

       54
       54
       +
       +    const QString errorString = failedTemplate->errorString();

     

       55
       55
       +
            ctx.insert(QStringLiteral("errorMessage"), errorString);

     

       56
       56
       +
            return tpl->render(&ctx);

     

       57
       57
       +
        }

     

       58
       58
       +
       @@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c

     

       59
       59
       +
            KConfigGroup group(&config, QStringLiteral("Desktop Entry"));

     

       60
       60
       +
            if (group.isValid()) {

     

       61
       61
       +
                d->dirName = dirName;

     

       62
       62
       +
       -        d->absolutePath = themePath;

     

       63
       63
       +
       +        d->absolutePaths = QStringList(themePath);

     

       64
       64
       +
                d->name = group.readEntry("Name", QString());

     

       65
       65
       +
                d->description = group.readEntry("Description", QString());

     

       66
       66
       +
                d->themeFileName = group.readEntry("FileName", QString());

     

       67
       67
       +
       @@ -141,7 +142,7 @@ Theme::~Theme()

     

       68
       68
       +
        

     

       69
       69
       +
        bool Theme::operator==(const Theme &other) const

     

       70
       70
       +
        {

     

       71
       71
       +
       -    return isValid() && other.isValid() && d->absolutePath == other.absolutePath();

     

       72
       72
       +
       +    return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();

     

       73
       73
       +
        }

     

       74
       74
       +
        

     

       75
       75
       +
        Theme &Theme::operator=(const Theme &other)

     

       76
       76
       +
       @@ -185,7 +186,12 @@ QString Theme::dirName() const

     

       77
       77
       +
        

     

       78
       78
       +
        QString Theme::absolutePath() const

     

       79
       79
       +
        {

     

       80
       80
       +
       -    return d->absolutePath;

     

       81
       81
       +
       +    return d->absolutePaths.first();

     

       82
       82
       +
       +}

     

       83
       83
       +
       +

     

       84
       84
       +
       +QStringList Theme::absolutePaths() const

     

       85
       85
       +
       +{

     

       86
       86
       +
       +    return d->absolutePaths;

     

       87
       87
       +
        }

     

       88
       88
       +
        

     

       89
       89
       +
        QString Theme::author() const

     

       90
       90
       +
       @@ -224,6 +230,13 @@ QString Theme::render(const QString &tem

     

       91
       91
       +
            return result;

     

       92
       92
       +
        }

     

       93
       93
       +
        

     

       94
       94
       +
       +void Theme::addThemeDir(const QString& path)

     

       95
       95
       +
       +{

     

       96
       96
       +
       +    QDir dir(path);

     

       97
       97
       +
       +    dir.cdUp();

     

       98
       98
       +
       +    d->absolutePaths << dir.absolutePath();

     

       99
       99
       +
       +}

     

       100
       100
       +
       +

     

       101
       101
       +
        void Theme::addPluginPath(const QString &path)

     

       102
       102
       +
        {

     

       103
       103
       +
            if (!ThemePrivate::sEngine) {

     

       104
       104
       +
       Index: grantleetheme-17.04.0/src/grantleetheme.h

     

       105
       105
       +
       ===================================================================

     

       106
       106
       +
       --- grantleetheme-17.04.0.orig/src/grantleetheme.h

     

       107
       107
       +
       +++ grantleetheme-17.04.0/src/grantleetheme.h

     

       108
       108
       +
       @@ -50,11 +50,14 @@ public:

     

       109
       109
       +
            QStringList displayExtraVariables() const;

     

       110
       110
       +
            QString dirName() const;

     

       111
       111
       +
            QString absolutePath() const;

     

       112
       112
       +
       +    QStringList absolutePaths() const;

     

       113
       113
       +
            QString author() const;

     

       114
       114
       +
            QString authorEmail() const;

     

       115
       115
       +
        

     

       116
       116
       +
            QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());

     

       117
       117
       +
        

     

       118
       118
       +
       +    void addThemeDir(const QString&);

     

       119
       119
       +
       +

     

       120
       120
       +
            static void addPluginPath(const QString &path);

     

       121
       121
       +
        

     

       122
       122
       +
        private:

     

       123
       123
       +
       Index: grantleetheme-17.04.0/src/grantleethememanager.cpp

     

       124
       124
       +
       ===================================================================

     

       125
       125
       +
       --- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp

     

       126
       126
       +
       +++ grantleetheme-17.04.0/src/grantleethememanager.cpp

     

       127
       127
       +
       @@ -142,25 +142,18 @@ public:

     

       128
       128
       +
        

     

       129
       129
       +
                for (const QString &directory : qAsConst(themesDirectories)) {

     

       130
       130
       +
                    QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);

     

       131
       131
       +
       -            QStringList alreadyLoadedThemeName;

     

       132
       132
       +
                    while (dirIt.hasNext()) {

     

       133
       133
       +
                        dirIt.next();

     

       134
       134
       +
                        const QString dirName = dirIt.fileName();

     

       135
       135
       +
                        GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);

     

       136
       136
       +
                        if (theme.isValid()) {

     

       137
       137
       +
                            QString themeName = theme.name();

     

       138
       138
       +
       -                    if (alreadyLoadedThemeName.contains(themeName)) {

     

       139
       139
       +
       -                        int i = 2;

     

       140
       140
       +
       -                        const QString originalName(theme.name());

     

       141
       141
       +
       -                        while (alreadyLoadedThemeName.contains(themeName)) {

     

       142
       142
       +
       -                            themeName = originalName + QStringLiteral(" (%1)").arg(i);

     

       143
       143
       +
       -                            ++i;

     

       144
       144
       +
       -                        }

     

       145
       145
       +
       -                        theme.d->name = themeName;

     

       146
       146
       +
       +                    QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName);

     

       147
       147
       +
       +                    if (i != themes.end()) {

     

       148
       148
       +
       +                        i.value().addThemeDir(dirIt.filePath());

     

       149
       149
       +
       +                    } else {

     

       150
       150
       +
       +                        themes.insert(dirName, theme);

     

       151
       151
       +
                            }

     

       152
       152
       +
       -                    alreadyLoadedThemeName << themeName;

     

       153
       153
       +
       -                    themes.insert(dirName, theme);

     

       154
       154
       +
       -                    //qDebug()<<" theme.name()"<<theme.name();

     

       155
       155
       +
                        }

     

       156
       156
       +
                    }

     

       157
       157
       +
                    watch->addDir(directory);

     

       158
       158
       +
       @@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con

     

       159
       159
       +
                        GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);

     

       160
       160
       +
                        if (theme.isValid()) {

     

       161
       161
       +
                            if (dirName == themeName) {

     

       162
       162
       +
       -                        return theme.absolutePath();

     

       163
       163
       +
       +                        return theme.absolutePaths().first();

     

       164
       164
       +
                            }

     

       165
       165
       +
                        }

     

       166
       166
       +
                    }

+25

pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch

···

       1
       1
       +
       diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp

     

       2
       2
       +
       index b86fc3a..8af72f4 100644

     

       3
       3
       +
       --- a/src/grantleetheme.cpp

     

       4
       4
       +
       +++ b/src/grantleetheme.cpp

     

       5
       5
       +
       @@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason,

     

       6
       6
       +
            Grantlee::Context ctx = createContext();

     

       7
       7
       +
            ctx.insert(QStringLiteral("error"), reason);

     

       8
       8
       +
            ctx.insert(QStringLiteral("templateName"), origTemplateName);

     

       9
       9
       +
       -    ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString());

     

       10
       10
       +
       +    const QString errorString = failedTemplate

     

       11
       11
       +
       +            ? failedTemplate->errorString()

     

       12
       12
       +
       +            : QStringLiteral("(null template)");

     

       13
       13
       +
       +    ctx.insert(QStringLiteral("errorMessage"), errorString);

     

       14
       14
       +
            return tpl->render(&ctx);

     

       15
       15
       +
        }

     

       16
       16
       +
        

     

       17
       17
       +
       @@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con

     

       18
       18
       +
            }

     

       19
       19
       +
        

     

       20
       20
       +
            Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine);

     

       21
       21
       +
       -    if (tpl->error()) {

     

       22
       22
       +
       +    if (!tpl || tpl->error()) {

     

       23
       23
       +
                return d->errorTemplate(i18n("Template parsing error"), templateName, tpl);

     

       24
       24
       +
            }

     

       25
       25
       +

+2

pkgs/applications/kde/grantleetheme/series

···

       1
       1
       +
       grantleetheme_check_null.patch

     

       2
       2
       +
       grantlee-merge-theme-dirs.patch

+20

pkgs/applications/kde/incidenceeditor.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,

     

       5
       5
       +
         kdiagram, kldap, kmime, qtbase,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "incidenceeditor";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram

     

       17
       17
       +
           kldap kmime qtbase

     

       18
       18
       +
         ];

     

       19
       19
       +
         outputs = [ "out" "dev" ];

     

       20
       20
       +
       }

+1 -1

pkgs/applications/kde/k3b.nix

···

       15
       15
        
           maintainers = with maintainers; [ sander phreedom ];

     

       16
       16
        
           platforms = platforms.linux;

     

       17
       17
        
         };

     

       18
       18
       -
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];

     

       18
       18
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ];

     

       19
       19
        
         propagatedBuildInputs = [

     

       20
       20
        
           # qt

     

       21
       21
        
           qtwebkit

+22

pkgs/applications/kde/kaddressbook.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,

     

       5
       5
       +
         kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,

     

       6
       6
       +
         kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison,

     

       7
       7
       +
         qgpgme, qtbase,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       mkDerivation {

     

       11
       11
       +
         name = "kaddressbook";

     

       12
       12
       +
         meta = {

     

       13
       13
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       14
       14
       +
           maintainers = kdepimTeam;

     

       15
       15
       +
         };

     

       16
       16
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash

     

       19
       19
       +
           kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit

     

       20
       20
       +
           kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase

     

       21
       21
       +
         ];

     

       22
       22
       +
       }

+19

pkgs/applications/kde/kalarmcal.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,

     

       5
       5
       +
         kpimtextedit,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "kalarmcal";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         propagatedBuildInputs = [

     

       16
       16
       +
           akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit

     

       17
       17
       +
         ];

     

       18
       18
       +
         outputs = [ "out" "dev" ];

     

       19
       19
       +
       }

+2 -4

pkgs/applications/kde/kcachegrind.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib,

     

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         kio, ki18n, karchive, qttools,

     

       5
       5
       -
         perl, python, php

     

       4
       4
       +
         karchive, ki18n, kio, perl, python, php, qttools,

     

       6
       5
        
       }:

     

       7
       6
        
       

     

       8
       7
        
       mkDerivation {

     
···

       12
       11
        
           maintainers = with lib.maintainers; [ orivej ];

     

       13
       12
        
         };

     

       14
       13
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       -
         propagatedBuildInputs = [ kio ];

     

       16
       16
       -
         buildInputs = [ perl python php ki18n karchive qttools ];

     

       14
       14
       +
         buildInputs = [ karchive ki18n kio perl python php qttools ];

     

       17
       15
        
       }

+4 -4

pkgs/applications/kde/kcalc.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib,

     

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp

     

       4
       4
       +
         gmp, kconfig, kconfigwidgets, kguiaddons, ki18n, kinit, knotifications,

     

       5
       5
       +
         kxmlgui,

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       mkDerivation {

     
···

       11
       12
        
           maintainers = [ lib.maintainers.fridh ];

     

       12
       13
        
         };

     

       13
       14
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       -
         buildInputs = [ gmp ];

     

       15
       15
       -
         propagatedBuildInputs = [

     

       16
       16
       -
           kconfig kconfigwidgets kguiaddons kinit knotifications

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           gmp kconfig kconfigwidgets kguiaddons ki18n kinit knotifications kxmlgui

     

       17
       17
        
         ];

     

       18
       18
        
       }

+16

pkgs/applications/kde/kcalcore.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kdelibs4support, libical

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kcalcore";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         propagatedBuildInputs = [ kdelibs4support libical ];

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       16
       16
       +
       }

+20

pkgs/applications/kde/kcalutils.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,

     

       5
       5
       +
         kidentitymanagement, kpimtextedit,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "kcalutils";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support

     

       17
       17
       +
           kidentitymanagement kpimtextedit

     

       18
       18
       +
         ];

     

       19
       19
       +
         outputs = [ "out" "dev" ];

     

       20
       20
       +
       }

+1 -2

pkgs/applications/kde/kcolorchooser.nix

···

       11
       11
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       14
       14
       -
         buildInputs = [ ki18n ];

     

       15
       15
       -
         propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];

     

       14
       14
       +
         buildInputs = [ ki18n kwidgetsaddons kxmlgui ];

     

       16
       15
        
       }

+3 -2

pkgs/applications/kde/kcontacts.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, lib,

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
        
         extra-cmake-modules,

     

       4
       4
        
         kcoreaddons, kconfig, kcodecs, ki18n, qtbase,

     

       5
       5
        
       }:

     
···

       8
       8
        
         name = "kcontacts";

     

       9
       9
        
         meta = {

     

       10
       10
        
           license = [ lib.licenses.lgpl21 ];

     

       11
       11
       -
           maintainers = [ lib.maintainers.ttuegel ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       14
       14
        
         buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       15
       16
        
       }

+16

pkgs/applications/kde/kdav.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kcoreaddons, kio, qtxmlpatterns,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kdav";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [ kcoreaddons kio qtxmlpatterns ];

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       16
       16
       +
       }

+1

pkgs/applications/kde/kdegraphics-mobipocket.nix

···

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       14
       14
        
         buildInputs = [ kio ];

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       15
       16
        
       }

+1 -1

pkgs/applications/kde/kdegraphics-thumbnailers.nix

···

       10
       10
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       11
       11
        
         };

     

       12
       12
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       13
       13
       -
         propagatedBuildInputs = [ kio libkexiv2 libkdcraw ];

     

       13
       13
       +
         buildInputs = [ kio libkexiv2 libkdcraw ];

     

       14
       14
        
       }

+1 -1

pkgs/applications/kde/kdenetwork-filesharing.nix

···

       11
       11
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       -
         propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];

     

       14
       14
       +
         buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];

     

       15
       15
        
       }

+21

pkgs/applications/kde/kdepim-apps-libs/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, copyPathsToStore, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets,

     

       5
       5
       +
         kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "kdepim-apps-libs";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets

     

       18
       18
       +
           kcontacts ki18n kiconthemes kio libkleo pimcommon prison

     

       19
       19
       +
         ];

     

       20
       20
       +
         outputs = [ "out" "dev" ];

     

       21
       21
       +
       }

+62

pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch

···

       1
       1
       +
       Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp

     

       4
       4
       +
       +++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp

     

       5
       5
       +
       @@ -50,9 +50,9 @@ public:

     

       6
       6
       +
                mTemplateLoader.clear();

     

       7
       7
       +
            }

     

       8
       8
       +
        

     

       9
       9
       +
       -    void changeGrantleePath(const QString &path)

     

       10
       10
       +
       +    void changeGrantleePath(const QStringList &paths)

     

       11
       11
       +
            {

     

       12
       12
       +
       -        mTemplateLoader->setTemplateDirs(QStringList() << path);

     

       13
       13
       +
       +        mTemplateLoader->setTemplateDirs(paths);

     

       14
       14
       +
                mEngine->addTemplateLoader(mTemplateLoader);

     

       15
       15
       +
        

     

       16
       16
       +
                mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));

     

       17
       17
       +
       @@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee

     

       18
       18
       +
        

     

       19
       19
       +
        void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)

     

       20
       20
       +
        {

     

       21
       21
       +
       -    d->changeGrantleePath(path);

     

       22
       22
       +
       +    d->changeGrantleePath(QStringList(path));

     

       23
       23
       +
        }

     

       24
       24
       +
        

     

       25
       25
       +
        void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)

     

       26
       26
       +
        {

     

       27
       27
       +
       -    d->changeGrantleePath(theme.absolutePath());

     

       28
       28
       +
       +    d->changeGrantleePath(theme.absolutePaths());

     

       29
       29
       +
        }

     

       30
       30
       +
        

     

       31
       31
       +
        inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)

     

       32
       32
       +
       Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp

     

       33
       33
       +
       ===================================================================

     

       34
       34
       +
       --- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp

     

       35
       35
       +
       +++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp

     

       36
       36
       +
       @@ -74,9 +74,9 @@ public:

     

       37
       37
       +
                mTemplateLoader.clear();

     

       38
       38
       +
            }

     

       39
       39
       +
        

     

       40
       40
       +
       -    void changeGrantleePath(const QString &path)

     

       41
       41
       +
       +    void changeGrantleePath(const QStringList &paths)

     

       42
       42
       +
            {

     

       43
       43
       +
       -        mTemplateLoader->setTemplateDirs(QStringList() << path);

     

       44
       44
       +
       +        mTemplateLoader->setTemplateDirs(paths);

     

       45
       45
       +
                mEngine->addTemplateLoader(mTemplateLoader);

     

       46
       46
       +
        

     

       47
       47
       +
                mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));

     

       48
       48
       +
       @@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta

     

       49
       49
       +
        

     

       50
       50
       +
        void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)

     

       51
       51
       +
        {

     

       52
       52
       +
       -    d->changeGrantleePath(path);

     

       53
       53
       +
       +    d->changeGrantleePath(QStringList(path));

     

       54
       54
       +
        }

     

       55
       55
       +
        

     

       56
       56
       +
        void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)

     

       57
       57
       +
        {

     

       58
       58
       +
       -    d->changeGrantleePath(theme.absolutePath());

     

       59
       59
       +
       +    d->changeGrantleePath(theme.absolutePaths());

     

       60
       60
       +
        }

     

       61
       61
       +
        

     

       62
       62
       +
        void GrantleeContactFormatter::setForceDisableQRCode(bool b)

+1

pkgs/applications/kde/kdepim-apps-libs/series

···

       1
       1
       +
       kdepim-apps-libs-grantlee-merge-theme-dirs.patch

+25

pkgs/applications/kde/kdepim-runtime.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         shared_mime_info,

     

       5
       5
       +
         akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,

     

       6
       6
       +
         kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,

     

       7
       7
       +
         kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,

     

       8
       8
       +
         qtwebengine,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       mkDerivation {

     

       12
       12
       +
         name = "kdepim-runtime";

     

       13
       13
       +
         meta = {

     

       14
       14
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       15
       15
       +
           maintainers = kdepimTeam;

     

       16
       16
       +
         };

     

       17
       17
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];

     

       18
       18
       +
         buildInputs = [

     

       19
       19
       +
           akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes

     

       20
       20
       +
           kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap

     

       21
       21
       +
           kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine

     

       22
       22
       +
         ];

     

       23
       23
       +
         # Attempts to build some files before dependencies have been generated

     

       24
       24
       +
         enableParallelBuilding = false;

     

       25
       25
       +
       }

+2 -2

pkgs/applications/kde/kdf.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib,

     

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         kcmutils

     

       4
       4
       +
         kcmutils, ki18n, kiconthemes, kio, knotifications, kxmlgui,

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       mkDerivation {

     
···

       11
       11
        
           maintainers = [ lib.maintainers.peterhoeg ];

     

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       -
         propagatedBuildInputs = [ kcmutils ];

     

       14
       14
       +
         buildInputs = [ kcmutils ki18n kiconthemes kio knotifications kxmlgui ];

     

       15
       15
        
       }

+6 -7

pkgs/applications/kde/kgpg.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib,

     

       3
       3
        
         extra-cmake-modules, kdoctools, ki18n, makeWrapper,

     

       4
       4
       -
         akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons,

     

       4
       4
       +
         akonadi-contacts, gnupg1, karchive, kcodecs, kcontacts, kcoreaddons,

     

       5
       5
        
         kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,

     

       6
       6
       -
         ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem

     

       6
       6
       +
         ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme,

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       mkDerivation {

     

       10
       10
        
         name = "kgpg";

     

       11
       11
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];

     

       12
       12
       -
         buildInputs = [ gnupg1 gpgme ki18n ];

     

       13
       13
       -
         propagatedBuildInputs = [

     

       14
       14
       -
           akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons

     

       15
       15
       -
           kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui

     

       16
       16
       -
           kwidgetsaddons kwindowsystem

     

       12
       12
       +
         buildInputs = [

     

       13
       13
       +
           akonadi-contacts gnupg1 karchive kcodecs kcontacts kcoreaddons kcrash

     

       14
       14
       +
           kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice

     

       15
       15
       +
           ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme

     

       17
       16
        
         ];

     

       18
       17
        
         postFixup = ''

     

       19
       18
        
           wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}"

+5 -6

pkgs/applications/kde/khelpcenter.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation,

     

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,

     

       5
       5
       -
         kdelibs4support, khtml, kservice, xapian

     

       4
       4
       +
         grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, kdelibs4support, ki18n,

     

       5
       5
       +
         kinit, khtml, kservice, xapian

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       mkDerivation {

     

       9
       9
        
         name = "khelpcenter";

     

       10
       10
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       11
       11
       -
         buildInputs = [ ki18n xapian ];

     

       12
       12
       -
         propagatedBuildInputs = [

     

       13
       13
       -
           grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons

     

       14
       14
       -
           kinit kcmutils kservice

     

       11
       11
       +
         buildInputs = [

     

       12
       12
       +
           grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml

     

       13
       13
       +
           ki18n kinit kservice xapian

     

       15
       14
        
         ];

     

       16
       15
        
       }

+16

pkgs/applications/kde/kholidays.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         qtbase, qtdeclarative, qttools,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kholidays";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [ qtbase qtdeclarative qttools ];

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       16
       16
       +
       }

+20

pkgs/applications/kde/kidentitymanagement.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kcompletion, kcoreaddons, kemoticons, kiconthemes, kio, kpimtextedit,

     

       5
       5
       +
         ktextwidgets, kxmlgui

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "kidentitymanagement";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           kcompletion kemoticons kiconthemes kio ktextwidgets kxmlgui

     

       17
       17
       +
         ];

     

       18
       18
       +
         propagatedBuildInputs = [ kcoreaddons kpimtextedit ];

     

       19
       19
       +
         outputs = [ "out" "dev" ];

     

       20
       20
       +
       }

+4 -5

pkgs/applications/kde/kig.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib,

     

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         kparts, qtsvg, qtxmlpatterns, ktexteditor, boost,

     

       5
       5
       -
         karchive, kcrash

     

       4
       4
       +
         boost, karchive, kcrash, kiconthemes, kparts, ktexteditor, qtsvg,

     

       5
       5
       +
         qtxmlpatterns,

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       mkDerivation {

     
···

       12
       12
        
           maintainers = with lib.maintainers; [ raskin ];

     

       13
       13
        
         };

     

       14
       14
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       -
         buildInputs = [ boost ];

     

       16
       16
       -
         propagatedBuildInputs = [

     

       17
       17
       -
           kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns

     

       18
       17
        
         ];

     

       19
       18
        
       }

     

       20
       19

+17

pkgs/applications/kde/kimap.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         cyrus_sasl, kcoreaddons, ki18n, kio, kmime

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kimap";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [ ki18n kio ];

     

       15
       15
       +
         propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ];

     

       16
       16
       +
         outputs = [ "out" "dev" ];

     

       17
       17
       +
       }

+1 -1

pkgs/applications/kde/kio-extras.nix

···

       13
       13
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       14
       14
        
         };

     

       15
       15
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];

     

       16
       16
       -
         propagatedBuildInputs = [

     

       16
       16
       +
         buildInputs = [

     

       17
       17
        
           exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons

     

       18
       18
        
           kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support

     

       19
       19
        
           kpty libmtp libssh openexr openslp phonon qtsvg samba solid

+17

pkgs/applications/kde/kldap.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         cyrus_sasl, ki18n, kio, kmbox, openldap

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kldap";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [ ki18n kio kmbox ];

     

       15
       15
       +
         propagatedBuildInputs = [ cyrus_sasl openldap ];

     

       16
       16
       +
         outputs = [ "out" "dev" ];

     

       17
       17
       +
       }

+19

pkgs/applications/kde/kleopatra.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime,

     

       5
       5
       +
         knotifications, kwindowsystem, kxmlgui, libkleo

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "kleopatra";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime

     

       17
       17
       +
           knotifications kwindowsystem kxmlgui libkleo

     

       18
       18
       +
         ];

     

       19
       19
       +
       }

+21

pkgs/applications/kde/kmail-account-wizard.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools, shared_mime_info,

     

       4
       4
       +
         akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,

     

       5
       5
       +
         kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,

     

       6
       6
       +
         kwallet, libkdepim, libkleo, pimcommon, qttools,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       mkDerivation {

     

       10
       10
       +
         name = "kmail-account-wizard";

     

       11
       11
       +
         meta = {

     

       12
       12
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       13
       13
       +
           maintainers = kdepimTeam;

     

       14
       14
       +
         };

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport

     

       18
       18
       +
           knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim

     

       19
       19
       +
           libkleo pimcommon qttools

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+29

pkgs/applications/kde/kmail.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,

     

       5
       5
       +
         kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs,

     

       6
       6
       +
         kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,

     

       7
       7
       +
         kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,

     

       8
       8
       +
         kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,

     

       9
       9
       +
         kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,

     

       10
       10
       +
         messagelib, pim-sieve-editor, qtscript, qtwebengine,

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       mkDerivation {

     

       14
       14
       +
         name = "kmail";

     

       15
       15
       +
         meta = {

     

       16
       16
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       17
       17
       +
           maintainers = kdepimTeam;

     

       18
       18
       +
         };

     

       19
       19
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       20
       20
       +
         buildInputs = [

     

       21
       21
       +
           akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig

     

       22
       22
       +
           kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n

     

       23
       23
       +
           kiconthemes kinit kio kldap kmail-account-wizard kmailtransport

     

       24
       24
       +
           knotifications knotifyconfig kontactinterface kparts kpty kservice

     

       25
       25
       +
           ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar

     

       26
       26
       +
           libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine

     

       27
       27
       +
         ];

     

       28
       28
       +
         propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];

     

       29
       29
       +
       }

+17

pkgs/applications/kde/kmailtransport.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kmailtransport";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [ akonadi kcmutils ki18n kio ];

     

       15
       15
       +
         propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];

     

       16
       16
       +
         outputs = [ "out" "dev" ];

     

       17
       17
       +
       }

+16

pkgs/applications/kde/kmbox.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kmime, qtbase,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kmbox";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [ kmime qtbase ];

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       16
       16
       +
       }

+3 -2

pkgs/applications/kde/kmime.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, lib,

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
        
         extra-cmake-modules, ki18n,

     

       4
       4
        
         kcodecs, qtbase,

     

       5
       5
        
       }:

     
···

       8
       8
        
         name = "kmime";

     

       9
       9
        
         meta = {

     

       10
       10
        
           license = [ lib.licenses.lgpl21 ];

     

       11
       11
       -
           maintainers = [ lib.maintainers.ttuegel ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
        
         };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules ki18n ];

     

       14
       14
        
         buildInputs = [ kcodecs qtbase ];

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       15
       16
        
       }

+4 -7

pkgs/applications/kde/kmix.nix

···

       12
       12
        
           maintainers = [ lib.maintainers.rongcuid ];

     

       13
       13
        
         };

     

       14
       14
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       -
         buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];

     

       16
       16
       -
         propagatedBuildInputs = [

     

       17
       17
       -
           kglobalaccel kxmlgui kcoreaddons kdelibs4support

     

       18
       18
       -
           plasma-framework

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           alsaLib kglobalaccel kxmlgui kcoreaddons kdelibs4support

     

       17
       17
       +
           libcanberra_kde libpulseaudio plasma-framework

     

       19
       18
        
         ];

     

       20
       20
       -
         cmakeFlags = [

     

       21
       21
       -
           "-DKMIX_KF5_BUILD=1"

     

       22
       22
       -
         ];

     

       19
       19
       +
         cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ];

     

       23
       20
        
       }

+1 -1

pkgs/applications/kde/kolourpaint.nix

···

       9
       9
        
       mkDerivation {

     

       10
       10
        
         name = "kolourpaint";

     

       11
       11
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       12
       12
       -
         propagatedBuildInputs = [ kdelibs4support libkexiv2 ];

     

       12
       12
       +
         buildInputs = [ kdelibs4support libkexiv2 ];

     

       13
       13
        
         meta = {

     

       14
       14
        
           maintainers = [ lib.maintainers.fridh ];

     

       15
       15
        
           license = with lib.licenses; [ gpl2 ];

+4 -3

pkgs/applications/kde/kompare.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib,

     

       3
       3
        
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         kparts, ktexteditor, kwidgetsaddons, libkomparediff2

     

       4
       4
       +
         kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       mkDerivation {

     

       8
       8
        
         name = "kompare";

     

       9
       9
        
         meta = { license = with lib.licenses; [ gpl2 ]; };

     

       10
       10
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       11
       11
       -
         propagatedBuildInputs = [

     

       12
       12
       -
           kparts ktexteditor kwidgetsaddons libkomparediff2

     

       11
       11
       +
         buildInputs = [

     

       12
       12
       +
           kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2

     

       13
       13
        
         ];

     

       14
       14
       +
         outputs = [ "out" "dev" ];

     

       14
       15
        
       }

+2 -3

pkgs/applications/kde/konsole.nix

···

       14
       14
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       15
       15
        
         };

     

       16
       16
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       17
       17
       -
         buildInputs = [ ki18n ];

     

       18
       18
       -
         propagatedBuildInputs = [

     

       17
       17
       +
         buildInputs = [

     

       19
       18
        
           kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support

     

       20
       20
       -
           kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty

     

       19
       19
       +
           kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty

     

       21
       20
        
           kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript

     

       22
       21
        
         ];

     

       23
       22
        
         propagatedUserEnvPkgs = [ (lib.getBin kinit) ];

+23

pkgs/applications/kde/kontact.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         qtwebengine,

     

       5
       5
       +
         kcmutils, kcrash, kdbusaddons, kwindowsystem,

     

       6
       6
       +
         akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,

     

       7
       7
       +
         mailcommon,

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       mkDerivation {

     

       11
       11
       +
         name = "kontact";

     

       12
       12
       +
         meta = {

     

       13
       13
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       14
       14
       +
           maintainers = kdepimTeam;

     

       15
       15
       +
         };

     

       16
       16
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           qtwebengine

     

       19
       19
       +
           kcmutils kcrash kdbusaddons kwindowsystem

     

       20
       20
       +
           akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit

     

       21
       21
       +
           mailcommon

     

       22
       22
       +
         ];

     

       23
       23
       +
       }

+17

pkgs/applications/kde/kontactinterface.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kiconthemes, kparts, kwindowsystem, kxmlgui

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kontactinterface";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [

     

       15
       15
       +
           kiconthemes kparts kwindowsystem kxmlgui

     

       16
       16
       +
         ];

     

       17
       17
       +
       }

+29

pkgs/applications/kde/korganizer.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         qtbase, qttools,

     

       5
       5
       +
         phonon,

     

       6
       6
       +
         knewstuff,

     

       7
       7
       +
         akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search,

     

       8
       8
       +
         calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs,

     

       9
       9
       +
         kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface,

     

       10
       10
       +
         kpimtextedit, pimcommon,

     

       11
       11
       +
       }:

     

       12
       12
       +
       

     

       13
       13
       +
       mkDerivation {

     

       14
       14
       +
         name = "korganizer";

     

       15
       15
       +
         meta = {

     

       16
       16
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       17
       17
       +
           maintainers = kdepimTeam;

     

       18
       18
       +
         };

     

       19
       19
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       20
       20
       +
         propagatedBuildInputs = [

     

       21
       21
       +
           qtbase qttools

     

       22
       22
       +
           phonon

     

       23
       23
       +
           knewstuff

     

       24
       24
       +
           akonadi-calendar akonadi-contacts akonadi-notes akonadi-search

     

       25
       25
       +
           calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs

     

       26
       26
       +
           kholidays kidentitymanagement kldap kmailtransport kontactinterface

     

       27
       27
       +
           kpimtextedit pimcommon

     

       28
       28
       +
         ];

     

       29
       29
       +
       }

+21

pkgs/applications/kde/kpimtextedit.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,

     

       5
       5
       +
         kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "kpimtextedit";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin

     

       17
       17
       +
           sonnet syntax-highlighting qttools

     

       18
       18
       +
         ];

     

       19
       19
       +
         propagatedBuildInputs = [ ktextwidgets ];

     

       20
       20
       +
         outputs = [ "out" "dev" ];

     

       21
       21
       +
       }

+15

pkgs/applications/kde/kqtquickcharts.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib,

     

       3
       3
       +
         extra-cmake-modules,

     

       4
       4
       +
         qtbase, qtdeclarative,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kqtquickcharts";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = [ lib.maintainers.ttuegel ];

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules ];

     

       14
       14
       +
         propagatedBuildInputs = [ qtbase qtdeclarative ];

     

       15
       15
       +
       }

+18

pkgs/applications/kde/ktnef.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kcalcore, kcalutils, kcontacts, kdelibs4support

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "ktnef";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         propagatedBuildInputs = [

     

       15
       15
       +
           kcalcore kcalutils kcontacts kdelibs4support

     

       16
       16
       +
         ];

     

       17
       17
       +
         outputs = [ "out" "dev" ];

     

       18
       18
       +
       }

+18

pkgs/applications/kde/libgravatar.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kconfig, kio, ktextwidgets, kwidgetsaddons, pimcommon

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "libgravatar";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         propagatedBuildInputs = [

     

       15
       15
       +
           kconfig kio ktextwidgets kwidgetsaddons pimcommon

     

       16
       16
       +
         ];

     

       17
       17
       +
         outputs = [ "out" "dev" ];

     

       18
       18
       +
       }

+1

pkgs/applications/kde/libkdcraw.nix

···

       9
       9
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       10
       10
        
         buildInputs = [ qtbase ];

     

       11
       11
        
         propagatedBuildInputs = [ libraw ];

     

       12
       12
       +
         outputs = [ "out" "dev" ];

     

       12
       13
        
       }

+21

pkgs/applications/kde/libkdepim.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-contacts, akonadi-search, kcmutils, kcodecs, kcompletion,

     

       5
       5
       +
         kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, kitemviews, kjobwidgets,

     

       6
       6
       +
         kldap, kwallet,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       mkDerivation {

     

       10
       10
       +
         name = "libkdepim";

     

       11
       11
       +
         meta = {

     

       12
       12
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       13
       13
       +
           maintainers = kdepimTeam;

     

       14
       14
       +
         };

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           akonadi akonadi-contacts akonadi-search kcmutils kcodecs kcompletion

     

       18
       18
       +
           kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap

     

       19
       19
       +
           kwallet

     

       20
       20
       +
         ];

     

       21
       21
       +
       }

+1

pkgs/applications/kde/libkexiv2.nix

···

       9
       9
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       10
       10
        
         buildInputs = [ qtbase ];

     

       11
       11
        
         propagatedBuildInputs = [ exiv2 ];

     

       12
       12
       +
         outputs = [ "out" "dev" ];

     

       12
       13
        
       }

+2 -1

pkgs/applications/kde/libkipi.nix

···

       7
       7
        
           maintainers = [ lib.maintainers.ttuegel ];

     

       8
       8
        
         };

     

       9
       9
        
         nativeBuildInputs = [ extra-cmake-modules ];

     

       10
       10
       -
         propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ];

     

       10
       10
       +
         buildInputs = [ kconfig ki18n kservice kxmlgui ];

     

       11
       11
       +
         outputs = [ "out" "dev" ];

     

       11
       12
        
       }

+21

pkgs/applications/kde/libkleo.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         boost, qgpgme, kcodecs, kcompletion, kconfig, kcoreaddons, ki18n, kitemmodels,

     

       5
       5
       +
         kpimtextedit, kwidgetsaddons, kwindowsystem

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "libkleo";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           boost kcodecs kcompletion kconfig kcoreaddons ki18n kitemmodels

     

       17
       17
       +
           kpimtextedit kwidgetsaddons kwindowsystem

     

       18
       18
       +
         ];

     

       19
       19
       +
         propagatedBuildInputs = [ qgpgme ];

     

       20
       20
       +
         outputs = [ "out" "dev" ];

     

       21
       21
       +
       }

+23

pkgs/applications/kde/libksieve.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, karchive, kcompletion, kiconthemes, kidentitymanagement, kio,

     

       5
       5
       +
         kmailtransport, knewstuff, kwindowsystem, kxmlgui, libkdepim, pimcommon,

     

       6
       6
       +
         qtwebengine, syntax-highlighting,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       mkDerivation {

     

       10
       10
       +
         name = "libksieve";

     

       11
       11
       +
         meta = {

     

       12
       12
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       13
       13
       +
           maintainers = kdepimTeam;

     

       14
       14
       +
         };

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       16
       16
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           akonadi karchive kcompletion kiconthemes kidentitymanagement kio

     

       19
       19
       +
           kmailtransport knewstuff kwindowsystem kxmlgui libkdepim pimcommon

     

       20
       20
       +
           qtwebengine

     

       21
       21
       +
         ];

     

       22
       22
       +
         propagatedBuildInputs = [ syntax-highlighting ];

     

       23
       23
       +
       }

+22

pkgs/applications/kde/mailcommon.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets,

     

       5
       5
       +
         kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap,

     

       6
       6
       +
         kmailtransport, kwindowsystem, mailimporter, messagelib, phonon,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       mkDerivation {

     

       10
       10
       +
         name = "mailcommon";

     

       11
       11
       +
         meta = {

     

       12
       12
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       13
       13
       +
           maintainers = kdepimTeam;

     

       14
       14
       +
         };

     

       15
       15
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons

     

       18
       18
       +
           kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport

     

       19
       19
       +
           kwindowsystem mailimporter messagelib phonon

     

       20
       20
       +
         ];

     

       21
       21
       +
         outputs = [ "out" "dev" ];

     

       22
       22
       +
       }

+19

pkgs/applications/kde/mailimporter.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,

     

       5
       5
       +
         kmime, kxmlgui, libkdepim

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "mailimporter";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime

     

       17
       17
       +
           kxmlgui libkdepim

     

       18
       18
       +
         ];

     

       19
       19
       +
       }

+20

pkgs/applications/kde/mbox-importer.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-search, kconfig, kservice, kio, mailcommon, mailimporter, messagelib

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "mbox-importer";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         buildInputs = [

     

       15
       15
       +
           akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib

     

       16
       16
       +
         ];

     

       17
       17
       +
         preHook = ''

     

       18
       18
       +
           set -x

     

       19
       19
       +
         '';

     

       20
       20
       +
       }

+29

pkgs/applications/kde/messagelib.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5,

     

       5
       5
       +
         grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,

     

       6
       6
       +
         kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,

     

       7
       7
       +
         kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,

     

       8
       8
       +
         pimcommon, qtwebengine, qtwebkit, syntax-highlighting

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       mkDerivation {

     

       12
       12
       +
         name = "messagelib";

     

       13
       13
       +
         meta = {

     

       14
       14
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       15
       15
       +
           maintainers = kdepimTeam;

     

       16
       16
       +
         };

     

       17
       17
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       18
       18
       +
         buildInputs = [

     

       19
       19
       +
           akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs

     

       20
       20
       +
           kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap

     

       21
       21
       +
           kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit

     

       22
       22
       +
           syntax-highlighting

     

       23
       23
       +
         ];

     

       24
       24
       +
         propagatedBuildInputs = [

     

       25
       25
       +
           akonadi akonadi-mime kcontacts kidentitymanagement kmime libkleo pimcommon

     

       26
       26
       +
           qtwebengine

     

       27
       27
       +
         ];

     

       28
       28
       +
         outputs = [ "out" "dev" ];

     

       29
       29
       +
       }

+5 -9

pkgs/applications/kde/okteta.nix

···

       1
       1
        
       {

     

       2
       2
        
         mkDerivation, lib,

     

       3
       3
       -
         extra-cmake-modules, kdoctools,

     

       4
       4
       -
         qtscript, kconfig, kinit, karchive,

     

       5
       5
       -
         kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,

     

       6
       6
       -
         shared_mime_info

     

       3
       3
       +
         extra-cmake-modules, kdoctools, shared_mime_info,

     

       4
       4
       +
         kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, qtscript

     

       7
       5
        
       }:

     

       8
       6
        
       

     

       9
       7
        
       mkDerivation {

     
···

       12
       10
        
           license = with lib.licenses; [ gpl2 ];

     

       13
       11
        
           maintainers = with lib.maintainers; [ peterhoeg ];

     

       14
       12
        
         };

     

       15
       15
       -
         nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

     

       16
       16
       -
         buildInputs = [ shared_mime_info ];

     

       17
       17
       -
         propagatedBuildInputs = [

     

       18
       18
       -
           kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5

     

       19
       19
       -
           karchive

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];

     

       14
       14
       +
         buildInputs = [

     

       15
       15
       +
           kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 qtscript

     

       20
       16
        
         ];

     

       21
       17
        
       }

+19

pkgs/applications/kde/pim-sieve-editor.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit,

     

       5
       5
       +
         kmailtransport, pimcommon, libksieve

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         name = "pim-sieve-editor";

     

       10
       10
       +
         meta = {

     

       11
       11
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       12
       12
       +
           maintainers = kdepimTeam;

     

       13
       13
       +
         };

     

       14
       14
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       15
       15
       +
         buildInputs = [

     

       16
       16
       +
           kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport

     

       17
       17
       +
           pimcommon libksieve

     

       18
       18
       +
         ];

     

       19
       19
       +
       }

+26

pkgs/applications/kde/pimcommon.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,

     

       5
       5
       +
         kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin,

     

       6
       6
       +
         kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,

     

       7
       7
       +
         kwallet, kwindowsystem, libkdepim, qtwebengine

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       mkDerivation {

     

       11
       11
       +
         name = "pimcommon";

     

       12
       12
       +
         meta = {

     

       13
       13
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       14
       14
       +
           maintainers = kdepimTeam;

     

       15
       15
       +
         };

     

       16
       16
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       17
       17
       +
         buildInputs = [

     

       18
       18
       +
           akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets

     

       19
       19
       +
           kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit

     

       20
       20
       +
           kwallet kwindowsystem libkdepim qtwebengine

     

       21
       21
       +
         ];

     

       22
       22
       +
         propagatedBuildInputs = [

     

       23
       23
       +
           akonadi akonadi-contacts kconfig kcontacts kimap

     

       24
       24
       +
         ];

     

       25
       25
       +
         outputs = [ "out" "dev" ];

     

       26
       26
       +
       }

+3 -4

pkgs/applications/kde/spectacle.nix

···

       11
       11
        
         name = "spectacle";

     

       12
       12
        
         meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };

     

       13
       13
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       -
         buildInputs = [ ki18n xcb-util-cursor ];

     

       15
       15
       -
         propagatedBuildInputs = [

     

       16
       16
       -
           kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications

     

       17
       17
       -
           kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras

     

       14
       14
       +
         buildInputs = [

     

       15
       15
       +
           kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications

     

       16
       16
       +
           kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor

     

       18
       17
        
         ];

     

       19
       18
        
         propagatedUserEnvPkgs = [ kipi-plugins libkipi ];

     

       20
       19
        
       }

+16

pkgs/applications/kde/syndication.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, lib, kdepimTeam,

     

       3
       3
       +
         extra-cmake-modules, kdoctools,

     

       4
       4
       +
         kio

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "syndication";

     

       9
       9
       +
         meta = {

     

       10
       10
       +
           license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

     

       11
       11
       +
           maintainers = kdepimTeam;

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       14
       14
       +
         propagatedBuildInputs = [ kio ];

     

       15
       15
       +
         outputs = [ "out" "dev" ];

     

       16
       16
       +
       }

+2 -2

pkgs/applications/misc/kanboard/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "kanboard-${version}";

     

       5
       5
       -
         version = "1.0.44";

     

       5
       5
       +
         version = "1.0.46";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://kanboard.net/${name}.zip";

     

       9
       9
       -
           sha256 = "1cwk9gcwddwbbw6hz2iqmkmy90rwddy79b9vi6fj9cl03zswypgn";

     

       9
       9
       +
           sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         dontBuild = true;

+1 -3

pkgs/build-support/cc-wrapper/default.nix

···

       8
       8
        
       { name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""

     

       9
       9
        
       , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell

     

       10
       10
        
       , zlib ? null, extraPackages ? [], extraBuildCommands ? ""

     

       11
       11
       -
       , dyld ? null # TODO: should this be a setup-hook on dyld?

     

       12
       11
        
       , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null

     

       13
       13
       -
       , buildPackages ? {}, hostPlatform, targetPlatform

     

       14
       14
       -
       , runCommand ? null

     

       12
       12
       +
       , buildPackages ? {}

     

       15
       13
        
       , useMacosReexportHack ? false

     

       16
       14
        
       }:

     

       17
       15

+2

pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix

···

       8
       8
        
           sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       +
         outputs = [ "out" "dev" ];

     

       12
       12
       +
       

     

       11
       13
        
         propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];

     

       12
       14
        
         nativeBuildInputs = [ pkgconfig intltool ];

     

       13
       15

+2

pkgs/desktops/plasma-5/default.nix

···

       71
       71
        
             propagateBin = propagate "bin";

     

       72
       72
        
       

     

       73
       73
        
             callPackage = self.newScope {

     

       74
       74
       +
               inherit propagate propagateBin;

     

       75
       75
       +
       

     

       74
       76
        
               mkDerivation = args:

     

       75
       77
        
                 let

     

       76
       78
        
                   inherit (args) name;

+2 -1

pkgs/desktops/plasma-5/libkscreen/default.nix

···

       1
       1
        
       {

     

       2
       2
       -
         mkDerivation, lib, copyPathsToStore,

     

       2
       2
       +
         mkDerivation, lib, copyPathsToStore, propagate,

     

       3
       3
        
         extra-cmake-modules,

     

       4
       4
        
         kwayland, libXrandr, qtx11extras

     

       5
       5
        
       }:

     
···

       13
       13
        
         preConfigure = ''

     

       14
       14
        
           NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\""

     

       15
       15
        
         '';

     

       16
       16
       +
         setupHook = propagate "out";

     

       16
       17
        
       }

+2 -3

pkgs/development/haskell-modules/configuration-common.nix

···

       727
       727
        
             '';

     

       728
       728
        
           });

     

       729
       729
        
       

     

       730
       730
       -
       

     

       731
       731
       -
         # https://github.com/plow-technologies/servant-auth/issues/20

     

       732
       732
       -
         servant-auth = dontCheck super.servant-auth;

     

       730
       730
       +
         # Glob == 0.7.x

     

       731
       731
       +
         servant-auth = doJailbreak super.servant-auth;

     

       733
       732
        
       

     

       734
       733
        
         # https://github.com/pontarius/pontarius-xmpp/issues/105

     

       735
       734
        
         pontarius-xmpp = dontCheck super.pontarius-xmpp;

+1 -1

pkgs/development/libraries/aspell/aspell-with-dicts.nix

···

       28
       28
        
         pushd "${aspell}/bin"

     

       29
       29
        
         for prg in *; do

     

       30
       30
        
           if [ -f "$prg" ]; then

     

       31
       31
       -
             makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "data-dir ${dictEnv}/lib/aspell"

     

       31
       31
       +
             makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "dict-dir ${dictEnv}/lib/aspell"

     

       32
       32
        
           fi

     

       33
       33
        
         done

     

       34
       34
        
         popd

+5 -2

pkgs/development/libraries/gpgme/default.nix

···

       32
       32
        
           "--enable-fixed-path=${gnupg}/bin"

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
       -
         # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html

     

       36
       35
        
         NIX_CFLAGS_COMPILE =

     

       37
       37
       -
           lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";

     

       36
       36
       +
           # qgpgme uses Q_ASSERT which retains build inputs at runtime unless

     

       37
       37
       +
           # debugging is disabled

     

       38
       38
       +
           lib.optional (qtbase != null) "-DQT_NO_DEBUG"

     

       39
       39
       +
           # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html

     

       40
       40
       +
           ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";

     

       38
       41
        
       

     

       39
       42
        
         meta = with stdenv.lib; {

     

       40
       43
        
           homepage = https://gnupg.org/software/gpgme/index.html;

+18 -4

pkgs/development/libraries/grantlee/5.x.nix pkgs/development/libraries/grantlee/5/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, qtbase, qtscript, cmake }:

     

       1
       1
       +
       { mkDerivation, lib, copyPathsToStore, fetchurl, qtbase, qtscript, cmake }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       3
       3
       +
       mkDerivation rec {

     

       4
       4
        
         name = "grantlee-${version}";

     

       5
       5
        
         version = "5.1.0";

     

       6
       6
       +
         grantleeCompatVersion = "5.1";

     

       7
       7
       +
         grantleePluginPrefix = "lib/grantlee/${grantleeCompatVersion}";

     

       6
       8
        
       

     

       7
       9
        
         src = fetchurl {

     

       8
       10
        
           url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";

     
···

       13
       15
        
         buildInputs = [ qtbase qtscript ];

     

       14
       16
        
         nativeBuildInputs = [ cmake ];

     

       15
       17
        
       

     

       16
       16
       -
         meta = {

     

       18
       18
       +
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       19
       19
       +
       

     

       20
       20
       +
         outputs = [ "out" "dev" ];

     

       21
       21
       +
         postFixup =

     

       22
       22
       +
           # Disabuse CMake of the notion that libraries are in $dev

     

       23
       23
       +
           ''

     

       24
       24
       +
             sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \

     

       25
       25
       +
                 -e "s|\''${_IMPORT_PREFIX}|$out|"

     

       26
       26
       +
           '';

     

       27
       27
       +
       

     

       28
       28
       +
         setupHook = ./setup-hook.sh;

     

       29
       29
       +
       

     

       30
       30
       +
         meta = with lib; {

     

       17
       31
        
           description = "Qt5 port of Django template system";

     

       18
       32
        
           longDescription = ''

     

       19
       33
        
             Grantlee is a plugin based String Template system written using the Qt

     
···

       25
       39
        
             and the design of Django is reused in Grantlee.'';

     

       26
       40
        
       

     

       27
       41
        
           homepage = http://gitorious.org/grantlee;

     

       28
       28
       -
           maintainers = [ ];

     

       42
       42
       +
           maintainers = [ maintainers.ttuegel ];

     

       29
       43
        
           inherit (qtbase.meta) platforms;

     

       30
       44
        
         };

     

       31
       45
        
       }

+19

pkgs/development/libraries/grantlee/5/grantlee-nix-profiles.patch

···

       1
       1
       +
       Index: grantlee-5.1.0/templates/lib/engine.cpp

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- grantlee-5.1.0.orig/templates/lib/engine.cpp

     

       4
       4
       +
       +++ grantlee-5.1.0/templates/lib/engine.cpp

     

       5
       5
       +
       @@ -48,6 +48,14 @@ Engine::Engine(QObject *parent)

     

       6
       6
       +
        

     

       7
       7
       +
          d_ptr->m_pluginDirs = QCoreApplication::instance()->libraryPaths();

     

       8
       8
       +
          d_ptr->m_pluginDirs << QString::fromLocal8Bit(GRANTLEE_PLUGIN_PATH);

     

       9
       9
       +
       +

     

       10
       10
       +
       +  // Add library paths derived from NIX_PROFILES.

     

       11
       11
       +
       +  const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');

     

       12
       12
       +
       +  for (const QByteArray &profile: profiles) {

     

       13
       13
       +
       +    if (!profile.isEmpty()) {

     

       14
       14
       +
       +      d_ptr->m_pluginDirs << (QFile::decodeName(profile) + QStringLiteral("/lib"));

     

       15
       15
       +
       +    }

     

       16
       16
       +
       +  }

     

       17
       17
       +
        }

     

       18
       18
       +
        

     

       19
       19
       +
        Engine::~Engine()

+27

pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch

···

       1
       1
       +
       Index: grantlee-5.1.0/templates/lib/templateloader.cpp

     

       2
       2
       +
       ===================================================================

     

       3
       3
       +
       --- grantlee-5.1.0.orig/templates/lib/templateloader.cpp

     

       4
       4
       +
       +++ grantlee-5.1.0/templates/lib/templateloader.cpp

     

       5
       5
       +
       @@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB

     

       6
       6
       +
                             + QLatin1Char('/') + fileName);

     

       7
       7
       +
            const QFileInfo fi(file);

     

       8
       8
       +
        

     

       9
       9
       +
       -    if (file.exists()

     

       10
       10
       +
       -        && !fi.canonicalFilePath().contains(

     

       11
       11
       +
       -               QDir(d->m_templateDirs.at(i)).canonicalPath()))

     

       12
       12
       +
       -      return Template();

     

       13
       13
       +
            ++i;

     

       14
       14
       +
          }

     

       15
       15
       +
        

     

       16
       16
       +
       @@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co

     

       17
       17
       +
                             + QLatin1Char('/') + fileName);

     

       18
       18
       +
        

     

       19
       19
       +
            const QFileInfo fi(file);

     

       20
       20
       +
       -    if (!fi.canonicalFilePath().contains(

     

       21
       21
       +
       -            QDir(d->m_templateDirs.at(i)).canonicalPath())) {

     

       22
       22
       +
       -      ++i;

     

       23
       23
       +
       -      continue;

     

       24
       24
       +
       -    }

     

       25
       25
       +
        

     

       26
       26
       +
            if (file.exists()) {

     

       27
       27
       +
              auto path = fi.absoluteFilePath();

+2

pkgs/development/libraries/grantlee/5/series

···

       1
       1
       +
       grantlee-nix-profiles.patch

     

       2
       2
       +
       grantlee-no-canonicalize-filepath.patch

+23

pkgs/development/libraries/grantlee/5/setup-hook.sh

···

       1
       1
       +
       grantleePluginPrefix=@grantleePluginPrefix@

     

       2
       2
       +
       

     

       3
       3
       +
       providesGrantleeRuntime() {

     

       4
       4
       +
           [ -d "$1/$grantleePluginPrefix" ]

     

       5
       5
       +
       }

     

       6
       6
       +
       

     

       7
       7
       +
       _grantleeCrossEnvHook() {

     

       8
       8
       +
           if providesQtRuntime "$1"; then

     

       9
       9
       +
               propagatedBuildInputs+=" $1"

     

       10
       10
       +
               propagatedUserEnvPkgs+=" $1"

     

       11
       11
       +
           fi

     

       12
       12
       +
       }

     

       13
       13
       +
       crossEnvHooks+=(_grantleeCrossEnvHook)

     

       14
       14
       +
       

     

       15
       15
       +
       _grantleeEnvHook() {

     

       16
       16
       +
           if providesGrantleeRuntime "$1"; then

     

       17
       17
       +
               propagatedNativeBuildInputs+=" $1"

     

       18
       18
       +
               if [ -z "$crossConfig" ]; then

     

       19
       19
       +
               propagatedUserEnvPkgs+=" $1"

     

       20
       20
       +
               fi

     

       21
       21
       +
           fi

     

       22
       22
       +
       }

     

       23
       23
       +
       envHooks+=(_grantleeEnvHook)

-13

pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch

···

       1
       1
       -
       Index: kcmutils-5.33.0/src/kcmoduleloader.cpp

     

       2
       2
       -
       ===================================================================

     

       3
       3
       -
       --- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp

     

       4
       4
       -
       +++ kcmutils-5.33.0/src/kcmoduleloader.cpp

     

       5
       5
       -
       @@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con

     

       6
       6
       -
                if (module) {

     

       7
       7
       -
                    return module;

     

       8
       8
       -
                } else {

     

       9
       9
       -
       -            KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));

     

       10
       10
       -
       +            KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library()));

     

       11
       11
       -
                    KPluginFactory* factory = loader.factory();

     

       12
       12
       -
                    if (!factory) {

     

       13
       13
       -
                        qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();

-1

pkgs/development/libraries/kde-frameworks/kcmutils/series

···

       1
       1
        
       kcmutils-follow-symlinks.patch

     

       2
       2
        
       kcmutils-debug-module-loader.patch

     

       3
       3
       -
       kcmutils-fix-plugin-path.patch

+2 -1

pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix

···

       11
       11
        
         nativeBuildInputs = [ extra-cmake-modules kdoctools ];

     

       12
       12
        
         buildInputs = [

     

       13
       13
        
           kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews

     

       14
       14
       -
           kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet

     

       14
       14
       +
           kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet

     

       15
       15
        
         ];

     

       16
       16
       +
         propagatedBuildInputs = [ qttools ];

     

       16
       17
        
       }

+3

pkgs/development/libraries/kde-frameworks/kwallet.nix

···

       16
       16
        
         ];

     

       17
       17
        
         propagatedBuildInputs = [ qtbase ];

     

       18
       18
        
         patches = [ ./kwallet-dbus.patch ];

     

       19
       19
       +
         postFixup = ''

     

       20
       20
       +
           rm "''${!outputBin}/share/dbus-1/services/org.kde.kwalletd.service"

     

       21
       21
       +
         '';

     

       19
       22
        
       }

+21

pkgs/development/libraries/kdiagram/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         mkDerivation, fetchurl, lib,

     

       3
       3
       +
         extra-cmake-modules, qttools,

     

       4
       4
       +
         qtbase, qtsvg,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       mkDerivation {

     

       8
       8
       +
         name = "kdiagram-2.6.0";

     

       9
       9
       +
         src = fetchurl {

     

       10
       10
       +
           url = "https://download.kde.org/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz";

     

       11
       11
       +
           sha256 = "10hqk12wwgbiq4q5145s8v7v96j621ckq1yil9s4pihmgsnqsy02";

     

       12
       12
       +
         };

     

       13
       13
       +
         nativeBuildInputs = [ extra-cmake-modules qttools ];

     

       14
       14
       +
         propagatedBuildInputs = [ qtbase qtsvg ];

     

       15
       15
       +
         meta = {

     

       16
       16
       +
           shortDescription = "Libraries for creating business diagrams";

     

       17
       17
       +
           license = lib.licenses.gpl2;

     

       18
       18
       +
           platforms = qtbase.meta.platforms;

     

       19
       19
       +
           maintainers = [ lib.maintainers.ttuegel ];

     

       20
       20
       +
         };

     

       21
       21
       +
       }

+1

pkgs/development/libraries/qt-5/5.6/qttools/default.nix

···

       6
       6
        
         patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

     

       7
       7
        
         postFixup = ''

     

       8
       8
        
           moveToOutput "bin/qdbus" "$out"

     

       9
       9
       +
           moveToOutput "bin/qdbusviewer" "$out"

     

       9
       10
        
           moveToOutput "bin/qtpaths" "$out"

     

       10
       11
        
         '';

     

       11
       12
        
       }

+1

pkgs/development/libraries/qt-5/5.9/qttools/default.nix

···

       10
       10
        
         # qmake moves all binaries to $dev in preFixup

     

       11
       11
        
         postFixup = ''

     

       12
       12
        
           moveToOutput "bin/qdbus" "$bin"

     

       13
       13
       +
           moveToOutput "bin/qdbusviewer" "$bin"

     

       13
       14
        
           moveToOutput "bin/qtpaths" "$bin"

     

       14
       15
        
         '';

     

       15
       16
        
       }

+2 -2

pkgs/development/ocaml-modules/batteries/default.nix

···

       1
       1
        
       { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "2.6.0"; in

     

       3
       3
       +
       let version = "2.7.0"; in

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation {

     

       6
       6
        
         name = "ocaml-batteries-${version}";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchzip {

     

       9
       9
        
           url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";

     

       10
       10
       -
           sha256 = "1nnypfxm3zkahjkzll5qn4ngpqvbxlwg9qdp8qdqvq2vl76w0672";

     

       10
       10
       +
           sha256 = "02rgfylz6x4y2030cclf9zwk2i8xqsydn1y9hjkja2qsk895bwfb";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ ocaml findlib ocamlbuild qtest ];

+4 -5

pkgs/development/ocaml-modules/qtest/default.nix

···

       1
       1
       -
       { stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:

     

       1
       1
       +
       { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qcheck, ounit }:

     

       2
       2
        
       

     

       3
       3
        
       if !stdenv.lib.versionAtLeast ocaml.version "4"

     

       4
       4
        
       then throw "qtest is not available for OCaml ${ocaml.version}"

     

       5
       5
        
       else

     

       6
       6
        
       

     

       7
       7
       -
       let version = "2.2"; in

     

       7
       7
       +
       let version = "2.6"; in

     

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation {

     

       10
       10
        
         name = "ocaml-qtest-${version}";

     

       11
       11
        
         src = fetchzip {

     

       12
       12
        
           url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz";

     

       13
       13
       -
           sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz";

     

       13
       13
       +
           sha256 = "1v5c1n5p8rhnisn606fs05q8764lqwgw08w66y5dm8wgmxgmsb3k";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         buildInputs = [ ocaml findlib ocamlbuild ];

     

       17
       17
       -
         propagatedBuildInputs = [ ounit ];

     

       17
       17
       +
         propagatedBuildInputs = [ qcheck ounit ];

     

       18
       18
        
       

     

       19
       19
       -
         createFindlibDestdir = true;

     

       20
       19
        
         installFlags = [ "BIN=$(out)/bin" ];

     

       21
       20
        
         preInstall = "mkdir -p $out/bin";

     

       22
       21

+5 -5

pkgs/development/python-modules/pytorch/default.nix

···

       2
       2
        
         git, stdenv }:

     

       3
       3
        
       

     

       4
       4
        
       buildPythonPackage rec {

     

       5
       5
       -
         version = "0.1.12";

     

       5
       5
       +
         version = "0.2.0";

     

       6
       6
        
         pname = "pytorch";

     

       7
       7
        
         name = "${pname}-${version}";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
       -
           owner = "pytorch";

     

       11
       11
       -
           repo = "pytorch";

     

       12
       12
       -
           rev = "v${version}";

     

       13
       13
       -
           sha256 = "0r8mf4xya76gz83y5z3hfxh0rydkydafhipl8g7d0bfrgw961jy9";

     

       10
       10
       +
           owner  = "pytorch";

     

       11
       11
       +
           repo   = "pytorch";

     

       12
       12
       +
           rev    = "v${version}";

     

       13
       13
       +
           sha256 = "112mp3r70d8f15dhxm6k7912b5i6c2q8hv9462s808y84grr2jdm";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         checkPhase = ''

+30

pkgs/development/python-modules/torchvision/default.nix

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , fetchPypi

     

       3
       3
       +
       , six

     

       4
       4
       +
       , numpy

     

       5
       5
       +
       , pillow

     

       6
       6
       +
       , pytorch

     

       7
       7
       +
       , lib }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         version = "0.1.9";

     

       11
       11
       +
         pname   = "torchvision";

     

       12
       12
       +
         name    = "${pname}-${version}";

     

       13
       13
       +
       

     

       14
       14
       +
         format = "wheel";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchPypi {

     

       17
       17
       +
           inherit pname version;

     

       18
       18
       +
           format = "wheel";

     

       19
       19
       +
           sha256 = "016rjfh9w1x4xpw15ryxsvq3j2li17nd3a7qslnf3241hc6vdcwf";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         propagatedBuildInputs = [ six numpy pillow pytorch ];

     

       23
       23
       +
       

     

       24
       24
       +
         meta = {

     

       25
       25
       +
           description = "PyTorch vision library";

     

       26
       26
       +
           homepage    = http://pytorch.org/;

     

       27
       27
       +
           license     = lib.licenses.bsd3;

     

       28
       28
       +
           maintainers = with lib.maintainers; [ ericsagnes ];

     

       29
       29
       +
         };

     

       30
       30
       +
       }

+9

pkgs/development/tools/database/liquibase/default.nix

···

       35
       35
        
             mkdir -p $out/{bin,lib,sdk}

     

       36
       36
        
             mv ./* $out/

     

       37
       37
        
       

     

       38
       38
       +
             # Clean up documentation.

     

       39
       39
       +
             mkdir -p $out/share/doc/${name}

     

       40
       40
       +
             mv $out/LICENSE.txt \

     

       41
       41
       +
                $out/README.txt \

     

       42
       42
       +
                $out/share/doc/${name}

     

       43
       43
       +
       

     

       44
       44
       +
             # Remove silly files.

     

       45
       45
       +
             rm $out/liquibase.bat $out/liquibase.spec

     

       46
       46
       +
       

     

       38
       47
        
             # we provide our own script

     

       39
       48
        
             rm $out/liquibase

     

       40
       49

+5

pkgs/os-specific/darwin/ios-cross/default.nix

···

       18
       18
        
        * x86_64-apple-darwin14  | x86_64 | true

     

       19
       19
        
        */

     

       20
       20
        
       

     

       21
       21
       +
       # Apple uses somewhat non-standard names for this. We could fall back on

     

       22
       22
       +
       # `targetPlatform.parsed.cpu.name`, but that would be a more standard one and

     

       23
       23
       +
       # likely to fail. Better just to require something manual.

     

       24
       24
       +
       assert targetPlatform ? arch;

     

       25
       25
       +
       

     

       21
       26
        
       let

     

       22
       27
        
       

     

       23
       28
        
         prefix = targetPlatform.config;

+5 -2

pkgs/os-specific/linux/busybox/default.nix

···

       27
       27
        
       in

     

       28
       28
        
       

     

       29
       29
        
       stdenv.mkDerivation rec {

     

       30
       30
       -
         name = "busybox-1.27.1";

     

       30
       30
       +
         name = "busybox-1.27.2";

     

       31
       31
        
       

     

       32
       32
       +
         # Note to whoever is updating busybox: please verify that:

     

       33
       33
       +
         # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test

     

       34
       34
       +
         # still builds after the update.

     

       32
       35
        
         src = fetchurl {

     

       33
       36
        
           url = "http://busybox.net/downloads/${name}.tar.bz2";

     

       34
       34
       -
           sha256 = "0dprylmcignrp29g41nkwr1b30v7i5x21lwymp3b93i1zd9sr468";

     

       37
       37
       +
           sha256 = "1pv3vs2w4l2wnw5qb0rkbpvjjdd1fwjv87miavqq0r0ynqbfajwx";

     

       35
       38
        
         };

     

       36
       39
        
       

     

       37
       40
        
         hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];

+3 -3

pkgs/os-specific/linux/microcode/intel.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "microcode-intel-${version}";

     

       5
       5
       -
         version = "20170511";

     

       5
       5
       +
         version = "20170707";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "http://downloadmirror.intel.com/26798/eng/microcode-${version}.tgz";

     

       9
       9
       -
           sha256 = "18w1ysklvkf4l9xgnl1wvhbgr3wbdaiphv56056pafs0hwnzsxrg";

     

       8
       8
       +
           url = "https://downloadmirror.intel.com/26925/eng/microcode-${version}.tgz";

     

       9
       9
       +
           sha256 = "14zf7fbhg0msa3bm0kl139pclmkfm83s6l86x48sr9sjpxllgm2g";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ libarchive ];

+14 -3

pkgs/servers/http/nginx/generic.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat

     

       2
       2
        
       , gd, geoip

     

       3
       3
       -
       , withStream ? false

     

       3
       3
       +
       , withStream ? true

     

       4
       4
       +
       , withMail ? false

     

       4
       5
        
       , modules ? []

     

       5
       6
        
       , hardening ? true

     

       6
       7
        
       , version, sha256, ...

     
···

       39
       40
        
           "--with-http_secure_link_module"

     

       40
       41
        
           "--with-http_degradation_module"

     

       41
       42
        
           "--with-http_stub_status_module"

     

       42
       42
       -
           "--with-ipv6"

     

       43
       43
       +
           "--with-threads"

     

       44
       44
       +
           "--with-pcre-jit"

     

       43
       45
        
           # Install destination problems

     

       44
       46
        
           # "--with-http_perl_module"

     

       45
       45
       -
         ] ++ optional withStream "--with-stream"

     

       47
       47
       +
         ] ++ optional withStream [

     

       48
       48
       +
           "--with-stream"

     

       49
       49
       +
           "--with-stream_geoip_module"

     

       50
       50
       +
           "--with-stream_realip_module"

     

       51
       51
       +
           "--with-stream_ssl_module"

     

       52
       52
       +
           "--with-stream_ssl_preread_module"

     

       53
       53
       +
         ] ++ optional withMail [

     

       54
       54
       +
           "--with-mail"

     

       55
       55
       +
           "--with-mail_ssl_module"

     

       56
       56
       +
         ]

     

       46
       57
        
           ++ optional (gd != null) "--with-http_image_filter_module"

     

       47
       58
        
           ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"

     

       48
       59
        
           ++ map (mod: "--add-module=${mod.src}") modules;

+15

pkgs/servers/nosql/cassandra/generic.nix

···

       26
       26
        
         installPhase = ''

     

       27
       27
        
           mkdir $out

     

       28
       28
        
           mv * $out

     

       29
       29
       +
       

     

       30
       30
       +
           # Clean up documentation.

     

       31
       31
       +
           mkdir -p $out/share/doc/${name}

     

       32
       32
       +
           mv $out/CHANGES.txt \

     

       33
       33
       +
              $out/LICENSE.txt \

     

       34
       34
       +
              $out/NEWS.txt \

     

       35
       35
       +
              $out/NOTICE.txt \

     

       36
       36
       +
              $out/javadoc \

     

       37
       37
       +
              $out/share/doc/${name}

     

       38
       38
       +
       

     

       39
       39
       +
           if [[ -d $out/doc ]]; then

     

       40
       40
       +
             mv "$out/doc/"* $out/share/doc/${name}

     

       41
       41
       +
             rmdir $out/doc

     

       42
       42
       +
           fi

     

       43
       43
       +
       

     

       29
       44
        
           for cmd in bin/cassandra bin/nodetool bin/sstablekeys \

     

       30
       45
        
             bin/sstableloader bin/sstableupgrade \

     

       31
       46
        
             tools/bin/cassandra-stress tools/bin/cassandra-stressd \

-6

pkgs/stdenv/darwin/default.nix

···

       78
       78
        
               cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {

     

       79
       79
        
                 inherit shell;

     

       80
       80
        
                 inherit (last) stdenv;

     

       81
       81
       -
                 inherit (last.pkgs.darwin) dyld;

     

       82
       81
        
       

     

       83
       82
        
                 nativeTools  = true;

     

       84
       83
        
                 nativePrefix = bootstrapTools;

     
···

       86
       85
        
                 buildPackages = lib.optionalAttrs (last ? stdenv) {

     

       87
       86
        
                   inherit (last) stdenv;

     

       88
       87
        
                 };

     

       89
       89
       -
                 hostPlatform = localSystem;

     

       90
       90
       -
                 targetPlatform = localSystem;

     

       91
       88
        
                 libc         = last.pkgs.darwin.Libsystem;

     

       92
       89
        
                 isClang      = true;

     

       93
       90
        
                 cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };

     
···

       320
       317
        
             buildPackages = {

     

       321
       318
        
               inherit (prevStage) stdenv;

     

       322
       319
        
             };

     

       323
       323
       -
             hostPlatform = localSystem;

     

       324
       324
       -
             targetPlatform = localSystem;

     

       325
       320
        
             inherit (pkgs) coreutils binutils gnugrep;

     

       326
       326
       -
             inherit (pkgs.darwin) dyld;

     

       327
       321
        
             cc   = pkgs.llvmPackages.clang-unwrapped;

     

       328
       322
        
             libc = pkgs.darwin.Libsystem;

     

       329
       323
        
           };

+4 -10

pkgs/stdenv/freebsd/default.nix

···

       40
       40
        
             targetPlatform = localSystem;

     

       41
       41
        
             inherit config;

     

       42
       42
        
             initialPath = [ "/" "/usr" ];

     

       43
       43
       -
             hostPlatform = localSystem;

     

       44
       44
       -
             targetPlatform = localSystem;

     

       45
       43
        
             shell = "${bootstrapTools}/bin/bash";

     

       46
       44
        
             fetchurlBoot = null;

     

       47
       45
        
             cc = null;

     
···

       55
       53
        
       

     

       56
       54
        
           stdenv = import ../generic {

     

       57
       55
        
             name = "stdenv-freebsd-boot-0";

     

       58
       58
       -
             buildPlatform = localSystem;

     

       59
       59
       -
             hostPlatform = localSystem;

     

       60
       60
       -
             targetPlatform = localSystem;

     

       61
       56
        
             inherit config;

     

       62
       57
        
             initialPath = [ prevStage.bootstrapTools ];

     

       63
       58
        
             inherit (prevStage.stdenv)

     

       64
       64
       -
               hostPlatform targetPlatform shell;

     

       59
       59
       +
               buildPlatform hostPlatform targetPlatform

     

       60
       60
       +
               shell;

     

       65
       61
        
             fetchurlBoot = prevStage.fetchurl;

     

       66
       62
        
             cc = null;

     

       67
       63
        
           };

     
···

       71
       67
        
           inherit config overlays;

     

       72
       68
        
           stdenv = import ../generic {

     

       73
       69
        
             name = "stdenv-freebsd-boot-3";

     

       74
       74
       -
             buildPlatform = localSystem;

     

       75
       75
       -
             hostPlatform = localSystem;

     

       76
       76
       -
             targetPlatform = localSystem;

     

       77
       70
        
             inherit config;

     

       78
       71
        
       

     

       79
       72
        
             inherit (prevStage.stdenv)

     

       80
       80
       -
               hostPlatform targetPlatform initialPath shell fetchurlBoot;

     

       73
       73
       +
               buildPlatform hostPlatform targetPlatform

     

       74
       74
       +
               initialPath shell fetchurlBoot;

     

       81
       75
        
       

     

       82
       76
        
             cc = import ../../build-support/cc-wrapper {

     

       83
       77
        
               nativeTools  = true;

-4

pkgs/stdenv/linux/default.nix

···

       79
       79
        
                 buildPackages = lib.optionalAttrs (prevStage ? stdenv) {

     

       80
       80
        
                   inherit (prevStage) stdenv;

     

       81
       81
        
                 };

     

       82
       82
       -
                 hostPlatform = localSystem;

     

       83
       83
       -
                 targetPlatform = localSystem;

     

       84
       82
        
                 cc = prevStage.gcc-unwrapped;

     

       85
       83
        
                 isGNU = true;

     

       86
       84
        
                 libc = prevStage.glibc;

     
···

       244
       242
        
               buildPackages = {

     

       245
       243
        
                 inherit (prevStage) stdenv;

     

       246
       244
        
               };

     

       247
       247
       -
               hostPlatform = localSystem;

     

       248
       248
       -
               targetPlatform = localSystem;

     

       249
       245
        
               cc = prevStage.gcc-unwrapped;

     

       250
       246
        
               libc = self.glibc;

     

       251
       247
        
               inherit (self) stdenv binutils coreutils gnugrep;

+2 -6

pkgs/stdenv/nix/default.nix

···

       13
       13
        
           inherit config overlays;

     

       14
       14
        
       

     

       15
       15
        
           stdenv = import ../generic rec {

     

       16
       16
       -
             buildPlatform = localSystem;

     

       17
       17
       -
             hostPlatform = localSystem;

     

       18
       18
       -
             targetPlatform = localSystem;

     

       16
       16
       +
             inherit config;

     

       19
       17
        
       

     

       20
       20
       -
             inherit config;

     

       18
       18
       +
             inherit (prevStage.stdenv) buildPlatform hostPlatform targetPlatform;

     

       21
       19
        
       

     

       22
       20
        
             preHook = ''

     

       23
       21
        
               export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"

     
···

       26
       24
        
             '';

     

       27
       25
        
       

     

       28
       26
        
             initialPath = (import ../common-path.nix) { pkgs = prevStage; };

     

       29
       29
       -
       

     

       30
       30
       -
             inherit (prevStage.stdenv) hostPlatform targetPlatform;

     

       31
       27
        
       

     

       32
       28
        
             cc = import ../../build-support/cc-wrapper {

     

       33
       29
        
               nativeTools = false;

+6 -6

pkgs/tools/misc/ostree/default.nix

···

       7
       7
        
         libglnx-src = fetchFromGitHub {

     

       8
       8
        
           owner  = "GNOME";

     

       9
       9
        
           repo   = "libglnx";

     

       10
       10
       -
           rev    = "36396b49ad6636c9959f3dfac5e04d41584b1a92";

     

       11
       11
       -
           sha256 = "146flrpzybm2s12wg05rnglnfd2f2jx3xzvns2pq28kvg09bgcfn";

     

       10
       10
       +
           rev    = "50a0feaba03ffa5a1980d3a14487276b8f49f8a6";

     

       11
       11
       +
           sha256 = "1rn5jdh84y1yfpqmvidx82lkm0jr7scjzdrps57r37ksxvrk3ibs";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         bsdiff-src = fetchFromGitHub {

     

       15
       15
        
           owner  = "mendsley";

     

       16
       16
        
           repo   = "bsdiff";

     

       17
       17
       -
           rev    = "1edf9f656850c0c64dae260960fabd8249ea9c60";

     

       18
       18
       -
           sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";

     

       17
       17
       +
           rev    = "7d70d8f4ff48345bc76e314c9d98da91f78873fa";

     

       18
       18
       +
           sha256 = "0ai2kykj8i4bqcy3gry36r3n4ax0fldncfhksl5b293nf2fihnws";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         version = "2016.11";

     

       21
       21
       +
         version = "2017.9";

     

       22
       22
        
       in stdenv.mkDerivation {

     

       23
       23
        
         name = "ostree-${version}";

     

       24
       24
        
       

     
···

       26
       26
        
           rev    = "v${version}";

     

       27
       27
        
           owner  = "ostreedev";

     

       28
       28
        
           repo   = "ostree";

     

       29
       29
       -
           sha256 = "19xmg01mxdykx74r9ra11hc15qd1fjqbxdn23jrn2pcvz8dw9zgc";

     

       29
       29
       +
           sha256 = "1040xcw8qcs6xq8x4wg47hha3915qzb6lndb38wjyn6wzl1680q3";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         nativeBuildInputs = [

+10 -1

pkgs/tools/security/pinentry/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, pkgconfig

     

       1
       1
       +
       { fetchurl, fetchpatch, stdenv, lib, pkgconfig

     

       2
       2
        
       , libgpgerror, libassuan, libcap ? null, ncurses ? null, gtk2 ? null, qt4 ? null

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       22
       22
        
         prePatch = ''

     

       23
       23
        
           substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses

     

       24
       24
        
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         patches = lib.optionals (gtk2 != null) [

     

       27
       27
       +
           (fetchpatch {

     

       28
       28
       +
              url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0006-gtk2-Fix-a-problem-with-fvwm.patch;

     

       29
       29
       +
              sha256 = "1w3y4brqp74hy3fbfxqnqp6jf985bd6667ivy1crz50r3z9zsy09";

     

       30
       30
       +
         })(fetchpatch {

     

       31
       31
       +
              url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch;

     

       32
       32
       +
              sha256 = "046jy7k0n7fj74s5w1h6sq1ljg8y77i0xwi301kv53bhsp0xsirx";

     

       33
       33
       +
         })];

     

       25
       34
        
       

     

       26
       35
        
         # configure cannot find moc on its own

     

       27
       36
        
         preConfigure = stdenv.lib.optionalString (qt4 != null) ''

+8 -10

pkgs/top-level/all-packages.nix

···

       6065
       6065
        
           nativeLibc = stdenv.cc.nativeLibc or false;

     

       6066
       6066
        
           nativePrefix = stdenv.cc.nativePrefix or "";

     

       6067
       6067
        
           cc = baseCC;

     

       6068
       6068
       -
           dyld = if stdenv.isDarwin then darwin.dyld else null;

     

       6069
       6068
        
           isGNU = baseCC.isGNU or false;

     

       6070
       6069
        
           isClang = baseCC.isClang or false;

     

       6071
       6070
        
           inherit libc extraBuildCommands;

     
···

       6091
       6090
        
             nativeLibc = false;

     

       6092
       6091
        
             noLibc = (libc == null);

     

       6093
       6092
        
       

     

       6094
       6094
       -
             dyld = if stdenv.isDarwin then darwin.dyld else null;

     

       6095
       6093
        
             isGNU = cc.isGNU or false;

     

       6096
       6094
        
             isClang = cc.isClang or false;

     

       6097
       6095
        
       

     
···

       9971
       9969
        
           ### KDE APPLICATIONS

     

       9972
       9970
        
       

     

       9973
       9971
        
           inherit (kdeApplications.override { libsForQt5 = self; })

     

       9974
       9974
       -
             libkdcraw libkexiv2 libkipi libkomparediff2;

     

       9972
       9972
       +
             kholidays libkdcraw libkexiv2 libkipi libkomparediff2;

     

       9975
       9973
        
       

     

       9976
       9974
        
           ### LIBRARIES

     

       9977
       9975
        
       

     
···

       9981
       9979
        
       

     

       9982
       9980
        
           qgpgme = callPackage ../development/libraries/gpgme { };

     

       9983
       9981
        
       

     

       9984
       9984
       -
           grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };

     

       9982
       9982
       +
           grantlee = callPackage ../development/libraries/grantlee/5 { };

     

       9985
       9983
        
       

     

       9986
       9984
        
           inherit (callPackage ../development/libraries/kirigami { })

     

       9987
       9985
        
             kirigami_1

     

       9988
       9986
        
             kirigami_2;

     

       9987
       9987
       +
       

     

       9988
       9988
       +
           kdiagram = callPackage ../development/libraries/kdiagram { };

     

       9989
       9989
        
       

     

       9990
       9990
        
           kirigami = kirigami_1;

     

       9991
       9991
        
       

     
···

       11775
       11775
        
       

     

       11776
       11776
        
         darwin = let

     

       11777
       11777
        
           apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };

     

       11778
       11778
       -
         in recurseIntoAttrs (apple-source-releases // rec {

     

       11778
       11778
       +
         in (apple-source-releases // rec {

     

       11779
       11779
        
           cctools = callPackage ../os-specific/darwin/cctools/port.nix {

     

       11780
       11780
        
             inherit libobjc;

     

       11781
       11781
        
             stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;

     
···

       14843
       14843
        
       

     

       14844
       14844
        
         inherit (kdeApplications)

     

       14845
       14845
        
           akonadi ark dolphin ffmpegthumbs filelight gwenview kate kdenlive

     

       14846
       14846
       -
           kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmix

     

       14847
       14847
       -
           kolourpaint kompare konsole krfb kwalletmanager marble okteta okular

     

       14846
       14846
       +
           kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmail

     

       14847
       14847
       +
           kmix kolourpaint kompare konsole krfb kwalletmanager marble okteta okular

     

       14848
       14848
        
           spectacle;

     

       14849
       14849
        
       

     

       14850
       14850
        
         kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };

     
···

       15827
       15827
        
           rancher-compose

     

       15828
       15828
        
           rancher-compose_0_10;

     

       15829
       15829
        
       

     

       15830
       15830
       -
         renoise = callPackage ../applications/audio/renoise {

     

       15831
       15831
       -
           demo = false;

     

       15832
       15832
       -
         };

     

       15830
       15830
       +
         renoise = callPackage ../applications/audio/renoise {};

     

       15833
       15831
        
       

     

       15834
       15832
        
         rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; };

     

       15835
       15833

+3 -3

pkgs/top-level/perl-packages.nix

···

       7241
       7241
        
       

     

       7242
       7242
        
         ImageExifTool = buildPerlPackage rec {

     

       7243
       7243
        
           name = "Image-ExifTool-${version}";

     

       7244
       7244
       -
           version = "10.55";

     

       7244
       7244
       +
           version = "10.60";

     

       7245
       7245
        
       

     

       7246
       7246
        
           src = fetchurl {

     

       7247
       7247
        
             url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";

     

       7248
       7248
       -
             sha256 = "0z8zwjjfvyllnhsafhddbybywpgqv0pl1dbn1g034cs27yj836q2";

     

       7248
       7248
       +
             sha256 = "1ymcnxf8miw0c1nadpxmvzabmaz837afrwp1k5khhv0s1vv8h2fz";

     

       7249
       7249
        
           };

     

       7250
       7250
        
       

     

       7251
       7251
        
           meta = with stdenv.lib; {

     
···

       7266
       7266
        
       

     

       7267
       7267
        
             license = with licenses; [ gpl1Plus /* or */ artistic2 ];

     

       7268
       7268
        
       

     

       7269
       7269
       -
             maintainers = [ ];

     

       7269
       7269
       +
             maintainers = [ maintainers.kiloreux ];

     

       7270
       7270
        
             platforms = platforms.unix;

     

       7271
       7271
        
           };

     

       7272
       7272
        
         };

+2

pkgs/top-level/python-packages.nix

···

       27068
       27068
        
           };

     

       27069
       27069
        
         };

     

       27070
       27070
        
       

     

       27071
       27071
       +
         torchvision = callPackage ../development/python-modules/torchvision { };

     

       27072
       27072
       +
       

     

       27071
       27073
        
         jenkinsapi = buildPythonPackage rec {

     

       27072
       27074
        
           name = "jenkinsapi-${version}";

     

       27073
       27075
        
           version = "0.2.32";