Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
Martin Weinelt
commit
bf1914e12a
|
|
@ -5417,6 +5417,12 @@
|
||||||
githubId = 41924494;
|
githubId = 41924494;
|
||||||
name = "Ivar";
|
name = "Ivar";
|
||||||
};
|
};
|
||||||
|
iwanb = {
|
||||||
|
email = "tracnar@gmail.com";
|
||||||
|
github = "iwanb";
|
||||||
|
githubId = 4035835;
|
||||||
|
name = "Iwan";
|
||||||
|
};
|
||||||
ixmatus = {
|
ixmatus = {
|
||||||
email = "parnell@digitalmentat.com";
|
email = "parnell@digitalmentat.com";
|
||||||
github = "ixmatus";
|
github = "ixmatus";
|
||||||
|
|
@ -11117,6 +11123,16 @@
|
||||||
email = "schristopher@konputa.com";
|
email = "schristopher@konputa.com";
|
||||||
name = "Scott Christopher";
|
name = "Scott Christopher";
|
||||||
};
|
};
|
||||||
|
sciencentistguy = {
|
||||||
|
email = "jamie@quigley.xyz";
|
||||||
|
name = "Jamie Quigley";
|
||||||
|
github = "Sciencentistguy";
|
||||||
|
githubId = 4983935;
|
||||||
|
keys = [{
|
||||||
|
longkeyid = "rsa2048/0x8E8FF66E2AE8D970";
|
||||||
|
fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970";
|
||||||
|
}];
|
||||||
|
};
|
||||||
scode = {
|
scode = {
|
||||||
email = "peter.schuller@infidyne.com";
|
email = "peter.schuller@infidyne.com";
|
||||||
github = "scode";
|
github = "scode";
|
||||||
|
|
|
||||||
|
|
@ -94,131 +94,133 @@ in rec {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
commonUnitOptions = { options = (sharedOptions // {
|
commonUnitOptions = {
|
||||||
|
options = sharedOptions // {
|
||||||
|
|
||||||
|
description = mkOption {
|
||||||
|
default = "";
|
||||||
|
type = types.singleLineStr;
|
||||||
|
description = "Description of this unit used in systemd messages and progress indicators.";
|
||||||
|
};
|
||||||
|
|
||||||
|
documentation = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf types.str;
|
||||||
|
description = "A list of URIs referencing documentation for this unit or its configuration.";
|
||||||
|
};
|
||||||
|
|
||||||
|
requires = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
Start the specified units when this unit is started, and stop
|
||||||
|
this unit when the specified units are stopped or fail.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
wants = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
Start the specified units when this unit is started.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
after = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
If the specified units are started at the same time as
|
||||||
|
this unit, delay this unit until they have started.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
before = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
If the specified units are started at the same time as
|
||||||
|
this unit, delay them until this unit has started.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
bindsTo = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
Like ‘requires’, but in addition, if the specified units
|
||||||
|
unexpectedly disappear, this unit will be stopped as well.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
partOf = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
If the specified units are stopped or restarted, then this
|
||||||
|
unit is stopped or restarted as well.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
conflicts = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
If the specified units are started, then this unit is stopped
|
||||||
|
and vice versa.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
requisite = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
Similar to requires. However if the units listed are not started,
|
||||||
|
they will not be started and the transaction will fail.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
unitConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = { RequiresMountsFor = "/data"; };
|
||||||
|
type = types.attrsOf unitOption;
|
||||||
|
description = ''
|
||||||
|
Each attribute in this set specifies an option in the
|
||||||
|
<literal>[Unit]</literal> section of the unit. See
|
||||||
|
<citerefentry><refentrytitle>systemd.unit</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
onFailure = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf unitNameType;
|
||||||
|
description = ''
|
||||||
|
A list of one or more units that are activated when
|
||||||
|
this unit enters the "failed" state.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
startLimitBurst = mkOption {
|
||||||
|
type = types.int;
|
||||||
|
description = ''
|
||||||
|
Configure unit start rate limiting. Units which are started
|
||||||
|
more than startLimitBurst times within an interval time
|
||||||
|
interval are not permitted to start any more.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
startLimitIntervalSec = mkOption {
|
||||||
|
type = types.int;
|
||||||
|
description = ''
|
||||||
|
Configure unit start rate limiting. Units which are started
|
||||||
|
more than startLimitBurst times within an interval time
|
||||||
|
interval are not permitted to start any more.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
description = mkOption {
|
|
||||||
default = "";
|
|
||||||
type = types.singleLineStr;
|
|
||||||
description = "Description of this unit used in systemd messages and progress indicators.";
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
documentation = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf types.str;
|
|
||||||
description = "A list of URIs referencing documentation for this unit or its configuration.";
|
|
||||||
};
|
|
||||||
|
|
||||||
requires = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
Start the specified units when this unit is started, and stop
|
|
||||||
this unit when the specified units are stopped or fail.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
wants = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
Start the specified units when this unit is started.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
after = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
If the specified units are started at the same time as
|
|
||||||
this unit, delay this unit until they have started.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
before = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
If the specified units are started at the same time as
|
|
||||||
this unit, delay them until this unit has started.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
bindsTo = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
Like ‘requires’, but in addition, if the specified units
|
|
||||||
unexpectedly disappear, this unit will be stopped as well.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
partOf = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
If the specified units are stopped or restarted, then this
|
|
||||||
unit is stopped or restarted as well.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
conflicts = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
If the specified units are started, then this unit is stopped
|
|
||||||
and vice versa.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
requisite = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
Similar to requires. However if the units listed are not started,
|
|
||||||
they will not be started and the transaction will fail.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
unitConfig = mkOption {
|
|
||||||
default = {};
|
|
||||||
example = { RequiresMountsFor = "/data"; };
|
|
||||||
type = types.attrsOf unitOption;
|
|
||||||
description = ''
|
|
||||||
Each attribute in this set specifies an option in the
|
|
||||||
<literal>[Unit]</literal> section of the unit. See
|
|
||||||
<citerefentry><refentrytitle>systemd.unit</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
onFailure = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = types.listOf unitNameType;
|
|
||||||
description = ''
|
|
||||||
A list of one or more units that are activated when
|
|
||||||
this unit enters the "failed" state.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
startLimitBurst = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
description = ''
|
|
||||||
Configure unit start rate limiting. Units which are started
|
|
||||||
more than startLimitBurst times within an interval time
|
|
||||||
interval are not permitted to start any more.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
startLimitIntervalSec = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
description = ''
|
|
||||||
Configure unit start rate limiting. Units which are started
|
|
||||||
more than startLimitBurst times within an interval time
|
|
||||||
interval are not permitted to start any more.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
}); };
|
|
||||||
|
|
||||||
stage2CommonUnitOptions = {
|
stage2CommonUnitOptions = {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -250,49 +252,41 @@ in rec {
|
||||||
};
|
};
|
||||||
stage1CommonUnitOptions = commonUnitOptions;
|
stage1CommonUnitOptions = commonUnitOptions;
|
||||||
|
|
||||||
serviceOptions = { options = {
|
serviceOptions = { name, config, ... }: {
|
||||||
|
|
||||||
environment = mkOption {
|
|
||||||
default = {};
|
|
||||||
type = with types; attrsOf (nullOr (oneOf [ str path package ]));
|
|
||||||
example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
|
|
||||||
description = "Environment variables passed to the service's processes.";
|
|
||||||
};
|
|
||||||
|
|
||||||
path = mkOption {
|
|
||||||
default = [];
|
|
||||||
type = with types; listOf (oneOf [ package str ]);
|
|
||||||
description = ''
|
|
||||||
Packages added to the service's <envar>PATH</envar>
|
|
||||||
environment variable. Both the <filename>bin</filename>
|
|
||||||
and <filename>sbin</filename> subdirectories of each
|
|
||||||
package are added.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
serviceConfig = mkOption {
|
|
||||||
default = {};
|
|
||||||
example =
|
|
||||||
{ RestartSec = 5;
|
|
||||||
};
|
|
||||||
type = types.addCheck (types.attrsOf unitOption) checkService;
|
|
||||||
description = ''
|
|
||||||
Each attribute in this set specifies an option in the
|
|
||||||
<literal>[Service]</literal> section of the unit. See
|
|
||||||
<citerefentry><refentrytitle>systemd.service</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
}; };
|
|
||||||
|
|
||||||
stage2ServiceOptions = { name, config, ... }: {
|
|
||||||
imports = [
|
|
||||||
stage2CommonUnitOptions
|
|
||||||
serviceOptions
|
|
||||||
];
|
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
environment = mkOption {
|
||||||
|
default = {};
|
||||||
|
type = with types; attrsOf (nullOr (oneOf [ str path package ]));
|
||||||
|
example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
|
||||||
|
description = "Environment variables passed to the service's processes.";
|
||||||
|
};
|
||||||
|
|
||||||
|
path = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = with types; listOf (oneOf [ package str ]);
|
||||||
|
description = ''
|
||||||
|
Packages added to the service's <envar>PATH</envar>
|
||||||
|
environment variable. Both the <filename>bin</filename>
|
||||||
|
and <filename>sbin</filename> subdirectories of each
|
||||||
|
package are added.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
serviceConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example =
|
||||||
|
{ RestartSec = 5;
|
||||||
|
};
|
||||||
|
type = types.addCheck (types.attrsOf unitOption) checkService;
|
||||||
|
description = ''
|
||||||
|
Each attribute in this set specifies an option in the
|
||||||
|
<literal>[Service]</literal> section of the unit. See
|
||||||
|
<citerefentry><refentrytitle>systemd.service</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
script = mkOption {
|
script = mkOption {
|
||||||
type = types.lines;
|
type = types.lines;
|
||||||
default = "";
|
default = "";
|
||||||
|
|
@ -349,6 +343,51 @@ in rec {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
jobScripts = mkOption {
|
||||||
|
type = with types; coercedTo path singleton (listOf path);
|
||||||
|
internal = true;
|
||||||
|
description = "A list of all job script derivations of this unit.";
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkMerge [
|
||||||
|
(mkIf (config.preStart != "") rec {
|
||||||
|
jobScripts = makeJobScript "${name}-pre-start" config.preStart;
|
||||||
|
serviceConfig.ExecStartPre = [ jobScripts ];
|
||||||
|
})
|
||||||
|
(mkIf (config.script != "") rec {
|
||||||
|
jobScripts = makeJobScript "${name}-start" config.script;
|
||||||
|
serviceConfig.ExecStart = jobScripts + " " + config.scriptArgs;
|
||||||
|
})
|
||||||
|
(mkIf (config.postStart != "") rec {
|
||||||
|
jobScripts = (makeJobScript "${name}-post-start" config.postStart);
|
||||||
|
serviceConfig.ExecStartPost = [ jobScripts ];
|
||||||
|
})
|
||||||
|
(mkIf (config.reload != "") rec {
|
||||||
|
jobScripts = makeJobScript "${name}-reload" config.reload;
|
||||||
|
serviceConfig.ExecReload = jobScripts;
|
||||||
|
})
|
||||||
|
(mkIf (config.preStop != "") rec {
|
||||||
|
jobScripts = makeJobScript "${name}-pre-stop" config.preStop;
|
||||||
|
serviceConfig.ExecStop = jobScripts;
|
||||||
|
})
|
||||||
|
(mkIf (config.postStop != "") rec {
|
||||||
|
jobScripts = makeJobScript "${name}-post-stop" config.postStop;
|
||||||
|
serviceConfig.ExecStopPost = jobScripts;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
stage2ServiceOptions = {
|
||||||
|
imports = [
|
||||||
|
stage2CommonUnitOptions
|
||||||
|
serviceOptions
|
||||||
|
];
|
||||||
|
|
||||||
|
options = {
|
||||||
restartIfChanged = mkOption {
|
restartIfChanged = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = true;
|
default = true;
|
||||||
|
|
@ -404,33 +443,6 @@ in rec {
|
||||||
apply = v: if isList v then v else [ v ];
|
apply = v: if isList v then v else [ v ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkMerge
|
|
||||||
[ (mkIf (config.preStart != "")
|
|
||||||
{ serviceConfig.ExecStartPre =
|
|
||||||
[ (makeJobScript "${name}-pre-start" config.preStart) ];
|
|
||||||
})
|
|
||||||
(mkIf (config.script != "")
|
|
||||||
{ serviceConfig.ExecStart =
|
|
||||||
makeJobScript "${name}-start" config.script + " " + config.scriptArgs;
|
|
||||||
})
|
|
||||||
(mkIf (config.postStart != "")
|
|
||||||
{ serviceConfig.ExecStartPost =
|
|
||||||
[ (makeJobScript "${name}-post-start" config.postStart) ];
|
|
||||||
})
|
|
||||||
(mkIf (config.reload != "")
|
|
||||||
{ serviceConfig.ExecReload =
|
|
||||||
makeJobScript "${name}-reload" config.reload;
|
|
||||||
})
|
|
||||||
(mkIf (config.preStop != "")
|
|
||||||
{ serviceConfig.ExecStop =
|
|
||||||
makeJobScript "${name}-pre-stop" config.preStop;
|
|
||||||
})
|
|
||||||
(mkIf (config.postStop != "")
|
|
||||||
{ serviceConfig.ExecStopPost =
|
|
||||||
makeJobScript "${name}-post-stop" config.postStop;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
stage1ServiceOptions = {
|
stage1ServiceOptions = {
|
||||||
|
|
@ -441,41 +453,43 @@ in rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
socketOptions = { options = {
|
socketOptions = {
|
||||||
|
options = {
|
||||||
|
|
||||||
listenStreams = mkOption {
|
listenStreams = mkOption {
|
||||||
default = [];
|
default = [];
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
example = [ "0.0.0.0:993" "/run/my-socket" ];
|
example = [ "0.0.0.0:993" "/run/my-socket" ];
|
||||||
description = ''
|
description = ''
|
||||||
For each item in this list, a <literal>ListenStream</literal>
|
For each item in this list, a <literal>ListenStream</literal>
|
||||||
option in the <literal>[Socket]</literal> section will be created.
|
option in the <literal>[Socket]</literal> section will be created.
|
||||||
'';
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
listenDatagrams = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf types.str;
|
||||||
|
example = [ "0.0.0.0:993" "/run/my-socket" ];
|
||||||
|
description = ''
|
||||||
|
For each item in this list, a <literal>ListenDatagram</literal>
|
||||||
|
option in the <literal>[Socket]</literal> section will be created.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
socketConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = { ListenStream = "/run/my-socket"; };
|
||||||
|
type = types.attrsOf unitOption;
|
||||||
|
description = ''
|
||||||
|
Each attribute in this set specifies an option in the
|
||||||
|
<literal>[Socket]</literal> section of the unit. See
|
||||||
|
<citerefentry><refentrytitle>systemd.socket</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
listenDatagrams = mkOption {
|
};
|
||||||
default = [];
|
|
||||||
type = types.listOf types.str;
|
|
||||||
example = [ "0.0.0.0:993" "/run/my-socket" ];
|
|
||||||
description = ''
|
|
||||||
For each item in this list, a <literal>ListenDatagram</literal>
|
|
||||||
option in the <literal>[Socket]</literal> section will be created.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
socketConfig = mkOption {
|
|
||||||
default = {};
|
|
||||||
example = { ListenStream = "/run/my-socket"; };
|
|
||||||
type = types.attrsOf unitOption;
|
|
||||||
description = ''
|
|
||||||
Each attribute in this set specifies an option in the
|
|
||||||
<literal>[Socket]</literal> section of the unit. See
|
|
||||||
<citerefentry><refentrytitle>systemd.socket</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
}; };
|
|
||||||
|
|
||||||
stage2SocketOptions = {
|
stage2SocketOptions = {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -492,23 +506,25 @@ in rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
timerOptions = { options = {
|
timerOptions = {
|
||||||
|
options = {
|
||||||
|
|
||||||
|
timerConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; };
|
||||||
|
type = types.attrsOf unitOption;
|
||||||
|
description = ''
|
||||||
|
Each attribute in this set specifies an option in the
|
||||||
|
<literal>[Timer]</literal> section of the unit. See
|
||||||
|
<citerefentry><refentrytitle>systemd.timer</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> and
|
||||||
|
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||||
|
<manvolnum>7</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
timerConfig = mkOption {
|
|
||||||
default = {};
|
|
||||||
example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; };
|
|
||||||
type = types.attrsOf unitOption;
|
|
||||||
description = ''
|
|
||||||
Each attribute in this set specifies an option in the
|
|
||||||
<literal>[Timer]</literal> section of the unit. See
|
|
||||||
<citerefentry><refentrytitle>systemd.timer</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry> and
|
|
||||||
<citerefentry><refentrytitle>systemd.time</refentrytitle>
|
|
||||||
<manvolnum>7</manvolnum></citerefentry> for details.
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}; };
|
|
||||||
|
|
||||||
stage2TimerOptions = {
|
stage2TimerOptions = {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -525,21 +541,23 @@ in rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
pathOptions = { options = {
|
pathOptions = {
|
||||||
|
options = {
|
||||||
|
|
||||||
|
pathConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = { PathChanged = "/some/path"; Unit = "changedpath.service"; };
|
||||||
|
type = types.attrsOf unitOption;
|
||||||
|
description = ''
|
||||||
|
Each attribute in this set specifies an option in the
|
||||||
|
<literal>[Path]</literal> section of the unit. See
|
||||||
|
<citerefentry><refentrytitle>systemd.path</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
pathConfig = mkOption {
|
|
||||||
default = {};
|
|
||||||
example = { PathChanged = "/some/path"; Unit = "changedpath.service"; };
|
|
||||||
type = types.attrsOf unitOption;
|
|
||||||
description = ''
|
|
||||||
Each attribute in this set specifies an option in the
|
|
||||||
<literal>[Path]</literal> section of the unit. See
|
|
||||||
<citerefentry><refentrytitle>systemd.path</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}; };
|
|
||||||
|
|
||||||
stage2PathOptions = {
|
stage2PathOptions = {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -556,49 +574,52 @@ in rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
mountOptions = { options = {
|
mountOptions = {
|
||||||
|
options = {
|
||||||
|
|
||||||
what = mkOption {
|
what = mkOption {
|
||||||
example = "/dev/sda1";
|
example = "/dev/sda1";
|
||||||
type = types.str;
|
type = types.str;
|
||||||
description = "Absolute path of device node, file or other resource. (Mandatory)";
|
description = "Absolute path of device node, file or other resource. (Mandatory)";
|
||||||
};
|
};
|
||||||
|
|
||||||
where = mkOption {
|
where = mkOption {
|
||||||
example = "/mnt";
|
example = "/mnt";
|
||||||
type = types.str;
|
type = types.str;
|
||||||
description = ''
|
description = ''
|
||||||
Absolute path of a directory of the mount point.
|
Absolute path of a directory of the mount point.
|
||||||
Will be created if it doesn't exist. (Mandatory)
|
Will be created if it doesn't exist. (Mandatory)
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
type = mkOption {
|
type = mkOption {
|
||||||
default = "";
|
default = "";
|
||||||
example = "ext4";
|
example = "ext4";
|
||||||
type = types.str;
|
type = types.str;
|
||||||
description = "File system type.";
|
description = "File system type.";
|
||||||
};
|
};
|
||||||
|
|
||||||
options = mkOption {
|
options = mkOption {
|
||||||
default = "";
|
default = "";
|
||||||
example = "noatime";
|
example = "noatime";
|
||||||
type = types.commas;
|
type = types.commas;
|
||||||
description = "Options used to mount the file system.";
|
description = "Options used to mount the file system.";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mountConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = { DirectoryMode = "0775"; };
|
||||||
|
type = types.attrsOf unitOption;
|
||||||
|
description = ''
|
||||||
|
Each attribute in this set specifies an option in the
|
||||||
|
<literal>[Mount]</literal> section of the unit. See
|
||||||
|
<citerefentry><refentrytitle>systemd.mount</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
mountConfig = mkOption {
|
|
||||||
default = {};
|
|
||||||
example = { DirectoryMode = "0775"; };
|
|
||||||
type = types.attrsOf unitOption;
|
|
||||||
description = ''
|
|
||||||
Each attribute in this set specifies an option in the
|
|
||||||
<literal>[Mount]</literal> section of the unit. See
|
|
||||||
<citerefentry><refentrytitle>systemd.mount</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
}; };
|
};
|
||||||
|
|
||||||
stage2MountOptions = {
|
stage2MountOptions = {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -614,29 +635,32 @@ in rec {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
automountOptions = { options = {
|
automountOptions = {
|
||||||
|
options = {
|
||||||
|
|
||||||
where = mkOption {
|
where = mkOption {
|
||||||
example = "/mnt";
|
example = "/mnt";
|
||||||
type = types.str;
|
type = types.str;
|
||||||
description = ''
|
description = ''
|
||||||
Absolute path of a directory of the mount point.
|
Absolute path of a directory of the mount point.
|
||||||
Will be created if it doesn't exist. (Mandatory)
|
Will be created if it doesn't exist. (Mandatory)
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
automountConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = { DirectoryMode = "0775"; };
|
||||||
|
type = types.attrsOf unitOption;
|
||||||
|
description = ''
|
||||||
|
Each attribute in this set specifies an option in the
|
||||||
|
<literal>[Automount]</literal> section of the unit. See
|
||||||
|
<citerefentry><refentrytitle>systemd.automount</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
automountConfig = mkOption {
|
|
||||||
default = {};
|
|
||||||
example = { DirectoryMode = "0775"; };
|
|
||||||
type = types.attrsOf unitOption;
|
|
||||||
description = ''
|
|
||||||
Each attribute in this set specifies an option in the
|
|
||||||
<literal>[Automount]</literal> section of the unit. See
|
|
||||||
<citerefentry><refentrytitle>systemd.automount</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
}; };
|
};
|
||||||
|
|
||||||
stage2AutomountOptions = {
|
stage2AutomountOptions = {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
@ -652,21 +676,23 @@ in rec {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
sliceOptions = { options = {
|
sliceOptions = {
|
||||||
|
options = {
|
||||||
|
|
||||||
|
sliceConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = { MemoryMax = "2G"; };
|
||||||
|
type = types.attrsOf unitOption;
|
||||||
|
description = ''
|
||||||
|
Each attribute in this set specifies an option in the
|
||||||
|
<literal>[Slice]</literal> section of the unit. See
|
||||||
|
<citerefentry><refentrytitle>systemd.slice</refentrytitle>
|
||||||
|
<manvolnum>5</manvolnum></citerefentry> for details.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
sliceConfig = mkOption {
|
|
||||||
default = {};
|
|
||||||
example = { MemoryMax = "2G"; };
|
|
||||||
type = types.attrsOf unitOption;
|
|
||||||
description = ''
|
|
||||||
Each attribute in this set specifies an option in the
|
|
||||||
<literal>[Slice]</literal> section of the unit. See
|
|
||||||
<citerefentry><refentrytitle>systemd.slice</refentrytitle>
|
|
||||||
<manvolnum>5</manvolnum></citerefentry> for details.
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}; };
|
|
||||||
|
|
||||||
stage2SliceOptions = {
|
stage2SliceOptions = {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ in
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment = {
|
environment = mkIf (cfg.toolkit == "cuda") {
|
||||||
LD_LIBRARY_PATH = "${config.boot.kernelPackages.nvidia_x11}/lib";
|
LD_LIBRARY_PATH = "${config.boot.kernelPackages.nvidia_x11}/lib";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,7 @@ let
|
||||||
|
|
||||||
enabledUpstreamUnits = filter (n: ! elem n cfg.suppressedUnits) upstreamUnits;
|
enabledUpstreamUnits = filter (n: ! elem n cfg.suppressedUnits) upstreamUnits;
|
||||||
enabledUnits = filterAttrs (n: v: ! elem n cfg.suppressedUnits) cfg.units;
|
enabledUnits = filterAttrs (n: v: ! elem n cfg.suppressedUnits) cfg.units;
|
||||||
|
jobScripts = concatLists (mapAttrsToList (_: unit: unit.jobScripts or []) (filterAttrs (_: v: v.enable) cfg.services));
|
||||||
|
|
||||||
stage1Units = generateUnits {
|
stage1Units = generateUnits {
|
||||||
type = "initrd";
|
type = "initrd";
|
||||||
|
|
@ -149,7 +150,7 @@ in {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
package = (mkPackageOption pkgs "systemd" {
|
package = (mkPackageOption pkgs "systemd" {
|
||||||
default = "systemdMinimal";
|
default = "systemdStage1";
|
||||||
}) // {
|
}) // {
|
||||||
visible = false;
|
visible = false;
|
||||||
};
|
};
|
||||||
|
|
@ -366,19 +367,35 @@ in {
|
||||||
"/sbin".source = "${initrdBinEnv}/sbin";
|
"/sbin".source = "${initrdBinEnv}/sbin";
|
||||||
|
|
||||||
"/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
|
"/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
|
||||||
|
"/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
|
||||||
};
|
};
|
||||||
|
|
||||||
storePaths = [
|
storePaths = [
|
||||||
# TODO: Limit this to the bare necessities
|
# systemd tooling
|
||||||
"${cfg.package}/lib"
|
"${cfg.package}/lib/systemd/systemd-fsck"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-growfs"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-hibernate-resume"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-journald"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-makefs"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-modules-load"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-remount-fs"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-sulogin-shell"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-sysctl"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-udevd"
|
||||||
|
"${cfg.package}/lib/systemd/systemd-vconsole-setup"
|
||||||
|
|
||||||
|
# additional systemd directories
|
||||||
|
"${cfg.package}/lib/systemd/system-generators"
|
||||||
|
"${cfg.package}/lib/udev"
|
||||||
|
|
||||||
|
# utilities needed by systemd
|
||||||
"${cfg.package.util-linux}/bin/mount"
|
"${cfg.package.util-linux}/bin/mount"
|
||||||
"${cfg.package.util-linux}/bin/umount"
|
"${cfg.package.util-linux}/bin/umount"
|
||||||
"${cfg.package.util-linux}/bin/sulogin"
|
"${cfg.package.util-linux}/bin/sulogin"
|
||||||
|
|
||||||
# so NSS can look up usernames
|
# so NSS can look up usernames
|
||||||
"${pkgs.glibc}/lib/libnss_files.so"
|
"${pkgs.glibc}/lib/libnss_files.so"
|
||||||
];
|
] ++ jobScripts;
|
||||||
|
|
||||||
targets.initrd.aliases = ["default.target"];
|
targets.initrd.aliases = ["default.target"];
|
||||||
units =
|
units =
|
||||||
|
|
|
||||||
|
|
@ -854,7 +854,7 @@ in
|
||||||
"-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet"
|
"-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet"
|
||||||
])
|
])
|
||||||
(mkIf (!cfg.useBootLoader) [
|
(mkIf (!cfg.useBootLoader) [
|
||||||
"-kernel ${config.system.build.toplevel}/kernel"
|
"-kernel \${NIXPKGS_QEMU_KERNEL_${config.system.name}:-${config.system.build.toplevel}/kernel}"
|
||||||
"-initrd ${config.system.build.toplevel}/initrd"
|
"-initrd ${config.system.build.toplevel}/initrd"
|
||||||
''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''
|
''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''
|
||||||
])
|
])
|
||||||
|
|
|
||||||
61
pkgs/applications/audio/jacktrip/default.nix
Normal file
61
pkgs/applications/audio/jacktrip/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
||||||
|
{ lib, mkDerivation, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, help2man
|
||||||
|
, qmake
|
||||||
|
, alsa-lib
|
||||||
|
, libjack2
|
||||||
|
, dbus
|
||||||
|
, qtbase
|
||||||
|
, qttools
|
||||||
|
, qtx11extras
|
||||||
|
, meson
|
||||||
|
, python3
|
||||||
|
, rtaudio
|
||||||
|
, ninja
|
||||||
|
}:
|
||||||
|
|
||||||
|
mkDerivation rec {
|
||||||
|
version = "1.5.3";
|
||||||
|
pname = "jacktrip";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jacktrip";
|
||||||
|
repo = "jacktrip";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-sfAYMTnBjT4LkgksyzDGGy97NLX5ljjhNDFioQnTzLs=";
|
||||||
|
};
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
rm build
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
rtaudio
|
||||||
|
qtbase
|
||||||
|
qtx11extras
|
||||||
|
libjack2
|
||||||
|
dbus
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
python3
|
||||||
|
python3.pkgs.pyaml
|
||||||
|
python3.pkgs.jinja2
|
||||||
|
ninja
|
||||||
|
help2man
|
||||||
|
meson
|
||||||
|
qmake
|
||||||
|
qttools
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
qmakeFlags = [ "jacktrip.pro" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Multi-machine audio network performance over the Internet";
|
||||||
|
homepage = "https://jacktrip.github.io/jacktrip/";
|
||||||
|
license = with licenses; [ gpl3 lgpl3 mit ];
|
||||||
|
maintainers = [ maintainers.iwanb ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "praat";
|
pname = "praat";
|
||||||
version = "6.2.09";
|
version = "6.2.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "praat";
|
owner = "praat";
|
||||||
repo = "praat";
|
repo = "praat";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA=";
|
sha256 = "sha256-IYbPMjKWDQQrF+JiqBQ2wsjY+Ms93tEdsG75CxipwaI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
|
|
|
||||||
|
|
@ -13,14 +13,14 @@ let
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "apostrophe";
|
pname = "apostrophe";
|
||||||
version = "2.6.1";
|
version = "2.6.2";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "World";
|
owner = "World";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
domain = "gitlab.gnome.org";
|
domain = "gitlab.gnome.org";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "awaXXSUiEIzOAj9Zw8K961HuIKsLFi3QKETUTTIaTjk=";
|
sha256 = "sha256-At3kaVJE07j/QWXerYnvxleE2Cbn0FjlBXH69tkuFys=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
|
nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,11 @@ assert stdenv ? glibc;
|
||||||
|
|
||||||
let
|
let
|
||||||
platform_major = "4";
|
platform_major = "4";
|
||||||
platform_minor = "22";
|
platform_minor = "23";
|
||||||
year = "2021";
|
year = "2022";
|
||||||
month = "12"; #release month
|
month = "03"; #release month
|
||||||
buildmonth = "11"; #sometimes differs from release month
|
buildmonth = "03"; #sometimes differs from release month
|
||||||
timestamp = "${year}${buildmonth}241800";
|
timestamp = "${year}${buildmonth}080310";
|
||||||
gtk = gtk3;
|
gtk = gtk3;
|
||||||
in rec {
|
in rec {
|
||||||
|
|
||||||
|
|
@ -40,7 +40,7 @@ in rec {
|
||||||
src =
|
src =
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||||
hash = "sha512-Lniaw8aUptHI0a75olTNHaMba+ugUdJKf9sJ0hGzKqY94vvfU3N2TH5eQBeXb1MyQdRdBL1D8Vs3+LD9lWlTMg==";
|
hash = "sha512-IKoHGBH8pQ1mkdMz11exO1u5T3hCPk662nPYoFunCyrQHOVA6KDAVHzEo1dxNUSJVGvW9YHDbGlZphXniTBJHw==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -52,7 +52,7 @@ in rec {
|
||||||
src =
|
src =
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||||
hash = "sha512-F/5yroFDbrSclmUP5vTNSkYR+OZ1dkPv2FPZT1XM5HFoynitYkDxnj+uTcJIBOWv3Zu1plU4yweW0DF1E9jLcg==";
|
hash = "sha512-cG3mMEJiuNrVfFy5nNkVqC2OpMeE5C1iu26E+LKGwwIBwqPoJtFBPRhLdGVC73KwDDRK8DEyurXsiFal60dv/g==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -64,7 +64,7 @@ in rec {
|
||||||
src =
|
src =
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||||
hash = "sha512-3XsBk8/KHtTjit/WMneOghuOkqEHOIdLwof7718dsrDP4vfgcfhb47V7fPYDOw2eld88pHk+85mTGpZOTTywxw==";
|
hash = "sha512-AEGENE5AXXUmIRwv8Hp3LByfPtuG/HvipqkMoq+K4A+8Y7NZCRQM9YSf8zr42S0aYTr6rwP6VJajpFiz4ixULg==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -90,7 +90,7 @@ in rec {
|
||||||
src =
|
src =
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
|
||||||
hash = "sha512-7bTYIFnX8oUPaqDrMOlGNnpyC+xvDQsNmgZUps/epGkzM9Fjlc2lPr75VR7UaezBCoAuNTSHCYtG5d6TJOKjmQ==";
|
hash = "sha512-CTSuI6Dc2wKe0RduPKAacQmXbEBtF4J7Q5b9gC1MIkXXWPLW7Yp+lL/a167TXgDHG3kqNWbonjZ2JwU2T0FRjg==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -102,7 +102,7 @@ in rec {
|
||||||
src =
|
src =
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||||
hash = "sha512-ahykujYH9RLvxVMPFlFILGYJO0LXHvuhnILifeAo5v5Tp5ktGVlZWG461iZHETlt8Zr76liGAqm1ytQcuzCyQA==";
|
hash = "sha512-6QOtNFYCRhdSiclEwijBcp2EODnlp8qtO56NJLuRdgwpEe+3A567L/vsZe/E72YTGZOFh9yJ7+XehIEjonfUIw==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -114,7 +114,7 @@ in rec {
|
||||||
src =
|
src =
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||||
hash = "sha512-CuKxjcnvkROURtavZJN0AhCuA0x7NayZTpIOn9oE21rUzVqR0p7x7C5RPtMZ9gS4ZMWcYyQDJ0BVgRHBoKsYqQ==";
|
hash = "sha512-bgaRM7l4WOoGA8doR/nqjV4Hnszx3N4cZANYfq/Fq5Agspocu4m1F4ofetQC4BdlLkx0o+moKSN6sm34aT5H4Q==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -126,7 +126,7 @@ in rec {
|
||||||
src =
|
src =
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||||
hash = "sha512-CqUbxUUMIJsXsx4XEOQ1d2L3U22VpAfQP+R8HNoVetDawhR+b2tyDVnTQRKTL4dJ0fjLXDeoHvTlPm1EXi/ahA==";
|
hash = "sha512-YyyATAL0pJVrinrLixIW3p+bz3WfD7L/WL0EGnUWgCGsiVDzF2CGoXXT8YsH34uc+6Hn8z23JCoNX4Sqdo8i7Q==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -138,7 +138,7 @@ in rec {
|
||||||
src =
|
src =
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
|
||||||
hash = "sha256-ys3MjIBr2hLZC/GB8Am/Qlto4+dSzOoK9p7QF+GS0Eg=";
|
hash = "sha256-1Go3e1HDRJlba8ySYRfi0+aU6aHjKmd3fc/IgeKw18c=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -248,12 +248,12 @@ rec {
|
||||||
cdt = buildEclipseUpdateSite rec {
|
cdt = buildEclipseUpdateSite rec {
|
||||||
name = "cdt-${version}";
|
name = "cdt-${version}";
|
||||||
# find current version at https://www.eclipse.org/cdt/downloads.php
|
# find current version at https://www.eclipse.org/cdt/downloads.php
|
||||||
version = "10.5.0";
|
version = "10.6.0";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
stripRoot = false;
|
stripRoot = false;
|
||||||
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
|
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
|
||||||
hash = "sha256-0sf38Ekw9mMjiEmJDcunVL3VS3KqWVXKZlQIGBk4V4g=";
|
hash = "sha256-eMvZ2UvPpUq1J4DDg6f+R1g217bnRjxmr5zWUAhef/c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ let
|
||||||
inherit buildKakounePluginFrom2Nix;
|
inherit buildKakounePluginFrom2Nix;
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins);
|
aliases = lib.optionalAttrs config.allowAliases (import ./aliases.nix lib plugins);
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ let
|
||||||
inherit llvmPackages luaPackages;
|
inherit llvmPackages luaPackages;
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {};
|
aliases = if config.allowAliases then (import ./aliases.nix lib) else final: prev: {};
|
||||||
|
|
||||||
extensible-self = lib.makeExtensible
|
extensible-self = lib.makeExtensible
|
||||||
(extends aliases
|
(extends aliases
|
||||||
|
|
|
||||||
|
|
@ -2329,7 +2329,7 @@ let
|
||||||
# then apply extension specific modifcations to packages.
|
# then apply extension specific modifcations to packages.
|
||||||
|
|
||||||
# overlays will be applied left to right, overrides should come after aliases.
|
# overlays will be applied left to right, overrides should come after aliases.
|
||||||
overlays = lib.optionals (config.allowAliases or true) [ aliases ];
|
overlays = lib.optionals config.allowAliases [ aliases ];
|
||||||
|
|
||||||
toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
|
toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays;
|
||||||
in
|
in
|
||||||
|
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, alsa-lib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL,
|
|
||||||
libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "epsxe";
|
|
||||||
version = "2.0.5";
|
|
||||||
|
|
||||||
src = let
|
|
||||||
version2 = replaceStrings ["."] [""] version;
|
|
||||||
platform = "linux" + (optionalString stdenv.is64bit "_x64");
|
|
||||||
in fetchurl {
|
|
||||||
url = "https://www.epsxe.com/files/ePSXe${version2}${platform}.zip";
|
|
||||||
sha256 = if stdenv.is64bit
|
|
||||||
then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0"
|
|
||||||
else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip wrapGAppsHook autoPatchelfHook ];
|
|
||||||
sourceRoot = ".";
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
alsa-lib
|
|
||||||
curl
|
|
||||||
gdk-pixbuf
|
|
||||||
glib
|
|
||||||
gtk3
|
|
||||||
libX11
|
|
||||||
libGLU libGL
|
|
||||||
openssl_1_0_2
|
|
||||||
ncurses5
|
|
||||||
SDL
|
|
||||||
SDL_ttf
|
|
||||||
stdenv.cc.cc.lib
|
|
||||||
zlib
|
|
||||||
];
|
|
||||||
|
|
||||||
dontStrip = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
install -D ${if stdenv.is64bit then "epsxe_x64" else "ePSXe"} $out/bin/epsxe
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://epsxe.com/";
|
|
||||||
description = "Enhanced PSX (PlayStation 1) emulator";
|
|
||||||
license = licenses.unfree;
|
|
||||||
maintainers = with maintainers; [ yana ];
|
|
||||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -18,11 +18,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ocrfeeder";
|
pname = "ocrfeeder";
|
||||||
version = "0.8.3";
|
version = "0.8.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "12f5gnq92ffnd5zaj04df7jrnsdz1zn4zcgpbf5p9qnd21i2y529";
|
sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
@ -49,18 +49,13 @@ stdenv.mkDerivation rec {
|
||||||
]))
|
]))
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/22
|
|
||||||
postConfigure = ''
|
|
||||||
substituteInPlace src/ocrfeeder/util/constants.py \
|
|
||||||
--replace /usr/share/xml/iso-codes ${isocodes}/share/xml/iso-codes
|
|
||||||
'';
|
|
||||||
|
|
||||||
enginesPath = lib.makeBinPath ([
|
enginesPath = lib.makeBinPath ([
|
||||||
tesseract4
|
tesseract4
|
||||||
] ++ extraOcrEngines);
|
] ++ extraOcrEngines);
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
gappsWrapperArgs+=(--prefix PATH : "${enginesPath}")
|
gappsWrapperArgs+=(--prefix PATH : "${enginesPath}")
|
||||||
|
gappsWrapperArgs+=(--set ISO_CODES_DIR "${isocodes}/share/xml/iso-codes")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
@ -69,5 +64,7 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = with maintainers; [ doronbehar ];
|
maintainers = with maintainers; [ doronbehar ];
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
# Compiles, but doesn't launch, see: https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ let
|
||||||
in
|
in
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "bottles";
|
pname = "bottles";
|
||||||
version = "2022.3.14-trento-3";
|
version = "2022.3.28-trento-1";
|
||||||
sha256 = "0wdqj9l69a9pnray2zcfgl2yw0hmrh23njbgwgqccimch014ckdq";
|
sha256 = "1mpvym7b88pb0xxij32arj31q5m6b3z47p8zv9njvkfs0151b2v4";
|
||||||
# Note: Update via pkgs/applications/misc/bottles/update.py
|
# Note: Update via pkgs/applications/misc/bottles/update.py
|
||||||
# mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
# mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||||
|
|
||||||
|
|
|
||||||
46
pkgs/applications/misc/wlclock/default.nix
Normal file
46
pkgs/applications/misc/wlclock/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromSourcehut
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, wayland-protocols
|
||||||
|
, wayland
|
||||||
|
, cairo
|
||||||
|
, scdoc
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "wlclock";
|
||||||
|
version = "1.0.1";
|
||||||
|
|
||||||
|
src = fetchFromSourcehut {
|
||||||
|
owner = "~leon_plickat";
|
||||||
|
repo = "wlclock";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-aHA4kXHYH+KvAJSep5X3DqsiK6WFpXr3rGQl/KNiUcY=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
wayland-protocols
|
||||||
|
wayland
|
||||||
|
cairo
|
||||||
|
scdoc
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A digital analog clock for Wayland desktops";
|
||||||
|
homepage = "https://git.sr.ht/~leon_plickat/wlclock";
|
||||||
|
license = licenses.gpl3;
|
||||||
|
maintainers = with maintainers; [ nomisiv ];
|
||||||
|
platforms = with platforms; linux;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -32,15 +32,15 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dev": {
|
"dev": {
|
||||||
"version": "101.0.4951.15",
|
"version": "102.0.4972.0",
|
||||||
"sha256": "1gm70mz6gzildh1g082q4dg5q9namm9kvxfj5qrdcj67gvz5m66y",
|
"sha256": "1aihdym7h8sd52wiybnrgjrd618f3yby4bpbkc26xyrl8gviz31d",
|
||||||
"sha256bin64": "0m1q85ai9pyam9anh8aiv7hyadam0hjkkhnsa6s05d82k8kz5rvc",
|
"sha256bin64": "0mb67cfr397aclkiy0v9xqga07c166qdylq257k2kmhj7df1gcvn",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2022-03-14",
|
"version": "2022-03-29",
|
||||||
"url": "https://gn.googlesource.com/gn",
|
"url": "https://gn.googlesource.com/gn",
|
||||||
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
|
"rev": "e39d5251c25155b9dfdb96adeab31b795095fd3b",
|
||||||
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
|
"sha256": "1clr0f847rmwwpmsl9zv4q6rw1shn09my775666v480szpahj9pk"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ let
|
||||||
archived = date: throw "the provider has been archived by upstream on ${date}";
|
archived = date: throw "the provider has been archived by upstream on ${date}";
|
||||||
removed = date: throw "removed from nixpkgs on ${date}";
|
removed = date: throw "removed from nixpkgs on ${date}";
|
||||||
in
|
in
|
||||||
lib.optionalAttrs (config.allowAliases or false) {
|
lib.optionalAttrs config.allowAliases {
|
||||||
arukas = archived "2022/01";
|
arukas = archived "2022/01";
|
||||||
chef = archived "2022/01";
|
chef = archived "2022/01";
|
||||||
cherryservers = archived "2022/01";
|
cherryservers = archived "2022/01";
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ buildPythonApplication rec {
|
||||||
description = "A tool that converts RSS/Atom newsfeeds to email";
|
description = "A tool that converts RSS/Atom newsfeeds to email";
|
||||||
homepage = "https://pypi.python.org/pypi/rss2email";
|
homepage = "https://pypi.python.org/pypi/rss2email";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with maintainers; [ jb55 Profpatsch ekleog ];
|
maintainers = with maintainers; [ Profpatsch ekleog ];
|
||||||
};
|
};
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
smoke-test = nixosTests.rss2email;
|
smoke-test = nixosTests.rss2email;
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
homepage = "https://github.com/sm00th/bitlbee-discord";
|
homepage = "https://github.com/sm00th/bitlbee-discord";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ lassulus jb55 ];
|
maintainers = with maintainers; [ lassulus ];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,10 @@ in
|
||||||
mkFranzDerivation' rec {
|
mkFranzDerivation' rec {
|
||||||
pname = "ferdi";
|
pname = "ferdi";
|
||||||
name = "Ferdi";
|
name = "Ferdi";
|
||||||
version = "5.8.0";
|
version = "5.8.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
||||||
sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o=";
|
sha256 = "sha256-Bl7bM5iDQlfPSZxksqlg7GbuwWlm53QkOf/TQEg3/n0=";
|
||||||
};
|
};
|
||||||
extraBuildInputs = [ xorg.libxshmfence ];
|
extraBuildInputs = [ xorg.libxshmfence ];
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "gtmess";
|
|
||||||
version = "0.97";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/gtmess/gtmess-${version}.tar.gz";
|
|
||||||
sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ ncurses openssl tcl tk];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Console MSN Messenger client for Linux and other unix systems";
|
|
||||||
homepage = "http://gtmess.sourceforge.net/";
|
|
||||||
license = lib.licenses.gpl2Plus;
|
|
||||||
platforms = with lib.platforms; linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, fetchgit, fetchpatch, wrapGAppsHook, autoreconfHook, bison, flex
|
{ stdenv, lib, fetchgit, wrapGAppsHook, autoreconfHook, bison, flex
|
||||||
, curl, gtk3, pkg-config, python3, shared-mime-info
|
, curl, gtk3, pkg-config, python3, shared-mime-info
|
||||||
, glib-networking, gsettings-desktop-schemas
|
, glib-networking, gsettings-desktop-schemas
|
||||||
|
|
||||||
|
|
@ -96,28 +96,18 @@ let
|
||||||
];
|
];
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "claws-mail";
|
pname = "claws-mail";
|
||||||
version = "4.0.0";
|
version = "4.1.0";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
rev = version;
|
rev = version;
|
||||||
url = "git://git.claws-mail.org/claws.git";
|
url = "git://git.claws-mail.org/claws.git";
|
||||||
sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn";
|
sha256 = "1pgl7z87qs3ksh1pazq9cml3h0vb7kr9b97gkkrzgsgfg1vbx390";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./mime.patch
|
./mime.patch
|
||||||
|
|
||||||
# Fixes a bug with the automatic authentication method, resulting in errors
|
|
||||||
# with certain mail providers.
|
|
||||||
# <https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4497>
|
|
||||||
# This MUST be removed for the next release.
|
|
||||||
(fetchpatch {
|
|
||||||
name = "fix-automatic-auth.patch";
|
|
||||||
url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=9c2585c58b49815a0eab8d683f0a94f75cbbe64e";
|
|
||||||
sha256 = "0v8v5q2p4h93lp7yq3gnlvarsrcssv96aks1wqy3187vsr4kdw7a";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|
|
||||||
|
|
@ -1,97 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig
|
|
||||||
, openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi
|
|
||||||
, libxcb, cups, xkeyboardconfig, runtimeShell
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
libPath = lib.makeLibraryPath
|
|
||||||
[ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11
|
|
||||||
libXext libXi libxcb cups
|
|
||||||
];
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "eagle";
|
|
||||||
version = "7.7.0";
|
|
||||||
|
|
||||||
src =
|
|
||||||
if stdenv.hostPlatform.system == "i686-linux" then
|
|
||||||
fetchurl {
|
|
||||||
url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-${version}.run";
|
|
||||||
sha256 = "16fa66p77xigc7zvzfm7737mllrcs6nrgk2p7wvkjw3p9lvbz7z1";
|
|
||||||
}
|
|
||||||
else if stdenv.hostPlatform.system == "x86_64-linux" then
|
|
||||||
fetchurl {
|
|
||||||
url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-${version}.run";
|
|
||||||
sha256 = "18dcn6wqph1sqh0ah98qzfi05wip8a8ifbkaq79iskbrsi8iqnrg";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
|
||||||
name = "eagle";
|
|
||||||
exec = "eagle";
|
|
||||||
icon = "eagle";
|
|
||||||
comment = "Schematic capture and PCB layout";
|
|
||||||
desktopName = "Eagle";
|
|
||||||
genericName = "Schematic editor";
|
|
||||||
categories = [ "Development" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[ patchelf zlib freetype fontconfig openssl libXrender libXrandr libXcursor
|
|
||||||
libX11 libXext libXi
|
|
||||||
];
|
|
||||||
|
|
||||||
dontUnpack = true;
|
|
||||||
|
|
||||||
# NOTES:
|
|
||||||
# Eagle for Linux comes as a self-extracting shell script with embedded
|
|
||||||
# tarball. The tarball data (.tar.bz2) starts after a __DATA__ marker.
|
|
||||||
#
|
|
||||||
# Eagle apparently doesn't like binary patching. This is what happens:
|
|
||||||
# $ ./result/eagle-6.4.0/bin/eagle
|
|
||||||
# argv[0] (/home/bfo/nixpkgs/result/eagle-6.4.0/bin/eagle) is not the currently executed program version!
|
|
||||||
installPhase = ''
|
|
||||||
# Extract eagle tarball
|
|
||||||
mkdir "$out"
|
|
||||||
sed '1,/^__DATA__$/d' "$src" | tar -xjf - -C "$out"
|
|
||||||
|
|
||||||
# Install manpage
|
|
||||||
mkdir -p "$out"/share/man/man1
|
|
||||||
ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1
|
|
||||||
|
|
||||||
# Build LD_PRELOAD library that redirects license file access to the home
|
|
||||||
# directory of the user
|
|
||||||
mkdir -p "$out"/lib
|
|
||||||
gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle7_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl
|
|
||||||
|
|
||||||
# Make wrapper script
|
|
||||||
dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
|
||||||
mkdir -p "$out"/bin
|
|
||||||
cat > "$out"/bin/eagle << EOF
|
|
||||||
#!${runtimeShell}
|
|
||||||
export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}"
|
|
||||||
export LD_PRELOAD="$out/lib/eagle_fixer.so"
|
|
||||||
export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
|
|
||||||
exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"
|
|
||||||
EOF
|
|
||||||
chmod a+x "$out"/bin/eagle
|
|
||||||
|
|
||||||
# Make desktop item
|
|
||||||
mkdir -p "$out"/share/applications
|
|
||||||
cp "$desktopItem"/share/applications/* "$out"/share/applications/
|
|
||||||
mkdir -p "$out"/share/icons
|
|
||||||
ln -s "$out/eagle-${version}/bin/eagleicon50.png" "$out"/share/icons/eagle.png
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Schematic editor and PCB layout tool from CadSoft";
|
|
||||||
homepage = "https://www.autodesk.com/products/eagle/overview";
|
|
||||||
license = licenses.unfree;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = [ maintainers.bjornfor ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
|
||||||
Center (BVLC) and by community contributors.
|
Center (BVLC) and by community contributors.
|
||||||
'';
|
'';
|
||||||
homepage = "http://caffe.berkeleyvision.org/";
|
homepage = "http://caffe.berkeleyvision.org/";
|
||||||
maintainers = with maintainers; [ jb55 ];
|
maintainers = with maintainers; [ ];
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "bada-bib";
|
pname = "bada-bib";
|
||||||
version = "0.6.0";
|
version = "0.6.1";
|
||||||
format = "other";
|
format = "other";
|
||||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||||
|
|
||||||
|
|
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
owner = "RogerCrocker";
|
owner = "RogerCrocker";
|
||||||
repo = "BadaBib";
|
repo = "BadaBib";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-gfZc3R8hrYy4Nco+XwG29lzZd537ByEgd3RL8h7f6DQ=";
|
sha256 = "sha256-fuGGKBScdo9rI3tLSBWIcWEME8nSuct0IUyfmI7PzCc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -8,16 +8,16 @@ with lib;
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gogs";
|
pname = "gogs";
|
||||||
version = "0.12.5";
|
version = "0.12.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gogs";
|
owner = "gogs";
|
||||||
repo = "gogs";
|
repo = "gogs";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-I3kFRKgVMGMKgHU5VEeNai8FseN/ea6MzEP94AR2Zfo=";
|
sha256 = "sha256-nAMnsRYYS5bZhLDzPdC4sj3rv1kPjckFnLoORY1HqW8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo=";
|
vendorSha256 = "sha256-U8rzYSLD9XeO5ai3p3OG74kPRI2IAlvOeZhU1Pa1BAI=";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "docker-compose";
|
pname = "docker-compose";
|
||||||
version = "2.3.4";
|
version = "2.4.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "docker";
|
owner = "docker";
|
||||||
repo = "compose";
|
repo = "compose";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ZFnrfGM2LUZZC8IPPCh3GS95jz7NGraOlr3wQaw5K0k=";
|
sha256 = "sha256-dHq1t1ebPSAS5H14Kd03xCiHV9UhAH0dIxikQK0rHQk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-Y2rE5/XLmQLqBA8xiCd9v30gTaO9qbiBFa4jKucKU6M=";
|
vendorSha256 = "sha256-N+paN3zEXzzUFb2JPVIDZYZ0h0iu7naiw4pSVnGsuKQ=";
|
||||||
|
|
||||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }:
|
{ pkgs, config, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gawk, gnused, gixy }:
|
||||||
|
|
||||||
let
|
let
|
||||||
aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else prev: {};
|
aliases = if config.allowAliases then (import ./aliases.nix lib) else prev: {};
|
||||||
|
|
||||||
writers = with lib; rec {
|
writers = with lib; rec {
|
||||||
# Base implementation for non-compiled executables.
|
# Base implementation for non-compiled executables.
|
||||||
|
|
|
||||||
24
pkgs/data/misc/cldr-annotations/default.nix
Normal file
24
pkgs/data/misc/cldr-annotations/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
{ lib, fetchzip }:
|
||||||
|
|
||||||
|
let
|
||||||
|
version = "40.0";
|
||||||
|
in fetchzip rec {
|
||||||
|
name = "cldr-annotations-${version}";
|
||||||
|
|
||||||
|
url = "https://unicode.org/Public/cldr/40/cldr-common-${version}.zip";
|
||||||
|
|
||||||
|
postFetch = ''
|
||||||
|
mkdir -p $out/share/unicode/cldr
|
||||||
|
unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*'
|
||||||
|
'';
|
||||||
|
|
||||||
|
sha256 = "sha256-L4NSMNFYKJWV3qKQhio9eMABtDlLieT9VeMZfzeAkbM=";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
|
||||||
|
homepage = "https://cldr.unicode.org";
|
||||||
|
license = licenses.unicode-dfs-2016;
|
||||||
|
platforms = platforms.all;
|
||||||
|
maintainers = with maintainers; [ DeeUnderscore ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "12.1";
|
version = "14.0";
|
||||||
|
|
||||||
fetchData = { file, sha256 }: fetchurl {
|
fetchData = { file, sha256 }: fetchurl {
|
||||||
url = "https://www.unicode.org/Public/emoji/${version}/${file}";
|
url = "https://www.unicode.org/Public/emoji/${version}/${file}";
|
||||||
|
|
@ -19,25 +19,17 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
srcs = {
|
srcs = {
|
||||||
emoji-data = fetchData {
|
|
||||||
file = "emoji-data.txt";
|
|
||||||
sha256 = "17gfm5a28lsymx36prbjy2g0b27gf3rcgggy0yxdshbxwf6zpf9k";
|
|
||||||
};
|
|
||||||
emoji-sequences = fetchData {
|
emoji-sequences = fetchData {
|
||||||
file = "emoji-sequences.txt";
|
file = "emoji-sequences.txt";
|
||||||
sha256 = "1fckw5hfyvz5jfp2jczzx8qcs79vf0zyq0z2942230j99arq70vc";
|
sha256 = "sha256-4helD/0oe+UmNIuVxPx/P0R9V10EY/RccewdeemeGxE=";
|
||||||
};
|
};
|
||||||
emoji-test = fetchData {
|
emoji-test = fetchData {
|
||||||
file = "emoji-test.txt";
|
file = "emoji-test.txt";
|
||||||
sha256 = "0w29lva7gp9g9lf7bz1i24qdalvf440bcq8npsbwr3cpp7na95kh";
|
sha256 = "sha256-DDOVhnFzfvowINzBZ7dGYMZnL4khyRWVzrLL95djsUg=";
|
||||||
};
|
|
||||||
emoji-variation-sequences = fetchData {
|
|
||||||
file = "emoji-variation-sequences.txt";
|
|
||||||
sha256 = "0akpib3cinr8xcs045hda5wnpfj6qfdjlkzmq5vgdc50gyhrd2z3";
|
|
||||||
};
|
};
|
||||||
emoji-zwj-sequences = fetchData {
|
emoji-zwj-sequences = fetchData {
|
||||||
file = "emoji-zwj-sequences.txt";
|
file = "emoji-zwj-sequences.txt";
|
||||||
sha256 = "0s2mvy1nr2v1x0rr1fxlsv8ly1vyf9978rb4hwry5vnr678ls522";
|
sha256 = "sha256-owlGLICFkyEsIHz/DUZucxjBmgVO40A69BCJPbIYDA0=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
autoreconfHook = pkgs.autoreconfHook269;
|
autoreconfHook = pkgs.autoreconfHook269;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // lib.optionalAttrs (config.allowAliases or true) {
|
} // lib.optionalAttrs config.allowAliases {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
# GTK Libs
|
# GTK Libs
|
||||||
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
|
glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
|
||||||
|
|
|
||||||
|
|
@ -278,7 +278,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
gnome-autoar = callPackage ./misc/gnome-autoar { };
|
gnome-autoar = callPackage ./misc/gnome-autoar { };
|
||||||
|
|
||||||
gnome-packagekit = callPackage ./misc/gnome-packagekit { };
|
gnome-packagekit = callPackage ./misc/gnome-packagekit { };
|
||||||
}) // lib.optionalAttrs (config.allowAliases or true) {
|
}) // lib.optionalAttrs config.allowAliases {
|
||||||
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
|
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
|
||||||
|
|
||||||
gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16
|
gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ in rec {
|
||||||
(lib.attrValues)
|
(lib.attrValues)
|
||||||
(mapReadableNames)
|
(mapReadableNames)
|
||||||
# Add some aliases
|
# Add some aliases
|
||||||
(extensions: extensions // lib.optionalAttrs (config.allowAliases or true) {
|
(extensions: extensions // lib.optionalAttrs config.allowAliases {
|
||||||
unite-shell = gnomeExtensions.unite; # added 2021-01-19
|
unite-shell = gnomeExtensions.unite; # added 2021-01-19
|
||||||
arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14
|
arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14
|
||||||
disable-unredirect = gnomeExtensions.disable-unredirect-fullscreen-windows; # added 2021-11-20
|
disable-unredirect = gnomeExtensions.disable-unredirect-fullscreen-windows; # added 2021-11-20
|
||||||
|
|
|
||||||
|
|
@ -226,7 +226,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
# Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
|
# Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
|
||||||
# https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
|
# https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
|
||||||
|
|
||||||
}) // lib.optionalAttrs (config.allowAliases or true) {
|
}) // lib.optionalAttrs config.allowAliases {
|
||||||
|
|
||||||
### ALIASES
|
### ALIASES
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -166,7 +166,7 @@ let
|
||||||
parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
|
parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
} // lib.optionalAttrs (config.allowAliases or true) {
|
} // lib.optionalAttrs config.allowAliases {
|
||||||
ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
|
ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
|
||||||
plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'";
|
plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.3/ -A '*.tar.xz' )
|
WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.4/ -A '*.tar.xz' )
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
extra-cmake-modules,
|
extra-cmake-modules,
|
||||||
kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
|
kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
|
||||||
kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
|
kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
|
||||||
kwindowsystem, kdeclarative, plasma-framework
|
kwindowsystem, kdeclarative, plasma-framework, qtx11extras
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
|
|
@ -12,6 +12,6 @@ mkDerivation {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
|
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
|
||||||
kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
|
kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
|
||||||
kwindowsystem kdeclarative plasma-framework
|
kwindowsystem kdeclarative plasma-framework qtx11extras
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,427 +4,427 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
bluedevil = {
|
bluedevil = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/bluedevil-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/bluedevil-5.24.4.tar.xz";
|
||||||
sha256 = "1hlyqhn14yq7960zfjwjygkpkvbmrlsanm1g1wrr7dwbmrp5dlcx";
|
sha256 = "1mph04r6l9bxml1brwifbnk6lkjxkzxx75b3g3myzijjv6f8wxw3";
|
||||||
name = "bluedevil-5.24.3.tar.xz";
|
name = "bluedevil-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
breeze = {
|
breeze = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/breeze-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/breeze-5.24.4.tar.xz";
|
||||||
sha256 = "0h19m6wmhjw8v6ys47kgzcb0h2nb9w2fcjzypnvmkvbjbkjr53sb";
|
sha256 = "01cqji6figwb95drcq9vrqlkv7xmpn2csbi2mvixbcdawqhywsg3";
|
||||||
name = "breeze-5.24.3.tar.xz";
|
name = "breeze-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
breeze-grub = {
|
breeze-grub = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/breeze-grub-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/breeze-grub-5.24.4.tar.xz";
|
||||||
sha256 = "15cpmqp7klp4dhcil3i78iff4kjasfx273v36ml8y05hm8w0igjq";
|
sha256 = "1p154g2x1g00iam2gkv7pml1r0b91b21s8fgrfrqg5pj45ysp5bc";
|
||||||
name = "breeze-grub-5.24.3.tar.xz";
|
name = "breeze-grub-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
breeze-gtk = {
|
breeze-gtk = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/breeze-gtk-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/breeze-gtk-5.24.4.tar.xz";
|
||||||
sha256 = "1922s17mh4ifaqbf4b7p6yj8pwd6z3qwpbf21j1fqhmdk4pvn499";
|
sha256 = "0s51azc2xmh7agbqlm9rn39c5qh6rfwyc2dq4sfv6vspm1883zmj";
|
||||||
name = "breeze-gtk-5.24.3.tar.xz";
|
name = "breeze-gtk-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
breeze-plymouth = {
|
breeze-plymouth = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/breeze-plymouth-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/breeze-plymouth-5.24.4.tar.xz";
|
||||||
sha256 = "0nkf0ll4hcawmkd7nrh8gcf6hhbl0ajxiz2azf9njab9pv2lcz1j";
|
sha256 = "038pglghl40nyq6lzydijy3wnr5agvfzddjxrf6lc9m6qapqd37v";
|
||||||
name = "breeze-plymouth-5.24.3.tar.xz";
|
name = "breeze-plymouth-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
discover = {
|
discover = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/discover-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/discover-5.24.4.tar.xz";
|
||||||
sha256 = "097m5njz86vi4innap1mvizas60r1qcrdzdgsid1hd6p5a92rwca";
|
sha256 = "0smhys51chvjh2ij4mk03cfnq09n8cq22iag1ld9j2125l5iwa99";
|
||||||
name = "discover-5.24.3.tar.xz";
|
name = "discover-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
drkonqi = {
|
drkonqi = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/drkonqi-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/drkonqi-5.24.4.tar.xz";
|
||||||
sha256 = "1n6psvr3washk796zrc8ag011fwy677h2mdkw9ijx8dhrk80br0k";
|
sha256 = "1yn7yj8nwnxm1s0si2353wl17jv7c7l5dc7833ndl56phv2999x0";
|
||||||
name = "drkonqi-5.24.3.tar.xz";
|
name = "drkonqi-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kactivitymanagerd = {
|
kactivitymanagerd = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kactivitymanagerd-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kactivitymanagerd-5.24.4.tar.xz";
|
||||||
sha256 = "0qxf3j36dj1yklnl27znsi9qdjmn6nr779cnzms38x76dq9kxblw";
|
sha256 = "0aamfgc4bdrysq7ps134pf5v4bgiwrsxffi0nb6d8zazswgkfa41";
|
||||||
name = "kactivitymanagerd-5.24.3.tar.xz";
|
name = "kactivitymanagerd-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kde-cli-tools = {
|
kde-cli-tools = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kde-cli-tools-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kde-cli-tools-5.24.4.tar.xz";
|
||||||
sha256 = "00z8yxic5ibk05x8c25dsc4ijvk6yv0aw1iyfhnpnzmdwdydlr7y";
|
sha256 = "1w2rhz32xaqhmq5lyvfmjrbssqf9f35k5fk02f05fz79yk9wir7z";
|
||||||
name = "kde-cli-tools-5.24.3.tar.xz";
|
name = "kde-cli-tools-5.24.4.tar.xz";
|
||||||
};
|
|
||||||
};
|
|
||||||
kdecoration = {
|
|
||||||
version = "5.24.3";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kdecoration-5.24.3.tar.xz";
|
|
||||||
sha256 = "0dpnaf5myn1h368cnkq9g6xfm1sqmyam6bxyidbd5j3dyy1kvz5v";
|
|
||||||
name = "kdecoration-5.24.3.tar.xz";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kde-gtk-config = {
|
kde-gtk-config = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kde-gtk-config-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kde-gtk-config-5.24.4.tar.xz";
|
||||||
sha256 = "0p50kf34csdrgck1y09d3lnz0r9ly0ca4778achrc59yr4qcsjzv";
|
sha256 = "02spbx2rniiyvzj4qb6lgzj0f83k4vq53fk4i1m45438z7aslymi";
|
||||||
name = "kde-gtk-config-5.24.3.tar.xz";
|
name = "kde-gtk-config-5.24.4.tar.xz";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
kdecoration = {
|
||||||
|
version = "5.24.4";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "${mirror}/stable/plasma/5.24.4/kdecoration-5.24.4.tar.xz";
|
||||||
|
sha256 = "05ccyb314mxf0d4ivj71l9lh13s3fqr7f4d2rmg6qshsql39569c";
|
||||||
|
name = "kdecoration-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kdeplasma-addons = {
|
kdeplasma-addons = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kdeplasma-addons-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kdeplasma-addons-5.24.4.tar.xz";
|
||||||
sha256 = "0g7jcvd6abnlzz9ibnc7phzm58pn6dv3795w4hhy47738jkhizl6";
|
sha256 = "03b8d3kdzwpyqrqkmpswryksrhav3mwcnbyzdc3g2kpk2qnx68fp";
|
||||||
name = "kdeplasma-addons-5.24.3.tar.xz";
|
name = "kdeplasma-addons-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kgamma5 = {
|
kgamma5 = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kgamma5-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kgamma5-5.24.4.tar.xz";
|
||||||
sha256 = "0rwqvz14a50s43p74n19v1zzd9y8f2lylfappxmhrdyxmbgkpnk6";
|
sha256 = "0z1zrw5id455idjbaqracs1vcwgs93an7w27ggfqs6i8nabrivbk";
|
||||||
name = "kgamma5-5.24.3.tar.xz";
|
name = "kgamma5-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
khotkeys = {
|
khotkeys = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/khotkeys-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/khotkeys-5.24.4.tar.xz";
|
||||||
sha256 = "1jxg91rpz09sh13fz270pxfw40qdy6p50j5xw7cpnyqlk2l5zx0p";
|
sha256 = "033dgz8wbsw2nj133hnmygz1izmcpxdn80jbjbm66nhbbyq7bb2s";
|
||||||
name = "khotkeys-5.24.3.tar.xz";
|
name = "khotkeys-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kinfocenter = {
|
kinfocenter = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kinfocenter-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kinfocenter-5.24.4.tar.xz";
|
||||||
sha256 = "08z2044bl0v4ydlx2chv849y6m4py0yd4lnw76sycd14lnvsrxfj";
|
sha256 = "0f5q6ajyd794p1z9j3il8sajlqkdcnf06xq4612qxdp49nb88nyw";
|
||||||
name = "kinfocenter-5.24.3.tar.xz";
|
name = "kinfocenter-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kmenuedit = {
|
kmenuedit = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kmenuedit-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kmenuedit-5.24.4.tar.xz";
|
||||||
sha256 = "1yivrdix4jiycfbw9g6pzx8zkmdq4g8g51ndc7sy3r0qxzgx1icb";
|
sha256 = "0ril8jxqkaavc4bkpksnyxn3bww7b81gnp9bnb17acrr2nd7wyhl";
|
||||||
name = "kmenuedit-5.24.3.tar.xz";
|
name = "kmenuedit-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kscreen = {
|
kscreen = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kscreen-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kscreen-5.24.4.tar.xz";
|
||||||
sha256 = "1wjbd33h8473v8i5qxdccxrsv04v6jyd7scrqdxqaln9n8ylp08f";
|
sha256 = "0shvhymdfxw1gz49y1s79zik9kkg5qh0mqdj6dx0s6r3w6vysj1h";
|
||||||
name = "kscreen-5.24.3.tar.xz";
|
name = "kscreen-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kscreenlocker = {
|
kscreenlocker = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kscreenlocker-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kscreenlocker-5.24.4.tar.xz";
|
||||||
sha256 = "1dh3z55hwakj11ffn2fm79vnlw7gcg1nkcxbxvcdcpq84ahpq583";
|
sha256 = "1xzc80awsapsg65kk21ssp7y0jb374k1w2bb7gvzj8j40rrn48pv";
|
||||||
name = "kscreenlocker-5.24.3.tar.xz";
|
name = "kscreenlocker-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
ksshaskpass = {
|
ksshaskpass = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/ksshaskpass-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/ksshaskpass-5.24.4.tar.xz";
|
||||||
sha256 = "0ivq9nyyqm1rrm6ck26jlsh8qv9q98dz5qwvcnpgpmxb3mr1dgiv";
|
sha256 = "1pa41w793dbi3rv6mm1a4xp46n80qwdpdlwhi6z4x76hjvqx9i9l";
|
||||||
name = "ksshaskpass-5.24.3.tar.xz";
|
name = "ksshaskpass-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
ksystemstats = {
|
ksystemstats = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/ksystemstats-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/ksystemstats-5.24.4.tar.xz";
|
||||||
sha256 = "03ikpd3m0qk8cb92g63i7q9c8bks7ggf1pmmig559cmg7gbknc2c";
|
sha256 = "1pa7xrw5ij32bm66pn72zkzz8y70fq71n4kigm9ixc1s2glkbiwd";
|
||||||
name = "ksystemstats-5.24.3.tar.xz";
|
name = "ksystemstats-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kwallet-pam = {
|
kwallet-pam = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kwallet-pam-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kwallet-pam-5.24.4.tar.xz";
|
||||||
sha256 = "0zxdrpjq8sg3qw2gfkvjs567b41labi940cq4qrix395v7251p9k";
|
sha256 = "0s6z7ds42a7kba25jd7pzylw7d2mc27xgymmdrpkg2afqanf3m4r";
|
||||||
name = "kwallet-pam-5.24.3.tar.xz";
|
name = "kwallet-pam-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kwayland-integration = {
|
kwayland-integration = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kwayland-integration-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kwayland-integration-5.24.4.tar.xz";
|
||||||
sha256 = "1kq5vrrplbdxri8610h89apfz07a6xi1gnlvmr8gbsvas5zicvwz";
|
sha256 = "1cnfb81yv6m37m2kyk523skqbk5in1kpbpxq60ivjri91sm4pryj";
|
||||||
name = "kwayland-integration-5.24.3.tar.xz";
|
name = "kwayland-integration-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kwayland-server = {
|
kwayland-server = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kwayland-server-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kwayland-server-5.24.4.tar.xz";
|
||||||
sha256 = "0fq61qk3cp4xg9759ylqqw5ncx9s7kayjf0bilg5m725bfhj02sn";
|
sha256 = "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi";
|
||||||
name = "kwayland-server-5.24.3.tar.xz";
|
name = "kwayland-server-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kwin = {
|
kwin = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kwin-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kwin-5.24.4.tar.xz";
|
||||||
sha256 = "0szlrcsj4h4fa5yf27nmza7c4dyc0xcwdrihs05pl5qk5bivfkfq";
|
sha256 = "1qwcd6iw6yvpchiwmvq5nwsr465jmrmscf286mjrc65im4hj6572";
|
||||||
name = "kwin-5.24.3.tar.xz";
|
name = "kwin-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kwrited = {
|
kwrited = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/kwrited-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/kwrited-5.24.4.tar.xz";
|
||||||
sha256 = "1sgd3iik647pz2zr5cpsbwm2ll8f11xyw2jv2sfxkbiiw53qaxid";
|
sha256 = "0j86ih4g762a94cyzilcbigh7iv04a80bqrlxm02fbqhffv01mv2";
|
||||||
name = "kwrited-5.24.3.tar.xz";
|
name = "kwrited-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
layer-shell-qt = {
|
layer-shell-qt = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/layer-shell-qt-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/layer-shell-qt-5.24.4.tar.xz";
|
||||||
sha256 = "0h3xlvmgyxyzxvazgbbn0a9l14hg5d38cl9hclnwmrnpwbn0bqax";
|
sha256 = "03qyf6pvk36ig6ilimq02q19frdlsmrkbng2iz3d59k15zdrz5x0";
|
||||||
name = "layer-shell-qt-5.24.3.tar.xz";
|
name = "layer-shell-qt-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
libkscreen = {
|
libkscreen = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/libkscreen-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/libkscreen-5.24.4.tar.xz";
|
||||||
sha256 = "18777lwn5j0isc347dks25731byyfdyls79lj6hnxqb6807lz1x6";
|
sha256 = "1xv7vml5lxj1lnansisfbfym35h265ggwsyjplz76aibj5nyqv81";
|
||||||
name = "libkscreen-5.24.3.tar.xz";
|
name = "libkscreen-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
libksysguard = {
|
libksysguard = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/libksysguard-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/libksysguard-5.24.4.tar.xz";
|
||||||
sha256 = "18piiy24rd5fzvp4cnhgx0d4x4m6fnxx01zm1mx0sh676g7m31hl";
|
sha256 = "00i4l2kc02wymmiqh7wam8dp4h9hvn8nsxfv258waq7pnxzjmnkn";
|
||||||
name = "libksysguard-5.24.3.tar.xz";
|
name = "libksysguard-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
milou = {
|
milou = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/milou-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/milou-5.24.4.tar.xz";
|
||||||
sha256 = "06xx4afym92hfpvbiqrv7mx30bdm3dhdfn8vki5zxq2k0rv0pmri";
|
sha256 = "0z7kmygvjzj30llwg8gpibjja2gzc09nh9pxrpy78pa1jxnas29i";
|
||||||
name = "milou-5.24.3.tar.xz";
|
name = "milou-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
oxygen = {
|
oxygen = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/oxygen-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/oxygen-5.24.4.tar.xz";
|
||||||
sha256 = "02j0drc24mf2pfhdgzri5sdcscq1bbj4lhhmhp6bn1v74wybv381";
|
sha256 = "1d3sz2qc1cz9x6g04r0scvw9fmrazfn5v3iav4cn7wdkz8x06kc0";
|
||||||
name = "oxygen-5.24.3.tar.xz";
|
name = "oxygen-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-browser-integration = {
|
plasma-browser-integration = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-browser-integration-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-browser-integration-5.24.4.tar.xz";
|
||||||
sha256 = "1msib3c8arybqbv1vfj1ijx74a34a02hn8gvjy4sf95zcl07mc20";
|
sha256 = "1havd775d4x2y36nkba2k6vdf839dspk10mxccnk2wkhdxmzfyk7";
|
||||||
name = "plasma-browser-integration-5.24.3.tar.xz";
|
name = "plasma-browser-integration-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-desktop = {
|
plasma-desktop = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-desktop-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-desktop-5.24.4.tar.xz";
|
||||||
sha256 = "1lwizprs6nk6nibydwkwmpi9c7c50lvg2k188pb6ddz2sb7pwgjq";
|
sha256 = "09fhqz2sp4caabr1li1shjd8l052vp4d10ci7pwsqj8f61331qmh";
|
||||||
name = "plasma-desktop-5.24.3.tar.xz";
|
name = "plasma-desktop-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-disks = {
|
plasma-disks = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-disks-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-disks-5.24.4.tar.xz";
|
||||||
sha256 = "0nklcimxyvci3xa6nc5jxbcxds4a14vkkwihgc6xfpc7xcca0wcy";
|
sha256 = "1mi5fp3305kjw41zhbccxyg666gcmmrvckipjhnnnfwd3gl372ng";
|
||||||
name = "plasma-disks-5.24.3.tar.xz";
|
name = "plasma-disks-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-firewall = {
|
plasma-firewall = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-firewall-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-firewall-5.24.4.tar.xz";
|
||||||
sha256 = "0r7gh3asnc5lbfsp1jb33lmgcxfpjmlrqlyz41g0wv9aj9x6pwxz";
|
sha256 = "0f9g5m2ddbp2axfxqc4d92fzg6r4z1l56i6nsry6nlz6cqky3fm2";
|
||||||
name = "plasma-firewall-5.24.3.tar.xz";
|
name = "plasma-firewall-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-integration = {
|
plasma-integration = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-integration-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-integration-5.24.4.tar.xz";
|
||||||
sha256 = "031w205icblf50ps7bw7wp5q4azbqpcp4bnig2wh5d1lc8xqzvvs";
|
sha256 = "1d2d7cmhdhmdzs91vpc2p3fg413daqhqilp8d2qbpsks5hyrkm3k";
|
||||||
name = "plasma-integration-5.24.3.tar.xz";
|
name = "plasma-integration-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-mobile = {
|
plasma-mobile = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-mobile-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-mobile-5.24.4.tar.xz";
|
||||||
sha256 = "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58";
|
sha256 = "1hgcnb4flw224j57fxkhaiwapymq6ccjwqj8s6jgqzc3ax0py0vr";
|
||||||
name = "plasma-mobile-5.24.3.tar.xz";
|
name = "plasma-mobile-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-nano = {
|
plasma-nano = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-nano-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-nano-5.24.4.tar.xz";
|
||||||
sha256 = "13jxhfi3c3dhg7zdyfqnsii661h1am0w9dsv82dalqvwr1mw28l5";
|
sha256 = "1fdq4r5zlkf3qb0a47zv3apgnqs4gqqfj8pdlcmzkyn9xykzs9vw";
|
||||||
name = "plasma-nano-5.24.3.tar.xz";
|
name = "plasma-nano-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-nm = {
|
plasma-nm = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-nm-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-nm-5.24.4.tar.xz";
|
||||||
sha256 = "1z9vzj2mbvqklnjxf2izpx9s6cq097im0kz41fy4c5cjxna4xxic";
|
sha256 = "0bzc48vdrnd6n9qcm8ms7wrjm2yl7h9dik32arwdxx56vb7jhv08";
|
||||||
name = "plasma-nm-5.24.3.tar.xz";
|
name = "plasma-nm-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-pa = {
|
plasma-pa = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-pa-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-pa-5.24.4.tar.xz";
|
||||||
sha256 = "0n87rb04izd0ix50iy2dgj6yzzr626vhpfk76lnqr57jz6fbx3z1";
|
sha256 = "09fkaq2zzicgr214zi2wf7cirffm7mwh55bivvafblp1wlavkrgz";
|
||||||
name = "plasma-pa-5.24.3.tar.xz";
|
name = "plasma-pa-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-sdk = {
|
plasma-sdk = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-sdk-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-sdk-5.24.4.tar.xz";
|
||||||
sha256 = "0g6nypqsbmsp9msixd7p25lk58zismdamkp41f5lx3cbb49x1fpr";
|
sha256 = "1zkggp9a1yz5mwwvndizwlan6wlb2fy8n940ljnhldccl91mgwzc";
|
||||||
name = "plasma-sdk-5.24.3.tar.xz";
|
name = "plasma-sdk-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-systemmonitor = {
|
plasma-systemmonitor = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-systemmonitor-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-systemmonitor-5.24.4.tar.xz";
|
||||||
sha256 = "17a3q1az4d3xpk2ifqsj6sz7r4apxy58kk2r2l14p6s6aszhqk4h";
|
sha256 = "0jcsmmg0asf2npl3f1nbzazz3i8m9b34q55088k8jjakwwxqbwhz";
|
||||||
name = "plasma-systemmonitor-5.24.3.tar.xz";
|
name = "plasma-systemmonitor-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-tests = {
|
plasma-tests = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-tests-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-tests-5.24.4.tar.xz";
|
||||||
sha256 = "1x5hr465kj3dg6c335lji2lxvp7cbn86181l78qk4l75sj1ss721";
|
sha256 = "1ms298h9wghj9gpi7laf1dsd7s3yiycy44k4s5v4id8vfarnbs27";
|
||||||
name = "plasma-tests-5.24.3.tar.xz";
|
name = "plasma-tests-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-thunderbolt = {
|
plasma-thunderbolt = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-thunderbolt-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-thunderbolt-5.24.4.tar.xz";
|
||||||
sha256 = "1px5vfk37ak6hj6q3ipljj2dpazdbgdsga6nbkwcfn31708c7gjj";
|
sha256 = "1cqabdsg8v8b00ppbabrg2gih16lf79lr5i8mqvjnc73npacvzhy";
|
||||||
name = "plasma-thunderbolt-5.24.3.tar.xz";
|
name = "plasma-thunderbolt-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-vault = {
|
plasma-vault = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-vault-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-vault-5.24.4.tar.xz";
|
||||||
sha256 = "0f5yhz7qz4bqj7mc7hv7mvh2ji82pp02c901ws5cwwsh23yrhjcd";
|
sha256 = "0rj9z2c52mya2fjm4bimqz5z3lj2qg764zri6bqwrgwgsjwc4s81";
|
||||||
name = "plasma-vault-5.24.3.tar.xz";
|
name = "plasma-vault-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-workspace = {
|
plasma-workspace = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-5.24.4.tar.xz";
|
||||||
sha256 = "1d1a8k75q0rdbbwkx8p1i38hc6xv9kggvfm6973lh3q0pc75qk0h";
|
sha256 = "0w7cnawnpcg5zk9bycjcnc8yfz21whrhd9h2z7hizgfnj2q403jv";
|
||||||
name = "plasma-workspace-5.24.3.tar.xz";
|
name = "plasma-workspace-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plasma-workspace-wallpapers = {
|
plasma-workspace-wallpapers = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-wallpapers-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-wallpapers-5.24.4.tar.xz";
|
||||||
sha256 = "0j1qqjc27grh3k02dgfb657ps11gym28lc9hzcw3qdxkf3djw9fs";
|
sha256 = "0hpg7nn5wsn56my48jk225x1qb70sgf3hf8q5swwqc1xc6xzcg14";
|
||||||
name = "plasma-workspace-wallpapers-5.24.3.tar.xz";
|
name = "plasma-workspace-wallpapers-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
plymouth-kcm = {
|
plymouth-kcm = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/plymouth-kcm-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/plymouth-kcm-5.24.4.tar.xz";
|
||||||
sha256 = "196nx8h54bnnrly12zvnwl22ksr9nk2mi6g39k4xmp28agw94jv5";
|
sha256 = "0s5h25vyk5yzipwj91rb62xzgi6aafpwikh7ibpmmh2wn71x3amr";
|
||||||
name = "plymouth-kcm-5.24.3.tar.xz";
|
name = "plymouth-kcm-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
polkit-kde-agent = {
|
polkit-kde-agent = {
|
||||||
version = "1-5.24.3";
|
version = "1-5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/polkit-kde-agent-1-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/polkit-kde-agent-1-5.24.4.tar.xz";
|
||||||
sha256 = "1mbr8xpjvd8w9b5nd6k8fxcnjykzzygwqk19il4wirqyh4n3k3bq";
|
sha256 = "1bc5ss6v4d7kwk1chhvpis5srs8lfypims46wgxjncyhjg2lcllm";
|
||||||
name = "polkit-kde-agent-1-5.24.3.tar.xz";
|
name = "polkit-kde-agent-1-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
powerdevil = {
|
powerdevil = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/powerdevil-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/powerdevil-5.24.4.tar.xz";
|
||||||
sha256 = "047h4lz8d1kdyakh5x7fr3kpk35r38z39vm7wb974rd9hjz7alj9";
|
sha256 = "0sjlx5fhfdld1i352adi2bhyd29ja9lbmzhfxgnvmpfl6q7c0w7g";
|
||||||
name = "powerdevil-5.24.3.tar.xz";
|
name = "powerdevil-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
qqc2-breeze-style = {
|
qqc2-breeze-style = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/qqc2-breeze-style-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/qqc2-breeze-style-5.24.4.tar.xz";
|
||||||
sha256 = "1y21ldxwlb12kfqzxpyhdw9lkcaf5sfamwhg68r512hy785sg490";
|
sha256 = "1d0cgsxvnm0zza7n5hz47n28yrr35hp0vniggifncm0ag8sn0kmd";
|
||||||
name = "qqc2-breeze-style-5.24.3.tar.xz";
|
name = "qqc2-breeze-style-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
sddm-kcm = {
|
sddm-kcm = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/sddm-kcm-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/sddm-kcm-5.24.4.tar.xz";
|
||||||
sha256 = "15n6drklwk3lmiaklw1af98qcixml4w83hngy23lwwv2lbnirl6h";
|
sha256 = "0pfqp5das7pxpmh111i2dlfqm6xzzd99bcb32bbmd9v6w2wlgwxy";
|
||||||
name = "sddm-kcm-5.24.3.tar.xz";
|
name = "sddm-kcm-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemsettings = {
|
systemsettings = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/systemsettings-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/systemsettings-5.24.4.tar.xz";
|
||||||
sha256 = "11fmjdh6v0a4gacqshhrk374i07px989p3x70w8438gr6y0n2032";
|
sha256 = "0cqm7s89jvzqz1fw32284ppnm3dc69yvc8bqqgw5jdbbjnc1z4k9";
|
||||||
name = "systemsettings-5.24.3.tar.xz";
|
name = "systemsettings-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
xdg-desktop-portal-kde = {
|
xdg-desktop-portal-kde = {
|
||||||
version = "5.24.3";
|
version = "5.24.4";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${mirror}/stable/plasma/5.24.3/xdg-desktop-portal-kde-5.24.3.tar.xz";
|
url = "${mirror}/stable/plasma/5.24.4/xdg-desktop-portal-kde-5.24.4.tar.xz";
|
||||||
sha256 = "06qdr7j2m9s9l60mk8vspb2173va10zdv6sinhmkhxxp78h857z6";
|
sha256 = "07nwb6ff8rnlk2play9gar52d8d44b8y412hnx9a9d4b50b4js0i";
|
||||||
name = "xdg-desktop-portal-kde-5.24.3.tar.xz";
|
name = "xdg-desktop-portal-kde-5.24.4.tar.xz";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
|
|
||||||
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
|
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
|
||||||
|
|
||||||
} // lib.optionalAttrs (config.allowAliases or true) {
|
} // lib.optionalAttrs config.allowAliases {
|
||||||
#### ALIASES - added 2018-01
|
#### ALIASES - added 2018-01
|
||||||
|
|
||||||
terminal = xfce4-terminal;
|
terminal = xfce4-terminal;
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,7 @@ let majorVersion = "6";
|
||||||
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
|
] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
|
||||||
++ optional noSysDirs ../no-sys-dirs.patch
|
++ optional noSysDirs ../no-sys-dirs.patch
|
||||||
++ optional langAda ../gnat-cflags.patch
|
++ optional langAda ../gnat-cflags.patch
|
||||||
|
++ optional langAda ./gnat-glibc234.patch
|
||||||
++ optional langFortran ../gfortran-driving.patch
|
++ optional langFortran ../gfortran-driving.patch
|
||||||
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
|
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
|
||||||
|
|
||||||
|
|
|
||||||
30
pkgs/development/compilers/gcc/6/gnat-glibc234.patch
Normal file
30
pkgs/development/compilers/gcc/6/gnat-glibc234.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
||||||
|
Fix build with glibc 2.34. Adapted from:
|
||||||
|
https://github.com/gcc-mirror/gcc/commit/331763de7d4850702a0f67298f36017c73cdb103
|
||||||
|
--- a/gcc/ada/init.c
|
||||||
|
+++ b/gcc/ada/init.c
|
||||||
|
@@ -579,12 +579,8 @@
|
||||||
|
|
||||||
|
#ifndef __ia64__
|
||||||
|
#define HAVE_GNAT_ALTERNATE_STACK 1
|
||||||
|
-/* This must be in keeping with System.OS_Interface.Alternate_Stack_Size.
|
||||||
|
- It must be larger than MINSIGSTKSZ and hopefully near 2 * SIGSTKSZ. */
|
||||||
|
-# if 16 * 1024 < MINSIGSTKSZ
|
||||||
|
-# error "__gnat_alternate_stack too small"
|
||||||
|
-# endif
|
||||||
|
-char __gnat_alternate_stack[16 * 1024];
|
||||||
|
+/* This must be in keeping with System.OS_Interface.Alternate_Stack_Size. */
|
||||||
|
+char __gnat_alternate_stack[32 * 1024];
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __XENO__
|
||||||
|
--- a/gcc/ada/s-osinte-linux.ads
|
||||||
|
+++ b/gcc/ada/s-osinte-linux.ads
|
||||||
|
@@ -328,7 +328,7 @@
|
||||||
|
oss : access stack_t) return int;
|
||||||
|
pragma Import (C, sigaltstack, "sigaltstack");
|
||||||
|
|
||||||
|
- Alternate_Stack_Size : constant := 16 * 1024;
|
||||||
|
+ Alternate_Stack_Size : constant := 32 * 1024;
|
||||||
|
-- This must be in keeping with init.c:__gnat_alternate_stack
|
||||||
|
|
||||||
|
Alternate_Stack : aliased char_array (1 .. Alternate_Stack_Size);
|
||||||
|
|
@ -83,6 +83,11 @@ let majorVersion = "9";
|
||||||
sha256 = ""; # TODO: uncomment and check hash when available.
|
sha256 = ""; # TODO: uncomment and check hash when available.
|
||||||
}) */
|
}) */
|
||||||
++ optional langAda ../gnat-cflags.patch
|
++ optional langAda ../gnat-cflags.patch
|
||||||
|
++ optional langAda (fetchpatch {
|
||||||
|
name = "gnat-glibc-234.diff";
|
||||||
|
url = "https://github.com/gcc-mirror/gcc/commit/331763de7d4850702a0f67298f36017c73cdb103.diff";
|
||||||
|
sha256 = "eS4B7vJasnv2N+5v5yB8/iDpKPX8CJDAy2xabWWj+aU=";
|
||||||
|
})
|
||||||
++ optional langD ../libphobos.patch
|
++ optional langD ../libphobos.patch
|
||||||
++ optional langFortran ../gfortran-driving.patch
|
++ optional langFortran ../gfortran-driving.patch
|
||||||
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
|
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,10 @@ mkCoqDerivation {
|
||||||
|
|
||||||
releaseRev = v: "v${v}";
|
releaseRev = v: "v${v}";
|
||||||
|
|
||||||
|
release."8.15.1".sha256 = "sha256:0k2sl3ns897a5ll11bazgpv4ppgi1vmx4n89v2dnxabm5dglyglp";
|
||||||
|
release."8.14.1".sha256 = "sha256:1w99jgm7mxwdxnalxhralmhmpwwbd52pbbifq0mx13ixkv6iqm1a";
|
||||||
release."8.14.0".sha256 = "04x47ngb95m1h4jw2gl0v79s5im7qimcw7pafc34gkkf51pyhakp";
|
release."8.14.0".sha256 = "04x47ngb95m1h4jw2gl0v79s5im7qimcw7pafc34gkkf51pyhakp";
|
||||||
|
release."8.13.2".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTa=";
|
||||||
release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY=";
|
release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY=";
|
||||||
release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM=";
|
release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM=";
|
||||||
release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU=";
|
release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU=";
|
||||||
|
|
@ -18,8 +21,9 @@ mkCoqDerivation {
|
||||||
|
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with versions; switch coq.coq-version [
|
defaultVersion = with versions; switch coq.coq-version [
|
||||||
{ case = "8.14"; out = "8.14.0"; }
|
{ case = "8.15"; out = "8.15.1"; }
|
||||||
{ case = "8.13"; out = "8.13.0"; }
|
{ case = "8.14"; out = "8.14.1"; }
|
||||||
|
{ case = "8.13"; out = "8.13.2"; }
|
||||||
{ case = "8.12"; out = "8.12.0"; }
|
{ case = "8.12"; out = "8.12.0"; }
|
||||||
{ case = "8.11"; out = "8.11.0"; }
|
{ case = "8.11"; out = "8.11.0"; }
|
||||||
{ case = "8.10"; out = "8.10.0"; }
|
{ case = "8.10"; out = "8.10.0"; }
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,13 @@ with lib; mkCoqDerivation {
|
||||||
owner = "thery";
|
owner = "thery";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with versions; switch coq.coq-version [
|
defaultVersion = with versions; switch coq.coq-version [
|
||||||
{ case = range "8.12" "8.14"; out = "8.14.1"; }
|
{ case = range "8.12" "8.15"; out = "8.15"; }
|
||||||
{ case = range "8.10" "8.11"; out = "8.10"; }
|
{ case = range "8.10" "8.11"; out = "8.10"; }
|
||||||
{ case = range "8.8" "8.9"; out = "8.8"; }
|
{ case = range "8.8" "8.9"; out = "8.8"; }
|
||||||
{ case = "8.7"; out = "8.7.2"; }
|
{ case = "8.7"; out = "8.7.2"; }
|
||||||
] null;
|
] null;
|
||||||
|
|
||||||
|
release."8.15".sha256 = "sha256:1zr2q52r08na8265019pj9spcz982ivixk6cnzk6l1srn2g328gv";
|
||||||
release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7";
|
release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7";
|
||||||
release."8.12".sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj";
|
release."8.12".sha256 = "1slka4w0pya15js4drx9frj7lxyp3k2lzib8v23givzpnxs8ijdj";
|
||||||
release."8.10".sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
|
release."8.10".sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz";
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,13 @@ mkCoqDerivation {
|
||||||
pname = "relation-algebra";
|
pname = "relation-algebra";
|
||||||
owner = "damien-pous";
|
owner = "damien-pous";
|
||||||
|
|
||||||
releaseRev = v: "v${v}";
|
releaseRev = v:
|
||||||
|
if versions.isGe "1.7.6" v
|
||||||
|
then "v.${v}"
|
||||||
|
else "v${v}";
|
||||||
|
|
||||||
|
release."1.7.7".sha256 = "sha256:1dff3id6nypl2alhk9rcifj3dab0j78dym05blc525lawsmc26l2";
|
||||||
|
release."1.7.6".sha256 = "sha256:02gsj06zcy9zgd0h1ibqspwfiwm36pkkgg9cz37k4bxzcapxcr6w";
|
||||||
release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU=";
|
release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU=";
|
||||||
release."1.7.4".sha256 = "sha256-o+v2CIAa2+9tJ/V8DneDTf4k31KMHycgMBLaQ+A4ufM=";
|
release."1.7.4".sha256 = "sha256-o+v2CIAa2+9tJ/V8DneDTf4k31KMHycgMBLaQ+A4ufM=";
|
||||||
release."1.7.3".sha256 = "sha256-4feSNfi7h4Yhwn5L+9KP9K1S7HCPvsvaVWwoQSTFvos=";
|
release."1.7.3".sha256 = "sha256-4feSNfi7h4Yhwn5L+9KP9K1S7HCPvsvaVWwoQSTFvos=";
|
||||||
|
|
@ -15,6 +20,8 @@ mkCoqDerivation {
|
||||||
|
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with versions; switch coq.coq-version [
|
defaultVersion = with versions; switch coq.coq-version [
|
||||||
|
{ case = isEq "8.15"; out = "1.7.7"; }
|
||||||
|
{ case = isEq "8.14"; out = "1.7.6"; }
|
||||||
{ case = isEq "8.13"; out = "1.7.5"; }
|
{ case = isEq "8.13"; out = "1.7.5"; }
|
||||||
{ case = isEq "8.12"; out = "1.7.4"; }
|
{ case = isEq "8.12"; out = "1.7.4"; }
|
||||||
{ case = isEq "8.11"; out = "1.7.3"; }
|
{ case = isEq "8.11"; out = "1.7.3"; }
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,7 @@
|
||||||
|
|
||||||
yampa = callPackage ./yampa.nix {};
|
yampa = callPackage ./yampa.nix {};
|
||||||
|
|
||||||
} // builtins_ // pkgs.lib.optionalAttrs (config.allowAliases or true) {
|
} // builtins_ // pkgs.lib.optionalAttrs config.allowAliases {
|
||||||
# removed packages
|
# removed packages
|
||||||
protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06
|
protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ with pkgs;
|
||||||
optionalExtensions = cond: as: if cond then as else [];
|
optionalExtensions = cond: as: if cond then as else [];
|
||||||
python2Extension = import ../../../top-level/python2-packages.nix;
|
python2Extension = import ../../../top-level/python2-packages.nix;
|
||||||
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);
|
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);
|
||||||
aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ../../../top-level/python-aliases.nix lib self super);
|
aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
|
||||||
in lib.makeScopeWithSplicing
|
in lib.makeScopeWithSplicing
|
||||||
pkgs.splicePackages
|
pkgs.splicePackages
|
||||||
pkgs.newScope
|
pkgs.newScope
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@ stdenv.mkDerivation {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "scheme";
|
owner = "scheme";
|
||||||
repo = "scsh";
|
repo = "scsh";
|
||||||
rev = "f99b8c5293628cfeaeb792019072e3a96841104f";
|
rev = "4acf6e4ed7b65b46186ef0c9c2a1e10bef8dc052";
|
||||||
sha256 = "sha256-vcVtqoUhozdJq1beUN8/rcI2qOJYUN+0CPSiDWGCIjI=";
|
sha256 = "sha256-92NtMK5nVd6+WtHj/Rk6iQEkGsNEZySTVZkkbqKrLYY=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{ callPackage, ... } @ args:
|
|
||||||
|
|
||||||
callPackage ./generic.nix (args // {
|
|
||||||
baseVersion = "1.10";
|
|
||||||
revision = "17";
|
|
||||||
sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8";
|
|
||||||
sourceExtension = "tgz";
|
|
||||||
extraConfigureFlags = "--with-gnump";
|
|
||||||
postPatch = ''
|
|
||||||
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
|
|
||||||
'';
|
|
||||||
knownVulnerabilities = [
|
|
||||||
"CVE-2021-40529"
|
|
||||||
# https://botan.randombit.net/security.html#id1
|
|
||||||
"2020-03-24: Side channel during CBC padding"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
|
|
@ -36,7 +36,6 @@
|
||||||
, withDocs ? true
|
, withDocs ? true
|
||||||
, doxygen
|
, doxygen
|
||||||
, graphviz
|
, graphviz
|
||||||
, texlive
|
|
||||||
|
|
||||||
, withExamples ? true
|
, withExamples ? true
|
||||||
, withShared ? true
|
, withShared ? true
|
||||||
|
|
@ -44,11 +43,6 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
onOff = value: if value then "ON" else "OFF";
|
onOff = value: if value then "ON" else "OFF";
|
||||||
tex = texlive.combine {
|
|
||||||
inherit (texlive)
|
|
||||||
scheme-medium varwidth multirow hanging adjustbox collectbox stackengine
|
|
||||||
sectsty tocloft newunicodechar etoc;
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fltk";
|
pname = "fltk";
|
||||||
|
|
@ -81,7 +75,6 @@ stdenv.mkDerivation rec {
|
||||||
] ++ lib.optionals withDocs [
|
] ++ lib.optionals withDocs [
|
||||||
doxygen
|
doxygen
|
||||||
graphviz
|
graphviz
|
||||||
tex
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
|
@ -149,9 +142,9 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# Docs
|
# Docs
|
||||||
"-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}"
|
"-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}"
|
||||||
"-DOPTION_BUILD_PDF_DOCUMENTATION=${onOff withDocs}"
|
"-DOPTION_BUILD_PDF_DOCUMENTATION=OFF"
|
||||||
"-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
|
"-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
|
||||||
"-DOPTION_INSTALL_PDF_DOCUMENTATION=${onOff withDocs}"
|
"-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF"
|
||||||
"-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
|
"-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gdcm";
|
pname = "gdcm";
|
||||||
version = "3.0.11";
|
version = "3.0.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "malaterre";
|
owner = "malaterre";
|
||||||
repo = "GDCM";
|
repo = "GDCM";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-rGR0yQImLG3kBp6/QoEMLFrFtgAIN6y9lZ3OmtAUVcY=";
|
sha256 = "sha256-ChHsbnX+128ZOugL6Nc8EqfaDMaNMNDmKTN55pyyem8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "globalplatform";
|
|
||||||
version = "6.0.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
|
|
||||||
sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
|
||||||
buildInputs = [ zlib openssl_1_0_2 pcsclite ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
|
|
||||||
description = "Library for interacting with smart card devices";
|
|
||||||
license = licenses.gpl3;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "gppcscconnectionplugin";
|
|
||||||
version = "1.1.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
|
|
||||||
sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
|
||||||
buildInputs = [ globalplatform openssl_1_0_2 pcsclite ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
|
|
||||||
description = "GlobalPlatform pcsc connection plugin";
|
|
||||||
license = [ licenses.lgpl3 licenses.gpl3 ];
|
|
||||||
platforms = platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||||
replacement for NCURSES on existing systems.
|
replacement for NCURSES on existing systems.
|
||||||
'';
|
'';
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ jb55 AndersonTorres ];
|
maintainers = with maintainers; [ AndersonTorres ];
|
||||||
inherit (ncurses.meta) platforms;
|
inherit (ncurses.meta) platforms;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/Configure b/Configure
|
|
||||||
index 494e0b3..0b448aa 100755
|
|
||||||
--- a/Configure
|
|
||||||
+++ b/Configure
|
|
||||||
@@ -652,6 +652,8 @@ my %table=(
|
|
||||||
"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
|
||||||
"debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
|
||||||
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
|
||||||
+"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
|
||||||
+"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
|
||||||
# iPhoneOS/iOS
|
|
||||||
"iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
|
|
||||||
index e6d0e6e1a6..b89456fd87 100644
|
|
||||||
--- a/crypto/x509/by_file.c
|
|
||||||
+++ b/crypto/x509/by_file.c
|
|
||||||
@@ -97,7 +97,10 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
|
|
||||||
switch (cmd) {
|
|
||||||
case X509_L_FILE_LOAD:
|
|
||||||
if (argl == X509_FILETYPE_DEFAULT) {
|
|
||||||
- file = ossl_safe_getenv(X509_get_default_cert_file_env());
|
|
||||||
+ file = ossl_safe_getenv("NIX_SSL_CERT_FILE");
|
|
||||||
+
|
|
||||||
+ if (!file)
|
|
||||||
+ file = ossl_safe_getenv(X509_get_default_cert_file_env());
|
|
||||||
|
|
||||||
if (file)
|
|
||||||
ok = (X509_load_cert_crl_file(ctx, file,
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
|
|
||||||
--- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100
|
|
||||||
+++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100
|
|
||||||
@@ -81,8 +81,8 @@
|
|
||||||
|
|
||||||
# ifndef OPENSSL_SYS_VMS
|
|
||||||
# define X509_CERT_AREA OPENSSLDIR
|
|
||||||
# define X509_CERT_DIR OPENSSLDIR "/certs"
|
|
||||||
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
|
||||||
+# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
|
|
||||||
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
|
|
||||||
# else
|
|
||||||
# define X509_CERT_AREA "SSLROOT:[000000]"
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
|
|
||||||
--- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100
|
|
||||||
+++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100
|
|
||||||
@@ -81,8 +81,8 @@
|
|
||||||
|
|
||||||
# ifndef OPENSSL_SYS_VMS
|
|
||||||
# define X509_CERT_AREA OPENSSLDIR
|
|
||||||
# define X509_CERT_DIR OPENSSLDIR "/certs"
|
|
||||||
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
|
|
||||||
+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
|
|
||||||
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
|
|
||||||
# else
|
|
||||||
# define X509_CERT_AREA "SSLROOT:[000000]"
|
|
||||||
|
|
@ -1,82 +0,0 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, perl, zlib
|
|
||||||
, withCryptodev ? false, cryptodev
|
|
||||||
}:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "openssl-chacha";
|
|
||||||
version = "2016-08-22";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "PeterMosmans";
|
|
||||||
repo = "openssl";
|
|
||||||
rev = "293717318e903b95f4d7e83a98a087282f37efc3";
|
|
||||||
sha256 = "134j3anjnj2q99xsd8d47bwvjp73qkdsimdd9riyjxa3hd8ysr00";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "man" ];
|
|
||||||
setOutputFlags = false;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ perl zlib ];
|
|
||||||
buildInputs = lib.optional withCryptodev cryptodev;
|
|
||||||
|
|
||||||
configureScript = "./config";
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"zlib"
|
|
||||||
"shared"
|
|
||||||
"experimental-jpake"
|
|
||||||
"enable-md2"
|
|
||||||
"enable-rc5"
|
|
||||||
"enable-rfc3779"
|
|
||||||
"enable-gost"
|
|
||||||
"--libdir=lib"
|
|
||||||
"--openssldir=etc/ssl"
|
|
||||||
] ++ lib.optionals withCryptodev [
|
|
||||||
"-DHAVE_CRYPTODEV"
|
|
||||||
"-DUSE_CRYPTODEV_DIGESTS"
|
|
||||||
];
|
|
||||||
|
|
||||||
makeFlags = [
|
|
||||||
"MANDIR=$(man)/share/man"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Parallel building is broken in OpenSSL.
|
|
||||||
enableParallelBuilding = false;
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
# If we're building dynamic libraries, then don't install static
|
|
||||||
# libraries.
|
|
||||||
if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
|
|
||||||
rm "$out/lib/"*.a
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p $bin
|
|
||||||
mv $out/bin $bin/
|
|
||||||
|
|
||||||
mkdir $dev
|
|
||||||
mv $out/include $dev/
|
|
||||||
|
|
||||||
# remove dependency on Perl at runtime
|
|
||||||
rm -r $out/etc/ssl/misc
|
|
||||||
|
|
||||||
rmdir $out/etc/ssl/{certs,private}
|
|
||||||
'';
|
|
||||||
|
|
||||||
postFixup = ''
|
|
||||||
# Check to make sure we don't depend on perl
|
|
||||||
if grep -r '${perl}' $out; then
|
|
||||||
echo "Found an erroneous dependency on perl ^^^" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://www.openssl.org/";
|
|
||||||
description = "A cryptographic library that implements the SSL and TLS protocols";
|
|
||||||
platforms = [ "x86_64-linux" ];
|
|
||||||
maintainers = [ lib.maintainers.cstrahan ];
|
|
||||||
license = licenses.openssl;
|
|
||||||
priority = 10; # resolves collision with ‘man-pages’
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -170,20 +170,6 @@ let
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
openssl_1_0_2 = common {
|
|
||||||
version = "1.0.2u";
|
|
||||||
sha256 = "ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16";
|
|
||||||
patches = [
|
|
||||||
./1.0.2/nix-ssl-cert-file.patch
|
|
||||||
|
|
||||||
(if stdenv.hostPlatform.isDarwin
|
|
||||||
then ./1.0.2/use-etc-ssl-certs-darwin.patch
|
|
||||||
else ./1.0.2/use-etc-ssl-certs.patch)
|
|
||||||
] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [
|
|
||||||
./1.0.2/darwin64-arm64.patch
|
|
||||||
];
|
|
||||||
extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ];
|
|
||||||
};
|
|
||||||
|
|
||||||
openssl_1_1 = common rec {
|
openssl_1_1 = common rec {
|
||||||
version = "1.1.1n";
|
version = "1.1.1n";
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A C++ framework for property based testing inspired by QuickCheck";
|
description = "A C++ framework for property based testing inspired by QuickCheck";
|
||||||
inherit (src.meta) homepage;
|
inherit (src.meta) homepage;
|
||||||
maintainers = with maintainers; [ jb55 ];
|
maintainers = with maintainers; [ ];
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -297,10 +297,6 @@ with prev;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ]
|
nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ]
|
||||||
++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ];
|
++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ];
|
||||||
|
|
||||||
# Fixup linking libluv.dylib, for some reason it's not linked against lua correctly.
|
|
||||||
NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin
|
|
||||||
(if isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua");
|
|
||||||
};
|
};
|
||||||
|
|
||||||
luv = prev.lib.overrideLuarocks prev.luv (drv: {
|
luv = prev.lib.overrideLuarocks prev.luv (drv: {
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,47 @@
|
||||||
{ lib, buildPythonPackage, fetchPypi, jsonconversion, six, pytestCheckHook }:
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, jsonconversion
|
||||||
|
, six
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "amazon-ion";
|
pname = "amazon-ion";
|
||||||
version = "0.8.0";
|
version = "0.9.1";
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "amazon.ion";
|
pname = "amazon.ion";
|
||||||
inherit version;
|
inherit version;
|
||||||
sha256 = "sha256-vtztUHSnGoPYozhwvigxEdieVtbKNfV4B5yZ4MHaWGw=";
|
hash = "sha256-Moq1e7LmI0L7DHg6UNYvseEDbqdL23aCwL38wDm3yCA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py --replace "'pytest-runner'," ""
|
substituteInPlace setup.py \
|
||||||
|
--replace "'pytest-runner'," ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ jsonconversion six ];
|
propagatedBuildInputs = [
|
||||||
|
jsonconversion
|
||||||
|
six
|
||||||
|
];
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ];
|
checkInputs = [
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [ "amazon.ion" ];
|
pythonImportsCheck = [
|
||||||
|
"amazon.ion"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Python implementation of Amazon Ion";
|
description = "Python implementation of Amazon Ion";
|
||||||
homepage = "https://github.com/amzn/ion-python";
|
homepage = "https://github.com/amzn/ion-python";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = [ maintainers.terlar ];
|
maintainers = with maintainers; [ terlar ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,14 +7,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dotmap";
|
pname = "dotmap";
|
||||||
version = "1.3.27";
|
version = "1.3.28";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-gHCQIN8CIeF8TgHWeQu8GCRxK1aQFJJ/d7jZurxxMik=";
|
hash = "sha256-riqDYqtjstyx681zz80aZ6hBizNw4V3NOusInHGlXoI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "goodwe";
|
pname = "goodwe";
|
||||||
version = "0.2.16";
|
version = "0.2.17";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||||
owner = "marcelblijleven";
|
owner = "marcelblijleven";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-qW1wD6QVLqGhEnpGqNjZ50jb/3HHooohfHz+p4/ZH74=";
|
sha256 = "sha256-Lx7jvL7Fyq8fqJQq8ZgEG/V20+tHxw3yl3s7scAwwjA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [
|
checkInputs = [
|
||||||
|
|
|
||||||
|
|
@ -1,170 +0,0 @@
|
||||||
{ lib
|
|
||||||
, fetchFromGitHub
|
|
||||||
, fetchurl
|
|
||||||
, buildPythonPackage
|
|
||||||
, pkgsStatic
|
|
||||||
, openssl_1_1
|
|
||||||
, openssl_1_0_2
|
|
||||||
, invoke
|
|
||||||
, tls-parser
|
|
||||||
, cacert
|
|
||||||
, pytestCheckHook
|
|
||||||
, pythonAtLeast
|
|
||||||
, pythonOlder
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
zlibStatic = (pkgsStatic.zlib.override {
|
|
||||||
splitStaticOutput = false;
|
|
||||||
}).overrideAttrs (oldAttrs: {
|
|
||||||
NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE} -fPIC";
|
|
||||||
});
|
|
||||||
nasslOpensslArgs = {
|
|
||||||
static = true;
|
|
||||||
enableSSL2 = true;
|
|
||||||
};
|
|
||||||
nasslOpensslFlagsCommon = [
|
|
||||||
"zlib"
|
|
||||||
"no-zlib-dynamic"
|
|
||||||
"no-shared"
|
|
||||||
"--with-zlib-lib=${zlibStatic.out}/lib"
|
|
||||||
"--with-zlib-include=${zlibStatic.out.dev}/include"
|
|
||||||
"enable-rc5"
|
|
||||||
"enable-md2"
|
|
||||||
"enable-gost"
|
|
||||||
"enable-cast"
|
|
||||||
"enable-idea"
|
|
||||||
"enable-ripemd"
|
|
||||||
"enable-mdc2"
|
|
||||||
"-fPIC"
|
|
||||||
];
|
|
||||||
opensslStatic = (openssl_1_1.override nasslOpensslArgs).overrideAttrs (
|
|
||||||
oldAttrs: rec {
|
|
||||||
name = "openssl-${version}";
|
|
||||||
version = "1.1.1h";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://www.openssl.org/source/${name}.tar.gz";
|
|
||||||
sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
|
|
||||||
};
|
|
||||||
configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [
|
|
||||||
"enable-weak-ssl-ciphers"
|
|
||||||
"enable-tls1_3"
|
|
||||||
"no-async"
|
|
||||||
];
|
|
||||||
patches = builtins.filter
|
|
||||||
(
|
|
||||||
p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch"
|
|
||||||
)
|
|
||||||
oldAttrs.patches;
|
|
||||||
buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
|
|
||||||
meta = oldAttrs.meta // {
|
|
||||||
knownVulnerabilities = [
|
|
||||||
"CVE-2020-1971"
|
|
||||||
"CVE-2021-23840"
|
|
||||||
"CVE-2021-23841"
|
|
||||||
"CVE-2021-3449"
|
|
||||||
"CVE-2021-3450"
|
|
||||||
"CVE-2021-3711"
|
|
||||||
"CVE-2021-3712"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
|
||||||
opensslLegacyStatic = (openssl_1_0_2.override nasslOpensslArgs).overrideAttrs (
|
|
||||||
oldAttrs: rec {
|
|
||||||
name = "openssl-${version}";
|
|
||||||
version = "1.0.2e";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://www.openssl.org/source/${name}.tar.gz";
|
|
||||||
sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";
|
|
||||||
};
|
|
||||||
configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon;
|
|
||||||
patches = builtins.filter
|
|
||||||
(
|
|
||||||
p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch"
|
|
||||||
)
|
|
||||||
oldAttrs.patches;
|
|
||||||
buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ];
|
|
||||||
# openssl_1_0_2 needs `withDocs = false`
|
|
||||||
outputs = lib.remove "doc" oldAttrs.outputs;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
in
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "nassl";
|
|
||||||
version = "4.0.2";
|
|
||||||
format = "setuptools";
|
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "nabla-c0d3";
|
|
||||||
repo = pname;
|
|
||||||
rev = version;
|
|
||||||
hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU=";
|
|
||||||
};
|
|
||||||
|
|
||||||
postPatch =
|
|
||||||
let
|
|
||||||
legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version;
|
|
||||||
modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version;
|
|
||||||
zlibVersion = zlibStatic.version;
|
|
||||||
in
|
|
||||||
''
|
|
||||||
mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
|
|
||||||
cp ${opensslLegacyStatic.out}/lib/libssl.a \
|
|
||||||
${opensslLegacyStatic.out}/lib/libcrypto.a \
|
|
||||||
deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
|
|
||||||
ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include
|
|
||||||
ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps
|
|
||||||
|
|
||||||
mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/
|
|
||||||
cp ${opensslStatic.out}/lib/libssl.a \
|
|
||||||
${opensslStatic.out}/lib/libcrypto.a \
|
|
||||||
deps/openssl-OpenSSL_${modernOpenSSLVersion}/
|
|
||||||
ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include
|
|
||||||
ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps
|
|
||||||
|
|
||||||
mkdir -p deps/zlib-${zlibVersion}/
|
|
||||||
cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
invoke
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
tls-parser
|
|
||||||
];
|
|
||||||
|
|
||||||
checkInputs = [
|
|
||||||
pytestCheckHook
|
|
||||||
];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
invoke build.nassl
|
|
||||||
invoke package.wheel
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
pythonImportsCheck = [
|
|
||||||
"nassl"
|
|
||||||
];
|
|
||||||
|
|
||||||
disabledTests = [
|
|
||||||
"Online"
|
|
||||||
] ++ lib.optionals (pythonAtLeast "3.10") [
|
|
||||||
"test_write_bad"
|
|
||||||
"test_client_authentication_no_certificate_supplied"
|
|
||||||
"test_client_authentication_succeeds"
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Low-level OpenSSL wrapper for Python";
|
|
||||||
homepage = "https://github.com/nabla-c0d3/nassl";
|
|
||||||
license = licenses.agpl3Only;
|
|
||||||
maintainers = with maintainers; [ veehaitch ];
|
|
||||||
platforms = with platforms; linux ++ darwin;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
79
pkgs/development/python-modules/numba/cuda_path.patch
Normal file
79
pkgs/development/python-modules/numba/cuda_path.patch
Normal file
|
|
@ -0,0 +1,79 @@
|
||||||
|
diff --git a/numba/cuda/cuda_paths.py b/numba/cuda/cuda_paths.py
|
||||||
|
index b9988bc..a642680 100644
|
||||||
|
--- a/numba/cuda/cuda_paths.py
|
||||||
|
+++ b/numba/cuda/cuda_paths.py
|
||||||
|
@@ -24,10 +24,7 @@ def _find_valid_path(options):
|
||||||
|
|
||||||
|
def _get_libdevice_path_decision():
|
||||||
|
options = [
|
||||||
|
- ('Conda environment', get_conda_ctk()),
|
||||||
|
- ('CUDA_HOME', get_cuda_home('nvvm', 'libdevice')),
|
||||||
|
- ('System', get_system_ctk('nvvm', 'libdevice')),
|
||||||
|
- ('Debian package', get_debian_pkg_libdevice()),
|
||||||
|
+ ('Nix store', get_nix_ctk('nvvm', 'libdevice')),
|
||||||
|
]
|
||||||
|
by, libdir = _find_valid_path(options)
|
||||||
|
return by, libdir
|
||||||
|
@@ -35,18 +32,16 @@ def _get_libdevice_path_decision():
|
||||||
|
|
||||||
|
def _nvvm_lib_dir():
|
||||||
|
if IS_WIN32:
|
||||||
|
- return 'nvvm', 'bin'
|
||||||
|
+ return 'bin',
|
||||||
|
elif IS_OSX:
|
||||||
|
- return 'nvvm', 'lib'
|
||||||
|
+ return 'lib',
|
||||||
|
else:
|
||||||
|
- return 'nvvm', 'lib64'
|
||||||
|
+ return 'lib64',
|
||||||
|
|
||||||
|
|
||||||
|
def _get_nvvm_path_decision():
|
||||||
|
options = [
|
||||||
|
- ('Conda environment', get_conda_ctk()),
|
||||||
|
- ('CUDA_HOME', get_cuda_home(*_nvvm_lib_dir())),
|
||||||
|
- ('System', get_system_ctk(*_nvvm_lib_dir())),
|
||||||
|
+ ('Nix store', get_nix_ctk(*_nvvm_lib_dir())),
|
||||||
|
]
|
||||||
|
by, path = _find_valid_path(options)
|
||||||
|
return by, path
|
||||||
|
@@ -74,14 +69,12 @@ def _cudalib_path():
|
||||||
|
elif IS_OSX:
|
||||||
|
return 'lib'
|
||||||
|
else:
|
||||||
|
- return 'lib64'
|
||||||
|
+ return 'lib'
|
||||||
|
|
||||||
|
|
||||||
|
def _get_cudalib_dir_path_decision():
|
||||||
|
options = [
|
||||||
|
- ('Conda environment', get_conda_ctk()),
|
||||||
|
- ('CUDA_HOME', get_cuda_home(_cudalib_path())),
|
||||||
|
- ('System', get_system_ctk(_cudalib_path())),
|
||||||
|
+ ('Nix store', get_nix_lib_ctk(_cudalib_path())),
|
||||||
|
]
|
||||||
|
by, libdir = _find_valid_path(options)
|
||||||
|
return by, libdir
|
||||||
|
@@ -92,6 +85,22 @@ def _get_cudalib_dir():
|
||||||
|
return _env_path_tuple(by, libdir)
|
||||||
|
|
||||||
|
|
||||||
|
+def get_nix_ctk(*subdirs):
|
||||||
|
+ """Return path to nix store cudatoolkit; or, None if it doesn't exist.
|
||||||
|
+ """
|
||||||
|
+ base = '@cuda_toolkit_path@'
|
||||||
|
+ if os.path.exists(base):
|
||||||
|
+ return os.path.join(base, *subdirs)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+def get_nix_lib_ctk(*subdirs):
|
||||||
|
+ """Return path to nix store cudatoolkit-lib; or, None if it doesn't exist.
|
||||||
|
+ """
|
||||||
|
+ base = '@cuda_toolkit_lib_path@'
|
||||||
|
+ if os.path.exists(base):
|
||||||
|
+ return os.path.join(base, *subdirs)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
def get_system_ctk(*subdirs):
|
||||||
|
"""Return path to system-wide cudatoolkit; or, None if it doesn't exist.
|
||||||
|
"""
|
||||||
|
|
@ -9,8 +9,15 @@
|
||||||
, llvmlite
|
, llvmlite
|
||||||
, setuptools
|
, setuptools
|
||||||
, libcxx
|
, libcxx
|
||||||
}:
|
, substituteAll
|
||||||
|
|
||||||
|
# CUDA-only dependencies:
|
||||||
|
, addOpenGLRunpath ? null
|
||||||
|
, cudatoolkit ? null
|
||||||
|
|
||||||
|
# CUDA flags:
|
||||||
|
, cudaSupport ? false
|
||||||
|
}:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "0.55.1";
|
version = "0.55.1";
|
||||||
pname = "numba";
|
pname = "numba";
|
||||||
|
|
@ -32,7 +39,24 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
||||||
|
|
||||||
propagatedBuildInputs = [ numpy llvmlite setuptools ];
|
propagatedBuildInputs = [ numpy llvmlite setuptools ] ++ lib.optionals cudaSupport [ cudatoolkit cudatoolkit.lib ];
|
||||||
|
|
||||||
|
nativeBuildInputs = lib.optional cudaSupport [ addOpenGLRunpath ];
|
||||||
|
|
||||||
|
patches = lib.optionals cudaSupport [
|
||||||
|
(substituteAll {
|
||||||
|
src = ./cuda_path.patch;
|
||||||
|
cuda_toolkit_path = cudatoolkit;
|
||||||
|
cuda_toolkit_lib_path = cudatoolkit.lib;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
postFixup = lib.optionalString cudaSupport ''
|
||||||
|
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
|
||||||
|
addOpenGLRunpath "$lib"
|
||||||
|
patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:$(patchelf --print-rpath "$lib")" "$lib"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
# Copy test script into $out and run the test suite.
|
# Copy test script into $out and run the test suite.
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pynetgear";
|
pname = "pynetgear";
|
||||||
version = "0.9.2";
|
version = "0.9.3";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||||
owner = "MatMaul";
|
owner = "MatMaul";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-/aPyx+jNOCW6bzeYAEBP1yfIJfQwJjo1i6WaRvAz0oU=";
|
sha256 = "sha256-zydSx2OZowf+1KZ5ZJ/1FDVqDZQZ4U0+q62eB1+s+WY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pysigma";
|
pname = "pysigma";
|
||||||
version = "0.4.4";
|
version = "0.4.5";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||||
owner = "SigmaHQ";
|
owner = "SigmaHQ";
|
||||||
repo = "pySigma";
|
repo = "pySigma";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-eZDPi87wwsM0EriJ/Y1yTSJ9R4BqvJg3YJyJUa2vLqo=";
|
hash = "sha256-jZPimSkJ6qTs0kEMVhP9Gnxu0jxA0cmgdn5++CevgIM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
||||||
|
|
@ -1,113 +0,0 @@
|
||||||
{ lib
|
|
||||||
, fetchFromGitHub
|
|
||||||
, buildPythonPackage
|
|
||||||
, pytestCheckHook
|
|
||||||
, pythonOlder
|
|
||||||
# deps
|
|
||||||
, cryptography
|
|
||||||
, nassl
|
|
||||||
, pydantic
|
|
||||||
, tls-parser
|
|
||||||
# check deps
|
|
||||||
, faker
|
|
||||||
, openssl_1_0_2
|
|
||||||
, openssl_1_1
|
|
||||||
}:
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "sslyze";
|
|
||||||
version = "5.0.3";
|
|
||||||
disabled = pythonOlder "3.7";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "nabla-c0d3";
|
|
||||||
repo = pname;
|
|
||||||
rev = version;
|
|
||||||
hash = "sha256-d465WJIDsgNAPe8KW5v2KDSgzMH7OPLSiFfFH9n+jiA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
patchPhase = ''
|
|
||||||
substituteInPlace setup.py \
|
|
||||||
--replace "cryptography>=2.6,<36.0.0" "cryptography>=2.6"
|
|
||||||
'';
|
|
||||||
|
|
||||||
checkInputs = [
|
|
||||||
pytestCheckHook
|
|
||||||
faker
|
|
||||||
];
|
|
||||||
|
|
||||||
# Most of the tests are online; hence, applicable tests are listed
|
|
||||||
# explicitly here
|
|
||||||
pytestFlagsArray = [
|
|
||||||
"tests/cli_tests/test_console_output.py"
|
|
||||||
"tests/cli_tests/test_server_string_parser.py"
|
|
||||||
"tests/json_tests/test_json_output.py"
|
|
||||||
"tests/plugins_tests/certificate_info/test_certificate_algorithms.py"
|
|
||||||
"tests/plugins_tests/certificate_info/test_certificate_utils.py"
|
|
||||||
"tests/plugins_tests/certificate_info/test_symantec.py"
|
|
||||||
"tests/plugins_tests/certificate_info/test_trust_store_repository.py"
|
|
||||||
"tests/plugins_tests/openssl_cipher_suites/test_cipher_suites.py"
|
|
||||||
"tests/plugins_tests/test_early_data_plugin.py"
|
|
||||||
"tests/plugins_tests/test_http_headers_plugin.py"
|
|
||||||
"tests/plugins_tests/test_robot_plugin.py"
|
|
||||||
"tests/plugins_tests/test_scan_commands.py"
|
|
||||||
"tests/plugins_tests/test_session_renegotiation_plugin.py"
|
|
||||||
"tests/scanner_tests/test_jobs_worker_thread.py"
|
|
||||||
"tests/scanner_tests/test_mass_scanner.py"
|
|
||||||
"tests/scanner_tests/test_models.py"
|
|
||||||
"tests/scanner_tests/test_scanner.py"
|
|
||||||
"tests/server_connectivity_tests/test_client_authentication.py"
|
|
||||||
];
|
|
||||||
|
|
||||||
disabledTests = [
|
|
||||||
# TestEllipticCurvesPluginWithOnlineServer
|
|
||||||
"test_supported_curves"
|
|
||||||
# TestRobotPluginPlugin
|
|
||||||
"test_robot_attack_good"
|
|
||||||
# TestHttpHeadersPlugin
|
|
||||||
"test_all_headers_disabled"
|
|
||||||
"test_expect_ct_enabled"
|
|
||||||
"test_hsts_enabled"
|
|
||||||
# TestSessionRenegotiationPlugin
|
|
||||||
"test_renegotiation_good"
|
|
||||||
# TestCertificateAlgorithms
|
|
||||||
"test_ecdsa_certificate"
|
|
||||||
"test_invalid_certificate_bad_name"
|
|
||||||
# TestEarlyDataPlugin
|
|
||||||
"test_early_data_enabled"
|
|
||||||
# TestTrustStoresRepository
|
|
||||||
"test_update_default"
|
|
||||||
# TestClientAuthentication
|
|
||||||
"test_optional_client_authentication"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Some tests require OpenSSL
|
|
||||||
preCheck = ''
|
|
||||||
pushd $TMPDIR/$sourceRoot/tests/openssl_server/
|
|
||||||
|
|
||||||
rm openssl-1-1-1-linux64
|
|
||||||
ln -s ${openssl_1_1.bin}/bin/openssl openssl-1-1-1-linux64
|
|
||||||
|
|
||||||
rm openssl-1-0-0e-linux64
|
|
||||||
ln -s ${openssl_1_0_2.bin}/bin/openssl openssl-1-0-0e-linux64
|
|
||||||
|
|
||||||
popd
|
|
||||||
'';
|
|
||||||
|
|
||||||
pythonImportsCheck = [ "sslyze" ];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
|
||||||
cryptography
|
|
||||||
nassl
|
|
||||||
pydantic
|
|
||||||
tls-parser
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "https://github.com/nabla-c0d3/sslyze";
|
|
||||||
description = "Fast and powerful SSL/TLS scanning library";
|
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
|
||||||
license = licenses.agpl3Only;
|
|
||||||
maintainers = with maintainers; [ veehaitch ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, pytestCheckHook
|
, pytest
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, cairo
|
, cairo
|
||||||
, python
|
, python
|
||||||
|
|
@ -32,9 +32,11 @@ buildPythonPackage rec {
|
||||||
cairo
|
cairo
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = [
|
# HACK: Don't use the pytestCheckHook because PYTHONPATH
|
||||||
pytestCheckHook
|
# will be added by the Python setuptook breaking meson.
|
||||||
];
|
checkPhase = ''
|
||||||
|
${pytest}/bin/pytest
|
||||||
|
'';
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
# This is only used for figuring out what version of Python is in
|
# This is only used for figuring out what version of Python is in
|
||||||
|
|
|
||||||
|
|
@ -362,7 +362,7 @@ let
|
||||||
mwaved = [ pkgs.fftw.dev ];
|
mwaved = [ pkgs.fftw.dev ];
|
||||||
mzR = with pkgs; [ zlib boost159.dev netcdf ];
|
mzR = with pkgs; [ zlib boost159.dev netcdf ];
|
||||||
ncdf4 = [ pkgs.netcdf ];
|
ncdf4 = [ pkgs.netcdf ];
|
||||||
nloptr = with pkgs; [ nlopt pkg-config ];
|
nloptr = with pkgs; [ nlopt pkg-config libiconv ];
|
||||||
n1qn1 = [ pkgs.gfortran ];
|
n1qn1 = [ pkgs.gfortran ];
|
||||||
odbc = [ pkgs.unixODBC ];
|
odbc = [ pkgs.unixODBC ];
|
||||||
pander = with pkgs; [ pandoc which ];
|
pander = with pkgs; [ pandoc which ];
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ stdenv.mkDerivation ({
|
||||||
NIX_CFLAGS_COMPILE =
|
NIX_CFLAGS_COMPILE =
|
||||||
lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
||||||
|
|
||||||
|
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
runHook preConfigure
|
runHook preConfigure
|
||||||
export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
|
export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "ddosify";
|
pname = "ddosify";
|
||||||
version = "0.7.5";
|
version = "0.7.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-n9xKg8RN2o20dTsV8a0tAJjmvAlwZ7TF2cTrXx+f49k=";
|
sha256 = "sha256-nwTVSx6+ELTZnM2tOuyzr7Koq6SE5L52S4revRjGABs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU=";
|
vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU=";
|
||||||
|
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
|
|
||||||
, makeWrapper
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "gpshell";
|
|
||||||
version = "1.4.4";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/globalplatform/gpshell-${version}.tar.gz";
|
|
||||||
sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
|
||||||
buildInputs = [ globalplatform pcsclite ];
|
|
||||||
|
|
||||||
postFixup = ''
|
|
||||||
wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
|
|
||||||
description = "Smartcard management application";
|
|
||||||
license = licenses.gpl3;
|
|
||||||
platforms = platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
21
pkgs/development/tools/rust/ograc/default.nix
Normal file
21
pkgs/development/tools/rust/ograc/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
{ fetchFromGitLab, lib, rustPlatform, }:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage {
|
||||||
|
pname = "ograc";
|
||||||
|
version = "0.1.6";
|
||||||
|
src = fetchFromGitLab {
|
||||||
|
owner = "lirnril";
|
||||||
|
repo = "ograc";
|
||||||
|
rev = "d09b3102ff7a364bf2593589327a16a473bd4f25";
|
||||||
|
sha256 = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo=";
|
||||||
|
};
|
||||||
|
cargoSha256 = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA=";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "like cargo, but backwards";
|
||||||
|
homepage = "https://crates.io/crates/ograc";
|
||||||
|
license = licenses.agpl3Plus;
|
||||||
|
maintainers = with maintainers; [ sciencentistguy ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs ? import <nixpkgs> {}
|
{ pkgs ? import <nixpkgs> {}
|
||||||
, nodejs ? pkgs.nodejs
|
, nodejs ? pkgs.nodejs
|
||||||
, yarn ? pkgs.yarn
|
, yarn ? pkgs.yarn
|
||||||
, allowAliases ? pkgs.config.allowAliases or true
|
, allowAliases ? pkgs.config.allowAliases
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
{ lib, appleDerivation, xcbuildHook
|
{ lib, appleDerivation, xcbuildHook
|
||||||
, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
|
, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
|
||||||
|
|
||||||
appleDerivation {
|
appleDerivation {
|
||||||
nativeBuildInputs = [ xcbuildHook ];
|
nativeBuildInputs = [ xcbuildHook ];
|
||||||
buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ];
|
buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
|
NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [ ./no-root-install.patch ];
|
patches = [ ./no-root-install.patch ];
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=$(out)" ];
|
makeFlags = [
|
||||||
|
"PREFIX=$(out)"
|
||||||
|
"CC=${stdenv.cc.targetPrefix}cc"
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Firmware extractor for cards supported by the b43 kernel module";
|
description = "Firmware extractor for cards supported by the b43 kernel module";
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||||
sha256 = "0vz4ka8gycf72gmnaq61k8rh8y17j1wm2k3fidxvcqjvmix0drzi";
|
sha256 = "0vz4ka8gycf72gmnaq61k8rh8y17j1wm2k3fidxvcqjvmix0drzi";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ b43FirmwareCutter ];
|
nativeBuildInputs = [ b43FirmwareCutter ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/lib/firmware
|
mkdir -p $out/lib/firmware
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0baw6gcnrhxbb447msv34xg6rmlcj0gm3ahxwvdwfcvq4xmknz50";
|
sha256 = "0baw6gcnrhxbb447msv34xg6rmlcj0gm3ahxwvdwfcvq4xmknz50";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ b43FirmwareCutter ];
|
nativeBuildInputs = [ b43FirmwareCutter ];
|
||||||
|
|
||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,30 @@
|
||||||
{ lib, pkgs }:
|
{ lib, pkgs }:
|
||||||
{
|
{
|
||||||
javaProperties = { comment ? "Generated with Nix" }: {
|
javaProperties = { comment ? "Generated with Nix" }: {
|
||||||
|
|
||||||
|
# Design note:
|
||||||
|
# A nested representation of inevitably leads to bad UX:
|
||||||
|
# 1. keys like "a.b" must be disallowed, or
|
||||||
|
# the addition of options in a freeformType module
|
||||||
|
# become breaking changes
|
||||||
|
# 2. adding a value for "a" after "a"."b" was already
|
||||||
|
# defined leads to a somewhat hard to understand
|
||||||
|
# Nix error, because that's not something you can
|
||||||
|
# do with attrset syntax. Workaround: "a"."", but
|
||||||
|
# that's too little too late. Another workaround:
|
||||||
|
# mkMerge [ { a = ...; } { a.b = ...; } ].
|
||||||
|
#
|
||||||
|
# Choosing a non-nested representation does mean that
|
||||||
|
# we sacrifice the ability to override at the (conceptual)
|
||||||
|
# hierarchical levels, _if_ an application exhibits those.
|
||||||
|
#
|
||||||
|
# Some apps just use periods instead of spaces in an odd
|
||||||
|
# mix of attempted categorization and natural language,
|
||||||
|
# with no meaningful hierarchy.
|
||||||
|
#
|
||||||
|
# We _can_ choose to support hierarchical config files
|
||||||
|
# via nested attrsets, but the module author should
|
||||||
|
# make sure that problem (2) does not occur.
|
||||||
type = lib.types.attrsOf lib.types.str;
|
type = lib.types.attrsOf lib.types.str;
|
||||||
|
|
||||||
generate = name: value:
|
generate = name: value:
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,11 @@ let
|
||||||
let
|
let
|
||||||
formatSet = format args;
|
formatSet = format args;
|
||||||
config = formatSet.type.merge [] (imap1 (n: def: {
|
config = formatSet.type.merge [] (imap1 (n: def: {
|
||||||
value = def;
|
# We check the input values, so that
|
||||||
|
# - we don't write nonsensical tests that will impede progress
|
||||||
|
# - the test author has a slightly more realistic view of the
|
||||||
|
# final format during development.
|
||||||
|
value = lib.throwIfNot (formatSet.type.check def) (builtins.trace def "definition does not pass the type's check function") def;
|
||||||
file = "def${toString n}";
|
file = "def${toString n}";
|
||||||
}) [ def ]);
|
}) [ def ]);
|
||||||
in formatSet.generate "test-format-file" config;
|
in formatSet.generate "test-format-file" config;
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
, storePathAsBuildHash ? false }:
|
, storePathAsBuildHash ? false }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "6.3.3";
|
version = "6.3.6";
|
||||||
|
|
||||||
goPackagePath = "github.com/mattermost/mattermost-server";
|
goPackagePath = "github.com/mattermost/mattermost-server";
|
||||||
|
|
||||||
|
|
@ -22,7 +22,7 @@ let
|
||||||
owner = "mattermost";
|
owner = "mattermost";
|
||||||
repo = "mattermost-server";
|
repo = "mattermost-server";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "OSN8Bscgv7rPfKIfZ3ZnegdgsygFpSM7/vGWojj0P3k=";
|
sha256 = "905zxMucDTxxrLoh5ZoAExW4eFmi+xa98aI3EpJZ2Og=";
|
||||||
};
|
};
|
||||||
|
|
||||||
ldflags = [
|
ldflags = [
|
||||||
|
|
@ -65,7 +65,7 @@ let
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
|
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
|
||||||
sha256 = "Og9DUGyE4cWYF7EQP/8szIrWM1Ldqnpqc+HW+L7XApo=";
|
sha256 = "JDsCDZEtbeBTYuzOSwrxFNRKXy+9KXirjaCz6ODP5uw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,10 @@
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "blackbox_exporter";
|
pname = "blackbox_exporter";
|
||||||
version = "0.20.0";
|
version = "0.20.0";
|
||||||
|
rev = "v${version}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
rev = "v${version}";
|
inherit rev;
|
||||||
owner = "prometheus";
|
owner = "prometheus";
|
||||||
repo = "blackbox_exporter";
|
repo = "blackbox_exporter";
|
||||||
sha256 = "sha256-Y3HdFIChkQVooxy2I2Gbqw3WLHsI4Zm+osHTzFluRZA=";
|
sha256 = "sha256-Y3HdFIChkQVooxy2I2Gbqw3WLHsI4Zm+osHTzFluRZA=";
|
||||||
|
|
@ -18,11 +19,21 @@ buildGoModule rec {
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests.prometheus-exporters) blackbox; };
|
passthru.tests = { inherit (nixosTests.prometheus-exporters) blackbox; };
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s"
|
||||||
|
"-w"
|
||||||
|
"-X github.com/prometheus/common/version.Version=${version}"
|
||||||
|
"-X github.com/prometheus/common/version.Revision=${rev}"
|
||||||
|
"-X github.com/prometheus/common/version.Branch=unknown"
|
||||||
|
"-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
|
||||||
|
"-X github.com/prometheus/common/version.BuildDate=unknown"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP";
|
description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP";
|
||||||
homepage = "https://github.com/prometheus/blackbox_exporter";
|
homepage = "https://github.com/prometheus/blackbox_exporter";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ globin fpletz willibutz Frostman ];
|
maintainers = with maintainers; [ globin fpletz willibutz Frostman ma27 ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,16 @@
|
||||||
{ lib, buildGoModule, fetchFromGitHub }:
|
{ lib, buildGoModule, fetchFromGitHub }:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "thanos";
|
pname = "thanos";
|
||||||
version = "0.24.0";
|
version = "0.25.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
owner = "thanos-io";
|
owner = "thanos-io";
|
||||||
repo = "thanos";
|
repo = "thanos";
|
||||||
sha256 = "sha256-HdfOxi9l2xPs4JOY15Yt+KlCm7SQ0Ap1qa5F7abr2g8=";
|
sha256 = "sha256-yisJqr2JMpXSo9O3q7WpNe1r6w7E3XyeLpVlbdest3s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-+0XW7xGocM00kxmOMj0xHYPIpxc0rTQnyr9JQ/cPl3I=";
|
vendorSha256 = "sha256-tHtfS4PnO9n3ckUdaG6dQAIE2D2PG6km4Tqofaab/eg=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ set -euo pipefail
|
||||||
cd -- "$(dirname -- "$BASH_SOURCE[0]")"
|
cd -- "$(dirname -- "$BASH_SOURCE[0]")"
|
||||||
|
|
||||||
node2nix \
|
node2nix \
|
||||||
|
--nodejs-14 \
|
||||||
--input node-packages.json \
|
--input node-packages.json \
|
||||||
--output node-packages-generated.nix \
|
--output node-packages-generated.nix \
|
||||||
--composition node-packages.nix \
|
--composition node-packages.nix \
|
||||||
|
|
|
||||||
|
|
@ -31,13 +31,13 @@ let
|
||||||
sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
|
sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"adler-32-1.3.0" = {
|
"adler-32-1.3.1" = {
|
||||||
name = "adler-32";
|
name = "adler-32";
|
||||||
packageName = "adler-32";
|
packageName = "adler-32";
|
||||||
version = "1.3.0";
|
version = "1.3.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz";
|
url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz";
|
||||||
sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==";
|
sha512 = "ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"after-0.8.1" = {
|
"after-0.8.1" = {
|
||||||
|
|
@ -184,13 +184,13 @@ let
|
||||||
sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
|
sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"brace-expansion-1.1.11" = {
|
"brace-expansion-2.0.1" = {
|
||||||
name = "brace-expansion";
|
name = "brace-expansion";
|
||||||
packageName = "brace-expansion";
|
packageName = "brace-expansion";
|
||||||
version = "1.1.11";
|
version = "2.0.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
|
url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz";
|
||||||
sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
|
sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"buffer-crc32-0.2.3" = {
|
"buffer-crc32-0.2.3" = {
|
||||||
|
|
@ -391,15 +391,6 @@ let
|
||||||
sha1 = "69700cf1ee8963454356ac192a6e5e91e232bffb";
|
sha1 = "69700cf1ee8963454356ac192a6e5e91e232bffb";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"concat-map-0.0.1" = {
|
|
||||||
name = "concat-map";
|
|
||||||
packageName = "concat-map";
|
|
||||||
version = "0.0.1";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
|
|
||||||
sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
"concat-stream-2.0.0" = {
|
"concat-stream-2.0.0" = {
|
||||||
name = "concat-stream";
|
name = "concat-stream";
|
||||||
packageName = "concat-stream";
|
packageName = "concat-stream";
|
||||||
|
|
@ -481,13 +472,13 @@ let
|
||||||
sha1 = "09507984ee9bcce3bd1b8861f0de8ab10ae8187d";
|
sha1 = "09507984ee9bcce3bd1b8861f0de8ab10ae8187d";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"crc-32-1.2.0" = {
|
"crc-32-1.2.1" = {
|
||||||
name = "crc-32";
|
name = "crc-32";
|
||||||
packageName = "crc-32";
|
packageName = "crc-32";
|
||||||
version = "1.2.0";
|
version = "1.2.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz";
|
url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz";
|
||||||
sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==";
|
sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"csrf-2.0.7" = {
|
"csrf-2.0.7" = {
|
||||||
|
|
@ -595,7 +586,7 @@ let
|
||||||
version = "1.0.1";
|
version = "1.0.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
name = "emitter-1.0.1.tar.gz";
|
name = "emitter-1.0.1.tar.gz";
|
||||||
url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1";
|
url = "https://codeload.github.com/component/emitter/tar.gz/refs/tags/1.0.1";
|
||||||
sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
|
sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -731,7 +722,7 @@ let
|
||||||
version = "2.0.1";
|
version = "2.0.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
name = "global-2.0.1.tar.gz";
|
name = "global-2.0.1.tar.gz";
|
||||||
url = "https://codeload.github.com/component/global/tar.gz/v2.0.1";
|
url = "https://codeload.github.com/component/global/tar.gz/refs/tags/v2.0.1";
|
||||||
sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785";
|
sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -924,13 +915,13 @@ let
|
||||||
sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
|
sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"minimatch-3.0.4" = {
|
"minimatch-5.0.1" = {
|
||||||
name = "minimatch";
|
name = "minimatch";
|
||||||
packageName = "minimatch";
|
packageName = "minimatch";
|
||||||
version = "3.0.4";
|
version = "5.0.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
|
url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz";
|
||||||
sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
|
sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"minimist-0.0.10" = {
|
"minimist-0.0.10" = {
|
||||||
|
|
@ -1185,22 +1176,13 @@ let
|
||||||
sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==";
|
sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"printj-1.2.3" = {
|
"printj-1.3.1" = {
|
||||||
name = "printj";
|
name = "printj";
|
||||||
packageName = "printj";
|
packageName = "printj";
|
||||||
version = "1.2.3";
|
version = "1.3.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz";
|
url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz";
|
||||||
sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA==";
|
sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==";
|
||||||
};
|
|
||||||
};
|
|
||||||
"printj-1.3.0" = {
|
|
||||||
name = "printj";
|
|
||||||
packageName = "printj";
|
|
||||||
version = "1.3.0";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz";
|
|
||||||
sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg==";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"proxy-addr-1.0.1" = {
|
"proxy-addr-1.0.1" = {
|
||||||
|
|
@ -1806,19 +1788,15 @@ in
|
||||||
sources."iconv-lite-0.4.4"
|
sources."iconv-lite-0.4.4"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
sources."brace-expansion-1.1.11"
|
sources."brace-expansion-2.0.1"
|
||||||
sources."buffer-crc32-0.2.3"
|
sources."buffer-crc32-0.2.3"
|
||||||
sources."buffer-from-1.1.2"
|
sources."buffer-from-1.1.2"
|
||||||
sources."bytes-1.0.0"
|
sources."bytes-1.0.0"
|
||||||
sources."callsite-1.0.0"
|
sources."callsite-1.0.0"
|
||||||
(sources."cfb-1.2.1" // {
|
(sources."cfb-1.2.1" // {
|
||||||
dependencies = [
|
dependencies = [
|
||||||
(sources."adler-32-1.3.0" // {
|
sources."adler-32-1.3.1"
|
||||||
dependencies = [
|
sources."printj-1.3.1"
|
||||||
sources."printj-1.2.3"
|
|
||||||
];
|
|
||||||
})
|
|
||||||
sources."printj-1.3.0"
|
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
(sources."codepage-1.14.0" // {
|
(sources."codepage-1.14.0" // {
|
||||||
|
|
@ -1844,7 +1822,6 @@ in
|
||||||
sources."vary-1.0.1"
|
sources."vary-1.0.1"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
sources."concat-map-0.0.1"
|
|
||||||
sources."concat-stream-2.0.0"
|
sources."concat-stream-2.0.0"
|
||||||
sources."connect-2.25.9"
|
sources."connect-2.25.9"
|
||||||
sources."connect-timeout-1.2.2"
|
sources."connect-timeout-1.2.2"
|
||||||
|
|
@ -1853,7 +1830,11 @@ in
|
||||||
sources."cookie-signature-1.0.4"
|
sources."cookie-signature-1.0.4"
|
||||||
sources."core-util-is-1.0.3"
|
sources."core-util-is-1.0.3"
|
||||||
sources."cors-2.8.5"
|
sources."cors-2.8.5"
|
||||||
sources."crc-32-1.2.0"
|
(sources."crc-32-1.2.1" // {
|
||||||
|
dependencies = [
|
||||||
|
sources."printj-1.3.1"
|
||||||
|
];
|
||||||
|
})
|
||||||
sources."csrf-2.0.7"
|
sources."csrf-2.0.7"
|
||||||
sources."cssom-0.2.5"
|
sources."cssom-0.2.5"
|
||||||
sources."csurf-1.4.1"
|
sources."csurf-1.4.1"
|
||||||
|
|
@ -1937,7 +1918,7 @@ in
|
||||||
sources."methods-1.1.0"
|
sources."methods-1.1.0"
|
||||||
sources."mime-1.2.11"
|
sources."mime-1.2.11"
|
||||||
sources."mime-types-1.0.2"
|
sources."mime-types-1.0.2"
|
||||||
sources."minimatch-3.0.4"
|
sources."minimatch-5.0.1"
|
||||||
sources."minimist-0.0.10"
|
sources."minimist-0.0.10"
|
||||||
(sources."mkdirp-0.5.0" // {
|
(sources."mkdirp-0.5.0" // {
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
|
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,14 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, pkgs
|
, pkgs
|
||||||
, lib
|
, lib
|
||||||
, nodejs
|
, nodejs-14_x
|
||||||
, runtimeShell
|
, runtimeShell
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
# nodejs-16_x fails with ENOTCACHED
|
||||||
|
nodejs = nodejs-14_x;
|
||||||
|
|
||||||
nodePackages = import ./node-packages.nix {
|
nodePackages = import ./node-packages.nix {
|
||||||
inherit pkgs nodejs;
|
inherit pkgs nodejs;
|
||||||
inherit (stdenv.hostPlatform) system;
|
inherit (stdenv.hostPlatform) system;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,13 @@
|
||||||
#!/usr/bin/env nix-shell
|
#!/usr/bin/env nix-shell
|
||||||
#! nix-shell -i bash -p nodePackages.node2nix
|
#! nix-shell -i bash -p nodePackages.node2nix
|
||||||
|
|
||||||
|
# Run this script not via `./generate.sh`, but via `$PWD/generate.sh`.
|
||||||
|
# Else `nix-shell` will not find this script.
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
cd -- "$(dirname -- "$BASH_SOURCE[0]")"
|
||||||
|
|
||||||
node2nix \
|
node2nix \
|
||||||
--input node-packages.json \
|
--input node-packages.json \
|
||||||
--output node-packages-generated.nix \
|
--output node-packages-generated.nix \
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,15 @@ let
|
||||||
sha512 = "v6Ucl//xSVhpyTtHMVCA9uv9W7CVwj8vBAQFKFDkfGC1DquBobOMhnzH9Odc+Tunf+i4WRnNgt90fQ7CSAbU3g==";
|
sha512 = "v6Ucl//xSVhpyTtHMVCA9uv9W7CVwj8vBAQFKFDkfGC1DquBobOMhnzH9Odc+Tunf+i4WRnNgt90fQ7CSAbU3g==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"@socket.io/base64-arraybuffer-1.0.2" = {
|
||||||
|
name = "_at_socket.io_slash_base64-arraybuffer";
|
||||||
|
packageName = "@socket.io/base64-arraybuffer";
|
||||||
|
version = "1.0.2";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz";
|
||||||
|
sha512 = "dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==";
|
||||||
|
};
|
||||||
|
};
|
||||||
"@types/component-emitter-1.2.11" = {
|
"@types/component-emitter-1.2.11" = {
|
||||||
name = "_at_types_slash_component-emitter";
|
name = "_at_types_slash_component-emitter";
|
||||||
packageName = "@types/component-emitter";
|
packageName = "@types/component-emitter";
|
||||||
|
|
@ -49,13 +58,13 @@ let
|
||||||
sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==";
|
sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"@types/node-17.0.0" = {
|
"@types/node-17.0.14" = {
|
||||||
name = "_at_types_slash_node";
|
name = "_at_types_slash_node";
|
||||||
packageName = "@types/node";
|
packageName = "@types/node";
|
||||||
version = "17.0.0";
|
version = "17.0.14";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/@types/node/-/node-17.0.0.tgz";
|
url = "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz";
|
||||||
sha512 = "eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw==";
|
sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"accept-language-parser-1.5.0" = {
|
"accept-language-parser-1.5.0" = {
|
||||||
|
|
@ -67,13 +76,13 @@ let
|
||||||
sha1 = "8877c54040a8dcb59e0a07d9c1fde42298334791";
|
sha1 = "8877c54040a8dcb59e0a07d9c1fde42298334791";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"accepts-1.3.7" = {
|
"accepts-1.3.8" = {
|
||||||
name = "accepts";
|
name = "accepts";
|
||||||
packageName = "accepts";
|
packageName = "accepts";
|
||||||
version = "1.3.7";
|
version = "1.3.8";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
|
url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz";
|
||||||
sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
|
sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"async-mutex-0.3.2" = {
|
"async-mutex-0.3.2" = {
|
||||||
|
|
@ -85,15 +94,6 @@ let
|
||||||
sha512 = "HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==";
|
sha512 = "HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"base64-arraybuffer-1.0.1" = {
|
|
||||||
name = "base64-arraybuffer";
|
|
||||||
packageName = "base64-arraybuffer";
|
|
||||||
version = "1.0.1";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz";
|
|
||||||
sha512 = "vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
"base64id-2.0.0" = {
|
"base64id-2.0.0" = {
|
||||||
name = "base64id";
|
name = "base64id";
|
||||||
packageName = "base64id";
|
packageName = "base64id";
|
||||||
|
|
@ -103,6 +103,15 @@ let
|
||||||
sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==";
|
sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"buffer-equal-constant-time-1.0.1" = {
|
||||||
|
name = "buffer-equal-constant-time";
|
||||||
|
packageName = "buffer-equal-constant-time";
|
||||||
|
version = "1.0.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
|
||||||
|
sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
|
||||||
|
};
|
||||||
|
};
|
||||||
"component-emitter-1.3.0" = {
|
"component-emitter-1.3.0" = {
|
||||||
name = "component-emitter";
|
name = "component-emitter";
|
||||||
packageName = "component-emitter";
|
packageName = "component-emitter";
|
||||||
|
|
@ -112,13 +121,13 @@ let
|
||||||
sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
|
sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"cookie-0.4.1" = {
|
"cookie-0.4.2" = {
|
||||||
name = "cookie";
|
name = "cookie";
|
||||||
packageName = "cookie";
|
packageName = "cookie";
|
||||||
version = "0.4.1";
|
version = "0.4.2";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
|
url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz";
|
||||||
sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
|
sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"core-util-is-1.0.3" = {
|
"core-util-is-1.0.3" = {
|
||||||
|
|
@ -175,6 +184,15 @@ let
|
||||||
sha1 = "978857442c44749e4206613e37946205826abd80";
|
sha1 = "978857442c44749e4206613e37946205826abd80";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"ecdsa-sig-formatter-1.0.11" = {
|
||||||
|
name = "ecdsa-sig-formatter";
|
||||||
|
packageName = "ecdsa-sig-formatter";
|
||||||
|
version = "1.0.11";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz";
|
||||||
|
sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==";
|
||||||
|
};
|
||||||
|
};
|
||||||
"ee-first-1.1.1" = {
|
"ee-first-1.1.1" = {
|
||||||
name = "ee-first";
|
name = "ee-first";
|
||||||
packageName = "ee-first";
|
packageName = "ee-first";
|
||||||
|
|
@ -193,22 +211,22 @@ let
|
||||||
sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
|
sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"engine.io-6.1.0" = {
|
"engine.io-6.1.2" = {
|
||||||
name = "engine.io";
|
name = "engine.io";
|
||||||
packageName = "engine.io";
|
packageName = "engine.io";
|
||||||
version = "6.1.0";
|
version = "6.1.2";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.0.tgz";
|
url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz";
|
||||||
sha512 = "ErhZOVu2xweCjEfYcTdkCnEYUiZgkAcBBAhW4jbIvNG8SLU3orAqoJCiytZjYF7eTpVmmCrLDjLIEaPlUAs1uw==";
|
sha512 = "v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"engine.io-parser-5.0.2" = {
|
"engine.io-parser-5.0.3" = {
|
||||||
name = "engine.io-parser";
|
name = "engine.io-parser";
|
||||||
packageName = "engine.io-parser";
|
packageName = "engine.io-parser";
|
||||||
version = "5.0.2";
|
version = "5.0.3";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.2.tgz";
|
url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz";
|
||||||
sha512 = "wuiO7qO/OEkPJSFueuATIXtrxF7/6GTbAO9QLv7nnbjwZ5tYhLm9zxvLwxstRs0dcT0KUlWTjtIOs1T86jt12g==";
|
sha512 = "BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"escape-html-1.0.3" = {
|
"escape-html-1.0.3" = {
|
||||||
|
|
@ -256,13 +274,13 @@ let
|
||||||
sha1 = "18282b27d08a267cb3030cd2b8b4b0f212af752a";
|
sha1 = "18282b27d08a267cb3030cd2b8b4b0f212af752a";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"graceful-fs-4.2.8" = {
|
"graceful-fs-4.2.9" = {
|
||||||
name = "graceful-fs";
|
name = "graceful-fs";
|
||||||
packageName = "graceful-fs";
|
packageName = "graceful-fs";
|
||||||
version = "4.2.8";
|
version = "4.2.9";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz";
|
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz";
|
||||||
sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==";
|
sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"handlebars-4.7.7" = {
|
"handlebars-4.7.7" = {
|
||||||
|
|
@ -301,6 +319,96 @@ let
|
||||||
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
|
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"jsonwebtoken-8.5.1" = {
|
||||||
|
name = "jsonwebtoken";
|
||||||
|
packageName = "jsonwebtoken";
|
||||||
|
version = "8.5.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz";
|
||||||
|
sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"jwa-1.4.1" = {
|
||||||
|
name = "jwa";
|
||||||
|
packageName = "jwa";
|
||||||
|
version = "1.4.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz";
|
||||||
|
sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"jws-3.2.2" = {
|
||||||
|
name = "jws";
|
||||||
|
packageName = "jws";
|
||||||
|
version = "3.2.2";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz";
|
||||||
|
sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"lodash.includes-4.3.0" = {
|
||||||
|
name = "lodash.includes";
|
||||||
|
packageName = "lodash.includes";
|
||||||
|
version = "4.3.0";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz";
|
||||||
|
sha1 = "60bb98a87cb923c68ca1e51325483314849f553f";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"lodash.isboolean-3.0.3" = {
|
||||||
|
name = "lodash.isboolean";
|
||||||
|
packageName = "lodash.isboolean";
|
||||||
|
version = "3.0.3";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz";
|
||||||
|
sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"lodash.isinteger-4.0.4" = {
|
||||||
|
name = "lodash.isinteger";
|
||||||
|
packageName = "lodash.isinteger";
|
||||||
|
version = "4.0.4";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz";
|
||||||
|
sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"lodash.isnumber-3.0.3" = {
|
||||||
|
name = "lodash.isnumber";
|
||||||
|
packageName = "lodash.isnumber";
|
||||||
|
version = "3.0.3";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz";
|
||||||
|
sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"lodash.isplainobject-4.0.6" = {
|
||||||
|
name = "lodash.isplainobject";
|
||||||
|
packageName = "lodash.isplainobject";
|
||||||
|
version = "4.0.6";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
|
||||||
|
sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"lodash.isstring-4.0.1" = {
|
||||||
|
name = "lodash.isstring";
|
||||||
|
packageName = "lodash.isstring";
|
||||||
|
version = "4.0.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz";
|
||||||
|
sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"lodash.once-4.1.1" = {
|
||||||
|
name = "lodash.once";
|
||||||
|
packageName = "lodash.once";
|
||||||
|
version = "4.1.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz";
|
||||||
|
sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac";
|
||||||
|
};
|
||||||
|
};
|
||||||
"lru-cache-6.0.0" = {
|
"lru-cache-6.0.0" = {
|
||||||
name = "lru-cache";
|
name = "lru-cache";
|
||||||
packageName = "lru-cache";
|
packageName = "lru-cache";
|
||||||
|
|
@ -391,13 +499,13 @@ let
|
||||||
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
|
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"negotiator-0.6.2" = {
|
"negotiator-0.6.3" = {
|
||||||
name = "negotiator";
|
name = "negotiator";
|
||||||
packageName = "negotiator";
|
packageName = "negotiator";
|
||||||
version = "0.6.2";
|
version = "0.6.3";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
|
url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz";
|
||||||
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
|
sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"neo-async-2.6.2" = {
|
"neo-async-2.6.2" = {
|
||||||
|
|
@ -499,6 +607,24 @@ let
|
||||||
sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
|
sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
"safe-buffer-5.2.1" = {
|
||||||
|
name = "safe-buffer";
|
||||||
|
packageName = "safe-buffer";
|
||||||
|
version = "5.2.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
|
||||||
|
sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"semver-5.7.1" = {
|
||||||
|
name = "semver";
|
||||||
|
packageName = "semver";
|
||||||
|
version = "5.7.1";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
|
||||||
|
sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
|
||||||
|
};
|
||||||
|
};
|
||||||
"semver-7.3.5" = {
|
"semver-7.3.5" = {
|
||||||
name = "semver";
|
name = "semver";
|
||||||
packageName = "semver";
|
packageName = "semver";
|
||||||
|
|
@ -535,13 +661,13 @@ let
|
||||||
sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
|
sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"socket.io-4.4.0" = {
|
"socket.io-4.4.1" = {
|
||||||
name = "socket.io";
|
name = "socket.io";
|
||||||
packageName = "socket.io";
|
packageName = "socket.io";
|
||||||
version = "4.4.0";
|
version = "4.4.1";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/socket.io/-/socket.io-4.4.0.tgz";
|
url = "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz";
|
||||||
sha512 = "bnpJxswR9ov0Bw6ilhCvO38/1WPtE3eA2dtxi2Iq4/sFebiDJQzgKNYA7AuVVdGW09nrESXd90NbZqtDd9dzRQ==";
|
sha512 = "s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"socket.io-adapter-2.3.3" = {
|
"socket.io-adapter-2.3.3" = {
|
||||||
|
|
@ -643,13 +769,13 @@ let
|
||||||
sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==";
|
sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"uglify-js-3.14.5" = {
|
"uglify-js-3.15.0" = {
|
||||||
name = "uglify-js";
|
name = "uglify-js";
|
||||||
packageName = "uglify-js";
|
packageName = "uglify-js";
|
||||||
version = "3.14.5";
|
version = "3.15.0";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz";
|
url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz";
|
||||||
sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==";
|
sha512 = "x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"util-deprecate-1.0.2" = {
|
"util-deprecate-1.0.2" = {
|
||||||
|
|
@ -700,29 +826,34 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
"whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.16.0" = nodeEnv.buildNodePackage {
|
"whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.17.0" = nodeEnv.buildNodePackage {
|
||||||
name = "whitebophir";
|
name = "whitebophir";
|
||||||
packageName = "whitebophir";
|
packageName = "whitebophir";
|
||||||
version = "1.16.0";
|
version = "1.17.0";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/lovasoa/whitebophir.git";
|
url = "https://github.com/lovasoa/whitebophir.git";
|
||||||
rev = "8a3997b26419b3d510ad92c18071c4ce007b0081";
|
rev = "7fd1b7bbeaf9a178ba76ff60ebc4c9870bc599f3";
|
||||||
sha256 = "8aab3d89c72589d60f956f83a8e33d9d52a5b4da3c13004f9ab75b6dcbdaadcc";
|
sha256 = "a343b29069e5da8ab129588a8d21ddefd03af5a69f04db6b35082ecfcef75d40";
|
||||||
};
|
};
|
||||||
dependencies = [
|
dependencies = [
|
||||||
sources."@financial-times/polyfill-useragent-normaliser-1.10.1"
|
(sources."@financial-times/polyfill-useragent-normaliser-1.10.1" // {
|
||||||
|
dependencies = [
|
||||||
|
sources."semver-7.3.5"
|
||||||
|
];
|
||||||
|
})
|
||||||
sources."@financial-times/useragent_parser-1.6.0"
|
sources."@financial-times/useragent_parser-1.6.0"
|
||||||
|
sources."@socket.io/base64-arraybuffer-1.0.2"
|
||||||
sources."@types/component-emitter-1.2.11"
|
sources."@types/component-emitter-1.2.11"
|
||||||
sources."@types/cookie-0.4.1"
|
sources."@types/cookie-0.4.1"
|
||||||
sources."@types/cors-2.8.12"
|
sources."@types/cors-2.8.12"
|
||||||
sources."@types/node-17.0.0"
|
sources."@types/node-17.0.14"
|
||||||
sources."accept-language-parser-1.5.0"
|
sources."accept-language-parser-1.5.0"
|
||||||
sources."accepts-1.3.7"
|
sources."accepts-1.3.8"
|
||||||
sources."async-mutex-0.3.2"
|
sources."async-mutex-0.3.2"
|
||||||
sources."base64-arraybuffer-1.0.1"
|
|
||||||
sources."base64id-2.0.0"
|
sources."base64id-2.0.0"
|
||||||
|
sources."buffer-equal-constant-time-1.0.1"
|
||||||
sources."component-emitter-1.3.0"
|
sources."component-emitter-1.3.0"
|
||||||
sources."cookie-0.4.1"
|
sources."cookie-0.4.2"
|
||||||
sources."core-util-is-1.0.3"
|
sources."core-util-is-1.0.3"
|
||||||
sources."cors-2.8.5"
|
sources."cors-2.8.5"
|
||||||
(sources."debug-2.6.9" // {
|
(sources."debug-2.6.9" // {
|
||||||
|
|
@ -732,25 +863,36 @@ in
|
||||||
})
|
})
|
||||||
sources."depd-1.1.2"
|
sources."depd-1.1.2"
|
||||||
sources."destroy-1.0.4"
|
sources."destroy-1.0.4"
|
||||||
|
sources."ecdsa-sig-formatter-1.0.11"
|
||||||
sources."ee-first-1.1.1"
|
sources."ee-first-1.1.1"
|
||||||
sources."encodeurl-1.0.2"
|
sources."encodeurl-1.0.2"
|
||||||
(sources."engine.io-6.1.0" // {
|
(sources."engine.io-6.1.2" // {
|
||||||
dependencies = [
|
dependencies = [
|
||||||
sources."debug-4.3.3"
|
sources."debug-4.3.3"
|
||||||
sources."ms-2.1.2"
|
sources."ms-2.1.2"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
sources."engine.io-parser-5.0.2"
|
sources."engine.io-parser-5.0.3"
|
||||||
sources."escape-html-1.0.3"
|
sources."escape-html-1.0.3"
|
||||||
sources."etag-1.8.1"
|
sources."etag-1.8.1"
|
||||||
sources."fresh-0.5.2"
|
sources."fresh-0.5.2"
|
||||||
sources."from2-2.3.0"
|
sources."from2-2.3.0"
|
||||||
sources."from2-string-1.1.0"
|
sources."from2-string-1.1.0"
|
||||||
sources."graceful-fs-4.2.8"
|
sources."graceful-fs-4.2.9"
|
||||||
sources."handlebars-4.7.7"
|
sources."handlebars-4.7.7"
|
||||||
sources."http-errors-1.8.1"
|
sources."http-errors-1.8.1"
|
||||||
sources."inherits-2.0.4"
|
sources."inherits-2.0.4"
|
||||||
sources."isarray-1.0.0"
|
sources."isarray-1.0.0"
|
||||||
|
sources."jsonwebtoken-8.5.1"
|
||||||
|
sources."jwa-1.4.1"
|
||||||
|
sources."jws-3.2.2"
|
||||||
|
sources."lodash.includes-4.3.0"
|
||||||
|
sources."lodash.isboolean-3.0.3"
|
||||||
|
sources."lodash.isinteger-4.0.4"
|
||||||
|
sources."lodash.isnumber-3.0.3"
|
||||||
|
sources."lodash.isplainobject-4.0.6"
|
||||||
|
sources."lodash.isstring-4.0.1"
|
||||||
|
sources."lodash.once-4.1.1"
|
||||||
sources."lru-cache-6.0.0"
|
sources."lru-cache-6.0.0"
|
||||||
sources."merge2-1.4.1"
|
sources."merge2-1.4.1"
|
||||||
sources."mime-1.6.0"
|
sources."mime-1.6.0"
|
||||||
|
|
@ -759,7 +901,7 @@ in
|
||||||
sources."minimist-1.2.5"
|
sources."minimist-1.2.5"
|
||||||
sources."mnemonist-0.38.5"
|
sources."mnemonist-0.38.5"
|
||||||
sources."ms-2.1.3"
|
sources."ms-2.1.3"
|
||||||
sources."negotiator-0.6.2"
|
sources."negotiator-0.6.3"
|
||||||
sources."neo-async-2.6.2"
|
sources."neo-async-2.6.2"
|
||||||
sources."object-assign-4.1.1"
|
sources."object-assign-4.1.1"
|
||||||
sources."obliterator-2.0.1"
|
sources."obliterator-2.0.1"
|
||||||
|
|
@ -769,13 +911,17 @@ in
|
||||||
sources."process-nextick-args-2.0.1"
|
sources."process-nextick-args-2.0.1"
|
||||||
sources."promise-polyfill-1.1.6"
|
sources."promise-polyfill-1.1.6"
|
||||||
sources."range-parser-1.2.1"
|
sources."range-parser-1.2.1"
|
||||||
sources."readable-stream-2.3.7"
|
(sources."readable-stream-2.3.7" // {
|
||||||
sources."safe-buffer-5.1.2"
|
dependencies = [
|
||||||
sources."semver-7.3.5"
|
sources."safe-buffer-5.1.2"
|
||||||
|
];
|
||||||
|
})
|
||||||
|
sources."safe-buffer-5.2.1"
|
||||||
|
sources."semver-5.7.1"
|
||||||
sources."send-0.17.2"
|
sources."send-0.17.2"
|
||||||
sources."serve-static-1.14.2"
|
sources."serve-static-1.14.2"
|
||||||
sources."setprototypeof-1.2.0"
|
sources."setprototypeof-1.2.0"
|
||||||
(sources."socket.io-4.4.0" // {
|
(sources."socket.io-4.4.1" // {
|
||||||
dependencies = [
|
dependencies = [
|
||||||
sources."debug-4.3.3"
|
sources."debug-4.3.3"
|
||||||
sources."ms-2.1.2"
|
sources."ms-2.1.2"
|
||||||
|
|
@ -793,11 +939,15 @@ in
|
||||||
sources."statuses-1.5.0"
|
sources."statuses-1.5.0"
|
||||||
sources."stream-from-promise-1.0.0"
|
sources."stream-from-promise-1.0.0"
|
||||||
sources."stream-to-string-1.2.0"
|
sources."stream-to-string-1.2.0"
|
||||||
sources."string_decoder-1.1.1"
|
(sources."string_decoder-1.1.1" // {
|
||||||
|
dependencies = [
|
||||||
|
sources."safe-buffer-5.1.2"
|
||||||
|
];
|
||||||
|
})
|
||||||
sources."toidentifier-1.0.1"
|
sources."toidentifier-1.0.1"
|
||||||
sources."toposort-2.0.2"
|
sources."toposort-2.0.2"
|
||||||
sources."tslib-2.3.1"
|
sources."tslib-2.3.1"
|
||||||
sources."uglify-js-3.14.5"
|
sources."uglify-js-3.15.0"
|
||||||
sources."util-deprecate-1.0.2"
|
sources."util-deprecate-1.0.2"
|
||||||
sources."vary-1.1.2"
|
sources."vary-1.1.2"
|
||||||
sources."wordwrap-1.0.0"
|
sources."wordwrap-1.0.0"
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
[
|
[
|
||||||
{ "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.16.0" }
|
{ "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.17.0" }
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,9 @@ in with pkgs; rec {
|
||||||
cp -d ${libc.out}/lib/libresolv*.so* $out/lib
|
cp -d ${libc.out}/lib/libresolv*.so* $out/lib
|
||||||
cp -d ${libc.out}/lib/crt?.o $out/lib
|
cp -d ${libc.out}/lib/crt?.o $out/lib
|
||||||
|
|
||||||
|
# Hacky compat with our current unpack-bootstrap-tools.sh
|
||||||
|
ln -s librt.so "$out"/lib/librt-dummy.so
|
||||||
|
|
||||||
cp -rL ${libc.dev}/include $out
|
cp -rL ${libc.dev}/include $out
|
||||||
chmod -R u+w "$out"
|
chmod -R u+w "$out"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "eksctl";
|
pname = "eksctl";
|
||||||
version = "0.89.0";
|
version = "0.90.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "weaveworks";
|
owner = "weaveworks";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-8Cdvt+WB/Tl5jFNRlE2t62Y7O0QIxtZWF8F/dLDSqkw=";
|
sha256 = "sha256-XQZ32Gg/LZCDuSmtGvDEYCuzvq39zzq3yGGTYSKZyXI=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-SJowSDvthxwfAyMSRtNkQbyOy8L5HjkVRkxG/L4/dLc=";
|
vendorSha256 = "sha256-IYqeuyNPRQBMwuZMW4InKfHpOLhleM5Mz5Oauw4nK6M=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
{ lib, fetchFromGitHub, rustPlatform
|
|
||||||
, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
|
|
||||||
|
|
||||||
with rustPlatform;
|
|
||||||
|
|
||||||
buildRustPackage rec {
|
|
||||||
pname = "intecture-agent";
|
|
||||||
version = "0.3.1";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "intecture";
|
|
||||||
repo = "agent";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj";
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoSha256 = "0j7yv00ipaa60hpakfj60xrblcyzjwi0lp2hpzz41vq3p9bkigvm";
|
|
||||||
|
|
||||||
buildInputs = [ openssl zeromq czmq zlib ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Authentication client/server for Intecture components";
|
|
||||||
homepage = "https://intecture.io";
|
|
||||||
license = licenses.mpl20;
|
|
||||||
maintainers = [ maintainers.rushmorem ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
{ lib, fetchFromGitHub, rustPlatform
|
|
||||||
, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
|
|
||||||
|
|
||||||
with rustPlatform;
|
|
||||||
|
|
||||||
buildRustPackage rec {
|
|
||||||
pname = "intecture-auth";
|
|
||||||
version = "0.1.2";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "intecture";
|
|
||||||
repo = "auth";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2";
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoSha256 = "15f7lb0xxaxvhvj8g3kjmqy5jzy4pyzwk3zfdvykphpg18qgg6qj";
|
|
||||||
|
|
||||||
buildInputs = [ openssl zeromq czmq zlib ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Authentication client/server for Intecture components";
|
|
||||||
homepage = "https://intecture.io";
|
|
||||||
license = licenses.mpl20;
|
|
||||||
maintainers = [ maintainers.rushmorem ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue