commit 0d5d6bb41ad9c4a982a0729edea6d18d551700b6 · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       752
       752
        
         ./services/matrix/dendrite.nix

     

       753
       753
        
         ./services/matrix/hebbot.nix

     

       754
       754
        
         ./services/matrix/hookshot.nix

     

       755
       755
       +
         ./services/matrix/lk-jwt-service.nix

     

       755
       756
        
         ./services/matrix/matrix-alertmanager.nix

     

       756
       757
        
         ./services/matrix/maubot.nix

     

       757
       758
        
         ./services/matrix/mautrix-meta.nix

     
···

       1181
       1182
        
         ./services/networking/lambdabot.nix

     

       1182
       1183
        
         ./services/networking/legit.nix

     

       1183
       1184
        
         ./services/networking/libreswan.nix

     

       1185
       1185
       +
         ./services/networking/livekit.nix

     

       1184
       1186
        
         ./services/networking/lldpd.nix

     

       1185
       1187
        
         ./services/networking/logmein-hamachi.nix

     

       1186
       1188
        
         ./services/networking/lokinet.nix

+93

nixos/modules/services/matrix/lk-jwt-service.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         cfg = config.services.lk-jwt-service;

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         meta.maintainers = [ lib.maintainers.quadradical ];

     

       12
       12
       +
         options.services.lk-jwt-service = {

     

       13
       13
       +
           enable = lib.mkEnableOption "Enable lk-jwt-service";

     

       14
       14
       +
           package = lib.mkPackageOption pkgs "lk-jwt-service" { };

     

       15
       15
       +
       

     

       16
       16
       +
           livekitUrl = lib.mkOption {

     

       17
       17
       +
             type = lib.types.strMatching "^wss?://.*";

     

       18
       18
       +
             example = "wss://example.com/livekit/sfu";

     

       19
       19
       +
             description = ''

     

       20
       20
       +
               The public websocket URL for livekit.

     

       21
       21
       +
               The proto needs to be either  `wss://` (recommended) or `ws://` (insecure).

     

       22
       22
       +
             '';

     

       23
       23
       +
           };

     

       24
       24
       +
       

     

       25
       25
       +
           keyFile = lib.mkOption {

     

       26
       26
       +
             type = lib.types.path;

     

       27
       27
       +
             description = ''

     

       28
       28
       +
               Path to a file containing the credential mapping (`<keyname>: <secret>`) to access LiveKit.

     

       29
       29
       +
       

     

       30
       30
       +
               Example:

     

       31
       31
       +
               ```

     

       32
       32
       +
                 lk-jwt-service: f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE

     

       33
       33
       +
               ```

     

       34
       34
       +
       

     

       35
       35
       +
               For more information, see <https://github.com/element-hq/lk-jwt-service#configuration>.

     

       36
       36
       +
             '';

     

       37
       37
       +
           };

     

       38
       38
       +
       

     

       39
       39
       +
           port = lib.mkOption {

     

       40
       40
       +
             type = lib.types.port;

     

       41
       41
       +
             default = 8080;

     

       42
       42
       +
             description = "Port that lk-jwt-service should listen on.";

     

       43
       43
       +
           };

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       46
       46
       +
         config = lib.mkIf cfg.enable {

     

       47
       47
       +
           systemd.services.lk-jwt-service = {

     

       48
       48
       +
             description = "Minimal service to issue LiveKit JWTs for MatrixRTC";

     

       49
       49
       +
             documentation = [ "https://github.com/element-hq/lk-jwt-service" ];

     

       50
       50
       +
             wantedBy = [ "multi-user.target" ];

     

       51
       51
       +
             wants = [ "network-online.target" ];

     

       52
       52
       +
             after = [ "network-online.target" ];

     

       53
       53
       +
             environment = {

     

       54
       54
       +
               LIVEKIT_URL = cfg.livekitUrl;

     

       55
       55
       +
               LIVEKIT_JWT_PORT = toString cfg.port;

     

       56
       56
       +
               LIVEKIT_KEY_FILE = "/run/credentials/lk-jwt-service.service/livekit-secrets";

     

       57
       57
       +
             };

     

       58
       58
       +
       

     

       59
       59
       +
             serviceConfig = {

     

       60
       60
       +
               LoadCredential = [ "livekit-secrets:${cfg.keyFile}" ];

     

       61
       61
       +
               ExecStart = lib.getExe cfg.package;

     

       62
       62
       +
               DynamicUser = true;

     

       63
       63
       +
               LockPersonality = true;

     

       64
       64
       +
               MemoryDenyWriteExecute = true;

     

       65
       65
       +
               ProtectClock = true;

     

       66
       66
       +
               ProtectControlGroups = true;

     

       67
       67
       +
               ProtectHostname = true;

     

       68
       68
       +
               ProtectKernelLogs = true;

     

       69
       69
       +
               ProtectKernelModules = true;

     

       70
       70
       +
               ProtectKernelTunables = true;

     

       71
       71
       +
               PrivateDevices = true;

     

       72
       72
       +
               PrivateMounts = true;

     

       73
       73
       +
               PrivateUsers = true;

     

       74
       74
       +
               RestrictAddressFamilies = [

     

       75
       75
       +
                 "AF_INET"

     

       76
       76
       +
                 "AF_INET6"

     

       77
       77
       +
               ];

     

       78
       78
       +
               RestrictNamespaces = true;

     

       79
       79
       +
               RestrictRealtime = true;

     

       80
       80
       +
               ProtectHome = true;

     

       81
       81
       +
               SystemCallArchitectures = "native";

     

       82
       82
       +
               SystemCallFilter = [

     

       83
       83
       +
                 "@system-service"

     

       84
       84
       +
                 "~@privileged"

     

       85
       85
       +
                 "~@resources"

     

       86
       86
       +
               ];

     

       87
       87
       +
               Restart = "on-failure";

     

       88
       88
       +
               RestartSec = 5;

     

       89
       89
       +
               UMask = "077";

     

       90
       90
       +
             };

     

       91
       91
       +
           };

     

       92
       92
       +
         };

     

       93
       93
       +
       }

+141

nixos/modules/services/networking/livekit.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         utils,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       8
       8
       +
       let

     

       9
       9
       +
         cfg = config.services.livekit;

     

       10
       10
       +
         format = pkgs.formats.json { };

     

       11
       11
       +
       in

     

       12
       12
       +
       {

     

       13
       13
       +
         meta.maintainers = with lib.maintainers; [ quadradical ];

     

       14
       14
       +
         options.services.livekit = {

     

       15
       15
       +
           enable = lib.mkEnableOption "Enable the livekit server";

     

       16
       16
       +
           package = lib.mkPackageOption pkgs "livekit" { };

     

       17
       17
       +
       

     

       18
       18
       +
           keyFile = lib.mkOption {

     

       19
       19
       +
             type = lib.types.path;

     

       20
       20
       +
             description = ''

     

       21
       21
       +
               LiveKit key file holding one or multiple application secrets. Use `livekit-server generate-keys` to generate a random key name and secret.

     

       22
       22
       +
       

     

       23
       23
       +
               The file should have the format `<keyname>: <secret>`. Example:

     

       24
       24
       +
               ```

     

       25
       25
       +
                 lk-jwt-service: f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE

     

       26
       26
       +
               ```

     

       27
       27
       +
       

     

       28
       28
       +
               Individual key/secret pairs need to be passed to clients to connect to this instance.

     

       29
       29
       +
             '';

     

       30
       30
       +
           };

     

       31
       31
       +
       

     

       32
       32
       +
           openFirewall = lib.mkOption {

     

       33
       33
       +
             type = lib.types.bool;

     

       34
       34
       +
             default = false;

     

       35
       35
       +
             description = "Opens port range for LiveKit on the firewall.";

     

       36
       36
       +
           };

     

       37
       37
       +
       

     

       38
       38
       +
           settings = lib.mkOption {

     

       39
       39
       +
             type = lib.types.submodule {

     

       40
       40
       +
               freeformType = format.type;

     

       41
       41
       +
               options = {

     

       42
       42
       +
                 port = lib.mkOption {

     

       43
       43
       +
                   type = lib.types.port;

     

       44
       44
       +
                   default = 7880;

     

       45
       45
       +
                   description = "Main TCP port for RoomService and RTC endpoint.";

     

       46
       46
       +
                 };

     

       47
       47
       +
       

     

       48
       48
       +
                 rtc = {

     

       49
       49
       +
                   port_range_start = lib.mkOption {

     

       50
       50
       +
                     type = lib.types.int;

     

       51
       51
       +
                     default = 50000;

     

       52
       52
       +
                     description = "Start of UDP port range for WebRTC";

     

       53
       53
       +
                   };

     

       54
       54
       +
       

     

       55
       55
       +
                   port_range_end = lib.mkOption {

     

       56
       56
       +
                     type = lib.types.int;

     

       57
       57
       +
                     default = 51000;

     

       58
       58
       +
                     description = "End of UDP port range for WebRTC";

     

       59
       59
       +
                   };

     

       60
       60
       +
       

     

       61
       61
       +
                   use_external_ip = lib.mkOption {

     

       62
       62
       +
                     type = lib.types.bool;

     

       63
       63
       +
                     default = false;

     

       64
       64
       +
                     description = ''

     

       65
       65
       +
                       When set to true, attempts to discover the host's public IP via STUN.

     

       66
       66
       +
                       This is useful for cloud environments such as AWS & Google where hosts have an internal IP that maps to an external one.

     

       67
       67
       +
                     '';

     

       68
       68
       +
                   };

     

       69
       69
       +
                 };

     

       70
       70
       +
               };

     

       71
       71
       +
             };

     

       72
       72
       +
             default = { };

     

       73
       73
       +
             description = ''

     

       74
       74
       +
               LiveKit configuration file expressed in nix.

     

       75
       75
       +
       

     

       76
       76
       +
               For an example configuration, see <https://docs.livekit.io/home/self-hosting/deployment/#configuration>.

     

       77
       77
       +
               For all possible values, see <https://github.com/livekit/livekit/blob/master/config-sample.yaml>.

     

       78
       78
       +
             '';

     

       79
       79
       +
           };

     

       80
       80
       +
         };

     

       81
       81
       +
       

     

       82
       82
       +
         config = lib.mkIf cfg.enable {

     

       83
       83
       +
           networking.firewall = lib.mkIf cfg.openFirewall {

     

       84
       84
       +
             allowedTCPPorts = [

     

       85
       85
       +
               cfg.settings.port

     

       86
       86
       +
             ];

     

       87
       87
       +
             allowedUDPPortRanges = [

     

       88
       88
       +
               {

     

       89
       89
       +
                 from = cfg.settings.rtc.port_range_start;

     

       90
       90
       +
                 to = cfg.settings.rtc.port_range_end;

     

       91
       91
       +
               }

     

       92
       92
       +
             ];

     

       93
       93
       +
           };

     

       94
       94
       +
       

     

       95
       95
       +
           systemd.services.livekit = {

     

       96
       96
       +
             description = "LiveKit SFU server";

     

       97
       97
       +
             documentation = [ "https://docs.livekit.io" ];

     

       98
       98
       +
             wantedBy = [ "multi-user.target" ];

     

       99
       99
       +
             wants = [ "network-online.target" ];

     

       100
       100
       +
             after = [ "network-online.target" ];

     

       101
       101
       +
       

     

       102
       102
       +
             serviceConfig = {

     

       103
       103
       +
               LoadCredential = [ "livekit-secrets:${cfg.keyFile}" ];

     

       104
       104
       +
               ExecStart = utils.escapeSystemdExecArgs [

     

       105
       105
       +
                 (lib.getExe cfg.package)

     

       106
       106
       +
                 "--config=${format.generate "livekit.json" cfg.settings}"

     

       107
       107
       +
                 "--key-file=/run/credentials/livekit.service/livekit-secrets"

     

       108
       108
       +
               ];

     

       109
       109
       +
               DynamicUser = true;

     

       110
       110
       +
               LockPersonality = true;

     

       111
       111
       +
               MemoryDenyWriteExecute = true;

     

       112
       112
       +
               ProtectClock = true;

     

       113
       113
       +
               ProtectControlGroups = true;

     

       114
       114
       +
               ProtectHostname = true;

     

       115
       115
       +
               ProtectKernelLogs = true;

     

       116
       116
       +
               ProtectKernelModules = true;

     

       117
       117
       +
               ProtectKernelTunables = true;

     

       118
       118
       +
               PrivateDevices = true;

     

       119
       119
       +
               PrivateMounts = true;

     

       120
       120
       +
               PrivateUsers = true;

     

       121
       121
       +
               RestrictAddressFamilies = [

     

       122
       122
       +
                 "AF_INET"

     

       123
       123
       +
                 "AF_INET6"

     

       124
       124
       +
                 "AF_NETLINK"

     

       125
       125
       +
               ];

     

       126
       126
       +
               RestrictNamespaces = true;

     

       127
       127
       +
               RestrictRealtime = true;

     

       128
       128
       +
               ProtectHome = true;

     

       129
       129
       +
               SystemCallArchitectures = "native";

     

       130
       130
       +
               SystemCallFilter = [

     

       131
       131
       +
                 "@system-service"

     

       132
       132
       +
                 "~@privileged"

     

       133
       133
       +
                 "~@resources"

     

       134
       134
       +
               ];

     

       135
       135
       +
               Restart = "on-failure";

     

       136
       136
       +
               RestartSec = 5;

     

       137
       137
       +
               UMask = "077";

     

       138
       138
       +
             };

     

       139
       139
       +
           };

     

       140
       140
       +
         };

     

       141
       141
       +
       }

+8 -4

nixos/modules/tasks/network-interfaces.nix

···

       604
       604
        
           networking.fqdnOrHostName = mkOption {

     

       605
       605
        
             readOnly = true;

     

       606
       606
        
             type = types.str;

     

       607
       607
       -
             default = if cfg.domain == null then cfg.hostName else cfg.fqdn;

     

       607
       607
       +
             default =

     

       608
       608
       +
               if (cfg.domain != null || opt.fqdn.highestPrio < (mkOptionDefault { }).priority) then

     

       609
       609
       +
                 cfg.fqdn

     

       610
       610
       +
               else

     

       611
       611
       +
                 cfg.hostName;

     

       608
       612
        
             defaultText = literalExpression ''

     

       609
       609
       -
               if cfg.domain == null then cfg.hostName else cfg.fqdn

     

       613
       613
       +
               if config.networking.domain != null || config.networking.fqdn is set then config.networking.fqdn else config.networking.hostName

     

       610
       614
        
             '';

     

       611
       615
        
             description = ''

     

       612
       616
        
               Either the fully qualified domain name (FQDN), or just the host name if

     

       613
       613
       -
               it does not exists.

     

       617
       617
       +
               it does not exist.

     

       614
       618
        
       

     

       615
       619
        
               This is a convenience option for modules to read instead of `fqdn` when

     

       616
       620
        
               a mere `hostName` is also an acceptable value; this option does not

     

       617
       617
       -
               throw an error when `domain` is unset.

     

       621
       621
       +
               throw an error when `domain` or `fqdn` is unset.

     

       618
       622
        
             '';

     

       619
       623
        
           };

     

       620
       624

nixos/tests/all-tests.nix

···

       729
       729
        
         lidarr = handleTest ./lidarr.nix { };

     

       730
       730
        
         lightdm = handleTest ./lightdm.nix { };

     

       731
       731
        
         lighttpd = runTest ./lighttpd.nix;

     

       732
       732
       +
         livekit = runTest ./networking/livekit.nix;

     

       732
       733
        
         limesurvey = handleTest ./limesurvey.nix { };

     

       733
       734
        
         limine = import ./limine { inherit runTest; };

     

       734
       735
        
         listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };

     

       735
       736
        
         litellm = runTest ./litellm.nix;

     

       736
       737
        
         litestream = handleTest ./litestream.nix { };

     

       738
       738
       +
         lk-jwt-service = runTest ./matrix/lk-jwt-service.nix;

     

       737
       739
        
         lldap = handleTest ./lldap.nix { };

     

       738
       740
        
         localsend = handleTest ./localsend.nix { };

     

       739
       741
        
         locate = handleTest ./locate.nix { };

+26

nixos/tests/matrix/lk-jwt-service.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       {

     

       7
       7
       +
         name = "lk-jwt-service";

     

       8
       8
       +
         meta.maintainers = [ lib.maintainers.quadradical ];

     

       9
       9
       +
       

     

       10
       10
       +
         nodes.machine = {

     

       11
       11
       +
           services.lk-jwt-service = {

     

       12
       12
       +
             enable = true;

     

       13
       13
       +
             keyFile = pkgs.writers.writeYAML "keys.yaml" {

     

       14
       14
       +
               key = "f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE";

     

       15
       15
       +
             };

     

       16
       16
       +
             livekitUrl = "wss://127.0.0.1:8100";

     

       17
       17
       +
             port = 8000;

     

       18
       18
       +
           };

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         testScript = ''

     

       22
       22
       +
           machine.wait_for_unit("lk-jwt-service.service")

     

       23
       23
       +
           machine.wait_for_open_port(8000)

     

       24
       24
       +
           machine.succeed('curl 127.0.0.1:8000/sfu/get -sLX POST -w "%{http_code}" | grep -q "^400"')

     

       25
       25
       +
         '';

     

       26
       26
       +
       }

+25

nixos/tests/networking/livekit.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       {

     

       7
       7
       +
         name = "livekit";

     

       8
       8
       +
         meta.maintainers = [ lib.maintainers.quadradical ];

     

       9
       9
       +
       

     

       10
       10
       +
         nodes.machine = {

     

       11
       11
       +
           services.livekit = {

     

       12
       12
       +
             enable = true;

     

       13
       13
       +
             keyFile = pkgs.writers.writeYAML "keys.yaml" {

     

       14
       14
       +
               key = "f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE";

     

       15
       15
       +
             };

     

       16
       16
       +
             settings.port = 8000;

     

       17
       17
       +
           };

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         testScript = ''

     

       21
       21
       +
           machine.wait_for_unit("livekit.service")

     

       22
       22
       +
           machine.wait_for_open_port(8000)

     

       23
       23
       +
           machine.succeed("curl 127.0.0.1:8000 -L --fail")

     

       24
       24
       +
         '';

     

       25
       25
       +
       }

+2 -2

pkgs/applications/misc/devilspie2/default.nix

···

       5
       5
        
         intltool,

     

       6
       6
        
         pkg-config,

     

       7
       7
        
         glib,

     

       8
       8
       -
         gtk,

     

       8
       8
       +
         gtk3,

     

       9
       9
        
         lua,

     

       10
       10
        
         libwnck,

     

       11
       11
        
       }:

     
···

       25
       25
        
         ];

     

       26
       26
        
         buildInputs = [

     

       27
       27
        
           glib

     

       28
       28
       -
           gtk

     

       28
       28
       +
           gtk3

     

       29
       29
        
           lua

     

       30
       30
        
           libwnck

     

       31
       31
        
         ];

+2 -2

pkgs/applications/misc/girara/default.nix

···

       9
       9
        
         dbus,

     

       10
       10
        
         xvfb-run,

     

       11
       11
        
         glib,

     

       12
       12
       -
         gtk,

     

       12
       12
       +
         gtk3,

     

       13
       13
        
         gettext,

     

       14
       14
        
         libiconv,

     

       15
       15
        
         json-glib,

     
···

       51
       51
        
       

     

       52
       52
        
         propagatedBuildInputs = [

     

       53
       53
        
           glib

     

       54
       54
       -
           gtk

     

       54
       54
       +
           gtk3

     

       55
       55
        
         ];

     

       56
       56
        
       

     

       57
       57
        
         nativeCheckInputs = [

+2 -2

pkgs/applications/misc/swappy/default.nix

···

       7
       7
        
         wayland,

     

       8
       8
        
         cairo,

     

       9
       9
        
         pango,

     

       10
       10
       -
         gtk,

     

       10
       10
       +
         gtk3,

     

       11
       11
        
         pkg-config,

     

       12
       12
        
         scdoc,

     

       13
       13
        
         libnotify,

     
···

       39
       39
        
         buildInputs = [

     

       40
       40
        
           cairo

     

       41
       41
        
           pango

     

       42
       42
       -
           gtk

     

       42
       42
       +
           gtk3

     

       43
       43
        
           libnotify

     

       44
       44
        
           wayland

     

       45
       45
        
           glib

+2 -2

pkgs/applications/misc/zathura/core/default.nix

···

       11
       11
        
         json-glib,

     

       12
       12
        
         desktop-file-utils,

     

       13
       13
        
         python3,

     

       14
       14
       -
         gtk,

     

       14
       14
       +
         gtk3,

     

       15
       15
        
         girara,

     

       16
       16
        
         gettext,

     

       17
       17
        
         gnome,

     
···

       75
       75
        
       

     

       76
       76
        
         buildInputs =

     

       77
       77
        
           [

     

       78
       78
       -
             gtk

     

       78
       78
       +
             gtk3

     

       79
       79
        
             girara

     

       80
       80
        
             libintl

     

       81
       81
        
             sqlite

-3

pkgs/applications/misc/zathura/default.nix

···

       3
       3
        
         lib,

     

       4
       4
        
         stdenv,

     

       5
       5
        
         newScope,

     

       6
       6
       -
         gtk3,

     

       7
       6
        
         useMupdf ? true,

     

       8
       7
        
       }:

     

       9
       8
        
       

     
···

       14
       13
        
         in

     

       15
       14
        
         {

     

       16
       15
        
           inherit useMupdf;

     

       17
       17
       -
       

     

       18
       18
       -
           gtk = gtk3;

     

       19
       16
        
       

     

       20
       17
        
           zathura_core = callPackage ./core { };

     

       21
       18

+2 -2

pkgs/applications/misc/zathura/djvu/default.nix

···

       5
       5
        
         meson,

     

       6
       6
        
         ninja,

     

       7
       7
        
         pkg-config,

     

       8
       8
       -
         gtk,

     

       8
       8
       +
         gtk3,

     

       9
       9
        
         zathura_core,

     

       10
       10
        
         girara,

     

       11
       11
        
         djvulibre,

     
···

       35
       35
        
           djvulibre

     

       36
       36
        
           gettext

     

       37
       37
        
           zathura_core

     

       38
       38
       -
           gtk

     

       38
       38
       +
           gtk3

     

       39
       39
        
           girara

     

       40
       40
        
         ];

     

       41
       41

+2 -2

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

···

       8
       8
        
         gcr,

     

       9
       9
        
         glib-networking,

     

       10
       10
        
         gsettings-desktop-schemas,

     

       11
       11
       -
         gtk,

     

       11
       11
       +
         gtk2,

     

       12
       12
        
         libsoup_2_4,

     

       13
       13
        
         webkitgtk_4_0,

     

       14
       14
        
         xorg,

     
···

       41
       41
        
             gcr

     

       42
       42
        
             glib-networking

     

       43
       43
        
             gsettings-desktop-schemas

     

       44
       44
       -
             gtk

     

       44
       44
       +
             gtk2

     

       45
       45
        
             libsoup_2_4

     

       46
       46
        
             webkitgtk_4_0

     

       47
       47
        
           ]

+2 -2

pkgs/applications/networking/ftp/gftp/default.nix

···

       5
       5
        
         autoconf,

     

       6
       6
        
         automake,

     

       7
       7
        
         gettext,

     

       8
       8
       -
         gtk,

     

       8
       8
       +
         gtk2,

     

       9
       9
        
         intltool,

     

       10
       10
        
         libtool,

     

       11
       11
        
         ncurses,

     
···

       35
       35
        
         ];

     

       36
       36
        
       

     

       37
       37
        
         buildInputs = [

     

       38
       38
       -
           gtk

     

       38
       38
       +
           gtk2

     

       39
       39
        
           ncurses

     

       40
       40
        
           openssl

     

       41
       41
        
           readline

+3 -3

pkgs/applications/networking/instant-messengers/ferdium/default.nix

···

       15
       15
        
           ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       16
       16
        
         hash =

     

       17
       17
        
           {

     

       18
       18
       -
             amd64-linux_hash = "sha256-Ey2FhekQVSYB0ki4U3HyuKs/URgtZMCl41jkPsZMNrQ=";

     

       19
       19
       -
             arm64-linux_hash = "sha256-oiimMFwwkBOwqlCSFoGQSYHsDpcjTQingyuBkYz8fvA=";

     

       18
       18
       +
             amd64-linux_hash = "sha256-e5O8cvQqvymHQiu7kY1AhKfoVOsDLYK8hDX+PKgZPFs=";

     

       19
       19
       +
             arm64-linux_hash = "sha256-UskXFGxAFOrAK8bIXRHSwN0G1lakGyuRGXTYYRFKHaw=";

     

       20
       20
        
           }

     

       21
       21
        
           ."${arch}-linux_hash";

     

       22
       22
        
       in

     

       23
       23
        
       mkFranzDerivation rec {

     

       24
       24
        
         pname = "ferdium";

     

       25
       25
        
         name = "Ferdium";

     

       26
       26
       -
         version = "7.0.0";

     

       26
       26
       +
         version = "7.0.1";

     

       27
       27
        
         src = fetchurl {

     

       28
       28
        
           url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";

     

       29
       29
        
           inherit hash;

+2 -2

pkgs/applications/office/grisbi/default.nix

···

       2
       2
        
         fetchFromGitHub,

     

       3
       3
        
         lib,

     

       4
       4
        
         stdenv,

     

       5
       5
       -
         gtk,

     

       5
       5
       +
         gtk3,

     

       6
       6
        
         pkg-config,

     

       7
       7
        
         libgsf,

     

       8
       8
        
         libofx,

     
···

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         buildInputs = [

     

       35
       35
       -
           gtk

     

       35
       35
       +
           gtk3

     

       36
       36
        
           libgsf

     

       37
       37
        
           libofx

     

       38
       38
        
           adwaita-icon-theme

+2 -2

pkgs/applications/terminal-emulators/stupidterm/default.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         pkg-config,

     

       6
       6
        
         vte,

     

       7
       7
       -
         gtk,

     

       7
       7
       +
         gtk3,

     

       8
       8
        
         pcre2,

     

       9
       9
        
         nixosTests,

     

       10
       10
        
       }:

     
···

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     

       19
       19
        
           vte

     

       20
       20
       -
           gtk

     

       20
       20
       +
           gtk3

     

       21
       21
        
           pcre2

     

       22
       22
        
         ];

     

       23
       23

+1 -1

pkgs/applications/video/olive-editor/default.nix

···

       26
       26
        
           version = "2.4.15.0";

     

       27
       27
        
           src = (

     

       28
       28
        
             old.src.override {

     

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

     

       29
       29
       +
               tag = "v${version}";

     

       30
       30
        
               hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M=";

     

       31
       31
        
             }

     

       32
       32
        
           );

+3 -3

pkgs/applications/video/vdr/markad/default.nix

···

       7
       7
        
       }:

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "vdr-markad";

     

       10
       10
       -
         version = "4.2.10";

     

       10
       10
       +
         version = "4.2.12";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           repo = "vdr-plugin-markad";

     

       14
       14
        
           owner = "kfb77";

     

       15
       15
       -
           hash = "sha256-qnE/0gnuY982qYz3ouUKFPURNkxM0XKWqf3w5ZwczV0=";

     

       16
       16
       -
           rev = "V${version}";

     

       15
       15
       +
           hash = "sha256-b2DSHbjMnRSY4pf5gSizU3Jbq8gEGC5xFYHCdIaYMfs=";

     

       16
       16
       +
           tag = "V${version}";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

+3 -3

pkgs/applications/video/vdr/nopacity/default.nix

···

       7
       7
        
       }:

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "vdr-skin-nopacity";

     

       10
       10
       -
         version = "1.1.18";

     

       10
       10
       +
         version = "1.1.19";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitLab {

     

       13
       13
        
           repo = "SkinNopacity";

     

       14
       14
        
           owner = "kamel5";

     

       15
       15
       -
           hash = "sha256-Aq5PtD6JV8jdBURADl9KkdVQvfmeQD/Zh62g5ansuC4=";

     

       16
       16
       -
           rev = version;

     

       15
       15
       +
           hash = "sha256-f15KtoPLvB5bF//5+gmmDmx8MGmiIDPGOYoNgSkcVqM=";

     

       16
       16
       +
           tag = version;

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         buildInputs = [

+1 -1

pkgs/applications/virtualization/virtualbox/default.nix

···

       418
       418
        
             fromSource

     

       419
       419
        
             binaryNativeCode

     

       420
       420
        
           ];

     

       421
       421
       -
           license = lib.licenses.gpl2;

     

       421
       421
       +
           license = lib.licenses.gpl3Only;

     

       422
       422
        
           homepage = "https://www.virtualbox.org/";

     

       423
       423
        
           maintainers = with lib.maintainers; [

     

       424
       424
        
             sander

+1 -1

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

···

       150
       150
        
             host/guest clipboard support.

     

       151
       151
        
           '';

     

       152
       152
        
           sourceProvenance = with lib.sourceTypes; [ fromSource ];

     

       153
       153
       -
           license = lib.licenses.gpl2;

     

       153
       153
       +
           license = lib.licenses.gpl3Only;

     

       154
       154
        
           maintainers = [

     

       155
       155
        
             lib.maintainers.sander

     

       156
       156
        
             lib.maintainers.friedrichaltheide

+2 -2

pkgs/by-name/al/alacarte/package.nix

···

       17
       17
        
       }:

     

       18
       18
        
       python3.pkgs.buildPythonApplication rec {

     

       19
       19
        
         pname = "alacarte";

     

       20
       20
       -
         version = "3.54.1";

     

       20
       20
       +
         version = "3.56.0";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitLab {

     

       23
       23
        
           domain = "gitlab.gnome.org";

     

       24
       24
        
           owner = "GNOME";

     

       25
       25
        
           repo = "alacarte";

     

       26
       26
        
           rev = version;

     

       27
       27
       -
           hash = "sha256-nfSYbGZvx76UzHGf6Jxq8Ny5o9NX5nXG9Kc/gRNn6HM=";

     

       27
       27
       +
           hash = "sha256-sH/2ULI1QEqmgFIFFnOwsx2/+TMt+bPu0l0LUcnBgWg=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         format = "other";

+2 -2

pkgs/by-name/an/animeko/package.nix

···

       79
       79
        
       

     

       80
       80
        
       stdenv.mkDerivation (finalAttrs: {

     

       81
       81
        
         pname = "animeko";

     

       82
       82
       -
         version = "4.9.0";

     

       82
       82
       +
         version = "4.9.1";

     

       83
       83
        
       

     

       84
       84
        
         src = fetchFromGitHub {

     

       85
       85
        
           owner = "open-ani";

     

       86
       86
        
           repo = "animeko";

     

       87
       87
        
           tag = "v${finalAttrs.version}";

     

       88
       88
       -
           hash = "sha256-fxnnOczLs88/OWYqHKTrWQyzqnqeODMKfoE3aQweQTc=";

     

       88
       88
       +
           hash = "sha256-NmvZR0NSo9y3vvdLqtyVKUlhCGq4Qu7Pbz/7Ufvf7rQ=";

     

       89
       89
        
           fetchSubmodules = true;

     

       90
       90
        
         };

     

       91
       91

+2 -2

pkgs/by-name/ch/charmcraft/package.nix

···

       8
       8
        
       

     

       9
       9
        
       python3Packages.buildPythonApplication rec {

     

       10
       10
        
         pname = "charmcraft";

     

       11
       11
       -
         version = "3.4.4";

     

       11
       11
       +
         version = "3.4.5";

     

       12
       12
        
       

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     
···

       16
       16
        
           owner = "canonical";

     

       17
       17
        
           repo = "charmcraft";

     

       18
       18
        
           tag = version;

     

       19
       19
       -
           hash = "sha256-EdpnTKbSDo2ZF4J/bWlcBYWuPSkxW3dmrQYjBeIyTzo=";

     

       19
       19
       +
           hash = "sha256-h2lviMU81KksEIltpOH+Oka8NWyKn9CrFP+lSyEMmLM=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

+2 -2

pkgs/by-name/ch/chatmcp/package.nix

···

       14
       14
        
       

     

       15
       15
        
       flutter329.buildFlutterApplication rec {

     

       16
       16
        
         pname = "chatmcp";

     

       17
       17
       -
         version = "0.0.26-alpha";

     

       17
       17
       +
         version = "0.0.28-alpha";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "daodao97";

     

       21
       21
        
           repo = "chatmcp";

     

       22
       22
        
           tag = "v${version}";

     

       23
       23
       -
           hash = "sha256-ayGpP1Tiz2437YDSXIwuFNXWpqReHUuI0Nuaf/aus+Q=";

     

       23
       23
       +
           hash = "sha256-QKTZ4gtGEXLGYzQdo1Ej6vFVLpmozywtSWy/fqgQOmI=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         pubspecLock = lib.importJSON ./pubspec.lock.json;

+3 -3

pkgs/by-name/de/devcontainer/package.nix

···

       19
       19
        
       in

     

       20
       20
        
       stdenv.mkDerivation (finalAttrs: {

     

       21
       21
        
         pname = "devcontainer";

     

       22
       22
       -
         version = "0.75.0";

     

       22
       22
       +
         version = "0.76.0";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "devcontainers";

     

       26
       26
        
           repo = "cli";

     

       27
       27
        
           tag = "v${finalAttrs.version}";

     

       28
       28
       -
           hash = "sha256-mzS5ejiD8HuvcD6aHIgbRU1pi43P8AiuDLaIlwpGllE=";

     

       28
       28
       +
           hash = "sha256-yTXAzyvkPO/7Xg+F4+hlLkyTpGHAqW3/3scJElfDfxA=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         yarnOfflineCache = fetchYarnDeps {

     

       32
       32
        
           yarnLock = "${finalAttrs.src}/yarn.lock";

     

       33
       33
       -
           hash = "sha256-ix9rixdrvt6hYtx4QTvsg3fm2uz3MvZxFZQfKkTDWc8=";

     

       33
       33
       +
           hash = "sha256-4NaZEA00dNPHAb7pcasufKf/4b8ufwS2lNS+a0rxbv8=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/es/esphome/package.nix

···

       22
       22
        
       in

     

       23
       23
        
       python.pkgs.buildPythonApplication rec {

     

       24
       24
        
         pname = "esphome";

     

       25
       25
       -
         version = "2025.4.0";

     

       25
       25
       +
         version = "2025.4.1";

     

       26
       26
        
         pyproject = true;

     

       27
       27
        
       

     

       28
       28
        
         src = fetchFromGitHub {

     

       29
       29
        
           owner = pname;

     

       30
       30
        
           repo = pname;

     

       31
       31
        
           tag = version;

     

       32
       32
       -
           hash = "sha256-qK/vQQdgtYrWUglVaBWDcTbgeDUrDB4rpQ+4q65Hre4=";

     

       32
       32
       +
           hash = "sha256-EWSV87z0Npsf/1lDzbk2s4Phx0tZJZnMzubaX+W6fAY=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         build-systems = with python.pkgs; [

+3 -3

pkgs/by-name/ga/gat/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "gat";

     

       9
       9
       -
         version = "0.22.0";

     

       9
       9
       +
         version = "0.23.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "koki-develop";

     

       13
       13
        
           repo = "gat";

     

       14
       14
        
           tag = "v${version}";

     

       15
       15
       -
           hash = "sha256-DJv7vll4I6jHpW7O7rc+Sn+Cr63Z1P4rZsIj5FPBEGw=";

     

       15
       15
       +
           hash = "sha256-NZ2pa2jewYmEGkRITfOfXeVWhfkfU0TQFKbkwkTsHNs=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-TUMfQBQaoJu731qYQuQ41K9JJvGocbbNpkX2LpkhHNc=";

     

       18
       18
       +
         vendorHash = "sha256-Fcj0APGk1C4leZoUphrj0Vi7XWClMfQsOb9wDoMfQrU=";

     

       19
       19
        
       

     

       20
       20
        
         env.CGO_ENABLED = 0;

     

       21
       21

+2 -2

pkgs/by-name/gr/grafana-alloy/package.nix

···

       17
       17
        
       

     

       18
       18
        
       buildGoModule rec {

     

       19
       19
        
         pname = "grafana-alloy";

     

       20
       20
       -
         version = "1.8.1";

     

       20
       20
       +
         version = "1.8.2";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "grafana";

     

       24
       24
        
           repo = "alloy";

     

       25
       25
        
           tag = "v${version}";

     

       26
       26
       -
           hash = "sha256-QuKwsKIm42hcWgLq2etjvBf+NDGiMVPQkKdQJZrFxUg=";

     

       26
       26
       +
           hash = "sha256-xbMbCxgwH3Ea3SBKZXzCIEv+AX7OQJmIqAx9PZkmkHo=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         proxyVendor = true;

+35 -5

pkgs/by-name/hy/hyperhdr/package.nix

···

       13
       13
        
         qt6Packages,

     

       14
       14
        
         qmqtt,

     

       15
       15
        
         xz,

     

       16
       16
       +
         sdbus-cpp_2,

     

       17
       17
       +
         plutovg,

     

       18
       18
       +
         lunasvg,

     

       19
       19
       +
         nanopb,

     

       20
       20
       +
         linalg,

     

       21
       21
       +
         stb,

     

       16
       22
        
       }:

     

       17
       23
        
       

     

       18
       24
        
       let

     
···

       23
       29
        
       

     

       24
       30
        
       stdenv.mkDerivation rec {

     

       25
       31
        
         pname = "hyperhdr";

     

       26
       26
       -
         version = "20.0.0.0";

     

       32
       32
       +
         version = "21.0.0.0";

     

       27
       33
        
       

     

       28
       34
        
         src = fetchFromGitHub {

     

       29
       35
        
           owner = "awawa-dev";

     

       30
       36
        
           repo = "HyperHDR";

     

       31
       37
        
           tag = "v${version}";

     

       32
       32
       -
           hash = "sha256-agIWtDlMwjD0sGX2ntFwqROzUsl8tY3nRbmFvvOVh4o=";

     

       38
       38
       +
           hash = "sha256-CSggawgUPkpeADc8VXs5FA+ubZAtrtTu0qYgIWA0V/c=";

     

       33
       39
        
         };

     

       34
       40
        
       

     

       35
       41
        
         nativeBuildInputs = [

     
···

       38
       44
        
           qt6Packages.wrapQtAppsHook

     

       39
       45
        
         ];

     

       40
       46
        
       

     

       47
       47
       +
         patches = [

     

       48
       48
       +
           # Allow completly unvendoring hyperhdr

     

       49
       49
       +
           # This can be removed on the next hyperhdr release

     

       50
       50
       +
           ./unvendor.patch

     

       51
       51
       +
         ];

     

       52
       52
       +
       

     

       53
       53
       +
         postPatch = ''

     

       54
       54
       +
           substituteInPlace sources/sound-capture/linux/SoundCaptureLinux.cpp \

     

       55
       55
       +
             --replace-fail "libasound.so.2" "${lib.getLib alsa-lib}/lib/libasound.so.2"

     

       56
       56
       +
         '';

     

       57
       57
       +
       

     

       41
       58
        
         cmakeFlags = [

     

       42
       59
        
           "-DPLATFORM=linux"

     

       43
       43
       -
           (cmakeBool "USE_SYSTEM_MQTT_LIBS" true)

     

       44
       60
        
           (cmakeBool "USE_SYSTEM_FLATBUFFERS_LIBS" true)

     

       61
       61
       +
           (cmakeBool "USE_SYSTEM_LUNASVG_LIBS" true)

     

       45
       62
        
           (cmakeBool "USE_SYSTEM_MBEDTLS_LIBS" true)

     

       63
       63
       +
           (cmakeBool "USE_SYSTEM_MQTT_LIBS" true)

     

       64
       64
       +
           (cmakeBool "USE_SYSTEM_NANOPB_LIBS" true)

     

       65
       65
       +
           (cmakeBool "USE_SYSTEM_SDBUS_CPP_LIBS" true)

     

       66
       66
       +
           (cmakeBool "USE_SYSTEM_STB_LIBS" true)

     

       46
       67
        
         ];

     

       47
       68
        
       

     

       48
       69
        
         buildInputs = [

     

       49
       70
        
           alsa-lib

     

       50
       71
        
           flatbuffers

     

       51
       72
        
           libjpeg_turbo

     

       52
       52
       -
           mdns

     

       73
       73
       +
           linalg

     

       74
       74
       +
           lunasvg

     

       53
       75
        
           mbedtls

     

       76
       76
       +
           mdns

     

       77
       77
       +
           nanopb

     

       54
       78
        
           pipewire

     

       79
       79
       +
           plutovg

     

       55
       80
        
           qmqtt

     

       56
       81
        
           qt6Packages.qtbase

     

       57
       82
        
           qt6Packages.qtserialport

     

       83
       83
       +
           sdbus-cpp_2

     

       84
       84
       +
           stb

     

       58
       85
        
           xz

     

       59
       86
        
         ];

     

       60
       87
        
       

     
···

       63
       90
        
           homepage = "https://github.com/awawa-dev/HyperHDR";

     

       64
       91
        
           changelog = "https://github.com/awawa-dev/HyperHDR/blob/${src.rev}/CHANGELOG.md";

     

       65
       92
        
           license = licenses.mit;

     

       66
       66
       -
           maintainers = with maintainers; [ hexa ];

     

       93
       93
       +
           maintainers = with maintainers; [

     

       94
       94
       +
             hexa

     

       95
       95
       +
             eymeric

     

       96
       96
       +
           ];

     

       67
       97
        
           mainProgram = "hyperhdr";

     

       68
       98
        
           platforms = platforms.linux;

     

       69
       99
        
         };

+295

pkgs/by-name/hy/hyperhdr/unvendor.patch

···

       1
       1
       +
       diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml

     

       2
       2
       +
       index 6007f64..a98a23c 100644

     

       3
       3
       +
       --- a/.github/workflows/push-master.yml

     

       4
       4
       +
       +++ b/.github/workflows/push-master.yml

     

       5
       5
       +
       @@ -2,7 +2,7 @@ name: HyperHDR CI Build

     

       6
       6
       +
        

     

       7
       7
       +
        on:

     

       8
       8
       +
          push:

     

       9
       9
       +
       -#  pull_request:

     

       10
       10
       +
       +  pull_request:

     

       11
       11
       +
        

     

       12
       12
       +
        env:

     

       13
       13
       +
            USE_CACHE: ${{ vars.USE_CACHE && vars.USE_CACHE || true }}

     

       14
       14
       +
       @@ -109,6 +109,7 @@ jobs:

     

       15
       15
       +
        

     

       16
       16
       +
              - name: Clear branch ccache storage

     

       17
       17
       +
                uses: yumemi-inc/clean-cache-action@v1

     

       18
       18
       +
       +        continue-on-error: true

     

       19
       19
       +
                with:

     

       20
       20
       +
                  ref: ${{ github.event.ref }}

     

       21
       21
       +
                  key: ${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-ccache-

     

       22
       22
       +
       @@ -193,6 +194,7 @@ jobs:

     

       23
       23
       +
        

     

       24
       24
       +
              - name: Clear branch ccache storage

     

       25
       25
       +
                uses: yumemi-inc/clean-cache-action@v1

     

       26
       26
       +
       +        continue-on-error: true

     

       27
       27
       +
                with:

     

       28
       28
       +
                  ref: ${{ github.event.ref }}

     

       29
       29
       +
                  key: macOS-ccache-${{ matrix.NICE_NAME }}

     

       30
       30
       +
       @@ -284,6 +286,7 @@ jobs:

     

       31
       31
       +
        

     

       32
       32
       +
              - name: Clear branch ccache storage

     

       33
       33
       +
                uses: yumemi-inc/clean-cache-action@v1

     

       34
       34
       +
       +        continue-on-error: true

     

       35
       35
       +
                with:

     

       36
       36
       +
                  ref: ${{ github.event.ref }}

     

       37
       37
       +
                  key: ${{ runner.os }}-ccache

     

       38
       38
       +
       diff --git a/BUILDING.md b/BUILDING.md

     

       39
       39
       +
       index 0347079..759cd6a 100644

     

       40
       40
       +
       --- a/BUILDING.md

     

       41
       41
       +
       +++ b/BUILDING.md

     

       42
       42
       +
       @@ -44,6 +44,10 @@ Use -D prefix when configuring the build.

     

       43
       43
       +
          * USE_CCACHE_CACHING = ON | OFF, enable CCache support if available

     

       44
       44
       +
          * USE_SYSTEM_MQTT_LIBS = ON | OFF, prefer system qMQTT libs

     

       45
       45
       +
          * USE_SYSTEM_FLATBUFFERS_LIBS = ON | OFF, prefer system Flatbuffers libs

     

       46
       46
       +
       +  * USE_SYSTEM_SDBUS_CPP_LIBS = ON | OFF, prefer system sdbus_c++ libs

     

       47
       47
       +
       +  * USE_SYSTEM_LUNASVG_LIBS = ON | OFF, prefer system lunasvg libs

     

       48
       48
       +
       +  * USE_SYSTEM_NANOPB_LIBS = ON | OFF, prefer system nanopb libs

     

       49
       49
       +
       +  * USE_SYSTEM_STB_LIBS = ON | OFF, prefer system stb libs

     

       50
       50
       +
          * USE_STATIC_QT_PLUGINS = ON | OFF, embed static QT-plugins into the application

     

       51
       51
       +
          * USE_STANDARD_INSTALLER_NAME = ON | OFF, use standard Linux package naming

     

       52
       52
       +
        

     

       53
       53
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       54
       54
       +
       index b918a81..fbf8d6b 100644

     

       55
       55
       +
       --- a/CMakeLists.txt

     

       56
       56
       +
       +++ b/CMakeLists.txt

     

       57
       57
       +
       @@ -34,6 +34,10 @@ SET ( DEFAULT_PROTOBUF                    ON  )

     

       58
       58
       +
        SET ( DEFAULT_WS281XPWM                   OFF )

     

       59
       59
       +
        SET ( DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS ON  )

     

       60
       60
       +
        SET ( DEFAULT_USE_SYSTEM_MQTT_LIBS        OFF )

     

       61
       61
       +
       +SET ( DEFAULT_USE_SYSTEM_SDBUS_CPP_LIBS   OFF )

     

       62
       62
       +
       +SET ( DEFAULT_USE_SYSTEM_LUNASVG_LIBS     OFF )

     

       63
       63
       +
       +SET ( DEFAULT_USE_SYSTEM_NANOPB_LIBS      OFF )

     

       64
       64
       +
       +SET ( DEFAULT_USE_SYSTEM_STB_LIBS         OFF )

     

       65
       65
       +
        SET ( DEFAULT_MF                          OFF )

     

       66
       66
       +
        SET ( DEFAULT_DX                          OFF )

     

       67
       67
       +
        SET ( DEFAULT_AVF                         OFF )

     

       68
       68
       +
       @@ -509,6 +513,18 @@ colorMe("USE_SYSTEM_MQTT_LIBS = " ${USE_SYSTEM_MQTT_LIBS})

     

       69
       69
       +
        option(USE_SYSTEM_FLATBUFFERS_LIBS "Use system flatbuffers libs" ${DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS})

     

       70
       70
       +
        colorMe("USE_SYSTEM_FLATBUFFERS_LIBS = " ${USE_SYSTEM_FLATBUFFERS_LIBS})

     

       71
       71
       +
        

     

       72
       72
       +
       +option(USE_SYSTEM_SDBUS_CPP_LIBS "Use system sdbus-c++ libs" ${DEFAULT_USE_SYSTEM_SDBUS_CPP_LIBS})

     

       73
       73
       +
       +colorMe("USE_SYSTEM_SDBUS_CPP_LIBS = " ${USE_SYSTEM_SDBUS_CPP_LIBS})

     

       74
       74
       +
       +

     

       75
       75
       +
       +option(USE_SYSTEM_LUNASVG_LIBS "Use system lunasvg libs" ${DEFAULT_USE_SYSTEM_LUNASVG_LIBS})

     

       76
       76
       +
       +colorMe("USE_SYSTEM_LUNASVG_LIBS = " ${USE_SYSTEM_LUNASVG_LIBS})

     

       77
       77
       +
       +

     

       78
       78
       +
       +option(USE_SYSTEM_NANOPB_LIBS "Use system nanopb libs" ${DEFAULT_USE_SYSTEM_NANOPB_LIBS})

     

       79
       79
       +
       +colorMe("USE_SYSTEM_NANOPB_LIBS = " ${USE_SYSTEM_NANOPB_LIBS})

     

       80
       80
       +
       +

     

       81
       81
       +
       +option(USE_SYSTEM_STB_LIBS "Use system stb libs" ${DEFAULT_USE_SYSTEM_STB_LIBS})

     

       82
       82
       +
       +colorMe("USE_SYSTEM_STB_LIBS = " ${USE_SYSTEM_STB_LIBS})

     

       83
       83
       +
       +

     

       84
       84
       +
        option(USE_STATIC_QT_PLUGINS "Enable static QT plugins" ${DEFAULT_STATIC_QT_PLUGINS})

     

       85
       85
       +
        colorMe("USE_STATIC_QT_PLUGINS = " ${USE_STATIC_QT_PLUGINS})

     

       86
       86
       +
        

     

       87
       87
       +
       diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt

     

       88
       88
       +
       index b4d23ad..38acea2 100644

     

       89
       89
       +
       --- a/external/CMakeLists.txt

     

       90
       90
       +
       +++ b/external/CMakeLists.txt

     

       91
       91
       +
       @@ -38,7 +38,7 @@ set_target_properties(sqlite3 PROPERTIES

     

       92
       92
       +
        target_compile_definitions(sqlite3 PUBLIC

     

       93
       93
       +
        	SQLITE_THREADSAFE=2

     

       94
       94
       +
        	SQLITE_DEFAULT_MEMSTATUS=0

     

       95
       95
       +
       -	SQLITE_DEFAULT_SYNCHRONOUS=3	

     

       96
       96
       +
       +	SQLITE_DEFAULT_SYNCHRONOUS=3

     

       97
       97
       +
        	SQLITE_OMIT_AUTHORIZATION

     

       98
       98
       +
        	SQLITE_OMIT_DEPRECATED

     

       99
       99
       +
        )

     

       100
       100
       +
       @@ -47,23 +47,32 @@ target_compile_definitions(sqlite3 PUBLIC

     

       101
       101
       +
        # Protobuf-nanopb

     

       102
       102
       +
        #=============================================================================

     

       103
       103
       +
        

     

       104
       104
       +
       -set(PROTOBUF-NANOPB-SOURCES

     

       105
       105
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb.h

     

       106
       106
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.h

     

       107
       107
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.c

     

       108
       108
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.h

     

       109
       109
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.c

     

       110
       110
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.h

     

       111
       111
       +
       -		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.c)

     

       112
       112
       +
       -

     

       113
       113
       +
       -add_library(protobuf-nanopb OBJECT ${PROTOBUF-NANOPB-SOURCES})

     

       114
       114
       +
       -set_target_properties(protobuf-nanopb PROPERTIES OUTPUT_NAME protobuf-nanopb)

     

       115
       115
       +
       -install(TARGETS protobuf-nanopb EXPORT nanopb-targets

     

       116
       116
       +
       -	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

     

       117
       117
       +
       +if (USE_SYSTEM_NANOPB_LIBS)

     

       118
       118
       +
       +	find_package(nanopb)

     

       119
       119
       +
       +	if (NOT nanopb_FOUND)

     

       120
       120
       +
       +		message(WARNING "Could NOT find nanopb system libraries. Fallback to nanopb submodule.")

     

       121
       121
       +
       +	endif()

     

       122
       122
       +
       +endif()

     

       123
       123
       +
        

     

       124
       124
       +
       -target_include_directories(protobuf-nanopb INTERFACE

     

       125
       125
       +
       -	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/nanopb>

     

       126
       126
       +
       -	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)

     

       127
       127
       +
       +if (NOT USE_SYSTEM_NANOPB_LIBS OR NOT nanopb_FOUND)

     

       128
       128
       +
       +	set(PROTOBUF-NANOPB-SOURCES

     

       129
       129
       +
       +			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb.h

     

       130
       130
       +
       +			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.h

     

       131
       131
       +
       +			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.c

     

       132
       132
       +
       +			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.h

     

       133
       133
       +
       +			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.c

     

       134
       134
       +
       +			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.h

     

       135
       135
       +
       +			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.c)

     

       136
       136
       +
       +

     

       137
       137
       +
       +	add_library(protobuf-nanopb OBJECT ${PROTOBUF-NANOPB-SOURCES})

     

       138
       138
       +
       +	set_target_properties(protobuf-nanopb PROPERTIES OUTPUT_NAME protobuf-nanopb)

     

       139
       139
       +
       +	install(TARGETS protobuf-nanopb EXPORT nanopb-targets

     

       140
       140
       +
       +		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

     

       141
       141
       +
       +

     

       142
       142
       +
       +	target_include_directories(protobuf-nanopb INTERFACE

     

       143
       143
       +
       +		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/nanopb>

     

       144
       144
       +
       +		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)

     

       145
       145
       +
       +endif()

     

       146
       146
       +
        

     

       147
       147
       +
        #=============================================================================

     

       148
       148
       +
        # RPi ws281x

     

       149
       149
       +
       @@ -75,7 +84,7 @@ if(ENABLE_WS281XPWM)

     

       150
       150
       +
        	string(REPLACE "configure_file(version.h.in version.h)" [=[configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)]=] FILE_CONTENTS "${FILE_CONTENTS}")

     

       151
       151
       +
        	file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x/CMakeLists.txt" "${FILE_CONTENTS}")

     

       152
       152
       +
        

     

       153
       153
       +
       -	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x)			

     

       154
       154
       +
       +	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x)

     

       155
       155
       +
        endif()

     

       156
       156
       +
        

     

       157
       157
       +
        #=============================================================================

     

       158
       158
       +
       @@ -90,11 +99,22 @@ target_include_directories(linalg INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/linalg"

     

       159
       159
       +
        # LUNASVG

     

       160
       160
       +
        #=============================================================================

     

       161
       161
       +
        

     

       162
       162
       +
       -

     

       163
       163
       +
        set(no_dev_warnings_backup "$CACHE{CMAKE_WARN_DEPRECATED}")

     

       164
       164
       +
        set(CMAKE_WARN_DEPRECATED OFF CACHE INTERNAL "" FORCE)

     

       165
       165
       +
       -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lunasvg)

     

       166
       166
       +
       -set_target_properties(lunasvg PROPERTIES POSITION_INDEPENDENT_CODE ON)

     

       167
       167
       +
       +

     

       168
       168
       +
       +if (USE_SYSTEM_LUNASVG_LIBS)

     

       169
       169
       +
       +	find_package(lunasvg GLOBAL)

     

       170
       170
       +
       +	if (NOT lunasvg_FOUND)

     

       171
       171
       +
       +		message(WARNING "Could NOT find lunasvg system libraries. Fallback to lunasvg submodule.")

     

       172
       172
       +
       +	endif()

     

       173
       173
       +
       +endif()

     

       174
       174
       +
       +

     

       175
       175
       +
       +if (NOT USE_SYSTEM_LUNASVG_LIBS OR NOT lunasvg_FOUND)

     

       176
       176
       +
       +	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lunasvg)

     

       177
       177
       +
       +	set_target_properties(lunasvg PROPERTIES POSITION_INDEPENDENT_CODE ON)

     

       178
       178
       +
       +	set_target_properties(plutovg PROPERTIES POSITION_INDEPENDENT_CODE ON)

     

       179
       179
       +
       +endif()

     

       180
       180
       +
       +

     

       181
       181
       +
        set(CMAKE_WARN_DEPRECATED ${no_dev_warnings_backup} CACHE INTERNAL "" FORCE)

     

       182
       182
       +
        

     

       183
       183
       +
        #=============================================================================

     

       184
       184
       +
       @@ -125,7 +145,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING)

     

       185
       185
       +
        	cmake_policy(PUSH)

     

       186
       186
       +
        

     

       187
       187
       +
        	set(CMAKE_POLICY_DEFAULT_CMP0071 NEW)

     

       188
       188
       +
       -	set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")	

     

       189
       189
       +
       +	set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")

     

       190
       190
       +
        

     

       191
       191
       +
        	if (NOT CMAKE_CROSSCOMPILING AND USE_PRECOMPILED_HEADERS)

     

       192
       192
       +
        		set(FLATBUFFERS_ENABLE_PCH ON CACHE BOOL "")

     

       193
       193
       +
       @@ -142,7 +162,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING)

     

       194
       194
       +
        		unset(FLATBUFFERS_FLATC_EXECUTABLE)

     

       195
       195
       +
        		set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "")

     

       196
       196
       +
        		set(FLATBUFFERS_BUILD_FLATHASH OFF CACHE BOOL "")

     

       197
       197
       +
       -		set(FLATBUFFERS_HOST_FLATBUFFERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/host_flatc)		

     

       198
       198
       +
       +		set(FLATBUFFERS_HOST_FLATBUFFERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/host_flatc)

     

       199
       199
       +
        		file(MAKE_DIRECTORY ${FLATBUFFERS_HOST_FLATBUFFERS_DIR})

     

       200
       200
       +
        

     

       201
       201
       +
        		EXECUTE_PROCESS ( WORKING_DIRECTORY ${FLATBUFFERS_HOST_FLATBUFFERS_DIR} RESULT_VARIABLE EXEC_RES

     

       202
       202
       +
       @@ -168,7 +188,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING)

     

       203
       203
       +
        		set(FLATBUFFERS_FLATC_EXECUTABLE "$<TARGET_FILE:flatc>")

     

       204
       204
       +
        	else()

     

       205
       205
       +
        		message( STATUS "Using host flatc compiler: ${FLATBUFFERS_FLATC_EXECUTABLE}")

     

       206
       206
       +
       -	endif()	

     

       207
       207
       +
       +	endif()

     

       208
       208
       +
        

     

       209
       209
       +
        	cmake_policy(POP)

     

       210
       210
       +
        endif()

     

       211
       211
       +
       @@ -177,7 +197,7 @@ set(FLATBUFFERS_FLATC_EXECUTABLE ${FLATBUFFERS_FLATC_EXECUTABLE} PARENT_SCOPE)

     

       212
       212
       +
        set(FLATBUFFERS_INCLUDE_DIRS ${FLATBUFFERS_INCLUDE_DIRS} PARENT_SCOPE)

     

       213
       213
       +
        include_directories(${FLATBUFFERS_INCLUDE_DIRS})

     

       214
       214
       +
        

     

       215
       215
       +
       -if (FLATBUFFERS_INCLUDE_DIRS AND EXISTS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json")		

     

       216
       216
       +
       +if (FLATBUFFERS_INCLUDE_DIRS AND EXISTS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json")

     

       217
       217
       +
        		file(STRINGS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json" _FLATBUFFERS_VERSION_STRING REGEX "^[ \t\r\n]+\"version\":[ \t\r\n]+\"[0-9]+.[0-9]+.[0-9]+\",")

     

       218
       218
       +
        		string(REGEX REPLACE "^[ \t\r\n]+\"version\":[ \t\r\n]+\"([0-9]+.[0-9]+.[0-9]+)\"," "\\1" FLATBUFFERS_PARSE_VERSION "${_FLATBUFFERS_VERSION_STRING}")

     

       219
       219
       +
        		message(STATUS "Using flatbuffers libraries version: \"${FLATBUFFERS_PARSE_VERSION}\"")

     

       220
       220
       +
       @@ -220,7 +240,7 @@ if ( ENABLE_MQTT )

     

       221
       221
       +
        		# HyperHDR workaround for fixed Qt5 version

     

       222
       222
       +
        		file(READ "${CMAKE_CURRENT_SOURCE_DIR}/qmqtt/CMakeLists.txt" FILE_CONTENTS)

     

       223
       223
       +
        		string(REPLACE "Qt5" "Qt${Qt_VERSION}" FILE_CONTENTS "${FILE_CONTENTS}")

     

       224
       224
       +
       -		string(REPLACE "find_package" "#find_package" FILE_CONTENTS "${FILE_CONTENTS}")		

     

       225
       225
       +
       +		string(REPLACE "find_package" "#find_package" FILE_CONTENTS "${FILE_CONTENTS}")

     

       226
       226
       +
        		file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/qmqtt/CMakeLists.txt" "${FILE_CONTENTS}")

     

       227
       227
       +
        

     

       228
       228
       +
        		cmake_policy(PUSH)

     

       229
       229
       +
       @@ -261,17 +281,41 @@ ENDIF()

     

       230
       230
       +
        #=============================================================================

     

       231
       231
       +
        

     

       232
       232
       +
        if (UNIX AND NOT APPLE AND (ENABLE_POWER_MANAGEMENT OR ENABLE_PIPEWIRE))

     

       233
       233
       +
       -	set(SDBUSCPP_BUILD_DOCS OFF CACHE BOOL "No doc")

     

       234
       234
       +
       -	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp)

     

       235
       235
       +
       -	set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON)

     

       236
       236
       +
       +	if (USE_SYSTEM_SDBUS_CPP_LIBS)

     

       237
       237
       +
       +		pkg_check_modules (sdbus-c++ sdbus-c++>=2.0.0)

     

       238
       238
       +
       +

     

       239
       239
       +
       +		if(NOT sdbus-c++_FOUND)

     

       240
       240
       +
       +			message( WARNING "Could not find: sdbus-c++>=2.0.0. Fallback to sdbus-c++ submodule." )

     

       241
       241
       +
       +		endif()

     

       242
       242
       +
       +	endif()

     

       243
       243
       +
       +

     

       244
       244
       +
       +	if(NOT sdbus-c++_FOUND)

     

       245
       245
       +
       +		message( "Using sdbus-c++ submodule." )

     

       246
       246
       +
       +		set(SDBUSCPP_BUILD_DOCS OFF CACHE BOOL "No doc")

     

       247
       247
       +
       +		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp)

     

       248
       248
       +
       +		set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON)

     

       249
       249
       +
       +	endif()

     

       250
       250
       +
        endif()

     

       251
       251
       +
        

     

       252
       252
       +
        #=============================================================================

     

       253
       253
       +
        # STB

     

       254
       254
       +
        #=============================================================================

     

       255
       255
       +
        

     

       256
       256
       +
       -add_library(stb INTERFACE )

     

       257
       257
       +
       -target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb)

     

       258
       258
       +
       +add_library(stb INTERFACE)

     

       259
       259
       +
       +

     

       260
       260
       +
       +if (USE_SYSTEM_STB_LIBS)

     

       261
       261
       +
       +	find_path(STB_INCLUDE_DIR stb_image.h PATH_SUFFIXES stb)

     

       262
       262
       +
       +	if (NOT STB_INCLUDE_DIR)

     

       263
       263
       +
       +		message(WARNING "Could NOT find system STB libraries. Falling back to embedded STB.")

     

       264
       264
       +
       +		target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb)

     

       265
       265
       +
       +	else()

     

       266
       266
       +
       +		message(STATUS "Found system STB libraries: ${STB_INCLUDE_DIR}")

     

       267
       267
       +
       +		target_include_directories(stb INTERFACE ${STB_INCLUDE_DIR})

     

       268
       268
       +
       +	endif()

     

       269
       269
       +
       +else()

     

       270
       270
       +
       +	target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb)

     

       271
       271
       +
       +endif()

     

       272
       272
       +
       +

     

       273
       273
       +
        target_compile_definitions(stb INTERFACE

     

       274
       274
       +
        	STB_IMAGE_WRITE_IMPLEMENTATION

     

       275
       275
       +
        	STB_IMAGE_IMPLEMENTATION

     

       276
       276
       +
       diff --git a/sources/utils-image/CMakeLists.txt b/sources/utils-image/CMakeLists.txt

     

       277
       277
       +
       index b5ad570..5c9b506 100644

     

       278
       278
       +
       --- a/sources/utils-image/CMakeLists.txt

     

       279
       279
       +
       +++ b/sources/utils-image/CMakeLists.txt

     

       280
       280
       +
       @@ -29,13 +29,13 @@ else()

     

       281
       281
       +
        	add_library(utils-image STATIC ${utils_image_SOURCES})

     

       282
       282
       +
        endif()

     

       283
       283
       +
        

     

       284
       284
       +
       -target_include_directories(utils-image PRIVATE stb lunasvg TurboJPEG::TurboJPEG)

     

       285
       285
       +
       +target_include_directories(utils-image PRIVATE stb lunasvg::lunasvg TurboJPEG::TurboJPEG)

     

       286
       286
       +
        

     

       287
       287
       +
        target_link_libraries(utils-image PRIVATE

     

       288
       288
       +
        	Qt${Qt_VERSION}::Core

     

       289
       289
       +
        	Qt${Qt_VERSION}::Network

     

       290
       290
       +
        	stb

     

       291
       291
       +
       -	lunasvg

     

       292
       292
       +
       +	lunasvg::lunasvg

     

       293
       293
       +
        	image

     

       294
       294
       +
        	TurboJPEG::TurboJPEG

     

       295
       295
       +
        )

+1 -1

pkgs/by-name/io/iosevka-bin/package.nix

···

       17
       17
        
       in

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
        
         pname = "${name}-bin";

     

       20
       20
       -
         version = "33.2.1";

     

       20
       20
       +
         version = "33.2.2";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchurl {

     

       23
       23
        
           url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";

+90 -90

pkgs/by-name/io/iosevka-bin/variants.nix

···

       1
       1
        
       # This file was autogenerated. DO NOT EDIT!

     

       2
       2
        
       {

     

       3
       3
       -
         Iosevka = "08z48033g3px5ybh5idcc8i9sgkaqphm2246ncrh4g7bwap4gm3p";

     

       4
       4
       -
         IosevkaAile = "10hc78wsqd7ijglsiml1mpcn3c8g0hf9j1hbz6k51rz8ql4iq12b";

     

       5
       5
       -
         IosevkaCurly = "13hdcvg51wlpxqjxzgf055gxfdqlw7ly2x9fajqiqwxfg6haq701";

     

       6
       6
       -
         IosevkaCurlySlab = "172g677kr092v1a86yv1nbnifdmvhk824fqwqyr9q8zv8yibq4pd";

     

       7
       7
       -
         IosevkaEtoile = "0ckz3qs9alf3r9xzq3l2pgdf86y8bckpyqbl8f37mwdqqk177y8l";

     

       8
       8
       -
         IosevkaSlab = "0sqwsgn8p1fympsm4ah27ghckxafddiqia8wibc54908jb84j6n2";

     

       9
       9
       -
         IosevkaSS01 = "1lsymss2scp7y8hdbwgzzqxi03wdmfikphfz0b2hjwbzqsv3198i";

     

       10
       10
       -
         IosevkaSS02 = "1fhiiwnmb7l2cw7rvmk65zn3x2g665p2hwl4mxmnbj94m0h1nyki";

     

       11
       11
       -
         IosevkaSS03 = "0vsrj557mzn21gdw1nrmrxl4r8q6rf3w7h1z104vxzp0zqn15hz6";

     

       12
       12
       -
         IosevkaSS04 = "114gzjjg00lagmq2lhdkjjgzsa2a9jc8v7mw0ayjc4gadjdvr3qv";

     

       13
       13
       -
         IosevkaSS05 = "1gw2wdxw4yz825aqi50p14bz7iz7i1d7nph1vz58ii52nnkygivq";

     

       14
       14
       -
         IosevkaSS06 = "0j5fz5vyg3b9c9aybrizncxdmh76yk2k6f430znqx6dd692i3irq";

     

       15
       15
       -
         IosevkaSS07 = "1qd28dp96xjqsz35b4fqxgiq2g797vpfv9zjvd1r1xcgsaliin5p";

     

       16
       16
       -
         IosevkaSS08 = "19n75kan3xggx3xvf0i978j058wzjd62bbyx36vyyjki104wkphk";

     

       17
       17
       -
         IosevkaSS09 = "0fidll4cqfwral0babkh3zb0kb9fi5nahax4cy395hbd2db4frzy";

     

       18
       18
       -
         IosevkaSS10 = "04nagrfnw0is75g0bh9pk046y6vh5b236d6mgfjxvv93zvqxdvyy";

     

       19
       19
       -
         IosevkaSS11 = "1ni71hx8pi9vyrg7imkym25g1pnx4fig525vkxp6mxzv63g50c43";

     

       20
       20
       -
         IosevkaSS12 = "1afhf8gvb7j0qlw87ps7rwaq2j39f199ghaif6qlh84wrahbmvr0";

     

       21
       21
       -
         IosevkaSS13 = "0byc54mpm28qcyzjryasyr6xm3nsqcc460caa9vmr0aajjmjqrva";

     

       22
       22
       -
         IosevkaSS14 = "0vlaa0zpb9myxnxrzwmr1sh99yypiiv94dabhyh5qwr8n8dz90qw";

     

       23
       23
       -
         IosevkaSS15 = "0q0jymy8brda65lliyfyfphw68s0zdh3c5vha1n0qgx26giq6cfx";

     

       24
       24
       -
         IosevkaSS16 = "0xdfagax1jaigxhk4n58r5wplpqgv9n4592g8rz09y9fnx16j42f";

     

       25
       25
       -
         IosevkaSS17 = "10yj4flqci2y7mbsjfm5zib7fa0jkxjsv4bjdh07bsgf0z1c5v4i";

     

       26
       26
       -
         IosevkaSS18 = "1j97gc101al6nqwrb2n896r1m29g9x9138fy9f7607mxd9l6m4y0";

     

       27
       27
       -
         SGr-Iosevka = "1rxmirx3xys75nmj76vdb6kh7m8awx8js9amm3cx9zwgn3rsibbm";

     

       28
       28
       -
         SGr-IosevkaCurly = "0sjqgnsbmmlb9g65z4zdfp57qbidmidzqvfal2szbydqp2kfpm8x";

     

       29
       29
       -
         SGr-IosevkaCurlySlab = "1yqy4fmfk8jbn98gqbg8q2iihlnzy590h4cyc3ap03npki9z737z";

     

       30
       30
       -
         SGr-IosevkaFixed = "1jw3w3nxbcbkqa2shskfjnh173zwj0n7qn1cl4dh5x4fpbpd8q1v";

     

       31
       31
       -
         SGr-IosevkaFixedCurly = "0pq0hyw1v687i1kwjzadwfbr9k6i07jyvg276h9mjsw6nc3x1lzm";

     

       32
       32
       -
         SGr-IosevkaFixedCurlySlab = "12bz84pm0cm37h99c67qw3ajqnfw894xx7jpzc6mygblcqv5ll6h";

     

       33
       33
       -
         SGr-IosevkaFixedSlab = "1cn9bndrcf1iv6jhry9wd850arb94dypm1zhv352vcq87vqawnyw";

     

       34
       34
       -
         SGr-IosevkaFixedSS01 = "1dgr2a94xhzcqsvcnpixdwvlm70nmxzpflr4m5c824g36n8xvvj3";

     

       35
       35
       -
         SGr-IosevkaFixedSS02 = "0vzfiq0wm6xf9alkarn2yyrdwjcxrr3z4ckskxl297pbpl3brr04";

     

       36
       36
       -
         SGr-IosevkaFixedSS03 = "1jbjmwx3l9h0978f319p4vkcm7bj9kmynywjvwgdfjwja5xl3mni";

     

       37
       37
       -
         SGr-IosevkaFixedSS04 = "0yiihs1l257bq9mxk6mmkldh5jipzc5nlh7v833pzw5b04i8lppl";

     

       38
       38
       -
         SGr-IosevkaFixedSS05 = "0n5v1yqgbydi51gf68d1w22vcp12annfialrj7w5azwszbgqps7k";

     

       39
       39
       -
         SGr-IosevkaFixedSS06 = "07lg26m4nbx02q1bfp7jg19pa2rvchpniay1wi3y064xw2xknzyb";

     

       40
       40
       -
         SGr-IosevkaFixedSS07 = "0pfbfifibcp5s7q8p4a17y6d5xp233ycba3n50qw3h0caml4qbnv";

     

       41
       41
       -
         SGr-IosevkaFixedSS08 = "18pc0fqx0zdqp2b3wxznx0c7qsa3b1fg9pfp90yc8984zfnfi0g7";

     

       42
       42
       -
         SGr-IosevkaFixedSS09 = "0mjyhjdif1a6mmh0swjczqmq4422ahpdpf5ivkpkd1dphcnpw5p5";

     

       43
       43
       -
         SGr-IosevkaFixedSS10 = "12m4c567cl869myhcbssy9xbigghvhylps3p76152hx0dvlaf7g5";

     

       44
       44
       -
         SGr-IosevkaFixedSS11 = "09q39nrzhcd1248nadv8cpqffkbzz2c4wcrq3pzfhxgsd3rl1asf";

     

       45
       45
       -
         SGr-IosevkaFixedSS12 = "1bj4j5zkyifsn0fgpb5ngixc2xii2rj9yglahy1hanxj5wd7i2ac";

     

       46
       46
       -
         SGr-IosevkaFixedSS13 = "1r0d62hka8jgkaasy4vagy0fvigfj7ffmjggqzsyrxma8lqhq73q";

     

       47
       47
       -
         SGr-IosevkaFixedSS14 = "1g1xyxs3lzzk1gj0qjv9gviklcs5psc19wrgklik6gd979rw1nzk";

     

       48
       48
       -
         SGr-IosevkaFixedSS15 = "0spga64nmnsbcrzvx7fqffbaxgps62qk90ap7ziqfbpvjmv1z7ig";

     

       49
       49
       -
         SGr-IosevkaFixedSS16 = "0yavrjd0b356kh32w4h022rrmk5cjs9zd7ibxfw8v4jzs0kyfcjy";

     

       50
       50
       -
         SGr-IosevkaFixedSS17 = "0aysk3lqvrrgng5sd0g40xsbkd74bqxksnm4mw4zngnp6mf59vvf";

     

       51
       51
       -
         SGr-IosevkaFixedSS18 = "0xd7d4j37xd2s2yhjc36fj6908s2zfl02cbn5yg2r8l02k4axi9v";

     

       52
       52
       -
         SGr-IosevkaSlab = "1y9xk9pyy16n239gn3l6355w5vmkb7chml3f7bhj4ad2ksiifvqx";

     

       53
       53
       -
         SGr-IosevkaSS01 = "1wz1vh7bqq1rwb7lgcb3864d7y5y1kf17hg83zg6061hdxfdsmhl";

     

       54
       54
       -
         SGr-IosevkaSS02 = "090idw6d1vqycs9gv6c3ajsgkk4wf66rag8gry9pcr54q9m5lym5";

     

       55
       55
       -
         SGr-IosevkaSS03 = "1p3q9gvx453506lrjcarvsqwqdbwgcdcrzq63p9gk2gm1n5kff85";

     

       56
       56
       -
         SGr-IosevkaSS04 = "1i22r2xkzj7271lhzaz2054nm5h6bdrz0jyagj93g2jdmqalfcpr";

     

       57
       57
       -
         SGr-IosevkaSS05 = "1qkxnj5wa2n9vk4v7ygyb4mrs52r1nh0847md42cj23ra5ym52xl";

     

       58
       58
       -
         SGr-IosevkaSS06 = "11mdlppqls83lrm2008bqzi1vmif6ficxby3p4ali61cv4w7svzx";

     

       59
       59
       -
         SGr-IosevkaSS07 = "1h7m4amjxhvhas3c7hxilfl8njn0i7d5rz6qczfwfd39v08iz5xy";

     

       60
       60
       -
         SGr-IosevkaSS08 = "1nq2c3a1s5lm1x4rx6xxpmxxkvvsg8rl2d98lriv80zhgs0lm4r8";

     

       61
       61
       -
         SGr-IosevkaSS09 = "1a90gi3gdfcid5kdrmyr0f7b5vg4akqmndxzrycrfbagbjdbi1v6";

     

       62
       62
       -
         SGr-IosevkaSS10 = "1ingh71nf7wkkgv4l6z4rbc43w4ca18x4ncr4f1jcyfliqqbf16k";

     

       63
       63
       -
         SGr-IosevkaSS11 = "0kgw3syf5ssym2hzz4xhg9dm078p6n1cj917bnvcymclam4b6c22";

     

       64
       64
       -
         SGr-IosevkaSS12 = "05vyx3fz0c9rrb4jfh194zw4bi8pafib6aa7cmiz1f6hz1vbacy5";

     

       65
       65
       -
         SGr-IosevkaSS13 = "0d6y1hjbnr30amcpakrwlmajcab1jlm3r5n7hhrc8d5jz35hqaa8";

     

       66
       66
       -
         SGr-IosevkaSS14 = "1l88ipygz2agjcqn44j1i5gnmqjrh793mwan67ilp1z5lgnzhw16";

     

       67
       67
       -
         SGr-IosevkaSS15 = "0j1svlf5c62bjhax31l9v2cn4qr5vx7hqpn8znv6035zdahilsqq";

     

       68
       68
       -
         SGr-IosevkaSS16 = "0q5dxd5zn75lfsxnvs219ii4nhc9gb6qaf42anzvqh7gq735kavh";

     

       69
       69
       -
         SGr-IosevkaSS17 = "0400s8yww3f98p797pppb4i3przdimbn432zah7dk5sgb0ywx95x";

     

       70
       70
       -
         SGr-IosevkaSS18 = "1ipbn79y1s095yqcji4wcysshnm1gkacb0xc5qh3lvsw8j2cr0v1";

     

       71
       71
       -
         SGr-IosevkaTerm = "1rqydb9y3nv8sb3vw874kr2f2lzphm1q7p1nlvv5sbwcd6fp53kf";

     

       72
       72
       -
         SGr-IosevkaTermCurly = "0gb5cxj0lhpi8mlsicfs3g9zzngfia0ggcmydv7c203bnza4d4ml";

     

       73
       73
       -
         SGr-IosevkaTermCurlySlab = "18anf1rzxgjc7df9jfr3pv0lxn6r7dn369lydqjlycpqjsfbfm30";

     

       74
       74
       -
         SGr-IosevkaTermSlab = "1fb1prmbdddh2jlsjnjw1gszxhccfp3bwjpzzs6b882bkryg8rmz";

     

       75
       75
       -
         SGr-IosevkaTermSS01 = "17y2bscaq7fjmy5cvwqycsmkzc5q0mp7lb99n2xrp9mrgf4yhqs0";

     

       76
       76
       -
         SGr-IosevkaTermSS02 = "126lpqnsx78i78nqi4l3n2va6588h8aw2ka7c2flj85vr29yisys";

     

       77
       77
       -
         SGr-IosevkaTermSS03 = "1wa8xl2m50kml1xj1yw29c3i6yzipqxcsryhi0k509cc9sxgnka7";

     

       78
       78
       -
         SGr-IosevkaTermSS04 = "0wfbi0hay0wrkrsa1v7hdy1l64mp5ipfpsl53jgf31panys7c683";

     

       79
       79
       -
         SGr-IosevkaTermSS05 = "0jk6cjlada8jxp68q05baw1f04waq5gmi01mipdrnvbw9kc30hyr";

     

       80
       80
       -
         SGr-IosevkaTermSS06 = "08jryrlih6kfnjj568i6imkrla1rgjmjr9wal16fng3gzfm8xq3p";

     

       81
       81
       -
         SGr-IosevkaTermSS07 = "0jiddj4qwrisq4v597dhvk15bkgiwx22ym64h2s5mkfqi7ddmfg3";

     

       82
       82
       -
         SGr-IosevkaTermSS08 = "0gjr3fd1cw78svlcdlq2dv8zzqrqijl57i51yll6g44vycfbfhh9";

     

       83
       83
       -
         SGr-IosevkaTermSS09 = "11x29agzb8s3a327zw6sb8sr1qkigc9psi4kinbmqzaxv86qgmx4";

     

       84
       84
       -
         SGr-IosevkaTermSS10 = "12x00b7fgci8jikayzhsf1p2qc0mrkff9n1rcq3xbwk03n0dykrn";

     

       85
       85
       -
         SGr-IosevkaTermSS11 = "0x836r4ham7ymlmpzxyk3bf3gb11rg40fdlin4liv4dj8mq2l8vb";

     

       86
       86
       -
         SGr-IosevkaTermSS12 = "1rk9lzxh1dgsnnk638p0fdxvvrnvbd5nxr3r2hx9qpfv72js19rk";

     

       87
       87
       -
         SGr-IosevkaTermSS13 = "0dbfmpx0asjichvgk4r2xi1w1mfsl5j496ih7cs5401vzwxm2xji";

     

       88
       88
       -
         SGr-IosevkaTermSS14 = "1433cfzzgxw1kb5alyjgfphq3ihwb8m45wpwnk7q9mlbap47wdff";

     

       89
       89
       -
         SGr-IosevkaTermSS15 = "15pi839rj3a72f85bbzxqysaykmd4lkfi9pxcvzr0yy0x2iy1cwz";

     

       90
       90
       -
         SGr-IosevkaTermSS16 = "1lfhgg5acmdxhkwwc2mp47sa835yhm0lj558gxcf59nd70hc3wak";

     

       91
       91
       -
         SGr-IosevkaTermSS17 = "14qp2i3f8r2bcgw8s8xnrykk34ik5p0d37pypf5rj8ph9fyfdjj1";

     

       92
       92
       -
         SGr-IosevkaTermSS18 = "0arw7wwgsr0a530jz7835m49ag4sp71zhs5xbc8sbhi9cqg94rdk";

     

       3
       3
       +
         Iosevka = "0p386cv1bkbrwx91hxxd0qf9y18sidhj8jzl0b7l0g5gi68v9z67";

     

       4
       4
       +
         IosevkaAile = "050j2bhbkl015kkmyz3qzxckfqpy0frg4800biqn20nfh0nd1wmw";

     

       5
       5
       +
         IosevkaCurly = "15fs984pbxvazhzcz941zrksg12jrqilflvzcpcnqfg0nyz7w79w";

     

       6
       6
       +
         IosevkaCurlySlab = "19n6sx5ag47ysa2qg64n5549r1ig33kzin5ln5mg6x5cfiir6j26";

     

       7
       7
       +
         IosevkaEtoile = "1syhrp6cifm989zybh2zvhdk2jwrck8mvmlgppw5wpz4q2d35k30";

     

       8
       8
       +
         IosevkaSlab = "16f7j3hqsfk2hnvwwnd5dszwf46r3a18njv1d1szkn2xnw55jgak";

     

       9
       9
       +
         IosevkaSS01 = "095rvb62j71hr5n13wxkbq3h36jr5gnv7536zycjlm0h34ff2ryn";

     

       10
       10
       +
         IosevkaSS02 = "1k880h5j2ynr88vgflvx7vjk88rh3xs6kblj82pb0li9fvl7c7wd";

     

       11
       11
       +
         IosevkaSS03 = "1jp9q00wjz47h66by4jrpfbkmzj15pvz2viqbl0p64kgmjnbak51";

     

       12
       12
       +
         IosevkaSS04 = "1djzfhpi92226a606zx9rkf8brvazilafv0bhwsx3zm7msnh1239";

     

       13
       13
       +
         IosevkaSS05 = "0k7yzz0xmpwgn9zyiwxz882lwi2xgm9kxp0d5hy684hbzapkydw2";

     

       14
       14
       +
         IosevkaSS06 = "1rph461k70yi745l99sfb5i29r0yf0i43v96jj5fgg82rswkjyb8";

     

       15
       15
       +
         IosevkaSS07 = "1idkdvfw6267vim2yspdcn8n92i4l7c4dvzgaqm7i3c4jis21cnr";

     

       16
       16
       +
         IosevkaSS08 = "02aiksqzccbzmcz81kp1rwxy9wjcanildagjnqksif7md55lsw99";

     

       17
       17
       +
         IosevkaSS09 = "1a5vgn5nlb8p5ypz3p9lqs10jfmjgam8iw4i5gm87xl0602nxf4w";

     

       18
       18
       +
         IosevkaSS10 = "051hkwkwgjdrb2011rzbq9hy0r26kxakryvhj5wr6cmh4gp59yz8";

     

       19
       19
       +
         IosevkaSS11 = "1gqidclxpcqyz3rc3skg3q3h53nhpkpll8ijb4b45sp3bldff110";

     

       20
       20
       +
         IosevkaSS12 = "18ijr79d3x4q52h4z4pba1p9l7hn20857v8nqn6nn59j6vrd1b2k";

     

       21
       21
       +
         IosevkaSS13 = "1rphwzi8zy39hjka6n5jcmqx9c05wgj0hkndgiyb8mdhi2nxl0wd";

     

       22
       22
       +
         IosevkaSS14 = "0ffyp9q5kwvf3d7qzqhaa3dpj0s3d0al76zsa8v92wahc1z20zm7";

     

       23
       23
       +
         IosevkaSS15 = "03dnpmjjvgnnagmqghnlxwd33xlg3frz44q0w0ri98pbls1zgysi";

     

       24
       24
       +
         IosevkaSS16 = "0vin643dgis6p81a3x4hfp2y9r0f5kmklpl88ql2pprcxlgr71qx";

     

       25
       25
       +
         IosevkaSS17 = "129g4d2xjcv0g8079dwsgc16z8dm8hsvk1l86sci32q34iwp53na";

     

       26
       26
       +
         IosevkaSS18 = "09m0qsgxqsja76g4ywjlxc4qc7wb0qkmm7mlx4fracy4jdq4niwk";

     

       27
       27
       +
         SGr-Iosevka = "0r3yg2gpg52kp6m63x16j6n54sv32q2vf38cm1p5lbpjd9zbfbi8";

     

       28
       28
       +
         SGr-IosevkaCurly = "1bba9f2hrxllxm13mc3lsgdf1f6nk5b84jgp6vrp0kgl6m1pkbls";

     

       29
       29
       +
         SGr-IosevkaCurlySlab = "18ypl4wrsd13zlb497nldf5lyd9c5ckc06dkq153884k518p51sy";

     

       30
       30
       +
         SGr-IosevkaFixed = "0cwv68dpql583ydxnlqkzj7c5hv1lhgkag7rl66yx3zsnxk4mrwb";

     

       31
       31
       +
         SGr-IosevkaFixedCurly = "01409k12sbw0hpkfbgj1168yp4pxkzazj3cxqc3kjas24hyk7kp9";

     

       32
       32
       +
         SGr-IosevkaFixedCurlySlab = "01y62dl3kcczl6wcsj5ccagf8pbqzmmwzf2kvdi3cr27krla944b";

     

       33
       33
       +
         SGr-IosevkaFixedSlab = "1bmw2n7wd8zz97754f9i9ks1nyfbnyl3z6hn4h9b8i7wbgf10123";

     

       34
       34
       +
         SGr-IosevkaFixedSS01 = "1scz7ag493v62q5azv2wv5habjmhdxcx56nh45ha65m1p0syjywg";

     

       35
       35
       +
         SGr-IosevkaFixedSS02 = "0hzgz8x4x06f3nw7z60zrvg2f28nzpxib1m76dvdq7cf1yjspwrw";

     

       36
       36
       +
         SGr-IosevkaFixedSS03 = "0mj7232ppva8hd7212rdz3l6inmgcy1ccicwf74j49zcj6d2i2l1";

     

       37
       37
       +
         SGr-IosevkaFixedSS04 = "14mjbkaf5q426225mfia2fpwywh3vq6dsw296acgg5ja80xsfm4r";

     

       38
       38
       +
         SGr-IosevkaFixedSS05 = "03ij2jsn1c6imbm42mhirn33dy66jlq6p854ss4scxgki4aiv2lb";

     

       39
       39
       +
         SGr-IosevkaFixedSS06 = "1s8ygxi0xgdwk3pvcnvhcbhqrcpmgipvs1w1v7jcb6mg5158s4xl";

     

       40
       40
       +
         SGr-IosevkaFixedSS07 = "183k6v2spd20578p8kfga54s9gzpfywjm4frdab0rnyffjhs1inr";

     

       41
       41
       +
         SGr-IosevkaFixedSS08 = "17mxmvmvn8l6yhd8ww69w81sv76zih8jhs9msz3ajrsrhq5glb9y";

     

       42
       42
       +
         SGr-IosevkaFixedSS09 = "0f8yrdi6n989v9ppb76gswsri9rnzyhi5cxvqmhmwixgb812crlc";

     

       43
       43
       +
         SGr-IosevkaFixedSS10 = "0i35zvqbr4sbafi07bvhcj4h1a6g5r3rgba57bi6zwihmmw6ysq8";

     

       44
       44
       +
         SGr-IosevkaFixedSS11 = "0zyrg10q3223q26kfnprmfanzck74943gqavyfy4iqq1dlwzq9sz";

     

       45
       45
       +
         SGr-IosevkaFixedSS12 = "1n9rcmxz3hwp300qcddlqydmj40ajy15cgv22z82qg608a3l1h14";

     

       46
       46
       +
         SGr-IosevkaFixedSS13 = "0b1zcqyn5zblqsz28myjw3py6c9cllml2nisyapsbs4yxy96sck7";

     

       47
       47
       +
         SGr-IosevkaFixedSS14 = "";

     

       48
       48
       +
         SGr-IosevkaFixedSS15 = "0cc7hik5d9cbfhwmazflwd6h3ddhy88892f1hr2z9bwgri47h2pp";

     

       49
       49
       +
         SGr-IosevkaFixedSS16 = "0cdi4jw5lig1i2v54dk35p9wjkl2bld6ldxxrg32smwik9zx9dpc";

     

       50
       50
       +
         SGr-IosevkaFixedSS17 = "1g7xqw50i589l5hqgb97gd1phyn9x1sij404k91g331bwmj4icl5";

     

       51
       51
       +
         SGr-IosevkaFixedSS18 = "19g3qprnfkr77p8zi14xdzyya5pssmv1rx8vsjahrkbyg2hxwcm7";

     

       52
       52
       +
         SGr-IosevkaSlab = "10pjqvqm1kssani9j1p4rryz3kz71jxrzh4xpr687j8sqjr0qkgh";

     

       53
       53
       +
         SGr-IosevkaSS01 = "10ls2xwg08m6nkmq9c7zfi9j5b957hwaxkb8yh136w0smd5lql07";

     

       54
       54
       +
         SGr-IosevkaSS02 = "121bbkybz8wxmpm0mrfc1fpa2n9l8624lcy867gf25kw4j0z360y";

     

       55
       55
       +
         SGr-IosevkaSS03 = "1p75ixf4myfs6wmc3z1jilkip34gjhmkkqs98js4adbzb14ys3fi";

     

       56
       56
       +
         SGr-IosevkaSS04 = "1mizbsfh7chzpdjpfbq47bvnz60n954jp7s8ni8mkafl2zm3jdja";

     

       57
       57
       +
         SGr-IosevkaSS05 = "0plaby57yqgz97hzypfmzlcp8aijycwnh7276ynzmy4irdiqariq";

     

       58
       58
       +
         SGr-IosevkaSS06 = "1gj6syx1zmhxiq2s33zza0wql9in0qcvbckb92yd51xsg8w5fwiq";

     

       59
       59
       +
         SGr-IosevkaSS07 = "0pdkwcr8lxq3gm03sv5cbicnb70jxbdymrmwk31lcrq0qf2mg0wl";

     

       60
       60
       +
         SGr-IosevkaSS08 = "1bfgv6l056pz421shil0z9vv4slzbqnl4q1dv422isffbxgbn28a";

     

       61
       61
       +
         SGr-IosevkaSS09 = "00rslbcc354phz8w5i2q2l9ds0vlpzym1n30rysc9w83yn4qnlnd";

     

       62
       62
       +
         SGr-IosevkaSS10 = "004mnamygjfcr09ylhzglxzclfi39yz81kqj87zynklnavb7yvzr";

     

       63
       63
       +
         SGr-IosevkaSS11 = "07m80h8kggxzpg2w0f5zx7r3nqjhwmx23l4rldbxgb4qgy08svlb";

     

       64
       64
       +
         SGr-IosevkaSS12 = "0pivpcmgxl4pgm4kfaid91jidpxvzdn0ma9dmi68nf0wyjxp9l2r";

     

       65
       65
       +
         SGr-IosevkaSS13 = "0nki8q2zykwc9cdrnqr941agfqz5l54nswy6388fmqyxp5d9j1jy";

     

       66
       66
       +
         SGr-IosevkaSS14 = "0p57i63v3iii56jj79pzm8jzbapjraiww3lda52wdsa4g3m3pyzl";

     

       67
       67
       +
         SGr-IosevkaSS15 = "1izkbr45bccwpx00crk2ib8ixa04j441iv25liib38zn7xgyf2cf";

     

       68
       68
       +
         SGr-IosevkaSS16 = "19xc6n5pn3xnng32rck0h5kfwy38yjzygbad4pm3ygqm6rh2rcs4";

     

       69
       69
       +
         SGr-IosevkaSS17 = "14n7ikpfry5bavwr9awhli94q46iby5997gdndwjgr0aq8hwk72d";

     

       70
       70
       +
         SGr-IosevkaSS18 = "1mif5zsmfs4cdb8y79awnzgk1m053j2fqnspmk4llfgv2knv6y75";

     

       71
       71
       +
         SGr-IosevkaTerm = "0q69644wdp5szk7ijzin8877jmfa7c0xw9dd7rznn41140hxy2ld";

     

       72
       72
       +
         SGr-IosevkaTermCurly = "0xaw2xmmcnmrxac37x4wwkywzbb1hniv9ngcil89937ih00f3v2l";

     

       73
       73
       +
         SGr-IosevkaTermCurlySlab = "1426k5q1kbci4y95yv2cf2b8ajp3q73kpiqg0xn43dp2ji1s7p3j";

     

       74
       74
       +
         SGr-IosevkaTermSlab = "0frv0sh6lsysn2xccpq59rlhdclpzqi44v0xw8vrpw1chw18pnqj";

     

       75
       75
       +
         SGr-IosevkaTermSS01 = "1dlwfzfjg7ayri9njdyhh8mmgr7lzj698qphgd1kgih9cvpsapxk";

     

       76
       76
       +
         SGr-IosevkaTermSS02 = "1j3zyj35dk15v68n7zs78vzgmsdqsvdwmw40zwznzkqy0jsll2ap";

     

       77
       77
       +
         SGr-IosevkaTermSS03 = "0bv33c5y1ja50v7l2702k0vlhjrig78i81wqf73cyy7gsis0q0gc";

     

       78
       78
       +
         SGr-IosevkaTermSS04 = "186fbcia31jyz2sgz3qpdmyh0g9qag64hcq2dcym2879qmgwzgm1";

     

       79
       79
       +
         SGr-IosevkaTermSS05 = "1mbyn3bdj1d23jj0zc89kq8aspa3g8zf3j3fnicw9ffc47a79kzm";

     

       80
       80
       +
         SGr-IosevkaTermSS06 = "0ypp71ydfzik6rfg037d928mvn6w7av13k7hkbzggi0q3l51dpl9";

     

       81
       81
       +
         SGr-IosevkaTermSS07 = "0a1ma9dxcq642r5090l25vlsc7ga7gylv4yfzcmr5frhi56a39gl";

     

       82
       82
       +
         SGr-IosevkaTermSS08 = "14bpsyzadhs8b7jf7fkcrj17pp42iakbvz4fd8ldy6slgzsv1xbb";

     

       83
       83
       +
         SGr-IosevkaTermSS09 = "07hwh8547hqsg4w4gdimc5cl3qqlc937xxc50py9r34rflilckzv";

     

       84
       84
       +
         SGr-IosevkaTermSS10 = "1iphz3isv37djyc3xl85b5zjp3760bf216fmg5v0lswxsfaisg8c";

     

       85
       85
       +
         SGr-IosevkaTermSS11 = "1f6axizf4d6jilcb1riznfrznrlsyf4ddaisr7clx91vd22mrcdl";

     

       86
       86
       +
         SGr-IosevkaTermSS12 = "05rx7mrq3nmqb1257gyw6sjq6y6gf2j5bkkabsj2b3iq1hwzkcdd";

     

       87
       87
       +
         SGr-IosevkaTermSS13 = "1x0q3cmdzxa6kvdrnqq5znrcici70cwxha9va99d1vadvz2qjbc3";

     

       88
       88
       +
         SGr-IosevkaTermSS14 = "07xqpca7ahkawcb4m0wf45ikwvm7nfgc5v10cfpn41jgnfighqf9";

     

       89
       89
       +
         SGr-IosevkaTermSS15 = "0ql2sfkayj3vpk86fvw76gnfcpfdaskxymlhb2ij1jz6ckgqgfny";

     

       90
       90
       +
         SGr-IosevkaTermSS16 = "1nr6ms7ybgb74k8zb38rb2rl9q20c8shkx2xfdmgx5qg86dwc9pd";

     

       91
       91
       +
         SGr-IosevkaTermSS17 = "0c75xp0w59wypiq8zhzpzwa6n8spmvzm1z067fwy8wmq8sp0i500";

     

       92
       92
       +
         SGr-IosevkaTermSS18 = "1rq4ra8al9x7dqv6l12y36pm4vrqkqx2c5rgzc3c6awnwk71rqbz";

     

       93
       93
        
       }

-53

pkgs/by-name/ka/karma-runner/fix-package-lock.patch

···

       1
       1
       -
       diff --git a/package-lock.json b/package-lock.json

     

       2
       2
       -
       index 413cf4d1..1d03d9f5 100644

     

       3
       3
       -
       --- a/package-lock.json

     

       4
       4
       -
       +++ b/package-lock.json

     

       5
       5
       -
       @@ -5226,36 +5226,6 @@

     

       6
       6
       -
              "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==",

     

       7
       7
       -
              "dev": true

     

       8
       8
       -
            },

     

       9
       9
       -
       -    "karma": {

     

       10
       10
       -
       -      "version": "file:",

     

       11
       11
       -
       -      "dev": true,

     

       12
       12
       -
       -      "requires": {

     

       13
       13
       -
       -        "@colors/colors": "1.5.0",

     

       14
       14
       -
       -        "body-parser": "^1.19.0",

     

       15
       15
       -
       -        "braces": "^3.0.2",

     

       16
       16
       -
       -        "chokidar": "^3.5.1",

     

       17
       17
       -
       -        "connect": "^3.7.0",

     

       18
       18
       -
       -        "di": "^0.0.1",

     

       19
       19
       -
       -        "dom-serialize": "^2.2.1",

     

       20
       20
       -
       -        "glob": "^7.1.7",

     

       21
       21
       -
       -        "graceful-fs": "^4.2.6",

     

       22
       22
       -
       -        "http-proxy": "^1.18.1",

     

       23
       23
       -
       -        "isbinaryfile": "^4.0.8",

     

       24
       24
       -
       -        "lodash": "^4.17.21",

     

       25
       25
       -
       -        "log4js": "^6.4.1",

     

       26
       26
       -
       -        "mime": "^2.5.2",

     

       27
       27
       -
       -        "minimatch": "^3.0.4",

     

       28
       28
       -
       -        "mkdirp": "^0.5.5",

     

       29
       29
       -
       -        "qjobs": "^1.2.0",

     

       30
       30
       -
       -        "range-parser": "^1.2.1",

     

       31
       31
       -
       -        "rimraf": "^3.0.2",

     

       32
       32
       -
       -        "socket.io": "^4.4.1",

     

       33
       33
       -
       -        "source-map": "^0.6.1",

     

       34
       34
       -
       -        "tmp": "^0.2.1",

     

       35
       35
       -
       -        "ua-parser-js": "^0.7.30",

     

       36
       36
       -
       -        "yargs": "^16.1.1"

     

       37
       37
       -
       -      }

     

       38
       38
       -
       -    },

     

       39
       39
       -
            "karma-browserify": {

     

       40
       40
       -
              "version": "7.0.0",

     

       41
       41
       -
              "resolved": "https://registry.npmjs.org/karma-browserify/-/karma-browserify-7.0.0.tgz",

     

       42
       42
       -
       diff --git a/package.json b/package.json

     

       43
       43
       -
       index 347d9e95..90f6d036 100644

     

       44
       44
       -
       --- a/package.json

     

       45
       45
       -
       +++ b/package.json

     

       46
       46
       -
       @@ -471,7 +471,6 @@

     

       47
       47
       -
            "eslint-plugin-standard": "^4.0.1",

     

       48
       48
       -
            "http2": "^3.3.6",

     

       49
       49
       -
            "jasmine-core": "^3.6.0",

     

       50
       50
       -
       -    "karma": ".",

     

       51
       51
       -
            "karma-browserify": "^7.0.0",

     

       52
       52
       -
            "karma-browserstack-launcher": "^1.6.0",

     

       53
       53
       -
            "karma-chai": "^0.1.0",

+10 -8

pkgs/by-name/ka/karma-runner/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildNpmPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         versionCheckHook,

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       buildNpmPackage rec {

     

       8
       9
        
         pname = "karma";

     

       9
       9
       -
         version = "6.4.2";

     

       10
       10
       +
         version = "6.4.4";

     

       10
       11
        
       

     

       11
       12
        
         src = fetchFromGitHub {

     

       12
       13
        
           owner = "karma-runner";

     

       13
       14
        
           repo = "karma";

     

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

     

       15
       15
       -
           hash = "sha256-v6IiLz65NS8GwM/FPqRxR5qcFDDu7EqloR0SIensdDI=";

     

       15
       15
       +
           tag = "v${version}";

     

       16
       16
       +
           hash = "sha256-RfEmzUMzgOY6YG0MBheCgwmwOU3C5G8hybH40gLmsr4=";

     

       16
       17
        
         };

     

       17
       18
        
       

     

       18
       18
       -
         patches = [

     

       19
       19
       -
           ./fix-package-lock.patch

     

       20
       20
       -
         ];

     

       19
       19
       +
         npmDepsHash = "sha256-bGtiGLwr9Bmi3Jx2DImpyLhPnxUo7q6YcMCxoxqOkGY=";

     

       21
       20
        
       

     

       22
       22
       -
         npmDepsHash = "sha256-nX4/96WdPEDZ6DASp+AOBbBbHyq+p2zIh2dZUbtmIPI=";

     

       21
       21
       +
         env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true;

     

       23
       22
        
       

     

       24
       24
       -
         env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true;

     

       23
       23
       +
         nativeInstallCheckInputs = [

     

       24
       24
       +
           versionCheckHook

     

       25
       25
       +
         ];

     

       26
       26
       +
         doInstallCheck = true;

     

       25
       27
        
       

     

       26
       28
        
         meta = {

     

       27
       29
        
           description = "Spectacular Test Runner for JavaScript";

+2 -2

pkgs/by-name/li/littlenavmap/atools.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "atools";

     

       10
       10
       -
         version = "4.0.16";

     

       10
       10
       +
         version = "4.0.17";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "albar965";

     

       14
       14
        
           repo = "atools";

     

       15
       15
        
           tag = "v${version}";

     

       16
       16
       -
           hash = "sha256-wPDE2CUHrf/WoksInYZ9UBEBMISqIkBYcMVu0NaxbmE=";

     

       16
       16
       +
           hash = "sha256-R5CbMdT8UsPiiIXFhmdAmNa1fKLPfUrWunlbwsHOVow=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

+4 -4

pkgs/by-name/li/littlenavmap/package.nix

···

       14
       14
        
           src = fetchFromGitHub {

     

       15
       15
        
             owner = "albar965";

     

       16
       16
        
             repo = "marble";

     

       17
       17
       -
             rev = "722acf7f8d79023f6c6a761063645a1470bb3935";

     

       17
       17
       +
             rev = "722acf7f8d79023f6c6a761063645a1470bb3935"; # branch lnm/1.1

     

       18
       18
        
             hash = "sha256-5GSa+xIQS9EgJXxMFUOA5jTtHJ6Dl4C9yAkFPIOrgo8=";

     

       19
       19
        
           };

     

       20
       20
        
       

     
···

       69
       69
        
       in

     

       70
       70
        
       stdenv.mkDerivation (finalAttrs: rec {

     

       71
       71
        
         inherit pname;

     

       72
       72
       -
         version = "3.0.16";

     

       72
       72
       +
         version = "3.0.17";

     

       73
       73
        
       

     

       74
       74
        
         src = fetchFromGitHub {

     

       75
       75
        
           owner = "albar965";

     

       76
       76
        
           repo = "littlenavmap";

     

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

     

       78
       78
       -
           hash = "sha256-QUgQV8WOAVowjGFpNbzl32gksQ2OnWtLfrJmBK2lJ6M=";

     

       77
       77
       +
           tag = "v${version}";

     

       78
       78
       +
           hash = "sha256-/1YB2uEQzT0K6IylpWDqOaMSENDR9GuyJNty+2C8kXM=";

     

       79
       79
        
         };

     

       80
       80
        
       

     

       81
       81
        
         nativeBuildInputs = [

pkgs/by-name/li/livekit/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildGoModule,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         nixosTests,

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       buildGoModule rec {

     
···

       22
       23
        
         postInstall = ''

     

       23
       24
        
           mv $out/bin/server $out/bin/livekit-server

     

       24
       25
        
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         passthru.tests = nixosTests.livekit;

     

       25
       28
        
       

     

       26
       29
        
         meta = with lib; {

     

       27
       30
        
           description = "End-to-end stack for WebRTC. SFU media server and SDKs";

pkgs/by-name/lk/lk-jwt-service/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildGoModule,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         nixosTests,

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       buildGoModule (finalAttrs: {

     
···

       16
       17
        
         };

     

       17
       18
        
       

     

       18
       19
        
         vendorHash = "sha256-47eJO1Ai78RuhlEPn/J1cd+YSqvmfUD8cuPZIqsdxvI=";

     

       20
       20
       +
       

     

       21
       21
       +
         passthru.tests = nixosTests.lk-jwt-service;

     

       19
       22
        
       

     

       20
       23
        
         meta = with lib; {

     

       21
       24
        
           changelog = "https://github.com/element-hq/lk-jwt-service/releases/tag/${finalAttrs.src.tag}";

+22 -18

pkgs/by-name/lo/local-ai/package.nix

···

       20
       20
        
         ncurses,

     

       21
       21
        
         which,

     

       22
       22
        
         opencv,

     

       23
       23
       +
         curl,

     

       23
       24
        
       

     

       24
       25
        
         enable_upx ? true,

     

       25
       26
        
         upx,

     
···

       28
       29
        
         # https://github.com/NixOS/rfcs/pull/169

     

       29
       30
        
       

     

       30
       31
        
         # CPU extensions

     

       31
       31
       -
         enable_avx ? true,

     

       32
       32
       -
         enable_avx2 ? true,

     

       32
       32
       +
         enable_avx ? stdenv.hostPlatform.isx86_64,

     

       33
       33
       +
         enable_avx2 ? stdenv.hostPlatform.isx86_64,

     

       33
       34
        
         enable_avx512 ? stdenv.hostPlatform.avx512Support,

     

       34
       34
       -
         enable_f16c ? true,

     

       35
       35
       -
         enable_fma ? true,

     

       35
       35
       +
         enable_f16c ? stdenv.hostPlatform.isx86_64,

     

       36
       36
       +
         enable_fma ? stdenv.hostPlatform.isx86_64,

     

       36
       37
        
       

     

       37
       38
        
         with_openblas ? false,

     

       38
       39
        
         openblas,

     
···

       105
       106
        
             final: prev: {

     

       106
       107
        
               name = "llama-cpp-grpc";

     

       107
       108
        
               src = fetchFromGitHub {

     

       108
       108
       -
                 owner = "ggml-org";

     

       109
       109
       +
                 owner = "ggerganov";

     

       109
       110
        
                 repo = "llama.cpp";

     

       110
       110
       -
                 rev = "300907b2110cc17b4337334dc397e05de2d8f5e0";

     

       111
       111
       -
                 hash = "sha256-7jPgToZ8Xs+8DfXP5WFWZKhqFdYcZ9yFzWVKjvOttIA=";

     

       111
       111
       +
                 rev = "d6d2c2ab8c8865784ba9fef37f2b2de3f2134d33";

     

       112
       112
       +
                 hash = "sha256-b9B5I3EbBFrkWc6RLXMWcCRKayyWjlGuQrogUcrISrc=";

     

       112
       113
        
                 fetchSubmodules = true;

     

       113
       114
        
               };

     

       114
       115
        
               postPatch =

     
···

       116
       117
        
                 + ''

     

       117
       118
        
                   cd examples

     

       118
       119
        
                   cp -r --no-preserve=mode ${src}/backend/cpp/llama grpc-server

     

       119
       119
       -
                   cp llava/clip.* llava/llava.* grpc-server

     

       120
       120
       +
                   cp llava/clip* llava/llava.* grpc-server

     

       120
       121
        
                   printf "\nadd_subdirectory(grpc-server)" >> CMakeLists.txt

     

       121
       122
        
       

     

       122
       123
        
                   cp ${src}/backend/backend.proto grpc-server

     
···

       137
       138
        
                 protobuf # provides also abseil_cpp as propagated build input

     

       138
       139
        
                 grpc

     

       139
       140
        
                 openssl

     

       141
       141
       +
                 curl

     

       140
       142
        
               ];

     

       141
       143
        
             }

     

       142
       144
        
           )).override

     
···

       286
       288
        
           src = fetchFromGitHub {

     

       287
       289
        
             owner = "PABannier";

     

       288
       290
        
             repo = "bark.cpp";

     

       289
       289
       -
             rev = "v1.0.0";

     

       291
       291
       +
             tag = "v1.0.0";

     

       290
       292
        
             hash = "sha256-wOcggRWe8lsUzEj/wqOAUlJVypgNFmit5ISs9fbwoCE=";

     

       291
       293
        
             fetchSubmodules = true;

     

       292
       294
        
           };

     
···

       303
       305
        
         stable-diffusion = stdenv.mkDerivation {

     

       304
       306
        
           name = "stable-diffusion";

     

       305
       307
        
           src = fetchFromGitHub {

     

       306
       306
       -
             owner = "leejet";

     

       308
       308
       +
             owner = "richiejp";

     

       307
       309
        
             repo = "stable-diffusion.cpp";

     

       308
       308
       -
             rev = "d46ed5e184b97c2018dc2e8105925bdb8775e02c";

     

       309
       309
       -
             hash = "sha256-5i2HjkdaQEmlUWeHucQyrS8zNS+xyB7Zj+1oA/xsv2k=";

     

       310
       310
       +
             rev = "53e3b17eb3d0b5760ced06a1f98320b68b34aaae"; # branch cuda-fix

     

       311
       311
       +
             hash = "sha256-z56jafOdibpX+XhRsrc7ieGbeug4bf737/UobqkpBV0=";

     

       310
       312
        
             fetchSubmodules = true;

     

       311
       313
        
           };

     

       312
       314
        
           installPhase = ''

     
···

       316
       318
        
               | tar cf - --null --files-from - \

     

       317
       319
        
               | tar xf - -C $out/build

     

       318
       320
        
           '';

     

       321
       321
       +
           cmakeFlags = [

     

       322
       322
       +
             (lib.cmakeFeature "GGML_BUILD_NUMBER" "1")

     

       323
       323
       +
           ];

     

       319
       324
        
           nativeBuildInputs = [ cmake ];

     

       320
       325
        
           buildInputs = [ opencv ];

     

       321
       326
        
         };

     
···

       331
       336
        
             stdenv;

     

       332
       337
        
       

     

       333
       338
        
         pname = "local-ai";

     

       334
       334
       -
         version = "2.26.0";

     

       339
       339
       +
         version = "2.28.0";

     

       335
       340
        
         src = fetchFromGitHub {

     

       336
       341
        
           owner = "go-skynet";

     

       337
       342
        
           repo = "LocalAI";

     

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

     

       339
       339
       -
           hash = "sha256-eHylgEbPNQ8CVLlstkeQH6jqYOKfvel1uU5ro8DkLJs=";

     

       343
       343
       +
           tag = "v${version}";

     

       344
       344
       +
           hash = "sha256-Hpz0dGkgasSY/FGO7mDzqsLjXut0LdQ9PUXGaURUOlY=";

     

       340
       345
        
         };

     

       341
       346
        
       

     

       342
       347
        
         prepare-sources =

     
···

       355
       360
        
         self = buildGo123Module.override { stdenv = effectiveStdenv; } {

     

       356
       361
        
           inherit pname version src;

     

       357
       362
        
       

     

       358
       358
       -
           vendorHash = "sha256-6loR8bvt5BlijufUBVDpxNS/cVCMmbaCwEhYpJKwGys=";

     

       363
       363
       +
           vendorHash = "sha256-1OY/y1AeL0K+vOU4Jk/cj7rToVLC9EkkNhgifB+icDM=";

     

       359
       364
        
       

     

       360
       365
        
           env.NIX_CFLAGS_COMPILE = " -isystem ${opencv}/include/opencv4";

     

       361
       366
        
       

     
···

       364
       369
        
               # TODO: add silero-vad

     

       365
       370
        
               sed -i Makefile \

     

       366
       371
        
                 -e '/mod download/ d' \

     

       367
       367
       -
                 -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \

     

       368
       372
        
                 -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \

     

       369
       373
        
                 -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \

     

       370
       374
        
                 -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/silero-vad/ d' \

     
···

       383
       387
        
             + ''

     

       384
       388
        
               shopt -s extglob

     

       385
       389
        
               mkdir -p backend-assets/grpc

     

       386
       386
       -
               cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-avx2

     

       390
       390
       +
               cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-fallback

     

       387
       391
        
               cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc

     

       388
       392
        
       

     

       389
       393
        
               mkdir -p backend/cpp/llama/llama.cpp

+1 -1

pkgs/by-name/lo/local-ai/tests.nix

···

       84
       84
        
                 nodes.machine = {

     

       85
       85
        
                   imports = [ common-config ];

     

       86
       86
        
                   virtualisation.cores = 2;

     

       87
       87
       -
                   virtualisation.memorySize = 4096;

     

       87
       87
       +
                   virtualisation.memorySize = 3 * 4096;

     

       88
       88
        
                   services.local-ai.models = models;

     

       89
       89
        
                 };

     

       90
       90
        
                 passthru = {

-94

pkgs/by-name/ne/neocomp/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         asciidoc,

     

       6
       6
       -
         docbook_xml_dtd_45,

     

       7
       7
       -
         docbook_xsl,

     

       8
       8
       -
         freetype,

     

       9
       9
       -
         judy,

     

       10
       10
       -
         libGL,

     

       11
       11
       -
         libconfig,

     

       12
       12
       -
         libdrm,

     

       13
       13
       -
         libxml2,

     

       14
       14
       -
         libxslt,

     

       15
       15
       -
         libXcomposite,

     

       16
       16
       -
         libXdamage,

     

       17
       17
       -
         libXext,

     

       18
       18
       -
         libXinerama,

     

       19
       19
       -
         libXrandr,

     

       20
       20
       -
         libXrender,

     

       21
       21
       -
         libXres,

     

       22
       22
       -
         pcre,

     

       23
       23
       -
         pkg-config,

     

       24
       24
       -
       }:

     

       25
       25
       -
       

     

       26
       26
       -
       stdenv.mkDerivation rec {

     

       27
       27
       -
         pname = "neocomp";

     

       28
       28
       -
         version = "unstable-2021-04-06";

     

       29
       29
       -
       

     

       30
       30
       -
         src = fetchFromGitHub {

     

       31
       31
       -
           owner = "DelusionalLogic";

     

       32
       32
       -
           repo = "NeoComp";

     

       33
       33
       -
           rev = "ccd340d7b2dcd3f828aff958a638cc23686aee6f";

     

       34
       34
       -
           sha256 = "sha256-tLLEwpAGNVTC+N41bM7pfskIli4Yvc95wH2/NT0OZ+8=";

     

       35
       35
       -
         };

     

       36
       36
       -
       

     

       37
       37
       -
         nativeBuildInputs = [

     

       38
       38
       -
           asciidoc

     

       39
       39
       -
           docbook_xml_dtd_45

     

       40
       40
       -
           docbook_xsl

     

       41
       41
       -
           pkg-config

     

       42
       42
       -
         ];

     

       43
       43
       -
       

     

       44
       44
       -
         buildInputs = [

     

       45
       45
       -
           freetype

     

       46
       46
       -
           judy

     

       47
       47
       -
           libGL

     

       48
       48
       -
           libconfig

     

       49
       49
       -
           libdrm

     

       50
       50
       -
           libxml2

     

       51
       51
       -
           libxslt

     

       52
       52
       -
           libXcomposite

     

       53
       53
       -
           libXdamage

     

       54
       54
       -
           libXext

     

       55
       55
       -
           libXinerama

     

       56
       56
       -
           libXrandr

     

       57
       57
       -
           libXrender

     

       58
       58
       -
           libXres

     

       59
       59
       -
           pcre

     

       60
       60
       -
         ];

     

       61
       61
       -
       

     

       62
       62
       -
         makeFlags = [

     

       63
       63
       -
           "PREFIX=${placeholder "out"}"

     

       64
       64
       -
           "CFGDIR=${placeholder "out"}/etc/xdg/neocomp"

     

       65
       65
       -
           "ASTDIR=${placeholder "out"}/share/neocomp/assets"

     

       66
       66
       -
           "COMPTON_VERSION=${version}"

     

       67
       67
       -
         ];

     

       68
       68
       -
       

     

       69
       69
       -
         postPatch = ''

     

       70
       70
       -
           substituteInPlace src/compton.c --replace \

     

       71
       71
       -
             "assets_add_path(\"./assets/\");" \

     

       72
       72
       -
             "assets_add_path(\"$out/share/neocomp/assets/\");"

     

       73
       73
       -
           substituteInPlace src/assets/assets.c --replace \

     

       74
       74
       -
             "#define MAX_PATH_LENGTH 64" \

     

       75
       75
       -
             "#define MAX_PATH_LENGTH 128"

     

       76
       76
       -
         '';

     

       77
       77
       -
       

     

       78
       78
       -
         meta = with lib; {

     

       79
       79
       -
           homepage = "https://github.com/DelusionalLogic/NeoComp";

     

       80
       80
       -
           license = licenses.gpl3Only;

     

       81
       81
       -
           maintainers = with maintainers; [

     

       82
       82
       -
             twey

     

       83
       83
       -
             moni

     

       84
       84
       -
           ];

     

       85
       85
       -
           platforms = platforms.linux;

     

       86
       86
       -
           description = "Fork of Compton, a compositor for X11";

     

       87
       87
       -
           longDescription = ''

     

       88
       88
       -
             NeoComp is a (hopefully) fast and (hopefully) simple compositor

     

       89
       89
       -
             for X11, focused on delivering frames from the window to the

     

       90
       90
       -
             framebuffer as quickly as possible.

     

       91
       91
       -
           '';

     

       92
       92
       -
           mainProgram = "neocomp";

     

       93
       93
       -
         };

     

       94
       94
       -
       }

+2 -2

pkgs/by-name/nz/nzbhydra2/package.nix

···

       10
       10
        
       }:

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "nzbhydra2";

     

       13
       13
       -
         version = "7.12.3";

     

       13
       13
       +
         version = "7.13.0";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchzip {

     

       16
       16
        
           url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";

     

       17
       17
       -
           hash = "sha256-uTtkMusIhDbD+CojOSJ59Kqo6iSuIqWLqd6T5tYuX4k=";

     

       17
       17
       +
           hash = "sha256-jMiSVzAulM7xs6Z3KYIFHjJHx8dWFVbr/PqNeItV81g=";

     

       18
       18
        
           stripRoot = false;

     

       19
       19
        
         };

     

       20
       20

+14 -13

pkgs/by-name/oe/oelint-adv/package.nix

···

       7
       7
        
       

     

       8
       8
        
       python3Packages.buildPythonApplication rec {

     

       9
       9
        
         pname = "oelint-adv";

     

       10
       10
       -
         version = "6.7.1";

     

       10
       10
       +
         version = "7.2.6";

     

       11
       11
        
         pyproject = true;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "priv-kweihmann";

     

       15
       15
        
           repo = "oelint-adv";

     

       16
       16
        
           tag = version;

     

       17
       17
       -
           hash = "sha256-rJ1M5YRXcKbDEGhy0G+N2dGD3sx8KFUfLJSLthYQNtU=";

     

       17
       17
       +
           hash = "sha256-QNTC8jO6RjHNaHVNSqAoM1xAhYc35G5A7D0yfwmd6+U=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       +
         postPatch = ''

     

       21
       21
       +
           substituteInPlace setup.cfg \

     

       22
       22
       +
             --replace-fail "--random-order-bucket=global" "" \

     

       23
       23
       +
             --replace-fail "--random-order"               "" \

     

       24
       24
       +
             --replace-fail "--force-sugar"                "" \

     

       25
       25
       +
             --replace-fail "--old-summary"                ""

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       20
       28
        
         build-system = with python3Packages; [

     

       21
       29
        
           setuptools

     

       22
       30
        
         ];

     
···

       25
       33
        
           anytree

     

       26
       34
        
           argcomplete

     

       27
       35
        
           colorama

     

       36
       36
       +
           oelint-data

     

       28
       37
        
           oelint-parser

     

       29
       38
        
           urllib3

     

       30
       39
        
         ];

     
···

       50
       59
        
       

     

       51
       60
        
         passthru.updateScript = nix-update-script { };

     

       52
       61
        
       

     

       53
       53
       -
         postPatch = ''

     

       54
       54
       -
           substituteInPlace setup.cfg \

     

       55
       55
       -
             --replace-fail "--random-order-bucket=global" "" \

     

       56
       56
       -
             --replace-fail "--random-order"               "" \

     

       57
       57
       -
             --replace-fail "--force-sugar"                "" \

     

       58
       58
       -
             --replace-fail "--old-summary"                ""

     

       59
       59
       -
         '';

     

       60
       60
       -
       

     

       61
       61
       -
         meta = with lib; {

     

       62
       62
       +
         meta = {

     

       62
       63
        
           description = "Advanced bitbake-recipe linter";

     

       63
       64
        
           mainProgram = "oelint-adv";

     

       64
       65
        
           homepage = "https://github.com/priv-kweihmann/oelint-adv";

     

       65
       66
        
           changelog = "https://github.com/priv-kweihmann/oelint-adv/releases/tag/${version}";

     

       66
       66
       -
           license = licenses.bsd2;

     

       67
       67
       -
           maintainers = with maintainers; [ otavio ];

     

       67
       67
       +
           license = lib.licenses.bsd2;

     

       68
       68
       +
           maintainers = with lib.maintainers; [ otavio ];

     

       68
       69
        
         };

     

       69
       70
        
       }

+4 -9

pkgs/by-name/ox/oxidized/Gemfile

···

       1
       1
        
       source 'https://rubygems.org'

     

       2
       2
        
       

     

       3
       3
       -
       gem 'oxidized', '0.30.1'

     

       4
       4
       -
       gem 'oxidized-web', '0.14.0'

     

       5
       5
       -
       

     

       6
       6
       -
       # The version on rubygems is not up2date

     

       7
       7
       -
       gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d'

     

       8
       8
       -
       

     

       9
       9
       -
       # Fix for https://github.com/ytti/oxidized/issues/2769

     

       10
       10
       -
       gem 'psych', '~> 3.3.2'

     

       11
       11
       -
       

     

       3
       3
       +
       gem 'oxidized', '0.33.0'

     

       4
       4
       +
       gem 'oxidized-web', '0.16.0'

     

       5
       5
       +
       gem 'oxidized-script', '0.7.0'

     

       6
       6
       +
       gem 'psych', '~> 5.0'

+35 -28

pkgs/by-name/ox/oxidized/Gemfile.lock

···

       1
       1
       -
       GIT

     

       2
       2
       -
         remote: https://github.com/ytti/oxidized-script.git

     

       3
       3
       -
         revision: 988cded5d89f52e274afb545bd3e011e19d5d22d

     

       4
       4
       -
         ref: 988cded5d89f52e274afb545bd3e011e19d5d22d

     

       5
       5
       -
         specs:

     

       6
       6
       -
           oxidized-script (0.6.0)

     

       7
       7
       -
             oxidized (~> 0.28)

     

       8
       8
       -
             slop (~> 4.6)

     

       9
       9
       -
       

     

       10
       1
        
       GEM

     

       11
       2
        
         remote: https://rubygems.org/

     

       12
       3
        
         specs:

     

       13
       4
        
           asetus (0.4.0)

     

       14
       5
        
           base64 (0.2.0)

     

       15
       6
        
           bcrypt_pbkdf (1.1.1)

     

       7
       7
       +
           bcrypt_pbkdf (1.1.1-arm64-darwin)

     

       8
       8
       +
           bcrypt_pbkdf (1.1.1-x86_64-darwin)

     

       16
       9
        
           charlock_holmes (0.7.9)

     

       17
       10
        
           date (3.4.1)

     

       18
       11
        
           ed25519 (1.3.0)

     
···

       23
       16
        
             thor

     

       24
       17
        
             tilt

     

       25
       18
        
           htmlentities (4.3.4)

     

       26
       26
       -
           json (2.10.2)

     

       19
       19
       +
           json (2.11.3)

     

       27
       20
        
           logger (1.7.0)

     

       28
       21
        
           multi_json (1.15.0)

     

       29
       22
        
           mustermann (3.0.3)

     
···

       31
       24
        
           net-ftp (0.3.8)

     

       32
       25
        
             net-protocol

     

       33
       26
        
             time

     

       27
       27
       +
           net-http-digest_auth (1.4.1)

     

       34
       28
        
           net-protocol (0.2.2)

     

       35
       29
        
             timeout

     

       36
       30
        
           net-scp (4.1.0)

     
···

       38
       32
        
           net-ssh (7.3.0)

     

       39
       33
        
           net-telnet (0.2.0)

     

       40
       34
        
           nio4r (2.7.4)

     

       41
       41
       -
           oxidized (0.30.1)

     

       42
       42
       -
             asetus (~> 0.1)

     

       35
       35
       +
           ostruct (0.6.1)

     

       36
       36
       +
           oxidized (0.33.0)

     

       37
       37
       +
             asetus (~> 0.4)

     

       43
       38
        
             bcrypt_pbkdf (~> 1.0)

     

       44
       39
        
             ed25519 (~> 1.2)

     

       45
       40
        
             net-ftp (~> 0.2)

     

       46
       46
       -
             net-scp (~> 4.0)

     

       47
       47
       -
             net-ssh (~> 7.1)

     

       41
       41
       +
             net-http-digest_auth (~> 1.4)

     

       42
       42
       +
             net-scp (~> 4.1)

     

       43
       43
       +
             net-ssh (~> 7.3)

     

       48
       44
        
             net-telnet (~> 0.2)

     

       49
       49
       -
             psych (~> 3.3.2)

     

       45
       45
       +
             ostruct (~> 0.6)

     

       46
       46
       +
             psych (~> 5.0)

     

       50
       47
        
             rugged (~> 1.6)

     

       51
       48
        
             slop (~> 4.6)

     

       52
       52
       -
           oxidized-web (0.14.0)

     

       49
       49
       +
           oxidized-script (0.7.0)

     

       50
       50
       +
             oxidized (~> 0.29)

     

       51
       51
       +
             slop (~> 4.6)

     

       52
       52
       +
           oxidized-web (0.16.0)

     

       53
       53
        
             charlock_holmes (~> 0.7.5)

     

       54
       54
        
             emk-sinatra-url-for (~> 0.2)

     

       55
       55
        
             haml (~> 6.0)

     

       56
       56
        
             htmlentities (~> 4.3)

     

       57
       57
        
             json (~> 2.3)

     

       58
       58
       -
             oxidized (~> 0.26)

     

       59
       59
       -
             puma (>= 3.11.4, < 6.5.0)

     

       60
       60
       -
             sinatra (>= 1.4.6, < 5.0)

     

       61
       61
       -
             sinatra-contrib (>= 1.4.6, < 5.0)

     

       62
       62
       -
           psych (3.3.4)

     

       63
       63
       -
           puma (6.4.3)

     

       58
       58
       +
             ostruct (~> 0.6)

     

       59
       59
       +
             oxidized (~> 0.31)

     

       60
       60
       +
             puma (>= 3.11.4)

     

       61
       61
       +
             sinatra (>= 1.4.6)

     

       62
       62
       +
             sinatra-contrib (>= 1.4.6)

     

       63
       63
       +
           psych (5.2.3)

     

       64
       64
       +
             date

     

       65
       65
       +
             stringio

     

       66
       66
       +
           puma (6.6.0)

     

       64
       67
        
             nio4r (~> 2.0)

     

       65
       65
       -
           rack (3.1.12)

     

       68
       68
       +
           rack (3.1.13)

     

       66
       69
        
           rack-protection (4.1.1)

     

       67
       70
        
             base64 (>= 0.1.0)

     

       68
       71
        
             logger (>= 1.6.0)

     
···

       86
       89
        
             sinatra (= 4.1.1)

     

       87
       90
        
             tilt (~> 2.0)

     

       88
       91
        
           slop (4.10.1)

     

       92
       92
       +
           stringio (3.1.7)

     

       89
       93
        
           temple (0.10.3)

     

       90
       94
        
           thor (1.3.2)

     

       91
       95
        
           tilt (2.6.0)

     
···

       94
       98
        
           timeout (0.4.3)

     

       95
       99
        
       

     

       96
       100
        
       PLATFORMS

     

       101
       101
       +
         arm64-darwin

     

       97
       102
        
         ruby

     

       103
       103
       +
         x86_64-darwin

     

       104
       104
       +
         x86_64-linux

     

       98
       105
        
       

     

       99
       106
        
       DEPENDENCIES

     

       100
       100
       -
         oxidized (= 0.30.1)

     

       101
       101
       -
         oxidized-script!

     

       102
       102
       -
         oxidized-web (= 0.14.0)

     

       103
       103
       -
         psych (~> 3.3.2)

     

       107
       107
       +
         oxidized (= 0.33.0)

     

       108
       108
       +
         oxidized-script (= 0.7.0)

     

       109
       109
       +
         oxidized-web (= 0.16.0)

     

       110
       110
       +
         psych (~> 5.0)

     

       104
       111
        
       

     

       105
       112
        
       BUNDLED WITH

     

       106
       106
       -
          2.6.2

     

       113
       113
       +
          2.5.22

+53 -18

pkgs/by-name/ox/oxidized/gemset.nix

···

       100
       100
        
           platforms = [ ];

     

       101
       101
        
           source = {

     

       102
       102
        
             remotes = [ "https://rubygems.org" ];

     

       103
       103
       -
             sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";

     

       103
       103
       +
             sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s";

     

       104
       104
        
             type = "gem";

     

       105
       105
        
           };

     

       106
       106
       -
           version = "2.10.2";

     

       106
       106
       +
           version = "2.11.3";

     

       107
       107
        
         };

     

       108
       108
        
         logger = {

     

       109
       109
        
           groups = [ "default" ];

     
···

       150
       150
        
           };

     

       151
       151
        
           version = "0.3.8";

     

       152
       152
        
         };

     

       153
       153
       +
         net-http-digest_auth = {

     

       154
       154
       +
           groups = [ "default" ];

     

       155
       155
       +
           platforms = [ ];

     

       156
       156
       +
           source = {

     

       157
       157
       +
             remotes = [ "https://rubygems.org" ];

     

       158
       158
       +
             sha256 = "1nq859b0gh2vjhvl1qh1zrk09pc7p54r9i6nnn6sb06iv07db2jb";

     

       159
       159
       +
             type = "gem";

     

       160
       160
       +
           };

     

       161
       161
       +
           version = "1.4.1";

     

       162
       162
       +
         };

     

       153
       163
        
         net-protocol = {

     

       154
       164
        
           dependencies = [ "timeout" ];

     

       155
       165
        
           groups = [ "default" ];

     
···

       202
       212
        
           };

     

       203
       213
        
           version = "2.7.4";

     

       204
       214
        
         };

     

       215
       215
       +
         ostruct = {

     

       216
       216
       +
           groups = [ "default" ];

     

       217
       217
       +
           platforms = [ ];

     

       218
       218
       +
           source = {

     

       219
       219
       +
             remotes = [ "https://rubygems.org" ];

     

       220
       220
       +
             sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";

     

       221
       221
       +
             type = "gem";

     

       222
       222
       +
           };

     

       223
       223
       +
           version = "0.6.1";

     

       224
       224
       +
         };

     

       205
       225
        
         oxidized = {

     

       206
       226
        
           dependencies = [

     

       207
       227
        
             "asetus"

     

       208
       228
        
             "bcrypt_pbkdf"

     

       209
       229
        
             "ed25519"

     

       210
       230
        
             "net-ftp"

     

       231
       231
       +
             "net-http-digest_auth"

     

       211
       232
        
             "net-scp"

     

       212
       233
        
             "net-ssh"

     

       213
       234
        
             "net-telnet"

     

       235
       235
       +
             "ostruct"

     

       214
       236
        
             "psych"

     

       215
       237
        
             "rugged"

     

       216
       238
        
             "slop"

     
···

       219
       241
        
           platforms = [ ];

     

       220
       242
        
           source = {

     

       221
       243
        
             remotes = [ "https://rubygems.org" ];

     

       222
       222
       -
             sha256 = "0ry9rwksjb80wxd42zv5m5444n5hwhkbr4spa895jk2c1k5q1y0c";

     

       244
       244
       +
             sha256 = "02vprgsqaafrnkz9fhj27mv8ngir4h1g07zc6s6f7gja5awfwqzm";

     

       223
       245
        
             type = "gem";

     

       224
       246
        
           };

     

       225
       225
       -
           version = "0.30.1";

     

       247
       247
       +
           version = "0.33.0";

     

       226
       248
        
         };

     

       227
       249
        
         oxidized-script = {

     

       228
       250
        
           dependencies = [

     
···

       232
       254
        
           groups = [ "default" ];

     

       233
       255
        
           platforms = [ ];

     

       234
       256
        
           source = {

     

       235
       235
       -
             fetchSubmodules = false;

     

       236
       236
       -
             rev = "988cded5d89f52e274afb545bd3e011e19d5d22d";

     

       237
       237
       -
             sha256 = "13vglj6w37xd6dqfn98xdan3kqbs460akj1rdr4bm7lsrpa281gf";

     

       238
       238
       -
             type = "git";

     

       239
       239
       -
             url = "https://github.com/ytti/oxidized-script.git";

     

       257
       257
       +
             remotes = [ "https://rubygems.org" ];

     

       258
       258
       +
             sha256 = "0734py1wb97zgjlsdd9rfw60pm0pnp02a53z0va5w5ng7sjn2zli";

     

       259
       259
       +
             type = "gem";

     

       240
       260
        
           };

     

       241
       241
       -
           version = "0.6.0";

     

       261
       261
       +
           version = "0.7.0";

     

       242
       262
        
         };

     

       243
       263
        
         oxidized-web = {

     

       244
       264
        
           dependencies = [

     
···

       247
       267
        
             "haml"

     

       248
       268
        
             "htmlentities"

     

       249
       269
        
             "json"

     

       270
       270
       +
             "ostruct"

     

       250
       271
        
             "oxidized"

     

       251
       272
        
             "puma"

     

       252
       273
        
             "sinatra"

     
···

       256
       277
        
           platforms = [ ];

     

       257
       278
        
           source = {

     

       258
       279
        
             remotes = [ "https://rubygems.org" ];

     

       259
       259
       -
             sha256 = "0mf1kxjg49fxf988sqd9cni8j5r8xsp3218370ppinsy39l50782";

     

       280
       280
       +
             sha256 = "1w16ha8rdnqb9j7v9mjdgfh4p0fdmwfxfprs167267ag1mah4268";

     

       260
       281
        
             type = "gem";

     

       261
       282
        
           };

     

       262
       262
       -
           version = "0.14.0";

     

       283
       283
       +
           version = "0.16.0";

     

       263
       284
        
         };

     

       264
       285
        
         psych = {

     

       286
       286
       +
           dependencies = [

     

       287
       287
       +
             "date"

     

       288
       288
       +
             "stringio"

     

       289
       289
       +
           ];

     

       265
       290
        
           groups = [ "default" ];

     

       266
       291
        
           platforms = [ ];

     

       267
       292
        
           source = {

     

       268
       293
        
             remotes = [ "https://rubygems.org" ];

     

       269
       269
       -
             sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph";

     

       294
       294
       +
             sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";

     

       270
       295
        
             type = "gem";

     

       271
       296
        
           };

     

       272
       272
       -
           version = "3.3.4";

     

       297
       297
       +
           version = "5.2.3";

     

       273
       298
        
         };

     

       274
       299
        
         puma = {

     

       275
       300
        
           dependencies = [ "nio4r" ];

     
···

       277
       302
        
           platforms = [ ];

     

       278
       303
        
           source = {

     

       279
       304
        
             remotes = [ "https://rubygems.org" ];

     

       280
       280
       -
             sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914";

     

       305
       305
       +
             sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";

     

       281
       306
        
             type = "gem";

     

       282
       307
        
           };

     

       283
       283
       -
           version = "6.4.3";

     

       308
       308
       +
           version = "6.6.0";

     

       284
       309
        
         };

     

       285
       310
        
         rack = {

     

       286
       311
        
           groups = [ "default" ];

     

       287
       312
        
           platforms = [ ];

     

       288
       313
        
           source = {

     

       289
       314
        
             remotes = [ "https://rubygems.org" ];

     

       290
       290
       -
             sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00";

     

       315
       315
       +
             sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p";

     

       291
       316
        
             type = "gem";

     

       292
       317
        
           };

     

       293
       293
       -
           version = "3.1.12";

     

       318
       318
       +
           version = "3.1.13";

     

       294
       319
        
         };

     

       295
       320
        
         rack-protection = {

     

       296
       321
        
           dependencies = [

     
···

       385
       410
        
             type = "gem";

     

       386
       411
        
           };

     

       387
       412
        
           version = "4.10.1";

     

       413
       413
       +
         };

     

       414
       414
       +
         stringio = {

     

       415
       415
       +
           groups = [ "default" ];

     

       416
       416
       +
           platforms = [ ];

     

       417
       417
       +
           source = {

     

       418
       418
       +
             remotes = [ "https://rubygems.org" ];

     

       419
       419
       +
             sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v";

     

       420
       420
       +
             type = "gem";

     

       421
       421
       +
           };

     

       422
       422
       +
           version = "3.1.7";

     

       388
       423
        
         };

     

       389
       424
        
         temple = {

     

       390
       425
        
           groups = [ "default" ];

+3 -3

pkgs/by-name/pr/pretix/package.nix

···

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
        
         pname = "pretix";

     

       43
       43
       -
         version = "2025.3.0";

     

       43
       43
       +
         version = "2025.4.0";

     

       44
       44
        
       

     

       45
       45
        
         src = fetchFromGitHub {

     

       46
       46
        
           owner = "pretix";

     

       47
       47
        
           repo = "pretix";

     

       48
       48
        
           rev = "refs/tags/v${version}";

     

       49
       49
       -
           hash = "sha256-D/j1RzKhRvdqMxcHg/NPZSoroN3etzh6/V38XV9W1cs=";

     

       49
       49
       +
           hash = "sha256-K/llv85CWp+V70BiYAR7lT+urGdLbXBhWpCptxUqDrc=";

     

       50
       50
        
         };

     

       51
       51
        
       

     

       52
       52
        
         npmDeps = buildNpmPackage {

     
···

       54
       54
        
           inherit version src;

     

       55
       55
        
       

     

       56
       56
        
           sourceRoot = "${src.name}/src/pretix/static/npm_dir";

     

       57
       57
       -
           npmDepsHash = "sha256-6qjG0p7pLtTd9CBVVzoeUPv6Vdr5se1wuI5qcKJH2Os=";

     

       57
       57
       +
           npmDepsHash = "sha256-FqwgHmIUfcipVbeXmN4uYPHdmnuaSgOQ9LHgKRf16ys=";

     

       58
       58
        
       

     

       59
       59
        
           dontBuild = true;

     

       60
       60

-25

pkgs/by-name/px/pxlib/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       5
       5
       -
         intltool,

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       stdenv.mkDerivation rec {

     

       9
       9
       -
         pname = "pxlib";

     

       10
       10
       -
         version = "0.6.8";

     

       11
       11
       -
         src = fetchurl {

     

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

     

       13
       13
       -
           sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz";

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         nativeBuildInputs = [ intltool ];

     

       17
       17
       -
       

     

       18
       18
       -
         meta = with lib; {

     

       19
       19
       -
           description = "Library to read and write Paradox files";

     

       20
       20
       -
           homepage = "https://pxlib.sourceforge.net/";

     

       21
       21
       -
           license = licenses.gpl2;

     

       22
       22
       -
           platforms = platforms.all;

     

       23
       23
       -
           maintainers = [ maintainers.winpat ];

     

       24
       24
       -
         };

     

       25
       25
       -
       }

-39

pkgs/by-name/px/pxview/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       5
       5
       -
         pkg-config,

     

       6
       6
       -
         perl,

     

       7
       7
       -
         perlPackages,

     

       8
       8
       -
         pxlib,

     

       9
       9
       -
       }:

     

       10
       10
       -
       

     

       11
       11
       -
       stdenv.mkDerivation rec {

     

       12
       12
       -
         pname = "pxview";

     

       13
       13
       -
         version = "0.2.5";

     

       14
       14
       -
         src = fetchurl {

     

       15
       15
       -
           url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz";

     

       16
       16
       -
           sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         buildInputs = [

     

       20
       20
       -
           pxlib

     

       21
       21
       -
           perl

     

       22
       22
       -
         ] ++ (with perlPackages; [ libxml_perl ]);

     

       23
       23
       -
         nativeBuildInputs = [ pkg-config ];

     

       24
       24
       -
       

     

       25
       25
       -
         configureFlags = [ "--with-pxlib=${pxlib.out}" ];

     

       26
       26
       -
       

     

       27
       27
       -
         # https://sourceforge.net/p/pxlib/bugs/12/

     

       28
       28
       -
         LDFLAGS = "-lm";

     

       29
       29
       -
         hardeningDisable = [ "format" ];

     

       30
       30
       -
       

     

       31
       31
       -
         meta = with lib; {

     

       32
       32
       -
           description = "Program to convert Paradox databases";

     

       33
       33
       -
           mainProgram = "pxview";

     

       34
       34
       -
           homepage = "https://pxlib.sourceforge.net/pxview/";

     

       35
       35
       -
           license = licenses.gpl2;

     

       36
       36
       -
           platforms = platforms.linux;

     

       37
       37
       -
           maintainers = [ maintainers.winpat ];

     

       38
       38
       -
         };

     

       39
       39
       -
       }

+3 -3

pkgs/by-name/ri/ripunzip/package.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage rec {

     

       13
       13
        
         pname = "ripunzip";

     

       14
       14
       -
         version = "2.0.1";

     

       14
       14
       +
         version = "2.0.2";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "google";

     

       18
       18
        
           repo = "ripunzip";

     

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

     

       20
       20
       -
           hash = "sha256-Y4p3CFE8MyEQJ/af0g2/EL4kto/VZABvD5OS0rRuo8g=";

     

       20
       20
       +
           hash = "sha256-IPa7LvwB6RqebJXWKz4DZE5o/ob0sV7mVp6a/F0qsbU=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         useFetchCargoVendor = true;

     

       24
       24
       -
         cargoHash = "sha256-lhStxg8H2T29eFYDFAZhFjOyH4hfRwEmcewm7Ec/oTw=";

     

       24
       24
       +
         cargoHash = "sha256-3bzIScXVxT8HFmFc0svincvTyuT2F2nfFs/3ApnCBUs=";

     

       25
       25
        
       

     

       26
       26
        
         buildInputs = [ openssl ];

     

       27
       27
        
         nativeBuildInputs = [ pkg-config ];

+2 -2

pkgs/by-name/so/source-meta-json-schema/package.nix

···

       5
       5
        
         cmake,

     

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
       -
         version = "9.1.0";

     

       8
       8
       +
         version = "9.2.1";

     

       9
       9
        
       in

     

       10
       10
        
       stdenv.mkDerivation (finalAttrs: {

     

       11
       11
        
         pname = "source-meta-json-schema";

     
···

       15
       15
        
           owner = "sourcemeta";

     

       16
       16
        
           repo = "jsonschema";

     

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

     

       18
       18
       -
           hash = "sha256-YxIRDTAAvkltT4HGUvPt/davarGRfE808OoI9UheqCA=";

     

       18
       18
       +
           hash = "sha256-VWq0BPVQRUmMXf6YZ4lid7EPPERA818UqE18EtayUus=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/th/thrift-ls/package.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "thrift-ls";

     

       9
       9
       -
         version = "0.2.5";

     

       9
       9
       +
         version = "0.2.7";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "joyme123";

     

       13
       13
        
           repo = "thrift-ls";

     

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

     

       15
       15
       -
           hash = "sha256-BkkXvmJ1XmDamU2Mt0BjbSnNVwlBxphW1FvE4x32ja0=";

     

       15
       15
       +
           hash = "sha256-QX4ChPjHIY0GtjqmZH5Q4veC+VnMntYIQvwwSds8UUo=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4=";

     

       18
       18
       +
         vendorHash = "sha256-SGCJ12BxjFUQ7bnaNY0bvrrtm2qNNrwYKKfNEi1lPco=";

     

       19
       19
        
       

     

       20
       20
        
         postInstall = ''

     

       21
       21
        
           mv $out/bin/thrift-ls $out/bin/thriftls

+2 -2

pkgs/desktops/rox/rox-filer/default.nix

···

       6
       6
        
         pkg-config,

     

       7
       7
        
         wrapGAppsHook3,

     

       8
       8
        
         libxml2,

     

       9
       9
       -
         gtk,

     

       9
       9
       +
         gtk2,

     

       10
       10
        
         libSM,

     

       11
       11
        
         shared-mime-info,

     

       12
       12
        
       }:

     
···

       26
       26
        
         ];

     

       27
       27
        
         buildInputs = [

     

       28
       28
        
           libxml2

     

       29
       29
       -
           gtk

     

       29
       29
       +
           gtk2

     

       30
       30
        
           shared-mime-info

     

       31
       31
        
           libSM

     

       32
       32
        
         ];

+2 -1

pkgs/development/libraries/gtk-mac-integration/default.nix

···

       6
       6
        
         pkg-config,

     

       7
       7
        
         glib,

     

       8
       8
        
         gtk-doc,

     

       9
       9
       -
         gtk,

     

       9
       9
       +
         gtk ? gtk3,

     

       10
       10
       +
         gtk3,

     

       10
       11
        
         gobject-introspection,

     

       11
       12
        
       }:

     

       12
       13

+28 -31

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fontconfig,

     

       6
       5
        
         graphviz,

     

       7
       7
       -
         poetry-core,

     

       8
       8
       -
         pytest7CheckHook,

     

       9
       9
       -
         pythonOlder,

     

       10
       10
       -
         six,

     

       11
       11
       -
         replaceVars,

     

       12
       12
       -
         withGraphviz ? true,

     

       6
       6
       +
       

     

       7
       7
       +
         # build-system

     

       8
       8
       +
         pdm-backend,

     

       9
       9
       +
       

     

       10
       10
       +
         # tests

     

       11
       11
       +
         pytest-cov-stub,

     

       12
       12
       +
         pytestCheckHook,

     

       13
       13
       +
         pyyaml,

     

       14
       14
       +
         test2ref,

     

       15
       15
       +
         fontconfig,

     

       13
       16
        
       }:

     

       14
       17
        
       

     

       15
       18
        
       buildPythonPackage rec {

     

       16
       19
        
         pname = "anytree";

     

       17
       17
       -
         version = "2.12.1";

     

       18
       18
       -
         format = "pyproject";

     

       19
       19
       -
       

     

       20
       20
       -
         disabled = pythonOlder "3.7";

     

       20
       20
       +
         version = "2.13.0";

     

       21
       21
       +
         pyproject = true;

     

       21
       22
        
       

     

       22
       23
        
         src = fetchFromGitHub {

     

       23
       24
        
           owner = "c0fec0de";

     

       24
       25
        
           repo = "anytree";

     

       25
       26
        
           tag = version;

     

       26
       26
       -
           hash = "sha256-5HU8kR3B2RHiGBraQ2FTgVtGHJi+Lha9U/7rpNsYCCI=";

     

       27
       27
       +
           hash = "sha256-kFNYJMWagpqixs84+AaNkh/28asLBJhibTP8LEEe4XY=";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       29
       -
         patches = lib.optionals withGraphviz [

     

       30
       30
       -
           (replaceVars ./graphviz.patch {

     

       31
       31
       -
             inherit graphviz;

     

       32
       32
       -
           })

     

       33
       33
       -
         ];

     

       34
       34
       -
       

     

       35
       30
        
         postPatch = ''

     

       36
       36
       -
           # drop [project.urls] section, poetry-core 2.0 compat issue

     

       37
       37
       -
           sed -i "/project\.urls/,+4d" pyproject.toml

     

       31
       31
       +
           substituteInPlace src/anytree/exporter/dotexporter.py \

     

       32
       32
       +
             --replace-fail \

     

       33
       33
       +
               'cmd = ["dot"' \

     

       34
       34
       +
               'cmd = ["${lib.getExe' graphviz "dot"}"'

     

       38
       35
        
         '';

     

       39
       36
        
       

     

       40
       40
       -
         nativeBuildInputs = [ poetry-core ];

     

       37
       37
       +
         build-system = [ pdm-backend ];

     

       41
       38
        
       

     

       42
       42
       -
         propagatedBuildInputs = [ six ];

     

       43
       43
       -
       

     

       44
       44
       -
         nativeCheckInputs = [ pytest7CheckHook ];

     

       39
       39
       +
         nativeCheckInputs = [

     

       40
       40
       +
           pytest-cov-stub

     

       41
       41
       +
           pytestCheckHook

     

       42
       42
       +
           pyyaml

     

       43
       43
       +
           test2ref

     

       44
       44
       +
         ];

     

       45
       45
        
       

     

       46
       46
        
         # Tests print “Fontconfig error: Cannot load default config file”

     

       47
       47
       -
         preCheck = lib.optionalString withGraphviz ''

     

       47
       47
       +
         preCheck = ''

     

       48
       48
        
           export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf

     

       49
       49
        
         '';

     

       50
       50
        
       

     

       51
       51
       -
         # Circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree

     

       52
       52
       -
         doCheck = withGraphviz;

     

       53
       53
       -
       

     

       54
       51
        
         pythonImportsCheck = [ "anytree" ];

     

       55
       52
        
       

     

       56
       56
       -
         meta = with lib; {

     

       53
       53
       +
         meta = {

     

       57
       54
        
           description = "Powerful and Lightweight Python Tree Data Structure";

     

       58
       55
        
           homepage = "https://github.com/c0fec0de/anytree";

     

       59
       56
        
           changelog = "https://github.com/c0fec0de/anytree/releases/tag/${version}";

     

       60
       60
       -
           license = licenses.asl20;

     

       61
       61
       -
           maintainers = with maitnainers; [ ];

     

       57
       57
       +
           license = lib.licenses.asl20;

     

       58
       58
       +
           maintainers = with lib.maitnainers; [ ];

     

       62
       59
        
         };

     

       63
       60
        
       }

-13

pkgs/development/python-modules/anytree/graphviz.patch

···

       1
       1
       -
       diff --git a/anytree/exporter/dotexporter.py b/anytree/exporter/dotexporter.py

     

       2
       2
       -
       index 9c10a68..209a952 100644

     

       3
       3
       -
       --- a/anytree/exporter/dotexporter.py

     

       4
       4
       -
       +++ b/anytree/exporter/dotexporter.py

     

       5
       5
       -
       @@ -228,7 +228,7 @@ class DotExporter(object):

     

       6
       6
       -
                    for line in self:

     

       7
       7
       -
                        dotfile.write(("%s\n" % line).encode("utf-8"))

     

       8
       8
       -
                    dotfile.flush()

     

       9
       9
       -
       -            cmd = ["dot", dotfilename, "-T", fileformat, "-o", filename]

     

       10
       10
       -
       +            cmd = ["@graphviz@/bin/dot", dotfilename, "-T", fileformat, "-o", filename]

     

       11
       11
       -
                    check_call(cmd)

     

       12
       12
       -
                try:

     

       13
       13
       -
                    remove(dotfilename)

+21 -28

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

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         fetchpatch,

     

       6
       5
        
       

     

       7
       6
        
         # build-system

     

       7
       7
       +
         pybind11,

     

       8
       8
       +
         scikit-build-core,

     

       9
       9
       +
         setuptools-scm,

     

       10
       10
       +
       

     

       11
       11
       +
         # nativeBuildInputs

     

       8
       12
        
         cmake,

     

       9
       9
       -
         scikit-build,

     

       10
       10
       -
         setuptools,

     

       11
       11
       -
         setuptools-scm,

     

       12
       12
       -
         pybind11,

     

       13
       13
       +
         ninja,

     

       13
       14
        
       

     

       15
       15
       +
         # buildInputs

     

       14
       16
        
         zlib,

     

       15
       17
        
       

     

       16
       18
        
         # dependencies

     
···

       19
       21
        
         pydantic,

     

       20
       22
        
         rich,

     

       21
       23
        
       

     

       22
       22
       -
         # checks

     

       24
       24
       +
         # tests

     

       25
       25
       +
         addBinToPathHook,

     

       23
       26
        
         awkward,

     

       24
       27
        
         pytestCheckHook,

     

       25
       28
        
         scipy,

     
···

       27
       30
        
       

     

       28
       31
        
       buildPythonPackage rec {

     

       29
       32
        
         pname = "correctionlib";

     

       30
       30
       -
         version = "2.6.4";

     

       33
       33
       +
         version = "2.7.0";

     

       31
       34
        
         pyproject = true;

     

       32
       35
        
       

     

       33
       36
        
         src = fetchFromGitHub {

     

       34
       37
        
           owner = "cms-nanoAOD";

     

       35
       38
        
           repo = "correctionlib";

     

       36
       39
        
           tag = "v${version}";

     

       37
       37
       -
           hash = "sha256-l+JjW/giGzU00z0jBN3D4KB/LjTIxeJb3CS+Ge0gbiA=";

     

       38
       40
        
           fetchSubmodules = true;

     

       41
       41
       +
           hash = "sha256-aLTeyDOo80p8xzl/IPnpT3BOjS2qOYn/Z7pidcLoEY8=";

     

       39
       42
        
         };

     

       40
       43
        
       

     

       41
       41
       -
         patches = [

     

       42
       42
       -
           # fix https://github.com/Tencent/rapidjson/issues/2277

     

       43
       43
       -
           (fetchpatch {

     

       44
       44
       -
             url = "https://github.com/Tencent/rapidjson/pull/719.diff";

     

       45
       45
       -
             hash = "sha256-xarSfi9o73KoJo0ijT0G8fyTSYVuY0+9rLEtfUwas0Q=";

     

       46
       46
       -
             extraPrefix = "rapidjson/";

     

       47
       47
       -
             stripLen = 1;

     

       48
       48
       -
           })

     

       44
       44
       +
         build-system = [

     

       45
       45
       +
           pybind11

     

       46
       46
       +
           scikit-build-core

     

       47
       47
       +
           setuptools-scm

     

       49
       48
        
         ];

     

       50
       49
        
       

     

       51
       51
       -
         build-system = [

     

       50
       50
       +
         nativeBuildInputs = [

     

       52
       51
        
           cmake

     

       53
       53
       -
           scikit-build

     

       54
       54
       -
           setuptools

     

       55
       55
       -
           setuptools-scm

     

       56
       56
       -
           pybind11

     

       52
       52
       +
           ninja

     

       57
       53
        
         ];

     

       54
       54
       +
         dontUseCmakeConfigure = true;

     

       58
       55
        
       

     

       59
       56
        
         buildInputs = [ zlib ];

     

       60
       57
        
       

     
···

       65
       62
        
           rich

     

       66
       63
        
         ];

     

       67
       64
        
       

     

       68
       68
       -
         dontUseCmakeConfigure = true;

     

       69
       69
       -
       

     

       70
       65
        
         nativeCheckInputs = [

     

       66
       66
       +
           # One test requires running the produced `correctionlib` binary

     

       67
       67
       +
           addBinToPathHook

     

       68
       68
       +
       

     

       71
       69
        
           awkward

     

       72
       70
        
           pytestCheckHook

     

       73
       71
        
           scipy

     

       74
       72
        
         ];

     

       75
       73
        
       

     

       76
       74
        
         pythonImportsCheck = [ "correctionlib" ];

     

       77
       77
       -
       

     

       78
       78
       -
         # One test requires running the produced `correctionlib` binary

     

       79
       79
       -
         preCheck = ''

     

       80
       80
       -
           export PATH=$out/bin:$PATH

     

       81
       81
       -
         '';

     

       82
       75
        
       

     

       83
       76
        
         meta = {

     

       84
       77
        
           description = "Provides a well-structured JSON data format for a wide variety of ad-hoc correction factors encountered in a typical HEP analysis";

+2 -2

pkgs/development/python-modules/django-otp/default.nix

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "django-otp";

     

       15
       15
       -
         version = "1.5.4";

     

       15
       15
       +
         version = "1.6.0";

     

       16
       16
        
         pyproject = true;

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "django-otp";

     

       20
       20
        
           repo = "django-otp";

     

       21
       21
        
           tag = "v${version}";

     

       22
       22
       -
           hash = "sha256-Hwi0Z5/e91peGbp+GvL/gCtUI4hcJ4kevJMWe9sFvYk=";

     

       22
       22
       +
           hash = "sha256-kK7aU2W89557vrzJF6XtmItIZlOsxibciyMlbRDT93c=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         build-system = [ hatchling ];

+2 -2

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

···

       27
       27
        
       

     

       28
       28
        
       buildPythonPackage rec {

     

       29
       29
        
         pname = "djangorestframework";

     

       30
       30
       -
         version = "3.15.2";

     

       30
       30
       +
         version = "3.16.0";

     

       31
       31
        
         pyproject = true;

     

       32
       32
        
         disabled = pythonOlder "3.6";

     

       33
       33
        
       

     
···

       35
       35
        
           owner = "encode";

     

       36
       36
        
           repo = "django-rest-framework";

     

       37
       37
        
           rev = version;

     

       38
       38
       -
           hash = "sha256-ne0sk4m11Ha77tNmCsdhj7QVmCkYj5GjLn/dLF4qxU8=";

     

       38
       38
       +
           hash = "sha256-LFq8mUx+jAFFnQTfysYs+DSN941p+8h9mDDOp+LO7VU=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         build-system = [ setuptools ];

+2 -2

pkgs/development/python-modules/langgraph-checkpoint/default.nix

···

       23
       23
        
       

     

       24
       24
        
       buildPythonPackage rec {

     

       25
       25
        
         pname = "langgraph-checkpoint";

     

       26
       26
       -
         version = "2.0.24";

     

       26
       26
       +
         version = "2.0.25";

     

       27
       27
        
         pyproject = true;

     

       28
       28
        
       

     

       29
       29
        
         src = fetchFromGitHub {

     

       30
       30
        
           owner = "langchain-ai";

     

       31
       31
        
           repo = "langgraph";

     

       32
       32
        
           tag = "checkpoint==${version}";

     

       33
       33
       -
           hash = "sha256-NlTpBXBeADlIHQDlt0muJEuoKOgXiAtAo8GoU5CsvZo=";

     

       33
       33
       +
           hash = "sha256-MmbdG5oYLG3rwJ1kr9oJuaWc0Wo7nvqEoFwO9DAw7oM=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         sourceRoot = "${src.name}/libs/checkpoint";

+41

pkgs/development/python-modules/oelint-data/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         setuptools,

     

       6
       6
       +
         oelint-parser,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       buildPythonPackage rec {

     

       10
       10
       +
         pname = "oelint-data";

     

       11
       11
       +
         version = "1.0.10";

     

       12
       12
       +
         pyproject = true;

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitHub {

     

       15
       15
       +
           owner = "priv-kweihmann";

     

       16
       16
       +
           repo = "oelint-data";

     

       17
       17
       +
           tag = version;

     

       18
       18
       +
           hash = "sha256-lBy/aGxcmJ3v5f+0YAJtuk0IK4WpL5iFrgKjyoLswro=";

     

       19
       19
       +
         };

     

       20
       20
       +
       

     

       21
       21
       +
         build-system = [

     

       22
       22
       +
           setuptools

     

       23
       23
       +
         ];

     

       24
       24
       +
       

     

       25
       25
       +
         dependencies = [

     

       26
       26
       +
           oelint-parser

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [ "oelint_data" ];

     

       30
       30
       +
       

     

       31
       31
       +
         # No tests

     

       32
       32
       +
         doCheck = false;

     

       33
       33
       +
       

     

       34
       34
       +
         meta = {

     

       35
       35
       +
           description = "Data for oelint-adv";

     

       36
       36
       +
           homepage = "https://github.com/priv-kweihmann/oelint-data";

     

       37
       37
       +
           changelog = "https://github.com/priv-kweihmann/oelint-data/releases/tag/${version}";

     

       38
       38
       +
           license = lib.licenses.bsd2;

     

       39
       39
       +
           maintainers = with lib.maintainers; [ GaetanLepage ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+4 -20

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

···

       51
       51
        
       

     

       52
       52
        
       buildPythonPackage rec {

     

       53
       53
        
         pname = "openusd";

     

       54
       54
       -
         version = "24.11";

     

       54
       54
       +
         version = "25.02a";

     

       55
       55
        
         pyproject = false;

     

       56
       56
        
       

     

       57
       57
        
         src = fetchFromGitHub {

     

       58
       58
        
           owner = "PixarAnimationStudios";

     

       59
       59
        
           repo = "OpenUSD";

     

       60
       60
        
           tag = "v${version}";

     

       61
       61
       -
           hash = "sha256-ugTb28DAn8D3URxCyGeptf7F3YpL7bX4++lyVN+apas=";

     

       61
       61
       +
           hash = "sha256-QFwG6kOLM+R+QIAozk/Dbldj8LRt9kCJv0W/EGHkq6Q=";

     

       62
       62
        
         };

     

       63
       63
        
       

     

       64
       64
        
         stdenv = python.stdenv;

     
···

       72
       72
        
             url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/a07a6b4d1da19bfc499db49641d74fb7c1a71e9b.patch?full_index=1";

     

       73
       73
        
             hash = "sha256-Gww6Ll2nKwpcxMY9lnf5BZ3eqUWz1rik9P3mPKDOf+Y=";

     

       74
       74
        
           })

     

       75
       75
       -
           # https://github.com/PixarAnimationStudios/OpenUSD/issues/3442

     

       76
       76
       -
           # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 1

     

       77
       77
       -
           (fetchpatch {

     

       78
       78
       -
             name = "explicitly-adding-template-keyword.patch";

     

       79
       79
       -
             url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/274cf7c6fe1c121d095acd38dd1a33214e0c8448.patch?full_index=1";

     

       80
       80
       -
             hash = "sha256-nlw7o2jVWV9f1Lzl32UXcRVXcWnfyMNv9Mp4SVgFvyw=";

     

       81
       81
       -
           })

     

       82
       82
       -
           # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 2

     

       83
       83
       -
           (fetchpatch {

     

       84
       84
       -
             name = "fix-removes-unused-path.patch";

     

       85
       85
       -
             url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/5a6437e44269534bfde0c35cc2c7bdef087b70e8.patch?full_index=1";

     

       86
       86
       -
             hash = "sha256-X2v14U0pJjd4IMD8viXK2/onVFqUabJTXwDGRFKDZ+g=";

     

       87
       87
       -
           })

     

       88
       75
        
         ];

     

       89
       76
        
       

     

       90
       77
        
         env.OSL_LOCATION = "${osl}";

     
···

       141
       128
        
             libX11

     

       142
       129
        
             libXt

     

       143
       130
        
           ]

     

       144
       144
       -
       

     

       145
       131
        
           ++ lib.optionals withOsl [ osl ]

     

       146
       132
        
           ++ lib.optionals withUsdView [ qt6.qtbase ]

     

       147
       147
       -
           ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [

     

       148
       148
       -
             qt6.qtbase

     

       149
       149
       -
             qt6.qtwayland

     

       150
       150
       -
           ];

     

       133
       133
       +
           ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ];

     

       151
       134
        
       

     

       152
       135
        
         propagatedBuildInputs =

     

       153
       136
        
           [

     
···

       187
       170
        
             for interchange between graphics applications.

     

       188
       171
        
           '';

     

       189
       172
        
           homepage = "https://openusd.org/";

     

       173
       173
       +
           changelog = "https://github.com/PixarAnimationStudios/OpenUSD/${src.tag}/CHANGELOG.md";

     

       190
       174
        
           license = lib.licenses.tost;

     

       191
       175
        
           maintainers = with lib.maintainers; [

     

       192
       176
        
             shaddydc

+45

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

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         pdm-backend,

     

       6
       6
       +
         binaryornot,

     

       7
       7
       +
         pytest-cov-stub,

     

       8
       8
       +
         pytestCheckHook,

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       buildPythonPackage rec {

     

       12
       12
       +
         pname = "test2ref";

     

       13
       13
       +
         version = "0.8.2";

     

       14
       14
       +
         pyproject = true;

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "nbiotcloud";

     

       18
       18
       +
           repo = "test2ref";

     

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

     

       20
       20
       +
           hash = "sha256-Rgm7qZc1pFY/9gwzHjnI305Ch9enXzzWRsPZ7CQjzpQ=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         build-system = [

     

       24
       24
       +
           pdm-backend

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         dependencies = [

     

       28
       28
       +
           binaryornot

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         pythonImportsCheck = [ "test2ref" ];

     

       32
       32
       +
       

     

       33
       33
       +
         nativeCheckInputs = [

     

       34
       34
       +
           pytest-cov-stub

     

       35
       35
       +
           pytestCheckHook

     

       36
       36
       +
         ];

     

       37
       37
       +
       

     

       38
       38
       +
         meta = {

     

       39
       39
       +
           description = "Testing Against Learned Reference Data";

     

       40
       40
       +
           homepage = "https://github.com/nbiotcloud/test2ref";

     

       41
       41
       +
           changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/v${version}";

     

       42
       42
       +
           license = lib.licenses.mit;

     

       43
       43
       +
           maintainers = with lib.maintainers; [ GaetanLepage ];

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+2 -2

pkgs/development/python-modules/types-s3transfer/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "types-s3transfer";

     

       11
       11
       -
         version = "0.11.5";

     

       11
       11
       +
         version = "0.12.0";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
        
         disabled = pythonOlder "3.8";

     
···

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           pname = "types_s3transfer";

     

       18
       18
        
           inherit version;

     

       19
       19
       -
           hash = "sha256-+pGVAG7qPf3VGvX1Gz3DpPV1aW8yO7AgLQPdPq6gEWY=";

     

       19
       19
       +
           hash = "sha256-+PWSAUgekENihzvwvjJn8lnWCtlG69/LhH0JKh+ib5g=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         build-system = [ setuptools ];

+2 -2

pkgs/tools/X11/xbindkeys-config/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       -
         gtk,

     

       5
       5
       +
         gtk2,

     

       6
       6
        
         pkg-config,

     

       7
       7
        
         procps,

     

       8
       8
        
         makeWrapper,

     
···

       21
       21
        
           pkg-config

     

       22
       22
        
           makeWrapper

     

       23
       23
        
         ];

     

       24
       24
       -
         buildInputs = [ gtk ];

     

       24
       24
       +
         buildInputs = [ gtk2 ];

     

       25
       25
        
       

     

       26
       26
        
         src = fetchurl {

     

       27
       27
        
           url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz";

+2 -2

pkgs/tools/misc/gbdfed/default.nix

···

       4
       4
        
         fetchurl,

     

       5
       5
        
         pkg-config,

     

       6
       6
        
         freetype,

     

       7
       7
       -
         gtk,

     

       7
       7
       +
         gtk2-x11,

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     
···

       19
       19
        
         nativeBuildInputs = [ pkg-config ];

     

       20
       20
        
         buildInputs = [

     

       21
       21
        
           freetype

     

       22
       22
       -
           gtk

     

       22
       22
       +
           gtk2-x11

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         patches = [ ./Makefile.patch ];

pkgs/top-level/aliases.nix

···

       1213
       1213
        
       

     

       1214
       1214
        
         ncdu_2 = ncdu; # Added 2022-07-22

     

       1215
       1215
        
         neocities-cli = neocities; # Added 2024-07-31

     

       1216
       1216
       +
         neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28

     

       1216
       1217
        
         netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02

     

       1217
       1218
        
         netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22

     

       1218
       1219
        
         nextcloud29 = throw ''

     
···

       1519
       1520
        
         proxmark3-rrg = proxmark3; # Added 2023-07-25

     

       1520
       1521
        
         psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14

     

       1521
       1522
        
         pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09

     

       1523
       1523
       +
         pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28

     

       1524
       1524
       +
         pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28

     

       1522
       1525
        
         pynac = throw "'pynac' has been removed as it was broken and unmaintained"; # Added 2025-03-18

     

       1523
       1526
        
         pyo3-pack = maturin;

     

       1524
       1527
        
         pypi2nix = throw "pypi2nix has been removed due to being unmaintained";

+10 -24

pkgs/top-level/all-packages.nix

···

       1623
       1623
        
         xst = callPackage ../applications/terminal-emulators/st/xst.nix { };

     

       1624
       1624
        
         mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { };

     

       1625
       1625
        
       

     

       1626
       1626
       -
         stupidterm = callPackage ../applications/terminal-emulators/stupidterm {

     

       1627
       1627
       -
           gtk = gtk3;

     

       1628
       1628
       -
         };

     

       1626
       1626
       +
         stupidterm = callPackage ../applications/terminal-emulators/stupidterm { };

     

       1629
       1627
        
       

     

       1630
       1628
        
         termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix {

     

       1631
       1629
        
           termite = termite-unwrapped;

     
···

       2545
       2543
        
       

     

       2546
       2544
        
         steampipePackages = recurseIntoAttrs (callPackage ../tools/misc/steampipe-packages { });

     

       2547
       2545
        
       

     

       2548
       2548
       -
         swappy = callPackage ../applications/misc/swappy { gtk = gtk3; };

     

       2546
       2546
       +
         swappy = callPackage ../applications/misc/swappy { };

     

       2549
       2547
        
       

     

       2550
       2548
        
         synth = callPackage ../tools/misc/synth { };

     

       2551
       2549
        
       

     
···

       2965
       2963
        
       

     

       2966
       2964
        
         dconf2nix = callPackage ../development/tools/haskell/dconf2nix { };

     

       2967
       2965
        
       

     

       2968
       2968
       -
         devilspie2 = callPackage ../applications/misc/devilspie2 {

     

       2969
       2969
       -
           gtk = gtk3;

     

       2970
       2970
       -
         };

     

       2966
       2966
       +
         devilspie2 = callPackage ../applications/misc/devilspie2 { };

     

       2971
       2967
        
       

     

       2972
       2968
        
         ddcui = libsForQt5.callPackage ../applications/misc/ddcui { };

     

       2973
       2969
        
       

     
···

       3273
       3269
        
       

     

       3274
       3270
        
         gawkInteractive = gawk.override { interactive = true; };

     

       3275
       3271
        
       

     

       3276
       3276
       -
         gbdfed = callPackage ../tools/misc/gbdfed {

     

       3277
       3277
       -
           gtk = gtk2-x11;

     

       3278
       3278
       -
         };

     

       3272
       3272
       +
         gbdfed = callPackage ../tools/misc/gbdfed { };

     

       3279
       3273
        
       

     

       3280
       3280
       -
         gftp = callPackage ../applications/networking/ftp/gftp {

     

       3281
       3281
       -
           gtk = gtk2;

     

       3282
       3282
       -
         };

     

       3274
       3274
       +
         gftp = callPackage ../applications/networking/ftp/gftp { };

     

       3283
       3275
        
       

     

       3284
       3276
        
         ggshield = callPackage ../tools/security/ggshield {

     

       3285
       3277
        
           python3 = python311;

     
···

       8909
       8901
        
       

     

       8910
       8902
        
         gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { };

     

       8911
       8903
        
       

     

       8912
       8912
       -
         gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {

     

       8913
       8913
       -
           gtk = gtk3;

     

       8914
       8914
       -
         };

     

       8904
       8904
       +
         gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { };

     

       8915
       8905
        
       

     

       8916
       8906
        
         gtk-mac-integration-gtk2 = gtk-mac-integration.override {

     

       8917
       8907
        
           gtk = gtk2;

     
···

       13272
       13262
        
       

     

       13273
       13263
        
         gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins { });

     

       13274
       13264
        
       

     

       13275
       13275
       -
         girara = callPackage ../applications/misc/girara {

     

       13276
       13276
       -
           gtk = gtk3;

     

       13277
       13277
       -
         };

     

       13265
       13265
       +
         girara = callPackage ../applications/misc/girara { };

     

       13278
       13266
        
       

     

       13279
       13267
        
         gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };

     

       13280
       13268
        
       

     
···

       13353
       13341
        
         graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };

     

       13354
       13342
        
         graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;

     

       13355
       13343
        
       

     

       13356
       13356
       -
         grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; };

     

       13344
       13344
       +
         grisbi = callPackage ../applications/office/grisbi { };

     

       13357
       13345
        
       

     

       13358
       13346
        
         q4wine = libsForQt5.callPackage ../applications/misc/q4wine { };

     

       13359
       13347
        
       

     
···

       14867
       14855
        
           pythonBindings = true;

     

       14868
       14856
        
         };

     

       14869
       14857
        
       

     

       14870
       14870
       -
         surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };

     

       14858
       14858
       +
         surf = callPackage ../applications/networking/browsers/surf { };

     

       14871
       14859
        
       

     

       14872
       14860
        
         surge = callPackage ../applications/audio/surge {

     

       14873
       14861
        
           git = gitMinimal;

     
···

       16327
       16315
        
         # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided

     

       16328
       16316
        
         pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });

     

       16329
       16317
        
       

     

       16330
       16330
       -
         rox-filer = callPackage ../desktops/rox/rox-filer {

     

       16331
       16331
       -
           gtk = gtk2;

     

       16332
       16332
       -
         };

     

       16318
       16318
       +
         rox-filer = callPackage ../desktops/rox/rox-filer { };

     

       16333
       16319
        
       

     

       16334
       16320
        
         xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });

     

       16335
       16321

pkgs/top-level/python-packages.nix

···

       10143
       10143
        
       

     

       10144
       10144
        
         odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { };

     

       10145
       10145
        
       

     

       10146
       10146
       +
         oelint-data = callPackage ../development/python-modules/oelint-data { };

     

       10147
       10147
       +
       

     

       10146
       10148
        
         oelint-parser = callPackage ../development/python-modules/oelint-parser { };

     

       10147
       10149
        
       

     

       10148
       10150
        
         oemthermostat = callPackage ../development/python-modules/oemthermostat { };

     
···

       17118
       17120
        
         test-results-parser = callPackage ../development/python-modules/test-results-parser { };

     

       17119
       17121
        
       

     

       17120
       17122
        
         test-tube = callPackage ../development/python-modules/test-tube { };

     

       17123
       17123
       +
       

     

       17124
       17124
       +
         test2ref = callPackage ../development/python-modules/test2ref { };

     

       17121
       17125
        
       

     

       17122
       17126
        
         testbook = callPackage ../development/python-modules/testbook { };

     

       17123
       17127