diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 46570b40d2a6..b9faf227859a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4502,6 +4502,12 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ghostbuster91 = { + name = "Kasper Kondzielski"; + email = "kghost0@gmail.com"; + github = "ghostbuster91"; + githubId = 5662622; + }; ghuntley = { email = "ghuntley@ghuntley.com"; github = "ghuntley"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index cee9095d3a96..4a2e58ff871d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -219,6 +219,15 @@ to be able to access the device. + + + mozillavpn, + the client for the + Mozilla VPN + service. Available as + services.mozillavpn. + + mtr-exporter, @@ -1815,6 +1824,17 @@ 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 diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 8796afebc8bb..6a42cac87782 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -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. +- [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). - [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. +- 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`. - 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)). diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 9304c307af2f..8e28d3336fa4 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -64,7 +64,8 @@ let filter = builtins.filterSource (n: t: - (t == "directory" -> baseNameOf n != "tests") + cleanSourceFilter n t + && (t == "directory" -> baseNameOf n != "tests") && (t == "file" -> hasSuffix ".nix" n) ); in diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1ad2592b1dd7..c11497e46f10 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -816,6 +816,7 @@ ./services/networking/mosquitto.nix ./services/networking/monero.nix ./services/networking/morty.nix + ./services/networking/mozillavpn.nix ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix diff --git a/nixos/modules/services/networking/mozillavpn.nix b/nixos/modules/services/networking/mozillavpn.nix new file mode 100644 index 000000000000..e35ba65314e9 --- /dev/null +++ b/nixos/modules/services/networking/mozillavpn.nix @@ -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 ]; +} diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index ab87394a30ee..e0bccb83a97f 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -344,6 +344,10 @@ in restartIfChanged = false; }; + systemd.services.virtchd = { + path = [ pkgs.cloud-hypervisor ]; + }; + systemd.services.libvirt-guests = { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ coreutils gawk cfg.package ]; diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index 3149c171bdec..177476900aa9 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -5,7 +5,7 @@ , pkg-config , scdoc , stdenv -, systemd +, systemdSupport ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { @@ -25,9 +25,13 @@ stdenv.mkDerivation rec { 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; { description = "A universal seat management library"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6f32892d4daf..0df988b9f98a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -21,19 +21,19 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.7.0", - "sha256": "12n97z3r5bz7hwgcz193x90n7ibk4fdph7pqxwwinrvlc6zb7hz6", - "vendorSha256": "12lj7p74mhiy30fhc12ihbf827axlbxhbfzr10iwwhb0nydsfiyl", - "version": "2.7.0" + "rev": "v2.7.1", + "sha256": "sha256-tXg9VpP3kj32Q9ktU5FrcQStIRlDtMLXYzn0RvLQCRk=", + "vendorSha256": "sha256-1Eenm7dgQc4jCPm7BfuiXR2B3IJRBAYdGD7CSs49koo=", + "version": "2.7.1" }, "akamai": { "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v1.11.0", - "sha256": "1ccliv8p36rh7f7zacjsa2x846d36nygbgs0vyjb0bpf5pl7grgd", - "vendorSha256": "19n841mby0l7ipjmmqsl5vnfmsj6y8fci1vzi8z6dqy3xcjlhwgb", - "version": "1.11.0" + "rev": "v1.12.1", + "sha256": "sha256-UQD1RiXIRcP0CvVO8Tx/qkBhRD3LFj/KI3WP/yKeBek=", + "vendorSha256": "sha256-GZFLnKHk6YaMwFGgy79ric388EMIH6NUVw4JVLNxWZY=", + "version": "1.12.1" }, "alicloud": { "deleteVendor": true, @@ -94,28 +94,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.8.0", - "sha256": "sha256-Ere41qols4lNnoAIZGWQmituukLnPNbv5d8C/e3rQgI=", - "vendorSha256": "sha256-ZXH9YlSii2z1s6Y/TfZVBje0/xQ2DXw3ZpgcBPeQZ2I=", - "version": "4.8.0" + "rev": "v4.9.0", + "sha256": "sha256-VLw2bqL6VEKwqzXYkNJGJtIi8gg+3/oCwbBf9UtATE4=", + "vendorSha256": "sha256-7pwwQHgtHO3GfcEAOHALo01i1pt9WsriZZkJjFzjwRE=", + "version": "4.9.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.19.1", - "sha256": "sha256-n5jDlcy5rwCcrqoL3ut+HThDLQ8hPj2mZ15d7hhALFw=", + "rev": "v2.20.0", + "sha256": "sha256-x1tSrejqsw3A/1n+PbG9wWx7q7qRciCjdwPAFT4lc2E=", "vendorSha256": null, - "version": "2.19.1" + "version": "2.20.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.0.2", - "sha256": "sha256-T24bfys9OxBnGN4YtJEsJmSUK26a5hMnbgZUANcpg3k=", + "rev": "v3.1.0", + "sha256": "sha256-idrGxmfhnMKvxtKJtjLs321D008Mcv27cHyhAjwCZfA=", "vendorSha256": null, - "version": "3.0.2" + "version": "3.1.0" }, "azurestack": { "owner": "hashicorp", @@ -194,10 +194,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.11.0", - "sha256": "sha256-z7IjLXO/AHWENKYaCospJDcOwOubNcRHKDQzmRkhimw=", - "vendorSha256": "sha256-Lx/faIdx4k399sm9p8BVqpiKZtNjZoThBhWWWgEuPyg=", - "version": "3.11.0" + "rev": "v3.12.0", + "sha256": "sha256-y2qq0asEnhnOjthLBFxyQjf1N5KNlXXK0eXjT1/vCXg=", + "vendorSha256": "sha256-v6fUzYwrYt4rk5LT0LyNd8e9X79r3dwtd3s1QIV/w/s=", + "version": "3.12.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -411,20 +411,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.15.0", - "sha256": "sha256-BHtbBfCihy1zh/A9JB03CDh5KpzMWeR/mbuRErJkVUE=", - "vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=", - "version": "4.15.0" + "rev": "v4.16.0", + "sha256": "sha256-kp6AldlkjiNd3R3hz+wB2uBQ37TyZ0hoEhxQYiFmO7g=", + "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", + "version": "4.16.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.15.0", - "sha256": "sha256-FTT6PS0OS4HPfkM2u4PZwOA/v5VzDwHLdO2s+qgRkW8=", - "vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=", - "version": "4.15.0" + "rev": "v4.16.0", + "sha256": "sha256-m5K2q83WbWVfjG7vhlh71k14GEXNs+2JfK/S1GnC5c0=", + "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", + "version": "4.16.0" }, "grafana": { "owner": "grafana", @@ -439,10 +439,10 @@ "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.14.2", - "sha256": "sha256-gGwwyp3NgdcoE6YIBewiiajPoZpJbQ80/Zr2pIw8imE=", + "rev": "v1.14.3", + "sha256": "sha256-OGVIZ6q8qq4XkkWxjX5BQCJE9qubJ5Xnt2DrD23JGB8=", "vendorSha256": null, - "version": "1.14.2" + "version": "1.14.3" }, "hcloud": { "owner": "hetznercloud", @@ -511,10 +511,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.40.0", - "sha256": "sha256-msBfnPkClyOvqXcKHIpCxT1YDRHY7p491zl8Uvl8qOQ=", - "vendorSha256": "sha256-YgRgm5S7cXHO9yqUUuVVkFRQL+pf0RMPJI9oUaWob2I=", - "version": "1.40.0" + "rev": "v1.40.1", + "sha256": "sha256-7NdpMWEpkcqEwi7xAedc/NPJ6e+RZZ4HdrKtmb/H6xU=", + "vendorSha256": "sha256-rVV6oeqIj4o9qxw2V67G3cgERJaccejaAAtEOJVLm4U=", + "version": "1.40.1" }, "icinga2": { "owner": "Icinga", @@ -583,19 +583,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.9.0", - "sha256": "sha256-w16pm2+8M59grW5HUBBtkKaCnvf5p4GQMEHtQa4DLXs=", + "rev": "v2.10.0", + "sha256": "sha256-pA0yI59iRBmiT3rdvoP4vkSz/+bH29O4eLGPCBjfiZU=", "vendorSha256": null, - "version": "2.9.0" + "version": "2.10.0" }, "launchdarkly": { "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.5.0", - "sha256": "1083w217y8l6clj3q31f1lanzngfinw682kdqpm0xfssqas7qzx6", - "vendorSha256": "13vcxvw56bn7mdz917lvdryd2d7mcvi83ykbzjfbpxr4lzrrm9qw", - "version": "2.5.0" + "rev": "v2.6.0", + "sha256": "sha256-Mf7oV5G5XjnE+3m8EDczDvrtn2s4nrNCTdAJz1n9v2Y=", + "vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=", + "version": "2.6.0" }, "libvirt": { "owner": "dmacvicar", @@ -634,13 +634,12 @@ "version": "2.2.2" }, "logicmonitor": { - "deleteVendor": true, "owner": "logicmonitor", "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor", "repo": "terraform-provider-logicmonitor", "rev": "v2.0.0", "sha256": "sha256-wamP36zV5HZ1qQlNZWIZyAYx/jOiRO1ODQpcd10Sl4w=", - "vendorSha256": "sha256-ccLI662Z+B+xvyuQ5aRHUViREtcdccjOMM5EIJiEaU0=", + "vendorSha256": null, "version": "2.0.0" }, "lxd": { @@ -656,10 +655,10 @@ "owner": "wgebis", "provider-source-address": "registry.terraform.io/wgebis/mailgun", "repo": "terraform-provider-mailgun", - "rev": "v0.7.1", - "sha256": "0sw4a5ch8izy9lw9qmbj6s5vxz7gxcarga1s1h3vlng9y1dpvp2r", - "vendorSha256": "1qwd3jwdh5pzq9sdb62lpkbspfn54jii725p2jgvzg93xarv4n58", - "version": "0.7.1" + "rev": "v0.7.2", + "sha256": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=", + "vendorSha256": "sha256-g1PEjNV/RE2q7olGQsdM6AbXcXP2UROHC/SwEMPDk8c=", + "version": "0.7.2" }, "matchbox": { "owner": "poseidon", @@ -692,10 +691,10 @@ "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.3.0", - "sha256": "0lrzbljd8iklyrmplc64lq4v8y7z5fw7l41y27nsfjl4rm0xz5bn", - "vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz", - "version": "1.3.0" + "rev": "v1.3.1", + "sha256": "sha256-X2Utt+MUboLc0/nAXB78ko3w2ieTIQaVsDK6MhbUKSQ=", + "vendorSha256": "sha256-yZ/TgAVlBxHhrrZU6SH1KXNoZj8oWRqx3BjVHkTtI+Q=", + "version": "1.3.1" }, "namecheap": { "owner": "namecheap", @@ -728,10 +727,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.41.2", - "sha256": "sha256-LCA1K4md1wRRkB7oerUn1MM0TRLcqQBoVpvoxCMGSs8=", + "rev": "v2.42.0", + "sha256": "sha256-OD0wahsEw86E7TbUxIqEhoZ85An9yRwgTENtdoYnFB0=", "vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=", - "version": "2.41.2" + "version": "2.42.0" }, "nomad": { "owner": "hashicorp", @@ -783,10 +782,10 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.69.0", - "sha256": "sha256-VwL+i4HtvAJi3R57cjUrg+7rx1LxEUAMwkorCvJ9DcU=", + "rev": "v4.70.0", + "sha256": "sha256-KgpYl1DllCkpXbxYp8cqKE28l4digmaB75BoL6CpkQA=", "vendorSha256": null, - "version": "4.69.0" + "version": "4.70.0" }, "okta": { "owner": "okta", @@ -816,13 +815,12 @@ "version": "1.4.1" }, "opennebula": { - "deleteVendor": true, "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", "rev": "v0.4.3", "sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=", - "vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=", + "vendorSha256": null, "version": "0.4.3" }, "openstack": { @@ -838,10 +836,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.28.2", - "sha256": "sha256-qp5H37Zf9oPYA2vvWKuEpfUeHIfK1NYE9Uk7dcX9izA=", - "vendorSha256": "sha256-FMcPG7EJvU6XNKd2+8+xmjqSI0Ec9Xx/6gZvK9zJ3wg=", - "version": "1.28.2" + "rev": "v1.29.0", + "sha256": "sha256-jhG2TyinnlPPIVA2K+ckOcxlqxeUFkp+WFJcJqYQ13k=", + "vendorSha256": "sha256-qNJ1jkbGgFUxvHYUMPX9kBAwQSx4vfOr7eS0Z6J7X8Q=", + "version": "1.29.0" }, "opsgenie": { "owner": "opsgenie", @@ -865,10 +863,10 @@ "owner": "ovh", "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.16.0", - "sha256": "0vvxcm4ff6zw5ngwq9cia2ifjg8a2adyf66dyc2d8lavvfld22v9", + "rev": "v0.17.1", + "sha256": "sha256-bAwOxRexJuSw3Ntb8zXeTFPp23hCkCEI+zF4Q2SP3lA=", "vendorSha256": null, - "version": "0.16.0" + "version": "0.17.1" }, "pagerduty": { "owner": "PagerDuty", @@ -955,10 +953,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.1-rc.1", - "sha256": "0f4sizgcy3000k67nb3axa8xhpczvzdla3bnpda27jdrx22ckyz8", - "vendorSha256": "11g5v5kvs4qxdg34ai7fpinwbshrjwi9hxzav2vpnzhy8lfqpkzb", - "version": "2.2.1-rc.1" + "rev": "v2.2.1-rc.2", + "sha256": "sha256-7T+J4T0qm7QMGWWjIT0nKHkHzd6wfFNP3suF7GitErc=", + "vendorSha256": "sha256-kfr8YqLr8CXntkiMEHA5kosZqkloV4rGjEmdXosT7WU=", + "version": "2.2.1-rc.2" }, "secret": { "owner": "numtide", @@ -1000,10 +998,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.11.0", - "sha256": "sha256-ezd4TzckY5yx/UjwGxH36VX+owI8fBUmxtQFztOsFvs=", + "rev": "v6.11.1", + "sha256": "sha256-37D4nblpGK8duohDiyY4UR0jn+T6QX7LnCfGtPdYQ3k=", "vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=", - "version": "6.11.0" + "version": "6.11.1" }, "skytap": { "owner": "skytap", @@ -1018,10 +1016,10 @@ "owner": "chanzuckerberg", "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.29.0", - "sha256": "sha256-CdJHknGzEKfbxzrtqmevKwiYTs1UoRFRj6/ShQ9mdIc=", + "rev": "v0.30.0", + "sha256": "sha256-JHpwqMyt/oMZv6P4xEOlyV0pL32HQselDg+dP9JGRpg=", "vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=", - "version": "0.29.0" + "version": "0.30.0" }, "sops": { "owner": "carlpett", @@ -1036,10 +1034,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.70.0", - "sha256": "sha256-jtoFXfHCnmGW2QVssngNtRLT6BfHaaNmNl4v2UIsmrI=", - "vendorSha256": "sha256-yfWdyEf6ypF0QCdh9zspCaFyPJpt4DgYR1LBPTztOUw=", - "version": "1.70.0" + "rev": "v1.71.0", + "sha256": "sha256-Fcx0KHTAAOQE/Qa+84p5l5ve5nrWXZHgRyc3xNYBJoQ=", + "vendorSha256": "sha256-pI9jX/Wp6Nu1ix82ZE2CBZYu0j4S+HH2+dD5G679VrE=", + "version": "1.71.0" }, "stackpath": { "owner": "stackpath", @@ -1081,10 +1079,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.66.3", - "sha256": "sha256-LwIL+GjyEyuTCKiKLrOKrH5S1s9L56PUaHu6ypSSnRQ=", + "rev": "v1.67.0", + "sha256": "sha256-61Fhh/BW1Iv/7wMU0lDMxPdB86Wqf43F90ZoWM990K0=", "vendorSha256": null, - "version": "1.66.3" + "version": "1.67.0" }, "tfe": { "owner": "hashicorp", @@ -1117,10 +1115,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", - "rev": "v3.1.0", - "sha256": "0g2bgvw02ydwgb6blica5a139crnyp4hdhzxf433n3fflwyvl6r1", - "vendorSha256": null, - "version": "3.1.0" + "rev": "v3.3.0", + "sha256": "sha256-7A9AXZxTIltZdXXIpMpQGYKwgSdU6kRRNuvVaNtMFGw=", + "vendorSha256": "sha256-bj2KpPFFnev5DAND9/HyUC4kOORAvnnpSihUECcHB/8=", + "version": "3.3.0" }, "triton": { "deleteVendor": true, @@ -1154,10 +1152,10 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.17", - "sha256": "sha256-QJtdCEw8bnVku4fqAX5MBU9tkPv5jwjra9lGPfUPGQw=", - "vendorSha256": "sha256-5EelFIfHVLRiRJig6EeJG6KGJuQ05LX3M5CNxUxQAas=", - "version": "0.17.17" + "rev": "0.17.19", + "sha256": "sha256-FTZyri4/6QWkLKKectzx3av8fnoDkOIyAkAPasFU8sU=", + "vendorSha256": "sha256-FA2Hev7RS3ZJ/cDTgyZ7uMFlQB/VdJ19GZUpkWTEPV8=", + "version": "0.17.19" }, "vault": { "owner": "hashicorp", diff --git a/pkgs/applications/radio/splat/default.nix b/pkgs/applications/radio/splat/default.nix new file mode 100644 index 000000000000..2e929ff04ef2 --- /dev/null +++ b/pkgs/applications/radio/splat/default.nix @@ -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; + }; + +} diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index ef8259e9e82e..bca93ca7bc56 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.41.0"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "GbZ2w1EOIrrfzDIEBi1DK6U3QC9eCuJhKMDZDJVAN+E="; + sha256 = "wkx/5rtDFjztit8jLVg7LgE9O6bCjetfz4B5hePete8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index dd3f304ef8b8..f75f556fb0de 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "args"; - version = "6.2.7"; + version = "6.3.0"; src = fetchFromGitHub { owner = "Taywee"; repo = pname; rev = version; - sha256 = "sha256-I297qPXs8Fj7Ibq2PN6y/Eas3DiW5Ecvqot0ePwFNTI="; + sha256 = "sha256-fEM9KNqqxYbafMcHCW46Y//8Hrvd7gZrCIQhH5lhpFc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index f42046c284ec..7ad5472f5b6d 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -1,12 +1,9 @@ -{ lib, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "delve"; version = "1.8.2"; - goPackagePath = "github.com/go-delve/delve"; - excludedPackages = [ "_fixtures" "scripts" "service/test" ]; - src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; @@ -14,10 +11,14 @@ buildGoPackage rec { sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik="; }; + vendorSha256 = null; + subPackages = [ "cmd/dlv" ]; nativeBuildInputs = [ makeWrapper ]; + checkFlags = [ "-short" ]; + postInstall = '' # fortify source breaks build since delve compiles with -O0 wrapProgram $out/bin/dlv \ diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix index a387c14c0a5c..eb8fd99f9e5a 100644 --- a/pkgs/development/tools/errcheck/default.nix +++ b/pkgs/development/tools/errcheck/default.nix @@ -2,22 +2,23 @@ buildGoModule rec { pname = "errcheck"; - version = "1.6.0"; + version = "unstable-2022-03-26"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; - rev = "v${version}"; - sha256 = "sha256-Przf2c2jFNdkUq7IOUD7ChXHiSayAz4xTsNzajycYZ0="; + rev = "e62617a91f7bd1abab2cbe7f28966188dd85eee0"; + sha256 = "sha256-RoPv6Odh8l9DF1S50pNEomLtI4uTDNjveOXZd4S52c0="; }; - vendorSha256 = "sha256-rluaBdW+w2zPThELlBwX/6LXDgc2aIk/ucbrsrABpVc="; + vendorSha256 = "sha256-fDugaI9Fh0L27yKSFNXyjYLMMDe6CRgE6kVLiJ3+Kyw="; + + subPackages = [ "." ]; 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"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 069cd2b37fe3..8d533d359df5 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo118Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo118Module rec { +buildGoModule rec { pname = "gopls"; version = "0.8.1"; diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix index f2099a855ccb..2f0416a8364e 100644 --- a/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/pkgs/development/tools/rust/cargo-rr/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { passthru = { updateScript = genericUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + versionLister = "${common-updater-scripts}/bin/list-git-tags"; }; }; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 8c39ab3f207f..7de74f405b41 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -556,6 +556,10 @@ in rec { }; }; + tmux-thumbs = pkgs.callPackage ./tmux-thumbs { + inherit mkTmuxPlugin; + }; + urlview = mkTmuxPlugin { pluginName = "urlview"; version = "unstable-2016-01-06"; diff --git a/pkgs/misc/tmux-plugins/tmux-thumbs/default.nix b/pkgs/misc/tmux-plugins/tmux-thumbs/default.nix new file mode 100644 index 000000000000..f55a2dbe7b60 --- /dev/null +++ b/pkgs/misc/tmux-plugins/tmux-thumbs/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/misc/tmux-plugins/tmux-thumbs/fix.patch b/pkgs/misc/tmux-plugins/tmux-thumbs/fix.patch new file mode 100644 index 000000000000..326696ebc40a --- /dev/null +++ b/pkgs/misc/tmux-plugins/tmux-thumbs/fix.patch @@ -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 + + + diff --git a/pkgs/servers/ftp/kamid/default.nix b/pkgs/servers/ftp/kamid/default.nix new file mode 100644 index 000000000000..160ad87144b4 --- /dev/null +++ b/pkgs/servers/ftp/kamid/default.nix @@ -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; + }; +} diff --git a/pkgs/tools/filesystems/lfs/default.nix b/pkgs/tools/filesystems/lfs/default.nix index 1009125adc6d..ec55905c6153 100644 --- a/pkgs/tools/filesystems/lfs/default.nix +++ b/pkgs/tools/filesystems/lfs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "lfs"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ySaPR6it/1xEf+Rnypnz5AklxWZZ8NeXpjId4ZSMIs8="; + sha256 = "sha256-7dSBac+rLedgko4KLVS9ZWrj/IlXJMsnbQFzyQxv4LQ="; }; - cargoSha256 = "sha256-FLbFDJXVpWycII8mdNDphh8QVXFFnxtFgloweW+BZA0="; + cargoSha256 = "sha256-stDxDBftIVZqgy49VGJHx+JTzflVE91QN75aSWhvgSs="; meta = with lib; { description = "Get information on your mounted disks"; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 91225e6b97c6..e81414a2595f 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "5.14.2"; + version = "5.15.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - sha256 = "sha256-AczT753yg3dTpdh2uNqE6pV9E9ekYbjEbor6TrCaq8g="; + sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk"; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/tools/misc/ncdu_2/c-import-order.patch b/pkgs/tools/misc/ncdu_2/c-import-order.patch new file mode 100644 index 000000000000..a094f3237ad6 --- /dev/null +++ b/pkgs/tools/misc/ncdu_2/c-import-order.patch @@ -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"); + }); diff --git a/pkgs/tools/misc/ncdu_2/default.nix b/pkgs/tools/misc/ncdu_2/default.nix new file mode 100644 index 000000000000..a703cf3eca6c --- /dev/null +++ b/pkgs/tools/misc/ncdu_2/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index d0125377763d..7f2a3d150226 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -21,10 +21,10 @@ , qtwayland }: let - version = "0.8.2"; + version = "1.0.1"; timestamp = "99999999999"; commit = "nix-${version}"; - hash = "sha256-BaqKlF2SZueykFhtj91McP39oXYAx+lz8eXhn5eouqg="; + hash = "sha256-vHBlrtQ06kjjXXGL/jSdpAPHgqb7Vn1c6jXZVXwxHPQ="; udev_rules = '' #Flipper Zero serial port @@ -50,13 +50,13 @@ mkDerivation { pkg-config qmake qttools + wrapQtAppsHook ]; buildInputs = [ zlib libusb1 libGL - wrapQtAppsHook qtbase qt3d @@ -70,39 +70,30 @@ mkDerivation { qtwayland ]; - preBuild = '' + qmakeFlags = [ + "DEFINES+=DISABLE_APPLICATION_UPDATES" + "CONFIG+=qtquickcompiler" + ]; + + postPatch = '' substituteInPlace qflipper_common.pri \ --replace 'GIT_VERSION = unknown' 'GIT_VERSION = "${version}"' \ --replace 'GIT_TIMESTAMP = 0' 'GIT_TIMESTAMP = ${timestamp}' \ --replace 'GIT_COMMIT = unknown' 'GIT_COMMIT = "${commit}"' cat qflipper_common.pri - ''; - installPhase = '' - runHook preInstall - + postInstall = '' mkdir -p $out/bin - ${lib.optionalString stdenv.isLinux '' - install -Dm755 qFlipper $out/bin/qFlipper - ''} ${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 - - 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 + cp qFlipper-cli $out/bin mkdir -p $out/etc/udev/rules.d tee $out/etc/udev/rules.d/42-flipperzero.rules << EOF ${udev_rules} EOF - - runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/misc/thumbs/default.nix b/pkgs/tools/misc/thumbs/default.nix new file mode 100644 index 000000000000..60a1dce08c08 --- /dev/null +++ b/pkgs/tools/misc/thumbs/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/tools/misc/thumbs/fix.patch b/pkgs/tools/misc/thumbs/fix.patch new file mode 100644 index 000000000000..e04d7db8598a --- /dev/null +++ b/pkgs/tools/misc/thumbs/fix.patch @@ -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), diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 90f4505e027f..c5b6cc96ea90 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -15,6 +15,7 @@ , CoreServices , tzdata , cmake +, perl # kafka is optional but one of the most used features , enableKafka ? true # TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*" @@ -29,7 +30,7 @@ let pname = "vector"; - version = "0.20.0"; + version = "0.20.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -38,11 +39,11 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OkT1Gj66Z4sj3YtaMlU1lbquTECPG34qydXGbx24Ig4="; + sha256 = "sha256-0xC6CpmSTRt7zj6RHqtjbMXWEiMUOdIymWVGI8Js+70="; }; - cargoSha256 = "sha256-O2uy0wK4pdwjAYzIKJnCzJVsA3n+U+dw731y7OPJfP0="; - nativeBuildInputs = [ pkg-config cmake ]; + cargoSha256 = "sha256-NLMyE9+iYFWuMmL50TeLZVvlHkIDaSZYJwXK4ykGrb8="; + nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 80082a223e57..360cc96b707b 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo118Module, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGo118Module rec { +buildGoModule rec { pname = "corerad"; version = "1.1.2"; diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index 42660dbf5cc0..fb46ab3fe102 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; - doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; passthru.tests.version = testVersion { diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix new file mode 100644 index 000000000000..9e4e7cc29d47 --- /dev/null +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -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; + }; +} diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index e6c596c07145..ac0d3fe196f3 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -1,7 +1,7 @@ #Adapted from #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 { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/home-manager \ --subst-var-by bash "${bash}" \ --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_PATH '${src}' \ diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 3ca4d0d8a559..075dd1b2b587 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.15"; + version = "0.4.17"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "v${version}"; - sha256 = "sha256-FYuai7YeqrnL5XgOV/EvxIRAu3TkeKJvKiDxnx94PJ8="; + sha256 = "sha256-08ccRiOBXYqueKfyi/Ry39O2xOXUKishgqhn6RdbvUE="; }; - cargoSha256 = "sha256-YWifpXrk+T8C3fGlURDKYWw7mD1TUjJbFHTlK84Tgpc="; + cargoSha256 = "sha256-vXUjKpCGlHlBvXLtmGkFtHRxxZakiEzuNzReFGEl6dw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9efd05c4f9f9..66c7623eab39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -73,7 +73,8 @@ with pkgs; ### Helper functions. 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; @@ -1145,6 +1146,8 @@ with pkgs; tfk8s = callPackage ../tools/misc/tfk8s { }; + thumbs = callPackage ../tools/misc/thumbs { }; + tnat64 = callPackage ../tools/networking/tnat64 { }; topicctl = callPackage ../tools/misc/topicctl { }; @@ -3097,7 +3100,9 @@ with pkgs; envsubst = callPackage ../tools/misc/envsubst { }; - errcheck = callPackage ../development/tools/errcheck { }; + errcheck = callPackage ../development/tools/errcheck { + buildGoModule = buildGo118Module; + }; eschalot = callPackage ../tools/security/eschalot { }; @@ -5079,6 +5084,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + mozillavpn = libsForQt5.callPackage ../tools/networking/mozillavpn { }; + mozwire = callPackage ../tools/networking/mozwire { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15318,6 +15325,8 @@ with pkgs; kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { }; + kamid = callPackage ../servers/ftp/kamid { }; + kati = callPackage ../development/tools/build-managers/kati { }; kcat = callPackage ../development/tools/kcat { }; @@ -20294,6 +20303,8 @@ with pkgs; spirv-cross = callPackage ../tools/graphics/spirv-cross { }; + splat = callPackage ../applications/radio/splat { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srm = callPackage ../tools/security/srm { }; @@ -22452,7 +22463,9 @@ with pkgs; coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { }; + corerad = callPackage ../tools/networking/corerad { + buildGoModule = buildGo118Module; + }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -23069,7 +23082,9 @@ with pkgs; go-langserver = callPackage ../development/tools/go-langserver { }; - gopls = callPackage ../development/tools/gopls { }; + gopls = callPackage ../development/tools/gopls { + buildGoModule = buildGo118Module; + }; gops = callPackage ../development/tools/gops { }; @@ -28127,6 +28142,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; ncdu = callPackage ../tools/misc/ncdu { }; + ncdu_2 = callPackage ../tools/misc/ncdu_2 { }; ncdc = callPackage ../applications/networking/p2p/ncdc { };