Merge staging-next into staging
This commit is contained in:
commit
08a8809bfe
|
@ -7614,6 +7614,12 @@
|
||||||
fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D";
|
fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D";
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
nitsky = {
|
||||||
|
name = "nitsky";
|
||||||
|
email = "492793+nitsky@users.noreply.github.com";
|
||||||
|
github = "nitsky";
|
||||||
|
githubId = 492793;
|
||||||
|
};
|
||||||
nkpvk = {
|
nkpvk = {
|
||||||
email = "niko.pavlinek@gmail.com";
|
email = "niko.pavlinek@gmail.com";
|
||||||
github = "nkpvk";
|
github = "nkpvk";
|
||||||
|
|
|
@ -53,6 +53,13 @@
|
||||||
<link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>.
|
<link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<link xlink:href="https://www.isc.org/kea/">Kea</link>, ISCs
|
||||||
|
2nd generation DHCP and DDNS server suite. Available at
|
||||||
|
<link xlink:href="options.html#opt-services.kea">services.kea</link>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
<link xlink:href="https://sr.ht">sourcehut</link>, a
|
<link xlink:href="https://sr.ht">sourcehut</link>, a
|
||||||
|
|
|
@ -17,6 +17,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable).
|
- [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable).
|
||||||
|
|
||||||
|
- [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea).
|
||||||
|
|
||||||
- [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable).
|
- [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable).
|
||||||
|
|
||||||
- [ucarp](https://download.pureftpd.org/pub/ucarp/README), an userspace implementation of the Common Address Redundancy Protocol (CARP). Available as [networking.ucarp](options.html#opt-networking.ucarp.enable).
|
- [ucarp](https://download.pureftpd.org/pub/ucarp/README), an userspace implementation of the Common Address Redundancy Protocol (CARP). Available as [networking.ucarp](options.html#opt-networking.ucarp.enable).
|
||||||
|
|
|
@ -727,6 +727,7 @@
|
||||||
./services/networking/iwd.nix
|
./services/networking/iwd.nix
|
||||||
./services/networking/jicofo.nix
|
./services/networking/jicofo.nix
|
||||||
./services/networking/jitsi-videobridge.nix
|
./services/networking/jitsi-videobridge.nix
|
||||||
|
./services/networking/kea.nix
|
||||||
./services/networking/keepalived/default.nix
|
./services/networking/keepalived/default.nix
|
||||||
./services/networking/keybase.nix
|
./services/networking/keybase.nix
|
||||||
./services/networking/kippo.nix
|
./services/networking/kippo.nix
|
||||||
|
|
|
@ -180,7 +180,7 @@ let
|
||||||
serviceConfig.PrivateTmp = mkDefault true;
|
serviceConfig.PrivateTmp = mkDefault true;
|
||||||
serviceConfig.WorkingDirectory = mkDefault /tmp;
|
serviceConfig.WorkingDirectory = mkDefault /tmp;
|
||||||
serviceConfig.DynamicUser = mkDefault enableDynamicUser;
|
serviceConfig.DynamicUser = mkDefault enableDynamicUser;
|
||||||
serviceConfig.User = conf.user;
|
serviceConfig.User = mkDefault conf.user;
|
||||||
serviceConfig.Group = conf.group;
|
serviceConfig.Group = conf.group;
|
||||||
} serviceOpts ]);
|
} serviceOpts ]);
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,6 +26,7 @@ in {
|
||||||
};
|
};
|
||||||
serviceOpts = {
|
serviceOpts = {
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
User = "kea";
|
||||||
ExecStart = ''
|
ExecStart = ''
|
||||||
${pkgs.prometheus-kea-exporter}/bin/kea-exporter \
|
${pkgs.prometheus-kea-exporter}/bin/kea-exporter \
|
||||||
--address ${cfg.listenAddress} \
|
--address ${cfg.listenAddress} \
|
||||||
|
|
361
nixos/modules/services/networking/kea.nix
Normal file
361
nixos/modules/services/networking/kea.nix
Normal file
|
@ -0,0 +1,361 @@
|
||||||
|
{ config
|
||||||
|
, lib
|
||||||
|
, pkgs
|
||||||
|
, ...
|
||||||
|
}:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.kea;
|
||||||
|
|
||||||
|
format = pkgs.formats.json {};
|
||||||
|
|
||||||
|
ctrlAgentConfig = format.generate "kea-ctrl-agent.conf" {
|
||||||
|
Control-agent = cfg.ctrl-agent.settings;
|
||||||
|
};
|
||||||
|
dhcp4Config = format.generate "kea-dhcp4.conf" {
|
||||||
|
Dhcp4 = cfg.dhcp4.settings;
|
||||||
|
};
|
||||||
|
dhcp6Config = format.generate "kea-dhcp6.conf" {
|
||||||
|
Dhcp6 = cfg.dhcp6.settings;
|
||||||
|
};
|
||||||
|
dhcpDdnsConfig = format.generate "kea-dhcp-ddns.conf" {
|
||||||
|
DhcpDdns = cfg.dhcp-ddns.settings;
|
||||||
|
};
|
||||||
|
|
||||||
|
package = pkgs.kea;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.services.kea = with types; {
|
||||||
|
ctrl-agent = mkOption {
|
||||||
|
description = ''
|
||||||
|
Kea Control Agent configuration
|
||||||
|
'';
|
||||||
|
default = {};
|
||||||
|
type = submodule {
|
||||||
|
options = {
|
||||||
|
enable = mkEnableOption "Kea Control Agent";
|
||||||
|
|
||||||
|
extraArgs = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
default = [];
|
||||||
|
description = ''
|
||||||
|
List of additonal arguments to pass to the daemon.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
settings = mkOption {
|
||||||
|
type = format.type;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
Kea Control Agent configuration as an attribute set, see <link xlink:href="https://kea.readthedocs.io/en/kea-${package.version}/arm/agent.html"/>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
dhcp4 = mkOption {
|
||||||
|
description = ''
|
||||||
|
DHCP4 Server configuration
|
||||||
|
'';
|
||||||
|
default = {};
|
||||||
|
type = submodule {
|
||||||
|
options = {
|
||||||
|
enable = mkEnableOption "Kea DHCP4 server";
|
||||||
|
|
||||||
|
extraArgs = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
default = [];
|
||||||
|
description = ''
|
||||||
|
List of additonal arguments to pass to the daemon.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
settings = mkOption {
|
||||||
|
type = format.type;
|
||||||
|
default = null;
|
||||||
|
example = {
|
||||||
|
valid-lifetime = 4000;
|
||||||
|
renew-timer = 1000;
|
||||||
|
rebind-timer = 2000;
|
||||||
|
interfaces-config = {
|
||||||
|
interfaces = [
|
||||||
|
"eth0"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
lease-database = {
|
||||||
|
type = "memfile";
|
||||||
|
persist = true;
|
||||||
|
name = "/var/lib/kea/dhcp4.leases";
|
||||||
|
};
|
||||||
|
subnet4 = [ {
|
||||||
|
subnet = "192.0.2.0/24";
|
||||||
|
pools = [ {
|
||||||
|
pool = "192.0.2.100 - 192.0.2.240";
|
||||||
|
} ];
|
||||||
|
} ];
|
||||||
|
};
|
||||||
|
description = ''
|
||||||
|
Kea DHCP4 configuration as an attribute set, see <link xlink:href="https://kea.readthedocs.io/en/kea-${package.version}/arm/dhcp4-srv.html"/>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
dhcp6 = mkOption {
|
||||||
|
description = ''
|
||||||
|
DHCP6 Server configuration
|
||||||
|
'';
|
||||||
|
default = {};
|
||||||
|
type = submodule {
|
||||||
|
options = {
|
||||||
|
enable = mkEnableOption "Kea DHCP6 server";
|
||||||
|
|
||||||
|
extraArgs = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
default = [];
|
||||||
|
description = ''
|
||||||
|
List of additonal arguments to pass to the daemon.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
settings = mkOption {
|
||||||
|
type = format.type;
|
||||||
|
default = null;
|
||||||
|
example = {
|
||||||
|
valid-lifetime = 4000;
|
||||||
|
renew-timer = 1000;
|
||||||
|
rebind-timer = 2000;
|
||||||
|
preferred-lifetime = 3000;
|
||||||
|
interfaces-config = {
|
||||||
|
interfaces = [
|
||||||
|
"eth0"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
lease-database = {
|
||||||
|
type = "memfile";
|
||||||
|
persist = true;
|
||||||
|
name = "/var/lib/kea/dhcp6.leases";
|
||||||
|
};
|
||||||
|
subnet6 = [ {
|
||||||
|
subnet = "2001:db8:1::/64";
|
||||||
|
pools = [ {
|
||||||
|
pool = "2001:db8:1::1-2001:db8:1::ffff";
|
||||||
|
} ];
|
||||||
|
} ];
|
||||||
|
};
|
||||||
|
description = ''
|
||||||
|
Kea DHCP6 configuration as an attribute set, see <link xlink:href="https://kea.readthedocs.io/en/kea-${package.version}/arm/dhcp6-srv.html"/>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
dhcp-ddns = mkOption {
|
||||||
|
description = ''
|
||||||
|
Kea DHCP-DDNS configuration
|
||||||
|
'';
|
||||||
|
default = {};
|
||||||
|
type = submodule {
|
||||||
|
options = {
|
||||||
|
enable = mkEnableOption "Kea DDNS server";
|
||||||
|
|
||||||
|
extraArgs = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
default = [];
|
||||||
|
description = ''
|
||||||
|
List of additonal arguments to pass to the daemon.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
settings = mkOption {
|
||||||
|
type = format.type;
|
||||||
|
default = null;
|
||||||
|
example = {
|
||||||
|
ip-address = "127.0.0.1";
|
||||||
|
port = 53001;
|
||||||
|
dns-server-timeout = 100;
|
||||||
|
ncr-protocol = "UDP";
|
||||||
|
ncr-format = "JSON";
|
||||||
|
tsig-keys = [ ];
|
||||||
|
forward-ddns = {
|
||||||
|
ddns-domains = [ ];
|
||||||
|
};
|
||||||
|
reverse-ddns = {
|
||||||
|
ddns-domains = [ ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
description = ''
|
||||||
|
Kea DHCP-DDNS configuration as an attribute set, see <link xlink:href="https://kea.readthedocs.io/en/kea-${package.version}/arm/ddns.html"/>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = let
|
||||||
|
commonServiceConfig = {
|
||||||
|
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||||
|
DynamicUser = true;
|
||||||
|
User = "kea";
|
||||||
|
ConfigurationDirectory = "kea";
|
||||||
|
RuntimeDirectory = "kea";
|
||||||
|
StateDirectory = "kea";
|
||||||
|
UMask = "0077";
|
||||||
|
};
|
||||||
|
in mkIf (cfg.ctrl-agent.enable || cfg.dhcp4.enable || cfg.dhcp6.enable || cfg.dhcp-ddns.enable) (mkMerge [
|
||||||
|
{
|
||||||
|
environment.systemPackages = [ package ];
|
||||||
|
}
|
||||||
|
|
||||||
|
(mkIf cfg.ctrl-agent.enable {
|
||||||
|
|
||||||
|
environment.etc."kea/ctrl-agent.conf".source = ctrlAgentConfig;
|
||||||
|
|
||||||
|
systemd.services.kea-ctrl-agent = {
|
||||||
|
description = "Kea Control Agent";
|
||||||
|
documentation = [
|
||||||
|
"man:kea-ctrl-agent(8)"
|
||||||
|
"https://kea.readthedocs.io/en/kea-${package.version}/arm/agent.html"
|
||||||
|
];
|
||||||
|
|
||||||
|
after = [
|
||||||
|
"network-online.target"
|
||||||
|
"time-sync.target"
|
||||||
|
];
|
||||||
|
wantedBy = [
|
||||||
|
"kea-dhcp4-server.service"
|
||||||
|
"kea-dhcp6-server.service"
|
||||||
|
"kea-dhcp-ddns-server.service"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
KEA_PIDFILE_DIR = "/run/kea";
|
||||||
|
};
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}";
|
||||||
|
KillMode = "process";
|
||||||
|
Restart = "on-failure";
|
||||||
|
} // commonServiceConfig;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
(mkIf cfg.dhcp4.enable {
|
||||||
|
|
||||||
|
environment.etc."kea/dhcp4-server.conf".source = dhcp4Config;
|
||||||
|
|
||||||
|
systemd.services.kea-dhcp4-server = {
|
||||||
|
description = "Kea DHCP4 Server";
|
||||||
|
documentation = [
|
||||||
|
"man:kea-dhcp4(8)"
|
||||||
|
"https://kea.readthedocs.io/en/kea-${package.version}/arm/dhcp4-srv.html"
|
||||||
|
];
|
||||||
|
|
||||||
|
after = [
|
||||||
|
"network-online.target"
|
||||||
|
"time-sync.target"
|
||||||
|
];
|
||||||
|
wantedBy = [
|
||||||
|
"multi-user.target"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
KEA_PIDFILE_DIR = "/run/kea";
|
||||||
|
};
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${package}/bin/kea-dhcp4 -c /etc/kea/dhcp4-server.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}";
|
||||||
|
# Kea does not request capabilities by itself
|
||||||
|
AmbientCapabilities = [
|
||||||
|
"CAP_NET_BIND_SERVICE"
|
||||||
|
"CAP_NET_RAW"
|
||||||
|
];
|
||||||
|
CapabilityBoundingSet = [
|
||||||
|
"CAP_NET_BIND_SERVICE"
|
||||||
|
"CAP_NET_RAW"
|
||||||
|
];
|
||||||
|
} // commonServiceConfig;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
(mkIf cfg.dhcp6.enable {
|
||||||
|
|
||||||
|
environment.etc."kea/dhcp6-server.conf".source = dhcp6Config;
|
||||||
|
|
||||||
|
systemd.services.kea-dhcp6-server = {
|
||||||
|
description = "Kea DHCP6 Server";
|
||||||
|
documentation = [
|
||||||
|
"man:kea-dhcp6(8)"
|
||||||
|
"https://kea.readthedocs.io/en/kea-${package.version}/arm/dhcp6-srv.html"
|
||||||
|
];
|
||||||
|
|
||||||
|
after = [
|
||||||
|
"network-online.target"
|
||||||
|
"time-sync.target"
|
||||||
|
];
|
||||||
|
wantedBy = [
|
||||||
|
"multi-user.target"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
KEA_PIDFILE_DIR = "/run/kea";
|
||||||
|
};
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${package}/bin/kea-dhcp6 -c /etc/kea/dhcp6-server.conf ${lib.escapeShellArgs cfg.dhcp6.extraArgs}";
|
||||||
|
# Kea does not request capabilities by itself
|
||||||
|
AmbientCapabilities = [
|
||||||
|
"CAP_NET_BIND_SERVICE"
|
||||||
|
];
|
||||||
|
CapabilityBoundingSet = [
|
||||||
|
"CAP_NET_BIND_SERVICE"
|
||||||
|
];
|
||||||
|
} // commonServiceConfig;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
(mkIf cfg.dhcp-ddns.enable {
|
||||||
|
|
||||||
|
environment.etc."kea/dhcp-ddns.conf".source = dhcpDdnsConfig;
|
||||||
|
|
||||||
|
systemd.services.kea-dhcp-ddns-server = {
|
||||||
|
description = "Kea DHCP-DDNS Server";
|
||||||
|
documentation = [
|
||||||
|
"man:kea-dhcp-ddns(8)"
|
||||||
|
"https://kea.readthedocs.io/en/kea-${package.version}/arm/ddns.html"
|
||||||
|
];
|
||||||
|
|
||||||
|
after = [
|
||||||
|
"network-online.target"
|
||||||
|
"time-sync.target"
|
||||||
|
];
|
||||||
|
wantedBy = [
|
||||||
|
"multi-user.target"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
KEA_PIDFILE_DIR = "/run/kea";
|
||||||
|
};
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${package}/bin/kea-dhcp-ddns -c /etc/kea/dhcp-ddns.conf ${lib.escapeShellArgs cfg.dhcp-ddns.extraArgs}";
|
||||||
|
AmbientCapabilites = [
|
||||||
|
"CAP_NET_BIND_SERVICE"
|
||||||
|
];
|
||||||
|
CapabilityBoundingSet = [
|
||||||
|
"CAP_NET_BIND_SERVICE"
|
||||||
|
];
|
||||||
|
} // commonServiceConfig;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
|
||||||
|
]);
|
||||||
|
|
||||||
|
meta.maintainers = with maintainers; [ hexa ];
|
||||||
|
}
|
|
@ -203,6 +203,7 @@ in
|
||||||
k3s = handleTest ./k3s.nix {};
|
k3s = handleTest ./k3s.nix {};
|
||||||
kafka = handleTest ./kafka.nix {};
|
kafka = handleTest ./kafka.nix {};
|
||||||
kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
|
kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
|
||||||
|
kea = handleTest ./kea.nix {};
|
||||||
keepalived = handleTest ./keepalived.nix {};
|
keepalived = handleTest ./keepalived.nix {};
|
||||||
keepassxc = handleTest ./keepassxc.nix {};
|
keepassxc = handleTest ./keepassxc.nix {};
|
||||||
kerberos = handleTest ./kerberos/default.nix {};
|
kerberos = handleTest ./kerberos/default.nix {};
|
||||||
|
|
73
nixos/tests/kea.nix
Normal file
73
nixos/tests/kea.nix
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
import ./make-test-python.nix ({ pkgs, lib, ...}: {
|
||||||
|
meta.maintainers = with lib.maintainers; [ hexa ];
|
||||||
|
|
||||||
|
nodes = {
|
||||||
|
router = { config, pkgs, ... }: {
|
||||||
|
virtualisation.vlans = [ 1 ];
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
useNetworkd = true;
|
||||||
|
useDHCP = false;
|
||||||
|
firewall.allowedUDPPorts = [ 67 ];
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.network = {
|
||||||
|
networks = {
|
||||||
|
"01-eth1" = {
|
||||||
|
name = "eth1";
|
||||||
|
networkConfig = {
|
||||||
|
Address = "10.0.0.1/30";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.kea.dhcp4 = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
valid-lifetime = 3600;
|
||||||
|
renew-timer = 900;
|
||||||
|
rebind-timer = 1800;
|
||||||
|
|
||||||
|
lease-database = {
|
||||||
|
type = "memfile";
|
||||||
|
persist = true;
|
||||||
|
name = "/var/lib/kea/dhcp4.leases";
|
||||||
|
};
|
||||||
|
|
||||||
|
interfaces-config = {
|
||||||
|
dhcp-socket-type = "raw";
|
||||||
|
interfaces = [
|
||||||
|
"eth1"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
subnet4 = [ {
|
||||||
|
subnet = "10.0.0.0/30";
|
||||||
|
pools = [ {
|
||||||
|
pool = "10.0.0.2 - 10.0.0.2";
|
||||||
|
} ];
|
||||||
|
} ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
client = { config, pkgs, ... }: {
|
||||||
|
virtualisation.vlans = [ 1 ];
|
||||||
|
systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
|
||||||
|
networking = {
|
||||||
|
useNetworkd = true;
|
||||||
|
useDHCP = false;
|
||||||
|
firewall.enable = false;
|
||||||
|
interfaces.eth1.useDHCP = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
testScript = { ... }: ''
|
||||||
|
start_all()
|
||||||
|
router.wait_for_unit("kea-dhcp4-server.service")
|
||||||
|
client.wait_for_unit("systemd-networkd-wait-online.service")
|
||||||
|
client.wait_until_succeeds("ping -c 5 10.0.0.1")
|
||||||
|
router.wait_until_succeeds("ping -c 5 10.0.0.2")
|
||||||
|
'';
|
||||||
|
})
|
|
@ -326,49 +326,36 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
kea = {
|
kea = let
|
||||||
|
controlSocketPath = "/run/kea/dhcp6.sock";
|
||||||
|
in
|
||||||
|
{
|
||||||
exporterConfig = {
|
exporterConfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
controlSocketPaths = [
|
controlSocketPaths = [
|
||||||
"/run/kea/kea-dhcp6.sock"
|
controlSocketPath
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
metricProvider = {
|
metricProvider = {
|
||||||
users.users.kea = {
|
systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6-server.service" ];
|
||||||
isSystemUser = true;
|
|
||||||
};
|
|
||||||
users.groups.kea = {};
|
|
||||||
|
|
||||||
systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6.service" ];
|
services.kea = {
|
||||||
|
enable = true;
|
||||||
systemd.services.kea-dhcp6 = let
|
dhcp6 = {
|
||||||
configFile = pkgs.writeText "kea-dhcp6.conf" (builtins.toJSON {
|
enable = true;
|
||||||
Dhcp6 = {
|
settings = {
|
||||||
"control-socket" = {
|
control-socket = {
|
||||||
"socket-type" = "unix";
|
socket-type = "unix";
|
||||||
"socket-name" = "/run/kea/kea-dhcp6.sock";
|
socket-name = controlSocketPath;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
});
|
|
||||||
in
|
|
||||||
{
|
|
||||||
after = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
DynamicUser = false;
|
|
||||||
User = "kea";
|
|
||||||
Group = "kea";
|
|
||||||
ExecStart = "${pkgs.kea}/bin/kea-dhcp6 -c ${configFile}";
|
|
||||||
StateDirectory = "kea";
|
|
||||||
RuntimeDirectory = "kea";
|
|
||||||
UMask = "0007";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
exporterTest = ''
|
exporterTest = ''
|
||||||
wait_for_unit("kea-dhcp6.service")
|
wait_for_unit("kea-dhcp6-server.service")
|
||||||
wait_for_file("/run/kea/kea-dhcp6.sock")
|
wait_for_file("${controlSocketPath}")
|
||||||
wait_for_unit("prometheus-kea-exporter.service")
|
wait_for_unit("prometheus-kea-exporter.service")
|
||||||
wait_for_open_port(9547)
|
wait_for_open_port(9547)
|
||||||
succeed(
|
succeed(
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "chia";
|
pname = "chia";
|
||||||
version = "1.2.1";
|
version = "1.2.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Chia-Network";
|
owner = "Chia-Network";
|
||||||
repo = "chia-blockchain";
|
repo = "chia-blockchain";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-ZNSNROWl6RR4GZnoRGAXrdw48wH9OOgrsoKz0RNIIcs=";
|
sha256 = "sha256-ZYncyaX9gqBhDKiC87A2xI7VeU0zGsmm3Sx45lwgnrg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec {
|
||||||
homepage = "https://github.com/rust-ethereum/ethabi";
|
homepage = "https://github.com/rust-ethereum/ethabi";
|
||||||
maintainers = [ maintainers.dbrock ];
|
maintainers = [ maintainers.dbrock ];
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Wallet for Nano cryptocurrency";
|
description = "Wallet for Nano cryptocurrency";
|
||||||
homepage = "https://nano.org/en/wallet/";
|
homepage = "https://nano.org/en/wallet/";
|
||||||
license = lib.licenses.bsd2;
|
license = lib.licenses.bsd2;
|
||||||
|
|
|
@ -5,15 +5,15 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
sublime4 = common {
|
sublime4 = common {
|
||||||
buildVersion = "4107";
|
buildVersion = "4113";
|
||||||
x64sha256 = "05ar7qd1d880442bx4w32mapsib7j27g9l96q2v2s7591r9fgnf7";
|
x64sha256 = "13679mnmigy1sgj355zs4si6gnx42rgjl4rn5d6gqgj5qq7zj3lh";
|
||||||
aarch64sha256 = "4MzwhZ17c6cYtlwPA+SBiey6GiVruADXOLJAeJlMrgM=";
|
aarch64sha256 = "0hg6g3cichma1x82963m7xwazmpdvv5zmz8rpwxs337zq7j3dmb3";
|
||||||
} {};
|
} {};
|
||||||
|
|
||||||
sublime4-dev = common {
|
sublime4-dev = common {
|
||||||
buildVersion = "4106";
|
buildVersion = "4112";
|
||||||
dev = true;
|
dev = true;
|
||||||
x64sha256 = "09jnn52zb0mjxpj5xz4sixl34cr6j60x46c2dj1m0dlgxap0sh8x";
|
x64sha256 = "1yy8wzcphsk3ji2sv2vjcw8ybn62yibzsv9snmm01gvkma16p9dl";
|
||||||
aarch64sha256 = "7blbeSZI0V6q89jMM+zi2ODEdoc1b3Am8F2b2jLr5O8=";
|
aarch64sha256 = "12bl235rxgw3q99yz9x4nfaryb32a2vzyam88by6p1s1zw2fxnp9";
|
||||||
} {};
|
} {};
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,6 @@ stdenv.mkDerivation (rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Quick image viewer";
|
description = "Quick image viewer";
|
||||||
homepage = "http://spiegl.de/qiv/";
|
homepage = "http://spiegl.de/qiv/";
|
||||||
inherit version;
|
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
|
||||||
makeFlags = ["PREFIX=$(out)"];
|
makeFlags = ["PREFIX=$(out)"];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "";
|
description = "";
|
||||||
# Code cannot be used in commercial programs
|
# Code cannot be used in commercial programs
|
||||||
# Looks like the definition hinges on the price, not license
|
# Looks like the definition hinges on the price, not license
|
||||||
|
|
|
@ -28,15 +28,16 @@
|
||||||
, nss
|
, nss
|
||||||
, pango
|
, pango
|
||||||
, systemd
|
, systemd
|
||||||
|
, udev
|
||||||
, xdg-utils
|
, xdg-utils
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "1password";
|
pname = "1password";
|
||||||
version = "8.0.34";
|
version = "8.1.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||||
sha256 = "0mp119v5vgsva7pnxpsbq4xhh4vbhwv7ga9b5b7f6slx3biy1wmh";
|
sha256 = "0y39sfhj9xrgprh01i9apzfkqzm6pdhjc8x59x5p5djjjvxbcwmy";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
@ -95,8 +96,12 @@ stdenv.mkDerivation rec {
|
||||||
patchelf --set-rpath ${rpath}:$out/share/1password $file
|
patchelf --set-rpath ${rpath}:$out/share/1password $file
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Electron is trying to open udev via dlopen()
|
||||||
|
# and for some reason that doesn't seem to be impacted from the rpath.
|
||||||
|
# Adding udev to LD_LIBRARY_PATH fixes that.
|
||||||
makeWrapper $out/share/1password/1password $out/bin/1password \
|
makeWrapper $out/share/1password/1password $out/bin/1password \
|
||||||
--prefix PATH : ${xdg-utils}/bin
|
--prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||||
|
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -54,6 +54,5 @@ mkDerivation rec {
|
||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = with lib.maintainers; [ tstrobel ];
|
maintainers = with lib.maintainers; [ tstrobel ];
|
||||||
platforms = with lib.platforms; linux;
|
platforms = with lib.platforms; linux;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,5 @@ buildPythonApplication rec {
|
||||||
homepage = "https://github.com/insanum/gcalcli";
|
homepage = "https://github.com/insanum/gcalcli";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ nocoolnametom ];
|
maintainers = with maintainers; [ nocoolnametom ];
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.isc;
|
license = licenses.isc;
|
||||||
maintainers = with maintainers; [ obadz ];
|
maintainers = with maintainers; [ obadz ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = with lib.maintainers; [ flokli ];
|
maintainers = with lib.maintainers; [ flokli ];
|
||||||
platforms = with lib.platforms; linux;
|
platforms = with lib.platforms; linux;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,13 +8,13 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "scli";
|
pname = "scli";
|
||||||
version = "0.6.3";
|
version = "0.6.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "isamert";
|
owner = "isamert";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-QGVBJKTBo2RckGwW1deM2toRPT73PYDLvr7YVepkQvg=";
|
sha256 = "0fx9ig08whl7bsii9m1h9wp361ngf1szd8v8yqglgl0x8044fwrk";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = with python3.pkgs; [
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
|
|
@ -36,6 +36,5 @@ stdenv.mkDerivation rec {
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
maintainers = with lib.maintainers; [ tstrobel ];
|
maintainers = with lib.maintainers; [ tstrobel ];
|
||||||
platforms = with lib.platforms; linux;
|
platforms = with lib.platforms; linux;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
downloadPage = "https://vifm.info/downloads.shtml";
|
downloadPage = "https://vifm.info/downloads.shtml";
|
||||||
homepage = "https://vifm.info/";
|
homepage = "https://vifm.info/";
|
||||||
inherit version;
|
|
||||||
updateWalker = true;
|
updateWalker = true;
|
||||||
changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog";
|
changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog";
|
||||||
};
|
};
|
||||||
|
|
|
@ -86,7 +86,6 @@ buildPythonApplication rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Interactive terminal multitool for tabular data";
|
description = "Interactive terminal multitool for tabular data";
|
||||||
license = lib.licenses.gpl3;
|
license = lib.licenses.gpl3;
|
||||||
maintainers = [ lib.maintainers.raskin ];
|
maintainers = [ lib.maintainers.raskin ];
|
||||||
|
|
54
pkgs/applications/misc/wofi-emoji/default.nix
Normal file
54
pkgs/applications/misc/wofi-emoji/default.nix
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
{ stdenv, lib, fetchFromGitHub, jq }:
|
||||||
|
|
||||||
|
let
|
||||||
|
emojiJSON = fetchFromGitHub {
|
||||||
|
owner = "github";
|
||||||
|
repo = "gemoji";
|
||||||
|
sha256 = "sha256-Tn0vba129LPlX+MRcCBA9qp2MU1ek1jYzVCqoNxCL/w=";
|
||||||
|
rev = "v4.0.0.rc2";
|
||||||
|
};
|
||||||
|
|
||||||
|
in stdenv.mkDerivation rec {
|
||||||
|
pname = "wofi-emoji";
|
||||||
|
version = "unstable-2021-05-24";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "dln";
|
||||||
|
repo = pname;
|
||||||
|
rev = "bfe35c1198667489023109f6843217b968a35183";
|
||||||
|
sha256 = "sha256-wMIjTUCVn4uF0cpBkPfs76NRvwS0WhGGJRy9vvtmVWQ=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ jq ];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
cp "${emojiJSON}/db/emoji.json" .
|
||||||
|
substituteInPlace build.sh \
|
||||||
|
--replace 'curl https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json' 'cat emoji.json'
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
bash build.sh
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp wofi-emoji $out/bin
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Simple emoji selector for Wayland using wofi and wl-clipboard";
|
||||||
|
homepage = "https://github.com/dln/wofi-emoji";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = [ maintainers.ymarkus ];
|
||||||
|
platforms = platforms.all;
|
||||||
|
};
|
||||||
|
}
|
|
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
|
||||||
platforms = with lib.platforms; linux;
|
platforms = with lib.platforms; linux;
|
||||||
maintainers = with lib.maintainers; [raskin];
|
maintainers = with lib.maintainers; [raskin];
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
inherit version;
|
|
||||||
downloadPage = "http://www.creytiv.com/pub/";
|
downloadPage = "http://www.creytiv.com/pub/";
|
||||||
updateWalker = true;
|
updateWalker = true;
|
||||||
downloadURLRegexp = "/baresip-.*[.]tar[.].*";
|
downloadURLRegexp = "/baresip-.*[.]tar[.].*";
|
||||||
|
|
|
@ -54,6 +54,5 @@ mkDerivation rec {
|
||||||
maintainers = with maintainers; [ colemickens ];
|
maintainers = with maintainers; [ colemickens ];
|
||||||
broken = stdenv.isDarwin;
|
broken = stdenv.isDarwin;
|
||||||
inherit (qtbase.meta) platforms;
|
inherit (qtbase.meta) platforms;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "Perl Console Twitter Client";
|
description = "Perl Console Twitter Client";
|
||||||
homepage = "http://oysttyer.github.io/";
|
homepage = "http://oysttyer.github.io/";
|
||||||
maintainers = with maintainers; [ woffs ];
|
maintainers = with maintainers; [ woffs ];
|
||||||
|
|
|
@ -42,6 +42,5 @@ mkDerivation rec {
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with maintainers; [ peterhoeg ];
|
maintainers = with maintainers; [ peterhoeg ];
|
||||||
inherit (qtbase.meta) platforms;
|
inherit (qtbase.meta) platforms;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,6 +60,5 @@ mkDerivation rec {
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with maintainers; [ peterhoeg ];
|
maintainers = with maintainers; [ peterhoeg ];
|
||||||
inherit (qtbase.meta) platforms;
|
inherit (qtbase.meta) platforms;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
maintainers = with lib.maintainers; [ kovirobi ];
|
maintainers = with lib.maintainers; [ kovirobi ];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
inherit version;
|
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
A simple command line tool to check for new mail in local mbox and
|
A simple command line tool to check for new mail in local mbox and
|
||||||
maildir and remote POP3 and IMAP mailboxes.
|
maildir and remote POP3 and IMAP mailboxes.
|
||||||
|
|
|
@ -16,7 +16,6 @@ stdenv.mkDerivation {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
|
description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
|
||||||
homepage = "http://tetgen.org/";
|
homepage = "http://tetgen.org/";
|
||||||
license = lib.licenses.agpl3Plus;
|
license = lib.licenses.agpl3Plus;
|
||||||
|
|
|
@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Extension of clingo to handle constraints over integers";
|
description = "Extension of clingo to handle constraints over integers";
|
||||||
license = lib.licenses.gpl3; # for now GPL3, next version MIT!
|
license = lib.licenses.gpl3; # for now GPL3, next version MIT!
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
|
|
|
@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
|
||||||
cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
|
cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "ASP system to ground and solve logic programs";
|
description = "ASP system to ground and solve logic programs";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -60,7 +60,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Automated theorem prover for higher-order logic";
|
description = "Automated theorem prover for higher-order logic";
|
||||||
license = lib.licenses.mit ;
|
license = lib.licenses.mit ;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
inherit (z3.meta) license homepage platforms;
|
inherit (z3.meta) license homepage platforms;
|
||||||
description = "TPTP wrapper for Z3 prover";
|
description = "TPTP wrapper for Z3 prover";
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [ gmp mpir cddlib ];
|
buildInputs = [ gmp mpir cddlib ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "A software package for computing Gröbner fans and tropical varieties";
|
description = "A software package for computing Gröbner fans and tropical varieties";
|
||||||
license = lib.licenses.gpl2 ;
|
license = lib.licenses.gpl2 ;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
checkTarget = "checks";
|
checkTarget = "checks";
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "Programs for computing automorphism groups of graphs and digraphs";
|
description = "Programs for computing automorphism groups of graphs and digraphs";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = teams.sage.members;
|
maintainers = teams.sage.members;
|
||||||
|
|
|
@ -21,6 +21,5 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2;
|
||||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Software for research in polyhedral geometry";
|
description = "Software for research in polyhedral geometry";
|
||||||
license = lib.licenses.gpl2 ;
|
license = lib.licenses.gpl2 ;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
|
||||||
preInstall = ''mkdir -p "$out"/{bin,share,lib,include}'';
|
preInstall = ''mkdir -p "$out"/{bin,share,lib,include}'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "A program to find rational points on hyperelliptic curves";
|
description = "A program to find rational points on hyperelliptic curves";
|
||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Cellular automata simulation program";
|
description = "Cellular automata simulation program";
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Cellular automata simulation program";
|
description = "Cellular automata simulation program";
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||||
zlib
|
zlib
|
||||||
];
|
];
|
||||||
|
|
||||||
phases = [ "unpackPhase" "installPhase" ];
|
dontConfigure = true;
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p "$out"
|
mkdir -p "$out"
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,6 @@ let
|
||||||
passthru.tests = {};
|
passthru.tests = {};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "A fast, lightweight SCM system for very large distributed projects";
|
description = "A fast, lightweight SCM system for very large distributed projects";
|
||||||
homepage = "https://www.mercurial-scm.org";
|
homepage = "https://www.mercurial-scm.org";
|
||||||
downloadPage = "https://www.mercurial-scm.org/release/";
|
downloadPage = "https://www.mercurial-scm.org/release/";
|
||||||
|
|
|
@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Monotone ancestry visualiser";
|
description = "Monotone ancestry visualiser";
|
||||||
license = lib.licenses.gpl2Plus ;
|
license = lib.licenses.gpl2Plus ;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -29,7 +29,6 @@ buildPythonApplication rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Strip output from Jupyter and IPython notebooks";
|
description = "Strip output from Jupyter and IPython notebooks";
|
||||||
homepage = "https://github.com/kynan/nbstripout";
|
homepage = "https://github.com/kynan/nbstripout";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
|
|
|
@ -17,13 +17,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "podman";
|
pname = "podman";
|
||||||
version = "3.2.2";
|
version = "3.2.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "containers";
|
owner = "containers";
|
||||||
repo = "podman";
|
repo = "podman";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-D1gtKaDZ7/SyySYWmDa3eDHbh2f5B3q1VEYKgl1pXCE=";
|
sha256 = "sha256-P8/4jehfcjM+r/pwW6fxrwquMVUqXxvvTur7Tesjmnc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
|
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
|
||||||
description = "A small window manager controlled by a 9P filesystem";
|
description = "A small window manager controlled by a 9P filesystem";
|
||||||
maintainers = with lib.maintainers; [ kovirobi ];
|
maintainers = with lib.maintainers; [ kovirobi ];
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
inherit version;
|
|
||||||
platforms = with lib.platforms; linux;
|
platforms = with lib.platforms; linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# shellcheck shell=bash
|
|
||||||
# Binutils Wrapper hygiene
|
# Binutils Wrapper hygiene
|
||||||
#
|
#
|
||||||
# See comments in cc-wrapper's setup hook. This works exactly the same way.
|
# See comments in cc-wrapper's setup hook. This works exactly the same way.
|
||||||
|
@ -15,9 +14,7 @@ bintoolsWrapper_addLDVars () {
|
||||||
getHostRoleEnvHook
|
getHostRoleEnvHook
|
||||||
|
|
||||||
if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
|
if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
|
||||||
varName=NIX_LDFLAGS${role_post}
|
export NIX_LDFLAGS${role_post}+=" -L$1/lib64"
|
||||||
eval "$varName=\"${!varName:-} -L$1/lib64\""
|
|
||||||
export "${varName?}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d "$1/lib" ]]; then
|
if [[ -d "$1/lib" ]]; then
|
||||||
|
@ -27,9 +24,7 @@ bintoolsWrapper_addLDVars () {
|
||||||
# directories and bloats the size of the environment variable space.
|
# directories and bloats the size of the environment variable space.
|
||||||
local -a glob=( $1/lib/lib* )
|
local -a glob=( $1/lib/lib* )
|
||||||
if [ "${#glob[*]}" -gt 0 ]; then
|
if [ "${#glob[*]}" -gt 0 ]; then
|
||||||
varName=NIX_LDFLAGS${role_post}
|
export NIX_LDFLAGS${role_post}+=" -L$1/lib"
|
||||||
eval "$varName=\"${!varName:-} -L$1/lib\""
|
|
||||||
export "${varName?}"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,6 @@ isExecutable() {
|
||||||
isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \
|
isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \
|
||||||
| grep '^ *Type: *EXEC\>\|^ *INTERP\>')"
|
| grep '^ *Type: *EXEC\>\|^ *INTERP\>')"
|
||||||
# not using grep -q, because it can cause Broken pipe
|
# not using grep -q, because it can cause Broken pipe
|
||||||
# https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag
|
|
||||||
[ -n "$isExeResult" ]
|
[ -n "$isExeResult" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# shellcheck shell=bash
|
preConfigurePhases+=" autoreconfPhase"
|
||||||
preConfigurePhases="${preConfigurePhases:-} autoreconfPhase"
|
|
||||||
|
|
||||||
autoreconfPhase() {
|
autoreconfPhase() {
|
||||||
runHook preAutoreconf
|
runHook preAutoreconf
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# shellcheck shell=bash
|
|
||||||
fixupOutputHooks+=(_makeSymlinksRelative)
|
fixupOutputHooks+=(_makeSymlinksRelative)
|
||||||
|
|
||||||
# For every symlink in $output that refers to another file in $output
|
# For every symlink in $output that refers to another file in $output
|
||||||
|
|
|
@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare)
|
||||||
|
|
||||||
_moveToShare() {
|
_moveToShare() {
|
||||||
forceShare=${forceShare:=man doc info}
|
forceShare=${forceShare:=man doc info}
|
||||||
if [[ -z $forceShare || -z $out ]]; then return; fi
|
if [ -z "$forceShare" -o -z "$out" ]; then return; fi
|
||||||
|
|
||||||
for d in $forceShare; do
|
for d in $forceShare; do
|
||||||
if [ -d "$out/$d" ]; then
|
if [ -d "$out/$d" ]; then
|
||||||
|
@ -14,9 +14,10 @@ _moveToShare() {
|
||||||
echo "both $d/ and share/$d/ exist!"
|
echo "both $d/ and share/$d/ exist!"
|
||||||
else
|
else
|
||||||
echo "moving $out/$d to $out/share/$d"
|
echo "moving $out/$d to $out/share/$d"
|
||||||
mkdir -p "$out/share"
|
mkdir -p $out/share
|
||||||
mv "$out/$d" "$out/share/"
|
mv $out/$d $out/share/
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
# shellcheck shell=bash
|
|
||||||
# The base package for automatic multiple-output splitting. Used in stdenv as well.
|
# The base package for automatic multiple-output splitting. Used in stdenv as well.
|
||||||
preConfigureHooks+=(_multioutConfig)
|
preConfigureHooks+=(_multioutConfig)
|
||||||
preFixupHooks+=(_multioutDocs)
|
preFixupHooks+=(_multioutDocs)
|
||||||
|
@ -48,25 +47,22 @@ _overrideFirst outputInfo "info" "$outputBin"
|
||||||
|
|
||||||
# Add standard flags to put files into the desired outputs.
|
# Add standard flags to put files into the desired outputs.
|
||||||
_multioutConfig() {
|
_multioutConfig() {
|
||||||
if [[ "$outputs" = "out" || -z "${setOutputFlags-1}" ]]; then
|
if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi;
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# try to detect share/doc/${shareDocName}
|
# try to detect share/doc/${shareDocName}
|
||||||
# Note: sadly, $configureScript detection comes later in configurePhase,
|
# Note: sadly, $configureScript detection comes later in configurePhase,
|
||||||
# and reordering would cause more trouble than worth.
|
# and reordering would cause more trouble than worth.
|
||||||
if [ -z "$shareDocName" ]; then
|
if [ -z "$shareDocName" ]; then
|
||||||
local confScript="$configureScript"
|
local confScript="$configureScript"
|
||||||
if [[ -z "$confScript" && -x ./configure ]]; then
|
if [ -z "$confScript" ] && [ -x ./configure ]; then
|
||||||
confScript=./configure
|
confScript=./configure
|
||||||
fi
|
fi
|
||||||
if [ -f "$confScript" ]; then
|
if [ -f "$confScript" ]; then
|
||||||
local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"
|
local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"
|
||||||
# PACKAGE_TARNAME sometimes contains garbage.
|
fi
|
||||||
# verify that shareDocName contains only valid characters
|
# PACKAGE_TARNAME sometimes contains garbage.
|
||||||
if ! [[ $shareDocName =~ ^[a-zA-Z0f9_-]+$ ]]; then
|
if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then
|
||||||
shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
|
shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,9 @@
|
||||||
# shellcheck disable=SC2148
|
|
||||||
# Use the last part of the out path as hash input for the build.
|
# Use the last part of the out path as hash input for the build.
|
||||||
# This should ensure that it is deterministic across rebuilds of the same
|
# This should ensure that it is deterministic across rebuilds of the same
|
||||||
# derivation and not easily collide with other builds.
|
# derivation and not easily collide with other builds.
|
||||||
# We also truncate the hash so that it cannot cause reference cycles.
|
# We also truncate the hash so that it cannot cause reference cycles.
|
||||||
# NIX_CFLAGS_COMPILE might not have been defined before
|
export NIX_CFLAGS_COMPILE+=" -frandom-seed=$(
|
||||||
NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -frandom-seed=$(
|
|
||||||
# shellcheck disable=SC2154
|
|
||||||
outbase="${out##*/}"
|
outbase="${out##*/}"
|
||||||
randomseed="${outbase:0:10}"
|
randomseed="${outbase:0:10}"
|
||||||
echo "$randomseed"
|
echo $randomseed
|
||||||
)"
|
)"
|
||||||
export NIX_CFLAGS_COMPILE
|
|
||||||
|
|
|
@ -154,7 +154,6 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "Color and Black-and-White emoji fonts";
|
description = "Color and Black-and-White emoji fonts";
|
||||||
homepage = "https://github.com/googlefonts/noto-emoji";
|
homepage = "https://github.com/googlefonts/noto-emoji";
|
||||||
license = with licenses; [ ofl asl20 ];
|
license = with licenses; [ ofl asl20 ];
|
||||||
|
|
|
@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
|
||||||
outputs = [ "out" "extra" ];
|
outputs = [ "out" "extra" ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Bitmapped character-art-friendly Unicode fonts";
|
description = "Bitmapped character-art-friendly Unicode fonts";
|
||||||
# Basically GPL2+ with font exception — because of the Unifont-augmented
|
# Basically GPL2+ with font exception — because of the Unifont-augmented
|
||||||
# version. The reduced version is public domain.
|
# version. The reduced version is public domain.
|
||||||
|
|
|
@ -29,7 +29,7 @@ in
|
||||||
ln -s "${srcs.test-images}" "$out/${srcs.test-images.name}"
|
ln -s "${srcs.test-images}" "$out/${srcs.test-images.name}"
|
||||||
ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}"
|
ln -s "${srcs.test-labels}" "$out/${srcs.test-labels.name}"
|
||||||
'';
|
'';
|
||||||
phases = [ "installPhase" ];
|
dontUnpack = true;
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A large database of handwritten digits";
|
description = "A large database of handwritten digits";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
|
|
|
@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Spell checker oriented word lists";
|
description = "Spell checker oriented word lists";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [pkg-config];
|
nativeBuildInputs = [pkg-config];
|
||||||
buildInputs = [xorgproto];
|
buildInputs = [xorgproto];
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "X11 colorname to RGB mapping database";
|
description = "X11 colorname to RGB mapping database";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
buildInputs = [jre ant jdk jre];
|
buildInputs = [jre ant jdk jre];
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "A JVM-based Common Lisp implementation";
|
description = "A JVM-based Common Lisp implementation";
|
||||||
license = lib.licenses.gpl3 ;
|
license = lib.licenses.gpl3 ;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -118,7 +118,6 @@ stdenv.mkDerivation rec {
|
||||||
CLASP_SRC_DONTTOUCH = "true";
|
CLASP_SRC_DONTTOUCH = "true";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "A Common Lisp implementation based on LLVM with C++ integration";
|
description = "A Common Lisp implementation based on LLVM with C++ integration";
|
||||||
license = lib.licenses.lgpl21Plus ;
|
license = lib.licenses.lgpl21Plus ;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -43,7 +43,6 @@ in stdenv.mkDerivation {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "Digital Mars D Compiler Package";
|
description = "Digital Mars D Compiler Package";
|
||||||
# As of 2.075 all sources and binaries use the boost license
|
# As of 2.075 all sources and binaries use the boost license
|
||||||
license = licenses.boost;
|
license = licenses.boost;
|
||||||
|
|
|
@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = [ maintainers.raskin ];
|
maintainers = [ maintainers.raskin ];
|
||||||
license = with licenses; [ gpl2 lgpl2 ];
|
license = with licenses; [ gpl2 lgpl2 ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "julia-bin";
|
pname = "julia-bin";
|
||||||
version = "1.6.1";
|
version = "1.6.2";
|
||||||
|
|
||||||
src = {
|
src = {
|
||||||
x86_64-linux = fetchurl {
|
x86_64-linux = fetchurl {
|
||||||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||||
sha256 = "01i5sm4vqb0y5qznql571zap19b42775drrcxnzsyhpaqgg8m23w";
|
sha256 = "0h1jh8gbvxb0pl1an0fbbg4lbd0sa24yj2f4yqwavw8dbdvvbd1y";
|
||||||
};
|
};
|
||||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,6 @@ in stdenv.mkDerivation {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "The LLVM-based D Compiler";
|
description = "The LLVM-based D Compiler";
|
||||||
homepage = "https://github.com/ldc-developers/ldc";
|
homepage = "https://github.com/ldc-developers/ldc";
|
||||||
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
|
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE
|
||||||
|
|
|
@ -2,9 +2,7 @@ diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
|
||||||
index 3a66dd9c3fb..7efc85d9f9f 100644
|
index 3a66dd9c3fb..7efc85d9f9f 100644
|
||||||
--- a/lib/builtins/CMakeLists.txt
|
--- a/lib/builtins/CMakeLists.txt
|
||||||
+++ b/lib/builtins/CMakeLists.txt
|
+++ b/lib/builtins/CMakeLists.txt
|
||||||
@@ -301,6 +301,10 @@ if (NOT MSVC)
|
@@ -345,4 +345,8 @@ if (NOT MSVC)
|
||||||
i386/umoddi3.S
|
|
||||||
)
|
|
||||||
|
|
||||||
+ set(i486_SOURCES ${i386_SOURCES})
|
+ set(i486_SOURCES ${i386_SOURCES})
|
||||||
+ set(i586_SOURCES ${i386_SOURCES})
|
+ set(i586_SOURCES ${i386_SOURCES})
|
||||||
|
|
|
@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";
|
description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";
|
||||||
license = lib.licenses.bsd3;
|
license = lib.licenses.bsd3;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -110,7 +110,6 @@ stdenv.mkDerivation rec {
|
||||||
'');
|
'');
|
||||||
|
|
||||||
meta = sbclBootstrap.meta // {
|
meta = sbclBootstrap.meta // {
|
||||||
inherit version;
|
|
||||||
updateWalker = true;
|
updateWalker = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,6 @@ let
|
||||||
homepage = "https://github.com/ethereum/solidity";
|
homepage = "https://github.com/ethereum/solidity";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
|
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
phases = "installPhase";
|
dontUnpack = true;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/share/java
|
mkdir -p $out/share/java
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
|
{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
|
||||||
let
|
|
||||||
version = "0.6.3";
|
stdenv.mkDerivation rec {
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "libgme";
|
pname = "libgme";
|
||||||
inherit version;
|
version = "0.6.3";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A collection of video game music chip emulators";
|
description = "A collection of video game music chip emulators";
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
{ lib, stdenv, fetchurl, cmake, boost, python2}:
|
{ lib, stdenv, fetchurl, cmake, boost, python2}:
|
||||||
|
|
||||||
let version = "1.8.2"; in
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "avro-c++";
|
pname = "avro-c++";
|
||||||
inherit version;
|
version = "1.8.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
|
url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
|
{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
version = "1.10.2";
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "avro-c";
|
pname = "avro-c";
|
||||||
inherit version;
|
version = "1.10.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
|
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
|
||||||
|
|
|
@ -1,17 +1,12 @@
|
||||||
{ lib, stdenv, fetchurl }:
|
{ lib, stdenv, fetchurl }:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
version = "0.6";
|
|
||||||
sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7";
|
|
||||||
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "bearssl";
|
pname = "bearssl";
|
||||||
inherit version;
|
version = "0.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.bearssl.org/bearssl-${version}.tar.gz";
|
url = "https://www.bearssl.org/bearssl-${version}.tar.gz";
|
||||||
inherit sha256;
|
sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "lib" "dev" "out" ];
|
outputs = [ "bin" "lib" "dev" "out" ];
|
||||||
|
|
|
@ -10,17 +10,17 @@
|
||||||
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
|
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
|
||||||
buildGoModule {
|
buildGoModule {
|
||||||
pname = "boringssl";
|
pname = "boringssl";
|
||||||
version = "2021-04-18";
|
version = "2021-07-09";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://boringssl.googlesource.com/boringssl";
|
url = "https://boringssl.googlesource.com/boringssl";
|
||||||
rev = "468cde90ca58421d63f4dfeaebcf8bb3fccb4127";
|
rev = "268a4a6ff3bd656ae65fe41ef1185daa85cfae21";
|
||||||
sha256 = "0gaqcbvp6r5fq265mckmg0i0rjab0bhxkxcvfxp3ar5dm7q88w39";
|
sha256 = "04fja4fdwhc69clmvg8i12zm6ks3sfl3r8i5bxn4x63b9dj5znlx";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ninja perl ];
|
nativeBuildInputs = [ cmake ninja perl ];
|
||||||
|
|
||||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
|
||||||
|
|
||||||
# hack to get both go and cmake configure phase
|
# hack to get both go and cmake configure phase
|
||||||
# (if we use postConfigure then cmake will loop runHook postConfigure)
|
# (if we use postConfigure then cmake will loop runHook postConfigure)
|
||||||
|
|
|
@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
|
||||||
# Requested here: https://github.com/cddlib/cddlib/issues/25
|
# Requested here: https://github.com/cddlib/cddlib/issues/25
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron";
|
description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = teams.sage.members;
|
maintainers = teams.sage.members;
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
{ lib, stdenv, fetchurl, pcre }:
|
{ lib, stdenv, fetchurl, pcre }:
|
||||||
|
|
||||||
let version = "1.0.10"; in
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "classads";
|
pname = "classads";
|
||||||
inherit version;
|
version = "1.0.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
|
url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
|
{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
version = "2.12.2";
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "clfft";
|
pname = "clfft";
|
||||||
inherit version;
|
version = "2.12.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "clMathLibraries";
|
owner = "clMathLibraries";
|
||||||
|
@ -29,6 +27,5 @@ in stdenv.mkDerivation {
|
||||||
homepage = "http://clmathlibraries.github.io/clFFT/";
|
homepage = "http://clmathlibraries.github.io/clFFT/";
|
||||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||||
maintainers = with maintainers; [ chessai ];
|
maintainers = with maintainers; [ chessai ];
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "Elliptic curve tools";
|
description = "Elliptic curve tools";
|
||||||
homepage = "https://github.com/JohnCremona/eclib";
|
homepage = "https://github.com/JohnCremona/eclib";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
, doxygen
|
, doxygen
|
||||||
, graphviz
|
, graphviz
|
||||||
, libxslt
|
, libxslt
|
||||||
|
, libiconv
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
|
||||||
libxslt
|
libxslt
|
||||||
];
|
];
|
||||||
|
|
||||||
|
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
expat
|
expat
|
||||||
zlib
|
zlib
|
||||||
|
|
|
@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
description = "Finite Field Linear Algebra Subroutines";
|
description = "Finite Field Linear Algebra Subroutines";
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = teams.sage.members;
|
maintainers = teams.sage.members;
|
||||||
|
|
|
@ -2,13 +2,9 @@
|
||||||
, libXrandr, libGLU, libGL, libXft, libXfixes, xinput
|
, libXrandr, libGLU, libGL, libXft, libXfixes, xinput
|
||||||
, CoreServices }:
|
, CoreServices }:
|
||||||
|
|
||||||
let
|
|
||||||
version = "1.6.57";
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fox";
|
pname = "fox";
|
||||||
inherit version;
|
version = "1.6.57";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
|
url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
|
||||||
|
|
|
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
|
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
|
||||||
inherit version;
|
|
||||||
homepage = "http://openkinect.org";
|
homepage = "http://openkinect.org";
|
||||||
license = with lib.licenses; [ gpl2 asl20 ];
|
license = with lib.licenses; [ gpl2 asl20 ];
|
||||||
maintainers = with lib.maintainers; [ bennofs ];
|
maintainers = with lib.maintainers; [ bennofs ];
|
||||||
|
|
|
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
buildInputs = [autoconf automake libtool gmpxx];
|
buildInputs = [autoconf automake libtool gmpxx];
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "A C++ library for arithmetic and algebraic computations";
|
description = "A C++ library for arithmetic and algebraic computations";
|
||||||
license = lib.licenses.cecill-b;
|
license = lib.licenses.cecill-b;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
buildInputs = [autoconf automake libtool gmpxx];
|
buildInputs = [autoconf automake libtool gmpxx];
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "A C++ library for arithmetic and algebraic computations";
|
description = "A C++ library for arithmetic and algebraic computations";
|
||||||
license = lib.licenses.cecill-b;
|
license = lib.licenses.cecill-b;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "A C++ library for arithmetic and algebraic computations";
|
description = "A C++ library for arithmetic and algebraic computations";
|
||||||
license = lib.licenses.cecill-b;
|
license = lib.licenses.cecill-b;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
Binary file not shown.
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.33";
|
version = "2.33";
|
||||||
patchSuffix = "-45";
|
patchSuffix = "-47";
|
||||||
sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
|
sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ stdenv.mkDerivation ({
|
||||||
[
|
[
|
||||||
/* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
|
/* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
|
||||||
$ git fetch --all -p && git checkout origin/release/2.33/master && git describe
|
$ git fetch --all -p && git checkout origin/release/2.33/master && git describe
|
||||||
glibc-2.33-45-g58b90461ae
|
glibc-2.33-47-gb5711025bc
|
||||||
$ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
|
$ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
|
||||||
|
|
||||||
To compare the archive contents zdiff can be used.
|
To compare the archive contents zdiff can be used.
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
|
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
version = "2.0.4";
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
pname = "goocanvas";
|
pname = "goocanvas";
|
||||||
inherit version;
|
version = "2.0.4";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" ];
|
outputs = [ "out" "dev" "devdoc" ];
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
{ lib, stdenv, fetchFromGitHub }:
|
{ lib, stdenv, fetchFromGitHub }:
|
||||||
|
|
||||||
let
|
stdenv.mkDerivation rec {
|
||||||
version = "2.9.4";
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "http-parser";
|
pname = "http-parser";
|
||||||
inherit version;
|
version = "2.9.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nodejs";
|
owner = "nodejs";
|
||||||
|
|
|
@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
|
||||||
"--with-cblas=-lblas"
|
"--with-cblas=-lblas"
|
||||||
];
|
];
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers";
|
description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers";
|
||||||
license = lib.licenses.gpl2Plus;
|
license = lib.licenses.gpl2Plus;
|
||||||
maintainers = [lib.maintainers.raskin];
|
maintainers = [lib.maintainers.raskin];
|
||||||
|
|
|
@ -1,17 +1,14 @@
|
||||||
{ fetchurl, lib, stdenv, unzip, ant, javac, jvm }:
|
{ fetchurl, lib, stdenv, unzip, ant, javac, jvm }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.7R2";
|
|
||||||
|
|
||||||
xbeans = fetchurl {
|
xbeans = fetchurl {
|
||||||
url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
|
url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
|
||||||
sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk";
|
sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "rhino";
|
pname = "rhino";
|
||||||
inherit version;
|
version = "1.7R2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://mozilla/js/rhino1_7R2.zip";
|
url = "mirror://mozilla/js/rhino1_7R2.zip";
|
||||||
|
|
|
@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
inherit version;
|
|
||||||
homepage = "https://github.com/open-source-parsers/jsoncpp";
|
homepage = "https://github.com/open-source-parsers/jsoncpp";
|
||||||
description = "A C++ library for interacting with JSON";
|
description = "A C++ library for interacting with JSON";
|
||||||
maintainers = with maintainers; [ ttuegel cpages ];
|
maintainers = with maintainers; [ ttuegel cpages ];
|
||||||
|
|
|
@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
|
||||||
description = "ANSI C routines for fast base64 encoding/decoding";
|
description = "ANSI C routines for fast base64 encoding/decoding";
|
||||||
license = lib.licenses.publicDomain;
|
license = lib.licenses.publicDomain;
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
|
|
|
@ -18,6 +18,5 @@ stdenv.mkDerivation rec {
|
||||||
license = lib.licenses.lgpl3;
|
license = lib.licenses.lgpl3;
|
||||||
maintainers = [ lib.maintainers.raskin ] ;
|
maintainers = [ lib.maintainers.raskin ] ;
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
inherit version;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Denable-test=false"
|
"-Denable-test=false"
|
||||||
|
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||||
|
"-Ddisable-introspection=true"
|
||||||
];
|
];
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|
|
@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
|
||||||
description = "Portable, simple C-language 9P client and server libary";
|
description = "Portable, simple C-language 9P client and server libary";
|
||||||
maintainers = with lib.maintainers; [ kovirobi ];
|
maintainers = with lib.maintainers; [ kovirobi ];
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
inherit version;
|
|
||||||
platforms = with lib.platforms; unix;
|
platforms = with lib.platforms; unix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue