From 3410ab90606228b3e343f49a5df7c9d3f83b593d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Feb 2022 20:38:33 +0000 Subject: [PATCH 01/53] birdfont: 2.29.6 -> 2.30.0 --- pkgs/tools/misc/birdfont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index a6c2ca77c5a7..3ee53c0f5929 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.6"; + version = "2.30.0"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-INHLH3wv1Rr3RLECAN2CQvctIjWdksxdfVfBkWnx+Is="; + sha256 = "sha256-aIhJXmzLY2Sw9mFe2AmLkXb+YRnFu1pMnFeDF+zfHRE="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ]; From 8687a92b102146911c7916920da5a11027a16cee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 18:07:07 +0000 Subject: [PATCH 02/53] praat: 6.2.07 -> 6.2.09 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 3ecfde7819fa..b4f450b31016 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.07"; + version = "6.2.09"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-MM8uC1+d1P7aZI460fCcHWtE7+xfJV1ZFj2cdp/b1rY="; + sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA="; }; configurePhase = '' From b7feb5361f2790df538ab5bd598a11e8de0a2857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Feb 2022 08:55:11 +0000 Subject: [PATCH 03/53] leo-editor: 6.5 -> 6.6-b2 --- pkgs/applications/editors/leo-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index ee22c591ad77..bf5083c1e889 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.5"; + version = "6.6-b2"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU="; + sha256 = "sha256-oUOsAYcxknG+bao76bzPhStO1m08pMWTEEiG2rLkklA="; }; dontBuild = true; From a5396c031be3a862e53e65b253108eba8c17e8a6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 28 Feb 2022 02:16:36 -0500 Subject: [PATCH 04/53] rebazel: fix darwin build --- pkgs/development/tools/rebazel/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix index 5dee0a1b9e86..c28701f96a21 100644 --- a/pkgs/development/tools/rebazel/default.nix +++ b/pkgs/development/tools/rebazel/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }: + rustPlatform.buildRustPackage rec { pname = "rebazel"; version = "0.1.4"; @@ -12,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + meta = with lib; { description = "tool for expediting bazel build workflows"; homepage = "https://github.com/meetup/rebazel"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a29312d19b3d..2ccd6c599e28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14416,7 +14416,9 @@ with pkgs; bazelisk = callPackage ../development/tools/bazelisk { }; - rebazel = callPackage ../development/tools/rebazel { }; + rebazel = callPackage ../development/tools/rebazel { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; From 6e4f5f9aeed9403a5f7a35d65f2dc816e34e754d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 28 Feb 2022 13:37:47 +0100 Subject: [PATCH 05/53] nixos/redis: bind on localhost by default --- nixos/modules/services/databases/redis.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index e0269a962fdd..a1bd73c9e371 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -81,7 +81,9 @@ in { user = mkOption { type = types.str; default = redisName name; - defaultText = "\"redis\" or \"redis-\${name}\" if name != \"\""; + defaultText = literalExpression '' + if name == "" then "redis" else "redis-''${name}" + ''; description = "The username and groupname for redis-server."; }; @@ -105,8 +107,7 @@ in { bind = mkOption { type = with types; nullOr str; - default = if name == "" then "127.0.0.1" else null; - defaultText = literalExpression ''if name == "" then "127.0.0.1" else null''; + default = "127.0.0.1"; description = '' The IP interface to bind to. null means "all interfaces". @@ -117,7 +118,9 @@ in { unixSocket = mkOption { type = with types; nullOr path; default = "/run/${redisName name}/redis.sock"; - defaultText = "\"/run/redis/redis.sock\" or \"/run/redis-\${name}/redis.sock\" if name != \"\""; + defaultText = literalExpression '' + if name == "" then "/run/redis/redis.sock" else "/run/redis-''${name}/redis.sock" + ''; description = "The path to the socket to bind to."; }; @@ -370,7 +373,7 @@ in { ProtectKernelTunables = true; ProtectControlGroups = true; RestrictAddressFamilies = - optionals (conf.bind != null) ["AF_INET" "AF_INET6"] ++ + optionals (conf.port != 0) ["AF_INET" "AF_INET6"] ++ optional (conf.unixSocket != null) "AF_UNIX"; RestrictNamespaces = true; LockPersonality = true; From 3c778d442db3fe669fbb0f3dcf44fa098096ed06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 19:07:32 +0000 Subject: [PATCH 06/53] x11docker: 7.1.0 -> 7.1.1 --- pkgs/applications/virtualization/x11docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 6ac7377122de..67345952655c 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-SBX50wQbNUvgmnO0B0iXiEXEmJrkVmtNqUUv0O6yRic="; + sha256 = "sha256-SUHWqcDL/oDljCpngkhUvzOvMIlZSc1p0j0wjupPBqw="; }; nativeBuildInputs = [ makeWrapper ]; From 8aaa0699db4ecbae35314144cbef1d95bf2c61ed Mon Sep 17 00:00:00 2001 From: ngerstle Date: Mon, 16 Aug 2021 23:34:10 +0200 Subject: [PATCH 07/53] k3s: enable enableUnifiedCgroupHierarchy --- nixos/modules/services/cluster/k3s/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 50b6780bbe66..7bda11afedfb 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -91,11 +91,6 @@ in virtualisation.docker = mkIf cfg.docker { enable = mkDefault true; }; - - # TODO: disable this once k3s supports cgroupsv2, either by docker - # supporting it, or their bundled containerd - systemd.enableUnifiedCgroupHierarchy = false; - environment.systemPackages = [ config.services.k3s.package ]; systemd.services.k3s = { From 7ef1ede3544f3a78e44420298b8105d1b435053c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Mar 2022 12:30:28 +0000 Subject: [PATCH 08/53] avocode: 4.15.5 -> 4.15.6 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 55080f333c23..4d2db993b8d1 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.15.5"; + version = "4.15.6"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-vPS2hTaWjundVjtguy/1eH1qBaipN2Ij8PQODka+IGg="; + sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0="; }; libPath = lib.makeLibraryPath (with xorg; [ From 5a6b36e498bbc5de5be9a5b85f66f31b6beaaf82 Mon Sep 17 00:00:00 2001 From: tim-tx Date: Sat, 5 Mar 2022 11:41:31 -0500 Subject: [PATCH 09/53] dendrite: 0.5.1 -> 0.6.5 --- .../from_md/release-notes/rl-2205.section.xml | 12 +++ .../manual/release-notes/rl-2205.section.md | 8 ++ nixos/modules/services/misc/dendrite.nix | 94 +++++++++++++++++++ pkgs/servers/dendrite/default.nix | 6 +- 4 files changed, 117 insertions(+), 3 deletions(-) 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 4f4a5a3394e6..f6b42c38655a 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 @@ -752,6 +752,18 @@ directly. + + + The dendrite package has been upgraded from + 0.5.1 to + 0.6.5. + Instances configured with split sqlite databases, which has + been the default in NixOS, require merging of the federation + sender and signing key databases. See upstream + release + notes on version 0.6.0 for details on database changes. + + The existing pkgs.opentelemetry-collector diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index c4281561f165..9dc751c58395 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -289,6 +289,14 @@ In addition to numerous new and upgraded packages, this release has the followin This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly. +- The `dendrite` package has been upgraded from 0.5.1 to + [0.6.5](https://github.com/matrix-org/dendrite/releases/tag/v0.6.5). Instances + configured with split sqlite databases, which has been the default + in NixOS, require merging of the federation sender and signing key + databases. See upstream [release + notes](https://github.com/matrix-org/dendrite/releases/tag/v0.6.0) + on version 0.6.0 for details on database changes. + - The existing `pkgs.opentelemetry-collector` has been moved to `pkgs.opentelemetry-collector-contrib` to match the actual source being the "contrib" edition. `pkgs.opentelemetry-collector` is now the actual core diff --git a/nixos/modules/services/misc/dendrite.nix b/nixos/modules/services/misc/dendrite.nix index c967fc3a362a..b2885b094153 100644 --- a/nixos/modules/services/misc/dendrite.nix +++ b/nixos/modules/services/misc/dendrite.nix @@ -110,6 +110,15 @@ in ''; }; }; + options.app_service_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:federationapi.db"; + description = '' + Database for the Appservice API. + ''; + }; + }; options.client_api = { registration_disabled = lib.mkOption { type = lib.types.bool; @@ -120,6 +129,91 @@ in ''; }; }; + options.federation_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:federationapi.db"; + description = '' + Database for the Federation API. + ''; + }; + }; + options.key_server.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:keyserver.db"; + description = '' + Database for the Key Server (for end-to-end encryption). + ''; + }; + }; + options.media_api = { + database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:mediaapi.db"; + description = '' + Database for the Media API. + ''; + }; + }; + base_path = lib.mkOption { + type = lib.types.str; + default = "${workingDir}/media_store"; + description = '' + Storage path for uploaded media. + ''; + }; + }; + options.room_server.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:roomserver.db"; + description = '' + Database for the Room Server. + ''; + }; + }; + options.sync_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:syncserver.db"; + description = '' + Database for the Sync API. + ''; + }; + }; + options.user_api = { + account_database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:userapi_accounts.db"; + description = '' + Database for the User API, accounts. + ''; + }; + }; + device_database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:userapi_devices.db"; + description = '' + Database for the User API, devices. + ''; + }; + }; + }; + options.mscs = { + database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:mscs.db"; + description = '' + Database for exerimental MSC's. + ''; + }; + }; + }; }; default = { }; description = '' diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 3d92b2cd4bac..b1c0f1424d9f 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.5.1"; + version = "0.6.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "1HCVWSxXOR2syN+dLDSvrNzYHTj/vXZRHkXhU0f3m1k="; + sha256 = "jSn2awZsfsniSOTNkaEdQw/sZm7nUfiMntsxigy/51Y="; }; - vendorSha256 = "sha256-RqEt0RAsKWKy6NvMzulqY56nZ7fIxgJkgN/WpEZ3F2I="; + vendorSha256 = "sha256-B4d3FGXy8TrED3oikTjETQso/AtEfIWWcdY6FykD/8A="; passthru.tests = { inherit (nixosTests) dendrite; From be7ebd802af54db41975c80a8ba88b184aa6bf85 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 4 Mar 2022 18:50:13 +0100 Subject: [PATCH 10/53] talosctl: 0.14.2 -> 0.14.3 --- .../networking/cluster/talosctl/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 8613abd99470..374d9c972c7c 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: let # look for GO_LDFLAGS getting set in the Makefile - version = "0.14.2"; - sha256 = "sha256-sQtry94T5cDO+836D/p/8ptQi3WYKDBLr1QZyEXdLQI="; - vendorSha256 = "sha256-cd2iNMxWmkSWqqkPLYocUG+fCUXoeUXEuGQxjUWQnXk="; - pkgsVersion = "0.9.0-4-gc875fbe"; - extrasVersion = "0.7.0-2-gb4c9d21"; + version = "0.14.3"; + sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU="; + vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk="; + pkgsVersion = "v0.9.0-6-gbfcc795"; + extrasVersion = "v0.7.0-2-gb4c9d21"; in buildGoModule rec { pname = "talosctl"; @@ -29,8 +29,8 @@ buildGoModule rec { "-X ${versionPkg}.Name=Talos" "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do "-X ${versionPkg}.Tag=${src.rev}" - "-X ${versionPkg}.PkgsVersion=v${pkgsVersion}" # PKGS - "-X ${versionPkg}.ExtrasVersion=v${extrasVersion}" # EXTRAS + "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS + "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS "-X ${imagesPkgs}.Username=talos-systems" # USERNAME "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS From e6d1c597f137ee8a4439d7d9c3d24e22b86eb03c Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sat, 5 Mar 2022 00:43:47 -0800 Subject: [PATCH 11/53] nixos/k3s: use the systemd driver for docker + unified cgroups This is necessary for it to work at all. The single-node-docker test will fail without this change. Also add a release note for it. --- .../from_md/release-notes/rl-2205.section.xml | 14 ++++++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 4 ++++ nixos/modules/services/cluster/k3s/default.nix | 1 + 3 files changed, 19 insertions(+) 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 2bcfc86b432b..33cc929b466f 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 @@ -364,6 +364,20 @@ relying on the insecure behaviour before upgrading. + + + services.k3s.enable no longer implies + systemd.enableUnifiedCgroupHierarchy = false, + and will default to the systemd cgroup driver + when using services.k3s.docker = true. This + change may require a reboot to take effect, and k3s may not be + able to run if the boot cgroup hierarchy does not match its + configuration. The previous behavior may be retained by + explicitly setting + systemd.enableUnifiedCgroupHierarchy = false + in your configuration. + + The DHCP server (services.dhcpd4, diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 650ace8d9d2a..b5d5574a9889 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -121,6 +121,10 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading. +- `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`. + This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration. + The previous behavior may be retained by explicitly setting `systemd.enableUnifiedCgroupHierarchy = false` in your configuration. + - The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened. The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities. The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed. diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 7bda11afedfb..3a36cfa3f37b 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -114,6 +114,7 @@ in [ "${cfg.package}/bin/k3s ${cfg.role}" ] ++ (optional cfg.docker "--docker") + ++ (optional (cfg.docker && config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd") ++ (optional cfg.disableAgent "--disable-agent") ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") ++ (optional (cfg.token != "") "--token ${cfg.token}") From fc6e238e3a1c70af6d1b4eefb569d503d93cb981 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Mar 2022 15:03:34 +0100 Subject: [PATCH 12/53] authz0: init at 1.1.1 --- pkgs/tools/security/authz0/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/security/authz0/default.nix diff --git a/pkgs/tools/security/authz0/default.nix b/pkgs/tools/security/authz0/default.nix new file mode 100644 index 000000000000..850e6321300c --- /dev/null +++ b/pkgs/tools/security/authz0/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "authz0"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "hahwul"; + repo = pname; + rev = "v${version}"; + hash = "sha256-8WtvUeHP7fJ1/G+UB1QLCSSNx7XA+vREcwJxoMeQsgM="; + }; + + vendorSha256 = "sha256-EQhvHu/LXZtVQ+MzjB96K0MUM4THiRDe1FkAATfGhdw="; + + meta = with lib; { + description = "Automated authorization test tool"; + homepage = "https://github.com/hahwul/authz0"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 575ca2a4c020..b394bfc5cf78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -208,8 +208,11 @@ with pkgs; appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; + authy = callPackage ../applications/misc/authy { }; + authz0 = callPackage ../tools/security/authz0 { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; From 278dcf832422a0e895808707a217e335afd6506c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Mar 2022 15:28:32 +0100 Subject: [PATCH 13/53] python3Packages.losant-rest: 1.15.2 -> 1.16.0 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 83ff792a62a3..6dac34a9f7a8 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.15.2"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-JmLQ3Hj9WnL/XfMxDiVAizGFASWMwF36ohp8asErUMM="; + sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo="; }; propagatedBuildInputs = [ From 6a5c5dc19a8c7e88618836051511d3a21068881d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 15:16:41 +0000 Subject: [PATCH 14/53] seqouia: 0.25.0 -> 0.26.0 --- pkgs/tools/security/sequoia/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 18db48dfb249..324af6aa4c99 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -25,16 +25,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia"; # Upstream has separate version numbering for the library and the CLI frontend. # This derivation provides the CLI frontend, and thus uses its version number. - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; rev = "sq/v${version}"; - sha256 = "13f582g10vba0cpbdmqkkfzgd5jgagb640jaz1w425wf5nbh6q50"; + sha256 = "1rcbv1s7wpxhrzw082q6vfrq1ja2ssfxn53c90h8fh5wrj7ns751"; }; - cargoSha256 = "sha256-qIGP48uj2iQ6MVgy5anKI9QrX9vnuKh46Fmmcczda4w="; + cargoSha256 = "0f3b8rh4pl03n8j9ihazaak214sv1rsksbgrb1nfcy8sq2yqfj4g"; nativeBuildInputs = [ pkg-config @@ -77,15 +77,6 @@ rustPlatform.buildRustPackage rec { # Sometimes, tests fail on CI (ofborg) & hydra without this CARGO_TEST_ARGS = "--workspace --exclude sequoia-store"; - # Without this, the examples won't build - postPatch = '' - substituteInPlace openpgp-ffi/examples/Makefile \ - --replace '-O0 -g -Wall -Werror' '-g' - substituteInPlace ffi/examples/Makefile \ - --replace '-O0 -g -Wall -Werror' '-g' - ''; - - preInstall = lib.optionalString pythonSupport '' export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" '' + lib.optionalString (!pythonSupport) '' From 7edc60c31eb2f80f7f293de40983d11793626451 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Mar 2022 16:49:44 +0100 Subject: [PATCH 15/53] python3Packages.pycep-parser: init at 0.3.1 --- .../python-modules/pycep-parser/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/pycep-parser/default.nix diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix new file mode 100644 index 000000000000..f286e6b45bdb --- /dev/null +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -0,0 +1,58 @@ +{ lib +, assertpy +, buildPythonPackage +, fetchFromGitHub +, lark +, poetry-core +, pytestCheckHook +, pythonOlder +, regex +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pycep-parser"; + version = "0.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gruebel"; + repo = "pycep"; + rev = version; + hash = "sha256-S4jBqMgyreWrEp1SuR8J5RVFc+i1O0xbfgux1UvFP5k="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + lark + regex + typing-extensions + ]; + + checkInputs = [ + assertpy + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.3.1-alpha.1"' 'version = "${version}"' \ + --replace 'regex = "^2022.3.2"' 'regex = "*"' + ''; + + pythonImportsCheck = [ + "pycep" + ]; + + meta = with lib; { + description = "Python based Bicep parser"; + homepage = "https://github.com/gruebel/pycep"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b72a6fb062d9..396a5d3733b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6717,6 +6717,8 @@ in { pycec = callPackage ../development/python-modules/pycec { }; + pycep-parser = callPackage ../development/python-modules/pycep-parser { }; + pycfdns = callPackage ../development/python-modules/pycfdns { }; pycflow2dot = callPackage ../development/python-modules/pycflow2dot { From 8e20e96aecf6c9db769ee2fb79dcac0ba3370eb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Mar 2022 16:56:53 +0100 Subject: [PATCH 16/53] python3Packages.bc-python-hcl2: 0.3.30 -> 0.3.33 --- .../python-modules/bc-python-hcl2/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 42203a43da46..78529e288ca2 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -1,33 +1,21 @@ { lib , buildPythonPackage , fetchPypi +, lark , nose , pythonOlder }: -let - lark-parser = buildPythonPackage rec { - pname = "lark-parser"; - version = "0.10.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "15jr4c1falvgkq664xdgamykk6waklh1psy8v3wlrg0v59hngws2"; - }; - - doCheck = true; - }; -in buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.30"; + version = "0.3.33"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs="; + hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY="; }; # Nose is required during build process, so can not use `checkInputs`. @@ -36,7 +24,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - lark-parser + lark ]; # This fork of python-hcl2 doesn't ship tests From b5248a72d43def2286f9b1ffd7e714c60b90f445 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 7 Mar 2022 17:11:50 +0100 Subject: [PATCH 17/53] checkov: 2.0.918 -> 2.0.921 --- pkgs/development/tools/analysis/checkov/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 8117b9ac0495..c6fd90506d94 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.918"; + version = "2.0.921"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-8nhz32ugnheBH1W3YKKmjRvjjx4WcpSyLwBS0STvsPM="; + hash = "sha256-Bl9zwJGyZN5vJVpy63GeaCQ+4X0dYMTAV4FtT96L42U="; }; nativeBuildInputs = with py.pkgs; [ @@ -71,6 +71,7 @@ buildPythonApplication rec { packaging policyuniverse prettytable + pycep-parser pyyaml semantic-version tabulate From 34b5dd453b13c2c09334e3def42416b5b2442a0a Mon Sep 17 00:00:00 2001 From: Ryan Gibb Date: Mon, 7 Mar 2022 16:29:00 +0000 Subject: [PATCH 18/53] nixos/zsh-autosuggestions: ZSH_AUTOSUGGEST_STRATEGY array zsh-autosuggestions supports having fallback strategies expressed through the ZSH_AUTOSUGGEST_STRATEGY array. For example, `ZSH_AUTOSUGGEST_STRATEGY=(history completion)`. We should also support this. --- .../from_md/release-notes/rl-2205.section.xml | 6 ++++++ .../manual/release-notes/rl-2205.section.md | 2 ++ .../programs/zsh/zsh-autosuggestions.nix | 21 ++++++++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) 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 27fbd68a6f3a..1ad1a8e3a36d 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 @@ -846,6 +846,12 @@ compatibilty, but will be removed at a later date. + + + programs.zsh.autosuggestions.strategy now + takes a list of strings instead of a string. + + The services.unifi.openPorts option default diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 388ddc67fb26..bf66e66da626 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -278,6 +278,8 @@ In addition to numerous new and upgraded packages, this release has the followin combined `influxdb2` package is still provided in this release for backwards compatibilty, but will be removed at a later date. +- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string. + - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. Configurations using this default will print a warning when rebuilt. diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix index fee324cc7326..2e53e907d547 100644 --- a/nixos/modules/programs/zsh/zsh-autosuggestions.nix +++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix @@ -22,17 +22,18 @@ in }; strategy = mkOption { - type = types.enum [ "history" "match_prev_cmd" ]; - default = "history"; + type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]); + default = [ "history" ]; description = '' - Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions. - There are currently two to choose from: + `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. + The strategies in the array are tried successively until a suggestion is found. + There are currently three built-in strategies to choose from: - * history: Chooses the most recent match. - * match_prev_cmd: Chooses the most recent match whose preceding history item matches - the most recently executed command (more info). Note that this strategy won't work as - expected with ZSH options that don't preserve the history order such as - HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST. + - `history`: Chooses the most recent match from history. + - `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module) + - `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches + the most recently executed command. Note that this strategy won't work as expected with ZSH options that + don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`. ''; }; @@ -62,7 +63,7 @@ in source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}" - export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}") + export ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.strategy}) ${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"} ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)} From a74714e62aa057a1f7a6ca8305a6a777a3769369 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Mar 2022 17:31:56 +0000 Subject: [PATCH 19/53] subfinder: 2.4.9 -> 2.5.0 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index d38200a53da4..9f0dfe7c3881 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.4.9"; + version = "2.5.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4="; + sha256 = "sha256-RzZlr0mscJgOGWOn4RU9SOr/WkKOrY39cIUKFKxis6Y="; }; - vendorSha256 = "sha256-lgbTfIsfYFSToCaDppMGaxfE1Bmk52eShQ+40g2VNw0="; + vendorSha256 = "sha256-P98giu0a5FLBsE87XVTurYNGnNk8JUfz1awY49OBj9M="; modRoot = "./v2"; From 5fb9ee7f05e4fdefbeca9cbf2c8ed3aa7516dd04 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 14 Feb 2022 11:08:03 -0500 Subject: [PATCH 20/53] dxvk: init at 1.10 --- pkgs/misc/dxvk/darwin-dxvk-compat.patch | 35 +++++++++ pkgs/misc/dxvk/darwin-moltenvk-compat.patch | 59 +++++++++++++++ pkgs/misc/dxvk/default.nix | 80 +++++++++++++++++++++ pkgs/misc/dxvk/dxvk.nix | 52 ++++++++++++++ pkgs/misc/dxvk/mcfgthread.patch | 34 +++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 262 insertions(+) create mode 100644 pkgs/misc/dxvk/darwin-dxvk-compat.patch create mode 100644 pkgs/misc/dxvk/darwin-moltenvk-compat.patch create mode 100644 pkgs/misc/dxvk/default.nix create mode 100644 pkgs/misc/dxvk/dxvk.nix create mode 100644 pkgs/misc/dxvk/mcfgthread.patch diff --git a/pkgs/misc/dxvk/darwin-dxvk-compat.patch b/pkgs/misc/dxvk/darwin-dxvk-compat.patch new file mode 100644 index 000000000000..1c68659215f0 --- /dev/null +++ b/pkgs/misc/dxvk/darwin-dxvk-compat.patch @@ -0,0 +1,35 @@ +Source: https://github.com/marzent/dxvk/commit/65247afe2de5dd6b555b8fdd46dddcdc6325e1d6 +--- + src/d3d11/d3d11_device.cpp | 12 +- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp +index 21f0d1b4a..5b1d05335 100644 +--- a/src/d3d11/d3d11_device.cpp ++++ b/src/d3d11/d3d11_device.cpp +@@ -799,8 +799,12 @@ namespace dxvk { + InitReturnPtr(ppGeometryShader); + D3D11CommonShader module; + +- if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback) +- return DXGI_ERROR_INVALID_CALL; ++ if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback) { ++ Logger::err( ++ "D3D11: CreateGeometryShaderWithStreamOutput:" ++ "\n Transform feedback not supported by device"); ++ return S_OK; ++ } + + // Zero-init some counterss so that we can increment + // them while walking over the stream output entries +@@ -1973,8 +1977,8 @@ namespace dxvk { + enabled.core.features.logicOp = supported.core.features.logicOp; + enabled.core.features.shaderImageGatherExtended = VK_TRUE; + enabled.core.features.variableMultisampleRate = supported.core.features.variableMultisampleRate; +- enabled.extTransformFeedback.transformFeedback = VK_TRUE; +- enabled.extTransformFeedback.geometryStreams = VK_TRUE; ++ enabled.extTransformFeedback.transformFeedback = supported.extTransformFeedback.transformFeedback; ++ enabled.extTransformFeedback.geometryStreams = supported.extTransformFeedback.geometryStreams; + } + + if (featureLevel >= D3D_FEATURE_LEVEL_10_1) { diff --git a/pkgs/misc/dxvk/darwin-moltenvk-compat.patch b/pkgs/misc/dxvk/darwin-moltenvk-compat.patch new file mode 100644 index 000000000000..7d16fdf70331 --- /dev/null +++ b/pkgs/misc/dxvk/darwin-moltenvk-compat.patch @@ -0,0 +1,59 @@ +Source: https://github.com/Gcenx/MoltenVK/commit/1f268bd45f6c928784d7cb90dedce382895f10ae + +Fake extensions for DXVK; +- _features.geometryShader +- _features.tessellationShader +- _features.shaderCullDistance + +Enabled defaults; +- MVK_ALLOW_METAL_FENCES=1 +- MVK_CONFIG_RESUME_LOST_DEVICE=1 +--- + MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm | 3 +++ + MoltenVK/MoltenVK/Utility/MVKEnvironment.h | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm +index bc6d19df..e1959c6e 100644 +--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm ++++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm +@@ -1656,6 +1656,8 @@ + _features.robustBufferAccess = true; // XXX Required by Vulkan spec + _features.fullDrawIndexUint32 = true; + _features.independentBlend = true; ++ _features.geometryShader = true; // XXX Required by DXVK for D3D10 ++ _features.tessellationShader = true; // XXX Required by DXVK for D3D11 + _features.sampleRateShading = true; + _features.depthBiasClamp = true; + _features.fillModeNonSolid = true; +@@ -1669,6 +1671,7 @@ + _features.shaderUniformBufferArrayDynamicIndexing = true; + _features.shaderStorageBufferArrayDynamicIndexing = true; + _features.shaderClipDistance = true; ++ _features.shaderCullDistance = true; // XXX Required by DXVK for 10level9 + _features.shaderInt16 = true; + _features.multiDrawIndirect = true; + _features.inheritedQueries = true; +diff --git a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h +index 81d0defc..80c414d3 100644 +--- a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h ++++ b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h +@@ -240,7 +240,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig); + # define MVK_ALLOW_METAL_EVENTS 1 + #endif + #ifndef MVK_ALLOW_METAL_FENCES +-# define MVK_ALLOW_METAL_FENCES 0 ++# define MVK_ALLOW_METAL_FENCES 1 // XXX Required by DXVK for Apple/NVidia GPUs (better FPS than CPU Emulation) + #endif + + /** Substitute Metal 2D textures for Vulkan 1D images. Enabled by default. */ +@@ -275,7 +275,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig); + + /** Resume MVKDevice VK_ERROR_DEVICE_LOST errors that do not cause MVKPhysicalDevice errors. Disabled by default. */ + #ifndef MVK_CONFIG_RESUME_LOST_DEVICE +-# define MVK_CONFIG_RESUME_LOST_DEVICE 0 ++# define MVK_CONFIG_RESUME_LOST_DEVICE 1 + #endif + + /** Support Metal argument buffers. Disabled by default. */ + \ No newline at end of file diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix new file mode 100644 index 000000000000..61e2d78b45c0 --- /dev/null +++ b/pkgs/misc/dxvk/default.nix @@ -0,0 +1,80 @@ +{ lib +, pkgs +, stdenv +, fetchFromGitHub +, pkgsCross +}: + +let + # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that + # needs to be built with a cross-compiler. + dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; }; + dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; }; + + # Use the self pattern to support overriding `src` and `version` via `overrideAttrs`. A recursive + # attrset wouldn’t work. + self = stdenv.mkDerivation { + name = "dxvk"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${self.version}"; + hash = "sha256-/zH6vER/6s/d+Tt181UJOa97sqdkJyKGw6E36+1owzQ="; + }; + + # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. + # Some games will work poorly (particularly Unreal Engine 4 games), but others work pretty well. + # Override this to patch DXVK itself (rather than the setup script). + dxvkPatches = lib.optional stdenv.isDarwin ./darwin-dxvk-compat.patch; + + outputs = [ "out" "bin" "lib" ]; + + # Also copy `mcfgthread-12.dll` due to DXVK’s being built in a MinGW cross environment. + patches = [ ./mcfgthread.patch ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $bin $lib + substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \ + --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ + --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \ + --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" + chmod a+x $out/bin/setup_dxvk.sh + declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) + for arch in "''${!dxvks[@]}"; do + ln -s "''${dxvks[$arch]}/bin" $bin/$arch + ln -s "''${dxvks[$arch]}/lib" $lib/$arch + done + ''; + + # DXVK with MoltenVK requires a patched MoltenVK in addition to its own patches. Provide a + # convenience function to handle the necessary patching. + # Usage: + # let + # patchedMoltenVK = dxvk.patchMoltenVK darwin.moltenvk; + # in + # wine64Packages.full.override { moltenvk = patchedMoltenVK; vkd3dSupport = false; } + passthru.patchMoltenVK = moltenvk: + moltenvk.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + # Lie to DXVK about certain features that DXVK expects to be available and set defaults + # for better performance/compatability on certain hardware. + ./darwin-moltenvk-compat.patch + ]; + }); + + meta = { + description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + homepage = "https://github.com/doitsujin/dxvk"; + changelog = "https://github.com/doitsujin/dxvk/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + }; + }; +in +self diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix new file mode 100644 index 000000000000..40b674df9225 --- /dev/null +++ b/pkgs/misc/dxvk/dxvk.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, glslang +, meson +, ninja +, windows +, src +, version +, dxvkPatches +}: + +stdenv.mkDerivation { + pname = "dxvk"; + inherit src version; + + nativeBuildInputs = [ glslang meson ninja ]; + buildInputs = [ windows.pthreads ]; + + patches = dxvkPatches; + + # Replace use of DXVK’s threading classes with the ones from the C++ standard library, which uses + # mcfgthreads in nixpkgs. + postPatch = '' + for class in mutex recursive_mutex condition_variable; do + for file in $(grep -rl dxvk::$class *); do + if [ "$(basename "$file")" != "thread.h" ]; then + substituteInPlace "$file" --replace dxvk::$class std::$class + fi + done + done + ''; + + mesonFlags = + let + arch = if stdenv.is32bit then "32" else "64"; + in + [ + "--buildtype" "release" + "--cross-file" "build-win${arch}.txt" + "--prefix" "${placeholder "out"}" + ]; + + meta = { + description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + homepage = "https://github.com/doitsujin/dxvk"; + changelog = "https://github.com/doitsujin/dxvk/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.zlib; + platforms = lib.platforms.windows; + }; +} diff --git a/pkgs/misc/dxvk/mcfgthread.patch b/pkgs/misc/dxvk/mcfgthread.patch new file mode 100644 index 000000000000..037071630172 --- /dev/null +++ b/pkgs/misc/dxvk/mcfgthread.patch @@ -0,0 +1,34 @@ +diff --git a/setup_dxvk.sh b/setup_dxvk.sh +index 3e63ecf0..87c04f23 100755 +--- a/setup_dxvk.sh ++++ b/setup_dxvk.sh +@@ -133,6 +133,8 @@ + rm -v "${dstfile}" + fi + $file_cmd "${srcfile}" "${dstfile}" ++ elif [ "${4}" = "--force" ]; then ++ $file_cmd "${srcfile}" "${dstfile}" + else + echo "${dstfile}: File not found in wine prefix" >&2 + return 1 +@@ -170,12 +172,12 @@ + } + + install() { +- installFile "$win64_sys_path" "$dxvk_lib64" "$1" ++ installFile "$win64_sys_path" "$dxvk_lib64" "$1" "${2-}" + inst64_ret="$?" + + inst32_ret=-1 + if $wow64; then +- installFile "$win32_sys_path" "$dxvk_lib32" "$1" ++ installFile "$win32_sys_path" "$dxvk_lib32" "$1" "${2-}" + inst32_ret="$?" + fi + +@@ -214,3 +216,5 @@ + + $action d3d10core + $action d3d11 ++ ++basedir="" dxvk_lib32=@mcfgthreads32@/bin dxvk_lib64=@mcfgthreads64@/bin $action mcfgthread-12 --force diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 389e1c038d32..e95201baf93e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33079,6 +33079,8 @@ with pkgs; dump = callPackage ../tools/backup/dump { }; + dxvk = callPackage ../misc/dxvk { }; + ecdsatool = callPackage ../tools/security/ecdsatool { }; emulationstation = callPackage ../applications/emulators/emulationstation { }; From 292c6dbc7c33dd4a9a58f355637c01c1f84fc3b4 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sun, 20 Feb 2022 10:15:30 +0100 Subject: [PATCH 21/53] losslesscut-bin: 3.33.1 -> 3.43.0, update license --- pkgs/applications/video/losslesscut-bin/appimage.nix | 4 ++-- pkgs/applications/video/losslesscut-bin/default.nix | 10 +++++----- pkgs/applications/video/losslesscut-bin/dmg.nix | 4 ++-- pkgs/applications/video/losslesscut-bin/windows.nix | 5 +++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index d1f60c3dd2c2..e6be6f54e1dc 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version }: +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }: let pname = "losslesscut"; @@ -11,7 +11,7 @@ let src = fetchurl { url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; name = nameSource; - sha256 = "0aqz5ijl5japfzzbcdcd2mmihkb8b2fc2hs9kkm3211yb37c5ygv"; + inherit sha256; }; extracted = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 01f9c1580628..be7786f91020 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,9 +1,9 @@ { callPackage, stdenvNoCC, lib }: let - version = "3.33.1"; - appimage = callPackage ./appimage.nix { inherit version; }; - dmg = callPackage ./dmg.nix { inherit version; }; - windows = callPackage ./windows.nix { inherit version; }; + version = "3.43.0"; + appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; }; + dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; }; + windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; }; in ( if stdenvNoCC.isDarwin then dmg else if stdenvNoCC.isCygwin then windows @@ -13,7 +13,7 @@ in ( meta = with lib; { description = "The swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; - license = licenses.mit; + license = licenses.gpl2Only; maintainers = with maintainers; [ ShamrockLee ]; } // oldAttrs.meta // { platforms = diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix index 3d0bad197570..3cbd77198b93 100644 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/dmg.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, fetchurl, undmg, version }: +{ stdenvNoCC, lib, fetchurl, undmg, version , sha256 }: let pname = "losslesscut"; @@ -10,7 +10,7 @@ let src = fetchurl { url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; name = nameSource; - sha256 = "0xa1avbwar7x7kv5yn2ldca4vj3nwaz0dhjm3bcdy59q914xn3dj"; + inherit sha256; }; in stdenvNoCC.mkDerivation { inherit pname version src; diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix index fe5df9d6c906..0e6ed9b04123 100644 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ b/pkgs/applications/video/losslesscut-bin/windows.nix @@ -3,6 +3,7 @@ , fetchurl , unzip , version +, sha256 , useMklink ? false , customSymlinkCommand ? null }: @@ -18,12 +19,12 @@ let else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}") else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}"); in stdenvNoCC.mkDerivation { - inherit pname version; + inherit pname version sha256; src = fetchurl { name = nameSource; url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; - sha256 = "1rq9frab0jl9y1mgmjhzsm734jvz0a646zq2wi5xzzspn4wikhvb"; + inherit sha256; }; nativeBuildInputs = [ unzip ]; From b195c905c0662847c01c700adb0f59371b963364 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 00:19:57 +0000 Subject: [PATCH 22/53] sqlfluff: 0.10.1 -> 0.11.0 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 7c95565487d8..82b7ea8ea954 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag="; + hash = "sha256-Cem53w/pzSDTi9A9mh9VeLlRn1m6KhkxWaqJjEtfwUs="; }; propagatedBuildInputs = with python3.pkgs; [ From 8b5c9ae734e090a8eea8ceee070b49923bc02437 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 01:09:02 +0000 Subject: [PATCH 23/53] python310Packages.google-cloud-speech: 2.13.0 -> 2.13.1 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 097da842100f..e461b4cdcb53 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-NO2oxVszbm2KYiN2NCn3edIyBx+E++sttJTgZd/yXzQ="; + hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA="; }; propagatedBuildInputs = [ From b3843a3924a514abf582e857d4f7669f01e90df3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 01:37:30 +0000 Subject: [PATCH 24/53] python310Packages.google-cloud-securitycenter: 1.9.0 -> 1.10.0 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index d49eb3cf3360..056c57ecd541 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-qtaZs6mgcYeEEdf6KGQNx7c+RP8SqSNyTCZuhTVAq38="; + hash = "sha256-VaU6DRkq1pOESSOSynRRjaljp68C1X2H8anjHeHorbI="; }; propagatedBuildInputs = [ From 4f34287644f907248caa3936e07f4232a2fe60c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 01:57:02 +0000 Subject: [PATCH 25/53] python310Packages.google-cloud-vision: 2.7.0 -> 2.7.1 --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 312d8ec3b153..61c383dca6ed 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-antpKF6egHtya4g9sKuQLQepz1QRLQ6LiCdpfYBsDh8="; + hash = "sha256-Ty80C73K3/TebsdSHinmp2y8TKgOftqT5PIDafq1GgM="; }; propagatedBuildInputs = [ From 9b2decc4d890a9c21527b1c1405e351479f98780 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 02:05:41 +0000 Subject: [PATCH 26/53] python310Packages.google-cloud-access-context-manager: 0.1.9 -> 0.1.10 --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 05963856edce..5861c66ca58d 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.9"; + version = "0.1.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8"; + sha256 = "sha256-/qQxNUVAHKZ5Go4GYpJ9ATi/EeseJPMyK5HsQCjtL0o="; }; propagatedBuildInputs = [ From 491a895d602f6bbfd1208e9c69f382218ba3e02c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 02:18:36 +0000 Subject: [PATCH 27/53] python310Packages.google-cloud-videointelligence: 2.6.0 -> 2.6.1 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 629220fe37a2..58368693523c 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-blkNMdh9ehRM9sidgGajIkrHgrJCT96hzG3nVU0DBo4="; + sha256 = "sha256-p1HXFxURs0axONrqHahl/SPvWN2mhAhvJePFOwzRR4c="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; From 6ade93c7c95fcd24e3a7681a80a752ed2287060a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 02:40:17 +0000 Subject: [PATCH 28/53] python310Packages.google-cloud-resource-manager: 1.4.0 -> 1.4.1 --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index e35349d8e895..da5d110225e8 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-InkkAtqK5f1oqUK0Nsxc2PYt5JWBlB3ElGVNs5IJV/Q="; + hash = "sha256-NUqFkvIwfaqz3MZEUoLqO7hFCVwV5124+lA8LGzccl0="; }; propagatedBuildInputs = [ From 2cb5a6770b051b142c4b19add93681a48f96be47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 02:44:55 +0000 Subject: [PATCH 29/53] cfripper: 1.5.0 -> 1.5.1 --- pkgs/tools/security/cfripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 28c692b5c179..39b0187c4a6e 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-nomNjt/BV/Tu/9w4IEu3tXWQw4/wLTc64khdnQeliH0="; + hash = "sha256-/qcpLCk1ZZMKxhqK6q6sSbRDjiF5GQmDJzvCaV2kAqQ="; }; propagatedBuildInputs = with python3.pkgs; [ From 2518644ff685cb60456cd264cf84edda708c395d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 03:26:24 +0000 Subject: [PATCH 30/53] colima: 0.3.3 -> 0.3.4 --- pkgs/applications/virtualization/colima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index e83fc4ef5018..980955fcda65 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "colima"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nov+DIaeYaRJy7Cz1hcKJUA88IKlZ4z/tn4WASZjxLI="; + sha256 = "sha256-g7q2DmtyArtW7Ii2XF5umXQ0+BlCSa1Q7VNNuIuX65k="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 5366edd9f0db8d288d68d71959bd67334388946a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 04:00:58 +0000 Subject: [PATCH 31/53] python310Packages.google-cloud-bigtable: 2.6.0 -> 2.7.0 --- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 779fbb4e6e53..9ffa885ab4a5 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-z6qhLNPfZnFJE6CStAByqxHBv3Itfzn1FtxDE+JPci8="; + hash = "sha256-TUgC/6IZ9kNE5iDtbhKPHJqo3sv9W+nl7KcxuXfrbyM="; }; propagatedBuildInputs = [ From 48097cfe33f0e14c44cf84ec1ee9b2dac6152bc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 04:08:46 +0000 Subject: [PATCH 32/53] python310Packages.google-cloud-datastore: 2.5.0 -> 2.5.1 --- .../python-modules/google-cloud-datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 30cf1ae31a04..d2afea058d0c 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4OwOEb+E+doiQ+gm3f4O+O88PXwFWINfTpRvOlzMuCA="; + sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc="; }; propagatedBuildInputs = [ From 458e4e0410ac1b498f2c1807d5e8f139a5197e73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 04:34:16 +0000 Subject: [PATCH 33/53] python310Packages.google-cloud-iam: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/google-cloud-iam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index c0130e506a39..26c89af2addb 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.6.0"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iLfXzZ3LCNlkgsMilf8TW5ZXgdSBWRgJtuL8zIpUlns="; + sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 280885f8451cb659c5362ae929fd77f2dcb80b94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 04:49:34 +0000 Subject: [PATCH 34/53] dnscontrol: 3.14.0 -> 3.15.0 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 8b6a5e2cc258..c6ada11d356c 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU="; + sha256 = "sha256-znBvV6z5rMfLeyEBRmAtfwVw1is5jJlGPQplXqEGAAM="; }; - vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ="; + vendorSha256 = "sha256-S2og/isDy6Jvo9XgIV6XbgrmRJsLnePwh/gll/14Ds0="; subPackages = [ "." ]; From 25a71f228befd53fc9fcea761f9ff9bbe128778a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 05:45:53 +0000 Subject: [PATCH 35/53] python310Packages.google-cloud-redis: 2.7.0 -> 2.7.1 --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index ef76b3783555..fc1ca3121252 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-i3jgEaAJ0zEaJWtpzhOe23CtpUpt1ON4gXnVvSG8fTI="; + hash = "sha256-tz2upcRjgE6/4cB0riARwot3Vhw4QSKqqHTlJS3i7is="; }; propagatedBuildInputs = [ From 542cb486362807d1f1acdbcbaffcc364abde25d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 06:01:59 +0000 Subject: [PATCH 36/53] exoscale-cli: 1.50.0 -> 1.51.1 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index ecab060ee975..529871683f69 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.50.0"; + version = "1.51.1"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RpUnJzMnYIvPpJd6+IVpDxCS/FGM+PHXvbQPJQEoS8Y="; + sha256 = "sha256-NU4xJTW0KCi8PZAY4cRJijGHCZEn5Z41xNF7+iH01oo="; }; goPackagePath = "github.com/exoscale/cli"; From 3eeb9e6ae319d423073e629bd0a498313d2958d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 06:18:13 +0000 Subject: [PATCH 37/53] python310Packages.google-cloud-monitoring: 2.9.0 -> 2.9.1 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 9a4a6a83d408..32572b0115e6 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.9.0"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-6Xu07QBrVGQOwxi65KZaYFKF3DJ/1uc+zC+NUKqJeWM="; + hash = "sha256-FoB6SGDrVDHG60WeWmGwfVbSwt6xdq9da2QwSikpIlU="; }; propagatedBuildInputs = [ From 20be77e9e5784315aed6b4f5860334e01cee518c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 06:33:24 +0000 Subject: [PATCH 38/53] python310Packages.google-cloud-websecurityscanner: 1.7.0 -> 1.7.1 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index c7730e5138b3..2ea8de6f139f 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FBTJlr4mN5qW3BvA1l/glRaqdcJGFFjqPea3KQjwUqQ="; + sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From d28134c6b492dcabfda886bd9d46689ed4815249 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 07:59:39 +0000 Subject: [PATCH 39/53] python310Packages.google-cloud-appengine-logging: 1.1.0 -> 1.1.1 --- .../python-modules/google-cloud-appengine-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 67296f667ab2..ff37c96bcda1 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "91fe9b0833f6e1a46293dcc0e483716372c9ff4a95ebe51276c5f0092cb9defd"; + sha256 = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc="; }; propagatedBuildInputs = [ From de5c2a2f1ace301ada0c0cfb03323ef55d9af4d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 08:08:32 +0000 Subject: [PATCH 40/53] python310Packages.google-cloud-iam-logging: 1.0.0 -> 1.0.1 --- .../python-modules/google-cloud-iam-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 47ca59ab2a21..ef35f70f8907 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4ac688593279c48d7863f0a90457202ff9b235e3ee8862498e8a5b8f867cc137"; + sha256 = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY="; }; propagatedBuildInputs = [ From 75f691d9083662372108b68cbf1a1b7426f32c34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 08:32:48 +0000 Subject: [PATCH 41/53] python310Packages.google-cloud-dlp: 3.6.1 -> 3.6.2 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 90e229857858..1961789e3b58 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.6.1"; + version = "3.6.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zDGLdyBvm2haNaWRanHkRJZqHl+yvBuHRxCGqXYO7Ow="; + hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk="; }; propagatedBuildInputs = [ From 481439de5581bab20576cf6f61899d8f8ba301fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 08:36:59 +0000 Subject: [PATCH 42/53] python310Packages.google-cloud-bigquery-datatransfer: 3.6.0 -> 3.6.1 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 35c082e05632..c15ac1424a35 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1syubhGCY8sYgV2mdneAV/8YOdplf5YZNEeZ0RAJC6E="; + sha256 = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; From cb8fa2cc3420ecfbc2ee9770246e27644b19e272 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 08:47:32 +0000 Subject: [PATCH 43/53] python310Packages.google-cloud-automl: 2.7.1 -> 2.7.2 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 03022877a244..be13251d2f4b 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.7.1"; + version = "2.7.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-NHjHzZm20jDdIg91Zr0ytM0V2sHAmZUF0hlD1C9DeSM="; + hash = "sha256-CUsLMX0zRONChgzejZnBztth5ORMZyb6rj6mok2pMMU="; }; propagatedBuildInputs = [ From 693adfda3fe2f8b0eca920d010f5b4320324de1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 09:43:53 +0000 Subject: [PATCH 44/53] python310Packages.google-cloud-iot: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/google-cloud-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 063ba0666026..24afcea7a73d 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5AOurJ/XIggFo3QZOQKiRNpbcHwdrIuMBbHeYDA001M="; + sha256 = "sha256-AjGoEAAI8aTACtcZp7zT5n9y6WCMc4GOfgUusUVXAVk="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From 6f3482f640b892e68c16bf8a59bffdbab2f5d4cd Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 7 Mar 2022 12:08:51 +0100 Subject: [PATCH 45/53] update.py: fix for kakoune/luarocks --- maintainers/scripts/update-luarocks-packages | 13 +++++-------- pkgs/applications/editors/kakoune/plugins/update.py | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index c559d5699dff..73a233c5f103 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -25,8 +25,8 @@ from pathlib import Path log = logging.getLogger() log.addHandler(logging.StreamHandler()) -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent -from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore +from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment PKG_LIST="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" @@ -118,7 +118,7 @@ class LuaEditor(Editor): def attr_path(self): return "luaPackages" - def get_update(self, input_file: str, outfile: str, proc: int): + def get_update(self, input_file: str, outfile: str, config: FetchConfig): _prefetch = generate_pkg_nix def update() -> dict: @@ -126,14 +126,14 @@ class LuaEditor(Editor): sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) try: - pool = Pool(processes=proc) + pool = Pool(processes=config.proc) results = pool.map(_prefetch, sorted_plugin_specs) finally: pass self.generate_nix(results, outfile) - redirects = [] + redirects = {} return redirects return update @@ -181,11 +181,9 @@ def generate_pkg_nix(plug: LuaPlugin): cmd.append(plug.version) - # if plug.server != "src" and plug.server: cmd.append(f"--only-server={plug.server}") - if plug.luaversion: with CleanEnvironment(): local_pkgs = str(ROOT.resolve()) @@ -209,7 +207,6 @@ def main(): parser = editor.create_parser() args = parser.parse_args() - log.setLevel(LOG_LEVELS[args.debug]) update_plugins(editor, args) diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 9f5f64f9e5b3..dd8765db28a4 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -15,7 +15,7 @@ from typing import List, Tuple from pathlib import Path # Import plugin update library from maintainers/scripts/pluginupdate.py -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore sys.path.insert( 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") ) @@ -42,7 +42,7 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): + def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) with open(outfile, "w+") as f: From a383bcb3c44d6b790a5c6ea0140d2e8392bd7010 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 7 Mar 2022 14:31:30 +0100 Subject: [PATCH 46/53] luaPackages.luv: 1.42.0 -> 1.43.0 --- maintainers/scripts/luarocks-packages.csv | 2 +- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 23303d22c471..d69546cdf07e 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -68,7 +68,7 @@ luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn luuid,,,,,, -luv,,,,1.42.0-0,, +luv,,,,1.43.0-0,, lyaml,,,,,,lblasc markdown,,,,,, mediator_lua,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c4442f1fd795..71d85a776bb2 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2033,14 +2033,14 @@ luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luv"; - version = "1.42.0-0"; + version = "1.43.0-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luv-1.42.0-0.rockspec"; - sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.43.0-0.rockspec"; + sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz"; - sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm"; + url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz"; + sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn"; }; disabled = with lua; (luaOlder "5.1"); From 644b783ac1a57b5fa700f0c36e8b80cb3e49c0e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Mar 2022 11:01:37 +0100 Subject: [PATCH 47/53] python3Packages.google-cloud-iam-logging: disable on older Python releases --- .../python-modules/google-cloud-iam-logging/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index ef35f70f8907..017634fd5273 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-iam-logging"; version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY="; + hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY="; }; propagatedBuildInputs = [ From 02ef43aa1069639970feab64a0b1ecdc890d2ed2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Mar 2022 11:02:09 +0100 Subject: [PATCH 48/53] python3Packages.google-cloud-appengine-logging: disable on older Python releases --- .../google-cloud-appengine-logging/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index ff37c96bcda1..c6f17c8d8b00 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-appengine-logging"; version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc="; + hash = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc="; }; propagatedBuildInputs = [ From 1935481cd363baad4a25eb41fc777d26fd33499b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 8 Mar 2022 11:10:26 +0100 Subject: [PATCH 49/53] python3Packages.google-cloud-bigquery-datatransfer: disable on older Python releases --- .../default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index c15ac1424a35..2717af605ef3 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -8,19 +8,33 @@ , pytest-asyncio , pytz , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; version = "3.6.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; + hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + pytz + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.bigquery_datatransfer" From 2356f9cb585300d7dcdcdb4ef0f5ced019a4c33a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 10:18:11 +0000 Subject: [PATCH 50/53] ffmpeg-normalize: 1.22.7 -> 1.22.8 --- pkgs/applications/video/ffmpeg-normalize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index add2e525dc9f..a2f802c6e87b 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.7"; + version = "1.22.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yWn9SoVKnj9KtvBdI3k1a7fuKJmYeu9KrNyvPqw9SHU="; + sha256 = "sha256-vxiq6q8fPh8ZLKnxYdIN591UQW73FWsoke1PvKTkko8="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; From db964ae0fa9d868e901ce3902e3b187c2401074c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 06:57:15 +0000 Subject: [PATCH 51/53] freerdp: 2.6.0 -> 2.6.1 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 19e8d1eeba7a..852fcf68987e 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-gYHnorj2Up0aAVeltCCPOg/j3DY0ukWWNUU7uikvys0="; + sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U="; }; postPatch = '' From c7b3a73f99eaa2213974bb4ada3b69d610fc951b Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 6 Oct 2021 18:49:20 +0200 Subject: [PATCH 52/53] ocamlPackages.camomile: append version to META file --- pkgs/development/ocaml-modules/camomile/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index a75f05b33f2e..e5fe67021312 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, cppo }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }: buildDunePackage rec { pname = "camomile"; @@ -23,6 +23,10 @@ buildDunePackage rec { runHook postConfigure ''; + postInstall = '' + echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META + ''; + meta = { inherit (src.meta) homepage; maintainers = [ lib.maintainers.vbgl ]; From db9a49b857749df1b97c3bd5466962bee69eed1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 11:30:10 +0000 Subject: [PATCH 53/53] python310Packages.google-cloud-datacatalog: 3.7.0 -> 3.7.1 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index a095b9a04f19..c3e748810ee3 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.7.0"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-5ehghcpPZTlw8dOJ74pkB4k0g79wHLh+zj3fLCOR4Rc="; + hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU="; }; propagatedBuildInputs = [