pyrox.dev
Merge branch 'master' into staging-next
+1
-1
nixos/doc/manual/release-notes/rl-2311.section.md
+1
-1
nixos/doc/manual/release-notes/rl-2311.section.md
···
38
38
39
39
- [stalwart-mail](https://stalw.art), an all-in-one email server (SMTP, IMAP, JMAP). Available as [services.stalwart-mail](#opt-services.stalwart-mail.enable).
40
40
41
-
- [Jool](https://nicmx.github.io/Jool/en/index.html), an Open Source implementation of IPv4/IPv6 translation on Linux. Available as [networking.jool.enable](#opt-networking.jool.enable).
41
+
- [Jool](https://nicmx.github.io/Jool/en/index.html), a kernelspace NAT64 and SIIT implementation, providing translation between IPv4 and IPv6. Available as [networking.jool.enable](#opt-networking.jool.enable).
42
42
43
43
- [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services.
44
44
+1
-1
nixos/modules/i18n/input-method/uim.nix
+1
-1
nixos/modules/i18n/input-method/uim.nix
···
10
10
11
11
i18n.inputMethod.uim = {
12
12
toolbar = mkOption {
13
-
type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
13
+
type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt5" ];
14
14
default = "gtk";
15
15
example = "gtk-systray";
16
16
description = lib.mdDoc ''
+53
-46
nixos/modules/services/matrix/mautrix-whatsapp.nix
+53
-46
nixos/modules/services/matrix/mautrix-whatsapp.nix
···
11
11
settingsFileUnsubstituted = settingsFormat.generate "mautrix-whatsapp-config-unsubstituted.json" cfg.settings;
12
12
settingsFormat = pkgs.formats.json {};
13
13
appservicePort = 29318;
14
+
15
+
mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v);
16
+
defaultConfig = {
17
+
homeserver.address = "http://localhost:8448";
18
+
appservice = {
19
+
hostname = "[::]";
20
+
port = appservicePort;
21
+
database.type = "sqlite3";
22
+
database.uri = "${dataDir}/mautrix-whatsapp.db";
23
+
id = "whatsapp";
24
+
bot.username = "whatsappbot";
25
+
bot.displayname = "WhatsApp Bridge Bot";
26
+
as_token = "";
27
+
hs_token = "";
28
+
};
29
+
bridge = {
30
+
username_template = "whatsapp_{{.}}";
31
+
displayname_template = "{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}} (WA)";
32
+
double_puppet_server_map = {};
33
+
login_shared_secret_map = {};
34
+
command_prefix = "!wa";
35
+
permissions."*" = "relay";
36
+
relay.enabled = true;
37
+
};
38
+
logging = {
39
+
min_level = "info";
40
+
writers = lib.singleton {
41
+
type = "stdout";
42
+
format = "pretty-colored";
43
+
time_format = " ";
44
+
};
45
+
};
46
+
};
47
+
14
48
in {
15
-
imports = [];
16
49
options.services.mautrix-whatsapp = {
17
-
enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp.";
50
+
enable = lib.mkEnableOption (lib.mdDoc "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp.");
18
51
19
52
settings = lib.mkOption {
20
53
type = settingsFormat.type;
21
-
default = {
22
-
appservice = {
23
-
address = "http://localhost:${toString appservicePort}";
24
-
hostname = "[::]";
25
-
port = appservicePort;
26
-
database = {
27
-
type = "sqlite3";
28
-
uri = "${dataDir}/mautrix-whatsapp.db";
29
-
};
30
-
id = "whatsapp";
31
-
bot = {
32
-
username = "whatsappbot";
33
-
displayname = "WhatsApp Bridge Bot";
34
-
};
35
-
as_token = "";
36
-
hs_token = "";
37
-
};
38
-
bridge = {
39
-
username_template = "whatsapp_{{.}}";
40
-
displayname_template = "{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}} (WA)";
41
-
double_puppet_server_map = {};
42
-
login_shared_secret_map = {};
43
-
command_prefix = "!wa";
44
-
permissions."*" = "relay";
45
-
relay.enabled = true;
46
-
};
47
-
logging = {
48
-
min_level = "info";
49
-
writers = [
50
-
{
51
-
type = "stdout";
52
-
format = "pretty-colored";
53
-
}
54
-
{
55
-
type = "file";
56
-
format = "json";
57
-
}
58
-
];
59
-
};
60
-
};
54
+
default = defaultConfig;
61
55
description = lib.mdDoc ''
62
56
{file}`config.yaml` configuration as a Nix attribute set.
63
57
Configuration options should match those described in
···
117
111
};
118
112
119
113
config = lib.mkIf cfg.enable {
120
-
services.mautrix-whatsapp.settings = {
121
-
homeserver.domain = lib.mkDefault config.services.matrix-synapse.settings.server_name;
114
+
115
+
users.users.mautrix-whatsapp = {
116
+
isSystemUser = true;
117
+
group = "mautrix-whatsapp";
118
+
home = dataDir;
119
+
description = "Mautrix-WhatsApp bridge user";
122
120
};
121
+
122
+
users.groups.mautrix-whatsapp = {};
123
+
124
+
services.mautrix-whatsapp.settings = lib.mkMerge (map mkDefaults [
125
+
defaultConfig
126
+
# Note: this is defined here to avoid the docs depending on `config`
127
+
{ homeserver.domain = config.services.matrix-synapse.settings.server_name; }
128
+
]);
123
129
124
130
systemd.services.mautrix-whatsapp = {
125
131
description = "Mautrix-WhatsApp Service - A WhatsApp bridge for Matrix";
···
158
164
'';
159
165
160
166
serviceConfig = {
161
-
DynamicUser = true;
167
+
User = "mautrix-whatsapp";
168
+
Group = "mautrix-whatsapp";
162
169
EnvironmentFile = cfg.environmentFile;
163
170
StateDirectory = baseNameOf dataDir;
164
-
WorkingDirectory = "${dataDir}";
171
+
WorkingDirectory = dataDir;
165
172
ExecStart = ''
166
173
${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \
167
174
--config='${settingsFile}' \
+182
-123
nixos/modules/services/networking/jool.nix
+182
-123
nixos/modules/services/networking/jool.nix
···
16
16
TemporaryFileSystem = [ "/" ];
17
17
BindReadOnlyPaths = [
18
18
builtins.storeDir
19
-
"/run/current-system/kernel-modules"
19
+
"/run/booted-system/kernel-modules"
20
20
];
21
21
22
22
# Give capabilities to load the module and configure it
···
31
31
32
32
configFormat = pkgs.formats.json {};
33
33
34
-
mkDefaultAttrs = lib.mapAttrs (n: v: lib.mkDefault v);
34
+
# Generate the config file of instance `name`
35
+
nat64Conf = name:
36
+
configFormat.generate "jool-nat64-${name}.conf"
37
+
(cfg.nat64.${name} // { instance = name; });
38
+
siitConf = name:
39
+
configFormat.generate "jool-siit-${name}.conf"
40
+
(cfg.siit.${name} // { instance = name; });
41
+
42
+
# NAT64 config type
43
+
nat64Options = lib.types.submodule {
44
+
# The format is plain JSON
45
+
freeformType = configFormat.type;
46
+
# Some options with a default value
47
+
options.framework = lib.mkOption {
48
+
type = lib.types.enum [ "netfilter" "iptables" ];
49
+
default = "netfilter";
50
+
description = lib.mdDoc ''
51
+
The framework to use for attaching Jool's translation to the exist
52
+
kernel packet processing rules. See the
53
+
[documentation](https://nicmx.github.io/Jool/en/intro-jool.html#design)
54
+
for the differences between the two options.
55
+
'';
56
+
};
57
+
options.global.pool6 = lib.mkOption {
58
+
type = lib.types.strMatching "[[:xdigit:]:]+/[[:digit:]]+"
59
+
// { description = "Network prefix in CIDR notation"; };
60
+
default = "64:ff9b::/96";
61
+
description = lib.mdDoc ''
62
+
The prefix used for embedding IPv4 into IPv6 addresses.
63
+
Defaults to the well-known NAT64 prefix, defined by
64
+
[RFC 6052](https://datatracker.ietf.org/doc/html/rfc6052).
65
+
'';
66
+
};
67
+
};
68
+
69
+
# SIIT config type
70
+
siitOptions = lib.types.submodule {
71
+
# The format is, again, plain JSON
72
+
freeformType = configFormat.type;
73
+
# Some options with a default value
74
+
options = { inherit (nat64Options.getSubOptions []) framework; };
75
+
};
35
76
36
-
defaultNat64 = {
37
-
instance = "default";
38
-
framework = "netfilter";
39
-
global.pool6 = "64:ff9b::/96";
77
+
makeNat64Unit = name: opts: {
78
+
"jool-nat64-${name}" = {
79
+
description = "Jool, NAT64 setup of instance ${name}";
80
+
documentation = [ "https://nicmx.github.io/Jool/en/documentation.html" ];
81
+
after = [ "network.target" ];
82
+
wantedBy = [ "multi-user.target" ];
83
+
serviceConfig = {
84
+
Type = "oneshot";
85
+
RemainAfterExit = true;
86
+
ExecStartPre = "${pkgs.kmod}/bin/modprobe jool";
87
+
ExecStart = "${jool-cli}/bin/jool file handle ${nat64Conf name}";
88
+
ExecStop = "${jool-cli}/bin/jool -f ${nat64Conf name} instance remove";
89
+
} // hardening;
90
+
};
40
91
};
41
-
defaultSiit = {
42
-
instance = "default";
43
-
framework = "netfilter";
92
+
93
+
makeSiitUnit = name: opts: {
94
+
"jool-siit-${name}" = {
95
+
description = "Jool, SIIT setup of instance ${name}";
96
+
documentation = [ "https://nicmx.github.io/Jool/en/documentation.html" ];
97
+
after = [ "network.target" ];
98
+
wantedBy = [ "multi-user.target" ];
99
+
serviceConfig = {
100
+
Type = "oneshot";
101
+
RemainAfterExit = true;
102
+
ExecStartPre = "${pkgs.kmod}/bin/modprobe jool_siit";
103
+
ExecStart = "${jool-cli}/bin/jool_siit file handle ${siitConf name}";
104
+
ExecStop = "${jool-cli}/bin/jool_siit -f ${siitConf name} instance remove";
105
+
} // hardening;
106
+
};
44
107
};
45
108
46
-
nat64Conf = configFormat.generate "jool-nat64.conf" cfg.nat64.config;
47
-
siitConf = configFormat.generate "jool-siit.conf" cfg.siit.config;
109
+
checkNat64 = name: _: ''
110
+
printf 'Validating Jool configuration for NAT64 instance "${name}"... '
111
+
jool file check ${nat64Conf name}
112
+
printf 'Ok.\n'; touch "$out"
113
+
'';
114
+
115
+
checkSiit = name: _: ''
116
+
printf 'Validating Jool configuration for SIIT instance "${name}"... '
117
+
jool_siit file check ${siitConf name}
118
+
printf 'Ok.\n'; touch "$out"
119
+
'';
48
120
49
121
in
50
122
51
123
{
52
-
###### interface
53
-
54
124
options = {
55
125
networking.jool.enable = lib.mkOption {
56
126
type = lib.types.bool;
···
64
134
NAT64, analogous to the IPv4 NAPT. Refer to the upstream
65
135
[documentation](https://nicmx.github.io/Jool/en/intro-xlat.html) for
66
136
the supported modes of translation and how to configure them.
137
+
138
+
Enabling this option will install the Jool kernel module and the
139
+
command line tools for controlling it.
67
140
'';
68
141
};
69
142
70
-
networking.jool.nat64.enable = lib.mkEnableOption (lib.mdDoc "a NAT64 instance of Jool.");
71
-
networking.jool.nat64.config = lib.mkOption {
72
-
type = configFormat.type;
73
-
default = defaultNat64;
143
+
networking.jool.nat64 = lib.mkOption {
144
+
type = lib.types.attrsOf nat64Options;
145
+
default = { };
74
146
example = lib.literalExpression ''
75
147
{
76
-
# custom NAT64 prefix
77
-
global.pool6 = "2001:db8:64::/96";
148
+
default = {
149
+
# custom NAT64 prefix
150
+
global.pool6 = "2001:db8:64::/96";
78
151
79
-
# Port forwarding
80
-
bib = [
81
-
{ # SSH 192.0.2.16 → 2001:db8:a::1
82
-
"protocol" = "TCP";
83
-
"ipv4 address" = "192.0.2.16#22";
84
-
"ipv6 address" = "2001:db8:a::1#22";
85
-
}
86
-
{ # DNS (TCP) 192.0.2.16 → 2001:db8:a::2
87
-
"protocol" = "TCP";
88
-
"ipv4 address" = "192.0.2.16#53";
89
-
"ipv6 address" = "2001:db8:a::2#53";
90
-
}
91
-
{ # DNS (UDP) 192.0.2.16 → 2001:db8:a::2
92
-
"protocol" = "UDP";
93
-
"ipv4 address" = "192.0.2.16#53";
94
-
"ipv6 address" = "2001:db8:a::2#53";
95
-
}
96
-
];
152
+
# Port forwarding
153
+
bib = [
154
+
{ # SSH 192.0.2.16 → 2001:db8:a::1
155
+
"protocol" = "TCP";
156
+
"ipv4 address" = "192.0.2.16#22";
157
+
"ipv6 address" = "2001:db8:a::1#22";
158
+
}
159
+
{ # DNS (TCP) 192.0.2.16 → 2001:db8:a::2
160
+
"protocol" = "TCP";
161
+
"ipv4 address" = "192.0.2.16#53";
162
+
"ipv6 address" = "2001:db8:a::2#53";
163
+
}
164
+
{ # DNS (UDP) 192.0.2.16 → 2001:db8:a::2
165
+
"protocol" = "UDP";
166
+
"ipv4 address" = "192.0.2.16#53";
167
+
"ipv6 address" = "2001:db8:a::2#53";
168
+
}
169
+
];
97
170
98
-
pool4 = [
99
-
# Ports for dynamic translation
100
-
{ protocol = "TCP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; }
101
-
{ protocol = "UDP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; }
102
-
{ protocol = "ICMP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; }
171
+
pool4 = [
172
+
# Port ranges for dynamic translation
173
+
{ protocol = "TCP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; }
174
+
{ protocol = "UDP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; }
175
+
{ protocol = "ICMP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; }
103
176
104
-
# Ports for static BIB entries
105
-
{ protocol = "TCP"; prefix = "192.0.2.16/32"; "port range" = "22"; }
106
-
{ protocol = "UDP"; prefix = "192.0.2.16/32"; "port range" = "53"; }
107
-
];
177
+
# Ports for static BIB entries
178
+
{ protocol = "TCP"; prefix = "192.0.2.16/32"; "port range" = "22"; }
179
+
{ protocol = "UDP"; prefix = "192.0.2.16/32"; "port range" = "53"; }
180
+
];
181
+
};
108
182
}
109
183
'';
110
184
description = lib.mdDoc ''
111
-
The configuration of a stateful NAT64 instance of Jool managed through
112
-
NixOS. See https://nicmx.github.io/Jool/en/config-atomic.html for the
113
-
available options.
185
+
Definitions of NAT64 instances of Jool.
186
+
See the
187
+
[documentation](https://nicmx.github.io/Jool/en/config-atomic.html) for
188
+
the available options. Also check out the
189
+
[tutorial](https://nicmx.github.io/Jool/en/run-nat64.html) for an
190
+
introduction to NAT64 and how to troubleshoot the setup.
191
+
192
+
The attribute name defines the name of the instance, with the main one
193
+
being `default`: this can be accessed from the command line without
194
+
specifying the name with `-i`.
114
195
115
196
::: {.note}
116
-
Existing or more instances created manually will not interfere with the
117
-
NixOS instance, provided the respective `pool4` addresses and port
118
-
ranges are not overlapping.
197
+
Instances created imperatively from the command line will not interfere
198
+
with the NixOS instances, provided the respective `pool4` addresses and
199
+
port ranges are not overlapping.
119
200
:::
120
201
121
202
::: {.warning}
122
-
Changes to the NixOS instance performed via `jool instance nixos-nat64`
123
-
are applied correctly but will be lost after restarting
124
-
`jool-nat64.service`.
203
+
Changes to an instance performed via `jool -i <name>` are applied
204
+
correctly but will be lost after restarting the respective
205
+
`jool-nat64-<name>.service`.
125
206
:::
126
207
'';
127
208
};
128
209
129
-
networking.jool.siit.enable = lib.mkEnableOption (lib.mdDoc "a SIIT instance of Jool.");
130
-
networking.jool.siit.config = lib.mkOption {
131
-
type = configFormat.type;
132
-
default = defaultSiit;
210
+
networking.jool.siit = lib.mkOption {
211
+
type = lib.types.attrsOf siitOptions;
212
+
default = { };
133
213
example = lib.literalExpression ''
134
214
{
135
-
# Maps any IPv4 address x.y.z.t to 2001:db8::x.y.z.t and v.v.
136
-
pool6 = "2001:db8::/96";
215
+
default = {
216
+
# Maps any IPv4 address x.y.z.t to 2001:db8::x.y.z.t and v.v.
217
+
global.pool6 = "2001:db8::/96";
137
218
138
-
# Explicit address mappings
139
-
eamt = [
140
-
# 2001:db8:1:: ←→ 192.0.2.0
141
-
{ "ipv6 prefix": "2001:db8:1::/128", "ipv4 prefix": "192.0.2.0" }
142
-
# 2001:db8:1::x ←→ 198.51.100.x
143
-
{ "ipv6 prefix": "2001:db8:2::/120", "ipv4 prefix": "198.51.100.0/24" }
144
-
]
219
+
# Explicit address mappings
220
+
eamt = [
221
+
# 2001:db8:1:: ←→ 192.0.2.0
222
+
{ "ipv6 prefix" = "2001:db8:1::/128"; "ipv4 prefix" = "192.0.2.0"; }
223
+
# 2001:db8:1::x ←→ 198.51.100.x
224
+
{ "ipv6 prefix" = "2001:db8:2::/120"; "ipv4 prefix" = "198.51.100.0/24"; }
225
+
];
226
+
};
145
227
}
146
228
'';
147
229
description = lib.mdDoc ''
148
-
The configuration of a SIIT instance of Jool managed through
149
-
NixOS. See https://nicmx.github.io/Jool/en/config-atomic.html for the
150
-
available options.
230
+
Definitions of SIIT instances of Jool.
231
+
See the
232
+
[documentation](https://nicmx.github.io/Jool/en/config-atomic.html) for
233
+
the available options. Also check out the
234
+
[tutorial](https://nicmx.github.io/Jool/en/run-vanilla.html) for an
235
+
introduction to SIIT and how to troubleshoot the setup.
236
+
237
+
The attribute name defines the name of the instance, with the main one
238
+
being `default`: this can be accessed from the command line without
239
+
specifying the name with `-i`.
151
240
152
241
::: {.note}
153
-
Existing or more instances created manually will not interfere with the
154
-
NixOS instance, provided the respective `EAMT` address mappings are not
155
-
overlapping.
242
+
Instances created imperatively from the command line will not interfere
243
+
with the NixOS instances, provided the respective EAMT addresses and
244
+
port ranges are not overlapping.
156
245
:::
157
246
158
247
::: {.warning}
159
-
Changes to the NixOS instance performed via `jool instance nixos-siit`
160
-
are applied correctly but will be lost after restarting
161
-
`jool-siit.service`.
248
+
Changes to an instance performed via `jool -i <name>` are applied
249
+
correctly but will be lost after restarting the respective
250
+
`jool-siit-<name>.service`.
162
251
:::
163
252
'';
164
253
};
165
254
166
255
};
167
256
168
-
###### implementation
169
-
170
257
config = lib.mkIf cfg.enable {
171
-
environment.systemPackages = [ jool-cli ];
258
+
# Install kernel module and cli tools
172
259
boot.extraModulePackages = [ jool ];
173
-
174
-
systemd.services.jool-nat64 = lib.mkIf cfg.nat64.enable {
175
-
description = "Jool, NAT64 setup";
176
-
documentation = [ "https://nicmx.github.io/Jool/en/documentation.html" ];
177
-
after = [ "network.target" ];
178
-
wantedBy = [ "multi-user.target" ];
179
-
reloadIfChanged = true;
180
-
serviceConfig = {
181
-
Type = "oneshot";
182
-
RemainAfterExit = true;
183
-
ExecStartPre = "${pkgs.kmod}/bin/modprobe jool";
184
-
ExecStart = "${jool-cli}/bin/jool file handle ${nat64Conf}";
185
-
ExecStop = "${jool-cli}/bin/jool -f ${nat64Conf} instance remove";
186
-
} // hardening;
187
-
};
188
-
189
-
systemd.services.jool-siit = lib.mkIf cfg.siit.enable {
190
-
description = "Jool, SIIT setup";
191
-
documentation = [ "https://nicmx.github.io/Jool/en/documentation.html" ];
192
-
after = [ "network.target" ];
193
-
wantedBy = [ "multi-user.target" ];
194
-
reloadIfChanged = true;
195
-
serviceConfig = {
196
-
Type = "oneshot";
197
-
RemainAfterExit = true;
198
-
ExecStartPre = "${pkgs.kmod}/bin/modprobe jool_siit";
199
-
ExecStart = "${jool-cli}/bin/jool_siit file handle ${siitConf}";
200
-
ExecStop = "${jool-cli}/bin/jool_siit -f ${siitConf} instance remove";
201
-
} // hardening;
202
-
};
203
-
204
-
system.checks = lib.singleton (pkgs.runCommand "jool-validated" {
205
-
nativeBuildInputs = [ pkgs.buildPackages.jool-cli ];
206
-
preferLocalBuild = true;
207
-
} ''
208
-
printf 'Validating Jool configuration... '
209
-
${lib.optionalString cfg.siit.enable "jool_siit file check ${siitConf}"}
210
-
${lib.optionalString cfg.nat64.enable "jool file check ${nat64Conf}"}
211
-
printf 'ok\n'
212
-
touch "$out"
213
-
'');
260
+
environment.systemPackages = [ jool-cli ];
214
261
215
-
networking.jool.nat64.config = mkDefaultAttrs defaultNat64;
216
-
networking.jool.siit.config = mkDefaultAttrs defaultSiit;
262
+
# Install services for each instance
263
+
systemd.services = lib.mkMerge
264
+
(lib.mapAttrsToList makeNat64Unit cfg.nat64 ++
265
+
lib.mapAttrsToList makeSiitUnit cfg.siit);
217
266
267
+
# Check the configuration of each instance
268
+
system.checks = lib.optional (cfg.nat64 != {} || cfg.siit != {})
269
+
(pkgs.runCommand "jool-validated"
270
+
{
271
+
nativeBuildInputs = with pkgs.buildPackages; [ jool-cli ];
272
+
preferLocalBuild = true;
273
+
}
274
+
(lib.concatStrings
275
+
(lib.mapAttrsToList checkNat64 cfg.nat64 ++
276
+
lib.mapAttrsToList checkSiit cfg.siit)));
218
277
};
219
278
220
279
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+2
-1
nixos/modules/services/x11/desktop-managers/budgie.nix
+2
-1
nixos/modules/services/x11/desktop-managers/budgie.nix
···
134
134
# Update user directories.
135
135
xdg-user-dirs
136
136
]
137
+
++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
137
138
++ (utils.removePackagesByName [
138
139
cinnamon.nemo
139
140
mate.eom
···
192
193
# Required by Budgie Panel plugins and/or Budgie Control Center panels.
193
194
networking.networkmanager.enable = mkDefault true; # for BCC's Network panel.
194
195
programs.nm-applet.enable = config.networking.networkmanager.enable; # Budgie has no Network applet.
195
-
programs.nm-applet.indicator = false; # Budgie doesn't support AppIndicators.
196
+
programs.nm-applet.indicator = true; # Budgie uses AppIndicators.
196
197
197
198
hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Bluetooth panel.
198
199
hardware.pulseaudio.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Sound panel.
+1
-1
nixos/tests/all-tests.nix
+1
-1
nixos/tests/all-tests.nix
···
395
395
jibri = handleTest ./jibri.nix {};
396
396
jirafeau = handleTest ./jirafeau.nix {};
397
397
jitsi-meet = handleTest ./jitsi-meet.nix {};
398
-
jool = handleTest ./jool.nix {};
398
+
jool = import ./jool.nix { inherit pkgs runTest; };
399
399
k3s = handleTest ./k3s {};
400
400
kafka = handleTest ./kafka.nix {};
401
401
kanidm = handleTest ./kanidm.nix {};
+2
-2
nixos/tests/custom-ca.nix
+2
-2
nixos/tests/custom-ca.nix
···
131
131
# chromium-based browsers refuse to run as root
132
132
test-support.displayManager.auto.user = "alice";
133
133
134
-
# browsers may hang with the default memory
135
-
virtualisation.memorySize = 600;
134
+
# machine often runs out of memory with less
135
+
virtualisation.memorySize = 1024;
136
136
137
137
environment.systemPackages = [ pkgs.xdotool pkgs.${browser} ];
138
138
};
+38
-68
nixos/tests/jool.nix
+38
-68
nixos/tests/jool.nix
···
1
-
{ system ? builtins.currentSystem,
2
-
config ? {},
3
-
pkgs ? import ../.. { inherit system config; }
4
-
}:
5
-
6
-
with import ../lib/testing-python.nix { inherit system pkgs; };
1
+
{ pkgs, runTest }:
7
2
8
3
let
9
4
inherit (pkgs) lib;
···
23
18
description = "Mock webserver";
24
19
wants = [ "network-online.target" ];
25
20
wantedBy = [ "multi-user.target" ];
26
-
serviceConfig.Restart = "always";
27
21
script = ''
28
22
while true; do
29
23
{
···
40
34
in
41
35
42
36
{
43
-
siit = makeTest {
37
+
siit = runTest {
44
38
# This test simulates the setup described in [1] with two IPv6 and
45
39
# IPv4-only devices on different subnets communicating through a border
46
40
# relay running Jool in SIIT mode.
···
49
43
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
50
44
51
45
# Border relay
52
-
nodes.relay = { ... }: {
53
-
imports = [ ../modules/profiles/minimal.nix ];
46
+
nodes.relay = {
54
47
virtualisation.vlans = [ 1 2 ];
55
48
56
49
# Enable packet routing
···
65
58
eth2.ipv4.addresses = [ { address = "192.0.2.1"; prefixLength = 24; } ];
66
59
};
67
60
68
-
networking.jool = {
69
-
enable = true;
70
-
siit.enable = true;
71
-
siit.config.global.pool6 = "fd::/96";
72
-
};
61
+
networking.jool.enable = true;
62
+
networking.jool.siit.default.global.pool6 = "fd::/96";
73
63
};
74
64
75
65
# IPv6 only node
76
-
nodes.alice = { ... }: {
77
-
imports = [
78
-
../modules/profiles/minimal.nix
79
-
ipv6Only
80
-
(webserver 6 "Hello, Bob!")
81
-
];
66
+
nodes.alice = {
67
+
imports = [ ipv6Only (webserver 6 "Hello, Bob!") ];
82
68
83
69
virtualisation.vlans = [ 1 ];
84
70
networking.interfaces.eth1.ipv6 = {
···
89
75
};
90
76
91
77
# IPv4 only node
92
-
nodes.bob = { ... }: {
93
-
imports = [
94
-
../modules/profiles/minimal.nix
95
-
ipv4Only
96
-
(webserver 4 "Hello, Alice!")
97
-
];
78
+
nodes.bob = {
79
+
imports = [ ipv4Only (webserver 4 "Hello, Alice!") ];
98
80
99
81
virtualisation.vlans = [ 2 ];
100
82
networking.interfaces.eth1.ipv4 = {
···
107
89
testScript = ''
108
90
start_all()
109
91
110
-
relay.wait_for_unit("jool-siit.service")
92
+
relay.wait_for_unit("jool-siit-default.service")
111
93
alice.wait_for_unit("network-addresses-eth1.service")
112
94
bob.wait_for_unit("network-addresses-eth1.service")
113
95
114
96
with subtest("Alice and Bob can't ping each other"):
115
-
relay.systemctl("stop jool-siit.service")
97
+
relay.systemctl("stop jool-siit-default.service")
116
98
alice.fail("ping -c1 fd::192.0.2.16")
117
99
bob.fail("ping -c1 198.51.100.8")
118
100
119
101
with subtest("Alice and Bob can ping using the relay"):
120
-
relay.systemctl("start jool-siit.service")
102
+
relay.systemctl("start jool-siit-default.service")
121
103
alice.wait_until_succeeds("ping -c1 fd::192.0.2.16")
122
104
bob.wait_until_succeeds("ping -c1 198.51.100.8")
123
105
···
132
114
'';
133
115
};
134
116
135
-
nat64 = makeTest {
117
+
nat64 = runTest {
136
118
# This test simulates the setup described in [1] with two IPv6-only nodes
137
119
# (a client and a homeserver) on the LAN subnet and an IPv4 node on the WAN.
138
120
# The router runs Jool in stateful NAT64 mode, masquarading the LAN and
···
142
124
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
143
125
144
126
# Router
145
-
nodes.router = { ... }: {
146
-
imports = [ ../modules/profiles/minimal.nix ];
127
+
nodes.router = {
147
128
virtualisation.vlans = [ 1 2 ];
148
129
149
130
# Enable packet routing
···
158
139
eth2.ipv4.addresses = [ { address = "203.0.113.1"; prefixLength = 24; } ];
159
140
};
160
141
161
-
networking.jool = {
162
-
enable = true;
163
-
nat64.enable = true;
164
-
nat64.config = {
165
-
bib = [
166
-
{ # forward HTTP 203.0.113.1 (router) → 2001:db8::9 (homeserver)
167
-
"protocol" = "TCP";
168
-
"ipv4 address" = "203.0.113.1#80";
169
-
"ipv6 address" = "2001:db8::9#80";
170
-
}
171
-
];
172
-
pool4 = [
173
-
# Ports for dynamic translation
174
-
{ protocol = "TCP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; }
175
-
{ protocol = "UDP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; }
176
-
{ protocol = "ICMP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; }
177
-
# Ports for static BIB entries
178
-
{ protocol = "TCP"; prefix = "203.0.113.1/32"; "port range" = "80"; }
179
-
];
180
-
};
142
+
networking.jool.enable = true;
143
+
networking.jool.nat64.default = {
144
+
bib = [
145
+
{ # forward HTTP 203.0.113.1 (router) → 2001:db8::9 (homeserver)
146
+
"protocol" = "TCP";
147
+
"ipv4 address" = "203.0.113.1#80";
148
+
"ipv6 address" = "2001:db8::9#80";
149
+
}
150
+
];
151
+
pool4 = [
152
+
# Ports for dynamic translation
153
+
{ protocol = "TCP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; }
154
+
{ protocol = "UDP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; }
155
+
{ protocol = "ICMP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; }
156
+
# Ports for static BIB entries
157
+
{ protocol = "TCP"; prefix = "203.0.113.1/32"; "port range" = "80"; }
158
+
];
181
159
};
182
160
};
183
161
184
162
# LAN client (IPv6 only)
185
-
nodes.client = { ... }: {
186
-
imports = [ ../modules/profiles/minimal.nix ipv6Only ];
163
+
nodes.client = {
164
+
imports = [ ipv6Only ];
187
165
virtualisation.vlans = [ 1 ];
188
166
189
167
networking.interfaces.eth1.ipv6 = {
···
194
172
};
195
173
196
174
# LAN server (IPv6 only)
197
-
nodes.homeserver = { ... }: {
198
-
imports = [
199
-
../modules/profiles/minimal.nix
200
-
ipv6Only
201
-
(webserver 6 "Hello from IPv6!")
202
-
];
175
+
nodes.homeserver = {
176
+
imports = [ ipv6Only (webserver 6 "Hello from IPv6!") ];
203
177
204
178
virtualisation.vlans = [ 1 ];
205
179
networking.interfaces.eth1.ipv6 = {
···
210
184
};
211
185
212
186
# WAN server (IPv4 only)
213
-
nodes.server = { ... }: {
214
-
imports = [
215
-
../modules/profiles/minimal.nix
216
-
ipv4Only
217
-
(webserver 4 "Hello from IPv4!")
218
-
];
187
+
nodes.server = {
188
+
imports = [ ipv4Only (webserver 4 "Hello from IPv4!") ];
219
189
220
190
virtualisation.vlans = [ 2 ];
221
191
networking.interfaces.eth1.ipv4.addresses =
···
229
199
node.wait_for_unit("network-addresses-eth1.service")
230
200
231
201
with subtest("Client can ping the WAN server"):
232
-
router.wait_for_unit("jool-nat64.service")
202
+
router.wait_for_unit("jool-nat64-default.service")
233
203
client.succeed("ping -c1 64:ff9b::203.0.113.16")
234
204
235
205
with subtest("Client can connect to the WAN webserver"):
-48
pkgs/applications/audio/hydrogen/0.nix
-48
pkgs/applications/audio/hydrogen/0.nix
···
1
-
{ lib
2
-
, stdenv
3
-
, fetchFromGitHub
4
-
, pkg-config
5
-
, cmake
6
-
, alsa-lib
7
-
, boost
8
-
, glib
9
-
, lash
10
-
, libjack2
11
-
, libarchive
12
-
, libsndfile
13
-
, lrdf
14
-
, qt4
15
-
}:
16
-
17
-
stdenv.mkDerivation rec {
18
-
version = "0.9.7";
19
-
pname = "hydrogen";
20
-
21
-
src = fetchFromGitHub {
22
-
owner = "hydrogen-music";
23
-
repo = "hydrogen";
24
-
rev = version;
25
-
sha256 = "sha256-6ycNUcumtAEl/6XbIpW6JglGv4nNOdMrOJ1nvJg3z/c=";
26
-
};
27
-
28
-
nativeBuildInputs = [ pkg-config cmake ];
29
-
buildInputs = [
30
-
alsa-lib
31
-
boost
32
-
glib
33
-
lash
34
-
libjack2
35
-
libarchive
36
-
libsndfile
37
-
lrdf
38
-
qt4
39
-
];
40
-
41
-
meta = with lib; {
42
-
description = "Advanced drum machine";
43
-
homepage = "http://www.hydrogen-music.org";
44
-
license = licenses.gpl2;
45
-
platforms = platforms.linux;
46
-
maintainers = [ maintainers.goibhniu ];
47
-
};
48
-
}
-30
pkgs/applications/audio/qmidiroute/default.nix
-30
pkgs/applications/audio/qmidiroute/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, qt4, alsa-lib }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
version = "0.4.0";
5
-
pname = "qmidiroute";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${pname}-${version}.tar.gz";
9
-
sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n";
10
-
};
11
-
12
-
nativeBuildInputs = [ pkg-config ];
13
-
buildInputs = [ qt4 alsa-lib ];
14
-
15
-
meta = with lib; {
16
-
description = "MIDI event processor and router";
17
-
longDescription = ''
18
-
qmidiroute is a versatile MIDI event processor and router for the ALSA
19
-
sequencer. The graphical interface is based on the Qt4 toolkit.
20
-
qmidiroute permits setting up an unlimited number of MIDI maps in which
21
-
incoming events are selected, modified or even changed in type before
22
-
being directed to a dedicated ALSA output port. The maps work in
23
-
parallel, and they are organized in tabs.
24
-
'';
25
-
26
-
license = licenses.gpl2;
27
-
maintainers = [ maintainers.lebastr ];
28
-
platforms = lib.platforms.linux;
29
-
};
30
-
}
-34
pkgs/applications/audio/qtscrobbler/default.nix
-34
pkgs/applications/audio/qtscrobbler/default.nix
···
1
-
{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkg-config, which, qt4, qmake4Hook }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "qtscrobbler";
5
-
version = "0.11";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/qtscrob/qtscrob/${version}/qtscrob-${version}.tar.bz2";
9
-
sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba";
10
-
};
11
-
12
-
nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkg-config which ];
13
-
buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp;
14
-
15
-
enableParallelBuilding = true;
16
-
17
-
postPatch = ''
18
-
cd src
19
-
sed -i -e "s,/usr/local,$out," -e "s,/usr,," common.pri
20
-
'';
21
-
22
-
meta = with lib; {
23
-
description = "Qt based last.fm scrobbler";
24
-
longDescription = ''
25
-
QTScrobbler is a tool to upload information about the tracks you have played from your Digital Audio Player (DAP) to your last.fm account.
26
-
It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware.
27
-
'';
28
-
29
-
homepage = "https://qtscrob.sourceforge.net";
30
-
license = licenses.gpl2;
31
-
maintainers = [ maintainers.vanzef ];
32
-
platforms = platforms.linux;
33
-
};
34
-
}
-56
pkgs/applications/audio/soundscape-renderer/default.nix
-56
pkgs/applications/audio/soundscape-renderer/default.nix
···
1
-
{ lib
2
-
, stdenv
3
-
, fetchFromGitHub
4
-
, autoreconfHook
5
-
, help2man
6
-
, pkg-config
7
-
, libsndfile
8
-
, fftwFloat
9
-
, libjack2
10
-
, libxml2
11
-
, qt4
12
-
, boost
13
-
, ecasound
14
-
, glibcLocales
15
-
, libGLU
16
-
, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
17
-
}:
18
-
19
-
stdenv.mkDerivation {
20
-
pname = "soundscape-renderer";
21
-
version = "unstable-2016-11-03";
22
-
23
-
src = fetchFromGitHub {
24
-
owner = "SoundScapeRenderer";
25
-
repo = "ssr";
26
-
rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9";
27
-
sha256 = "sha256-9s+Elaxz9kX+Nle1CqBU/9r0hdI4dhsJ6GrNqvP5HIs=";
28
-
};
29
-
30
-
# Without it doesn't find all of the boost libraries.
31
-
BOOST_LIB_DIR = "${boost}/lib";
32
-
# uses the deprecated get_generic_category() in boost_system
33
-
env.NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1";
34
-
35
-
LC_ALL = "en_US.UTF-8";
36
-
37
-
nativeBuildInputs = [ autoreconfHook pkg-config ];
38
-
buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
39
-
40
-
# 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
41
-
# 2) Make it find ecasound headers
42
-
# 3) Fix locale for help2man
43
-
prePatch = ''
44
-
substituteInPlace configure.ac --replace 'git describe ||' 'git describe 2> /dev/null ||';
45
-
substituteInPlace configure.ac --replace '/{usr,opt}/{,local/}' '${ecasound}/'
46
-
substituteInPlace man/Makefile.am --replace '--locale=en' '--locale=en_US.UTF-8'
47
-
'';
48
-
49
-
meta = {
50
-
homepage = "http://spatialaudio.net/ssr/";
51
-
description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction";
52
-
license = lib.licenses.gpl3;
53
-
maintainers = [ lib.maintainers.fridh ];
54
-
};
55
-
56
-
}
+2
-7
pkgs/applications/blockchains/namecoin/default.nix
+2
-7
pkgs/applications/blockchains/namecoin/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump
2
-
, withGui }:
1
+
{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, hexdump }:
3
2
4
3
stdenv.mkDerivation rec {
5
-
pname = "namecoin" + lib.optionalString (!withGui) "d";
4
+
pname = "namecoind";
6
5
version = "25.0";
7
6
8
7
src = fetchFromGitHub {
···
25
24
db4
26
25
miniupnpc
27
26
eject
28
-
] ++ lib.optionals withGui [
29
-
qt4
30
-
protobuf
31
-
qrencode
32
27
];
33
28
34
29
enableParallelBuilding = true;
-60
pkgs/applications/editors/texmacs/darwin.nix
-60
pkgs/applications/editors/texmacs/darwin.nix
···
1
-
{ lib, stdenv, callPackage, fetchurl,
2
-
guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript,
3
-
tex ? null,
4
-
aspell ? null,
5
-
netpbm ? null,
6
-
imagemagick ? null,
7
-
extraFonts ? false,
8
-
chineseFonts ? false,
9
-
japaneseFonts ? false,
10
-
koreanFonts ? false }:
11
-
let
12
-
version = "1.99.4";
13
-
common = callPackage ./common.nix {
14
-
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
15
-
};
16
-
in
17
-
stdenv.mkDerivation {
18
-
pname = "TeXmacs";
19
-
inherit version;
20
-
21
-
src= fetchurl {
22
-
url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
23
-
sha256 = "1z8sj0xd1ncbl7ipzfsib6lmc7ahgvmiw61ln5zxm2l88jf7qc1a";
24
-
};
25
-
26
-
patches = [ ./darwin.patch ];
27
-
28
-
buildInputs = [ guile_1_8.dev qt4 freetype CoreFoundation Cocoa gettext libiconv ghostscript ];
29
-
30
-
GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile ";
31
-
32
-
NIX_LDFLAGS="${zlib}/lib/libz.dylib";
33
-
34
-
buildPhase = ''
35
-
substituteInPlace Makefile \
36
-
--replace 'find -d $(MACOS_PACKAGE_TEXMACS)' 'find $(MACOS_PACKAGE_TEXMACS) -depth' \
37
-
--replace '$(MACOS_PACKAGE_SRC)/bundle-libs.sh' 'true'
38
-
make MACOS_BUNDLE
39
-
'';
40
-
41
-
installPhase = ''
42
-
mkdir -p $out/Applications
43
-
cp -R ../distr/TeXmacs-${version}.app $out/Applications
44
-
'';
45
-
46
-
inherit (common) postPatch;
47
-
48
-
postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " +
49
-
"${ghostscript}/bin:" +
50
-
(lib.optionalString (aspell != null) "${aspell}/bin:") +
51
-
(lib.optionalString (tex != null) "${tex}/bin:") +
52
-
(lib.optionalString (netpbm != null) "${lib.getBin netpbm}/bin:") +
53
-
(lib.optionalString (imagemagick != null) "${imagemagick}/bin:");
54
-
55
-
enableParallelBuilding = true;
56
-
57
-
meta = common.meta // {
58
-
platforms = lib.platforms.darwin;
59
-
};
60
-
}
-29
pkgs/applications/editors/texmacs/darwin.patch
-29
pkgs/applications/editors/texmacs/darwin.patch
···
1
-
--- a/configure
2
-
+++ b/configure
3
-
@@ -7461,7 +7461,7 @@ $as_echo "final adjustments for cygwin host" >&6; }
4
-
CONFIG_QTPIPES="yes"
5
-
CONFIG_CXXFLAGS="-I${prefix}/include"
6
-
CONFIG_BSHARED=""
7
-
- CONFIG_BFLAGS="-framework Cocoa -framework IOKit"
8
-
+ CONFIG_BFLAGS="-framework Cocoa -framework IOKit -framework CoreFoundation"
9
-
CONFIG_BPATH=""
10
-
CONFIG_SO="dylib"
11
-
CONFIG_LIB_PATH="DYLD_LIBRARY_PATH"
12
-
@@ -8281,6 +8281,7 @@ _ASEOF
13
-
if $QMAKE ${additional_qmake_flags} ; then :; else
14
-
as_fn_error $? "Calling $QMAKE failed." "$LINENO" 5
15
-
fi
16
-
+ echo "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10" >> $pro_file
17
-
# Try to compile a simple Qt app.
18
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a simple Qt app" >&5
19
-
$as_echo_n "checking whether we can build a simple Qt app... " >&6; }
20
-
--- a/src/Plugins/Unix/unix_sys_utils.cpp
21
-
+++ b/src/Plugins/Unix/unix_sys_utils.cpp
22
-
@@ -17,6 +17,7 @@
23
-
#include <spawn.h>
24
-
#include <unistd.h>
25
-
#include <sys/wait.h>
26
-
+#include <pthread.h>
27
-
28
-
// for thread safe strings
29
-
#include <string>
-26
pkgs/applications/emulators/resim/default.nix
-26
pkgs/applications/emulators/resim/default.nix
···
1
-
{ fetchFromGitHub, lib, stdenv, cmake, qt4 }:
2
-
3
-
stdenv.mkDerivation {
4
-
pname = "resim";
5
-
version = "unstable-2016-11-11";
6
-
src = fetchFromGitHub {
7
-
owner = "itszor";
8
-
repo = "resim";
9
-
rev = "cdc7808ceb7ba4ac00d0d08ca646b58615059150";
10
-
sha256 = "1743lngqxd7ai4k6cd4d1cf9h60z2pnvr2iynfs1zlpcj3w1hx0c";
11
-
};
12
-
nativeBuildInputs = [ cmake ];
13
-
buildInputs = [ qt4 ];
14
-
installPhase = ''
15
-
mkdir -pv $out/{lib,bin}
16
-
cp -v libresim/libarmsim.so $out/lib/libarmsim.so
17
-
cp -v vc4emul/vc4emul $out/bin/vc4emul
18
-
'';
19
-
20
-
cmakeFlags = [
21
-
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
22
-
"-DCMAKE_SKIP_BUILD_RPATH=ON"
23
-
];
24
-
25
-
meta.license = lib.licenses.mit;
26
-
}
-39
pkgs/applications/graphics/animbar/default.nix
-39
pkgs/applications/graphics/animbar/default.nix
···
1
-
{ stdenv, lib, fetchurl, cmake, qt4, file }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "animbar";
5
-
version = "1.2";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
9
-
sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9";
10
-
};
11
-
12
-
nativeBuildInputs = [ cmake ];
13
-
14
-
buildInputs = [ qt4 file ];
15
-
16
-
installPhase = ''
17
-
mkdir -p $out/bin $out/share/pixmaps
18
-
cp src/animbar $out/bin
19
-
cp ../icon/* $out/share/pixmaps
20
-
'';
21
-
22
-
meta = with lib; {
23
-
description = "Create your own animation on paper and transparancy";
24
-
longDescription = ''
25
-
Animbar lets you easily create your own animation on paper and
26
-
transparancy. From a set of input images two output images are
27
-
computed, that are printed one on paper and one on
28
-
transparency. By moving the transparency over the paper you
29
-
create a fascinating animation effect. This kind of animation
30
-
technique is hundreds of years old and known under several
31
-
names: picket fence animation, barrier grid animation, Moiré
32
-
animation, to name a few.
33
-
'';
34
-
homepage = "http://animbar.mnim.org";
35
-
maintainers = with maintainers; [ leenaars ];
36
-
platforms = platforms.linux;
37
-
license = licenses.gpl3;
38
-
};
39
-
}
+24
-13
pkgs/applications/graphics/qscreenshot/default.nix
+24
-13
pkgs/applications/graphics/qscreenshot/default.nix
···
1
-
{ lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }:
1
+
{ stdenv
2
+
, lib
3
+
, fetchgit
4
+
, dos2unix
5
+
, qtbase
6
+
, qttools
7
+
, qtx11extras
8
+
, wrapQtAppsHook
9
+
, cmake }:
2
10
3
11
stdenv.mkDerivation rec {
4
12
pname = "qscreenshot";
5
-
version = "1.0";
13
+
version = "unstable-2021-10-18";
6
14
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/qscreenshot/qscreenshot-${version}-src.tar.gz";
9
-
sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx";
15
+
src = fetchgit {
16
+
url = "https://git.code.sf.net/p/qscreenshot/code";
17
+
rev = "e340f06ae2f1a92a353eaa68e103d1c840adc12d";
18
+
sha256 = "0mdiwn74vngiyazr3lq72f3jnv5zw8wyd2dw6rik6dbrvfs69jig";
10
19
};
11
20
12
-
buildInputs = [ dos2unix which qt ]
13
-
++ lib.optional stdenv.isDarwin Carbon;
14
-
15
-
# Remove carriage returns that cause /bin/sh to abort
16
-
preConfigure = ''
17
-
dos2unix configure
18
-
sed -i "s|lrelease-qt4|lrelease|" src/src.pro
19
-
'';
21
+
preConfigure = "cd qScreenshot";
20
22
23
+
nativeBuildInputs = [
24
+
cmake
25
+
qttools
26
+
wrapQtAppsHook
27
+
];
28
+
buildInputs = [
29
+
qtbase
30
+
qtx11extras
31
+
];
21
32
meta = with lib; {
22
33
description = "Simple creation and editing of screenshots";
23
34
homepage = "https://sourceforge.net/projects/qscreenshot/";
-26
pkgs/applications/graphics/scantailor/default.nix
-26
pkgs/applications/graphics/scantailor/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, qt4, cmake, libjpeg, libtiff, boost }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "scantailor";
5
-
version = "0.9.12.1";
6
-
7
-
src = fetchFromGitHub {
8
-
owner = "scantailor";
9
-
repo = "scantailor";
10
-
rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}";
11
-
sha256 = "sha256-Jn8+X737vwaE0ZPYdQv/1SocmWFA74XL90IW8yNiafA=";
12
-
};
13
-
14
-
nativeBuildInputs = [ cmake ];
15
-
buildInputs = [ qt4 libjpeg libtiff boost ];
16
-
17
-
meta = {
18
-
homepage = "https://scantailor.org/";
19
-
description = "Interactive post-processing tool for scanned pages";
20
-
21
-
license = lib.licenses.gpl3Plus;
22
-
23
-
maintainers = [ lib.maintainers.viric ];
24
-
platforms = lib.platforms.gnu ++ lib.platforms.linux;
25
-
};
26
-
}
+1
-4
pkgs/applications/misc/lutris/fhsenv.nix
+1
-4
pkgs/applications/misc/lutris/fhsenv.nix
-31
pkgs/applications/misc/qmetro/default.nix
-31
pkgs/applications/misc/qmetro/default.nix
···
1
-
{ lib, stdenv, fetchurl, qmake4Hook, unzip, qt4 }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "qmetro";
5
-
version = "0.7.1";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/qmetro/qmetro-${version}.zip";
9
-
sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5";
10
-
};
11
-
12
-
nativeBuildInputs = [ qmake4Hook unzip ];
13
-
14
-
buildInputs = [ qt4 ];
15
-
16
-
postPatch = ''
17
-
sed -e 's#Exec=/usr/bin/qmetro#Exec=qmetro#' -i rc/qmetro.desktop
18
-
echo 'LIBS += -lz' >> qmetro.pro
19
-
'';
20
-
21
-
enableParallelBuilding = true;
22
-
23
-
meta = with lib; {
24
-
homepage = "https://sourceforge.net/projects/qmetro/";
25
-
description = "Worldwide transit maps viewer";
26
-
license = licenses.gpl3;
27
-
28
-
maintainers = with maintainers; [ orivej ];
29
-
platforms = platforms.unix;
30
-
};
31
-
}
-34
pkgs/applications/misc/sqliteman/default.nix
-34
pkgs/applications/misc/sqliteman/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla-qt4 }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "sqliteman";
5
-
version = "1.2.0";
6
-
7
-
src = fetchFromGitHub {
8
-
repo = "sqliteman";
9
-
owner = "pvanek";
10
-
rev = version;
11
-
sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs";
12
-
};
13
-
14
-
nativeBuildInputs = [ cmake ];
15
-
buildInputs = [ qt4 qscintilla-qt4 ];
16
-
17
-
prePatch = ''
18
-
sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp
19
-
'';
20
-
21
-
preConfigure = ''
22
-
cd Sqliteman
23
-
sed -i 's,/usr/include/Qsci,${qscintilla-qt4}/include/Qsci,' cmake/modules/FindQScintilla.cmake
24
-
sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla-qt4}/libs,' cmake/modules/FindQScintilla.cmake
25
-
'';
26
-
27
-
meta = with lib; {
28
-
description = "A simple but powerful Sqlite3 GUI database manager";
29
-
homepage = "http://sqliteman.yarpen.cz/";
30
-
license = licenses.gpl2Plus;
31
-
platforms = platforms.linux;
32
-
maintainers = [ maintainers.eikek ];
33
-
};
34
-
}
+2
-2
pkgs/applications/misc/yate/default.nix
+2
-2
pkgs/applications/misc/yate/default.nix
···
1
-
{ stdenv, fetchurl, lib, qt4, openssl, pkg-config }:
1
+
{ stdenv, fetchurl, lib, openssl, pkg-config }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "yate";
···
11
11
12
12
# TODO zaptel ? postgres ?
13
13
nativeBuildInputs = [ pkg-config ];
14
-
buildInputs = [ qt4 openssl ];
14
+
buildInputs = [ openssl ];
15
15
16
16
# /dev/null is used when linking which is a impure path for the wrapper
17
17
postPatch =
-52
pkgs/applications/office/scribus/1_4.nix
-52
pkgs/applications/office/scribus/1_4.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
2
-
, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
3
-
, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
4
-
5
-
let
6
-
icon = fetchurl {
7
-
url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
8
-
sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
9
-
};
10
-
11
-
pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
12
-
in stdenv.mkDerivation rec {
13
-
pname = "scribus";
14
-
version = "1.4.8";
15
-
16
-
src = fetchurl {
17
-
url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
18
-
sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
19
-
};
20
-
21
-
nativeBuildInputs = [ pkg-config cmake ];
22
-
buildInputs = with xorg;
23
-
[ freetype lcms libtiff libxml2 libart_lgpl qt4
24
-
pythonEnv cups fontconfig
25
-
libjpeg zlib libpng podofo hunspell cairo
26
-
boost # for internal 2geom library
27
-
libXaw libXext libX11 libXtst libXi libXinerama
28
-
libpthreadstubs libXau libXdmcp
29
-
imagemagick # To build the icon
30
-
];
31
-
32
-
postPatch = ''
33
-
substituteInPlace scribus/util_ghostscript.cpp \
34
-
--replace 'QString gsName("gs");' \
35
-
'QString gsName("${ghostscript}/bin/gs");'
36
-
'';
37
-
38
-
postInstall = ''
39
-
for i in 16 24 48 64 96 128 256 512; do
40
-
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
41
-
convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
42
-
done
43
-
'';
44
-
45
-
meta = {
46
-
maintainers = [ lib.maintainers.marcweber ];
47
-
platforms = lib.platforms.linux;
48
-
description = "Desktop Publishing (DTP) and Layout program for Linux";
49
-
homepage = "https://www.scribus.net";
50
-
license = lib.licenses.gpl2;
51
-
};
52
-
}
+5
-4
pkgs/applications/office/tagainijisho/default.nix
+5
-4
pkgs/applications/office/tagainijisho/default.nix
···
1
-
{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }:
2
-
mkDerivation rec {
1
+
{ stdenv, lib, fetchzip, qtbase, qttools, cmake, sqlite, wrapQtAppsHook }:
2
+
3
+
stdenv.mkDerivation rec {
3
4
pname = "tagainijisho";
4
5
version = "1.2.2";
5
6
···
8
9
hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94=";
9
10
};
10
11
11
-
nativeBuildInputs = [ cmake ];
12
-
buildInputs = [ qtbase qttools sqlite ];
12
+
nativeBuildInputs = [ qttools cmake wrapQtAppsHook ];
13
+
buildInputs = [ qtbase sqlite ];
13
14
14
15
cmakeFlags = [
15
16
"-DEMBED_SQLITE=OFF"
-30
pkgs/applications/science/chemistry/avogadro/default.nix
-30
pkgs/applications/science/chemistry/avogadro/default.nix
···
1
-
{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "avogadro";
5
-
version = "1.1.1";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2";
9
-
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
10
-
};
11
-
12
-
buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ];
13
-
14
-
nativeBuildInputs = [ cmake pkg-config doxygen ];
15
-
16
-
env.NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h";
17
-
18
-
patches = [
19
-
(fetchurl {
20
-
url = "https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch";
21
-
sha256 = "1p113v19z3zwr9gxj2k599f8p97a8rwm93pa4amqvd0snn31mw0k";
22
-
})
23
-
];
24
-
25
-
meta = with lib; {
26
-
description = "Molecule editor and visualizer";
27
-
maintainers = with maintainers; [ danielbarter ];
28
-
platforms = platforms.mesaPlatforms;
29
-
};
30
-
}
+74
-67
pkgs/applications/science/electronics/flatcam/default.nix
+74
-67
pkgs/applications/science/electronics/flatcam/default.nix
···
1
1
{ lib
2
-
, stdenv
3
-
, python3
4
-
, fetchPypi
5
2
, fetchFromBitbucket
6
-
, fetchpatch
7
-
, substituteAll
8
-
, geos
3
+
, buildPythonApplication
4
+
, pyqt5
5
+
, matplotlib
6
+
, numpy
7
+
, cycler
8
+
, python-dateutil
9
+
, kiwisolver
10
+
, six
11
+
, setuptools
12
+
, dill
13
+
, rtree
14
+
, pyopengl
15
+
, vispy
16
+
, ortools
17
+
, svg-path
18
+
, simplejson
19
+
, shapely
20
+
, freetype-py
21
+
, fonttools
22
+
, rasterio
23
+
, lxml
24
+
, ezdxf
25
+
, qrcode
26
+
, reportlab
27
+
, svglib
28
+
, gdal
29
+
, pyserial
30
+
, python3
9
31
}:
10
32
11
-
let
12
-
python = python3.override {
13
-
packageOverrides = self: super: {
14
-
shapely = super.shapely.overridePythonAttrs (old: rec {
15
-
version = "1.8.4";
16
-
17
-
src = fetchPypi {
18
-
pname = "Shapely";
19
-
inherit version;
20
-
hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw=";
21
-
};
22
-
23
-
# Environment variable used in shapely/_buildcfg.py
24
-
GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}";
25
-
26
-
patches = [
27
-
# Patch to search form GOES .so/.dylib files in a Nix-aware way
28
-
(substituteAll {
29
-
src = ./shapely-library-paths.patch;
30
-
libgeos_c = GEOS_LIBRARY_PATH;
31
-
libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6";
32
-
})
33
-
];
34
-
35
-
postPatch = ''
36
-
substituteInPlace pyproject.toml \
37
-
--replace 'setuptools<64' 'setuptools'
38
-
'';
39
-
});
40
-
};
41
-
};
42
-
in
43
-
python.pkgs.buildPythonApplication rec {
33
+
buildPythonApplication rec {
44
34
pname = "flatcam";
45
-
version = "8.5";
35
+
version = "unstable-2022-02-02";
46
36
47
37
src = fetchFromBitbucket {
48
38
owner = "jpcgt";
49
39
repo = pname;
50
-
rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging.
51
-
sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m";
40
+
rev = "ebf5cb9e3094362c4b0774a54cf119559c02211d"; # beta branch as of 2022-02-02
41
+
hash = "sha256-QKkBPEM+HVYmSZ83b4JRmOmCMp7C3EUqbJKPqUXMiKE=";
52
42
};
53
43
54
-
propagatedBuildInputs = with python.pkgs; [
44
+
format = "other";
45
+
46
+
dontBuild = true;
47
+
48
+
propagatedBuildInputs = [
49
+
pyqt5
55
50
matplotlib
56
51
numpy
57
-
packaging
58
-
pyqt4
52
+
cycler
53
+
python-dateutil
54
+
kiwisolver
55
+
six
56
+
setuptools
57
+
dill
59
58
rtree
60
-
scipy
61
-
setuptools
59
+
pyopengl
60
+
vispy
61
+
ortools
62
+
svg-path
63
+
simplejson
62
64
shapely
63
-
simplejson
64
-
six
65
-
svg-path
65
+
freetype-py
66
+
fonttools
67
+
rasterio
68
+
lxml
69
+
ezdxf
70
+
qrcode
71
+
reportlab
72
+
svglib
73
+
gdal
74
+
pyserial
66
75
];
67
76
68
-
packaging_fix_pull_request_patch = fetchpatch {
69
-
name = "packaging_fix_pull_request.patch";
70
-
url = "https://bitbucket.org/trepetti/flatcam/commits/5591ed889d1f48a5190fe237b562cb932cb5876c/raw";
71
-
sha256 = "19rhjdrf1n1q29cgpcry6pl2kl90zq0d613hhkwdir9bhq5bkknp";
72
-
};
77
+
preInstall = ''
78
+
patchShebangs .
73
79
74
-
patches = [
75
-
packaging_fix_pull_request_patch
76
-
./release.patch
77
-
];
80
+
sed -i "s|/usr/local/bin|$out/bin|" Makefile
78
81
79
-
postPatch = ''
80
-
substituteInPlace setup.py --replace "'shapely>=1.3'" "'shapely>=1.3',"
82
+
mkdir -p $out/share/{flatcam,applications}
83
+
mkdir -p $out/bin
81
84
'';
82
85
83
-
# Only non-GUI tests can be run deterministically in the Nix build environment.
84
-
checkPhase = ''
85
-
python -m unittest tests.test_excellon
86
-
python -m unittest tests.test_gerber_buffer
87
-
python -m unittest tests.test_paint
88
-
python -m unittest tests.test_pathconnect
86
+
installFlags = [
87
+
"USER_ID=0"
88
+
"LOCAL_PATH=/build/source/."
89
+
"INSTALL_PATH=${placeholder "out"}/share/flatcam"
90
+
"APPS_PATH=${placeholder "out"}/share/applications"
91
+
];
92
+
93
+
postInstall = ''
94
+
sed -i "s|python3|${python3.withPackages (_: propagatedBuildInputs)}/bin/python3|" $out/bin/flatcam-beta
95
+
mv $out/bin/flatcam{-beta,}
89
96
'';
90
97
91
98
meta = with lib; {
-13
pkgs/applications/science/electronics/flatcam/release.patch
-13
pkgs/applications/science/electronics/flatcam/release.patch
···
1
-
diff --git a/FlatCAMVersion.py b/FlatCAMVersion.py
2
-
index ba9e04a5..2c64d5a6 100644
3
-
--- a/FlatCAMVersion.py
4
-
+++ b/FlatCAMVersion.py
5
-
@@ -16,7 +16,7 @@ version = {
6
-
"number": 8.5,
7
-
"date": (2016, 7, 1), # Year, Month, Day
8
-
"name": None,
9
-
- "release": False,
10
-
+ "release": True,
11
-
}
12
-
13
-
-28
pkgs/applications/science/electronics/qfsm/default.nix
-28
pkgs/applications/science/electronics/qfsm/default.nix
···
1
-
{ lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "qfsm";
5
-
version = "0.54.0";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/qfsm/qfsm-${version}-Source.tar.bz2";
9
-
sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb";
10
-
};
11
-
12
-
nativeBuildInputs = [ cmake pkg-config ];
13
-
buildInputs = [ qt4 graphviz ];
14
-
15
-
patches = [
16
-
./drop-hardcoded-prefix.patch
17
-
./gcc6-fixes.patch
18
-
];
19
-
20
-
hardeningDisable = [ "format" ];
21
-
22
-
meta = {
23
-
description = "Graphical editor for finite state machines";
24
-
homepage = "https://qfsm.sourceforge.net/";
25
-
license = lib.licenses.gpl3Plus;
26
-
platforms = lib.platforms.unix;
27
-
};
28
-
}
-20
pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch
-20
pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch
···
1
-
diff -ubrw qfsm-0.53.0-Source-orig/CMakeLists.txt qfsm-0.53.0-Source-new/CMakeLists.txt
2
-
--- qfsm-0.53.0-Source-orig/CMakeLists.txt 2012-11-11 20:13:01.935856229 +0100
3
-
+++ qfsm-0.53.0-Source-new/CMakeLists.txt 2012-11-11 20:13:24.962930007 +0100
4
-
@@ -406,10 +406,6 @@
5
-
6
-
7
-
IF(UNIX AND NOT WIN32)
8
-
- SET(CMAKE_INSTALL_PREFIX "/usr")
9
-
-ENDIF(UNIX AND NOT WIN32)
10
-
-
11
-
-IF(UNIX AND NOT WIN32)
12
-
ADD_DEFINITIONS(-DQFSM_LANGUAGE_DIR="${CMAKE_INSTALL_PREFIX}/share/qfsm/")
13
-
ADD_DEFINITIONS(-DQFSM_HELP_DIR="${CMAKE_INSTALL_PREFIX}/share/doc/qfsm/")
14
-
ELSE(UNIX AND NOT WIN32)
15
-
@@ -472,5 +468,3 @@
16
-
)
17
-
18
-
ENDIF(UNIX AND NOT WIN32)
19
-
-
20
-
-
-20
pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch
-20
pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch
···
1
-
--- qfsm-0.54.0-Source-orig/src/FileIO.cpp 2015-01-02 19:01:46.000000000 +0100
2
-
+++ qfsm-0.54.0-Source/src/FileIO.cpp 2017-09-11 19:53:30.579488402 +0200
3
-
@@ -1617,7 +1617,7 @@
4
-
QString ext;
5
-
6
-
if (!imp)
7
-
- return FALSE;
8
-
+ return NULL;
9
-
10
-
Project* p=NULL;
11
-
importdlg->setAcceptMode(QFileDialog::AcceptOpen);
12
-
@@ -1641,7 +1641,7 @@
13
-
ifstream fin(act_importfile);
14
-
15
-
if (!fin)
16
-
- return FALSE;
17
-
+ return NULL;
18
-
19
-
emit setWaitCursor();
20
-
-34
pkgs/applications/science/electronics/qucs/cmakelists.patch
-34
pkgs/applications/science/electronics/qucs/cmakelists.patch
···
1
-
diff --git i/qucs-core/CMakeLists.txt w/qucs-core/CMakeLists.txt
2
-
index 2dbbd41..d174b50 100644
3
-
--- i/qucs-core/CMakeLists.txt
4
-
+++ w/qucs-core/CMakeLists.txt
5
-
@@ -158,26 +158,9 @@ ENDIF()
6
-
7
-
#
8
-
# Need Bison
9
-
-#
10
-
-# This is a HACK to get arround a PATH issue with Qt Creator on OSX.
11
-
-# It seams impossible to pass a custom PATH to Qt Creator on OSX, ie, cannot prepend `/usr/local/bin/` for intance.
12
-
-# The FIND_PACKAGE fails. For now we provide a fallback with a custom FIND_PROGRAM. The variable BISON_DIR is also available.
13
-
-IF(WIN32)
14
-
- FIND_PACKAGE(BISON 2.4 REQUIRED)
15
-
- IF(BISON_FOUND)
16
-
- #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" )
17
-
- ENDIF()
18
-
-ELSE() # Linux, OSX
19
-
- # use -DBISON_DIR=/path/ to provide the path to bison
20
-
- FIND_PROGRAM( BISON_EXECUTABLE bison
21
-
- PATHS /usr/local/bin/ /opt/local/bin/ /usr/bin ${BISON_DIR}
22
-
- DOC "bison path"
23
-
- NO_DEFAULT_PATH )
24
-
- IF(BISON_EXECUTABLE )
25
-
- MESSAGE(STATUS "Found bison: " ${BISON_EXECUTABLE})
26
-
- ELSE()
27
-
- MESSAGE(FATAL_ERROR "Unable to find bison. Try to provide -DBISON_DIR=[path]")
28
-
- ENDIF()
29
-
+FIND_PACKAGE(BISON 2.4 REQUIRED)
30
-
+IF(BISON_FOUND)
31
-
+ #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" )
32
-
ENDIF()
33
-
34
-
#
-30
pkgs/applications/science/electronics/qucs/default.nix
-30
pkgs/applications/science/electronics/qucs/default.nix
···
1
-
{lib, stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
version = "0.0.19";
5
-
pname = "qucs";
6
-
7
-
src = fetchFromGitHub {
8
-
owner = "Qucs";
9
-
repo = "qucs";
10
-
rev = "qucs-${version}";
11
-
sha256 = "106h3kjyg7c0hkmzkin7h8fcl32n60835121b2qqih8ixi6r5id6";
12
-
};
13
-
14
-
QTDIR=qt4;
15
-
16
-
patches = [
17
-
./cmakelists.patch
18
-
];
19
-
20
-
nativeBuildInputs = [ cmake flex bison ];
21
-
buildInputs = [ qt4 libX11 gperf adms ];
22
-
23
-
meta = {
24
-
description = "Integrated circuit simulator";
25
-
homepage = "https://qucs.sourceforge.net";
26
-
license = lib.licenses.gpl2Plus;
27
-
maintainers = with lib.maintainers; [viric];
28
-
platforms = with lib.platforms; linux;
29
-
};
30
-
}
+9
-9
pkgs/applications/science/logic/surelog/default.nix
+9
-9
pkgs/applications/science/logic/surelog/default.nix
···
10
10
, gtest
11
11
, uhdm
12
12
, antlr4
13
-
, flatbuffers
14
13
, capnproto
15
14
}:
16
15
17
-
stdenv.mkDerivation rec {
16
+
stdenv.mkDerivation (finalAttrs: {
18
17
pname = "surelog";
19
-
version = "1.57";
18
+
version = "1.73";
20
19
21
20
src = fetchFromGitHub {
22
21
owner = "chipsalliance";
23
-
repo = pname;
24
-
rev = "v${version}";
25
-
hash = "sha256-Gty0OSNG5Nonyw7v2KiKP51LhiugMY7uqI6aJ6as0SQ=";
22
+
repo = finalAttrs.pname;
23
+
rev = "v${finalAttrs.version}";
24
+
hash = "sha256-z47Eqs3fP53pbEb3s66CqMiO4UpEwox+fKakxtRBakQ=";
25
+
fetchSubmodules = false; # we use all dependencies from nix
26
26
};
27
27
28
28
nativeBuildInputs = [
···
40
40
buildInputs = [
41
41
libuuid
42
42
gperftools
43
-
flatbuffers
44
43
uhdm
45
44
capnproto
46
45
antlr4.runtime.cpp
47
46
];
48
47
49
48
cmakeFlags = [
50
-
"-DSURELOG_USE_HOST_FLATBUFFERS=On"
49
+
"-DSURELOG_USE_HOST_CAPNP=On"
51
50
"-DSURELOG_USE_HOST_UHDM=On"
52
51
"-DSURELOG_USE_HOST_GTEST=On"
53
52
"-DSURELOG_USE_HOST_ANTLR=On"
···
66
65
description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler";
67
66
homepage = "https://github.com/chipsalliance/Surelog";
68
67
license = lib.licenses.asl20;
68
+
mainProgram = "surelog";
69
69
maintainers = with lib.maintainers; [ matthuszagh ];
70
70
platforms = lib.platforms.all;
71
71
};
72
-
}
72
+
})
+7
-6
pkgs/applications/science/logic/uhdm/default.nix
+7
-6
pkgs/applications/science/logic/uhdm/default.nix
···
7
7
, gtest
8
8
}:
9
9
10
-
stdenv.mkDerivation rec {
10
+
stdenv.mkDerivation (finalAttrs: {
11
11
pname = "UHDM";
12
-
version = "1.57";
12
+
version = "1.73";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "chipsalliance";
16
-
repo = pname;
17
-
rev = "v${version}";
18
-
hash = "sha256-z3vURlKXCW5W2naVwJjBXcn94u80JsBxlUOIy9ylsJw=";
16
+
repo = finalAttrs.pname;
17
+
rev = "v${finalAttrs.version}";
18
+
hash = "sha256-VmRn51UrJTGEG4n2fi5kRv8khXakfGbqMtYPejsZCBI=";
19
+
fetchSubmodules = false; # we use all dependencies from nix
19
20
};
20
21
21
22
nativeBuildInputs = [
···
43
44
maintainers = with lib.maintainers; [ matthuszagh ];
44
45
platforms = lib.platforms.all;
45
46
};
46
-
}
47
+
})
-60
pkgs/applications/science/medicine/aliza/default.nix
-60
pkgs/applications/science/medicine/aliza/default.nix
···
1
-
{ lib, stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }:
2
-
3
-
with lib;
4
-
stdenv.mkDerivation {
5
-
pname = "aliza";
6
-
version = "1.98.57";
7
-
src = fetchurl {
8
-
# See https://www.aliza-dicom-viewer.com/download
9
-
urls = [
10
-
"https://drive.google.com/uc?export=download&id=1-AXa3tjy_onecW2k7ftjAQl0KGTb0B1Y"
11
-
"https://web.archive.org/web/20210327224315/https://doc-0s-0s-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/1lgjid9ti29rdf5ebmd7o58iqhs3gfpo/1616884950000/16072287944266838401/*/1-AXa3tjy_onecW2k7ftjAQl0KGTb0B1Y?e=download"
12
-
];
13
-
sha256 = "01qk2gadmc24pmfdnmpiz7vgfiqkvhznyq9rsr153frscg76gc9b";
14
-
name = "aliza.rpm";
15
-
};
16
-
17
-
nativeBuildInputs = [ makeWrapper rpmextract ];
18
-
19
-
unpackCmd = "rpmextract $curSrc";
20
-
21
-
postPatch = ''
22
-
sed -i 's/^Exec.*$/Exec=aliza %F/' share/applications/aliza.desktop
23
-
'';
24
-
25
-
installPhase = ''
26
-
runHook preInstall
27
-
28
-
mkdir -p $out
29
-
cp -r bin share $out
30
-
31
-
runHook postInstall
32
-
'';
33
-
34
-
postInstall = let
35
-
libs = lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ];
36
-
in ''
37
-
${patchelf}/bin/patchelf \
38
-
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
39
-
$out/bin/aliza
40
-
41
-
${patchelf}/bin/patchelf \
42
-
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
43
-
$out/bin/aliza-vtkvol
44
-
45
-
wrapProgram $out/bin/aliza \
46
-
--prefix LD_LIBRARY_PATH : ${libs}
47
-
48
-
wrapProgram $out/bin/aliza-vtkvol \
49
-
--prefix LD_LIBRARY_PATH : ${libs}
50
-
'';
51
-
52
-
meta = {
53
-
description = "Medical imaging software with 2D, 3D and 4D capabilities";
54
-
homepage = "https://www.aliza-dicom-viewer.com";
55
-
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
56
-
license = licenses.unfreeRedistributable;
57
-
maintainers = with maintainers; [ mounium ];
58
-
platforms = platforms.linux;
59
-
};
60
-
}
+14
-39
pkgs/applications/science/misc/root/default.nix
+14
-39
pkgs/applications/science/misc/root/default.nix
···
2
2
, lib
3
3
, callPackage
4
4
, fetchurl
5
-
, fetchpatch
6
5
, makeWrapper
7
6
, cmake
8
7
, coreutils
···
14
13
, gnugrep
15
14
, gnused
16
15
, gsl
16
+
, gtest
17
17
, lapack
18
18
, libX11
19
19
, libXpm
···
23
23
, libGL
24
24
, libxcrypt
25
25
, libxml2
26
-
, llvm_9
26
+
, llvm_13
27
27
, lsof
28
28
, lz4
29
29
, xz
···
55
55
, noSplash ? false
56
56
}:
57
57
58
-
let
59
-
60
-
_llvm_9 = llvm_9.overrideAttrs (prev: {
61
-
patches = (prev.patches or [ ]) ++ [
62
-
(fetchpatch {
63
-
url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff";
64
-
stripLen = 3;
65
-
hash = "sha256-LH2RipJICEDWOr7JzX5s0QiUhEwXNMFEJihYKy9qWpo=";
66
-
})
67
-
];
68
-
});
69
-
70
-
in
71
-
72
58
stdenv.mkDerivation rec {
73
59
pname = "root";
74
-
version = "6.26.10";
60
+
version = "6.28.06";
75
61
76
62
passthru = {
77
63
tests = import ./tests { inherit callPackage; };
···
79
65
80
66
src = fetchurl {
81
67
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
82
-
hash = "sha256-jla+w5cQQBeqVPnrVU3noaE0R0/gs7sPQ6cPxPq9Yl8=";
68
+
hash = "sha256-rztnO5rKOTpcmuG/huqyZyqvGEG2WMXG56MKuTxYZTM=";
83
69
};
84
70
85
71
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
···
97
83
lapack
98
84
libxcrypt
99
85
libxml2
100
-
_llvm_9
86
+
llvm_13
101
87
lz4
102
88
xz
103
89
gsl
90
+
gtest
104
91
openblas
105
92
openssl
106
93
xxHash
···
122
109
123
110
patches = [
124
111
./sw_vers.patch
125
-
] ++ lib.optionals (python.pkgs.pythonAtLeast "3.11") [
126
-
# Fix build against Python 3.11
127
-
(fetchpatch {
128
-
url = "https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc.patch";
129
-
hash = "sha256-4qur2e3SxMIPgOg4IjlvuULR2BObuP7xdvs+LmNT2/s=";
130
-
})
131
112
];
132
113
133
-
# Fix build against vanilla LLVM 9
134
-
postPatch = ''
135
-
sed \
136
-
-e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/i#define private protected' \
137
-
-e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/a#undef private' \
138
-
-i interpreter/cling/lib/Interpreter/IncrementalJIT.h
139
-
'';
140
-
141
114
preConfigure = ''
142
115
rm -rf builtins/*
143
116
substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
144
117
--replace 'set(lcgpackages ' '#set(lcgpackages '
118
+
119
+
substituteInPlace interpreter/llvm/src/tools/clang/tools/driver/CMakeLists.txt \
120
+
--replace 'add_clang_symlink(''${link} clang)' ""
145
121
146
122
# Don't require textutil on macOS
147
123
: > cmake/modules/RootCPack.cmake
···
167
143
"-DCMAKE_INSTALL_LIBDIR=lib"
168
144
"-DCMAKE_INSTALL_INCLUDEDIR=include"
169
145
"-Dbuiltin_llvm=OFF"
146
+
"-Dbuiltin_freetype=OFF"
147
+
"-Dbuiltin_gtest=OFF"
170
148
"-Dbuiltin_nlohmannjson=OFF"
171
149
"-Dbuiltin_openui5=OFF"
172
150
"-Dalien=OFF"
···
240
218
# but it also need to support Bash-less POSIX shell like dash,
241
219
# as they are mentioned in `thisroot.sh`.
242
220
243
-
# `thisroot.sh` would include commands `lsof` and `procps` since ROOT 6.28.
244
-
# See https://github.com/root-project/root/pull/10332
245
-
246
221
patchRcPathPosix "$out/bin/thisroot.sh" "${lib.makeBinPath [
247
222
coreutils # dirname tail
248
223
gnugrep # grep
249
224
gnused # sed
250
-
lsof # lsof # for ROOT (>=6.28)
225
+
lsof # lsof
251
226
man # manpath
252
-
procps # ps # for ROOT (>=6.28)
227
+
procps # ps
253
228
which # which
254
229
]}"
255
230
patchRcPathCsh "$out/bin/thisroot.csh" "${lib.makeBinPath [
256
231
coreutils
257
232
gnugrep
258
233
gnused
259
-
lsof # lsof # for ROOT (>=6.28)
234
+
lsof # lsof
260
235
man
261
236
which
262
237
]}"
+11
-25
pkgs/applications/science/misc/vite/default.nix
+11
-25
pkgs/applications/science/misc/vite/default.nix
···
1
-
{ fetchsvn, lib, stdenv, cmake, qt4, libGLU, libGL }:
1
+
{ stdenv, fetchFromGitLab, lib, cmake, qtbase, qttools, qtcharts, libGLU, libGL, glm, glew, wrapQtAppsHook }:
2
2
3
-
# ViTE 1.1 has several bugs, so use the SVN version.
4
-
let
5
-
rev = "1543";
6
-
externals = fetchsvn {
7
-
url = "svn://scm.gforge.inria.fr/svn/vite/externals";
8
-
sha256 = "1a422n3dp72v4visq5b1i21cf8sj12903sgg5v2hah3sgk02dnyz";
9
-
inherit rev;
10
-
};
11
-
in
12
-
stdenv.mkDerivation {
3
+
stdenv.mkDerivation rec {
13
4
pname = "vite";
14
-
version = "1.2pre${rev}";
5
+
version = "unstable-2022-05-17";
15
6
16
-
src = fetchsvn {
17
-
url = "svn://scm.gforge.inria.fr/svn/vite/trunk";
18
-
sha256 = "02479dv96h29d0w0svp42mjjrxhmv8lkkqp30w7mlx5gr2g0v7lf";
19
-
inherit rev;
7
+
src = fetchFromGitLab {
8
+
domain = "gitlab.inria.fr";
9
+
owner = "solverstack";
10
+
repo = pname;
11
+
rev = "6d497cc519fac623e595bd174e392939c4de845c";
12
+
hash = "sha256-Yf2jYALZplIXzVtd/sg6gzEYrZ+oU0zLG1ETd/hiTi0=";
20
13
};
21
14
22
-
preConfigure = ''
23
-
rm -rv externals
24
-
ln -sv "${externals}" externals
25
-
'';
26
-
27
-
nativeBuildInputs = [ cmake ];
28
-
buildInputs = [ qt4 libGLU libGL ];
29
-
30
-
NIX_LDFLAGS = "-lGLU";
15
+
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
16
+
buildInputs = [ qtbase qtcharts libGLU libGL glm glew ];
31
17
32
18
meta = {
33
19
description = "Visual Trace Explorer (ViTE), a tool to visualize execution traces";
+185
-184
pkgs/applications/system/asusctl/Cargo.lock
+185
-184
pkgs/applications/system/asusctl/Cargo.lock
···
89
89
90
90
[[package]]
91
91
name = "addr2line"
92
-
version = "0.20.0"
92
+
version = "0.21.0"
93
93
source = "registry+https://github.com/rust-lang/crates.io-index"
94
-
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
94
+
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
95
95
dependencies = [
96
96
"gimli",
97
97
]
···
115
115
116
116
[[package]]
117
117
name = "aho-corasick"
118
-
version = "1.0.2"
118
+
version = "1.0.4"
119
119
source = "registry+https://github.com/rust-lang/crates.io-index"
120
-
checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
120
+
checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
121
121
dependencies = [
122
122
"memchr",
123
123
]
124
124
125
125
[[package]]
126
126
name = "android-activity"
127
-
version = "0.4.2"
127
+
version = "0.4.3"
128
128
source = "registry+https://github.com/rust-lang/crates.io-index"
129
-
checksum = "40bc1575e653f158cbdc6ebcd917b9564e66321c5325c232c3591269c257be69"
129
+
checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
130
130
dependencies = [
131
131
"android-properties",
132
132
"bitflags 1.3.2",
···
163
163
164
164
[[package]]
165
165
name = "anyhow"
166
-
version = "1.0.72"
166
+
version = "1.0.75"
167
167
source = "registry+https://github.com/rust-lang/crates.io-index"
168
-
checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
168
+
checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
169
169
170
170
[[package]]
171
171
name = "arboard"
···
199
199
200
200
[[package]]
201
201
name = "asusctl"
202
-
version = "4.7.0-RC3"
202
+
version = "4.7.1"
203
203
dependencies = [
204
204
"asusd",
205
205
"cargo-husky",
···
218
218
219
219
[[package]]
220
220
name = "asusd"
221
-
version = "4.7.0-RC3"
221
+
version = "4.7.1"
222
222
dependencies = [
223
223
"async-trait",
224
224
"cargo-husky",
···
242
242
243
243
[[package]]
244
244
name = "asusd-user"
245
-
version = "4.7.0-RC3"
245
+
version = "4.7.1"
246
246
dependencies = [
247
247
"cargo-husky",
248
248
"config-traits",
···
323
323
"polling",
324
324
"rustix 0.37.23",
325
325
"slab",
326
-
"socket2",
326
+
"socket2 0.4.9",
327
327
"waker-fn",
328
328
]
329
329
330
330
[[package]]
331
331
name = "async-lock"
332
-
version = "2.7.0"
332
+
version = "2.8.0"
333
333
source = "registry+https://github.com/rust-lang/crates.io-index"
334
-
checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
334
+
checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
335
335
dependencies = [
336
336
"event-listener",
337
337
]
···
374
374
dependencies = [
375
375
"proc-macro2",
376
376
"quote",
377
-
"syn 2.0.27",
377
+
"syn 2.0.29",
378
378
]
379
379
380
380
[[package]]
···
385
385
386
386
[[package]]
387
387
name = "async-trait"
388
-
version = "0.1.72"
388
+
version = "0.1.73"
389
389
source = "registry+https://github.com/rust-lang/crates.io-index"
390
-
checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
390
+
checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
391
391
dependencies = [
392
392
"proc-macro2",
393
393
"quote",
394
-
"syn 2.0.27",
394
+
"syn 2.0.29",
395
395
]
396
396
397
397
[[package]]
···
426
426
427
427
[[package]]
428
428
name = "atomic_refcell"
429
-
version = "0.1.10"
429
+
version = "0.1.11"
430
430
source = "registry+https://github.com/rust-lang/crates.io-index"
431
-
checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31"
431
+
checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905"
432
432
433
433
[[package]]
434
434
name = "atspi"
···
471
471
472
472
[[package]]
473
473
name = "backtrace"
474
-
version = "0.3.68"
474
+
version = "0.3.69"
475
475
source = "registry+https://github.com/rust-lang/crates.io-index"
476
-
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
476
+
checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
477
477
dependencies = [
478
478
"addr2line",
479
479
"cc",
···
486
486
487
487
[[package]]
488
488
name = "base64"
489
-
version = "0.13.1"
489
+
version = "0.21.2"
490
490
source = "registry+https://github.com/rust-lang/crates.io-index"
491
-
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
491
+
checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
492
492
493
493
[[package]]
494
494
name = "bindgen"
···
518
518
519
519
[[package]]
520
520
name = "bitflags"
521
-
version = "2.3.3"
521
+
version = "2.4.0"
522
522
source = "registry+https://github.com/rust-lang/crates.io-index"
523
-
checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
523
+
checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
524
+
dependencies = [
525
+
"serde",
526
+
]
524
527
525
528
[[package]]
526
529
name = "block"
···
594
597
dependencies = [
595
598
"proc-macro2",
596
599
"quote",
597
-
"syn 2.0.27",
600
+
"syn 2.0.29",
598
601
]
599
602
600
603
[[package]]
···
656
659
657
660
[[package]]
658
661
name = "cc"
659
-
version = "1.0.79"
662
+
version = "1.0.83"
660
663
source = "registry+https://github.com/rust-lang/crates.io-index"
661
-
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
664
+
checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
662
665
dependencies = [
663
666
"jobserver",
667
+
"libc",
664
668
]
665
669
666
670
[[package]]
···
680
684
681
685
[[package]]
682
686
name = "cfg-expr"
683
-
version = "0.15.3"
687
+
version = "0.15.4"
684
688
source = "registry+https://github.com/rust-lang/crates.io-index"
685
-
checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c"
689
+
checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9"
686
690
dependencies = [
687
691
"smallvec",
688
692
"target-lexicon",
···
767
771
checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d"
768
772
dependencies = [
769
773
"quote",
770
-
"syn 2.0.27",
774
+
"syn 2.0.29",
771
775
]
772
776
773
777
[[package]]
···
781
785
782
786
[[package]]
783
787
name = "config-traits"
784
-
version = "4.7.0-RC3"
788
+
version = "4.7.1"
785
789
dependencies = [
786
790
"cargo-husky",
787
791
"log",
···
870
874
]
871
875
872
876
[[package]]
877
+
name = "deranged"
878
+
version = "0.3.8"
879
+
source = "registry+https://github.com/rust-lang/crates.io-index"
880
+
checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
881
+
882
+
[[package]]
873
883
name = "derivative"
874
884
version = "2.2.0"
875
885
source = "registry+https://github.com/rust-lang/crates.io-index"
···
1079
1089
dependencies = [
1080
1090
"proc-macro2",
1081
1091
"quote",
1082
-
"syn 2.0.27",
1092
+
"syn 2.0.29",
1083
1093
]
1084
1094
1085
1095
[[package]]
···
1119
1129
1120
1130
[[package]]
1121
1131
name = "errno"
1122
-
version = "0.3.1"
1132
+
version = "0.3.2"
1123
1133
source = "registry+https://github.com/rust-lang/crates.io-index"
1124
-
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
1134
+
checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
1125
1135
dependencies = [
1126
1136
"errno-dragonfly",
1127
1137
"libc",
···
1190
1200
1191
1201
[[package]]
1192
1202
name = "flate2"
1193
-
version = "1.0.26"
1203
+
version = "1.0.27"
1194
1204
source = "registry+https://github.com/rust-lang/crates.io-index"
1195
-
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
1205
+
checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
1196
1206
dependencies = [
1197
1207
"crc32fast",
1198
1208
"miniz_oxide 0.7.1",
···
1286
1296
dependencies = [
1287
1297
"proc-macro2",
1288
1298
"quote",
1289
-
"syn 2.0.27",
1299
+
"syn 2.0.29",
1290
1300
]
1291
1301
1292
1302
[[package]]
···
1420
1430
1421
1431
[[package]]
1422
1432
name = "gimli"
1423
-
version = "0.27.3"
1433
+
version = "0.28.0"
1424
1434
source = "registry+https://github.com/rust-lang/crates.io-index"
1425
-
checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
1435
+
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
1426
1436
1427
1437
[[package]]
1428
1438
name = "gio"
···
1544
1554
1545
1555
[[package]]
1546
1556
name = "glutin"
1547
-
version = "0.30.9"
1557
+
version = "0.30.10"
1548
1558
source = "registry+https://github.com/rust-lang/crates.io-index"
1549
-
checksum = "23b0385782048be65f0a9dd046c469d6a758a53fe1aa63a8111dea394d2ffa2f"
1559
+
checksum = "8fc93b03242719b8ad39fb26ed2b01737144ce7bd4bfc7adadcef806596760fe"
1550
1560
dependencies = [
1551
1561
"bitflags 1.3.2",
1552
1562
"cfg_aliases",
···
1579
1589
1580
1590
[[package]]
1581
1591
name = "glutin_egl_sys"
1582
-
version = "0.5.0"
1592
+
version = "0.5.1"
1583
1593
source = "registry+https://github.com/rust-lang/crates.io-index"
1584
-
checksum = "1b3bcbddc51573b977fc6dca5d93867e4f29682cdbaf5d13e48f4fa4346d4d87"
1594
+
checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5"
1585
1595
dependencies = [
1586
1596
"gl_generator",
1587
1597
"windows-sys 0.45.0",
···
1776
1786
1777
1787
[[package]]
1778
1788
name = "inotify"
1779
-
version = "0.10.1"
1789
+
version = "0.10.2"
1780
1790
source = "registry+https://github.com/rust-lang/crates.io-index"
1781
-
checksum = "ff335215fb898bf09c45833b657233d8c0b699a616d7dd64d0513080da270ab6"
1791
+
checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
1782
1792
dependencies = [
1783
1793
"bitflags 1.3.2",
1784
1794
"futures-core",
···
1826
1836
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
1827
1837
dependencies = [
1828
1838
"hermit-abi",
1829
-
"rustix 0.38.4",
1839
+
"rustix 0.38.9",
1830
1840
"windows-sys 0.48.0",
1831
1841
]
1832
1842
···
1983
1993
1984
1994
[[package]]
1985
1995
name = "linux-raw-sys"
1986
-
version = "0.4.3"
1996
+
version = "0.4.5"
1987
1997
source = "registry+https://github.com/rust-lang/crates.io-index"
1988
-
checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
1998
+
checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
1989
1999
1990
2000
[[package]]
1991
2001
name = "lock_api"
···
1999
2009
2000
2010
[[package]]
2001
2011
name = "log"
2002
-
version = "0.4.19"
2012
+
version = "0.4.20"
2003
2013
source = "registry+https://github.com/rust-lang/crates.io-index"
2004
-
checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
2014
+
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
2005
2015
2006
2016
[[package]]
2007
2017
name = "logind-zbus"
2008
-
version = "3.1.1"
2018
+
version = "3.1.2"
2009
2019
source = "registry+https://github.com/rust-lang/crates.io-index"
2010
-
checksum = "14b36b364be05220b24411a1c1a1ee4df0ba77b09c9880e70e5f4c16ebdec157"
2020
+
checksum = "c07a2542f6e91ea92780158654852190edb2ba0b232d9d00d649d0c691cb7eb3"
2011
2021
dependencies = [
2012
2022
"serde",
2013
2023
"zbus",
···
2015
2025
2016
2026
[[package]]
2017
2027
name = "mac-notification-sys"
2018
-
version = "0.5.8"
2028
+
version = "0.5.9"
2019
2029
source = "registry+https://github.com/rust-lang/crates.io-index"
2020
-
checksum = "abc434554ad0e640d772f7f262aa28e61d485212533d3673abe5f3d1729bd42a"
2030
+
checksum = "9402858e87f85f88bf518bd2e68450640df1c99b1ddb3ea28c4d5d823bb54cdd"
2021
2031
dependencies = [
2022
2032
"cc",
2023
2033
"dirs-next",
···
2274
2284
"proc-macro-crate",
2275
2285
"proc-macro2",
2276
2286
"quote",
2277
-
"syn 2.0.27",
2287
+
"syn 2.0.29",
2278
2288
]
2279
2289
2280
2290
[[package]]
···
2340
2350
2341
2351
[[package]]
2342
2352
name = "object"
2343
-
version = "0.31.1"
2353
+
version = "0.32.0"
2344
2354
source = "registry+https://github.com/rust-lang/crates.io-index"
2345
-
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
2355
+
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
2346
2356
dependencies = [
2347
2357
"memchr",
2348
2358
]
···
2355
2365
2356
2366
[[package]]
2357
2367
name = "orbclient"
2358
-
version = "0.3.45"
2368
+
version = "0.3.46"
2359
2369
source = "registry+https://github.com/rust-lang/crates.io-index"
2360
-
checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1"
2370
+
checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f"
2361
2371
dependencies = [
2362
2372
"redox_syscall 0.3.5",
2363
2373
]
···
2433
2443
"libc",
2434
2444
"redox_syscall 0.3.5",
2435
2445
"smallvec",
2436
-
"windows-targets 0.48.1",
2446
+
"windows-targets 0.48.5",
2437
2447
]
2438
2448
2439
2449
[[package]]
···
2456
2466
2457
2467
[[package]]
2458
2468
name = "pin-project-lite"
2459
-
version = "0.2.10"
2469
+
version = "0.2.13"
2460
2470
source = "registry+https://github.com/rust-lang/crates.io-index"
2461
-
checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
2471
+
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
2462
2472
2463
2473
[[package]]
2464
2474
name = "pin-utils"
···
2480
2490
2481
2491
[[package]]
2482
2492
name = "png"
2483
-
version = "0.17.9"
2493
+
version = "0.17.10"
2484
2494
source = "registry+https://github.com/rust-lang/crates.io-index"
2485
-
checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
2495
+
checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
2486
2496
dependencies = [
2487
2497
"bitflags 1.3.2",
2488
2498
"crc32fast",
···
2577
2587
2578
2588
[[package]]
2579
2589
name = "quote"
2580
-
version = "1.0.32"
2590
+
version = "1.0.33"
2581
2591
source = "registry+https://github.com/rust-lang/crates.io-index"
2582
-
checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
2592
+
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
2583
2593
dependencies = [
2584
2594
"proc-macro2",
2585
2595
]
···
2651
2661
2652
2662
[[package]]
2653
2663
name = "regex"
2654
-
version = "1.9.1"
2664
+
version = "1.9.3"
2655
2665
source = "registry+https://github.com/rust-lang/crates.io-index"
2656
-
checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
2666
+
checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
2657
2667
dependencies = [
2658
2668
"aho-corasick",
2659
2669
"memchr",
···
2663
2673
2664
2674
[[package]]
2665
2675
name = "regex-automata"
2666
-
version = "0.3.3"
2676
+
version = "0.3.6"
2667
2677
source = "registry+https://github.com/rust-lang/crates.io-index"
2668
-
checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
2678
+
checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
2669
2679
dependencies = [
2670
2680
"aho-corasick",
2671
2681
"memchr",
···
2680
2690
2681
2691
[[package]]
2682
2692
name = "rog-control-center"
2683
-
version = "4.7.0-RC3"
2693
+
version = "4.7.1"
2684
2694
dependencies = [
2685
2695
"asusd",
2686
2696
"cargo-husky",
···
2713
2723
2714
2724
[[package]]
2715
2725
name = "rog_anime"
2716
-
version = "4.7.0-RC3"
2726
+
version = "4.7.1"
2717
2727
dependencies = [
2718
2728
"cargo-husky",
2719
2729
"gif",
···
2730
2740
2731
2741
[[package]]
2732
2742
name = "rog_aura"
2733
-
version = "4.7.0-RC3"
2743
+
version = "4.7.1"
2734
2744
dependencies = [
2735
2745
"cargo-husky",
2736
2746
"log",
···
2744
2754
2745
2755
[[package]]
2746
2756
name = "rog_dbus"
2747
-
version = "4.7.0-RC3"
2757
+
version = "4.7.1"
2748
2758
dependencies = [
2749
2759
"cargo-husky",
2750
2760
"rog_anime",
···
2756
2766
2757
2767
[[package]]
2758
2768
name = "rog_platform"
2759
-
version = "4.7.0-RC3"
2769
+
version = "4.7.1"
2760
2770
dependencies = [
2761
2771
"cargo-husky",
2762
2772
"concat-idents",
···
2769
2779
"serde_derive",
2770
2780
"sysfs-class",
2771
2781
"typeshare",
2772
-
"udev 0.7.0",
2782
+
"udev",
2773
2783
"zbus",
2774
2784
]
2775
2785
2776
2786
[[package]]
2777
2787
name = "rog_profiles"
2778
-
version = "4.7.0-RC3"
2788
+
version = "4.7.1"
2779
2789
dependencies = [
2780
2790
"cargo-husky",
2781
2791
"log",
2782
2792
"serde",
2783
2793
"serde_derive",
2784
2794
"typeshare",
2785
-
"udev 0.7.0",
2795
+
"udev",
2786
2796
"zbus",
2787
2797
]
2788
2798
2789
2799
[[package]]
2790
2800
name = "rog_simulators"
2791
-
version = "4.7.0-RC3"
2801
+
version = "4.7.1"
2792
2802
dependencies = [
2793
2803
"glam",
2794
2804
"log",
···
2799
2809
2800
2810
[[package]]
2801
2811
name = "ron"
2802
-
version = "0.8.0"
2812
+
version = "0.8.1"
2803
2813
source = "registry+https://github.com/rust-lang/crates.io-index"
2804
-
checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
2814
+
checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
2805
2815
dependencies = [
2806
2816
"base64",
2807
-
"bitflags 1.3.2",
2817
+
"bitflags 2.4.0",
2808
2818
"serde",
2819
+
"serde_derive",
2809
2820
]
2810
2821
2811
2822
[[package]]
2812
2823
name = "rusb"
2813
-
version = "0.9.2"
2824
+
version = "0.9.3"
2814
2825
source = "registry+https://github.com/rust-lang/crates.io-index"
2815
-
checksum = "44a8c36914f9b1a3be712c1dfa48c9b397131f9a75707e570a391735f785c5d1"
2826
+
checksum = "45fff149b6033f25e825cbb7b2c625a11ee8e6dac09264d49beb125e39aa97bf"
2816
2827
dependencies = [
2817
2828
"libc",
2818
2829
"libusb1-sys",
···
2855
2866
2856
2867
[[package]]
2857
2868
name = "rustix"
2858
-
version = "0.38.4"
2869
+
version = "0.38.9"
2859
2870
source = "registry+https://github.com/rust-lang/crates.io-index"
2860
-
checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
2871
+
checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49"
2861
2872
dependencies = [
2862
-
"bitflags 2.3.3",
2873
+
"bitflags 2.4.0",
2863
2874
"errno",
2864
2875
"libc",
2865
-
"linux-raw-sys 0.4.3",
2876
+
"linux-raw-sys 0.4.5",
2866
2877
"windows-sys 0.48.0",
2867
2878
]
2868
2879
···
2937
2948
2938
2949
[[package]]
2939
2950
name = "serde"
2940
-
version = "1.0.174"
2951
+
version = "1.0.188"
2941
2952
source = "registry+https://github.com/rust-lang/crates.io-index"
2942
-
checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1"
2953
+
checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
2943
2954
dependencies = [
2944
2955
"serde_derive",
2945
2956
]
2946
2957
2947
2958
[[package]]
2948
2959
name = "serde_derive"
2949
-
version = "1.0.174"
2960
+
version = "1.0.188"
2950
2961
source = "registry+https://github.com/rust-lang/crates.io-index"
2951
-
checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e"
2962
+
checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
2952
2963
dependencies = [
2953
2964
"proc-macro2",
2954
2965
"quote",
2955
-
"syn 2.0.27",
2966
+
"syn 2.0.29",
2956
2967
]
2957
2968
2958
2969
[[package]]
2959
2970
name = "serde_json"
2960
-
version = "1.0.103"
2971
+
version = "1.0.105"
2961
2972
source = "registry+https://github.com/rust-lang/crates.io-index"
2962
-
checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
2973
+
checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
2963
2974
dependencies = [
2964
2975
"itoa",
2965
2976
"ryu",
···
2968
2979
2969
2980
[[package]]
2970
2981
name = "serde_repr"
2971
-
version = "0.1.15"
2982
+
version = "0.1.16"
2972
2983
source = "registry+https://github.com/rust-lang/crates.io-index"
2973
-
checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5"
2984
+
checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
2974
2985
dependencies = [
2975
2986
"proc-macro2",
2976
2987
"quote",
2977
-
"syn 2.0.27",
2988
+
"syn 2.0.29",
2978
2989
]
2979
2990
2980
2991
[[package]]
···
3024
3035
3025
3036
[[package]]
3026
3037
name = "simd-adler32"
3027
-
version = "0.3.5"
3038
+
version = "0.3.7"
3028
3039
source = "registry+https://github.com/rust-lang/crates.io-index"
3029
-
checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
3040
+
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
3030
3041
3031
3042
[[package]]
3032
3043
name = "slab"
3033
-
version = "0.4.8"
3044
+
version = "0.4.9"
3034
3045
source = "registry+https://github.com/rust-lang/crates.io-index"
3035
-
checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
3046
+
checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
3036
3047
dependencies = [
3037
3048
"autocfg",
3038
3049
]
···
3109
3120
]
3110
3121
3111
3122
[[package]]
3123
+
name = "socket2"
3124
+
version = "0.5.3"
3125
+
source = "registry+https://github.com/rust-lang/crates.io-index"
3126
+
checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
3127
+
dependencies = [
3128
+
"libc",
3129
+
"windows-sys 0.48.0",
3130
+
]
3131
+
3132
+
[[package]]
3112
3133
name = "static_assertions"
3113
3134
version = "1.1.0"
3114
3135
source = "registry+https://github.com/rust-lang/crates.io-index"
···
3128
3149
3129
3150
[[package]]
3130
3151
name = "supergfxctl"
3131
-
version = "5.1.1"
3132
-
source = "git+https://gitlab.com/asus-linux/supergfxctl.git#fcba63b1a29284fc76da65e60751a33b81380259"
3152
+
version = "5.1.2"
3153
+
source = "git+https://gitlab.com/asus-linux/supergfxctl.git#c2a1bb3461c7abbcdabecdc463d668555120f953"
3133
3154
dependencies = [
3134
3155
"log",
3135
3156
"logind-zbus",
···
3137
3158
"serde_derive",
3138
3159
"serde_json",
3139
3160
"tokio",
3140
-
"udev 0.6.3",
3161
+
"udev",
3141
3162
"zbus",
3142
3163
]
3143
3164
···
3154
3175
3155
3176
[[package]]
3156
3177
name = "syn"
3157
-
version = "2.0.27"
3178
+
version = "2.0.29"
3158
3179
source = "registry+https://github.com/rust-lang/crates.io-index"
3159
-
checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
3180
+
checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
3160
3181
dependencies = [
3161
3182
"proc-macro2",
3162
3183
"quote",
···
3187
3208
3188
3209
[[package]]
3189
3210
name = "systemd-zbus"
3190
-
version = "0.1.0"
3211
+
version = "0.1.1"
3191
3212
source = "registry+https://github.com/rust-lang/crates.io-index"
3192
-
checksum = "abba675e441b13248eaf74f1acfacf64adc7b5c030f2f3ff66cc7e02b9a0c417"
3213
+
checksum = "ffbb1b6ea6d96b14a7e94532711efc4106337fe8b1d6bdf8ba5318012a9fa7e3"
3193
3214
dependencies = [
3194
3215
"serde",
3195
3216
"zbus",
···
3197
3218
3198
3219
[[package]]
3199
3220
name = "target-lexicon"
3200
-
version = "0.12.10"
3221
+
version = "0.12.11"
3201
3222
source = "registry+https://github.com/rust-lang/crates.io-index"
3202
-
checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
3223
+
checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
3203
3224
3204
3225
[[package]]
3205
3226
name = "tauri-winrt-notification"
···
3213
3234
3214
3235
[[package]]
3215
3236
name = "tempfile"
3216
-
version = "3.7.0"
3237
+
version = "3.8.0"
3217
3238
source = "registry+https://github.com/rust-lang/crates.io-index"
3218
-
checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
3239
+
checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
3219
3240
dependencies = [
3220
3241
"cfg-if",
3221
3242
"fastrand 2.0.0",
3222
3243
"redox_syscall 0.3.5",
3223
-
"rustix 0.38.4",
3244
+
"rustix 0.38.9",
3224
3245
"windows-sys 0.48.0",
3225
3246
]
3226
3247
···
3235
3256
3236
3257
[[package]]
3237
3258
name = "thiserror"
3238
-
version = "1.0.44"
3259
+
version = "1.0.47"
3239
3260
source = "registry+https://github.com/rust-lang/crates.io-index"
3240
-
checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
3261
+
checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
3241
3262
dependencies = [
3242
3263
"thiserror-impl",
3243
3264
]
3244
3265
3245
3266
[[package]]
3246
3267
name = "thiserror-impl"
3247
-
version = "1.0.44"
3268
+
version = "1.0.47"
3248
3269
source = "registry+https://github.com/rust-lang/crates.io-index"
3249
-
checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
3270
+
checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
3250
3271
dependencies = [
3251
3272
"proc-macro2",
3252
3273
"quote",
3253
-
"syn 2.0.27",
3274
+
"syn 2.0.29",
3254
3275
]
3255
3276
3256
3277
[[package]]
3257
3278
name = "time"
3258
-
version = "0.3.23"
3279
+
version = "0.3.27"
3259
3280
source = "registry+https://github.com/rust-lang/crates.io-index"
3260
-
checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
3281
+
checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
3261
3282
dependencies = [
3283
+
"deranged",
3262
3284
"serde",
3263
3285
"time-core",
3264
3286
]
···
3320
3342
3321
3343
[[package]]
3322
3344
name = "tokio"
3323
-
version = "1.29.1"
3345
+
version = "1.32.0"
3324
3346
source = "registry+https://github.com/rust-lang/crates.io-index"
3325
-
checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
3347
+
checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
3326
3348
dependencies = [
3327
-
"autocfg",
3328
3349
"backtrace",
3329
3350
"libc",
3330
3351
"mio",
3331
3352
"num_cpus",
3332
3353
"pin-project-lite",
3333
-
"socket2",
3354
+
"socket2 0.5.3",
3334
3355
"tokio-macros",
3335
3356
"windows-sys 0.48.0",
3336
3357
]
···
3343
3364
dependencies = [
3344
3365
"proc-macro2",
3345
3366
"quote",
3346
-
"syn 2.0.27",
3367
+
"syn 2.0.29",
3347
3368
]
3348
3369
3349
3370
[[package]]
···
3386
3407
"serde",
3387
3408
"serde_spanned",
3388
3409
"toml_datetime",
3389
-
"winnow 0.5.0",
3410
+
"winnow",
3390
3411
]
3391
3412
3392
3413
[[package]]
···
3409
3430
dependencies = [
3410
3431
"proc-macro2",
3411
3432
"quote",
3412
-
"syn 2.0.27",
3433
+
"syn 2.0.29",
3413
3434
]
3414
3435
3415
3436
[[package]]
···
3453
3474
dependencies = [
3454
3475
"quote",
3455
3476
"syn 1.0.109",
3456
-
]
3457
-
3458
-
[[package]]
3459
-
name = "udev"
3460
-
version = "0.6.3"
3461
-
source = "registry+https://github.com/rust-lang/crates.io-index"
3462
-
checksum = "1c960764f7e816eed851a96c364745d37f9fe71a2e7dba79fbd40104530b5dd0"
3463
-
dependencies = [
3464
-
"libc",
3465
-
"libudev-sys",
3466
-
"pkg-config",
3467
3477
]
3468
3478
3469
3479
[[package]]
···
3758
3768
3759
3769
[[package]]
3760
3770
name = "webbrowser"
3761
-
version = "0.8.10"
3771
+
version = "0.8.11"
3762
3772
source = "registry+https://github.com/rust-lang/crates.io-index"
3763
-
checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6"
3773
+
checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57"
3764
3774
dependencies = [
3765
3775
"core-foundation",
3766
3776
"home",
···
3849
3859
source = "registry+https://github.com/rust-lang/crates.io-index"
3850
3860
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
3851
3861
dependencies = [
3852
-
"windows-targets 0.48.1",
3862
+
"windows-targets 0.48.5",
3853
3863
]
3854
3864
3855
3865
[[package]]
···
3889
3899
source = "registry+https://github.com/rust-lang/crates.io-index"
3890
3900
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
3891
3901
dependencies = [
3892
-
"windows-targets 0.48.1",
3902
+
"windows-targets 0.48.5",
3893
3903
]
3894
3904
3895
3905
[[package]]
···
3909
3919
3910
3920
[[package]]
3911
3921
name = "windows-targets"
3912
-
version = "0.48.1"
3922
+
version = "0.48.5"
3913
3923
source = "registry+https://github.com/rust-lang/crates.io-index"
3914
-
checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
3924
+
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
3915
3925
dependencies = [
3916
-
"windows_aarch64_gnullvm 0.48.0",
3917
-
"windows_aarch64_msvc 0.48.0",
3918
-
"windows_i686_gnu 0.48.0",
3919
-
"windows_i686_msvc 0.48.0",
3920
-
"windows_x86_64_gnu 0.48.0",
3921
-
"windows_x86_64_gnullvm 0.48.0",
3922
-
"windows_x86_64_msvc 0.48.0",
3926
+
"windows_aarch64_gnullvm 0.48.5",
3927
+
"windows_aarch64_msvc 0.48.5",
3928
+
"windows_i686_gnu 0.48.5",
3929
+
"windows_i686_msvc 0.48.5",
3930
+
"windows_x86_64_gnu 0.48.5",
3931
+
"windows_x86_64_gnullvm 0.48.5",
3932
+
"windows_x86_64_msvc 0.48.5",
3923
3933
]
3924
3934
3925
3935
[[package]]
···
3930
3940
3931
3941
[[package]]
3932
3942
name = "windows_aarch64_gnullvm"
3933
-
version = "0.48.0"
3943
+
version = "0.48.5"
3934
3944
source = "registry+https://github.com/rust-lang/crates.io-index"
3935
-
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
3945
+
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
3936
3946
3937
3947
[[package]]
3938
3948
name = "windows_aarch64_msvc"
···
3948
3958
3949
3959
[[package]]
3950
3960
name = "windows_aarch64_msvc"
3951
-
version = "0.48.0"
3961
+
version = "0.48.5"
3952
3962
source = "registry+https://github.com/rust-lang/crates.io-index"
3953
-
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
3963
+
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
3954
3964
3955
3965
[[package]]
3956
3966
name = "windows_i686_gnu"
···
3966
3976
3967
3977
[[package]]
3968
3978
name = "windows_i686_gnu"
3969
-
version = "0.48.0"
3979
+
version = "0.48.5"
3970
3980
source = "registry+https://github.com/rust-lang/crates.io-index"
3971
-
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
3981
+
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
3972
3982
3973
3983
[[package]]
3974
3984
name = "windows_i686_msvc"
···
3984
3994
3985
3995
[[package]]
3986
3996
name = "windows_i686_msvc"
3987
-
version = "0.48.0"
3997
+
version = "0.48.5"
3988
3998
source = "registry+https://github.com/rust-lang/crates.io-index"
3989
-
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
3999
+
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
3990
4000
3991
4001
[[package]]
3992
4002
name = "windows_x86_64_gnu"
···
4002
4012
4003
4013
[[package]]
4004
4014
name = "windows_x86_64_gnu"
4005
-
version = "0.48.0"
4015
+
version = "0.48.5"
4006
4016
source = "registry+https://github.com/rust-lang/crates.io-index"
4007
-
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
4017
+
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
4008
4018
4009
4019
[[package]]
4010
4020
name = "windows_x86_64_gnullvm"
···
4014
4024
4015
4025
[[package]]
4016
4026
name = "windows_x86_64_gnullvm"
4017
-
version = "0.48.0"
4027
+
version = "0.48.5"
4018
4028
source = "registry+https://github.com/rust-lang/crates.io-index"
4019
-
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
4029
+
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
4020
4030
4021
4031
[[package]]
4022
4032
name = "windows_x86_64_msvc"
···
4032
4042
4033
4043
[[package]]
4034
4044
name = "windows_x86_64_msvc"
4035
-
version = "0.48.0"
4045
+
version = "0.48.5"
4036
4046
source = "registry+https://github.com/rust-lang/crates.io-index"
4037
-
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
4047
+
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
4038
4048
4039
4049
[[package]]
4040
4050
name = "winit"
···
4073
4083
4074
4084
[[package]]
4075
4085
name = "winnow"
4076
-
version = "0.4.1"
4086
+
version = "0.5.15"
4077
4087
source = "registry+https://github.com/rust-lang/crates.io-index"
4078
-
checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
4079
-
dependencies = [
4080
-
"memchr",
4081
-
]
4082
-
4083
-
[[package]]
4084
-
name = "winnow"
4085
-
version = "0.5.0"
4086
-
source = "registry+https://github.com/rust-lang/crates.io-index"
4087
-
checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
4088
+
checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
4088
4089
dependencies = [
4089
4090
"memchr",
4090
4091
]
···
4149
4150
4150
4151
[[package]]
4151
4152
name = "zbus"
4152
-
version = "3.13.1"
4153
+
version = "3.14.1"
4153
4154
source = "registry+https://github.com/rust-lang/crates.io-index"
4154
-
checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29"
4155
+
checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948"
4155
4156
dependencies = [
4156
4157
"async-broadcast",
4157
4158
"async-executor",
···
4162
4163
"async-recursion",
4163
4164
"async-task",
4164
4165
"async-trait",
4166
+
"blocking",
4165
4167
"byteorder",
4166
4168
"derivative",
4167
4169
"enumflags2",
···
4189
4191
4190
4192
[[package]]
4191
4193
name = "zbus_macros"
4192
-
version = "3.13.1"
4194
+
version = "3.14.1"
4193
4195
source = "registry+https://github.com/rust-lang/crates.io-index"
4194
-
checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af"
4196
+
checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
4195
4197
dependencies = [
4196
4198
"proc-macro-crate",
4197
4199
"proc-macro2",
4198
4200
"quote",
4199
4201
"regex",
4200
4202
"syn 1.0.109",
4201
-
"winnow 0.4.1",
4202
4203
"zvariant_utils",
4203
4204
]
4204
4205
+3
-3
pkgs/applications/system/asusctl/default.nix
+3
-3
pkgs/applications/system/asusctl/default.nix
···
13
13
14
14
rustPlatform.buildRustPackage rec {
15
15
pname = "asusctl";
16
-
version = "4.7.0";
16
+
version = "4.7.1";
17
17
18
18
src = fetchFromGitLab {
19
19
owner = "asus-linux";
20
20
repo = "asusctl";
21
21
rev = version;
22
-
hash = "sha256-SZijR9PotN0O72laj+FBSCVMXLXadmLRhCSD4XqobD0=";
22
+
hash = "sha256-T/KAhKoxZRdbJspL+Fkos6YqVhiUxCtxbCSm+8CX1to=";
23
23
};
24
24
25
25
cargoHash = "";
···
28
28
outputHashes = {
29
29
"ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI=";
30
30
"notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs=";
31
-
"supergfxctl-5.1.1" = "sha256-H00QHNILEjOtavXdj4Jd+rdLprJpVSlSVV3qkTeknzQ=";
31
+
"supergfxctl-5.1.2" = "sha256-1XCIltd7o+Bc+UXmeuPAXdPKU86UP0p+Qh0gTZyrbH8=";
32
32
};
33
33
};
34
34
+2
-2
pkgs/applications/version-management/git-repo/default.nix
+2
-2
pkgs/applications/version-management/git-repo/default.nix
···
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "git-repo";
7
-
version = "2.36";
7
+
version = "2.36.1";
8
8
9
9
src = fetchFromGitHub {
10
10
owner = "android";
11
11
repo = "tools_repo";
12
12
rev = "v${version}";
13
-
hash = "sha256-TCCVdPhrR4NWwqNjEAySSsiW2D7gCdLAiD+UeuvBJvI=";
13
+
hash = "sha256-jq9Frh3rufI9Q3auh2Qfoo89x+jKsbxBB8ojreVgmjc=";
14
14
};
15
15
16
16
# Fix 'NameError: name 'ssl' is not defined'
+10
-3
pkgs/applications/virtualization/kraft/default.nix
+10
-3
pkgs/applications/virtualization/kraft/default.nix
···
2
2
, buildGoModule
3
3
, fetchFromGitHub
4
4
, stdenv
5
+
, nix-update-script
5
6
}:
6
7
7
8
buildGoModule rec {
8
9
pname = "kraftkit";
9
-
version = "0.6.4";
10
+
version = "0.6.6";
10
11
11
12
src = fetchFromGitHub {
12
13
owner = "unikraft";
13
14
repo = "kraftkit";
14
15
rev = "v${version}";
15
-
hash = "sha256-+aZrJqxgPGIoWEW4PZj6Nib7Z49HitxqMbeoyIe14iM=";
16
+
hash = "sha256-3dI3F1cCeLEOd+zusWUDZWLrVaaKHXzwOL/mF/yPZC8=";
16
17
};
17
18
18
-
vendorHash = "sha256-4V7GTqCDSHybuwIrnmO1MJ+DwMpkKOdA7UC72YJqStM=";
19
+
vendorHash = "sha256-4zciooCUNVLTQ/0tctqV3hExR5vRY5VumHzGtL8xdws=";
19
20
20
21
ldflags = [
21
22
"-s"
···
24
25
];
25
26
26
27
subPackages = [ "cmd/kraft" ];
28
+
29
+
passthru = {
30
+
updateScript = nix-update-script {
31
+
extraArgs = [ "--version-regex" "^v([0-9.]+)" ];
32
+
};
33
+
};
27
34
28
35
meta = {
29
36
description = "Build and use highly customized and ultra-lightweight unikernel VMs";
+8
pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
+8
pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix
···
4
4
, budgie-desktop-view
5
5
, glib
6
6
, gsettings-desktop-schemas
7
+
, magpie
7
8
, mate
8
9
, nixos-artwork
9
10
, nixos-background-light ? nixos-artwork.wallpapers.nineish
···
30
31
font-name="Noto Sans 10"
31
32
document-font-name="Noto Sans 10"
32
33
monospace-font-name="Hack 10"
34
+
35
+
[org.gnome.desktop.peripherals.touchpad:Budgie]
36
+
tap-to-click=true
33
37
34
38
[org.gnome.desktop.wm.preferences:Budgie]
35
39
titlebar-font="Noto Sans Bold 10"
36
40
41
+
[org.gnome.mutter:Budgie]
42
+
edge-tiling=true
43
+
37
44
[com.solus-project.budgie-menu:Budgie]
38
45
use-default-menu-icon=true
39
46
···
56
63
budgie-desktop
57
64
budgie-desktop-view
58
65
gsettings-desktop-schemas
66
+
magpie
59
67
] ++ extraGSettingsOverridePackages;
60
68
61
69
in
-63
pkgs/development/compilers/eql/default.nix
-63
pkgs/development/compilers/eql/default.nix
···
1
-
{ lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
version = "unstable-2012-12-10";
5
-
pname = "eql";
6
-
src = fetchgit {
7
-
rev = "9097bf98446ee33c07bb155d800395775ce0d9b2";
8
-
url = "https://gitlab.com/eql/eql.git";
9
-
sha256 = "17h23qr7fyr9hvjgiq0yhacmjs43x06vh8978aq42ymcgipxdcww";
10
-
};
11
-
12
-
buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ];
13
-
14
-
env.NIX_CFLAGS_COMPILE = "-fPIC";
15
-
16
-
postPatch = ''
17
-
sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp
18
-
19
-
# cl_def_c_function was renamed to ecl_def_c_function in ECL 20.4.24.
20
-
find . -type f -exec sed -e 's/\scl_def_c_function(/ ecl_def_c_function(/' -i {} \;
21
-
'';
22
-
23
-
buildPhase = ''
24
-
cd src
25
-
ecl -shell make-eql-lib.lisp
26
-
qmake eql_lib.pro
27
-
make
28
-
cd ..
29
-
30
-
cd src
31
-
qmake eql_exe.pro
32
-
make
33
-
cd ..
34
-
cd src
35
-
'';
36
-
37
-
installPhase = ''
38
-
cd ..
39
-
mkdir -p $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib
40
-
cp -r . $out/lib/eql/build-dir
41
-
ln -s $out/lib/eql/build-dir/eql $out/bin
42
-
ln -s $out/lib/eql/build-dir/src/*.h $out/include
43
-
ln -s $out/lib/eql/build-dir/src/gen/*.h $out/include/gen
44
-
ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib
45
-
'';
46
-
47
-
meta = with lib; {
48
-
description = "Embedded Qt Lisp (ECL+Qt)";
49
-
maintainers = with maintainers; [ raskin ];
50
-
platforms = platforms.linux;
51
-
license = licenses.mit;
52
-
};
53
-
54
-
passthru = {
55
-
updateInfo = {
56
-
downloadPage = "http://password-taxi.at/EQL";
57
-
method = "fetchgit";
58
-
rev = src.rev;
59
-
url = src.url;
60
-
hash = src.sha256;
61
-
};
62
-
};
63
-
}
-47
pkgs/development/compilers/seexpr/default.nix
-47
pkgs/development/compilers/seexpr/default.nix
···
1
-
{ lib
2
-
, stdenv
3
-
, fetchFromGitHub
4
-
, cmake
5
-
, libpng
6
-
, zlib
7
-
, qt4
8
-
, bison
9
-
, flex
10
-
, libGLU
11
-
, python3Packages
12
-
}:
13
-
14
-
stdenv.mkDerivation rec {
15
-
pname = "seexpr";
16
-
version = "3.0.1";
17
-
18
-
src = fetchFromGitHub {
19
-
owner = "wdas";
20
-
repo = "SeExpr";
21
-
rev = "v${version}";
22
-
sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk=";
23
-
};
24
-
25
-
cmakeFlags = [
26
-
"-DENABLE_SSE4=OFF"
27
-
# file RPATH_CHANGE could not write new RPATH
28
-
"-DCMAKE_SKIP_BUILD_RPATH=ON"
29
-
];
30
-
31
-
nativeBuildInputs = [ cmake ];
32
-
buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ];
33
-
34
-
# https://github.com/wdas/SeExpr/issues/106
35
-
postPatch = ''
36
-
substituteInPlace src/build/seexpr2.pc.in \
37
-
--replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
38
-
'';
39
-
40
-
meta = with lib; {
41
-
description = "Embeddable expression evaluation engine from Disney Animation";
42
-
homepage = "https://wdas.github.io/SeExpr/";
43
-
maintainers = with maintainers; [ hodapp ];
44
-
license = licenses.asl20;
45
-
platforms = platforms.linux;
46
-
};
47
-
}
+2
-3
pkgs/development/compilers/yosys/plugins/symbiflow.nix
+2
-3
pkgs/development/compilers/yosys/plugins/symbiflow.nix
···
11
11
, capnproto
12
12
, surelog
13
13
, antlr4
14
-
, flatbuffers
15
14
, pkg-config
16
15
}: let
17
16
18
-
version = "1.20230425";
17
+
version = "1.20230808";
19
18
20
19
src = fetchFromGitHub {
21
20
owner = "chipsalliance";
22
21
repo = "yosys-f4pga-plugins";
23
22
rev = "v${version}";
24
-
hash = "sha256-KNkmhvpKTby85P88+DqCOOGxIKpzbw5KF9ymqy40pfw=";
23
+
hash = "sha256-wksAHLgLjVZE4Vk2QVcJN1mnQ9mxWCZHk55oO99cVJ0=";
25
24
};
26
25
27
26
# Supported symbiflow plugins.
+2
-2
pkgs/development/libraries/dssi/default.nix
+2
-2
pkgs/development/libraries/dssi/default.nix
···
1
-
{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsa-lib, qt4, libX11, libsndfile, libSM
1
+
{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsa-lib, libX11, libsndfile, libSM
2
2
, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config
3
3
}:
4
4
···
13
13
14
14
nativeBuildInputs = [ autoconf automake pkg-config ];
15
15
buildInputs =
16
-
[ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM
16
+
[ ladspaH libjack2 liblo alsa-lib libX11 libsndfile libSM
17
17
libsamplerate libtool xorgproto libICE
18
18
];
19
19
-21
pkgs/development/libraries/libjreen/default.nix
-21
pkgs/development/libraries/libjreen/default.nix
···
1
-
{ lib, stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "libjreen";
5
-
version = "1.2.0";
6
-
7
-
src = fetchurl {
8
-
url = "https://qutim.org/dwnl/73/${pname}-${version}.tar.bz2";
9
-
sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582";
10
-
};
11
-
12
-
nativeBuildInputs = [ cmake pkg-config ];
13
-
buildInputs = [ qt4 gsasl ];
14
-
15
-
meta = {
16
-
description = "C++ Jabber library using Qt framework";
17
-
homepage = "https://qutim.org/jreen/";
18
-
license = lib.licenses.gpl2Plus;
19
-
platforms = lib.platforms.unix;
20
-
};
21
-
}
+23
pkgs/development/libraries/libuev/default.nix
+23
pkgs/development/libraries/libuev/default.nix
···
1
+
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "libuev";
5
+
version = "2.4.0";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "troglobit";
9
+
repo = "libuev";
10
+
rev = "v${version}";
11
+
hash = "sha256-x6l7CqlZ82kc8shAf2SxgIa4ESu0fTtnOgGz5joVCEY=";
12
+
};
13
+
14
+
nativeBuildInputs = [ pkg-config autoreconfHook ];
15
+
16
+
meta = with lib; {
17
+
description = "Lightweight event loop library for Linux epoll() family APIs";
18
+
homepage = "https://codedocs.xyz/troglobit/libuev/";
19
+
license = licenses.mit;
20
+
platforms = platforms.unix;
21
+
maintainers = with maintainers; [ vifino ];
22
+
};
23
+
}
-34
pkgs/development/libraries/ntrack/default.nix
-34
pkgs/development/libraries/ntrack/default.nix
···
1
-
{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python3 }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "ntrack";
5
-
version = "016";
6
-
7
-
src = fetchurl {
8
-
url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz";
9
-
sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w";
10
-
};
11
-
12
-
buildInputs = [ libnl qt4 ];
13
-
14
-
nativeBuildInputs = [ pkg-config python3 ];
15
-
16
-
# error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic]
17
-
env.NIX_CFLAGS_COMPILE = "-Wno-error";
18
-
19
-
configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ];
20
-
21
-
# Remove this patch after version 016
22
-
patches = [ ./libnl-fix.patch ];
23
-
24
-
postPatch = ''
25
-
sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
26
-
'';
27
-
28
-
meta = with lib; {
29
-
description = "Network Connectivity Tracking library for Desktop Applications";
30
-
homepage = "https://launchpad.net/ntrack";
31
-
platforms = platforms.linux;
32
-
license = licenses.lgpl3Plus;
33
-
};
34
-
}
-11
pkgs/development/libraries/ntrack/libnl-fix.patch
-11
pkgs/development/libraries/ntrack/libnl-fix.patch
···
1
-
--- ./modules/ntrack-libnl.c.orig 2013-12-02 11:31:54.749215448 -0600
2
-
+++ ./modules/ntrack-libnl.c 2013-12-02 11:34:46.597684553 -0600
3
-
@@ -530,7 +530,7 @@
4
-
op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info);
5
-
} else if (nl_info->topmost_route && topmost_route) {
6
-
int diff_bits;
7
-
- if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF
8
-
+ if ((diff_bits = (nl_object_get_id_attrs(OBJ_CAST(topmost_route)) | ROUTE_ATTR_OIF
9
-
| ROUTE_ATTR_GATEWAY) &
10
-
nl_object_diff (OBJ_CAST (nl_info->topmost_route),
11
-
OBJ_CAST (topmost_route)))) {
-21
pkgs/development/libraries/prison/default.nix
-21
pkgs/development/libraries/prison/default.nix
···
1
-
{ lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "prison";
5
-
version = "1.0";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://kde/stable/prison/${version}/src/prison-${version}.tar.gz";
9
-
sha256 = "08hkzzda36jpdywjqlyzcvli7cx17h4l9yffzsdnhdd788n28krr";
10
-
};
11
-
12
-
buildInputs = [ qt4 qrencode libdmtx ];
13
-
14
-
nativeBuildInputs = [ cmake ];
15
-
16
-
meta = {
17
-
description = "Qt4 library for QR-codes";
18
-
license = lib.licenses.mit;
19
-
inherit (qt4.meta) platforms;
20
-
};
21
-
}
-23
pkgs/development/libraries/qimageblitz/default.nix
-23
pkgs/development/libraries/qimageblitz/default.nix
···
1
-
{lib, stdenv, fetchurl, cmake, qt4}:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "qimageblitz";
5
-
version = "0.0.4";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/qimageblitz/qimageblitz-${version}.tar.bz2";
9
-
sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
10
-
};
11
-
12
-
nativeBuildInputs = [ cmake ];
13
-
buildInputs = [ qt4 ];
14
-
15
-
patches = [ ./qimageblitz-9999-exec-stack.patch ];
16
-
17
-
meta = {
18
-
description = "Graphical effect and filter library for KDE4";
19
-
license = lib.licenses.bsd2;
20
-
homepage = "http://qimageblitz.sourceforge.net";
21
-
platforms = lib.platforms.linux;
22
-
};
23
-
}
-11
pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch
-11
pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch
···
1
-
diff -uar qimageblitz/blitz/asm_scale.S qimageblitz~/blitz/asm_scale.S
2
-
--- qimageblitz-orig/blitz/asm_scale.S 2007-10-17 01:17:57.000000000 +0200
3
-
+++ qimageblitz/blitz/asm_scale.S 2007-10-17 01:19:12.000000000 +0200
4
-
@@ -814,3 +814,7 @@
5
-
SIZE(qimageScale_mmx_AARGBA)
6
-
7
-
#endif
8
-
+#if defined(__linux__) && defined(__ELF__)
9
-
+.section .note.GNU-stack,"",%progbits
10
-
+#endif
11
-
+
-67
pkgs/development/libraries/qscintilla-qt4/default.nix
-67
pkgs/development/libraries/qscintilla-qt4/default.nix
···
1
-
{ stdenv
2
-
, lib
3
-
, fetchurl
4
-
, unzip
5
-
, qt4
6
-
, qmake4Hook
7
-
}:
8
-
9
-
stdenv.mkDerivation rec {
10
-
pname = "qscintilla-qt4";
11
-
version = "2.11.6";
12
-
13
-
src = fetchurl {
14
-
url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
15
-
sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
16
-
};
17
-
18
-
sourceRoot = "QScintilla-${version}/Qt4Qt5";
19
-
20
-
buildInputs = [ qt4 ];
21
-
22
-
nativeBuildInputs = [ unzip qmake4Hook ];
23
-
24
-
patches = [
25
-
./fix-qt4-build.patch
26
-
];
27
-
28
-
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
29
-
# by some packages such as sqlitebrowser
30
-
postFixup = ''
31
-
ln -s $out/lib/libqscintilla2_qt4.so $out/lib/libqscintilla2.so
32
-
'';
33
-
34
-
dontWrapQtApps = true;
35
-
36
-
postPatch = ''
37
-
substituteInPlace qscintilla.pro \
38
-
--replace '$$[QT_INSTALL_LIBS]' $out/lib \
39
-
--replace '$$[QT_INSTALL_HEADERS]' $out/include \
40
-
--replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \
41
-
--replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \
42
-
--replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \
43
-
--replace '$$[QT_INSTALL_DATA]' $out/share
44
-
'';
45
-
46
-
meta = with lib; {
47
-
description = "A Qt port of the Scintilla text editing library";
48
-
longDescription = ''
49
-
QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
50
-
control.
51
-
52
-
As well as features found in standard text editing components,
53
-
QScintilla includes features especially useful when editing and
54
-
debugging source code. These include support for syntax styling,
55
-
error indicators, code completion and call tips. The selection
56
-
margin can contain markers like those used in debuggers to
57
-
indicate breakpoints and the current line. Styling choices are
58
-
more open than with many editors, allowing the use of
59
-
proportional fonts, bold and italics, multiple foreground and
60
-
background colours and multiple fonts.
61
-
'';
62
-
homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro";
63
-
license = with licenses; [ gpl3 ]; # and commercial
64
-
maintainers = with maintainers; [ peterhoeg ];
65
-
platforms = platforms.linux;
66
-
};
67
-
}
-11
pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch
-11
pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch
···
1
-
diff -ur QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.11.2-fix/Qt4Qt5/Qsci/qsciscintillabase.h
2
-
--- Qt4Qt5/Qsci/qsciscintillabase.h 2019-06-25 14:49:27.000000000 +0200
3
-
+++ Qt4Qt5-fix/Qsci/qsciscintillabase.h 2019-10-04 10:22:26.337474261 +0200
4
-
@@ -27,6 +27,7 @@
5
-
#include <QByteArray>
6
-
#include <QPoint>
7
-
#include <QTimer>
8
-
+#include <QUrl>
9
-
10
-
#include <Qsci/qsciglobal.h>
11
-
-13
pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch
-13
pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch
···
1
-
diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm
2
-
index 204d685..e05179e 100644
3
-
--- a/src/gui/text/qfontengine_coretext.mm
4
-
+++ b/src/gui/text/qfontengine_coretext.mm
5
-
@@ -886,7 +886,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
6
-
7
-
QFixed QCoreTextFontEngine::emSquareSize() const
8
-
{
9
-
- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
10
-
+ return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
11
-
}
12
-
13
-
QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
-239
pkgs/development/libraries/qt-4.x/4.8/default.nix
-239
pkgs/development/libraries/qt-4.x/4.8/default.nix
···
1
-
{ stdenv, lib, fetchurl, fetchpatch, substituteAll
2
-
, libXrender, libXinerama, libXcursor, libXv, libXext
3
-
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
4
-
, libmng, which, libGLU, openssl, dbus, cups, pkg-config
5
-
, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
6
-
, alsa-lib
7
-
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
8
-
, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf
9
-
, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
10
-
, developerBuild ? false
11
-
, docs ? false
12
-
, examples ? false
13
-
, demos ? false
14
-
# darwin support
15
-
, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx
16
-
}:
17
-
18
-
# TODO:
19
-
# * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid
20
-
# false build-time dependencies
21
-
22
-
stdenv.mkDerivation rec {
23
-
pname = "qt" + lib.optionalString ( docs && demos && examples && developerBuild ) "-full";
24
-
version = "4.8.7";
25
-
26
-
src = fetchurl {
27
-
url = "http://download.qt-project.org/official_releases/qt/"
28
-
+ "${lib.versions.majorMinor version}/${version}/qt-everywhere-opensource-src-${version}.tar.gz";
29
-
sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272";
30
-
};
31
-
32
-
outputs = [ "out" "dev" ];
33
-
34
-
outputInclude = "out";
35
-
36
-
setOutputFlags = false;
37
-
38
-
39
-
prePatch = ''
40
-
substituteInPlace configure --replace /bin/pwd pwd
41
-
substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
42
-
substituteInPlace src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp \
43
-
--replace 'asm volatile' 'asm'
44
-
sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
45
-
'' + lib.optionalString stdenv.isDarwin ''
46
-
# remove impure reference to /usr/lib/libstdc++.6.dylib
47
-
# there might be more references, but this is the only one I could find
48
-
substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \
49
-
--replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib"
50
-
'' + lib.optionalString stdenv.cc.isClang ''
51
-
substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \
52
-
--replace 'optionalHeight > 0' 'optionalHeight != NULL'
53
-
'';
54
-
55
-
patches =
56
-
lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
57
-
./glib-2.32.patch
58
-
./libressl.patch
59
-
./parallel-configure.patch
60
-
./clang-5-darwin.patch
61
-
./qt-4.8.7-unixmake-darwin.patch
62
-
./kill-legacy-darwin-apis.patch
63
-
(substituteAll {
64
-
src = ./dlopen-absolute-paths.diff;
65
-
cups = if cups != null then lib.getLib cups else null;
66
-
icu = icu.out;
67
-
libXfixes = libXfixes.out;
68
-
glibc = stdenv.cc.libc.out;
69
-
})
70
-
(fetchpatch {
71
-
name = "fix-medium-font.patch";
72
-
url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/"
73
-
+ "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff";
74
-
sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j";
75
-
})
76
-
# Patches are no longer available from here, so vendoring it for now.
77
-
#(fetchpatch {
78
-
# name = "qt4-gcc6.patch";
79
-
# url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f";
80
-
# sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34";
81
-
#})
82
-
./qt4-gcc6.patch
83
-
./qt4-openssl-1.1.patch
84
-
(fetchpatch {
85
-
name = "gcc9-foreach.patch";
86
-
url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/"
87
-
+ "0d4a3dd61ccb156dee556c214dbe91c04d44a717/debian/patches/gcc9-qforeach.patch";
88
-
sha256 = "0dzn6qxrgxb75rvck9kmy5gspawdn970wsjw56026dhkih8cp3pg";
89
-
})
90
-
91
-
# Pull upstream fix for gcc-11 support.
92
-
(fetchpatch {
93
-
name = "gcc11-ptr-cmp.patch";
94
-
url = "https://github.com/qt/qttools/commit/7138c963f9d1258bc1b49cb4d63c3e2b7d0ccfda.patch";
95
-
sha256 = "1a9g05r267c94qpw3ssb6k4lci200vla3vm5hri1nna6xwdsmrhc";
96
-
# "src/" -> "tools/"
97
-
stripLen = 2;
98
-
extraPrefix = "tools/";
99
-
})
100
-
]
101
-
++ lib.optional gtkStyle (substituteAll ({
102
-
src = ./dlopen-gtkstyle.diff;
103
-
# substituteAll ignores env vars starting with capital letter
104
-
gtk = gtk2.out;
105
-
} // lib.optionalAttrs gnomeStyle {
106
-
gconf = GConf.out;
107
-
libgnomeui = libgnomeui.out;
108
-
gnome_vfs = gnome_vfs.out;
109
-
}))
110
-
++ lib.optional stdenv.isAarch64 (fetchpatch {
111
-
url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch";
112
-
sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl";
113
-
})
114
-
++ lib.optionals stdenv.hostPlatform.isMusl [
115
-
./qt-musl.patch
116
-
./qt-musl-iconv-no-bom.patch
117
-
./patch-qthread-stacksize.diff
118
-
./qsettings-recursive-global-mutex.patch
119
-
];
120
-
121
-
preConfigure = ''
122
-
export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
123
-
configureFlags+="
124
-
-docdir $out/share/doc/qt-${version}
125
-
-plugindir $out/lib/qt4/plugins
126
-
-importdir $out/lib/qt4/imports
127
-
-examplesdir $TMPDIR/share/doc/qt-${version}/examples
128
-
-demosdir $TMPDIR/share/doc/qt-${version}/demos
129
-
-datadir $out/share/qt-${version}
130
-
-translationdir $out/share/qt-${version}/translations
131
-
--jobs=$NIX_BUILD_CORES
132
-
"
133
-
unset LD # Makefile uses gcc for linking; setting LD interferes
134
-
'' + lib.optionalString stdenv.cc.isClang ''
135
-
sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf
136
-
sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
137
-
'' + lib.optionalString stdenv.hostPlatform.isWindows ''
138
-
sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \
139
-
-e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \
140
-
-e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \
141
-
-e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \
142
-
-e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \
143
-
mkspecs/win32-g++/qmake.conf
144
-
'';
145
-
146
-
prefixKey = "-prefix ";
147
-
148
-
configurePlatforms = [];
149
-
configureFlags = let
150
-
mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}";
151
-
platformFlag =
152
-
if stdenv.hostPlatform != stdenv.buildPlatform
153
-
then "-xplatform"
154
-
else "-platform";
155
-
in (if stdenv.hostPlatform != stdenv.buildPlatform then [
156
-
# I've not tried any case other than i686-pc-mingw32.
157
-
# -nomake tools: it fails linking some asian language symbols
158
-
# -no-svg: it fails to build on mingw64
159
-
"-static" "-release" "-confirm-license" "-opensource"
160
-
"-no-opengl" "-no-phonon"
161
-
"-no-svg"
162
-
"-make" "qmake" "-make" "libs" "-nomake" "tools"
163
-
] else [
164
-
"-v" "-no-separate-debug-info" "-release" "-fast" "-confirm-license" "-opensource"
165
-
166
-
(mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig"
167
-
"-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked"
168
-
169
-
"-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite"
170
-
171
-
"-exceptions" "-xmlpatterns"
172
-
173
-
"-make" "libs" "-make" "tools" "-make" "translations"
174
-
"-no-phonon" "-no-webkit" "-no-multimedia" "-audio-backend"
175
-
]) ++ [
176
-
"-${lib.optionalString (!demos) "no"}make" "demos"
177
-
"-${lib.optionalString (!examples) "no"}make" "examples"
178
-
"-${lib.optionalString (!docs) "no"}make" "docs"
179
-
] ++ lib.optional developerBuild "-developer-build"
180
-
++ lib.optionals stdenv.hostPlatform.isDarwin [ platformFlag "unsupported/macx-clang-libc++" ]
181
-
++ lib.optionals stdenv.hostPlatform.isWindows [ platformFlag "win32-g++-4.6" ];
182
-
183
-
propagatedBuildInputs =
184
-
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
185
-
libSM zlib libpng openssl dbus freetype fontconfig glib ]
186
-
# Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
187
-
++ lib.optional libGLSupported libGLU;
188
-
189
-
# The following libraries are only used in plugins
190
-
buildInputs =
191
-
[ cups # Qt dlopen's libcups instead of linking to it
192
-
postgresql sqlite libjpeg libmng libtiff icu ]
193
-
++ lib.optionals (libmysqlclient != null) [ libmysqlclient ]
194
-
++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
195
-
++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
196
-
197
-
nativeBuildInputs = [ perl pkg-config which ];
198
-
199
-
enableParallelBuilding = true;
200
-
201
-
env.NIX_CFLAGS_COMPILE = toString (
202
-
# with gcc7 the warnings blow the log over Hydra's limit
203
-
[ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ]
204
-
++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin
205
-
++ lib.optionals (stdenv.isFreeBSD || stdenv.isDarwin)
206
-
[ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ]
207
-
++ lib.optional stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1");
208
-
209
-
NIX_LDFLAGS = lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0";
210
-
211
-
preBuild = lib.optionalString stdenv.isDarwin ''
212
-
# resolve "extra qualification on member" error
213
-
sed -i 's/struct ::TabletProximityRec;/struct TabletProximityRec;/' \
214
-
src/gui/kernel/qt_cocoa_helpers_mac_p.h
215
-
find . -name "Makefile*" | xargs sed -i 's/^\(LINK[[:space:]]* = clang++\)/\1 ${NIX_LDFLAGS}/'
216
-
sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release
217
-
'';
218
-
219
-
doCheck = false; # qwebframe test fails with fontconfig errors
220
-
221
-
postInstall = ''
222
-
rm -rf $out/tests
223
-
''
224
-
# I don't know why it does not install qmake
225
-
+ lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
226
-
cp bin/qmake* $out/bin
227
-
'';
228
-
229
-
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
230
-
231
-
meta = {
232
-
homepage = "https://qt-project.org/";
233
-
description = "A cross-platform application framework for C++";
234
-
license = lib.licenses.lgpl21Plus; # or gpl3
235
-
maintainers = with lib.maintainers; [ orivej lovek323 sander ];
236
-
platforms = lib.platforms.unix;
237
-
badPlatforms = [ "x86_64-darwin" "aarch64-darwin" ];
238
-
};
239
-
}
-74
pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
-74
pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
···
1
-
diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp
2
-
index c3e2907..2fac4e1 100644
3
-
--- a/src/corelib/tools/qlocale_icu.cpp
4
-
+++ b/src/corelib/tools/qlocale_icu.cpp
5
-
@@ -81,7 +81,7 @@ bool qt_initIcu(const QString &localeString)
6
-
if (status == NotLoaded) {
7
-
8
-
// resolve libicui18n
9
-
- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
10
-
+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT));
11
-
lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
12
-
if (!lib.load()) {
13
-
qWarning() << "Unable to load library icui18n" << lib.errorString();
14
-
@@ -111,7 +111,7 @@ bool qt_initIcu(const QString &localeString)
15
-
}
16
-
17
-
// resolve libicuuc
18
-
- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
19
-
+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT));
20
-
ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
21
-
if (!ucLib.load()) {
22
-
qWarning() << "Unable to load library icuuc" << ucLib.errorString();
23
-
diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp
24
-
index 99ea43f..acdf9c9 100644
25
-
--- a/src/gui/painting/qcups.cpp
26
-
+++ b/src/gui/painting/qcups.cpp
27
-
@@ -87,7 +87,7 @@ static CupsPrintFile _cupsPrintFile = 0;
28
-
29
-
static void resolveCups()
30
-
{
31
-
- QLibrary cupsLib(QLatin1String("cups"), 2);
32
-
+ QLibrary cupsLib(QLatin1String("@cups@/lib/libcups"), 2);
33
-
if(cupsLib.load()) {
34
-
_cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
35
-
_cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");
36
-
diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp
37
-
index 3d15538..f0f5351 100644
38
-
--- a/src/gui/painting/qprinterinfo_unix.cpp
39
-
+++ b/src/gui/painting/qprinterinfo_unix.cpp
40
-
@@ -454,7 +454,7 @@ int qt_retrieveNisPrinters(QList<QPrinterDescription> *printers)
41
-
char *domain;
42
-
int err;
43
-
44
-
- QLibrary lib(QLatin1String("nsl"));
45
-
+ QLibrary lib(QLatin1String("@glibc@/lib/libnsl"));
46
-
typedef int (*ypGetDefaultDomain)(char **);
47
-
ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain");
48
-
typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *);
49
-
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
50
-
index 6b42d1e..f88b628 100644
51
-
--- a/src/network/kernel/qhostinfo_unix.cpp
52
-
+++ b/src/network/kernel/qhostinfo_unix.cpp
53
-
@@ -95,7 +95,7 @@ static res_state_ptr local_res = 0;
54
-
static void resolveLibrary()
55
-
{
56
-
#if !defined(QT_NO_LIBRARY) && !defined(Q_OS_QNX)
57
-
- QLibrary lib(QLatin1String("resolv"));
58
-
+ QLibrary lib(QLatin1String("@glibc@/lib/libresolv"));
59
-
lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
60
-
if (!lib.load())
61
-
return;
62
-
diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp
63
-
index f8f3d69..d63c5bc 100644
64
-
--- a/src/plugins/platforms/xlib/qxlibstatic.cpp
65
-
+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp
66
-
@@ -242,7 +242,7 @@ static void* qt_load_library_runtime(const char *library, int vernum,
67
-
}
68
-
69
-
# define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \
70
-
- (symbol_type)qt_load_library_runtime("libXfixes", vernum, 4, #symbol);
71
-
+ (symbol_type)qt_load_library_runtime("@libXfixes@/lib/libXfixes", vernum, 4, #symbol);
72
-
# define XFIXES_LOAD_V1(symbol) \
73
-
XFIXES_LOAD_RUNTIME(1, symbol, Ptr##symbol)
74
-
# define XFIXES_LOAD_V2(symbol) \
-37
pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
-37
pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
···
1
-
diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp
2
-
index 3b128e6..39434db 100644
3
-
--- a/src/gui/styles/qgtkstyle_p.cpp
4
-
+++ b/src/gui/styles/qgtkstyle_p.cpp
5
-
@@ -312,7 +312,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QHashableLatin1Literal &path)
6
-
void QGtkStylePrivate::resolveGtk() const
7
-
{
8
-
// enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
9
-
- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
10
-
+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
11
-
libgtk.setLoadHints(QLibrary::ImprovedSearchHeuristics);
12
-
13
-
gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
14
-
@@ -435,8 +435,8 @@ void QGtkStylePrivate::resolveGtk() const
15
-
pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
16
-
pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
17
-
18
-
- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync");
19
-
- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init");
20
-
+ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync");
21
-
+ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init");
22
-
}
23
-
24
-
/* \internal
25
-
@@ -608,9 +608,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
26
-
static bool resolveGConf()
27
-
{
28
-
if (!QGtkStylePrivate::gconf_client_get_default) {
29
-
- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default");
30
-
- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string");
31
-
- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool");
32
-
+ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default");
33
-
+ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string");
34
-
+ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool");
35
-
}
36
-
return (QGtkStylePrivate::gconf_client_get_default !=0);
37
-
}
-12
pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch
-12
pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch
···
1
-
diff -Naur qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
2
-
--- qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-04-26 15:46:22.000000000 -0400
3
-
+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-07-14 22:47:02.145152876 -0400
4
-
@@ -89,7 +89,7 @@
5
-
#include <pthread.h>
6
-
#elif PLATFORM(GTK)
7
-
#include <wtf/gtk/GOwnPtr.h>
8
-
-typedef struct _GMutex GMutex;
9
-
+typedef union _GMutex GMutex;
10
-
typedef struct _GCond GCond;
11
-
#endif
12
-
-330
pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
-330
pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
···
1
-
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
2
-
index 4a9049b..c0ac9db 100644
3
-
--- a/src/corelib/io/qfilesystemengine_unix.cpp
4
-
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
5
-
@@ -242,9 +242,8 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
6
-
#else
7
-
char *ret = 0;
8
-
# if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
9
-
- // When using -mmacosx-version-min=10.4, we get the legacy realpath implementation,
10
-
- // which does not work properly with the realpath(X,0) form. See QTBUG-28282.
11
-
- if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) {
12
-
+ // In Nix-on-Darwin, we don't support ancient macOS anyway, and the deleted branch relies on
13
-
+ // a symbol that's been deprecated for years and that our CF doesn't have
14
-
ret = (char*)malloc(PATH_MAX + 1);
15
-
if (ret && realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) {
16
-
const int savedErrno = errno; // errno is checked below, and free() might change it
17
-
@@ -252,19 +251,6 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
18
-
errno = savedErrno;
19
-
ret = 0;
20
-
}
21
-
- } else {
22
-
- // on 10.5 we can use FSRef to resolve the file path.
23
-
- QString path = QDir::cleanPath(entry.filePath());
24
-
- FSRef fsref;
25
-
- if (FSPathMakeRef((const UInt8 *)path.toUtf8().data(), &fsref, 0) == noErr) {
26
-
- CFURLRef urlref = CFURLCreateFromFSRef(NULL, &fsref);
27
-
- CFStringRef canonicalPath = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle);
28
-
- QString ret = QCFString::toQString(canonicalPath);
29
-
- CFRelease(canonicalPath);
30
-
- CFRelease(urlref);
31
-
- return QFileSystemEntry(ret);
32
-
- }
33
-
- }
34
-
# else
35
-
# if _POSIX_VERSION >= 200801L
36
-
ret = realpath(entry.nativeFilePath().constData(), (char*)0);
37
-
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
38
-
index 3bf7342..b6bcfc0 100644
39
-
--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
40
-
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
41
-
@@ -43,7 +43,6 @@ BOOL stringIsCaseInsensitiveEqualToString(NSString *first, NSString *second);
42
-
BOOL hasCaseInsensitiveSuffix(NSString *string, NSString *suffix);
43
-
BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring);
44
-
NSString *filenameByFixingIllegalCharacters(NSString *string);
45
-
-CFStringEncoding stringEncodingForResource(Handle resource);
46
-
47
-
#ifdef __cplusplus
48
-
}
49
-
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
50
-
index d6c3f0c..c88ca76 100644
51
-
--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
52
-
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
53
-
@@ -68,45 +68,4 @@ BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring)
54
-
return filename;
55
-
}
56
-
57
-
-CFStringEncoding stringEncodingForResource(Handle resource)
58
-
-{
59
-
- short resRef = HomeResFile(resource);
60
-
- if (ResError() != noErr)
61
-
- return NSMacOSRomanStringEncoding;
62
-
-
63
-
- // Get the FSRef for the current resource file
64
-
- FSRef fref;
65
-
- OSStatus error = FSGetForkCBInfo(resRef, 0, NULL, NULL, NULL, &fref, NULL);
66
-
- if (error != noErr)
67
-
- return NSMacOSRomanStringEncoding;
68
-
-
69
-
- RetainPtr<CFURLRef> url(AdoptCF, CFURLCreateFromFSRef(NULL, &fref));
70
-
- if (!url)
71
-
- return NSMacOSRomanStringEncoding;
72
-
-
73
-
- NSString *path = [(NSURL *)url.get() path];
74
-
-
75
-
- // Get the lproj directory name
76
-
- path = [path stringByDeletingLastPathComponent];
77
-
- if (!stringIsCaseInsensitiveEqualToString([path pathExtension], @"lproj"))
78
-
- return NSMacOSRomanStringEncoding;
79
-
-
80
-
- NSString *directoryName = [[path stringByDeletingPathExtension] lastPathComponent];
81
-
- RetainPtr<CFStringRef> locale(AdoptCF, CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, (CFStringRef)directoryName));
82
-
- if (!locale)
83
-
- return NSMacOSRomanStringEncoding;
84
-
-
85
-
- LangCode lang;
86
-
- RegionCode region;
87
-
- error = LocaleStringToLangAndRegionCodes([(NSString *)locale.get() UTF8String], &lang, ®ion);
88
-
- if (error != noErr)
89
-
- return NSMacOSRomanStringEncoding;
90
-
-
91
-
- TextEncoding encoding;
92
-
- error = UpgradeScriptInfoToTextEncoding(kTextScriptDontCare, lang, region, NULL, &encoding);
93
-
- if (error != noErr)
94
-
- return NSMacOSRomanStringEncoding;
95
-
-
96
-
- return encoding;
97
-
-}
98
-
99
-
diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
100
-
index 865ea32..20bda8d 100644
101
-
--- a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
102
-
+++ b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
103
-
@@ -101,33 +101,6 @@ static WTF::RetainPtr<CFDictionaryRef> readPListFile(CFStringRef fileName, bool
104
-
return map;
105
-
}
106
-
107
-
-static Vector<String> stringListFromResourceId(SInt16 id)
108
-
-{
109
-
- Vector<String> list;
110
-
-
111
-
- Handle handle = Get1Resource('STR#', id);
112
-
- if (!handle)
113
-
- return list;
114
-
-
115
-
- CFStringEncoding encoding = stringEncodingForResource(handle);
116
-
-
117
-
- unsigned char* p = (unsigned char*)*handle;
118
-
- if (!p)
119
-
- return list;
120
-
-
121
-
- SInt16 count = *(SInt16*)p;
122
-
- p += sizeof(SInt16);
123
-
-
124
-
- for (SInt16 i = 0; i < count; ++i) {
125
-
- unsigned char length = *p;
126
-
- WTF::RetainPtr<CFStringRef> str = CFStringCreateWithPascalString(0, p, encoding);
127
-
- list.append(str.get());
128
-
- p += 1 + length;
129
-
- }
130
-
-
131
-
- return list;
132
-
-}
133
-
-
134
-
bool PluginPackage::fetchInfo()
135
-
{
136
-
if (!load())
137
-
@@ -202,36 +175,8 @@ bool PluginPackage::fetchInfo()
138
-
m_description = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(m_module, CFSTR("WebPluginDescription"));
139
-
140
-
} else {
141
-
- int resFile = CFBundleOpenBundleResourceMap(m_module);
142
-
-
143
-
- UseResFile(resFile);
144
-
-
145
-
- Vector<String> mimes = stringListFromResourceId(MIMEListStringStringNumber);
146
-
-
147
-
- if (mimes.size() % 2 != 0)
148
-
- return false;
149
-
-
150
-
- Vector<String> descriptions = stringListFromResourceId(MIMEDescriptionStringNumber);
151
-
- if (descriptions.size() != mimes.size() / 2)
152
-
- return false;
153
-
-
154
-
- for (size_t i = 0; i < mimes.size(); i += 2) {
155
-
- String mime = mimes[i].lower();
156
-
- Vector<String> extensions;
157
-
- mimes[i + 1].lower().split(UChar(','), extensions);
158
-
-
159
-
- m_mimeToExtensions.set(mime, extensions);
160
-
-
161
-
- m_mimeToDescriptions.set(mime, descriptions[i / 2]);
162
-
- }
163
-
-
164
-
- Vector<String> names = stringListFromResourceId(PluginNameOrDescriptionStringNumber);
165
-
- if (names.size() == 2) {
166
-
- m_description = names[0];
167
-
- m_name = names[1];
168
-
- }
169
-
-
170
-
- CFBundleCloseBundleResourceMap(m_module, resFile);
171
-
+ LOG(Plugins, "Nix removed ancient code that relies on long-deprecated functionality that we don't want to support!");
172
-
+ return false;
173
-
}
174
-
175
-
LOG(Plugins, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data());
176
-
diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
177
-
index b206e48..669d442 100644
178
-
--- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
179
-
+++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
180
-
@@ -26,7 +26,6 @@
181
-
#import "config.h"
182
-
#import "NetscapePluginModule.h"
183
-
184
-
-#import <WebCore/WebCoreNSStringExtras.h>
185
-
#import <wtf/HashSet.h>
186
-
187
-
using namespace WebCore;
188
-
@@ -196,132 +195,6 @@ static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginInfo& plugi
189
-
return true;
190
-
}
191
-
192
-
-class ResourceMap {
193
-
-public:
194
-
- explicit ResourceMap(CFBundleRef bundle)
195
-
- : m_bundle(bundle)
196
-
- , m_currentResourceFile(CurResFile())
197
-
- , m_bundleResourceMap(CFBundleOpenBundleResourceMap(m_bundle))
198
-
- {
199
-
- UseResFile(m_bundleResourceMap);
200
-
- }
201
-
-
202
-
- ~ResourceMap()
203
-
- {
204
-
- // Close the resource map.
205
-
- CFBundleCloseBundleResourceMap(m_bundle, m_bundleResourceMap);
206
-
-
207
-
- // And restore the old resource.
208
-
- UseResFile(m_currentResourceFile);
209
-
- }
210
-
-
211
-
- bool isValid() const { return m_bundleResourceMap != -1; }
212
-
-
213
-
-private:
214
-
- CFBundleRef m_bundle;
215
-
- ResFileRefNum m_currentResourceFile;
216
-
- ResFileRefNum m_bundleResourceMap;
217
-
-};
218
-
-
219
-
-static bool getStringListResource(ResID resourceID, Vector<String>& stringList) {
220
-
- Handle stringListHandle = Get1Resource('STR#', resourceID);
221
-
- if (!stringListHandle || !*stringListHandle)
222
-
- return false;
223
-
-
224
-
- // Get the string list size.
225
-
- Size stringListSize = GetHandleSize(stringListHandle);
226
-
- if (stringListSize < static_cast<Size>(sizeof(UInt16)))
227
-
- return false;
228
-
-
229
-
- CFStringEncoding stringEncoding = stringEncodingForResource(stringListHandle);
230
-
-
231
-
- unsigned char* ptr = reinterpret_cast<unsigned char*>(*stringListHandle);
232
-
- unsigned char* end = ptr + stringListSize;
233
-
-
234
-
- // Get the number of strings in the string list.
235
-
- UInt16 numStrings = *reinterpret_cast<UInt16*>(ptr);
236
-
- ptr += sizeof(UInt16);
237
-
-
238
-
- for (UInt16 i = 0; i < numStrings; ++i) {
239
-
- // We're past the end of the string, bail.
240
-
- if (ptr >= end)
241
-
- return false;
242
-
-
243
-
- // Get the string length.
244
-
- unsigned char stringLength = *ptr++;
245
-
-
246
-
- RetainPtr<CFStringRef> cfString(AdoptCF, CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, ptr, stringLength, stringEncoding, false, kCFAllocatorNull));
247
-
- if (!cfString.get())
248
-
- return false;
249
-
-
250
-
- stringList.append(cfString.get());
251
-
- ptr += stringLength;
252
-
- }
253
-
-
254
-
- if (ptr != end)
255
-
- return false;
256
-
-
257
-
- return true;
258
-
-}
259
-
-
260
-
-static const ResID PluginNameOrDescriptionStringNumber = 126;
261
-
-static const ResID MIMEDescriptionStringNumber = 127;
262
-
-static const ResID MIMEListStringStringNumber = 128;
263
-
-
264
-
-static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& pluginInfo)
265
-
-{
266
-
- ResourceMap resourceMap(bundle);
267
-
- if (!resourceMap.isValid())
268
-
- return false;
269
-
-
270
-
- // Get the description and name string list.
271
-
- Vector<String> descriptionAndName;
272
-
- if (!getStringListResource(PluginNameOrDescriptionStringNumber, descriptionAndName))
273
-
- return false;
274
-
-
275
-
- // Get the MIME types and extensions string list. This list needs to be a multiple of two.
276
-
- Vector<String> mimeTypesAndExtensions;
277
-
- if (!getStringListResource(MIMEListStringStringNumber, mimeTypesAndExtensions))
278
-
- return false;
279
-
-
280
-
- if (mimeTypesAndExtensions.size() % 2)
281
-
- return false;
282
-
-
283
-
- // Now get the MIME type descriptions string list. This string list needs to be the same length as the number of MIME types.
284
-
- Vector<String> mimeTypeDescriptions;
285
-
- if (!getStringListResource(MIMEDescriptionStringNumber, mimeTypeDescriptions))
286
-
- return false;
287
-
-
288
-
- // Add all MIME types.
289
-
- for (size_t i = 0; i < mimeTypesAndExtensions.size() / 2; ++i) {
290
-
- MimeClassInfo mimeClassInfo;
291
-
-
292
-
- const String& mimeType = mimeTypesAndExtensions[i * 2];
293
-
- String description;
294
-
- if (i < mimeTypeDescriptions.size())
295
-
- description = mimeTypeDescriptions[i];
296
-
-
297
-
- mimeClassInfo.type = mimeType.lower();
298
-
- mimeClassInfo.desc = description;
299
-
-
300
-
- Vector<String> extensions;
301
-
- mimeTypesAndExtensions[i * 2 + 1].split(',', extensions);
302
-
-
303
-
- for (size_t i = 0; i < extensions.size(); ++i)
304
-
- mimeClassInfo.extensions.append(extensions[i].lower());
305
-
-
306
-
- pluginInfo.mimes.append(mimeClassInfo);
307
-
- }
308
-
-
309
-
- // Set the description and name if they exist.
310
-
- if (descriptionAndName.size() > 0)
311
-
- pluginInfo.desc = descriptionAndName[0];
312
-
- if (descriptionAndName.size() > 1)
313
-
- pluginInfo.name = descriptionAndName[1];
314
-
-
315
-
- return true;
316
-
-}
317
-
-
318
-
bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin& plugin)
319
-
{
320
-
RetainPtr<CFStringRef> bundlePath(AdoptCF, pluginPath.createCFString());
321
-
@@ -344,8 +217,7 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu
322
-
return false;
323
-
324
-
// Check that there's valid info for this plug-in.
325
-
- if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info) &&
326
-
- !getPluginInfoFromCarbonResources(bundle.get(), plugin.info))
327
-
+ if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info))
328
-
return false;
329
-
330
-
plugin.path = pluginPath;
-64
pkgs/development/libraries/qt-4.x/4.8/libressl.patch
-64
pkgs/development/libraries/qt-4.x/4.8/libressl.patch
···
1
-
$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.3 2015/09/17 12:24:42 dcoppa Exp $
2
-
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp Wed Sep 16 13:27:39 2015
3
-
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp Wed Sep 16 13:33:06 2015
4
-
@@ -228,13 +228,17 @@ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, re
5
-
#ifndef OPENSSL_NO_SSL2
6
-
DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
7
-
#endif
8
-
+#ifndef OPENSSL_NO_SSL3
9
-
DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
10
-
+#endif
11
-
DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
12
-
DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
13
-
#ifndef OPENSSL_NO_SSL2
14
-
DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
15
-
#endif
16
-
+#ifndef OPENSSL_NO_SSL3
17
-
DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
18
-
+#endif
19
-
DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
20
-
DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
21
-
#else
22
-
@@ -822,13 +826,17 @@ bool q_resolveOpenSslSymbols()
23
-
#ifndef OPENSSL_NO_SSL2
24
-
RESOLVEFUNC(SSLv2_client_method)
25
-
#endif
26
-
+#ifndef OPENSSL_NO_SSL3
27
-
RESOLVEFUNC(SSLv3_client_method)
28
-
+#endif
29
-
RESOLVEFUNC(SSLv23_client_method)
30
-
RESOLVEFUNC(TLSv1_client_method)
31
-
#ifndef OPENSSL_NO_SSL2
32
-
RESOLVEFUNC(SSLv2_server_method)
33
-
#endif
34
-
+#ifndef OPENSSL_NO_SSL3
35
-
RESOLVEFUNC(SSLv3_server_method)
36
-
+#endif
37
-
RESOLVEFUNC(SSLv23_server_method)
38
-
RESOLVEFUNC(TLSv1_server_method)
39
-
RESOLVEFUNC(X509_NAME_entry_count)
40
-
--- a/src/network/ssl/qsslsocket_openssl.cpp Thu May 7 16:14:44 2015
41
-
+++ b/src/network/ssl/qsslsocket_openssl.cpp Wed Sep 16 13:30:03 2015
42
-
@@ -267,15 +267,19 @@ init_context:
43
-
#endif
44
-
break;
45
-
case QSsl::SslV3:
46
-
+#ifndef OPENSSL_NO_SSL3
47
-
ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
48
-
+#else
49
-
+ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
50
-
+#endif
51
-
break;
52
-
- case QSsl::SecureProtocols: // SslV2 will be disabled below
53
-
- case QSsl::TlsV1SslV3: // SslV2 will be disabled below
54
-
case QSsl::AnyProtocol:
55
-
- default:
56
-
ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
57
-
break;
58
-
case QSsl::TlsV1:
59
-
+ case QSsl::SecureProtocols:
60
-
+ case QSsl::TlsV1SslV3:
61
-
+ default:
62
-
ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method());
63
-
break;
64
-
}
-22
pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch
-22
pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch
···
1
-
--- a/configure
2
-
+++ b/configure
3
-
@@ -1087,2 +1087,3 @@ fi
4
-
#-------------------------------------------------------------------------------
5
-
+JOBS=
6
-
7
-
@@ -2528,2 +2529,5 @@ while [ "$#" -gt 0 ]; do
8
-
;;
9
-
+ jobs)
10
-
+ JOBS=-j$VAL
11
-
+ ;;
12
-
*)
13
-
@@ -5072,3 +5076,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
14
-
if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then
15
-
- (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1
16
-
+ (cd "$outpath/qmake" && "$MAKE" $JOBS -f "$mkfile" depend) >/dev/null 2>&1
17
-
sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"$mkfile.tmp"
18
-
@@ -5080,3 +5084,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
19
-
QMAKE_BUILD_ERROR=no
20
-
- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
21
-
+ (cd "$outpath/qmake"; "$MAKE" $JOBS) || QMAKE_BUILD_ERROR=yes
22
-
[ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
-54
pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff
-54
pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff
···
1
-
--- a/src/corelib/thread/qthread_unix.cpp.orig 2015-11-23 19:05:40.000000000 +0100
2
-
+++ b/src/corelib/thread/qthread_unix.cpp 2015-11-24 11:22:31.000000000 +0100
3
-
@@ -79,6 +79,7 @@
4
-
#endif
5
-
6
-
+#include <sys/resource.h> // getrlimit/setrlimit
7
-
#if defined(Q_OS_MAC)
8
-
# ifdef qDebug
9
-
# define old_qDebug qDebug
10
-
# undef qDebug
11
-
@@ -649,6 +650,43 @@
12
-
#endif // QT_HAS_THREAD_PRIORITY_SCHEDULING
13
-
14
-
15
-
+ if (d->stackSize == 0) {
16
-
+ // Fix the default (too small) stack size for threads on OS X,
17
-
+ // which also affects the thread pool.
18
-
+ // See also:
19
-
+ // https://bugreports.qt.io/browse/QTBUG-2568
20
-
+ // This fix can also be found in Chromium:
21
-
+ // https://chromium.googlesource.com/chromium/src.git/+/master/base/threading/platform_thread_mac.mm#186
22
-
+
23
-
+ // The Mac OS X default for a pthread stack size is 512kB.
24
-
+ // Libc-594.1.4/pthreads/pthread.c's pthread_attr_init uses
25
-
+ // DEFAULT_STACK_SIZE for this purpose.
26
-
+ //
27
-
+ // 512kB isn't quite generous enough for some deeply recursive threads that
28
-
+ // otherwise request the default stack size by specifying 0. Here, adopt
29
-
+ // glibc's behavior as on Linux, which is to use the current stack size
30
-
+ // limit (ulimit -s) as the default stack size. See
31
-
+ // glibc-2.11.1/nptl/nptl-init.c's __pthread_initialize_minimal_internal. To
32
-
+ // avoid setting the limit below the Mac OS X default or the minimum usable
33
-
+ // stack size, these values are also considered. If any of these values
34
-
+ // can't be determined, or if stack size is unlimited (ulimit -s unlimited),
35
-
+ // stack_size is left at 0 to get the system default.
36
-
+ //
37
-
+ // Mac OS X normally only applies ulimit -s to the main thread stack. On
38
-
+ // contemporary OS X and Linux systems alike, this value is generally 8MB
39
-
+ // or in that neighborhood.
40
-
+ size_t default_stack_size = 0;
41
-
+ struct rlimit stack_rlimit;
42
-
+ if (pthread_attr_getstacksize(&attr, &default_stack_size) == 0 &&
43
-
+ getrlimit(RLIMIT_STACK, &stack_rlimit) == 0 &&
44
-
+ stack_rlimit.rlim_cur != RLIM_INFINITY) {
45
-
+ default_stack_size =
46
-
+ std::max(std::max(default_stack_size,
47
-
+ static_cast<size_t>(PTHREAD_STACK_MIN)),
48
-
+ static_cast<size_t>(stack_rlimit.rlim_cur));
49
-
+ }
50
-
+ d->stackSize = default_stack_size;
51
-
+ }
52
-
if (d->stackSize > 0) {
53
-
#if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0)
54
-
int code = pthread_attr_setstacksize(&attr, d->stackSize);
-21
pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh
-21
pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh
···
1
-
qmakeConfigurePhase() {
2
-
runHook preConfigure
3
-
4
-
$QMAKE PREFIX=$out $qmakeFlags
5
-
6
-
if ! [[ -v enableParallelBuilding ]]; then
7
-
enableParallelBuilding=1
8
-
echo "qmake4Hook: enabled parallel building"
9
-
fi
10
-
11
-
if ! [[ -v enableParallelInstalling ]]; then
12
-
enableParallelInstalling=1
13
-
echo "qmake: enabled parallel installing"
14
-
fi
15
-
16
-
runHook postConfigure
17
-
}
18
-
19
-
export QMAKE=@qt4@/bin/qmake
20
-
21
-
configurePhase=qmakeConfigurePhase
-17
pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch
-17
pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch
···
1
-
Calling qsettings before constructing qapplications causes a dead-lock.
2
-
3
-
http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932
4
-
http://developer.qt.nokia.com/forums/viewthread/10365
5
-
6
-
7
-
--- ./src/corelib/io/qsettings.cpp.orig
8
-
+++ ./src/corelib/io/qsettings.cpp
9
-
@@ -122,7 +122,7 @@
10
-
Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc)
11
-
Q_GLOBAL_STATIC(PathHash, pathHashFunc)
12
-
Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc)
13
-
-Q_GLOBAL_STATIC(QMutex, globalMutex)
14
-
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive))
15
-
static QSettings::Format globalDefaultFormat = QSettings::NativeFormat;
16
-
17
-
#ifndef Q_OS_WIN
-11
pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch
-11
pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch
···
1
-
--- a/qmake/generators/unix/unixmake.cpp
2
-
+++ b/qmake/generators/unix/unixmake.cpp
3
-
@@ -831,7 +831,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
4
-
else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP"))
5
-
ret += " " + var("QMAKE_STRIPFLAGS_APP");
6
-
if(bundle)
7
-
- ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
8
-
+ ret += " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
9
-
else
10
-
ret += " \"" + dst_targ + "\"";
11
-
}
-11
pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch
-11
pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch
···
1
-
--- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig
2
-
+++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp
3
-
@@ -62,7 +62,7 @@
4
-
#elif defined(Q_OS_AIX)
5
-
# define NO_BOM
6
-
# define UTF16 "UCS-2"
7
-
-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
8
-
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
9
-
# define NO_BOM
10
-
# if Q_BYTE_ORDER == Q_BIG_ENDIAN
11
-
# define UTF16 "UTF-16BE"
-14
pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch
-14
pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch
···
1
-
--- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig
2
-
+++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h
3
-
@@ -86,11 +86,7 @@
4
-
5
-
#undef QT_SOCKLEN_T
6
-
7
-
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
8
-
#define QT_SOCKLEN_T socklen_t
9
-
-#else
10
-
-#define QT_SOCKLEN_T int
11
-
-#endif
12
-
13
-
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
14
-
#define QT_SNPRINTF ::snprintf
-33
pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch
-33
pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch
···
1
-
--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500
2
-
+++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500
3
-
@@ -7744,7 +7744,7 @@
4
-
*-g++*)
5
-
# Check gcc's version
6
-
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
7
-
- 5*|4*|3.4*)
8
-
+ 9*|8*|7*|6*|5*|4*|3.4*)
9
-
;;
10
-
3.3*)
11
-
canBuildWebKit="no"
12
-
@@ -8060,7 +8060,7 @@
13
-
3.*)
14
-
COMPILER_VERSION="3.*"
15
-
;;
16
-
- 5*|4.*)
17
-
+ 9*|8*|7*|6*|5*|4.*)
18
-
COMPILER_VERSION="4"
19
-
;;
20
-
*)
21
-
--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500
22
-
+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500
23
-
@@ -70,8 +70,8 @@
24
-
ForegroundShift = 10,
25
-
BackgroundShift = 20,
26
-
SpecialShift = 20,
27
-
- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
28
-
- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
29
-
+ ForegroundMask = 0x1f << ForegroundShift,
30
-
+ BackgroundMask = 0x7 << BackgroundShift
31
-
};
32
-
33
-
public:
-398
pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch
-398
pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch
···
1
-
--- a/src/network/ssl/qsslcertificate.cpp
2
-
+++ b/src/network/ssl/qsslcertificate.cpp
3
-
@@ -259,10 +259,10 @@
4
-
QByteArray QSslCertificate::version() const
5
-
{
6
-
QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
7
-
- if (d->versionString.isEmpty() && d->x509)
8
-
+ if (d->versionString.isEmpty() && d->x509) {
9
-
d->versionString =
10
-
- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
11
-
-
12
-
+ QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
13
-
+ }
14
-
return d->versionString;
15
-
}
16
-
17
-
@@ -276,7 +276,7 @@
18
-
{
19
-
QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
20
-
if (d->serialNumberString.isEmpty() && d->x509) {
21
-
- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber;
22
-
+ ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509);
23
-
// if we cannot convert to a long, just output the hexadecimal number
24
-
if (serialNumber->length > 4) {
25
-
QByteArray hexString;
26
-
@@ -489,24 +489,33 @@
27
-
QSslKey key;
28
-
29
-
key.d->type = QSsl::PublicKey;
30
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
31
-
X509_PUBKEY *xkey = d->x509->cert_info->key;
32
-
+#else
33
-
+ X509_PUBKEY *xkey = q_X509_get_X509_PUBKEY(d->x509);
34
-
+#endif
35
-
EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey);
36
-
Q_ASSERT(pkey);
37
-
38
-
- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) {
39
-
+ int key_id;
40
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
41
-
+ key_id = q_EVP_PKEY_type(pkey->type);
42
-
+#else
43
-
+ key_id = q_EVP_PKEY_base_id(pkey);
44
-
+#endif
45
-
+ if (key_id == EVP_PKEY_RSA) {
46
-
key.d->rsa = q_EVP_PKEY_get1_RSA(pkey);
47
-
key.d->algorithm = QSsl::Rsa;
48
-
key.d->isNull = false;
49
-
- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) {
50
-
+ } else if (key_id == EVP_PKEY_DSA) {
51
-
key.d->dsa = q_EVP_PKEY_get1_DSA(pkey);
52
-
key.d->algorithm = QSsl::Dsa;
53
-
key.d->isNull = false;
54
-
- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) {
55
-
+ } else if (key_id == EVP_PKEY_DH) {
56
-
// DH unsupported
57
-
} else {
58
-
// error?
59
-
}
60
-
-
61
-
q_EVP_PKEY_free(pkey);
62
-
return key;
63
-
}
64
-
--- a/src/network/ssl/qsslkey.cpp
65
-
+++ b/src/network/ssl/qsslkey.cpp
66
-
@@ -321,8 +321,19 @@
67
-
{
68
-
if (d->isNull)
69
-
return -1;
70
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
71
-
return (d->algorithm == QSsl::Rsa)
72
-
? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p);
73
-
+#else
74
-
+ if (d->algorithm == QSsl::Rsa) {
75
-
+ return q_RSA_bits(d->rsa);
76
-
+ }else{
77
-
+ BIGNUM *p = NULL;
78
-
+ q_DSA_get0_pqg(d->dsa, &p, NULL, NULL);
79
-
+ return q_BN_num_bits(p);
80
-
+ }
81
-
+#endif
82
-
+
83
-
}
84
-
85
-
/*!
86
-
--- a/src/network/ssl/qsslsocket_openssl.cpp
87
-
+++ b/src/network/ssl/qsslsocket_openssl.cpp
88
-
@@ -93,6 +93,7 @@
89
-
bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
90
-
bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
91
-
92
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
93
-
/* \internal
94
-
95
-
From OpenSSL's thread(3) manual page:
96
-
@@ -174,6 +175,8 @@
97
-
}
98
-
} // extern "C"
99
-
100
-
+#endif //OPENSSL_VERSION_NUMBER >= 0x10100000L
101
-
+
102
-
QSslSocketBackendPrivate::QSslSocketBackendPrivate()
103
-
: ssl(0),
104
-
ctx(0),
105
-
@@ -222,9 +225,12 @@
106
-
ciph.d->encryptionMethod = descriptionList.at(4).mid(4);
107
-
ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export"));
108
-
109
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
110
-
ciph.d->bits = cipher->strength_bits;
111
-
ciph.d->supportedBits = cipher->alg_bits;
112
-
-
113
-
+#else
114
-
+ ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits);
115
-
+#endif
116
-
}
117
-
return ciph;
118
-
}
119
-
@@ -367,7 +373,7 @@
120
-
//
121
-
// See also: QSslContext::fromConfiguration()
122
-
if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) {
123
-
- q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle());
124
-
+ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle());
125
-
}
126
-
}
127
-
128
-
@@ -504,8 +510,10 @@
129
-
*/
130
-
void QSslSocketPrivate::deinitialize()
131
-
{
132
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
133
-
q_CRYPTO_set_id_callback(0);
134
-
q_CRYPTO_set_locking_callback(0);
135
-
+#endif
136
-
}
137
-
138
-
/*!
139
-
@@ -526,13 +534,17 @@
140
-
return false;
141
-
142
-
// Check if the library itself needs to be initialized.
143
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
144
-
QMutexLocker locker(openssl_locks()->initLock());
145
-
+#endif
146
-
if (!s_libraryLoaded) {
147
-
s_libraryLoaded = true;
148
-
149
-
// Initialize OpenSSL.
150
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
151
-
q_CRYPTO_set_id_callback(id_function);
152
-
q_CRYPTO_set_locking_callback(locking_function);
153
-
+#endif
154
-
if (q_SSL_library_init() != 1)
155
-
return false;
156
-
q_SSL_load_error_strings();
157
-
@@ -571,7 +583,9 @@
158
-
159
-
void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
160
-
{
161
-
- QMutexLocker locker(openssl_locks()->initLock());
162
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
163
-
+ QMutexLocker locker(openssl_locks()->initLock());
164
-
+#endif
165
-
if (s_loadedCiphersAndCerts)
166
-
return;
167
-
s_loadedCiphersAndCerts = true;
168
-
@@ -663,13 +677,18 @@
169
-
STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl);
170
-
for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) {
171
-
if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) {
172
-
- if (cipher->valid) {
173
-
+
174
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
175
-
+ if (cipher->valid) {
176
-
+#endif
177
-
QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
178
-
if (!ciph.isNull()) {
179
-
if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
180
-
ciphers << ciph;
181
-
}
182
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
183
-
}
184
-
+#endif
185
-
}
186
-
}
187
-
188
-
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
189
-
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
190
-
@@ -290,6 +290,22 @@
191
-
DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG)
192
-
DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
193
-
DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
194
-
+DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return)
195
-
+
196
-
+DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return)
197
-
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
198
-
+DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return)
199
-
+DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return)
200
-
+DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return)
201
-
+DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return)
202
-
+DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return)
203
-
+DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return)
204
-
+DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return)
205
-
+DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
206
-
+DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return)
207
-
+DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return)
208
-
+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return)
209
-
+#endif
210
-
211
-
#ifdef Q_OS_SYMBIAN
212
-
#define RESOLVEFUNC(func, ordinal, lib) \
213
-
@@ -801,6 +817,7 @@
214
-
RESOLVEFUNC(SSL_CTX_use_PrivateKey)
215
-
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
216
-
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
217
-
+ RESOLVEFUNC(SSL_CTX_get_cert_store)
218
-
RESOLVEFUNC(SSL_accept)
219
-
RESOLVEFUNC(SSL_clear)
220
-
RESOLVEFUNC(SSL_connect)
221
-
@@ -823,6 +840,23 @@
222
-
RESOLVEFUNC(SSL_set_connect_state)
223
-
RESOLVEFUNC(SSL_shutdown)
224
-
RESOLVEFUNC(SSL_write)
225
-
+
226
-
+ RESOLVEFUNC(X509_get_serialNumber)
227
-
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
228
-
+ RESOLVEFUNC(SSL_CTX_ctrl)
229
-
+ RESOLVEFUNC(EVP_PKEY_id)
230
-
+ RESOLVEFUNC(EVP_PKEY_base_id)
231
-
+ RESOLVEFUNC(SSL_CIPHER_get_bits)
232
-
+ RESOLVEFUNC(SSL_CTX_set_options)
233
-
+ RESOLVEFUNC(X509_get_version)
234
-
+ RESOLVEFUNC(X509_get_X509_PUBKEY)
235
-
+ RESOLVEFUNC(RSA_bits)
236
-
+ RESOLVEFUNC(DSA_security_bits)
237
-
+ RESOLVEFUNC(DSA_get0_pqg)
238
-
+ RESOLVEFUNC(X509_get_notAfter)
239
-
+ RESOLVEFUNC(X509_get_notBefore)
240
-
+#endif
241
-
+
242
-
#ifndef OPENSSL_NO_SSL2
243
-
RESOLVEFUNC(SSLv2_client_method)
244
-
#endif
245
-
--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
246
-
+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
247
-
@@ -399,7 +399,25 @@
248
-
PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\
249
-
bp,(char *)x,enc,kstr,klen,cb,u)
250
-
#endif
251
-
+
252
-
+X509_STORE * q_SSL_CTX_get_cert_store(const SSL_CTX *ctx);
253
-
+ASN1_INTEGER * q_X509_get_serialNumber(X509 *x);
254
-
+
255
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
256
-
#define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
257
-
+#define q_X509_get_version(x) X509_get_version(x)
258
-
+#else
259
-
+int q_EVP_PKEY_id(const EVP_PKEY *pkey);
260
-
+int q_EVP_PKEY_base_id(const EVP_PKEY *pkey);
261
-
+int q_SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits);
262
-
+long q_SSL_CTX_set_options(SSL_CTX *ctx, long options);
263
-
+long q_X509_get_version(X509 *x);
264
-
+X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
265
-
+int q_RSA_bits(const RSA *rsa);
266
-
+int q_DSA_security_bits(const DSA *dsa);
267
-
+void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g);
268
-
+#endif
269
-
+
270
-
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
271
-
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
272
-
#define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st))
273
-
@@ -410,8 +428,15 @@
274
-
#define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
275
-
#define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
276
-
q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
277
-
+
278
-
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
279
-
#define q_X509_get_notAfter(x) X509_get_notAfter(x)
280
-
#define q_X509_get_notBefore(x) X509_get_notBefore(x)
281
-
+#else
282
-
+ASN1_TIME *q_X509_get_notAfter(X509 *x);
283
-
+ASN1_TIME *q_X509_get_notBefore(X509 *x);
284
-
+#endif
285
-
+
286
-
#define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
287
-
(char *)(rsa))
288
-
#define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
289
-
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp.omv~ 2017-03-15 02:27:18.143322736 +0100
290
-
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp 2017-03-15 02:29:56.215819741 +0100
291
-
@@ -696,7 +696,7 @@
292
-
unsigned char *data = 0;
293
-
int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
294
-
info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size);
295
-
- q_CRYPTO_free(data);
296
-
+ q_OPENSSL_free(data);
297
-
}
298
-
return info;
299
-
}
300
-
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp.0131~ 2017-03-15 02:22:37.053244125 +0100
301
-
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp 2017-03-15 02:22:37.055244057 +0100
302
-
@@ -328,7 +328,7 @@
303
-
if (d->algorithm == QSsl::Rsa) {
304
-
return q_RSA_bits(d->rsa);
305
-
}else{
306
-
- BIGNUM *p = NULL;
307
-
+ const BIGNUM *p = NULL;
308
-
q_DSA_get0_pqg(d->dsa, &p, NULL, NULL);
309
-
return q_BN_num_bits(p);
310
-
}
311
-
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp.0131~ 2017-03-15 02:22:37.054244091 +0100
312
-
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-03-15 02:29:41.155236836 +0100
313
-
@@ -111,16 +111,16 @@
314
-
DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
315
-
DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
316
-
DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
317
-
-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
318
-
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
319
-
DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
320
-
DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
321
-
-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
322
-
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
323
-
DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
324
-
DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
325
-
DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
326
-
DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
327
-
DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
328
-
-DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
329
-
+DEFINEFUNC(void, OPENSSL_free, void *a, a, return, DUMMYARG)
330
-
DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG)
331
-
#if OPENSSL_VERSION_NUMBER < 0x00908000L
332
-
DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return)
333
-
@@ -300,7 +300,7 @@
334
-
DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
335
-
DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return)
336
-
DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return)
337
-
-DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return)
338
-
+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return)
339
-
#endif
340
-
341
-
#ifdef Q_OS_SYMBIAN
342
-
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h.0131~ 2017-03-15 02:22:37.054244091 +0100
343
-
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-03-15 02:29:50.192986268 +0100
344
-
@@ -59,6 +59,9 @@
345
-
QT_BEGIN_NAMESPACE
346
-
347
-
#define DUMMYARG
348
-
+#ifndef OPENSSL_NO_SSL2
349
-
+#define OPENSSL_NO_SSL2 1
350
-
+#endif
351
-
352
-
#if !defined QT_LINKED_OPENSSL
353
-
// **************** Shared declarations ******************
354
-
@@ -207,16 +210,16 @@
355
-
int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
356
-
long q_BIO_ctrl(BIO *a, int b, long c, void *d);
357
-
int q_BIO_free(BIO *a);
358
-
-BIO *q_BIO_new(BIO_METHOD *a);
359
-
+BIO *q_BIO_new(const BIO_METHOD *a);
360
-
BIO *q_BIO_new_mem_buf(void *a, int b);
361
-
int q_BIO_read(BIO *a, void *b, int c);
362
-
-BIO_METHOD *q_BIO_s_mem();
363
-
+const BIO_METHOD *q_BIO_s_mem();
364
-
int q_BIO_write(BIO *a, const void *b, int c);
365
-
int q_BN_num_bits(const BIGNUM *a);
366
-
int q_CRYPTO_num_locks();
367
-
void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
368
-
void q_CRYPTO_set_id_callback(unsigned long (*a)());
369
-
-void q_CRYPTO_free(void *a);
370
-
+void q_OPENSSL_free(void *a);
371
-
void q_DSA_free(DSA *a);
372
-
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
373
-
// 0.9.8 broke SC and BC by changing this function's signature.
374
-
@@ -326,7 +329,6 @@
375
-
void q_SSL_set_connect_state(SSL *a);
376
-
int q_SSL_shutdown(SSL *a);
377
-
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
378
-
-const SSL_METHOD *q_SSLv2_client_method();
379
-
const SSL_METHOD *q_SSLv3_client_method();
380
-
const SSL_METHOD *q_SSLv23_client_method();
381
-
const SSL_METHOD *q_TLSv1_client_method();
382
-
@@ -335,7 +337,6 @@
383
-
const SSL_METHOD *q_SSLv23_server_method();
384
-
const SSL_METHOD *q_TLSv1_server_method();
385
-
#else
386
-
-SSL_METHOD *q_SSLv2_client_method();
387
-
SSL_METHOD *q_SSLv3_client_method();
388
-
SSL_METHOD *q_SSLv23_client_method();
389
-
SSL_METHOD *q_TLSv1_client_method();
390
-
@@ -415,7 +416,7 @@
391
-
X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
392
-
int q_RSA_bits(const RSA *rsa);
393
-
int q_DSA_security_bits(const DSA *dsa);
394
-
-void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g);
395
-
+void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
396
-
#endif
397
-
398
-
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-54
pkgs/development/libraries/qt-mobility/default.nix
-54
pkgs/development/libraries/qt-mobility/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }:
2
-
# possible additional dependencies: pulseaudio udev networkmanager immerson qmf
3
-
4
-
stdenv.mkDerivation rec {
5
-
version = "1.2.0";
6
-
pname = "qt-mobility";
7
-
src = fetchFromGitHub {
8
-
owner = "qtproject";
9
-
repo = "qt-mobility";
10
-
rev = "v${version}";
11
-
sha256 = "14713pbscysd6d0b9rgm7gg145jzwvgdn22778pf2v13qzvfmy1i";
12
-
};
13
-
14
-
env.NIX_CFLAGS_COMPILE = "-fpermissive";
15
-
16
-
configurePhase = ''
17
-
./configure -prefix $out
18
-
'';
19
-
20
-
# we need to prevent the 'make install' to want to write to ${qt4}!
21
-
# according to thiago#qt@freenode these are used for the QML engine
22
-
preBuild = ''
23
-
for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do
24
-
substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/"
25
-
done
26
-
'';
27
-
28
-
# Features files (*.prf) are not installed on nixos
29
-
# https://bugreports.qt-project.org/browse/QTMOBILITY-1085
30
-
# - features/mobility.prf (/tmp/nix-build-9kh12nhf9cyplfwiws96gz414v6wgl67-qt-mobility-1.2.0.drv-0/qt-mobility-opensource-src-1.2.0)
31
-
32
-
patchPhase = ''
33
-
# required to make the configure script work
34
-
substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd"
35
-
36
-
# required to make /include generator work
37
-
substituteInPlace bin/syncheaders --replace "/usr/bin/perl" "${perl}/bin/perl"
38
-
39
-
# required to make the -prefix variable parsing work
40
-
substituteInPlace bin/pathhelper --replace "/usr/bin/perl" "${perl}/bin/perl"
41
-
'';
42
-
43
-
buildInputs = [ qt4 libX11 bluez perl ];
44
-
45
-
meta = with lib; {
46
-
description = "Qt Mobility";
47
-
homepage = "http://qt.nokia.com/products/qt-addons/mobility";
48
-
maintainers = [ maintainers.qknight ];
49
-
platforms = platforms.linux;
50
-
license = with licenses; [ bsd3 fdl13Plus gpl3Plus lgpl21Plus ];
51
-
};
52
-
}
53
-
54
-
-42
pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
-42
pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "qtstyleplugin-kvantum-qt4";
5
-
version = "1.0.10";
6
-
7
-
src = fetchFromGitHub {
8
-
owner = "tsujan";
9
-
repo = "Kvantum";
10
-
rev = "V${version}";
11
-
hash = "sha256-48Blio8qHLmXSKG0c1tphXSfiwQXs0Xqwxe187nM3Ro=";
12
-
};
13
-
14
-
nativeBuildInputs = [ qmake4Hook ];
15
-
buildInputs = [ qt4 libX11 libXext ];
16
-
17
-
sourceRoot = "${src.name}/Kvantum";
18
-
19
-
buildPhase = ''
20
-
runHook preBuild
21
-
qmake kvantum.pro
22
-
make
23
-
runHook postBuild
24
-
'';
25
-
26
-
installPhase = ''
27
-
runHook preInstall
28
-
mkdir $TMP/kvantum
29
-
make INSTALL_ROOT="$TMP/kvantum" install
30
-
mv $TMP/kvantum/usr/ $out
31
-
mv $TMP/kvantum/${qt4}/lib $out
32
-
runHook postInstall
33
-
'';
34
-
35
-
meta = with lib; {
36
-
description = "SVG-based Qt4 theme engine";
37
-
homepage = "https://github.com/tsujan/Kvantum";
38
-
license = licenses.gpl3Plus;
39
-
platforms = platforms.linux;
40
-
maintainers = [ maintainers.bugworm ];
41
-
};
42
-
}
-42
pkgs/development/libraries/qwt/6_qt4.nix
-42
pkgs/development/libraries/qwt/6_qt4.nix
···
1
-
{ lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "qwt";
5
-
version = "6.1.5";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2";
9
-
sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0";
10
-
};
11
-
12
-
buildInputs = [
13
-
qt4
14
-
] ++ lib.optionals stdenv.isDarwin [ AGL ];
15
-
16
-
nativeBuildInputs = [ qmake4Hook ];
17
-
18
-
enableParallelBuilding = true;
19
-
20
-
postPatch = ''
21
-
sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
22
-
'';
23
-
24
-
# qwt.framework output includes a relative reference to itself, which breaks dependents
25
-
preFixup =
26
-
lib.optionalString stdenv.isDarwin ''
27
-
echo "Attempting to repair qwt"
28
-
install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt"
29
-
'';
30
-
31
-
qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ];
32
-
33
-
meta = with lib; {
34
-
description = "Qt widgets for technical applications";
35
-
homepage = "http://qwt.sourceforge.net/";
36
-
# LGPL 2.1 plus a few exceptions (more liberal)
37
-
license = lib.licenses.qwt;
38
-
platforms = platforms.linux ++ platforms.darwin;
39
-
maintainers = [ maintainers.bjornfor ];
40
-
branch = "6";
41
-
};
42
-
}
-23
pkgs/development/libraries/smokegen/default.nix
-23
pkgs/development/libraries/smokegen/default.nix
···
1
-
{ stdenv, lib, cmake, qt4, fetchzip }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "smokegen";
5
-
version = "4.14.3";
6
-
7
-
src = fetchzip {
8
-
url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz";
9
-
hash = "sha256-finsoruPeJZLawIjNUJ25Pq54eaCByfALVraNQJPk7c=";
10
-
};
11
-
12
-
strictDeps = true;
13
-
nativeBuildInputs = [ cmake qt4 ];
14
-
buildInputs = [ qt4 ];
15
-
16
-
meta = with lib; {
17
-
description = "A general purpose C++ parser with a plugin infrastructure";
18
-
homepage = "https://invent.kde.org/unmaintained/smokegen";
19
-
license = licenses.gpl2Only;
20
-
platforms = platforms.unix;
21
-
maintainers = with maintainers; [ uthar ];
22
-
};
23
-
}
-27
pkgs/development/libraries/smokeqt/default.nix
-27
pkgs/development/libraries/smokeqt/default.nix
···
1
-
{ stdenv, lib, cmake, qt4, smokegen, fetchzip }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "smokeqt";
5
-
version = "4.14.3";
6
-
7
-
src = fetchzip {
8
-
url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz";
9
-
hash = "sha256-8FiEGF8gduVw5I/bi2wExGUWmjIjYEhWpjpXKJGBNMg=";
10
-
};
11
-
12
-
strictDeps = true;
13
-
nativeBuildInputs = [ cmake smokegen ];
14
-
buildInputs = [ qt4 ];
15
-
16
-
cmakeFlags = [
17
-
"-DCMAKE_CXX_STANDARD=98"
18
-
];
19
-
20
-
meta = with lib; {
21
-
description = "Bindings for the Qt libraries";
22
-
homepage = "https://invent.kde.org/unmaintained/smokeqt";
23
-
license = licenses.gpl2Only;
24
-
platforms = platforms.unix;
25
-
maintainers = with maintainers; [ uthar ];
26
-
};
27
-
}
-100
pkgs/development/lisp-modules-new-obsolete/packages.nix
-100
pkgs/development/lisp-modules-new-obsolete/packages.nix
···
11
11
optionals
12
12
hasSuffix
13
13
splitString
14
-
remove
15
-
optionalString
16
-
stringLength
17
14
;
18
15
19
16
# Used by builds that would otherwise attempt to write into storeDir.
···
45
42
# Patches are already applied in `build`
46
43
patches = [];
47
44
src = build;
48
-
# TODO(kasper): handle this with a setup hook
49
-
LD_LIBRARY_PATH =
50
-
build.LD_LIBRARY_PATH
51
-
+ (optionalString (stringLength build.LD_LIBRARY_PATH != 0) ":")
52
-
+ "${build}";
53
45
});
54
46
55
47
# A little hacky
···
340
332
};
341
333
version = "f19162e76";
342
334
});
343
-
344
-
qt = let
345
-
rev = "dffff3ee3dbd0686c85c323f579b8bbf4881e60e";
346
-
in build-with-compile-into-pwd rec {
347
-
pname = "commonqt";
348
-
version = builtins.substring 0 7 rev;
349
-
350
-
src = pkgs.fetchFromGitHub {
351
-
inherit rev;
352
-
owner = pname;
353
-
repo = pname;
354
-
hash = "sha256-GAgwT0D9mIkYPTHfCH/KxxIv7b6QGwcxwZE7ehH5xug=";
355
-
};
356
-
357
-
buildInputs = [ pkgs.qt4 ];
358
-
nativeBuildInputs = [ pkgs.smokegen pkgs.smokeqt ];
359
-
nativeLibs = [ pkgs.qt4 pkgs.smokegen pkgs.smokeqt ];
360
-
361
-
systems = [ "qt" ];
362
-
363
-
lispLibs = with ql; [
364
-
cffi named-readtables cl-ppcre alexandria
365
-
closer-mop iterate trivial-garbage bordeaux-threads
366
-
];
367
335
};
368
-
369
-
qt-libs = build-with-compile-into-pwd {
370
-
inherit (ql.qt-libs) pname version src;
371
-
patches = [ ./patches/qt-libs-dont-download.patch ];
372
-
prePatch = ''
373
-
substituteInPlace systems/*.asd --replace ":qt+libs" ":qt"
374
-
echo "LD Path: $LD_LIBRARY_PATH"
375
-
'';
376
-
lispLibs = ql.qt-libs.lispLibs ++ [ qt ];
377
-
systems = [
378
-
"qt-libs"
379
-
"commonqt"
380
-
# "phonon"
381
-
# "qimageblitz"
382
-
# "qsci"
383
-
"qt3support"
384
-
"qtcore"
385
-
"qtdbus"
386
-
"qtdeclarative"
387
-
"qtgui"
388
-
"qthelp"
389
-
"qtnetwork"
390
-
"qtopengl"
391
-
"qtscript"
392
-
"qtsql"
393
-
"qtsvg"
394
-
"qttest"
395
-
"qtuitools"
396
-
# "qtwebkit"
397
-
"qtxml"
398
-
"qtxmlpatterns"
399
-
# "qwt"
400
-
"smokebase"
401
-
];
402
-
};
403
-
commonqt = qt-libs;
404
-
qt3support = qt-libs;
405
-
qtcore = qt-libs;
406
-
qtdbus = qt-libs;
407
-
qtdeclarative = qt-libs;
408
-
qtgui = qt-libs;
409
-
qthelp = qt-libs;
410
-
qtnetwork = qt-libs;
411
-
qtopengl = qt-libs;
412
-
qtscript = qt-libs;
413
-
qtsql = qt-libs;
414
-
qtsvg = qt-libs;
415
-
qttest = qt-libs;
416
-
qtuitools = qt-libs;
417
-
qtxml = qt-libs;
418
-
qtxmlpatterns = qt-libs;
419
-
smokebase = qt-libs;
420
-
421
-
qtools = build-with-compile-into-pwd {
422
-
inherit (ql.qtools) pname version src nativeLibs;
423
-
lispLibs = [ qt ] ++ remove ql.qt_plus_libs ql.qtools.lispLibs ++ [ qt-libs ];
424
-
patches = [ ./patches/qtools-use-nix-libs.patch ];
425
-
};
426
-
427
-
magicl = build-with-compile-into-pwd {
428
-
inherit (ql.magicl) pname version src lispLibs;
429
-
nativeBuildInputs = [ pkgs.gfortran ];
430
-
nativeLibs = [ pkgs.openblas ];
431
-
patches = [ ./patches/magicl-dont-build-fortran-twice.patch ];
432
-
};
433
-
434
-
};
435
-
436
336
in packages
-36
pkgs/development/lisp-modules-new-obsolete/patches/qt-libs-dont-download.patch
-36
pkgs/development/lisp-modules-new-obsolete/patches/qt-libs-dont-download.patch
···
1
-
--- a/qt-libs.asd
2
-
+++ b/qt-libs.asd
3
-
@@ -17,5 +17,4 @@
4
-
:components ((:file "qt-libs"))
5
-
:depends-on (:qt-lib-generator
6
-
:cl-ppcre
7
-
- :cffi)
8
-
- :perform (asdf:load-op :after (op c) (uiop:symbol-call :qt-libs :ensure-standalone-libs)))
9
-
+ :cffi))
10
-
--- a/qt-libs.lisp
11
-
+++ b/qt-libs.lisp
12
-
@@ -94,16 +94,14 @@
13
-
standalone-dir)
14
-
15
-
(defun %ensure-lib-loaded (file)
16
-
- (let ((file (etypecase file
17
-
- (pathname file)
18
-
- (string (installed-library-file file))))
19
-
- (name (intern (string-upcase (pathname-name file))))
20
-
- #+sbcl(sb-ext:*muffled-warnings* 'style-warning))
21
-
- (cffi::register-foreign-library
22
-
- name `((T ,file))
23
-
- :search-path (to-directory file))
24
-
- (unless (cffi:foreign-library-loaded-p name)
25
-
- (cffi:load-foreign-library name))))
26
-
+ (let ((name (make-pathname :name (format nil "lib~a" file)
27
-
+ :type #+unix "so"
28
-
+ #+darwin "dylib")))
29
-
+ (or (find-if (lambda (lib)
30
-
+ (equal (cffi:foreign-library-pathname lib)
31
-
+ (namestring name)))
32
-
+ (cffi:list-foreign-libraries))
33
-
+ (cffi:load-foreign-library name))))
34
-
35
-
(defun ensure-lib-loaded (file)
36
-
(cond ((pathnamep file)
-82
pkgs/development/lisp-modules/packages.nix
-82
pkgs/development/lisp-modules/packages.nix
···
535
535
});
536
536
537
537
538
-
qt = let
539
-
rev = "dffff3ee3dbd0686c85c323f579b8bbf4881e60e";
540
-
in build-with-compile-into-pwd rec {
541
-
pname = "commonqt";
542
-
version = builtins.substring 0 7 rev;
543
-
src = pkgs.fetchFromGitHub {
544
-
inherit rev;
545
-
owner = pname;
546
-
repo = pname;
547
-
hash = "sha256-GAgwT0D9mIkYPTHfCH/KxxIv7b6QGwcxwZE7ehH5xug=";
548
-
};
549
-
550
-
buildInputs = [ pkgs.qt4 ];
551
-
nativeBuildInputs = [ pkgs.smokegen pkgs.smokeqt ];
552
-
nativeLibs = [ pkgs.qt4 pkgs.smokegen pkgs.smokeqt ];
553
-
554
-
systems = [ "qt" ];
555
-
556
-
lispLibs = with super; [
557
-
cffi named-readtables cl-ppcre alexandria
558
-
closer-mop iterate trivial-garbage bordeaux-threads
559
-
];
560
-
};
561
-
562
-
qt-libs = build-with-compile-into-pwd {
563
-
inherit (super.qt-libs) pname version src;
564
-
patches = [ ./patches/qt-libs-dont-download.patch ];
565
-
prePatch = ''
566
-
substituteInPlace systems/*.asd --replace ":qt+libs" ":qt"
567
-
'';
568
-
lispLibs = super.qt-libs.lispLibs ++ [ self.qt ];
569
-
systems = [
570
-
"qt-libs"
571
-
"commonqt"
572
-
# "phonon"
573
-
# "qimageblitz"
574
-
# "qsci"
575
-
"qt3support"
576
-
"qtcore"
577
-
"qtdbus"
578
-
"qtdeclarative"
579
-
"qtgui"
580
-
"qthelp"
581
-
"qtnetwork"
582
-
"qtopengl"
583
-
"qtscript"
584
-
"qtsql"
585
-
"qtsvg"
586
-
"qttest"
587
-
"qtuitools"
588
-
# "qtwebkit"
589
-
"qtxml"
590
-
"qtxmlpatterns"
591
-
# "qwt"
592
-
"smokebase"
593
-
];
594
-
};
595
-
596
-
commonqt = self.qt-libs;
597
-
qt3support = self.qt-libs;
598
-
qtcore = self.qt-libs;
599
-
qtdbus = self.qt-libs;
600
-
qtdeclarative = self.qt-libs;
601
-
qtgui = self.qt-libs;
602
-
qthelp = self.qt-libs;
603
-
qtnetwork = self.qt-libs;
604
-
qtopengl = self.qt-libs;
605
-
qtscript = self.qt-libs;
606
-
qtsql = self.qt-libs;
607
-
qtsvg = self.qt-libs;
608
-
qttest = self.qt-libs;
609
-
qtuitools = self.qt-libs;
610
-
qtxml = self.qt-libs;
611
-
qtxmlpatterns = self.qt-libs;
612
-
smokebase = self.qt-libs;
613
-
614
-
qtools = build-with-compile-into-pwd {
615
-
inherit (super.qtools) pname version src nativeLibs;
616
-
lispLibs = [ self.qt ] ++ remove super.qt_plus_libs super.qtools.lispLibs ++ [ self.qt-libs ];
617
-
patches = [ ./patches/qtools-use-nix-libs.patch ];
618
-
};
619
-
620
538
magicl = build-with-compile-into-pwd {
621
539
inherit (super.magicl) pname version src lispLibs;
622
540
nativeBuildInputs = [ pkgs.gfortran ];
-19
pkgs/development/lisp-modules/patches/qtools-use-nix-libs.patch
-19
pkgs/development/lisp-modules/patches/qtools-use-nix-libs.patch
···
1
-
Dont use the qt+libs system for managing Qt dependencies, because Nix provides
2
-
them already.
3
-
Don't build the deploy.lisp helper file, because Nix also can handle deployment.
4
-
--- a/qtools.asd
5
-
+++ b/qtools.asd
6
-
@@ -33,10 +33,9 @@
7
-
(:file "generate")
8
-
(:file "dynamic")
9
-
(:file "precompile")
10
-
- (:file "deploy")
11
-
(:file "fast-call")
12
-
(:file "documentation"))
13
-
- :depends-on (:qt+libs
14
-
+ :depends-on (:qt
15
-
:deploy
16
-
:cl-ppcre
17
-
:closer-mop
18
-
19
-
Diff finished. Sun Oct 2 14:38:06 2022
+1
-2
pkgs/development/python-modules/ete3/default.nix
+1
-2
pkgs/development/python-modules/ete3/default.nix
···
7
7
, withTreeVisualization ? false
8
8
, lxml
9
9
, withXmlSupport ? false
10
-
, pyqt4
11
10
, pyqt5
12
11
}:
13
12
···
25
24
pythonImportsCheck = [ "ete3" ];
26
25
27
26
propagatedBuildInputs = [ six numpy ]
28
-
++ lib.optional withTreeVisualization (if isPy3k then pyqt5 else pyqt4)
27
+
++ lib.optional withTreeVisualization pyqt5
29
28
++ lib.optional withXmlSupport lxml;
30
29
31
30
meta = with lib; {
+1
-2
pkgs/development/python-modules/nuitka/default.nix
+1
-2
pkgs/development/python-modules/nuitka/default.nix
···
2
2
, buildPythonPackage
3
3
, fetchFromGitHub
4
4
, vmprof
5
-
, pyqt4
6
5
, isPyPy
7
6
, pkgs
8
7
, scons
···
21
20
hash = "sha256-8eWOcxATVS866nlN39b2VU1CuXAfcn0yQsDweHS2yDU=";
22
21
};
23
22
24
-
nativeCheckInputs = [ vmprof pyqt4 ];
23
+
nativeCheckInputs = [ vmprof ];
25
24
nativeBuildInputs = [ scons ];
26
25
propagatedBuildInputs = [ chrpath ];
27
26
-69
pkgs/development/python-modules/pyqt/4.x.nix
-69
pkgs/development/python-modules/pyqt/4.x.nix
···
1
-
{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip_4, qt4, pkg-config, lndir, dbus, makeWrapper }:
2
-
3
-
buildPythonPackage rec {
4
-
pname = "PyQt-x11-gpl";
5
-
version = "4.12.3";
6
-
format = "other";
7
-
8
-
src = fetchurl {
9
-
url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz";
10
-
sha256 = "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0";
11
-
};
12
-
13
-
postPatch = ''
14
-
mkdir -p $out
15
-
lndir ${dbus-python} $out
16
-
rm -rf "$out/nix-support"
17
-
18
-
export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
19
-
${lib.optionalString stdenv.isDarwin ''
20
-
export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \
21
-
''}
22
-
23
-
substituteInPlace configure.py \
24
-
--replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \
25
-
${lib.optionalString stdenv.isDarwin ''
26
-
--replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \
27
-
''}
28
-
29
-
chmod +x configure.py
30
-
sed -i '1i#!${python.pythonForBuild.interpreter}' configure.py
31
-
'';
32
-
33
-
configureScript = "./configure.py";
34
-
dontAddPrefix = true;
35
-
configureFlags = [
36
-
"--confirm-license"
37
-
"--bindir=${placeholder "out"}/bin"
38
-
"--destdir=${placeholder "out"}/${python.sitePackages}"
39
-
"--plugin-destdir=${placeholder "out"}/lib/qt4/plugins"
40
-
"--sipdir=${placeholder "out"}/share/sip/PyQt4"
41
-
"--dbus=${lib.getDev dbus-python}/include/dbus-1.0"
42
-
"--verbose"
43
-
];
44
-
45
-
nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ];
46
-
buildInputs = [ qt4 dbus ];
47
-
48
-
propagatedBuildInputs = [ sip_4 ];
49
-
50
-
postInstall = ''
51
-
for i in $out/bin/*; do
52
-
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
53
-
done
54
-
'';
55
-
56
-
enableParallelBuilding = true;
57
-
58
-
passthru = {
59
-
qt = qt4;
60
-
};
61
-
62
-
meta = with lib; {
63
-
description = "Python bindings for Qt";
64
-
license = "GPL";
65
-
homepage = "http://www.riverbankcomputing.co.uk";
66
-
maintainers = [ maintainers.sander ];
67
-
platforms = platforms.mesaPlatforms;
68
-
};
69
-
}
-34
pkgs/development/python-modules/pyside/apiextractor.nix
-34
pkgs/development/python-modules/pyside/apiextractor.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, cmake, libxml2, libxslt, python3, qt4 }:
2
-
3
-
# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
4
-
let
5
-
pythonEnv = python3.withPackages (ps: with ps; [ sphinx ]);
6
-
in
7
-
stdenv.mkDerivation rec {
8
-
pname = "pyside-apiextractor";
9
-
version = "0.10.10";
10
-
11
-
src = fetchFromGitHub {
12
-
owner = "PySide";
13
-
repo = "Apiextractor";
14
-
rev = version;
15
-
hash = "sha256-YH8aYyzv59xiIglZbdNgOPnmEQwNE2GmotAFFfFdMlg=";
16
-
};
17
-
18
-
outputs = [ "out" "dev" ];
19
-
20
-
preConfigure = ''
21
-
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
22
-
'';
23
-
24
-
nativeBuildInputs = [ cmake pythonEnv ];
25
-
buildInputs = [ qt4 libxml2 libxslt ];
26
-
27
-
meta = with lib; {
28
-
description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process";
29
-
license = licenses.gpl2;
30
-
homepage = "http://www.pyside.org/docs/apiextractor/";
31
-
maintainers = [ ];
32
-
platforms = platforms.all;
33
-
};
34
-
}
-34
pkgs/development/python-modules/pyside/default.nix
-34
pkgs/development/python-modules/pyside/default.nix
···
1
-
{ lib, fetchFromGitHub, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa, libGL }:
2
-
3
-
buildPythonPackage rec {
4
-
pname = "pyside";
5
-
version = "1.2.4";
6
-
format = "other";
7
-
8
-
src = fetchFromGitHub {
9
-
owner = "PySide";
10
-
repo = "PySide";
11
-
rev = version;
12
-
hash = "sha256-14XbihJRMk9WaeK6NUBV/4OMFZF8EBIJgEJEaCU8Ecg=";
13
-
};
14
-
15
-
outputs = [ "out" "dev" ];
16
-
17
-
preConfigure = ''
18
-
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
19
-
'';
20
-
21
-
nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
22
-
23
-
buildInputs = [ mesa libGL ];
24
-
25
-
makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ];
26
-
27
-
dontWrapQtApps = true;
28
-
29
-
meta = {
30
-
description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
31
-
license = lib.licenses.lgpl21;
32
-
homepage = "http://www.pyside.org";
33
-
};
34
-
}
-18
pkgs/development/python-modules/pyside/gcc6.patch
-18
pkgs/development/python-modules/pyside/gcc6.patch
···
1
-
--- Shiboken-1.2.4.org/tests/libsample/simplefile.cpp 2017-08-26 09:06:27.216859143 +0100
2
-
+++ Shiboken-1.2.4/tests/libsample/simplefile.cpp 2017-08-26 09:05:40.037029652 +0100
3
-
@@ -90,13 +90,13 @@
4
-
SimpleFile::exists() const
5
-
{
6
-
std::ifstream ifile(p->m_filename);
7
-
- return ifile;
8
-
+ return (bool)ifile;
9
-
}
10
-
11
-
bool
12
-
SimpleFile::exists(const char* filename)
13
-
{
14
-
std::ifstream ifile(filename);
15
-
- return ifile;
16
-
+ return (bool)ifile;
17
-
}
18
-
-33
pkgs/development/python-modules/pyside/generatorrunner.nix
-33
pkgs/development/python-modules/pyside/generatorrunner.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, cmake, pysideApiextractor, python3, qt4 }:
2
-
3
-
# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`.
4
-
let
5
-
pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]);
6
-
in stdenv.mkDerivation rec {
7
-
pname = "pyside-generatorrunner";
8
-
version = "0.6.16";
9
-
10
-
src = fetchFromGitHub {
11
-
owner = "PySide";
12
-
repo = "Generatorrunner";
13
-
rev = version;
14
-
hash = "sha256-JAghKY033RTD5b2elitzVQbbN3PMmT3BHwpqx8N5EYg=";
15
-
};
16
-
17
-
outputs = [ "out" "dev" ];
18
-
19
-
preConfigure = ''
20
-
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
21
-
'';
22
-
23
-
nativeBuildInputs = [ cmake pythonEnv ];
24
-
buildInputs = [ pysideApiextractor qt4 ];
25
-
26
-
meta = with lib; {
27
-
description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process";
28
-
license = licenses.gpl2;
29
-
homepage = "http://www.pyside.org/docs/generatorrunner/";
30
-
maintainers = [ ];
31
-
platforms = platforms.all;
32
-
};
33
-
}
-66
pkgs/development/python-modules/pyside/shiboken.nix
-66
pkgs/development/python-modules/pyside/shiboken.nix
···
1
-
{ lib, fetchFromGitHub, buildPythonPackage
2
-
, cmake
3
-
, fetchurl
4
-
, isPy3k
5
-
, libxml2
6
-
, libxslt
7
-
, pkg-config
8
-
, pysideApiextractor
9
-
, pysideGeneratorrunner
10
-
, python
11
-
, pythonAtLeast
12
-
, qt4
13
-
, sphinx
14
-
}:
15
-
16
-
buildPythonPackage rec {
17
-
pname = "pyside-shiboken";
18
-
version = "1.2.4";
19
-
format = "other";
20
-
21
-
src = fetchFromGitHub {
22
-
owner = "PySide";
23
-
repo = "Shiboken";
24
-
rev = version;
25
-
sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v";
26
-
};
27
-
28
-
nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ];
29
-
30
-
buildInputs = [ python libxml2 libxslt ];
31
-
32
-
outputs = [ "out" "dev" ];
33
-
34
-
preConfigure = ''
35
-
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
36
-
echo "preConfigure: Fixing shiboken_generator install target."
37
-
substituteInPlace generator/CMakeLists.txt --replace \
38
-
\"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/
39
-
'';
40
-
41
-
patches = [
42
-
# gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
43
-
./gcc6.patch
44
-
(lib.optional (pythonAtLeast "3.5") ./shiboken_py35.patch)
45
-
(fetchurl {
46
-
# https://github.com/pyside/Shiboken/pull/90
47
-
name = "fix-build-with-python-3.9.patch";
48
-
url = "https://github.com/pyside/Shiboken/commit/d1c901d4c0af581003553865360ba964cda041e8.patch";
49
-
sha256 = "1f7slz8n8rps5r67hz3hi4rr82igc3l166shfy6647ivsb2fnxwy";
50
-
})
51
-
];
52
-
53
-
cmakeFlags = lib.optionals isPy3k [
54
-
"-DUSE_PYTHON3=TRUE"
55
-
"-DPYTHON3_INCLUDE_DIR=${lib.getDev python}/include/${python.libPrefix}"
56
-
"-DPYTHON3_LIBRARY=${lib.getLib python}/lib"
57
-
];
58
-
59
-
meta = with lib; {
60
-
description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
61
-
license = licenses.gpl2;
62
-
homepage = "http://www.pyside.org/";
63
-
maintainers = [ ];
64
-
platforms = platforms.all;
65
-
};
66
-
}
-12
pkgs/development/python-modules/pyside/shiboken_py35.patch
-12
pkgs/development/python-modules/pyside/shiboken_py35.patch
···
1
-
diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake
2
-
--- a/cmake/Modules/FindPython3Libs.cmake
3
-
+++ b/cmake/Modules/FindPython3Libs.cmake
4
-
@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
5
-
# Search for the python framework on Apple.
6
-
# CMAKE_FIND_FRAMEWORKS(Python)
7
-
8
-
-FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0)
9
-
+FOREACH(_CURRENT_VERSION 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
10
-
IF(_CURRENT_VERSION GREATER 3.1)
11
-
SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "")
12
-
ELSE()
-34
pkgs/development/python-modules/pyside/tools.nix
-34
pkgs/development/python-modules/pyside/tools.nix
···
1
-
{ lib, buildPythonPackage, fetchFromGitHub, cmake, qt4, pyside, pysideShiboken }:
2
-
3
-
buildPythonPackage rec {
4
-
pname = "pyside-tools";
5
-
version = "0.2.15";
6
-
format = "other";
7
-
8
-
src = fetchFromGitHub {
9
-
owner = "PySide";
10
-
repo = "Tools";
11
-
rev = version;
12
-
sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll";
13
-
};
14
-
15
-
outputs = [ "out" "dev" ];
16
-
17
-
preConfigure = ''
18
-
cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev")
19
-
'';
20
-
21
-
nativeBuildInputs = [ cmake ];
22
-
23
-
buildInputs = [ qt4 ];
24
-
25
-
propagatedBuildInputs = [ pyside pysideShiboken ];
26
-
27
-
meta = with lib; {
28
-
description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework";
29
-
license = licenses.gpl2;
30
-
homepage = "https://wiki.qt.io/PySide";
31
-
maintainers = [ ];
32
-
platforms = platforms.all;
33
-
};
34
-
}
+2
-2
pkgs/development/python-modules/python-cinderclient/default.nix
+2
-2
pkgs/development/python-modules/python-cinderclient/default.nix
···
17
17
18
18
buildPythonPackage rec {
19
19
pname = "python-cinderclient";
20
-
version = "9.3.0";
20
+
version = "9.4.0";
21
21
22
22
src = fetchPypi {
23
23
inherit pname version;
24
-
hash = "sha256-mmqjD+/0jAwP0Yjm1RUNvdkeP9WxDS2514uYEqsUr4g=";
24
+
hash = "sha256-pT5kcKUWYntZ0iUFIioMhXlL4afyd06HeWEFvUfulpU=";
25
25
};
26
26
27
27
propagatedBuildInputs = [
-42
pkgs/development/python-modules/qscintilla-qt4/default.nix
-42
pkgs/development/python-modules/qscintilla-qt4/default.nix
···
1
-
{ lib
2
-
, buildPythonPackage
3
-
, isPy3k
4
-
, isPyPy
5
-
, pkgs
6
-
, python
7
-
, pyqt4
8
-
}:
9
-
10
-
buildPythonPackage {
11
-
pname = "qscintilla-qt4";
12
-
version = pkgs.qscintilla-qt4.version;
13
-
format = "other";
14
-
15
-
disabled = isPyPy;
16
-
17
-
src = pkgs.qscintilla-qt4.src;
18
-
19
-
nativeBuildInputs = [ pkgs.xorg.lndir ];
20
-
21
-
buildInputs = [ pyqt4.qt pyqt4 ];
22
-
23
-
preConfigure = ''
24
-
mkdir -p $out
25
-
lndir ${pyqt4} $out
26
-
rm -rf "$out/nix-support"
27
-
cd Python
28
-
${python.executable} ./configure-old.py \
29
-
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
30
-
--apidir $out/api/${python.libPrefix} \
31
-
-n ${pkgs.qscintilla-qt4}/include \
32
-
-o ${pkgs.qscintilla-qt4}/lib \
33
-
--sipdir $out/share/sip
34
-
'';
35
-
36
-
meta = with lib; {
37
-
description = "A Python binding to QScintilla, Qt based text editing control";
38
-
license = licenses.lgpl21Plus;
39
-
maintainers = with maintainers; [ danbst ];
40
-
platforms = platforms.linux;
41
-
};
42
-
}
-66
pkgs/development/python-modules/subdownloader/default.nix
-66
pkgs/development/python-modules/subdownloader/default.nix
···
1
-
{ lib
2
-
, buildPythonPackage
3
-
, fetchurl
4
-
, mmpython
5
-
, pyqt4
6
-
}:
7
-
8
-
buildPythonPackage rec {
9
-
version = "2.0.18";
10
-
pname = "subdownloader";
11
-
12
-
src = fetchurl {
13
-
url = "https://launchpad.net/subdownloader/trunk/2.0.18/+download/subdownloader_2.0.18.orig.tar.gz";
14
-
sha256 = "0manlfdpb585niw23ibb8n21mindd1bazp0pnxvmdjrp2mnw97ig";
15
-
};
16
-
17
-
propagatedBuildInputs = [ mmpython pyqt4 ];
18
-
19
-
setup = ''
20
-
import os
21
-
import sys
22
-
23
-
try:
24
-
if os.environ.get("NO_SETUPTOOLS"):
25
-
raise ImportError()
26
-
from setuptools import setup, Extension
27
-
SETUPTOOLS = True
28
-
except ImportError:
29
-
SETUPTOOLS = False
30
-
# Use distutils.core as a fallback.
31
-
# We won t be able to build the Wheel file on Windows.
32
-
from distutils.core import setup, Extension
33
-
34
-
with open("README") as fp:
35
-
long_description = fp.read()
36
-
37
-
requirements = [ ]
38
-
39
-
install_options = {
40
-
"name": "subdownloader",
41
-
"version": "2.0.18",
42
-
"description": "Tool for automatic download/upload subtitles for videofiles using fast hashing",
43
-
"long_description": long_description,
44
-
"url": "http://www.subdownloader.net",
45
-
46
-
"scripts": ["run.py"],
47
-
"packages": ["cli", "FileManagement", "gui", "languages", "modules"],
48
-
49
-
}
50
-
if SETUPTOOLS:
51
-
install_options["install_requires"] = requirements
52
-
53
-
setup(**install_options)
54
-
'';
55
-
56
-
postUnpack = ''
57
-
echo '${setup}' > $sourceRoot/setup.py
58
-
'';
59
-
60
-
meta = with lib; {
61
-
description = "Tool for automatic download/upload subtitles for videofiles using fast hashing";
62
-
homepage = "https://www.subdownloader.net";
63
-
license = licenses.gpl3;
64
-
};
65
-
66
-
}
-31
pkgs/development/tools/analysis/valkyrie/default.nix
-31
pkgs/development/tools/analysis/valkyrie/default.nix
···
1
-
{ lib, stdenv, fetchurl, qt4, qmake4Hook }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "valkyrie";
5
-
version = "2.0.0";
6
-
7
-
src = fetchurl {
8
-
url = "https://valgrind.org/downloads/${pname}-${version}.tar.bz2";
9
-
sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7";
10
-
};
11
-
12
-
patchPhase = ''
13
-
sed -i '1s;^;#include <unistd.h>\n;' src/objects/tool_object.cpp
14
-
sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_config.cpp
15
-
sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_config.cpp
16
-
sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_utils.cpp
17
-
sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_utils.cpp
18
-
'';
19
-
20
-
buildInputs = [ qt4 ];
21
-
22
-
nativeBuildInputs = [ qmake4Hook ];
23
-
24
-
meta = with lib; {
25
-
homepage = "http://www.valgrind.org/";
26
-
description = "Qt4-based GUI for the Valgrind 3.6.x series";
27
-
license = licenses.gpl2;
28
-
platforms = platforms.linux;
29
-
maintainers = with maintainers; [ pSub ];
30
-
};
31
-
}
-53
pkgs/development/tools/fmbt/default.nix
-53
pkgs/development/tools/fmbt/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
2
-
, flex
3
-
, gettext, libedit, glib, imagemagick6, libxml2, boost, gnuplot, graphviz
4
-
, tesseract, gts, libXtst
5
-
}:
6
-
stdenv.mkDerivation rec {
7
-
version = "0.42";
8
-
pname = "fMBT";
9
-
10
-
src = fetchFromGitHub {
11
-
owner = "intel";
12
-
repo = "fMBT";
13
-
rev = "v${version}";
14
-
sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp";
15
-
};
16
-
17
-
nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper
18
-
python.pkgs.wrapPython ];
19
-
20
-
buildInputs = [ python gettext libedit glib imagemagick6 libxml2 boost
21
-
gnuplot graphviz tesseract gts
22
-
];
23
-
24
-
propagatedBuildInputs = with python.pkgs; [
25
-
pyside pydbus pexpect pysideShiboken
26
-
];
27
-
28
-
preBuild = ''
29
-
export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages"
30
-
export PATH="$PATH:$out/bin"
31
-
export LD_LIBRARY_PATH="${lib.makeLibraryPath [libXtst]}"
32
-
'';
33
-
34
-
postInstall = ''
35
-
echo -e '#! ${stdenv.shell}\npython "$@"' > "$out/bin/fmbt-python"
36
-
chmod a+x "$out/bin/fmbt-python"
37
-
patchShebangs "$out/bin"
38
-
for i in "$out"/bin/*; do
39
-
wrapProgram "$i" --suffix "PATH" ":" "$PATH" \
40
-
--suffix "PYTHONPATH" ":" "$PYTHONPATH" \
41
-
--suffix "LD_LIBRARY_PATH" ":" "$LD_LIBRARY_PATH"
42
-
done
43
-
'';
44
-
45
-
meta = with lib; {
46
-
description = "Free Model-Based Testing tool";
47
-
homepage = "https://github.com/intel/fMBT";
48
-
license = licenses.lgpl21;
49
-
platforms = platforms.linux;
50
-
maintainers = with maintainers; [ raskin ];
51
-
};
52
-
}
53
-
-72
pkgs/development/tools/misc/nrf-command-line-tools/default.nix
-72
pkgs/development/tools/misc/nrf-command-line-tools/default.nix
···
1
-
{ lib
2
-
, stdenv
3
-
, fetchurl
4
-
, autoPatchelfHook
5
-
, udev
6
-
, libusb1
7
-
, segger-jlink
8
-
}:
9
-
10
-
let
11
-
supported = {
12
-
x86_64-linux = {
13
-
name = "linux-amd64";
14
-
sha256 = "0e036afa51c83de7824ef75d34e165ed55efc486697b8ff105639644bce988e5";
15
-
};
16
-
i686-linux = {
17
-
name = "linux-i386";
18
-
sha256 = "ba208559ae1195a0d4342374a0eb79697d31d6b848d180ac906494f17f56623b";
19
-
};
20
-
aarch64-linux = {
21
-
name = "linux-arm64";
22
-
sha256 = "cffa4b8becdb5545705fd138422c648d809b520b7bc6c77b8b50aa1f79ebe845";
23
-
};
24
-
armv7l-linux = {
25
-
name = "linux-armhf";
26
-
sha256 = "c58d330152ae1ef588a5ee1d93777e18b341d4f6a2754642b0ddd41821050a3a";
27
-
};
28
-
};
29
-
30
-
platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}");
31
-
32
-
version = "10.16.0";
33
-
34
-
url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-${lib.versions.major version}-x-x/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrf-command-line-tools-${lib.versions.major version}.${lib.versions.minor version}.${lib.versions.patch version}_${platform.name}.tar.gz";
35
-
36
-
in stdenv.mkDerivation {
37
-
pname = "nrf-command-line-tools";
38
-
inherit version;
39
-
40
-
src = fetchurl {
41
-
inherit url;
42
-
inherit (platform) sha256;
43
-
};
44
-
45
-
runtimeDependencies = [ segger-jlink ];
46
-
47
-
nativeBuildInputs = [ autoPatchelfHook ];
48
-
buildInputs = [ udev libusb1 ];
49
-
50
-
dontConfigure = true;
51
-
dontBuild = true;
52
-
53
-
installPhase = ''
54
-
runHook preInstall
55
-
56
-
rm -rf ./python
57
-
mkdir -p $out
58
-
cp -r * $out
59
-
60
-
chmod +x $out/lib/*
61
-
62
-
runHook postInstall
63
-
'';
64
-
65
-
meta = with lib; {
66
-
description = "Nordic Semiconductor nRF Command Line Tools";
67
-
homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Command-Line-Tools";
68
-
license = licenses.unfree;
69
-
platforms = attrNames supported;
70
-
maintainers = with maintainers; [ stargate01 ];
71
-
};
72
-
}
-120
pkgs/development/tools/misc/segger-jlink/default.nix
-120
pkgs/development/tools/misc/segger-jlink/default.nix
···
1
-
{ lib
2
-
, stdenv
3
-
, fetchurl
4
-
, autoPatchelfHook
5
-
, qt4
6
-
, udev
7
-
, config
8
-
, acceptLicense ? config.segger-jlink.acceptLicense or false
9
-
}:
10
-
11
-
let
12
-
supported = {
13
-
x86_64-linux = {
14
-
name = "x86_64";
15
-
sha256 = "90aa7e4f5eae6e60fd41978111b3ff124ba0269562d0d0ec3110d3cb4bb51fe2";
16
-
};
17
-
i686-linux = {
18
-
name = "i386";
19
-
sha256 = "18aea42cd17591cada78af7cba0f94a9d851e9d29995b6c8e1e7033d0af35d1c";
20
-
};
21
-
aarch64-linux = {
22
-
name = "arm64";
23
-
sha256 = "db410c1df80748827b4e25ff3abceee29e28305a0a7e30e4e39bb5c7e32f1aa2";
24
-
};
25
-
armv7l-linux = {
26
-
name = "arm";
27
-
sha256 = "abcdaf44aeb2ad4e769709ec4fe971e259b23d297a98f58199c7bdf26db82e84";
28
-
};
29
-
};
30
-
31
-
platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}");
32
-
33
-
version = "766";
34
-
35
-
url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz";
36
-
37
-
in stdenv.mkDerivation {
38
-
pname = "segger-jlink";
39
-
inherit version;
40
-
41
-
src =
42
-
assert !acceptLicense -> throw ''
43
-
Use of the "SEGGER JLink Software and Documentation pack" requires the
44
-
acceptance of the following licenses:
45
-
46
-
- SEGGER Downloads Terms of Use [1]
47
-
- SEGGER Software Licensing [2]
48
-
49
-
You can express acceptance by setting acceptLicense to true in your
50
-
configuration. Note that this is not a free license so it requires allowing
51
-
unfree licenses as well.
52
-
53
-
configuration.nix:
54
-
nixpkgs.config.allowUnfree = true;
55
-
nixpkgs.config.segger-jlink.acceptLicense = true;
56
-
57
-
config.nix:
58
-
allowUnfree = true;
59
-
segger-jlink.acceptLicense = true;
60
-
61
-
[1]: ${url}
62
-
[2]: https://www.segger.com/purchase/licensing/
63
-
'';
64
-
fetchurl {
65
-
inherit url;
66
-
inherit (platform) sha256;
67
-
curlOpts = "--data accept_license_agreement=accepted";
68
-
};
69
-
70
-
# Currently blocked by patchelf bug
71
-
# https://github.com/NixOS/patchelf/pull/275
72
-
#runtimeDependencies = [ udev ];
73
-
74
-
nativeBuildInputs = [ autoPatchelfHook ];
75
-
buildInputs = [ qt4 udev ];
76
-
77
-
dontConfigure = true;
78
-
dontBuild = true;
79
-
80
-
installPhase = ''
81
-
runHook preInstall
82
-
83
-
# Install binaries
84
-
mkdir -p $out/bin
85
-
mv J* $out/bin
86
-
87
-
# Install libraries
88
-
mkdir -p $out/lib
89
-
mv libjlinkarm.so* $out/lib
90
-
# This library is opened via dlopen at runtime
91
-
for libr in $out/lib/*; do
92
-
ln -s $libr $out/bin
93
-
done
94
-
95
-
# Install docs and examples
96
-
mkdir -p $out/share/docs
97
-
mv Doc/* $out/share/docs
98
-
mkdir -p $out/share/examples
99
-
mv Samples/* $out/share/examples
100
-
101
-
# Install udev rule
102
-
mkdir -p $out/lib/udev/rules.d
103
-
mv 99-jlink.rules $out/lib/udev/rules.d/
104
-
105
-
runHook postInstall
106
-
'';
107
-
108
-
preFixup = ''
109
-
# Workaround to setting runtime dependecy
110
-
patchelf --add-needed libudev.so.1 $out/lib/libjlinkarm.so
111
-
'';
112
-
113
-
meta = with lib; {
114
-
description = "J-Link Software and Documentation pack";
115
-
homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack";
116
-
license = licenses.unfree;
117
-
platforms = attrNames supported;
118
-
maintainers = with maintainers; [ FlorianFranzen stargate01 ];
119
-
};
120
-
}
+3
-3
pkgs/development/tools/rust/cargo-hack/default.nix
+3
-3
pkgs/development/tools/rust/cargo-hack/default.nix
···
2
2
3
3
rustPlatform.buildRustPackage rec {
4
4
pname = "cargo-hack";
5
-
version = "0.6.4";
5
+
version = "0.6.5";
6
6
7
7
src = fetchCrate {
8
8
inherit pname version;
9
-
sha256 = "sha256-kb4ftO4nhQ+MykK18O5aoexuBoN+u0xobUvIEge00jU=";
9
+
sha256 = "sha256-loGQTCi6lTNB/jn47fvWTqKr01p4xRqyq+Y02a/UwSc=";
10
10
};
11
11
12
-
cargoSha256 = "sha256-+Am9w3iU2kSAIx+1tK3kpoa+oJvLQ6Ew7LeP6njYEQw=";
12
+
cargoSha256 = "sha256-gk/0aTMlUWYKfJJ9CfTvYLTZ6/ShIRuhpywhuwFHD5E=";
13
13
14
14
# some necessary files are absent in the crate version
15
15
doCheck = false;
-34
pkgs/games/gambatte/default.nix
-34
pkgs/games/gambatte/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, scons, qt4, alsa-lib }:
2
-
3
-
stdenv.mkDerivation {
4
-
pname = "gambatte";
5
-
version = "2020-03-14";
6
-
7
-
src = fetchFromGitHub {
8
-
owner = "sinamas";
9
-
repo = "gambatte";
10
-
rev = "56e3371151b5ee86dcdcf4868324ebc6de220bc9";
11
-
sha256 = "0cc6zcvxpvi5hgcssb1zy0fkj9nk7n0d2xm88a4v05kpm5zw7sh2";
12
-
};
13
-
14
-
buildInputs = [ scons qt4 alsa-lib ];
15
-
16
-
patches = [ ./fix-scons-paths.patch ];
17
-
18
-
buildPhase = ''
19
-
./build_qt.sh
20
-
'';
21
-
22
-
installPhase = ''
23
-
mkdir -p $out/bin
24
-
cp gambatte_qt/bin/gambatte_qt $out/bin/
25
-
'';
26
-
27
-
meta = with lib; {
28
-
description = "Portable, open-source Game Boy Color emulator";
29
-
homepage = "https://github.com/sinamas/gambatte";
30
-
license = licenses.gpl2;
31
-
maintainers = [ maintainers.dezgeg ];
32
-
platforms = platforms.linux;
33
-
};
34
-
}
-32
pkgs/games/instead-launcher/default.nix
-32
pkgs/games/instead-launcher/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, instead, qmake4Hook, zlib }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "instead-launcher";
5
-
6
-
version = "0.7.0";
7
-
8
-
src = fetchFromGitHub {
9
-
owner = "instead-hub";
10
-
repo = "instead-launcher";
11
-
rev = version;
12
-
sha256 = "1svy8i8anspway01pnz2cy69aad03anvkq04wrdfv1h9c34gbvb9";
13
-
};
14
-
15
-
patches = [ ./path.patch ];
16
-
17
-
postPatch = ''
18
-
substituteInPlace platform.cpp --subst-var-by instead ${instead}
19
-
'';
20
-
21
-
nativeBuildInputs = [ qmake4Hook ];
22
-
23
-
buildInputs = [ zlib ];
24
-
25
-
meta = with lib; {
26
-
homepage = "https://instead.syscall.ru/wiki/en/instead-launcher";
27
-
description = "Install and play games from INSTEAD repository";
28
-
license = licenses.gpl2;
29
-
platforms = platforms.linux;
30
-
maintainers = with maintainers; [ orivej ];
31
-
};
32
-
}
-39
pkgs/games/instead-launcher/path.patch
-39
pkgs/games/instead-launcher/path.patch
···
1
-
From c7460a7fc255ef4e8e0e37798605c4d8bb50633d Mon Sep 17 00:00:00 2001
2
-
From: Orivej Desh <orivej@gmx.fr>
3
-
Date: Sat, 1 Apr 2017 01:30:37 +0000
4
-
Subject: [PATCH] path
5
-
6
-
---
7
-
mainwindow.cpp | 2 +-
8
-
platform.cpp | 2 +-
9
-
2 files changed, 2 insertions(+), 2 deletions(-)
10
-
11
-
diff --git a/mainwindow.cpp b/mainwindow.cpp
12
-
index 9687c4e..234b176 100644
13
-
--- a/mainwindow.cpp
14
-
+++ b/mainwindow.cpp
15
-
@@ -688,7 +688,7 @@ void MainWindow::loadConfig() {
16
-
if ( args.contains( "default-gamespath" ) )
17
-
defGamesPath = args["default-gamespath"].toString();
18
-
19
-
- QString insteadPath = conf.value("InsteadPath", defInsteadPath).toString();
20
-
+ QString insteadPath = defInsteadPath;
21
-
bool autoRefresh = conf.value("AutoRefresh", "false").toString() == "true";
22
-
bool autoRefreshSW = conf.value("AutoRefreshSW", "false").toString() == "true";
23
-
QString lang = conf.value( "Language", "*" ).toString();
24
-
diff --git a/platform.cpp b/platform.cpp
25
-
index bda86be..c356f1c 100644
26
-
--- a/platform.cpp
27
-
+++ b/platform.cpp
28
-
@@ -22,7 +22,7 @@ QString getConfigPath() {
29
-
}
30
-
31
-
QString getDefaultInterpreterPath() {
32
-
- return "/usr/local/bin/sdl-instead";
33
-
+ return "@instead@/bin/sdl-instead";
34
-
}
35
-
36
-
#elif defined(Q_OS_WIN)
37
-
--
38
-
2.12.2
39
-
-46
pkgs/games/tworld2/default.nix
-46
pkgs/games/tworld2/default.nix
···
1
-
{ stdenv
2
-
, lib
3
-
, fetchurl
4
-
, SDL
5
-
, qt4
6
-
}:
7
-
8
-
stdenv.mkDerivation rec {
9
-
pname = "tworld2";
10
-
version = "2.2.0";
11
-
12
-
src = fetchurl {
13
-
url = "https://tw2.bitbusters.club/downloads/tworld-${version}-src.tar.gz";
14
-
hash = "sha256-USy2F4es0W3xT4aI254OQ02asJKNt3V0Y72LCbXYpfg=";
15
-
};
16
-
17
-
buildInputs = [ SDL qt4 ];
18
-
19
-
enableParallelBuilding = true;
20
-
21
-
postConfigure = ''
22
-
echo "#define COMPILE_TIME \"$(date -ud "@$SOURCE_DATE_EPOCH" '+%Y %b %e %T %Z')\"" >comptime.h
23
-
'';
24
-
25
-
makeFlags = [
26
-
"bindir=${placeholder "out"}/bin"
27
-
"sharedir=${placeholder "out"}/share"
28
-
"mandir=${placeholder "out"}/share/man/en"
29
-
];
30
-
31
-
postInstall = ''
32
-
mkdir -p $out/share/doc/${pname}
33
-
cp COPYING README docs/tworld2.html $out/share/doc/${pname}
34
-
35
-
mkdir $out/share/icons
36
-
cp tworld.ico tworld2.ico $out/share/icons
37
-
'';
38
-
39
-
meta = with lib; {
40
-
homepage = "https://tw2.bitbusters.club/";
41
-
description = "Tile World 2: Tile World is a reimplementation of the game Chip's Challenge";
42
-
license = licenses.gpl2Plus;
43
-
maintainers = with maintainers; [ drperceptron ];
44
-
platforms = platforms.linux;
45
-
};
46
-
}
+2
-2
pkgs/os-specific/darwin/sketchybar/default.nix
+2
-2
pkgs/os-specific/darwin/sketchybar/default.nix
···
20
20
in
21
21
stdenv.mkDerivation (finalAttrs: {
22
22
pname = "sketchybar";
23
-
version = "2.16.1";
23
+
version = "2.16.3";
24
24
25
25
src = fetchFromGitHub {
26
26
owner = "FelixKratz";
27
27
repo = "SketchyBar";
28
28
rev = "v${finalAttrs.version}";
29
-
hash = "sha256-H+bR5ZhUTrN2KAEdY/hnq6c3TEb1NQvPQ9uPo09gSM8=";
29
+
hash = "sha256-PCAGIcO7lvIAEFXlJn/e9zG5kxvDABshxFbu/bXWX7o=";
30
30
};
31
31
32
32
buildInputs = [
-2
pkgs/os-specific/windows/default.nix
-2
pkgs/os-specific/windows/default.nix
-32
pkgs/os-specific/windows/jom/default.nix
-32
pkgs/os-specific/windows/jom/default.nix
···
1
-
{ lib, stdenv, fetchgit, qt48, qmake4Hook, flex }:
2
-
3
-
# At the time of committing this, the expression fails for me to cross-build in
4
-
# both mingw32 and mingw64.
5
-
6
-
stdenv.mkDerivation {
7
-
pname = "jom";
8
-
version = "1.0.11";
9
-
10
-
src = fetchgit {
11
-
url = "git://gitorious.org/qt-labs/jom.git";
12
-
rev = "c91a204b05f97eef3c73aaaba3036e20f79fd487";
13
-
sha256 = "6d3ac84f83bb045213903d9d5340c0447c8fe41671d1dcdeae5c40b66d62ccbf";
14
-
};
15
-
16
-
buildInputs = [ qt48 ];
17
-
nativeBuildInputs = [ flex qmake4Hook ];
18
-
19
-
QTDIR = qt48;
20
-
21
-
# cmakeFlags = [ "-DWIN32=1" "-DCMAKE_SYSTEM_NAME=Windows" "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres" ];
22
-
23
-
preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
24
-
export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
25
-
'';
26
-
27
-
meta = {
28
-
homepage = "https://qt-project.org/wiki/jom";
29
-
description = "Clone of nmake supporting multiple independent commands in parallel";
30
-
license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later.
31
-
};
32
-
}
+1
pkgs/servers/bililiverecorder/default.nix
+1
pkgs/servers/bililiverecorder/default.nix
···
44
44
description = "A convenient free open source bilibili live recording tool";
45
45
homepage = "https://rec.danmuji.org/";
46
46
changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/${version}";
47
+
mainProgram = "BililiveRecorder";
47
48
license = licenses.gpl3Only;
48
49
maintainers = with maintainers; [ zaldnoay ];
49
50
platforms = platforms.unix;
+24
pkgs/servers/ftp/uftpd/default.nix
+24
pkgs/servers/ftp/uftpd/default.nix
···
1
+
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libuev, libite }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "uftpd";
5
+
version = "2.15";
6
+
7
+
src = fetchFromGitHub {
8
+
owner = "troglobit";
9
+
repo = "uftpd";
10
+
rev = "v${version}";
11
+
hash = "sha256-+y1eRPUgYf5laRFIDD1XOEfonPP8QMJNCSkmHlXIjdY=";
12
+
};
13
+
14
+
nativeBuildInputs = [ pkg-config autoreconfHook ];
15
+
buildInputs = [ libuev libite ];
16
+
17
+
meta = with lib; {
18
+
description = "FTP/TFTP server for Linux that just works™";
19
+
homepage = "https://troglobit.com/projects/uftpd/";
20
+
license = licenses.isc;
21
+
platforms = platforms.unix;
22
+
maintainers = with maintainers; [ vifino ];
23
+
};
24
+
}
+2
-2
pkgs/tools/admin/okta-aws-cli/default.nix
+2
-2
pkgs/tools/admin/okta-aws-cli/default.nix
···
2
2
3
3
buildGoModule rec {
4
4
pname = "okta-aws-cli";
5
-
version = "1.1.0";
5
+
version = "1.2.1";
6
6
7
7
subPackages = [ "cmd/okta-aws-cli" ];
8
8
···
10
10
owner = "okta";
11
11
repo = "okta-aws-cli";
12
12
rev = "v${version}";
13
-
sha256 = "sha256-TRS1+msrp+Wd+9FhQSErZGvfpcRA5ltNKIyVHLveMOo=";
13
+
sha256 = "1d148zf9warwg8kvkqpw79dwmlrab61hpird58wlh6jyqfxa5729";
14
14
};
15
15
16
16
vendorHash = "sha256-AJmQxMRj602yodzIdhZV+R22KxnEIbT9iSz/5G5T6r8=";
-38
pkgs/tools/audio/acoustid-fingerprinter/default.nix
-38
pkgs/tools/audio/acoustid-fingerprinter/default.nix
···
1
-
{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg_4 }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "acoustid-fingerprinter";
5
-
version = "0.6";
6
-
7
-
src = fetchurl {
8
-
url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
9
-
+ "${pname}-${version}.tar.gz";
10
-
sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0";
11
-
};
12
-
13
-
nativeBuildInputs = [ cmake pkg-config ];
14
-
buildInputs = [ qt4 taglib chromaprint ffmpeg_4 ];
15
-
16
-
cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ];
17
-
18
-
patches = [
19
-
(fetchpatch {
20
-
name = "fix-build-with-libav-10.patch";
21
-
url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/2c778334a9fc2f0ccf9b1d7635c116bce6509748/raw";
22
-
sha256 = "1smyp3x5n6jwxpgw60xsijq2fn6g1gl759h1lm5agaxhcyyqn0i0";
23
-
})
24
-
(fetchpatch {
25
-
name = "fix-build-failure-on-gcc-6.patch";
26
-
url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw";
27
-
sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk";
28
-
})
29
-
];
30
-
31
-
meta = with lib; {
32
-
homepage = "https://acoustid.org/fingerprinter";
33
-
description = "Audio fingerprinting tool using chromaprint";
34
-
license = lib.licenses.gpl2Plus;
35
-
maintainers = with maintainers; [ ehmry ];
36
-
platforms = with platforms; linux;
37
-
};
38
-
}
-43
pkgs/tools/bluetooth/nrfconnect/default.nix
-43
pkgs/tools/bluetooth/nrfconnect/default.nix
···
1
-
{ lib
2
-
, fetchurl
3
-
, appimageTools
4
-
}:
5
-
6
-
let
7
-
pname = "nrfconnect";
8
-
version = "4.0.1";
9
-
10
-
src = fetchurl {
11
-
url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-connect-for-desktop/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrfconnect-${version}-x86_64.appimage";
12
-
sha256 = "sha256-Mh4DrXn3DS5qOz3109lmXyFn28WenG6ZSvqFnUuc+rw=";
13
-
name = "${pname}-${version}.AppImage";
14
-
};
15
-
16
-
appimageContents = appimageTools.extractType2 {
17
-
inherit pname version src;
18
-
};
19
-
20
-
in appimageTools.wrapType2 {
21
-
inherit pname version src;
22
-
23
-
extraPkgs = pkgs: with pkgs; [
24
-
segger-jlink
25
-
];
26
-
27
-
extraInstallCommands = ''
28
-
mv $out/bin/${pname}-${version} $out/bin/${pname}
29
-
install -m 444 -D ${appimageContents}/nrfconnect.desktop $out/share/applications/nrfconnect.desktop
30
-
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/nrfconnect.png \
31
-
$out/share/icons/hicolor/512x512/apps/nrfconnect.png
32
-
substituteInPlace $out/share/applications/nrfconnect.desktop \
33
-
--replace 'Exec=AppRun' 'Exec=${pname}'
34
-
'';
35
-
36
-
meta = with lib; {
37
-
description = "Nordic Semiconductor nRF Connect for Desktop";
38
-
homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Connect-for-desktop";
39
-
license = licenses.unfree;
40
-
platforms = platforms.linux;
41
-
maintainers = with maintainers; [ stargate01 ];
42
-
};
43
-
}
-46
pkgs/tools/graphics/structure-synth/default.nix
-46
pkgs/tools/graphics/structure-synth/default.nix
···
1
-
{ lib, stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "structure-synth";
5
-
version = "1.5.0";
6
-
7
-
src = fetchurl {
8
-
url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v${version}.zip";
9
-
sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb";
10
-
};
11
-
12
-
buildInputs = [ qt4 libGLU ];
13
-
nativeBuildInputs = [ qmake4Hook makeWrapper unzip ];
14
-
15
-
# Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15:
16
-
patches = [ ./gcc47.patch ];
17
-
18
-
enableParallelBuilding = true;
19
-
20
-
preConfigure = ''
21
-
${qt4}/bin/qmake -project -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU"
22
-
'';
23
-
24
-
installPhase = ''
25
-
mkdir -p $out/bin;
26
-
mkdir -p $out/share/Examples $out/share/Misc;
27
-
cp "Structure Synth Source Code" $out/bin/structure-synth;
28
-
cp -r Examples/* $out/share/Examples;
29
-
cp -r Misc/* $out/share/Misc;
30
-
'';
31
-
32
-
# Structure Synth expects to see 'Examples' and 'Misc' directory in
33
-
# either $HOME or $PWD - so help it along by moving $PWD to 'share',
34
-
# where we just copied those two directories:
35
-
preFixup = ''
36
-
wrapProgram "$out/bin/structure-synth" --chdir "$out/share"
37
-
'';
38
-
39
-
meta = with lib; {
40
-
description = "Application for generating 3D structures by specifying a design grammar";
41
-
homepage = "https://structuresynth.sourceforge.net";
42
-
maintainers = with maintainers; [ hodapp ];
43
-
license = licenses.gpl3;
44
-
platforms = platforms.linux;
45
-
};
46
-
}
-50
pkgs/tools/graphics/structure-synth/gcc47.patch
-50
pkgs/tools/graphics/structure-synth/gcc47.patch
···
1
-
diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp"
2
-
*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2010-11-13 22:32:44.000000000 -0500
3
-
--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2018-06-24 14:23:30.794296776 -0400
4
-
***************
5
-
*** 1,5 ****
6
-
#include <QThread>
7
-
!
8
-
9
-
#include "RayTracer.h"
10
-
11
-
--- 1,5 ----
12
-
#include <QThread>
13
-
! #include <GL/glu.h>
14
-
15
-
#include "RayTracer.h"
16
-
17
-
diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp"
18
-
*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2010-09-08 21:25:30.000000000 -0400
19
-
--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2018-06-24 14:23:12.542868194 -0400
20
-
***************
21
-
*** 122,128 ****
22
-
currentT = p;
23
-
24
-
// We do not intersect grid.
25
-
! if (!found) return false;
26
-
}
27
-
28
-
stepX = (dir.x() > 0) ? 1 : -1;
29
-
--- 122,128 ----
30
-
currentT = p;
31
-
32
-
// We do not intersect grid.
33
-
! if (!found) return NULL;
34
-
}
35
-
36
-
stepX = (dir.x() > 0) ? 1 : -1;
37
-
Only in Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer: VoxelStepper.cpp.orig
38
-
diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h"
39
-
*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" 2010-08-11 15:12:22.000000000 -0400
40
-
--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" 2018-06-24 14:23:30.793296807 -0400
41
-
***************
42
-
*** 2,7 ****
43
-
--- 2,8 ----
44
-
45
-
#include "SyntopiaCore/Math/Vector3.h"
46
-
#include "Object3D.h"
47
-
+ #include <GL/glu.h>
48
-
49
-
namespace SyntopiaCore {
50
-
namespace GLEngine {
+1
-2
pkgs/tools/inputmethods/hime/default.nix
+1
-2
pkgs/tools/inputmethods/hime/default.nix
···
4
4
, which
5
5
, gtk2
6
6
, gtk3
7
-
, qt4
8
7
, qt5
9
8
, libXtst
10
9
, lib
···
25
24
};
26
25
27
26
nativeBuildInputs = [ which pkg-config unixtools.whereis ];
28
-
buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase libchewing anthy ];
27
+
buildInputs = [ libXtst gtk2 gtk3 qt5.qtbase libchewing anthy ];
29
28
30
29
preConfigure = "patchShebangs configure";
31
30
configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ];
-24
pkgs/tools/inputmethods/ibus/ibus-qt.nix
-24
pkgs/tools/inputmethods/ibus/ibus-qt.nix
···
1
-
{ lib, stdenv, fetchurl, ibus, cmake, pkg-config, qt4, icu, doxygen }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "ibus-qt";
5
-
version = "1.3.4";
6
-
7
-
src = fetchurl {
8
-
url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${pname}-${version}-Source.tar.gz";
9
-
sha256 = "sha256-HnsMy4i8NscCVFF28IcOZ2BoXozZfZzXk4CE9c7bL/E=";
10
-
};
11
-
12
-
nativeBuildInputs = [ cmake pkg-config doxygen ];
13
-
buildInputs = [ ibus qt4 icu ];
14
-
15
-
cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ];
16
-
17
-
meta = with lib; {
18
-
homepage = "https://github.com/ibus/ibus-qt/";
19
-
description = "Qt4 interface to the ibus input method";
20
-
platforms = platforms.linux;
21
-
license = licenses.gpl2Plus;
22
-
maintainers = with maintainers; [ gebner ];
23
-
};
24
-
}
+1
-14
pkgs/tools/inputmethods/uim/default.nix
+1
-14
pkgs/tools/inputmethods/uim/default.nix
···
7
7
, withGtk2 ? withGtk, gtk2 ? null
8
8
, withGtk3 ? withGtk, gtk3 ? null
9
9
, withQt ? true
10
-
, withQt4 ? withQt, qt4 ? null
11
-
, withQt5 ? false, qt5 ? null
10
+
, withQt5 ? withQt, qt5 ? null
12
11
, withLibnotify ? true, libnotify ? null
13
12
, withSqlite ? true, sqlite ? null
14
13
, withNetworking ? true, curl ? null, openssl ? null
···
21
20
assert withGtk2 -> gtk2 != null;
22
21
assert withGtk3 -> gtk3 != null;
23
22
24
-
# TODO(@oxij): ./configure can't find both qmakes at the same time
25
-
# this can be fixed by adding an alias qmake -> qmaka${version} in qmake derivation
26
-
assert withQt4 -> !withQt5 && qt4 != null;
27
-
assert withQt5 -> !withQt4 && qt5 != null;
28
-
29
-
assert !withQt5; # fails to build with "Makefile.qmake: No such file or directory"
30
-
31
23
assert withAnthy -> anthy != null;
32
24
assert withLibnotify -> libnotify != null;
33
25
assert withSqlite -> sqlite != null;
···
60
52
++ lib.optional withAnthy anthy
61
53
++ lib.optional withGtk2 gtk2
62
54
++ lib.optional withGtk3 gtk3
63
-
++ lib.optional withQt4 qt4
64
55
++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ]
65
56
++ lib.optional withLibnotify libnotify
66
57
++ lib.optional withSqlite sqlite
···
114
105
++ lib.optional withAnthy "--with-anthy-utf8"
115
106
++ lib.optional withGtk2 "--with-gtk2"
116
107
++ lib.optional withGtk3 "--with-gtk3"
117
-
++ lib.optionals withQt4 [
118
-
"--with-qt4"
119
-
"--with-qt4-immodule"
120
-
]
121
108
++ lib.optionals withQt5 [
122
109
"--with-qt5"
123
110
"--with-qt5-immodule"
+2
-2
pkgs/tools/misc/qjoypad/default.nix
+2
-2
pkgs/tools/misc/qjoypad/default.nix
···
10
10
hash = "sha256:1w26ddxb1xirb7qjf7kv9llxzjhbhcb7warnxbx41qhbni46g26y";
11
11
};
12
12
13
-
nativeBuildInputs = [ pkg-config cmake ];
14
-
buildInputs = [ libX11 libXtst qtbase qttools qtx11extras ];
13
+
nativeBuildInputs = [ pkg-config cmake qttools ];
14
+
buildInputs = [ libX11 libXtst qtbase qtx11extras ];
15
15
16
16
meta = with lib; {
17
17
description = "A program that lets you use gaming devices anywhere";
+108
-171
pkgs/tools/networking/veilid/Cargo.lock
+108
-171
pkgs/tools/networking/veilid/Cargo.lock
···
430
430
dependencies = [
431
431
"proc-macro2",
432
432
"quote",
433
-
"syn 2.0.29",
433
+
"syn 2.0.31",
434
434
]
435
435
436
436
[[package]]
···
461
461
dependencies = [
462
462
"proc-macro2",
463
463
"quote",
464
-
"syn 2.0.29",
464
+
"syn 2.0.31",
465
465
]
466
466
467
467
[[package]]
···
730
730
dependencies = [
731
731
"proc-macro2",
732
732
"quote",
733
-
"syn 2.0.29",
733
+
"syn 2.0.31",
734
734
]
735
735
736
736
[[package]]
···
798
798
]
799
799
800
800
[[package]]
801
-
name = "bugsalot"
802
-
version = "0.2.2"
803
-
source = "git+https://github.com/crioux/bugsalot.git#336a7053faadf990b9362edf5752ef34fa1f9615"
804
-
dependencies = [
805
-
"libc",
806
-
]
807
-
808
-
[[package]]
809
801
name = "bumpalo"
810
802
version = "3.13.0"
811
803
source = "registry+https://github.com/rust-lang/crates.io-index"
···
1012
1004
"heck",
1013
1005
"proc-macro2",
1014
1006
"quote",
1015
-
"syn 2.0.29",
1007
+
"syn 2.0.31",
1016
1008
]
1017
1009
1018
1010
[[package]]
···
1164
1156
1165
1157
[[package]]
1166
1158
name = "core-foundation"
1167
-
version = "0.7.0"
1168
-
source = "registry+https://github.com/rust-lang/crates.io-index"
1169
-
checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
1170
-
dependencies = [
1171
-
"core-foundation-sys 0.7.0",
1172
-
"libc",
1173
-
]
1174
-
1175
-
[[package]]
1176
-
name = "core-foundation"
1177
1159
version = "0.9.3"
1178
1160
source = "registry+https://github.com/rust-lang/crates.io-index"
1179
1161
checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
1180
1162
dependencies = [
1181
-
"core-foundation-sys 0.8.4",
1163
+
"core-foundation-sys",
1182
1164
"libc",
1183
1165
]
1184
-
1185
-
[[package]]
1186
-
name = "core-foundation-sys"
1187
-
version = "0.7.0"
1188
-
source = "registry+https://github.com/rust-lang/crates.io-index"
1189
-
checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
1190
1166
1191
1167
[[package]]
1192
1168
name = "core-foundation-sys"
···
1201
1177
checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
1202
1178
dependencies = [
1203
1179
"bitflags 1.3.2",
1204
-
"core-foundation 0.9.3",
1180
+
"core-foundation",
1205
1181
"core-graphics-types",
1206
1182
"foreign-types",
1207
1183
"libc",
···
1214
1190
checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33"
1215
1191
dependencies = [
1216
1192
"bitflags 1.3.2",
1217
-
"core-foundation 0.9.3",
1193
+
"core-foundation",
1218
1194
"libc",
1219
1195
]
1220
1196
···
1303
1279
1304
1280
[[package]]
1305
1281
name = "ctrlc"
1306
-
version = "3.4.0"
1282
+
version = "3.4.1"
1307
1283
source = "registry+https://github.com/rust-lang/crates.io-index"
1308
-
checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
1284
+
checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf"
1309
1285
dependencies = [
1310
-
"nix 0.26.4",
1286
+
"nix 0.27.1",
1311
1287
"windows-sys 0.48.0",
1312
1288
]
1313
1289
1314
1290
[[package]]
1315
1291
name = "cursive"
1316
1292
version = "0.20.0"
1293
+
source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4"
1317
1294
dependencies = [
1318
1295
"ahash 0.8.3",
1319
1296
"async-std",
···
1333
1310
[[package]]
1334
1311
name = "cursive-flexi-logger-view"
1335
1312
version = "0.5.0"
1313
+
source = "git+https://gitlab.com/veilid/cursive-flexi-logger-view.git#7c931536b8c57339011bbe2ee604e431c91c0aa8"
1336
1314
dependencies = [
1337
1315
"arraydeque",
1338
-
"cursive",
1339
1316
"cursive_core",
1340
1317
"flexi_logger",
1341
1318
"lazy_static",
···
1347
1324
[[package]]
1348
1325
name = "cursive-macros"
1349
1326
version = "0.1.0"
1327
+
source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4"
1350
1328
dependencies = [
1351
1329
"proc-macro2",
1352
1330
"quote",
···
1355
1333
1356
1334
[[package]]
1357
1335
name = "cursive_buffered_backend"
1358
-
version = "0.6.1-pre"
1336
+
version = "0.6.1"
1337
+
source = "git+https://gitlab.com/veilid/cursive-buffered-backend.git#a0f5242882b0d42a0b18baa68b2d8d6dcaa6dee4"
1359
1338
dependencies = [
1360
1339
"cursive_core",
1361
1340
"enumset",
···
1368
1347
[[package]]
1369
1348
name = "cursive_core"
1370
1349
version = "0.3.7"
1350
+
source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4"
1371
1351
dependencies = [
1372
1352
"ahash 0.8.3",
1373
1353
"ansi-parser",
···
1424
1404
dependencies = [
1425
1405
"proc-macro2",
1426
1406
"quote",
1427
-
"syn 2.0.29",
1407
+
"syn 2.0.31",
1428
1408
]
1429
1409
1430
1410
[[package]]
···
1480
1460
"ident_case",
1481
1461
"proc-macro2",
1482
1462
"quote",
1483
-
"syn 2.0.29",
1463
+
"syn 2.0.31",
1484
1464
]
1485
1465
1486
1466
[[package]]
···
1502
1482
dependencies = [
1503
1483
"darling_core 0.20.3",
1504
1484
"quote",
1505
-
"syn 2.0.29",
1485
+
"syn 2.0.31",
1506
1486
]
1507
1487
1508
1488
[[package]]
···
1684
1664
dependencies = [
1685
1665
"proc-macro2",
1686
1666
"quote",
1687
-
"syn 2.0.29",
1667
+
"syn 2.0.31",
1688
1668
]
1689
1669
1690
1670
[[package]]
···
1727
1707
"darling 0.20.3",
1728
1708
"proc-macro2",
1729
1709
"quote",
1730
-
"syn 2.0.29",
1710
+
"syn 2.0.31",
1731
1711
]
1732
1712
1733
1713
[[package]]
···
1807
1787
]
1808
1788
1809
1789
[[package]]
1810
-
name = "failure"
1811
-
version = "0.1.8"
1812
-
source = "registry+https://github.com/rust-lang/crates.io-index"
1813
-
checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
1814
-
dependencies = [
1815
-
"backtrace",
1816
-
"failure_derive",
1817
-
]
1818
-
1819
-
[[package]]
1820
-
name = "failure_derive"
1821
-
version = "0.1.8"
1822
-
source = "registry+https://github.com/rust-lang/crates.io-index"
1823
-
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
1824
-
dependencies = [
1825
-
"proc-macro2",
1826
-
"quote",
1827
-
"syn 1.0.109",
1828
-
"synstructure",
1829
-
]
1830
-
1831
-
[[package]]
1832
1790
name = "fallible-iterator"
1833
1791
version = "0.2.0"
1834
1792
source = "registry+https://github.com/rust-lang/crates.io-index"
···
2043
2001
dependencies = [
2044
2002
"proc-macro2",
2045
2003
"quote",
2046
-
"syn 2.0.29",
2004
+
"syn 2.0.31",
2047
2005
]
2048
2006
2049
2007
[[package]]
···
2266
2224
2267
2225
[[package]]
2268
2226
name = "hashbrown"
2269
-
version = "0.13.2"
2270
-
source = "registry+https://github.com/rust-lang/crates.io-index"
2271
-
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
2272
-
dependencies = [
2273
-
"ahash 0.8.3",
2274
-
]
2275
-
2276
-
[[package]]
2277
-
name = "hashbrown"
2278
2227
version = "0.14.0"
2279
2228
source = "registry+https://github.com/rust-lang/crates.io-index"
2280
2229
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
2281
2230
dependencies = [
2282
2231
"ahash 0.8.3",
2283
2232
"allocator-api2",
2284
-
]
2285
-
2286
-
[[package]]
2287
-
name = "hashlink"
2288
-
version = "0.8.2"
2289
-
dependencies = [
2290
-
"hashbrown 0.13.2",
2291
-
"serde",
2292
2233
]
2293
2234
2294
2235
[[package]]
···
2466
2407
checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
2467
2408
dependencies = [
2468
2409
"android_system_properties",
2469
-
"core-foundation-sys 0.8.4",
2410
+
"core-foundation-sys",
2470
2411
"iana-time-zone-haiku",
2471
2412
"js-sys",
2472
2413
"wasm-bindgen",
···
2520
2461
]
2521
2462
2522
2463
[[package]]
2523
-
name = "igd"
2524
-
version = "0.12.1"
2525
-
dependencies = [
2526
-
"attohttpc",
2527
-
"log",
2528
-
"rand 0.8.5",
2529
-
"url",
2530
-
"xmltree",
2531
-
]
2532
-
2533
-
[[package]]
2534
2464
name = "image"
2535
2465
version = "0.24.7"
2536
2466
source = "registry+https://github.com/rust-lang/crates.io-index"
···
2602
2532
checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
2603
2533
dependencies = [
2604
2534
"cfg-if 1.0.0",
2605
-
"js-sys",
2606
-
"wasm-bindgen",
2607
-
"web-sys",
2608
2535
]
2609
2536
2610
2537
[[package]]
···
2706
2633
]
2707
2634
2708
2635
[[package]]
2709
-
name = "keychain-services"
2710
-
version = "0.1.2"
2711
-
source = "git+https://github.com/iqlusioninc/keychain-services.rs.git?rev=7410fb8baf4ecdf04cdcd7d06d02658f4f158d77#7410fb8baf4ecdf04cdcd7d06d02658f4f158d77"
2712
-
dependencies = [
2713
-
"core-foundation 0.7.0",
2714
-
"failure",
2715
-
"failure_derive",
2716
-
"zeroize",
2717
-
]
2718
-
2719
-
[[package]]
2720
2636
name = "keyring-manager"
2721
2637
version = "0.5.0"
2638
+
source = "registry+https://github.com/rust-lang/crates.io-index"
2639
+
checksum = "8c023f807de9a2f26e86c6ec3b5a3e0ea5681301999dcda9e262069ab3efb63e"
2722
2640
dependencies = [
2723
2641
"byteorder",
2724
2642
"cfg-if 1.0.0",
2725
-
"core-foundation 0.9.3",
2726
-
"core-foundation-sys 0.8.4",
2643
+
"core-foundation",
2644
+
"core-foundation-sys",
2727
2645
"directories 5.0.1",
2728
2646
"fs4",
2729
2647
"jni",
2730
-
"keychain-services",
2731
2648
"lazy_static",
2732
2649
"log",
2733
2650
"ndk",
···
2744
2661
[[package]]
2745
2662
name = "keyvaluedb"
2746
2663
version = "0.1.0"
2664
+
source = "registry+https://github.com/rust-lang/crates.io-index"
2665
+
checksum = "8833bc9e937f44bac0e8d129b3ccda60dee6ca5fa2757d7e05a5e04503df02fb"
2747
2666
dependencies = [
2748
2667
"smallvec",
2749
2668
]
···
2751
2670
[[package]]
2752
2671
name = "keyvaluedb-memorydb"
2753
2672
version = "0.1.0"
2673
+
source = "registry+https://github.com/rust-lang/crates.io-index"
2674
+
checksum = "14fdc324ae658318df46f62e64159c5662b94bcc99f9b6403d47d20ca7768b21"
2754
2675
dependencies = [
2755
2676
"keyvaluedb",
2756
2677
"parking_lot 0.12.1",
···
2759
2680
[[package]]
2760
2681
name = "keyvaluedb-sqlite"
2761
2682
version = "0.1.0"
2683
+
source = "registry+https://github.com/rust-lang/crates.io-index"
2684
+
checksum = "e6bad95a1ad34c10ad4823fae1cb655be7fec022de642c95fbfafad360ba2f54"
2762
2685
dependencies = [
2763
2686
"hex",
2764
2687
"keyvaluedb",
···
2770
2693
[[package]]
2771
2694
name = "keyvaluedb-web"
2772
2695
version = "0.1.0"
2696
+
source = "registry+https://github.com/rust-lang/crates.io-index"
2697
+
checksum = "26cc6bb420f98cdd63a72c95eaa06947cdbd04e60a8d296b87f466196bacf068"
2773
2698
dependencies = [
2774
2699
"async-lock",
2775
2700
"flume",
···
2778
2703
"keyvaluedb",
2779
2704
"keyvaluedb-memorydb",
2780
2705
"log",
2781
-
"parking_lot 0.11.2",
2706
+
"parking_lot 0.12.1",
2782
2707
"send_wrapper 0.6.0",
2783
2708
"wasm-bindgen",
2784
2709
"web-sys",
···
2934
2859
2935
2860
[[package]]
2936
2861
name = "memchr"
2937
-
version = "2.6.2"
2862
+
version = "2.6.3"
2938
2863
source = "registry+https://github.com/rust-lang/crates.io-index"
2939
-
checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
2864
+
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
2940
2865
2941
2866
[[package]]
2942
2867
name = "memoffset"
···
3400
3325
3401
3326
[[package]]
3402
3327
name = "object"
3403
-
version = "0.32.0"
3328
+
version = "0.32.1"
3404
3329
source = "registry+https://github.com/rust-lang/crates.io-index"
3405
-
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
3330
+
checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
3406
3331
dependencies = [
3407
3332
"memchr",
3408
3333
]
···
3695
3620
"pest_meta",
3696
3621
"proc-macro2",
3697
3622
"quote",
3698
-
"syn 2.0.29",
3623
+
"syn 2.0.31",
3699
3624
]
3700
3625
3701
3626
[[package]]
···
3766
3691
dependencies = [
3767
3692
"proc-macro2",
3768
3693
"quote",
3769
-
"syn 2.0.29",
3694
+
"syn 2.0.31",
3770
3695
]
3771
3696
3772
3697
[[package]]
···
4082
4007
4083
4008
[[package]]
4084
4009
name = "regex"
4085
-
version = "1.9.4"
4010
+
version = "1.9.5"
4086
4011
source = "registry+https://github.com/rust-lang/crates.io-index"
4087
-
checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
4012
+
checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
4088
4013
dependencies = [
4089
4014
"aho-corasick",
4090
4015
"memchr",
4091
-
"regex-automata 0.3.7",
4016
+
"regex-automata 0.3.8",
4092
4017
"regex-syntax 0.7.5",
4093
4018
]
4094
4019
···
4103
4028
4104
4029
[[package]]
4105
4030
name = "regex-automata"
4106
-
version = "0.3.7"
4031
+
version = "0.3.8"
4107
4032
source = "registry+https://github.com/rust-lang/crates.io-index"
4108
-
checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
4033
+
checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
4109
4034
dependencies = [
4110
4035
"aho-corasick",
4111
4036
"memchr",
···
4200
4125
"bitflags 2.4.0",
4201
4126
"fallible-iterator",
4202
4127
"fallible-streaming-iterator",
4203
-
"hashlink 0.8.4",
4128
+
"hashlink",
4204
4129
"libsqlite3-sys",
4205
4130
"smallvec",
4206
4131
]
···
4378
4303
checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
4379
4304
dependencies = [
4380
4305
"bitflags 1.3.2",
4381
-
"core-foundation 0.9.3",
4382
-
"core-foundation-sys 0.8.4",
4306
+
"core-foundation",
4307
+
"core-foundation-sys",
4383
4308
"libc",
4384
4309
"security-framework-sys",
4385
4310
]
···
4390
4315
source = "registry+https://github.com/rust-lang/crates.io-index"
4391
4316
checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
4392
4317
dependencies = [
4393
-
"core-foundation-sys 0.8.4",
4318
+
"core-foundation-sys",
4394
4319
"libc",
4395
4320
]
4396
4321
···
4451
4376
dependencies = [
4452
4377
"proc-macro2",
4453
4378
"quote",
4454
-
"syn 2.0.29",
4379
+
"syn 2.0.31",
4455
4380
]
4456
4381
4457
4382
[[package]]
···
4484
4409
dependencies = [
4485
4410
"proc-macro2",
4486
4411
"quote",
4487
-
"syn 2.0.29",
4412
+
"syn 2.0.31",
4488
4413
]
4489
4414
4490
4415
[[package]]
···
4556
4481
dependencies = [
4557
4482
"proc-macro2",
4558
4483
"quote",
4559
-
"syn 2.0.29",
4484
+
"syn 2.0.31",
4560
4485
]
4561
4486
4562
4487
[[package]]
···
4833
4758
4834
4759
[[package]]
4835
4760
name = "syn"
4836
-
version = "2.0.29"
4761
+
version = "2.0.31"
4837
4762
source = "registry+https://github.com/rust-lang/crates.io-index"
4838
-
checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
4763
+
checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
4839
4764
dependencies = [
4840
4765
"proc-macro2",
4841
4766
"quote",
···
4849
4774
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
4850
4775
4851
4776
[[package]]
4852
-
name = "synstructure"
4853
-
version = "0.12.6"
4854
-
source = "registry+https://github.com/rust-lang/crates.io-index"
4855
-
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
4856
-
dependencies = [
4857
-
"proc-macro2",
4858
-
"quote",
4859
-
"syn 1.0.109",
4860
-
"unicode-xid",
4861
-
]
4862
-
4863
-
[[package]]
4864
4777
name = "sysinfo"
4865
4778
version = "0.28.4"
4866
4779
source = "registry+https://github.com/rust-lang/crates.io-index"
4867
4780
checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b"
4868
4781
dependencies = [
4869
4782
"cfg-if 1.0.0",
4870
-
"core-foundation-sys 0.8.4",
4783
+
"core-foundation-sys",
4871
4784
"libc",
4872
4785
"ntapi",
4873
4786
"once_cell",
···
4917
4830
4918
4831
[[package]]
4919
4832
name = "thiserror"
4920
-
version = "1.0.47"
4833
+
version = "1.0.48"
4921
4834
source = "registry+https://github.com/rust-lang/crates.io-index"
4922
-
checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
4835
+
checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
4923
4836
dependencies = [
4924
4837
"thiserror-impl",
4925
4838
]
4926
4839
4927
4840
[[package]]
4928
4841
name = "thiserror-impl"
4929
-
version = "1.0.47"
4842
+
version = "1.0.48"
4930
4843
source = "registry+https://github.com/rust-lang/crates.io-index"
4931
-
checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
4844
+
checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
4932
4845
dependencies = [
4933
4846
"proc-macro2",
4934
4847
"quote",
4935
-
"syn 2.0.29",
4848
+
"syn 2.0.31",
4936
4849
]
4937
4850
4938
4851
[[package]]
···
5050
4963
dependencies = [
5051
4964
"proc-macro2",
5052
4965
"quote",
5053
-
"syn 2.0.29",
4966
+
"syn 2.0.31",
5054
4967
]
5055
4968
5056
4969
[[package]]
···
5259
5172
dependencies = [
5260
5173
"proc-macro2",
5261
5174
"quote",
5262
-
"syn 2.0.29",
5175
+
"syn 2.0.31",
5263
5176
]
5264
5177
5265
5178
[[package]]
···
5518
5431
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
5519
5432
5520
5433
[[package]]
5521
-
name = "unicode-xid"
5522
-
version = "0.2.4"
5523
-
source = "registry+https://github.com/rust-lang/crates.io-index"
5524
-
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
5525
-
5526
-
[[package]]
5527
5434
name = "unicode_categories"
5528
5435
version = "0.1.1"
5529
5436
source = "registry+https://github.com/rust-lang/crates.io-index"
···
5599
5506
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
5600
5507
5601
5508
[[package]]
5509
+
name = "veilid-bugsalot"
5510
+
version = "0.1.0"
5511
+
source = "registry+https://github.com/rust-lang/crates.io-index"
5512
+
checksum = "a9ee584edf237fac328b891dd06c21e7914a1db3762907edc366a13803451fe3"
5513
+
5514
+
[[package]]
5602
5515
name = "veilid-cli"
5603
-
version = "0.2.0"
5516
+
version = "0.2.1"
5604
5517
dependencies = [
5605
5518
"arboard",
5606
5519
"async-std",
5607
5520
"async-tungstenite 0.8.0",
5608
-
"bugsalot",
5609
5521
"cfg-if 1.0.0",
5610
5522
"clap 4.4.2",
5611
5523
"config",
···
5631
5543
"thiserror",
5632
5544
"tokio",
5633
5545
"tokio-util",
5546
+
"veilid-bugsalot",
5634
5547
"veilid-tools",
5635
5548
]
5636
5549
5637
5550
[[package]]
5638
5551
name = "veilid-core"
5639
-
version = "0.2.0"
5552
+
version = "0.2.1"
5640
5553
dependencies = [
5641
5554
"argon2",
5642
5555
"async-io",
···
5648
5561
"async_executors",
5649
5562
"backtrace",
5650
5563
"blake3",
5651
-
"bugsalot",
5652
5564
"capnp",
5653
5565
"capnpc",
5654
5566
"cfg-if 1.0.0",
···
5668
5580
"futures-util",
5669
5581
"generic-array 0.14.7",
5670
5582
"getrandom 0.2.10",
5671
-
"hashlink 0.8.2",
5672
5583
"hex",
5673
5584
"ifstructs",
5674
-
"igd",
5675
5585
"jni",
5676
5586
"jni-sys",
5677
5587
"js-sys",
···
5721
5631
"tracing-subscriber",
5722
5632
"tracing-wasm",
5723
5633
"trust-dns-resolver",
5634
+
"veilid-bugsalot",
5635
+
"veilid-hashlink",
5636
+
"veilid-igd",
5724
5637
"veilid-tools",
5725
5638
"wasm-bindgen",
5726
5639
"wasm-bindgen-futures",
···
5740
5653
5741
5654
[[package]]
5742
5655
name = "veilid-flutter"
5743
-
version = "0.2.0"
5656
+
version = "0.2.1"
5744
5657
dependencies = [
5745
5658
"allo-isolate",
5746
5659
"async-std",
···
5768
5681
]
5769
5682
5770
5683
[[package]]
5684
+
name = "veilid-hashlink"
5685
+
version = "0.1.0"
5686
+
source = "registry+https://github.com/rust-lang/crates.io-index"
5687
+
checksum = "6a3dabbda02cfe176635dcaa18a021416ff2eb4d0b47a913e3fdc7f62049d7b1"
5688
+
dependencies = [
5689
+
"hashbrown 0.14.0",
5690
+
"serde",
5691
+
]
5692
+
5693
+
[[package]]
5694
+
name = "veilid-igd"
5695
+
version = "0.1.0"
5696
+
source = "registry+https://github.com/rust-lang/crates.io-index"
5697
+
checksum = "28428a3f826ed334f995522e554d7c8c1a5a0e0a0248fc795a31022ddf436c9d"
5698
+
dependencies = [
5699
+
"attohttpc",
5700
+
"log",
5701
+
"rand 0.8.5",
5702
+
"url",
5703
+
"xmltree",
5704
+
]
5705
+
5706
+
[[package]]
5771
5707
name = "veilid-server"
5772
-
version = "0.2.0"
5708
+
version = "0.2.1"
5773
5709
dependencies = [
5774
5710
"ansi_term",
5775
5711
"async-std",
5776
5712
"async-tungstenite 0.23.0",
5777
5713
"backtrace",
5778
-
"bugsalot",
5779
5714
"cfg-if 1.0.0",
5780
5715
"clap 4.4.2",
5781
5716
"color-eyre",
···
5812
5747
"tracing-opentelemetry",
5813
5748
"tracing-subscriber",
5814
5749
"url",
5750
+
"veilid-bugsalot",
5815
5751
"veilid-core",
5816
5752
"wg",
5817
5753
"windows-service",
···
5819
5755
5820
5756
[[package]]
5821
5757
name = "veilid-tools"
5822
-
version = "0.2.0"
5758
+
version = "0.2.1"
5823
5759
dependencies = [
5824
5760
"android_logger 0.13.3",
5825
5761
"async-lock",
···
5833
5769
"flume",
5834
5770
"fn_name",
5835
5771
"futures-util",
5772
+
"getrandom 0.2.10",
5836
5773
"jni",
5837
5774
"jni-sys",
5838
5775
"js-sys",
···
5870
5807
5871
5808
[[package]]
5872
5809
name = "veilid-wasm"
5873
-
version = "0.2.0"
5810
+
version = "0.2.1"
5874
5811
dependencies = [
5875
5812
"cfg-if 1.0.0",
5876
5813
"console_error_panic_hook",
···
5970
5907
"once_cell",
5971
5908
"proc-macro2",
5972
5909
"quote",
5973
-
"syn 2.0.29",
5910
+
"syn 2.0.31",
5974
5911
"wasm-bindgen-shared",
5975
5912
]
5976
5913
···
6004
5941
dependencies = [
6005
5942
"proc-macro2",
6006
5943
"quote",
6007
-
"syn 2.0.29",
5944
+
"syn 2.0.31",
6008
5945
"wasm-bindgen-backend",
6009
5946
"wasm-bindgen-shared",
6010
5947
]
···
6518
6455
dependencies = [
6519
6456
"proc-macro2",
6520
6457
"quote",
6521
-
"syn 2.0.29",
6458
+
"syn 2.0.31",
6522
6459
]
6523
6460
6524
6461
[[package]]
+5
-5
pkgs/tools/networking/veilid/default.nix
+5
-5
pkgs/tools/networking/veilid/default.nix
···
10
10
11
11
rustPlatform.buildRustPackage rec {
12
12
pname = "veilid";
13
-
version = "0.2.0";
13
+
version = "0.2.1";
14
14
15
15
src = fetchFromGitLab {
16
16
owner = "veilid";
17
17
repo = pname;
18
18
rev = "v${version}";
19
-
fetchSubmodules = true;
20
-
sha256 = "sha256-OgV6Rp5Az5iPUekeO8L28bxlXj/wZ5mOGmlXz14wcoQ=";
19
+
sha256 = "sha256-ebWY/1LTLwi1YFHliPDracdF0WLfY047jUtQ/1w9Rjw=";
21
20
};
22
21
23
22
cargoLock = {
24
23
lockFile = ./Cargo.lock;
25
24
outputHashes = {
26
-
"bugsalot-0.2.2" = "sha256-9zLzK22dOB7w+ejk1SfkA98z4rEzrB6mAVUpPFuDUnY=";
27
-
"keychain-services-0.1.2" = "sha256-gkiE9PoSIgHngXc/BLMTL97/6dSnqAj42+q01CLbu+E=";
25
+
"cursive-0.20.0" = "sha256-jETyRRnzt7OMkTo4LRfeRr37oPJpn9R2soxkH7tzGy8=";
26
+
"cursive-flexi-logger-view-0.5.0" = "sha256-zFpfVFNZNNdNMdpJbaT4O2pMYccGEAGnvYzpRziMwfQ=";
27
+
"cursive_buffered_backend-0.6.1" = "sha256-+sTJnp570HupwaJxV2x+oKyLwNmqQ4HqOH2P1s9Hhw8=";
28
28
};
29
29
};
30
30
-36
pkgs/tools/security/omapd/default.nix
-36
pkgs/tools/security/omapd/default.nix
···
1
-
{ lib, stdenv, fetchurl, qt4, gdb, zlib }:
2
-
3
-
stdenv.mkDerivation rec {
4
-
pname = "omapd";
5
-
version = "0.9.2";
6
-
7
-
src = fetchurl {
8
-
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/omapd/${pname}-${version}.tgz";
9
-
sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc";
10
-
};
11
-
12
-
patches = [ ./zlib.patch ];
13
-
14
-
buildInputs = [ qt4 zlib gdb ];
15
-
16
-
buildPhase = ''
17
-
(cd plugins/RAMHashTables; qmake; make)
18
-
qmake
19
-
make
20
-
'';
21
-
22
-
installPhase = ''
23
-
install -vD omapd $out/bin/omapd
24
-
install -vD omapd.conf $out/etc/omapd.conf
25
-
install -vD plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/libRAMHashTables.so
26
-
ln -s $out/usr/lib/omapd/plugins $out/bin/plugins
27
-
'';
28
-
29
-
meta = with lib; {
30
-
homepage = "https://code.google.com/archive/p/omapd/";
31
-
description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)";
32
-
license = licenses.gpl3;
33
-
maintainers = [ ];
34
-
platforms = platforms.linux;
35
-
};
36
-
}
-9
pkgs/tools/security/omapd/zlib.patch
-9
pkgs/tools/security/omapd/zlib.patch
···
1
-
diff -uNr omapd-0.9.2-old/omapd.pro omapd-0.9.2/omapd.pro
2
-
--- omapd-0.9.2-old/omapd.pro 2015-08-03 09:46:47.463420480 +0200
3
-
+++ omapd-0.9.2/omapd.pro 2015-08-03 09:48:32.238657105 +0200
4
-
@@ -37,4 +37,4 @@
5
-
clientconfiguration.h \
6
-
managementserver.h \
7
-
json.h
8
-
-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
9
-
+LIBS += -lz
+3
-3
pkgs/tools/security/vault-ssh-plus/default.nix
+3
-3
pkgs/tools/security/vault-ssh-plus/default.nix
···
8
8
}:
9
9
buildGoModule rec {
10
10
pname = "vault-ssh-plus";
11
-
version = "0.7.0";
11
+
version = "0.7.1";
12
12
13
13
src = fetchFromGitHub {
14
14
owner = "isometry";
15
15
repo = pname;
16
16
rev = "v${version}";
17
-
hash = "sha256-D38G947/1//AMmWghgw0TDzNcd4LUcCuyLBhRP7YFJY=";
17
+
hash = "sha256-J2fb1sRjBxLegFVwyEIRVolaLnXvziPrlidd/n/+tU8=";
18
18
};
19
19
20
-
vendorHash = "sha256-tNdr2xyxri7mj1bP6oVx1DGzwrzg84TpPCY0kHNkXLw=";
20
+
vendorHash = "sha256-Casouw2fNg/hywx7A37VCVzQ8Gfnvf5qm6upOTUQZvA=";
21
21
22
22
nativeBuildInputs = [ makeWrapper ];
23
23
+37
-4
pkgs/top-level/aliases.nix
+37
-4
pkgs/top-level/aliases.nix
···
58
58
### A ###
59
59
60
60
accounts-qt = throw "'accounts-qt' has been renamed to/replaced by 'libsForQt5.accounts-qt'"; # Converted to throw 2022-02-22
61
+
acoustidFingerprinter = throw "acoustidFingerprinter has been removed from nixpkgs, as it was unmaintained"; # Added 2022-05-09
61
62
adobeReader = throw "'adobeReader' has been renamed to/replaced by 'adobe-reader'"; # Converted to throw 2022-02-22
62
63
adobe_flex_sdk = throw "'adobe_flex_sdk' has been renamed to/replaced by 'apache-flex-sdk'"; # Converted to throw 2022-02-22
63
64
adoptopenjdk-hotspot-bin-17 = throw "AdoptOpenJDK is now Temurin. Use temurin-bin-17"; # added 2022-07-02
···
68
69
airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19
69
70
airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19
70
71
aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream"; # Added 2020-11-30
72
+
aliza = throw "aliza has been removed, because it depended on qt4 and was unmaintained in nixpkgs"; # Added 2022-05-12
71
73
alsaLib = alsa-lib; # Added 2021-06-09
72
74
alsaOss = alsa-oss; # Added 2021-06-10
73
75
alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10
···
78
80
aminal = throw "aminal was renamed to darktile"; # Added 2021-09-28
79
81
ammonite-repl = throw "'ammonite-repl' has been renamed to/replaced by 'ammonite'"; # Converted to throw 2022-02-22
80
82
amuleDaemon = throw "amuleDaemon was renamed to amule-daemon"; # Added 2022-02-11
83
+
amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09
81
84
amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11
82
-
amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09
83
85
angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06
84
86
angryipscanner = ipscan; # Added 2023-08-30
85
-
ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16
86
-
ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30
87
87
ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
88
+
ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30
89
+
ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16
88
90
ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
91
+
animbar = throw "animbar has been removed, because it was unmaintained"; # Added 2022-05-26
89
92
antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead"; # Added 2020-08-06
90
93
antimicroX = antimicrox; # Added 2021-10-31
91
94
apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02
···
111
114
audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09
112
115
automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30
113
116
avldrums-lv2 = x42-avldrums; # Added 2020-03-29
117
+
avogadro = throw "avogadro has been removed, because it depended on qt4"; # Added 2022-06-12
114
118
avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
115
119
awesome-4-0 = awesome; # Added 2022-05-05
116
120
aws = throw "aws has been removed: abandoned by upstream. For the AWS CLI maintained by Amazon, see 'awscli' or 'awscli2'"; # Added 2022-09-21
···
480
484
enyo-doom = enyo-launcher; # Added 2022-09-09
481
485
epoxy = libepoxy; # Added 2021-11-11
482
486
epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
487
+
eql = throw "eql has been removed from nixpkgs, because it depended on qt4. eql5 exists, but is not currently pacakged in nixpkgs."; # added 2022-05-09
483
488
inherit (beam.interpreters) erlangR26 erlangR25 erlangR24 erlangR23; # added 2023-03-21
484
489
erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21
485
490
erlangR21 = erlang_21;
···
536
541
flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03
537
542
flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03
538
543
flvtool2 = throw "flvtool2 has been removed"; # Added 2020-11-03
544
+
fmbt = throw "fmbt was removed, because it depended on qt4 and python2 and was unmaintained upstream"; # Added 2022-06-13
539
545
fme = throw "fme was removed, because it is old and uses Glade, a discontinued library"; # Added 2022-01-26
540
546
foldingathome = fahclient; # Added 2020-09-03
541
547
font-awesome-ttf = throw "'font-awesome-ttf' has been renamed to/replaced by 'font-awesome'"; # Converted to throw 2022-02-22
···
573
579
574
580
g4py = python3Packages.geant4; # Added 2020-06-06
575
581
gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06
582
+
gambatte = throw "gambatte has been removed, because the project has been taken private"; # Added 2022-05-26
576
583
gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03
577
584
garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17
578
585
gawp = throw "gawp has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02
···
733
740
ht-rust = xh; # Added 2021-02-13
734
741
hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra_unstable` now"; # Added 2020-04-06
735
742
hydra-unstable = hydra_unstable; # added 2022-05-10
743
+
hydrogen_0 = throw "hydrogen_0 has been removed, because it depended on qt4"; # Added 2022-06-13
736
744
hyperspace-cli = throw "hyperspace-cli is out of date, and has been deprecated upstream in favour of using the individual repos instead"; # Added 2022-08-29
737
745
738
746
### I ###
···
741
749
i3cat = throw "i3cat has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-02
742
750
iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22
743
751
iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08
744
-
ical2org = throw "ical2org has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-02
752
+
ibus-qt = throw "ibus-qt has been removed, because it depended on qt4"; # Added 2022-06-09
753
+
ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02
745
754
icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15
746
755
icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
747
756
icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
···
756
765
imagemagick7_light = imagemagick_light; # Added 2021-02-22
757
766
imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04
758
767
impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
768
+
instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26
759
769
insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13
760
770
i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21
761
771
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped";
···
903
913
libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14
904
914
libixp_hg = libixp;
905
915
libjpeg_drop = libjpeg_original; # Added 2020-06-05
916
+
libjreen = throw "libjreen has been removed, because it did not support a recent version of qt5"; # Added 2022-06-12
906
917
libjson_rpc_cpp = throw "'libjson_rpc_cpp' has been renamed to/replaced by 'libjson-rpc-cpp'"; # Converted to throw 2022-02-22
907
918
libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it"; # Added 2021-11-09
908
919
liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22
···
1153
1164
1154
1165
### N ###
1155
1166
1167
+
namecoin = throw "namecoin GUI has been removed, because it depended on qt4"; # Added 2022-05-26
1168
+
navipowm = throw "navipowm has been removed, because it was unmaintained upstream"; # Added 2022-05-26
1156
1169
ncdu_2 = ncdu; # Added 2022-07-22
1157
1170
nccl = throw "nccl has been renamed to cudaPackages.nccl"; # Added 2022-04-04
1158
1171
nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04
···
1211
1224
noto-fonts-extra = noto-fonts; # Added 2023-04-08
1212
1225
nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15
1213
1226
now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05
1227
+
ntrack = throw "ntrack has been removed, because it depended on qt4"; # Added 2022-05-12
1214
1228
ntdb = throw "ntdb has been removed: abandoned by upstream"; # Added 2022-04-21
1215
1229
nxproxy = throw "'nxproxy' has been renamed to/replaced by 'nx-libs'"; # Converted to throw 2022-02-22
1216
1230
···
1231
1245
ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22
1232
1246
ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20
1233
1247
olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
1248
+
omapd = throw "omapd has been removed from nixpkgs, as it was unmaintained"; # Added 2022-05-09
1234
1249
opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21
1235
1250
opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08
1236
1251
openafs_1_8 = openafs; # Added 2022-08-22
···
1479
1494
qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05
1480
1495
qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25
1481
1496
qflipper = qFlipper; # Added 2022-02-11
1497
+
qfsm = throw "qfsm has been removed, because it depended on qt4"; # Added 2022-06-12
1498
+
qimageblitz = throw "qimageblitz has been removed from nixpkgs, because it depended on qt4 and was last updated upstream in 2007"; # Added 2022-06-12
1499
+
qmetro = throw "qmetro has been removed, because it does not support qt5 (well)"; # Added 2022-05-26
1500
+
qmidiroute = throw "qmidiroute has been removed, because it was unmaintained upstream"; # Added 2022-05-26
1482
1501
qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02
1483
1502
qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17
1484
1503
qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02
1485
1504
qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14
1505
+
qtscrobbler = throw "qtscrobbler has been removed, because it was unmaintained"; # Added 2022-05-26
1486
1506
qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15
1487
1507
qt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24
1488
1508
qt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24
1489
1509
qt515 = qt5; # Added 2022-11-24
1510
+
qt4 = throw "qt4 has been removed from nixpkgs, because it's been EOL since the end of 2015"; # Added 2022-05-09
1490
1511
qt5ct = libsForQt5.qt5ct; # Added 2021-12-27
1491
1512
qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
1492
1513
qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
1493
1514
qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
1494
1515
qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04
1516
+
qt-mobility = throw "qt-mobility has been removed, because it depended on qt4"; # Added 2022-06-13
1495
1517
qtscriptgenerator = throw "'qtscriptgenerator' (Qt4) is unmaintained upstream and not used in nixpkgs"; # Added 2022-06-14
1518
+
qtstyleplugin-kvantum-qt4 = throw "qtstyleplugin-kvantum-qt4 has been removed, because it depended on qt4"; # Added 2022-05-26
1496
1519
quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22
1497
1520
quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22
1498
1521
quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09
1522
+
qucs = throw "qucs has been removed, because it depended on qt4. try using qucs-s"; # Added 2022-05-12
1499
1523
quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-03
1500
1524
qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19
1501
1525
qvim = throw "qvim has been removed"; # Added 2020-08-31
···
1518
1542
redkite = throw "redkite was archived by upstream"; # Added 2021-04-12
1519
1543
redis-desktop-manager = throw "'redis-desktop-manager' has been renamed to/replaced by 'resp-app'"; # Added 2022-11-10
1520
1544
redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
1545
+
resim = throw "resim has been removed, because it depended on qt4"; # Added 2022-05-26
1521
1546
reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
1522
1547
residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27
1523
1548
retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19
···
1573
1598
saneFrontends = throw "'saneFrontends' has been renamed to/replaced by 'sane-frontends'"; # Converted to throw 2022-02-22
1574
1599
scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01
1575
1600
scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15
1601
+
scantailor = scantailor-advanced; # Added 2022-05-26
1576
1602
scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22
1577
1603
scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22
1604
+
screencloud = throw "screencloud has been removed, because it was unmaintained in nixpkgs"; # Added 2022-05-26
1605
+
scribus_1_4 = throw "scribus has been removed, because it is based on EOL technologies, e.g. qt4 and python2"; # Added 2022-05-29
1578
1606
scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13
1579
1607
scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08
1580
1608
scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07
···
1663
1691
sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22
1664
1692
sqlite-replication = throw "'sqlite-replication' has been removed since it is no longer required by lxd and is not maintained."; # throw 2022-12-26
1665
1693
sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22
1694
+
sqliteman = throw "sqliteman has been removed, because it was unmaintained"; # Added 2022-05-26
1666
1695
squid4 = squid; # added 2019-08-22
1667
1696
srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21
1668
1697
sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22
1669
1698
ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17
1699
+
ssr = throw "ssr has been removed, because it was unmaintained in nixpkgs and depended on qt4"; # Added 2022-05-26
1670
1700
stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14
1671
1701
steam-run-native = steam-run; # added 2022-02-21
1672
1702
stride = throw "'stride' aka. Atlassian Stride is dead since 2019 (bought by Slack)"; # added 2022-06-15
1703
+
structure-synth = throw "structure-synth has been removed, because it was unmaintained"; # Added 2022-05-09
1673
1704
stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09
1674
1705
subversion_1_10 = throw "subversion_1_10 has been removed as it has reached its end of life"; # Added 2022-04-26
1675
1706
subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31
···
1762
1793
turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08
1763
1794
tvbrowser-bin = tvbrowser; # Added 2023-03-02
1764
1795
twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26
1796
+
tworld2 = throw "tworld2 has been removed, as it was unmaintained"; # Added 2022-05-09
1765
1797
tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
1766
1798
typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11
1767
1799
typst-fmt = typstfmt; # Added 2023-07-15
···
1798
1830
### V ###
1799
1831
1800
1832
v4l_utils = v4l-utils; # Added 2019-08-07
1833
+
valkyrie = throw "valkyrie was removed from nixpkgs, because it is unmaintained upstream"; # Added 2022-05-10
1801
1834
vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26
1802
1835
vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
1803
1836
vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists";
+12
-139
pkgs/top-level/all-packages.nix
+12
-139
pkgs/top-level/all-packages.nix
···
1483
1483
1484
1484
acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { };
1485
1485
1486
-
acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { };
1487
-
1488
1486
alsaequal = callPackage ../tools/audio/alsaequal { };
1489
1487
1490
1488
acpica-tools = callPackage ../tools/system/acpica-tools { };
···
2727
2725
punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { };
2728
2726
2729
2727
py65 = with python3.pkgs; toPythonApplication py65;
2730
-
2731
-
resim = callPackage ../applications/emulators/resim { };
2732
2728
2733
2729
retrofe = callPackage ../applications/emulators/retrofe { };
2734
2730
···
6346
6342
6347
6343
simg2img = callPackage ../tools/filesystems/simg2img { };
6348
6344
6349
-
smokegen = callPackage ../development/libraries/smokegen { };
6350
-
6351
-
smokeqt = callPackage ../development/libraries/smokeqt { };
6352
-
6353
6345
snazy = callPackage ../development/tools/snazy { };
6354
6346
6355
6347
snippetpixie = callPackage ../tools/text/snippetpixie { };
···
6990
6982
libkkc = callPackage ../tools/inputmethods/libkkc { };
6991
6983
6992
6984
ibus = callPackage ../tools/inputmethods/ibus { };
6993
-
6994
-
ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
6995
6985
6996
6986
ibus-engines = recurseIntoAttrs {
6997
6987
anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
···
8255
8245
8256
8246
flowblade = callPackage ../applications/video/flowblade { };
8257
8247
8258
-
fmbt = callPackage ../development/tools/fmbt {
8259
-
python = python2;
8260
-
};
8261
-
8262
8248
fontfor = callPackage ../tools/misc/fontfor { };
8263
8249
8264
8250
fontforge = lowPrio (callPackage ../tools/misc/fontforge {
···
12473
12459
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
12474
12460
};
12475
12461
12476
-
qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { };
12477
-
12478
12462
qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { };
12479
12463
12480
12464
qrcp = callPackage ../tools/networking/qrcp { };
···
13024
13008
13025
13009
seehecht = callPackage ../tools/text/seehecht { };
13026
13010
13027
-
seexpr = callPackage ../development/compilers/seexpr { };
13028
-
13029
13011
selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
13030
13012
13031
13013
semantic-release = callPackage ../development/tools/semantic-release {
···
13376
13358
13377
13359
spiped = callPackage ../tools/networking/spiped { };
13378
13360
13379
-
sqliteman = callPackage ../applications/misc/sqliteman { };
13380
-
13381
13361
sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { };
13382
13362
13383
13363
sqls = callPackage ../applications/misc/sqls { };
···
13469
13449
strip-nondeterminism = perlPackages.strip-nondeterminism;
13470
13450
13471
13451
structorizer = callPackage ../applications/graphics/structorizer { };
13472
-
13473
-
structure-synth = callPackage ../tools/graphics/structure-synth { };
13474
13452
13475
13453
su-exec = callPackage ../tools/security/su-exec { };
13476
13454
···
13769
13747
13770
13748
tewisay = callPackage ../tools/misc/tewisay { };
13771
13749
13772
-
texmacs = if stdenv.isDarwin
13773
-
then callPackage ../applications/editors/texmacs/darwin.nix {
13774
-
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa;
13775
-
tex = texlive.combined.scheme-small;
13776
-
extraFonts = true;
13777
-
} else libsForQt5.callPackage ../applications/editors/texmacs {
13778
-
tex = texlive.combined.scheme-small;
13779
-
extraFonts = true;
13780
-
};
13750
+
texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
13751
+
tex = texlive.combined.scheme-small;
13752
+
extraFonts = true;
13753
+
};
13781
13754
13782
13755
texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };
13783
13756
···
14080
14053
14081
14054
tunwg = callPackage ../tools/networking/tunwg { };
14082
14055
14083
-
omapd = callPackage ../tools/security/omapd { };
14084
-
14085
14056
ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
14086
14057
14087
14058
ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint {
···
14221
14192
14222
14193
uftrace = callPackage ../development/tools/uftrace { };
14223
14194
14195
+
uftpd = callPackage ../servers/ftp/uftpd {};
14196
+
14224
14197
uget = callPackage ../tools/networking/uget { };
14225
14198
14226
14199
uget-integrator = callPackage ../tools/networking/uget-integrator { };
···
14646
14619
tweet-hs = haskell.lib.compose.justStaticExecutables haskellPackages.tweet-hs;
14647
14620
14648
14621
tweeny = callPackage ../development/libraries/tweeny { };
14649
-
14650
-
qfsm = callPackage ../applications/science/electronics/qfsm { };
14651
14622
14652
14623
tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { };
14653
14624
···
15746
15717
dictu = callPackage ../development/compilers/dictu { };
15747
15718
15748
15719
eli = callPackage ../development/compilers/eli { };
15749
-
15750
-
eql = callPackage ../development/compilers/eql { };
15751
15720
15752
15721
erg = callPackage ../development/compilers/erg { };
15753
15722
···
18115
18084
pypi-mirror = callPackage ../development/tools/pypi-mirror { };
18116
18085
18117
18086
setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix { };
18118
-
18119
-
# These pyside tools do not provide any Python modules and are meant to be here.
18120
-
# See ../development/python-modules/pyside for details.
18121
-
pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
18122
-
pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
18123
18087
18124
18088
svg2tikz = with python3.pkgs; toPythonApplication svg2tikz;
18125
18089
···
19892
19856
sdk = true;
19893
19857
};
19894
19858
19895
-
nrf-command-line-tools = callPackage ../development/tools/misc/nrf-command-line-tools { };
19896
-
19897
19859
nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { };
19898
-
19899
-
nrfconnect = callPackage ../tools/bluetooth/nrfconnect { };
19900
19860
19901
19861
nrfutil = callPackage ../development/tools/misc/nrfutil { };
19902
19862
···
20218
20178
20219
20179
scss-lint = callPackage ../development/tools/scss-lint { };
20220
20180
20221
-
segger-jlink = callPackage ../development/tools/misc/segger-jlink { };
20222
-
20223
20181
segger-ozone = callPackage ../development/tools/misc/segger-ozone { };
20224
20182
20225
20183
selene = callPackage ../development/tools/selene { };
···
20521
20479
inherit (buildPackages.darwin) xnu bootstrap_cmds cctools;
20522
20480
};
20523
20481
valgrind-light = res.valgrind.override { gdb = null; };
20524
-
20525
-
valkyrie = callPackage ../development/tools/analysis/valkyrie { };
20526
20482
20527
20483
qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind { };
20528
20484
···
21931
21887
21932
21888
gusb = callPackage ../development/libraries/gusb { };
21933
21889
21934
-
qt-mobility = callPackage ../development/libraries/qt-mobility { };
21935
-
21936
-
21937
-
qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };
21938
-
21939
21890
qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp { };
21940
21891
21941
21892
gnet = callPackage ../development/libraries/gnet { };
···
23349
23300
libjpeg = libjpeg_turbo;
23350
23301
libjpeg8 = libjpeg_turbo.override { enableJpeg8 = true; };
23351
23302
23352
-
libjreen = callPackage ../development/libraries/libjreen { };
23353
-
23354
23303
libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp {
23355
23304
libmicrohttpd = libmicrohttpd_0_9_72;
23356
23305
};
···
23721
23670
libudfread = callPackage ../development/libraries/libudfread { };
23722
23671
23723
23672
libuecc = callPackage ../development/libraries/libuecc { };
23673
+
23674
+
libuev = callPackage ../development/libraries/libuev {};
23724
23675
23725
23676
libui = callPackage ../development/libraries/libui {
23726
23677
inherit (darwin.apple_sdk.frameworks) Cocoa;
···
24341
24292
ntbtls = callPackage ../development/libraries/ntbtls { };
24342
24293
24343
24294
ntk = callPackage ../development/libraries/audio/ntk { };
24344
-
24345
-
ntrack = callPackage ../development/libraries/ntrack { };
24346
24295
24347
24296
numcpp = callPackage ../development/libraries/numcpp { };
24348
24297
···
24725
24674
24726
24675
primesieve = callPackage ../applications/science/math/primesieve { };
24727
24676
24728
-
prison = callPackage ../development/libraries/prison { };
24729
-
24730
24677
proj = callPackage ../development/libraries/proj { };
24731
24678
24732
24679
proj_7 = callPackage ../development/libraries/proj/7.nix { };
···
24797
24744
24798
24745
qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
24799
24746
24800
-
qimageblitz = callPackage ../development/libraries/qimageblitz { };
24801
-
24802
24747
qoi = callPackage ../development/libraries/qoi { };
24803
24748
24804
24749
qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
···
24807
24752
24808
24753
quartoMinimal = callPackage ../development/libraries/quarto { rWrapper = null; python3 = null; };
24809
24754
24810
-
qt4 = qt48;
24811
-
24812
-
qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
24813
-
# GNOME dependencies are not used unless gtkStyle == true
24814
-
inherit (gnome2) libgnomeui GConf gnome_vfs;
24815
-
cups = if stdenv.isLinux then cups else null;
24816
-
24817
-
# XXX: mariadb doesn't built on fbsd as of nov 2015
24818
-
libmysqlclient = if (!stdenv.isFreeBSD) then libmysqlclient else null;
24819
-
24820
-
inherit (darwin) libobjc;
24821
-
inherit (darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
24822
-
};
24823
-
24824
-
qmake48Hook = makeSetupHook {
24825
-
name = "qmake4.8-hook";
24826
-
substitutions = { qt4 = qt48; };
24827
-
} ../development/libraries/qt-4.x/4.8/qmake-hook.sh;
24828
-
24829
-
qmake4Hook = qmake48Hook;
24830
-
24831
-
qt48Full = qt48.override {
24832
-
docs = true;
24833
-
demos = true;
24834
-
examples = true;
24835
-
developerBuild = true;
24836
-
};
24837
-
24838
24755
qt5 = recurseIntoAttrs (makeOverridable
24839
24756
(import ../development/libraries/qt-5/5.15) {
24840
24757
inherit (__splicedPackages)
···
24880
24797
};
24881
24798
24882
24799
qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { };
24883
-
24884
-
qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix {
24885
-
inherit (darwin.apple_sdk.frameworks) AGL;
24886
-
};
24887
24800
24888
24801
rabbitmq-c = callPackage ../development/libraries/rabbitmq-c { };
24889
24802
···
30608
30521
(callPackage ../applications/editors/android-studio { });
30609
30522
android-studio = androidStudioPackages.stable;
30610
30523
30611
-
animbar = callPackage ../applications/graphics/animbar { };
30612
-
30613
30524
antfs-cli = callPackage ../applications/misc/antfs-cli { };
30614
30525
30615
30526
antimony = libsForQt5.callPackage ../applications/graphics/antimony { };
···
32697
32608
husky = callPackage ../development/tools/misc/husky { };
32698
32609
32699
32610
hydrogen = qt5.callPackage ../applications/audio/hydrogen { };
32700
-
hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit.
32701
32611
32702
32612
hydroxide = callPackage ../applications/networking/hydroxide { };
32703
32613
···
34576
34486
34577
34487
nanorc = callPackage ../applications/editors/nano/nanorc { };
34578
34488
34579
-
navipowm = callPackage ../applications/misc/navipowm { };
34580
-
34581
34489
nc4nix = callPackage ../development/tools/nc4nix { };
34582
34490
34583
34491
netbeans = callPackage ../applications/editors/netbeans {
···
35141
35049
35142
35050
qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { };
35143
35051
35144
-
qmetro = callPackage ../applications/misc/qmetro { };
35145
-
35146
35052
qmidiarp = callPackage ../applications/audio/qmidiarp { };
35147
35053
35148
35054
qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };
35149
-
35150
-
qmidiroute = callPackage ../applications/audio/qmidiroute { };
35151
35055
35152
35056
qmmp = qt6Packages.callPackage ../applications/audio/qmmp { };
35153
35057
···
35159
35063
35160
35064
qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
35161
35065
35162
-
qscreenshot = callPackage ../applications/graphics/qscreenshot {
35163
-
inherit (darwin.apple_sdk.frameworks) Carbon;
35164
-
qt = qt4;
35165
-
};
35066
+
qscreenshot = libsForQt5.callPackage ../applications/graphics/qscreenshot { };
35166
35067
35167
35068
qsstv = qt5.callPackage ../applications/radio/qsstv { };
35168
35069
···
35192
35093
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
35193
35094
35194
35095
qtractor = libsForQt5.callPackage ../applications/audio/qtractor { };
35195
-
35196
-
qtscrobbler = callPackage ../applications/audio/qtscrobbler { };
35197
35096
35198
35097
quantomatic = callPackage ../applications/science/physics/quantomatic { };
35199
35098
···
35443
35342
35444
35343
sbagen = callPackage ../applications/misc/sbagen { };
35445
35344
35446
-
scantailor = callPackage ../applications/graphics/scantailor { };
35447
-
35448
35345
scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };
35449
35346
35450
35347
sc-im = callPackage ../applications/misc/sc-im { };
···
35452
35349
scite = callPackage ../applications/editors/scite { };
35453
35350
35454
35351
scli = callPackage ../applications/misc/scli { };
35455
-
35456
-
scribus_1_4 = callPackage ../applications/office/scribus/1_4.nix {
35457
-
inherit (gnome2) libart_lgpl;
35458
-
};
35459
35352
35460
35353
scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
35461
35354
scribus = scribus_1_5;
···
35770
35663
src = callPackage ../applications/version-management/src {
35771
35664
git = gitMinimal;
35772
35665
python = python3;
35773
-
};
35774
-
35775
-
ssr = callPackage ../applications/audio/soundscape-renderer {
35776
-
autoreconfHook = buildPackages.autoreconfHook269;
35777
35666
};
35778
35667
35779
35668
ssrc = callPackage ../applications/audio/ssrc { };
···
37391
37280
37392
37281
nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
37393
37282
37394
-
namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; };
37395
-
namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; };
37283
+
namecoind = callPackage ../applications/blockchains/namecoin { };
37396
37284
37397
37285
nbxplorer = callPackage ../applications/blockchains/nbxplorer { };
37398
37286
···
38021
37909
38022
37910
galaxis = callPackage ../games/galaxis { };
38023
37911
38024
-
gambatte = callPackage ../games/gambatte { };
38025
-
38026
37912
gambit-chess = callPackage ../games/gambit { };
38027
37913
38028
37914
garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
···
38118
38004
instaloader = python3Packages.callPackage ../tools/misc/instaloader { };
38119
38005
38120
38006
instead = callPackage ../games/instead { };
38121
-
38122
-
instead-launcher = callPackage ../games/instead-launcher { };
38123
38007
38124
38008
iortcw = callPackage ../games/iortcw { };
38125
38009
# used as base package for iortcw forks
···
38704
38588
38705
38589
tuxtype = callPackage ../games/tuxtype { };
38706
38590
38707
-
tworld2 = callPackage ../games/tworld2 { };
38708
-
38709
38591
speed_dreams = callPackage ../games/speed-dreams {
38710
38592
# Torcs wants to make shared libraries linked with plib libraries (it provides static).
38711
38593
# i686 is the only platform I know than can do that linking without plib built with -fPIC
···
38996
38878
38997
38879
apbs = callPackage ../applications/science/chemistry/apbs { };
38998
38880
38999
-
avogadro = callPackage ../applications/science/chemistry/avogadro {
39000
-
openbabel = openbabel2;
39001
-
eigen = eigen2;
39002
-
};
39003
-
39004
38881
avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { };
39005
38882
39006
38883
molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { };
···
39633
39510
39634
39511
### SCIENCE/MEDICINE
39635
39512
39636
-
aliza = callPackage ../applications/science/medicine/aliza { };
39637
-
39638
39513
dcmtk = callPackage ../applications/science/medicine/dcmtk { };
39639
39514
39640
39515
xmedcon = callPackage ../applications/science/medicine/xmedcon { };
···
39964
39839
39965
39840
diylc = callPackage ../applications/science/electronics/diylc { };
39966
39841
39967
-
flatcam = callPackage ../applications/science/electronics/flatcam { };
39842
+
flatcam = python39.pkgs.callPackage ../applications/science/electronics/flatcam { };
39968
39843
39969
39844
flopoco = callPackage ../applications/science/electronics/flopoco { };
39970
39845
···
40020
39895
openboardview = callPackage ../applications/science/electronics/openboardview { };
40021
39896
40022
39897
pcb = callPackage ../applications/science/electronics/pcb { };
40023
-
40024
-
qucs = callPackage ../applications/science/electronics/qucs { };
40025
39898
40026
39899
qucs-s = qt6Packages.callPackage ../applications/science/electronics/qucs-s { };
40027
39900
···
40244
40117
40245
40118
tulip = libsForQt5.callPackage ../applications/science/misc/tulip { };
40246
40119
40247
-
vite = callPackage ../applications/science/misc/vite { };
40120
+
vite = libsForQt5.callPackage ../applications/science/misc/vite { };
40248
40121
40249
40122
xearth = callPackage ../applications/science/astronomy/xearth { };
40250
40123
xplanet = callPackage ../applications/science/astronomy/xplanet { };
+2
pkgs/top-level/python-aliases.nix
+2
pkgs/top-level/python-aliases.nix
···
273
273
pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0
274
274
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
275
275
PyMVGLive = pymvglive; # added 2023-02-19
276
+
pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09
276
277
pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2
277
278
pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06
278
279
pyreadability = readability-lxml; # added 2022-05-24
···
363
364
sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03
364
365
sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
365
366
SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23
367
+
subdownloader = throw "subdownloader has been removed, because it depended on pyqt4"; # added 2022-06-09
366
368
suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27
367
369
suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27
368
370
tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
-16
pkgs/top-level/python-packages.nix
-16
pkgs/top-level/python-packages.nix
···
9691
9691
9692
9692
pyqt-builder = callPackage ../development/python-modules/pyqt-builder { };
9693
9693
9694
-
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { };
9695
-
9696
9694
pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { };
9697
9695
9698
9696
pyqt5_sip = callPackage ../development/python-modules/pyqt/sip.nix { };
···
9898
9896
pyside6 = toPythonModule (callPackage ../development/python-modules/pyside6 {
9899
9897
inherit (pkgs) cmake ninja qt6;
9900
9898
});
9901
-
9902
-
pyside = callPackage ../development/python-modules/pyside {
9903
-
inherit (pkgs) mesa;
9904
-
};
9905
-
9906
-
pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix {
9907
-
inherit (pkgs) libxml2 libxslt;
9908
-
};
9909
-
9910
-
pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
9911
9899
9912
9900
pysigma = callPackage ../development/python-modules/pysigma { };
9913
9901
···
10901
10889
qrcode = callPackage ../development/python-modules/qrcode { };
10902
10890
10903
10891
qreactor = callPackage ../development/python-modules/qreactor { };
10904
-
10905
-
qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { };
10906
10892
10907
10893
qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {
10908
10894
pythonPackages = self;
···
12421
12407
stytra = callPackage ../development/python-modules/stytra { };
12422
12408
12423
12409
subarulink = callPackage ../development/python-modules/subarulink { };
12424
-
12425
-
subdownloader = callPackage ../development/python-modules/subdownloader { };
12426
12410
12427
12411
subliminal = callPackage ../development/python-modules/subliminal { };
12428
12412