From 07c201917c64f3ed784f3e0ec045a7670b52a7e3 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 25 Jan 2022 21:42:24 +0000 Subject: [PATCH 01/39] sox: 14.4.2 -> unstable-2021-05-09 --- pkgs/applications/misc/audio/sox/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 29a932f40d58..74aec8fe4e16 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,7 +1,9 @@ { config , lib , stdenv -, fetchurl +, fetchzip +, autoreconfHook +, autoconf-archive , pkg-config , CoreAudio , enableAlsa ? true @@ -35,15 +37,16 @@ stdenv.mkDerivation rec { pname = "sox"; - version = "14.4.2"; + version = "unstable-2021-05-09"; - src = fetchurl { - url = "mirror://sourceforge/sox/sox-${version}.tar.gz"; - sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; + src = fetchzip { + url = "https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49.zip"; + sha256 = "15rp55vr0h2954zl1rllsnriv64qab8fzsp0aprnpx1s5b14xjpm"; }; - # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = lib.optional enableOpusfile pkg-config; + nativeBuildInputs = [ autoreconfHook autoconf-archive ] + # configure.ac uses pkg-config only to locate libopusfile + ++ lib.optional enableOpusfile pkg-config; patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; From 3d72a0fc55a56499b5a6dcf1260585923f7ca808 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Feb 2022 12:02:04 +0000 Subject: [PATCH 02/39] postman: 9.13.0 -> 9.14.0 --- pkgs/development/web/postman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index bf1ed98b4737..2c0698b74a8a 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "9.13.0"; + version = "9.14.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "sha256-ZlCIqQ4i/jaf/uDBonVXf6kAuKEhinnKTk3nO7mnBV4="; + sha256 = "sha256-pA3gT4xoIWhajY03JzVgHK5KyTx1uH6gyasuLTdt6cM="; name = "${pname}.tar.gz"; }; From ec9353941dc489faa71201ae962164df44af45f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 09:25:59 +0000 Subject: [PATCH 03/39] svgbob: 0.6.5 -> 0.6.6 --- pkgs/tools/graphics/svgbob/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 52ef4230fd3a..ab3724fb7460 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.6.5"; + version = "0.6.6"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "sha256-EsOq081wfnuFT0OKqLyi3R105brZwuHJwzEx00c2LGg="; + sha256 = "sha256-NG5UbUv//03PVs5QoLVDkgA6Fc3SWKtbgIpcvcb7rW0="; }; - cargoSha256 = "sha256-sBU3GoqUH9cS1Kn0MCysCG9kQsWQqteVui1AHW9bfs0="; + cargoSha256 = "sha256-CdPTtn0NTcEAQvLTh4vdG053oZNNMmbP5IxmMU4YGAw="; postInstall = '' mv $out/bin/svgbob_cli $out/bin/svgbob From 1b557ada015ed0eba7c80633479c57627aef6012 Mon Sep 17 00:00:00 2001 From: flexagoon Date: Tue, 1 Mar 2022 21:51:56 +0300 Subject: [PATCH 04/39] mullvad-vpn: 2021.6 -> 2022.1 --- pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 0df8fc010e2c..cf22d8804068 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.6"; + version = "2022.1"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "0vpahryw4hm1k9p4vang84ji88znz67s7wxnwqndf02a627n7fcm"; + sha256 = "0s12y9j75k59kqkcvfflb1v5p3ny7xgc1m5bd635lvql1bv46c3i"; }; nativeBuildInputs = [ From 3fa7cc7ac697637462f1644421c7309928dcacbd Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Wed, 2 Mar 2022 23:59:27 +0530 Subject: [PATCH 05/39] prometheus-pve-exporter: init at 2.2.2 --- .../monitoring/prometheus/pve-exporter.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 38 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/pve-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix new file mode 100644 index 000000000000..707c121cc50a --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -0,0 +1,37 @@ +{ lib +, python3 +, nixosTests +}: + +python3.pkgs.buildPythonApplication rec { + pname = "prometheus-pve-exporter"; + version = "2.2.2"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "0vvsiw8nj8zkx6v42f260xbsdd92l0ac4vwpm7w38j3qwvanar7k"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + prometheus-client + proxmoxer + pyyaml + requests + werkzeug + ]; + + doCheck = false; + + pythonImportsCheck = [ "pve_exporter" ]; + + passthru.tests = { + inherit (nixosTests.prometheus-exporters) pve; + }; + + meta = with lib; { + description = "Exposes information gathered from Proxmox VE cluster for use by the Prometheus monitoring system"; + homepage = "https://github.com/prometheus-pve/prometheus-pve-exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ nukaduka ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 637462d344f8..8e2e1d3139a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21721,6 +21721,7 @@ with pkgs; prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; + prometheus-pve-exporter = callPackage ../servers/monitoring/prometheus/pve-exporter.nix { }; prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; From 6a0b420d9445ccc5a7171a8f777449b144008711 Mon Sep 17 00:00:00 2001 From: Kartik Gokte Date: Wed, 2 Mar 2022 23:59:33 +0530 Subject: [PATCH 06/39] nixos/prometheus-pve-exporter: init at 2.2.2 --- .../from_md/release-notes/rl-2205.section.xml | 8 ++ .../manual/release-notes/rl-2205.section.md | 2 + .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/pve.nix | 118 ++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 21 ++++ 5 files changed, 150 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/pve.nix 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 04bb7ec12d3e..95d8904666c0 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 @@ -136,6 +136,14 @@ services.mtr-exporter. + + + prometheus-pve-exporter, + a tool that exposes information from the Proxmox VE API for + use by Prometheus. Available as + services.prometheus.exporters.pve. + + tetrd, share your diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a2e8038ae1f8..f97919417dff 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -43,6 +43,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [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). + - [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable). - [ArchiSteamFarm](https://github.com/JustArchiNET/ArchiSteamFarm), a C# application with primary purpose of idling Steam cards from multiple accounts simultaneously. Available as [services.archisteamfarm](options.html#opt-services.archisteamfarm.enable). diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index d29d50706ef6..46e410f11d42 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -55,6 +55,7 @@ let "postfix" "postgres" "process" + "pve" "py-air-control" "redis" "rspamd" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix new file mode 100644 index 000000000000..ef708414c95e --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, options }: + +with lib; +let + cfg = config.services.prometheus.exporters.pve; + + # pve exporter requires a config file so create an empty one if configFile is not provided + emptyConfigFile = pkgs.writeTextFile { + name = "pve.yml"; + text = "default:"; + }; + + computedConfigFile = "${if cfg.configFile == null then emptyConfigFile else cfg.configFile}"; +in +{ + port = 9221; + extraOpts = { + package = mkOption { + type = types.package; + default = pkgs.prometheus-pve-exporter; + defaultText = literalExpression "pkgs.prometheus-pve-exporter"; + example = literalExpression "pkgs.prometheus-pve-exporter"; + description = '' + The package to use for prometheus-pve-exporter + ''; + }; + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/prometheus-pve-exporter/pve.env"; + description = '' + Path to the service's environment file. This path can either be a computed path in /nix/store or a path in the local filesystem. + + The environment file should NOT be stored in /nix/store as it contains passwords and/or keys in plain text. + + Environment reference: https://github.com/prometheus-pve/prometheus-pve-exporter#authentication + ''; + }; + + configFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/prometheus-pve-exporter/pve.yml"; + description = '' + Path to the service's config file. This path can either be a computed path in /nix/store or a path in the local filesystem. + + The config file should NOT be stored in /nix/store as it will contain passwords and/or keys in plain text. + + If both configFile and environmentFile are provided, the configFile option will be ignored. + + Configuration reference: https://github.com/prometheus-pve/prometheus-pve-exporter/#authentication + ''; + }; + + collectors = { + status = mkOption { + type = types.bool; + default = true; + description = '' + Collect Node/VM/CT status + ''; + }; + version = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE version info + ''; + }; + node = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE node info + ''; + }; + cluster = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE cluster info + ''; + }; + resources = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE resources info + ''; + }; + config = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE onboot status + ''; + }; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/pve_exporter \ + --${if cfg.collectors.status == true then "" else "no-"}collector.status \ + --${if cfg.collectors.version == true then "" else "no-"}collector.version \ + --${if cfg.collectors.node == true then "" else "no-"}collector.node \ + --${if cfg.collectors.cluster == true then "" else "no-"}collector.cluster \ + --${if cfg.collectors.resources == true then "" else "no-"}collector.resources \ + --${if cfg.collectors.config == true then "" else "no-"}collector.config \ + ${computedConfigFile} \ + ${toString cfg.port} ${cfg.listenAddress} + ''; + } // optionalAttrs (cfg.environmentFile != null) { + EnvironmentFile = cfg.environmentFile; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 036c037e426c..537809600bf6 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -933,6 +933,27 @@ let ''; }; + pve = let + pveExporterEnvFile = pkgs.writeTextFile { + name = "pve.env"; + text = '' + PVE_USER="test_user@pam" + PVE_PASSWORD="hunter3" + PVE_VERIFY_SSL="false" + ''; + }; + in { + exporterConfig = { + enable = true; + environmentFile = pveExporterEnvFile; + }; + exporterTest = '' + wait_for_unit("prometheus-pve-exporter.service") + wait_for_open_port(9221) + wait_until_succeeds("curl localhost:9221") + ''; + }; + py-air-control = { nodeName = "py_air_control"; exporterConfig = { From cd50424dbba12475f0f0f9a79e16857fbe298371 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Mar 2022 05:27:21 +0000 Subject: [PATCH 07/39] monetdb: 11.43.5 -> 11.43.9 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 3f0ed926e4cd..6cc0738454dd 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.43.5"; + version = "11.43.9"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "sha256-Pgh2gqsZnDEOBs2t7PoRWXZ9hSPcGRL0YL4QSP8dLL8="; + sha256 = "sha256-DTpuL5caf4fmJMGq+1L3iyiSkLZYIUnejgJ/4LOk6kQ="; }; postPatch = '' From 7de39727be6922e530a4dfaf263b8b34a2496bdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Mar 2022 05:18:25 +0000 Subject: [PATCH 08/39] esbuild: 0.14.24 -> 0.14.25 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index d6903f464fd2..f7335a8ef8da 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.24"; + version = "0.14.25"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-ayL5aTfYFdsmZ4Zpkij27HE/2MCyt6J5qQ1d0BIX0eE="; + sha256 = "sha256-95xVQU1AWIDvMlWJpB54RxGoOtZtaUlyfmfdcKERe6Y="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; From a63d4457725af58d27a1685fb35caf1ea491f816 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 11:42:33 +0100 Subject: [PATCH 09/39] minidlna: 1.3.0 -> 1.3.1 Prevents DNS rebinding attacks through malicious remote web servers. https://www.openwall.com/lists/oss-security/2022/03/03/1 Fixes: CVE-2022-26505 --- pkgs/tools/networking/minidlna/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index c14b8c68479b..ac4b70184e92 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,20 +1,25 @@ -{ lib, stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: +{ lib, stdenv, fetchgit, autoreconfHook, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: -let version = "1.3.0"; in - -stdenv.mkDerivation { +let pname = "minidlna"; - inherit version; + version = "1.3.1"; +in +stdenv.mkDerivation { + inherit pname version; - src = fetchurl { - url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; - sha256 = "0qrw5ny82p5ybccw4pp9jma8nwl28z927v0j2561m0289imv1na7"; + # tarball for 1.3.1 is missing + src = fetchgit { + url = "https://git.code.sf.net/p/${pname}/git"; + rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-nbvz/QHSZBTZEqX/utOoOF5vorhrxGqIBA9qfpIZzyU="; }; preConfigure = '' export makeFlags="INSTALLPREFIX=$out" ''; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; postInstall = '' From d5633c504fc1e96bfbae4d500e6fe86cc192fa15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 12:53:30 +0100 Subject: [PATCH 10/39] minidlna: add passthrough test --- pkgs/tools/networking/minidlna/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index ac4b70184e92..00cd85a42738 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: +{ lib, stdenv, fetchgit, autoreconfHook, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext, nixosTests }: let pname = "minidlna"; @@ -28,6 +28,8 @@ stdenv.mkDerivation { cp minidlnad.8 $out/share/man/man8 ''; + passthru.tests = { inherit (nixosTests) minidlna; }; + meta = with lib; { description = "Media server software"; longDescription = '' From 97572a798ce24879341bc38ddb8fb5f70509902e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 6 Mar 2022 13:08:19 +0000 Subject: [PATCH 11/39] nixosTests.minidlna: fix by performing requests by IP a little ugly, but minidlna now checks requests Host: header and only accepts requests using an IPv4 address to avoid DNS-rebinding attacks. --- nixos/tests/minidlna.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/minidlna.nix b/nixos/tests/minidlna.nix index d852c7f60bc4..104b79078fd5 100644 --- a/nixos/tests/minidlna.nix +++ b/nixos/tests/minidlna.nix @@ -33,7 +33,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { server.succeed("mkdir -p /tmp/stuff && chown minidlna: /tmp/stuff") server.wait_for_unit("minidlna") server.wait_for_open_port("8200") - server.succeed("curl --fail http://localhost:8200/") - client.succeed("curl --fail http://server:8200/") + # requests must be made *by IP* to avoid triggering minidlna's + # DNS-rebinding protection + server.succeed("curl --fail http://$(getent ahostsv4 localhost | head -n1 | cut -f 1 -d ' '):8200/") + client.succeed("curl --fail http://$(getent ahostsv4 server | head -n1 | cut -f 1 -d ' '):8200/") ''; }) From 53e882ea1443dd9982e3d10d0386f0af26285068 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Mar 2022 20:27:09 +0000 Subject: [PATCH 12/39] python310Packages.cloudsmith-api: 1.30.0 -> 1.33.7 --- pkgs/development/python-modules/cloudsmith-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 517f3b99befd..92e5a71ee80d 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.30.0"; + version = "1.33.7"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-IKxeNAMJTMCpP/jz7lHuetHCpddypgYdCKQcI/9pIj8="; + sha256 = "sha256-KNm2O2kZg+YzjtebsBoL7BOHCuffDELXm2k8vIFtKdk="; }; propagatedBuildInputs = [ From 57acd781a5f636550766d31685a5cbfdb7e82366 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Mar 2022 21:05:01 +0000 Subject: [PATCH 13/39] emacs.pkgs.ebuild-mode: 1.53 -> 1.55 --- .../editors/emacs/elisp-packages/ebuild-mode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix index 3202e5f5ac5f..ad4f20956574 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix @@ -2,11 +2,11 @@ trivialBuild rec { pname = "ebuild-mode"; - version = "1.53"; + version = "1.55"; src = fetchurl { url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; - sha256 = "1l740qp71df9ids0c49kvp942rk8k1rfkg1hyv7ysfns5shk7b9l"; + sha256 = "1bs2s5g79vrbk8544lvp388cdbig0s121kwk0h10hif4kp56ka9w"; }; meta = with lib; { From 872c33b3c178b314860a908503d6643ccc86634d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Mar 2022 13:13:11 +0000 Subject: [PATCH 14/39] qpwgraph: 0.2.0 -> 0.2.2 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index c92e9cf7a46b..860eca652e7a 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-SGx80fMFomNEa/jgH8Yeof+f7zXCDxx3Yqd0GxHZGMw="; + sha256 = "sha256-BBvF1L3IqkYqSghHxcbwOBizdu6GtxaWof3Q/bc+aTY="; }; nativeBuildInputs = [ cmake pkg-config ]; From 705f2d7827b831878bf267dcc78037dcf54666bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Mar 2022 23:06:10 +0000 Subject: [PATCH 15/39] vintagestory: 1.16.3 -> 1.16.4 --- pkgs/games/vintagestory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index a14e80759b53..e6e7d28e17bd 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-PpvTHG/EBKBhtlgIrAz/B+U1aHbZURN2cWTlZ/DkZQs="; + sha256 = "sha256-wdwQ1Dv0872nEOYIB+rEzYtG5rnSw8DZgoSlSvCvtrI="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; From 1ad945f64541fb3773bbd3ff11b163a6c97f0467 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Tue, 8 Mar 2022 14:38:28 +0000 Subject: [PATCH 16/39] libbladeRF: 2.2.1 -> 2.4.1 --- pkgs/development/libraries/libbladeRF/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index e8b550e06c2a..08cba497fc9d 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -10,24 +10,15 @@ let }; in stdenv.mkDerivation rec { pname = "libbladeRF"; - version = "2.2.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; + sha256 = "05axh51lrzxpz2qfswnjwxpfk3mlsv2wc88dd12gfr1karn5jwz9"; }; - # This patch is required for version 2.2.1. As the patch is already part of - # upstream master, it will be incorporated into the next release. The patch - # fixes a (well-justified) compiler warning which breaks the build because - # we compile with -Werror. - patches = [ (fetchpatch { - url = "https://github.com/Nuand/bladeRF/commit/163425d48a3b7d8c100d7295220d3648c050d0dd.patch"; - sha256 = "1swsymlyxm3yk2k8l71z1fv0a5k2rmab02f0c7xkrvk683mq6yxw"; - }) ]; - nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 buildInputs = [ tecla libusb1 ] From 27abcbf8df2ffce07d34c87b237293f8993ad7b8 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 8 Mar 2022 19:02:28 +0000 Subject: [PATCH 17/39] syft: 0.40.1 -> 0.41.1 --- pkgs/tools/admin/syft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 5fc640440ed3..d4d5ee7348b7 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.40.1"; + version = "0.41.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4HXAMhX77ISfEpjJWcgj+g9VV0TNMM7lMuoih0NDFJs="; + sha256 = "sha256-6ltEC9LCuE4Rj4TlBwsDI45L92XMuCbEuMDkOk8OkZo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-yPTjKYtAAx8bijTVA2WEGcb8wGzqRcZH69n3LlVqDD0="; + vendorSha256 = "sha256-13PcAQlHPaQ1n7OiRSEW5H3rDXgUAmKAQGqQM31iyR8="; nativeBuildInputs = [ installShellFiles ]; From 72fe5bcb633714b9a0f756cbd435891469539741 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 9 Mar 2022 10:10:03 +0300 Subject: [PATCH 18/39] =?UTF-8?q?miniflux:=202.0.35=20=E2=86=92=202.0.36?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/miniflux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 57a554ff5813..fa1133b7d53d 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.35"; + version = "2.0.36"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-tOainlvEB0O6yMzIm0df4r8D68swtjXBFUDsPcNc3uA="; + sha256 = "sha256-Ly4Ep+ZyjEb1ywXO/W1P1ZDvqSAtJY4wuE8n9jbbeuU="; }; - vendorSha256 = "sha256-dxtQAGlNOVO9NtuGbF6Nifa4QhnFGyHKhlDS3+V5HuM="; + vendorSha256 = "sha256-ZEIQeN7t9Az1W6T2Z+ZKHqs2O8UNNMl0nANM1mVyiTA="; nativeBuildInputs = [ installShellFiles ]; From a335d1ba1ca3ece3f7caeaa8b49b50f4655bb5b1 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Wed, 9 Mar 2022 09:35:42 +0100 Subject: [PATCH 19/39] metals: 0.11.1 -> 0.11.2 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 3d4eb2c7788f..a4fd0ee23380 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.1"; + version = "0.11.2"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-wYIuRTvkPqS4SE5RnkBgmLCwmNv+cYB/iPb9TYip9s0="; + outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U="; }; nativeBuildInputs = [ makeWrapper ]; From 291dcf35ae4144112682eab13bb40f88767919cd Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 9 Mar 2022 11:11:28 +0100 Subject: [PATCH 20/39] tor-browser-bundle-bin: 11.0.6 -> 11.0.7 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 427f6bcdc9a4..5c17bf67a0fc 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.6"; + version = "11.0.7"; lang = "en-US"; @@ -97,7 +97,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "03c3l720x4c6mfq56fyqspc5sxw0mz1ph48l5wph06dzw8wd5cfz"; + sha256 = "197yf0abcb98kqds0xvki0b52rlhzyzdc98zmhrn7y8gmahc84cz"; }; i686-linux = fetchurl { @@ -105,7 +105,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0llg1nl7x7y4kp0hr3bbhdfggaf8praizkvcpp88x2i2zc9sp5mx"; + sha256 = "0yylfsgmnfn6zww0r6kp1d1wmmb0lfa4lqwkgr7d8rzi6q9spmqk"; }; }; in From 480d05bd08584fb9cd40ab3a2b28e38f9a481400 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 12:06:19 +0000 Subject: [PATCH 21/39] python310Packages.somajo: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index e332d0defd73..a03052c7e429 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "v${version}"; - sha256 = "0ywdh1pfk0pgm64p97i9cwz0h9wggbp4shxp5l7kkqs2n2v5c6qg"; + sha256 = "sha256-M0WtONhsqmmK0PBB+Df4YrFpT+vfVidDkt80eBHOo04="; }; propagatedBuildInputs = [ From e620f19a08b77d7a386ee05b69f5598f4ae613aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Mar 2022 23:15:24 +0000 Subject: [PATCH 22/39] python310Packages.cvxpy: 1.1.18 -> 1.2.0 --- pkgs/development/python-modules/cvxpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 79ed1ebac5f2..73609966ba84 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.18"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W67+Hy7Wk3dJspNYbGzk9C7TDniQIj92Ycyyu333C+8="; + sha256 = "sha256-QURm/ehJovqr/ZRE7ILKLnvxQsAdcjdSTPlzCt60IBw="; }; propagatedBuildInputs = [ From 709f12b9dc53e141e9b47c5e22d4e4f229955cf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 02:27:48 +0000 Subject: [PATCH 23/39] python310Packages.rich-rst: 1.1.5 -> 1.1.7 --- pkgs/development/python-modules/rich-rst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix index 6bb1fa39647d..4c543febb813 100644 --- a/pkgs/development/python-modules/rich-rst/default.nix +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rich-rst"; - version = "1.1.5"; + version = "1.1.7"; format = "pyproject"; src = fetchFromGitHub { owner = "wasi-master"; repo = pname; rev = "v${version}"; - sha256 = "0g1whhw07jgy46a1x85pd23gs356j1cc229wqf5j3x4r11kin6i5"; + sha256 = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; }; propagatedBuildInputs = [ docutils rich ]; From eeab10bd54e2f6a25c27059290e7e7f2b3fd1cf0 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 10 Mar 2022 15:29:58 +0100 Subject: [PATCH 24/39] nixVersions.nix_2_7: Propagate nlohmann_json Just like upstream: https://github.com/NixOS/nix/blob/2.7.0/flake.nix#L136 --- pkgs/tools/package-management/nix/common.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 55d2e0b54059..2161ea3c309f 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -101,15 +101,17 @@ stdenv.mkDerivation { lowdown ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ libcpuid - ] ++ lib.optional (atLeast27) [ - nlohmann_json ] ++ lib.optionals withLibseccomp [ libseccomp ] ++ lib.optionals withAWS [ aws-sdk-cpp ]; - propagatedBuildInputs = [ boehmgc ]; + propagatedBuildInputs = [ + boehmgc + ] ++ lib.optional (atLeast27) [ + nlohmann_json + ]; NIX_LDFLAGS = lib.optionals (!atLeast24) [ # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba From 5f531579af5894c5bbb89edb78a0d6931de66e4e Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Sun, 16 Jan 2022 00:23:11 +0900 Subject: [PATCH 25/39] nwg-drawer: 0.1.11 -> 0.2.8 --- pkgs/applications/misc/nwg-drawer/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index b822a7ed117d..1aa4a3660c2e 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -1,29 +1,43 @@ { lib , buildGoModule , fetchFromGitHub -, pkg-config , cairo , gobject-introspection , gtk3 , gtk-layer-shell -}: +, pkg-config +, wrapGAppsHook +, xdg-utils }: buildGoModule rec { pname = "nwg-drawer"; - version = "0.1.11"; + version = "0.2.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aUn9zvlNUuvm7Uo0wyzbkSLXfUDcKn1uxAu3pVwq0FA="; + sha256 = "sha256-YhCMOktfsSb7GrKA8reZb+QHcNS/Lpd0hCaPqnWvL7w="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; - - nativeBuildInputs = [ pkg-config ]; + vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + + doCheck = false; + + preInstall = '' + mkdir -p $out/share/nwg-drawer + cp -r desktop-directories drawer.css $out/share/nwg-drawer + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${xdg-utils}/bin + --prefix XDG_DATA_DIRS : $out/share + ) + ''; meta = with lib; { description = "Application drawer for sway Wayland compositor"; From 31fc2697bb75fb03d57681fd22539cd89786d616 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 18:03:21 +0000 Subject: [PATCH 26/39] python310Packages.jupyterlab: 3.3.0 -> 3.3.1 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 90c99c16b1a4..c000bb050d89 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x6GZe+v1SH+MF1h/UZA5ElAU0SLN1dYL7/rUsmbaMw8="; + sha256 = "sha256-zkgnmTeccKqH5jtZ4sU3l3nOGGWLkkYM0gu0QVSGWXM="; }; nativeBuildInputs = [ From 8dadd2047397b83084b98d2f5f432456ad91a1d7 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 10 Mar 2022 13:53:24 -0500 Subject: [PATCH 27/39] alejandra: 1.0.0 -> 1.1.0 --- pkgs/tools/nix/alejandra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index ac841502552a..15d232dbfbba 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-fJ/WHSU45bMJRDqz9yA3B2lwXtW5DKooU+Pzn13GyZI="; + sha256 = "sha256-vkFKYnSmhPPXtc3AH7iRtqRRqxhj0o5WySqPT+klDWU="; }; - cargoSha256 = "sha256-mIcTgpWI5iuMH03EsZalmAxjpme+bsIJU7kW9PavHEM="; + cargoSha256 = "sha256-MsXaanznE4UtZMj54EDq86aJ2t4xT8O5ziTpa/KCwBw="; passthru.tests = { version = testVersion { package = alejandra; }; From 161c11f5fed44b4f334010aac283990c259fd3c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 19:23:08 +0000 Subject: [PATCH 28/39] python310Packages.types-paramiko: 2.8.13 -> 2.8.16 --- pkgs/development/python-modules/types-paramiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix index 6f7916521711..f43fc5ed507b 100644 --- a/pkgs/development/python-modules/types-paramiko/default.nix +++ b/pkgs/development/python-modules/types-paramiko/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "types-paramiko"; - version = "2.8.13"; + version = "2.8.16"; src = fetchPypi { inherit pname version; - sha256 = "0xk5xqhfl3xmzrnzb17c5hj5zbh7fpyfyj35zjma32iivfkqd8lp"; + sha256 = "sha256-HWkCWoa5509G2OHyPFijb5RVORAvE1tQEgL7myxP0SI="; }; pythonImportsCheck = [ From 5befd4f04660917278b2261a1ddfba77efe36e06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 20:06:37 +0000 Subject: [PATCH 29/39] python310Packages.types-cryptography: 3.3.15 -> 3.3.18 --- .../development/python-modules/types-cryptography/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-cryptography/default.nix b/pkgs/development/python-modules/types-cryptography/default.nix index 495a8d8c46d0..dd68bfddef7b 100644 --- a/pkgs/development/python-modules/types-cryptography/default.nix +++ b/pkgs/development/python-modules/types-cryptography/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "types-cryptography"; - version = "3.3.15"; + version = "3.3.18"; src = fetchPypi { inherit pname version; - sha256 = "0fr70phvg3zc4h41mv48g04x3f20y478y01ji3w1i2mqlxskm657"; + sha256 = "sha256-RI/q+a4xImFJvGvOHPj/9U2mYe8Eg398DDFoKYhcNig="; }; pythonImportsCheck = [ From ab25306b60d775875d9540708e2fc66099304f09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 20:32:04 +0000 Subject: [PATCH 30/39] sfeed: 1.2 -> 1.3 --- pkgs/tools/misc/sfeed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 85bc57d3556d..c85b884c50d3 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "1.2"; + version = "1.3"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-cx+mIVrY9tB5k1YnAHkpGahXVG6S+JBshJKkzEbcKZI="; + sha256 = "sha256-XOBzvVOOv84LzFNiLOnmJWm552igGLNFB2i3eMeWaW8="; }; buildInputs = [ ncurses ]; From 836bfe371d78167791f1257e6b0b99e954f28965 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 10 Mar 2022 21:46:47 +0100 Subject: [PATCH 31/39] disnix: 0.10.1 -> 0.10.2 --- pkgs/tools/package-management/disnix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 0e22a24c0995..dedb57960b35 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "disnix"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-${version}/disnix-${version}.tar.gz"; - sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq"; + url = "https://github.com/svanderburg/disnix/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "0mc0wy8fca60w0d56cljq2cw1xigbp2dklb43fxa5xph94j3i49a"; }; nativeBuildInputs = [ pkg-config ]; From edbf04d5b2693c3114fc927b86634014b498a781 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 10 Mar 2022 21:47:07 +0100 Subject: [PATCH 32/39] disnixos: 0.9.1 -> 0.9.2 --- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 639d19782106..35541fa36ac5 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "disnixos"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-${version}/disnixos-${version}.tar.gz"; - sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b"; + url = "https://github.com/svanderburg/disnixos/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "0zcghb9nm911bfwpzcgj4ga2cndxbzp5pmrxff711qydrwgy7sg7"; }; nativeBuildInputs = [ pkg-config ]; From 916c7c1b4fb7af702cd86ac27662d3b3e968ef61 Mon Sep 17 00:00:00 2001 From: SuperSamus <40663462+SuperSamus@users.noreply.github.com> Date: Thu, 10 Mar 2022 22:12:16 +0100 Subject: [PATCH 33/39] melonDS: 0.9.3 -> 0.9.4 (#163600) --- pkgs/applications/emulators/melonDS/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 3e30be8c2a3f..6e389b8daf64 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "melonDS"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "1v8a060gbpx7rdkk2w4hym361l2wip7yjjn8wny1gfsa273k3zy5"; + sha256 = "sha256-FSacau7DixU6R4eKNIYVRZiMb/GhijTzHbcGlZ6WG/I="; }; nativeBuildInputs = [ cmake pkg-config ]; From b10a88ae4a335f3add552d1356ff8aedd6099a8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Mar 2022 16:02:53 +0000 Subject: [PATCH 34/39] sqlcipher: 4.5.0 -> 4.5.1 --- pkgs/development/libraries/sqlcipher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 353347215663..13714b4825cf 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "sha256-MFuFyKvOOrDrq9cDPQlNK6/YHSkaRX4qbw/44m5CRh4="; + sha256 = "sha256-cvbR3tav6DjIdJB/x2q5Oq7ju9q63z75b6q1uHYY9bE="; }; nativeBuildInputs = [ installShellFiles tcl ]; From fc1d03c30239e281bb61886e186b7f6a760337ae Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Thu, 10 Mar 2022 22:26:36 +0100 Subject: [PATCH 35/39] snes9x-gtk: 1.60 -> 1.61 --- pkgs/applications/emulators/snes9x-gtk/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix index 27f3400cc0b1..ff7df4b09440 100644 --- a/pkgs/applications/emulators/snes9x-gtk/default.nix +++ b/pkgs/applications/emulators/snes9x-gtk/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook -, SDL2, zlib, gtk3, libxml2, libXv, libepoxy, minizip, pulseaudio, portaudio }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook, alsa-lib +, SDL2, zlib, gtkmm3, libXv, libepoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; - version = "1.60"; + version = "1.61"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; + fetchSubmodules = true; + sha256 = "1kay7aj30x0vn8rkylspdycydrzsc0aidjbs0dd238hr5hid723b"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv libepoxy minizip pulseaudio portaudio ]; + buildInputs = [ alsa-lib SDL2 zlib gtkmm3 libXv libepoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { # see https://github.com/snes9xgit/snes9x/blob/master/LICENSE for exact details license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ qknight ]; + maintainers = with maintainers; [ qknight xfix ]; platforms = platforms.linux; }; } From 335c0e5a4b9a1114c0ed1210f666c8a0ed1b4bb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 16:06:47 +0000 Subject: [PATCH 36/39] qtox: 1.17.4 -> 1.17.5 --- .../networking/instant-messengers/qtox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index b264608f5100..e315938c5719 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "qtox"; - version = "1.17.4"; + version = "1.17.5"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "sha256-j1aAry4wjb4RResdu8PQzyVazvVxnxvZMoC59sO0frw="; + sha256 = "sha256-H3qFEw/TkzOxEXtZs0k89wWMnhrOkF7VapUKtCUhGns="; }; buildInputs = [ From 420535ffa35c3a22f9cbcb42e21004e5a0f82287 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 13:51:30 +0000 Subject: [PATCH 37/39] python310Packages.sendgrid: 6.9.6 -> 6.9.7 --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index c9b6d7c96808..aab6ab049da5 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.6"; + version = "6.9.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-6MkAtkbKVoa8UatG92RzbCdAM+WsQN2WnOIh4pRoUVk="; + sha256 = "sha256-Lx84jmgJz/J5MJtJyqDTVIbN6H63gD2rkJrdNeojd08="; }; propagatedBuildInputs = [ From fab5361a6204a95cec5facbadedae834bb552af6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 11:59:16 +0000 Subject: [PATCH 38/39] python39Packages.pyparted: 3.11.7 -> 3.12.0 --- pkgs/development/python-modules/pyparted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index ee34f91b57e2..1c054defbef3 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyparted"; - version = "3.11.7"; + version = "3.12.0"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; rev = "v${version}"; - sha256 = "01193fmkss9icjvqpw85szpk8ld1pnha7p9kqm7mpwk6rc6gi2m3"; + sha256 = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; }; postPatch = '' From c2699c59f7a9e30022de93b739373a89e415456c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Mar 2022 12:54:10 +0000 Subject: [PATCH 39/39] python310Packages.homeconnect: 0.6.3 -> 0.7.0 --- pkgs/development/python-modules/homeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index 98aab26ffac8..b6fca4201ad7 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.6.3"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn"; + sha256 = "sha256-/h0dEVmP0R9tVt56mvu72Ksrvnuox1FA7BgrZMOhV6Q="; }; propagatedBuildInputs = [