commit 01a4d350c7d8ee4cc9c9e918fe53af9588b2e6e0 · pyrox.dev/nixpkgs

+49 -1

nixos/doc/manual/release-notes/rl-2105.xml

···

       36
       36
        
            now point to an externally wrapped by default derivations, that allow you to

     

       37
       37
        
            also add `extraPythonPackages` to the Python interpreter used by GNURadio.

     

       38
       38
        
            Missing environmental variables needed for operational GUI were also added

     

       39
       39
       -
            (<link xlink:href="https://github.com/NixOS/nixpkgs/issues/75478">#7547</link>).

     

       39
       39
       +
            (<link xlink:href="https://github.com/NixOS/nixpkgs/issues/75478">#75478</link>).

     

       40
       40
       +
           </para>

     

       41
       41
       +
          </listitem>

     

       42
       42
       +
          <listitem>

     

       43
       43
       +
           <para>

     

       44
       44
       +
            <link xlink:href="https://www.gnuradio.org/">GNURadio</link> has a

     

       45
       45
       +
            <code>pkgs</code> attribute set, and there's a <code>gnuradio.callPackage</code>

     

       46
       46
       +
            function that extends <code>pkgs</code> with a <code>mkDerivation</code>, and a

     

       47
       47
       +
            <code>mkDerivationWith</code>, like Qt5. Now all <code>gnuradio.pkgs</code> are

     

       48
       48
       +
            defined with <code>gnuradio.callPackage</code> and some packages that depend

     

       49
       49
       +
            on gnuradio are defined with this as well.

     

       40
       50
        
           </para>

     

       41
       51
        
          </listitem>

     

       42
       52
        
          <listitem>

     
···

       55
       65
        
            <xref linkend="opt-services.privoxy.settings"/>

     

       56
       66
        
            (See <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC 0042</link>

     

       57
       67
        
            for the motivation).

     

       68
       68
       +
           </para>

     

       69
       69
       +
          </listitem>

     

       70
       70
       +
          <listitem>

     

       71
       71
       +
           <para>

     

       72
       72
       +
            <link xlink:href="https://kodi.tv/">Kodi</link> has been updated to version 19.0 "Matrix". See

     

       73
       73
       +
            the <link xlink:href="https://kodi.tv/article/kodi-190-matrix-release">announcement</link> for

     

       74
       74
       +
            further details.

     

       58
       75
        
           </para>

     

       59
       76
        
          </listitem>

     

       60
       77
        
         </itemizedlist>

     
···

       575
       592
        
             have been removed. You should set your own according to the

     

       576
       593
        
             <link xlink:href="https://kafka.apache.org/documentation/#java">upstream documentation</link>

     

       577
       594
        
             for your Kafka version.

     

       595
       595
       +
           </para>

     

       596
       596
       +
          </listitem>

     

       597
       597
       +
          <listitem>

     

       598
       598
       +
           <para>

     

       599
       599
       +
            The <package>kodi</package> package has been modified to allow concise addon management. Consider

     

       600
       600
       +
            the following configuration from previous releases of NixOS to install <package>kodi</package>,

     

       601
       601
       +
            including the <package>kodiPackages.inputstream-adaptive</package> and <package>kodiPackages.vfs-sftp</package>

     

       602
       602
       +
            addons:

     

       603
       603
       +
       

     

       604
       604
       +
            <programlisting>

     

       605
       605
       +
       environment.systemPackages = [

     

       606
       606
       +
         pkgs.kodi

     

       607
       607
       +
       ];

     

       608
       608
       +
       

     

       609
       609
       +
       nixpkgs.config.kodi = {

     

       610
       610
       +
         enableInputStreamAdaptive = true;

     

       611
       611
       +
         enableVFSSFTP = true;

     

       612
       612
       +
       };

     

       613
       613
       +
            </programlisting>

     

       614
       614
       +
       

     

       615
       615
       +
            All Kodi <literal>config</literal> flags have been removed, and as a result the above configuration

     

       616
       616
       +
            should now be written as:

     

       617
       617
       +
       

     

       618
       618
       +
            <programlisting>

     

       619
       619
       +
       environment.systemPackages = [

     

       620
       620
       +
         (pkgs.kodi.withPackages (p: with p; [

     

       621
       621
       +
           inputstream-adaptive

     

       622
       622
       +
           vfs-sftp

     

       623
       623
       +
         ]))

     

       624
       624
       +
       ];

     

       625
       625
       +
            </programlisting>

     

       578
       626
        
           </para>

     

       579
       627
        
          </listitem>

     

       580
       628
        
         </itemizedlist>

+16 -4

nixos/modules/services/misc/mautrix-telegram.nix

···

       6
       6
        
         dataDir = "/var/lib/mautrix-telegram";

     

       7
       7
        
         registrationFile = "${dataDir}/telegram-registration.yaml";

     

       8
       8
        
         cfg = config.services.mautrix-telegram;

     

       9
       9
       -
         # TODO: switch to configGen.json once RFC42 is implemented

     

       10
       10
       -
         settingsFile = pkgs.writeText "mautrix-telegram-settings.json" (builtins.toJSON cfg.settings);

     

       9
       9
       +
         settingsFormat = pkgs.formats.json {};

     

       10
       10
       +
         settingsFileUnsubstituted = settingsFormat.generate "mautrix-telegram-config-unsubstituted.json" cfg.settings;

     

       11
       11
       +
         settingsFile = "${dataDir}/config.json";

     

       11
       12
        
       

     

       12
       13
        
       in {

     

       13
       14
        
         options = {

     
···

       15
       16
        
             enable = mkEnableOption "Mautrix-Telegram, a Matrix-Telegram hybrid puppeting/relaybot bridge";

     

       16
       17
        
       

     

       17
       18
        
             settings = mkOption rec {

     

       18
       18
       -
               # TODO: switch to types.config.json as prescribed by RFC42 once it's implemented

     

       19
       19
       -
               type = types.attrs;

     

       20
       19
        
               apply = recursiveUpdate default;

     

       20
       20
       +
               inherit (settingsFormat) type;

     

       21
       21
        
               default = {

     

       22
       22
        
                 appservice = rec {

     

       23
       23
        
                   database = "sqlite:///${dataDir}/mautrix-telegram.db";

     
···

       124
       124
        
             after = [ "network-online.target" ] ++ cfg.serviceDependencies;

     

       125
       125
        
       

     

       126
       126
        
             preStart = ''

     

       127
       127
       +
               # Not all secrets can be passed as environment variable (yet)

     

       128
       128
       +
               # https://github.com/tulir/mautrix-telegram/issues/584

     

       129
       129
       +
               [ -f ${settingsFile} ] && rm -f ${settingsFile}

     

       130
       130
       +
               old_umask=$(umask)

     

       131
       131
       +
               umask 0277

     

       132
       132
       +
               ${pkgs.envsubst}/bin/envsubst \

     

       133
       133
       +
                 -o ${settingsFile} \

     

       134
       134
       +
                 -i ${settingsFileUnsubstituted}

     

       135
       135
       +
               umask $old_umask

     

       136
       136
       +
       

     

       127
       137
        
               # generate the appservice's registration file if absent

     

       128
       138
        
               if [ ! -f '${registrationFile}' ]; then

     

       129
       139
        
                 ${pkgs.mautrix-telegram}/bin/mautrix-telegram \

     
···

       159
       169
        
                   --config='${settingsFile}'

     

       160
       170
        
               '';

     

       161
       171
        
             };

     

       172
       172
       +
       

     

       173
       173
       +
             restartTriggers = [ settingsFileUnsubstituted ];

     

       162
       174
        
           };

     

       163
       175
        
         };

     

       164
       176

+2 -1

nixos/modules/services/monitoring/prometheus/exporters.nix

···

       31
       31
        
           "dovecot"

     

       32
       32
        
           "fritzbox"

     

       33
       33
        
           "json"

     

       34
       34
       +
           "jitsi"

     

       34
       35
        
           "keylight"

     

       35
       36
        
           "knot"

     

       36
       37
        
           "lnd"

     
···

       130
       131
        
                 inherit name port;

     

       131
       132
        
               } // extraOpts);

     

       132
       133
        
             } ({ config, ... }: mkIf config.openFirewall {

     

       133
       133
       -
               firewallFilter = mkOptionDefault "-p tcp -m tcp --dport ${toString config.port}";

     

       134
       134
       +
               firewallFilter = mkDefault "-p tcp -m tcp --dport ${toString config.port}";

     

       134
       135
        
             })];

     

       135
       136
        
             internal = true;

     

       136
       137
        
             default = {};

+40

nixos/modules/services/monitoring/prometheus/exporters/jitsi.nix

···

       1
       1
       +
       { config, lib, pkgs, options }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.prometheus.exporters.jitsi;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         port = 9700;

     

       10
       10
       +
         extraOpts = {

     

       11
       11
       +
           url = mkOption {

     

       12
       12
       +
             type = types.str;

     

       13
       13
       +
             default = "http://localhost:8080/colibri/stats";

     

       14
       14
       +
             description = ''

     

       15
       15
       +
               Jitsi Videobridge metrics URL to monitor.

     

       16
       16
       +
               This is usually /colibri/stats on port 8080 of the jitsi videobridge host.

     

       17
       17
       +
             '';

     

       18
       18
       +
           };

     

       19
       19
       +
           interval = mkOption {

     

       20
       20
       +
             type = types.str;

     

       21
       21
       +
             default = "30s";

     

       22
       22
       +
             example = "1min";

     

       23
       23
       +
             description = ''

     

       24
       24
       +
               How often to scrape new data

     

       25
       25
       +
             '';

     

       26
       26
       +
           };

     

       27
       27
       +
         };

     

       28
       28
       +
         serviceOpts = {

     

       29
       29
       +
           serviceConfig = {

     

       30
       30
       +
             ExecStart = ''

     

       31
       31
       +
               ${pkgs.prometheus-jitsi-exporter}/bin/jitsiexporter \

     

       32
       32
       +
                 -url ${escapeShellArg cfg.url} \

     

       33
       33
       +
                 -host ${cfg.listenAddress} \

     

       34
       34
       +
                 -port ${toString cfg.port} \

     

       35
       35
       +
                 -interval ${toString cfg.interval} \

     

       36
       36
       +
                 ${concatStringsSep " \\\n  " cfg.extraFlags}

     

       37
       37
       +
             '';

     

       38
       38
       +
           };

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+23

nixos/tests/prometheus-exporters.nix

···

       233
       233
        
             '';

     

       234
       234
        
           };

     

       235
       235
        
       

     

       236
       236
       +
           jitsi = {

     

       237
       237
       +
             exporterConfig = {

     

       238
       238
       +
               enable = true;

     

       239
       239
       +
             };

     

       240
       240
       +
             metricProvider = {

     

       241
       241
       +
               systemd.services.prometheus-jitsi-exporter.after = [ "jitsi-videobridge2.service" ];

     

       242
       242
       +
               services.jitsi-videobridge = {

     

       243
       243
       +
                 enable = true;

     

       244
       244
       +
                 apis = [ "colibri" "rest" ];

     

       245
       245
       +
               };

     

       246
       246
       +
             };

     

       247
       247
       +
             exporterTest = ''

     

       248
       248
       +
               wait_for_unit("jitsi-videobridge2.service")

     

       249
       249
       +
               wait_for_open_port(8080)

     

       250
       250
       +
               wait_for_unit("prometheus-jitsi-exporter.service")

     

       251
       251
       +
               wait_for_open_port(9700)

     

       252
       252
       +
               wait_until_succeeds(

     

       253
       253
       +
                   'journalctl -eu prometheus-jitsi-exporter.service -o cat | grep -q "key=participants"'

     

       254
       254
       +
               )

     

       255
       255
       +
               succeed("curl -sSf 'localhost:9700/metrics' | grep -q 'jitsi_participants 0'")

     

       256
       256
       +
             '';

     

       257
       257
       +
           };

     

       258
       258
       +
       

     

       236
       259
        
           json = {

     

       237
       260
        
             exporterConfig = {

     

       238
       261
        
               enable = true;

+2 -2

pkgs/applications/audio/rosegarden/default.nix

···

       3
       3
        
       , liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation (rec {

     

       6
       6
       -
         version = "20.06";

     

       6
       6
       +
         version = "20.12";

     

       7
       7
        
         pname = "rosegarden";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.bz2";

     

       11
       11
       -
           sha256 = "1i9x9rkqwwdrk77xl5ra8i48cjirbc7fbisnj0nnclccwaq0wk6r";

     

       11
       11
       +
           sha256 = "sha256-iGaEr8WFipV4I00fhFGI2xMBFPf784IIxNXs2hUTHFs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         patchPhase = ''

+2 -2

pkgs/applications/display-managers/lightdm-mini-greeter/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "lightdm-mini-greeter";

     

       5
       5
       -
         version = "0.5.0";

     

       5
       5
       +
         version = "0.5.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "prikhi";

     

       9
       9
        
           repo = "lightdm-mini-greeter";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-cVOnd3k+9hFQjROiwPpxZcCxD2NiH1eclJHF88eV6BM=";

     

       11
       11
       +
           sha256 = "sha256-Pm7ExfusFIPktX2C4UE07qgOVhcWhVxnaD3QARpmu7Y=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];

+1 -3

pkgs/applications/graphics/photoflare/default.nix

···

       19
       19
        
       

     

       20
       20
        
         NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick";

     

       21
       21
        
       

     

       22
       22
       -
         enableParallelBuilding = true;

     

       23
       23
       -
       

     

       24
       22
        
         meta = with lib; {

     

       25
       23
        
           description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface";

     

       26
       24
        
           homepage = "https://photoflare.io";

     

       27
       25
        
           maintainers = [ maintainers.omgbebebe ];

     

       28
       28
       -
           license = licenses.gpl3;

     

       26
       26
       +
           license = licenses.gpl3Plus;

     

       29
       27
        
           platforms = platforms.linux;

     

       30
       28
        
         };

     

       31
       29
        
       }

+7 -4

pkgs/applications/misc/pueue/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchFromGitHub, installShellFiles }:

     

       1
       1
       +
       { stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, SystemConfiguration, libiconv }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "pueue";

     

       5
       5
       -
         version = "0.12.0";

     

       5
       5
       +
         version = "0.12.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "Nukesor";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-yOUVDq/wRY35ZQjQVwTLYHKukkKpoggN51wBDdZnhI4=";

     

       11
       11
       +
           sha256 = "sha256-wcOF34GzlB6YKISkjDgYgsaN1NmWBMIntfT23A6byx8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-56jJ8IjxWTBlaDd1CVit4RP659Mgw2j2wMWcSDYVihM=";

     

       14
       14
       +
         cargoSha256 = "sha256-7SJjtHNSabE/VqdiSwKZ/yNzk6GSMNsQLaSx/MjN5NA=";

     

       15
       15
        
       

     

       16
       16
        
         nativeBuildInputs = [ installShellFiles ];

     

       17
       17
       +
       

     

       18
       18
       +
         buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration libiconv ];

     

       17
       19
        
       

     

       18
       20
        
         checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ];

     

       19
       21
        
       

     
···

       27
       29
        
         meta = with lib; {

     

       28
       30
        
           description = "A daemon for managing long running shell commands";

     

       29
       31
        
           homepage = "https://github.com/Nukesor/pueue";

     

       32
       32
       +
           changelog = "https://github.com/Nukesor/pueue/raw/v${version}/CHANGELOG.md";

     

       30
       33
        
           license = licenses.mit;

     

       31
       34
        
           maintainers = [ maintainers.marsam ];

     

       32
       35
        
         };

+6 -4

pkgs/applications/networking/browsers/asuka/default.nix

···

       1
       1
       -
       { lib, stdenv, rustPlatform, fetchurl, pkg-config, ncurses, openssl, Security }:

     

       1
       1
       +
       { lib, stdenv, rustPlatform, fetchFromSourcehut, pkg-config, ncurses, openssl, Security }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "asuka";

     

       5
       5
        
         version = "0.8.1";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://git.sr.ht/~julienxx/${pname}/archive/${version}.tar.gz";

     

       9
       9
       -
           sha256 = "07i80qmdpwfdgwrk1gzs10wln91v23qjrsk0x134xf5mjnakxc06";

     

       7
       7
       +
         src = fetchFromSourcehut {

     

       8
       8
       +
           owner = "~julienxx";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "1y8v4qc5dng3v9k0bky1xlf3qi9pk2vdsi29lff4ha5310467f0k";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         cargoSha256 = "0p0x4ch04kydg76bfal5zqzr9hvn5268wf3k2v9h7g8r4y8xqlhw";

+3 -3

pkgs/applications/networking/cluster/terragrunt/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "terragrunt";

     

       5
       5
       -
         version = "0.28.9";

     

       5
       5
       +
         version = "0.28.11";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "gruntwork-io";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-sqwR+bXx5ab5OsmW44C5MIXjzQFM1QsBvsM0R3pL3H8=";

     

       11
       11
       +
           sha256 = "sha256-qlmiQ73MRXcdXXC50pewUMt9YFbzXIbjnZTV5gIcvGs=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-9DBCP/4mp/Gr2ie0nk7WGfL+M7snMEztdHZzxdIFbzM=";

     

       14
       14
       +
         vendorSha256 = "sha256-SVrDBDGK809O+RaE3gOa9U1agY6hSGI/k3FUCgm+5PA=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+6 -4

pkgs/applications/networking/mailreaders/aerc/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchurl

     

       1
       1
       +
       { lib, buildGoModule, fetchFromSourcehut

     

       2
       2
        
       , ncurses, notmuch, scdoc

     

       3
       3
        
       , python3, w3m, dante

     

       4
       4
        
       }:

     
···

       7
       7
        
         pname = "aerc";

     

       8
       8
        
         version = "0.5.2";

     

       9
       9
        
       

     

       10
       10
       -
         src = fetchurl {

     

       11
       11
       -
           url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz";

     

       12
       12
       -
           sha256 = "h7kiRA5TuZ8mDSMymWU33stFLIOMd06TQLYzKW+faO4=";

     

       10
       10
       +
         src = fetchFromSourcehut {

     

       11
       11
       +
           owner = "~sircmpwn";

     

       12
       12
       +
           repo = pname;

     

       13
       13
       +
           rev = version;

     

       14
       14
       +
           sha256 = "1ja639qry8h2d6y7qshf62ypkzs2rzady59p81scqh8nx0g9bils";

     

       13
       15
        
         };

     

       14
       16
        
       

     

       15
       17
        
         runVend = true;

+19 -13

pkgs/applications/radio/gnss-sdr/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       2
       3
        
       , armadillo

     

       3
       3
       -
       , boost

     

       4
       4
        
       , cmake

     

       5
       5
       +
       , gmp

     

       5
       6
        
       , glog

     

       6
       7
        
       , gmock

     

       7
       8
        
       , openssl

     

       8
       9
        
       , gflags

     

       9
       9
       -
       , gnuradio

     

       10
       10
       +
       , gnuradio3_8

     

       11
       11
       +
       , libpcap

     

       10
       12
        
       , orc

     

       11
       13
        
       , pkg-config

     

       12
       12
       -
       , pythonPackages

     

       13
       14
        
       , uhd

     

       14
       15
        
       , log4cpp

     

       15
       16
        
       , blas, lapack

     
···

       18
       19
        
       , protobuf

     

       19
       20
        
       }:

     

       20
       21
        
       

     

       21
       21
       -
       stdenv.mkDerivation rec {

     

       22
       22
       +
       gnuradio3_8.pkgs.mkDerivation rec {

     

       22
       23
        
         pname = "gnss-sdr";

     

       23
       24
        
         version = "0.0.13";

     

       24
       25
        
       

     
···

       29
       30
        
           sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby";

     

       30
       31
        
         };

     

       31
       32
        
       

     

       32
       32
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       33
       33
       +
         nativeBuildInputs = [

     

       34
       34
       +
           cmake

     

       35
       35
       +
           gnuradio3_8.unwrapped.python

     

       36
       36
       +
           gnuradio3_8.unwrapped.python.pkgs.Mako

     

       37
       37
       +
           gnuradio3_8.unwrapped.python.pkgs.six

     

       38
       38
       +
         ];

     

       39
       39
       +
       

     

       33
       40
        
         buildInputs = [

     

       41
       41
       +
           gmp

     

       34
       42
        
           armadillo

     

       35
       35
       -
           boost.dev

     

       43
       43
       +
           gnuradio3_8.unwrapped.boost

     

       36
       44
        
           glog

     

       37
       45
        
           gmock

     

       38
       38
       -
           openssl.dev

     

       46
       46
       +
           openssl

     

       39
       47
        
           gflags

     

       40
       40
       -
           gnuradio

     

       41
       48
        
           orc

     

       42
       42
       -
           pythonPackages.Mako

     

       43
       43
       -
           pythonPackages.six

     

       44
       44
       -
       

     

       45
       49
        
           # UHD support is optional, but gnuradio is built with it, so there's

     

       46
       50
        
           # nothing to be gained by leaving it out.

     

       47
       47
       -
           uhd

     

       51
       51
       +
           gnuradio3_8.unwrapped.uhd

     

       48
       52
        
           log4cpp

     

       49
       53
        
           blas lapack

     

       50
       54
        
           matio

     

       51
       55
        
           pugixml

     

       52
       56
        
           protobuf

     

       57
       57
       +
           gnuradio3_8.pkgs.osmosdr

     

       58
       58
       +
           libpcap

     

       53
       59
        
         ];

     

       54
       60
        
       

     

       55
       61
        
         cmakeFlags = [

+22 -33

pkgs/applications/radio/gnuradio/3.7.nix

···

       5
       5
        
       # Remove gcc and python references

     

       6
       6
        
       , removeReferencesTo

     

       7
       7
        
       , pkg-config

     

       8
       8
       +
       , volk

     

       8
       9
        
       , cppunit

     

       9
       10
        
       , swig

     

       10
       11
        
       , orc

     
···

       43
       44
        
         minor = "14";

     

       44
       45
        
         patch = "0";

     

       45
       46
        
       }

     

       46
       46
       -
       , fetchSubmodules ? true

     

       47
       47
       +
       # We use our build of volk and not the one bundled with the release

     

       48
       48
       +
       , fetchSubmodules ? false

     

       47
       49
        
       }:

     

       48
       50
        
       

     

       49
       51
        
       let

     

       50
       50
       -
         sourceSha256 = "1nh4f9dmygprlbqybd3j1byg9fsr6065n140mvc4b0v8qqygmhrc";

     

       52
       52
       +
         sourceSha256 = "BiUDibXV/5cEYmAAaIxT4WTxF/ni4MJumF5oJ/vuOyc=";

     

       51
       53
        
         featuresInfo = {

     

       52
       54
        
           # Needed always

     

       53
       55
        
           basic = {

     
···

       61
       63
        
           };

     

       62
       64
        
           volk = {

     

       63
       65
        
             cmakeEnableFlag = "VOLK";

     

       66
       66
       +
             runtime = [

     

       67
       67
       +
               volk

     

       68
       68
       +
             ];

     

       64
       69
        
           };

     

       65
       70
        
           doxygen = {

     

       66
       71
        
             native = [ doxygen ];

     
···

       213
       218
        
           qt = qt4;

     

       214
       219
        
           gtk = gtk2;

     

       215
       220
        
         });

     

       221
       221
       +
         inherit (shared) hasFeature; # function

     

       222
       222
       +
       in

     

       223
       223
       +
       

     

       224
       224
       +
       stdenv.mkDerivation rec {

     

       225
       225
       +
         inherit pname;

     

       216
       226
        
         inherit (shared)

     

       217
       227
        
           version

     

       218
       228
        
           src

     

       219
       219
       -
           hasFeature # function

     

       220
       229
        
           nativeBuildInputs

     

       221
       230
        
           buildInputs

     

       222
       231
        
           disallowedReferences

     

       223
       232
        
           postInstall

     

       224
       224
       -
           passthru

     

       225
       233
        
           doCheck

     

       226
       234
        
           dontWrapPythonPrograms

     

       227
       235
        
           meta

     

       228
       236
        
         ;

     

       237
       237
       +
       

     

       238
       238
       +
         passthru = shared.passthru // {

     

       239
       239
       +
           # Deps that are potentially overriden and are used inside GR plugins - the same version must

     

       240
       240
       +
           inherit boost volk;

     

       241
       241
       +
         } // lib.optionalAttrs (hasFeature "gr-uhd" features) {

     

       242
       242
       +
           inherit uhd;

     

       243
       243
       +
         };

     

       229
       244
        
         cmakeFlags = shared.cmakeFlags

     

       230
       245
        
           # From some reason, if these are not set, libcodec2 and gsm are

     

       231
       246
        
           # not detected properly (slightly different then what's in

     
···

       235
       250
        
             "-DLIBCODEC2_INCLUDE_DIR=${codec2}/include"

     

       236
       251
        
             "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"

     

       237
       252
        
             "-DLIBGSM_INCLUDE_DIR=${gsm}/include/gsm"

     

       253
       253
       +
           ]

     

       254
       254
       +
           ++ lib.optionals (hasFeature "volk" features && volk != null) [

     

       255
       255
       +
             "-DENABLE_INTERNAL_VOLK=OFF"

     

       238
       256
        
           ]

     

       239
       257
        
         ;

     

       240
       258
        
         stripDebugList = shared.stripDebugList

     
···

       250
       268
        
           + lib.optionalString (hasFeature "gnuradio-companion" features) ''

     

       251
       269
        
             sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt

     

       252
       270
        
           ''

     

       253
       253
       -
           # If python-support is disabled, don't install volk's (git submodule)

     

       254
       254
       -
           # volk_modtool - it references python.

     

       255
       255
       -
           #

     

       256
       256
       -
           # NOTE: The same is done for 3.8, but we don't put this string in

     

       257
       257
       -
           # ./shared.nix since on the next release of 3.8 it won't be needed there,

     

       258
       258
       -
           # but it will be needed for 3.7, probably for ever.

     

       259
       259
       -
           + lib.optionalString (!hasFeature "python-support" features) ''

     

       260
       260
       -
             sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt

     

       261
       261
       -
           ''

     

       262
       271
        
         ;

     

       263
       272
        
         patches = [

     

       264
       273
        
           # Don't install python referencing files if python support is disabled.

     
···

       272
       281
        
             sha256 = "2Pitgu8accs16B5X5+/q51hr+IY9DMsA15f56gAtBs8=";

     

       273
       282
        
           })

     

       274
       283
        
         ];

     

       275
       275
       -
       in

     

       276
       276
       -
       

     

       277
       277
       -
       stdenv.mkDerivation rec {

     

       278
       278
       -
         inherit

     

       279
       279
       -
           pname

     

       280
       280
       -
           version

     

       281
       281
       -
           src

     

       282
       282
       -
           nativeBuildInputs

     

       283
       283
       -
           buildInputs

     

       284
       284
       -
           cmakeFlags

     

       285
       285
       -
           preConfigure

     

       286
       286
       -
           # disallowedReferences

     

       287
       287
       -
           stripDebugList

     

       288
       288
       -
           patches

     

       289
       289
       -
           postInstall

     

       290
       290
       -
           passthru

     

       291
       291
       -
           doCheck

     

       292
       292
       -
           dontWrapPythonPrograms

     

       293
       293
       -
           meta

     

       294
       294
       -
         ;

     

       295
       284
        
       }

+284

pkgs/applications/radio/gnuradio/3.8.nix

···

       1
       1
       +
       { lib, stdenv

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , fetchpatch

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       # Remove gcc and python references

     

       6
       6
       +
       , removeReferencesTo

     

       7
       7
       +
       , pkg-config

     

       8
       8
       +
       , volk

     

       9
       9
       +
       , cppunit

     

       10
       10
       +
       , swig

     

       11
       11
       +
       , orc

     

       12
       12
       +
       , boost

     

       13
       13
       +
       , log4cpp

     

       14
       14
       +
       , mpir

     

       15
       15
       +
       , doxygen

     

       16
       16
       +
       , python

     

       17
       17
       +
       , codec2

     

       18
       18
       +
       , gsm

     

       19
       19
       +
       , fftwFloat

     

       20
       20
       +
       , alsaLib

     

       21
       21
       +
       , libjack2

     

       22
       22
       +
       , CoreAudio

     

       23
       23
       +
       , uhd

     

       24
       24
       +
       , SDL

     

       25
       25
       +
       , gsl

     

       26
       26
       +
       , cppzmq

     

       27
       27
       +
       , zeromq

     

       28
       28
       +
       # Needed only if qt-gui is disabled, from some reason

     

       29
       29
       +
       , icu

     

       30
       30
       +
       # GUI related

     

       31
       31
       +
       , gtk3

     

       32
       32
       +
       , pango

     

       33
       33
       +
       , gobject-introspection

     

       34
       34
       +
       , cairo

     

       35
       35
       +
       , qt5

     

       36
       36
       +
       , libsForQt5

     

       37
       37
       +
       # Features available to override, the list of them is in featuresInfo. They

     

       38
       38
       +
       # are all turned on by default.

     

       39
       39
       +
       , features ? {}

     

       40
       40
       +
       # If one wishes to use a different src or name for a very custom build

     

       41
       41
       +
       , overrideSrc ? {}

     

       42
       42
       +
       , pname ? "gnuradio"

     

       43
       43
       +
       , versionAttr ? {

     

       44
       44
       +
         major = "3.8";

     

       45
       45
       +
         minor = "2";

     

       46
       46
       +
         patch = "0";

     

       47
       47
       +
       }

     

       48
       48
       +
       # We use our build of volk and not the one bundled with the release

     

       49
       49
       +
       , fetchSubmodules ? false

     

       50
       50
       +
       }:

     

       51
       51
       +
       

     

       52
       52
       +
       let

     

       53
       53
       +
         sourceSha256 =  "SFDjtyQRp0fXijZukpLYtISpx8imxedlYN9mRibv1eA=";

     

       54
       54
       +
         featuresInfo = {

     

       55
       55
       +
           # Needed always

     

       56
       56
       +
           basic = {

     

       57
       57
       +
             native = [

     

       58
       58
       +
               cmake

     

       59
       59
       +
               pkg-config

     

       60
       60
       +
               orc

     

       61
       61
       +
             ];

     

       62
       62
       +
             runtime = [

     

       63
       63
       +
               boost

     

       64
       64
       +
               log4cpp

     

       65
       65
       +
               mpir

     

       66
       66
       +
             ]

     

       67
       67
       +
               # when gr-qtgui is disabled, icu needs to be included, otherwise

     

       68
       68
       +
               # building with boost 1.7x fails

     

       69
       69
       +
               ++ lib.optionals (!(hasFeature "gr-qtgui" features)) [ icu ];

     

       70
       70
       +
             pythonNative = with python.pkgs; [

     

       71
       71
       +
               Mako

     

       72
       72
       +
               six

     

       73
       73
       +
             ];

     

       74
       74
       +
           };

     

       75
       75
       +
           volk = {

     

       76
       76
       +
             cmakeEnableFlag = "VOLK";

     

       77
       77
       +
             runtime = [

     

       78
       78
       +
               volk

     

       79
       79
       +
             ];

     

       80
       80
       +
           };

     

       81
       81
       +
           doxygen = {

     

       82
       82
       +
             native = [ doxygen ];

     

       83
       83
       +
             cmakeEnableFlag = "DOXYGEN";

     

       84
       84
       +
           };

     

       85
       85
       +
           sphinx = {

     

       86
       86
       +
             pythonNative = with python.pkgs; [ sphinx ];

     

       87
       87
       +
             cmakeEnableFlag = "SPHINX";

     

       88
       88
       +
           };

     

       89
       89
       +
           python-support = {

     

       90
       90
       +
             pythonRuntime = [ python.pkgs.six ];

     

       91
       91
       +
             native = [

     

       92
       92
       +
               swig

     

       93
       93
       +
               python

     

       94
       94
       +
             ];

     

       95
       95
       +
             cmakeEnableFlag = "PYTHON";

     

       96
       96
       +
           };

     

       97
       97
       +
           testing-support = {

     

       98
       98
       +
             native = [ cppunit ];

     

       99
       99
       +
             cmakeEnableFlag = "TESTING";

     

       100
       100
       +
           };

     

       101
       101
       +
           gnuradio-runtime = {

     

       102
       102
       +
             cmakeEnableFlag = "GNURADIO_RUNTIME";

     

       103
       103
       +
           };

     

       104
       104
       +
           gr-ctrlport = {

     

       105
       105
       +
             # Thrift support is not really working well, and even the patch they

     

       106
       106
       +
             # recommend applying on 0.9.2 won't apply. See:

     

       107
       107
       +
             # https://github.com/gnuradio/gnuradio/blob/v3.8.2.0/gnuradio-runtime/lib/controlport/thrift/README

     

       108
       108
       +
             cmakeEnableFlag = "GR_CTRLPORT";

     

       109
       109
       +
             native = [

     

       110
       110
       +
               swig

     

       111
       111
       +
             ];

     

       112
       112
       +
           };

     

       113
       113
       +
           gnuradio-companion = {

     

       114
       114
       +
             pythonRuntime = with python.pkgs; [

     

       115
       115
       +
               pyyaml

     

       116
       116
       +
               Mako

     

       117
       117
       +
               numpy

     

       118
       118
       +
               pygobject3

     

       119
       119
       +
             ];

     

       120
       120
       +
             runtime = [

     

       121
       121
       +
               gtk3

     

       122
       122
       +
               pango

     

       123
       123
       +
               gobject-introspection

     

       124
       124
       +
               cairo

     

       125
       125
       +
             ];

     

       126
       126
       +
             cmakeEnableFlag = "GRC";

     

       127
       127
       +
           };

     

       128
       128
       +
           gr-blocks = {

     

       129
       129
       +
             cmakeEnableFlag = "GR_BLOCKS";

     

       130
       130
       +
           };

     

       131
       131
       +
           gr-fec = {

     

       132
       132
       +
             cmakeEnableFlag = "GR_FEC";

     

       133
       133
       +
           };

     

       134
       134
       +
           gr-fft = {

     

       135
       135
       +
             runtime = [ fftwFloat ];

     

       136
       136
       +
             cmakeEnableFlag = "GR_FFT";

     

       137
       137
       +
           };

     

       138
       138
       +
           gr-filter = {

     

       139
       139
       +
             runtime = [ fftwFloat ];

     

       140
       140
       +
             cmakeEnableFlag = "GR_FILTER";

     

       141
       141
       +
           };

     

       142
       142
       +
           gr-analog = {

     

       143
       143
       +
             cmakeEnableFlag = "GR_ANALOG";

     

       144
       144
       +
           };

     

       145
       145
       +
           gr-digital = {

     

       146
       146
       +
             cmakeEnableFlag = "GR_DIGITAL";

     

       147
       147
       +
           };

     

       148
       148
       +
           gr-dtv = {

     

       149
       149
       +
             cmakeEnableFlag = "GR_DTV";

     

       150
       150
       +
           };

     

       151
       151
       +
           gr-audio = {

     

       152
       152
       +
             runtime = []

     

       153
       153
       +
               ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ]

     

       154
       154
       +
               ++ lib.optionals stdenv.isDarwin [ CoreAudio ]

     

       155
       155
       +
             ;

     

       156
       156
       +
             cmakeEnableFlag = "GR_AUDIO";

     

       157
       157
       +
           };

     

       158
       158
       +
           gr-channels = {

     

       159
       159
       +
             cmakeEnableFlag = "GR_CHANNELS";

     

       160
       160
       +
           };

     

       161
       161
       +
           gr-qtgui = {

     

       162
       162
       +
             runtime = [ qt5.qtbase libsForQt5.qwt ];

     

       163
       163
       +
             pythonRuntime = [ python.pkgs.pyqt5 ];

     

       164
       164
       +
             cmakeEnableFlag = "GR_QTGUI";

     

       165
       165
       +
           };

     

       166
       166
       +
           gr-trellis = {

     

       167
       167
       +
             cmakeEnableFlag = "GR_TRELLIS";

     

       168
       168
       +
           };

     

       169
       169
       +
           gr-uhd = {

     

       170
       170
       +
             runtime = [ uhd ];

     

       171
       171
       +
             cmakeEnableFlag = "GR_UHD";

     

       172
       172
       +
           };

     

       173
       173
       +
           gr-utils = {

     

       174
       174
       +
             cmakeEnableFlag = "GR_UTILS";

     

       175
       175
       +
           };

     

       176
       176
       +
           gr-modtool = {

     

       177
       177
       +
             pythonRuntime = with python.pkgs; [

     

       178
       178
       +
               click

     

       179
       179
       +
               click-plugins

     

       180
       180
       +
             ];

     

       181
       181
       +
             cmakeEnableFlag = "GR_MODTOOL";

     

       182
       182
       +
           };

     

       183
       183
       +
           gr-video-sdl = {

     

       184
       184
       +
             runtime = [ SDL ];

     

       185
       185
       +
             cmakeEnableFlag = "GR_VIDEO_SDL";

     

       186
       186
       +
           };

     

       187
       187
       +
           gr-vocoder = {

     

       188
       188
       +
             runtime = [ codec2 gsm ];

     

       189
       189
       +
             cmakeEnableFlag = "GR_VOCODER";

     

       190
       190
       +
           };

     

       191
       191
       +
           gr-wavelet = {

     

       192
       192
       +
             cmakeEnableFlag = "GR_WAVELET";

     

       193
       193
       +
             runtime = [ gsl ];

     

       194
       194
       +
           };

     

       195
       195
       +
           gr-zeromq = {

     

       196
       196
       +
             runtime = [ cppzmq zeromq ];

     

       197
       197
       +
             cmakeEnableFlag = "GR_ZEROMQ";

     

       198
       198
       +
           };

     

       199
       199
       +
         };

     

       200
       200
       +
         shared = (import ./shared.nix {

     

       201
       201
       +
           inherit

     

       202
       202
       +
             stdenv

     

       203
       203
       +
             lib

     

       204
       204
       +
             python

     

       205
       205
       +
             removeReferencesTo

     

       206
       206
       +
             featuresInfo

     

       207
       207
       +
             features

     

       208
       208
       +
             versionAttr

     

       209
       209
       +
             sourceSha256

     

       210
       210
       +
             overrideSrc

     

       211
       211
       +
             fetchFromGitHub

     

       212
       212
       +
             fetchSubmodules

     

       213
       213
       +
           ;

     

       214
       214
       +
           qt = qt5;

     

       215
       215
       +
           gtk = gtk3;

     

       216
       216
       +
         });

     

       217
       217
       +
         inherit (shared) hasFeature; # function

     

       218
       218
       +
       in

     

       219
       219
       +
       

     

       220
       220
       +
       stdenv.mkDerivation rec {

     

       221
       221
       +
         inherit pname;

     

       222
       222
       +
         inherit (shared)

     

       223
       223
       +
           version

     

       224
       224
       +
           src

     

       225
       225
       +
           nativeBuildInputs

     

       226
       226
       +
           buildInputs

     

       227
       227
       +
           disallowedReferences

     

       228
       228
       +
           stripDebugList

     

       229
       229
       +
           doCheck

     

       230
       230
       +
           dontWrapPythonPrograms

     

       231
       231
       +
           dontWrapQtApps

     

       232
       232
       +
           meta

     

       233
       233
       +
         ;

     

       234
       234
       +
         passthru = shared.passthru // {

     

       235
       235
       +
           # Deps that are potentially overriden and are used inside GR plugins - the same version must

     

       236
       236
       +
           inherit boost volk;

     

       237
       237
       +
         } // lib.optionalAttrs (hasFeature "gr-uhd" features) {

     

       238
       238
       +
           inherit uhd;

     

       239
       239
       +
         } // lib.optionalAttrs (hasFeature "gr-qtgui" features) {

     

       240
       240
       +
           inherit (libsForQt5) qwt;

     

       241
       241
       +
         };

     

       242
       242
       +
         cmakeFlags = shared.cmakeFlags

     

       243
       243
       +
           # From some reason, if these are not set, libcodec2 and gsm are not

     

       244
       244
       +
           # detected properly. NOTE: qradiolink needs libcodec2 to be detected in

     

       245
       245
       +
           # order to build, see https://github.com/qradiolink/qradiolink/issues/67

     

       246
       246
       +
           ++ lib.optionals (hasFeature "gr-vocoder" features) [

     

       247
       247
       +
             "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"

     

       248
       248
       +
             "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"

     

       249
       249
       +
             "-DLIBCODEC2_HAS_FREEDV_API=ON"

     

       250
       250
       +
             "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"

     

       251
       251
       +
             "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"

     

       252
       252
       +
           ]

     

       253
       253
       +
           ++ lib.optionals (hasFeature "volk" features && volk != null) [

     

       254
       254
       +
             "-DENABLE_INTERNAL_VOLK=OFF"

     

       255
       255
       +
           ]

     

       256
       256
       +
         ;

     

       257
       257
       +
       

     

       258
       258
       +
         postInstall = shared.postInstall

     

       259
       259
       +
           # This is the only python reference worth removing, if needed (3.7 doesn't

     

       260
       260
       +
           # set that reference).

     

       261
       261
       +
           + lib.optionalString (!hasFeature "python-support" features) ''

     

       262
       262
       +
             ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake

     

       263
       263
       +
           ''

     

       264
       264
       +
         ;

     

       265
       265
       +
         patches = [

     

       266
       266
       +
           # Don't install python referencing files if python support is disabled.

     

       267
       267
       +
           # See: https://github.com/gnuradio/gnuradio/pull/3839

     

       268
       268
       +
           (fetchpatch {

     

       269
       269
       +
             url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff";

     

       270
       270
       +
             sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q=";

     

       271
       271
       +
           })

     

       272
       272
       +
           (fetchpatch {

     

       273
       273
       +
             url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff";

     

       274
       274
       +
             sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4=";

     

       275
       275
       +
           })

     

       276
       276
       +
           # Needed to use boost 1.7x, see:

     

       277
       277
       +
           # https://github.com/gnuradio/gnuradio/issues/3720

     

       278
       278
       +
           # https://github.com/gnuradio/gnuradio/pull/3967

     

       279
       279
       +
           (fetchpatch {

     

       280
       280
       +
             url = "https://github.com/gnuradio/gnuradio/commit/cbcb968358fad56f3646619b258f18b0e6693a07.diff";

     

       281
       281
       +
             sha256 = "1ajf4797f869lqv436xw61s29qdbn7f01i0970kfxv3yahd34p9v";

     

       282
       282
       +
           })

     

       283
       283
       +
         ];

     

       284
       284
       +
       }

-53

pkgs/applications/radio/gnuradio/ais.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , cmake

     

       5
       5
       -
       , pkg-config

     

       6
       6
       -
       , boost

     

       7
       7
       -
       , gnuradio

     

       8
       8
       -
       , makeWrapper

     

       9
       9
       -
       , cppunit

     

       10
       10
       -
       , gr-osmosdr

     

       11
       11
       -
       , log4cpp

     

       12
       12
       -
       , pythonSupport ? true

     

       13
       13
       -
       , python

     

       14
       14
       -
       , swig

     

       15
       15
       -
       , fetchpatch

     

       16
       16
       -
       }:

     

       17
       17
       -
       

     

       18
       18
       -
       stdenv.mkDerivation {

     

       19
       19
       -
         pname = "gr-ais";

     

       20
       20
       -
         version = "2015-12-20";

     

       21
       21
       -
       

     

       22
       22
       -
         src = fetchFromGitHub {

     

       23
       23
       -
           owner = "bistromath";

     

       24
       24
       -
           repo = "gr-ais";

     

       25
       25
       -
           rev = "cdc1f52745853f9c739c718251830eb69704b26e";

     

       26
       26
       -
           sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";

     

       27
       27
       -
         };

     

       28
       28
       -
       

     

       29
       29
       -
         patches = [

     

       30
       30
       -
           (fetchpatch {

     

       31
       31
       -
             url = "https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054.patch";

     

       32
       32
       -
             sha256 = "1cwalphldvf6dbhzwz1gi53z0cb4921qsvlz4138q7m6dxccvssg";

     

       33
       33
       -
           })

     

       34
       34
       -
         ];

     

       35
       35
       -
       

     

       36
       36
       -
         nativeBuildInputs = [ cmake makeWrapper pkg-config ];

     

       37
       37
       -
         buildInputs = [ boost gnuradio cppunit gr-osmosdr log4cpp ]

     

       38
       38
       -
           ++ lib.optionals pythonSupport [ python swig ];

     

       39
       39
       -
       

     

       40
       40
       -
         postInstall = ''

     

       41
       41
       -
           for prog in "$out"/bin/*; do

     

       42
       42
       -
               wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")

     

       43
       43
       -
           done

     

       44
       44
       -
         '';

     

       45
       45
       -
       

     

       46
       46
       -
         meta = with lib; {

     

       47
       47
       -
           description = "Gnuradio block for ais";

     

       48
       48
       -
           homepage = "https://github.com/bistromath/gr-ais";

     

       49
       49
       -
           license = licenses.gpl3Plus;

     

       50
       50
       -
           platforms = platforms.linux ++ platforms.darwin;

     

       51
       51
       -
           maintainers = with maintainers; [ mog ];

     

       52
       52
       -
         };

     

       53
       53
       -
       }

+64 -89

pkgs/applications/radio/gnuradio/default.nix

···

       5
       5
        
       # Remove gcc and python references

     

       6
       6
        
       , removeReferencesTo

     

       7
       7
        
       , pkg-config

     

       8
       8
       +
       , volk

     

       8
       9
        
       , cppunit

     

       9
       9
       -
       , swig

     

       10
       10
        
       , orc

     

       11
       11
        
       , boost

     

       12
       12
        
       , log4cpp

     
···

       22
       22
        
       , uhd

     

       23
       23
        
       , SDL

     

       24
       24
        
       , gsl

     

       25
       25
       +
       , libsodium

     

       26
       26
       +
       , libsndfile

     

       27
       27
       +
       , libunwind

     

       25
       28
        
       , cppzmq

     

       26
       29
        
       , zeromq

     

       30
       30
       +
       # Needed only if qt-gui is disabled, from some reason

     

       31
       31
       +
       , icu

     

       27
       32
        
       # GUI related

     

       28
       33
        
       , gtk3

     

       29
       34
        
       , pango

     
···

       38
       43
        
       , overrideSrc ? {}

     

       39
       44
        
       , pname ? "gnuradio"

     

       40
       45
        
       , versionAttr ? {

     

       41
       41
       -
         major = "3.8";

     

       42
       42
       -
         minor = "2";

     

       46
       46
       +
         major = "3.9";

     

       47
       47
       +
         minor = "0";

     

       43
       48
        
         patch = "0";

     

       44
       49
        
       }

     

       45
       45
       -
       # Should be false on the release after 3.8.2.0

     

       46
       46
       -
       , fetchSubmodules ? true

     

       50
       50
       +
       , fetchSubmodules ? false

     

       47
       51
        
       }:

     

       48
       52
        
       

     

       49
       53
        
       let

     

       50
       50
       -
         sourceSha256 =  "1mnfwdy7w3160vi6110x2qkyq8l78qi8771zwak9n72bl7lhhpnf";

     

       54
       54
       +
         sourceSha256 =  "ZjQzioAuWrd8jsYOnLNH1mK4n9EbrjgvPX3mTzVFdLk=";

     

       51
       55
        
         featuresInfo = {

     

       52
       56
        
           # Needed always

     

       53
       57
        
           basic = {

     
···

       57
       61
        
               orc

     

       58
       62
        
             ];

     

       59
       63
        
             runtime = [

     

       64
       64
       +
               volk

     

       60
       65
        
               boost

     

       61
       66
        
               log4cpp

     

       62
       67
        
               mpir

     

       63
       63
       -
             ];

     

       68
       68
       +
             ]

     

       69
       69
       +
               # when gr-qtgui is disabled, icu needs to be included, otherwise

     

       70
       70
       +
               # building with boost 1.7x fails

     

       71
       71
       +
               ++ lib.optionals (!(hasFeature "gr-qtgui" features)) [ icu ];

     

       64
       72
        
             pythonNative = with python.pkgs; [

     

       65
       73
        
               Mako

     

       66
       74
        
               six

     

       67
       75
        
             ];

     

       68
       76
        
           };

     

       69
       69
       -
           # NOTE: Should be removed on the release after 3.8.2.0, see:

     

       70
       70
       -
           # https://github.com/gnuradio/gnuradio/commit/80c04479d

     

       71
       71
       -
           volk = {

     

       72
       72
       -
             cmakeEnableFlag = "VOLK";

     

       73
       73
       -
           };

     

       74
       77
        
           doxygen = {

     

       75
       78
        
             native = [ doxygen ];

     

       76
       79
        
             cmakeEnableFlag = "DOXYGEN";

     

       77
       80
        
           };

     

       78
       78
       -
           sphinx = {

     

       79
       79
       -
             pythonNative = with python.pkgs; [ sphinx ];

     

       80
       80
       -
             cmakeEnableFlag = "SPHINX";

     

       81
       81
       -
           };

     

       82
       81
        
           python-support = {

     

       83
       82
        
             pythonRuntime = [ python.pkgs.six ];

     

       84
       83
        
             native = [

     

       85
       85
       -
               swig

     

       86
       84
        
               python

     

       87
       85
        
             ];

     

       88
       86
        
             cmakeEnableFlag = "PYTHON";

     
···

       90
       88
        
           testing-support = {

     

       91
       89
        
             native = [ cppunit ];

     

       92
       90
        
             cmakeEnableFlag = "TESTING";

     

       91
       91
       +
           };

     

       92
       92
       +
           post-install = {

     

       93
       93
       +
             cmakeEnableFlag = "POSTINSTALL";

     

       93
       94
        
           };

     

       94
       95
        
           gnuradio-runtime = {

     

       95
       96
        
             cmakeEnableFlag = "GNURADIO_RUNTIME";

     

       97
       97
       +
             pythonRuntime = [

     

       98
       98
       +
               python.pkgs.pybind11

     

       99
       99
       +
             ];

     

       96
       100
        
           };

     

       97
       101
        
           gr-ctrlport = {

     

       98
       102
        
             # Thrift support is not really working well, and even the patch they

     

       99
       103
        
             # recommend applying on 0.9.2 won't apply. See:

     

       100
       100
       -
             # https://github.com/gnuradio/gnuradio/blob/v3.8.2.0/gnuradio-runtime/lib/controlport/thrift/README

     

       104
       104
       +
             # https://github.com/gnuradio/gnuradio/blob/v3.9.0.0/gnuradio-runtime/lib/controlport/thrift/README

     

       105
       105
       +
             runtime = [

     

       106
       106
       +
               libunwind

     

       107
       107
       +
             ];

     

       101
       108
        
             cmakeEnableFlag = "GR_CTRLPORT";

     

       102
       102
       -
             native = [

     

       103
       103
       -
               swig

     

       104
       104
       -
             ];

     

       105
       109
        
           };

     

       106
       110
        
           gnuradio-companion = {

     

       107
       111
        
             pythonRuntime = with python.pkgs; [

     
···

       110
       114
        
               numpy

     

       111
       115
        
               pygobject3

     

       112
       116
        
             ];

     

       117
       117
       +
             native = [

     

       118
       118
       +
               python.pkgs.pytest

     

       119
       119
       +
             ];

     

       113
       120
        
             runtime = [

     

       114
       121
        
               gtk3

     

       115
       122
        
               pango

     

       116
       123
        
               gobject-introspection

     

       117
       124
        
               cairo

     

       125
       125
       +
               libsndfile

     

       118
       126
        
             ];

     

       119
       127
        
             cmakeEnableFlag = "GRC";

     

       120
       128
        
           };

     
···

       160
       168
        
             cmakeEnableFlag = "GR_TRELLIS";

     

       161
       169
        
           };

     

       162
       170
        
           gr-uhd = {

     

       163
       163
       -
             runtime = [ uhd ];

     

       171
       171
       +
             runtime = [

     

       172
       172
       +
               uhd

     

       173
       173
       +
             ];

     

       164
       174
        
             cmakeEnableFlag = "GR_UHD";

     

       165
       175
        
           };

     

       166
       176
        
           gr-utils = {

     
···

       173
       183
        
             ];

     

       174
       184
        
             cmakeEnableFlag = "GR_MODTOOL";

     

       175
       185
        
           };

     

       186
       186
       +
           gr-blocktool = {

     

       187
       187
       +
             cmakeEnableFlag = "GR_BLOCKTOOL";

     

       188
       188
       +
           };

     

       176
       189
        
           gr-video-sdl = {

     

       177
       190
        
             runtime = [ SDL ];

     

       178
       191
        
             cmakeEnableFlag = "GR_VIDEO_SDL";

     

       179
       192
        
           };

     

       180
       180
       -
           gr-vocoder = {

     

       181
       181
       -
             runtime = [ codec2 gsm ];

     

       182
       182
       -
             cmakeEnableFlag = "GR_VOCODER";

     

       183
       183
       -
           };

     

       193
       193
       +
           # codec2 and gsm support is broken with gr3.9: https://github.com/gnuradio/gnuradio/issues/4278

     

       194
       194
       +
           # gr-vocoder = {

     

       195
       195
       +
             # runtime = [ codec2 gsm ];

     

       196
       196
       +
             # cmakeEnableFlag = "GR_VOCODER";

     

       197
       197
       +
           # };

     

       184
       198
        
           gr-wavelet = {

     

       185
       199
        
             cmakeEnableFlag = "GR_WAVELET";

     

       186
       186
       -
             runtime = [ gsl ];

     

       200
       200
       +
             runtime = [ gsl libsodium ];

     

       187
       201
        
           };

     

       188
       202
        
           gr-zeromq = {

     

       189
       203
        
             runtime = [ cppzmq zeromq ];

     

       190
       204
        
             cmakeEnableFlag = "GR_ZEROMQ";

     

       191
       205
        
           };

     

       206
       206
       +
           gr-network = {

     

       207
       207
       +
             cmakeEnableFlag = "GR_NETWORK";

     

       208
       208
       +
           };

     

       192
       209
        
         };

     

       193
       210
        
         shared = (import ./shared.nix {

     

       194
       211
        
           inherit

     
···

       207
       224
        
           qt = qt5;

     

       208
       225
        
           gtk = gtk3;

     

       209
       226
        
         });

     

       227
       227
       +
         inherit (shared) hasFeature; # function

     

       228
       228
       +
       in

     

       229
       229
       +
       

     

       230
       230
       +
       stdenv.mkDerivation rec {

     

       231
       231
       +
         inherit pname;

     

       210
       232
        
         inherit (shared)

     

       211
       233
        
           version

     

       212
       234
        
           src

     

       213
       213
       -
           hasFeature # function

     

       214
       235
        
           nativeBuildInputs

     

       215
       236
        
           buildInputs

     

       237
       237
       +
           cmakeFlags

     

       216
       238
        
           disallowedReferences

     

       217
       239
        
           stripDebugList

     

       218
       218
       -
           passthru

     

       219
       240
        
           doCheck

     

       220
       241
        
           dontWrapPythonPrograms

     

       221
       242
        
           dontWrapQtApps

     

       222
       243
        
           meta

     

       223
       244
        
         ;

     

       224
       224
       -
         cmakeFlags = shared.cmakeFlags

     

       225
       225
       -
           # From some reason, if these are not set, libcodec2 and gsm are not

     

       226
       226
       -
           # detected properly. NOTE: qradiolink needs libcodec2 to be detected in

     

       227
       227
       -
           # order to build, see https://github.com/qradiolink/qradiolink/issues/67

     

       228
       228
       -
           ++ lib.optionals (hasFeature "gr-vocoder" features) [

     

       229
       229
       -
             "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"

     

       230
       230
       -
             "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include"

     

       231
       231
       -
             "-DLIBCODEC2_HAS_FREEDV_API=ON"

     

       232
       232
       -
             "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"

     

       233
       233
       -
             "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm"

     

       234
       234
       -
           ]

     

       235
       235
       -
         ;

     

       245
       245
       +
         passthru = shared.passthru // {

     

       246
       246
       +
           # Deps that are potentially overriden and are used inside GR plugins - the same version must

     

       247
       247
       +
           inherit boost volk;

     

       248
       248
       +
         } // lib.optionalAttrs (hasFeature "gr-uhd" features) {

     

       249
       249
       +
           inherit uhd;

     

       250
       250
       +
         } // lib.optionalAttrs (hasFeature "gr-qtgui" features) {

     

       251
       251
       +
           inherit (libsForQt5) qwt;

     

       252
       252
       +
         };

     

       236
       253
        
       

     

       237
       254
        
         postInstall = shared.postInstall

     

       238
       238
       -
           # This is the only python reference worth removing, if needed (3.7 doesn't

     

       239
       239
       -
           # set that reference).

     

       255
       255
       +
           # This is the only python reference worth removing, if needed.

     

       256
       256
       +
           # Even if python support is enabled, and we don't care about this

     

       257
       257
       +
           # reference, pybind's path is not properly set. See:

     

       258
       258
       +
           # https://github.com/gnuradio/gnuradio/issues/4380

     

       240
       259
        
           + lib.optionalString (!hasFeature "python-support" features) ''

     

       241
       260
        
             ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake

     

       242
       242
       -
           ''

     

       243
       243
       -
         ;

     

       244
       244
       -
         preConfigure = ""

     

       245
       245
       -
           # If python-support is disabled, don't install volk's (git submodule)

     

       246
       246
       -
           # volk_modtool - it references python.

     

       247
       247
       -
           #

     

       248
       248
       -
           # NOTE: on the next release, volk will always be required to be installed

     

       249
       249
       -
           # externally (submodule removed upstream). Hence this hook will fail and

     

       250
       250
       -
           # we'll need to package volk while able to tell it to install or not

     

       251
       251
       -
           # install python referencing files. When we'll be there, this will help:

     

       252
       252
       -
           # https://github.com/gnuradio/volk/pull/404

     

       253
       253
       -
           + lib.optionalString (!hasFeature "python-support" features) ''

     

       254
       254
       -
             sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt

     

       261
       261
       +
             ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so)

     

       262
       262
       +
             ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake

     

       255
       263
        
           ''

     

       256
       256
       -
         ;

     

       257
       257
       -
         patches = [

     

       258
       258
       -
           # Don't install python referencing files if python support is disabled.

     

       259
       259
       -
           # See: https://github.com/gnuradio/gnuradio/pull/3839

     

       260
       260
       -
           (fetchpatch {

     

       261
       261
       -
             url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff";

     

       262
       262
       -
             sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q=";

     

       263
       263
       -
           })

     

       264
       264
       -
           (fetchpatch {

     

       265
       265
       -
             url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff";

     

       266
       266
       -
             sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4=";

     

       267
       267
       -
           })

     

       268
       268
       -
         ];

     

       269
       269
       -
       in

     

       270
       270
       -
       

     

       271
       271
       -
       stdenv.mkDerivation rec {

     

       272
       272
       -
         inherit

     

       273
       273
       -
           pname

     

       274
       274
       -
           version

     

       275
       275
       -
           src

     

       276
       276
       -
           nativeBuildInputs

     

       277
       277
       -
           buildInputs

     

       278
       278
       -
           cmakeFlags

     

       279
       279
       -
           preConfigure

     

       280
       280
       -
           # disallowedReferences

     

       281
       281
       -
           stripDebugList

     

       282
       282
       -
           patches

     

       283
       283
       -
           postInstall

     

       284
       284
       -
           passthru

     

       285
       285
       -
           doCheck

     

       286
       286
       -
           dontWrapPythonPrograms

     

       287
       287
       -
           dontWrapQtApps

     

       288
       288
       -
           meta

     

       289
       264
        
         ;

     

       290
       265
        
       }

-37

pkgs/applications/radio/gnuradio/gsm.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp

     

       2
       2
       -
       , makeWrapper, cppunit, libosmocore, gr-osmosdr

     

       3
       3
       -
       , pythonSupport ? true, python, swig

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       assert pythonSupport -> python != null && swig != null;

     

       7
       7
       -
       

     

       8
       8
       -
       stdenv.mkDerivation {

     

       9
       9
       -
         pname = "gr-gsm";

     

       10
       10
       -
         version = "2016-08-25";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchFromGitHub {

     

       13
       13
       -
           owner = "ptrkrysik";

     

       14
       14
       -
           repo = "gr-gsm";

     

       15
       15
       -
           rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d";

     

       16
       16
       -
           sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       20
       20
       -
         buildInputs = [

     

       21
       21
       -
           boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp

     

       22
       22
       -
         ] ++ lib.optionals pythonSupport [ python swig ];

     

       23
       23
       -
       

     

       24
       24
       -
         postInstall = ''

     

       25
       25
       -
           for prog in "$out"/bin/*; do

     

       26
       26
       -
               wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gr-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out")

     

       27
       27
       -
           done

     

       28
       28
       -
         '';

     

       29
       29
       -
       

     

       30
       30
       -
         meta = with lib; {

     

       31
       31
       -
           description = "Gnuradio block for gsm";

     

       32
       32
       -
           homepage = "https://github.com/ptrkrysik/gr-gsm";

     

       33
       33
       -
           license = licenses.gpl3Plus;

     

       34
       34
       -
           platforms = platforms.linux;

     

       35
       35
       -
           maintainers = with maintainers; [ mog ];

     

       36
       36
       -
         };

     

       37
       37
       -
       }

-38

pkgs/applications/radio/gnuradio/limesdr.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio

     

       2
       2
       -
       , pythonSupport ? true, python, swig, limesuite, log4cpp

     

       3
       3
       -
       } :

     

       4
       4
       -
       

     

       5
       5
       -
       assert pythonSupport -> python != null && swig != null;

     

       6
       6
       -
       

     

       7
       7
       -
       let

     

       8
       8
       -
         version = "2.0.0";

     

       9
       9
       -
       

     

       10
       10
       -
       in stdenv.mkDerivation {

     

       11
       11
       -
         pname = "gr-limesdr";

     

       12
       12
       -
         inherit version;

     

       13
       13
       -
       

     

       14
       14
       -
         src = fetchFromGitHub {

     

       15
       15
       -
           owner = "myriadrf";

     

       16
       16
       -
           repo = "gr-limesdr";

     

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

     

       18
       18
       -
           sha256 = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq";

     

       19
       19
       -
         };

     

       20
       20
       -
       

     

       21
       21
       -
         nativeBuildInputs = [

     

       22
       22
       -
           cmake

     

       23
       23
       -
           pkg-config

     

       24
       24
       -
         ] ++ lib.optionals pythonSupport [ swig ];

     

       25
       25
       -
       

     

       26
       26
       -
         buildInputs = [

     

       27
       27
       -
           boost gnuradio limesuite log4cpp

     

       28
       28
       -
         ] ++ lib.optionals pythonSupport [ python ];

     

       29
       29
       -
       

     

       30
       30
       -
       

     

       31
       31
       -
         meta = with lib; {

     

       32
       32
       -
           description = "Gnuradio source and sink blocks for LimeSDR";

     

       33
       33
       -
           homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio";

     

       34
       34
       -
           license = licenses.mit;

     

       35
       35
       -
           platforms = platforms.linux;

     

       36
       36
       -
           maintainers = [ maintainers.markuskowa ];

     

       37
       37
       -
         };

     

       38
       38
       -
       }

-37

pkgs/applications/radio/gnuradio/nacl.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, uhd

     

       2
       2
       -
       , makeWrapper, libsodium, cppunit, log4cpp

     

       3
       3
       -
       , pythonSupport ? true, python, swig

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       assert pythonSupport -> python != null && swig != null;

     

       7
       7
       -
       

     

       8
       8
       -
       stdenv.mkDerivation {

     

       9
       9
       -
         pname = "gr-nacl";

     

       10
       10
       -
         version = "2017-04-10";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchFromGitHub {

     

       13
       13
       -
           owner = "stwunsch";

     

       14
       14
       -
           repo = "gr-nacl";

     

       15
       15
       -
           rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765";

     

       16
       16
       -
           sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       20
       20
       -
         buildInputs = [

     

       21
       21
       -
           boost gnuradio uhd makeWrapper libsodium cppunit log4cpp

     

       22
       22
       -
         ] ++ lib.optionals pythonSupport [ python swig ];

     

       23
       23
       -
       

     

       24
       24
       -
         postInstall = ''

     

       25
       25
       -
           for prog in "$out"/bin/*; do

     

       26
       26
       -
               wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")

     

       27
       27
       -
           done

     

       28
       28
       -
         '';

     

       29
       29
       -
       

     

       30
       30
       -
         meta = with lib; {

     

       31
       31
       -
           description = "Gnuradio block for encryption";

     

       32
       32
       -
           homepage = "https://github.com/stwunsch/gr-nacl";

     

       33
       33
       -
           license = licenses.gpl3Plus;

     

       34
       34
       -
           platforms = platforms.linux ++ platforms.darwin;

     

       35
       35
       -
           maintainers = with maintainers; [ mog ];

     

       36
       36
       -
         };

     

       37
       37
       -
       }

-45

pkgs/applications/radio/gnuradio/osmosdr.nix

···

       1
       1
       -
       { lib, stdenv, fetchgit, cmake, pkg-config, makeWrapper

     

       2
       2
       -
       , boost

     

       3
       3
       -
       , pythonSupport ? true, python, swig

     

       4
       4
       -
       , airspy

     

       5
       5
       -
       , gnuradio

     

       6
       6
       -
       , hackrf

     

       7
       7
       -
       , libbladeRF

     

       8
       8
       -
       , rtl-sdr

     

       9
       9
       -
       , soapysdr-with-plugins

     

       10
       10
       -
       , uhd

     

       11
       11
       -
       , log4cpp

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       assert pythonSupport -> python != null && swig != null;

     

       15
       15
       -
       

     

       16
       16
       -
       stdenv.mkDerivation rec {

     

       17
       17
       -
         pname = "gr-osmosdr";

     

       18
       18
       -
         version = "0.1.5";

     

       19
       19
       -
       

     

       20
       20
       -
         src = fetchgit {

     

       21
       21
       -
           url = "git://git.osmocom.org/gr-osmosdr";

     

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

     

       23
       23
       -
           sha256 = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         nativeBuildInputs = [ cmake makeWrapper pkg-config ];

     

       27
       27
       -
         buildInputs = [

     

       28
       28
       -
           boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd

     

       29
       29
       -
         ] ++ lib.optionals stdenv.isLinux [ soapysdr-with-plugins ]

     

       30
       30
       -
           ++ lib.optionals pythonSupport [ python swig python.pkgs.cheetah ];

     

       31
       31
       -
       

     

       32
       32
       -
         postInstall = ''

     

       33
       33
       -
           for prog in "$out"/bin/*; do

     

       34
       34
       -
               wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")

     

       35
       35
       -
           done

     

       36
       36
       -
         '';

     

       37
       37
       -
       

     

       38
       38
       -
         meta = with lib; {

     

       39
       39
       -
           description = "Gnuradio block for OsmoSDR and rtl-sdr";

     

       40
       40
       -
           homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR";

     

       41
       41
       -
           license = licenses.gpl3Plus;

     

       42
       42
       -
           platforms = platforms.linux ++ platforms.darwin;

     

       43
       43
       -
           maintainers = with maintainers; [ bjornfor ];

     

       44
       44
       -
         };

     

       45
       45
       -
       }

-36

pkgs/applications/radio/gnuradio/rds.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio, log4cpp

     

       2
       2
       -
       , makeWrapper, pythonSupport ? true, python, swig

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       assert pythonSupport -> python != null && swig != null;

     

       6
       6
       -
       

     

       7
       7
       -
       stdenv.mkDerivation rec {

     

       8
       8
       -
         pname = "gr-rds";

     

       9
       9
       -
         version = "1.1.0";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchFromGitHub {

     

       12
       12
       -
           owner = "bastibl";

     

       13
       13
       -
           repo = "gr-rds";

     

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

     

       15
       15
       -
           sha256 = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy";

     

       16
       16
       -
         };

     

       17
       17
       -
       

     

       18
       18
       -
         nativeBuildInputs = [ cmake pkg-config ];

     

       19
       19
       -
         buildInputs = [

     

       20
       20
       -
           boost gnuradio makeWrapper log4cpp

     

       21
       21
       -
         ] ++ lib.optionals pythonSupport [ python swig ];

     

       22
       22
       -
       

     

       23
       23
       -
         postInstall = ''

     

       24
       24
       -
           for prog in "$out"/bin/*; do

     

       25
       25
       -
               wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")

     

       26
       26
       -
           done

     

       27
       27
       -
         '';

     

       28
       28
       -
       

     

       29
       29
       -
         meta = with lib; {

     

       30
       30
       -
           description = "Gnuradio block for radio data system";

     

       31
       31
       -
           homepage = "https://github.com/bastibl/gr-rds";

     

       32
       32
       -
           license = licenses.gpl2Plus;

     

       33
       33
       -
           platforms = platforms.linux ++ platforms.darwin;

     

       34
       34
       -
           maintainers = with maintainers; [ mog ];

     

       35
       35
       -
         };

     

       36
       36
       -
       }

+4 -5

pkgs/applications/radio/gnuradio/shared.nix

···

       85
       85
        
         ;

     

       86
       86
        
         postInstall = ""

     

       87
       87
        
           # Gcc references

     

       88
       88
       -
           + lib.optionalString (hasFeature "volk" features) ''

     

       89
       89
       -
             ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)

     

       90
       90
       -
           ''

     

       91
       88
        
           + lib.optionalString (hasFeature "gnuradio-runtime" features) ''

     

       92
       89
        
             ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime.so)

     

       93
       90
        
           ''

     
···

       103
       100
        
             features

     

       104
       101
        
             featuresInfo

     

       105
       102
        
             python

     

       106
       106
       -
             qt

     

       107
       107
       -
             gtk

     

       108
       103
        
           ;

     

       104
       104
       +
         } // lib.optionalAttrs (hasFeature "gr-qtgui" features) {

     

       105
       105
       +
           inherit qt;

     

       106
       106
       +
         } // lib.optionalAttrs (hasFeature "gnuradio-companion" features) {

     

       107
       107
       +
           inherit gtk;

     

       109
       108
        
         };

     

       110
       109
        
         # Wrapping is done with an external wrapper

     

       111
       110
        
         dontWrapPythonPrograms = true;

+86 -39

pkgs/applications/radio/gnuradio/wrapper.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       +
       # The unwrapped gnuradio derivation

     

       3
       4
        
       , unwrapped

     

       5
       5
       +
       # If it's a minimal build, we don't want to wrap it with lndir and

     

       6
       6
       +
       # wrapProgram..

     

       7
       7
       +
       , wrap ? true

     

       8
       8
       +
       # For the wrapper

     

       4
       9
        
       , makeWrapper

     

       5
       10
        
       # For lndir

     

       6
       11
        
       , xorg

     

       12
       12
       +
       # To define a the gnuradio.pkgs scope

     

       13
       13
       +
       , newScope

     

       7
       14
        
       # For Emulating wrapGAppsHook

     

       8
       15
        
       , gsettings-desktop-schemas

     

       9
       16
        
       , glib

     
···

       37
       44
        
                 []

     

       38
       45
        
             )

     

       39
       46
        
             ) unwrapped.featuresInfo)

     

       40
       40
       -
           ++ lib.optionals (unwrapped.hasFeature "python-support" unwrapped.features) [

     

       41
       41
       -
             # Add unwrapped itself as a python module

     

       42
       42
       -
             (unwrapped.python.pkgs.toPythonModule unwrapped)

     

       43
       43
       -
           ]

     

       47
       47
       +
           ++ lib.optionals

     

       48
       48
       +
             (unwrapped.hasFeature "python-support" unwrapped.features)

     

       49
       49
       +
             (

     

       50
       50
       +
               # Add unwrapped itself as a python module

     

       51
       51
       +
               [ (unwrapped.python.pkgs.toPythonModule unwrapped) ]

     

       52
       52
       +
               # Add all extraPackages as python modules

     

       53
       53
       +
               ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages)

     

       54
       54
       +
             )

     

       44
       55
        
         ;

     

       45
       45
       -
         python3Env = unwrapped.python.withPackages(ps: pythonPkgs);

     

       56
       56
       +
         pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs);

     

       46
       57
        
       

     

       47
       58
        
         name = (lib.appendToName "wrapped" unwrapped).name;

     

       48
       59
        
         makeWrapperArgs = builtins.concatStringsSep " " ([

     
···

       88
       99
        
             (if unwrapped.versionAttr.major == "3.8" then

     

       89
       100
        
               [

     

       90
       101
        
                 "--prefix" "QT_PLUGIN_PATH" ":"

     

       91
       91
       -
                 "${lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtPluginPrefix}"

     

       102
       102
       +
                 "${

     

       103
       103
       +
                   lib.makeSearchPath

     

       104
       104
       +
                   unwrapped.qt.qtbase.qtPluginPrefix

     

       105
       105
       +
                   (builtins.map lib.getBin [

     

       106
       106
       +
                     unwrapped.qt.qtbase

     

       107
       107
       +
                     unwrapped.qt.qtwayland

     

       108
       108
       +
                   ])

     

       109
       109
       +
                 }"

     

       92
       110
        
                 "--prefix" "QML2_IMPORT_PATH" ":"

     

       93
       93
       -
                 "${lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtQmlPrefix}"

     

       111
       111
       +
                 "${

     

       112
       112
       +
                   lib.makeSearchPath

     

       113
       113
       +
                   unwrapped.qt.qtbase.qtQmlPrefix

     

       114
       114
       +
                   (builtins.map lib.getBin [

     

       115
       115
       +
                     unwrapped.qt.qtbase

     

       116
       116
       +
                     unwrapped.qt.qtwayland

     

       117
       117
       +
                   ])

     

       118
       118
       +
                 }"

     

       94
       119
        
               ]

     

       95
       120
        
             else

     

       96
       96
       -
               # TODO: Add here qt4 related environment for 3.7?

     

       121
       121
       +
               # Add here qt4 related environment for 3.7?

     

       97
       122
        
               [

     

       98
       123
        
       

     

       99
       124
        
               ]

     

       100
       125
        
             )

     

       101
       126
        
           ++ extraMakeWrapperArgs

     

       102
       127
        
         );

     

       103
       103
       -
       in

     

       104
       104
       -
       stdenv.mkDerivation {

     

       105
       105
       -
         inherit name;

     

       106
       128
        
       

     

       107
       107
       -
         buildInputs = [

     

       108
       108
       -
           makeWrapper

     

       109
       109
       -
           xorg.lndir

     

       110
       110
       -
         ];

     

       111
       111
       -
       

     

       112
       112
       -
         passthru = {

     

       113
       113
       -
           inherit python3Env pythonPkgs unwrapped;

     

       129
       129
       +
         packages = import ../../../top-level/gnuradio-packages.nix {

     

       130
       130
       +
           inherit lib stdenv newScope;

     

       131
       131
       +
           gnuradio = unwrapped;

     

       132
       132
       +
         };

     

       133
       133
       +
         passthru = unwrapped.passthru // {

     

       134
       134
       +
           inherit

     

       135
       135
       +
             pythonEnv

     

       136
       136
       +
             pythonPkgs

     

       137
       137
       +
             unwrapped

     

       138
       138
       +
           ;

     

       139
       139
       +
           pkgs = packages;

     

       114
       140
        
         };

     

       115
       115
       -
       

     

       116
       116
       -
         buildCommand = ''

     

       117
       117
       -
           mkdir $out

     

       118
       118
       -
           cd $out

     

       119
       119
       -
           lndir -silent ${unwrapped}

     

       120
       120
       -
           for i in $out/bin/*; do

     

       121
       121
       -
             if [[ ! -x "$i" ]]; then

     

       122
       122
       -
               continue

     

       123
       123
       -
             fi

     

       124
       124
       -
             cp -L "$i" "$i".tmp

     

       125
       125
       -
             mv -f "$i".tmp "$i"

     

       126
       126
       -
             if head -1 "$i" | grep -q ${unwrapped.python}; then

     

       127
       127
       -
               substituteInPlace "$i" \

     

       128
       128
       -
                 --replace ${unwrapped.python} ${python3Env}

     

       129
       129
       -
             fi

     

       130
       130
       -
             wrapProgram "$i" ${makeWrapperArgs}

     

       131
       131
       -
           done

     

       132
       132
       -
         '';

     

       133
       133
       -
       

     

       134
       134
       -
         inherit (unwrapped) meta;

     

       135
       135
       -
       }

     

       141
       141
       +
         self = if wrap then

     

       142
       142
       +
           stdenv.mkDerivation {

     

       143
       143
       +
             inherit name passthru;

     

       144
       144
       +
             buildInputs = [

     

       145
       145
       +
               makeWrapper

     

       146
       146
       +
               xorg.lndir

     

       147
       147
       +
             ];

     

       148
       148
       +
             buildCommand = ''

     

       149
       149
       +
               mkdir $out

     

       150
       150
       +
               cd $out

     

       151
       151
       +
               lndir -silent ${unwrapped}

     

       152
       152
       +
               ${lib.optionalString

     

       153
       153
       +
                 (extraPackages != [])

     

       154
       154
       +
                 (builtins.concatStringsSep "\n"

     

       155
       155
       +
                   (builtins.map (pkg: ''

     

       156
       156
       +
                     if [[ -d ${lib.getBin pkg}/bin/ ]]; then

     

       157
       157
       +
                       lndir -silent ${pkg}/bin ./bin

     

       158
       158
       +
                     fi

     

       159
       159
       +
                   '') extraPackages)

     

       160
       160
       +
                 )

     

       161
       161
       +
               }

     

       162
       162
       +
               for i in $out/bin/*; do

     

       163
       163
       +
                 if [[ ! -x "$i" ]]; then

     

       164
       164
       +
                   continue

     

       165
       165
       +
                 fi

     

       166
       166
       +
                 cp -L "$i" "$i".tmp

     

       167
       167
       +
                 mv -f "$i".tmp "$i"

     

       168
       168
       +
                 if head -1 "$i" | grep -q ${unwrapped.python}; then

     

       169
       169
       +
                   substituteInPlace "$i" \

     

       170
       170
       +
                     --replace ${unwrapped.python} ${pythonEnv}

     

       171
       171
       +
                 fi

     

       172
       172
       +
                 wrapProgram "$i" ${makeWrapperArgs}

     

       173
       173
       +
               done

     

       174
       174
       +
             '';

     

       175
       175
       +
             inherit (unwrapped) meta;

     

       176
       176
       +
           }

     

       177
       177
       +
         else

     

       178
       178
       +
           unwrapped.overrideAttrs(_: {

     

       179
       179
       +
             inherit passthru;

     

       180
       180
       +
           })

     

       181
       181
       +
         ;

     

       182
       182
       +
       in self

+30 -6

pkgs/applications/radio/gqrx/default.nix

···

       1
       1
       -
       { lib, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gr-osmosdr

     

       2
       2
       -
       , mkDerivation

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , cmake

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       , qt5

     

       6
       6
       +
       , gnuradio3_8Minimal

     

       7
       7
       +
       , log4cpp

     

       8
       8
       +
       , mpir

     

       9
       9
       +
       , fftwFloat

     

       10
       10
       +
       , alsaLib

     

       11
       11
       +
       , libjack2

     

       3
       12
        
       # drivers (optional):

     

       4
       4
       -
       , rtl-sdr, hackrf

     

       13
       13
       +
       , rtl-sdr

     

       14
       14
       +
       , hackrf

     

       5
       15
        
       , pulseaudioSupport ? true, libpulseaudio

     

       6
       16
        
       }:

     

       7
       17
        
       

     

       8
       18
        
       assert pulseaudioSupport -> libpulseaudio != null;

     

       9
       19
        
       

     

       10
       10
       -
       mkDerivation rec {

     

       20
       20
       +
       gnuradio3_8Minimal.pkgs.mkDerivation rec {

     

       11
       21
        
         pname = "gqrx";

     

       12
       22
        
         version = "2.14.4";

     

       13
       23
        
       

     
···

       18
       28
        
           sha256 = "sha256-mMaxu0jq2GaNLWjLsJQXx+zCxtyiCAZQJJZ8GJtnllQ=";

     

       19
       29
        
         };

     

       20
       30
        
       

     

       21
       21
       -
         nativeBuildInputs = [ cmake ];

     

       31
       31
       +
         nativeBuildInputs = [

     

       32
       32
       +
           cmake

     

       33
       33
       +
           pkg-config

     

       34
       34
       +
           qt5.wrapQtAppsHook

     

       35
       35
       +
         ];

     

       22
       36
        
         buildInputs = [

     

       23
       23
       -
           qtbase qtsvg gnuradio boost gr-osmosdr rtl-sdr hackrf

     

       37
       37
       +
           log4cpp

     

       38
       38
       +
           mpir

     

       39
       39
       +
           fftwFloat

     

       40
       40
       +
           alsaLib

     

       41
       41
       +
           libjack2

     

       42
       42
       +
           gnuradio3_8Minimal.unwrapped.boost

     

       43
       43
       +
           qt5.qtbase

     

       44
       44
       +
           qt5.qtsvg

     

       45
       45
       +
           gnuradio3_8Minimal.pkgs.osmosdr

     

       46
       46
       +
           rtl-sdr

     

       47
       47
       +
           hackrf

     

       24
       48
        
         ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ];

     

       25
       49
        
       

     

       26
       50
        
         postInstall = ''

+9 -10

pkgs/applications/radio/inspectrum/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , mkDerivation

     

       2
       2
       +
       , gnuradio3_8Minimal

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , pkg-config

     

       5
       5
        
       , cmake

     

       6
       6
       -
       , boost

     

       7
       6
        
       , fftwFloat

     

       8
       8
       -
       , gnuradio

     

       7
       7
       +
       , qt5

     

       9
       8
        
       , liquid-dsp

     

       10
       10
       -
       , qtbase

     

       11
       11
       -
       , wrapQtAppsHook

     

       12
       9
        
       }:

     

       13
       10
        
       

     

       14
       14
       -
       mkDerivation rec {

     

       11
       11
       +
       gnuradio3_8Minimal.pkgs.mkDerivation rec {

     

       15
       12
        
         pname = "inspectrum";

     

       16
       13
        
         version = "0.2.3";

     

       17
       14
        
       

     
···

       22
       19
        
           sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355";

     

       23
       20
        
         };

     

       24
       21
        
       

     

       25
       25
       -
         nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           cmake

     

       24
       24
       +
           qt5.wrapQtAppsHook

     

       25
       25
       +
           pkg-config

     

       26
       26
       +
         ];

     

       26
       27
        
         buildInputs = [

     

       27
       28
        
           fftwFloat

     

       28
       28
       -
           boost

     

       29
       29
       -
           gnuradio

     

       30
       29
        
           liquid-dsp

     

       31
       31
       -
           qtbase

     

       30
       30
       +
           qt5.qtbase

     

       32
       31
        
         ];

     

       33
       32
        
       

     

       34
       33
        
         meta = with lib; {

+44 -24

pkgs/applications/radio/qradiolink/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, alsaLib, boost

     

       2
       2
       -
       , qt4, libpulseaudio, codec2, libconfig

     

       3
       3
       -
       , gnuradio, gr-osmosdr, gsm

     

       4
       4
       -
       , libopus, libjpeg, protobuf, qwt, speex

     

       5
       5
       -
       } :

     

       6
       6
       -
       

     

       7
       7
       -
       let

     

       8
       8
       -
         version = "0.5.0";

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchFromGitHub

     

       3
       3
       +
       , libpulseaudio

     

       4
       4
       +
       , libconfig

     

       5
       5
       +
       # Needs a gnuradio built with qt gui support

     

       6
       6
       +
       , gnuradio3_8

     

       7
       7
       +
       # Not gnuradioPackages'

     

       8
       8
       +
       , codec2

     

       9
       9
       +
       , log4cpp

     

       10
       10
       +
       , gmp

     

       11
       11
       +
       , gsm

     

       12
       12
       +
       , libopus

     

       13
       13
       +
       , libjpeg

     

       14
       14
       +
       , libsndfile

     

       15
       15
       +
       , libftdi

     

       16
       16
       +
       , protobuf

     

       17
       17
       +
       , speex

     

       18
       18
       +
       , speexdsp

     

       19
       19
       +
       }:

     

       9
       20
        
       

     

       10
       10
       -
       in stdenv.mkDerivation {

     

       21
       21
       +
       gnuradio3_8.pkgs.mkDerivation rec {

     

       11
       22
        
         pname = "qradiolink";

     

       12
       12
       -
         inherit version;

     

       23
       23
       +
         version = "0.8.5-2";

     

       13
       24
        
       

     

       14
       25
        
         src = fetchFromGitHub {

     

       15
       15
       -
           owner = "kantooon";

     

       26
       26
       +
           owner = "qradiolink";

     

       16
       27
        
           repo = "qradiolink";

     

       17
       28
        
           rev = version;

     

       18
       18
       -
           sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";

     

       29
       29
       +
           sha256 = "MgHfKR3AJW3pIN9oCBr4BWxk1fGSCpLmMzjxvuTmuFA=";

     

       19
       30
        
         };

     

       20
       31
        
       

     

       21
       32
        
         preBuild = ''

     

       22
       22
       -
           cd ext

     

       33
       33
       +
           cd src/ext

     

       23
       34
        
           protoc --cpp_out=. Mumble.proto

     

       24
       35
        
           protoc --cpp_out=. QRadioLink.proto

     

       25
       25
       -
           cd ..

     

       36
       36
       +
           cd ../..

     

       26
       37
        
           qmake

     

       27
       38
        
         '';

     

       28
       39
        
       

     

       29
       40
        
         installPhase = ''

     

       30
       30
       -
           mkdir -p $out/bin

     

       31
       31
       -
           cp qradiolink $out/bin

     

       41
       41
       +
           install -D qradiolink $out/bin/qradiolink

     

       42
       42
       +
           install -Dm644 src/res/icon.png $out/share/pixmaps/qradiolink.png

     

       43
       43
       +
           install -Dm644 qradiolink.desktop $out/share/applications/qradiolink.desktop

     

       32
       44
        
         '';

     

       33
       45
        
       

     

       34
       46
        
         buildInputs = [

     

       35
       35
       -
           qt4

     

       36
       36
       -
           alsaLib

     

       37
       37
       -
           boost

     

       38
       38
       -
           libpulseaudio

     

       47
       47
       +
           gnuradio3_8.unwrapped.boost

     

       39
       48
        
           codec2

     

       49
       49
       +
           log4cpp

     

       50
       50
       +
           gmp

     

       51
       51
       +
           libpulseaudio

     

       40
       52
        
           libconfig

     

       41
       53
        
           gsm

     

       42
       42
       -
           gnuradio

     

       43
       43
       -
           gr-osmosdr

     

       54
       54
       +
           gnuradio3_8.pkgs.osmosdr

     

       44
       55
        
           libopus

     

       45
       56
        
           libjpeg

     

       57
       57
       +
           speex

     

       58
       58
       +
           speexdsp

     

       59
       59
       +
           gnuradio3_8.qt.qtbase

     

       60
       60
       +
           gnuradio3_8.qt.qtmultimedia

     

       61
       61
       +
           libftdi

     

       62
       62
       +
           libsndfile

     

       63
       63
       +
           gnuradio3_8.qwt

     

       64
       64
       +
         ];

     

       65
       65
       +
         nativeBuildInputs = [

     

       46
       66
        
           protobuf

     

       47
       47
       -
           speex

     

       48
       48
       -
           qwt

     

       67
       67
       +
           gnuradio3_8.qt.qmake

     

       68
       68
       +
           gnuradio3_8.qt.wrapQtAppsHook

     

       49
       69
        
         ];

     

       50
       70
        
       

     

       51
       71
        
         enableParallelBuilding = true;

+159

pkgs/applications/radio/uhd/3.5.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations

     

       8
       8
       +
       , boost

     

       9
       9
       +
       , enableLibuhd_C_api ? true

     

       10
       10
       +
       # requires numpy

     

       11
       11
       +
       , enableLibuhd_Python_api ? false

     

       12
       12
       +
       , python3

     

       13
       13
       +
       , enableExamples ? false

     

       14
       14
       +
       , enableUtils ? false

     

       15
       15
       +
       , enableLiberio ? false

     

       16
       16
       +
       , liberio

     

       17
       17
       +
       , libusb1

     

       18
       18
       +
       , enableDpdk ? false

     

       19
       19
       +
       , dpdk

     

       20
       20
       +
       # Devices

     

       21
       21
       +
       , enableOctoClock ? true

     

       22
       22
       +
       , enableMpmd ? true

     

       23
       23
       +
       , enableB100 ? true

     

       24
       24
       +
       , enableB200 ? true

     

       25
       25
       +
       , enableUsrp1 ? true

     

       26
       26
       +
       , enableUsrp2 ? true

     

       27
       27
       +
       , enableX300 ? true

     

       28
       28
       +
       , enableN230 ? true

     

       29
       29
       +
       , enableN300 ? true

     

       30
       30
       +
       , enableN320 ? true

     

       31
       31
       +
       , enableE300 ? true

     

       32
       32
       +
       , enableE320 ? true

     

       33
       33
       +
       }:

     

       34
       34
       +
       

     

       35
       35
       +
       let

     

       36
       36
       +
         onOffBool = b: if b then "ON" else "OFF";

     

       37
       37
       +
         inherit (lib) optionals;

     

       38
       38
       +
       in

     

       39
       39
       +
       

     

       40
       40
       +
       stdenv.mkDerivation rec {

     

       41
       41
       +
         pname = "uhd";

     

       42
       42
       +
         # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz

     

       43
       43
       +
         # and xxx.yyy.zzz. Hrmpf... style keeps changing

     

       44
       44
       +
         version = "3.15.0.0";

     

       45
       45
       +
       

     

       46
       46
       +
         src = fetchFromGitHub {

     

       47
       47
       +
           owner = "EttusResearch";

     

       48
       48
       +
           repo = "uhd";

     

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

     

       50
       50
       +
           sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf";

     

       51
       51
       +
         };

     

       52
       52
       +
         # Firmware images are downloaded (pre-built) from the respective release on Github

     

       53
       53
       +
         uhdImagesSrc = fetchurl {

     

       54
       54
       +
           url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz";

     

       55
       55
       +
           sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp";

     

       56
       56
       +
         };

     

       57
       57
       +
       

     

       58
       58
       +
         cmakeFlags = [

     

       59
       59
       +
           "-DENABLE_LIBUHD=ON"

     

       60
       60
       +
           "-DENABLE_USB=ON"

     

       61
       61
       +
           "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases

     

       62
       62
       +
           "-DENABLE_EXAMPLES=${onOffBool enableExamples}"

     

       63
       63
       +
           "-DENABLE_UTILS=${onOffBool enableUtils}"

     

       64
       64
       +
           "-DENABLE_LIBUHD_C_API=${onOffBool enableLibuhd_C_api}"

     

       65
       65
       +
           "-DENABLE_LIBUHD_PYTHON_API=${onOffBool enableLibuhd_Python_api}"

     

       66
       66
       +
           "-DENABLE_LIBERIO=${onOffBool enableLiberio}"

     

       67
       67
       +
           "-DENABLE_DPDK=${onOffBool enableDpdk}"

     

       68
       68
       +
           # Devices

     

       69
       69
       +
           "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}"

     

       70
       70
       +
           "-DENABLE_MPMD=${onOffBool enableMpmd}"

     

       71
       71
       +
           "-DENABLE_B100=${onOffBool enableB100}"

     

       72
       72
       +
           "-DENABLE_B200=${onOffBool enableB200}"

     

       73
       73
       +
           "-DENABLE_USRP1=${onOffBool enableUsrp1}"

     

       74
       74
       +
           "-DENABLE_USRP2=${onOffBool enableUsrp2}"

     

       75
       75
       +
           "-DENABLE_X300=${onOffBool enableX300}"

     

       76
       76
       +
           "-DENABLE_N230=${onOffBool enableN230}"

     

       77
       77
       +
           "-DENABLE_N300=${onOffBool enableN300}"

     

       78
       78
       +
           "-DENABLE_N320=${onOffBool enableN320}"

     

       79
       79
       +
           "-DENABLE_E300=${onOffBool enableE300}"

     

       80
       80
       +
           "-DENABLE_E320=${onOffBool enableE320}"

     

       81
       81
       +
         ]

     

       82
       82
       +
           # TODO: Check if this still needed

     

       83
       83
       +
           # ABI differences GCC 7.1

     

       84
       84
       +
           # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1

     

       85
       85
       +
           ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]

     

       86
       86
       +
         ;

     

       87
       87
       +
       

     

       88
       88
       +
         # Python + Mako are always required for the build itself but not necessary for runtime.

     

       89
       89
       +
         pythonEnv = python3.withPackages (ps: with ps; [ Mako ]

     

       90
       90
       +
           ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ]

     

       91
       91
       +
           ++ optionals (enableUtils) [ requests six ]

     

       92
       92
       +
         );

     

       93
       93
       +
       

     

       94
       94
       +
         nativeBuildInputs = [

     

       95
       95
       +
           cmake

     

       96
       96
       +
           pkg-config

     

       97
       97
       +
         ]

     

       98
       98
       +
           # If both enableLibuhd_Python_api and enableUtils are off, we don't need

     

       99
       99
       +
           # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime

     

       100
       100
       +
           # dependency

     

       101
       101
       +
           ++ optionals (!enableLibuhd_Python_api && !enableUtils) [ pythonEnv ]

     

       102
       102
       +
         ;

     

       103
       103
       +
         buildInputs = [

     

       104
       104
       +
           boost

     

       105
       105
       +
           libusb1

     

       106
       106
       +
         ]

     

       107
       107
       +
           # However, if enableLibuhd_Python_api *or* enableUtils is on, we need

     

       108
       108
       +
           # pythonEnv for runtime as well. The utilities' runtime dependencies are

     

       109
       109
       +
           # handled at the environment

     

       110
       110
       +
           ++ optionals (enableLibuhd_Python_api || enableUtils) [ pythonEnv ]

     

       111
       111
       +
           ++ optionals (enableLiberio) [ liberio ]

     

       112
       112
       +
           ++ optionals (enableDpdk) [ dpdk ]

     

       113
       113
       +
         ;

     

       114
       114
       +
       

     

       115
       115
       +
         doCheck = true;

     

       116
       116
       +
       

     

       117
       117
       +
         # Build only the host software

     

       118
       118
       +
         preConfigure = "cd host";

     

       119
       119
       +
         # TODO: Check if this still needed, perhaps relevant:

     

       120
       120
       +
         # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm

     

       121
       121
       +
         patches = if stdenv.isAarch32 then ./neon.patch else null;

     

       122
       122
       +
       

     

       123
       123
       +
         postPhases = [ "installFirmware" "removeInstalledTests" ]

     

       124
       124
       +
           ++ optionals (enableUtils) [ "moveUdevRules" ]

     

       125
       125
       +
         ;

     

       126
       126
       +
       

     

       127
       127
       +
         # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`

     

       128
       128
       +
         installFirmware = ''

     

       129
       129
       +
           mkdir -p "$out/share/uhd/images"

     

       130
       130
       +
           tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images"

     

       131
       131
       +
         '';

     

       132
       132
       +
       

     

       133
       133
       +
         # -DENABLE_TESTS=ON installs the tests, we don't need them in the output

     

       134
       134
       +
         removeInstalledTests = ''

     

       135
       135
       +
           rm -r $out/lib/uhd/tests

     

       136
       136
       +
         '';

     

       137
       137
       +
       

     

       138
       138
       +
         # Moves the udev rules to the standard location, needed only if utils are

     

       139
       139
       +
         # enabled

     

       140
       140
       +
         moveUdevRules = ''

     

       141
       141
       +
           mkdir -p $out/lib/udev/rules.d

     

       142
       142
       +
           mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/

     

       143
       143
       +
         '';

     

       144
       144
       +
       

     

       145
       145
       +
         meta = with lib; {

     

       146
       146
       +
           description = "USRP Hardware Driver (for Software Defined Radio)";

     

       147
       147
       +
           longDescription = ''

     

       148
       148
       +
             The USRP Hardware Driver (UHD) software is the hardware driver for all

     

       149
       149
       +
             USRP (Universal Software Radio Peripheral) devices.

     

       150
       150
       +
       

     

       151
       151
       +
             USRP devices are designed and sold by Ettus Research, LLC and its parent

     

       152
       152
       +
             company, National Instruments.

     

       153
       153
       +
           '';

     

       154
       154
       +
           homepage = "https://uhd.ettus.com/";

     

       155
       155
       +
           license = licenses.gpl3Plus;

     

       156
       156
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       157
       157
       +
           maintainers = with maintainers; [ bjornfor fpletz tomberek ];

     

       158
       158
       +
         };

     

       159
       159
       +
       }

+9 -8

pkgs/applications/radio/uhd/default.nix

···

       1
       1
       -
       { lib, stdenv

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , fetchurl

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , cmake

     
···

       8
       9
        
       , enableLibuhd_C_api ? true

     

       9
       10
        
       # requires numpy

     

       10
       11
        
       , enableLibuhd_Python_api ? false

     

       11
       11
       -
       , python3 ? null

     

       12
       12
       +
       , python3

     

       12
       13
        
       , enableExamples ? false

     

       13
       14
        
       , enableUtils ? false

     

       14
       15
        
       , enableLiberio ? false

     

       15
       15
       -
       , liberio ? null

     

       16
       16
       -
       , libusb1 ? null

     

       16
       16
       +
       , liberio

     

       17
       17
       +
       , libusb1

     

       17
       18
        
       , enableDpdk ? false

     

       18
       18
       -
       , dpdk ? null

     

       19
       19
       +
       , dpdk

     

       19
       20
        
       # Devices

     

       20
       21
        
       , enableOctoClock ? true

     

       21
       22
        
       , enableMpmd ? true

     
···

       40
       41
        
         pname = "uhd";

     

       41
       42
        
         # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz

     

       42
       43
        
         # and xxx.yyy.zzz. Hrmpf... style keeps changing

     

       43
       43
       -
         version = "3.15.0.0";

     

       44
       44
       +
         version = "4.0.0.0";

     

       44
       45
        
       

     

       45
       46
        
         src = fetchFromGitHub {

     

       46
       47
        
           owner = "EttusResearch";

     

       47
       48
        
           repo = "uhd";

     

       48
       49
        
           rev = "v${version}";

     

       49
       49
       -
           sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf";

     

       50
       50
       +
           sha256 = "NCyiI4pIPw0nBRFdUGpgZ/x2mWz+Qm78ZGACUnSbGSs=";

     

       50
       51
        
         };

     

       51
       52
        
         # Firmware images are downloaded (pre-built) from the respective release on Github

     

       52
       53
        
         uhdImagesSrc = fetchurl {

     

       53
       54
        
           url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz";

     

       54
       54
       -
           sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp";

     

       55
       55
       +
           sha256 = "Xfx0bsHUQ5+Dp+xk0sVWWP83oyXQcUH5AX4PNEE7fY4=";

     

       55
       56
        
         };

     

       56
       57
        
       

     

       57
       58
        
         cmakeFlags = [

+12 -248

pkgs/applications/video/kodi/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper

     

       2
       2
       -
       , pkg-config, cmake, gnumake, yasm, python3Packages

     

       3
       3
       -
       , libgcrypt, libgpgerror, libunistring

     

       4
       4
       -
       , boost, avahi, lame

     

       5
       5
       -
       , gettext, pcre-cpp, yajl, fribidi, which

     

       6
       6
       -
       , openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless

     

       7
       7
       -
       , gtest, ncurses, spdlog

     

       8
       8
       -
       , libxml2, systemd

     

       9
       9
       -
       , alsaLib, libGLU, libGL, fontconfig, freetype, ftgl

     

       10
       10
       -
       , libjpeg, libpng, libtiff

     

       11
       11
       -
       , libmpeg2, libsamplerate, libmad

     

       12
       12
       -
       , libogg, libvorbis, flac, libxslt

     

       13
       13
       -
       , lzo, libcdio, libmodplug, libass, libbluray

     

       14
       14
       -
       , sqlite, libmysqlclient, nasm, gnutls, libva, libdrm

     

       15
       15
       -
       , curl, bzip2, zip, unzip, glxinfo

     

       16
       16
       -
       , libcec, libcec_platform, dcadec, libuuid

     

       17
       17
       -
       , libcrossguid, libmicrohttpd

     

       18
       18
       -
       , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1

     

       19
       19
       -
       , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson

     

       20
       20
       -
       , lirc

     

       21
       21
       -
       , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp

     

       22
       22
       -
       , dbusSupport ? true, dbus ? null

     

       23
       23
       -
       , joystickSupport ? true, cwiid ? null

     

       24
       24
       -
       , nfsSupport ? true, libnfs ? null

     

       25
       25
       -
       , pulseSupport ? true, libpulseaudio ? null

     

       26
       26
       -
       , rtmpSupport ? true, rtmpdump ? null

     

       27
       27
       -
       , sambaSupport ? true, samba ? null

     

       28
       28
       -
       , udevSupport ? true, udev ? null

     

       29
       29
       -
       , usbSupport  ? false, libusb-compat-0_1 ? null

     

       30
       30
       -
       , vdpauSupport ? true, libvdpau ? null

     

       31
       31
       -
       , useWayland ? false, wayland ? null, wayland-protocols ? null

     

       32
       32
       -
       , waylandpp ?  null, libxkbcommon ? null

     

       33
       33
       -
       , useGbm ? false, mesa ? null, libinput ? null

     

       34
       34
       -
       , buildPackages

     

       35
       35
       -
       }:

     

       36
       36
       -
       

     

       37
       37
       -
       assert dbusSupport  -> dbus != null;

     

       38
       38
       -
       assert nfsSupport   -> libnfs != null;

     

       39
       39
       -
       assert pulseSupport -> libpulseaudio != null;

     

       40
       40
       -
       assert rtmpSupport  -> rtmpdump != null;

     

       41
       41
       -
       assert sambaSupport -> samba != null;

     

       42
       42
       -
       assert udevSupport  -> udev != null;

     

       43
       43
       -
       assert usbSupport   -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable

     

       44
       44
       -
       assert vdpauSupport -> libvdpau != null;

     

       45
       45
       -
       assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;

     

       46
       46
       -
       assert useGbm || useWayland || x11Support;

     

       47
       47
       -
       

     

       1
       1
       +
       { callPackage, ... } @ args:

     

       48
       2
        
       let

     

       49
       49
       -
         kodiReleaseDate = "20210219";

     

       50
       50
       -
         kodiVersion = "19.0";

     

       51
       51
       -
         rel = "Matrix";

     

       52
       52
       -
       

     

       53
       53
       -
         kodi_src = fetchFromGitHub {

     

       54
       54
       -
           owner  = "xbmc";

     

       55
       55
       -
           repo   = "xbmc";

     

       56
       56
       -
           rev    = "${kodiVersion}-${rel}";

     

       57
       57
       -
           sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p";

     

       58
       58
       -
         };

     

       59
       59
       -
       

     

       60
       60
       -
         ffmpeg = stdenv.mkDerivation rec {

     

       61
       61
       -
           pname = "kodi-ffmpeg";

     

       62
       62
       -
           version = "4.3.1";

     

       63
       63
       -
           src = fetchFromGitHub {

     

       64
       64
       -
             owner   = "xbmc";

     

       65
       65
       -
             repo    = "FFmpeg";

     

       66
       66
       -
             rev     = "${version}-${rel}-Beta1";

     

       67
       67
       -
             sha256  = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w";

     

       68
       68
       -
           };

     

       69
       69
       -
           preConfigure = ''

     

       70
       70
       -
             cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .

     

       71
       71
       -
             sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt

     

       72
       72
       -
             sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt

     

       73
       73
       -
           '';

     

       74
       74
       -
           cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       75
       75
       -
             "-DCROSSCOMPILING=ON"

     

       76
       76
       -
             "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}"

     

       77
       77
       -
             "-DOS=${stdenv.hostPlatform.parsed.kernel.name}"

     

       78
       78
       -
             "-DPKG_CONFIG_EXECUTABLE=pkg-config"

     

       79
       79
       -
           ];

     

       80
       80
       -
           buildInputs = [ libidn libtasn1 p11-kit zlib libva ]

     

       81
       81
       -
             ++ lib.optional  vdpauSupport    libvdpau;

     

       82
       82
       -
           nativeBuildInputs = [ cmake nasm pkg-config gnutls ];

     

       83
       83
       -
         };

     

       84
       84
       -
       

     

       85
       85
       -
         # We can build these externally but FindLibDvd.cmake forces us to build it

     

       86
       86
       -
         # them, so we currently just use them for the src.

     

       87
       87
       -
         libdvdcss = fetchFromGitHub {

     

       88
       88
       -
           owner = "xbmc";

     

       89
       89
       -
           repo = "libdvdcss";

     

       90
       90
       -
           rev = "1.4.2-${rel}-Beta-5";

     

       91
       91
       -
           sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";

     

       92
       92
       -
         };

     

       93
       93
       -
       

     

       94
       94
       -
         libdvdnav = fetchFromGitHub {

     

       95
       95
       -
           owner = "xbmc";

     

       96
       96
       -
           repo = "libdvdnav";

     

       97
       97
       -
           rev = "6.0.0-${rel}-Alpha-3";

     

       98
       98
       -
           sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";

     

       99
       99
       -
         };

     

       100
       100
       -
       

     

       101
       101
       -
         libdvdread = fetchFromGitHub {

     

       102
       102
       -
           owner = "xbmc";

     

       103
       103
       -
           repo = "libdvdread";

     

       104
       104
       -
           rev = "6.0.0-${rel}-Alpha-3";

     

       105
       105
       -
           sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";

     

       106
       106
       -
         };

     

       107
       107
       -
       

     

       108
       108
       -
         kodi_platforms =

     

       109
       109
       -
           lib.optional useGbm "gbm" ++

     

       110
       110
       -
           lib.optional useWayland "wayland" ++

     

       111
       111
       -
           lib.optional x11Support "x11"

     

       112
       112
       -
         ;

     

       113
       113
       -
       

     

       114
       114
       -
       in stdenv.mkDerivation {

     

       115
       115
       -
           name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}";

     

       116
       116
       -
       

     

       117
       117
       -
           src = kodi_src;

     

       118
       118
       -
       

     

       119
       119
       -
           buildInputs = [

     

       120
       120
       -
             gnutls libidn libtasn1 nasm p11-kit

     

       121
       121
       -
             libxml2 python3Packages.python

     

       122
       122
       -
             boost libmicrohttpd

     

       123
       123
       -
             gettext pcre-cpp yajl fribidi libva libdrm

     

       124
       124
       -
             openssl gperf tinyxml2 taglib libssh

     

       125
       125
       -
             gtest ncurses spdlog

     

       126
       126
       -
             alsaLib libGL libGLU fontconfig freetype ftgl

     

       127
       127
       -
             libjpeg libpng libtiff

     

       128
       128
       -
             libmpeg2 libsamplerate libmad

     

       129
       129
       -
             libogg libvorbis flac libxslt systemd

     

       130
       130
       -
             lzo libcdio libmodplug libass libbluray

     

       131
       131
       -
             sqlite libmysqlclient avahi lame

     

       132
       132
       -
             curl bzip2 zip glxinfo

     

       133
       133
       -
             libcec libcec_platform dcadec libuuid

     

       134
       134
       -
             libgcrypt libgpgerror libunistring

     

       135
       135
       -
             libcrossguid libplist

     

       136
       136
       -
             bluez giflib glib harfbuzz lcms2 libpthreadstubs

     

       137
       137
       -
             ffmpeg flatbuffers fmt fstrcmp rapidjson

     

       138
       138
       -
             lirc

     

       139
       139
       -
           ]

     

       140
       140
       -
           ++ lib.optional x11Support [

     

       141
       141
       -
             libX11 xorgproto libXt libXmu libXext.dev libXdmcp

     

       142
       142
       -
             libXinerama libXrandr.dev libXtst libXfixes

     

       143
       143
       -
           ]

     

       144
       144
       -
           ++ lib.optional  dbusSupport     dbus

     

       145
       145
       -
           ++ lib.optional joystickSupport cwiid

     

       146
       146
       -
           ++ lib.optional  nfsSupport      libnfs

     

       147
       147
       -
           ++ lib.optional  pulseSupport    libpulseaudio

     

       148
       148
       -
           ++ lib.optional  rtmpSupport     rtmpdump

     

       149
       149
       -
           ++ lib.optional  sambaSupport    samba

     

       150
       150
       -
           ++ lib.optional  udevSupport     udev

     

       151
       151
       -
           ++ lib.optional  usbSupport      libusb-compat-0_1

     

       152
       152
       -
           ++ lib.optional  vdpauSupport    libvdpau

     

       153
       153
       -
           ++ lib.optionals useWayland [

     

       154
       154
       -
             wayland

     

       155
       155
       -
             waylandpp.dev

     

       156
       156
       -
             wayland-protocols

     

       157
       157
       -
             # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise

     

       158
       158
       -
             libxkbcommon.dev

     

       159
       159
       -
           ]

     

       160
       160
       -
           ++ lib.optional useGbm [

     

       161
       161
       -
             libxkbcommon.dev

     

       162
       162
       -
             mesa.dev

     

       163
       163
       -
             libinput.dev

     

       164
       164
       -
           ];

     

       165
       165
       -
       

     

       166
       166
       -
           nativeBuildInputs = [

     

       167
       167
       -
             cmake

     

       168
       168
       -
             doxygen

     

       169
       169
       -
             makeWrapper

     

       170
       170
       -
             which

     

       171
       171
       -
             pkg-config gnumake

     

       172
       172
       -
             autoconf automake libtool # still needed for some components. Check if that is the case with 19.0

     

       173
       173
       -
             jre_headless yasm gettext python3Packages.python flatbuffers

     

       174
       174
       -
       

     

       175
       175
       -
             # for TexturePacker

     

       176
       176
       -
             giflib zlib libpng libjpeg lzo

     

       177
       177
       -
           ] ++ lib.optionals useWayland [ wayland-protocols waylandpp.bin ];

     

       178
       178
       -
       

     

       179
       179
       -
           depsBuildBuild = [

     

       180
       180
       -
             buildPackages.stdenv.cc

     

       181
       181
       -
           ];

     

       182
       182
       -
       

     

       183
       183
       -
           cmakeFlags = [

     

       184
       184
       -
             "-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}"

     

       185
       185
       -
             "-Dlibdvdcss_URL=${libdvdcss}"

     

       186
       186
       -
             "-Dlibdvdnav_URL=${libdvdnav}"

     

       187
       187
       -
             "-Dlibdvdread_URL=${libdvdread}"

     

       188
       188
       -
             "-DGIT_VERSION=${kodiReleaseDate}"

     

       189
       189
       -
             "-DENABLE_EVENTCLIENTS=ON"

     

       190
       190
       -
             "-DENABLE_INTERNAL_CROSSGUID=OFF"

     

       191
       191
       -
             "-DENABLE_OPTICAL=ON"

     

       192
       192
       -
             "-DLIRC_DEVICE=/run/lirc/lircd"

     

       193
       193
       -
             "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"

     

       194
       194
       -
             "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"

     

       195
       195
       -
             "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"

     

       196
       196
       -
           ] ++ lib.optional useWayland [

     

       197
       197
       -
             "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"

     

       198
       198
       -
           ];

     

       199
       199
       -
       

     

       200
       200
       -
           # 14 tests fail but the biggest issue is that every test takes 30 seconds -

     

       201
       201
       -
           # I'm guessing there is a thing waiting to time out

     

       202
       202
       -
           doCheck = false;

     

       203
       203
       -
       

     

       204
       204
       -
           preConfigure = ''

     

       205
       205
       -
             cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")

     

       206
       206
       -
           '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       207
       207
       -
             # Need these tools on the build system when cross compiling,

     

       208
       208
       -
             # hacky, but have found no other way.

     

       209
       209
       -
             CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder

     

       210
       210
       -
             cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"

     

       211
       211
       -
       

     

       212
       212
       -
             CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker

     

       213
       213
       -
             cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"

     

       214
       214
       -
           '';

     

       215
       215
       -
       

     

       216
       216
       -
           postPatch = ''

     

       217
       217
       -
             substituteInPlace xbmc/platform/posix/PosixTimezone.cpp \

     

       218
       218
       -
               --replace 'usr/share/zoneinfo' 'etc/zoneinfo'

     

       219
       219
       -
           '';

     

       220
       220
       -
       

     

       221
       221
       -
           postInstall = ''

     

       222
       222
       -
             for p in $(ls $out/bin/) ; do

     

       223
       223
       -
               wrapProgram $out/bin/$p \

     

       224
       224
       -
                 --prefix PATH            ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \

     

       225
       225
       -
                 --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath

     

       226
       226
       -
                     ([ curl systemd libmad libvdpau libcec libcec_platform libass ]

     

       227
       227
       -
                        ++ lib.optional nfsSupport libnfs

     

       228
       228
       -
                        ++ lib.optional rtmpSupport rtmpdump)}"

     

       229
       229
       -
             done

     

       230
       230
       -
       

     

       231
       231
       -
             substituteInPlace $out/share/xsessions/kodi.desktop \

     

       232
       232
       -
               --replace kodi-standalone $out/bin/kodi-standalone

     

       233
       233
       -
           '';

     

       234
       234
       -
       

     

       235
       235
       -
           doInstallCheck = true;

     

       236
       236
       -
       

     

       237
       237
       -
           installCheckPhase = "$out/bin/kodi --version";

     

       238
       238
       -
       

     

       239
       239
       -
           passthru = {

     

       240
       240
       -
             pythonPackages = python3Packages;

     

       3
       3
       +
         unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]);

     

       4
       4
       +
         kodiPackages = callPackage ./packages.nix { kodi = unwrapped; };

     

       5
       5
       +
       in

     

       6
       6
       +
         unwrapped.overrideAttrs (oldAttrs: {

     

       7
       7
       +
           passthru = oldAttrs.passthru // {

     

       8
       8
       +
             packages = kodiPackages;

     

       9
       9
       +
             withPackages = func: callPackage ./wrapper.nix {

     

       10
       10
       +
               kodi = unwrapped;

     

       11
       11
       +
               addons = kodiPackages.requiredKodiAddons (func kodiPackages);

     

       12
       12
       +
             };

     

       241
       13
        
           };

     

       242
       242
       -
       

     

       243
       243
       -
           meta = with lib; {

     

       244
       244
       -
             description = "Media center";

     

       245
       245
       -
             homepage    = "https://kodi.tv/";

     

       246
       246
       -
             license     = licenses.gpl2;

     

       247
       247
       -
             platforms   = platforms.linux;

     

       248
       248
       -
             maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ];

     

       249
       249
       -
           };

     

       250
       250
       -
       }

     

       14
       14
       +
         })

+78 -75

pkgs/applications/video/kodi/plugins.nix pkgs/applications/video/kodi/packages.nix

···

       1
       1
        
       { lib, stdenv, callPackage, fetchFromGitHub

     

       2
       2
       -
       , cmake, kodiPlain, libcec_platform, tinyxml, pugixml

     

       2
       2
       +
       , cmake, kodi, libcec_platform, tinyxml, pugixml

     

       3
       3
        
       , steam, udev, libusb1, jsoncpp, libhdhomerun, zlib

     

       4
       4
        
       , python3Packages, expat, glib, nspr, nss, openssl

     

       5
       5
        
       , libssh, libarchive, lzma, bzip2, lz4, lzo }:

     
···

       8
       8
        
       

     

       9
       9
        
       let self = rec {

     

       10
       10
        
       

     

       11
       11
       -
         pluginDir = "/share/kodi/addons";

     

       11
       11
       +
         addonDir = "/share/kodi/addons";

     

       12
       12
        
         rel = "Matrix";

     

       13
       13
        
       

     

       14
       14
       -
         kodi = kodiPlain;

     

       14
       14
       +
         inherit kodi;

     

       15
       15
        
       

     

       16
       16
        
         # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix

     

       17
       17
       -
         toKodiPlugin = drv: drv.overrideAttrs(oldAttrs: {

     

       17
       17
       +
         toKodiAddon = drv: drv.overrideAttrs(oldAttrs: {

     

       18
       18
        
           # Use passthru in order to prevent rebuilds when possible.

     

       19
       19
        
           passthru = (oldAttrs.passthru or {})// {

     

       20
       20
       -
             kodiPluginFor = kodi;

     

       21
       21
       -
             requiredKodiPlugins = requiredKodiPlugins drv.propagatedBuildInputs;

     

       20
       20
       +
             kodiAddonFor = kodi;

     

       21
       21
       +
             requiredKodiAddons = requiredKodiAddons drv.propagatedBuildInputs;

     

       22
       22
        
           };

     

       23
       23
        
         });

     

       24
       24
        
       

     

       25
       25
       -
         # Check whether a derivation provides a Kodi plugin.

     

       26
       26
       -
         hasKodiPlugin = drv: drv ? kodiPluginFor && drv.kodiPluginFor == kodi;

     

       25
       25
       +
         # Check whether a derivation provides a Kodi addon.

     

       26
       26
       +
         hasKodiAddon = drv: drv ? kodiAddonFor && drv.kodiAddonFor == kodi;

     

       27
       27
        
       

     

       28
       28
       -
         # Get list of required Kodi plugins given a list of derivations.

     

       29
       29
       -
         requiredKodiPlugins = drvs: let

     

       30
       30
       -
             modules = filter hasKodiPlugin drvs;

     

       31
       31
       -
           in unique (modules ++ concatLists (catAttrs "requiredKodiPlugins" modules));

     

       32
       32
       -
       

     

       33
       33
       -
         kodiWithPlugins = func: callPackage ./wrapper.nix {

     

       34
       34
       -
           inherit kodi;

     

       35
       35
       -
           plugins = requiredKodiPlugins (func self);

     

       36
       36
       -
         };

     

       28
       28
       +
         # Get list of required Kodi addons given a list of derivations.

     

       29
       29
       +
         requiredKodiAddons = drvs: let

     

       30
       30
       +
             modules = filter hasKodiAddon drvs;

     

       31
       31
       +
           in unique (modules ++ concatLists (catAttrs "requiredKodiAddons" modules));

     

       37
       32
        
       

     

       38
       33
        
         kodi-platform = stdenv.mkDerivation rec {

     

       39
       34
        
           project = "kodi-platform";

     
···

       48
       43
        
           };

     

       49
       44
        
       

     

       50
       45
        
           nativeBuildInputs = [ cmake ];

     

       51
       51
       -
           buildInputs = [ kodiPlain libcec_platform tinyxml ];

     

       46
       46
       +
           buildInputs = [ kodi libcec_platform tinyxml ];

     

       52
       47
        
         };

     

       53
       48
        
       

     

       54
       54
       -
         mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args:

     

       55
       55
       -
         toKodiPlugin (stdenv.mkDerivation ({

     

       56
       56
       -
           name = "kodi-plugin-${plugin}-${version}";

     

       49
       49
       +
         buildKodiAddon =

     

       50
       50
       +
           { name ? "${attrs.pname}-${attrs.version}"

     

       51
       51
       +
           , namespace

     

       52
       52
       +
           , sourceDir ? ""

     

       53
       53
       +
           , ... } @ attrs:

     

       54
       54
       +
         toKodiAddon (stdenv.mkDerivation ({

     

       55
       55
       +
           name = "kodi-" + name;

     

       57
       56
        
       

     

       58
       57
        
           dontStrip = true;

     

       59
       58
        
       

     

       60
       59
        
           extraRuntimeDependencies = [ ];

     

       61
       60
        
       

     

       62
       61
        
           installPhase = ''

     

       63
       63
       -
             ${if sourceDir == null then "" else "cd $src/$sourceDir"}

     

       64
       64
       -
             d=$out${pluginDir}/${namespace}

     

       62
       62
       +
             cd $src/$sourceDir

     

       63
       63
       +
             d=$out${addonDir}/${namespace}

     

       65
       64
        
             mkdir -p $d

     

       66
       65
        
             sauce="."

     

       67
       66
        
             [ -d ${namespace} ] && sauce=${namespace}

     

       68
       67
        
             cp -R "$sauce/"* $d

     

       69
       68
        
           '';

     

       70
       70
       -
         } // args));

     

       69
       69
       +
         } // attrs));

     

       71
       70
        
       

     

       72
       72
       -
         mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [],

     

       73
       73
       -
           extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args:

     

       74
       74
       -
         toKodiPlugin (stdenv.mkDerivation ({

     

       75
       75
       -
           name = "kodi-plugin-${plugin}-${version}";

     

       71
       71
       +
         buildKodiBinaryAddon =

     

       72
       72
       +
           { name ? "${attrs.pname}-${attrs.version}"

     

       73
       73
       +
           , namespace

     

       74
       74
       +
           , version

     

       75
       75
       +
           , extraBuildInputs ? []

     

       76
       76
       +
           , extraRuntimeDependencies ? []

     

       77
       77
       +
           , extraInstallPhase ? "", ... } @ attrs:

     

       78
       78
       +
         toKodiAddon (stdenv.mkDerivation ({

     

       79
       79
       +
           name = "kodi-" + name;

     

       76
       80
        
       

     

       77
       81
        
           dontStrip = true;

     

       78
       82
        
       

     

       79
       83
        
           nativeBuildInputs = [ cmake ];

     

       80
       80
       -
           buildInputs = [ kodiPlain kodi-platform libcec_platform ] ++ extraBuildInputs;

     

       84
       84
       +
           buildInputs = [ kodi kodi-platform libcec_platform ] ++ extraBuildInputs;

     

       81
       85
        
       

     

       82
       86
        
           inherit extraRuntimeDependencies;

     

       83
       87
        
       

     
···

       86
       90
        
             "-DOVERRIDE_PATHS=1"

     

       87
       91
        
           ];

     

       88
       92
        
       

     

       89
       89
       -
           # kodi checks for plugin .so libs existance in the addon folder (share/...)

     

       93
       93
       +
           # kodi checks for addon .so libs existance in the addon folder (share/...)

     

       90
       94
        
           # and the non-wrapped kodi lib/... folder before even trying to dlopen

     

       91
       95
        
           # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use

     

       92
       96
        
           installPhase = let n = namespace; in ''

     

       93
       97
        
             make install

     

       94
       94
       -
             ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version}

     

       98
       98
       +
             ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version}

     

       95
       99
        
             ${extraInstallPhase}

     

       96
       100
        
           '';

     

       97
       97
       -
         } // args));

     

       101
       101
       +
         } // attrs));

     

       98
       102
        
       

     

       99
       99
       -
         advanced-launcher = mkKodiPlugin rec {

     

       103
       103
       +
         advanced-launcher = buildKodiAddon rec {

     

       100
       104
        
       

     

       101
       101
       -
           plugin = "advanced-launcher";

     

       105
       105
       +
           pname = "advanced-launcher";

     

       102
       106
        
           namespace = "plugin.program.advanced.launcher";

     

       103
       107
        
           version = "2.5.8";

     

       104
       108
        
       

     

       105
       109
        
           src = fetchFromGitHub {

     

       106
       110
        
             owner = "edwtjo";

     

       107
       107
       -
             repo = plugin;

     

       111
       111
       +
             repo = pname;

     

       108
       112
        
             rev = version;

     

       109
       113
        
             sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2";

     

       110
       114
        
           };

     
···

       127
       131
        
       

     

       128
       132
        
         };

     

       129
       133
        
       

     

       130
       130
       -
         advanced-emulator-launcher = mkKodiPlugin rec {

     

       134
       134
       +
         advanced-emulator-launcher = buildKodiAddon rec {

     

       131
       135
        
       

     

       132
       132
       -
           plugin = "advanced-emulator-launcher";

     

       136
       136
       +
           pname = "advanced-emulator-launcher";

     

       133
       137
        
           namespace = "plugin.program.advanced.emulator.launcher";

     

       134
       138
        
           version = "0.9.6";

     

       135
       139
        
       

     
···

       175
       179
        
           };

     

       176
       180
        
       

     

       177
       181
        
           mkController = controller: {

     

       178
       178
       -
               ${controller} = mkKodiPlugin rec {

     

       179
       179
       -
                 plugin = pname + "-" + controller;

     

       182
       182
       +
               ${controller} = buildKodiAddon rec {

     

       183
       183
       +
                 pname = pname + "-" + controller;

     

       180
       184
        
                 namespace = "game.controller." + controller;

     

       181
       185
        
                 sourceDir = "addons/" + namespace;

     

       182
       186
        
                 inherit version src meta;

     
···

       209
       213
        
             broken = true; # requires port to python3

     

       210
       214
        
           };

     

       211
       215
        
         in {

     

       212
       212
       -
           service = mkKodiPlugin {

     

       213
       213
       -
             plugin = pname + "-service";

     

       216
       216
       +
           service = buildKodiAddon {

     

       217
       217
       +
             pname = pname + "-service";

     

       214
       218
        
             version = "1.2.1";

     

       215
       219
        
             namespace = "service.hyper.launcher";

     

       216
       220
        
             inherit src meta;

     

       217
       221
        
           };

     

       218
       218
       -
           plugin = mkKodiPlugin {

     

       219
       219
       -
             plugin = pname;

     

       222
       222
       +
           plugin = buildKodiAddon {

     

       220
       223
        
             namespace = "plugin.hyper.launcher";

     

       221
       221
       -
             inherit version src meta;

     

       224
       224
       +
             inherit pname version src meta;

     

       222
       225
        
           };

     

       223
       226
        
         };

     

       224
       227
        
       

     

       225
       225
       -
         joystick = mkKodiABIPlugin rec {

     

       228
       228
       +
         joystick = buildKodiBinaryAddon rec {

     

       229
       229
       +
           pname = namespace;

     

       226
       230
        
           namespace = "peripheral.joystick";

     

       227
       231
        
           version = "1.7.1";

     

       228
       228
       -
           plugin = namespace;

     

       229
       232
        
       

     

       230
       233
        
           src = fetchFromGitHub {

     

       231
       234
        
             owner = "xbmc";

     
···

       243
       246
        
           extraBuildInputs = [ tinyxml udev ];

     

       244
       247
        
         };

     

       245
       248
        
       

     

       246
       246
       -
         simpleplugin = mkKodiPlugin rec {

     

       247
       247
       -
           plugin = "simpleplugin";

     

       249
       249
       +
         simpleplugin = buildKodiAddon rec {

     

       250
       250
       +
           pname = "simpleplugin";

     

       248
       251
        
           namespace = "script.module.simpleplugin";

     

       249
       252
        
           version = "2.3.2";

     

       250
       253
        
       

     
···

       263
       266
        
           };

     

       264
       267
        
         };

     

       265
       268
        
       

     

       266
       266
       -
         svtplay = mkKodiPlugin rec {

     

       269
       269
       +
         svtplay = buildKodiAddon rec {

     

       267
       270
        
       

     

       268
       268
       -
           plugin = "svtplay";

     

       271
       271
       +
           pname = "svtplay";

     

       269
       272
        
           namespace = "plugin.video.svtplay";

     

       270
       273
        
           version = "5.1.12";

     

       271
       274
        
       

     

       272
       275
        
           src = fetchFromGitHub {

     

       273
       273
       -
             name = plugin + "-" + version + ".tar.gz";

     

       276
       276
       +
             name = pname + "-" + version + ".tar.gz";

     

       274
       277
        
             owner = "nilzen";

     

       275
       275
       -
             repo = "xbmc-" + plugin;

     

       278
       278
       +
             repo = "xbmc-" + pname;

     

       276
       279
        
             rev = "v${version}";

     

       277
       280
        
             sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6";

     

       278
       281
        
           };

     
···

       292
       295
        
       

     

       293
       296
        
         };

     

       294
       297
        
       

     

       295
       295
       -
         steam-controller = mkKodiABIPlugin rec {

     

       298
       298
       +
         steam-controller = buildKodiBinaryAddon rec {

     

       299
       299
       +
           pname = namespace;

     

       296
       300
        
           namespace = "peripheral.steamcontroller";

     

       297
       301
        
           version = "0.11.0";

     

       298
       298
       -
           plugin = namespace;

     

       299
       302
        
       

     

       300
       303
        
           src = fetchFromGitHub {

     

       301
       304
        
             owner = "kodi-game";

     
···

       314
       317
        
       

     

       315
       318
        
         };

     

       316
       319
        
       

     

       317
       317
       -
         steam-launcher = mkKodiPlugin {

     

       320
       320
       +
         steam-launcher = buildKodiAddon {

     

       318
       321
        
       

     

       319
       319
       -
           plugin = "steam-launcher";

     

       322
       322
       +
           pname = "steam-launcher";

     

       320
       323
        
           namespace = "script.steam.launcher";

     

       321
       324
        
           version = "3.5.1";

     

       322
       325
        
       

     
···

       343
       346
        
           };

     

       344
       347
        
         };

     

       345
       348
        
       

     

       346
       346
       -
         pdfreader = mkKodiPlugin rec {

     

       347
       347
       -
           plugin = "pdfreader";

     

       349
       349
       +
         pdfreader = buildKodiAddon rec {

     

       350
       350
       +
           pname = "pdfreader";

     

       348
       351
        
           namespace = "plugin.image.pdf";

     

       349
       352
        
           version = "2.0.2";

     

       350
       353
        
       

     
···

       362
       365
        
           };

     

       363
       366
        
         };

     

       364
       367
        
       

     

       365
       365
       -
         pvr-hts = mkKodiABIPlugin rec {

     

       368
       368
       +
         pvr-hts = buildKodiBinaryAddon rec {

     

       366
       369
        
       

     

       367
       367
       -
           plugin = "pvr-hts";

     

       370
       370
       +
           pname = "pvr-hts";

     

       368
       371
        
           namespace = "pvr.hts";

     

       369
       372
        
           version = "8.2.2";

     

       370
       373
        
       

     
···

       384
       387
        
       

     

       385
       388
        
         };

     

       386
       389
        
       

     

       387
       387
       -
         pvr-hdhomerun = mkKodiABIPlugin rec {

     

       390
       390
       +
         pvr-hdhomerun = buildKodiBinaryAddon rec {

     

       388
       391
        
       

     

       389
       389
       -
           plugin = "pvr-hdhomerun";

     

       392
       392
       +
           pname = "pvr-hdhomerun";

     

       390
       393
        
           namespace = "pvr.hdhomerun";

     

       391
       394
        
           version = "7.1.0";

     

       392
       395
        
       

     
···

       408
       411
        
       

     

       409
       412
        
         };

     

       410
       413
        
       

     

       411
       411
       -
         pvr-iptvsimple = mkKodiABIPlugin rec {

     

       414
       414
       +
         pvr-iptvsimple = buildKodiBinaryAddon rec {

     

       412
       415
        
       

     

       413
       413
       -
           plugin = "pvr-iptvsimple";

     

       416
       416
       +
           pname = "pvr-iptvsimple";

     

       414
       417
        
           namespace = "pvr.iptvsimple";

     

       415
       418
        
           version = "7.4.2";

     

       416
       419
        
       

     
···

       432
       435
        
           extraBuildInputs = [ zlib pugixml ];

     

       433
       436
        
         };

     

       434
       437
        
       

     

       435
       435
       -
         osmc-skin = mkKodiPlugin rec {

     

       438
       438
       +
         osmc-skin = buildKodiAddon rec {

     

       436
       439
        
       

     

       437
       437
       -
           plugin = "osmc-skin";

     

       440
       440
       +
           pname = "osmc-skin";

     

       438
       441
        
           namespace = "skin.osmc";

     

       439
       442
        
           version = "18.0.0";

     

       440
       443
        
       

     
···

       454
       457
        
           };

     

       455
       458
        
         };

     

       456
       459
        
       

     

       457
       457
       -
         yatp = python3Packages.toPythonModule (mkKodiPlugin rec {

     

       458
       458
       -
           plugin = "yatp";

     

       460
       460
       +
         yatp = python3Packages.toPythonModule (buildKodiAddon rec {

     

       461
       461
       +
           pname = "yatp";

     

       459
       462
        
           namespace = "plugin.video.yatp";

     

       460
       463
        
           version = "3.3.2";

     

       461
       464
        
       

     
···

       482
       485
        
           };

     

       483
       486
        
         });

     

       484
       487
        
       

     

       485
       485
       -
         inputstream-adaptive = mkKodiABIPlugin rec {

     

       488
       488
       +
         inputstream-adaptive = buildKodiBinaryAddon rec {

     

       486
       489
        
       

     

       487
       487
       -
           plugin = "inputstream-adaptive";

     

       490
       490
       +
           pname = "inputstream-adaptive";

     

       488
       491
        
           namespace = "inputstream.adaptive";

     

       489
       492
        
           version = "2.6.7";

     

       490
       493
        
       

     
···

       500
       503
        
           extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ];

     

       501
       504
        
       

     

       502
       505
        
           extraInstallPhase = let n = namespace; in ''

     

       503
       503
       -
             ln -s $out/lib/addons/${n}/libssd_wv.so $out/${pluginDir}/${n}/libssd_wv.so

     

       506
       506
       +
             ln -s $out/lib/addons/${n}/libssd_wv.so $out/${addonDir}/${n}/libssd_wv.so

     

       504
       507
        
           '';

     

       505
       508
        
       

     

       506
       509
        
           meta = {

     
···

       511
       514
        
           };

     

       512
       515
        
         };

     

       513
       516
        
       

     

       514
       514
       -
         vfs-sftp = mkKodiABIPlugin rec {

     

       517
       517
       +
         vfs-sftp = buildKodiBinaryAddon rec {

     

       518
       518
       +
           pname = namespace;

     

       515
       519
        
           namespace = "vfs.sftp";

     

       516
       520
        
           version = "2.0.0";

     

       517
       517
       -
           plugin = namespace;

     

       518
       521
        
       

     

       519
       522
        
           src = fetchFromGitHub {

     

       520
       523
        
             owner = "xbmc";

     
···

       533
       536
        
           extraBuildInputs = [ openssl libssh zlib ];

     

       534
       537
        
         };

     

       535
       538
        
       

     

       536
       536
       -
         vfs-libarchive = mkKodiABIPlugin rec {

     

       539
       539
       +
         vfs-libarchive = buildKodiBinaryAddon rec {

     

       540
       540
       +
           pname = namespace;

     

       537
       541
        
           namespace = "vfs.libarchive";

     

       538
       542
        
           version = "2.0.0";

     

       539
       539
       -
           plugin = namespace;

     

       540
       543
        
       

     

       541
       544
        
           src = fetchFromGitHub {

     

       542
       545
        
             owner = "xbmc";

+242

pkgs/applications/video/kodi/unwrapped.nix

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper

     

       2
       2
       +
       , pkg-config, cmake, gnumake, yasm, python3Packages

     

       3
       3
       +
       , libgcrypt, libgpgerror, libunistring

     

       4
       4
       +
       , boost, avahi, lame

     

       5
       5
       +
       , gettext, pcre-cpp, yajl, fribidi, which

     

       6
       6
       +
       , openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless

     

       7
       7
       +
       , gtest, ncurses, spdlog

     

       8
       8
       +
       , libxml2, systemd

     

       9
       9
       +
       , alsaLib, libGLU, libGL, fontconfig, freetype, ftgl

     

       10
       10
       +
       , libjpeg, libpng, libtiff

     

       11
       11
       +
       , libmpeg2, libsamplerate, libmad

     

       12
       12
       +
       , libogg, libvorbis, flac, libxslt

     

       13
       13
       +
       , lzo, libcdio, libmodplug, libass, libbluray

     

       14
       14
       +
       , sqlite, libmysqlclient, nasm, gnutls, libva, libdrm

     

       15
       15
       +
       , curl, bzip2, zip, unzip, glxinfo

     

       16
       16
       +
       , libcec, libcec_platform, dcadec, libuuid

     

       17
       17
       +
       , libcrossguid, libmicrohttpd

     

       18
       18
       +
       , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1

     

       19
       19
       +
       , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson

     

       20
       20
       +
       , lirc

     

       21
       21
       +
       , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp

     

       22
       22
       +
       , dbusSupport ? true, dbus

     

       23
       23
       +
       , joystickSupport ? true, cwiid

     

       24
       24
       +
       , nfsSupport ? true, libnfs

     

       25
       25
       +
       , pulseSupport ? true, libpulseaudio

     

       26
       26
       +
       , rtmpSupport ? true, rtmpdump

     

       27
       27
       +
       , sambaSupport ? true, samba

     

       28
       28
       +
       , udevSupport ? true, udev

     

       29
       29
       +
       , usbSupport  ? false, libusb-compat-0_1

     

       30
       30
       +
       , vdpauSupport ? true, libvdpau

     

       31
       31
       +
       , waylandSupport ? false, wayland, wayland-protocols

     

       32
       32
       +
       , waylandpp ?  null, libxkbcommon

     

       33
       33
       +
       , gbmSupport ? false, mesa, libinput

     

       34
       34
       +
       , buildPackages

     

       35
       35
       +
       }:

     

       36
       36
       +
       

     

       37
       37
       +
       assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable

     

       38
       38
       +
       assert gbmSupport || waylandSupport || x11Support;

     

       39
       39
       +
       

     

       40
       40
       +
       let

     

       41
       41
       +
         kodiReleaseDate = "20210219";

     

       42
       42
       +
         kodiVersion = "19.0";

     

       43
       43
       +
         rel = "Matrix";

     

       44
       44
       +
       

     

       45
       45
       +
         kodi_src = fetchFromGitHub {

     

       46
       46
       +
           owner  = "xbmc";

     

       47
       47
       +
           repo   = "xbmc";

     

       48
       48
       +
           rev    = "${kodiVersion}-${rel}";

     

       49
       49
       +
           sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p";

     

       50
       50
       +
         };

     

       51
       51
       +
       

     

       52
       52
       +
         ffmpeg = stdenv.mkDerivation rec {

     

       53
       53
       +
           pname = "kodi-ffmpeg";

     

       54
       54
       +
           version = "4.3.1";

     

       55
       55
       +
           src = fetchFromGitHub {

     

       56
       56
       +
             owner   = "xbmc";

     

       57
       57
       +
             repo    = "FFmpeg";

     

       58
       58
       +
             rev     = "${version}-${rel}-Beta1";

     

       59
       59
       +
             sha256  = "1c5rwlxn6xj501iw7masdv2p6wb9rkmd299lmlkx97sw1kvxvg2w";

     

       60
       60
       +
           };

     

       61
       61
       +
           preConfigure = ''

     

       62
       62
       +
             cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .

     

       63
       63
       +
             sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt

     

       64
       64
       +
             sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt

     

       65
       65
       +
           '';

     

       66
       66
       +
           cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       67
       67
       +
             "-DCROSSCOMPILING=ON"

     

       68
       68
       +
             "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}"

     

       69
       69
       +
             "-DOS=${stdenv.hostPlatform.parsed.kernel.name}"

     

       70
       70
       +
             "-DPKG_CONFIG_EXECUTABLE=pkg-config"

     

       71
       71
       +
           ];

     

       72
       72
       +
           buildInputs = [ libidn libtasn1 p11-kit zlib libva ]

     

       73
       73
       +
             ++ lib.optional vdpauSupport libvdpau;

     

       74
       74
       +
           nativeBuildInputs = [ cmake nasm pkg-config gnutls ];

     

       75
       75
       +
         };

     

       76
       76
       +
       

     

       77
       77
       +
         # We can build these externally but FindLibDvd.cmake forces us to build it

     

       78
       78
       +
         # them, so we currently just use them for the src.

     

       79
       79
       +
         libdvdcss = fetchFromGitHub {

     

       80
       80
       +
           owner = "xbmc";

     

       81
       81
       +
           repo = "libdvdcss";

     

       82
       82
       +
           rev = "1.4.2-${rel}-Beta-5";

     

       83
       83
       +
           sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl";

     

       84
       84
       +
         };

     

       85
       85
       +
       

     

       86
       86
       +
         libdvdnav = fetchFromGitHub {

     

       87
       87
       +
           owner = "xbmc";

     

       88
       88
       +
           repo = "libdvdnav";

     

       89
       89
       +
           rev = "6.0.0-${rel}-Alpha-3";

     

       90
       90
       +
           sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb";

     

       91
       91
       +
         };

     

       92
       92
       +
       

     

       93
       93
       +
         libdvdread = fetchFromGitHub {

     

       94
       94
       +
           owner = "xbmc";

     

       95
       95
       +
           repo = "libdvdread";

     

       96
       96
       +
           rev = "6.0.0-${rel}-Alpha-3";

     

       97
       97
       +
           sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59";

     

       98
       98
       +
         };

     

       99
       99
       +
       

     

       100
       100
       +
         kodi_platforms = lib.optional gbmSupport "gbm"

     

       101
       101
       +
           ++ lib.optional waylandSupport "wayland"

     

       102
       102
       +
           ++ lib.optional x11Support "x11";

     

       103
       103
       +
       

     

       104
       104
       +
       in stdenv.mkDerivation {

     

       105
       105
       +
           pname = "kodi";

     

       106
       106
       +
           version = kodiVersion;

     

       107
       107
       +
       

     

       108
       108
       +
           src = kodi_src;

     

       109
       109
       +
       

     

       110
       110
       +
           buildInputs = [

     

       111
       111
       +
             gnutls libidn libtasn1 nasm p11-kit

     

       112
       112
       +
             libxml2 python3Packages.python

     

       113
       113
       +
             boost libmicrohttpd

     

       114
       114
       +
             gettext pcre-cpp yajl fribidi libva libdrm

     

       115
       115
       +
             openssl gperf tinyxml2 taglib libssh

     

       116
       116
       +
             gtest ncurses spdlog

     

       117
       117
       +
             alsaLib libGL libGLU fontconfig freetype ftgl

     

       118
       118
       +
             libjpeg libpng libtiff

     

       119
       119
       +
             libmpeg2 libsamplerate libmad

     

       120
       120
       +
             libogg libvorbis flac libxslt systemd

     

       121
       121
       +
             lzo libcdio libmodplug libass libbluray

     

       122
       122
       +
             sqlite libmysqlclient avahi lame

     

       123
       123
       +
             curl bzip2 zip unzip glxinfo

     

       124
       124
       +
             libcec libcec_platform dcadec libuuid

     

       125
       125
       +
             libgcrypt libgpgerror libunistring

     

       126
       126
       +
             libcrossguid libplist

     

       127
       127
       +
             bluez giflib glib harfbuzz lcms2 libpthreadstubs

     

       128
       128
       +
             ffmpeg flatbuffers fmt fstrcmp rapidjson

     

       129
       129
       +
             lirc

     

       130
       130
       +
           ]

     

       131
       131
       +
           ++ lib.optional x11Support [

     

       132
       132
       +
             libX11 xorgproto libXt libXmu libXext.dev libXdmcp

     

       133
       133
       +
             libXinerama libXrandr.dev libXtst libXfixes

     

       134
       134
       +
           ]

     

       135
       135
       +
           ++ lib.optional  dbusSupport     dbus

     

       136
       136
       +
           ++ lib.optional  joystickSupport cwiid

     

       137
       137
       +
           ++ lib.optional  nfsSupport      libnfs

     

       138
       138
       +
           ++ lib.optional  pulseSupport    libpulseaudio

     

       139
       139
       +
           ++ lib.optional  rtmpSupport     rtmpdump

     

       140
       140
       +
           ++ lib.optional  sambaSupport    samba

     

       141
       141
       +
           ++ lib.optional  udevSupport     udev

     

       142
       142
       +
           ++ lib.optional  usbSupport      libusb-compat-0_1

     

       143
       143
       +
           ++ lib.optional  vdpauSupport    libvdpau

     

       144
       144
       +
           ++ lib.optionals waylandSupport [

     

       145
       145
       +
             wayland

     

       146
       146
       +
             waylandpp.dev

     

       147
       147
       +
             wayland-protocols

     

       148
       148
       +
             # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise

     

       149
       149
       +
             libxkbcommon.dev

     

       150
       150
       +
           ]

     

       151
       151
       +
           ++ lib.optional gbmSupport [

     

       152
       152
       +
             libxkbcommon.dev

     

       153
       153
       +
             mesa.dev

     

       154
       154
       +
             libinput.dev

     

       155
       155
       +
           ];

     

       156
       156
       +
       

     

       157
       157
       +
           nativeBuildInputs = [

     

       158
       158
       +
             cmake

     

       159
       159
       +
             doxygen

     

       160
       160
       +
             makeWrapper

     

       161
       161
       +
             which

     

       162
       162
       +
             pkg-config gnumake

     

       163
       163
       +
             autoconf automake libtool # still needed for some components. Check if that is the case with 19.0

     

       164
       164
       +
             jre_headless yasm gettext python3Packages.python flatbuffers

     

       165
       165
       +
       

     

       166
       166
       +
             # for TexturePacker

     

       167
       167
       +
             giflib zlib libpng libjpeg lzo

     

       168
       168
       +
           ] ++ lib.optionals waylandSupport [ wayland-protocols waylandpp.bin ];

     

       169
       169
       +
       

     

       170
       170
       +
           depsBuildBuild = [

     

       171
       171
       +
             buildPackages.stdenv.cc

     

       172
       172
       +
           ];

     

       173
       173
       +
       

     

       174
       174
       +
           cmakeFlags = [

     

       175
       175
       +
             "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}"

     

       176
       176
       +
             "-Dlibdvdcss_URL=${libdvdcss}"

     

       177
       177
       +
             "-Dlibdvdnav_URL=${libdvdnav}"

     

       178
       178
       +
             "-Dlibdvdread_URL=${libdvdread}"

     

       179
       179
       +
             "-DGIT_VERSION=${kodiReleaseDate}"

     

       180
       180
       +
             "-DENABLE_EVENTCLIENTS=ON"

     

       181
       181
       +
             "-DENABLE_INTERNAL_CROSSGUID=OFF"

     

       182
       182
       +
             "-DENABLE_OPTICAL=ON"

     

       183
       183
       +
             "-DLIRC_DEVICE=/run/lirc/lircd"

     

       184
       184
       +
             "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"

     

       185
       185
       +
             "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"

     

       186
       186
       +
             "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"

     

       187
       187
       +
           ] ++ lib.optional waylandSupport [

     

       188
       188
       +
             "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"

     

       189
       189
       +
           ];

     

       190
       190
       +
       

     

       191
       191
       +
           # 14 tests fail but the biggest issue is that every test takes 30 seconds -

     

       192
       192
       +
           # I'm guessing there is a thing waiting to time out

     

       193
       193
       +
           doCheck = false;

     

       194
       194
       +
       

     

       195
       195
       +
           preConfigure = ''

     

       196
       196
       +
             cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")

     

       197
       197
       +
           '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

     

       198
       198
       +
             # Need these tools on the build system when cross compiling,

     

       199
       199
       +
             # hacky, but have found no other way.

     

       200
       200
       +
             CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder

     

       201
       201
       +
             cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"

     

       202
       202
       +
       

     

       203
       203
       +
             CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker

     

       204
       204
       +
             cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"

     

       205
       205
       +
           '';

     

       206
       206
       +
       

     

       207
       207
       +
           postPatch = ''

     

       208
       208
       +
             substituteInPlace xbmc/platform/posix/PosixTimezone.cpp \

     

       209
       209
       +
               --replace 'usr/share/zoneinfo' 'etc/zoneinfo'

     

       210
       210
       +
           '';

     

       211
       211
       +
       

     

       212
       212
       +
           postInstall = ''

     

       213
       213
       +
             for p in $(ls $out/bin/) ; do

     

       214
       214
       +
               wrapProgram $out/bin/$p \

     

       215
       215
       +
                 --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ]

     

       216
       216
       +
                   ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \

     

       217
       217
       +
                 --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath

     

       218
       218
       +
                     ([ curl systemd libmad libvdpau libcec libcec_platform libass ]

     

       219
       219
       +
                        ++ lib.optional nfsSupport libnfs

     

       220
       220
       +
                        ++ lib.optional rtmpSupport rtmpdump)}"

     

       221
       221
       +
             done

     

       222
       222
       +
       

     

       223
       223
       +
             substituteInPlace $out/share/xsessions/kodi.desktop \

     

       224
       224
       +
               --replace kodi-standalone $out/bin/kodi-standalone

     

       225
       225
       +
           '';

     

       226
       226
       +
       

     

       227
       227
       +
           doInstallCheck = true;

     

       228
       228
       +
       

     

       229
       229
       +
           installCheckPhase = "$out/bin/kodi --version";

     

       230
       230
       +
       

     

       231
       231
       +
           passthru = {

     

       232
       232
       +
             pythonPackages = python3Packages;

     

       233
       233
       +
           };

     

       234
       234
       +
       

     

       235
       235
       +
           meta = with lib; {

     

       236
       236
       +
             description = "Media center";

     

       237
       237
       +
             homepage    = "https://kodi.tv/";

     

       238
       238
       +
             license     = licenses.gpl2Plus;

     

       239
       239
       +
             platforms   = platforms.linux;

     

       240
       240
       +
             maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ];

     

       241
       241
       +
           };

     

       242
       242
       +
       }

+6 -13

pkgs/applications/video/kodi/wrapper.nix

···

       1
       1
       -
       { lib, makeWrapper, buildEnv, kodi, plugins }:

     

       1
       1
       +
       { lib, makeWrapper, buildEnv, kodi, addons }:

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         drvName = builtins.parseDrvName kodi.name;

     

       5
       5
       -
       in buildEnv {

     

       6
       6
       -
         name = "${drvName.name}-with-plugins-${drvName.version}";

     

       3
       3
       +
       buildEnv {

     

       4
       4
       +
         name = "${kodi.name}-env";

     

       7
       5
        
       

     

       8
       8
       -
         paths = [ kodi ] ++ plugins;

     

       6
       6
       +
         paths = [ kodi ] ++ addons;

     

       9
       7
        
         pathsToLink = [ "/share" ];

     

       10
       8
        
       

     

       11
       9
        
         buildInputs = [ makeWrapper ];

     
···

       15
       13
        
           for exe in kodi{,-standalone}

     

       16
       14
        
           do

     

       17
       15
        
             makeWrapper ${kodi}/bin/$exe $out/bin/$exe \

     

       18
       18
       -
               --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \

     

       16
       16
       +
               --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath addons} \

     

       19
       17
        
               --prefix KODI_HOME : $out/share/kodi \

     

       20
       18
        
               --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath

     

       21
       19
        
                 (lib.concatMap

     

       22
       22
       -
                   (plugin: plugin.extraRuntimeDependencies or []) plugins)}"

     

       20
       20
       +
                   (plugin: plugin.extraRuntimeDependencies or []) addons)}"

     

       23
       21
        
           done

     

       24
       22
        
         '';

     

       25
       25
       -
       

     

       26
       26
       -
         meta = kodi.meta // {

     

       27
       27
       -
           description = kodi.meta.description

     

       28
       28
       -
                       + " (with plugins: ${lib.concatMapStringsSep ", " (x: x.name) plugins})";

     

       29
       29
       -
         };

     

       30
       23
        
       }

+2 -2

pkgs/data/fonts/twitter-color-emoji/default.nix

···

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
        
       let

     

       17
       17
       -
         version = "13.0.1";

     

       17
       17
       +
         version = "13.0.2";

     

       18
       18
        
       

     

       19
       19
        
         twemojiSrc = fetchFromGitHub {

     

       20
       20
        
           name = "twemoji";

     

       21
       21
        
           owner = "twitter";

     

       22
       22
        
           repo = "twemoji";

     

       23
       23
        
           rev = "v${version}";

     

       24
       24
       -
           sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9";

     

       24
       24
       +
           sha256 = "069pyq09jfzwp3xla8vmhbyyam32x2iyp0s29xcxlkj22p99bg6d";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         pythonEnv =

+45

pkgs/development/gnuradio-modules/ais/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , mkDerivation

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , python

     

       8
       8
       +
       , boost

     

       9
       9
       +
       , cppunit

     

       10
       10
       +
       , log4cpp

     

       11
       11
       +
       , osmosdr

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       mkDerivation rec {

     

       15
       15
       +
         pname = "gr-ais";

     

       16
       16
       +
         version = "2015-12-20";

     

       17
       17
       +
         src = fetchFromGitHub {

     

       18
       18
       +
           owner = "bistromath";

     

       19
       19
       +
           repo = "gr-ais";

     

       20
       20
       +
           rev = "cdc1f52745853f9c739c718251830eb69704b26e";

     

       21
       21
       +
           sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";

     

       22
       22
       +
         };

     

       23
       23
       +
         disabledForGRafter = "3.8";

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [

     

       26
       26
       +
           cmake

     

       27
       27
       +
           pkg-config

     

       28
       28
       +
           python

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         buildInputs = [

     

       32
       32
       +
           cppunit

     

       33
       33
       +
           osmosdr

     

       34
       34
       +
           boost

     

       35
       35
       +
           log4cpp

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         meta = with lib; {

     

       39
       39
       +
           description = "Gnuradio block for ais";

     

       40
       40
       +
           homepage = "https://github.com/bistromath/gr-ais";

     

       41
       41
       +
           license = licenses.gpl3Plus;

     

       42
       42
       +
           platforms = platforms.unix;

     

       43
       43
       +
           maintainers = with maintainers; [ mog ];

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+48

pkgs/development/gnuradio-modules/gsm/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , cppunit

     

       7
       7
       +
       , swig

     

       8
       8
       +
       , boost

     

       9
       9
       +
       , log4cpp

     

       10
       10
       +
       , python

     

       11
       11
       +
       , libosmocore

     

       12
       12
       +
       , osmosdr

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       mkDerivation {

     

       16
       16
       +
         pname = "gr-gsm";

     

       17
       17
       +
         version = "2016-08-25";

     

       18
       18
       +
         src = fetchFromGitHub {

     

       19
       19
       +
           owner = "ptrkrysik";

     

       20
       20
       +
           repo = "gr-gsm";

     

       21
       21
       +
           rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d";

     

       22
       22
       +
           sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";

     

       23
       23
       +
         };

     

       24
       24
       +
         disabledForGRafter = "3.8";

     

       25
       25
       +
       

     

       26
       26
       +
         nativeBuildInputs = [

     

       27
       27
       +
           cmake

     

       28
       28
       +
           pkg-config

     

       29
       29
       +
           swig

     

       30
       30
       +
           python

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       33
       33
       +
         buildInputs = [

     

       34
       34
       +
           cppunit

     

       35
       35
       +
           log4cpp

     

       36
       36
       +
           boost

     

       37
       37
       +
           libosmocore

     

       38
       38
       +
           osmosdr

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = with lib; {

     

       42
       42
       +
           description = "Gnuradio block for gsm";

     

       43
       43
       +
           homepage = "https://github.com/ptrkrysik/gr-gsm";

     

       44
       44
       +
           license = licenses.gpl3Plus;

     

       45
       45
       +
           platforms = platforms.linux;

     

       46
       46
       +
           maintainers = with maintainers; [ mog ];

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+61

pkgs/development/gnuradio-modules/limesdr/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , gnuradio

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , doxygen

     

       8
       8
       +
       , swig

     

       9
       9
       +
       , python

     

       10
       10
       +
       , log4cpp

     

       11
       11
       +
       , mpir

     

       12
       12
       +
       , boost

     

       13
       13
       +
       , gmp

     

       14
       14
       +
       , icu

     

       15
       15
       +
       , limesuite

     

       16
       16
       +
       }:

     

       17
       17
       +
       

     

       18
       18
       +
       let

     

       19
       19
       +
         version = {

     

       20
       20
       +
           "3.7" = "2.0.0";

     

       21
       21
       +
           "3.8" = "3.0.1";

     

       22
       22
       +
           "3.9" = null;

     

       23
       23
       +
         }.${gnuradio.versionAttr.major};

     

       24
       24
       +
         src = fetchFromGitHub {

     

       25
       25
       +
           owner = "myriadrf";

     

       26
       26
       +
           repo = "gr-limesdr";

     

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

     

       28
       28
       +
           sha256 = {

     

       29
       29
       +
             "3.7" = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq";

     

       30
       30
       +
             "3.8" = "ffs+8TU0yr6IW1xZJ/abQ1CQWGZM+zYqPRJxy3ZvM9U=";

     

       31
       31
       +
             "3.9" = null;

     

       32
       32
       +
           }.${gnuradio.versionAttr.major};

     

       33
       33
       +
         };

     

       34
       34
       +
       in mkDerivation {

     

       35
       35
       +
         pname = "gr-limesdr";

     

       36
       36
       +
         inherit version src;

     

       37
       37
       +
         disabledForGRafter = "3.9";

     

       38
       38
       +
       

     

       39
       39
       +
         nativeBuildInputs = [

     

       40
       40
       +
           cmake

     

       41
       41
       +
           pkg-config

     

       42
       42
       +
           swig

     

       43
       43
       +
           python

     

       44
       44
       +
         ];

     

       45
       45
       +
         buildInputs = [

     

       46
       46
       +
           log4cpp

     

       47
       47
       +
           mpir

     

       48
       48
       +
           boost

     

       49
       49
       +
           gmp

     

       50
       50
       +
           icu

     

       51
       51
       +
           limesuite

     

       52
       52
       +
         ];

     

       53
       53
       +
       

     

       54
       54
       +
         meta = with lib; {

     

       55
       55
       +
           description = "Gnuradio source and sink blocks for LimeSDR";

     

       56
       56
       +
           homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio";

     

       57
       57
       +
           license = licenses.mit;

     

       58
       58
       +
           platforms = platforms.linux;

     

       59
       59
       +
           maintainers = [ maintainers.markuskowa ];

     

       60
       60
       +
         };

     

       61
       61
       +
       }

+25

pkgs/development/gnuradio-modules/mkDerivation.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , unwrapped

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       mkDerivation:

     

       6
       6
       +
       

     

       7
       7
       +
       args:

     

       8
       8
       +
       

     

       9
       9
       +
       # Check if it's supposed to not get built for the current gnuradio version

     

       10
       10
       +
       if (builtins.hasAttr "disabledForGRafter" args) &&

     

       11
       11
       +
       (lib.versionAtLeast unwrapped.versionAttr.major args.disabledForGRafter) then

     

       12
       12
       +
       let name = args.name or "${args.pname}"; in

     

       13
       13
       +
       throw "Package ${name} is incompatible with GNURadio ${unwrapped.versionAttr.major}"

     

       14
       14
       +
       else

     

       15
       15
       +
       

     

       16
       16
       +
       let

     

       17
       17
       +
         args_ = {

     

       18
       18
       +
           enableParallelBuilding = args.enableParallelBuilding or true;

     

       19
       19
       +
           nativeBuildInputs = (args.nativeBuildInputs or []);

     

       20
       20
       +
           # We add gnuradio and volk itself by default - most gnuradio based packages

     

       21
       21
       +
           # will not consider it a depenency worth mentioning and it will almost

     

       22
       22
       +
           # always be needed

     

       23
       23
       +
           buildInputs = (args.buildInputs or []) ++ [ unwrapped unwrapped.volk ];

     

       24
       24
       +
         };

     

       25
       25
       +
       in mkDerivation (args // args_)

+46

pkgs/development/gnuradio-modules/nacl/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , cmake

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , cppunit

     

       7
       7
       +
       , swig

     

       8
       8
       +
       , boost

     

       9
       9
       +
       , log4cpp

     

       10
       10
       +
       , python

     

       11
       11
       +
       , libsodium

     

       12
       12
       +
       }:

     

       13
       13
       +
       

     

       14
       14
       +
       mkDerivation {

     

       15
       15
       +
         pname = "gr-nacl";

     

       16
       16
       +
         version = "2017-04-10";

     

       17
       17
       +
         src = fetchFromGitHub {

     

       18
       18
       +
           owner = "stwunsch";

     

       19
       19
       +
           repo = "gr-nacl";

     

       20
       20
       +
           rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765";

     

       21
       21
       +
           sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v";

     

       22
       22
       +
         };

     

       23
       23
       +
         disabledForGRafter = "3.8";

     

       24
       24
       +
       

     

       25
       25
       +
         nativeBuildInputs = [

     

       26
       26
       +
           cmake

     

       27
       27
       +
           pkg-config

     

       28
       28
       +
           swig

     

       29
       29
       +
           python

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         buildInputs = [

     

       33
       33
       +
           cppunit

     

       34
       34
       +
           log4cpp

     

       35
       35
       +
           boost

     

       36
       36
       +
           libsodium

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         meta = with lib; {

     

       40
       40
       +
           description = "Gnuradio block for encryption";

     

       41
       41
       +
           homepage = "https://github.com/stwunsch/gr-nacl";

     

       42
       42
       +
           license = licenses.gpl3Plus;

     

       43
       43
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       44
       44
       +
           maintainers = with maintainers; [ mog ];

     

       45
       45
       +
         };

     

       46
       46
       +
       }

+86

pkgs/development/gnuradio-modules/osmosdr/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchgit

     

       4
       4
       +
       , gnuradio

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , log4cpp

     

       8
       8
       +
       , mpir

     

       9
       9
       +
       , boost

     

       10
       10
       +
       , gmp

     

       11
       11
       +
       , fftwFloat

     

       12
       12
       +
       , python

     

       13
       13
       +
       , swig

     

       14
       14
       +
       , uhd

     

       15
       15
       +
       , icu

     

       16
       16
       +
       , airspy

     

       17
       17
       +
       , hackrf

     

       18
       18
       +
       , libbladeRF

     

       19
       19
       +
       , rtl-sdr

     

       20
       20
       +
       , soapysdr-with-plugins

     

       21
       21
       +
       }:

     

       22
       22
       +
       

     

       23
       23
       +
       let

     

       24
       24
       +
         version = {

     

       25
       25
       +
           "3.7" = "0.1.5";

     

       26
       26
       +
           "3.8" = "0.2.2";

     

       27
       27
       +
           "3.9" = null;

     

       28
       28
       +
         }.${gnuradio.versionAttr.major};

     

       29
       29
       +
         src = fetchgit {

     

       30
       30
       +
           url = "git://git.osmocom.org/gr-osmosdr";

     

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

     

       32
       32
       +
           sha256 = {

     

       33
       33
       +
             "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";

     

       34
       34
       +
             "3.8" = "HT6xlN6cJAnvF+s1g2I1uENhBJJizdADlLXeSD0rEqs=";

     

       35
       35
       +
             "3.9" = null;

     

       36
       36
       +
           }.${gnuradio.versionAttr.major};

     

       37
       37
       +
         };

     

       38
       38
       +
       in mkDerivation {

     

       39
       39
       +
         pname = "gr-osmosdr";

     

       40
       40
       +
         inherit version src;

     

       41
       41
       +
         disabledForGRafter = "3.9";

     

       42
       42
       +
       

     

       43
       43
       +
         buildInputs = [

     

       44
       44
       +
           log4cpp

     

       45
       45
       +
           mpir

     

       46
       46
       +
           boost

     

       47
       47
       +
           fftwFloat

     

       48
       48
       +
           gmp

     

       49
       49
       +
           icu

     

       50
       50
       +
           airspy

     

       51
       51
       +
           hackrf

     

       52
       52
       +
           libbladeRF

     

       53
       53
       +
           rtl-sdr

     

       54
       54
       +
           soapysdr-with-plugins

     

       55
       55
       +
         ] ++ lib.optional (gnuradio.hasFeature "gr-uhd" gnuradio.features) [

     

       56
       56
       +
           uhd

     

       57
       57
       +
         ];

     

       58
       58
       +
         cmakeFlags = [

     

       59
       59
       +
           (if (gnuradio.hasFeature "python-support" gnuradio.features) then

     

       60
       60
       +
             "-DENABLE_PYTHON=ON"

     

       61
       61
       +
           else

     

       62
       62
       +
             "-DENABLE_PYTHON=OFF"

     

       63
       63
       +
           )

     

       64
       64
       +
         ];

     

       65
       65
       +
         nativeBuildInputs = [

     

       66
       66
       +
           cmake

     

       67
       67
       +
           pkg-config

     

       68
       68
       +
           swig

     

       69
       69
       +
         ] ++ lib.optionals (gnuradio.hasFeature "python-support" gnuradio.features) [

     

       70
       70
       +
             (if (gnuradio.versionAttr.major == "3.7") then

     

       71
       71
       +
               python.pkgs.cheetah

     

       72
       72
       +
             else

     

       73
       73
       +
               python.pkgs.Mako

     

       74
       74
       +
             )

     

       75
       75
       +
             python

     

       76
       76
       +
           ]

     

       77
       77
       +
         ;

     

       78
       78
       +
       

     

       79
       79
       +
         meta = with lib; {

     

       80
       80
       +
           description = "Gnuradio block for OsmoSDR and rtl-sdr";

     

       81
       81
       +
           homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR";

     

       82
       82
       +
           license = licenses.gpl3Plus;

     

       83
       83
       +
           maintainers = with maintainers; [ bjornfor ];

     

       84
       84
       +
           platforms = platforms.unix;

     

       85
       85
       +
         };

     

       86
       86
       +
       }

+59

pkgs/development/gnuradio-modules/rds/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , mkDerivation

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , gnuradio

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , pkg-config

     

       7
       7
       +
       , swig

     

       8
       8
       +
       , python

     

       9
       9
       +
       , log4cpp

     

       10
       10
       +
       , mpir

     

       11
       11
       +
       , boost

     

       12
       12
       +
       , gmp

     

       13
       13
       +
       , icu

     

       14
       14
       +
       }:

     

       15
       15
       +
       

     

       16
       16
       +
       let

     

       17
       17
       +
         version = {

     

       18
       18
       +
           "3.7" = "1.1.0";

     

       19
       19
       +
           "3.8" = "3.8.0";

     

       20
       20
       +
           "3.9" = null;

     

       21
       21
       +
         }.${gnuradio.versionAttr.major};

     

       22
       22
       +
         src = fetchFromGitHub {

     

       23
       23
       +
           owner = "bastibl";

     

       24
       24
       +
           repo = "gr-rds";

     

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

     

       26
       26
       +
           sha256 = {

     

       27
       27
       +
             "3.7" = "0jkzchvw0ivcxsjhi1h0mf7k13araxf5m4wi5v9xdgqxvipjzqfy";

     

       28
       28
       +
             "3.8" = "+yKLJu2bo7I2jkAiOdjvdhZwxFz9NFgTmzcLthH9Y5o=";

     

       29
       29
       +
             "3.9" = null;

     

       30
       30
       +
           }.${gnuradio.versionAttr.major};

     

       31
       31
       +
         };

     

       32
       32
       +
       in mkDerivation {

     

       33
       33
       +
         pname = "gr-rds";

     

       34
       34
       +
         inherit version src;

     

       35
       35
       +
         disabledForGRafter = "3.9";

     

       36
       36
       +
       

     

       37
       37
       +
         buildInputs = [

     

       38
       38
       +
           log4cpp

     

       39
       39
       +
           mpir

     

       40
       40
       +
           boost

     

       41
       41
       +
           gmp

     

       42
       42
       +
           icu

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         nativeBuildInputs = [

     

       46
       46
       +
           cmake

     

       47
       47
       +
           pkg-config

     

       48
       48
       +
           swig

     

       49
       49
       +
           python

     

       50
       50
       +
         ];

     

       51
       51
       +
       

     

       52
       52
       +
         meta = with lib; {

     

       53
       53
       +
           description = "Gnuradio block for radio data system";

     

       54
       54
       +
           homepage = "https://github.com/bastibl/gr-rds";

     

       55
       55
       +
           license = licenses.gpl2Plus;

     

       56
       56
       +
           platforms = platforms.unix;

     

       57
       57
       +
           maintainers = with maintainers; [ mog ];

     

       58
       58
       +
         };

     

       59
       59
       +
       }

pkgs/development/libraries/iniparser/default.nix

···

       36
       36
        
           cp libiniparser.a $out/lib

     

       37
       37
        
           cp libiniparser.so.1 $out/lib

     

       38
       38
        
           ln -s libiniparser.so.1 $out/lib/libiniparser.so

     

       39
       39
       +
       

     

       40
       40
       +
           mkdir -p $out/lib/pkgconfig

     

       41
       41
       +
           substituteAll ${./iniparser.pc.in} $out/lib/pkgconfig/iniparser.pc

     

       39
       42
        
         '';

     

       40
       43
        
       

     

       41
       44
        
         meta = with lib; {

+12

pkgs/development/libraries/iniparser/iniparser.pc.in

···

       1
       1
       +
       prefix=@out@

     

       2
       2
       +
       exec_prefix=@out@

     

       3
       3
       +
       libdir=${exec_prefix}/lib

     

       4
       4
       +
       includedir=${prefix}/include

     

       5
       5
       +
       datarootdir=${prefix}/share

     

       6
       6
       +
       datadir=${datarootdir}

     

       7
       7
       +
       

     

       8
       8
       +
       Name: libiniparser

     

       9
       9
       +
       Description: Iniparser library

     

       10
       10
       +
       Version: @version@

     

       11
       11
       +
       Libs: -L${libdir} -liniparser

     

       12
       12
       +
       Cflags: -I${includedir}

+2 -2

pkgs/development/libraries/libdigidocpp/default.nix

···

       2
       2
        
       , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:

     

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         version = "3.14.4";

     

       5
       5
       +
         version = "3.14.5";

     

       6
       6
        
         pname = "libdigidocpp";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
            url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";

     

       10
       10
       -
            sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l";

     

       10
       10
       +
            sha256 = "sha256-PSrYoz5ID88pYs/4rP2kz0NpI0pK6wcnx62HokE0g20=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ cmake pkg-config xxd ];

+2 -2

pkgs/development/libraries/libhandy/default.nix

···

       22
       22
        
       

     

       23
       23
        
       stdenv.mkDerivation rec {

     

       24
       24
        
         pname = "libhandy";

     

       25
       25
       -
         version = "1.0.3";

     

       25
       25
       +
         version = "1.2.0";

     

       26
       26
        
       

     

       27
       27
        
         outputs = [ "out" "dev" "devdoc" "glade" ];

     

       28
       28
        
         outputBin = "dev";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchurl {

     

       31
       31
        
           url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       32
       32
       -
           sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o=";

     

       32
       32
       +
           sha256 = "sha256-OfWQriCRDnb+HAYHsuvliXUPRWENau7Fww4u5gKiCyU=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [

+2 -2

pkgs/development/libraries/libisoburn/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "libisoburn";

     

       5
       5
       -
         version = "1.5.2";

     

       5
       5
       +
         version = "1.5.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";

     

       9
       9
       -
           sha256 = "1v4hanapr02wf2i6rncc62z8cyc18078nb2y6q4hp3hxa74hnwnc";

     

       9
       9
       +
           sha256 = "sha256-LYmEbUOIDxf6WRxTs76kL/uANijk5jDGgPwskYT3kTI=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ attr zlib libburn libisofs ];

+2 -2

pkgs/development/libraries/liblinear/default.nix

···

       4
       4
        
         soVersion = "4";

     

       5
       5
        
       in stdenv.mkDerivation rec {

     

       6
       6
        
         pname = "liblinear";

     

       7
       7
       -
         version = "2.42";

     

       7
       7
       +
         version = "2.43";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "cjlin1";

     

       11
       11
        
           repo = "liblinear";

     

       12
       12
        
           rev = "v${builtins.replaceStrings ["."] [""] version}";

     

       13
       13
       -
           sha256 = "0p0hpjajfkskhd7jiv5zwhfa8hi49q3mgifjlkqvy99xspv98ijj";

     

       13
       13
       +
           sha256 = "sha256-qcSMuWHJgsapWs1xgxv3fKSXcx18q8cwyIn3E4RCGKA=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         postPatch = ''

+2 -2

pkgs/development/libraries/libofx/default.nix

···

       3
       3
        
       

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "libofx";

     

       6
       6
       -
         version = "0.10.0";

     

       6
       6
       +
         version = "0.10.1";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "LibOFX";

     

       10
       10
        
           repo = pname;

     

       11
       11
        
           rev = version;

     

       12
       12
       -
           sha256 = "sha256-gdLh5ZUciN4FCJwTCaJSKJ5RjXgNDXnDOUWkyTZwf2c=";

     

       12
       12
       +
           sha256 = "sha256-QIasZKwSD9YCidHCxT/HOThxE5HEQWD0I2/loDP6mlU=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         preConfigure = "./autogen.sh";

+2 -2

pkgs/development/libraries/oneDNN/default.nix

···

       5
       5
        
       # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "oneDNN";

     

       8
       8
       -
         version = "2.1";

     

       8
       8
       +
         version = "2.1.2";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "oneapi-src";

     

       12
       12
        
           repo = "oneDNN";

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "sha256-PZ8r1eNfz4dVxlbtQJSrxiw/Hk6E6wSDapkMy7ux9fI=";

     

       14
       14
       +
           sha256 = "sha256-8nXzsY4+XnhKbuYyDWehiWqQEWoEcDBF4KagOg1WlN8=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

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

+51

pkgs/development/libraries/volk/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , cmake

     

       6
       6
       +
       , cppunit

     

       7
       7
       +
       , python3

     

       8
       8
       +
       , enableModTool ? true

     

       9
       9
       +
       , removeReferencesTo

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       stdenv.mkDerivation rec {

     

       13
       13
       +
         pname = "volk";

     

       14
       14
       +
         version = "2.4.1";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "gnuradio";

     

       18
       18
       +
           repo = pname;

     

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

     

       20
       20
       +
           sha256 = "fuHJ+p5VN4ThdbQFbzB08VCuy/Zo7m/I1Gs5EQGPeNY=";

     

       21
       21
       +
           fetchSubmodules = true;

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           # Fixes a failing test: https://github.com/gnuradio/volk/pull/434

     

       26
       26
       +
           (fetchpatch {

     

       27
       27
       +
             url = "https://github.com/gnuradio/volk/pull/434/commits/bce8531b6f1a3c5abe946ed6674b283d54258281.patch";

     

       28
       28
       +
             sha256 = "OLW9uF6iL47z63kjvYqwsWtkINav8Xhs+Htqg6Kr4uI=";

     

       29
       29
       +
           })

     

       30
       30
       +
         ];

     

       31
       31
       +
         cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ];

     

       32
       32
       +
         postInstall = ''

     

       33
       33
       +
           ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         nativeBuildInputs = [

     

       37
       37
       +
           cmake

     

       38
       38
       +
           python3

     

       39
       39
       +
           python3.pkgs.Mako

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         doCheck = true;

     

       43
       43
       +
       

     

       44
       44
       +
         meta = with lib; {

     

       45
       45
       +
           homepage = "http://libvolk.org/";

     

       46
       46
       +
           description = "The Vector Optimized Library of Kernels";

     

       47
       47
       +
           license = licenses.gpl3Plus;

     

       48
       48
       +
           maintainers = with maintainers; [ doronbehar ];

     

       49
       49
       +
           platforms = platforms.all;

     

       50
       50
       +
         };

     

       51
       51
       +
       }

+16 -7

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

···

       1
       1
       -
       { lib, stdenv, buildPythonPackage, fetchPypi, libspatialindex, numpy }:

     

       1
       1
       +
       { lib,

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchPypi,

     

       5
       5
       +
         libspatialindex,

     

       6
       6
       +
         numpy,

     

       7
       7
       +
         pytestCheckHook

     

       8
       8
       +
       }:

     

       2
       9
        
       

     

       3
       10
        
       buildPythonPackage rec {

     

       4
       11
        
         pname = "Rtree";

     
···

       9
       16
        
           sha256 = "be8772ca34699a9ad3fb4cfe2cfb6629854e453c10b3328039301bbfc128ca3e";

     

       10
       17
        
         };

     

       11
       18
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ libspatialindex ];

     

       19
       19
       +
         buildInputs = [ libspatialindex ];

     

       13
       20
        
       

     

       14
       21
        
         patchPhase = ''

     

       15
       15
       -
           substituteInPlace rtree/core.py --replace \

     

       22
       22
       +
           substituteInPlace rtree/finder.py --replace \

     

       16
       23
        
             "find_library('spatialindex_c')" "'${libspatialindex}/lib/libspatialindex_c${stdenv.hostPlatform.extensions.sharedLibrary}'"

     

       17
       24
        
         '';

     

       18
       25
        
       

     

       19
       19
       -
         # Tests appear to be broken due to mysterious memory unsafe issues. See #36760

     

       20
       20
       -
         doCheck = false;

     

       21
       21
       -
         checkInputs = [ numpy ];

     

       26
       26
       +
         checkInputs = [

     

       27
       27
       +
           numpy

     

       28
       28
       +
           pytestCheckHook

     

       29
       29
       +
         ];

     

       30
       30
       +
         pythonImportsCheck = [ "rtree" ];

     

       22
       31
        
       

     

       23
       32
        
         meta = with lib; {

     

       24
       33
        
           description = "R-Tree spatial index for Python GIS";

     

       25
       34
        
           homepage = "https://toblerity.org/rtree/";

     

       26
       26
       -
           license = licenses.lgpl21;

     

       35
       35
       +
           license = licenses.mit;

     

       27
       36
        
           maintainers = with maintainers; [ bgamari ];

     

       28
       37
        
         };

     

       29
       38
        
       }

+3 -3

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

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "convertdate";

     

       12
       12
       -
         version = "2.3.0";

     

       12
       12
       +
         version = "2.3.1";

     

       13
       13
        
       

     

       14
       14
        
         disabled = isPy27;

     

       15
       15
        
       

     
···

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "fitnr";

     

       19
       19
        
           repo = pname;

     

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

     

       21
       21
       -
           sha256 = "17j188zlp46zmq8qyy4z4f9v25l3zibkwzj8wp4fxqgimjnfj2nr";

     

       20
       20
       +
           rev = version;

     

       21
       21
       +
           sha256 = "1g8sgd3xc9viy0kb1i4xp6bdn1hzwhrnk8kmismla88scivrhq32";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

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

···

       42
       42
        
       

     

       43
       43
        
         nativeBuildInputs = lib.optionals (!isPyPy) [

     

       44
       44
        
           cffi

     

       45
       45
       +
         ] ++ [

     

       45
       46
        
           rustPlatform.cargoSetupHook

     

       46
       47
        
           setuptools-rust

     

       47
       48
        
         ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]);

+2 -2

pkgs/development/tools/analysis/tfsec/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoPackage rec {

     

       4
       4
        
         pname = "tfsec";

     

       5
       5
       -
         version = "0.39.5";

     

       5
       5
       +
         version = "0.39.6";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "tfsec";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-RDvwZyltPD21CQwZISOrLPVgQeRmPQc6/yssptS4XMw=";

     

       11
       11
       +
           sha256 = "sha256-2P+/y3iP/eMGGc0W1lHWWxO+uMy5gvlvjKzZ/8maJ9o=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         goPackagePath = "github.com/tfsec/tfsec";

+3 -3

pkgs/development/tools/misc/terraform-ls/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "terraform-ls";

     

       5
       5
       -
         version = "0.14.0";

     

       5
       5
       +
         version = "0.15.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "hashicorp";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-p9q+cSnMN6Na+XZoYSHfE4SCNYOEavXE+eWIaxcD73k=";

     

       11
       11
       +
           sha256 = "sha256-/g62LSlaIK67oY6dI8S3Lni85eBBI6piqP2Fsq3HXWQ=";

     

       12
       12
        
         };

     

       13
       13
       -
         vendorSha256 = "sha256-XOIs5Ng0FYz7OfwbrNiVN3GTIABqxlO8ITKGfnC+kWo=";

     

       13
       13
       +
         vendorSha256 = "sha256-U0jVdyY4SifPWkOkq3ohY/LvfGcYm4rI+tW1QEm39oo=";

     

       14
       14
        
       

     

       15
       15
        
         # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com

     

       16
       16
        
         doCheck = false;

+3 -3

pkgs/servers/minio/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "minio";

     

       5
       5
       -
         version = "2021-03-10T05-11-33Z";

     

       5
       5
       +
         version = "2021-03-12T00-00-47Z";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "minio";

     

       9
       9
        
           repo = "minio";

     

       10
       10
        
           rev = "RELEASE.${version}";

     

       11
       11
       -
           sha256 = "sha256-YwlVZE7TO9qr/8lwLXdZqjxy4NGxTkmLyKFDVlTZPqQ=";

     

       11
       11
       +
           sha256 = "sha256-7KHEmnrTw6SBhsImMjcv+b1wvFEg8AXgsuZTGp5iVis=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-E+j+ysBKKSyTITmJwHieBcpXdF3+rtt4YS7OVPMC6vI=";

     

       14
       14
       +
         vendorSha256 = "sha256-tMt6XRj1dd+AHqWA6WGm5GBFGx+IsP1ijYCj8cmUXy0=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+2 -2

pkgs/servers/monitoring/loki/default.nix

···

       2
       2
        
       }:

     

       3
       3
        
       

     

       4
       4
        
       buildGoModule rec {

     

       5
       5
       -
         version = "2.1.0";

     

       5
       5
       +
         version = "2.2.0";

     

       6
       6
        
         pname = "grafana-loki";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           rev = "v${version}";

     

       10
       10
        
           owner = "grafana";

     

       11
       11
        
           repo = "loki";

     

       12
       12
       -
           sha256 = "O/3079a67j1i9pgf18SBx0iJcQPVmb0H+K/PzQVBCDQ=";

     

       12
       12
       +
           sha256 = "sha256-mEu9z3lhHSE0NMXXViX4OBbIiNba7/RPr+AFmIM77g4=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         vendorSha256 = null;

+23

pkgs/servers/monitoring/prometheus/jitsi-exporter.nix

···

       1
       1
       +
       { lib, buildGoModule, fetchgit, nixosTests }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildGoModule rec {

     

       4
       4
       +
         pname = "jitsiexporter";

     

       5
       5
       +
         version = "0.2.18";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchgit {

     

       8
       8
       +
           url = "https://git.xsfx.dev/prometheus/jitsiexporter";

     

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

     

       10
       10
       +
           sha256 = "1cf46wp96d9dwlwlffcgbcr0v3xxxfdv6il0zqkm2i7cfsfw0skf";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         vendorSha256 = null;

     

       14
       14
       +
       

     

       15
       15
       +
         passthru.tests = { inherit (nixosTests.prometheus-exporters) jitsi; };

     

       16
       16
       +
       

     

       17
       17
       +
         meta = with lib; {

     

       18
       18
       +
           description = "Export Jitsi Videobridge metrics to Prometheus";

     

       19
       19
       +
           homepage = "https://git.xsfx.dev/prometheus/jitsiexporter";

     

       20
       20
       +
           license = licenses.mit;

     

       21
       21
       +
           maintainers = with maintainers; [ petabyteboy ];

     

       22
       22
       +
         };

     

       23
       23
       +
       }

+3 -3

pkgs/servers/rtsp-simple-server/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "rtsp-simple-server";

     

       8
       8
       -
         version = "0.14.2";

     

       8
       8
       +
         version = "0.15.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "aler9";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "sha256-pnMUUxV4DM2YClwc24l+5Ehh5zc+qEOLTtiqh7c+8PI=";

     

       14
       14
       +
           sha256 = "sha256-U0wZ0NrvCQjMLDDjO6Jf6uu5FlHar7Td2zhoU2+MMkM=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-oWWUEPEpMLqXucQwUvM6fyGCwttTIV6ZcCM2VZXnKuM=";

     

       17
       17
       +
         vendorSha256 = "sha256-dfAuq4iw3NQ4xaabPv7MQ88CYXgivRBeyvbmJ3SSjbI=";

     

       18
       18
        
       

     

       19
       19
        
         # Tests need docker

     

       20
       20
        
         doCheck = false;

+3 -3

pkgs/tools/admin/clair/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "clair";

     

       5
       5
       -
         version = "4.0.2";

     

       5
       5
       +
         version = "4.0.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "quay";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-uGvcr7TG/NCi0YoYZnQU11zOxXDhFTnCmLQVxOqmXLY=";

     

       11
       11
       +
           sha256 = "sha256-ztp3t55EOUQqTAEUZtHvHK8nTTVOAmYR9vN2hXLhpVw=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "sha256-CO4U8uSQeHXLPj5PH/SsOI/LjT2Rs/mBHsvNTudx72I=";

     

       14
       14
       +
         vendorSha256 = "sha256-+0jp/TvUjpeJJxEs2drVkUb/ua9qqqxome4M9TkpfP4=";

     

       15
       15
        
       

     

       16
       16
        
         doCheck = false;

     

       17
       17

+2 -2

pkgs/tools/filesystems/reiser4progs/default.nix

···

       1
       1
        
       {lib, stdenv, fetchurl, libaal}:

     

       2
       2
        
       

     

       3
       3
       -
       let version = "2.0.1"; in

     

       3
       3
       +
       let version = "2.0.4"; in

     

       4
       4
        
       stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "reiser4progs";

     

       6
       6
        
         inherit version;

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "1r7m95mnp6xmp1j5k99jhmz6g9y2qq7cghlmdxsfbr3xviqfs45d";

     

       10
       10
       +
           sha256 = "sha256-WmIkISnRp5BngSfPEKY95HVEt5TBtPKu+RMBwlLsnuA=";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [libaal];

+7 -4

pkgs/tools/graphics/resvg/default.nix

···

       1
       1
       -
       { lib, rustPlatform, fetchFromGitHub }:

     

       1
       1
       +
       { stdenv, lib, rustPlatform, fetchFromGitHub, libiconv }:

     

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "resvg";

     

       5
       5
       -
         version = "0.13.1";

     

       5
       5
       +
         version = "0.14.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "RazrFalcon";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-Jo+dx4+3GpEwOoE8HH0YahBmPvT9Oy2qXMvCJ/NZhF0=";

     

       11
       11
       +
           sha256 = "sha256-fd97w6yd9ZX2k8Vq+Vh6jouufGdFE02ZV8mb+BtA3tk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-8Es9NZYsC/9PZ6ytWZTAH42U3vxZtJERPSsno1s4TEc=";

     

       14
       14
       +
         cargoSha256 = "sha256-LlEYfjUINQW/YrhNp/Z+fdLQPcvrTjNFtDAk1gyAuj0=";

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

     

       15
       17
        
       

     

       16
       18
        
         doCheck = false;

     

       17
       19
        
       

     

       18
       20
        
         meta = with lib; {

     

       19
       21
        
           description = "An SVG rendering library";

     

       20
       22
        
           homepage = "https://github.com/RazrFalcon/resvg";

     

       23
       23
       +
           changelog = "https://github.com/RazrFalcon/resvg/raw/v${version}/CHANGELOG.md";

     

       21
       24
        
           license = licenses.mpl20;

     

       22
       25
        
           maintainers = [ maintainers.marsam ];

     

       23
       26
        
         };

+2 -2

pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix

···

       13
       13
        
       

     

       14
       14
        
       stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "ibus-anthy";

     

       16
       16
       -
         version = "1.5.11";

     

       16
       16
       +
         version = "1.5.12";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl {

     

       19
       19
        
           url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz";

     

       20
       20
       -
           sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0";

     

       20
       20
       +
           sha256 = "sha256-6edY3dRq4pI3bqsXEYf6jyBjDwpXzRKKQSCP3N/fV7s=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [

+2 -2

pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "ibus-table";

     

       8
       8
       -
         version = "1.12.3";

     

       8
       8
       +
         version = "1.12.4";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner  = "kaio";

     

       12
       12
        
           repo   = "ibus-table";

     

       13
       13
        
           rev    = version;

     

       14
       14
       -
           sha256 = "sha256-iVbct7p+i8ifSQzOFUUnJU0RHX36cFiTlv7p79iawj8=";

     

       14
       14
       +
           sha256 = "sha256-2qST5k2+8gfSf1/FaxXW4qwSQgNw/QKM+1mMWDdrjCU=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         postPatch = ''

+3 -3

pkgs/tools/misc/direnv/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "direnv";

     

       5
       5
       -
         version = "2.27.0";

     

       5
       5
       +
         version = "2.28.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "direnv";

     

       9
       9
        
           repo = "direnv";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "05vvn59xd2q4yjizh5fprjib5xqq58by80d5avsm8nb1qxf383b1";

     

       11
       11
       +
           sha256 = "sha256-iZ3Lf7Yg+N9BWyLLF+MrT2gpPT9BTcp6pNMpfqwcZXo=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "084x7d7sshcsyim76d6pl6127nlqacgwwnm965srl9y5w5nqzba6";

     

       14
       14
       +
         vendorSha256 = "sha256-P8NLY1iGh86ntmYsTVlnNh5akdaM8nzcxDn6Nfmgr84=";

     

       15
       15
        
       

     

       16
       16
        
         # we have no bash at the moment for windows

     

       17
       17
        
         BASH_PATH =

+2 -2

pkgs/tools/networking/minio-client/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "minio-client";

     

       5
       5
       -
         version = "2021-03-10T05-59-20Z";

     

       5
       5
       +
         version = "2021-03-12T03-36-59Z";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "minio";

     

       9
       9
        
           repo = "mc";

     

       10
       10
        
           rev = "RELEASE.${version}";

     

       11
       11
       -
           sha256 = "sha256-IoCM2FA6oNiNT6zWspMEqgq4hZ8tAQVEAqouRlBe/ts=";

     

       11
       11
       +
           sha256 = "sha256-aIJjr7KaT4E4Q1Ho4D0emduJWFxdCXCodq7J43r0DMQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorSha256 = "sha256-aoRdtv/Q7vjn0M7iSYAuyu/3pEH30x6D39xTHqQPvuo=";

+3 -3

pkgs/tools/package-management/emplace/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "emplace";

     

       5
       5
       -
         version = "1.2.0";

     

       5
       5
       +
         version = "1.2.1";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "tversteeg";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           sha256 = "sha256-vA+Y4j9Flcrizqh61+4X70FzF5/wK2WVHQRsAUQzKnU=";

     

       11
       11
       +
           sha256 = "sha256-5t47QrYWbm8A4E1GhqZwME7rmSfU1SYVniRGSrcRpvk=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         cargoSha256 = "sha256-zGdjMpB7h+/RdM+wXffUuAyHnks6umyJmzUrANmqAS8=";

     

       14
       14
       +
         cargoSha256 = "sha256-/GFpjovPGEgkfJ53+wR8CBDXiQQPDCiIaRG2Ka71dhQ=";

     

       15
       15
        
       

     

       16
       16
        
         meta = with lib; {

     

       17
       17
        
           description = "Mirror installed software on multiple machines";

+3 -3

pkgs/tools/security/age/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "age";

     

       5
       5
       -
         version = "1.0.0-beta6";

     

       6
       6
       -
         vendorSha256 = "sha256-FTByNpLkWWHAWe5wVDRBGtKap/5+XGHeBMQAIdlPCkA=";

     

       5
       5
       +
         version = "1.0.0-rc.1";

     

       6
       6
       +
         vendorSha256 = "1qx6pkhq00y0lsi6f82g8hxxh65zk1c0ls91ap6hdlj7ch79bhl2";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "FiloSottile";

     

       10
       10
        
           repo = "age";

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           sha256 = "sha256-1LCcCEf2/R0am0jpA8yKl44+AoUFkbepxp9V6/nZkBQ=";

     

       12
       12
       +
           sha256 = "1n25wip4qnd3v9ial1apc2ybx10b9z6lwz7flyss6kvj3x5g9jd1";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         meta = with lib; {

+3 -3

pkgs/tools/security/teler/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "teler";

     

       8
       8
       -
         version = "1.0.3";

     

       8
       8
       +
         version = "1.1.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "kitabisa";

     

       12
       12
        
           repo = "teler";

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "sha256-6OeGlpimQtw4w26HRzw2wmd3wjASY199p8XXPD/JMy8=";

     

       14
       14
       +
           sha256 = "sha256-0tx/oyHl6s1mj7NyWMZGCJoSuOeB+BMlBrnGY4IN/i4=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-L+wjurURpesCA2IK0r1sxvOUvNJT1wiRp75kpe6LH5s=";

     

       17
       17
       +
         vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys=";

     

       18
       18
        
       

     

       19
       19
        
         # test require internet access

     

       20
       20
        
         doCheck = false;

+3 -3

pkgs/tools/security/terrascan/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "terrascan";

     

       8
       8
       -
         version = "1.3.3";

     

       8
       8
       +
         version = "1.4.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "accurics";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "sha256-mPd4HsWbPUNJTUNjQ5zQztoXZy2b9iLksdGKAjp0A58=";

     

       14
       14
       +
           sha256 = "sha256-YUrvdleH332fWDgq8AwUdXkFC7m9ap+OVuQhKlxZfII=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         vendorSha256 = "sha256-eNQTJHqOCOTAPO+vil6rkV9bNWZIdXxGQPE4IpETFtA=";

     

       17
       17
       +
         vendorSha256 = "sha256-CzJ83MsBetrzbBT+fmz8F8MjdrManJAd4xpykh/2938=";

     

       18
       18
        
       

     

       19
       19
        
         # tests want to download a vulnerable Terraform project

     

       20
       20
        
         doCheck = false;

+6 -4

pkgs/tools/typesetting/scdoc/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl }:

     

       1
       1
       +
       { lib, stdenv, fetchFromSourcehut }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "scdoc";

     

       5
       5
        
         version = "1.11.1";

     

       6
       6
        
       

     

       7
       7
       -
         src = fetchurl {

     

       8
       8
       -
           url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";

     

       9
       9
       -
           sha256 = "007pm3gspvya58cwb12wpnrm9dq5p28max2s0b2y9rq80nqgqag5";

     

       7
       7
       +
         src = fetchFromSourcehut {

     

       8
       8
       +
           owner = "~sircmpwn";

     

       9
       9
       +
           repo = pname;

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "1g37j847j3h4a4qbbfbr6vvsxpifj9v25jgv25nd71d1n0dxlhvk";

     

       10
       12
        
         };

     

       11
       13
        
       

     

       12
       14
        
         postPatch = ''

+6 -4

pkgs/tools/wayland/wev/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       -
       , fetchurl

     

       3
       3
       +
       , fetchFromSourcehut

     

       4
       4
        
       , pkg-config

     

       5
       5
        
       , scdoc

     

       6
       6
        
       , wayland

     
···

       12
       12
        
         pname = "wev";

     

       13
       13
        
         version = "1.0.0";

     

       14
       14
        
       

     

       15
       15
       -
         src = fetchurl {

     

       16
       16
       -
           url = "https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz";

     

       17
       17
       -
           sha256 = "0vlxdkb59v6nb10j28gh1a56sx8jk7ak7liwzv911kpmygnls03g";

     

       15
       15
       +
         src = fetchFromSourcehut {

     

       16
       16
       +
           owner = "~sircmpwn";

     

       17
       17
       +
           repo = pname;

     

       18
       18
       +
           rev = version;

     

       19
       19
       +
           sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms";

     

       18
       20
        
         };

     

       19
       21
        
       

     

       20
       22
        
         nativeBuildInputs = [ pkg-config scdoc wayland ];

+6 -4

pkgs/tools/wayland/wlsunset/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, meson, pkg-config, ninja, wayland

     

       1
       1
       +
       { lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland

     

       2
       2
        
       , wayland-protocols

     

       3
       3
        
       }:

     

       4
       4
        
       

     
···

       6
       6
        
         pname = "wlsunset";

     

       7
       7
        
         version = "0.1.0";

     

       8
       8
        
       

     

       9
       9
       -
         src = fetchurl {

     

       10
       10
       -
           url = "https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz";

     

       11
       11
       -
           sha256 = "0g7mk14hlbwbhq6nqr84452sbgcja3hdxsqf0vws4njhfjgqiv3q";

     

       9
       9
       +
         src = fetchFromSourcehut {

     

       10
       10
       +
           owner = "~kennylevinsen";

     

       11
       11
       +
           repo = pname;

     

       12
       12
       +
           rev = version;

     

       13
       13
       +
           sha256 = "12snizvf49y40cirhr2brgyldhsykv4k2gnln2sdrajqzhrc98v6";

     

       12
       14
        
         };

     

       13
       15
        
       

     

       14
       16
        
         nativeBuildInputs = [ meson pkg-config ninja wayland ];

+6 -4

pkgs/tools/wayland/wshowkeys/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl

     

       1
       1
       +
       { lib, stdenv, fetchFromSourcehut

     

       2
       2
        
       , meson, pkg-config, wayland, ninja

     

       3
       3
        
       , cairo, libinput, pango, wayland-protocols, libxkbcommon

     

       4
       4
        
       }:

     
···

       10
       10
        
         pname = "wshowkeys-unstable";

     

       11
       11
        
         inherit version;

     

       12
       12
        
       

     

       13
       13
       -
         src = fetchurl {

     

       14
       14
       -
           url = "https://git.sr.ht/~sircmpwn/wshowkeys/archive/${commit}.tar.gz";

     

       15
       15
       -
           sha256 = "0iplmw13jmc8d3m307kc047zq8yqwm42kw9fpm270562i3p0qk4d";

     

       13
       13
       +
         src = fetchFromSourcehut {

     

       14
       14
       +
           owner = "~sircmpwn";

     

       15
       15
       +
           repo = "wshowkeys";

     

       16
       16
       +
           rev = commit;

     

       17
       17
       +
           sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs";

     

       16
       18
        
         };

     

       17
       19
        
       

     

       18
       20
        
         nativeBuildInputs = [ meson pkg-config wayland ninja ];

+21 -9

pkgs/top-level/aliases.nix

···

       240
       240
        
         gnome_doc_utils = gnome-doc-utils; # added 2018-02-25

     

       241
       241
        
         gnome_themes_standard = gnome-themes-standard; # added 2018-02-25

     

       242
       242
        
         gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27

     

       243
       243
       -
         gnuradio-nacl = gr-nacl; # added 2019-05-27

     

       244
       244
       -
         gnuradio-gsm = gr-gsm; # added 2019-05-27

     

       245
       245
       -
         gnuradio-ais = gr-ais; # added 2019-05-27

     

       246
       246
       -
         gnuradio-limesdr = gr-limesdr; # added 2019-05-27

     

       247
       247
       -
         gnuradio-rds = gr-rds; # added 2019-05-27

     

       248
       248
       -
         gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27

     

       249
       249
       -
         # added 20-10-2020

     

       243
       243
       +
         # Added 2020-10-16

     

       250
       244
        
         gnuradio-with-packages = gnuradio3_7.override {

     

       251
       251
       -
           extraPackages = [ gr-nacl gr-gsm gr-ais gr-limesdr gr-rds gr-osmosdr ];

     

       245
       245
       +
           extraPackages = lib.attrVals [

     

       246
       246
       +
             "osmosdr" "ais" "gsm" "nacl" "rds" "limesdr"

     

       247
       247
       +
           ] gnuradio3_7Packages;

     

       252
       248
        
         };

     

       249
       249
       +
         gnuradio-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16

     

       250
       250
       +
         gnuradio-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16

     

       251
       251
       +
         gnuradio-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16

     

       252
       252
       +
         gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16

     

       253
       253
       +
         gnuradio-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16

     

       254
       254
       +
         gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16

     

       255
       255
       +
         gr-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16

     

       256
       256
       +
         gr-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16

     

       257
       257
       +
         gr-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16

     

       258
       258
       +
         gr-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16

     

       259
       259
       +
         gr-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16

     

       260
       260
       +
         gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16

     

       253
       261
        
         gnustep-make = gnustep.make; # added 2016-7-6

     

       254
       262
        
         gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12

     

       255
       263
        
         gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14

     
···

       302
       310
        
         json_glib = json-glib; # added 2018-02-25

     

       303
       311
        
         kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16

     

       304
       312
        
         k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06

     

       313
       313
       +
         kodiGBM = kodi-gbm;

     

       314
       314
       +
         kodiPlain = kodi;

     

       315
       315
       +
         kodiPlainWayland = kodi-wayland;

     

       305
       316
        
         julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15

     

       306
       317
        
         julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15

     

       307
       318
        
         kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28

     
···

       780
       791
        
         xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24

     

       781
       792
        
         xbmc = kodi; # added 2018-04-25

     

       782
       793
        
         xbmcPlain = kodiPlain; # added 2018-04-25

     

       783
       783
       -
         xbmcPlugins = kodiPlugins; # added 2018-04-25

     

       794
       794
       +
         xbmcPlugins = kodiPackages; # added 2018-04-25

     

       795
       795
       +
         kodiPlugins = kodiPackages; # added 2021-03-09;

     

       784
       796
        
         xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01

     

       785
       797
        
         xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";

     

       786
       798
        
         pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only";

+94 -124

pkgs/top-level/all-packages.nix

···

       2780
       2780
        
       

     

       2781
       2781
        
         precice = callPackage ../development/libraries/precice { };

     

       2782
       2782
        
       

     

       2783
       2783
       -
         pueue = callPackage ../applications/misc/pueue { };

     

       2783
       2783
       +
         pueue = callPackage ../applications/misc/pueue {

     

       2784
       2784
       +
           inherit (darwin.apple_sdk.frameworks) SystemConfiguration;

     

       2785
       2785
       +
         };

     

       2784
       2786
        
       

     

       2785
       2787
        
         pixiecore = callPackage ../tools/networking/pixiecore {};

     

       2786
       2788
        
       

     
···

       3957
       3959
        
         };

     

       3958
       3960
        
       

     

       3959
       3961
        
         volctl = callPackage ../tools/audio/volctl { };

     

       3962
       3962
       +
       

     

       3963
       3963
       +
         volk = callPackage ../development/libraries/volk { };

     

       3960
       3964
        
       

     

       3961
       3965
        
         vorta = libsForQt5.callPackage ../applications/backup/vorta { };

     

       3962
       3966
        
       

     
···

       13150
       13154
        
       

     

       13151
       13155
        
         uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };

     

       13152
       13156
        
       

     

       13153
       13153
       -
         uhd = callPackage ../applications/radio/uhd { };

     

       13157
       13157
       +
         uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { };

     

       13158
       13158
       +
         uhd = callPackage ../applications/radio/uhd {

     

       13159
       13159
       +
           boost = boost17x;

     

       13160
       13160
       +
         };

     

       13154
       13161
        
       

     

       13155
       13162
        
         uisp = callPackage ../development/tools/misc/uisp { };

     

       13156
       13163
        
       

     
···

       16785
       16792
        
       

     

       16786
       16793
        
         qm-dsp = callPackage ../development/libraries/audio/qm-dsp { };

     

       16787
       16794
        
       

     

       16788
       16788
       -
         qradiolink = callPackage ../applications/radio/qradiolink {

     

       16789
       16789
       -
           # 3.8 support is not ready yet:

     

       16790
       16790
       -
           # https://github.com/qradiolink/qradiolink/issues/67#issuecomment-703222573

     

       16791
       16791
       -
           # The non minimal build is used because the 'qtgui' component is needed.

     

       16792
       16792
       -
           # gr-osmosdr is using the same gnuradio as of now.

     

       16793
       16793
       -
           gnuradio = gnuradio3_7-unwrapped;

     

       16794
       16794
       -
         };

     

       16795
       16795
       +
         qradiolink = callPackage ../applications/radio/qradiolink { };

     

       16795
       16796
        
       

     

       16796
       16797
        
         qrupdate = callPackage ../development/libraries/qrupdate { };

     

       16797
       16798
        
       

     
···

       18607
       18608
        
         prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };

     

       18608
       18609
        
         prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };

     

       18609
       18610
        
         prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };

     

       18611
       18611
       +
         prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { };

     

       18610
       18612
        
         prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };

     

       18611
       18613
        
         prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { };

     

       18612
       18614
        
         prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { };

     
···

       22344
       22346
        
       

     

       22345
       22347
        
         gksu = callPackage ../applications/misc/gksu { };

     

       22346
       22348
        
       

     

       22347
       22347
       -
         gnss-sdr = callPackage ../applications/radio/gnss-sdr {

     

       22348
       22348
       -
           boost = boost166;

     

       22349
       22349
       -
           gnuradio = gnuradio3_7-unwrapped;

     

       22350
       22350
       -
         };

     

       22349
       22349
       +
         gnss-sdr = callPackage ../applications/radio/gnss-sdr { };

     

       22351
       22350
        
       

     

       22352
       22352
       -
         gnuradio-unwrapped = callPackage ../applications/radio/gnuradio {

     

       22353
       22353
       -
           inherit (darwin.apple_sdk.frameworks) CoreAudio;

     

       22354
       22354
       -
           python = python3;

     

       22351
       22351
       +
         gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {

     

       22352
       22352
       +
           unwrapped = callPackage ../applications/radio/gnuradio {

     

       22353
       22353
       +
             inherit (darwin.apple_sdk.frameworks) CoreAudio;

     

       22354
       22354
       +
             python = python3;

     

       22355
       22355
       +
             boost = boost17x;

     

       22356
       22356
       +
           };

     

       22355
       22357
        
         };

     

       22358
       22358
       +
         gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;

     

       22356
       22359
        
         # A build without gui components and other utilites not needed for end user

     

       22357
       22360
        
         # libraries

     

       22358
       22358
       -
         gnuradioMinimal = gnuradio-unwrapped.override {

     

       22359
       22359
       -
           features = {

     

       22360
       22360
       -
             gnuradio-companion = false;

     

       22361
       22361
       -
             python-support = false;

     

       22362
       22362
       -
             gr-ctrlport = false;

     

       22363
       22363
       -
             examples = false;

     

       22364
       22364
       -
             gr-qtgui = false;

     

       22365
       22365
       -
             gr-utils = false;

     

       22366
       22366
       -
             gr-modtool = false;

     

       22367
       22367
       -
             sphinx = false;

     

       22368
       22368
       -
             doxygen = false;

     

       22361
       22361
       +
         gnuradioMinimal = gnuradio.override {

     

       22362
       22362
       +
           wrap = false;

     

       22363
       22363
       +
           unwrapped = gnuradio.unwrapped.override {

     

       22364
       22364
       +
             volk = volk.override {

     

       22365
       22365
       +
               # So it will not reference python

     

       22366
       22366
       +
               enableModTool = false;

     

       22367
       22367
       +
             };

     

       22368
       22368
       +
             features = {

     

       22369
       22369
       +
               gnuradio-companion = false;

     

       22370
       22370
       +
               python-support = false;

     

       22371
       22371
       +
               examples = false;

     

       22372
       22372
       +
               gr-qtgui = false;

     

       22373
       22373
       +
               gr-utils = false;

     

       22374
       22374
       +
               gr-modtool = false;

     

       22375
       22375
       +
               gr-blocktool = false;

     

       22376
       22376
       +
               sphinx = false;

     

       22377
       22377
       +
               doxygen = false;

     

       22378
       22378
       +
             };

     

       22369
       22379
        
           };

     

       22370
       22380
        
         };

     

       22371
       22371
       -
         gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {

     

       22372
       22372
       -
           unwrapped = gnuradio-unwrapped;

     

       22381
       22381
       +
         gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix {

     

       22382
       22382
       +
           unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix {

     

       22383
       22383
       +
             inherit (darwin.apple_sdk.frameworks) CoreAudio;

     

       22384
       22384
       +
             python = python3;

     

       22385
       22385
       +
             boost = boost17x;

     

       22386
       22386
       +
           };

     

       22373
       22387
        
         };

     

       22374
       22374
       -
         gnuradio3_7-unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix {

     

       22375
       22375
       -
           inherit (darwin.apple_sdk.frameworks) CoreAudio;

     

       22376
       22376
       -
           python = python2;

     

       22377
       22377
       -
         };

     

       22388
       22388
       +
         gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs;

     

       22378
       22389
        
         # A build without gui components and other utilites not needed if gnuradio is

     

       22379
       22390
        
         # used as a c++ library.

     

       22380
       22380
       -
         gnuradio3_7Minimal = gnuradio3_7-unwrapped.override {

     

       22381
       22381
       -
           features = {

     

       22382
       22382
       -
             gnuradio-companion = false;

     

       22383
       22383
       -
             python-support = false;

     

       22384
       22384
       -
             gr-ctrlport = false;

     

       22385
       22385
       -
             gr-qtgui = false;

     

       22386
       22386
       -
             gr-utils = false;

     

       22387
       22387
       -
             sphinx = false;

     

       22388
       22388
       -
             doxygen = false;

     

       22389
       22389
       -
             gr-wxgui = false;

     

       22391
       22391
       +
         gnuradio3_8Minimal = gnuradio3_8.override {

     

       22392
       22392
       +
           wrap = false;

     

       22393
       22393
       +
           unwrapped = gnuradio3_8.unwrapped.override {

     

       22394
       22394
       +
             volk = volk.override {

     

       22395
       22395
       +
               enableModTool = false;

     

       22396
       22396
       +
             };

     

       22397
       22397
       +
             features = {

     

       22398
       22398
       +
               gnuradio-companion = false;

     

       22399
       22399
       +
               python-support = false;

     

       22400
       22400
       +
               examples = false;

     

       22401
       22401
       +
               gr-qtgui = false;

     

       22402
       22402
       +
               gr-utils = false;

     

       22403
       22403
       +
               gr-modtool = false;

     

       22404
       22404
       +
               sphinx = false;

     

       22405
       22405
       +
               doxygen = false;

     

       22406
       22406
       +
             };

     

       22390
       22407
        
           };

     

       22391
       22408
        
         };

     

       22392
       22409
        
         gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix {

     

       22393
       22393
       -
           unwrapped = gnuradio3_7-unwrapped;

     

       22394
       22394
       -
         };

     

       22395
       22395
       -
       

     

       22396
       22396
       -
         grandorgue = callPackage ../applications/audio/grandorgue { };

     

       22397
       22397
       -
       

     

       22398
       22398
       -
         gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix {

     

       22399
       22399
       -
           gnuradio = gnuradio3_7-unwrapped;

     

       22410
       22410
       +
           unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix {

     

       22411
       22411
       +
             inherit (darwin.apple_sdk.frameworks) CoreAudio;

     

       22412
       22412
       +
             python = python2;

     

       22413
       22413
       +
             # Incompatible with uhd4+

     

       22414
       22414
       +
             uhd = uhd3_5;

     

       22415
       22415
       +
           };

     

       22400
       22416
        
         };

     

       22401
       22401
       -
       

     

       22402
       22402
       -
         gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix {

     

       22403
       22403
       -
           gnuradio = gnuradio3_7-unwrapped;

     

       22404
       22404
       -
         };

     

       22405
       22405
       -
       

     

       22406
       22406
       -
         gr-ais = callPackage ../applications/radio/gnuradio/ais.nix {

     

       22407
       22407
       -
           gnuradio = gnuradio3_7-unwrapped;

     

       22408
       22408
       -
         };

     

       22409
       22409
       -
       

     

       22410
       22410
       -
         gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix {

     

       22411
       22411
       -
           gnuradio = gnuradio3_7-unwrapped;

     

       22412
       22412
       -
         };

     

       22413
       22413
       -
       

     

       22414
       22414
       -
         gr-rds = callPackage ../applications/radio/gnuradio/rds.nix {

     

       22415
       22415
       -
           gnuradio = gnuradio3_7-unwrapped;

     

       22417
       22417
       +
         gnuradio3_7Packages = lib.recurseIntoAttrs gnuradio3_7.pkgs;

     

       22418
       22418
       +
         # A build without gui components and other utilites not needed if gnuradio is

     

       22419
       22419
       +
         # used as a c++ library.

     

       22420
       22420
       +
         gnuradio3_7Minimal = gnuradio3_7.override {

     

       22421
       22421
       +
           wrap = false;

     

       22422
       22422
       +
           unwrapped = gnuradio3_7.unwrapped.override {

     

       22423
       22423
       +
             volk = volk.override {

     

       22424
       22424
       +
               enableModTool = false;

     

       22425
       22425
       +
             };

     

       22426
       22426
       +
             features = {

     

       22427
       22427
       +
               gnuradio-companion = false;

     

       22428
       22428
       +
               python-support = false;

     

       22429
       22429
       +
               gr-qtgui = false;

     

       22430
       22430
       +
               gr-utils = false;

     

       22431
       22431
       +
               sphinx = false;

     

       22432
       22432
       +
               doxygen = false;

     

       22433
       22433
       +
               gr-wxgui = false;

     

       22434
       22434
       +
             };

     

       22435
       22435
       +
           };

     

       22416
       22436
        
         };

     

       22417
       22437
        
       

     

       22418
       22418
       -
         gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix {

     

       22419
       22419
       -
           gnuradio = gnuradio3_7-unwrapped;

     

       22420
       22420
       -
         };

     

       22438
       22438
       +
         grandorgue = callPackage ../applications/audio/grandorgue { };

     

       22421
       22439
        
       

     

       22422
       22440
        
         goldendict = libsForQt5.callPackage ../applications/misc/goldendict {

     

       22423
       22441
        
           inherit (darwin) libiconv;

     
···

       22445
       22463
        
       

     

       22446
       22464
        
         gpx = callPackage ../applications/misc/gpx { };

     

       22447
       22465
        
       

     

       22448
       22448
       -
         gqrx = libsForQt514.callPackage ../applications/radio/gqrx {

     

       22449
       22449
       -
           gnuradio = gnuradio3_7Minimal;

     

       22450
       22450
       -
           # Use the same gnuradio for gr-osmosdr as well

     

       22451
       22451
       -
           gr-osmosdr = gr-osmosdr.override {

     

       22452
       22452
       -
             gnuradio = gnuradio3_7Minimal;

     

       22453
       22453
       -
             pythonSupport = false;

     

       22454
       22454
       -
           };

     

       22455
       22455
       -
         };

     

       22466
       22466
       +
         gqrx = callPackage ../applications/radio/gqrx { };

     

       22456
       22467
        
       

     

       22457
       22468
        
         gpx-viewer = callPackage ../applications/misc/gpx-viewer { };

     

       22458
       22469
        
       

     
···

       23300
       23311
        
       

     

       23301
       23312
        
         inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});

     

       23302
       23313
        
       

     

       23303
       23303
       -
         inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum {

     

       23304
       23304
       -
           gnuradio = gnuradioMinimal;

     

       23305
       23305
       -
         };

     

       23314
       23314
       +
         inspectrum = callPackage ../applications/radio/inspectrum { };

     

       23306
       23315
        
       

     

       23307
       23316
        
         ion3 = callPackage ../applications/window-managers/ion-3 {

     

       23308
       23317
        
           lua = lua5_1;

     
···

       26187
       26196
        
           cores = retroArchCores;

     

       26188
       26197
        
         };

     

       26189
       26198
        
       

     

       26190
       26190
       -
         wrapKodi = { kodi }: callPackage ../applications/video/kodi/wrapper.nix {

     

       26191
       26191
       -
           inherit kodi;

     

       26192
       26192
       -
           plugins = let inherit (lib) optional optionals; in with kodiPlugins;

     

       26193
       26193
       -
             ([]

     

       26194
       26194
       -
             ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher

     

       26195
       26195
       -
             ++ optional (config.kodi.enableAdvancedEmulatorLauncher or false)

     

       26196
       26196
       -
               advanced-emulator-launcher

     

       26197
       26197
       -
             ++ optionals (config.kodi.enableControllers or false)

     

       26198
       26198
       -
               (with controllers;

     

       26199
       26199
       -
                 [ default dreamcast gba genesis mouse n64 nes ps snes ])

     

       26200
       26200
       -
             ++ optional (config.kodi.enableExodus or false) exodus

     

       26201
       26201
       -
             ++ optionals (config.kodi.enableHyperLauncher or false)

     

       26202
       26202
       -
                  (with hyper-launcher; [ plugin service pdfreader ])

     

       26203
       26203
       -
             ++ optional (config.kodi.enableJoystick or false) joystick

     

       26204
       26204
       -
             ++ optional (config.kodi.enableOSMCskin or false) osmc-skin

     

       26205
       26205
       -
             ++ optional (config.kodi.enableSVTPlay or false) svtplay

     

       26206
       26206
       -
             ++ optional (config.kodi.enableSteamController or false) steam-controller

     

       26207
       26207
       -
             ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher

     

       26208
       26208
       -
             ++ optional (config.kodi.enablePVRHTS or false) pvr-hts

     

       26209
       26209
       -
             ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun

     

       26210
       26210
       -
             ++ optional (config.kodi.enablePVRIPTVSimple or false) pvr-iptvsimple

     

       26211
       26211
       -
             ++ optional (config.kodi.enableInputStreamAdaptive or false) inputstream-adaptive

     

       26212
       26212
       -
             ++ optional (config.kodi.enableVFSSFTP or false) vfs-sftp

     

       26213
       26213
       -
             ++ optional (config.kodi.enableVFSLibarchive or false) vfs-libarchive

     

       26214
       26214
       -
             );

     

       26215
       26215
       -
         };

     

       26216
       26216
       -
       

     

       26217
       26199
        
         wsjtx = qt5.callPackage ../applications/radio/wsjtx { };

     

       26218
       26200
        
       

     

       26219
       26201
        
         wxhexeditor = callPackage ../applications/editors/wxhexeditor {

     
···

       26271
       26253
        
           gtk = gtk2;

     

       26272
       26254
        
         };

     

       26273
       26255
        
       

     

       26274
       26274
       -
         kodiPlain = callPackage ../applications/video/kodi { };

     

       26275
       26275
       -
       

     

       26276
       26276
       -
         kodiPlainWayland = callPackage ../applications/video/kodi {

     

       26277
       26277
       -
           useWayland = true;

     

       26278
       26278
       -
         };

     

       26279
       26279
       -
       

     

       26280
       26280
       -
         kodiGBM = callPackage ../applications/video/kodi {

     

       26281
       26281
       -
           useGbm = true;

     

       26282
       26282
       -
         };

     

       26283
       26283
       -
       

     

       26284
       26284
       -
         kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});

     

       26256
       26256
       +
         kodiPackages = recurseIntoAttrs (kodi.packages);

     

       26285
       26257
        
       

     

       26286
       26286
       -
         kodi = wrapKodi {

     

       26287
       26287
       -
           kodi = kodiPlain;

     

       26288
       26288
       -
         };

     

       26258
       26258
       +
         kodi = callPackage ../applications/video/kodi { };

     

       26289
       26259
        
       

     

       26290
       26290
       -
         kodi-wayland = wrapKodi {

     

       26291
       26291
       -
           kodi = kodiPlainWayland;

     

       26260
       26260
       +
         kodi-wayland = callPackage ../applications/video/kodi {

     

       26261
       26261
       +
           waylandSupport = true;

     

       26292
       26262
        
         };

     

       26293
       26263
        
       

     

       26294
       26294
       -
         kodi-gbm = wrapKodi {

     

       26295
       26295
       -
           kodi = kodiGBM;

     

       26264
       26264
       +
         kodi-gbm = callPackage ../applications/video/kodi {

     

       26265
       26265
       +
           gbmSupport = true;

     

       26296
       26266
        
         };

     

       26297
       26267
        
       

     

       26298
       26268
        
         kodi-cli = callPackage ../tools/misc/kodi-cli { };

+47

pkgs/top-level/gnuradio-packages.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , newScope

     

       4
       4
       +
       , gnuradio # unwrapped gnuradio

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       lib.makeScope newScope ( self:

     

       8
       8
       +
       

     

       9
       9
       +
       let

     

       10
       10
       +
         # Modeled after qt's

     

       11
       11
       +
         mkDerivationWith = import ../development/gnuradio-modules/mkDerivation.nix {

     

       12
       12
       +
           inherit lib;

     

       13
       13
       +
           unwrapped = gnuradio;

     

       14
       14
       +
         };

     

       15
       15
       +
         mkDerivation = mkDerivationWith stdenv.mkDerivation;

     

       16
       16
       +
       

     

       17
       17
       +
         callPackage = self.newScope {

     

       18
       18
       +
           inherit (gnuradio)

     

       19
       19
       +
             # Packages that are potentially overriden and used as deps here.

     

       20
       20
       +
             boost

     

       21
       21
       +
             uhd

     

       22
       22
       +
             volk

     

       23
       23
       +
           ;

     

       24
       24
       +
           inherit mkDerivationWith mkDerivation;

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
       in {

     

       28
       28
       +
       

     

       29
       29
       +
         inherit callPackage mkDerivation mkDerivationWith;

     

       30
       30
       +
       

     

       31
       31
       +
         ### Packages

     

       32
       32
       +
       

     

       33
       33
       +
         inherit gnuradio;

     

       34
       34
       +
       

     

       35
       35
       +
         osmosdr = callPackage ../development/gnuradio-modules/osmosdr/default.nix { };

     

       36
       36
       +
       

     

       37
       37
       +
         ais = callPackage ../development/gnuradio-modules/ais/default.nix { };

     

       38
       38
       +
       

     

       39
       39
       +
         gsm = callPackage ../development/gnuradio-modules/gsm/default.nix { };

     

       40
       40
       +
       

     

       41
       41
       +
         nacl = callPackage ../development/gnuradio-modules/nacl/default.nix { };

     

       42
       42
       +
       

     

       43
       43
       +
         rds = callPackage ../development/gnuradio-modules/rds/default.nix { };

     

       44
       44
       +
       

     

       45
       45
       +
         limesdr = callPackage ../development/gnuradio-modules/limesdr/default.nix { };

     

       46
       46
       +
       

     

       47
       47
       +
       })