lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

Project import generated by Copybara.

Browse source 
GitOrigin-RevId: 967d40bec14be87262b21ab901dbace23b7365db
This commit is contained in:
Default email 2021-07-18 23:22:44 +02:00
parent 5cae67db9e
commit d87170d3f2
254 changed files with 2068 additions and 1583 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
third_party/nixpkgs/lib/types.nix vendored
View file

@ -581,7 +581,17 @@ rec {
in
mkOptionType rec {
name = "enum";
description = "one of ${concatMapStringsSep ", " show values}";
description =
# Length 0 or 1 enums may occur in a design pattern with type merging
# where an "interface" module declares an empty enum and other modules
# provide implementations, each extending the enum with their own
# identifier.
if values == [] then
"impossible (empty enum)"
else if builtins.length values == 1 then
"value ${show (builtins.head values)} (singular enum)"
else
"one of ${concatMapStringsSep ", " show values}";
check = flip elem values;
merge = mergeEqualOption;
functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); };

6
third_party/nixpkgs/maintainers/maintainer-list.nix vendored
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";

9
third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml vendored
View file

@ -7,7 +7,7 @@
<itemizedlist spacing="compact">
<listitem>
<para>
Support is planned until the end of April 2022, handing over to
Support is planned until the end of June 2022, handing over to
22.05.
</para>
</listitem>
@ -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

4
third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md vendored
View file

@ -2,7 +2,7 @@
In addition to numerous new and upgraded packages, this release has the following highlights:
- Support is planned until the end of April 2022, handing over to 22.05.
- Support is planned until the end of June 2022, handing over to 22.05.
## Highlights {#sec-release-21.11-highlights}
@ -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).

2
third_party/nixpkgs/nixos/modules/misc/ids.nix vendored
View file

@ -229,7 +229,7 @@ in
grafana = 196;
skydns = 197;
# ripple-rest = 198; # unused, removed 2017-08-12
nix-serve = 199;
# nix-serve = 199; # unused, removed 2020-12-12
tvheadend = 200;
uwsgi = 201;
gitit = 202;

1
third_party/nixpkgs/nixos/modules/module-list.nix vendored
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

2
third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix vendored
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 ]);
};

1
third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix vendored
View file

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

11
third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix vendored
View file

@ -25,10 +25,9 @@ in {
default = [];
example = "/run/keys/telegraf.env";
description = ''
File to load as environment file. Environment variables
from this file will be interpolated into the config file
using envsubst with this syntax:
<literal>$ENVIRONMENT ''${VARIABLE}</literal>
File to load as environment file. Environment variables from this file
will be interpolated into the config file using envsubst with this
syntax: <literal>$ENVIRONMENT</literal> or <literal>''${VARIABLE}</literal>.
This is useful to avoid putting secrets into the nix store.
'';
};
@ -73,6 +72,7 @@ in {
ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID";
RuntimeDirectory = "telegraf";
User = "telegraf";
Group = "telegraf";
Restart = "on-failure";
# for ping probes
AmbientCapabilities = [ "CAP_NET_RAW" ];
@ -81,7 +81,10 @@ in {
users.users.telegraf = {
uid = config.ids.uids.telegraf;
group = "telegraf";
description = "telegraf daemon user";
};
users.groups.telegraf = {};
};
}

361
third_party/nixpkgs/nixos/modules/services/networking/kea.nix vendored Normal file
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 ];
}

8
third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix vendored
View file

@ -69,13 +69,9 @@ in
ExecStart = "${pkgs.nix-serve}/bin/nix-serve " +
"--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}";
User = "nix-serve";
Group = "nogroup";
Group = "nix-serve";
DynamicUser = true;
};
};
users.users.nix-serve = {
description = "Nix-serve user";
uid = config.ids.uids.nix-serve;
};
};
}

2
third_party/nixpkgs/nixos/tests/all-tests.nix vendored
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 {};
@ -295,6 +296,7 @@ in
nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};
nginx-sso = handleTest ./nginx-sso.nix {};
nginx-variants = handleTest ./nginx-variants.nix {};
nix-serve = handleTest ./nix-ssh-serve.nix {};
nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};
nixos-generate-config = handleTest ./nixos-generate-config.nix {};
nomad = handleTest ./nomad.nix {};

73
third_party/nixpkgs/nixos/tests/kea.nix vendored 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")
'';
})

22
third_party/nixpkgs/nixos/tests/nix-serve.nix vendored Normal file
View file

@ -0,0 +1,22 @@
import ./make-test-python.nix ({ pkgs, ... }:
{
name = "nix-serve";
machine = { pkgs, ... }: {
services.nix-serve.enable = true;
environment.systemPackages = [
pkgs.hello
];
};
testScript = let
pkgHash = builtins.head (
builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello)
);
in ''
start_all()
machine.wait_for_unit("nix-serve.service")
machine.wait_for_open_port(5000)
machine.succeed(
"curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar"
)
'';
})

47
third_party/nixpkgs/nixos/tests/prometheus-exporters.nix vendored
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(

1
third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix vendored
View file

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

4
third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix vendored
View file

@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
version = "2.29.0";
version = "2.30.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
sha256 = "1y4xvnwh2mqbc39pmnpgjg8mlx208s2pipm7dazq4bgmay7k9zh0";
sha256 = "0xh28m3slzg6bp0fm183m62ydzqkvj384j4dwsfalgz4ndwvy595";
};
appimageContents = appimageTools.extractType2 {

1
third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix vendored
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;

2
third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix vendored
View file

@ -58,7 +58,7 @@ in
homepage = "https://code.visualstudio.com/";
downloadPage = "https://code.visualstudio.com/Updates";
license = licenses.unfree;
maintainers = with maintainers; [ eadwu synthetica ];
maintainers = with maintainers; [ eadwu synthetica maxeaubrey ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ];
};
}

1
third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix vendored
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;
};

1
third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix vendored
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

1
third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix vendored
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;
};
}

7
third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix vendored
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, runtimeShell }:
stdenv.mkDerivation {
name = "thinkingrock-binary-2.2.1";
stdenv.mkDerivation rec {
pname = "thinkingrock-binary";
version = "2.2.1";
src = fetchurl {
url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz";
url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%20${version}/tr-${version}.tar.gz";
sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm";
};

1
third_party/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix vendored
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;
};
}

1
third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix vendored
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";
};

1
third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix vendored
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 ];

10
third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json vendored
View file

@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
"version": "91.0.4472.114",
"sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1",
"sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys",
"version": "91.0.4472.164",
"sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4",
"sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr",
"deps": {
"gn": {
"version": "2021-04-06",
@ -55,8 +55,8 @@
"sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
},
"ungoogled-patches": {
"rev": "91.0.4472.114-1",
"sha256": "1xb5g3hybaiwn3y1zw1fxd3g0zwmvplrs06sdqnxzsr1qm8b874h"
"rev": "91.0.4472.164-1",
"sha256": "1vlirqrsliyl1dvm511p5axzvhvqil1m1jlk5zngvl9zfbdjw910"
}
}
}

2
third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix vendored
View file

@ -53,6 +53,6 @@ buildGoPackage rec {
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
platforms = platforms.unix;
license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes ];
maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ];
};
}

1
third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix vendored
View file

@ -62,6 +62,7 @@ let
marsam
timstott
zimbatm
maxeaubrey
];
};
} // attrs');

1
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix vendored
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[.].*";

4
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix vendored
View file

@ -2,12 +2,12 @@
let
pname = "deltachat-electron";
version = "1.15.5";
version = "1.20.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
sha256 = "sha256-BTGwgC0zSr1tq/X4v/fS/12E7/mGVYQ0m+Bt6o7VL4o=";
sha256 = "sha256-u0YjaXb+6BOBWaZANPcaxp7maqlBWAtecSsCGbr67dk=";
};
appimageContents = appimageTools.extract { inherit name src; };

1
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix vendored
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 ];

1
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix vendored
View file

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

2
third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix vendored
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.

1
third_party/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix vendored
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;

1
third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingcon.nix vendored
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;

1
third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix vendored
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];

1
third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix vendored
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];

1
third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix vendored
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];

1
third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix vendored
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];

1
third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix vendored
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;

24
third_party/nixpkgs/pkgs/applications/science/math/pcalc/default.nix vendored
View file

@ -1,26 +1,26 @@
{ lib, stdenv, fetchgit, bison, flex }:
with lib;
{ lib, stdenv, fetchFromGitHub, bison, flex }:
stdenv.mkDerivation rec {
pname = "pcalc";
version = "20141224";
version = "20181202";
src = fetchgit {
url = "git://git.code.sf.net/p/pcalc/code";
rev = "181d60d3c880da4344fef7138065943eb3b9255f";
sha256 = "1hd5bh20j5xzvv6qa0fmzmv0h8sf38r7zgi7y0b6nk17pjq33v90";
src = fetchFromGitHub {
owner = "vapier";
repo = "pcalc";
rev = "d93be9e19ecc0b2674cf00ec91cbb79d32ccb01d";
sha256 = "sha256-m4xdsEJGKxLgp/d5ipxQ+cKG3z7rlvpPL6hELnDu6Hk=";
};
makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ];
buildInputs = [ bison flex ];
nativeBuildInputs = [ bison flex ];
meta = {
homepage = "http://pcalc.sourceforge.net/";
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://vapier.github.io/pcalc/";
description = "Programmer's calculator";
license = licenses.gpl2;
maintainers = with lib.maintainers; [ ftrvxmtrx ];
platforms = lib.platforms.linux;
inherit version;
};
}

1
third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix vendored
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];

1
third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix vendored
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];

1
third_party/nixpkgs/pkgs/applications/science/misc/golly/beta.nix vendored
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];

1
third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix vendored
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];

2
third_party/nixpkgs/pkgs/applications/science/programming/fdr/default.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix vendored
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/";

1
third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix vendored
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;

4
third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix vendored
View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hdhomerun";
namespace = "pvr.hdhomerun";
version = "7.1.0";
version = "7.1.1";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hdhomerun";
rev = "${version}-${rel}";
sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm";
sha256 = "sha256-mQeeeCOxhUTiUcOJ1OiIiJ+7envAIGO67Bp4EAf4sIE=";
};
extraBuildInputs = [ jsoncpp libhdhomerun ];

22
third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix vendored
View file

@ -23,13 +23,13 @@ in {
] mkPlugin);
femon = stdenv.mkDerivation rec {
name = "vdr-femon-2.4.0";
pname = "vdr-femon";
version = "2.4.0";
buildInputs = [ vdr ];
src = fetchurl {
url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${name}.tgz";
url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz";
sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp";
};
@ -48,7 +48,6 @@ in {
};
vaapidevice = stdenv.mkDerivation {
pname = "vdr-vaapidevice";
version = "20190525";
@ -84,7 +83,8 @@ in {
markad = stdenv.mkDerivation rec {
name = "vdr-markad-2017-03-13";
pname = "vdr-markad";
version = "unstable-2017-03-13";
src = fetchgit {
url = "git://projects.vdr-developer.org/vdr-plugin-markad.git";
@ -176,18 +176,16 @@ in {
};
vnsiserver = let
name = "vnsiserver";
vnsiserver = stdenv.mkDerivation rec {
pname = "vdr-vnsiserver";
version = "1.8.0";
in stdenv.mkDerivation {
name = "vdr-${name}-${version}";
buildInputs = [ vdr ];
installFlags = [ "DESTDIR=$(out)" ];
src = fetchFromGitHub {
repo = "vdr-plugin-${name}";
repo = "vdr-plugin-vnsiserver";
owner = "FernetMenta";
rev = "v${version}";
sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw";
@ -204,7 +202,8 @@ in {
};
text2skin = stdenv.mkDerivation {
name = "vdr-text2skin-1.3.4-20170702";
pname = "vdr-text2skin";
version = "1.3.4-20170702";
src = fetchgit {
url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git";
@ -308,7 +307,6 @@ in {
in stdenv.mkDerivation rec {
pname = "vdr-fritzbox";
version = "1.5.3";
src = fetchFromGitHub {

4
third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix vendored
View file

@ -8,12 +8,12 @@
}:
buildPythonApplication rec {
version = "1.28.6";
version = "1.29.2";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
sha256 = "1d44906f7ab738ba2d1785130ed31b16111eee6dc5a1dbd7252091dae48c5281";
sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc=";
};
# lots of networking and other fails

45
third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch vendored
View file

@ -1,45 +0,0 @@
From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Tue, 23 Feb 2021 20:25:30 +1100
Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in
use
Closes #475
---
client/renderers/EGL/egl.c | 3 ++-
client/src/main.c | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c
index b7a5644..72ce50d 100644
--- a/client/renderers/EGL/egl.c
+++ b/client/renderers/EGL/egl.c
@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this)
if (!this->formatValid)
return;
- int w, h;
+ int w = 0, h = 0;
+
switch(this->format.rotate)
{
case LG_ROTATE_0:
diff --git a/client/src/main.c b/client/src/main.c
index f05e929..f5d6fad 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -186,8 +186,9 @@ static void updatePositionInfo(void)
if (!g_state.haveSrcSize)
goto done;
- float srcW;
- float srcH;
+ float srcW = 0.0f;
+ float srcH = 0.0f;
+
switch(params.winRotate)
{
case LG_ROTATE_0:
--
2.30.1

52
third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix vendored
View file

@ -1,40 +1,54 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol
, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp
, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver
, expat, libbfd
{ stdenv, lib, fetchFromGitHub, fetchpatch, makeDesktopItem, cmake, pkg-config
, SDL, SDL2_ttf, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig
, libXi, libXScrnSaver, libXinerama
, wayland, wayland-protocols
}:
let
desktopItem = makeDesktopItem {
name = "looking-glass-client";
desktopName = "Looking Glass Client";
type = "Application";
exec = "looking-glass-client";
icon = "lg-logo";
terminal = true;
};
in
stdenv.mkDerivation rec {
pname = "looking-glass-client";
version = "B3";
version = "B4";
src = fetchFromGitHub {
owner = "gnif";
repo = "LookingGlass";
rev = version;
sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f";
sha256 = "0fwmz0l1dcfwklgvxmv0galgj2q3nss90kc3jwgf6n80x27rsnhf";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle
libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols
libffi libGLU libXScrnSaver expat libbfd
SDL SDL2_ttf freefont_ttf spice-protocol
libbfd nettle fontconfig
libXi libXScrnSaver libXinerama
wayland wayland-protocols
];
patches = [
# error: ‘h’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
# Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3.
# Including our own patch here since upstream commit patch doesnt apply cleanly on B3
./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch
];
patchFlags = "-p2";
sourceRoot = "source/client";
NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
postUnpack = ''
echo $version > source/VERSION
export sourceRoot="source/client"
'';
postInstall = ''
mkdir -p $out/share/pixmaps
ln -s ${desktopItem}/share/applications $out/share/
cp $src/resources/lg-logo.png $out/share/pixmaps
'';
meta = with lib; {
description = "A KVM Frame Relay (KVMFR) implementation";
longDescription = ''
@ -46,7 +60,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://looking-glass.io/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ alexbakker ];
maintainers = with maintainers; [ alexbakker babbaj ];
platforms = [ "x86_64-linux" ];
};
}

10
third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix vendored
View file

@ -86,6 +86,16 @@ stdenv.mkDerivation rec {
patches = [
./fix-qemu-ga.patch
./9p-ignore-noatime.patch
(fetchpatch {
name = "CVE-2021-3545.patch";
url = "https://gitlab.com/qemu-project/qemu/-/commit/121841b25d72d13f8cad554363138c360f1250ea.patch";
sha256 = "13dgfd8dmxcalh2nvb68iv0kyv4xxrvpdqdxf1h3bjr4451glag1";
})
(fetchpatch {
name = "CVE-2021-3546.patch";
url = "https://gitlab.com/qemu-project/qemu/-/commit/9f22893adcb02580aee5968f32baa2cd109b3ec2.patch";
sha256 = "1vkhm9vl671y4cra60b6704339qk1h5dyyb3dfvmvpsvfyh2pm7n";
})
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optionals stdenv.hostPlatform.isMusl [
(fetchpatch {

1
third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix vendored
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;
};
}

18
third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix vendored
View file

@ -63,11 +63,19 @@ let
# We can't use the existing fetchCrate function, since it uses a
# recursive hash of the unpacked crate.
fetchCrate = pkg: fetchurl {
name = "crate-${pkg.name}-${pkg.version}.tar.gz";
url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download";
sha256 = pkg.checksum;
};
fetchCrate = pkg:
assert lib.assertMsg (pkg ? checksum) ''
Package ${pkg.name} does not have a checksum.
Please note that the Cargo.lock format where checksums used to be listed
under [metadata] is not supported.
If that is the case, running `cargo update` with a recent toolchain will
automatically update the format along with the crate's depenendencies.
'';
fetchurl {
name = "crate-${pkg.name}-${pkg.version}.tar.gz";
url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download";
sha256 = pkg.checksum;
};
# Fetch and unpack a crate.
mkCrate = pkg:

1
third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix vendored
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 ];

1
third_party/nixpkgs/pkgs/data/fonts/unscii/default.nix vendored
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.

1
third_party/nixpkgs/pkgs/data/misc/scowl/default.nix vendored
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];

1
third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix vendored
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];

2
third_party/nixpkgs/pkgs/data/themes/yaru/default.nix vendored
View file

@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/ubuntu/yaru";
license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ];
platforms = platforms.linux;
maintainers = with maintainers; [ fortuneteller2k ];
maintainers = with maintainers; [ fortuneteller2k maxeaubrey ];
};
}

2
third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix vendored
View file

@ -5,6 +5,7 @@
, libX11
, gtk2
, gtk3
, wrapGAppsHook
, withGtk3 ? true
}:
@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
intltool
wrapGAppsHook
];
buildInputs = [

1
third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix vendored
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];

1
third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix vendored
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];

1
third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix vendored
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;

1
third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix vendored
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

4
third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch vendored
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})

1
third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix vendored
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];

1
third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix vendored
View file

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

1
third_party/nixpkgs/pkgs/development/compilers/solc/default.nix vendored
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

2
third_party/nixpkgs/pkgs/development/compilers/vala/default.nix vendored
View file

@ -100,7 +100,7 @@ let
homepage = "https://wiki.gnome.org/Projects/Vala";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ antono jtojnar peterhoeg ];
maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ];
};
});

8
third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix vendored
View file

@ -1,14 +1,12 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
let version = "0.4.4"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "clooj";
inherit version;
version = "0.4.4";
jar = fetchurl {
# mirrored as original mediafire.com source does not work without user interaction
url = "https://archive.org/download/clooj-0.4.4-standalone/clooj-0.4.4-standalone.jar";
url = "https://archive.org/download/clooj-${version}-standalone/clooj-${version}-standalone.jar";
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
};

7
third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix vendored
View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }:
let version = "5.0"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "eff";
inherit version;
version = "5.0";
src = fetchFromGitHub {
owner = "matijapretnar";

1
third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix vendored
View file

@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = [ maintainers.kovirobi ];
platforms = with platforms; linux ++ darwin;
inherit version;
mainProgram = "apl";
longDescription = ''

6
third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix vendored
View file

@ -1,10 +1,8 @@
{ lib, fetchurl, python2Packages }:
let version = "0.9.5.1.1"; in
python2Packages.buildPythonPackage {
python2Packages.buildPythonPackage rec {
pname = "pyrex";
inherit version;
version = "0.9.5.1.1";
src = fetchurl {
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";

6
third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix vendored
View file

@ -1,10 +1,8 @@
{ lib, fetchurl, python2Packages }:
let version = "0.9.6.4"; in
python2Packages.buildPythonPackage {
python2Packages.buildPythonPackage rec {
pname = "pyrex";
inherit version;
version = "0.9.6.4";
src = fetchurl {
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";

1
third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix vendored
View file

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
license = lib.licenses.bsdOriginal;
maintainers = [ lib.maintainers.raskin ];
inherit version;
downloadPage = "https://github.com/sshock/AFFLIBv3/tags";
};
}

7
third_party/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix vendored
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";

6
third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix vendored
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";

6
third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix vendored
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";

1
third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix vendored
View file

@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
meta = with lib; {
inherit version;
description = "Utilities library for Linphone";
homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
license = licenses.gpl3Plus;

11
third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix vendored
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" ];

1
third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix vendored
View file

@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit version;
description = "Cryptographic algorithms library";
maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;

1
third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix vendored
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;

6
third_party/nixpkgs/pkgs/development/libraries/classads/default.nix vendored
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";

7
third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix vendored
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;
};
}

8
third_party/nixpkgs/pkgs/development/libraries/csfml/default.nix vendored
View file

@ -1,12 +1,8 @@
{ lib, stdenv, fetchFromGitHub, cmake, sfml }:
let
version = "2.5";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "csfml";
inherit version;
version = "2.5";
src = fetchFromGitHub {
owner = "SFML";
repo = "CSFML";

1
third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix vendored
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;

3
third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix vendored
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

1
third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix vendored
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;

1
third_party/nixpkgs/pkgs/development/libraries/flint/default.nix vendored
View file

@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
inherit version;
description = "Fast Library for Number Theory";
license = lib.licenses.gpl2Plus;
maintainers = lib.teams.sage.members;

6
third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix vendored
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";

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