Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
eb0f97ec8f
|
|
@ -7614,6 +7614,12 @@
|
|||
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 = {
|
||||
email = "niko.pavlinek@gmail.com";
|
||||
github = "nkpvk";
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
Moved to: ./contributing-to-this-manual.xml. Link:
|
||||
|
||||
https://nixos.org/manual/nixos/unstable/#chap-contributing
|
||||
3
nixos/doc/manual/README.md
Normal file
3
nixos/doc/manual/README.md
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[Moved to ./contributing-to-this-manual.chapter.md](./contributing-to-this-manual.chapter.md). Link:
|
||||
|
||||
https://nixos.org/manual/nixos/unstable/#chap-contributing
|
||||
|
|
@ -47,6 +47,13 @@
|
|||
<link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>.
|
||||
</para>
|
||||
</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>
|
||||
<para>
|
||||
<link xlink:href="https://sr.ht">sourcehut</link>, a
|
||||
|
|
|
|||
|
|
@ -15,6 +15,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).
|
||||
|
||||
- [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).
|
||||
|
||||
- [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/jicofo.nix
|
||||
./services/networking/jitsi-videobridge.nix
|
||||
./services/networking/kea.nix
|
||||
./services/networking/keepalived/default.nix
|
||||
./services/networking/keybase.nix
|
||||
./services/networking/kippo.nix
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ let
|
|||
serviceConfig.PrivateTmp = mkDefault true;
|
||||
serviceConfig.WorkingDirectory = mkDefault /tmp;
|
||||
serviceConfig.DynamicUser = mkDefault enableDynamicUser;
|
||||
serviceConfig.User = conf.user;
|
||||
serviceConfig.User = mkDefault conf.user;
|
||||
serviceConfig.Group = conf.group;
|
||||
} serviceOpts ]);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ in {
|
|||
};
|
||||
serviceOpts = {
|
||||
serviceConfig = {
|
||||
User = "kea";
|
||||
ExecStart = ''
|
||||
${pkgs.prometheus-kea-exporter}/bin/kea-exporter \
|
||||
--address ${cfg.listenAddress} \
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ let
|
|||
blackhole { badnetworks; };
|
||||
forward first;
|
||||
forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };
|
||||
directory "/run/named";
|
||||
directory "${cfg.directory}";
|
||||
pid-file "/run/named/named.pid";
|
||||
${cfg.extraOptions}
|
||||
};
|
||||
|
|
@ -166,6 +166,12 @@ in
|
|||
";
|
||||
};
|
||||
|
||||
directory = mkOption {
|
||||
type = types.str;
|
||||
default = "/run/named";
|
||||
description = "Working directory of BIND.";
|
||||
};
|
||||
|
||||
zones = mkOption {
|
||||
default = [ ];
|
||||
type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions));
|
||||
|
|
@ -240,6 +246,9 @@ in
|
|||
|
||||
${pkgs.coreutils}/bin/mkdir -p /run/named
|
||||
chown ${bindUser} /run/named
|
||||
|
||||
${pkgs.coreutils}/bin/mkdir -p ${cfg.directory}
|
||||
chown ${bindUser} ${cfg.directory}
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
|
|
|||
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 {};
|
||||
kafka = handleTest ./kafka.nix {};
|
||||
kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};
|
||||
kea = handleTest ./kea.nix {};
|
||||
keepalived = handleTest ./keepalived.nix {};
|
||||
keepassxc = handleTest ./keepassxc.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 = {
|
||||
enable = true;
|
||||
controlSocketPaths = [
|
||||
"/run/kea/kea-dhcp6.sock"
|
||||
controlSocketPath
|
||||
];
|
||||
};
|
||||
metricProvider = {
|
||||
users.users.kea = {
|
||||
isSystemUser = true;
|
||||
};
|
||||
users.groups.kea = {};
|
||||
systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6-server.service" ];
|
||||
|
||||
systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6.service" ];
|
||||
|
||||
systemd.services.kea-dhcp6 = let
|
||||
configFile = pkgs.writeText "kea-dhcp6.conf" (builtins.toJSON {
|
||||
Dhcp6 = {
|
||||
"control-socket" = {
|
||||
"socket-type" = "unix";
|
||||
"socket-name" = "/run/kea/kea-dhcp6.sock";
|
||||
services.kea = {
|
||||
enable = true;
|
||||
dhcp6 = {
|
||||
enable = true;
|
||||
settings = {
|
||||
control-socket = {
|
||||
socket-type = "unix";
|
||||
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 = ''
|
||||
wait_for_unit("kea-dhcp6.service")
|
||||
wait_for_file("/run/kea/kea-dhcp6.sock")
|
||||
wait_for_unit("kea-dhcp6-server.service")
|
||||
wait_for_file("${controlSocketPath}")
|
||||
wait_for_unit("prometheus-kea-exporter.service")
|
||||
wait_for_open_port(9547)
|
||||
succeed(
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "chia";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chia-Network";
|
||||
repo = "chia-blockchain";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZNSNROWl6RR4GZnoRGAXrdw48wH9OOgrsoKz0RNIIcs=";
|
||||
sha256 = "sha256-ZYncyaX9gqBhDKiC87A2xI7VeU0zGsmm3Sx45lwgnrg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://github.com/rust-ethereum/ethabi";
|
||||
maintainers = [ maintainers.dbrock ];
|
||||
license = licenses.asl20;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Wallet for Nano cryptocurrency";
|
||||
homepage = "https://nano.org/en/wallet/";
|
||||
license = lib.licenses.bsd2;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ trivialBuild rec {
|
|||
version = "1.52";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.gentoo.org/~ulm/emacs/ebuild-mode-${version}.tar.xz";
|
||||
url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
|
||||
sha256 = "10nikbbwh612qlnms2i31963a0h3ccyg85vrxlizdpsqs4cjpg6h";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -125,20 +125,16 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
aggressive-indent = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
aggressive-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "aggressive-indent";
|
||||
ename = "aggressive-indent";
|
||||
version = "1.8.3";
|
||||
version = "1.10.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/aggressive-indent-1.8.3.el";
|
||||
sha256 = "0jnzccl50x0wapprgwxinp99pwwa6j43q6msn4gv437j7swy8wnj";
|
||||
url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar";
|
||||
sha256 = "166jk1z0vw481lfi3gbg7f9vsgwfv8fiyxpkfphgvgcmf5phv4q1";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/aggressive-indent.html";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -670,10 +666,10 @@
|
|||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.9.tar";
|
||||
sha256 = "0710bq07j6w6zm49ci1bbx580frdbc62b3hbxwzkwm5204nf78bf";
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.10.tar";
|
||||
sha256 = "0sqr4cld84vgfnf0fjgvbbix1p23s0n2xsszfap6d8a2xzzpp044";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -775,10 +771,10 @@
|
|||
elpaBuild {
|
||||
pname = "dash";
|
||||
ename = "dash";
|
||||
version = "2.18.1";
|
||||
version = "2.19.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dash-2.18.1.tar";
|
||||
sha256 = "17mrvmrfh5c3kri4r3gf1c3gz4i5vl9ac60grpx4103b56y4cgra";
|
||||
url = "https://elpa.gnu.org/packages/dash-2.19.0.tar";
|
||||
sha256 = "0qszjs60xxqjiqf5f2bgmnbx5jiqii4ghcydwg500za0n2j0f5sx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1015,10 +1011,10 @@
|
|||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.6.24";
|
||||
version = "0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.6.24.tar";
|
||||
sha256 = "0156rh6fkv2yp509h6i8qzh4gsda2mcmfrxl4r6ywn1z5ahijc3r";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.7.tar";
|
||||
sha256 = "0q4ywgh87d6hjac3031s21w91gld2hh7s8nbva94dnzwn6y9d0v1";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -1075,10 +1071,10 @@
|
|||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20210618";
|
||||
version = "20210710";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20210618.tar";
|
||||
sha256 = "13sb9shpj9fhns8sl3dxdgnn8z4wf14mgi4s87k5x4nrr012sscf";
|
||||
url = "https://elpa.gnu.org/packages/eev-20210710.tar";
|
||||
sha256 = "19k5yncyjg7afvkx54k9mplm86jyr3svjjyprrj1frdi219i5piw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2321,10 +2317,10 @@
|
|||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.4.0.tar";
|
||||
sha256 = "0ssckl06jk08vaq4g7sxpzvc3ybm339fzbn9qw21w82v1l60rzpm";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-1.5.0.tar";
|
||||
sha256 = "0y5a7g66iiai20fvc6qff3ki792bzca87zxbmxl8hpks4a6znc80";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2889,10 +2885,10 @@
|
|||
elpaBuild {
|
||||
pname = "pyim";
|
||||
ename = "pyim";
|
||||
version = "3.8.2";
|
||||
version = "3.9.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.8.2.tar";
|
||||
sha256 = "05sgciqb0hzy07j8pvbg7h2vpa9z5z60m6pknxd3b1kpi45vaihw";
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.9.2.tar";
|
||||
sha256 = "18m5wni1zns8fad2ll9flbfgxfy14gi03apnycajdbqxsqfp65j9";
|
||||
};
|
||||
packageRequires = [ async emacs xr ];
|
||||
meta = {
|
||||
|
|
@ -3430,10 +3426,10 @@
|
|||
elpaBuild {
|
||||
pname = "slime-volleyball";
|
||||
ename = "slime-volleyball";
|
||||
version = "1.1.7";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/slime-volleyball-1.1.7.tar";
|
||||
sha256 = "0dl1x0ghfwg4vv2asz3g4plghjxpzd56fyw09vsa3s3k9xsmy3yy";
|
||||
url = "https://elpa.gnu.org/packages/slime-volleyball-1.2.0.tar";
|
||||
sha256 = "07xavg6xq5ckrfy5sk5k5ldb46m5w8nw1r1k006ck8f23ajaw5z2";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
|
|
@ -3561,16 +3557,16 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
spinner = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
spinner = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "spinner";
|
||||
ename = "spinner";
|
||||
version = "1.7.3";
|
||||
version = "1.7.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/spinner-1.7.3.el";
|
||||
sha256 = "19kp1mmndbmw11sgvv2ggfjl4pyf5zrsbh3871f0965pw9z8vahd";
|
||||
url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar";
|
||||
sha256 = "140kss25ijbwf8hzflbjz67ry76w2cyrh02axk95n6qcxv7jr7pv";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/spinner.html";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -3824,10 +3820,10 @@
|
|||
elpaBuild {
|
||||
pname = "transient";
|
||||
ename = "transient";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/transient-0.3.5.tar";
|
||||
sha256 = "15dlj21gn0zxywic9wdcp5zc8skm1s170bq7smgkpd3p3lxslf68";
|
||||
url = "https://elpa.gnu.org/packages/transient-0.3.6.tar";
|
||||
sha256 = "11n2551kvfjrqyk0x78bz6pirnfs126cbchiv1pchqwyk8z8c9ks";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210628";
|
||||
version = "20210712";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210628.tar";
|
||||
sha256 = "1sn2yyynndk8qf43ss8bayll33r4ina8xfx4ywzcs3m1lm6xy1zl";
|
||||
url = "https://orgmode.org/elpa/org-20210712.tar";
|
||||
sha256 = "0xdxzfk7hvsmlyivn61ivci6hy2alxg2ysdm5xad4xxz337jrj7x";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -19,10 +19,10 @@
|
|||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210628";
|
||||
version = "20210712";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210628.tar";
|
||||
sha256 = "0r4kxp1hbhkwvi7939fglng8db4h4n7vigy8pd2gia3a02xcw8l5";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210712.tar";
|
||||
sha256 = "1cdpwsfjmjplyik1r9kl4lvd5lm52zrixlfg2ml1mhh28s680k0q";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -5,15 +5,15 @@ let
|
|||
in
|
||||
{
|
||||
sublime4 = common {
|
||||
buildVersion = "4107";
|
||||
x64sha256 = "05ar7qd1d880442bx4w32mapsib7j27g9l96q2v2s7591r9fgnf7";
|
||||
aarch64sha256 = "4MzwhZ17c6cYtlwPA+SBiey6GiVruADXOLJAeJlMrgM=";
|
||||
buildVersion = "4113";
|
||||
x64sha256 = "13679mnmigy1sgj355zs4si6gnx42rgjl4rn5d6gqgj5qq7zj3lh";
|
||||
aarch64sha256 = "0hg6g3cichma1x82963m7xwazmpdvv5zmz8rpwxs337zq7j3dmb3";
|
||||
} {};
|
||||
|
||||
sublime4-dev = common {
|
||||
buildVersion = "4106";
|
||||
buildVersion = "4112";
|
||||
dev = true;
|
||||
x64sha256 = "09jnn52zb0mjxpj5xz4sixl34cr6j60x46c2dj1m0dlgxap0sh8x";
|
||||
aarch64sha256 = "7blbeSZI0V6q89jMM+zi2ODEdoc1b3Am8F2b2jLr5O8=";
|
||||
x64sha256 = "1yy8wzcphsk3ji2sv2vjcw8ybn62yibzsv9snmm01gvkma16p9dl";
|
||||
aarch64sha256 = "12bl235rxgw3q99yz9x4nfaryb32a2vzyam88by6p1s1zw2fxnp9";
|
||||
} {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "06as63444m2036vk4180dfpavmp9l07qc1jfc4gg86j0apdxr6sh";
|
||||
x86_64-darwin = "0dxchqwk3flv2cr542y1l7c06lak9zzj09f2kljsan6gs6zbls2b";
|
||||
aarch64-linux = "0pdbganyc59mll3232b26cc6fi8a8kpvjm5qky4qr4pk4jsj2r6q";
|
||||
aarch64-darwin = "00pax1hakj5l21j7fm1b05s8kkfnbvgfs9h7f27ad379n6482gxl";
|
||||
armv7l-linux = "1g63xh3k1nm8kls674qavmyl7csb3m4d7ywc0512far76lw39rvr";
|
||||
x86_64-linux = "049spg4c1arkw97mg0h046kiirmcrjj97sy4ldiblwldjn510acw";
|
||||
x86_64-darwin = "0g6b1891ag4a6p7rlkfka5v4nbmpr4ckkmibhw8l3wa9zdzs77x6";
|
||||
aarch64-linux = "1qvk6cn5v9bz4vl5ifpdgrba94v6a54xx8s3fxdkj3lqvq27kpd1";
|
||||
aarch64-darwin = "1whgjkxy70ifx1vaddxr8f1xcg651fhca4x7rzidzbyyf3baghy0";
|
||||
armv7l-linux = "1k45s81s4ispc0vz7i17a7gss05d82vpymxgangg6f1yxwz944r4";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.58.0";
|
||||
version = "1.58.2";
|
||||
pname = "vscode";
|
||||
|
||||
sourceExecutableName = "code";
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ stdenv.mkDerivation (rec {
|
|||
meta = with lib; {
|
||||
description = "Quick image viewer";
|
||||
homepage = "http://spiegl.de/qiv/";
|
||||
inherit version;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = ["PREFIX=$(out)"];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "";
|
||||
# Code cannot be used in commercial programs
|
||||
# Looks like the definition hinges on the price, not license
|
||||
|
|
|
|||
|
|
@ -28,15 +28,16 @@
|
|||
, nss
|
||||
, pango
|
||||
, systemd
|
||||
, udev
|
||||
, xdg-utils
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "8.0.34";
|
||||
version = "8.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "0mp119v5vgsva7pnxpsbq4xhh4vbhwv7ga9b5b7f6slx3biy1wmh";
|
||||
sha256 = "0y39sfhj9xrgprh01i9apzfkqzm6pdhjc8x59x5p5djjjvxbcwmy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -95,8 +96,12 @@ stdenv.mkDerivation rec {
|
|||
patchelf --set-rpath ${rpath}:$out/share/1password $file
|
||||
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 \
|
||||
--prefix PATH : ${xdg-utils}/bin
|
||||
--prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -54,6 +54,5 @@ mkDerivation rec {
|
|||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ tstrobel ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,5 @@ buildPythonApplication rec {
|
|||
homepage = "https://github.com/insanum/gcalcli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nocoolnametom ];
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ obadz ];
|
||||
platforms = platforms.all;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ flokli ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "scli";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isamert";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QGVBJKTBo2RckGwW1deM2toRPT73PYDLvr7YVepkQvg=";
|
||||
sha256 = "0fx9ig08whl7bsii9m1h9wp361ngf1szd8v8yqglgl0x8044fwrk";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -36,6 +36,5 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ tstrobel ];
|
||||
platforms = with lib.platforms; linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
downloadPage = "https://vifm.info/downloads.shtml";
|
||||
homepage = "https://vifm.info/";
|
||||
inherit version;
|
||||
updateWalker = true;
|
||||
changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Interactive terminal multitool for tabular data";
|
||||
license = lib.licenses.gpl3;
|
||||
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;
|
||||
maintainers = with lib.maintainers; [raskin];
|
||||
license = lib.licenses.bsd3;
|
||||
inherit version;
|
||||
downloadPage = "http://www.creytiv.com/pub/";
|
||||
updateWalker = true;
|
||||
downloadURLRegexp = "/baresip-.*[.]tar[.].*";
|
||||
|
|
|
|||
|
|
@ -54,6 +54,5 @@ mkDerivation rec {
|
|||
maintainers = with maintainers; [ colemickens ];
|
||||
broken = stdenv.isDarwin;
|
||||
inherit (qtbase.meta) platforms;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Perl Console Twitter Client";
|
||||
homepage = "http://oysttyer.github.io/";
|
||||
maintainers = with maintainers; [ woffs ];
|
||||
|
|
|
|||
|
|
@ -42,6 +42,5 @@ mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,5 @@ mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
|
|||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ kovirobi ];
|
||||
platforms = lib.platforms.linux;
|
||||
inherit version;
|
||||
|
||||
longDescription = ''
|
||||
A simple command line tool to check for new mail in local mbox and
|
||||
maildir and remote POP3 and IMAP mailboxes.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.74";
|
||||
version = "0.75";
|
||||
pname = "putty";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
|
||||
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "0zc43g8ycyf712cdrja4k8ih5s3agw1k0nq0jkifdn8xwn4d7mfx";
|
||||
sha256 = "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk";
|
||||
};
|
||||
|
||||
# glib-2.62 deprecations
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
|
|||
with lib;
|
||||
|
||||
let
|
||||
version = "3.4.6";
|
||||
version = "3.4.7";
|
||||
variant = if withQt then "qt" else "cli";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
|
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
|
||||
sha256 = "0a26kcj3n1a2kw1f3fc6s1x3rw3f3bj2cq6rp7k0kc4ciwh7i9hj";
|
||||
sha256 = "17d00kl0s010wg2dfhy7sdbr2qm54lsi317fmbcvjz4rxx8ywk3c";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcftools";
|
||||
version = "1.11";
|
||||
version = "1.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0r508mp15pqzf8r1269kb4v5naw9zsvbwd3cz8s1yj7carsf9viw";
|
||||
sha256 = "sha256-E7+h2ipe3aj6URlqR6C0r7P+8XUWRR5PDnhHfz3TC5A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
|
||||
homepage = "http://tetgen.org/";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Extension of clingo to handle constraints over integers";
|
||||
license = lib.licenses.gpl3; # for now GPL3, next version MIT!
|
||||
platforms = lib.platforms.unix;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "ASP system to ground and solve logic programs";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Automated theorem prover for higher-order logic";
|
||||
license = lib.licenses.mit ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
inherit (z3.meta) license homepage platforms;
|
||||
description = "TPTP wrapper for Z3 prover";
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ gmp mpir cddlib ];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "A software package for computing Gröbner fans and tropical varieties";
|
||||
license = lib.licenses.gpl2 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
checkTarget = "checks";
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Programs for computing automorphism groups of graphs and digraphs";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.sage.members;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ ftrvxmtrx ];
|
||||
platforms = lib.platforms.linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Software for research in polyhedral geometry";
|
||||
license = lib.licenses.gpl2 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, flint
|
||||
|
|
@ -11,57 +10,16 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.27";
|
||||
version = "0.7.29";
|
||||
pname = "pynac";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pynac";
|
||||
repo = "pynac";
|
||||
rev = "pynac-${version}";
|
||||
sha256 = "sha256-1HHCIeaNE2UsJNX92UlDGLJS8I4nC/8FnwX7Y4F9HpU=";
|
||||
sha256 = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# the five patches below are included with sage 9.3. since pynac
|
||||
# is a self-described "Sage Math support library", we include them
|
||||
# here.
|
||||
|
||||
# https://trac.sagemath.org/ticket/30688
|
||||
(fetchpatch {
|
||||
name = "power_inf_loop.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3";
|
||||
sha256 = "sha256-VYeaJl8u2wl7FQ/6xnpZv1KpdNYEmJoPhuMrBADyTRs=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/31479
|
||||
(fetchpatch {
|
||||
name = "disable_poly_mul_expand.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/disable_poly_mul_expand.patch?h=9.3";
|
||||
sha256 = "sha256-gRjoltU9Tzj7fjNyE25fY+iyDxERzSTOMigzxFpUqPo=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/31530
|
||||
(fetchpatch {
|
||||
name = "too_much_sub.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3";
|
||||
sha256 = "sha256-lw7xSQ/l+rzPu+ghWF4omYF0mKksGGPuuHJTktvbdis=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/31554
|
||||
(fetchpatch {
|
||||
name = "handle_factor.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3";
|
||||
sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw=";
|
||||
})
|
||||
|
||||
# https://trac.sagemath.org/ticket/31645
|
||||
(fetchpatch {
|
||||
name = "seriesbug.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/seriesbug.patch?h=9.3";
|
||||
sha256 = "sha256-b3//oirN7JHDYqrvE+tDYcnKpSYQJ08yBzcNlII2Dts=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
flint
|
||||
gmp
|
||||
|
|
@ -84,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
of the full GiNaC, and it is *only* meant to be used as a Python library.
|
||||
'';
|
||||
homepage = "http://pynac.org";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.sage.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
|
|||
preInstall = ''mkdir -p "$out"/{bin,share,lib,include}'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "A program to find rational points on hyperelliptic curves";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Cellular automata simulation program";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Cellular automata simulation program";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
|||
zlib
|
||||
];
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
dontConfigure = true;
|
||||
installPhase = ''
|
||||
mkdir -p "$out"
|
||||
|
||||
|
|
|
|||
|
|
@ -90,7 +90,6 @@ let
|
|||
passthru.tests = {};
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "A fast, lightweight SCM system for very large distributed projects";
|
||||
homepage = "https://www.mercurial-scm.org";
|
||||
downloadPage = "https://www.mercurial-scm.org/release/";
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Monotone ancestry visualiser";
|
||||
license = lib.licenses.gpl2Plus ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Strip output from Jupyter and IPython notebooks";
|
||||
homepage = "https://github.com/kynan/nbstripout";
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "3.2.2";
|
||||
version = "3.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D1gtKaDZ7/SyySYWmDa3eDHbh2f5B3q1VEYKgl1pXCE=";
|
||||
sha256 = "sha256-P8/4jehfcjM+r/pwW6fxrwquMVUqXxvvTur7Tesjmnc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -64,11 +64,9 @@ buildGoModule rec {
|
|||
installShellCompletion --fish completions/fish/*
|
||||
installShellCompletion --zsh completions/zsh/*
|
||||
MANDIR=$man/share/man make install.man-nobuild
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d
|
||||
install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d
|
||||
install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, runCommand
|
||||
, makeWrapper
|
||||
, lib
|
||||
, stdenv
|
||||
, extraPackages ? []
|
||||
, podman # Docker compat
|
||||
, runc # Default container runtime
|
||||
|
|
@ -13,12 +14,14 @@
|
|||
, cni-plugins # not added to path
|
||||
, iptables
|
||||
, iproute2
|
||||
, qemu
|
||||
, xz
|
||||
}:
|
||||
|
||||
let
|
||||
podman = podman-unwrapped;
|
||||
|
||||
binPath = lib.makeBinPath ([
|
||||
binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [
|
||||
runc
|
||||
crun
|
||||
conmon
|
||||
|
|
@ -27,6 +30,9 @@ let
|
|||
util-linux
|
||||
iptables
|
||||
iproute2
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
qemu
|
||||
xz
|
||||
] ++ extraPackages);
|
||||
|
||||
in runCommand podman.name {
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A small window manager controlled by a 9P filesystem";
|
||||
maintainers = with lib.maintainers; [ kovirobi ];
|
||||
license = lib.licenses.mit;
|
||||
inherit version;
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ url_to_name(){
|
|||
fi
|
||||
}
|
||||
|
||||
# Fetch everything and checkout the right sha1
|
||||
# Fetch and checkout the right sha1
|
||||
checkout_hash(){
|
||||
local hash="$1"
|
||||
local ref="$2"
|
||||
|
|
@ -149,6 +149,7 @@ checkout_hash(){
|
|||
hash=$(hash_from_ref "$ref")
|
||||
fi
|
||||
|
||||
clean_git fetch ${builder:+--progress} --depth=1 origin "$hash" || \
|
||||
clean_git fetch -t ${builder:+--progress} origin || return 1
|
||||
|
||||
local object_type=$(git cat-file -t "$hash")
|
||||
|
|
|
|||
|
|
@ -154,7 +154,6 @@ in
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Color and Black-and-White emoji fonts";
|
||||
homepage = "https://github.com/googlefonts/noto-emoji";
|
||||
license = with licenses; [ ofl asl20 ];
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "extra" ];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Bitmapped character-art-friendly Unicode fonts";
|
||||
# Basically GPL2+ with font exception — because of the Unifont-augmented
|
||||
# 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-labels}" "$out/${srcs.test-labels.name}"
|
||||
'';
|
||||
phases = [ "installPhase" ];
|
||||
dontUnpack = true;
|
||||
meta = with lib; {
|
||||
description = "A large database of handwritten digits";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "Spell checker oriented word lists";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [pkg-config];
|
||||
buildInputs = [xorgproto];
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "X11 colorname to RGB mapping database";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -25,15 +25,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-mail";
|
||||
version = "unstable-2021-06-21";
|
||||
version = "6.0.0";
|
||||
|
||||
repoName = "mail";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = "c64c87fabb31dea8dc388152d5a835401993acf4";
|
||||
sha256 = "yEUg1IbYbzOJiklnqR23X+aGVE9j4F9iH8FkmlB15x4=";
|
||||
rev = version;
|
||||
sha256 = "07iiipl0nsp63g5bn1y2hg6bmgj6i9cxqcfpd7q3vmldnkijvaxs";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
buildInputs = [jre ant jdk jre];
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "A JVM-based Common Lisp implementation";
|
||||
license = lib.licenses.gpl3 ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -118,7 +118,6 @@ stdenv.mkDerivation rec {
|
|||
CLASP_SRC_DONTTOUCH = "true";
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "A Common Lisp implementation based on LLVM with C++ integration";
|
||||
license = lib.licenses.lgpl21Plus ;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ in stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Digital Mars D Compiler Package";
|
||||
# As of 2.075 all sources and binaries use the boost license
|
||||
license = licenses.boost;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
|
|||
maintainers = [ maintainers.raskin ];
|
||||
license = with licenses; [ gpl2 lgpl2 ];
|
||||
platforms = platforms.linux;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia-bin";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
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}");
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ in stdenv.mkDerivation {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "The LLVM-based D Compiler";
|
||||
homepage = "https://github.com/ldc-developers/ldc";
|
||||
# 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
|
||||
--- a/lib/builtins/CMakeLists.txt
|
||||
+++ b/lib/builtins/CMakeLists.txt
|
||||
@@ -301,6 +301,10 @@ if (NOT MSVC)
|
||||
i386/umoddi3.S
|
||||
)
|
||||
@@ -345,4 +345,8 @@ if (NOT MSVC)
|
||||
|
||||
+ set(i486_SOURCES ${i386_SOURCES})
|
||||
+ set(i586_SOURCES ${i386_SOURCES})
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [lib.maintainers.raskin];
|
||||
|
|
|
|||
|
|
@ -110,7 +110,6 @@ stdenv.mkDerivation rec {
|
|||
'');
|
||||
|
||||
meta = sbclBootstrap.meta // {
|
||||
inherit version;
|
||||
updateWalker = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ let
|
|||
homepage = "https://github.com/ethereum/solidity";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
|
||||
inherit version;
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@ with lib; mkCoqDerivation {
|
|||
owner = "math-comp";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isGe "8.12"; out = "1.0.0"; }
|
||||
{ case = isGe "8.12"; out = "1.1.0"; }
|
||||
{ case = range "8.11" "8.12"; out = "0.10.0"; }
|
||||
] null;
|
||||
release."1.1.0".sha256 = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q=";
|
||||
release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp";
|
||||
release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h";
|
||||
releaseRev = v: "v${v}";
|
||||
|
|
@ -16,11 +17,14 @@ with lib; mkCoqDerivation {
|
|||
|
||||
propagatedBuildInputs = [ coq-elpi ];
|
||||
|
||||
mlPlugin = true;
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "COQMF_COQLIB=lib/coq/${coq.coq-version}" ];
|
||||
extraInstallFlags = [ "VFILES=structures.v" ];
|
||||
|
||||
meta = {
|
||||
description = "Coq plugin embedding ELPI.";
|
||||
maintainers = [ maintainers.cohencyril ];
|
||||
license = licenses.lgpl21;
|
||||
description = "High level commands to declare a hierarchy based on packed classes";
|
||||
maintainers = with maintainers; [ cohencyril siraben ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,10 @@ with lib; mkCoqDerivation {
|
|||
|
||||
pname = "math-classes";
|
||||
inherit version;
|
||||
defaultVersion = if versions.range "8.6" "8.12" coq.coq-version then "8.12.0" else null;
|
||||
defaultVersion = if versions.range "8.11" "8.13" coq.coq-version then "8.13.0" else
|
||||
if versions.range "8.6" "8.10" coq.coq-version then "8.12.0" else null;
|
||||
release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425";
|
||||
release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby";
|
||||
|
||||
extraBuildInputs = [ bignums ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ let mca = mkCoqDerivation {
|
|||
pname = "analysis";
|
||||
owner = "math-comp";
|
||||
|
||||
release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4=";
|
||||
release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5";
|
||||
release."0.3.4".sha256 = "18mgycjgg829dbr7ps77z6lcj03h3dchjbj5iir0pybxby7gd45c";
|
||||
release."0.3.3".sha256 = "1m2mxcngj368vbdb8mlr91hsygl430spl7lgyn9qmn3jykack867";
|
||||
|
|
@ -16,7 +17,7 @@ let mca = mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.6"; }
|
||||
{ cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.9"; }
|
||||
{ cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; }
|
||||
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; }
|
||||
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; }
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
|||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
phases = "installPhase";
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/java
|
||||
|
|
|
|||
|
|
@ -236,9 +236,9 @@ in {
|
|||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "3";
|
||||
patch = "5";
|
||||
};
|
||||
sha256 = "0di3dr5ry4r0hwxh4fbqjhyl5im948wdby0bhijzsxx83c2qhd7n";
|
||||
sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0=";
|
||||
pythonVersion = "2.7";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
|
|
@ -247,15 +247,15 @@ in {
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
pypy36 = callPackage ./pypy {
|
||||
self = pypy36;
|
||||
pypy37 = callPackage ./pypy {
|
||||
self = pypy37;
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "3";
|
||||
patch = "5";
|
||||
};
|
||||
sha256 = "1bq5i2mqgjjfc4rhxgxm6ihwa76vn2qapd7l59ri7xp01p522gd2";
|
||||
pythonVersion = "3.6";
|
||||
sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI=";
|
||||
pythonVersion = "3.7";
|
||||
db = db.override { dbmSupport = !stdenv.isDarwin; };
|
||||
python = python27;
|
||||
inherit passthruFun;
|
||||
|
|
|
|||
|
|
@ -73,6 +73,8 @@ in with passthru; stdenv.mkDerivation rec {
|
|||
LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
|
||||
|
||||
patches = [
|
||||
./dont_fetch_vendored_deps.patch
|
||||
|
||||
(substituteAll {
|
||||
src = ./tk_tcl_paths.patch;
|
||||
inherit tk tcl;
|
||||
|
|
@ -81,12 +83,18 @@ in with passthru; stdenv.mkDerivation rec {
|
|||
tk_libprefix = tk.libPrefix;
|
||||
tcl_libprefix = tcl.libPrefix;
|
||||
})
|
||||
|
||||
(substituteAll {
|
||||
src = ./sqlite_paths.patch;
|
||||
inherit (sqlite) out dev;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
substituteInPlace lib_pypy/pypy_tools/build_cffi_imports.py \
|
||||
--replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES"
|
||||
|
||||
sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
|
||||
substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
diff -ur a/lib_pypy/pypy_tools/build_cffi_imports.py b/lib_pypy/pypy_tools/build_cffi_imports.py
|
||||
--- a/lib_pypy/pypy_tools/build_cffi_imports.py 2021-04-12 01:11:48.000000000 -0400
|
||||
+++ b/lib_pypy/pypy_tools/build_cffi_imports.py 2021-07-16 06:37:03.000000000 -0400
|
||||
@@ -225,6 +225,8 @@
|
||||
|
||||
print('*', ' '.join(args), file=sys.stderr)
|
||||
if embed_dependencies and key in cffi_dependencies:
|
||||
+ print("Nixpkgs: skipping fetching/building dependency", key)
|
||||
+ elif False:
|
||||
status, stdout, stderr = _build_dependency(key)
|
||||
if status != 0:
|
||||
failures.append((key, module))
|
||||
12
pkgs/development/interpreters/python/pypy/sqlite_paths.patch
Normal file
12
pkgs/development/interpreters/python/pypy/sqlite_paths.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -ur a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py
|
||||
--- a/lib_pypy/_sqlite3_build.py 2021-04-12 01:11:48.000000000 -0400
|
||||
+++ b/lib_pypy/_sqlite3_build.py 2021-07-14 18:08:33.000000000 -0400
|
||||
@@ -301,6 +301,8 @@
|
||||
else:
|
||||
extra_args = dict(
|
||||
libraries=libraries,
|
||||
+ include_dirs=['@dev@/include'],
|
||||
+ library_dirs=['@out@/lib']
|
||||
)
|
||||
|
||||
SOURCE = """
|
||||
|
|
@ -12,7 +12,7 @@ let
|
|||
opString = lib.optionalString;
|
||||
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
|
||||
config = import ./config.nix { inherit fetchFromSavannah; };
|
||||
rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; };
|
||||
rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
|
||||
|
||||
# Contains the ruby version heuristics
|
||||
rubyVersion = import ./ruby-version.nix { inherit lib; };
|
||||
|
|
|
|||
|
|
@ -1,24 +1,18 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch }:
|
||||
{ stdenv, lib, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rubygems";
|
||||
version = "3.2.16";
|
||||
version = "3.2.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
|
||||
sha256 = "1bpn45hchcbirqvqwxcxyk1xy2xkdd915jci2hfjq4y6zc4idns0";
|
||||
sha256 = "09ff830a043y6s7390hsg3k55ffpifb1zsvs0dhz8z8pypwgiscl";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-add-post-extract-hook.patch
|
||||
./0002-binaries-with-env-shebang.patch
|
||||
./0003-gem-install-default-to-user.patch
|
||||
# Ensure tmp directory are not left behind
|
||||
# https://github.com/rubygems/rubygems/pull/4610
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch";
|
||||
sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms=";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
|
||||
let
|
||||
version = "0.6.3";
|
||||
in stdenv.mkDerivation {
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgme";
|
||||
inherit version;
|
||||
version = "0.6.3";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of video game music chip emulators";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{ lib, stdenv, fetchurl, cmake, boost, python2}:
|
||||
|
||||
let version = "1.8.2"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avro-c++";
|
||||
inherit version;
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
|
||||
|
||||
let
|
||||
version = "1.10.2";
|
||||
in stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avro-c";
|
||||
inherit version;
|
||||
version = "1.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,12 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "0.6";
|
||||
sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bearssl";
|
||||
inherit version;
|
||||
version = "0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.bearssl.org/bearssl-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "lib" "dev" "out" ];
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
|
||||
buildGoModule {
|
||||
pname = "boringssl";
|
||||
version = "2021-04-18";
|
||||
version = "2021-07-09";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://boringssl.googlesource.com/boringssl";
|
||||
rev = "468cde90ca58421d63f4dfeaebcf8bb3fccb4127";
|
||||
sha256 = "0gaqcbvp6r5fq265mckmg0i0rjab0bhxkxcvfxp3ar5dm7q88w39";
|
||||
rev = "268a4a6ff3bd656ae65fe41ef1185daa85cfae21";
|
||||
sha256 = "04fja4fdwhc69clmvg8i12zm6ks3sfl3r8i5bxn4x63b9dj5znlx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja perl ];
|
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
|
||||
|
||||
# hack to get both go and cmake configure phase
|
||||
# (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
|
||||
doCheck = true;
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.sage.members;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{ lib, stdenv, fetchurl, pcre }:
|
||||
|
||||
let version = "1.0.10"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "classads";
|
||||
inherit version;
|
||||
version = "1.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
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 }:
|
||||
|
||||
let
|
||||
version = "2.12.2";
|
||||
in stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clfft";
|
||||
inherit version;
|
||||
version = "2.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clMathLibraries";
|
||||
|
|
@ -29,6 +27,5 @@ in stdenv.mkDerivation {
|
|||
homepage = "http://clmathlibraries.github.io/clFFT/";
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ chessai ];
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
doCheck = true;
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "Elliptic curve tools";
|
||||
homepage = "https://github.com/JohnCremona/eclib";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, doxygen
|
||||
, graphviz
|
||||
, libxslt
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
|
|||
libxslt
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
expat
|
||||
zlib
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue