Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-18 00:01:24 +00:00 committed by GitHub
commit 382fdc7ad3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
235 changed files with 1218 additions and 708 deletions

View file

@ -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";

View file

@ -53,6 +53,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

View file

@ -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).
- [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).

View file

@ -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

View file

@ -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 ]);
};

View file

@ -26,6 +26,7 @@ in {
};
serviceOpts = {
serviceConfig = {
User = "kea";
ExecStart = ''
${pkgs.prometheus-kea-exporter}/bin/kea-exporter \
--address ${cfg.listenAddress} \

View 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 ];
}

View file

@ -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
View 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")
'';
})

View file

@ -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(

View file

@ -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 = [

View file

@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/rust-ethereum/ethabi";
maintainers = [ maintainers.dbrock ];
license = licenses.asl20;
inherit version;
};
}

View file

@ -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;

View file

@ -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";
} {};
}

View file

@ -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;
};

View file

@ -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

View file

@ -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
'';

View file

@ -54,6 +54,5 @@ mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ tstrobel ];
platforms = with lib.platforms; linux;
inherit version;
};
}

View file

@ -33,6 +33,5 @@ buildPythonApplication rec {
homepage = "https://github.com/insanum/gcalcli";
license = licenses.mit;
maintainers = with maintainers; [ nocoolnametom ];
inherit version;
};
}

View file

@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
license = licenses.isc;
maintainers = with maintainers; [ obadz ];
platforms = platforms.all;
inherit version;
};
}

View file

@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ flokli ];
platforms = with lib.platforms; linux;
inherit version;
};
}

View file

@ -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; [

View file

@ -36,6 +36,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ tstrobel ];
platforms = with lib.platforms; linux;
inherit version;
};
}

View file

@ -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";
};

View file

@ -86,7 +86,6 @@ buildPythonApplication rec {
'';
meta = {
inherit version;
description = "Interactive terminal multitool for tabular data";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.raskin ];

View 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;
};
}

View file

@ -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[.].*";

View file

@ -54,6 +54,5 @@ mkDerivation rec {
maintainers = with maintainers; [ colemickens ];
broken = stdenv.isDarwin;
inherit (qtbase.meta) platforms;
inherit version;
};
}

View file

@ -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 ];

View file

@ -42,6 +42,5 @@ mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
inherit (qtbase.meta) platforms;
inherit version;
};
}

View file

@ -60,6 +60,5 @@ mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
inherit (qtbase.meta) platforms;
inherit version;
};
}

View file

@ -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.

View file

@ -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;

View file

@ -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;

View file

@ -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];

View file

@ -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];

View file

@ -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];

View file

@ -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];

View file

@ -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;

View file

@ -21,6 +21,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with lib.maintainers; [ ftrvxmtrx ];
platforms = lib.platforms.linux;
inherit version;
};
}

View file

@ -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];

View file

@ -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];

View file

@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "Cellular automata simulation program";
license = lib.licenses.gpl2;
maintainers = [lib.maintainers.raskin];

View file

@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "Cellular automata simulation program";
license = lib.licenses.gpl2;
maintainers = [lib.maintainers.raskin];

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation {
zlib
];
phases = [ "unpackPhase" "installPhase" ];
dontConfigure = true;
installPhase = ''
mkdir -p "$out"

View file

@ -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/";

View file

@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "Monotone ancestry visualiser";
license = lib.licenses.gpl2Plus ;
maintainers = [lib.maintainers.raskin];

View file

@ -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;

View file

@ -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;

View file

@ -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;
};
}

View file

@ -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 ];

View file

@ -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.

View file

@ -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 = ''

View file

@ -102,7 +102,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "Spell checker oriented word lists";
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];

View file

@ -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];

View file

@ -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];

View file

@ -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];

View file

@ -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;

View file

@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.raskin ];
license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.linux;
inherit version;
};
}

View file

@ -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}");

View file

@ -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

View file

@ -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})

View file

@ -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];

View file

@ -110,7 +110,6 @@ stdenv.mkDerivation rec {
'');
meta = sbclBootstrap.meta // {
inherit version;
updateWalker = true;
};
}

View file

@ -99,7 +99,6 @@ let
homepage = "https://github.com/ethereum/solidity";
license = licenses.gpl3;
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
inherit version;
};
};
in

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
phases = "installPhase";
dontUnpack = true;
installPhase = ''
mkdir -p $out/share/java

View file

@ -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";

View file

@ -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";

View file

@ -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";

View file

@ -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" ];

View file

@ -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)

View file

@ -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;

View file

@ -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";

View file

@ -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;
};
}

View file

@ -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;

View file

@ -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

View file

@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with lib; {
inherit version;
description = "Finite Field Linear Algebra Subroutines";
license = licenses.lgpl21Plus;
maintainers = teams.sage.members;

View file

@ -2,13 +2,9 @@
, libXrandr, libGLU, libGL, libXft, libXfixes, xinput
, CoreServices }:
let
version = "1.6.57";
in
stdenv.mkDerivation rec {
pname = "fox";
inherit version;
version = "1.6.57";
src = fetchurl {
url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";

View file

@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
inherit version;
homepage = "http://openkinect.org";
license = with lib.licenses; [ gpl2 asl20 ];
maintainers = with lib.maintainers; [ bennofs ];

View file

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [autoconf automake libtool gmpxx];
meta = {
inherit version;
description = "A C++ library for arithmetic and algebraic computations";
license = lib.licenses.cecill-b;
maintainers = [lib.maintainers.raskin];

View file

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [autoconf automake libtool gmpxx];
meta = {
inherit version;
description = "A C++ library for arithmetic and algebraic computations";
license = lib.licenses.cecill-b;
maintainers = [lib.maintainers.raskin];

View file

@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = {
inherit version;
description = "A C++ library for arithmetic and algebraic computations";
license = lib.licenses.cecill-b;
maintainers = [lib.maintainers.raskin];

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
let
version = "2.0.4";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "goocanvas";
inherit version;
version = "2.0.4";
outputs = [ "out" "dev" "devdoc" ];

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchFromGitHub }:
let
version = "2.9.4";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "http-parser";
inherit version;
version = "2.9.4";
src = fetchFromGitHub {
owner = "nodejs";

View file

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
"--with-cblas=-lblas"
];
meta = {
inherit version;
description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers";
license = lib.licenses.gpl2Plus;
maintainers = [lib.maintainers.raskin];

View file

@ -1,17 +1,14 @@
{ fetchurl, lib, stdenv, unzip, ant, javac, jvm }:
let
version = "1.7R2";
xbeans = fetchurl {
url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk";
};
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "rhino";
inherit version;
version = "1.7R2";
src = fetchurl {
url = "mirror://mozilla/js/rhino1_7R2.zip";

View file

@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
inherit version;
homepage = "https://github.com/open-source-parsers/jsoncpp";
description = "A C++ library for interacting with JSON";
maintainers = with maintainers; [ ttuegel cpages ];

View file

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "ANSI C routines for fast base64 encoding/decoding";
license = lib.licenses.publicDomain;
platforms = lib.platforms.unix;

View file

@ -18,6 +18,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl3;
maintainers = [ lib.maintainers.raskin ] ;
platforms = lib.platforms.unix;
inherit version;
};
}

View file

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Denable-test=false"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Ddisable-introspection=true"
];
passthru = {

View file

@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
description = "Portable, simple C-language 9P client and server libary";
maintainers = with lib.maintainers; [ kovirobi ];
license = lib.licenses.mit;
inherit version;
platforms = with lib.platforms; unix;
};
}

View file

@ -1,12 +1,9 @@
{ lib, stdenv, fetchurl, expat, curl, fftw }:
let
version = "0.9.3";
deb_patch = "5";
in
stdenv.mkDerivation rec {
pname = "libofa";
inherit version;
version = "0.9.3";
deb_patch = "5";
src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, libsigcxx }:
let version = "0.4"; in
stdenv.mkDerivation rec {
pname = "libpar2";
inherit version;
version = "0.4";
src = fetchurl {
url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz";

View file

@ -17,7 +17,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 = "/re-.*[.]tar[.].*";

View file

@ -1,12 +1,9 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
, glib, isocodes, gobject-introspection }:
let
version = "5.4";
in
stdenv.mkDerivation rec {
pname = "libxklavier";
inherit version;
version = "5.4";
src = fetchgit {
url = "git://anongit.freedesktop.org/git/libxklavier";

View file

@ -4,11 +4,9 @@
, enableStatic ? stdenv.hostPlatform.isStatic
}:
let
version = "1.16.1";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libxsmm";
inherit version;
version = "1.16.1";
src = fetchFromGitHub {
owner = "hfp";

View file

@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
inherit version;
description = "C++ library for exact, high-performance linear algebra";
license = licenses.lgpl21Plus;
maintainers = teams.sage.members;

View file

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
checkInputs = [ boost ];
meta = with lib; {
inherit version;
homepage = "https://gitlab.com/mdds/mdds";
description = "A collection of multi-dimensional data structure and indexing algorithm";
platforms = platforms.all;

View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
buildInputs = [ mpfr ];
meta = {
inherit version;
description = "A multiple precision interval arithmetic library based on MPFR";
homepage = "https://gforge.inria.fr/projects/mpfi/";
license = lib.licenses.lgpl21Plus;

View file

@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ "--enable-fat" ];
meta = {
inherit version;
description = "A highly optimised library for bignum arithmetic forked from GMP";
license = lib.licenses.lgpl3Plus;
maintainers = [lib.maintainers.raskin];

Some files were not shown because too many files have changed in this diff Show more