Merge master into staging-next
This commit is contained in:
commit
c8ebb5d394
|
@ -4502,6 +4502,12 @@
|
||||||
githubId = 3217744;
|
githubId = 3217744;
|
||||||
name = "Peter Ferenczy";
|
name = "Peter Ferenczy";
|
||||||
};
|
};
|
||||||
|
ghostbuster91 = {
|
||||||
|
name = "Kasper Kondzielski";
|
||||||
|
email = "kghost0@gmail.com";
|
||||||
|
github = "ghostbuster91";
|
||||||
|
githubId = 5662622;
|
||||||
|
};
|
||||||
ghuntley = {
|
ghuntley = {
|
||||||
email = "ghuntley@ghuntley.com";
|
email = "ghuntley@ghuntley.com";
|
||||||
github = "ghuntley";
|
github = "ghuntley";
|
||||||
|
|
|
@ -219,6 +219,15 @@
|
||||||
to be able to access the device.
|
to be able to access the device.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<link xlink:href="https://github.com/mozilla-mobile/mozilla-vpn-client">mozillavpn</link>,
|
||||||
|
the client for the
|
||||||
|
<link xlink:href="https://vpn.mozilla.org/">Mozilla VPN</link>
|
||||||
|
service. Available as
|
||||||
|
<link xlink:href="options.html#opt-services.mozillavpn">services.mozillavpn</link>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
<link xlink:href="https://github.com/mgumz/mtr-exporter">mtr-exporter</link>,
|
<link xlink:href="https://github.com/mgumz/mtr-exporter">mtr-exporter</link>,
|
||||||
|
@ -1815,6 +1824,17 @@
|
||||||
desktop environments as needed.
|
desktop environments as needed.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
xfsprogs was update to version 5.15, which enables inobtcount
|
||||||
|
and bigtime by default on filesystem creation. Support for
|
||||||
|
these features was added in kernel 5.10 and deemed stable in
|
||||||
|
kernel 5.15. If you want to be able to mount XFS filesystems
|
||||||
|
created with this release of xfsprogs on kernel releases older
|
||||||
|
than 5.10, you need to format them with
|
||||||
|
<literal>mkfs.xfs -m bigtime=0 -m inobtcount=0</literal>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
<literal>services.xserver.desktopManager.xfce</literal> now
|
<literal>services.xserver.desktopManager.xfce</literal> now
|
||||||
|
|
|
@ -65,6 +65,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](options.html#opt-programs.k4-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device.
|
- [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](options.html#opt-programs.k4-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device.
|
||||||
|
|
||||||
|
- [mozillavpn](https://github.com/mozilla-mobile/mozilla-vpn-client), the client for the [Mozilla VPN](https://vpn.mozilla.org/) service. Available as [services.mozillavpn](options.html#opt-services.mozillavpn).
|
||||||
|
|
||||||
- [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable).
|
- [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable).
|
||||||
|
|
||||||
- [prometheus-pve-exporter](https://github.com/prometheus-pve/prometheus-pve-exporter), a tool that exposes information from the Proxmox VE API for use by Prometheus. Available as [services.prometheus.exporters.pve](options.html#opt-services.prometheus.exporters.pve).
|
- [prometheus-pve-exporter](https://github.com/prometheus-pve/prometheus-pve-exporter), a tool that exposes information from the Proxmox VE API for use by Prometheus. Available as [services.prometheus.exporters.pve](options.html#opt-services.prometheus.exporters.pve).
|
||||||
|
@ -628,6 +630,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||||
|
|
||||||
- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
|
- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
|
||||||
|
|
||||||
|
- xfsprogs was update to version 5.15, which enables inobtcount and bigtime by default on filesystem creation. Support for these features was added in kernel 5.10 and deemed stable in kernel 5.15.
|
||||||
|
If you want to be able to mount XFS filesystems created with this release of xfsprogs on kernel releases older than 5.10, you need to format them with `mkfs.xfs -m bigtime=0 -m inobtcount=0`.
|
||||||
|
|
||||||
- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver`.
|
- `services.xserver.desktopManager.xfce` now includes Xfce's screen locker, `xfce4-screensaver`.
|
||||||
|
|
||||||
- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
|
- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
|
||||||
|
|
|
@ -64,7 +64,8 @@ let
|
||||||
filter =
|
filter =
|
||||||
builtins.filterSource
|
builtins.filterSource
|
||||||
(n: t:
|
(n: t:
|
||||||
(t == "directory" -> baseNameOf n != "tests")
|
cleanSourceFilter n t
|
||||||
|
&& (t == "directory" -> baseNameOf n != "tests")
|
||||||
&& (t == "file" -> hasSuffix ".nix" n)
|
&& (t == "file" -> hasSuffix ".nix" n)
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
|
|
|
@ -816,6 +816,7 @@
|
||||||
./services/networking/mosquitto.nix
|
./services/networking/mosquitto.nix
|
||||||
./services/networking/monero.nix
|
./services/networking/monero.nix
|
||||||
./services/networking/morty.nix
|
./services/networking/morty.nix
|
||||||
|
./services/networking/mozillavpn.nix
|
||||||
./services/networking/miredo.nix
|
./services/networking/miredo.nix
|
||||||
./services/networking/mstpd.nix
|
./services/networking/mstpd.nix
|
||||||
./services/networking/mtprotoproxy.nix
|
./services/networking/mtprotoproxy.nix
|
||||||
|
|
19
nixos/modules/services/networking/mozillavpn.nix
Normal file
19
nixos/modules/services/networking/mozillavpn.nix
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
options.services.mozillavpn.enable = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Enable the Mozilla VPN daemon.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf config.services.mozillavpn.enable {
|
||||||
|
environment.systemPackages = [ pkgs.mozillavpn ];
|
||||||
|
services.dbus.packages = [ pkgs.mozillavpn ];
|
||||||
|
systemd.packages = [ pkgs.mozillavpn ];
|
||||||
|
};
|
||||||
|
|
||||||
|
meta.maintainers = with lib.maintainers; [ andersk ];
|
||||||
|
}
|
|
@ -344,6 +344,10 @@ in
|
||||||
restartIfChanged = false;
|
restartIfChanged = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.virtchd = {
|
||||||
|
path = [ pkgs.cloud-hypervisor ];
|
||||||
|
};
|
||||||
|
|
||||||
systemd.services.libvirt-guests = {
|
systemd.services.libvirt-guests = {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
path = with pkgs; [ coreutils gawk cfg.package ];
|
path = with pkgs; [ coreutils gawk cfg.package ];
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, scdoc
|
, scdoc
|
||||||
, stdenv
|
, stdenv
|
||||||
, systemd
|
, systemdSupport ? stdenv.isLinux, systemd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -25,9 +25,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
|
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
|
||||||
|
|
||||||
buildInputs = [ systemd ];
|
buildInputs = lib.optionals systemdSupport [ systemd ];
|
||||||
|
|
||||||
mesonFlags = [ "-Dlibseat-logind=systemd" "-Dlibseat-builtin=enabled" ];
|
mesonFlags = [
|
||||||
|
"-Dlibseat-logind=${if systemdSupport then "systemd" else "disabled"}"
|
||||||
|
"-Dlibseat-builtin=enabled"
|
||||||
|
"-Dserver=enabled"
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A universal seat management library";
|
description = "A universal seat management library";
|
||||||
|
|
|
@ -21,19 +21,19 @@
|
||||||
"owner": "aiven",
|
"owner": "aiven",
|
||||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||||
"repo": "terraform-provider-aiven",
|
"repo": "terraform-provider-aiven",
|
||||||
"rev": "v2.7.0",
|
"rev": "v2.7.1",
|
||||||
"sha256": "12n97z3r5bz7hwgcz193x90n7ibk4fdph7pqxwwinrvlc6zb7hz6",
|
"sha256": "sha256-tXg9VpP3kj32Q9ktU5FrcQStIRlDtMLXYzn0RvLQCRk=",
|
||||||
"vendorSha256": "12lj7p74mhiy30fhc12ihbf827axlbxhbfzr10iwwhb0nydsfiyl",
|
"vendorSha256": "sha256-1Eenm7dgQc4jCPm7BfuiXR2B3IJRBAYdGD7CSs49koo=",
|
||||||
"version": "2.7.0"
|
"version": "2.7.1"
|
||||||
},
|
},
|
||||||
"akamai": {
|
"akamai": {
|
||||||
"owner": "akamai",
|
"owner": "akamai",
|
||||||
"provider-source-address": "registry.terraform.io/akamai/akamai",
|
"provider-source-address": "registry.terraform.io/akamai/akamai",
|
||||||
"repo": "terraform-provider-akamai",
|
"repo": "terraform-provider-akamai",
|
||||||
"rev": "v1.11.0",
|
"rev": "v1.12.1",
|
||||||
"sha256": "1ccliv8p36rh7f7zacjsa2x846d36nygbgs0vyjb0bpf5pl7grgd",
|
"sha256": "sha256-UQD1RiXIRcP0CvVO8Tx/qkBhRD3LFj/KI3WP/yKeBek=",
|
||||||
"vendorSha256": "19n841mby0l7ipjmmqsl5vnfmsj6y8fci1vzi8z6dqy3xcjlhwgb",
|
"vendorSha256": "sha256-GZFLnKHk6YaMwFGgy79ric388EMIH6NUVw4JVLNxWZY=",
|
||||||
"version": "1.11.0"
|
"version": "1.12.1"
|
||||||
},
|
},
|
||||||
"alicloud": {
|
"alicloud": {
|
||||||
"deleteVendor": true,
|
"deleteVendor": true,
|
||||||
|
@ -94,28 +94,28 @@
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||||
"repo": "terraform-provider-aws",
|
"repo": "terraform-provider-aws",
|
||||||
"rev": "v4.8.0",
|
"rev": "v4.9.0",
|
||||||
"sha256": "sha256-Ere41qols4lNnoAIZGWQmituukLnPNbv5d8C/e3rQgI=",
|
"sha256": "sha256-VLw2bqL6VEKwqzXYkNJGJtIi8gg+3/oCwbBf9UtATE4=",
|
||||||
"vendorSha256": "sha256-ZXH9YlSii2z1s6Y/TfZVBje0/xQ2DXw3ZpgcBPeQZ2I=",
|
"vendorSha256": "sha256-7pwwQHgtHO3GfcEAOHALo01i1pt9WsriZZkJjFzjwRE=",
|
||||||
"version": "4.8.0"
|
"version": "4.9.0"
|
||||||
},
|
},
|
||||||
"azuread": {
|
"azuread": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||||
"repo": "terraform-provider-azuread",
|
"repo": "terraform-provider-azuread",
|
||||||
"rev": "v2.19.1",
|
"rev": "v2.20.0",
|
||||||
"sha256": "sha256-n5jDlcy5rwCcrqoL3ut+HThDLQ8hPj2mZ15d7hhALFw=",
|
"sha256": "sha256-x1tSrejqsw3A/1n+PbG9wWx7q7qRciCjdwPAFT4lc2E=",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "2.19.1"
|
"version": "2.20.0"
|
||||||
},
|
},
|
||||||
"azurerm": {
|
"azurerm": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||||
"repo": "terraform-provider-azurerm",
|
"repo": "terraform-provider-azurerm",
|
||||||
"rev": "v3.0.2",
|
"rev": "v3.1.0",
|
||||||
"sha256": "sha256-T24bfys9OxBnGN4YtJEsJmSUK26a5hMnbgZUANcpg3k=",
|
"sha256": "sha256-idrGxmfhnMKvxtKJtjLs321D008Mcv27cHyhAjwCZfA=",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "3.0.2"
|
"version": "3.1.0"
|
||||||
},
|
},
|
||||||
"azurestack": {
|
"azurestack": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
|
@ -194,10 +194,10 @@
|
||||||
"owner": "cloudflare",
|
"owner": "cloudflare",
|
||||||
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
|
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
|
||||||
"repo": "terraform-provider-cloudflare",
|
"repo": "terraform-provider-cloudflare",
|
||||||
"rev": "v3.11.0",
|
"rev": "v3.12.0",
|
||||||
"sha256": "sha256-z7IjLXO/AHWENKYaCospJDcOwOubNcRHKDQzmRkhimw=",
|
"sha256": "sha256-y2qq0asEnhnOjthLBFxyQjf1N5KNlXXK0eXjT1/vCXg=",
|
||||||
"vendorSha256": "sha256-Lx/faIdx4k399sm9p8BVqpiKZtNjZoThBhWWWgEuPyg=",
|
"vendorSha256": "sha256-v6fUzYwrYt4rk5LT0LyNd8e9X79r3dwtd3s1QIV/w/s=",
|
||||||
"version": "3.11.0"
|
"version": "3.12.0"
|
||||||
},
|
},
|
||||||
"cloudfoundry": {
|
"cloudfoundry": {
|
||||||
"owner": "cloudfoundry-community",
|
"owner": "cloudfoundry-community",
|
||||||
|
@ -411,20 +411,20 @@
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||||
"proxyVendor": true,
|
"proxyVendor": true,
|
||||||
"repo": "terraform-provider-google",
|
"repo": "terraform-provider-google",
|
||||||
"rev": "v4.15.0",
|
"rev": "v4.16.0",
|
||||||
"sha256": "sha256-BHtbBfCihy1zh/A9JB03CDh5KpzMWeR/mbuRErJkVUE=",
|
"sha256": "sha256-kp6AldlkjiNd3R3hz+wB2uBQ37TyZ0hoEhxQYiFmO7g=",
|
||||||
"vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=",
|
"vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
|
||||||
"version": "4.15.0"
|
"version": "4.16.0"
|
||||||
},
|
},
|
||||||
"google-beta": {
|
"google-beta": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||||
"proxyVendor": true,
|
"proxyVendor": true,
|
||||||
"repo": "terraform-provider-google-beta",
|
"repo": "terraform-provider-google-beta",
|
||||||
"rev": "v4.15.0",
|
"rev": "v4.16.0",
|
||||||
"sha256": "sha256-FTT6PS0OS4HPfkM2u4PZwOA/v5VzDwHLdO2s+qgRkW8=",
|
"sha256": "sha256-m5K2q83WbWVfjG7vhlh71k14GEXNs+2JfK/S1GnC5c0=",
|
||||||
"vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=",
|
"vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
|
||||||
"version": "4.15.0"
|
"version": "4.16.0"
|
||||||
},
|
},
|
||||||
"grafana": {
|
"grafana": {
|
||||||
"owner": "grafana",
|
"owner": "grafana",
|
||||||
|
@ -439,10 +439,10 @@
|
||||||
"owner": "gridscale",
|
"owner": "gridscale",
|
||||||
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
|
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
|
||||||
"repo": "terraform-provider-gridscale",
|
"repo": "terraform-provider-gridscale",
|
||||||
"rev": "v1.14.2",
|
"rev": "v1.14.3",
|
||||||
"sha256": "sha256-gGwwyp3NgdcoE6YIBewiiajPoZpJbQ80/Zr2pIw8imE=",
|
"sha256": "sha256-OGVIZ6q8qq4XkkWxjX5BQCJE9qubJ5Xnt2DrD23JGB8=",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "1.14.2"
|
"version": "1.14.3"
|
||||||
},
|
},
|
||||||
"hcloud": {
|
"hcloud": {
|
||||||
"owner": "hetznercloud",
|
"owner": "hetznercloud",
|
||||||
|
@ -511,10 +511,10 @@
|
||||||
"owner": "IBM-Cloud",
|
"owner": "IBM-Cloud",
|
||||||
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
|
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
|
||||||
"repo": "terraform-provider-ibm",
|
"repo": "terraform-provider-ibm",
|
||||||
"rev": "v1.40.0",
|
"rev": "v1.40.1",
|
||||||
"sha256": "sha256-msBfnPkClyOvqXcKHIpCxT1YDRHY7p491zl8Uvl8qOQ=",
|
"sha256": "sha256-7NdpMWEpkcqEwi7xAedc/NPJ6e+RZZ4HdrKtmb/H6xU=",
|
||||||
"vendorSha256": "sha256-YgRgm5S7cXHO9yqUUuVVkFRQL+pf0RMPJI9oUaWob2I=",
|
"vendorSha256": "sha256-rVV6oeqIj4o9qxw2V67G3cgERJaccejaAAtEOJVLm4U=",
|
||||||
"version": "1.40.0"
|
"version": "1.40.1"
|
||||||
},
|
},
|
||||||
"icinga2": {
|
"icinga2": {
|
||||||
"owner": "Icinga",
|
"owner": "Icinga",
|
||||||
|
@ -583,19 +583,19 @@
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
||||||
"repo": "terraform-provider-kubernetes",
|
"repo": "terraform-provider-kubernetes",
|
||||||
"rev": "v2.9.0",
|
"rev": "v2.10.0",
|
||||||
"sha256": "sha256-w16pm2+8M59grW5HUBBtkKaCnvf5p4GQMEHtQa4DLXs=",
|
"sha256": "sha256-pA0yI59iRBmiT3rdvoP4vkSz/+bH29O4eLGPCBjfiZU=",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "2.9.0"
|
"version": "2.10.0"
|
||||||
},
|
},
|
||||||
"launchdarkly": {
|
"launchdarkly": {
|
||||||
"owner": "launchdarkly",
|
"owner": "launchdarkly",
|
||||||
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
|
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
|
||||||
"repo": "terraform-provider-launchdarkly",
|
"repo": "terraform-provider-launchdarkly",
|
||||||
"rev": "v2.5.0",
|
"rev": "v2.6.0",
|
||||||
"sha256": "1083w217y8l6clj3q31f1lanzngfinw682kdqpm0xfssqas7qzx6",
|
"sha256": "sha256-Mf7oV5G5XjnE+3m8EDczDvrtn2s4nrNCTdAJz1n9v2Y=",
|
||||||
"vendorSha256": "13vcxvw56bn7mdz917lvdryd2d7mcvi83ykbzjfbpxr4lzrrm9qw",
|
"vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=",
|
||||||
"version": "2.5.0"
|
"version": "2.6.0"
|
||||||
},
|
},
|
||||||
"libvirt": {
|
"libvirt": {
|
||||||
"owner": "dmacvicar",
|
"owner": "dmacvicar",
|
||||||
|
@ -634,13 +634,12 @@
|
||||||
"version": "2.2.2"
|
"version": "2.2.2"
|
||||||
},
|
},
|
||||||
"logicmonitor": {
|
"logicmonitor": {
|
||||||
"deleteVendor": true,
|
|
||||||
"owner": "logicmonitor",
|
"owner": "logicmonitor",
|
||||||
"provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor",
|
"provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor",
|
||||||
"repo": "terraform-provider-logicmonitor",
|
"repo": "terraform-provider-logicmonitor",
|
||||||
"rev": "v2.0.0",
|
"rev": "v2.0.0",
|
||||||
"sha256": "sha256-wamP36zV5HZ1qQlNZWIZyAYx/jOiRO1ODQpcd10Sl4w=",
|
"sha256": "sha256-wamP36zV5HZ1qQlNZWIZyAYx/jOiRO1ODQpcd10Sl4w=",
|
||||||
"vendorSha256": "sha256-ccLI662Z+B+xvyuQ5aRHUViREtcdccjOMM5EIJiEaU0=",
|
"vendorSha256": null,
|
||||||
"version": "2.0.0"
|
"version": "2.0.0"
|
||||||
},
|
},
|
||||||
"lxd": {
|
"lxd": {
|
||||||
|
@ -656,10 +655,10 @@
|
||||||
"owner": "wgebis",
|
"owner": "wgebis",
|
||||||
"provider-source-address": "registry.terraform.io/wgebis/mailgun",
|
"provider-source-address": "registry.terraform.io/wgebis/mailgun",
|
||||||
"repo": "terraform-provider-mailgun",
|
"repo": "terraform-provider-mailgun",
|
||||||
"rev": "v0.7.1",
|
"rev": "v0.7.2",
|
||||||
"sha256": "0sw4a5ch8izy9lw9qmbj6s5vxz7gxcarga1s1h3vlng9y1dpvp2r",
|
"sha256": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=",
|
||||||
"vendorSha256": "1qwd3jwdh5pzq9sdb62lpkbspfn54jii725p2jgvzg93xarv4n58",
|
"vendorSha256": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=",
|
||||||
"version": "0.7.1"
|
"version": "0.7.2"
|
||||||
},
|
},
|
||||||
"matchbox": {
|
"matchbox": {
|
||||||
"owner": "poseidon",
|
"owner": "poseidon",
|
||||||
|
@ -692,10 +691,10 @@
|
||||||
"owner": "mongodb",
|
"owner": "mongodb",
|
||||||
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
|
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
|
||||||
"repo": "terraform-provider-mongodbatlas",
|
"repo": "terraform-provider-mongodbatlas",
|
||||||
"rev": "v1.3.0",
|
"rev": "v1.3.1",
|
||||||
"sha256": "0lrzbljd8iklyrmplc64lq4v8y7z5fw7l41y27nsfjl4rm0xz5bn",
|
"sha256": "sha256-X2Utt+MUboLc0/nAXB78ko3w2ieTIQaVsDK6MhbUKSQ=",
|
||||||
"vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz",
|
"vendorSha256": "sha256-yZ/TgAVlBxHhrrZU6SH1KXNoZj8oWRqx3BjVHkTtI+Q=",
|
||||||
"version": "1.3.0"
|
"version": "1.3.1"
|
||||||
},
|
},
|
||||||
"namecheap": {
|
"namecheap": {
|
||||||
"owner": "namecheap",
|
"owner": "namecheap",
|
||||||
|
@ -728,10 +727,10 @@
|
||||||
"owner": "newrelic",
|
"owner": "newrelic",
|
||||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||||
"repo": "terraform-provider-newrelic",
|
"repo": "terraform-provider-newrelic",
|
||||||
"rev": "v2.41.2",
|
"rev": "v2.42.0",
|
||||||
"sha256": "sha256-LCA1K4md1wRRkB7oerUn1MM0TRLcqQBoVpvoxCMGSs8=",
|
"sha256": "sha256-OD0wahsEw86E7TbUxIqEhoZ85An9yRwgTENtdoYnFB0=",
|
||||||
"vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=",
|
"vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=",
|
||||||
"version": "2.41.2"
|
"version": "2.42.0"
|
||||||
},
|
},
|
||||||
"nomad": {
|
"nomad": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
|
@ -783,10 +782,10 @@
|
||||||
"owner": "oracle",
|
"owner": "oracle",
|
||||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||||
"repo": "terraform-provider-oci",
|
"repo": "terraform-provider-oci",
|
||||||
"rev": "v4.69.0",
|
"rev": "v4.70.0",
|
||||||
"sha256": "sha256-VwL+i4HtvAJi3R57cjUrg+7rx1LxEUAMwkorCvJ9DcU=",
|
"sha256": "sha256-KgpYl1DllCkpXbxYp8cqKE28l4digmaB75BoL6CpkQA=",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "4.69.0"
|
"version": "4.70.0"
|
||||||
},
|
},
|
||||||
"okta": {
|
"okta": {
|
||||||
"owner": "okta",
|
"owner": "okta",
|
||||||
|
@ -816,13 +815,12 @@
|
||||||
"version": "1.4.1"
|
"version": "1.4.1"
|
||||||
},
|
},
|
||||||
"opennebula": {
|
"opennebula": {
|
||||||
"deleteVendor": true,
|
|
||||||
"owner": "OpenNebula",
|
"owner": "OpenNebula",
|
||||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||||
"repo": "terraform-provider-opennebula",
|
"repo": "terraform-provider-opennebula",
|
||||||
"rev": "v0.4.3",
|
"rev": "v0.4.3",
|
||||||
"sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=",
|
"sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=",
|
||||||
"vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=",
|
"vendorSha256": null,
|
||||||
"version": "0.4.3"
|
"version": "0.4.3"
|
||||||
},
|
},
|
||||||
"openstack": {
|
"openstack": {
|
||||||
|
@ -838,10 +836,10 @@
|
||||||
"owner": "opentelekomcloud",
|
"owner": "opentelekomcloud",
|
||||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||||
"repo": "terraform-provider-opentelekomcloud",
|
"repo": "terraform-provider-opentelekomcloud",
|
||||||
"rev": "v1.28.2",
|
"rev": "v1.29.0",
|
||||||
"sha256": "sha256-qp5H37Zf9oPYA2vvWKuEpfUeHIfK1NYE9Uk7dcX9izA=",
|
"sha256": "sha256-jhG2TyinnlPPIVA2K+ckOcxlqxeUFkp+WFJcJqYQ13k=",
|
||||||
"vendorSha256": "sha256-FMcPG7EJvU6XNKd2+8+xmjqSI0Ec9Xx/6gZvK9zJ3wg=",
|
"vendorSha256": "sha256-qNJ1jkbGgFUxvHYUMPX9kBAwQSx4vfOr7eS0Z6J7X8Q=",
|
||||||
"version": "1.28.2"
|
"version": "1.29.0"
|
||||||
},
|
},
|
||||||
"opsgenie": {
|
"opsgenie": {
|
||||||
"owner": "opsgenie",
|
"owner": "opsgenie",
|
||||||
|
@ -865,10 +863,10 @@
|
||||||
"owner": "ovh",
|
"owner": "ovh",
|
||||||
"provider-source-address": "registry.terraform.io/ovh/ovh",
|
"provider-source-address": "registry.terraform.io/ovh/ovh",
|
||||||
"repo": "terraform-provider-ovh",
|
"repo": "terraform-provider-ovh",
|
||||||
"rev": "v0.16.0",
|
"rev": "v0.17.1",
|
||||||
"sha256": "0vvxcm4ff6zw5ngwq9cia2ifjg8a2adyf66dyc2d8lavvfld22v9",
|
"sha256": "sha256-bAwOxRexJuSw3Ntb8zXeTFPp23hCkCEI+zF4Q2SP3lA=",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "0.16.0"
|
"version": "0.17.1"
|
||||||
},
|
},
|
||||||
"pagerduty": {
|
"pagerduty": {
|
||||||
"owner": "PagerDuty",
|
"owner": "PagerDuty",
|
||||||
|
@ -955,10 +953,10 @@
|
||||||
"owner": "scaleway",
|
"owner": "scaleway",
|
||||||
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
|
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
|
||||||
"repo": "terraform-provider-scaleway",
|
"repo": "terraform-provider-scaleway",
|
||||||
"rev": "v2.2.1-rc.1",
|
"rev": "v2.2.1-rc.2",
|
||||||
"sha256": "0f4sizgcy3000k67nb3axa8xhpczvzdla3bnpda27jdrx22ckyz8",
|
"sha256": "sha256-7T+J4T0qm7QMGWWjIT0nKHkHzd6wfFNP3suF7GitErc=",
|
||||||
"vendorSha256": "11g5v5kvs4qxdg34ai7fpinwbshrjwi9hxzav2vpnzhy8lfqpkzb",
|
"vendorSha256": "sha256-kfr8YqLr8CXntkiMEHA5kosZqkloV4rGjEmdXosT7WU=",
|
||||||
"version": "2.2.1-rc.1"
|
"version": "2.2.1-rc.2"
|
||||||
},
|
},
|
||||||
"secret": {
|
"secret": {
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
|
@ -1000,10 +998,10 @@
|
||||||
"owner": "splunk-terraform",
|
"owner": "splunk-terraform",
|
||||||
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
|
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
|
||||||
"repo": "terraform-provider-signalfx",
|
"repo": "terraform-provider-signalfx",
|
||||||
"rev": "v6.11.0",
|
"rev": "v6.11.1",
|
||||||
"sha256": "sha256-ezd4TzckY5yx/UjwGxH36VX+owI8fBUmxtQFztOsFvs=",
|
"sha256": "sha256-37D4nblpGK8duohDiyY4UR0jn+T6QX7LnCfGtPdYQ3k=",
|
||||||
"vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=",
|
"vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=",
|
||||||
"version": "6.11.0"
|
"version": "6.11.1"
|
||||||
},
|
},
|
||||||
"skytap": {
|
"skytap": {
|
||||||
"owner": "skytap",
|
"owner": "skytap",
|
||||||
|
@ -1018,10 +1016,10 @@
|
||||||
"owner": "chanzuckerberg",
|
"owner": "chanzuckerberg",
|
||||||
"provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
|
"provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
|
||||||
"repo": "terraform-provider-snowflake",
|
"repo": "terraform-provider-snowflake",
|
||||||
"rev": "v0.29.0",
|
"rev": "v0.30.0",
|
||||||
"sha256": "sha256-CdJHknGzEKfbxzrtqmevKwiYTs1UoRFRj6/ShQ9mdIc=",
|
"sha256": "sha256-JHpwqMyt/oMZv6P4xEOlyV0pL32HQselDg+dP9JGRpg=",
|
||||||
"vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=",
|
"vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=",
|
||||||
"version": "0.29.0"
|
"version": "0.30.0"
|
||||||
},
|
},
|
||||||
"sops": {
|
"sops": {
|
||||||
"owner": "carlpett",
|
"owner": "carlpett",
|
||||||
|
@ -1036,10 +1034,10 @@
|
||||||
"owner": "spotinst",
|
"owner": "spotinst",
|
||||||
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
|
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
|
||||||
"repo": "terraform-provider-spotinst",
|
"repo": "terraform-provider-spotinst",
|
||||||
"rev": "v1.70.0",
|
"rev": "v1.71.0",
|
||||||
"sha256": "sha256-jtoFXfHCnmGW2QVssngNtRLT6BfHaaNmNl4v2UIsmrI=",
|
"sha256": "sha256-Fcx0KHTAAOQE/Qa+84p5l5ve5nrWXZHgRyc3xNYBJoQ=",
|
||||||
"vendorSha256": "sha256-yfWdyEf6ypF0QCdh9zspCaFyPJpt4DgYR1LBPTztOUw=",
|
"vendorSha256": "sha256-pI9jX/Wp6Nu1ix82ZE2CBZYu0j4S+HH2+dD5G679VrE=",
|
||||||
"version": "1.70.0"
|
"version": "1.71.0"
|
||||||
},
|
},
|
||||||
"stackpath": {
|
"stackpath": {
|
||||||
"owner": "stackpath",
|
"owner": "stackpath",
|
||||||
|
@ -1081,10 +1079,10 @@
|
||||||
"owner": "tencentcloudstack",
|
"owner": "tencentcloudstack",
|
||||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||||
"repo": "terraform-provider-tencentcloud",
|
"repo": "terraform-provider-tencentcloud",
|
||||||
"rev": "v1.66.3",
|
"rev": "v1.67.0",
|
||||||
"sha256": "sha256-LwIL+GjyEyuTCKiKLrOKrH5S1s9L56PUaHu6ypSSnRQ=",
|
"sha256": "sha256-61Fhh/BW1Iv/7wMU0lDMxPdB86Wqf43F90ZoWM990K0=",
|
||||||
"vendorSha256": null,
|
"vendorSha256": null,
|
||||||
"version": "1.66.3"
|
"version": "1.67.0"
|
||||||
},
|
},
|
||||||
"tfe": {
|
"tfe": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
|
@ -1117,10 +1115,10 @@
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
"provider-source-address": "registry.terraform.io/hashicorp/tls",
|
"provider-source-address": "registry.terraform.io/hashicorp/tls",
|
||||||
"repo": "terraform-provider-tls",
|
"repo": "terraform-provider-tls",
|
||||||
"rev": "v3.1.0",
|
"rev": "v3.3.0",
|
||||||
"sha256": "0g2bgvw02ydwgb6blica5a139crnyp4hdhzxf433n3fflwyvl6r1",
|
"sha256": "sha256-7A9AXZxTIltZdXXIpMpQGYKwgSdU6kRRNuvVaNtMFGw=",
|
||||||
"vendorSha256": null,
|
"vendorSha256": "sha256-bj2KpPFFnev5DAND9/HyUC4kOORAvnnpSihUECcHB/8=",
|
||||||
"version": "3.1.0"
|
"version": "3.3.0"
|
||||||
},
|
},
|
||||||
"triton": {
|
"triton": {
|
||||||
"deleteVendor": true,
|
"deleteVendor": true,
|
||||||
|
@ -1154,10 +1152,10 @@
|
||||||
"owner": "cloudposse",
|
"owner": "cloudposse",
|
||||||
"provider-source-address": "registry.terraform.io/cloudposse/utils",
|
"provider-source-address": "registry.terraform.io/cloudposse/utils",
|
||||||
"repo": "terraform-provider-utils",
|
"repo": "terraform-provider-utils",
|
||||||
"rev": "0.17.17",
|
"rev": "0.17.19",
|
||||||
"sha256": "sha256-QJtdCEw8bnVku4fqAX5MBU9tkPv5jwjra9lGPfUPGQw=",
|
"sha256": "sha256-FTZyri4/6QWkLKKectzx3av8fnoDkOIyAkAPasFU8sU=",
|
||||||
"vendorSha256": "sha256-5EelFIfHVLRiRJig6EeJG6KGJuQ05LX3M5CNxUxQAas=",
|
"vendorSha256": "sha256-FA2Hev7RS3ZJ/cDTgyZ7uMFlQB/VdJ19GZUpkWTEPV8=",
|
||||||
"version": "0.17.17"
|
"version": "0.17.19"
|
||||||
},
|
},
|
||||||
"vault": {
|
"vault": {
|
||||||
"owner": "hashicorp",
|
"owner": "hashicorp",
|
||||||
|
|
55
pkgs/applications/radio/splat/default.nix
Normal file
55
pkgs/applications/radio/splat/default.nix
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
{ lib, stdenv, fetchurl, groff, ncurses, bzip2, zlib }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "splat";
|
||||||
|
version = "1.4.2";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://www.qsl.net/kd2bd/${pname}-${version}.tar.bz2";
|
||||||
|
hash = "sha256-ObCzFOLpJ73wDR7aS5hl79EouoUDBfmHrsBJxP1Yopw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs =
|
||||||
|
# configure script needs `clear`
|
||||||
|
[ groff ncurses ];
|
||||||
|
|
||||||
|
buildInputs = [ bzip2 zlib ];
|
||||||
|
|
||||||
|
postPatch = "patchShebangs build utils/build";
|
||||||
|
|
||||||
|
configurePhase =
|
||||||
|
# configure for maximum resolution
|
||||||
|
''
|
||||||
|
runHook preConfigure
|
||||||
|
cat > std-params.h << EOF
|
||||||
|
#define HD_MODE 1
|
||||||
|
#define MAXPAGES 64
|
||||||
|
EOF
|
||||||
|
runHook postConfigure
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
./build all
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
install -Dt $out/bin splat
|
||||||
|
find utils -type f -executable -exec install -Dt $out/bin {} \;
|
||||||
|
install -Dt $out/share/man/man1 docs/english/man/*.1
|
||||||
|
install -Dt $out/share/man/es/man1 docs/spanish/man/*.1
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description =
|
||||||
|
"SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz";
|
||||||
|
license = licenses.gpl2Only;
|
||||||
|
homepage = "https://www.qsl.net/kd2bd/splat.html";
|
||||||
|
maintainers = with maintainers; [ ehmry ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
|
@ -15,11 +15,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "zenity";
|
pname = "zenity";
|
||||||
version = "3.41.0";
|
version = "3.42.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "GbZ2w1EOIrrfzDIEBi1DK6U3QC9eCuJhKMDZDJVAN+E=";
|
sha256 = "wkx/5rtDFjztit8jLVg7LgE9O6bCjetfz4B5hePete8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "args";
|
pname = "args";
|
||||||
version = "6.2.7";
|
version = "6.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Taywee";
|
owner = "Taywee";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-I297qPXs8Fj7Ibq2PN6y/Eas3DiW5Ecvqot0ePwFNTI=";
|
sha256 = "sha256-fEM9KNqqxYbafMcHCW46Y//8Hrvd7gZrCIQhH5lhpFc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }:
|
{ lib, buildGoModule, fetchFromGitHub, makeWrapper }:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "delve";
|
pname = "delve";
|
||||||
version = "1.8.2";
|
version = "1.8.2";
|
||||||
|
|
||||||
goPackagePath = "github.com/go-delve/delve";
|
|
||||||
excludedPackages = [ "_fixtures" "scripts" "service/test" ];
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "go-delve";
|
owner = "go-delve";
|
||||||
repo = "delve";
|
repo = "delve";
|
||||||
|
@ -14,10 +11,14 @@ buildGoPackage rec {
|
||||||
sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik=";
|
sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vendorSha256 = null;
|
||||||
|
|
||||||
subPackages = [ "cmd/dlv" ];
|
subPackages = [ "cmd/dlv" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
checkFlags = [ "-short" ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# fortify source breaks build since delve compiles with -O0
|
# fortify source breaks build since delve compiles with -O0
|
||||||
wrapProgram $out/bin/dlv \
|
wrapProgram $out/bin/dlv \
|
||||||
|
|
|
@ -2,22 +2,23 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "errcheck";
|
pname = "errcheck";
|
||||||
version = "1.6.0";
|
version = "unstable-2022-03-26";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kisielk";
|
owner = "kisielk";
|
||||||
repo = "errcheck";
|
repo = "errcheck";
|
||||||
rev = "v${version}";
|
rev = "e62617a91f7bd1abab2cbe7f28966188dd85eee0";
|
||||||
sha256 = "sha256-Przf2c2jFNdkUq7IOUD7ChXHiSayAz4xTsNzajycYZ0=";
|
sha256 = "sha256-RoPv6Odh8l9DF1S50pNEomLtI4uTDNjveOXZd4S52c0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc=";
|
vendorSha256 = "sha256-fDugaI9Fh0L27yKSFNXyjYLMMDe6CRgE6kVLiJ3+Kyw=";
|
||||||
|
|
||||||
|
subPackages = [ "." ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Program for checking for unchecked errors in go programs";
|
description = "Checks for unchecked errors in go programs";
|
||||||
homepage = "https://github.com/kisielk/errcheck";
|
homepage = "https://github.com/kisielk/errcheck";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ kalbasit ];
|
maintainers = with maintainers; [ kalbasit ];
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, buildGo118Module, fetchFromGitHub }:
|
{ lib, buildGoModule, fetchFromGitHub }:
|
||||||
|
|
||||||
buildGo118Module rec {
|
buildGoModule rec {
|
||||||
pname = "gopls";
|
pname = "gopls";
|
||||||
version = "0.8.1";
|
version = "0.8.1";
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = genericUpdater {
|
updateScript = genericUpdater {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
|
versionLister = "${common-updater-scripts}/bin/list-git-tags";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -556,6 +556,10 @@ in rec {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
tmux-thumbs = pkgs.callPackage ./tmux-thumbs {
|
||||||
|
inherit mkTmuxPlugin;
|
||||||
|
};
|
||||||
|
|
||||||
urlview = mkTmuxPlugin {
|
urlview = mkTmuxPlugin {
|
||||||
pluginName = "urlview";
|
pluginName = "urlview";
|
||||||
version = "unstable-2016-01-06";
|
version = "unstable-2016-01-06";
|
||||||
|
|
29
pkgs/misc/tmux-plugins/tmux-thumbs/default.nix
Normal file
29
pkgs/misc/tmux-plugins/tmux-thumbs/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{ lib, mkTmuxPlugin, fetchFromGitHub, thumbs, substituteAll }:
|
||||||
|
|
||||||
|
mkTmuxPlugin rec {
|
||||||
|
pluginName = "tmux-thumbs";
|
||||||
|
version = "0.7.1";
|
||||||
|
rtpFilePath = "tmux-thumbs.tmux";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "fcsonline";
|
||||||
|
repo = pluginName;
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-PH1nscmVhxJFupS7dlbOb+qEwG/Pa/2P6XFIbR/cfaQ=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(substituteAll {
|
||||||
|
src = ./fix.patch;
|
||||||
|
tmuxThumbsDir = "${thumbs}/bin";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/fcsonline/tmux-thumbs";
|
||||||
|
description = "A lightning fast version of tmux-fingers written in Rust for copy pasting with vimium/vimperator like hints.";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.unix;
|
||||||
|
maintainers = with maintainers; [ ghostbuster91 ];
|
||||||
|
};
|
||||||
|
}
|
45
pkgs/misc/tmux-plugins/tmux-thumbs/fix.patch
Normal file
45
pkgs/misc/tmux-plugins/tmux-thumbs/fix.patch
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
diff --git a/tmux-thumbs.sh b/tmux-thumbs.sh
|
||||||
|
index 34dd528..8c05d54 100755
|
||||||
|
--- a/tmux-thumbs.sh
|
||||||
|
+++ b/tmux-thumbs.sh
|
||||||
|
@@ -1,22 +1,8 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -Eeu -o pipefail
|
||||||
|
|
||||||
|
-VERSION=$(grep 'version =' Cargo.toml | grep -oe "[0-9]\+.[0-9]\+.[0-9]\+")
|
||||||
|
-
|
||||||
|
# Setup env variables to be compatible with compiled and bundled installations
|
||||||
|
CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
-RELEASE_DIR="${CURRENT_DIR}/target/release"
|
||||||
|
-
|
||||||
|
-THUMBS_BINARY="${RELEASE_DIR}/thumbs"
|
||||||
|
-TMUX_THUMBS_BINARY="${RELEASE_DIR}/tmux-thumbs"
|
||||||
|
-
|
||||||
|
-if [ ! -f "$THUMBS_BINARY" ]; then
|
||||||
|
- tmux split-window "cd ${CURRENT_DIR} && bash ./tmux-thumbs-install.sh"
|
||||||
|
- exit
|
||||||
|
-elif [[ $(${THUMBS_BINARY} --version) != "thumbs ${VERSION}" ]]; then
|
||||||
|
- tmux split-window "cd ${CURRENT_DIR} && bash ./tmux-thumbs-install.sh update"
|
||||||
|
- exit
|
||||||
|
-fi
|
||||||
|
|
||||||
|
function get-opt-value() {
|
||||||
|
tmux show -vg "@thumbs-${1}" 2> /dev/null
|
||||||
|
@@ -36,7 +22,7 @@ function get-opt-arg() {
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
-PARAMS=(--dir "${CURRENT_DIR}")
|
||||||
|
+PARAMS=(--dir @tmuxThumbsDir@)
|
||||||
|
|
||||||
|
function add-param() {
|
||||||
|
local type opt arg
|
||||||
|
@@ -51,4 +37,4 @@ add-param upcase-command string
|
||||||
|
add-param multi-command string
|
||||||
|
add-param osc52 boolean
|
||||||
|
|
||||||
|
-"${TMUX_THUMBS_BINARY}" "${PARAMS[@]}" || true
|
||||||
|
+@tmuxThumbsDir@/tmux-thumbs "${PARAMS[@]}" || true
|
||||||
|
|
||||||
|
|
||||||
|
|
38
pkgs/servers/ftp/kamid/default.nix
Normal file
38
pkgs/servers/ftp/kamid/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
{ stdenv
|
||||||
|
, lib
|
||||||
|
, pkg-config
|
||||||
|
, libevent
|
||||||
|
, libressl
|
||||||
|
, libbsd
|
||||||
|
, fetchurl
|
||||||
|
, readline
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "kamid";
|
||||||
|
version = "0.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/omar-polo/kamid/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||||
|
sha256 = "16gi82dgaxwy8fgg05hbam796pk51i6xlyrx8qhghi7ikxr5jd19";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
libevent
|
||||||
|
libressl
|
||||||
|
readline
|
||||||
|
libbsd
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A FREE, easy-to-use and portable implementation of a 9p file server daemon for UNIX-like systems";
|
||||||
|
homepage = "https://kamid.omarpolo.com";
|
||||||
|
license = licenses.isc;
|
||||||
|
maintainers = with maintainers; [ heph2 ];
|
||||||
|
platforms = platforms.unix;
|
||||||
|
};
|
||||||
|
}
|
|
@ -5,16 +5,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "lfs";
|
pname = "lfs";
|
||||||
version = "2.4.0";
|
version = "2.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Canop";
|
owner = "Canop";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ySaPR6it/1xEf+Rnypnz5AklxWZZ8NeXpjId4ZSMIs8=";
|
sha256 = "sha256-7dSBac+rLedgko4KLVS9ZWrj/IlXJMsnbQFzyQxv4LQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-FLbFDJXVpWycII8mdNDphh8QVXFFnxtFgloweW+BZA0=";
|
cargoSha256 = "sha256-stDxDBftIVZqgy49VGJHx+JTzflVE91QN75aSWhvgSs=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Get information on your mounted disks";
|
description = "Get information on your mounted disks";
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xfsprogs";
|
pname = "xfsprogs";
|
||||||
version = "5.14.2";
|
version = "5.15.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
|
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
|
||||||
sha256 = "sha256-AczT753yg3dTpdh2uNqE6pV9E9ekYbjEbor6TrCaq8g=";
|
sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "doc" ];
|
outputs = [ "bin" "dev" "out" "doc" ];
|
||||||
|
|
17
pkgs/tools/misc/ncdu_2/c-import-order.patch
Normal file
17
pkgs/tools/misc/ncdu_2/c-import-order.patch
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
diff --git a/src/ui.zig b/src/ui.zig
|
||||||
|
index 8401910..50171a7 100644
|
||||||
|
--- a/src/ui.zig
|
||||||
|
+++ b/src/ui.zig
|
||||||
|
@@ -8,11 +8,11 @@ const main = @import("main.zig");
|
||||||
|
const util = @import("util.zig");
|
||||||
|
|
||||||
|
pub const c = @cImport({
|
||||||
|
+ @cDefine("_XOPEN_SOURCE", "1");
|
||||||
|
@cInclude("stdio.h");
|
||||||
|
@cInclude("string.h");
|
||||||
|
@cInclude("curses.h");
|
||||||
|
@cInclude("time.h");
|
||||||
|
- @cDefine("_X_OPEN_SOURCE", "1");
|
||||||
|
@cInclude("wchar.h");
|
||||||
|
@cInclude("locale.h");
|
||||||
|
});
|
33
pkgs/tools/misc/ncdu_2/default.nix
Normal file
33
pkgs/tools/misc/ncdu_2/default.nix
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
{ lib, stdenv, fetchurl, fetchpatch, zig, ncurses }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "ncdu";
|
||||||
|
version = "2.0";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
|
||||||
|
sha256 = "sha256-Zs2mgEdnsukbeM/cqCX5/a9qCkxuQAYloBrVWVQYR8w=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./c-import-order.patch # https://code.blicky.net/yorhel/ncdu/issues/183
|
||||||
|
];
|
||||||
|
|
||||||
|
XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
zig
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [ ncurses ];
|
||||||
|
|
||||||
|
PREFIX = placeholder "out";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Disk usage analyzer with an ncurses interface";
|
||||||
|
homepage = "https://dev.yorhel.nl/ncdu";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.all;
|
||||||
|
maintainers = with maintainers; [ pSub SuperSandro2000 ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -21,10 +21,10 @@
|
||||||
, qtwayland
|
, qtwayland
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = "0.8.2";
|
version = "1.0.1";
|
||||||
timestamp = "99999999999";
|
timestamp = "99999999999";
|
||||||
commit = "nix-${version}";
|
commit = "nix-${version}";
|
||||||
hash = "sha256-BaqKlF2SZueykFhtj91McP39oXYAx+lz8eXhn5eouqg=";
|
hash = "sha256-vHBlrtQ06kjjXXGL/jSdpAPHgqb7Vn1c6jXZVXwxHPQ=";
|
||||||
|
|
||||||
udev_rules = ''
|
udev_rules = ''
|
||||||
#Flipper Zero serial port
|
#Flipper Zero serial port
|
||||||
|
@ -50,13 +50,13 @@ mkDerivation {
|
||||||
pkg-config
|
pkg-config
|
||||||
qmake
|
qmake
|
||||||
qttools
|
qttools
|
||||||
|
wrapQtAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
zlib
|
zlib
|
||||||
libusb1
|
libusb1
|
||||||
libGL
|
libGL
|
||||||
wrapQtAppsHook
|
|
||||||
|
|
||||||
qtbase
|
qtbase
|
||||||
qt3d
|
qt3d
|
||||||
|
@ -70,39 +70,30 @@ mkDerivation {
|
||||||
qtwayland
|
qtwayland
|
||||||
];
|
];
|
||||||
|
|
||||||
preBuild = ''
|
qmakeFlags = [
|
||||||
|
"DEFINES+=DISABLE_APPLICATION_UPDATES"
|
||||||
|
"CONFIG+=qtquickcompiler"
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
substituteInPlace qflipper_common.pri \
|
substituteInPlace qflipper_common.pri \
|
||||||
--replace 'GIT_VERSION = unknown' 'GIT_VERSION = "${version}"' \
|
--replace 'GIT_VERSION = unknown' 'GIT_VERSION = "${version}"' \
|
||||||
--replace 'GIT_TIMESTAMP = 0' 'GIT_TIMESTAMP = ${timestamp}' \
|
--replace 'GIT_TIMESTAMP = 0' 'GIT_TIMESTAMP = ${timestamp}' \
|
||||||
--replace 'GIT_COMMIT = unknown' 'GIT_COMMIT = "${commit}"'
|
--replace 'GIT_COMMIT = unknown' 'GIT_COMMIT = "${commit}"'
|
||||||
cat qflipper_common.pri
|
cat qflipper_common.pri
|
||||||
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
postInstall = ''
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
${lib.optionalString stdenv.isLinux ''
|
|
||||||
install -Dm755 qFlipper $out/bin/qFlipper
|
|
||||||
''}
|
|
||||||
${lib.optionalString stdenv.isDarwin ''
|
${lib.optionalString stdenv.isDarwin ''
|
||||||
install -Dm755 qFlipper.app/Contents/MacOS/qFlipper $out/bin/qFlipper
|
cp qFlipper.app/Contents/MacOS/qFlipper $out/bin
|
||||||
''}
|
''}
|
||||||
cp qFlipperTool $out/bin
|
cp qFlipper-cli $out/bin
|
||||||
|
|
||||||
mkdir -p $out/share/applications
|
|
||||||
cp installer-assets/appimage/qFlipper.desktop $out/share/applications
|
|
||||||
|
|
||||||
mkdir -p $out/share/icons
|
|
||||||
cp application/assets/icons/qFlipper.png $out/share/icons
|
|
||||||
|
|
||||||
mkdir -p $out/etc/udev/rules.d
|
mkdir -p $out/etc/udev/rules.d
|
||||||
tee $out/etc/udev/rules.d/42-flipperzero.rules << EOF
|
tee $out/etc/udev/rules.d/42-flipperzero.rules << EOF
|
||||||
${udev_rules}
|
${udev_rules}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
23
pkgs/tools/misc/thumbs/default.nix
Normal file
23
pkgs/tools/misc/thumbs/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
{ lib, rustPlatform, fetchFromGitHub }:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "thumbs";
|
||||||
|
version = "0.7.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "fcsonline";
|
||||||
|
repo = "tmux-thumbs";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "sha256-PH1nscmVhxJFupS7dlbOb+qEwG/Pa/2P6XFIbR/cfaQ=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "sha256-6htKiXMMyYRFefJzvDnmdx3CJ3XL8zONhGlV2wcbr9g=";
|
||||||
|
|
||||||
|
cargoPatches = [ ./fix.patch ];
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/fcsonline/tmux-thumbs";
|
||||||
|
description = "A lightning fast version copy/pasting like vimium/vimperator";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ ghostbuster91 ];
|
||||||
|
};
|
||||||
|
}
|
13
pkgs/tools/misc/thumbs/fix.patch
Normal file
13
pkgs/tools/misc/thumbs/fix.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/src/swapper.rs b/src/swapper.rs
|
||||||
|
index 6cf1e89..bcb0969 100644
|
||||||
|
--- a/src/swapper.rs
|
||||||
|
+++ b/src/swapper.rs
|
||||||
|
@@ -215,7 +215,7 @@ impl<'a> Swapper<'a> {
|
||||||
|
};
|
||||||
|
|
||||||
|
let pane_command = format!(
|
||||||
|
- "tmux capture-pane -t {active_pane_id} -p{scroll_params} | tail -n {height} | {dir}/target/release/thumbs -f '%U:%H' -t {tmp} {args}; tmux swap-pane -t {active_pane_id}; {zoom_command} tmux wait-for -S {signal}",
|
||||||
|
+ "tmux capture-pane -t {active_pane_id} -p{scroll_params} | tail -n {height} | {dir}/thumbs -f '%U:%H' -t {tmp} {args}; tmux swap-pane -t {active_pane_id}; {zoom_command} tmux wait-for -S {signal}",
|
||||||
|
active_pane_id = active_pane_id,
|
||||||
|
scroll_params = scroll_params,
|
||||||
|
height = self.active_pane_height.unwrap_or(i32::MAX),
|
|
@ -15,6 +15,7 @@
|
||||||
, CoreServices
|
, CoreServices
|
||||||
, tzdata
|
, tzdata
|
||||||
, cmake
|
, cmake
|
||||||
|
, perl
|
||||||
# kafka is optional but one of the most used features
|
# kafka is optional but one of the most used features
|
||||||
, enableKafka ? true
|
, enableKafka ? true
|
||||||
# TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*"
|
# TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*"
|
||||||
|
@ -29,7 +30,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "vector";
|
pname = "vector";
|
||||||
version = "0.20.0";
|
version = "0.20.1";
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
@ -38,11 +39,11 @@ rustPlatform.buildRustPackage {
|
||||||
owner = "timberio";
|
owner = "timberio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-OkT1Gj66Z4sj3YtaMlU1lbquTECPG34qydXGbx24Ig4=";
|
sha256 = "sha256-0xC6CpmSTRt7zj6RHqtjbMXWEiMUOdIymWVGI8Js+70=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-O2uy0wK4pdwjAYzIKJnCzJVsA3n+U+dw731y7OPJfP0=";
|
cargoSha256 = "sha256-NLMyE9+iYFWuMmL50TeLZVvlHkIDaSZYJwXK4ykGrb8=";
|
||||||
nativeBuildInputs = [ pkg-config cmake ];
|
nativeBuildInputs = [ pkg-config cmake perl ];
|
||||||
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
|
buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
|
||||||
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, buildGo118Module, fetchFromGitHub, nixosTests }:
|
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
|
||||||
|
|
||||||
buildGo118Module rec {
|
buildGoModule rec {
|
||||||
pname = "corerad";
|
pname = "corerad";
|
||||||
version = "1.1.2";
|
version = "1.1.2";
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,6 @@ buildGoModule rec {
|
||||||
|
|
||||||
vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI=";
|
vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI=";
|
||||||
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||||
|
|
||||||
passthru.tests.version = testVersion {
|
passthru.tests.version = testVersion {
|
||||||
|
|
111
pkgs/tools/networking/mozillavpn/default.nix
Normal file
111
pkgs/tools/networking/mozillavpn/default.nix
Normal file
|
@ -0,0 +1,111 @@
|
||||||
|
{ buildGoModule
|
||||||
|
, fetchFromGitHub
|
||||||
|
, go
|
||||||
|
, lib
|
||||||
|
, pkg-config
|
||||||
|
, polkit
|
||||||
|
, python3
|
||||||
|
, qmake
|
||||||
|
, qtbase
|
||||||
|
, qtcharts
|
||||||
|
, qtgraphicaleffects
|
||||||
|
, qtnetworkauth
|
||||||
|
, qtquickcontrols2
|
||||||
|
, qttools
|
||||||
|
, qtwebsockets
|
||||||
|
, stdenv
|
||||||
|
, which
|
||||||
|
, wireguard-tools
|
||||||
|
, wrapQtAppsHook
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
glean_parser_4_1_1 = python3.pkgs.buildPythonPackage rec {
|
||||||
|
pname = "glean_parser";
|
||||||
|
version = "4.1.1";
|
||||||
|
src = python3.pkgs.fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
hash = "sha256-4noazRqjjJNI2kTO714kSp70jZpWmqHWR2vnkgAftLE=";
|
||||||
|
};
|
||||||
|
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
|
||||||
|
propagatedBuildInputs = with python3.pkgs; [
|
||||||
|
appdirs
|
||||||
|
click
|
||||||
|
diskcache
|
||||||
|
jinja2
|
||||||
|
jsonschema
|
||||||
|
pyyaml
|
||||||
|
setuptools
|
||||||
|
yamllint
|
||||||
|
];
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace setup.py --replace '"pytest-runner", ' ""
|
||||||
|
'';
|
||||||
|
doCheck = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
pname = "mozillavpn";
|
||||||
|
version = "2.7.1";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mozilla-mobile";
|
||||||
|
repo = "mozilla-vpn-client";
|
||||||
|
rev = "v${version}";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
hash = "sha256-i551UkCOwWnioe1YgCNZAlYiQJ4YDDBMoDZhfbkLTbs=";
|
||||||
|
};
|
||||||
|
|
||||||
|
netfilter-go-modules = (buildGoModule {
|
||||||
|
inherit pname version src;
|
||||||
|
vendorSha256 = "sha256-KFYMim5U8WlJHValvIBQgEN+17SDv0JVbH03IiyfDc0=";
|
||||||
|
modRoot = "linux/netfilter";
|
||||||
|
}).go-modules;
|
||||||
|
|
||||||
|
in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
inherit pname version src;
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
polkit
|
||||||
|
qtbase
|
||||||
|
qtcharts
|
||||||
|
qtgraphicaleffects
|
||||||
|
qtnetworkauth
|
||||||
|
qtquickcontrols2
|
||||||
|
qtwebsockets
|
||||||
|
];
|
||||||
|
nativeBuildInputs = [
|
||||||
|
glean_parser_4_1_1
|
||||||
|
go
|
||||||
|
pkg-config
|
||||||
|
python3
|
||||||
|
python3.pkgs.pyyaml
|
||||||
|
qmake
|
||||||
|
qttools
|
||||||
|
which
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
for file in linux/*.service linux/extra/*.desktop src/platforms/linux/daemon/*.service; do
|
||||||
|
substituteInPlace "$file" --replace /usr/bin/mozillavpn "$out/bin/mozillavpn"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
ln -s '${netfilter-go-modules}' linux/netfilter/vendor
|
||||||
|
python3 scripts/generate_glean.py
|
||||||
|
python3 scripts/importLanguages.py
|
||||||
|
'';
|
||||||
|
|
||||||
|
qmakeFlags = [ "USRPATH=$(out)" "ETCPATH=$(out)/etc" ];
|
||||||
|
qtWrapperArgs =
|
||||||
|
[ "--prefix" "PATH" ":" (lib.makeBinPath [ wireguard-tools ]) ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Client for the Mozilla VPN service";
|
||||||
|
homepage = "https://vpn.mozilla.org/";
|
||||||
|
license = lib.licenses.mpl20;
|
||||||
|
maintainers = with lib.maintainers; [ andersk ];
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
#Adapted from
|
#Adapted from
|
||||||
#https://github.com/rycee/home-manager/blob/2c07829be2bcae55e04997b19719ff902a44016d/home-manager/default.nix
|
#https://github.com/rycee/home-manager/blob/2c07829be2bcae55e04997b19719ff902a44016d/home-manager/default.nix
|
||||||
|
|
||||||
{ bash, coreutils, findutils, gnused, less, gettext, nixos-option, lib, stdenv, makeWrapper, fetchFromGitHub }:
|
{ bash, coreutils, findutils, gnused, less, ncurses, gettext, nixos-option, lib, stdenv, makeWrapper, fetchFromGitHub }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||||
substituteInPlace $out/bin/home-manager \
|
substituteInPlace $out/bin/home-manager \
|
||||||
--subst-var-by bash "${bash}" \
|
--subst-var-by bash "${bash}" \
|
||||||
--subst-var-by DEP_PATH "${
|
--subst-var-by DEP_PATH "${
|
||||||
lib.makeBinPath [ coreutils findutils gettext gnused less nixos-option ]
|
lib.makeBinPath [ coreutils findutils gettext gnused less ncurses nixos-option ]
|
||||||
}" \
|
}" \
|
||||||
--subst-var-by HOME_MANAGER_LIB '${src}/lib/bash/home-manager.sh' \
|
--subst-var-by HOME_MANAGER_LIB '${src}/lib/bash/home-manager.sh' \
|
||||||
--subst-var-by HOME_MANAGER_PATH '${src}' \
|
--subst-var-by HOME_MANAGER_PATH '${src}' \
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "mdbook";
|
pname = "mdbook";
|
||||||
version = "0.4.15";
|
version = "0.4.17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rust-lang";
|
owner = "rust-lang";
|
||||||
repo = "mdBook";
|
repo = "mdBook";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-FYuai7YeqrnL5XgOV/EvxIRAu3TkeKJvKiDxnx94PJ8=";
|
sha256 = "sha256-08ccRiOBXYqueKfyi/Ry39O2xOXUKishgqhn6RdbvUE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-YWifpXrk+T8C3fGlURDKYWw7mD1TUjJbFHTlK84Tgpc=";
|
cargoSha256 = "sha256-vXUjKpCGlHlBvXLtmGkFtHRxxZakiEzuNzReFGEl6dw=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,8 @@ with pkgs;
|
||||||
### Helper functions.
|
### Helper functions.
|
||||||
inherit lib config overlays;
|
inherit lib config overlays;
|
||||||
|
|
||||||
inherit (lib) lowPrio hiPrio appendToName makeOverridable;
|
# do not import 'appendToName' to get consistent package-names with the same set of package-parameters: https://github.com/NixOS/nixpkgs/issues/68519
|
||||||
|
inherit (lib) lowPrio hiPrio makeOverridable;
|
||||||
|
|
||||||
inherit (lib) recurseIntoAttrs;
|
inherit (lib) recurseIntoAttrs;
|
||||||
|
|
||||||
|
@ -1145,6 +1146,8 @@ with pkgs;
|
||||||
|
|
||||||
tfk8s = callPackage ../tools/misc/tfk8s { };
|
tfk8s = callPackage ../tools/misc/tfk8s { };
|
||||||
|
|
||||||
|
thumbs = callPackage ../tools/misc/thumbs { };
|
||||||
|
|
||||||
tnat64 = callPackage ../tools/networking/tnat64 { };
|
tnat64 = callPackage ../tools/networking/tnat64 { };
|
||||||
|
|
||||||
topicctl = callPackage ../tools/misc/topicctl { };
|
topicctl = callPackage ../tools/misc/topicctl { };
|
||||||
|
@ -3097,7 +3100,9 @@ with pkgs;
|
||||||
|
|
||||||
envsubst = callPackage ../tools/misc/envsubst { };
|
envsubst = callPackage ../tools/misc/envsubst { };
|
||||||
|
|
||||||
errcheck = callPackage ../development/tools/errcheck { };
|
errcheck = callPackage ../development/tools/errcheck {
|
||||||
|
buildGoModule = buildGo118Module;
|
||||||
|
};
|
||||||
|
|
||||||
eschalot = callPackage ../tools/security/eschalot { };
|
eschalot = callPackage ../tools/security/eschalot { };
|
||||||
|
|
||||||
|
@ -5079,6 +5084,8 @@ with pkgs;
|
||||||
|
|
||||||
mcrcon = callPackage ../tools/networking/mcrcon {};
|
mcrcon = callPackage ../tools/networking/mcrcon {};
|
||||||
|
|
||||||
|
mozillavpn = libsForQt5.callPackage ../tools/networking/mozillavpn { };
|
||||||
|
|
||||||
mozwire = callPackage ../tools/networking/mozwire {
|
mozwire = callPackage ../tools/networking/mozwire {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
};
|
};
|
||||||
|
@ -15318,6 +15325,8 @@ with pkgs;
|
||||||
|
|
||||||
kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { };
|
kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { };
|
||||||
|
|
||||||
|
kamid = callPackage ../servers/ftp/kamid { };
|
||||||
|
|
||||||
kati = callPackage ../development/tools/build-managers/kati { };
|
kati = callPackage ../development/tools/build-managers/kati { };
|
||||||
|
|
||||||
kcat = callPackage ../development/tools/kcat { };
|
kcat = callPackage ../development/tools/kcat { };
|
||||||
|
@ -20294,6 +20303,8 @@ with pkgs;
|
||||||
|
|
||||||
spirv-cross = callPackage ../tools/graphics/spirv-cross { };
|
spirv-cross = callPackage ../tools/graphics/spirv-cross { };
|
||||||
|
|
||||||
|
splat = callPackage ../applications/radio/splat { };
|
||||||
|
|
||||||
sratom = callPackage ../development/libraries/audio/sratom { };
|
sratom = callPackage ../development/libraries/audio/sratom { };
|
||||||
|
|
||||||
srm = callPackage ../tools/security/srm { };
|
srm = callPackage ../tools/security/srm { };
|
||||||
|
@ -22452,7 +22463,9 @@ with pkgs;
|
||||||
|
|
||||||
coredns = callPackage ../servers/dns/coredns { };
|
coredns = callPackage ../servers/dns/coredns { };
|
||||||
|
|
||||||
corerad = callPackage ../tools/networking/corerad { };
|
corerad = callPackage ../tools/networking/corerad {
|
||||||
|
buildGoModule = buildGo118Module;
|
||||||
|
};
|
||||||
|
|
||||||
cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
|
cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
|
||||||
|
|
||||||
|
@ -23069,7 +23082,9 @@ with pkgs;
|
||||||
|
|
||||||
go-langserver = callPackage ../development/tools/go-langserver { };
|
go-langserver = callPackage ../development/tools/go-langserver { };
|
||||||
|
|
||||||
gopls = callPackage ../development/tools/gopls { };
|
gopls = callPackage ../development/tools/gopls {
|
||||||
|
buildGoModule = buildGo118Module;
|
||||||
|
};
|
||||||
|
|
||||||
gops = callPackage ../development/tools/gops { };
|
gops = callPackage ../development/tools/gops { };
|
||||||
|
|
||||||
|
@ -28127,6 +28142,7 @@ with pkgs;
|
||||||
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
|
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
|
||||||
|
|
||||||
ncdu = callPackage ../tools/misc/ncdu { };
|
ncdu = callPackage ../tools/misc/ncdu { };
|
||||||
|
ncdu_2 = callPackage ../tools/misc/ncdu_2 { };
|
||||||
|
|
||||||
ncdc = callPackage ../applications/networking/p2p/ncdc { };
|
ncdc = callPackage ../applications/networking/p2p/ncdc { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue